Browse Source

Fixed hmtl

Mario Martínez Hernández 4 tháng trước cách đây
mục cha
commit
ef310293fb

+ 3 - 3
src/main/resources/templates/dashboardUniversitat.html

@@ -162,13 +162,13 @@
 													<span th:text="${item.codis2}"></span>
 												</td>
 												<td>
-													<a target="_blank" th:href="${'/dashboard/'+item.ruct2}"><span th:text="${#locale.language} == 'es' ? ${item.nomCas}:${item.nomVal}"></span></a>
+													<a target="_blank" th:href="${'/dashboard/'+item.ruct2}"><span th:text="${#locale.language} == 'es' ? ${item.nomCas2}:${item.nomVal2}"></span></a>
 												</td>
 												<td>
-													<a target="_blank" th:href="${'/dashboard/'+item.ruct2}"><span th:text="${#locale.language} == 'es' ? ${item.nomCas2}:${item.nomVal2}"></span></a>
+													<a target="_blank" th:href="${'/dashboard/'+item.ruct}"><span th:text="${#locale.language} == 'es' ? ${item.nomCas}:${item.nomVal}"></span></a>
 												</td>
 												<td>
-													<span th:text="${item.tambit2 == 'M' ? 'Máster' : item.tambit2 == 'G' ? 'Grado' : 'Doctorado'}"></span>
+													<span th:text="${item.tambit == 'M' ? 'Máster' : item.tambit == 'G' ? 'Grado' : 'Doctorado'}"></span>
 												</td>
 												<td>
 													<span th:text="${item.acreditacio?.grupCurs+' - '+item.acreditacio?.grup}"></span>

+ 3 - 3
src/main/resources/templates/procedure.html

@@ -139,7 +139,7 @@
 									</span>
 									<br>
 									
-									<span th:if="${item.estat == 'A' or item.estat == null}"><span th:text="#{procedures.dateLimit}"></span>: <span th:text="${#dates.format(item.dataLim, 'dd-MM-yyyy')}"></span></span>
+									<span th:if="${item.estat == 'A' or item.estat == null}"><span th:text="#{procedures.dateLimit}"></span>: <span th:text="${#dates.format(item.dataLim, 'YYYY-MM-DD')}"></span></span>
 									<span style="float: right; margin-top:-5px;" th:if="${item.estat == 'A' and item.isAssignedToUser}" th:attr="title=#{procedures.status.title.a}"><i class="fa fa-play-circle"></i></span>
 									<span style="float: right; margin-top:-5px;" th:if="${item.estat == 'A' and not item.isAssignedToUser}" th:attr="title=#{procedures.status.title.o}"><i class="fa fa-exclamation-triangle"></i></span>
 									<span style="float: right; margin-top:-5px;" th:if="${item.estat == null}"><i class="fa fa-lock" th:attr="title=#{procedures.status.title.p}"></i></span>
@@ -273,7 +273,7 @@
 											<br>
 											<span><span th:text="#{procedures.done.user}"></span>: <span th:text="${item.usuariFet}"></span></span>
 											<br>
-											<span><span th:text="#{procedures.done.date}"></span>: <span th:text="${#dates.format(item.dataFet, 'dd-MM-yyyy')}"></span></span>
+											<span><span th:text="#{procedures.done.date}"></span>: <span th:text="${#dates.format(item.dataFet, 'YYYY-MM-DD')}"></span></span>
 										</span>
 									</div>
 									<div class="container" th:if="${item.versions != null}" style="margin-top:25px;text-align:left;margin-left: 0px;">
@@ -311,7 +311,7 @@
 												<br>
 												<span><span th:text="#{procedures.done.user}"></span>: <span th:text="${version.usuariFet}"></span></span>
 												<br>
-												<span><span th:text="#{procedures.done.date}"></span>: <span th:text="${#dates.format(version.dataFet, 'dd-MM-yyyy')}"></span></span>
+												<span><span th:text="#{procedures.done.date}"></span>: <span th:text="${#dates.format(version.dataFet, 'YYYY-MM-DD')}"></span></span>
 											</div>
 											<br>
 										</div>