diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 00000000..7edac904 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "clockify.tracking.workspaceId": "6464949facab6237e1538c14" +} \ No newline at end of file diff --git a/ci4/app/Config/Routes.php b/ci4/app/Config/Routes.php index 57dc996b..0145ca50 100644 --- a/ci4/app/Config/Routes.php +++ b/ci4/app/Config/Routes.php @@ -137,17 +137,17 @@ $routes->group('', [], function($routes) { $routes->resource('imposiciones', ['namespace' => 'App\Controllers\Configuracion', 'controller' => 'Imposiciones', 'except' => 'show,new,create,update']); $routes->group('papelesgenericos', ['namespace' => 'App\Controllers\Configuracion'], function ($routes) { - $routes->get('', 'PapelesGenericos::index', ['as' => 'papelGenericoList']); - $routes->get('add', 'PapelesGenericos::add', ['as' => 'newPapelGenerico']); - $routes->post('add', 'PapelesGenericos::add', ['as' => 'createPapelGenerico']); - $routes->post('create', 'PapelesGenericos::create', ['as' => 'ajaxCreatePapelGenerico']); - $routes->put('(:num)/update', 'PapelesGenericos::update/$1', ['as' => 'ajaxUpdatePapelGenerico']); - $routes->post('(:num)/edit', 'PapelesGenericos::edit/$1', ['as' => 'updatePapelGenerico']); - $routes->post('datatable', 'PapelesGenericos::datatable', ['as' => 'dataTableOfPapelesGenericos']); - $routes->post('allmenuitems', 'PapelesGenericos::allItemsSelect', ['as' => 'select2ItemsOfPapelesGenericos']); - $routes->post('menuitems', 'PapelesGenericos::menuItems', ['as' => 'menuItemsOfPapelesGenericos']); + $routes->get('', 'Papelesgenericos::index', ['as' => 'papelGenericoList']); + $routes->get('add', 'Papelesgenericos::add', ['as' => 'newPapelGenerico']); + $routes->post('add', 'Papelesgenericos::add', ['as' => 'createPapelGenerico']); + $routes->post('create', 'Papelesgenericos::create', ['as' => 'ajaxCreatePapelGenerico']); + $routes->put('(:num)/update', 'Papelesgenericos::update/$1', ['as' => 'ajaxUpdatePapelGenerico']); + $routes->post('(:num)/edit', 'Papelesgenericos::edit/$1', ['as' => 'updatePapelGenerico']); + $routes->post('datatable', 'Papelesgenericos::datatable', ['as' => 'dataTableOfPapelesGenericos']); + $routes->post('allmenuitems', 'Papelesgenericos::allItemsSelect', ['as' => 'select2ItemsOfPapelesGenericos']); + $routes->post('menuitems', 'Papelesgenericos::menuItems', ['as' => 'menuItemsOfPapelesGenericos']); }); - $routes->resource('papelesgenericos', ['namespace' => 'App\Controllers\Configuracion', 'controller' => 'PapelesGenericos', 'except' => 'show,new,create,update']); + $routes->resource('papelesgenericos', ['namespace' => 'App\Controllers\Configuracion', 'controller' => 'Papelesgenericos', 'except' => 'show,new,create,update']); }); diff --git a/ci4/app/Controllers/Configuracion/PapelesGenericos.php b/ci4/app/Controllers/Configuracion/PapelesGenericos.php index 753861d4..a7d3f0e8 100644 --- a/ci4/app/Controllers/Configuracion/PapelesGenericos.php +++ b/ci4/app/Controllers/Configuracion/PapelesGenericos.php @@ -9,7 +9,7 @@ use App\Entities\Configuracion\PapelGenerico; use App\Models\Configuracion\PapelGenericoModel; -class PapelesGenericos extends \App\Controllers\GoBaseResourceController { +class Papelesgenericos extends \App\Controllers\GoBaseResourceController { protected $modelName = PapelGenericoModel::class; protected $format = 'json'; @@ -208,7 +208,7 @@ if ($this->request->getPost('show_in_client') == null ) { $length = $reqData['length'] ?? 5; $search = $reqData['search']['value']; $requestedOrder = $reqData['order']['0']['column'] ?? 1; - $order = PapelGenericoModel::SORTABLE[$requestedOrder > 0 ? $requestedOrder : 1]; + $order = PapelGenericoModel::SORTABLE[$requestedOrder >= 0 ? $requestedOrder : 0]; $dir = $reqData['order']['0']['dir'] ?? 'asc'; $resourceData = $this->model->getResource($search)->orderBy($order, $dir)->limit($length, $start)->get()->getResultObject(); diff --git a/ci4/app/Controllers/WorstCase_LT6015.asc b/ci4/app/Controllers/WorstCase_LT6015.asc new file mode 100644 index 00000000..ab24f1e7 --- /dev/null +++ b/ci4/app/Controllers/WorstCase_LT6015.asc @@ -0,0 +1,95 @@ +Version 4 +SHEET 1 2680 680 +WIRE -496 -752 -608 -752 +WIRE -608 -736 -608 -752 +WIRE -496 -736 -496 -752 +WIRE -608 -640 -608 -656 +WIRE -176 -624 -352 -624 +WIRE 0 -624 -96 -624 +WIRE 176 -624 0 -624 +WIRE 352 -624 256 -624 +WIRE -496 -592 -496 -656 +WIRE -432 -592 -496 -592 +WIRE -496 -576 -496 -592 +WIRE 48 -560 48 -576 +WIRE 0 -544 0 -624 +WIRE 16 -544 0 -544 +WIRE 352 -528 352 -624 +WIRE 352 -528 80 -528 +WIRE 368 -528 352 -528 +WIRE 16 -512 0 -512 +WIRE -496 -480 -496 -496 +WIRE -432 -480 -352 -624 +WIRE -432 -480 -496 -480 +WIRE 48 -480 48 -496 +WIRE -608 -464 -608 -480 +WIRE -496 -464 -496 -480 +WIRE -352 -448 -432 -592 +WIRE -336 -448 -352 -448 +WIRE -176 -448 -256 -448 +WIRE 0 -448 0 -512 +WIRE 0 -448 -96 -448 +WIRE 0 -432 0 -448 +WIRE 0 -336 0 -352 +FLAG 0 -336 0 +FLAG 368 -528 Out +FLAG -608 -464 0 +FLAG -608 -640 0 +FLAG -608 -752 Vcc +FLAG -608 -560 Vee +FLAG 48 -576 Vcc +FLAG 48 -480 Vee +FLAG -496 -464 0 +SYMBOL res -192 -432 R270 +WINDOW 0 32 56 VTop 2 +WINDOW 3 0 56 VBottom 2 +SYMATTR InstName R1 +SYMATTR Value {wc(22.5k,tola,1)} +SYMBOL res -16 -448 R0 +SYMATTR InstName R4 +SYMATTR Value {wc(22.5k,tolb,0)} +SYMBOL res 272 -640 R90 +WINDOW 0 0 56 VBottom 2 +WINDOW 3 32 56 VTop 2 +SYMATTR InstName R3 +SYMATTR Value {wc(22.5k,tolb,3)} +SYMBOL res -192 -608 R270 +WINDOW 0 32 56 VTop 2 +WINDOW 3 0 56 VBottom 2 +SYMATTR InstName R2 +SYMATTR Value {wc(22.5k,tola,2)} +SYMBOL Opamps\\LT6015 48 -528 R0 +SYMATTR InstName U2 +SYMBOL voltage -608 -752 R0 +WINDOW 123 0 0 Left 2 +WINDOW 39 0 0 Left 2 +SYMATTR InstName V1 +SYMATTR Value 15 +SYMBOL voltage -608 -576 R0 +WINDOW 123 0 0 Left 2 +WINDOW 39 0 0 Left 2 +SYMATTR InstName V2 +SYMATTR Value -15 +SYMBOL current -496 -736 R0 +SYMATTR InstName I1 +SYMATTR Value PWL(.1m 0 .2m .25) +SYMBOL res -512 -592 R0 +SYMATTR InstName R5 +SYMATTR Value 1 +SYMBOL res -240 -464 R90 +WINDOW 0 0 56 VBottom 2 +WINDOW 3 32 56 VTop 2 +SYMATTR InstName R6 +SYMATTR Value 1 +TEXT -616 -200 Left 2 !.param tola=.01 +TEXT -616 -168 Left 2 !.param tolb=.05 +TEXT 328 -352 Left 2 !.tran .5m +TEXT -96 -168 Left 2 !.step param run 0 16 1 +TEXT -616 -280 Left 2 !.func binary(run,index) floor(run/(2**index))-2*floor(run/(2**(index+1))) +TEXT -616 -240 Left 2 !.func wc(nom,tol,index) if(run==numruns,nom,if(binary(run,index),nom*(1+tol),nom*(1-tol))) +TEXT -96 -200 Left 2 !.param numruns=16 +TEXT 80 -408 Left 2 ;5% Resistor +TEXT 208 -672 Bottom 2 ;5% Resistor +TEXT -136 -672 Bottom 2 ;1% Resistor +TEXT -136 -496 Bottom 2 ;1% Resistor +TEXT 416 -528 Left 2 ;±1mV/mA diff --git a/ci4/app/Models/Configuracion/PapelGenericoModel.php b/ci4/app/Models/Configuracion/PapelGenericoModel.php index 026ada40..0dd7bbf0 100644 --- a/ci4/app/Models/Configuracion/PapelGenericoModel.php +++ b/ci4/app/Models/Configuracion/PapelGenericoModel.php @@ -13,11 +13,11 @@ class PapelGenericoModel extends \App\Models\GoBaseModel protected $useAutoIncrement = true; const SORTABLE = [ - 1 => "t1.id", - 2 => "t1.nombre", - 3 => "t1.code", - 4 => "t1.code_ot", - 5 => "t1.show_in_client", + 0 => "t1.id", + 1 => "t1.nombre", + 2 => "t1.code", + 3 => "t1.code_ot", + 4 => "t1.show_in_client", ]; protected $allowedFields = ["nombre", "code", "code_ot", "show_in_client"]; diff --git a/ci4/app/Views/themes/backend/vuexy/form/configuracion/papel/viewPapelGenericoList.php b/ci4/app/Views/themes/backend/vuexy/form/configuracion/papel/viewPapelGenericoList.php index f7fb7658..2f644971 100644 --- a/ci4/app/Views/themes/backend/vuexy/form/configuracion/papel/viewPapelGenericoList.php +++ b/ci4/app/Views/themes/backend/vuexy/form/configuracion/papel/viewPapelGenericoList.php @@ -8,7 +8,7 @@

- 'btn btn-primary float-end']); ?> + 'btn btn-primary float-end']); ?>
@@ -16,7 +16,6 @@ - @@ -70,7 +69,7 @@ } ], stateSave: true, - order: [[1, 'asc']], + order: [[0, 'asc']], language: { url: "//cdn.datatables.net/plug-ins/1.13.4/i18n/i18n ?>.json" }, @@ -84,12 +83,11 @@ { orderable: false, searchable: false, - targets: [0,lastColNr] + targets: [lastColNr] } ], columns : [ - { 'data': actionBtns }, - { 'data': 'id' }, + { 'data': 'id' }, { 'data': 'nombre' }, { 'data': 'code' }, { 'data': 'code_ot' }, @@ -100,10 +98,10 @@ theTable.on( 'draw.dt', function () { - const boolCols = [5]; + const boolCols = [4]; for (let coln of boolCols) { theTable.column(coln, { page: 'current' }).nodes().each( function (cell, i) { - cell.innerHTML = cell.innerHTML == '1' ? '' : ''; + cell.innerHTML = cell.innerHTML == '1' ? 'Tick' : ''; }); }