Skip to content

A
Asistencia
Commit 3da62f82 by Billy Larru
Options

agregando select de marcacion de entrada y salida

parent aae5bf06
Showing with 30 additions and 9 deletions
src/main/webapp/css/general.css
...@@ -15,4 +15,8 @@ btn-green{ ...@@ -15,4 +15,8 @@ btn-green{
.border-left-jade{ .border-left-jade{
border-left-color: #26A69A; border-left-color: #26A69A;
}
.text-migration{
color: #36F;
} }
\ No newline at end of file
src/main/webapp/js/pages/control_asistencia_policias.js
...@@ -168,13 +168,24 @@ function evtChange() { ...@@ -168,13 +168,24 @@ function evtChange() {
} }
if (criterio == 1 || criterio == 2) { if (criterio == 1 || criterio == 2) {
let html = let html =
`<div class='col-md-12'> `<div class=''>
<div class="form-group"> <div class="form-group col-md-6">
<label style="font-size: small">
Marcación:
</label>
<span class="text-danger"> (*)</span>
<select id="cboTipoAsistencia" class="form-control">
<option value="0">[SELECCIONE]</option>
<option value="1">ENTRADA</option>
<option value="2">SALIDA</option>
</select>
</div>
<div class="form-group col-md-6">
<label style="font-size: small"> <label style="font-size: small">
Hora: Hora:
</label> </label>
<span class="text-danger"> (*)</span> <span class="text-danger"> (*)</span>
<input type="text" id="txtHora" name="txtHora" value="" class="form-control" placeholder="Ingrese la hora" style="text-transform:uppercase;"> <input type="time" id="txtHora" name="txtHora" value="" class="form-control" placeholder="Ingrese la hora" style="text-transform:uppercase;">
</div> </div>
</div>`; </div>`;
$("#divFiltro").html(html); $("#divFiltro").html(html);
......
src/main/webapp/vistas/controlAsistenciaPolicias.jsp
...@@ -124,9 +124,11 @@ ...@@ -124,9 +124,11 @@
<td class="text-center">REGULAR</td> <td class="text-center">REGULAR</td>
<td class="text-center">IMPAR</td> <td class="text-center">IMPAR</td>
<td class="text-center"> <td class="text-center">
<span class="text-success font-weight-bold">06:32</span> <span class="text-migration font-weight-bold">06:32</span>
</td>
<td class="text-center">
<span class="text-default">17:23</span>
</td> </td>
<td class="text-center">17:23</td>
<td><span class="label label-success">TEMPRANO</span></td> <td><span class="label label-success">TEMPRANO</span></td>
<td></td> <td></td>
</tr> </tr>
...@@ -137,8 +139,10 @@ ...@@ -137,8 +139,10 @@
<td>19:00 - 07:00</td> <td>19:00 - 07:00</td>
<td class="text-center">AMANECIDA 12H</td> <td class="text-center">AMANECIDA 12H</td>
<td class="text-center">IMPAR</td> <td class="text-center">IMPAR</td>
<td class="text-center">19:07</td> <td class="text-center">
<td class="text-center">07:02</td> <span class="text-migration">19:07</span>
</td>
<td class="text-center text-migration">07:02</td>
<td><span class="label label-warning">TARDANZA</span></td> <td><span class="label label-warning">TARDANZA</span></td>
<td></td> <td></td>
</tr> </tr>
...@@ -175,7 +179,7 @@ ...@@ -175,7 +179,7 @@
<td class="text-center">AMANECIDA 24H</td> <td class="text-center">AMANECIDA 24H</td>
<td class="text-center">IMPAR</td> <td class="text-center">IMPAR</td>
<td class="text-center">07:24</td> <td class="text-center">07:24</td>
<td class="text-center">06:58</td> <td class="text-center text-migration">06:58</td>
<td><span class="label label-default">NO MARCÓ</span></td> <td><span class="label label-default">NO MARCÓ</span></td>
<td></td> <td></td>
</tr> </tr>
...@@ -241,7 +245,7 @@ ...@@ -241,7 +245,7 @@
<td>07:00 - 17:00</td> <td>07:00 - 17:00</td>
<td class="text-center">REGULAR</td> <td class="text-center">REGULAR</td>
<td class="text-center">IMPAR</td> <td class="text-center">IMPAR</td>
<td class="text-center">07:28</td> <td class="text-center text-migration">07:28</td>
<td></td> <td></td>
<td><span class="label bg-purple">SALIDA PENDIENTE</span></td> <td><span class="label bg-purple">SALIDA PENDIENTE</span></td>
<td> <td>
...@@ -314,6 +318,7 @@ ...@@ -314,6 +318,7 @@
<label style="font-size: small"> <label style="font-size: small">
Descripcion: Descripcion:
</label> </label>
<span class="text-danger"> (*)</span>
<select id="cboTipoAsistencia" class="form-control"> <select id="cboTipoAsistencia" class="form-control">
<option value="0">[SELECCIONE]</option> <option value="0">[SELECCIONE]</option>
<option value="1">Registro directo</option> <option value="1">Registro directo</option>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment