Commit eb38880c1a3b3012b70da4011f8ffd93e24f7661
1 parent
4ce85a987e
Exists in
master
añadido muchos cambios a la adscripcion para que se puedan verificar cada uno de…
… los documentos subidos; ahora vamos a realizar otras super modificaciones para mejorar la adscripcion de vertical a horizontal
Showing
10 changed files
with
1139 additions
and
314 deletions
Show diff stats
.idea/misc.xml
@@ -1,13 +0,0 @@ | @@ -1,13 +0,0 @@ | ||
1 | -<?xml version="1.0" encoding="UTF-8"?> | ||
2 | -<project version="4"> | ||
3 | - <component name="ProjectLevelVcsManager" settingsEditedManually="false"> | ||
4 | - <OptionsSetting value="true" id="Add" /> | ||
5 | - <OptionsSetting value="true" id="Remove" /> | ||
6 | - <OptionsSetting value="true" id="Checkout" /> | ||
7 | - <OptionsSetting value="true" id="Update" /> | ||
8 | - <OptionsSetting value="true" id="Status" /> | ||
9 | - <OptionsSetting value="true" id="Edit" /> | ||
10 | - <ConfirmationsSetting value="0" id="Add" /> | ||
11 | - <ConfirmationsSetting value="0" id="Remove" /> | ||
12 | - </component> | ||
13 | -</project> | ||
14 | \ No newline at end of file | 0 | \ No newline at end of file |
app/Resources/views/cea/solicitudes_mostar.html.twig
@@ -2,279 +2,576 @@ | @@ -2,279 +2,576 @@ | ||
2 | {% block stylesheets %} | 2 | {% block stylesheets %} |
3 | {{ parent() }} | 3 | {{ parent() }} |
4 | <link href="{{ asset('assets/vendor/lightbox2/dist/css/lightbox.css') }}" rel="stylesheet"> | 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 | {% endblock %} | 98 | {% endblock %} |
6 | 99 | ||
7 | -{%block body %} | ||
8 | - | ||
9 | - <div class="content-wrapper"> | 100 | +{% block body %} |
101 | + | ||
102 | + <div class="content-wrapper"> | ||
10 | <div class="container"> | 103 | <div class="container"> |
11 | {% for message in app.session.flashBag.get('notice') %} | 104 | {% for message in app.session.flashBag.get('notice') %} |
12 | - <h4 class="alert alert-success">{{ message }}</h4> | ||
13 | - | ||
14 | - {%endfor %} | 105 | + <h4 class="alert alert-success">{{ message }}</h4> |
106 | + | ||
107 | + {% endfor %} | ||
15 | <div class="row"> | 108 | <div class="row"> |
16 | <div class="col-md-9"> | 109 | <div class="col-md-9"> |
17 | - <h4 class="page-head-line">Solicitud de Adscripción número <code>CEA-{{adscripcion.idRolInstitucion.idInstitucion.idEjeParroquia.IdEje.abreviacion}}-{{ adscripcion.anoAdscripcion }}-{{adscripcion.correlativoAdscripcion}}</code>: | ||
18 | - {{ adscripcion.idRolInstitucion.idRol.idPersona.primerNombre }}, | ||
19 | - {{ adscripcion.idRolInstitucion.idRol.idPersona.primerApellido }} | ||
20 | - </h4> | 110 | + <h4 class="page-head-line">Solicitud de Adscripción número |
111 | + <code>CEA-{{ todo.idInstitucion.idEjeParroquia.IdEje.abreviacion }} | ||
112 | + -{{ todo.adscripcion.anoAdscripcion }}-{{ todo.adscripcion.correlativoAdscripcion }}</code>: | ||
113 | + {{ todo }} | ||
114 | + </h4> | ||
21 | </div> | 115 | </div> |
22 | <div class="col-md-3"> | 116 | <div class="col-md-3"> |
23 | {% if servicio.idEstatus.id == 1 %} | 117 | {% if servicio.idEstatus.id == 1 %} |
24 | - <h4 class="alert alert-success">Estatus <strong>{{servicio.idEstatus}}</strong></h4> | 118 | + <h4 class="alert alert-success">Estatus <strong>{{ servicio.idEstatus }}</strong></h4> |
25 | {% elseif servicio.idEstatus.id == 3 %} | 119 | {% elseif servicio.idEstatus.id == 3 %} |
26 | - <h4 class="alert alert-danger">Estatus <strong>{{servicio.idEstatus}}</strong></h4> | 120 | + <h4 class="alert alert-danger">Estatus <strong>{{ servicio.idEstatus }}</strong></h4> |
27 | {% else %} | 121 | {% else %} |
28 | - <h4 class="alert alert-warning">Estatus <strong>{{servicio.idEstatus}}</strong></h4> | ||
29 | - {% endif %} | 122 | + <h4 class="alert alert-warning">Estatus <strong>{{ servicio.idEstatus }}</strong></h4> |
123 | + {% endif %} | ||
30 | 124 | ||
31 | </div> | 125 | </div> |
32 | 126 | ||
33 | </div> | 127 | </div> |
34 | - <div class="row"> | ||
35 | - | ||
36 | - <div class="col-md-6"> | 128 | + <form action="{{ path('cea_solicitudes_actualizar', { 'id': todo.adscripcion.id}) }}" method="POST" |
129 | + name="rechazar"> | ||
130 | + <div class="row"> | ||
37 | 131 | ||
38 | - <div class="col-md-4"> | ||
39 | - <img src="{{ asset('bundles/framework/images/portal/logo_ubv.png') }}" /> | ||
40 | - </div> | 132 | + <div class="col-md-6"> |
41 | 133 | ||
42 | - <div class="col-md-8"> | ||
43 | - | ||
44 | - | ||
45 | - | ||
46 | - <div class="form-group"> | ||
47 | - <label for="username">Fecha de Ingreso UBV:</label> | ||
48 | - <input type="date" class="form-control" id="username" name="primerApellido" value="{{ adscripcion.fechaIngreso|date('Y-m-d') }}" /> | 134 | + <div class="col-md-4"> |
135 | + <img src="{{ asset('bundles/framework/images/portal/logo_ubv.png') }}"/> | ||
49 | </div> | 136 | </div> |
50 | - {% if escalas is not null %} | ||
51 | - <div class="form-group"> | ||
52 | - <label for="Escalafones">Escalafones:</label> | ||
53 | - <table class="table table-striped table-bordered"> | ||
54 | - <th>Escalafón</th> | ||
55 | - <th>Fecha</th> | ||
56 | - <th>Tipo</th> | ||
57 | - {% for escala in escalas %} | ||
58 | - | ||
59 | - <tr> | ||
60 | - <td>{{escala.idEscala }}</td> | ||
61 | - <td>{{escala.fechaEscala | date('d-m-Y') }}</td> | ||
62 | - <td>{{escala.idTipoEscala }}</td> | ||
63 | - </tr> | ||
64 | - {%endfor %} | ||
65 | - </table> | ||
66 | - {% if adscripcion.oposicion is null %} | 137 | + |
138 | + <div class="col-md-8"> | ||
139 | + | ||
140 | + | ||
141 | + <div class="form-group"> | ||
142 | + <label for="username">Fecha de Ingreso UBV:</label> | ||
143 | + <input type="date" class="form-control" id="username" name="primerApellido" | ||
144 | + value="{{ todo.adscripcion.fechaIngreso|date('Y-m-d') }}"/> | ||
145 | + </div> | ||
146 | + {% if todo.escalafones is not null %} | ||
67 | <div class="form-group"> | 147 | <div class="form-group"> |
68 | - <h6 class="alert alert-warning">El Docente al momento de la solicitud informa no haber realizado Concurso de oposición</h6> | ||
69 | - </div> | ||
70 | - <!-- <button class="btn btn-success btn-sm">Añadir Concurso de Oposición</button> --> | ||
71 | - {% endif %} | ||
72 | - | ||
73 | - | ||
74 | - </div> | ||
75 | - {% endif %} | ||
76 | - | ||
77 | - | ||
78 | - {% if adscripcion.idLineaInvestigacion is not null %} | ||
79 | - <div class="form-group"> | ||
80 | - <label for="username">Area y Línea de Investigación:</label> | ||
81 | - <ul> | ||
82 | - <li>{{adscripcion.idLineaInvestigacion.idAreaInvestigacion}}</li> | ||
83 | - <li>{{adscripcion.idLineaInvestigacion}}</li> | ||
84 | - </ul> | ||
85 | - </div> | ||
86 | - {% endif %} | ||
87 | - | ||
88 | - | ||
89 | - {% if adscripcion.tituloTrabajo is not null %} | ||
90 | - <div class="form-group"> | ||
91 | - <label for="titulo">Título del Trabajo:</label> | ||
92 | - <input type="text" class="form-control" value="{{adscripcion.tituloTrabajo}}" /> | ||
93 | - </div> | ||
94 | - {% endif %} | 148 | + <label for="Escalafones">Escalafones:</label> |
149 | + <table class="table table-striped table-bordered"> | ||
150 | + <th>Escalafón</th> | ||
151 | + <th>Fecha</th> | ||
152 | + <th>Tipo</th> | ||
153 | + {% for escala in todo.escalafones %} | ||
154 | + | ||
155 | + <tr> | ||
156 | + <td>{{ escala.idEscala }}</td> | ||
157 | + <td>{{ escala.fechaEscala | date('d-m-Y') }}</td> | ||
158 | + <td>{{ escala.idTipoEscala }}</td> | ||
159 | + </tr> | ||
160 | + {% endfor %} | ||
161 | + </table> | ||
162 | + {% if todo.adscripcion.oposicion is null %} | ||
163 | + <div class="form-group"> | ||
164 | + <h6 class="alert alert-warning">El Docente al momento de la solicitud | ||
165 | + informa no | ||
166 | + haber realizado Concurso de oposición</h6> | ||
167 | + </div> | ||
168 | + <!-- <button class="btn btn-success btn-sm">Añadir Concurso de Oposición</button> --> | ||
169 | + {% endif %} | ||
170 | + | ||
171 | + | ||
172 | + </div> | ||
173 | + {% endif %} | ||
174 | + | ||
175 | + | ||
176 | + {% if todo.adscripcion.idLineaInvestigacion is not null %} | ||
177 | + <div class="form-group"> | ||
178 | + <label for="username">Area y Línea de Investigación:</label> | ||
179 | + <ul> | ||
180 | + <li>{{ todo.adscripcion.idLineaInvestigacion.idAreaInvestigacion }}</li> | ||
181 | + <li>{{ todo.adscripcion.idLineaInvestigacion }}</li> | ||
182 | + </ul> | ||
183 | + </div> | ||
184 | + {% endif %} | ||
185 | + | ||
186 | + | ||
187 | + {% if todo.adscripcion.tituloTrabajo is not null %} | ||
188 | + <div class="form-group"> | ||
189 | + <label for="titulo">Título del Trabajo:</label> | ||
190 | + <input type="text" class="form-control" | ||
191 | + value="{{ todo.adscripcion.tituloTrabajo }}"/> | ||
192 | + </div> | ||
193 | + {% endif %} | ||
95 | 194 | ||
96 | </div> | 195 | </div> |
97 | - </div> | ||
98 | - | ||
99 | - <div class="col-md-5"> | ||
100 | - <h3>Documentos Consignados</h3> | ||
101 | - <div class="widget-content"> | ||
102 | - | ||
103 | - | ||
104 | - | ||
105 | - <div class="col-xs-4"> | ||
106 | - <div class="thumbnail"> | ||
107 | - <a href="{{asset('uploads/adscripcion/'~ adscripcion.trabajo)}}" data-lightbox="adscripcion"> | ||
108 | - <img src="{{ asset('uploads/adscripcion/thumb/'~ adscripcion.trabajo) }}" /> | ||
109 | - </a> | ||
110 | - <div class="caption"> | ||
111 | - <p>Constancia de Trabajo</p> | ||
112 | - </div> | ||
113 | - </div> | ||
114 | - </div> | ||
115 | - | ||
116 | - <div class="col-xs-4"> | ||
117 | - <div class="thumbnail"> | ||
118 | - <a href="{{asset('uploads/adscripcion/'~ adscripcion.pregrado)}}" data-lightbox="adscripcion"> | ||
119 | - <img src="{{ asset('uploads/adscripcion/thumb/'~ adscripcion.pregrado) }}" /> | ||
120 | - </a> | ||
121 | - <div class="caption"> | ||
122 | - <p>Título de Pregrado</p> | ||
123 | - </div> | ||
124 | - </div> | ||
125 | - </div> | ||
126 | - | ||
127 | - {% if adscripcion.postgrado is not null %} | ||
128 | - <div class="col-xs-4"> | ||
129 | - <div class="thumbnail"> | ||
130 | - <a href="{{asset('uploads/adscripcion/'~ adscripcion.postgrado)}}" data-lightbox="adscripcion"> | ||
131 | - <img src="{{ asset('uploads/adscripcion/thumb/'~ adscripcion.postgrado) }}" /> | ||
132 | - </a> | ||
133 | - <div class="caption"> | ||
134 | - <p>Título de Postgrado</p> | ||
135 | - </div> | ||
136 | - </div> | ||
137 | - </div> | ||
138 | - {% endif %} | ||
139 | - | ||
140 | - {% if adscripcion.oposicion is not null %} | ||
141 | - <div class="col-xs-4"> | ||
142 | - <div class="thumbnail"> | ||
143 | - <a href="{{asset('uploads/adscripcion/'~ adscripcion.oposicion)}}" data-lightbox="adscripcion"> | ||
144 | - <img src="{{ asset('uploads/adscripcion/thumb/'~ adscripcion.oposicion) }}" /> | ||
145 | - </a> | ||
146 | - <div class="caption"> | ||
147 | - <p>Concurso de Oposición</p> | ||
148 | - </div> | ||
149 | - </div> | ||
150 | - </div> | ||
151 | - {% endif %} | ||
152 | - | ||
153 | - | ||
154 | - | ||
155 | - {% if adscripcion.asistente is not null %} | ||
156 | - <div class="col-xs-4"> | ||
157 | - <div class="thumbnail"> | ||
158 | - <a href="{{asset('uploads/ascenso/'~ adscripcion.asistente)}}" data-lightbox="adscripcion"> | ||
159 | - <img src="{{ asset('uploads/ascenso/thumb/'~ adscripcion.asistente) }}" /> | ||
160 | - </a> | ||
161 | - <div class="caption"> | ||
162 | - <p>Ascenso Asistente</p> | ||
163 | - </div> | ||
164 | - </div> | ||
165 | - </div> | ||
166 | - {% endif %} | ||
167 | - | ||
168 | - {% if adscripcion.agreado is not null %} | ||
169 | - <div class="col-xs-4"> | ||
170 | - <div class="thumbnail"> | ||
171 | - <a href="{{asset('uploads/ascenso/'~ adscripcion.agreado)}}" data-lightbox="adscripcion"> | ||
172 | - <img src="{{ asset('uploads/ascenso/thumb/'~ adscripcion.agreado) }}" /> | ||
173 | - </a> | ||
174 | - <div class="caption"> | ||
175 | - <p>Ascenso Agregado</p> | ||
176 | - </div> | ||
177 | - </div> | ||
178 | - </div> | ||
179 | - {% endif %} | ||
180 | - | ||
181 | - | ||
182 | - {% if adscripcion.asociado is not null %} | ||
183 | - <div class="col-xs-4"> | ||
184 | - <div class="thumbnail"> | ||
185 | - <a href="{{asset('uploads/ascenso/'~ adscripcion.asociado)}}" data-lightbox="adscripcion"> | ||
186 | - <img src="{{ asset('uploads/ascenso/thumb/'~ adscripcion.asociado) }}" /> | ||
187 | - </a> | ||
188 | - <div class="caption"> | ||
189 | - <p>Ascenso Asociado</p> | ||
190 | - </div> | ||
191 | - </div> | ||
192 | - </div> | ||
193 | - {% endif %} | ||
194 | - | ||
195 | - {% if adscripcion.titular is not null %} | ||
196 | - <div class="col-xs-4"> | ||
197 | - <div class="thumbnail"> | ||
198 | - <a href="{{asset('uploads/ascenso/'~ adscripcion.titular)}}" data-lightbox="adscripcion"> | ||
199 | - <img src="{{ asset('uploads/ascenso/thumb/'~ adscripcion.titular) }}" /> | ||
200 | - </a> | ||
201 | - <div class="caption"> | ||
202 | - <p>Ascenso Titular</p> | ||
203 | - </div> | ||
204 | - </div> | ||
205 | - </div> | ||
206 | - {% endif %} | ||
207 | - | ||
208 | - | ||
209 | - | ||
210 | - | ||
211 | - | ||
212 | - | ||
213 | - | ||
214 | - | ||
215 | - | 196 | + </div> |
197 | + <div class="col-md-5"> | ||
198 | + <h3>Documentos Consignados</h3> | ||
199 | + | ||
200 | + <div class="widget-content"> | ||
201 | + | ||
202 | + {% for verificado in todo.documentosVerificados %} | ||
203 | + {{ dump(verificado.idTipoDocumentos.identificador)}} | ||
204 | + <div class="col-xs-4"> | ||
205 | + <div class="thumbnail"> | ||
206 | + <a href="{{ asset('uploads/adscripcion/'~ todo.adscripcion.trabajo) }}" | ||
207 | + data-lightbox="adscripcion"> | ||
208 | + <img src="{{ asset('uploads/adscripcion/thumb/'~ todo.adscripcion.trabajo) }}"/> | ||
209 | + </a> | ||
210 | + <div class="caption"> | ||
211 | + <p>Constancia de Trabajo</p> | ||
212 | + <div class="wrapper"> | ||
213 | + <label for="yes_radio" class="yes-lbl"><i class="fa fa-check"></i> | ||
214 | + </label><input type="radio" value="1" name="trabajo" class="yes_radio" | ||
215 | + id="yes_radio"> | ||
216 | + <label for="maybe_radio" class="maybe-lbl"><i | ||
217 | + class="fa fa-question"></i></label><input type="radio" value="" | ||
218 | + name="trabajo" | ||
219 | + class="maybe_radio" | ||
220 | + id="maybe_radio" | ||
221 | + checked="checked" | ||
222 | + disabled> | ||
223 | + <label for="no_radio" class="no-lbl"><i | ||
224 | + class="fa fa-close"></i></label><input type="radio" value="3" | ||
225 | + name="trabajo" | ||
226 | + class="no_radio" | ||
227 | + id="no_radio"> | ||
216 | 228 | ||
229 | + <div class="toggle"></div> | ||
230 | + </div> | ||
231 | + </div> | ||
232 | + </div> | ||
233 | + </div> | ||
234 | + {% endfor %} | ||
235 | + <div class="col-xs-4"> | ||
236 | + <div class="thumbnail"> | ||
237 | + <a href="{{ asset('uploads/adscripcion/'~ todo.adscripcion.trabajo) }}" | ||
238 | + data-lightbox="adscripcion"> | ||
239 | + <img src="{{ asset('uploads/adscripcion/thumb/'~ todo.adscripcion.trabajo) }}"/> | ||
240 | + </a> | ||
241 | + <div class="caption"> | ||
242 | + <p>Constancia de Trabajo</p> | ||
243 | + <div class="wrapper"> | ||
244 | + <label for="yes_radio" class="yes-lbl"><i class="fa fa-check"></i> | ||
245 | + </label><input type="radio" value="1" name="trabajo" class="yes_radio" | ||
246 | + id="yes_radio"> | ||
247 | + <label for="maybe_radio" class="maybe-lbl"><i | ||
248 | + class="fa fa-question"></i></label><input type="radio" value="" | ||
249 | + name="trabajo" | ||
250 | + class="maybe_radio" | ||
251 | + id="maybe_radio" | ||
252 | + checked="checked" | ||
253 | + disabled> | ||
254 | + <label for="no_radio" class="no-lbl"><i | ||
255 | + class="fa fa-close"></i></label><input type="radio" value="3" | ||
256 | + name="trabajo" | ||
257 | + class="no_radio" | ||
258 | + id="no_radio"> | ||
259 | + | ||
260 | + <div class="toggle"></div> | ||
261 | + </div> | ||
262 | + </div> | ||
263 | + </div> | ||
264 | + </div> | ||
265 | + | ||
266 | + <div class="col-xs-4"> | ||
267 | + <div class="thumbnail"> | ||
268 | + <a href="{{ asset('uploads/adscripcion/'~ todo.adscripcion.pregrado) }}" | ||
269 | + data-lightbox="adscripcion"> | ||
270 | + <img src="{{ asset('uploads/adscripcion/thumb/'~ todo.adscripcion.pregrado) }}"/> | ||
271 | + </a> | ||
272 | + <div class="caption"> | ||
273 | + <p>Título de Pregrado</p> | ||
274 | + <div class="wrapper"> | ||
275 | + <label for="yes_radio1" class="yes-lbl"><i class="fa fa-check"></i> </label><input | ||
276 | + type="radio" value="1" name="pregrado" class="yes_radio" | ||
277 | + id="yes_radio1"> | ||
278 | + <label for="maybe_radio1" class="maybe-lbl"><i | ||
279 | + class="fa fa-question"></i></label><input type="radio" value="" | ||
280 | + name="pregrado" | ||
281 | + class="maybe_radio" | ||
282 | + id="maybe_radio1" | ||
283 | + checked="checked" | ||
284 | + disabled> | ||
285 | + <label for="no_radio1" class="no-lbl"><i | ||
286 | + class="fa fa-close"></i></label><input type="radio" value="3" | ||
287 | + name="pregrado" | ||
288 | + class="no_radio" | ||
289 | + id="no_radio1"> | ||
290 | + | ||
291 | + <div class="toggle"></div> | ||
292 | + </div> | ||
293 | + </div> | ||
294 | + | ||
295 | + </div> | ||
296 | + </div> | ||
297 | + | ||
298 | + {% if todo.adscripcion.postgrado is not null %} | ||
299 | + <div class="col-xs-4"> | ||
300 | + <div class="thumbnail"> | ||
301 | + <a href="{{ asset('uploads/adscripcion/'~ todo.adscripcion.postgrado) }}" | ||
302 | + data-lightbox="adscripcion"> | ||
303 | + <img src="{{ asset('uploads/adscripcion/thumb/'~ todo.adscripcion.postgrado) }}"/> | ||
304 | + </a> | ||
305 | + <div class="caption"> | ||
306 | + <p>Título de Postgrado</p> | ||
307 | + <div class="wrapper"> | ||
308 | + <label for="yes_radio2" class="yes-lbl"><i class="fa fa-check"></i> | ||
309 | + </label><input type="radio" value="1" name="postgrado" class="yes_radio" | ||
310 | + id="yes_radio2"> | ||
311 | + <label for="maybe_radio2" class="maybe-lbl"><i | ||
312 | + class="fa fa-question"></i></label><input type="radio" | ||
313 | + value="" | ||
314 | + name="postgrado" | ||
315 | + class="maybe_radio" | ||
316 | + id="maybe_radio2" | ||
317 | + checked="checked" | ||
318 | + disabled> | ||
319 | + <label for="no_radio2" class="no-lbl"><i | ||
320 | + class="fa fa-close"></i></label><input type="radio" | ||
321 | + value="3" | ||
322 | + name="postgrado" | ||
323 | + class="no_radio" | ||
324 | + id="no_radio2"> | ||
325 | + | ||
326 | + <div class="toggle"></div> | ||
327 | + </div> | ||
328 | + </div> | ||
329 | + </div> | ||
330 | + </div> | ||
331 | + {% endif %} | ||
332 | + | ||
333 | + {% if todo.adscripcion.oposicion is not null %} | ||
334 | + <div class="col-xs-4"> | ||
335 | + <div class="thumbnail"> | ||
336 | + <a href="{{ asset('uploads/adscripcion/'~ todo.adscripcion.oposicion) }}" | ||
337 | + data-lightbox="adscripcion"> | ||
338 | + <img src="{{ asset('uploads/adscripcion/thumb/'~ todo.adscripcion.oposicion) }}"/> | ||
339 | + </a> | ||
340 | + <div class="caption"> | ||
341 | + <p>Concurso de Oposición</p> | ||
342 | + <div class="wrapper"> | ||
343 | + <label for="yes_radio3" class="yes-lbl"><i class="fa fa-check"></i> | ||
344 | + </label><input type="radio" value="1" name="oposicion" class="yes_radio" | ||
345 | + id="yes_radio3"> | ||
346 | + <label for="maybe_radio3" class="maybe-lbl"> | ||
347 | + <i class="fa fa-question"></i> | ||
348 | + </label> | ||
349 | + <input type="radio" value="" name="oposicion" class="maybe_radio" id="maybe_radio3" checked="checked" disabled> | ||
350 | + <label for="no_radio3" class="no-lbl"><i | ||
351 | + class="fa fa-close"></i></label><input type="radio" | ||
352 | + value="3" | ||
353 | + name="oposicion" | ||
354 | + class="no_radio" | ||
355 | + id="no_radio3"> | ||
356 | + | ||
357 | + <div class="toggle"></div> | ||
358 | + </div> | ||
359 | + </div> | ||
360 | + </div> | ||
361 | + </div> | ||
362 | + {% endif %} | ||
363 | + | ||
364 | + | ||
365 | + | ||
366 | + {% if todo.adscripcion.asistente is not null %} | ||
367 | + <div class="col-xs-4"> | ||
368 | + <div class="thumbnail"> | ||
369 | + <a href="{{ asset('uploads/ascenso/'~ todo.adscripcion.asistente) }}" | ||
370 | + data-lightbox="adscripcion"> | ||
371 | + <img src="{{ asset('uploads/ascenso/thumb/'~ todo.adscripcion.asistente) }}"/> | ||
372 | + </a> | ||
373 | + <div class="caption"> | ||
374 | + <p>Ascenso Asistente</p> | ||
375 | + <div class="wrapper"> | ||
376 | + <label for="yes_radio4" class="yes-lbl"><i class="fa fa-check"></i> | ||
377 | + </label><input type="radio" value="1" name="asistente" class="yes_radio" | ||
378 | + id="yes_radio4"> | ||
379 | + <label for="maybe_radio4" class="maybe-lbl"><i | ||
380 | + class="fa fa-question"></i></label><input type="radio" | ||
381 | + value="" | ||
382 | + name="asistente" | ||
383 | + class="maybe_radio" | ||
384 | + id="maybe_radio4" | ||
385 | + checked="checked" | ||
386 | + disabled> | ||
387 | + <label for="no_radio4" class="no-lbl"><i | ||
388 | + class="fa fa-close"></i></label><input type="radio" | ||
389 | + value="3" | ||
390 | + name="asistente" | ||
391 | + class="no_radio" | ||
392 | + id="no_radio4"> | ||
393 | + | ||
394 | + <div class="toggle"></div> | ||
395 | + </div> | ||
396 | + </div> | ||
397 | + </div> | ||
398 | + </div> | ||
399 | + {% endif %} | ||
400 | + | ||
401 | + {% if todo.adscripcion.agreado is not null %} | ||
402 | + <div class="col-xs-4"> | ||
403 | + <div class="thumbnail"> | ||
404 | + <a href="{{ asset('uploads/ascenso/'~ todo.adscripcion.agreado) }}" | ||
405 | + data-lightbox="adscripcion"> | ||
406 | + <img src="{{ asset('uploads/ascenso/thumb/'~ todo.adscripcion.agreado) }}"/> | ||
407 | + </a> | ||
408 | + <div class="caption"> | ||
409 | + <p>Ascenso Agregado</p> | ||
410 | + <div class="wrapper"> | ||
411 | + <label for="yes_radio5" class="yes-lbl"><i class="fa fa-check"></i> | ||
412 | + </label><input type="radio" value="1" name="agregado" class="yes_radio" | ||
413 | + id="yes_radio5"> | ||
414 | + <label for="maybe_radio5" class="maybe-lbl"><i | ||
415 | + class="fa fa-question"></i></label><input type="radio" | ||
416 | + value="" | ||
417 | + name="agregado" | ||
418 | + class="maybe_radio" | ||
419 | + id="maybe_radio5" | ||
420 | + checked="checked" | ||
421 | + disabled> | ||
422 | + <label for="no_radio5" class="no-lbl"><i | ||
423 | + class="fa fa-close"></i></label><input type="radio" | ||
424 | + value="3" | ||
425 | + name="agregado" | ||
426 | + class="no_radio" | ||
427 | + id="no_radio5"> | ||
428 | + | ||
429 | + <div class="toggle"></div> | ||
430 | + </div> | ||
431 | + </div> | ||
432 | + </div> | ||
433 | + </div> | ||
434 | + {% endif %} | ||
435 | + | ||
436 | + | ||
437 | + {% if todo.adscripcion.asociado is not null %} | ||
438 | + <div class="col-xs-4"> | ||
439 | + <div class="thumbnail"> | ||
440 | + <a href="{{ asset('uploads/ascenso/'~ todo.adscripcion.asociado) }}" | ||
441 | + data-lightbox="adscripcion"> | ||
442 | + <img src="{{ asset('uploads/ascenso/thumb/'~ todo.adscripcion.asociado) }}"/> | ||
443 | + </a> | ||
444 | + <div class="caption"> | ||
445 | + <p>Ascenso Asociado</p> | ||
446 | + <div class="wrapper"> | ||
447 | + <label for="yes_radio6" class="yes-lbl"><i class="fa fa-check"></i> | ||
448 | + </label><input type="radio" value="1" name="asociado" class="yes_radio" | ||
449 | + id="yes_radio6"> | ||
450 | + <label for="maybe_radio6" class="maybe-lbl"><i | ||
451 | + class="fa fa-question"></i></label><input type="radio" | ||
452 | + value="" | ||
453 | + name="asociado" | ||
454 | + class="maybe_radio" | ||
455 | + id="maybe_radio6" | ||
456 | + checked="checked" | ||
457 | + disabled> | ||
458 | + <label for="no_radio6" class="no-lbl"><i | ||
459 | + class="fa fa-close"></i></label><input type="radio" | ||
460 | + value="3" | ||
461 | + name="asociado" | ||
462 | + class="no_radio" | ||
463 | + id="no_radio6"> | ||
464 | + | ||
465 | + <div class="toggle"></div> | ||
466 | + </div> | ||
467 | + </div> | ||
468 | + </div> | ||
469 | + </div> | ||
470 | + {% endif %} | ||
471 | + | ||
472 | + {% if todo.adscripcion.titular is not null %} | ||
473 | + <div class="col-xs-4"> | ||
474 | + <div class="thumbnail"> | ||
475 | + <a href="{{ asset('uploads/ascenso/'~ todo.adscripcion.titular) }}" | ||
476 | + data-lightbox="adscripcion"> | ||
477 | + <img src="{{ asset('uploads/ascenso/thumb/'~ todo.adscripcion.titular) }}"/> | ||
478 | + </a> | ||
479 | + <div class="caption"> | ||
480 | + <p>Ascenso Titular</p> | ||
481 | + <div class="wrapper"> | ||
482 | + <label for="yes_radio7" class="yes-lbl"><i class="fa fa-check"></i> | ||
483 | + </label><input type="radio" value="1" name="titular" class="yes_radio" | ||
484 | + id="yes_radio7"> | ||
485 | + <label for="maybe_radio7" class="maybe-lbl"><i | ||
486 | + class="fa fa-question"></i></label><input type="radio" | ||
487 | + value="" | ||
488 | + name="titular" | ||
489 | + class="maybe_radio" | ||
490 | + id="maybe_radio7" | ||
491 | + checked="checked" | ||
492 | + disabled> | ||
493 | + <label for="no_radio7" class="no-lbl"><i | ||
494 | + class="fa fa-close"></i></label><input type="radio" | ||
495 | + value="3" | ||
496 | + name="titular" | ||
497 | + class="no_radio" | ||
498 | + id="no_radio7"> | ||
499 | + | ||
500 | + <div class="toggle"></div> | ||
501 | + </div> | ||
502 | + </div> | ||
503 | + </div> | ||
504 | + </div> | ||
505 | + {% endif %} | ||
506 | + | ||
507 | + | ||
508 | + </div> | ||
217 | </div> | 509 | </div> |
510 | + | ||
511 | + | ||
218 | </div> | 512 | </div> |
219 | - | ||
220 | - | ||
221 | 513 | ||
222 | - </div> | ||
223 | - <!-- MOSTRAR ACTIVIDAD PIDA DEL DOCENTE --> | ||
224 | - {% if not pida %} | ||
225 | - <p class="alert alert-warning">El Docente no ha registrado todavía su actividad PIDA</p> | ||
226 | - {% else %} | ||
227 | - <div class="form-group"> | ||
228 | - <label for="pida">PIDA:</label> | 514 | + <!-- MOSTRAR ACTIVIDAD PIDA DEL DOCENTE --> |
515 | + {% if not todo.pida %} | ||
516 | + <p class="alert alert-warning">El Docente no ha registrado todavía su actividad PIDA</p> | ||
517 | + {% else %} | ||
518 | + <div class="form-group"> | ||
519 | + <label for="pida">PIDA:</label> | ||
520 | + {% for pida in todo.pida %} | ||
229 | <ul> | 521 | <ul> |
230 | - <li>Objetivo Estratégico: {{pida.idPlanHistoricoNacionalEstrategico.nombre}}</li> | 522 | + <li>Objetivo Estratégico: {{ pida.idPlanHistoricoNacionalEstrategico.nombre }}</li> |
231 | <li>Ámbito: {{ pida.idActividadDocente.nombre }}</li> | 523 | <li>Ámbito: {{ pida.idActividadDocente.nombre }}</li> |
232 | <li>Objetivo Específico: {{ pida.ObjetivoEspecifico }}</li> | 524 | <li>Objetivo Específico: {{ pida.ObjetivoEspecifico }}</li> |
233 | <li>Fecha inicio: {{ pida.fechaInicio | date('d-m-Y') }} </li> | 525 | <li>Fecha inicio: {{ pida.fechaInicio | date('d-m-Y') }} </li> |
234 | <li>Fecha final: {{ pida.fechaFinal | date('d-m-Y') }} </li> | 526 | <li>Fecha final: {{ pida.fechaFinal | date('d-m-Y') }} </li> |
235 | - | ||
236 | - </ul> | ||
237 | - </div> | ||
238 | - {% endif %} | ||
239 | - <a class="btn btn-success btn-sm" href="{{ path('cea_solicitudes_actualizar', { 'id': adscripcion.id, 'estatus' : 'true' }) }}" ><span class="fa fa-check"></span> Aprobar</a> | ||
240 | - <a class="btn btn-danger btn-sm" data-toggle="modal" data-target="#motivo_rechazo" ><span class="fa fa-close"></span> Rechazar</a> | ||
241 | - | ||
242 | - | ||
243 | - <!-- Modal --> | ||
244 | -<div class="modal fade" id="motivo_rechazo" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"> | ||
245 | - <div class="modal-dialog" role="document"> | ||
246 | - <form action="{{ path('cea_solicitudes_actualizar', { 'id': adscripcion.id, 'estatus' : 'false' }) }}" method="POST" name="rechazar"> | ||
247 | - <div class="modal-content"> | ||
248 | - <div class="modal-header"> | ||
249 | - <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button> | ||
250 | - <h4 class="modal-title" id="myModalLabel">Rechazo de Solicitud</h4> | ||
251 | - </div> | ||
252 | - | ||
253 | - <div class="modal-body"> | ||
254 | - | ||
255 | - | ||
256 | - <div class="form-group"> | ||
257 | - <label for="message-text" class="control-label">Mensaje:</label> | ||
258 | - <textarea class="form-control" id="message-text" name="message-text"></textarea> | ||
259 | - </div> | ||
260 | - | ||
261 | - </div> | ||
262 | - <div class="modal-footer"> | ||
263 | - <button type="button" class="btn btn-default" data-dismiss="modal">Close</button> | ||
264 | - <button type="submit" class="btn btn-primary">Enviar Correo</button> | ||
265 | - </div> | ||
266 | - </div> | ||
267 | - </form> | ||
268 | - </div> | ||
269 | -</div> | 527 | + |
528 | + </ul> | ||
529 | + {% endfor %} | ||
530 | + | ||
531 | + </div> | ||
532 | + {% endif %} | ||
533 | + <button type="submit" class="btn btn-success" id="aprobar" name="aprobar">Aprobar</button> | ||
534 | + <a data-toggle="modal" data-target="#motivo_rechazo" class="btn btn-danger">Rechazar</a> | ||
535 | + | ||
536 | + | ||
537 | + <!-- Modal --> | ||
538 | + <div class="modal fade" id="motivo_rechazo" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"> | ||
539 | + <div class="modal-dialog" role="document"> | ||
540 | + | ||
541 | + <div class="modal-content"> | ||
542 | + <div class="modal-header"> | ||
543 | + <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span | ||
544 | + aria-hidden="true">×</span></button> | ||
545 | + <h4 class="modal-title" id="myModalLabel">Rechazo de Solicitud</h4> | ||
546 | + </div> | ||
547 | + | ||
548 | + <div class="modal-body"> | ||
549 | + | ||
550 | + | ||
551 | + <div class="form-group"> | ||
552 | + <label for="message-text" class="control-label">Mensaje:</label> | ||
553 | + <textarea class="form-control" id="message-text" name="message-text"></textarea> | ||
554 | + </div> | ||
555 | + | ||
556 | + </div> | ||
557 | + <div class="modal-footer"> | ||
558 | + <button type="button" class="btn btn-default" data-dismiss="modal">Close</button> | ||
559 | + <button type="submit" class="btn btn-primary" name="rechazar" id="rechazar">Enviar | ||
560 | + Correo | ||
561 | + </button> | ||
562 | + </div> | ||
563 | + </div> | ||
564 | + | ||
565 | + </div> | ||
566 | + </div> | ||
270 | </div> | 567 | </div> |
271 | - | 568 | + |
272 | </div> | 569 | </div> |
273 | - | 570 | + </form> |
274 | {% endblock %} | 571 | {% endblock %} |
275 | 572 | ||
276 | 573 | ||
277 | {% block javascripts %} | 574 | {% block javascripts %} |
278 | {{ parent() }} | 575 | {{ parent() }} |
279 | <script type="text/javascript" src="{{ asset('assets/vendor/lightbox2/dist/js/lightbox.min.js') }}"></script> | 576 | <script type="text/javascript" src="{{ asset('assets/vendor/lightbox2/dist/js/lightbox.min.js') }}"></script> |
280 | - {% endblock %} | ||
281 | \ No newline at end of file | 577 | \ No newline at end of file |
578 | +{% endblock %} | ||
282 | \ No newline at end of file | 579 | \ No newline at end of file |
src/AppBundle/Controller/AdscripcionController.php
@@ -8,7 +8,7 @@ | @@ -8,7 +8,7 @@ | ||
8 | 8 | ||
9 | namespace AppBundle\Controller; | 9 | namespace AppBundle\Controller; |
10 | 10 | ||
11 | -use AppBundle\Form\UserType; | 11 | +use AppBundle\Entity\DocumentosVerificados; |
12 | use Symfony\Component\HttpFoundation\File\UploadedFile; | 12 | use Symfony\Component\HttpFoundation\File\UploadedFile; |
13 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; | 13 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; |
14 | use Symfony\Bundle\FrameworkBundle\Controller\Controller; | 14 | use Symfony\Bundle\FrameworkBundle\Controller\Controller; |
@@ -38,6 +38,7 @@ class AdscripcionController extends Controller | @@ -38,6 +38,7 @@ class AdscripcionController extends Controller | ||
38 | $adscripcion = new Adscripcion(); | 38 | $adscripcion = new Adscripcion(); |
39 | $escala = new DocenteEscala(); | 39 | $escala = new DocenteEscala(); |
40 | 40 | ||
41 | + | ||
41 | /** @var TYPE_NAME $form */ | 42 | /** @var TYPE_NAME $form */ |
42 | $form = $this->createForm('AppBundle\Form\UserType'); | 43 | $form = $this->createForm('AppBundle\Form\UserType'); |
43 | $form->handleRequest($request); | 44 | $form->handleRequest($request); |
@@ -45,8 +46,9 @@ class AdscripcionController extends Controller | @@ -45,8 +46,9 @@ class AdscripcionController extends Controller | ||
45 | $form->get('escala')->getData(); | 46 | $form->get('escala')->getData(); |
46 | 47 | ||
47 | if ($form->isSubmitted() && $form->isValid()) { | 48 | if ($form->isSubmitted() && $form->isValid()) { |
49 | + $em = $this->getDoctrine()->getManager(); | ||
48 | //var_dump($form->get('lineas_investigacion')->getData()); exit; | 50 | //var_dump($form->get('lineas_investigacion')->getData()); exit; |
49 | - | 51 | + verificar_documentos($this->getUser()->getIdRolInstitucion()->getId(), 1, 2, $em); |
50 | // $file stores the uploaded PDF file | 52 | // $file stores the uploaded PDF file |
51 | /** @var UploadedFile $constanciaTrabajo */ | 53 | /** @var UploadedFile $constanciaTrabajo */ |
52 | $constanciaTrabajo = $form->get('trabajo')->getData(); | 54 | $constanciaTrabajo = $form->get('trabajo')->getData(); |
@@ -71,7 +73,7 @@ class AdscripcionController extends Controller | @@ -71,7 +73,7 @@ class AdscripcionController extends Controller | ||
71 | $nombrePregrado | 73 | $nombrePregrado |
72 | ); | 74 | ); |
73 | thumbnail($nombrePregrado, $this->container->getParameter('adscripcion_directory'), $this->container->getParameter('adscripcion_thumb_directory')); | 75 | thumbnail($nombrePregrado, $this->container->getParameter('adscripcion_directory'), $this->container->getParameter('adscripcion_thumb_directory')); |
74 | - | 76 | + verificar_documentos($this->getUser()->getIdRolInstitucion()->getId(), 2, 2, $em); |
75 | if($form->get('postgrado')->getData()) { | 77 | if($form->get('postgrado')->getData()) { |
76 | /** @var UploadedFile $constanciaPostgrado */ | 78 | /** @var UploadedFile $constanciaPostgrado */ |
77 | $constanciaPostgrado = $form->get('postgrado')->getData(); | 79 | $constanciaPostgrado = $form->get('postgrado')->getData(); |
@@ -82,11 +84,12 @@ class AdscripcionController extends Controller | @@ -82,11 +84,12 @@ class AdscripcionController extends Controller | ||
82 | ); | 84 | ); |
83 | thumbnail($nombrePostgrado, $this->container->getParameter('adscripcion_directory'), $this->container->getParameter('adscripcion_thumb_directory')); | 85 | thumbnail($nombrePostgrado, $this->container->getParameter('adscripcion_directory'), $this->container->getParameter('adscripcion_thumb_directory')); |
84 | $adscripcion->setPostgrado($nombrePostgrado); | 86 | $adscripcion->setPostgrado($nombrePostgrado); |
87 | + verificar_documentos($this->getUser()->getIdRolInstitucion()->getId(), 3, 2, $em); | ||
85 | } | 88 | } |
86 | - $em = $this->getDoctrine()->getManager(); | 89 | + |
87 | 90 | ||
88 | $adscripcion->setTrabajo($nombreTrabajo); | 91 | $adscripcion->setTrabajo($nombreTrabajo); |
89 | - $adscripcion->setPregrado($nombrePregrado); | 92 | + $adscripcion->setPregrado($nombrePregrado); |
90 | $adscripcion->setIdRolInstitucion($this->getUser()->getIdRolInstitucion()); | 93 | $adscripcion->setIdRolInstitucion($this->getUser()->getIdRolInstitucion()); |
91 | $adscripcion->setFechaIngreso($form->get('fecha_ingreso')->getData()); | 94 | $adscripcion->setFechaIngreso($form->get('fecha_ingreso')->getData()); |
92 | $adscripcion->setIdEstatus($this->getDoctrine()->getRepository('AppBundle:Estatus')->findOneById(2)); | 95 | $adscripcion->setIdEstatus($this->getDoctrine()->getRepository('AppBundle:Estatus')->findOneById(2)); |
@@ -121,7 +124,8 @@ class AdscripcionController extends Controller | @@ -121,7 +124,8 @@ class AdscripcionController extends Controller | ||
121 | $nombreOposicion | 124 | $nombreOposicion |
122 | ); | 125 | ); |
123 | thumbnail($nombreOposicion, $this->container->getParameter('adscripcion_directory'), $this->container->getParameter('adscripcion_thumb_directory')); | 126 | thumbnail($nombreOposicion, $this->container->getParameter('adscripcion_directory'), $this->container->getParameter('adscripcion_thumb_directory')); |
124 | - $adscripcion->setOposicion($nombreOposicion); | 127 | + $adscripcion->setOposicion($nombreOposicion); |
128 | + verificar_documentos($this->getUser()->getIdRolInstitucion()->getId(), 4, 2, $em); | ||
125 | } | 129 | } |
126 | 130 | ||
127 | 131 | ||
@@ -135,6 +139,7 @@ class AdscripcionController extends Controller | @@ -135,6 +139,7 @@ class AdscripcionController extends Controller | ||
135 | $escala2->setIdEscala($asistente); | 139 | $escala2->setIdEscala($asistente); |
136 | $escala2->setIdTipoEscala($this->getDoctrine()->getRepository('AppBundle:TipoAscenso')->findOneById(2)); | 140 | $escala2->setIdTipoEscala($this->getDoctrine()->getRepository('AppBundle:TipoAscenso')->findOneById(2)); |
137 | $em->persist($escala2); | 141 | $em->persist($escala2); |
142 | + verificar_documentos($this->getUser()->getIdRolInstitucion()->getId(), 5, 2, $em); | ||
138 | 143 | ||
139 | $constanciaAsistente = $form->get('documento_asistente')->getData(); | 144 | $constanciaAsistente = $form->get('documento_asistente')->getData(); |
140 | $nombreAsistente = md5(uniqid()).'.'.$constanciaAsistente->guessExtension(); | 145 | $nombreAsistente = md5(uniqid()).'.'.$constanciaAsistente->guessExtension(); |
@@ -156,6 +161,7 @@ class AdscripcionController extends Controller | @@ -156,6 +161,7 @@ class AdscripcionController extends Controller | ||
156 | $escala3->setIdEscala($asociado); | 161 | $escala3->setIdEscala($asociado); |
157 | $escala3->setIdTipoEscala($this->getDoctrine()->getRepository('AppBundle:TipoAscenso')->findOneById(2)); | 162 | $escala3->setIdTipoEscala($this->getDoctrine()->getRepository('AppBundle:TipoAscenso')->findOneById(2)); |
158 | $em->persist($escala3); | 163 | $em->persist($escala3); |
164 | + verificar_documentos($this->getUser()->getIdRolInstitucion()->getId(), 6, 2, $em); | ||
159 | 165 | ||
160 | $constanciaAsociado = $form->get('documento_asociado')->getData(); | 166 | $constanciaAsociado = $form->get('documento_asociado')->getData(); |
161 | $nombreAsociado = md5(uniqid()).'.'.$constanciaAsociado->guessExtension(); | 167 | $nombreAsociado = md5(uniqid()).'.'.$constanciaAsociado->guessExtension(); |
@@ -176,6 +182,7 @@ class AdscripcionController extends Controller | @@ -176,6 +182,7 @@ class AdscripcionController extends Controller | ||
176 | $escala4->setIdEscala($agregado); | 182 | $escala4->setIdEscala($agregado); |
177 | $escala4->setIdTipoEscala($this->getDoctrine()->getRepository('AppBundle:TipoAscenso')->findOneById(2)); | 183 | $escala4->setIdTipoEscala($this->getDoctrine()->getRepository('AppBundle:TipoAscenso')->findOneById(2)); |
178 | $em->persist($escala4); | 184 | $em->persist($escala4); |
185 | + verificar_documentos($this->getUser()->getIdRolInstitucion()->getId(), 7, 2, $em); | ||
179 | 186 | ||
180 | $constanciaAgregado = $form->get('documento_agregado')->getData(); | 187 | $constanciaAgregado = $form->get('documento_agregado')->getData(); |
181 | $nombreAgregado = md5(uniqid()).'.'.$constanciaAgregado->guessExtension(); | 188 | $nombreAgregado = md5(uniqid()).'.'.$constanciaAgregado->guessExtension(); |
@@ -196,6 +203,7 @@ class AdscripcionController extends Controller | @@ -196,6 +203,7 @@ class AdscripcionController extends Controller | ||
196 | $escala5->setIdEscala($titular); | 203 | $escala5->setIdEscala($titular); |
197 | $escala5->setIdTipoEscala($this->getDoctrine()->getRepository('AppBundle:TipoAscenso')->findOneById(2)); | 204 | $escala5->setIdTipoEscala($this->getDoctrine()->getRepository('AppBundle:TipoAscenso')->findOneById(2)); |
198 | $em->persist($escala5); | 205 | $em->persist($escala5); |
206 | + verificar_documentos($this->getUser()->getIdRolInstitucion()->getId(), 8, 2, $em); | ||
199 | 207 | ||
200 | $constanciaTitular = $form->get('documento_titular')->getData(); | 208 | $constanciaTitular = $form->get('documento_titular')->getData(); |
201 | $nombreTitular = md5(uniqid()).'.'.$constanciaTitular->guessExtension(); | 209 | $nombreTitular = md5(uniqid()).'.'.$constanciaTitular->guessExtension(); |
@@ -365,24 +373,15 @@ class AdscripcionController extends Controller | @@ -365,24 +373,15 @@ class AdscripcionController extends Controller | ||
365 | */ | 373 | */ |
366 | public function solicitudesAdscripcionShowAction(DocenteServicio $servicio) | 374 | public function solicitudesAdscripcionShowAction(DocenteServicio $servicio) |
367 | { | 375 | { |
368 | - $escala = $this->getDoctrine()->getRepository('AppBundle:DocenteEscala')->findBy(array( | ||
369 | - 'idRolInstitucion' => $servicio->getIdRolInstitucion()->getId() | ||
370 | - )); | ||
371 | - | ||
372 | - $adscripcion = $this->getDoctrine()->getRepository('AppBundle:Adscripcion')->findOneByIdRolInstitucion($servicio->getIdRolInstitucion()); | ||
373 | - $pida = $this->getDoctrine()->getRepository('AppBundle:AdscripcionPida')->findOneByIdRolInstitucion($servicio->getIdRolInstitucion()); | ||
374 | - $ascenso = $this->getDoctrine()->getRepository('AppBundle:Ascenso')->findOneBy(array( | ||
375 | - 'idRolInstitucion' => $servicio->getIdRolInstitucion(), | ||
376 | - | ||
377 | - )); | 376 | + $em = $this->getDoctrine()->getManager(); |
377 | + $todo = $em->getRepository("AppBundle:RolInstitucion")->findOneById($servicio->getIdRolInstitucion()); | ||
378 | + | ||
379 | + | ||
378 | 380 | ||
379 | return $this->render('cea/solicitudes_mostar.html.twig', array( | 381 | return $this->render('cea/solicitudes_mostar.html.twig', array( |
380 | - 'adscripcion' => $adscripcion, | ||
381 | 'servicio' => $servicio, | 382 | 'servicio' => $servicio, |
382 | - 'escalas' => $escala, | ||
383 | 'servicio' => $servicio, | 383 | 'servicio' => $servicio, |
384 | - 'pida' => $pida, | ||
385 | - 'ascenso' => $ascenso | 384 | + 'todo' => $todo |
386 | )); | 385 | )); |
387 | } | 386 | } |
388 | 387 | ||
@@ -390,19 +389,41 @@ class AdscripcionController extends Controller | @@ -390,19 +389,41 @@ class AdscripcionController extends Controller | ||
390 | /** | 389 | /** |
391 | * Encuentra y muestra una entidad de tipo Adscripción. | 390 | * Encuentra y muestra una entidad de tipo Adscripción. |
392 | * | 391 | * |
393 | - * @Route("/solicitudes/actualizar/{id}/{estatus}", name="cea_solicitudes_actualizar") | 392 | + * @Route("/solicitudes/actualizar/{id}", name="cea_solicitudes_actualizar") |
394 | * @Method({"GET", "POST"}) | 393 | * @Method({"GET", "POST"}) |
395 | * @Security("has_role('ROLE_COORDINADOR_REGIONAL')") | 394 | * @Security("has_role('ROLE_COORDINADOR_REGIONAL')") |
396 | */ | 395 | */ |
397 | - public function solicitudesAdscripcionEditAction(Adscripcion $adscripcion, $estatus, Request $request) | 396 | + public function solicitudesAdscripcionEditAction(Adscripcion $adscripcion, Request $request) |
398 | { | 397 | { |
398 | + $em = $this->getDoctrine()->getManager(); | ||
399 | $mensaje = ""; | 399 | $mensaje = ""; |
400 | - //$adscripciones = $this->getDoctrine()->getRepository('AppBundle:Adscripcion')->findOneById($adscripcion->getId()); | ||
401 | - $serviciosAdscripcion = $this->getDoctrine()->getRepository('AppBundle:DocenteServicio')->findOneBy(array( | 400 | + $serviciosAdscripcion = $em->getRepository('AppBundle:DocenteServicio')->findOneBy(array( |
402 | 'idRolInstitucion' => $adscripcion->getIdRolInstitucion(), | 401 | 'idRolInstitucion' => $adscripcion->getIdRolInstitucion(), |
403 | 'idServicioCe' => 2 | 402 | 'idServicioCe' => 2 |
404 | )); | 403 | )); |
405 | - | 404 | + $parametros = $request->request->all(); |
405 | + | ||
406 | + //Guardar el resultado de la verificación de Documentos | ||
407 | + foreach ($parametros as $key => $value){ | ||
408 | + if($key === 'trabajo') { | ||
409 | + verificar_documentos($adscripcion, 1, $value, $em); | ||
410 | + }else if($key === 'pregrado') { | ||
411 | + verificar_documentos($adscripcion, 2, $value, $em); | ||
412 | + }else if($key === 'postgrado') { | ||
413 | + verificar_documentos($adscripcion, 3, $value, $em); | ||
414 | + }else if($key === 'oposicion') { | ||
415 | + verificar_documentos($adscripcion, 4, $value, $em); | ||
416 | + }else if($key === 'asistente') { | ||
417 | + verificar_documentos($adscripcion, 5, $value, $em); | ||
418 | + }else if($key === 'agregado') { | ||
419 | + verificar_documentos($adscripcion, 6, $value, $em); | ||
420 | + }else if($key === 'asociado') { | ||
421 | + verificar_documentos($adscripcion, 7, $value, $em); | ||
422 | + }else if($key === 'titular') { | ||
423 | + verificar_documentos($adscripcion, 8, $value, $em); | ||
424 | + } | ||
425 | + } | ||
426 | + | ||
406 | 427 | ||
407 | $serviciosPida = $this->getDoctrine()->getRepository('AppBundle:DocenteServicio')->findOneBy(array( | 428 | $serviciosPida = $this->getDoctrine()->getRepository('AppBundle:DocenteServicio')->findOneBy(array( |
408 | 'idRolInstitucion' => $adscripcion->getIdRolInstitucion(), | 429 | 'idRolInstitucion' => $adscripcion->getIdRolInstitucion(), |
@@ -410,7 +431,11 @@ class AdscripcionController extends Controller | @@ -410,7 +431,11 @@ class AdscripcionController extends Controller | ||
410 | )); | 431 | )); |
411 | 432 | ||
412 | $pida = $this->getDoctrine()->getRepository('AppBundle:AdscripcionPida')->findOneByIdRolInstitucion($adscripcion->getIdRolInstitucion()); | 433 | $pida = $this->getDoctrine()->getRepository('AppBundle:AdscripcionPida')->findOneByIdRolInstitucion($adscripcion->getIdRolInstitucion()); |
413 | - | 434 | + if(isset($parametros['aprobar'])) { |
435 | + $estatus = true; | ||
436 | + }else{ | ||
437 | + $estatus = false; | ||
438 | + } | ||
414 | if($estatus == "true") { | 439 | if($estatus == "true") { |
415 | $serviciosAdscripcion->setIdEstatus($this->getDoctrine()->getRepository('AppBundle:Estatus')->findOneById(1)); | 440 | $serviciosAdscripcion->setIdEstatus($this->getDoctrine()->getRepository('AppBundle:Estatus')->findOneById(1)); |
416 | $serviciosPida->setIdEstatus($serviciosAdscripcion->getIdEstatus()); | 441 | $serviciosPida->setIdEstatus($serviciosAdscripcion->getIdEstatus()); |
@@ -458,13 +483,8 @@ class AdscripcionController extends Controller | @@ -458,13 +483,8 @@ class AdscripcionController extends Controller | ||
458 | $escala = $this->getDoctrine()->getRepository('AppBundle:DocenteEscala')->findBy(array( | 483 | $escala = $this->getDoctrine()->getRepository('AppBundle:DocenteEscala')->findBy(array( |
459 | 'idRolInstitucion' => $adscripcion->getIdRolInstitucion()->getId() | 484 | 'idRolInstitucion' => $adscripcion->getIdRolInstitucion()->getId() |
460 | )); | 485 | )); |
461 | - | ||
462 | - return $this->render('cea/solicitudes_mostar.html.twig', array( | ||
463 | - 'servicio' => $serviciosAdscripcion, | ||
464 | - 'adscripcion' => $adscripcion, | ||
465 | - 'escalas' => $escala, | ||
466 | - 'pida' => $pida | ||
467 | - )); | 486 | + |
487 | + return $this->redirect($this->generateUrl('cea_adscripcion_show', array('id' => $serviciosAdscripcion->getId()))); | ||
468 | 488 | ||
469 | } | 489 | } |
470 | 490 | ||
@@ -553,3 +573,25 @@ function thumbnail ($filename, $fuente, $destino){ | @@ -553,3 +573,25 @@ function thumbnail ($filename, $fuente, $destino){ | ||
553 | 573 | ||
554 | imagejpeg($nm, $destino . "/" . $filename); | 574 | imagejpeg($nm, $destino . "/" . $filename); |
555 | } | 575 | } |
576 | + | ||
577 | +function verificar_documentos($adscripcion, $tipo, $estatus, $em, $servicio = 2){ | ||
578 | + $existe = $em->getRepository("AppBundle:DocumentosVerificados")->findOneBy(array( | ||
579 | + 'idRolInstitucion' => $adscripcion, | ||
580 | + 'idTipoDocumentos' => $tipo | ||
581 | + )); | ||
582 | + | ||
583 | + if(!$existe) { | ||
584 | + $verificacion = new DocumentosVerificados(); | ||
585 | + $verificacion->setIdEstatus($em->getRepository("AppBundle:Estatus")->findOneById($estatus)); | ||
586 | + $verificacion->setIdRolInstitucion($em->getRepository("AppBundle:RolInstitucion")->findOneById($adscripcion)); | ||
587 | + $verificacion->setIdServicio($em->getRepository("AppBundle:ServiciosCe")->findOneById($servicio)); | ||
588 | + $verificacion->setIdTipoDocumentos($em->getRepository("AppBundle:TipoDocumentos")->findOneById($tipo)); | ||
589 | + $em->persist($verificacion); | ||
590 | + $em->flush(); | ||
591 | + }else{ | ||
592 | + $existe->setIdEstatus($em->getRepository("AppBundle:Estatus")->findOneById($estatus)); | ||
593 | + $em->persist($existe); | ||
594 | + $em->flush(); | ||
595 | + } | ||
596 | + | ||
597 | +} |
src/AppBundle/Entity/Adscripcion.php
@@ -31,18 +31,19 @@ class Adscripcion | @@ -31,18 +31,19 @@ class Adscripcion | ||
31 | * @ORM\SequenceGenerator(sequenceName="adscripcion_id_seq", allocationSize=1, initialValue=1) | 31 | * @ORM\SequenceGenerator(sequenceName="adscripcion_id_seq", allocationSize=1, initialValue=1) |
32 | */ | 32 | */ |
33 | private $id; | 33 | private $id; |
34 | - | ||
35 | - | 34 | + |
36 | 35 | ||
37 | /** | 36 | /** |
38 | * @var \AppBundle\Entity\RolInstitucion | 37 | * @var \AppBundle\Entity\RolInstitucion |
39 | * | 38 | * |
40 | - * @ORM\ManyToOne(targetEntity="AppBundle\Entity\RolInstitucion") | 39 | + * @ORM\OneToOne(targetEntity="AppBundle\Entity\RolInstitucion", inversedBy="adscripcion") |
41 | * @ORM\JoinColumns({ | 40 | * @ORM\JoinColumns({ |
42 | * @ORM\JoinColumn(name="id_rol_institucion", referencedColumnName="id", nullable=false) | 41 | * @ORM\JoinColumn(name="id_rol_institucion", referencedColumnName="id", nullable=false) |
43 | * }) | 42 | * }) |
44 | */ | 43 | */ |
45 | protected $idRolInstitucion; | 44 | protected $idRolInstitucion; |
45 | + | ||
46 | + | ||
46 | 47 | ||
47 | /** @ORM\Column(type="date", nullable=false, options={"comment" = "Fecha de de Ingreso a la Institucion"}) | 48 | /** @ORM\Column(type="date", nullable=false, options={"comment" = "Fecha de de Ingreso a la Institucion"}) |
48 | /** | 49 | /** |
@@ -303,28 +304,7 @@ class Adscripcion | @@ -303,28 +304,7 @@ class Adscripcion | ||
303 | } | 304 | } |
304 | 305 | ||
305 | 306 | ||
306 | - /** | ||
307 | - * Set idRolInstitucion | ||
308 | - * | ||
309 | - * @param \AppBundle\Entity\RolInstitucion $idRolInstitucion | ||
310 | - * @return Usuarios | ||
311 | - */ | ||
312 | - public function setIdRolInstitucion(\AppBundle\Entity\RolInstitucion $idRolInstitucion = null) | ||
313 | - { | ||
314 | - $this->idRolInstitucion = $idRolInstitucion; | ||
315 | - | ||
316 | - return $this; | ||
317 | - } | ||
318 | 307 | ||
319 | - /** | ||
320 | - * Get idRolInstitucion | ||
321 | - * | ||
322 | - * @return \AppBundle\Entity\RolInstitucion | ||
323 | - */ | ||
324 | - public function getIdRolInstitucion() | ||
325 | - { | ||
326 | - return $this->idRolInstitucion; | ||
327 | - } | ||
328 | 308 | ||
329 | 309 | ||
330 | 310 | ||
@@ -504,4 +484,27 @@ class Adscripcion | @@ -504,4 +484,27 @@ class Adscripcion | ||
504 | { | 484 | { |
505 | return $this->correlativoAdscripcion; | 485 | return $this->correlativoAdscripcion; |
506 | } | 486 | } |
487 | + | ||
488 | + /** | ||
489 | + * Set idRolInstitucion | ||
490 | + * | ||
491 | + * @param \AppBundle\Entity\RolInstitucion $idRolInstitucion | ||
492 | + * @return Adscripcion | ||
493 | + */ | ||
494 | + public function setIdRolInstitucion(\AppBundle\Entity\RolInstitucion $idRolInstitucion) | ||
495 | + { | ||
496 | + $this->idRolInstitucion = $idRolInstitucion; | ||
497 | + | ||
498 | + return $this; | ||
499 | + } | ||
500 | + | ||
501 | + /** | ||
502 | + * Get idRolInstitucion | ||
503 | + * | ||
504 | + * @return \AppBundle\Entity\RolInstitucion | ||
505 | + */ | ||
506 | + public function getIdRolInstitucion() | ||
507 | + { | ||
508 | + return $this->idRolInstitucion; | ||
509 | + } | ||
507 | } | 510 | } |
src/AppBundle/Entity/AdscripcionPida.php
@@ -39,7 +39,7 @@ class AdscripcionPida | @@ -39,7 +39,7 @@ class AdscripcionPida | ||
39 | /** | 39 | /** |
40 | * @var \AppBundle\Entity\RolInstitucion | 40 | * @var \AppBundle\Entity\RolInstitucion |
41 | * | 41 | * |
42 | - * @ORM\ManyToOne(targetEntity="AppBundle\Entity\RolInstitucion") | 42 | + * @ORM\ManyToOne(targetEntity="AppBundle\Entity\RolInstitucion", inversedBy="pida") |
43 | * @ORM\JoinColumns({ | 43 | * @ORM\JoinColumns({ |
44 | * @ORM\JoinColumn(name="id_rol_institucion", referencedColumnName="id", nullable=false) | 44 | * @ORM\JoinColumn(name="id_rol_institucion", referencedColumnName="id", nullable=false) |
45 | * }) | 45 | * }) |
src/AppBundle/Entity/Ascenso.php
@@ -30,7 +30,7 @@ class Ascenso | @@ -30,7 +30,7 @@ class Ascenso | ||
30 | /** | 30 | /** |
31 | * @var \AppBundle\Entity\RolInstitucion | 31 | * @var \AppBundle\Entity\RolInstitucion |
32 | * | 32 | * |
33 | - * @ORM\ManyToOne(targetEntity="AppBundle\Entity\RolInstitucion") | 33 | + * @ORM\ManyToOne(targetEntity="AppBundle\Entity\RolInstitucion", inversedBy="ascensos") |
34 | * @ORM\JoinColumns({ | 34 | * @ORM\JoinColumns({ |
35 | * @ORM\JoinColumn(name="id_rol_institucion", referencedColumnName="id", nullable=false) | 35 | * @ORM\JoinColumn(name="id_rol_institucion", referencedColumnName="id", nullable=false) |
36 | * }) | 36 | * }) |
src/AppBundle/Entity/DocenteEscala.php
@@ -35,7 +35,7 @@ class DocenteEscala | @@ -35,7 +35,7 @@ class DocenteEscala | ||
35 | /** | 35 | /** |
36 | * @var \AppBundle\Entity\RolInstitucion | 36 | * @var \AppBundle\Entity\RolInstitucion |
37 | * | 37 | * |
38 | - * @ORM\ManyToOne(targetEntity="AppBundle\Entity\RolInstitucion") | 38 | + * @ORM\ManyToOne(targetEntity="AppBundle\Entity\RolInstitucion", inversedBy="escalafones") |
39 | * @ORM\JoinColumns({ | 39 | * @ORM\JoinColumns({ |
40 | * @ORM\JoinColumn(name="id_rol_institucion", referencedColumnName="id", nullable=false) | 40 | * @ORM\JoinColumn(name="id_rol_institucion", referencedColumnName="id", nullable=false) |
41 | * }) | 41 | * }) |
src/AppBundle/Entity/DocumentosVerificados.php
@@ -0,0 +1,267 @@ | @@ -0,0 +1,267 @@ | ||
1 | +<?php | ||
2 | + | ||
3 | +namespace AppBundle\Entity; | ||
4 | + | ||
5 | +use Doctrine\ORM\Mapping as ORM; | ||
6 | + | ||
7 | +/** | ||
8 | + * DocumentosVerificados | ||
9 | + * | ||
10 | + * @ORM\Table(name="documentos_verificados") | ||
11 | + * @ORM\Entity | ||
12 | + * @ORM\HasLifecycleCallbacks() | ||
13 | + */ | ||
14 | +class DocumentosVerificados | ||
15 | +{ | ||
16 | + /** | ||
17 | + * @var integer | ||
18 | + * | ||
19 | + * @ORM\Column(name="id", type="integer", nullable=false, options={"comment" = "Identificador de la inscripcion del estudiante"}) | ||
20 | + * @ORM\Id | ||
21 | + * @ORM\GeneratedValue(strategy="IDENTITY") | ||
22 | + * @ORM\SequenceGenerator(sequenceName="documentos_verificados_id_seq", allocationSize=1, initialValue=1) | ||
23 | + */ | ||
24 | + private $id; | ||
25 | + | ||
26 | + | ||
27 | + | ||
28 | + | ||
29 | + /** | ||
30 | + * @var \AppBundle\Entity\Estatus | ||
31 | + * | ||
32 | + * @ORM\ManyToOne(targetEntity="AppBundle\Entity\Estatus") | ||
33 | + * @ORM\JoinColumns({ | ||
34 | + * @ORM\JoinColumn(name="id_estatus", referencedColumnName="id", nullable=false) | ||
35 | + * }) | ||
36 | + */ | ||
37 | + private $idEstatus; | ||
38 | + | ||
39 | + | ||
40 | + /** | ||
41 | + * @var \AppBundle\Entity\RolInstitucion | ||
42 | + * | ||
43 | + * @ORM\ManyToOne(targetEntity="AppBundle\Entity\RolInstitucion", inversedBy="documentosVerificados") | ||
44 | + * @ORM\JoinColumns({ | ||
45 | + * @ORM\JoinColumn(name="id_rol_institucion", referencedColumnName="id", nullable=false) | ||
46 | + * }) | ||
47 | + */ | ||
48 | + private $idRolInstitucion; | ||
49 | + | ||
50 | + | ||
51 | + /** | ||
52 | + * @var \AppBundle\Entity\TipoDocumentos | ||
53 | + * | ||
54 | + * @ORM\ManyToOne(targetEntity="AppBundle\Entity\TipoDocumentos") | ||
55 | + * @ORM\JoinColumns({ | ||
56 | + * @ORM\JoinColumn(name="id_tipo_documentos", referencedColumnName="id", nullable=false) | ||
57 | + * }) | ||
58 | + */ | ||
59 | + private $idTipoDocumentos; | ||
60 | + | ||
61 | + | ||
62 | + /** | ||
63 | + * @var \AppBundle\Entity\ServiciosCe | ||
64 | + * | ||
65 | + * @ORM\ManyToOne(targetEntity="AppBundle\Entity\ServiciosCe") | ||
66 | + * @ORM\JoinColumns({ | ||
67 | + * @ORM\JoinColumn(name="id_servicio", referencedColumnName="id", nullable=false) | ||
68 | + * }) | ||
69 | + */ | ||
70 | + private $idServicio; | ||
71 | + | ||
72 | + | ||
73 | + | ||
74 | + /** | ||
75 | + * @var \DateTime | ||
76 | + * | ||
77 | + * @ORM\Column(name="fecha_creacion", type="date", nullable=false, options={"comment" = "fecha de creacion de la inscripcion"}) | ||
78 | + */ | ||
79 | + protected $created; | ||
80 | + | ||
81 | + | ||
82 | + /** | ||
83 | + * @var \DateTime | ||
84 | + * | ||
85 | + * @ORM\Column(name="fecha_ultima_actualizacion", type="date", nullable=false, options={"comment" = "fecha de actualizacion de la inscripcion"}) | ||
86 | + */ | ||
87 | + protected $modified; | ||
88 | + | ||
89 | + | ||
90 | + | ||
91 | + | ||
92 | + | ||
93 | + | ||
94 | + /** | ||
95 | + * @ORM\PrePersist | ||
96 | + */ | ||
97 | + public function prePersist() | ||
98 | + { | ||
99 | + | ||
100 | + $this->created = new \DateTime(); | ||
101 | + $this->modified = new \DateTime(); | ||
102 | + | ||
103 | + } | ||
104 | + | ||
105 | + | ||
106 | + /** | ||
107 | + * @ORM\PreUpdate | ||
108 | + */ | ||
109 | + public function preUpdate() | ||
110 | + { | ||
111 | + $this->modified = new \DateTime(); | ||
112 | + | ||
113 | + } | ||
114 | + | ||
115 | + | ||
116 | + | ||
117 | + | ||
118 | + /** | ||
119 | + * Set created | ||
120 | + * | ||
121 | + * @param \DateTime $created | ||
122 | + * @return Inscripcion | ||
123 | + */ | ||
124 | + public function setCreated($created) | ||
125 | + { | ||
126 | + $this->created = $created; | ||
127 | + | ||
128 | + return $this; | ||
129 | + } | ||
130 | + | ||
131 | + /** | ||
132 | + * Get created | ||
133 | + * | ||
134 | + * @return \DateTime | ||
135 | + */ | ||
136 | + public function getCreated() | ||
137 | + { | ||
138 | + return $this->created; | ||
139 | + } | ||
140 | + | ||
141 | + /** | ||
142 | + * Set modified | ||
143 | + * | ||
144 | + * @param \DateTime $modified | ||
145 | + * @return Inscripcion | ||
146 | + */ | ||
147 | + public function setModified($modified) | ||
148 | + { | ||
149 | + $this->modified = $modified; | ||
150 | + | ||
151 | + return $this; | ||
152 | + } | ||
153 | + | ||
154 | + /** | ||
155 | + * Get modified | ||
156 | + * | ||
157 | + * @return \DateTime | ||
158 | + */ | ||
159 | + public function getModified() | ||
160 | + { | ||
161 | + return $this->modified; | ||
162 | + } | ||
163 | + | ||
164 | + | ||
165 | + | ||
166 | + /** | ||
167 | + * Get id | ||
168 | + * | ||
169 | + * @return integer | ||
170 | + */ | ||
171 | + public function getId() | ||
172 | + { | ||
173 | + return $this->id; | ||
174 | + } | ||
175 | + | ||
176 | + /** | ||
177 | + * Set idEstatus | ||
178 | + * | ||
179 | + * @param \AppBundle\Entity\Estatus $idEstatus | ||
180 | + * @return DocumentosVerificados | ||
181 | + */ | ||
182 | + public function setIdEstatus(\AppBundle\Entity\Estatus $idEstatus) | ||
183 | + { | ||
184 | + $this->idEstatus = $idEstatus; | ||
185 | + | ||
186 | + return $this; | ||
187 | + } | ||
188 | + | ||
189 | + /** | ||
190 | + * Get idEstatus | ||
191 | + * | ||
192 | + * @return \AppBundle\Entity\Estatus | ||
193 | + */ | ||
194 | + public function getIdEstatus() | ||
195 | + { | ||
196 | + return $this->idEstatus; | ||
197 | + } | ||
198 | + | ||
199 | + /** | ||
200 | + * Set idRolInstitucion | ||
201 | + * | ||
202 | + * @param \AppBundle\Entity\RolInstitucion $idRolInstitucion | ||
203 | + * @return DocumentosVerificados | ||
204 | + */ | ||
205 | + public function setIdRolInstitucion(\AppBundle\Entity\RolInstitucion $idRolInstitucion) | ||
206 | + { | ||
207 | + $this->idRolInstitucion = $idRolInstitucion; | ||
208 | + | ||
209 | + return $this; | ||
210 | + } | ||
211 | + | ||
212 | + /** | ||
213 | + * Get idRolInstitucion | ||
214 | + * | ||
215 | + * @return \AppBundle\Entity\RolInstitucion | ||
216 | + */ | ||
217 | + public function getIdRolInstitucion() | ||
218 | + { | ||
219 | + return $this->idRolInstitucion; | ||
220 | + } | ||
221 | + | ||
222 | + /** | ||
223 | + * Set idTipoDocumentos | ||
224 | + * | ||
225 | + * @param \AppBundle\Entity\TipoDocumentos $idTipoDocumentos | ||
226 | + * @return DocumentosVerificados | ||
227 | + */ | ||
228 | + public function setIdTipoDocumentos(\AppBundle\Entity\TipoDocumentos $idTipoDocumentos) | ||
229 | + { | ||
230 | + $this->idTipoDocumentos = $idTipoDocumentos; | ||
231 | + | ||
232 | + return $this; | ||
233 | + } | ||
234 | + | ||
235 | + /** | ||
236 | + * Get idTipoDocumentos | ||
237 | + * | ||
238 | + * @return \AppBundle\Entity\TipoDocumentos | ||
239 | + */ | ||
240 | + public function getIdTipoDocumentos() | ||
241 | + { | ||
242 | + return $this->idTipoDocumentos; | ||
243 | + } | ||
244 | + | ||
245 | + /** | ||
246 | + * Set idServicio | ||
247 | + * | ||
248 | + * @param \AppBundle\Entity\ServiciosCe $idServicio | ||
249 | + * @return DocumentosVerificados | ||
250 | + */ | ||
251 | + public function setIdServicio(\AppBundle\Entity\ServiciosCe $idServicio) | ||
252 | + { | ||
253 | + $this->idServicio = $idServicio; | ||
254 | + | ||
255 | + return $this; | ||
256 | + } | ||
257 | + | ||
258 | + /** | ||
259 | + * Get idServicio | ||
260 | + * | ||
261 | + * @return \AppBundle\Entity\ServiciosCe | ||
262 | + */ | ||
263 | + public function getIdServicio() | ||
264 | + { | ||
265 | + return $this->idServicio; | ||
266 | + } | ||
267 | +} |
src/AppBundle/Entity/RolInstitucion.php
@@ -9,6 +9,7 @@ | @@ -9,6 +9,7 @@ | ||
9 | 9 | ||
10 | namespace AppBundle\Entity; | 10 | namespace AppBundle\Entity; |
11 | 11 | ||
12 | +use Doctrine\Common\Collections\ArrayCollection; | ||
12 | use Doctrine\ORM\Mapping as ORM; | 13 | use Doctrine\ORM\Mapping as ORM; |
13 | 14 | ||
14 | /** | 15 | /** |
@@ -59,6 +60,35 @@ class RolInstitucion | @@ -59,6 +60,35 @@ class RolInstitucion | ||
59 | */ | 60 | */ |
60 | private $idEstatus; | 61 | private $idEstatus; |
61 | 62 | ||
63 | + /** | ||
64 | + * @ORM\OneToMany(targetEntity="AppBundle\Entity\AdscripcionPida", mappedBy="idRolInstitucion") | ||
65 | + */ | ||
66 | + private $pida; | ||
67 | + | ||
68 | + | ||
69 | + /** | ||
70 | + * @ORM\OneToMany(targetEntity="AppBundle\Entity\DocenteEscala", mappedBy="idRolInstitucion") | ||
71 | + */ | ||
72 | + private $escalafones; | ||
73 | + | ||
74 | + | ||
75 | + /** | ||
76 | + * @ORM\OneToMany(targetEntity="AppBundle\Entity\Ascenso", mappedBy="idRolInstitucion") | ||
77 | + */ | ||
78 | + private $ascensos; | ||
79 | + | ||
80 | + | ||
81 | + /** | ||
82 | + * @ORM\OneToMany(targetEntity="AppBundle\Entity\DocumentosVerificados", mappedBy="idRolInstitucion") | ||
83 | + */ | ||
84 | + private $documentosVerificados; | ||
85 | + | ||
86 | + | ||
87 | + /** | ||
88 | + * @ORM\OneToOne(targetEntity="AppBundle\Entity\Adscripcion", mappedBy="idRolInstitucion") | ||
89 | + */ | ||
90 | + private $adscripcion; | ||
91 | + | ||
62 | 92 | ||
63 | 93 | ||
64 | /** | 94 | /** |
@@ -143,13 +173,181 @@ class RolInstitucion | @@ -143,13 +173,181 @@ class RolInstitucion | ||
143 | 173 | ||
144 | /** | 174 | /** |
145 | * Get __toString | 175 | * Get __toString |
146 | - * | 176 | + * @return string |
147 | * | 177 | * |
148 | */ | 178 | */ |
149 | public function __toString() | 179 | public function __toString() |
150 | { | 180 | { |
151 | - return $this->getIdRol()->getIdPersona()->getCedulaPasaporte(); | 181 | + return $this->getIdRol()->getIdPersona()->getPrimerNombre() . ", " . $this->getIdRol()->getIdPersona()->getPrimerApellido(); |
182 | + } | ||
183 | + | ||
184 | + | ||
185 | + /** | ||
186 | + * Constructor | ||
187 | + */ | ||
188 | + public function __construct() | ||
189 | + { | ||
190 | + $this->pida = new ArrayCollection(); | ||
191 | + $this->escalafones = new ArrayCollection(); | ||
192 | + $this->ascensos = new ArrayCollection(); | ||
193 | + $this->documentosVerificados = new ArrayCollection(); | ||
194 | + | ||
195 | + } | ||
196 | + | ||
197 | + /** | ||
198 | + * Add pida | ||
199 | + * | ||
200 | + * @param \AppBundle\Entity\AdscripcionPida $pida | ||
201 | + * @return RolInstitucion | ||
202 | + */ | ||
203 | + public function addPida(\AppBundle\Entity\AdscripcionPida $pida) | ||
204 | + { | ||
205 | + $this->pida[] = $pida; | ||
206 | + | ||
207 | + return $this; | ||
208 | + } | ||
209 | + | ||
210 | + /** | ||
211 | + * Remove pida | ||
212 | + * | ||
213 | + * @param \AppBundle\Entity\AdscripcionPida $pida | ||
214 | + */ | ||
215 | + public function removePida(\AppBundle\Entity\AdscripcionPida $pida) | ||
216 | + { | ||
217 | + $this->pida->removeElement($pida); | ||
218 | + } | ||
219 | + | ||
220 | + /** | ||
221 | + * Get pida | ||
222 | + * | ||
223 | + * @return \Doctrine\Common\Collections\Collection | ||
224 | + */ | ||
225 | + public function getPida() | ||
226 | + { | ||
227 | + return $this->pida; | ||
228 | + } | ||
229 | + | ||
230 | + | ||
231 | + | ||
232 | + /** | ||
233 | + * Set adscripcion | ||
234 | + * | ||
235 | + * @param \AppBundle\Entity\Adscripcion $adscripcion | ||
236 | + * @return RolInstitucion | ||
237 | + */ | ||
238 | + public function setAdscripcion(\AppBundle\Entity\Adscripcion $adscripcion = null) | ||
239 | + { | ||
240 | + $this->adscripcion = $adscripcion; | ||
241 | + | ||
242 | + return $this; | ||
243 | + } | ||
244 | + | ||
245 | + /** | ||
246 | + * Get adscripcion | ||
247 | + * | ||
248 | + * @return \AppBundle\Entity\Adscripcion | ||
249 | + */ | ||
250 | + public function getAdscripcion() | ||
251 | + { | ||
252 | + return $this->adscripcion; | ||
253 | + } | ||
254 | + | ||
255 | + /** | ||
256 | + * Add escalafones | ||
257 | + * | ||
258 | + * @param \AppBundle\Entity\DocenteEscala $escalafones | ||
259 | + * @return RolInstitucion | ||
260 | + */ | ||
261 | + public function addEscalafone(\AppBundle\Entity\DocenteEscala $escalafones) | ||
262 | + { | ||
263 | + $this->escalafones[] = $escalafones; | ||
264 | + | ||
265 | + return $this; | ||
266 | + } | ||
267 | + | ||
268 | + /** | ||
269 | + * Remove escalafones | ||
270 | + * | ||
271 | + * @param \AppBundle\Entity\DocenteEscala $escalafones | ||
272 | + */ | ||
273 | + public function removeEscalafone(\AppBundle\Entity\DocenteEscala $escalafones) | ||
274 | + { | ||
275 | + $this->escalafones->removeElement($escalafones); | ||
276 | + } | ||
277 | + | ||
278 | + /** | ||
279 | + * Get escalafones | ||
280 | + * | ||
281 | + * @return \Doctrine\Common\Collections\Collection | ||
282 | + */ | ||
283 | + public function getEscalafones() | ||
284 | + { | ||
285 | + return $this->escalafones; | ||
152 | } | 286 | } |
153 | 287 | ||
288 | + /** | ||
289 | + * Add ascensos | ||
290 | + * | ||
291 | + * @param \AppBundle\Entity\Ascenso $ascensos | ||
292 | + * @return RolInstitucion | ||
293 | + */ | ||
294 | + public function addAscenso(\AppBundle\Entity\Ascenso $ascensos) | ||
295 | + { | ||
296 | + $this->ascensos[] = $ascensos; | ||
297 | + | ||
298 | + return $this; | ||
299 | + } | ||
154 | 300 | ||
155 | -} | ||
156 | \ No newline at end of file | 301 | \ No newline at end of file |
302 | + /** | ||
303 | + * Remove ascensos | ||
304 | + * | ||
305 | + * @param \AppBundle\Entity\Ascenso $ascensos | ||
306 | + */ | ||
307 | + public function removeAscenso(\AppBundle\Entity\Ascenso $ascensos) | ||
308 | + { | ||
309 | + $this->ascensos->removeElement($ascensos); | ||
310 | + } | ||
311 | + | ||
312 | + /** | ||
313 | + * Get ascensos | ||
314 | + * | ||
315 | + * @return \Doctrine\Common\Collections\Collection | ||
316 | + */ | ||
317 | + public function getAscensos() | ||
318 | + { | ||
319 | + return $this->ascensos; | ||
320 | + } | ||
321 | + | ||
322 | + /** | ||
323 | + * Add documentosVerificados | ||
324 | + * | ||
325 | + * @param \AppBundle\Entity\DocumentosVerificados $documentosVerificados | ||
326 | + * @return RolInstitucion | ||
327 | + */ | ||
328 | + public function addDocumentosVerificado(\AppBundle\Entity\DocumentosVerificados $documentosVerificados) | ||
329 | + { | ||
330 | + $this->documentosVerificados[] = $documentosVerificados; | ||
331 | + | ||
332 | + return $this; | ||
333 | + } | ||
334 | + | ||
335 | + /** | ||
336 | + * Remove documentosVerificados | ||
337 | + * | ||
338 | + * @param \AppBundle\Entity\DocumentosVerificados $documentosVerificados | ||
339 | + */ | ||
340 | + public function removeDocumentosVerificado(\AppBundle\Entity\DocumentosVerificados $documentosVerificados) | ||
341 | + { | ||
342 | + $this->documentosVerificados->removeElement($documentosVerificados); | ||
343 | + } | ||
344 | + | ||
345 | + /** | ||
346 | + * Get documentosVerificados | ||
347 | + * | ||
348 | + * @return \Doctrine\Common\Collections\Collection | ||
349 | + */ | ||
350 | + public function getDocumentosVerificados() | ||
351 | + { | ||
352 | + return $this->documentosVerificados; | ||
353 | + } | ||
354 | +} |
src/AppBundle/Entity/TipoDocumentos.php
@@ -25,6 +25,14 @@ class TipoDocumentos | @@ -25,6 +25,14 @@ class TipoDocumentos | ||
25 | */ | 25 | */ |
26 | private $nombre; | 26 | private $nombre; |
27 | 27 | ||
28 | + | ||
29 | + /** | ||
30 | + * @var string | ||
31 | + * | ||
32 | + * @ORM\Column(name="identificador", type="string", length=255, nullable=false, options={"comment" = "Nombre para identificar la ruta del documento en la vista"}) | ||
33 | + */ | ||
34 | + private $identificador; | ||
35 | + | ||
28 | /** | 36 | /** |
29 | * @var integer | 37 | * @var integer |
30 | * | 38 | * |
@@ -81,4 +89,27 @@ class TipoDocumentos | @@ -81,4 +89,27 @@ class TipoDocumentos | ||
81 | } | 89 | } |
82 | 90 | ||
83 | 91 | ||
92 | + | ||
93 | + /** | ||
94 | + * Set identificador | ||
95 | + * | ||
96 | + * @param string $identificador | ||
97 | + * @return TipoDocumentos | ||
98 | + */ | ||
99 | + public function setIdentificador($identificador) | ||
100 | + { | ||
101 | + $this->identificador = $identificador; | ||
102 | + | ||
103 | + return $this; | ||
104 | + } | ||
105 | + | ||
106 | + /** | ||
107 | + * Get identificador | ||
108 | + * | ||
109 | + * @return string | ||
110 | + */ | ||
111 | + public function getIdentificador() | ||
112 | + { | ||
113 | + return $this->identificador; | ||
114 | + } | ||
84 | } | 115 | } |