Merge remote-tracking branch 'origin/feature/senior-officer' into staging

# Conflicts: # module.json # routes/web.php
2024-10-04 11:05:26 +07:00
parent 5bfefe973d 0b5820375b
commit 6c20c33edc
17 changed files with 1239 additions and 188 deletions
--- a/module.json
+++ b/module.json
@@ -120,6 +120,18 @@
          "administrator","so"
        ]
      },
+      {
+        "title": "Team Activity",
+        "path": "activity.progres",
+        "icon": "ki-filled ki-questionnaire-tablet text-lg",
+        "classes": "",
+        "attributes": [],
+        "permission": "",
+        "roles": [
+          "so"
+        ]
+      },
+
      {
        "title": "Activity",
        "path": "activity",