Merge branch '1371-le-datatable-dei-flussi-delle-competenze-e-delle-r…

…ichieste-ferie-non-sono-mostrare' into 'master' Resolve "Le datatable dei flussi delle competenze e delle richieste ferie non sono mostrare correttamente" Closes #1371 See merge request epas/epas!1603
consiglionazionaledellericerche · Sep 12, 2022 · 41a49ac · 41a49ac
2 parents 63f6cc2 + 60c43fb
commit 41a49ac
Show file tree

Hide file tree

Showing 10 changed files with 66 additions and 64 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -26,6 +26,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
    orfano
  - Risolto bug che faceva visualizzare un'erronea lista di attività su cui il turnista aveva diritti 
    di visualizzazione
+ - Corrette tabelle flussi competenze e assenze per init datatable e aggiornate le datatable alla 
+   ultima versione 1.12.1.
 
 ## [2.5.3] - 2022-08-16
 ### Added

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.5.4-rc4
+2.5.4-rc5
diff --git a/app/views/AbsenceRequests/tableElements/_allFlowsTable.html b/app/views/AbsenceRequests/tableElements/_allFlowsTable.html
@@ -14,8 +14,8 @@
 			<th #{if approvalRequired}rowspan="2"#{/if}>&{'absenceRequest.note'}</th>
 			<th #{if approvalRequired}rowspan="2"#{/if}>Stato attuale</th>
 			<th #{if approvalRequired}rowspan="2"#{/if}>Visualizza</th>
-				
-		</tr>			
+
+		</tr>
 		#{if approvalRequired}
 			<tr>
 				#{if config.managerApprovalRequired}
@@ -53,8 +53,8 @@
 				<td>${item.actualEvent().eventType.label()}</td>
 				<td>
 				#{secure.link @AbsenceRequests.show(item.id, type)}
-                  <i class="fa fa-eye" aria-hidden="true"></i> Visualizza
-                #{/secure.link}
+					<i class="fa fa-eye" aria-hidden="true"></i> Visualizza
+				#{/secure.link}
 				</td>
 			</tr>
 		#{/list}

diff --git a/app/views/AbsenceRequests/tableElements/_approvedTable.html b/app/views/AbsenceRequests/tableElements/_approvedTable.html
@@ -1,6 +1,6 @@
   #{title title:'Terminati', administration:true /}
-  
-  <table  class="table table-striped table-hover table-bordered table-condensed center" datatable-absencerequest width="100%">
+
+  <table  class="table table-striped table-hover table-bordered table-condensed center" datatable width="100%">
 	<thead>
 		<tr>
 			#{if !onlyOwn}
@@ -16,8 +16,8 @@
 			#{/if}
 			<th #{if approvalRequired}rowspan="2"#{/if}>&{'absenceRequest.note'}</th>
 			<th #{if approvalRequired}rowspan="2"#{/if}>Visualizza</th>
-				
-		</tr>			
+
+		</tr>
 		#{if approvalRequired}
 			<tr>
 				#{if config.officeHeadApprovalRequired}
@@ -28,7 +28,8 @@
 				#{/if}			
 				#{if config.administrativeApprovalRequired}
 					<th width="20%">&{'absenceRequest.administrativeApproved'}</th>
-				#{/if}			
+				#{/if}
+			</tr>
 		#{/if}
 	</thead>
 
@@ -60,11 +61,11 @@
 				#{/if}
 				<td>${item.note}</td>
 				<td>
-				
+
 				#{secure.link @AbsenceRequests.show(item.id, type)}
-	        	  <i class="fa fa-eye" aria-hidden="true"></i> Visualizza
-	        	#{/secure.link}
-	        	
+					<i class="fa fa-eye" aria-hidden="true"></i> Visualizza
+				#{/secure.link}
+
 				</td>
 			</tr>
 		#{/list}

diff --git a/app/views/AbsenceRequests/tableElements/_table.html b/app/views/AbsenceRequests/tableElements/_table.html
@@ -4,7 +4,7 @@
 	<thead>
 
 		<tr>
-			<th width="10%" rowspan="2">Data e ora sottomissione</th>
+			<th width="10%" #{if approvalRequired}rowspan="2"#{/if}>Data e ora sottomissione</th>
 			#{if !onlyOwn}
 				<th width="15%" #{if approvalRequired}rowspan="2"#{/if}>&{'absenceRequest.person'}</th>
 			#{/if}

diff --git a/app/views/CompetenceRequests/tableElements/_allFlowsTable.html b/app/views/CompetenceRequests/tableElements/_allFlowsTable.html
@@ -27,19 +27,20 @@
 
 		</tr>			
 		#{if approvalRequired}
+		<tr>
+			<th width="10%">Dal </th>
+			<th width="10%">Al  </th>
 
-			<th width="10%" #{if approvalRequired}rowspan="2"#{/if}>Dal </th>
-			<th width="10%" #{if approvalRequired}rowspan="2"#{/if}>Al  </th>
-
-			<th width="10%" #{if approvalRequired}rowspan="2"#{/if}>Dal</th>
-			<th width="10%" #{if approvalRequired}rowspan="2"#{/if}>Al </th>
+			<th width="10%">Dal</th>
+			<th width="10%">Al </th>
 
 				#{if config.reperibilityManagerApprovalRequired}
 					<th width="20%">Supervisore del servizio</th>
 				#{/if}						
 				#{if config.employeeApprovalRequired}
 					<th width="20%">Reperibile</th>
-				#{/if}			
+				#{/if}
+		</tr>
 		#{/if}
 	</thead>
 

diff --git a/app/views/CompetenceRequests/tableElements/_approvedTable.html b/app/views/CompetenceRequests/tableElements/_approvedTable.html
@@ -1,21 +1,18 @@
 #{title title:'Terminati', administration:true /}
 
-   <table  class="table table-striped table-hover table-bordered table-condensed center" datatable width="100%">
+  <table  class="table table-striped table-hover table-bordered table-condensed center" datatable-absencerequest width="100%">
 	<thead>
-
 		<tr>
-			<th width="10%" rowspan="2">Data e ora sottomissione</th>
+			<th width="10%" #{if approvalRequired}rowspan="2"#{/if}>Data e ora sottomissione</th>
 			#{if !onlyOwn}
 				<th width="15%" #{if approvalRequired}rowspan="2"#{/if}>&{'competenceRequest.person'}</th>
 			#{/if}
 			#{if approvalRequired}
 				<th colspan="2">Date richieste</th>
-			#{/if}
-			#{if approvalRequired}
 				<th colspan="2">Date offerte</th>
 			#{/if}
 
-		    <th width="10%" #{if approvalRequired}rowspan="2"#{/if}>Destinatario</th>
+			<th width="10%" #{if approvalRequired}rowspan="2"#{/if}>Destinatario</th>
 
 			#{if approvalRequired}
 				<th colspan="${approvalsRequired}">Date di Approvazione/Disapprovazione</th>
@@ -24,22 +21,23 @@
 			<th #{if approvalRequired}rowspan="2"#{/if}>Visualizza</th>
 			<th #{if approvalRequired}rowspan="2"#{/if}>Azioni</th>
 			<th #{if approvalRequired}rowspan="2"#{/if}>Note</th>
-				
-		</tr>			
+
+		</tr>
 		#{if approvalRequired}
+		<tr>
+			<th width="10%">Dal </th>
+			<th width="10%">Al  </th>
 
-			<th width="10%" #{if approvalRequired}rowspan="2"#{/if}>Dal </th>
-			<th width="10%" #{if approvalRequired}rowspan="2"#{/if}>Al  </th>
+			<th width="10%">Dal</th>
+			<th width="10%">Al </th>
 
-			<th width="10%" #{if approvalRequired}rowspan="2"#{/if}>Dal</th>
-			<th width="10%" #{if approvalRequired}rowspan="2"#{/if}>Al </th>
-
-				#{if config.reperibilityManagerApprovalRequired}
-					<th width="20%">Supervisore del servizio</th>
-				#{/if}						
-				#{if config.employeeApprovalRequired}
-					<th width="20%">Reperibile</th>
-				#{/if}			
+			#{if config.reperibilityManagerApprovalRequired}
+				<th width="20%">Supervisore del servizio</th>
+			#{/if}
+			#{if config.employeeApprovalRequired}
+				<th width="20%">Reperibile</th>
+			#{/if}
+		</tr>
 		#{/if}
 	</thead>
 
@@ -67,7 +65,7 @@
 				<td>${item.actualEvent().eventType.label()}</td>
 				<td>
 				#{secure.check 'CompetenceRequests.show', target: item }
-				#{secure.link @CompetenceRequests.show(item.id, type)}	    	  	
+				#{secure.link @CompetenceRequests.show(item.id, type)}
 	        	<i class="fa fa-eye" aria-hidden="true"></i> Visualizza
 	        	#{/secure.link}
 	        	#{/secure.check}
@@ -84,8 +82,8 @@
       			</a>
       			#{/secure.check}
       			</td>
-      			<td #{if item.note != null && !item.note.equals("")} 
-      				webui-popover-hover data-content="${item.note}">      			
+      			<td #{if item.note != null && !item.note.equals("")}
+      				webui-popover-hover data-content="${item.note}">
       				<i class="fa fa-exclamation-triangle fa-2x text-danger" aria-hidden="true" ></i>
       				#{/if}
       			</td>

diff --git a/app/views/CompetenceRequests/tableElements/_closedTable.html b/app/views/CompetenceRequests/tableElements/_closedTable.html
@@ -11,22 +11,21 @@
 				<th colspan="2">Date offerte</th>
 			#{/if}
 
-		    <th width="10%" #{if approvalRequired}rowspan="4"#{/if}>Destinatario</th>
+		    <th width="10%" #{if approvalRequired}rowspan="2"#{/if}>Destinatario</th>
 
 			<th #{if approvalRequired}rowspan="2"#{/if}>&{'competenceRequest.note'}</th>
 			<th #{if approvalRequired}rowspan="2"#{/if}>Stato attuale</th>
 			<th #{if approvalRequired}rowspan="2"#{/if}>Visualizza</th>
 
 		</tr>			
 		#{if approvalRequired}
-
-			<th width="10%" #{if approvalRequired}rowspan="2"#{/if}>Dal </th>
-			<th width="10%" #{if approvalRequired}rowspan="2"#{/if}>Al  </th>
-
-			<th width="10%" #{if approvalRequired}rowspan="2"#{/if}>Dal</th>
-			<th width="10%" #{if approvalRequired}rowspan="2"#{/if}>Al </th>
+		<tr>
+			<th width="10%">Dal </th>
+			<th width="10%">Al  </th>
 
-
+			<th width="10%">Dal</th>
+			<th width="10%">Al </th>
+		</tr>
 		#{/if}
 	</thead>
 

diff --git a/app/views/CompetenceRequests/tableElements/_table.html b/app/views/CompetenceRequests/tableElements/_table.html
@@ -27,19 +27,20 @@
 
 		</tr>
 		#{if approvalRequired}
+		<tr>
+			<th width="10%">Dal </th>
+			<th width="10%">Al  </th>
 
-			<th width="10%" #{if approvalRequired}rowspan="2"#{/if}>Dal </th>
-			<th width="10%" #{if approvalRequired}rowspan="2"#{/if}>Al  </th>
-
-			<th width="10%" #{if approvalRequired}rowspan="2"#{/if}>Dal</th>
-			<th width="10%" #{if approvalRequired}rowspan="2"#{/if}>Al </th>
+			<th width="10%">Dal</th>
+			<th width="10%">Al </th>
 
-				#{if config.reperibilityManagerApprovalRequired}
-					<th width="20%">Supervisore del servizio</th>
-				#{/if}
-				#{if config.employeeApprovalRequired}
-					<th width="20%">Reperibile</th>
-				#{/if}
+			#{if config.reperibilityManagerApprovalRequired}
+				<th width="20%">Supervisore del servizio</th>
+			#{/if}
+			#{if config.employeeApprovalRequired}
+				<th width="20%">Reperibile</th>
+			#{/if}
+		</tr>
 		#{/if}
 	</thead>
 

diff --git a/app/views/main.html b/app/views/main.html
@@ -21,7 +21,7 @@
   <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/bootstrap-datepicker/1.6.4/css/bootstrap-datepicker3.min.css" />
   <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/morris.js/0.5.1/morris.css">
   <link rel="stylesheet" href="//cdn.jsdelivr.net/jquery.webui-popover/2.1.15/jquery.webui-popover.min.css">
-  <link rel="stylesheet" href="//cdn.datatables.net/u/bs/dt-1.10.12,cr-1.3.2,r-2.1.0/datatables.min.css"/>
+  <link rel="stylesheet" href="//cdn.datatables.net/1.12.1/css/jquery.dataTables.min.css"/>
   <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/Trumbowyg/2.10.0/ui/trumbowyg.min.css" />
   <link rel="stylesheet" href="//fonts.googleapis.com/css?family=Shadows+Into+Light"/>
 
@@ -214,7 +214,7 @@
 <script src="//cdnjs.cloudflare.com/ajax/libs/moment.js/2.10.3/moment-with-locales.min.js"></script>  <!-- per combodate xeditable -->
 <script src="//cdnjs.cloudflare.com/ajax/libs/morris.js/0.5.1/morris.min.js"></script>
 <script src="//cdn.jsdelivr.net/jquery.webui-popover/2.1.15/jquery.webui-popover.min.js"></script>
-<script src="//cdn.datatables.net/u/bs/dt-1.10.12,cr-1.3.2,r-2.1.0/datatables.min.js"></script>
+<script src="//cdn.datatables.net/1.12.1/js/jquery.dataTables.min.js"></script>
 <script src="//cdn.datatables.net/plug-ins/1.12.1/sorting/datetime-moment.js"></script>  <!-- per sorting date in datatable -->
 <script src="//cdnjs.cloudflare.com/ajax/libs/raphael/2.1.0/raphael-min.js"></script>
 <script src="//cdnjs.cloudflare.com/ajax/libs/bootbox.js/4.2.0/bootbox.min.js"></script>