commit latest sprint

WebGde/WebContent/index.html

@@ -205,7 +205,8 @@
             <!-- <span class="TiffModalClose">&times;</span> -->
           </div>
           <div id="TiffModalBody">
-          	<div id='nextDiv'>
+          </div>
+            <div id='nextDiv'>
 				<button id="prev">prev</button>
 				<button id="next">next</button>
 	  		</div>
@@ -215,8 +216,6 @@
 	  			<button id='return'>Ret</button>
 		    	<button id='reject'>Rej</button>
 	  		</div>
-          </div>
-
         </div>
       </div>
 

WebGde/WebContent/src/accessFile/accessFile.js

@@ -339,8 +339,7 @@ async function accessFile() {
                     }
                     for (var i = 0; i < count; i++) {
                         urls.shift();
-                    }
-                    console.log(urls);                   
+                    }                 
                     return urls;
                 }
 

WebGde/WebContent/src/endSession/endSession.js

@@ -63,11 +63,13 @@ function createEndSessionWindow(){
 		    
 		    let returnElem = await returnElementLogout(sessionStorage.getItem("element_id"));		    
 		    if( returnElem == 200){
+		    	saveExceptionToXml();
 		    	endWindow.style.display = 'none';
 		    	localStorage.clear();
 		  		sessionStorage.clear(); 		
 	    		logoutKeycloak();
-			    submitted = false;		    
+			    submitted = false;
+			    		    
     		}
 		  }  
 		  else{

WebGde/WebContent/src/highlight/highlight.js

@@ -195,8 +195,7 @@ function initHighlight() {
                 isCanvasNotCreated = false;
                 ctx.clearRect(0, 0, highlightCanvas.width, highlightCanvas.height);
             }
-            else{
-                
+            else{               
                 rect = document.getElementById(sessionStorage.getItem("TiffViewer_current")).getBoundingClientRect();
                 if(isInitialPositioning){
                     resizeHighlightCanvas(entries[0].contentRect.width, entries[0].contentRect.height, (rect.left-263));

WebGde/WebContent/style.css

@@ -7,6 +7,10 @@ html {
     font-family: Helvetica, sans-serif;
 }
 
+button:hover{
+	cursor:pointer;
+}
+
 #with-config {
     margin: 0;
     grid-template-columns: auto auto 375px;
@@ -204,7 +208,8 @@ textarea{
     z-index: 999;
     position: absolute;
     top: 44px;
-    right: 21px;
+    right: 0%;
+    transform: translate(0%, 0);
     text-align: center;
     height: auto;
     width: 43px;
@@ -237,10 +242,10 @@ textarea{
 #nextDiv {
 	padding: 3px;
     width: 763px;
-    height: 22px;
+    height: 50px;
     position: absolute;
     z-index: 20;
-    left: calc(49%);
+    left: calc(50%);
     transform: translate(-50%, 0);
     top: 328px;
 
@@ -590,6 +595,7 @@ select {
     transform: translate(-50%, 0);
     padding: 10px;
     background-color: white;
+    z-index:999;
 }
 
 #checkBoxCont{

WebGde/src/main/java/com/svi/webgde/restservice/services/GDEWebServices.java

@@ -144,7 +144,7 @@ public class GDEWebServices {
 	@Path("/write-mertrics")
 	public Response writeCSVMetrics(JsonObject jsonObject) {
 
-		SimpleDateFormat isoFormat = new SimpleDateFormat("MM-dd-yyyy_HH.mm.ss");
+		SimpleDateFormat isoFormat = new SimpleDateFormat("MM-dd-yyyy");
 		isoFormat.setTimeZone(TimeZone.getTimeZone("Asia/Manila"));
 		Date date = new Date();
 		String now;