ui integration from adhoc

WebGde/WebContent/src/endSession/endSession.js

@@ -19,18 +19,21 @@ function checkForm(form){
   if(inputsBlankCount==0 && selectsBlankCount==0) return true;
 }
 
-endButton.addEventListener("click", function(){      
+/*endButton.addEventListener("click", function(){      
   let endWindow = document.getElementById('end_window');
   endWindow.style.display = 'block';
 });
 
-createEndSessionWindow();
+*/
 
 function createEndSessionWindow(){
+	let overlay = document.createElement("div");
+	overlay.classList.add("genericPopup");
+	
+	
     let endWindow = document.createElement('div');
     endWindow.id = 'end_window';
-    endWindow.style.display = 'none';
-    document.body.appendChild(endWindow);
+    endWindow.classList.add("parent_Window")
     
     let endBodyDiv = document.createElement('div');
     endBodyDiv.id = 'endBodyDiv'; 
@@ -43,6 +46,7 @@ function createEndSessionWindow(){
     endOkCnclDiv.id = 'endOkCnclCont';
     
     let okEnd = document.createElement('button');
+    okEnd.classList.add("emphasizeButton");
     okEnd.innerHTML = 'ok';
     okEnd.id = 'okEndButtn';
     okEnd.onclick = async function () {
@@ -79,11 +83,10 @@ function createEndSessionWindow(){
 	}
     
     let cancelEnd = document.createElement('button');
+    cancelEnd.classList.add("normalButton");
     cancelEnd.innerHTML = 'cancel';
     cancelEnd.id = 'cnclEndButton';
-    cancelEnd.onclick = function () {     	   	
-    	endWindow.style.display = 'none'; 	 	
-    }
+    
         
     endOkCnclDiv.appendChild(okEnd);
     endOkCnclDiv.appendChild(cancelEnd);
@@ -95,4 +98,14 @@ function createEndSessionWindow(){
     endWindow.appendChild(endBodyDiv);
     
       
+        
+    cancelEnd.addEventListener("click", function () {
+		overlay.remove();
+	});
+
+    
+      
+      overlay.append(endWindow);
+      document.body.append(overlay);
+      
 }

WebGde/WebContent/src/getFields/getFields.js

@@ -17,11 +17,25 @@
  * @returns 
  */
 
- let getDocType;
+let getDocType;
 const displayFields = async (parentID) => {
     try {
         document.getElementById("userNameValue").innerHTML = `User: ${sessionStorage.getItem("user_id")}`;
+       
         document.getElementById("elemIDValue").innerHTML = `Element ID: ${sessionStorage.getItem("element_id")}`;
+        
+        let logOutDiv = document.getElementById("popupLogout");
+        logOutDiv.title = "Logout";
+        logOutDiv.classList.add("logOutButton")
+        let logoutIcon = document.createElement("img");
+        logoutIcon.classList.add("normalIcon");
+        logoutIcon.src = "/WebGde/assets/logout_icon.png";
+	 	
+        
+   		logOutDiv.append(logoutIcon);
+        
+        
+        
         let div = document.getElementById(parentID)
         if(!div) return { valid: false, error: `Element with ID '${parentID}' not found` }
 
@@ -73,6 +87,7 @@ const displayFields = async (parentID) => {
 		
 		
         const submit = document.createElement('input')
+        submit.classList.add("submitButtons");
         submit.type = 'submit'
         div.appendChild(submit)