Initial implementation using api.php and update Manage assets

This commit is contained in:
ygbanzato 2023-08-07 15:04:14 +01:00
parent 7ddb163db2
commit 9adffbe511
7 changed files with 455 additions and 748 deletions

View File

@ -11,16 +11,25 @@
use App\Models\Equipment; use App\Models\Equipment;
use App\Models\Plant; use App\Models\Plant;
use App\Models\CompanyProject; use App\Models\CompanyProject;
use App\Models\User;
use App\Models\ConstructionWorkstation; use App\Models\ConstructionWorkstation;
use App\Models\EquipmentType;
use Mockery\Undefined;
class ProjectoDatacontroller extends Controller class ProjectoDatacontroller extends Controller
{ {
public function receivePlants($clientId){
if($clientId == 'all'){
$allPlants = Plant::all();
return response()->json($allPlants);
}
dd($clientId);
}
public function getEquipmentDetails($receiveListEquipmentId) public function getEquipmentDetails($receiveListEquipmentId)
{ {
$ids = explode(',', $receiveListEquipmentId); $ids = explode(',', $receiveListEquipmentId);
@ -88,8 +97,10 @@ public function ManageAssets()
// ->select('equipaments.*', 'factories.factories_name', 'equipament_types.equipment_type_name') // ->select('equipaments.*', 'factories.factories_name', 'equipament_types.equipment_type_name')
// ->get(); // ->get();
// return view('Admin/DataManagement/manageassets', compact('units','equipaments')); $allEquipmentType = EquipmentType::all();
return view('Admin/DataManagement/manageassets', compact('units', 'equipments')); $allClients = User::where('type_users', 3)->get();
return view('Admin/DataManagement/manageassets', compact('units', 'equipments','allEquipmentType','allClients'));
} }
public function showUnit($id) public function showUnit($id)
@ -101,6 +112,8 @@ public function showUnit($id)
public function receiveEquipmentsProject($receiveNumberProject) public function receiveEquipmentsProject($receiveNumberProject)
{ {
// Recebe os dados vindos da funcao 'data' criada na view // Recebe os dados vindos da funcao 'data' criada na view
@ -130,7 +143,6 @@ public function receiveEquipmentsProject($receiveNumberProject)
->where('company_projects_id', $receiveNumberProject); ->where('company_projects_id', $receiveNumberProject);
} }
} }
return DataTables::of($model) return DataTables::of($model)
->addColumn('equipment_type', function ($row) { ->addColumn('equipment_type', function ($row) {
return $row->equipmentType->equipment_type_name; return $row->equipmentType->equipment_type_name;
@ -157,6 +169,22 @@ public function receiveEquipmentsProject($receiveNumberProject)
->toJson(); ->toJson();
} }
public function receiveAllEquipments()
{
$model = Equipment::all();
// ->with(['equipmentType', 'unit']);
return DataTables::of($model)
// ->addColumn('equipment_type', function ($row) {
// return $row->equipmentType->equipment_type_name;
// })
// ->addColumn('Unit', function ($row) {
// return $row->unit->unit_name;
// })
->toJson();
}
public function receiveWorkstationProject($receiveNumberProject) public function receiveWorkstationProject($receiveNumberProject)
{ {
$model = ConstructionWorkstation::where('company_projects_id', $receiveNumberProject)->with('workstationsAssociationTasks'); $model = ConstructionWorkstation::where('company_projects_id', $receiveNumberProject)->with('workstationsAssociationTasks');

View File

@ -2655,6 +2655,14 @@ .show > .btn-secondary.dropdown-toggle:focus {
box-shadow: 0 0 0 0 rgba(130, 138, 145, 0.5); box-shadow: 0 0 0 0 rgba(130, 138, 145, 0.5);
} }
.btn-test{
color: #fff;
background-color: purple;
border-color: purple;
box-shadow: none;
}
.btn-success { .btn-success {
color: #fff; color: #fff;
background-color: #28a745; background-color: #28a745;

File diff suppressed because it is too large Load Diff

View File

@ -91,7 +91,7 @@
</div> </div>
<div class="form-group col-sm-6"> <div class="form-group col-sm-6">
<label>Nova Localização</label> <label>Morada Instalação</label>
<input type="text" class="form-control" name="new_company_address" <input type="text" class="form-control" name="new_company_address"
placeholder="Localização..."> placeholder="Localização...">
</div> </div>
@ -99,7 +99,7 @@
<div class="form-group" id="localization_installation_client"> <div class="form-group" id="localization_installation_client">
<label>Localização</label> <label>Morada Instalação</label>
<input type="text" class="form-control" placeholder="Localização" readonly> <input type="text" class="form-control" placeholder="Localização" readonly>
</div> </div>

View File

@ -95,7 +95,7 @@ class="btn btn-block bg-gradient-primary btn-lg">Articulado</a>
<div class="float-right"> <div class="float-right">
{{-- <a href="#" type="button" class="btn btn-primary">Editar</a> --}} {{-- <a href="#" type="button" class="btn btn-primary">Editar</a> --}}
<button type="button" class="btn btn-primary" data-toggle="modal" <button type="button" class="btn btn-test" data-toggle="modal"
data-target="#ModalTransferForArticulated"> data-target="#ModalTransferForArticulated">
Editar Editar
</button> </button>
@ -274,7 +274,8 @@ class="form-control">
<div class="card-body"> <div class="card-body">
<div class="table-responsive"> <div class="table-responsive">
<table id="TablePreparedProjectWorkstation" class="table table-bordered table-striped"> <table id="TablePreparedProjectWorkstation"
class="table table-bordered table-striped">
<thead> <thead>
<tr> <tr>
<th>Postos de Trabalho</th> <th>Postos de Trabalho</th>
@ -556,7 +557,7 @@ class="checkboxChoseTasksOficesCV"
}); });
</script> </script>
<script type="Text/javascript"> <script type="Text/javascript">
$(document).ready(function() { $(document).ready(function() {
$('#TablePreparedProjectWorkstation').DataTable({ $('#TablePreparedProjectWorkstation').DataTable({
autoWidth: false, autoWidth: false,
@ -706,7 +707,6 @@ class="checkboxChoseTasksOficesCV"
}); });
}); });
</script> </script>
@endsection @endsection
{{-- // ajax: { {{-- // ajax: {

View File

@ -1,5 +1,6 @@
<?php <?php
use App\Http\Controllers\ProjectoDatacontroller;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Support\Facades\Route; use Illuminate\Support\Facades\Route;
@ -17,3 +18,5 @@
Route::middleware('auth:sanctum')->get('/user', function (Request $request) { Route::middleware('auth:sanctum')->get('/user', function (Request $request) {
return $request->user(); return $request->user();
}); });
Route::get('receivePlants/{clientId}',[ProjectoDatacontroller::class,'receivePlants']);

View File

@ -41,6 +41,7 @@
Route::get('/ReceiveEquipmentIdForShowModal/{EquipmentID}',[ExecutionProjectController::class,'receiveEquipmentIdForShowModal'])->name('ReceiveEquipmentIdForShowModal '); Route::get('/ReceiveEquipmentIdForShowModal/{EquipmentID}',[ExecutionProjectController::class,'receiveEquipmentIdForShowModal'])->name('ReceiveEquipmentIdForShowModal ');
// Route::get('/api/receiveEquipmentsExecutionProject/{receiveNumberProject}',[ExecutionProjectController::class,'receiveEquipmentsExecutionProject'])->name('receiveEquipmentsExecutionProject'); // Route::get('/api/receiveEquipmentsExecutionProject/{receiveNumberProject}',[ExecutionProjectController::class,'receiveEquipmentsExecutionProject'])->name('receiveEquipmentsExecutionProject');
Route::get('/api/receiveAllEquipments',[ProjectoDatacontroller::class,'receiveAllEquipments']);
Route::get('/api/receiveEquipmentsProject/{receiveNumberProject}',[ProjectoDatacontroller::class,'receiveEquipmentsProject']); Route::get('/api/receiveEquipmentsProject/{receiveNumberProject}',[ProjectoDatacontroller::class,'receiveEquipmentsProject']);
Route::get('/api/receiveWorkstationProject/{receiveNumberProject}',[ProjectoDatacontroller::class,'receiveWorkstationProject' ]); Route::get('/api/receiveWorkstationProject/{receiveNumberProject}',[ProjectoDatacontroller::class,'receiveWorkstationProject' ]);