diff --git a/app/Http/Controllers/CreateProjectController.php b/app/Http/Controllers/CreateProjectController.php new file mode 100644 index 00000000..1edea80b --- /dev/null +++ b/app/Http/Controllers/CreateProjectController.php @@ -0,0 +1,88 @@ +get(); + return view ('projectsClients/createProject', ['companies' => $companies]); + } + + + public function createProject(Request $request){ + // dd($request); + + // Validação... + $installationId = $request->input('installation_id'); + + if ($installationId == 'new_install') { + // Criar uma nova instalação... + $newInstallation = new Installation; + $newInstallation->installation_name = $request->input('new_company_name'); + $newInstallation->address = $request->input('new_company_address'); + $newInstallation->user_id = $request->input('user_id'); + + $newInstallation->save(); + + // Use o id da nova instalação. + $installationId = $newInstallation->id; + // dd($installationId); + } + + $project = new company_project; + + $project->description_project = $request->input('description_project'); + $project->n_project_ispt = $request->input('n_project_ispt'); + $project->responsible_project_ispt = $request->input('responsible_project_ispt'); + $project->responsible_project_company = $request->input('responsible_project_company'); + $project->date_started = $request->input('date_started'); + + $project->installation_ID = $installationId; + + $project->save(); + + return redirect()->route('testExcel')->with('success', 'Dados guardados com sucesso'); + } + + + public function storeProject(Request $request) +{ + if ($request->input('company_id') == 'new') { + $company = new company_project; // Substitua "Company" pelo nome do seu modelo de empresas + $company->name = $request->input('new_company_name'); + $company->save(); + + $company_id = $company->id; + } else { + $company_id = $request->input('company_id'); + } + + // Agora, você pode usar $company_id ao criar o projeto +} + + public function getByUserNif (Request $request){ + + // dd(Installation::where('user_id', $request->input('user_id'))->get()); + + $user_id = $request->input('user_id'); //Check + $installations = Installation::where('user_id', $user_id)->get(); + + return response()->json($installations); + } + public function createEquipamentProject (Request $request){ + + dd($request->input('data')); + // $data = $request->input('data'); + } + + +} diff --git a/app/Http/Controllers/EquipamentsController.php b/app/Http/Controllers/EquipamentsController.php new file mode 100644 index 00000000..c3ac5201 --- /dev/null +++ b/app/Http/Controllers/EquipamentsController.php @@ -0,0 +1,17 @@ +validate([ 'name' => 'required', diff --git a/app/Http/Middleware/VerifyCsrfToken.php b/app/Http/Middleware/VerifyCsrfToken.php index 9e865217..47390301 100644 --- a/app/Http/Middleware/VerifyCsrfToken.php +++ b/app/Http/Middleware/VerifyCsrfToken.php @@ -12,6 +12,6 @@ class VerifyCsrfToken extends Middleware * @var array */ protected $except = [ - // + '/create-equipament-project', ]; } diff --git a/app/Models/ambits_equipment.php b/app/Models/ambits_equipment.php new file mode 100644 index 00000000..f2ccc282 --- /dev/null +++ b/app/Models/ambits_equipment.php @@ -0,0 +1,14 @@ +pending_nif}}" readonly> -
+ {{--
+
--}} +
+ +
diff --git a/resources/views/Templates/templateAdmin.blade.php b/resources/views/Templates/templateAdmin.blade.php index 5402ca85..ab72d852 100644 --- a/resources/views/Templates/templateAdmin.blade.php +++ b/resources/views/Templates/templateAdmin.blade.php @@ -4,6 +4,9 @@ + + + ISPT 4.0 @@ -32,6 +35,9 @@ + + + @@ -121,7 +127,7 @@ class="fas fa-bars">
  • - +

    Criar obra

    @@ -144,7 +150,7 @@ class="fas fa-bars">
  • - +

    Relatórios @@ -250,13 +256,6 @@ class="fas fa-bars"> - - - - - @@ -277,6 +276,11 @@ class="fas fa-bars"> + + + + + @@ -289,10 +293,23 @@ class="fas fa-bars"> - - - - + + + + + + + +{{-- Script que dao erro no projecto --}} + + + + + + + {{-- --}} \ No newline at end of file diff --git a/resources/views/createProject.blade.php b/resources/views/createProject.blade.php new file mode 100644 index 00000000..1f132efd --- /dev/null +++ b/resources/views/createProject.blade.php @@ -0,0 +1,194 @@ +@extends('Templates/templateAdmin') + +@section('Main-content') + + + + @if (session('success')) +

    + @endif + + + +

    +
    +
    +
    +
    + @csrf +
    + + +
    + +
    + +

    + Baixar Template + +
    +
    + +
    +
    +
    +
    +
    + + {{-- --}} + + + + + + + +@endsection + + + +{{-- + // reader.onload = function() { + // const fileData = reader.result; + // const workbook = XLSX.read(fileData, { + // type: 'binary' + // }); + // const worksheet1 = workbook.Sheets[workbook.SheetNames[0]]; + // const tableData1 = XLSX.utils.sheet_to_json(worksheet1); + // const tabelaHtml1 = criarTabelaHtml(tableData1); + // const tabelaExcel1 = document.getElementById('tabelaExcel1'); + // if (tabelaExcel1 !== null) { + // tabelaExcel1.innerHTML = tabelaHtml1; + // } + // }; + + +// function criarTabelaHtml(dados) { + +// const colunasObj = dados[2]; +// const colunasheader = Object.keys(colunasObj).map(key => +// colunasObj[key]); + + + +// const colunasHtml = colunasheader.map(coluna => `${coluna}`).join(''); + +// const colunas = Object.keys(dados[2]); + +// const linhasHtml = dados +// .slice(3) +// .map(linha => { +// const celulasHtml = colunas.map(coluna => { +// const valor = linha[coluna] !== undefined ? linha[coluna] : 'NULL'; +// return `${valor}`; +// }).join(''); +// return `${celulasHtml}`; +// }) +// .join(''); + +// // console.log() +// return ` +// + // + // ${colunasHtml} + // + // + // ${linhasHtml} + // + //
    +// `; +// } --}} diff --git a/resources/views/email/pendingUsers.blade.php b/resources/views/email/pendingUsers.blade.php index 53335edf..7f6b721d 100644 --- a/resources/views/email/pendingUsers.blade.php +++ b/resources/views/email/pendingUsers.blade.php @@ -30,6 +30,7 @@
    • + {{-- /.card-body --}} {{-- ./card --}} diff --git a/resources/views/projectsClients/createProject.blade.php b/resources/views/projectsClients/createProject.blade.php new file mode 100644 index 00000000..42651baa --- /dev/null +++ b/resources/views/projectsClients/createProject.blade.php @@ -0,0 +1,408 @@ +@extends('Templates/templateAdmin') + +@section('Main-content') + + + @if (session('success')) + + @endif + +
    +
    + +
      +
    • Project details
      • +
    • Articulated
      • +
    • Workstation
      • +
    +
    +
    + +
    +
    +
    +

    Detalhes da Obra

    +
    + +
    + +
    + @csrf + +
    +
    + + +
    +
    + + +
    +
    +
    +
    + + +
    +
    + + +
    +
    +
    + +
    + + +
    + + + +
    + +
    + +
    + + +
    + +
    + + +
    +
    + + +
    + + +
    + + +
    +
    + + +
    + + +
    + +
    +
    + + + +
    + +
    + +
    + +
    + + +
    +
    + +
    +
    +
    + + +
    + {{-- /.card-body --}} +
    + {{-- /.card card-primary --}} +
    + + + + + {{--
    +
    +
    +

    Articulated

    +
    + +
    + + + +
    +
    +

    Tasks

    +
    + +
    +
    +
    +
    + + +
    + +
    + +

    + + +
    +
    + +
    +
    +
    + + +
    + +
    + + + +
    + +
    + + + + +
    --}} + +
    + + + + + + + + {{-- --}} + + {{-- Script Articlado --}} + + + +@endsection diff --git a/routes/web.php b/routes/web.php index 859ccd57..c7e41874 100644 --- a/routes/web.php +++ b/routes/web.php @@ -23,14 +23,45 @@ use App\Http\Controllers\CustomRegistrationController; +use App\Http\Controllers\CreateProjectController; -Route::get('/download-template', function () { - $filePath = public_path('templateExcel/FinalTemplate .xlsx'); - $fileName = 'FinalTemplate .xlsx'; + + + +Route::get('/template', function () { + $filePath = public_path('templateExcel/FinalTemplate1.xlsx'); + $fileName = 'Valves_Template.xlsx'; return response()->download($filePath, $fileName); -}); +})->name('download'); + +/* +|-------------------------------------------------------------------------- +| Create Project +|-------------------------------------------------------------------------- +| +| Here is where you can register web routes for your application. These +| routes are loaded by the RouteServiceProvider and all of them will +| be assigned to the "web" middleware group. Make something great! +| +*/ +route::get('createProject', [CreateProjectController::class,'listCompanies'])->name('createProject'); + + route::post('createProject1',[CreateProjectController::class,'createProject'])->name('createProject1'); + +// route::get('testExcel', function(){ +// return view('testExcel'); +// }); + + + Route::post('/create-equipament-project', [CreateProjectController::class,'createEquipamentProject'])->name('createEquipamentProject'); + + + /* Api */ + Route::get('/api/installations/', [CreateProjectController::class, 'getByUserNif']); + + @@ -46,6 +77,11 @@ })->name('verification.notice'); +Route::get('/testExcel', function(){ + return view('createProject'); +})->name('testExcel'); + + /* |-------------------------------------------------------------------------- | Web Routes @@ -104,6 +140,7 @@ Route::get('users/{id}/edit', [userController::class, 'edit'])->name('users.edit'); Route::put('users/{user}', [userController::class, 'update'])->name('users.update'); Route::delete('users/{user}', [UserController::class, 'destroy'])->name('users.destroy'); + /*