Merge pull request #13 from susom/development

Development
susom · Feb 13, 2025 · 782aa87 · 782aa87
2 parents 65ee6ca + d137807
commit 782aa87
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 13 deletions.
diff --git a/IntakeDashboard.php b/IntakeDashboard.php
@@ -28,15 +28,19 @@ public function __construct()
 
     }
 
-//    public function setModuleCore(){
-//        $moduleCore = new ModuleCore($this);
-//    }
-//
-//    public function getModuleCore(){
-//        if(!$this->moduleCore)
-//            $this->setModuleCore(new ModuleCore($this));
-//        return $this->moduleCore;
-//    }
+    /**
+     * //Required for link-based access from control panel (non-admin)
+     * @param $project_id
+     * @param $link
+     * @return mixed|null
+     */
+    function redcap_module_link_check_display($project_id, $link)
+    {
+        if(empty($_SESSION['username']))
+            return null;
+        return $link;
+    }
+
 
     /**
      * Helper method for inserting the JSMO JS into a page along with any preload data
@@ -424,7 +428,6 @@ public function saveUser($username, $universalId)
         $saveData = [
             [
                 "record_id" => $username,
-                "type" => "Secondary",
                 "intake_id" => $universalId,
                 "redcap_event_name" => $event_name,
                 "redcap_repeat_instrument" => $form_name,

diff --git a/config.json b/config.json
@@ -17,7 +17,14 @@
     "enable-no-auth-logging": true,
 
     "links": {
-        "project": [],
+        "project": [
+            {
+                "name": "Intake Dashboard",
+                "icon": "gear",
+                "url" : "pages/root.php",
+                "show-header-and-footer": false
+            }
+        ],
         "control-center": [
             {
                 "name": "Intake Dashboard",

diff --git a/dashboard-ui/dist/assets/index-BhWjgiNT.js → dashboard-ui/dist/assets/index-BsGXjJTR.js b/dashboard-ui/dist/assets/index-BhWjgiNT.js → dashboard-ui/dist/assets/index-BsGXjJTR.js
diff --git a/dashboard-ui/src/views/ChildContent/childContent.jsx b/dashboard-ui/src/views/ChildContent/childContent.jsx
@@ -185,7 +185,7 @@ export function ChildContent({childInfo, immutableParentInfo, mutableParentInfo}
                     >Confirm</Button>
                 </div>
             </Modal>
-            <LoadingOverlay visible={loading} loaderProps={{ children: 'Loading...' }} />
+            <LoadingOverlay visible={loading} loaderProps={{ type: 'dots', size:"md" }} overlayProps={{ blur: 2 }} />
             {renderRequestButton()}
             <Modal size="80%" opened={childOpened} onClose={childClose} title="Child Intake Submission">
                 {childOpened && renderChildModal()}