fixed search for admin; fixed progression for students

BarokDG · Mar 10, 2021 · 7fe3f28 · 7fe3f28
1 parent 9383d8e
commit 7fe3f28
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 30 deletions.
diff --git a/assets/js/admin.js b/assets/js/admin.js
@@ -33,13 +33,10 @@ if(currentDept == 'adm'){
                 let cursor = e.target.result;
 
                 if(cursor){
-                    // studentToRequestMap[cursor.value.studentId].push()
                     studentToRequestMap[cursor.value.studentId][cursor.value.deptId] = cursor.value.status
-                    // studentToRequestMap[cursor.value.studentId][studentToRequestMap[cursor.value.studentId].length - 1].push(cursor.value.status)
                     cursor.continue()
                 }
             }
-            console.log(studentToRequestMap);  
             printStudentClearanceStatus(studentToRequestMap)
 
         }
@@ -51,16 +48,14 @@ if(currentDept == 'adm'){
     function searchAdmin(e){
         let searchItem  = search.value
         let collection = document.querySelectorAll(".collection-item");
-
+        
         collection.forEach((item) =>{
-            if(item.textContent.indexOf(searchItem.toUpperCase())){
-                item.style.display = "none";
-
-
+            if(item.children[0].textContent.includes(searchItem.toUpperCase())){
+                console.log(item);
+                item.hidden = false
             }
             else{
-                item.style.display = "flex-inline"
-
+                item.hidden = true
             }
         });
 

diff --git a/assets/js/transactions.js b/assets/js/transactions.js
@@ -264,9 +264,9 @@ switch (currentDept) {
 }
     if(confirm("Are you sure about the deletion?")){
     let noteId = e.target.parentNode.parentNode.getAttribute('data-note-id');
-    console.log(e.target.parentNode.parentNode)
+    // console.log(e.target.parentNode.parentNode)
     console.log(noteId);
-        objectStore.delete(noteId);
+    objectStore.delete(noteId);
 
     //   report deletion
     transaction.oncomplete = function(){
@@ -422,7 +422,7 @@ function addClearanceRequest(e){
         status : "",
         description : ""
     }
-
+    console.log(newRecord);
     let transaction = db.transaction(['clearanceOS'], 'readwrite');
     let objectStore = transaction.objectStore('clearanceOS');
 
@@ -445,6 +445,7 @@ function addClearanceRequest(e){
 
 }
 
+// ADD CLEARANCE REQUEST TO CLEARANCE DEPARTMENT
 function addClearanceRequestCleareanceDept(e){
     let newRecord = {
         studentId : urlSearchParams.get('id'),
@@ -466,7 +467,7 @@ function addClearanceRequestCleareanceDept(e){
                 }
                 cursor.continue()
             }
-            else if(allCleared.length != 4 || allCleared.includes('rejected')){
+            else if(allCleared.length != 4 || allCleared.includes('rejected') || allCleared.includes('')){
                 alert('You will have to get a successful clearance notice from all the other departments first!')
             }
             else{

diff --git a/loan.html b/loan.html
@@ -135,7 +135,7 @@ <h5 class="modal-title" id="exampleModalLabel">Record a Loan</h5>
                                 <input type="text" class="form-control" id="lastName" placeholder="Last Name" required>
                             </div>
                             <div class="form-group">
-                                <input type="text" class="form-control" id="studentId" placeholder="ID" required>
+                                <input type="text" class="form-control" id="studentId" placeholder="ID" pattern="[A-Z]{2}\/\d{2}\/\d{2}" required>
                             </div>
                             <div class="form-group">
                                 <input type="text" class="form-control" id="phone" placeholder="Phone No." required>

diff --git a/students.html b/students.html
@@ -210,21 +210,6 @@ <h3 class="heading my-5">AAIT Clearance System</h3>
 
         <!-- for sidebar responsiveness -->
         <script src="./assets/js/sidebar.js"></script>
-
-        <!-- DB -->
-        <script src="./assets/js/db.js"></script>
-
-        <!-- Add and display -->
-        <script src="./assets/js/transactions.js"></script>
-
-        <!-- <script src="./assets/js/personalize.js"></script> -->
-        <!-- personalize for each department -->
-
-
-        <!-- ApexCharts js -->
-        <script src="https://cdn.jsdelivr.net/npm/apexcharts"></script>
-        <script src="./assets/js/apexscript.js"></script>
-
         <script>
             var progress = document.querySelector('.progress-bar');
 
@@ -251,6 +236,21 @@ <h3 class="heading my-5">AAIT Clearance System</h3>
             }
         </script>
 
+        <!-- DB -->
+        <script src="./assets/js/db.js"></script>
+
+        <!-- Add and display -->
+        <script src="./assets/js/transactions.js"></script>
+
+        <!-- <script src="./assets/js/personalize.js"></script> -->
+        <!-- personalize for each department -->
+
+
+        <!-- ApexCharts js -->
+        <script src="https://cdn.jsdelivr.net/npm/apexcharts"></script>
+        <script src="./assets/js/apexscript.js"></script>
+
+
 </body>
 
 </html>