Cambios en consultas de Contrato

sistema-mantenimiento-back/app/Http/Controllers/EmployeeController.php

@@ -1359,7 +1359,7 @@ class EmployeeController extends Controller
                 ->where('S002V01TPERS.PERS_NULI', '=', $line_number)
                 ->where('S002V01TPECO.PECO_NULI', '=', $line_number)
                 ->where('S002V01TCONT.CONT_NULI', '=', $line_number)
-                ->select('S002V01TCONT.CONT_FEIN as START_DATE', 'S002V01TCONT.CONT_FEFI as END_DATE', 'S002V01TCONT.CONT_COST as CONTRACT_COST')
+                ->select('S002V01TCONT.CONT_FEIN as START_DATE', 'S002V01TCONT.CONT_FEFI as END_DATE', 'S002V01TCONT.CONT_COST as CONTRACT_COST', 'S002V01TCONT.CONT_NOMB as CONTRACT_NAME')
                 ->join('S002V01TPECO', 'S002V01TPERS.PERS_IDPE', '=', 'S002V01TPECO.PECO_IDPE')
                 ->join('S002V01TCONT', 'S002V01TPECO.PECO_IDCO', '=', 'S002V01TCONT.CONT_IDCO')
                 ->get();

sistema-mantenimiento-back/app/Http/Controllers/InterventionController.php

@@ -210,6 +210,7 @@ class InterventionController extends Controller
             $contracts = DB::table('S002V01TCONT')
                 ->select(
                     'CONT_IDCO as CONTRACT_ID',
+                    'CONT_NOMB as CONTRACT_NAME',
                     'CONT_TIPO as CONTRACT_TYPE',
                     'CONT_FEIN as START_DATE',
                     'CONT_FEFI as END_DATE',
@@ -245,9 +246,12 @@ class InterventionController extends Controller
                 ->join('S002V01TPECO', 'S002V01TPERS.PERS_IDPE', '=', 'S002V01TPECO.PECO_IDPE')
                 ->get();
 
+            $todays_date = Carbon::now();
             // Itera los contratos para agregar a los dueños de los mismos y su duración
             foreach ($contracts as $contract) {
                 $contract->DENOMINATION = [];
+                // Verifica el estado del contrato, si ya paso su fecha de fin
+                $contract->STATUS = $todays_date->greaterThan(Carbon::create($contract->END_DATE)) ? "Expirado" : "Activo";
                 $contract->START_DATE = Carbon::create($contract->START_DATE)->format("d-m-Y");
                 $contract->END_DATE = Carbon::create($contract->END_DATE)->format("d-m-Y");
                 $contract->CONTRACT_COST = $this->encrypt_controller->encrypt($contract->CONTRACT_COST);
@@ -298,6 +302,7 @@ class InterventionController extends Controller
             $contract = DB::table('S002V01TCONT')
                 ->select(
                     'CONT_IDCO as CONTRACT_ID',
+                    'CONT_NOMB as CONTRACT_NAME',
                     'CONT_TIPO as CONTRACT_TYPE',
                     'CONT_FEIN as START_DATE',
                     'CONT_FEFI as END_DATE',
@@ -347,6 +352,7 @@ class InterventionController extends Controller
             $request['CONTRACT_COST'] = $this->encrypt_controller->decrypt($request->CONTRACT_COST);
 
             $validator = Validator::make($request->all(), [
+                "CONTRACT_NAME" => ['required'],
                 "CONTRACT_TYPE" => ['required'],
                 "DENOMINATION" => ['required', 'size:10'],
                 "START_DATE" => ['required', 'date'],
@@ -457,6 +463,7 @@ class InterventionController extends Controller
 
             $insert_contract = DB::table('S002V01TCONT')
                 ->insert([
+                    "CONT_NOMB" => $request->CONTRACT_NAME,
                     "CONT_TIPO" => $request->CONTRACT_TYPE,
                     "CONT_FEIN" => Carbon::create($request->START_DATE)->format('Y-m-d H:i:s'),
                     "CONT_FEFI" => Carbon::create($request->END_DATE)->format('Y-m-d H:i:s'),
@@ -477,6 +484,7 @@ class InterventionController extends Controller
             // Busca el id del contrato insertado
             $contract_id = DB::table('S002V01TCONT')
                 ->select("CONT_IDCO as CONTRACT_ID")
+                ->where("CONT_NAME", '=', $request->CONTRACT_NAME)
                 ->where("CONT_TIPO", '=', $request->CONTRACT_TYPE)
                 ->where("CONT_FERE", '=', $REGISTER_DATE)
                 ->where("CONT_COST", '=', $request->CONTRACT_COST)
@@ -526,6 +534,7 @@ class InterventionController extends Controller
             $contracts = DB::table('S002V01TCONT')
                 ->select(
                     'CONT_IDCO as CONTRACT_ID',
+                    'CONT_NOMB as CONTRACT_NANE',
                     'CONT_TIPO as CONTRACT_TYPE',
                     'CONT_FEIN as START_DATE',
                     'CONT_FEFI as END_DATE',

sistema-mantenimiento-back/app/Http/Controllers/SubcontractController.php

@@ -758,7 +758,7 @@ class SubcontractController extends Controller
 
             // Obtiene los contratos pertenecientes al subcontratista deseado
             $contracts = DB::table('S002V01TPERS')
-                ->groupBy('S002V01TPERS.PERS_IDPS', 'S002V01TCONT.CONT_IDCO', 'S002V01TCONT.CONT_FEIN', 'S002V01TCONT.CONT_FEFI', 'S002V01TPERS.PERS_NULI', 'S002V01TCONT.CONT_COST')
+                ->groupBy('S002V01TPERS.PERS_IDPS', 'S002V01TCONT.CONT_IDCO', 'S002V01TCONT.CONT_FEIN', 'S002V01TCONT.CONT_FEFI', 'S002V01TPERS.PERS_NULI', 'S002V01TCONT.CONT_COST', 'S002V01TCONT.CONT_NOMB')
                 ->orderBy("S002V01TCONT.CONT_FEIN", 'desc')
                 ->where('S002V01TPERS.PERS_IDPS', '=', $id_subcontratist)
                 ->where('S002V01TPERS.PERS_NULI', '=', $line_number)
@@ -766,6 +766,7 @@ class SubcontractController extends Controller
                 ->where('S002V01TCONT.CONT_NULI', '=', $line_number)
                 ->select(
                     'S002V01TCONT.CONT_FEIN as START_DATE',
+                    'S002V01TCONT.CONT_NOMB as CONTRACT_NAME',
                     'S002V01TCONT.CONT_FEFI as END_DATE',
                     'S002V01TCONT.CONT_IDCO as ID_CONTRACT',
                     'S002V01TCONT.CONT_COST as COST',