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
68efe9c2
Commit
68efe9c2
authored
Oct 05, 2018
by
Billy Larru
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[FIX tolerancia individual, quitando centrado de nombres]
parent
83377f17
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
7 deletions
+6
-7
tolerancia_individual.js
src/main/webapp/js/pages/tolerancia_individual.js
+1
-2
registroTolerancia.jspf
...nistrativos/tolerancia/individual/registroTolerancia.jspf
+3
-3
toleranciaIndividual.jsp
src/main/webapp/vistas/toleranciaIndividual.jsp
+2
-2
No files found.
src/main/webapp/js/pages/tolerancia_individual.js
View file @
68efe9c2
...
...
@@ -8,7 +8,6 @@ function getColumns() {
{
title
:
`APELLIDOS Y NOMBRES`
,
data
:
null
,
className
:
`text-center`
,
render
:
(
data
)
=>
{
let
nombresCompletos
;
let
nombres
=
data
.
trabajador_nombres
;
...
...
@@ -206,7 +205,7 @@ const registrarNuevaTolerancia = () => {
const
mostrarModalNuevaTolerancia
=
()
=>
{
ajaxModal
.
get
(
"administrativos/tolerancia/individual/registroTolerancia.jspf"
).
then
((
response
)
=>
{
swal
({
title
:
'<strong>
Nueva
Tolerancia</strong>'
,
title
:
'<strong>
Registro de
Tolerancia</strong>'
,
// type: 'info',
html
:
response
.
data
,
showCloseButton
:
true
,
...
...
src/main/webapp/vistas/modals/administrativos/tolerancia/individual/registroTolerancia.jspf
View file @
68efe9c2
...
...
@@ -23,7 +23,7 @@
</div>
<div class="row">
<div class="form-group col-md-4">
<label>Horario S
a
bado</label>
<label>Horario Sbado</label>
<input type="time" class="form-control text-center" id="txtHorarioSabado" disabled>
</div>
<div class="form-group col-md-4">
...
...
@@ -31,7 +31,7 @@
<input type="number" min="0" value="0" class="form-control text-center" id="txtToleranciaSabado">
</div>
<div class="form-group col-md-4">
<label>Nuevo Horario S
a
bado</label>
<label>Nuevo Horario Sbado</label>
<input type="time" min="00:00" max="23:59" class="form-control text-center" id="txtNuevoHorarioSabado">
</div>
</div>
...
...
@@ -53,7 +53,7 @@
</div>
<div class="row">
<div class="form-group col-md-12">
<label>Observaci
o
n</label>
<label>Observacin</label>
<textarea name="txtObservacion" id="txtObservacion" cols="30" rows="4" class="form-control"></textarea>
</div>
</div>
...
...
src/main/webapp/vistas/toleranciaIndividual.jsp
View file @
68efe9c2
...
...
@@ -15,7 +15,7 @@
<div
class=
"col-md-6 col-md-offset-3"
>
<div
class=
"panel panel-primary"
>
<div
class=
"panel-heading"
>
<h5
class=
"panel-title"
>
B
u
squeda
</h5>
<h5
class=
"panel-title"
>
B
ú
squeda
</h5>
</div>
<div
class=
"panel-body"
>
...
...
@@ -64,7 +64,7 @@
<div
class=
"col-md-8 col-md-offset-2"
>
<div
class=
"panel panel-primary card-3"
style=
"margin-top: 30px"
>
<div
class=
"panel-heading"
style=
"padding: 8px 15px"
>
<h6
class=
"panel-title"
style=
"font-size: 15px; font-family: inherit"
>
L
ISTADO DE TOLERANCIAS INDIVIDUALES
</h6>
<h6
class=
"panel-title"
style=
"font-size: 15px; font-family: inherit"
>
L
istado de tolerancias individuales
</h6>
<div
class=
"heading-elements"
>
<button
type=
"button"
id=
"btnNuevaTolerancia"
class=
"btn bg-slate border-slate-600 btn-xs"
><i
class=
"glyphicon glyphicon-plus"
></i>
Nueva tolerancia
</button>
</div>
...
...
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