work on comments

Author: Hagellach37

firebase/database.rules.json

@@ -15,8 +15,6 @@
           ||
           (auth != null  && query.orderByChild == 'status' && query.equalTo == 'build_area_tutorial' && query.limitToFirst == 1)
           ||
-          (auth != null  && query.orderByChild == 'name' && query.equalTo == 'build_area_tutorial_solid_waste' && query.limitToFirst == 1)
-          ||
           // only team members can query by their own teamId
           (auth != null && query.orderByChild == 'teamId' &&
            query.equalTo == root.child('/v2/users/'+auth.uid+'/teamId').val())

manager_dashboard/manager_dashboard/js/forms.js

@@ -1,3 +1,8 @@
+const BUILD_AREA_TYPE = 1
+const FOOTPRINT_TYPE = 2
+const CHANGE_DETECTION_TYPE = 3
+const COMPLETENESS_TYPE = 4
+
 //auto expand textarea
 function adjust_textarea(h) {
     h.style.height = "20px";
@@ -68,7 +73,7 @@ function displayProjectTypeForm(projectType) {
     document.getElementById("projectType").value = projectType;
     switch (projectType) {
         case "build_area":
-            initTutorials(1);
+            initTutorials(BUILD_AREA_TYPE);
             displayTileServer("bing", "A");
             document.getElementById("groupSize").value = 120;
             document.getElementById("form_project_aoi_geometry").style.display = "block";
@@ -80,7 +85,7 @@ function displayProjectTypeForm(projectType) {
             document.getElementById("form_team_settings").style.display = "None";
             break;
         case "footprint":
-            initTutorials(2);
+            initTutorials(FOOTPRINT_TYPE);
             displayTileServer("bing", "A");
             document.getElementById("groupSize").value = 25;
             document.getElementById("form_project_aoi_geometry").style.display = "None";
@@ -96,10 +101,10 @@ function displayProjectTypeForm(projectType) {
             displayTileServer("bing", "B");
             if (projectType == "change_detection") {
                 document.getElementById("groupSize").value = 25;
-                initTutorials(3);
+                initTutorials(CHANGE_DETECTION_TYPE);
             } else {
                 document.getElementById("groupSize").value = 80;
-                initTutorials(4);
+                initTutorials(COMPLETENESS_TYPE);
             }
             document.getElementById("form_project_aoi_geometry").style.display = "block";
             document.getElementById("form_project_task_geometry").style.display = "None";

manager_dashboard/manager_dashboard/js/uploadProjects.js

@@ -22,7 +22,7 @@ function getFormInput() {
 
     // add teamId if visibility is not set to public
     visibility = document.getElementById("visibility").value
-    if (visibility != "public") {
+    if (visibility !== "public") {
         form_data.teamId = visibility
         maxTasksPerUser = document.getElementById("maxTasksPerUser").value
         if (maxTasksPerUser > 0) {

mapswipe_workers/mapswipe_workers/project_types/base/project.py

@@ -78,7 +78,7 @@ def __init__(self, project_draft):
                 "private_inactive"  # private project visible only for team members
             )
             max_tasks_per_user = project_draft.get("maxTasksPerUser", None)
-            if max_tasks_per_user:
+            if max_tasks_per_user is not None:
                 self.maxTasksPerUser = int(max_tasks_per_user)
 
         self.tutorialId = project_draft.get("tutorialId", None)

mapswipe_workers/mapswipe_workers/project_types/tile_map_service_grid/project.py

@@ -7,6 +7,7 @@
     CustomError,
     logger,
     MAX_INPUT_GEOMETRIES,
+    ProjectType,
 )
 from mapswipe_workers.project_types.tile_map_service_grid.group import Group
 from mapswipe_workers.utils import tile_grouping_functions as grouping_functions
@@ -24,7 +25,10 @@ def __init__(self, project_draft: dict):
         self.tileServer = vars(BaseTileServer(project_draft["tileServer"]))
 
         # get TileServerB for change detection and completeness type
-        if self.projectType in [3, 4]:
+        if self.projectType in [
+            ProjectType.COMPLETENESS.value,
+            ProjectType.CHANGE_DETECTION.value,
+        ]:
             self.tileServerB = vars(BaseTileServer(project_draft["tileServerB"]))
 
     def validate_geometries(self):

mapswipe_workers/mapswipe_workers/project_types/tile_map_service_grid/task.py

@@ -1,5 +1,6 @@
 from mapswipe_workers.project_types.base.task import BaseTask
 from mapswipe_workers.utils import tile_functions as t
+from mapswipe_workers.definitions import ProjectType
 
 
 class Task(BaseTask):
@@ -42,7 +43,10 @@ def __init__(self, group: object, project: object, TileX: str, TileY: str):
         )
 
         # get TileServer B only for change_detection or completeness type
-        if project.projectType in [3, 4]:
+        if project.projectType in [
+            ProjectType.COMPLETENESS.value,
+            ProjectType.CHANGE_DETECTION.value,
+        ]:
             self.urlB = t.tile_coords_zoom_and_tileserver_to_url(
                 TileX, TileY, project.zoomLevel, project.tileServerB
             )

mapswipe_workers/python_scripts/add_tutorial_id_to_projects.py

@@ -1,14 +1,16 @@
 import sys
 from mapswipe_workers.auth import firebaseDB
-from mapswipe_workers.definitions import logger
+from mapswipe_workers.definitions import logger, ProjectType
 
 
-def get_all_projects(project_type: int):
-    """Get the user ids from all users in Firebase DB."""
+def get_all_projects_of_type(project_type: int):
+    """Get the project ids for active and inactive projects in Firebase DB."""
 
     project_id_list = []
     fb_db = firebaseDB()
 
+    # we neglect private projects here
+    # since there are no projects set up in production yet
     status_list = ["active", "inactive"]
 
     for status in status_list:
@@ -37,8 +39,8 @@ def add_tutorial_id_to_projects(project_id_list, tutorial_id):
 
 
 if __name__ == "__main__":
-    """python add_tutorial_id_to_projects.py project_type tutorial_id"""
-    project_type = sys.argv[1]
+    """python add_tutorial_id_to_projects.py BUILD_AREA tutorial_id"""
+    project_type = ProjectType[sys.argv[1]].value
     tutorial_id = sys.argv[2]
-    project_id_list = get_all_projects(1)
+    project_id_list = get_all_projects_of_type(project_type)
     add_tutorial_id_to_projects(project_id_list, tutorial_id)