Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
Asistencia
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Billy Larru
Asistencia
Commits
3da62f82
Commit
3da62f82
authored
6 years ago
by
Billy Larru
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
agregando select de marcacion de entrada y salida
parent
aae5bf06
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
30 additions
and
9 deletions
+30
-9
general.css
src/main/webapp/css/general.css
+5
-0
control_asistencia_policias.js
src/main/webapp/js/pages/control_asistencia_policias.js
+14
-3
controlAsistenciaPolicias.jsp
src/main/webapp/vistas/controlAsistenciaPolicias.jsp
+11
-6
No files found.
src/main/webapp/css/general.css
View file @
3da62f82
...
...
@@ -15,4 +15,8 @@ btn-green{
.border-left-jade
{
border-left-color
:
#26A69A
;
}
.text-migration
{
color
:
#36F
;
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
src/main/webapp/js/pages/control_asistencia_policias.js
View file @
3da62f82
...
...
@@ -168,13 +168,24 @@ function evtChange() {
}
if
(
criterio
==
1
||
criterio
==
2
)
{
let
html
=
`<div class='col-md-12'>
<div class="form-group">
`<div class=''>
<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">
Hora:
</label>
<span class="text-danger"> (*)</span>
<input type="t
ext
" id="txtHora" name="txtHora" value="" class="form-control" placeholder="Ingrese la hora" style="text-transform:uppercase;">
<input type="t
ime
" id="txtHora" name="txtHora" value="" class="form-control" placeholder="Ingrese la hora" style="text-transform:uppercase;">
</div>
</div>`
;
$
(
"#divFiltro"
).
html
(
html
);
...
...
This diff is collapsed.
Click to expand it.
src/main/webapp/vistas/controlAsistenciaPolicias.jsp
View file @
3da62f82
...
...
@@ -124,9 +124,11 @@
<td
class=
"text-center"
>
REGULAR
</td>
<td
class=
"text-center"
>
IMPAR
</td>
<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
class=
"text-center"
>
17:23
</td>
<td><span
class=
"label label-success"
>
TEMPRANO
</span></td>
<td></td>
</tr>
...
...
@@ -137,8 +139,10 @@
<td>
19:00 - 07:00
</td>
<td
class=
"text-center"
>
AMANECIDA 12H
</td>
<td
class=
"text-center"
>
IMPAR
</td>
<td
class=
"text-center"
>
19:07
</td>
<td
class=
"text-center"
>
07:02
</td>
<td
class=
"text-center"
>
<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></td>
</tr>
...
...
@@ -175,7 +179,7 @@
<td
class=
"text-center"
>
AMANECIDA 24H
</td>
<td
class=
"text-center"
>
IMPAR
</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></td>
</tr>
...
...
@@ -241,7 +245,7 @@
<td>
07:00 - 17:00
</td>
<td
class=
"text-center"
>
REGULAR
</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><span
class=
"label bg-purple"
>
SALIDA PENDIENTE
</span></td>
<td>
...
...
@@ -314,6 +318,7 @@
<label
style=
"font-size: small"
>
Descripcion:
</label>
<span
class=
"text-danger"
>
(*)
</span>
<select
id=
"cboTipoAsistencia"
class=
"form-control"
>
<option
value=
"0"
>
[SELECCIONE]
</option>
<option
value=
"1"
>
Registro directo
</option>
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment