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

Falta testear funcionamiento completo. Edit no funciona

Browse Source
This commit is contained in:
Jaime Jiménez
2023-08-05 12:51:29 +02:00
parent 3e27d3fc17
commit 121b270dd0
15 changed files with 390 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
ci4/app/Controllers/Compras/Proveedores.php
View File

@ -1,19 +1,12 @@
<?php namespace App\Controllers\compras;
<?php namespace App\Controllers\Compras;
use App\Controllers\GoBaseResourceController;
use App\Models\Collection;
use App\Entities\compras\ProveedorEntity;
use App\Entities\Compras\ProveedorEntity;
use App\Models\compras\ProveedorTipoModel;
use App\Models\compras\ProvinciaModel;
use App\Models\Configuracion\PaisModel;
use App\Models\compras\ProveedorModel;
use App\Models\Compras\ProveedorModel;
class Proveedores extends \App\Controllers\GoBaseResourceController {
@ -34,8 +27,23 @@ class Proveedores extends \App\Controllers\GoBaseResourceController {
public function initController(\CodeIgniter\HTTP\RequestInterface $request, \CodeIgniter\HTTP\ResponseInterface $response, \Psr\Log\LoggerInterface $logger) {
$this->viewData['pageTitle'] = lang('LgProveedores.moduleTitle');
$this->viewData['pageTitle'] = lang('Proveedores.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;
$this->viewData = ['usingServerSideDataTable' => true];
// Breadcrumbs (IMN)
$this->viewData['breadcrumb'] = [
['title' => lang("App.menu_configuration"), 'route' => "javascript:void(0);", 'active' => false],
['title' => lang("App.menu_proveedores"), 'route' => site_url('compras/proveedores'), 'active' => true]
];
parent::initController($request, $response, $logger);
}
@ -44,7 +52,7 @@ class Proveedores extends \App\Controllers\GoBaseResourceController {
$viewData = [
'currentModule' => static::$controllerSlug,
'pageSubTitle' => lang('Basic.global.ManageAllRecords', [lang('LgProveedores.proveedor')]),
'pageSubTitle' => lang('Basic.global.ManageAllRecords', [lang('Proveedores.proveedor')]),
'proveedorEntity' => new ProveedorEntity(),
'usingServerSideDataTable' => true,
@ -83,7 +91,7 @@ class Proveedores extends \App\Controllers\GoBaseResourceController {
$this->dealWithException($e);
}
else:
$this->viewData['errorMessage'] = lang('Basic.global.formErr1', [mb_strtolower(lang('LgProveedores.proveedor'))]);
$this->viewData['errorMessage'] = lang('Basic.global.formErr1', [mb_strtolower(lang('Proveedores.proveedor'))]);
$this->session->setFlashdata('formErrors', $this->model->errors());
endif;
@ -93,7 +101,7 @@ class Proveedores extends \App\Controllers\GoBaseResourceController {
$id = $this->model->db->insertID();
$message = lang('Basic.global.saveSuccess', [mb_strtolower(lang('LgProveedores.proveedor'))]).'.';
$message = lang('Basic.global.saveSuccess', [mb_strtolower(lang('Proveedores.proveedor'))]).'.';
$message .= anchor( "admin/proveedores/{$id}/edit" , lang('Basic.global.continueEditing').'?');
$message = ucfirst(str_replace("'", "\'", $message));
@ -118,7 +126,7 @@ class Proveedores extends \App\Controllers\GoBaseResourceController {
$this->viewData['formAction'] = route_to('createProveedor');
$this->viewData['boxTitle'] = lang('Basic.global.addNew').' '.lang('LgProveedores.moduleTitle').' '.lang('Basic.global.addNewSuffix');
$this->viewData['boxTitle'] = lang('Basic.global.addNew').' '.lang('Proveedores.moduleTitle').' '.lang('Basic.global.addNewSuffix');
return $this->displayForm(__METHOD__);
@ -133,7 +141,7 @@ class Proveedores extends \App\Controllers\GoBaseResourceController {
$proveedorEntity = $this->model->find($id);
if ($proveedorEntity == false) :
$message = lang('Basic.global.notFoundWithIdErr', [mb_strtolower(lang('LgProveedores.proveedor')), $id]);
$message = lang('Basic.global.notFoundWithIdErr', [mb_strtolower(lang('Proveedores.proveedor')), $id]);
return $this->redirect2listView('sweet-error', $message);
endif;
@ -162,20 +170,21 @@ class Proveedores extends \App\Controllers\GoBaseResourceController {
$this->dealWithException($e);
}
else:
$this->viewData['warningMessage'] = lang('Basic.global.formErr1', [mb_strtolower(lang('LgProveedores.proveedor'))]);
$this->viewData['warningMessage'] = lang('Basic.global.formErr1', [mb_strtolower(lang('Proveedores.proveedor'))]);
$this->session->setFlashdata('formErrors', $this->model->errors());
endif;
$proveedorEntity->fill($sanitizedData);
$thenRedirect = true;
$thenRedirect = false;
endif;
if ($noException && $successfulResult) :
$id = $proveedorEntity->id ?? $id;
$message = lang('Basic.global.updateSuccess', [mb_strtolower(lang('LgProveedores.proveedor'))]).'.';
$message .= anchor( "admin/proveedores/{$id}/edit" , lang('Basic.global.continueEditing').'?');
$message = ucfirst(str_replace("'", "\'", $message));
$message = lang('Basic.global.updateSuccess', [lang('Basic.global.record')]).'.';
//$message = lang('Basic.global.updateSuccess', [mb_strtolower(lang('Proveedores.proveedor'))]).'.';
//$message .= anchor( "admin/proveedores/{$id}/edit" , lang('Basic.global.continueEditing').'?');
//$message = ucfirst(str_replace("'", "\'", $message));
if ($thenRedirect) :
if (!empty($this->indexRoute)) :
@ -197,7 +206,7 @@ class Proveedores extends \App\Controllers\GoBaseResourceController {
$this->viewData['formAction'] = route_to('updateProveedor', $id);
$this->viewData['boxTitle'] = lang('Basic.global.edit2').' '.lang('LgProveedores.moduleTitle').' '.lang('Basic.global.edit3');
$this->viewData['boxTitle'] = lang('Basic.global.edit2').' '.lang('Proveedores.moduleTitle').' '.lang('Basic.global.edit3');
return $this->displayForm(__METHOD__, $id);
@ -217,7 +226,7 @@ class Proveedores extends \App\Controllers\GoBaseResourceController {
$length = $reqData['length'] ?? 5;
$search = $reqData['search']['value'];
$requestedOrder = $reqData['order']['0']['column'] ?? 1;
$order = ProveedorModel::SORTABLE[$requestedOrder > 0 ? $requestedOrder : 1];
$order = ProveedorModel::SORTABLE[$requestedOrder >= 0 ? $requestedOrder : 0];
$dir = $reqData['order']['0']['dir'] ?? 'asc';
$resourceData = $this->model->getResource($search)->orderBy($order, $dir)->limit($length, $start)->get()->getResultObject();
@ -282,9 +291,9 @@ class Proveedores extends \App\Controllers\GoBaseResourceController {
protected function getProveedorTipoListItems($selId = null) {
$data = [''=>lang('Basic.global.pleaseSelectA', [mb_strtolower(lang('LgProveedoresTipos.proveedorTipo'))])];
$data = [''=>lang('Basic.global.pleaseSelectA', [mb_strtolower(lang('Proveedores.tipoId'))])];
if (!empty($selId)) :
$proveedorTipoModel = model('App\Models\compras\ProveedorTipoModel');
$proveedorTipoModel = model('App\Models\Compras\ProveedorTipoModel');
$selOption = $proveedorTipoModel->where('id', $selId)->findColumn('nombre');
if (!empty($selOption)) :
@ -307,7 +316,7 @@ class Proveedores extends \App\Controllers\GoBaseResourceController {
protected function getProvinciaListItems($selId = null) {
$data = [''=>lang('Basic.global.pleaseSelectA', [mb_strtolower(lang('Provincias.provincia'))])];
if (!empty($selId)) :
$provinciaModel = model('App\Models\compras\ProvinciaModel');
$provinciaModel = model('App\Models\Configuracion\ProvinciaModel');
$selOption = $provinciaModel->where('id', $selId)->findColumn('nombre');
if (!empty($selOption)) :