Merge pull request #233 from mapswipe/fix-manager-dashboard-change-status-button

improve manager dashboard from feedback

Author: Hagellach37

manager_dashboard/manager_dashboard/js/project-management.js

@@ -1,4 +1,10 @@
+function addEventListeners(status) {
+  $("#projectsTable-"+status).on('click', '.change-status', changeProjectStatus);
+  $("#projectsTable-"+status).on('click', '.change-isFeatured', changeProjectIsFeatured);
+}
+
 function getProjects(status) {
+  console.log('start get project status')
   var ProjectsRef = firebase.database().ref("v2/projects").orderByChild("status").equalTo(status);
 
   var tableRef = $("#projectsTable-"+status).DataTable();
@@ -21,9 +27,6 @@ function getProjects(status) {
               btn1 = addButton(data.key, data.val().status, "inactive")
               btn2 = addButton(data.key, data.val().status, "finished")
               row_array.push(btn1.outerHTML + btn2.outerHTML)
-            } else if (data.val().status == "new") {
-              btn = addButton(data.key, data.val().status, "active")
-              row_array.push(btn.outerHTML)
             } else if (data.val().status == "finished") {
               btn = addButton(data.key, data.val().status, "inactive")
               row_array.push(btn.outerHTML)
@@ -55,22 +58,11 @@ function getProjects(status) {
             tableRef.row.add(row_array).draw( false )
         });
     };
-
     $('.dataTables_length').addClass('bs-select');
     console.log('added data table styles')
-
-    var btns = document.getElementsByClassName('change-status')
-    for (let item of btns) {
-        item.addEventListener("click", changeProjectStatus)
-    }
-
-    var btns = document.getElementsByClassName('change-isFeatured')
-    for (let item of btns) {
-        item.addEventListener("click", changeProjectIsFeatured)
-    }
-
   });
 
+
 }
 
 function addButton(id, oldStatus, newStatus){
@@ -114,11 +106,12 @@ function updateTableView() {
         .draw();
     }
 
-    getProjects("new")
     getProjects("active")
     getProjects("inactive")
     getProjects("finished")
     getProjects("archived")
+
+  console.log('updated table view')
 }
 
 
@@ -154,8 +147,10 @@ function changeProjectIsFeatured() {
 }
 
 
-getProjects("new")
-getProjects("active")
-getProjects("inactive")
-getProjects("finished")
-getProjects("archived")
+status_array = ["active", "inactive", "finished", "archived"]
+
+  for (var i = 0; i < status_array.length; i++) {
+    status = status_array[i]
+    getProjects(status)
+    addEventListeners(status)
+  }

manager_dashboard/manager_dashboard/manage.html

@@ -91,25 +91,6 @@ <h3>Please <a href="index.html">log in</a> first.</h3>
 
         <!-- manage existing projects -->
         <div class="row justify-content-center" id="project-management" style="display: block">
-          <div class="col-md-12">
-            <div id="new-projects" class="col-md-12 project-data">
-              <h2>New Projects</h2>
-              <p>These projects have just been created and no mapping has happened yet.</p>
-              <table id="projectsTable-new" class="table table-striped table-bordered">
-                      <thead>
-                        <tr class="thead-inverse">
-                          <th>Project ID</th>
-                          <th>Name</th>
-                          <th>Project Type</th>
-                          <th>Progress</th>
-                          <th>Change Status</th>
-                        </tr>
-                      </thead>
-                      <tbody>
-                        <!-- will be added by function -->
-                      </tbody>
-                  </table>
-              </div>
             <div id="active-projects" class="col-md-12 project-data">
                 <h2>Active Projects</h2>
                 <p>These projects are currently visible in the MapSwipe app.</p>

mapswipe_workers/mapswipe_workers/base/base_project.py

@@ -66,7 +66,7 @@ def __init__(self, project_draft):
         self.projectId = project_draft['projectDraftId']
         self.projectType = int(project_draft['projectType'])
         self.verificationNumber = project_draft['verificationNumber']
-        self.status = 'new'
+        self.status = 'inactive'
         self.projectTopic = project_draft.get('projectTopic', None)
         self.projectRegion = project_draft.get('projectRegion', None)
         self.projectNumber = project_draft.get('projectNumber', None)