From d27805b782f7f3e243c060ac217caf4f346db193 Mon Sep 17 00:00:00 2001 From: gpabloandres Date: Thu, 26 May 2016 19:20:14 -0300 Subject: [PATCH 1/2] Modifica nombre de database --- app/Config/database.php | 1 - 1 file changed, 1 deletion(-) diff --git a/app/Config/database.php b/app/Config/database.php index ebe91a1..6183ff4 100644 --- a/app/Config/database.php +++ b/app/Config/database.php @@ -8,7 +8,6 @@ class DATABASE_CONFIG { 'login' => 'root', 'password' => '', 'database' => 'traes', - //'database' => 'traes_cens302', 'encoding' =>'utf8', 'prefix' => '' ); From d88bba6a6ff0b64fe3b892d38fb4582b28445e4c Mon Sep 17 00:00:00 2001 From: gpabloandress Date: Mon, 6 Jun 2016 16:05:33 -0300 Subject: [PATCH 2/2] Ordena carpeta Elements --- .../{ => forms}/form_empleado_add.ctp | 0 .../{ => forms}/form_empleado_edit.ctp | 0 .../{ => formsSearch}/formSearch_empleado.ctp | 12 +-- app/View/Empleados/add.ctp | 32 ++++---- app/View/Empleados/edit.ctp | 34 ++++---- app/View/Empleados/index.ctp | 78 +++++++++---------- 6 files changed, 78 insertions(+), 78 deletions(-) rename app/View/Elements/{ => forms}/form_empleado_add.ctp (100%) rename app/View/Elements/{ => forms}/form_empleado_edit.ctp (100%) rename app/View/Elements/{ => formsSearch}/formSearch_empleado.ctp (98%) diff --git a/app/View/Elements/form_empleado_add.ctp b/app/View/Elements/forms/form_empleado_add.ctp similarity index 100% rename from app/View/Elements/form_empleado_add.ctp rename to app/View/Elements/forms/form_empleado_add.ctp diff --git a/app/View/Elements/form_empleado_edit.ctp b/app/View/Elements/forms/form_empleado_edit.ctp similarity index 100% rename from app/View/Elements/form_empleado_edit.ctp rename to app/View/Elements/forms/form_empleado_edit.ctp diff --git a/app/View/Elements/formSearch_empleado.ctp b/app/View/Elements/formsSearch/formSearch_empleado.ctp similarity index 98% rename from app/View/Elements/formSearch_empleado.ctp rename to app/View/Elements/formsSearch/formSearch_empleado.ctp index 49471e4..e559b1b 100644 --- a/app/View/Elements/formSearch_empleado.ctp +++ b/app/View/Elements/formsSearch/formSearch_empleado.ctp @@ -1,7 +1,7 @@ -Form->create('Empleado',array('type'=>'get','action'=>'index', 'novalidate' => true));?> -
- Form->input('documento_nro' , array('label' => false, 'class' => 'form-control', 'Placeholder' => 'Ingrese Nº de documento...')); ?> -
-
- Form->end(array('label' => 'BUSCAR', 'class' => 'btn btn-primary'));?> +Form->create('Empleado',array('type'=>'get','action'=>'index', 'novalidate' => true));?> +
+ Form->input('documento_nro' , array('label' => false, 'class' => 'form-control', 'Placeholder' => 'Ingrese Nº de documento...')); ?> +
+
+ Form->end(array('label' => 'BUSCAR', 'class' => 'btn btn-primary'));?>
\ No newline at end of file diff --git a/app/View/Empleados/add.ctp b/app/View/Empleados/add.ctp index 2426e96..4391e0c 100644 --- a/app/View/Empleados/add.ctp +++ b/app/View/Empleados/add.ctp @@ -1,16 +1,16 @@ -
-
-
-Form->create('Empleado', array('type' => 'file', 'novalidate' => 'novalidate'));?> -
- element('form_empleado_add'); ?>

-

-
-
- Form->submit(__('GUARDAR', true), array('name' => 'ok', 'div' => false, 'class' => 'btn btn-success')); ?> - Form->submit(__('CANCELAR', true), array('name' => 'cancel', 'div' => false, 'class' => 'btn btn-warning')); ?> -
- Form->end();?> -
-
-
\ No newline at end of file +
+
+
+Form->create('Empleado', array('type' => 'file', 'novalidate' => 'novalidate'));?> +
+ element('forms/form_empleado_add'); ?>

+

+
+
+ Form->submit(__('GUARDAR', true), array('name' => 'ok', 'div' => false, 'class' => 'btn btn-success')); ?> + Form->submit(__('CANCELAR', true), array('name' => 'cancel', 'div' => false, 'class' => 'btn btn-warning')); ?> +
+ Form->end();?> +
+
+
diff --git a/app/View/Empleados/edit.ctp b/app/View/Empleados/edit.ctp index 50e738a..5d17a99 100644 --- a/app/View/Empleados/edit.ctp +++ b/app/View/Empleados/edit.ctp @@ -1,17 +1,17 @@ -
-
-
- Form->create('Empleado', array('type' => 'file', 'novalidate' => true));?> -
- element('form_empleado_edit'); ?>

-

- Form->input('id', array('type' => 'hidden')); ?> -
-
- Form->submit(__('GUARDAR', true), array('name' => 'ok', 'div' => false, 'class' => 'btn btn-success')); ?> - Form->submit(__('CANCELAR', true), array('name' => 'cancel', 'div' => false, 'class' => 'btn btn-warning')); ?> -
- Form->end();?> -
-
-
\ No newline at end of file +
+
+
+ Form->create('Empleado', array('type' => 'file', 'novalidate' => true));?> +
+ element('forms/form_empleado_edit'); ?>

+

+ Form->input('id', array('type' => 'hidden')); ?> +
+
+ Form->submit(__('GUARDAR', true), array('name' => 'ok', 'div' => false, 'class' => 'btn btn-success')); ?> + Form->submit(__('CANCELAR', true), array('name' => 'cancel', 'div' => false, 'class' => 'btn btn-warning')); ?> +
+ Form->end();?> +
+
+
diff --git a/app/View/Empleados/index.ctp b/app/View/Empleados/index.ctp index d6b15bf..72fa1c2 100644 --- a/app/View/Empleados/index.ctp +++ b/app/View/Empleados/index.ctp @@ -1,39 +1,39 @@ - -
Agentes
-
-
- -
-
- -
-
- Html->link('AGREGAR', array('action' => 'add'), array('class' => 'btn btn-info')); ?> -
-
- - -
- - - element('empleado',array( 'empleado' => $empleado )); ?> - - - - -
-
- element('pagination'); ?> -
-
- - -
-
-
Búsqueda
-
- element('formSearch_empleado'); ?> -
-
-
-
\ No newline at end of file + +
Agentes
+
+
+ +
+
+ +
+
+ Html->link('AGREGAR', array('action' => 'add'), array('class' => 'btn btn-info')); ?> +
+
+ + +
+ + + element('empleado',array( 'empleado' => $empleado )); ?> + + + + +
+
+ element('pagination'); ?> +
+
+ + +
+
+
Búsqueda
+
+ element('formsSearch/formSearch_empleado'); ?> +
+
+
+