Commit 9ae39944af829a0a78ebdc4263c2ff56a9ce7566
1 parent
94b8dadb76
Exists in
master
modificada mostrar la aprobación de antiguedad con la nueva documentacion vertical
Showing
2 changed files
with
125 additions
and
20 deletions
Show diff stats
app/Resources/views/cea/servicios_mostar.html.twig
... | ... | @@ -2,6 +2,99 @@ |
2 | 2 | {% block stylesheets %} |
3 | 3 | {{ parent() }} |
4 | 4 | <link href="{{ asset('assets/vendor/lightbox2/dist/css/lightbox.css') }}" rel="stylesheet"> |
5 | + <style> | |
6 | + .wrapper { | |
7 | + width: 6.9rem; | |
8 | + height: 2rem; | |
9 | + position: relative; | |
10 | + margin: 0rem auto; | |
11 | + border-radius: 2rem; | |
12 | + background: gray; | |
13 | + } | |
14 | + | |
15 | + .wrapper .toggle { | |
16 | + width: 1.8rem; | |
17 | + height: 1.8rem; | |
18 | + position: absolute; | |
19 | + left: 2.5rem; | |
20 | + top: 0.1rem; | |
21 | + border-radius: 50%; | |
22 | + box-sizing: border-box; | |
23 | + border: 0.1rem solid #ff6c00; | |
24 | + background: #ff8933; | |
25 | + box-shadow: 0 0 0.2rem 0.1rem #ff6c00 inset, 0 0 0.2rem 0.1rem #ff6c00; | |
26 | + transition: all 0.3s cubic-bezier(0.175, 0.885, 0.32, 1.275); | |
27 | + } | |
28 | + | |
29 | + .wrapper label { | |
30 | + cursor: pointer; | |
31 | + width: 2rem; | |
32 | + height: 2rem; | |
33 | + position: absolute; | |
34 | + margin: 0; | |
35 | + padding: 0; | |
36 | + z-index: 1; | |
37 | + display: inline-block; | |
38 | + text-align: center; | |
39 | + line-height: 2rem; | |
40 | + text-transform: uppercase; | |
41 | + font-family: FontAwesome; | |
42 | + font-style: normal; | |
43 | + font-weight: normal; | |
44 | + color: white; | |
45 | + | |
46 | + } | |
47 | + | |
48 | + .wrapper input { | |
49 | + position: absolute; | |
50 | + left: 0; | |
51 | + margin: 0; | |
52 | + padding: 0; | |
53 | + opacity: 0; | |
54 | + } | |
55 | + | |
56 | + .yes_radio:checked ~ .toggle { | |
57 | + border: 0.1rem solid #008000; | |
58 | + background: #00b300; | |
59 | + box-shadow: 0 0 0.2rem 0.1rem #008000 inset, 0 0 0.2rem 0.1rem #008000; | |
60 | + left: 0.1rem; | |
61 | + } | |
62 | + | |
63 | + .no_radio:checked { | |
64 | + background: red; | |
65 | + } | |
66 | + | |
67 | + .no_radio:checked ~ .toggle { | |
68 | + border: 0.1rem solid #ff0000; | |
69 | + background: #ff3333; | |
70 | + box-shadow: 0 0 0.2rem 0.1rem #ff0000 inset, 0 0 0.2rem 0.1rem #ff0000; | |
71 | + left: 4.97rem; | |
72 | + } | |
73 | + | |
74 | + .maybe_radio, .maybe-lbl { | |
75 | + left: 33.33333%; | |
76 | + } | |
77 | + | |
78 | + .no_radio, .no-lbl { | |
79 | + left: 66.66667%; | |
80 | + } | |
81 | + | |
82 | + .maybe-lbl { | |
83 | + -webkit-animation-delay: 2s; | |
84 | + -o-animation-delay: 2s; | |
85 | + -moz-animation-delay: 2s; | |
86 | + animation-delay: 2s; | |
87 | + } | |
88 | + | |
89 | + .no-lbl { | |
90 | + -webkit-animation-delay: 4s; | |
91 | + -o-animation-delay: 4s; | |
92 | + -moz-animation-delay: 4s; | |
93 | + animation-delay: 4s; | |
94 | + } | |
95 | + | |
96 | + | |
97 | + </style> | |
5 | 98 | {% endblock %} |
6 | 99 | |
7 | 100 | {%block body %} |
... | ... | @@ -15,8 +108,7 @@ |
15 | 108 | <div class="row"> |
16 | 109 | <div class="col-md-9"> |
17 | 110 | <h4 class="page-head-line">Servicio número <code>{{servicio.id}}</code>: |
18 | - {{ servicio.idRolInstitucion.idRol.idPersona.primerNombre }}, | |
19 | - {{ servicio.idRolInstitucion.idRol.idPersona.primerApellido }} | |
111 | + {{ docente }} | |
20 | 112 | </h4> |
21 | 113 | </div> |
22 | 114 | <div class="col-md-3"> |
... | ... | @@ -56,7 +148,7 @@ |
56 | 148 | {% if servicio.idServicioCe.id == 1 %} |
57 | 149 | <div class="form-group"> |
58 | 150 | <label for="Escalafones">Fecha de Ingreso UBV:</label> |
59 | - {{ adscripcion.fechaIngreso|date('d/m/Y') }} | |
151 | + {{ docente.adscripcion.fechaIngreso|date('d/m/Y') }} | |
60 | 152 | </div> |
61 | 153 | |
62 | 154 | <div class="form-group"> |
... | ... | @@ -120,28 +212,38 @@ |
120 | 212 | <div class="widget-content"> |
121 | 213 | |
122 | 214 | |
123 | - | |
215 | + {% for documento in docente.documentosVerificados %} | |
216 | + | |
217 | + {% if documento.idTipoDocumentos.identificador == "trabajo" or documento.idTipoDocumentos.identificador == "oposicion" %} | |
124 | 218 | <div class="col-xs-4"> |
125 | 219 | <div class="thumbnail"> |
126 | - <a href="{{asset('uploads/adscripcion/'~ adscripcion.trabajo)}}" data-lightbox="adscripcion"> | |
127 | - <img src="{{ asset('uploads/adscripcion/thumb/'~ adscripcion.trabajo) }}" /> | |
220 | + <a href="{{asset('uploads/adscripcion/'~ documento.ubicacion)}}" data-lightbox="adscripcion"> | |
221 | + <img src="{{ asset('uploads/adscripcion/thumb/'~ documento.ubicacion) }}" /> | |
128 | 222 | </a> |
129 | 223 | <div class="caption"> |
130 | - <p>Constancia de Trabajo</p> | |
131 | - </div> | |
132 | - </div> | |
133 | - </div> | |
134 | - | |
135 | - <div class="col-xs-4"> | |
136 | - <div class="thumbnail"> | |
137 | - <a href="{{asset('uploads/adscripcion/'~ adscripcion.oposicion)}}" data-lightbox="adscripcion"> | |
138 | - <img src="{{ asset('uploads/adscripcion/thumb/'~ adscripcion.oposicion) }}" /> | |
139 | - </a> | |
140 | - <div class="caption"> | |
141 | - <p>Concurso Oposición</p> | |
224 | + <p>{{ documento.idTipoDocumentos.nombre }}</p> | |
225 | + <div class="wrapper"> | |
226 | + <label for="yes_radio{{ loop.index }}" class="yes-lbl"><i class="fa fa-check"></i> | |
227 | + </label> | |
228 | + <input type="radio" value="1" name="{{ documento.idTipoDocumentos.identificador }}" class="yes_radio" id="yes_radio{{ loop.index }}" {% if documento.idEstatus.id == 1 %} checked="checked" {% endif %} disabled> | |
229 | + <label for="maybe_radio{{ loop.index }}" class="maybe-lbl"> | |
230 | + <i class="fa fa-question"></i> | |
231 | + </label> | |
232 | + <input type="radio" value="" name="{{ documento.idTipoDocumentos.identificador }}" class="maybe_radio" id="maybe_radio{{ loop.index }}" {% if documento.idEstatus.id == 2 %} checked="checked" {% endif %} disabled> | |
233 | + <label for="no_radio{{ loop.index }}" class="no-lbl"><i | |
234 | + class="fa fa-close"></i></label><input type="radio" value="3" | |
235 | + name="{{ documento.idTipoDocumentos.identificador }}" | |
236 | + class="no_radio" | |
237 | + id="no_radio{{ loop.index }}" {% if documento.idEstatus.id == 3 %} checked="checked" {% endif %} disabled> | |
238 | + | |
239 | + <div class="toggle"></div> | |
240 | + </div> | |
142 | 241 | </div> |
143 | 242 | </div> |
144 | 243 | </div> |
244 | + {% endif %} | |
245 | + {% endfor %} | |
246 | + | |
145 | 247 | |
146 | 248 | |
147 | 249 | </div> | ... | ... |
src/AppBundle/Controller/AppController.php
... | ... | @@ -170,7 +170,9 @@ class AppController extends Controller { |
170 | 170 | * @Method("GET") |
171 | 171 | */ |
172 | 172 | public function serviciosShowAction(DocenteServicio $servicio) |
173 | - { | |
173 | + { | |
174 | + $em = $this->getDoctrine()->getManager(); | |
175 | + $docente = $em->getRepository("AppBundle:RolInstitucion")->findOneById($servicio->getIdRolInstitucion()->getId()); | |
174 | 176 | $adscripcion = $this->getDoctrine()->getRepository('AppBundle:Adscripcion')->findOneByIdRolInstitucion($servicio->getIdRolInstitucion()); |
175 | 177 | $escala = $this->getDoctrine()->getRepository('AppBundle:DocenteEscala')->findOneBy(array( |
176 | 178 | 'idRolInstitucion' => $servicio->getIdRolInstitucion(), |
... | ... | @@ -179,7 +181,8 @@ class AppController extends Controller { |
179 | 181 | return $this->render('cea/servicios_mostar.html.twig', array( |
180 | 182 | 'servicio' => $servicio, |
181 | 183 | 'oposicion' => $escala, |
182 | - 'adscripcion' => $adscripcion | |
184 | + 'adscripcion' => $adscripcion, | |
185 | + 'docente' => $docente | |
183 | 186 | )); |
184 | 187 | } |
185 | 188 | ... | ... |