diff --git a/ci4/.env b/ci4/.env index bf6320e4..9ed14e17 100644 --- a/ci4/.env +++ b/ci4/.env @@ -22,8 +22,8 @@ CI_ENVIRONMENT = development # APP #-------------------------------------------------------------------- -#app.baseURL = 'https://sk-jjo.imnavajas.es' -app.baseURL = 'https://sk-imn.imnavajas.es' +app.baseURL = 'https://sk-jjo.imnavajas.es' +#app.baseURL = 'https://sk-imn.imnavajas.es' # app.baseURL = "http://safekat.test/" # app.forceGlobalSecureRequests = false @@ -41,22 +41,22 @@ app.baseURL = 'https://sk-imn.imnavajas.es' # DATABASE #-------------------------------------------------------------------- -database.default.hostname = localhost -database.default.database = sk_jjo -database.default.username = sk_jjo -database.default.password = 61tv&G1Zf^XY -database.default.DBDriver = MySQLi -database.default.DBPrefix = -database.default.dump = - # database.default.hostname = localhost -# database.default.database = sk_imn -# database.default.username = sk_imn -# database.default.password = Uyia19_87 +# database.default.database = sk_jjo +# database.default.username = sk_jjo +# database.default.password = 61tv&G1Zf^XY # database.default.DBDriver = MySQLi # database.default.DBPrefix = # database.default.dump = +database.default.hostname = localhost +database.default.database = sk_imn +database.default.username = sk_imn +database.default.password = Uyia19_87 +database.default.DBDriver = MySQLi +database.default.DBPrefix = +database.default.dump = + # database.tests.hostname = localhost # database.tests.database = ci4 # database.tests.username = root diff --git a/ci4/app/Config/Routes.php b/ci4/app/Config/Routes.php index 0f4b2cef..414260f1 100644 --- a/ci4/app/Config/Routes.php +++ b/ci4/app/Config/Routes.php @@ -266,7 +266,7 @@ $routes->group('maquinasdefecto', ['namespace' => 'App\Controllers\Configuracion $routes->post('add', 'Maquinasdefecto::add', ['as' => 'createMaquinaPorDefecto']); $routes->post('create', 'Maquinasdefecto::create', ['as' => 'ajaxCreateMaquinaPorDefecto']); $routes->put('(:num)/update', 'Maquinasdefecto::update/$1', ['as' => 'ajaxUpdateMaquinaPorDefecto']); - $routes->post('(:num)/edit', 'Maquinasdefecto::edit/$1', ['as' => 'updateMaquinaPorDefecto']); + $routes->post('edit/(:num)', 'Maquinasdefecto::edit/$1', ['as' => 'updateMaquinaPorDefecto']); $routes->post('datatable', 'Maquinasdefecto::datatable', ['as' => 'dataTableOfMaquinasPorDefecto']); $routes->post('allmenuitems', 'Maquinasdefecto::allItemsSelect', ['as' => 'select2ItemsOfMaquinasPorDefecto']); $routes->post('menuitems', 'Maquinasdefecto::menuItems', ['as' => 'menuItemsOfMaquinasPorDefecto']); diff --git a/ci4/app/Controllers/Configuracion/Maquinasdefecto.php b/ci4/app/Controllers/Configuracion/Maquinasdefecto.php index 7696ac6d..4ec1393e 100644 --- a/ci4/app/Controllers/Configuracion/Maquinasdefecto.php +++ b/ci4/app/Controllers/Configuracion/Maquinasdefecto.php @@ -32,6 +32,12 @@ class Maquinasdefecto extends \App\Controllers\GoBaseResourceController { public function initController(\CodeIgniter\HTTP\RequestInterface $request, \CodeIgniter\HTTP\ResponseInterface $response, \Psr\Log\LoggerInterface $logger) { $this->viewData['pageTitle'] = lang('MaquinasPorDefecto.moduleTitle'); $this->viewData['usingSweetAlert'] = true; + + // 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); } @@ -54,7 +60,8 @@ class Maquinasdefecto extends \App\Controllers\GoBaseResourceController { public function add() { - + // JJO + $session = session(); $requestMethod = $this->request->getMethod(); @@ -66,6 +73,9 @@ class Maquinasdefecto extends \App\Controllers\GoBaseResourceController { $sanitizedData = $this->sanitized($postData, $nullIfEmpty); + // JJO + $sanitizedData['user_created_id'] = $session->id_user; + $noException = true; if ($successfulResult = $this->canValidate()) : // if ($successfulResult = $this->validate($this->formValidationRules) ) : @@ -80,7 +90,7 @@ class Maquinasdefecto extends \App\Controllers\GoBaseResourceController { } else: $this->viewData['errorMessage'] = lang('Basic.global.formErr1', [mb_strtolower(lang('MaquinasPorDefecto.maquinaPorDefecto'))]); - $this->session->setFlashdata('formErrors', $this->model->errors()); + $this->session->setFlashdata('formErrors', $this->model->errors()); endif; $thenRedirect = true; // Change this to false if you want your user to stay on the form after submission @@ -90,7 +100,7 @@ class Maquinasdefecto extends \App\Controllers\GoBaseResourceController { $id = $this->model->db->insertID(); $message = lang('Basic.global.saveSuccess', [mb_strtolower(lang('MaquinasPorDefecto.maquinaPorDefecto'))]).'.'; - $message .= anchor( "maquinasdefecto/{$id}/edit" , lang('Basic.global.continueEditing').'?'); + $message .= anchor( "configuracion/maquinasdefecto/edit/{$id}" , lang('Basic.global.continueEditing').'?'); $message = ucfirst(str_replace("'", "\'", $message)); if ($thenRedirect) : @@ -121,6 +131,9 @@ class Maquinasdefecto extends \App\Controllers\GoBaseResourceController { public function edit($requestedId = null) { + // JJO + $session = session(); + if ($requestedId == null) : return $this->redirect2listView(); endif; @@ -142,7 +155,8 @@ class Maquinasdefecto extends \App\Controllers\GoBaseResourceController { $sanitizedData = $this->sanitized($postData, $nullIfEmpty); - + // JJO + $sanitizedData['user_updated_id'] = $session->id_user; $noException = true; if ($successfulResult = $this->canValidate()) : // if ($successfulResult = $this->validate($this->formValidationRules) ) : @@ -189,7 +203,7 @@ class Maquinasdefecto extends \App\Controllers\GoBaseResourceController { $this->viewData['maquinaList'] = $this->getMaquinaListItems($maquinasDefectoEntity->maquina_id ?? null); $this->viewData['tipoList'] = $this->getTipoOptions(); - $this->viewData['formAction'] = route_to('updateMaquinaPorDefecto', $id); + $this->viewData['formAction'] = route_to('updateMaquinaPorDefecto', $id); $this->viewData['boxTitle'] = lang('Basic.global.edit2').' '.lang('MaquinasPorDefecto.moduleTitle').' '.lang('Basic.global.edit3'); @@ -306,4 +320,6 @@ class Maquinasdefecto extends \App\Controllers\GoBaseResourceController { } + //sanitiezdata + //array(10) { ["tipo"]=> string(2) "bn" ["ancho_min"]=> string(3) "100" ["alto_min"]=> string(3) "180" ["tirada_min"]=> string(2) "31" ["maquina_id"]=> string(2) "80" ["ancho_max"]=> string(3) "477" ["alto_max"]=> string(3) "316" ["tirada_max"]=> string(5) "10000" ["save"]=> string(7) "Guardar" ["user_updated_id"]=> string(1) "1" } } diff --git a/ci4/app/Controllers/Configuracion/Papelesimpresion.php b/ci4/app/Controllers/Configuracion/Papelesimpresion.php index a1c693c3..716259cf 100644 --- a/ci4/app/Controllers/Configuracion/Papelesimpresion.php +++ b/ci4/app/Controllers/Configuracion/Papelesimpresion.php @@ -184,10 +184,9 @@ class Papelesimpresion extends \App\Controllers\GoBaseResourceController $sanitizedData = $this->sanitized($postData, $nullIfEmpty); // JJO - $sanitizedData['user_update_id'] = $session->id_user; + $sanitizedData['user_updated_id'] = $session->id_user; + - - if ($this->request->getPost('defecto') == null) { $sanitizedData['defecto'] = false; } diff --git a/ci4/app/Controllers/Tarifas/Tarifaacabado.php b/ci4/app/Controllers/Tarifas/Tarifaacabado.php index 12ccaf84..abfc4770 100644 --- a/ci4/app/Controllers/Tarifas/Tarifaacabado.php +++ b/ci4/app/Controllers/Tarifas/Tarifaacabado.php @@ -83,9 +83,8 @@ class Tarifaacabado extends \App\Controllers\GoBaseResourceController $sanitizedData = $this->sanitized($postData, $nullIfEmpty); // JJO - if (isset($this->model->user_update_id)) { - $sanitizedData['user_created_id'] = $session->id_user; - } + $sanitizedData['user_created_id'] = $session->id_user; + $noException = true; if ($successfulResult = $this->canValidate()) : // if ($successfulResult = $this->validate($this->formValidationRules) ) : @@ -166,9 +165,8 @@ class Tarifaacabado extends \App\Controllers\GoBaseResourceController $sanitizedData = $this->sanitized($postData, $nullIfEmpty); // JJO - if (isset($this->model->user_update_id)) { - $sanitizedData['user_update_id'] = $session->id_user; - } + $sanitizedData['user_updated_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 1d515568..38e4fd0b 100644 --- a/ci4/app/Controllers/Tarifas/Tarifapreimpresion.php +++ b/ci4/app/Controllers/Tarifas/Tarifapreimpresion.php @@ -136,8 +136,8 @@ class Tarifapreimpresion extends \App\Controllers\GoBaseController { $sanitizedData = $this->sanitized($postData, $nullIfEmpty); // JJO - if(isset($this->model->user_update_id)){ - $sanitizedData['user_update_id'] = $session->id_user; + if(isset($this->model->user_updated_id)){ + $sanitizedData['user_updated_id'] = $session->id_user; } $noException = true; diff --git a/ci4/app/Controllers/Tarifas/Tarifasmanipulado.php b/ci4/app/Controllers/Tarifas/Tarifasmanipulado.php index 897959e4..6340b8eb 100644 --- a/ci4/app/Controllers/Tarifas/Tarifasmanipulado.php +++ b/ci4/app/Controllers/Tarifas/Tarifasmanipulado.php @@ -80,7 +80,7 @@ class Tarifasmanipulado extends \App\Controllers\GoBaseResourceController { $sanitizedData = $this->sanitized($postData, $nullIfEmpty); // JJO - if(isset($this->model->user_update_id)){ + if(isset($this->model->user_updated_id)){ $sanitizedData['user_created_id'] = $session->id_user; } @@ -162,7 +162,7 @@ class Tarifasmanipulado extends \App\Controllers\GoBaseResourceController { $sanitizedData = $this->sanitized($postData, $nullIfEmpty); // JJO - if(isset($this->model->user_update_id)){ + if(isset($this->model->user_updated_id)){ $sanitizedData['user_updated_id'] = $session->id_user; } diff --git a/ci4/app/Entities/Tarifas/TarifaManipuladoEntity.php b/ci4/app/Entities/Tarifas/TarifaManipuladoEntity.php index 0bea4ac9..b2ffe371 100644 --- a/ci4/app/Entities/Tarifas/TarifaManipuladoEntity.php +++ b/ci4/app/Entities/Tarifas/TarifaManipuladoEntity.php @@ -10,14 +10,14 @@ class TarifaManipuladoEntity extends \CodeIgniter\Entity\Entity "id" => null, "nombre" => null, "user_created_id" => 0, - "user_update_id" => 0, + "user_updated_id" => 0, "is_deleted" => 0, "created_at" => null, "updated_at" => null, ]; protected $casts = [ "user_created_id" => "int", - "user_update_id" => "int", + "user_updated_id" => "int", "is_deleted" => "int", ]; } diff --git a/ci4/app/Entities/Tarifas/TarifaacabadoEntity.php b/ci4/app/Entities/Tarifas/TarifaacabadoEntity.php index 74827121..3b0e8599 100644 --- a/ci4/app/Entities/Tarifas/TarifaacabadoEntity.php +++ b/ci4/app/Entities/Tarifas/TarifaacabadoEntity.php @@ -9,14 +9,14 @@ class TarifaacabadoEntity extends \CodeIgniter\Entity\Entity "id" => null, "nombre" => null, "user_created_id" => 0, - "user_update_id" => 0, + "user_updated_id" => 0, "is_deleted" => 0, "created_at" => null, "updated_at" => null, ]; protected $casts = [ "user_created_id" => "int", - "user_update_id" => "int", + "user_updated_id" => "int", "is_deleted" => "int", ]; } diff --git a/ci4/app/Entities/Tarifas/TarifapreimpresionEntity.php b/ci4/app/Entities/Tarifas/TarifapreimpresionEntity.php index 65534647..4ff65c2f 100644 --- a/ci4/app/Entities/Tarifas/TarifapreimpresionEntity.php +++ b/ci4/app/Entities/Tarifas/TarifapreimpresionEntity.php @@ -10,7 +10,7 @@ class TarifapreimpresionEntity extends \CodeIgniter\Entity\Entity "nombre" => null, "precio" => null, "user_created_id" => 1, - "user_update_id" => 1, + "user_updated_id" => 1, "deleted_at" => null, "is_deleted" => 0, "created_at" => null, @@ -19,6 +19,6 @@ class TarifapreimpresionEntity extends \CodeIgniter\Entity\Entity protected $casts = [ "precio" => "float", "user_created_id" => "int", - "user_update_id" => "int", + "user_updated_id" => "int", ]; } diff --git a/ci4/app/Language/en/MaquinasPorDefecto.php b/ci4/app/Language/en/MaquinasPorDefecto.php index 18f3a6a5..06823f2c 100644 --- a/ci4/app/Language/en/MaquinasPorDefecto.php +++ b/ci4/app/Language/en/MaquinasPorDefecto.php @@ -18,7 +18,7 @@ return [ 'maquinaId' => 'Machine', 'maquinaPorDefecto' => 'Default Machine', 'maquinaPorDefectoList' => 'Default Machine List', - 'maquinadefecto' => 'Default Machines', + 'maquinadefecto' => 'Default Machine', 'maquinasPorDefecto' => 'Default Machines', 'maquinasdefecto' => 'Default Machines', 'moduleTitle' => 'Default Machines', diff --git a/ci4/app/Language/en/Tarifaacabado.php b/ci4/app/Language/en/Tarifaacabado.php index 3cd59a9a..08940774 100644 --- a/ci4/app/Language/en/Tarifaacabado.php +++ b/ci4/app/Language/en/Tarifaacabado.php @@ -69,7 +69,7 @@ return [ ], - 'user_update_id' => [ + 'user_updated_id' => [ 'integer' => 'The {field} field must contain an integer.', 'required' => 'The {field} field is required.', diff --git a/ci4/app/Language/en/Tarifamanipulado.php b/ci4/app/Language/en/Tarifamanipulado.php index c604ac4b..7b260795 100644 --- a/ci4/app/Language/en/Tarifamanipulado.php +++ b/ci4/app/Language/en/Tarifamanipulado.php @@ -76,7 +76,7 @@ return [ ], - 'user_update_id' => [ + 'user_updated_id' => [ 'integer' => 'The {field} field must contain an integer.', 'required' => 'The {field} field is required.', diff --git a/ci4/app/Language/en/Tarifapreimpresion.php b/ci4/app/Language/en/Tarifapreimpresion.php index b3887dac..3dd6ecb3 100644 --- a/ci4/app/Language/en/Tarifapreimpresion.php +++ b/ci4/app/Language/en/Tarifapreimpresion.php @@ -34,7 +34,7 @@ return [ ], - 'user_update_id' => [ + 'user_updated_id' => [ 'integer' => 'The {field} field must contain an integer.', 'required' => 'The {field} field is required.', diff --git a/ci4/app/Language/es/Tarifaacabado.php b/ci4/app/Language/es/Tarifaacabado.php index 35bb5601..7259743a 100644 --- a/ci4/app/Language/es/Tarifaacabado.php +++ b/ci4/app/Language/es/Tarifaacabado.php @@ -91,7 +91,7 @@ return [ ], 'validation' => [ - 'user_update_id' => [ + 'user_updated_id' => [ 'integer' => 'El campo {field} debe contener un número entero.', 'required' => 'El campo {field} es obligatorio.', diff --git a/ci4/app/Language/es/Tarifamanipulado.php b/ci4/app/Language/es/Tarifamanipulado.php index f383deb9..e82f7dcd 100644 --- a/ci4/app/Language/es/Tarifamanipulado.php +++ b/ci4/app/Language/es/Tarifamanipulado.php @@ -76,7 +76,7 @@ return [ ], - 'user_update_id' => [ + 'user_updated_id' => [ 'integer' => 'El campo {field} debe contener un número entero.', 'required' => 'El campo {field} es obligatorio.', diff --git a/ci4/app/Language/es/Tarifapreimpresion.php b/ci4/app/Language/es/Tarifapreimpresion.php index d418d88f..0dc23d06 100644 --- a/ci4/app/Language/es/Tarifapreimpresion.php +++ b/ci4/app/Language/es/Tarifapreimpresion.php @@ -34,7 +34,7 @@ return [ ], - 'user_update_id' => [ + 'user_updated_id' => [ 'integer' => 'El campo {field} debe contener un número entero.', 'required' => 'El campo {field} es obligatorio.', diff --git a/ci4/app/Models/Configuracion/MaquinasDefectoModel.php b/ci4/app/Models/Configuracion/MaquinasDefectoModel.php index 7f59f9ab..5fe5012d 100644 --- a/ci4/app/Models/Configuracion/MaquinasDefectoModel.php +++ b/ci4/app/Models/Configuracion/MaquinasDefectoModel.php @@ -32,8 +32,10 @@ class MaquinasDefectoModel extends \App\Models\GoBaseModel "tirada_min", "tirada_max", "maquina_id", - - + "deleted_at", + "is_deleted", + "user_created_id", + "user_updated_id" ]; protected $returnType = "App\Entities\Configuracion\MaquinasDefectoEntity"; @@ -48,63 +50,63 @@ class MaquinasDefectoModel extends \App\Models\GoBaseModel protected $validationRules = [ "alto_max" => [ - "label" => "MaquinaPorDefectoes.altoMax", + "label" => "MaquinasPorDefecto.altoMax", "rules" => "required|decimal", ], "alto_min" => [ - "label" => "MaquinaPorDefectoes.altoMin", + "label" => "MaquinasPorDefecto.altoMin", "rules" => "required|decimal", ], "ancho_max" => [ - "label" => "MaquinaPorDefectoes.anchoMax", + "label" => "MaquinasPorDefecto.anchoMax", "rules" => "required|decimal", ], "ancho_min" => [ - "label" => "MaquinaPorDefectoes.anchoMin", + "label" => "MaquinasPorDefecto.anchoMin", "rules" => "required|decimal", ], "tipo" => [ - "label" => "MaquinaPorDefectoes.tipo", + "label" => "MaquinasPorDefecto.tipo", "rules" => "required|in_list[bn,bnhq,color,portada,cubierta,rotativa]", ], "tirada_max" => [ - "label" => "MaquinaPorDefectoes.tiradaMax", + "label" => "MaquinasPorDefecto.tiradaMax", "rules" => "required|integer", ], "tirada_min" => [ - "label" => "MaquinaPorDefectoes.tiradaMin", + "label" => "MaquinasPorDefecto.tiradaMin", "rules" => "required|integer", ], ]; protected $validationMessages = [ "alto_max" => [ - "decimal" => "MaquinaPorDefectoes.validation.alto_max.decimal", - "required" => "MaquinaPorDefectoes.validation.alto_max.required", + "decimal" => "MaquinasPorDefecto.validation.alto_max.decimal", + "required" => "MaquinasPorDefecto.validation.alto_max.required", ], "alto_min" => [ - "decimal" => "MaquinaPorDefectoes.validation.alto_min.decimal", - "required" => "MaquinaPorDefectoes.validation.alto_min.required", + "decimal" => "MaquinasPorDefecto.validation.alto_min.decimal", + "required" => "MaquinasPorDefecto.validation.alto_min.required", ], "ancho_max" => [ - "decimal" => "MaquinaPorDefectoes.validation.ancho_max.decimal", - "required" => "MaquinaPorDefectoes.validation.ancho_max.required", + "decimal" => "MaquinasPorDefecto.validation.ancho_max.decimal", + "required" => "MaquinasPorDefecto.validation.ancho_max.required", ], "ancho_min" => [ - "decimal" => "MaquinaPorDefectoes.validation.ancho_min.decimal", - "required" => "MaquinaPorDefectoes.validation.ancho_min.required", + "decimal" => "MaquinasPorDefecto.validation.ancho_min.decimal", + "required" => "MaquinasPorDefecto.validation.ancho_min.required", ], "tipo" => [ - "in_list" => "MaquinaPorDefectoes.validation.tipo.in_list", - "required" => "MaquinaPorDefectoes.validation.tipo.required", + "in_list" => "MaquinasPorDefecto.validation.tipo.in_list", + "required" => "MaquinasPorDefecto.validation.tipo.required", ], "tirada_max" => [ - "integer" => "MaquinaPorDefectoes.validation.tirada_max.integer", - "required" => "MaquinaPorDefectoes.validation.tirada_max.required", + "integer" => "MaquinasPorDefecto.validation.tirada_max.integer", + "required" => "MaquinasPorDefecto.validation.tirada_max.required", ], "tirada_min" => [ - "integer" => "MaquinaPorDefectoes.validation.tirada_min.integer", - "required" => "MaquinaPorDefectoes.validation.tirada_min.required", + "integer" => "MaquinasPorDefecto.validation.tirada_min.integer", + "required" => "MaquinasPorDefecto.validation.tirada_min.required", ], ]; diff --git a/ci4/app/Models/Configuracion/PapelImpresionModel.php b/ci4/app/Models/Configuracion/PapelImpresionModel.php index 7e71af37..afe4a799 100644 --- a/ci4/app/Models/Configuracion/PapelImpresionModel.php +++ b/ci4/app/Models/Configuracion/PapelImpresionModel.php @@ -69,7 +69,7 @@ class PapelImpresionModel extends \App\Models\GoBaseModel "isActivo", "deleted_at", "is_deleted", - "user_update_id", + "user_updated_id", ]; protected $returnType = "App\Entities\Configuracion\PapelImpresion"; diff --git a/ci4/app/Models/Tarifas/TarifaacabadoModel.php b/ci4/app/Models/Tarifas/TarifaacabadoModel.php index 8f178563..6b785958 100644 --- a/ci4/app/Models/Tarifas/TarifaacabadoModel.php +++ b/ci4/app/Models/Tarifas/TarifaacabadoModel.php @@ -21,7 +21,7 @@ class TarifaacabadoModel extends \App\Models\GoBaseModel "deleted_at", "is_deleted", "user_created_id", - "user_update_id", + "user_updated_id", ]; protected $returnType = 'App\Entities\Tarifas\TarifaacabadoEntity'; diff --git a/ci4/app/Models/Tarifas/TarifapreimpresionModel.php b/ci4/app/Models/Tarifas/TarifapreimpresionModel.php index 4d99f487..a7df86b3 100644 --- a/ci4/app/Models/Tarifas/TarifapreimpresionModel.php +++ b/ci4/app/Models/Tarifas/TarifapreimpresionModel.php @@ -18,7 +18,7 @@ class TarifapreimpresionModel extends \App\Models\GoBaseModel "deleted_at", "is_deleted", "user_created_id", - "user_update_id"]; + "user_updated_id"]; protected $returnType = "App\Entities\Tarifas\TarifapreimpresionEntity"; protected $useTimestamps = true; diff --git a/ci4/app/Views/themes/backend/vuexy/form/configuracion/maquinas/_maquinaPorDefectoFormItems.php b/ci4/app/Views/themes/backend/vuexy/form/configuracion/maquinas/_maquinaPorDefectoFormItems.php index 5693150f..76ded6c8 100644 --- a/ci4/app/Views/themes/backend/vuexy/form/configuracion/maquinas/_maquinaPorDefectoFormItems.php +++ b/ci4/app/Views/themes/backend/vuexy/form/configuracion/maquinas/_maquinaPorDefectoFormItems.php @@ -4,7 +4,7 @@ - @@ -19,43 +19,24 @@ - - - -
- - +
- -
- -
- - +
- +
-
- - -
+
@@ -63,7 +44,7 @@ - $v) : ?> @@ -75,6 +56,29 @@
+ +
+ + +
+ + +
+ + +
+ +
+ + +
+ \ No newline at end of file diff --git a/ci4/app/Views/themes/backend/vuexy/form/configuracion/maquinas/viewMaquinaForm.php b/ci4/app/Views/themes/backend/vuexy/form/configuracion/maquinas/viewMaquinaForm.php index 224ae1a2..e16f1726 100644 --- a/ci4/app/Views/themes/backend/vuexy/form/configuracion/maquinas/viewMaquinaForm.php +++ b/ci4/app/Views/themes/backend/vuexy/form/configuracion/maquinas/viewMaquinaForm.php @@ -287,9 +287,6 @@ yeniden(json.); - setTimeout(() => { - console.log("1 Segundo esperado") - }, 1000); $.ajax({ url: '', data: { diff --git a/ci4/app/Views/themes/backend/vuexy/form/configuracion/maquinas/viewMaquinaPorDefectoForm.php b/ci4/app/Views/themes/backend/vuexy/form/configuracion/maquinas/viewMaquinaPorDefectoForm.php index b1bc22f8..e2e70ec6 100644 --- a/ci4/app/Views/themes/backend/vuexy/form/configuracion/maquinas/viewMaquinaPorDefectoForm.php +++ b/ci4/app/Views/themes/backend/vuexy/form/configuracion/maquinas/viewMaquinaPorDefectoForm.php @@ -15,12 +15,15 @@ getErrors()) ? $validation->listErrors("bootstrap_style") : "" ?> -
- "btn btn-secondary float-start", - ]) ?> - "> -
+
+ " + /> + "btn btn-secondary"]) ?> +
@@ -32,7 +35,6 @@ $('#maquinaId').select2({ - theme: 'bootstrap-5', allowClear: false, ajax: { url: '', diff --git a/ci4/app/Views/themes/backend/vuexy/form/configuracion/maquinas/viewMaquinaPorDefectoList.php b/ci4/app/Views/themes/backend/vuexy/form/configuracion/maquinas/viewMaquinaPorDefectoList.php index 7d24705e..7a39f6fa 100644 --- a/ci4/app/Views/themes/backend/vuexy/form/configuracion/maquinas/viewMaquinaPorDefectoList.php +++ b/ci4/app/Views/themes/backend/vuexy/form/configuracion/maquinas/viewMaquinaPorDefectoList.php @@ -125,7 +125,7 @@ $(document).on('click', '.btn-edit', function(e) { $(document).on('click', '.btn-delete', function(e) { Swal.fire({ - title: '', + title: '', text: '', icon: 'warning', showCancelButton: true, @@ -139,8 +139,10 @@ $(document).on('click', '.btn-delete', function(e) { const row = $(this).closest('tr'); if (result.value) { $.ajax({ - url: `/${dataId}`, - method: 'DELETE', + //url: `/${dataId}`, + //method: 'DELETE', + url: `/configuracion/maquinasdefecto/delete/${dataId}`, + method: 'GET', }).done((data, textStatus, jqXHR) => { Toast.fire({ icon: 'success', @@ -166,20 +168,18 @@ $(document).on('click', '.btn-delete', function(e) { section('css') ?> - + endSection() ?> section('additionalExternalJs') ?> - - + + + - - - endSection() ?> diff --git a/ci4/app/Views/themes/backend/vuexy/form/tarifas/preimpresion/_tarifapreimpresionFormItems.php b/ci4/app/Views/themes/backend/vuexy/form/tarifas/preimpresion/_tarifapreimpresionFormItems.php index 1b02eb61..a21e3271 100644 --- a/ci4/app/Views/themes/backend/vuexy/form/tarifas/preimpresion/_tarifapreimpresionFormItems.php +++ b/ci4/app/Views/themes/backend/vuexy/form/tarifas/preimpresion/_tarifapreimpresionFormItems.php @@ -25,7 +25,7 @@ - + */ ?> diff --git a/ci4/app/Views/themes/backend/vuexy/form/tarifas/preimpresion/viewTarifapreimpresionList.php b/ci4/app/Views/themes/backend/vuexy/form/tarifas/preimpresion/viewTarifapreimpresionList.php index 1e5360d1..5d78905a 100644 --- a/ci4/app/Views/themes/backend/vuexy/form/tarifas/preimpresion/viewTarifapreimpresionList.php +++ b/ci4/app/Views/themes/backend/vuexy/form/tarifas/preimpresion/viewTarifapreimpresionList.php @@ -48,7 +48,7 @@ user_created_id) ?> - user_update_id) ?> + user_updated_id) ?> created_at) ? '' : date('d/m/Y H:m:s', strtotime($item->created_at)) ?> diff --git a/from mac to app.txt b/from mac to app.txt index 453b3f74..935ea43b 100644 --- a/from mac to app.txt +++ b/from mac to app.txt @@ -51,8 +51,8 @@ Pasos para añadir el soft delete a una tabla debajo de $sanitizedData = $this->sanitized($postData, $nullIfEmpty); // JJO - if(isset($this->model->user_update_id)){ - $sanitizedData['user_update_id'] = $session->id_user; + if(isset($this->model->user_updated_id)){ + $sanitizedData['user_updated_id'] = $session->id_user; } 5b.- Con lazy-tables: