Merge branch 'dev/maquinas_defecto' into 'main'

Añadida funcionalidad maquinas por defecto

See merge request jjimenez/safekat!30
This commit is contained in:
2023-07-13 10:10:24 +00:00
30 changed files with 1172 additions and 37 deletions

View File

@ -25,7 +25,7 @@
<label for="userUpdateId" class="form-label">
<?=lang('Tarifapreimpresion.userUpdateId') ?>*
</label>
<input type="number" id="userUpdateId" name="user_update_id" required placeholder="1" maxLength="10" class="form-control" value="<?=old('user_update_id', $tarifapreimpresionEntity->user_update_id) ?>">
<input type="number" id="userUpdateId" name="user_updated_id" required placeholder="1" maxLength="10" class="form-control" value="<?=old('user_updated_id', $tarifapreimpresionEntity->user_updated_id) ?>">
</div><!--//.mb-3 -->
*/ ?>
</div><!--//.col -->

View File

@ -48,7 +48,7 @@
<?= esc($item->user_created_id) ?>
</td>
<td class="align-middle">
<?= esc($item->user_update_id) ?>
<?= esc($item->user_updated_id) ?>
</td>
<td class="align-middle text-nowrap">
<?= empty($item->created_at) ? '' : date('d/m/Y H:m:s', strtotime($item->created_at)) ?>