From 5788d392d9241942b47dda69b48660dd50828f6d Mon Sep 17 00:00:00 2001 From: Jaime Jimenez Date: Wed, 17 May 2023 20:38:05 +0200 Subject: [PATCH] tarifas acabado/manipulado/preimpresion terminadas. Faltan envios --- ci4/app/Controllers/GoBaseController.php | 4 +- ci4/app/Controllers/Tarifas/Tarifaacabado.php | 7 ++- .../Controllers/Tarifas/Tarifamanipulado.php | 14 ++++- .../Tarifas/Tarifapreimpresion.php | 16 ++++-- .../Tarifas/TarifamanipuladoEntity.php | 2 + .../Tarifas/TarifapreimpresionEntity.php | 2 + ci4/app/Models/Tarifas/TarifaacabadoModel.php | 2 +- .../Models/Tarifas/TarifamanipuladoModel.php | 23 ++------ .../Tarifas/TarifapreimpresionModel.php | 28 ++++------ .../acabado/_tarifaacabadoFormItems.php | 14 ++--- .../tarifas/acabado/viewTarifaacabadoList.php | 16 ++++-- .../manipulado/_tarifamanipuladoFormItems.php | 18 +++---- .../manipulado/viewTarifamanipuladoList.php | 14 +++-- .../_tarifapreimpresionFormItems.php | 4 +- .../viewTarifapreimpresionList.php | 8 +++ from mac to app.txt | 53 +++++++++++++++++++ 16 files changed, 154 insertions(+), 71 deletions(-) create mode 100644 from mac to app.txt diff --git a/ci4/app/Controllers/GoBaseController.php b/ci4/app/Controllers/GoBaseController.php index f18ee4e2..61dc5e64 100644 --- a/ci4/app/Controllers/GoBaseController.php +++ b/ci4/app/Controllers/GoBaseController.php @@ -228,7 +228,7 @@ abstract class GoBaseController extends Controller { if (isset($this->primaryModel) && isset(static::$singularObjectNameCc) && !empty(static::$singularObjectNameCc) && !isset($this->viewData[(static::$singularObjectNameCc) . 'List'])) { //JJO if ($this->soft_delete): - $this->viewData[(static::$singularObjectNameCc) . 'List'] = $this->primaryModel->asObject()->where('is_deletedadad', 0)->findAll(); + $this->viewData[(static::$singularObjectNameCc) . 'List'] = $this->primaryModel->asObject()->where('is_deleted', 0)->findAll(); else: $this->viewData[(static::$singularObjectNameCc) . 'List'] = $this->primaryModel->asObject()->findAll(); endif; @@ -347,7 +347,7 @@ abstract class GoBaseController extends Controller { if (!isset($error)) : try { if ($deletePermanently && !$this->soft_delete) : - if (is_numeric($id)) : + if (is_numeric($id)) : $rawResult = $this->primaryModel->delete($id); else: $rawResult = $this->primaryModel->where($this->primaryModel->getPrimaryKeyName(), $id)->delete(); diff --git a/ci4/app/Controllers/Tarifas/Tarifaacabado.php b/ci4/app/Controllers/Tarifas/Tarifaacabado.php index 03100719..52713db3 100644 --- a/ci4/app/Controllers/Tarifas/Tarifaacabado.php +++ b/ci4/app/Controllers/Tarifas/Tarifaacabado.php @@ -105,6 +105,7 @@ class Tarifaacabado extends \App\Controllers\GoBaseController { public function edit($requestedId = null) { + // JJO $session = session(); if ($requestedId == null) : @@ -127,7 +128,11 @@ class Tarifaacabado extends \App\Controllers\GoBaseController { $postData = $this->request->getPost(); $sanitizedData = $this->sanitized($postData, $nullIfEmpty); - $sanitizedData['user_update_id'] = $session->id_user; + // JJO + if(isset($this->model->user_update_id)){ + $sanitizedData['user_update_id'] = $session->id_user; + } + $noException = true; if ($successfulResult = $this->canValidate()) : // if ($successfulResult = $this->validate($this->formValidationRules) ) : diff --git a/ci4/app/Controllers/Tarifas/Tarifamanipulado.php b/ci4/app/Controllers/Tarifas/Tarifamanipulado.php index 4f29e7a8..7b28b845 100644 --- a/ci4/app/Controllers/Tarifas/Tarifamanipulado.php +++ b/ci4/app/Controllers/Tarifas/Tarifamanipulado.php @@ -22,6 +22,10 @@ class Tarifamanipulado extends \App\Controllers\GoBaseController { public function initController(\CodeIgniter\HTTP\RequestInterface $request, \CodeIgniter\HTTP\ResponseInterface $response, \Psr\Log\LoggerInterface $logger) { $this->viewData['pageTitle'] = lang('Tarifamanipulado.moduleTitle'); + // Se indica que este controlador trabaja con soft_delete + $this->soft_delete = true; + // Se indica el flag para los ficheros borrados + $this->delete_flag = 1; parent::initController($request, $response, $logger); } @@ -101,6 +105,9 @@ class Tarifamanipulado extends \App\Controllers\GoBaseController { public function edit($requestedId = null) { + // JJO + $session = session(); + if ($requestedId == null) : return $this->redirect2listView(); endif; @@ -119,9 +126,12 @@ class Tarifamanipulado extends \App\Controllers\GoBaseController { $nullIfEmpty = true; // !(phpversion() >= '8.1'); $postData = $this->request->getPost(); - $sanitizedData = $this->sanitized($postData, $nullIfEmpty); - + $sanitizedData = $this->sanitized($postData, $nullIfEmpty); + // JJO + if(isset($this->model->user_update_id)){ + $sanitizedData['user_update_id'] = $session->id_user; + } $noException = true; if ($successfulResult = $this->canValidate()) : // if ($successfulResult = $this->validate($this->formValidationRules) ) : diff --git a/ci4/app/Controllers/Tarifas/Tarifapreimpresion.php b/ci4/app/Controllers/Tarifas/Tarifapreimpresion.php index b8c2e9a2..000066c4 100644 --- a/ci4/app/Controllers/Tarifas/Tarifapreimpresion.php +++ b/ci4/app/Controllers/Tarifas/Tarifapreimpresion.php @@ -22,6 +22,10 @@ class Tarifapreimpresion extends \App\Controllers\GoBaseController { public function initController(\CodeIgniter\HTTP\RequestInterface $request, \CodeIgniter\HTTP\ResponseInterface $response, \Psr\Log\LoggerInterface $logger) { $this->viewData['pageTitle'] = lang('Preimpresions.moduleTitle'); + // Se indica que este controlador trabaja con soft_delete + $this->soft_delete = true; + // Se indica el flag para los ficheros borrados + $this->delete_flag = 1; parent::initController($request, $response, $logger); } @@ -100,7 +104,10 @@ class Tarifapreimpresion extends \App\Controllers\GoBaseController { } // end function add() public function edit($requestedId = null) { - + + // JJO + $session = session(); + if ($requestedId == null) : return $this->redirect2listView(); endif; @@ -119,9 +126,12 @@ class Tarifapreimpresion extends \App\Controllers\GoBaseController { $nullIfEmpty = true; // !(phpversion() >= '8.1'); $postData = $this->request->getPost(); - $sanitizedData = $this->sanitized($postData, $nullIfEmpty); - + $sanitizedData = $this->sanitized($postData, $nullIfEmpty); + // JJO + if(isset($this->model->user_update_id)){ + $sanitizedData['user_update_id'] = $session->id_user; + } $noException = true; if ($successfulResult = $this->canValidate()) : // if ($successfulResult = $this->validate($this->formValidationRules) ) : diff --git a/ci4/app/Entities/Tarifas/TarifamanipuladoEntity.php b/ci4/app/Entities/Tarifas/TarifamanipuladoEntity.php index c1c852dd..22c1969e 100644 --- a/ci4/app/Entities/Tarifas/TarifamanipuladoEntity.php +++ b/ci4/app/Entities/Tarifas/TarifamanipuladoEntity.php @@ -17,6 +17,8 @@ class TarifamanipuladoEntity extends \CodeIgniter\Entity\Entity "formula_price" => null, "user_created_id" => 1, "user_update_id" => 1, + "deleted_at" => null, + "is_deleted" => 0, "created_at" => null, "updated_at" => null, ]; diff --git a/ci4/app/Entities/Tarifas/TarifapreimpresionEntity.php b/ci4/app/Entities/Tarifas/TarifapreimpresionEntity.php index f1a11d29..65534647 100644 --- a/ci4/app/Entities/Tarifas/TarifapreimpresionEntity.php +++ b/ci4/app/Entities/Tarifas/TarifapreimpresionEntity.php @@ -11,6 +11,8 @@ class TarifapreimpresionEntity extends \CodeIgniter\Entity\Entity "precio" => null, "user_created_id" => 1, "user_update_id" => 1, + "deleted_at" => null, + "is_deleted" => 0, "created_at" => null, "updated_at" => null, ]; diff --git a/ci4/app/Models/Tarifas/TarifaacabadoModel.php b/ci4/app/Models/Tarifas/TarifaacabadoModel.php index 6da11e33..73a359a2 100644 --- a/ci4/app/Models/Tarifas/TarifaacabadoModel.php +++ b/ci4/app/Models/Tarifas/TarifaacabadoModel.php @@ -32,7 +32,7 @@ class TarifaacabadoModel extends \App\Models\GoBaseModel ]; protected $returnType = "App\Entities\Tarifas\TarifaacabadoEntity"; - public static $labelField = "Select a field..."; + public static $labelField = "nombre"; protected $validationRules = [ "ajuste" => [ diff --git a/ci4/app/Models/Tarifas/TarifamanipuladoModel.php b/ci4/app/Models/Tarifas/TarifamanipuladoModel.php index 4e653e79..640325ec 100644 --- a/ci4/app/Models/Tarifas/TarifamanipuladoModel.php +++ b/ci4/app/Models/Tarifas/TarifamanipuladoModel.php @@ -21,6 +21,8 @@ class TarifamanipuladoModel extends \App\Models\GoBaseModel "ajuste", "ajuste_total_pedido", "formula_price", + "deleted_at", + "is_deleted", "user_created_id", "user_update_id", ]; @@ -28,10 +30,9 @@ class TarifamanipuladoModel extends \App\Models\GoBaseModel protected $useTimestamps = true; protected $useSoftDeletes = false; - protected $createdField = "created_at"; - protected $updatedField = "updated_at"; + protected $deletedField = 'deleted_at'; public static $labelField = "nombre"; @@ -68,14 +69,6 @@ class TarifamanipuladoModel extends \App\Models\GoBaseModel "label" => "Manipuladoes.tiradaMin", "rules" => "required|integer", ], - "user_created_id" => [ - "label" => "Manipuladoes.userCreatedId", - "rules" => "required|integer", - ], - "user_update_id" => [ - "label" => "Manipuladoes.userUpdateId", - "rules" => "required|integer", - ], ]; protected $validationMessages = [ @@ -110,14 +103,6 @@ class TarifamanipuladoModel extends \App\Models\GoBaseModel "tirada_min" => [ "integer" => "Manipuladoes.validation.tirada_min.integer", "required" => "Manipuladoes.validation.tirada_min.required", - ], - "user_created_id" => [ - "integer" => "Manipuladoes.validation.user_created_id.integer", - "required" => "Manipuladoes.validation.user_created_id.required", - ], - "user_update_id" => [ - "integer" => "Manipuladoes.validation.user_update_id.integer", - "required" => "Manipuladoes.validation.user_update_id.required", - ], + ] ]; } diff --git a/ci4/app/Models/Tarifas/TarifapreimpresionModel.php b/ci4/app/Models/Tarifas/TarifapreimpresionModel.php index 8d1e319f..4d99f487 100644 --- a/ci4/app/Models/Tarifas/TarifapreimpresionModel.php +++ b/ci4/app/Models/Tarifas/TarifapreimpresionModel.php @@ -12,15 +12,21 @@ class TarifapreimpresionModel extends \App\Models\GoBaseModel */ protected $useAutoIncrement = true; - protected $allowedFields = ["nombre", "precio", "user_created_id", "user_update_id"]; + protected $allowedFields = [ + "nombre", + "precio", + "deleted_at", + "is_deleted", + "user_created_id", + "user_update_id"]; protected $returnType = "App\Entities\Tarifas\TarifapreimpresionEntity"; protected $useTimestamps = true; protected $useSoftDeletes = false; protected $createdField = "created_at"; - protected $updatedField = "updated_at"; + protected $deletedField = 'deleted_at'; public static $labelField = "nombre"; @@ -32,15 +38,7 @@ class TarifapreimpresionModel extends \App\Models\GoBaseModel "precio" => [ "label" => "Tarifapreimpresion.precio", "rules" => "required|decimal", - ], - "user_created_id" => [ - "label" => "Tarifapreimpresion.userCreatedId", - "rules" => "required|integer", - ], - "user_update_id" => [ - "label" => "Tarifapreimpresion.userUpdateId", - "rules" => "required|integer", - ], + ] ]; protected $validationMessages = [ @@ -52,13 +50,5 @@ class TarifapreimpresionModel extends \App\Models\GoBaseModel "decimal" => "Tarifapreimpresion.validation.precio.decimal", "required" => "Tarifapreimpresion.validation.precio.required", ], - "user_created_id" => [ - "integer" => "Tarifapreimpresion.validation.user_created_id.integer", - "required" => "Tarifapreimpresion.validation.user_created_id.required", - ], - "user_update_id" => [ - "integer" => "Tarifapreimpresion.validation.user_update_id.integer", - "required" => "Tarifapreimpresion.validation.user_update_id.required", - ], ]; } diff --git a/ci4/app/Views/themes/backend/vuexy/form/tarifas/acabado/_tarifaacabadoFormItems.php b/ci4/app/Views/themes/backend/vuexy/form/tarifas/acabado/_tarifaacabadoFormItems.php index 758e3ab7..8fe282b7 100644 --- a/ci4/app/Views/themes/backend/vuexy/form/tarifas/acabado/_tarifaacabadoFormItems.php +++ b/ci4/app/Views/themes/backend/vuexy/form/tarifas/acabado/_tarifaacabadoFormItems.php @@ -14,13 +14,6 @@ -
- - -
-
+
+ + +
+