Skip to content

Modifica nombre de database #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Modifica nombre de database #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d27805b
Modifica nombre de database
gpabloandress May 26, 2016
d88bba6
Ordena carpeta Elements
gpabloandress Jun 6, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion app/Config/database.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ class DATABASE_CONFIG {
'login' => 'root',
'password' => '',
'database' => 'traes',
//'database' => 'traes_cens302',
'encoding' =>'utf8',
'prefix' => ''
);
Expand Down
0 app/View/Elements/form_empleado_add.ctp → ...View/Elements/forms/form_empleado_add.ctp
View file
Open in desktop
File renamed without changes.
0 app/View/Elements/form_empleado_edit.ctp → ...iew/Elements/forms/form_empleado_edit.ctp
View file
Open in desktop
File renamed without changes.
12 changes: 6 additions & 6 deletions app/View/Elements/formSearch_empleado.ctp → ...ments/formsSearch/formSearch_empleado.ctp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php echo $this->Form->create('Empleado',array('type'=>'get','action'=>'index', 'novalidate' => true));?>
<div class="form-group">
<?php echo $this->Form->input('documento_nro' , array('label' => false, 'class' => 'form-control', 'Placeholder' => 'Ingrese Nº de documento...')); ?>
</div>
<div class="text-center">
<?php echo $this->Form->end(array('label' => 'BUSCAR', 'class' => 'btn btn-primary'));?>
<?php echo $this->Form->create('Empleado',array('type'=>'get','action'=>'index', 'novalidate' => true));?>
<div class="form-group">
<?php echo $this->Form->input('documento_nro' , array('label' => false, 'class' => 'form-control', 'Placeholder' => 'Ingrese Nº de documento...')); ?>
</div>
<div class="text-center">
<?php echo $this->Form->end(array('label' => 'BUSCAR', 'class' => 'btn btn-primary'));?>
</div>
32 changes: 16 additions & 16 deletions app/View/Empleados/add.ctp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<div class="TituloSec"><?php echo __('Agregar Agente'); ?></div>
<div id="ContenidoSec">
<div class="empleados form">
<?php echo $this->Form->create('Empleado', array('type' => 'file', 'novalidate' => 'novalidate'));?>
<div class="unit">
<?php echo $this->element('form_empleado_add'); ?><p>
</div>
<div class="text-center">
<div class="submit">
<?php echo $this->Form->submit(__('GUARDAR', true), array('name' => 'ok', 'div' => false, 'class' => 'btn btn-success')); ?>
<?php echo $this->Form->submit(__('CANCELAR', true), array('name' => 'cancel', 'div' => false, 'class' => 'btn btn-warning')); ?>
</div>
<?php echo $this->Form->end();?>
</div>
</div>
</div>
<div class="TituloSec"><?php echo __('Agregar Agente'); ?></div>
<div id="ContenidoSec">
<div class="empleados form">
<?php echo $this->Form->create('Empleado', array('type' => 'file', 'novalidate' => 'novalidate'));?>
<div class="unit">
<?php echo $this->element('forms/form_empleado_add'); ?><p>
</div>
<div class="text-center">
<div class="submit">
<?php echo $this->Form->submit(__('GUARDAR', true), array('name' => 'ok', 'div' => false, 'class' => 'btn btn-success')); ?>
<?php echo $this->Form->submit(__('CANCELAR', true), array('name' => 'cancel', 'div' => false, 'class' => 'btn btn-warning')); ?>
</div>
<?php echo $this->Form->end();?>
</div>
</div>
</div>
34 changes: 17 additions & 17 deletions app/View/Empleados/edit.ctp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<div class="TituloSec"><?php echo __('Editar Agente'); ?></div>
<div id="ContenidoSec">
<div class="empleados form">
<?php echo $this->Form->create('Empleado', array('type' => 'file', 'novalidate' => true));?>
<div class="unit">
<?php echo $this->element('form_empleado_edit'); ?><p>
</div>
<?php echo $this->Form->input('id', array('type' => 'hidden')); ?>
<div class="text-center">
<div class="submit">
<?php echo $this->Form->submit(__('GUARDAR', true), array('name' => 'ok', 'div' => false, 'class' => 'btn btn-success')); ?>
<?php echo $this->Form->submit(__('CANCELAR', true), array('name' => 'cancel', 'div' => false, 'class' => 'btn btn-warning')); ?>
</div>
<?php echo $this->Form->end();?>
</div>
</div>
</div>
<div class="TituloSec"><?php echo __('Editar Agente'); ?></div>
<div id="ContenidoSec">
<div class="empleados form">
<?php echo $this->Form->create('Empleado', array('type' => 'file', 'novalidate' => true));?>
<div class="unit">
<?php echo $this->element('forms/form_empleado_edit'); ?><p>
</div>
<?php echo $this->Form->input('id', array('type' => 'hidden')); ?>
<div class="text-center">
<div class="submit">
<?php echo $this->Form->submit(__('GUARDAR', true), array('name' => 'ok', 'div' => false, 'class' => 'btn btn-success')); ?>
<?php echo $this->Form->submit(__('CANCELAR', true), array('name' => 'cancel', 'div' => false, 'class' => 'btn btn-warning')); ?>
</div>
<?php echo $this->Form->end();?>
</div>
</div>
</div>
78 changes: 39 additions & 39 deletions app/View/Empleados/index.ctp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,39 +1,39 @@
<!-- start main -->
<div class="TituloSec">Agentes</div>
<div id="ContenidoSec">
<div id="main">
<!-- start second nav -->
<div class="row">
<div class="col-xs-12 col-sm-8 col-md-8">
<div id="second-nav">
<div class="unit text-center">
<span class="link"><?php echo $this->Html->link('AGREGAR', array('action' => 'add'), array('class' => 'btn btn-info')); ?></span>
</div>
</div>
<!-- end second nav -->
<div class="row">
<?php foreach ($empleados as $empleado): ?>
<?php echo $this->element('empleado',array( 'empleado' => $empleado )); ?>
<?php endforeach; ?>
</div>
<div class="unit text-center">
<?php echo $this->element('pagination'); ?>
</div>
</div>
<!-- end main -->
<div class="col-xs-12 col-sm-4 col-md-4">
<div class="unit">
<div class="subtitulo">Búsqueda</div>
<br>
<?php echo $this->element('formSearch_empleado'); ?>
</div>
</div>
</div>
</div>
<!-- start main -->
<div class="TituloSec">Agentes</div>
<div id="ContenidoSec">
<div id="main">
<!-- start second nav -->
<div class="row">
<div class="col-xs-12 col-sm-8 col-md-8">

<div id="second-nav">
<div class="unit text-center">
<span class="link"><?php echo $this->Html->link('AGREGAR', array('action' => 'add'), array('class' => 'btn btn-info')); ?></span>
</div>
</div>
<!-- end second nav -->

<div class="row">
<?php foreach ($empleados as $empleado): ?>

<?php echo $this->element('empleado',array( 'empleado' => $empleado )); ?>

<?php endforeach; ?>


</div>
<div class="unit text-center">
<?php echo $this->element('pagination'); ?>
</div>
</div>
<!-- end main -->

<div class="col-xs-12 col-sm-4 col-md-4">
<div class="unit">
<div class="subtitulo">Búsqueda</div>
<br>
<?php echo $this->element('formsSearch/formSearch_empleado'); ?>
</div>
</div>
</div>
</div>