Changeset 43c9090 for src/main/resources/static/js/editUser.js

Timestamp:

10/12/24 21:32:15 (5 weeks ago)

Author:

macagaso <gasoskamarija@…>

Branches:

master

Parents:

743de55

Message:

Updated version

File:

• src/main/resources/static/js/editUser.js (modified) (11 diffs)

src/main/resources/static/js/editUser.js

@@ -3 +3 @@
 import { verificationCheck } from './authentication-shared.js';
 
-let loggedPerson;
+let loggedPerson,checkDifferent;
 const modal = document.getElementById('popupModal');
 const cancelBtn = document.getElementById('cancelBtn');
@@ -71 +71 @@
         counter= user.carriedOut.length;
     }
-    console.log(counter);
     return counter;
 }
@@ -122 +121 @@
             buttonCell.appendChild(button1);
             button2.textContent = "Потврди одржан";
-            button2.addEventListener('click',()=>
-                function(){
+            buttonCell.appendChild(button2);
+            button2.addEventListener('click',()=> {
                 modal.style.display='flex';
-                approveBtn.addEventListener('click', () => {
-                    const userInput = document.getElementById('userInput').value;
-                    confirmCarriedOut(request.term,userInput);
-                    modal.style.display = 'none'; // Close the modal after approval
-                });
+                document.getElementById("userInput").disabled=false;
             });
-            buttonCell.appendChild(button2);
+            approveBtn.addEventListener('click', () => {
+                const userInput = document.getElementById('userInput').value;
+                confirmCarriedOut(request.term,userInput);
+                modal.style.display = 'none';
+            });
+
         }
 
@@ -146 +146 @@
     if(selectedValue==="requests"){
         url=`/api/requests/listAll?username=${loggedPerson.username}`;
-        tHeadArray=["Термин", "Опции"];
+        tHeadArray=["Термин","Медицинска состојба","Опции"];
         createHeader(tHeadArray);
         getAll(url);
@@ -153 +153 @@
         let testTemp="RESERVED";
         url=`/api/appointments/listAll?username=${loggedPerson.username}&status=${testTemp}`;
-        tHeadArray=["Термин", "Опции"];
+        tHeadArray=["Термин","Медицинска состојба", "Опции"];
         createHeader(tHeadArray);
         getAll(url);
@@ -230 +230 @@
         .catch(error => {
             console.error('Error fetching user data:', error);
-            return { name: '', surname: '' };  // return empty values on error
+            return { name: '', surname: '' };
         });
 }
@@ -267 +267 @@
         if (cookieUsername) {
             fetchUserData(cookieUsername,"USER").then(userData => {
-                const fullName = `${userData.name} ${userData.surname}`;
-                document.getElementById('cookie-name').innerHTML = fullName;
+            console.log("success")
             });
-        } else {
-            document.getElementById('cookie-name').textContent = 'Default Name';
         }
     }
@@ -277 +274 @@
 function saveProfileChanges() {
     const userName = document.querySelector('input[name="username"]').value;
-    console.log(userName);
+    const phoneNum=document.querySelector('input[name="phone"]').value.replace(/-/g,"")
+    console.log(phoneNum);
     const updatedData = {
         username: userName,
         name: document.querySelector('input[name="firstName"]').value,
         surname: document.querySelector('input[name="lastName"]').value,
-        phone: document.querySelector('input[name="phone"]').value,
+        phone: phoneNum,
         age: document.querySelector('input[name="age"]').value
     };
-    if(!verificationCheck(updatedData)){
+    if(!verificationCheck(updatedData,checkDifferent)){
         return;
     }
@@ -299 +297 @@
         .then(data => {
             alert('Profile updated successfully!');
-            toggleEditing(false); // Disable fields after saving changes
+            toggleEditing(false);
             updateCookieUsername(userName);
         })
@@ -313 +311 @@
     };
 }
+function removeOptions(){
+    if(getRoleFromCookie()!=="ADMIN"){
+        let temp=this;
+        temp.removeChild(document.getElementById("requests"));
+        temp.removeChild(document.getElementById("appointments"))
+    }
+}
 
 function toggleEditing(isEnabled) {
@@ -322 +327 @@
 
 window.onload = function(){
+    checkDifferent=true;
     updateProfile();
     toggleEditing(false);
     document.getElementById('edit-profile').addEventListener('click', function() {
        const role=getQueryParams();
-       if(role.param1 ==='ADMIN')
-        toggleEditing(true);
+       if(role.param1 ==='ADMIN'){
+           toggleEditing(true);
+           checkDifferent=false;
+       }
+
     });
     document.getElementById('saveChanges').addEventListener('click', saveProfileChanges);
     document.getElementById("statusDropdown").addEventListener('change',createRowsBasedOnType);
-
-}
+    document.getElementById("statusDropdown").addEventListener('click',removeOptions);
+}