cp simples

core/views/other.py

@@ -122,43 +122,6 @@ def controlpanel(request):
     """
     jobs_completed = []
 
-    def process_imports():
-        """databaseReset.py - CHECK THIS IS ALL CORRECT& CURRENT IF YOU RE-ENABLE IT
-        jq.enq("reinit",reinit_db)
-        jq.enq("caves",import_caves)
-        jq.enq("users",import_users)
-        jq.enq("people",import_people)
-        jq.enq("scans",import_surveyscans)
-        jq.enq("logbooks",import_logbooks)
-        jq.enq("QMs",import_QMs)
-        jq.enq("drawings",import_drawingsfiles)
-        jq.enq("survex",import_survex)
-        """
-        if request.POST.get("import_caves", False):
-            import_caves()
-            jobs_completed.append("Caves")
-        if request.POST.get("import_people", False):
-            import_people()
-            
-            jobs_completed.append("People")
-        if request.POST.get("import_surveyscans", False):
-            import_surveyscans()
-            jobs_completed.append("Scans")
-        if request.POST.get("import_logbooks", False):
-            import_logbooks()
-            jobs_completed.append("Logbooks")
-        if request.POST.get("import_QMs", False):
-            import_QMs()
-            jobs_completed.append("QMs")
-        if request.POST.get("import_drawingsfiles", False):
-            import_drawingsfiles()
-            jobs_completed.append("Drawings")
-        if request.POST.get("import_survex", False):
-            import_survex()
-            jobs_completed.append("Survex")
-
-        print("", flush=True)
-
     if not request.user.is_superuser:  # expoadmin is both .is_staff and ._is_superuser
         return render(
             request,
@@ -168,20 +131,11 @@ def controlpanel(request):
             
         )
     else:
-        if request.method == "POST":
-            # reinit_db()
-            process_imports()
-            return render(
-                request,
-                "controlPanel.html",
-                {"expeditions": Expedition.objects.all(), "jobs_completed": jobs_completed, "year": current_expo()},
-            )
-        else:
-            return render(
-                request,
-                "controlPanel.html",
-                {"expeditions": Expedition.objects.all(), "jobs_completed": jobs_completed, "year": current_expo()},
-            )
+        return render(
+            request,
+            "controlPanel.html",
+            {"expeditions": Expedition.objects.all(), "year": current_expo()},
+        )
 
 
 def exportlogbook(request, year=None):