jjimenez/safekat
1
0
Fork 0
mirror of https://git.imnavajas.es/jjimenez/safekat.git synced 2025-07-25 22:52:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

tarifas acabado/manipulado/preimpresion terminadas. Faltan envios

Browse Source
This commit is contained in:
Jaime Jimenez
2023-05-17 20:38:05 +02:00
parent 39598b697d
commit 5788d392d9
16 changed files with 154 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ci4/app/Controllers/GoBaseController.php
View File

@ -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();

7
ci4/app/Controllers/Tarifas/Tarifaacabado.php
View File

@ -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) ) :

14
ci4/app/Controllers/Tarifas/Tarifamanipulado.php
View File

@ -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) ) :

16
ci4/app/Controllers/Tarifas/Tarifapreimpresion.php
View File

@ -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) ) :