Initial implementation using api.php and update Manage assets
This commit is contained in:
ygbanzato
parent
7ddb163db2
commit
9adffbe511
|
|
@ -11,16 +11,25 @@
|
|||
use App\Models\Equipment;
|
||||
use App\Models\Plant;
|
||||
use App\Models\CompanyProject;
|
||||
|
||||
|
||||
|
||||
|
||||
use App\Models\User;
|
||||
|
||||
|
||||
use App\Models\ConstructionWorkstation;
|
||||
use App\Models\EquipmentType;
|
||||
use Mockery\Undefined;
|
||||
|
||||
class ProjectoDatacontroller extends Controller
|
||||
{
|
||||
public function receivePlants($clientId){
|
||||
if($clientId == 'all'){
|
||||
$allPlants = Plant::all();
|
||||
return response()->json($allPlants);
|
||||
}
|
||||
dd($clientId);
|
||||
|
||||
}
|
||||
|
||||
|
||||
public function getEquipmentDetails($receiveListEquipmentId)
|
||||
{
|
||||
$ids = explode(',', $receiveListEquipmentId);
|
||||
|
|
@ -88,8 +97,10 @@ public function ManageAssets()
|
|||
// ->select('equipaments.*', 'factories.factories_name', 'equipament_types.equipment_type_name')
|
||||
// ->get();
|
||||
|
||||
// return view('Admin/DataManagement/manageassets', compact('units','equipaments'));
|
||||
return view('Admin/DataManagement/manageassets', compact('units', 'equipments'));
|
||||
$allEquipmentType = EquipmentType::all();
|
||||
$allClients = User::where('type_users', 3)->get();
|
||||
|
||||
return view('Admin/DataManagement/manageassets', compact('units', 'equipments','allEquipmentType','allClients'));
|
||||
}
|
||||
|
||||
public function showUnit($id)
|
||||
|
|
@ -101,6 +112,8 @@ public function showUnit($id)
|
|||
|
||||
|
||||
|
||||
|
||||
|
||||
public function receiveEquipmentsProject($receiveNumberProject)
|
||||
{
|
||||
// Recebe os dados vindos da funcao 'data' criada na view
|
||||
|
|
@ -130,7 +143,6 @@ public function receiveEquipmentsProject($receiveNumberProject)
|
|||
->where('company_projects_id', $receiveNumberProject);
|
||||
}
|
||||
}
|
||||
|
||||
return DataTables::of($model)
|
||||
->addColumn('equipment_type', function ($row) {
|
||||
return $row->equipmentType->equipment_type_name;
|
||||
|
|
@ -157,6 +169,22 @@ public function receiveEquipmentsProject($receiveNumberProject)
|
|||
->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)
|
||||
{
|
||||
$model = ConstructionWorkstation::where('company_projects_id', $receiveNumberProject)->with('workstationsAssociationTasks');
|
||||
|
|
|
|||
8
public/assets/dist/css/adminlte.css
vendored
8
public/assets/dist/css/adminlte.css
vendored
|
|
@ -2655,6 +2655,14 @@ .show > .btn-secondary.dropdown-toggle:focus {
|
|||
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 {
|
||||
color: #fff;
|
||||
background-color: #28a745;
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -91,7 +91,7 @@
|
|||
</div>
|
||||
|
||||
<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"
|
||||
placeholder="Localização...">
|
||||
</div>
|
||||
|
|
@ -99,7 +99,7 @@
|
|||
|
||||
|
||||
<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>
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -95,7 +95,7 @@ class="btn btn-block bg-gradient-primary btn-lg">Articulado</a>
|
|||
<div class="float-right">
|
||||
|
||||
{{-- <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">
|
||||
Editar
|
||||
</button>
|
||||
|
|
@ -114,8 +114,8 @@ class="btn btn-block bg-gradient-primary btn-lg">Articulado</a>
|
|||
<h3 class="card-title">Articulado</h3>
|
||||
<div class="card-tools">
|
||||
<!-- <button type="button" class="btn btn-tool" data-card-widget="collapse"><i
|
||||
class="fas fa-plus"></i>
|
||||
</button> -->
|
||||
class="fas fa-plus"></i>
|
||||
</button> -->
|
||||
</div>
|
||||
<!-- /.card-tools -->
|
||||
</div>
|
||||
|
|
@ -227,8 +227,8 @@ class="form-control">
|
|||
|
||||
<div class="card-tools">
|
||||
<!-- <button type="button" class="btn btn-tool" data-card-widget="collapse">
|
||||
<i class="fas fa-plus"></i>
|
||||
</button> -->
|
||||
<i class="fas fa-plus"></i>
|
||||
</button> -->
|
||||
</div>
|
||||
<!-- /.card-tools -->
|
||||
</div>
|
||||
|
|
@ -274,7 +274,8 @@ class="form-control">
|
|||
<div class="card-body">
|
||||
<div class="table-responsive">
|
||||
|
||||
<table id="TablePreparedProjectWorkstation" class="table table-bordered table-striped">
|
||||
<table id="TablePreparedProjectWorkstation"
|
||||
class="table table-bordered table-striped">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Postos de Trabalho</th>
|
||||
|
|
@ -475,7 +476,7 @@ class="checkboxChoseTasksOficesCV"
|
|||
</div>
|
||||
</div>
|
||||
<!-- /.modal-content --
|
||||
/.modal-dialog -->
|
||||
/.modal-dialog -->
|
||||
</div>
|
||||
<!-- /.modal remover-->
|
||||
|
||||
|
|
@ -535,10 +536,10 @@ class="checkboxChoseTasksOficesCV"
|
|||
$('#AmbitsEquipments_list').empty(); // Limpar o select de ambits
|
||||
$('#AmbitsEquipments_list').append(
|
||||
'<option value="#" selected>Mostrar Todos</option>'
|
||||
); // Opção para mostrar todos
|
||||
); // Opção para mostrar todos
|
||||
$('#AmbitsEquipments_list').append(
|
||||
'<option value="" hidden>Selecionar Tipo de Âmbito...</option>'
|
||||
);
|
||||
);
|
||||
$.each(data, function(key, value) {
|
||||
$('#AmbitsEquipments_list').append('<option value="' +
|
||||
value.ambits_id + '">' + value
|
||||
|
|
@ -556,32 +557,32 @@ class="checkboxChoseTasksOficesCV"
|
|||
});
|
||||
</script>
|
||||
|
||||
<script type="Text/javascript">
|
||||
$(document).ready(function() {
|
||||
$('#TablePreparedProjectWorkstation').DataTable({
|
||||
autoWidth: false,
|
||||
processing: true,
|
||||
serverSide: true,
|
||||
ajax: {
|
||||
url: '/api/receiveWorkstationProject/' + $('#receiveNumberProject').val()
|
||||
},
|
||||
columns: [{
|
||||
data: 'name_workstations',
|
||||
name: 'name_workstations'
|
||||
},
|
||||
{
|
||||
data: 'nomenclature_workstation',
|
||||
name: 'nomenclature_workstation'
|
||||
},
|
||||
{
|
||||
data: 'workstations_Association_Tasks',
|
||||
name: 'workstations_Association_Tasks'
|
||||
}
|
||||
<script type="Text/javascript">
|
||||
$(document).ready(function() {
|
||||
$('#TablePreparedProjectWorkstation').DataTable({
|
||||
autoWidth: false,
|
||||
processing: true,
|
||||
serverSide: true,
|
||||
ajax: {
|
||||
url: '/api/receiveWorkstationProject/' + $('#receiveNumberProject').val()
|
||||
},
|
||||
columns: [{
|
||||
data: 'name_workstations',
|
||||
name: 'name_workstations'
|
||||
},
|
||||
{
|
||||
data: 'nomenclature_workstation',
|
||||
name: 'nomenclature_workstation'
|
||||
},
|
||||
{
|
||||
data: 'workstations_Association_Tasks',
|
||||
name: 'workstations_Association_Tasks'
|
||||
}
|
||||
|
||||
]
|
||||
})
|
||||
})
|
||||
</script>
|
||||
]
|
||||
})
|
||||
})
|
||||
</script>
|
||||
|
||||
<script>
|
||||
$(document).ready(function() {
|
||||
|
|
@ -706,7 +707,6 @@ class="checkboxChoseTasksOficesCV"
|
|||
});
|
||||
});
|
||||
</script>
|
||||
|
||||
@endsection
|
||||
|
||||
{{-- // ajax: {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
<?php
|
||||
|
||||
use App\Http\Controllers\ProjectoDatacontroller;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Route;
|
||||
|
||||
|
|
@ -17,3 +18,5 @@
|
|||
Route::middleware('auth:sanctum')->get('/user', function (Request $request) {
|
||||
return $request->user();
|
||||
});
|
||||
|
||||
Route::get('receivePlants/{clientId}',[ProjectoDatacontroller::class,'receivePlants']);
|
||||
|
|
@ -41,6 +41,7 @@
|
|||
Route::get('/ReceiveEquipmentIdForShowModal/{EquipmentID}',[ExecutionProjectController::class,'receiveEquipmentIdForShowModal'])->name('ReceiveEquipmentIdForShowModal ');
|
||||
|
||||
// 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/receiveWorkstationProject/{receiveNumberProject}',[ProjectoDatacontroller::class,'receiveWorkstationProject' ]);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user