fix bugs, left and right button and submit

WebGde/WebContent/index.html

@@ -141,6 +141,7 @@
 				<div id="prev"></div>
 	  		</div>
 	  	  </div>
+	  	  
         <!-- Modal content -->
         <div class="TiffModalContent">
           <div class="bar">
@@ -153,23 +154,37 @@
           <div id="TiffModalBody">
           </div>
           	
-
-	  		
+          	<div >
           </div>
-        
-        <div id='nextDivContainer' title="next">
-        <div id='TiffButtonRight'>
-	  			<div id='refresh'></div>
-	  			<div id='pause'></div>
-	  			<div id='return'></div>
-		    	<div id='reject'></div>
+          <div >
           </div>
-            <div id='nextDiv'>
-				<div id="next"></div>
-	  		</div>
-	  		</div>
-        <div id="TiffModalFooter">
+          <div >
+          </div>
+          	
+          	 <div id="TiffButtonRight">
+          	 		<div id="refresh"></div>
+          	 		<div id="pause"></div>
+          	 		<div id="return"></div>
+          	 		<div id="reject"></div>
+		          </div>
+
+	  		<div id="TiffModalFooter">
         </div>
+
+       
+         </div>
+          <div id='nextDivContainer' title="next">
+		       
+        
+		            <div id='nextDiv'>
+						<div id="next"></div>
+			  		</div>
+	  		</div>
+        
+         
+         
+         
+	  		
       </div>
 
 <!--       <img src="" id="tableBanner" />
@@ -198,6 +213,47 @@
 <script src="./src/accessFile/accessFile.js"></script>
 
 <script>
+
+const TiffViewer_refresh = document.getElementById("refresh");
+TiffViewer_refresh.title = "refresh";
+  TiffViewer_refresh.classList.add("buttonRightClass")
+const refreshIcon = document.createElement("img");
+refreshIcon.classList.add("refresh");
+	refreshIcon.classList.add("tiffViewerIcons");
+	refreshIcon.src = "/WebGde/assets/refresh_icon.png";
+	refreshIcon.alt = "refresh";
+
+
+const TiffViewer_pause = document.getElementById("pause");
+TiffViewer_pause.title = "pause";
+TiffViewer_pause.classList.add("buttonRightClass")
+const pauseIcon = document.createElement("img");
+	pauseIcon.classList.add("tiffViewerIcons");
+	pauseIcon.src = "/WebGde/assets/pause_icon.png";
+	pauseIcon.alt = "refresh";
+	
+const TiffViewer_return = document.getElementById("return");
+TiffViewer_return.title = "return";
+  TiffViewer_return.classList.add("buttonRightClass")
+const returnIcon = document.createElement("img");
+	returnIcon.classList.add("tiffViewerIcons");
+	returnIcon.src = "/WebGde/assets/return_icon.png";
+	returnIcon.alt = "refresh";
+	
+const TiffViewer_reject = document.getElementById("reject");
+  TiffViewer_reject.title = "reject";
+  TiffViewer_reject.classList.add("buttonRightClass")
+const rejectIcon = document.createElement("img");
+	rejectIcon.classList.add("tiffViewerIcons");
+	rejectIcon.src = "/WebGde/assets/reject_icon.png";
+	rejectIcon.alt = "refresh";
+
+	TiffViewer_refresh.append(refreshIcon) 
+	  TiffViewer_pause.append(pauseIcon)
+	  TiffViewer_return.append(returnIcon)
+	  TiffViewer_reject.append(rejectIcon)
+
+
   document.getElementById("nextDiv").addEventListener('click',
                 function() {
                         const fieldForm = document.getElementById("fields");

WebGde/WebContent/src/BPO/rejectElement.js

@@ -59,8 +59,9 @@ async function rejectElement() {
 }
  //window for reason rejecting element
 
-var rejectButton = document.getElementById('reject');
-rejectButton.onclick = function () {     
+var rejectButton = document.getElementById("reject");
+
+	rejectButton.onclick = function () {     
 	createRejectWindow();  
     /*let screenMain = document.getElementById("reject_window");
   /*  screenMain.style.display = 'block';*/
@@ -70,10 +71,12 @@ rejectButton.onclick = function () {
     //fieldForm.querySelector('input[type="submit"]').click();     
 };
 
+
+
 window.addEventListener('keydown', function(e) {
     if (e.ctrlKey == true && e.keyCode == 69){
-        let screenMain = document.getElementById("genericPopup");
-    	screenMain.style.display = 'block';
+      
+    	createRejectWindow(); 
     	rejectButton.disabled = true;
     }
 });

WebGde/WebContent/src/BPO/returnElement.js

@@ -68,11 +68,14 @@ async function returnElementLogout(elementId) {
 }
 
 var returnButton = document.getElementById('return');
-returnButton.onclick = function () {
-    returnElementBPO(sessionStorage.getItem("element_id"));
+
+returnButton.addEventListener("click", function () {
+		returnElementBPO(sessionStorage.getItem("element_id"));
     // const fieldForm = document.getElementById("fields");
     // fieldForm.querySelector('input[type="submit"]').click();
-};
+	});
+
+
 
 window.addEventListener('keydown', function(e) {
     if (e.altKey == true && e.keyCode == 85){

WebGde/WebContent/src/getFields/getFields.js

@@ -29,10 +29,15 @@ const displayFields = async (parentID) => {
         logOutDiv.classList.add("logOutButton")
         let logoutIcon = document.createElement("img");
         logoutIcon.classList.add("normalIcon");
+        logoutIcon.classList.add("logOutIcon")
         logoutIcon.src = "/WebGde/assets/logout_icon.png";
 	 	
-        
-   		logOutDiv.append(logoutIcon);
+        let logoutClass = document.getElementsByClassName("logOutIcon");
+        console.log(logoutClass.length);
+        if(logoutClass.length === 0){
+			logOutDiv.append(logoutIcon);
+		}
+   		
         
         
         

WebGde/WebContent/src/tiffViewer/tiffViewer.js

@@ -140,7 +140,7 @@ function TIFFViewer(xhr, TiffViewerImageName) {
   TiffViewer_hflip.id = "TiffViewer_FlipX";
   TiffViewer_hflip.classList.add("TiffViewer_ButtonClass");
 	TiffViewer_hflip.title = "Horizontal Flip";
-	let hflipIcon = document.createElement("img");
+	const hflipIcon = document.createElement("img");
 	 hflipIcon.classList.add("tiffViewerIcons");
 	 hflipIcon.src = "/WebGde/assets/flip_horizontal_icon.png";
 	 hflipIcon.alt = "horizontal-flip";
@@ -150,7 +150,7 @@ function TIFFViewer(xhr, TiffViewerImageName) {
   TiffViewer_vflip.id = "TiffViewer_FlipY";
   TiffViewer_vflip.classList.add("TiffViewer_ButtonClass");
   TiffViewer_vflip.title = "Vertical Flip"
-	let vflipIcon = document.createElement("img");
+	const vflipIcon = document.createElement("img");
 	vflipIcon.classList.add("tiffViewerIcons");
 	vflipIcon.src = "/WebGde/assets/flip_vertical_icon.png";
 	vflipIcon.alt = "vertical-flip";
@@ -162,7 +162,7 @@ function TIFFViewer(xhr, TiffViewerImageName) {
   TiffViewer_Rrotate.id = "TiffViewer_RotateR";
   TiffViewer_Rrotate.classList.add("TiffViewer_ButtonClass");
   TiffViewer_Rrotate.title = "Rotate Right"
-	let RrotateIcon = document.createElement("img");
+	const RrotateIcon = document.createElement("img");
 	RrotateIcon.classList.add("tiffViewerIcons");
 	RrotateIcon.src = "/WebGde/assets/rotate_right_icon.png";
 	RrotateIcon.alt = "rotate-right";
@@ -171,7 +171,7 @@ function TIFFViewer(xhr, TiffViewerImageName) {
   TiffViewer_Lrotate.id = "TiffViewer_RotateL";
   TiffViewer_Lrotate.classList.add("TiffViewer_ButtonClass");
    TiffViewer_Lrotate.title = "Rotate Left"
-	let LrotateIcon = document.createElement("img");
+	const LrotateIcon = document.createElement("img");
 	LrotateIcon.classList.add("tiffViewerIcons");
 	LrotateIcon.src = "/WebGde/assets/rotate_left_icon.png";
 	LrotateIcon.alt = "rotate-left";
@@ -185,7 +185,7 @@ function TIFFViewer(xhr, TiffViewerImageName) {
   TiffViewer_zoomIn.id = "TiffViewer_ZoomP";
   TiffViewer_zoomIn.classList.add("TiffViewer_ButtonClass");
   TiffViewer_zoomIn.title = "Zoom In";
-	let zoomInIcon = document.createElement("img");
+	const zoomInIcon = document.createElement("img");
 	zoomInIcon.classList.add("tiffViewerIcons");
 	zoomInIcon.src = "/WebGde/assets/zoom_in_icon.png";
 	zoomInIcon.alt = "zoom-in";
@@ -194,7 +194,7 @@ function TIFFViewer(xhr, TiffViewerImageName) {
   TiffViewer_zoomOut.id = "TiffViewer_ZoomM";
   TiffViewer_zoomOut.classList.add("TiffViewer_ButtonClass");
   TiffViewer_zoomOut.title = "Zoom Out";
-	let zoomOutIcon = document.createElement("img");
+	const zoomOutIcon = document.createElement("img");
 	zoomOutIcon.classList.add("tiffViewerIcons");
 	zoomOutIcon.src = "/WebGde/assets/zoom_out_icon.png";
 	zoomOutIcon.alt = "zoom-out";
@@ -218,7 +218,7 @@ function TIFFViewer(xhr, TiffViewerImageName) {
   TiffViewer_Fscrn.id = "TiffViewer_FullscreenButton";
   TiffViewer_Fscrn.classList.add("TiffViewer_ButtonClass");
   TiffViewer_Fscrn.title = "Fullscreen";
-	let FscrnIcon = document.createElement("img");
+	const FscrnIcon = document.createElement("img");
 	FscrnIcon.classList.add("tiffViewerIcons");
 	FscrnIcon.src = "/WebGde/assets/fullscreen_icon.png";
 	FscrnIcon.alt = "full-screen";
@@ -229,7 +229,7 @@ function TIFFViewer(xhr, TiffViewerImageName) {
   TiffViewer_Fit.id = "TiffViewer_FitButton";
   TiffViewer_Fit.classList.add("TiffViewer_ButtonClass");
   TiffViewer_Fit.title = "Fullscreen";
-	let FitIcon = document.createElement("img");
+	const FitIcon = document.createElement("img");
 	FitIcon.classList.add("tiffViewerIcons");
 	FitIcon.src = "/WebGde/assets/full_content_icon.png";
 	FitIcon.alt = "full-screen";
@@ -237,47 +237,25 @@ function TIFFViewer(xhr, TiffViewerImageName) {
   const zoom = document.createElement("div");
   zoom.classList.add("viewerSizeLabel");
   
-  const TiffViewer_refresh = document.getElementById("refresh");
-  TiffViewer_refresh.classList.add("buttonRightClass")
-  TiffViewer_refresh.title = "refresh";
-  let refreshIcon = document.createElement("img");
-	refreshIcon.classList.add("tiffViewerIcons");
-	refreshIcon.src = "/WebGde/assets/refresh_icon.png";
-	refreshIcon.alt = "refresh";
-  
-  
- const TiffViewer_pause = document.getElementById("pause");
- TiffViewer_pause.title = "pause";
-   TiffViewer_pause.classList.add("buttonRightClass")
-  let pauseIcon = document.createElement("img");
-	pauseIcon.classList.add("tiffViewerIcons");
-	pauseIcon.src = "/WebGde/assets/pause_icon.png";
-	pauseIcon.alt = "refresh";
-	
-  const TiffViewer_return = document.getElementById("return");
-  TiffViewer_return.title = "return";
-    TiffViewer_return.classList.add("buttonRightClass")
-  let returnIcon = document.createElement("img");
-	returnIcon.classList.add("tiffViewerIcons");
-	returnIcon.src = "/WebGde/assets/return_icon.png";
-	returnIcon.alt = "refresh";
-	
-  const TiffViewer_reject = document.getElementById("reject");
-    TiffViewer_reject.classList.add("buttonRightClass")
-    TiffViewer_reject.title = "reject";
-  let rejectIcon = document.createElement("img");
-	rejectIcon.classList.add("tiffViewerIcons");
-	rejectIcon.src = "/WebGde/assets/reject_icon.png";
-	rejectIcon.alt = "refresh";
+  
+ 
+  
+  
+  
+  
 
   let ofTotal = JSON.parse(sessionStorage.getItem("dir_files")).length;
   document.getElementById("totalPageValue").innerHTML = Current_page + ' of ' + ofTotal;
 
+	
+  
+	
+
+
+
   //append all content declarations to modal
-  TiffViewer_refresh.append(refreshIcon) 
-  TiffViewer_pause.append(pauseIcon)
-  TiffViewer_return.append(returnIcon)
-  TiffViewer_reject.append(rejectIcon)
+ 
+ 
   TiffViewer_Fit.append(FitIcon)  
   TiffViewer_Fscrn.append(FscrnIcon)
   TiffViewer_zoomOut.append(zoomOutIcon)
@@ -288,6 +266,7 @@ function TIFFViewer(xhr, TiffViewerImageName) {
   TiffViewer_vflip.append(vflipIcon)
   
   TiffViewer_Header.append(TiffViewer_detailcont);
+
   TiffViewer_Body.append(TiffViewer_filecont);
   TiffViewer_Footer.append(zoom, TiffViewer_btncont);
 
@@ -617,13 +596,13 @@ function TIFFViewer(xhr, TiffViewerImageName) {
       setwidth = origwidth;
       wzoom[TiffViewer_current - 1] = origwidth;
       hzoom[TiffViewer_current - 1] = origheight;
-      this.innerHTML = "rc";
+    
     } else {
       setheight = changedheight;
       setwidth = changedwidth;
       wzoom[TiffViewer_current - 1] = changedwidth;
       hzoom[TiffViewer_current - 1] = changedheight;
-      this.innerHTML = "fc";
+  
     }
     Edited();
   }
@@ -737,7 +716,7 @@ function TIFFViewer(xhr, TiffViewerImageName) {
 			setwidth = changedwidth;
 			wzoom[TiffViewer_current - 1] = changedwidth;
 			hzoom[TiffViewer_current - 1] = changedheight;
-			fitB.innerHTML = "fc";		
+					
 		}
 	
 		if (flippedX[TiffViewer_current - 1] != 1) {

WebGde/WebContent/style.css

@@ -272,7 +272,7 @@ img.tiffViewerIcons {
     color: white;
     position: absolute;
     right: 5px;
-    top: 7px;
+    top: 10px;
 }
 
 .popup .popupLogoutText {
@@ -329,7 +329,7 @@ textarea{
 }
 
 #TiffButtonRight{
-	display: inline-flex;
+	    display: inline-flex;
     padding: 2px 16px;
     z-index: 1;
     position: absolute;
@@ -338,6 +338,8 @@ textarea{
     height: 45px;
     flex-wrap: wrap;
     align-content: center;
+    margin-top: -50px;
+    right: -76px;
 }
 
 .buttonRightClass {
@@ -377,7 +379,7 @@ textarea{
 	height: 13px;
 	justify-content: center;
 	cursor: pointer;
-	border: 2px solid #b6b6b6;
+	border: 2px solid #ffffff;
 	border-radius: 200px;
 	font-size: 15px;
 	color: white;
@@ -691,10 +693,11 @@ vertical-align: middle;
 #TiffModalFooter {
     height: 38px;
     bottom: 0px;
-    position: absolute;
-    width: 100%;
+    position: fixed;
+    width: 70%;
     display: block;
     background-color: #000000a1;
+    float: right;
 }
 
 #TiffViewer_FileContainer{