Clinician portal for SPARC

compose-cluster/generate_compose_yaml.py

@@ -103,6 +103,7 @@
 argparser.add_argument('--saml_cloud_iam_demo', help='Enable SAML authentication with CARDS via the Cloud-IAM.com demo', action='store_true')
 argparser.add_argument('--server_address', help='Domain name (or Domain name:port) that the public will use for accessing this CARDS deployment')
 argparser.add_argument('--slack_notifications', help='Enable the periodic sending of performance metrics to a Slack channel', action='store_true')
+argparser.add_argument('--locking', help='Enable the ability to lock and unlock resources', action='store_true')
 argparser.add_argument('--smtps', help='Enable SMTPS emailing functionality', action='store_true')
 argparser.add_argument('--smtps_localhost_proxy', help='Run an SSL termination proxy so that the CARDS container may connect to the host\'s SMTP server at localhost:25', action='store_true')
 argparser.add_argument('--smtps_test_container', help='Enable the mock SMTPS (cards/postfix-docker) container for viewing CARDS-sent emails.', action='store_true')
@@ -778,6 +779,9 @@ def newListIfEmpty(yaml_object, *keys):
   if 'NIGHTLY_SLACK_NOTIFICATIONS_SCHEDULE' in os.environ:
     yaml_obj['services']['cardsinitial']['environment'].append("NIGHTLY_SLACK_NOTIFICATIONS_SCHEDULE={}".format(os.environ['NIGHTLY_SLACK_NOTIFICATIONS_SCHEDULE']))
 
+if args.locking:
+  yaml_obj['services']['cardsinitial']['environment'].append("LOCKING_ENABLED=true")
+
 if ENABLE_BACKUP_SERVER:
   print("Configuring service: backup_recorder")
 

distribution/docker_entry.sh

@@ -158,6 +158,12 @@ then
   featureFlagString="$featureFlagString -f mvn:io.uhndata.cards/cards-slack-notifications/${CARDS_VERSION}/slingosgifeature"
 fi
 
+#Should the cards-locking module be loaded?
+if [[ "$LOCKING_ENABLED" == "true" ]]
+then
+  featureFlagString="$featureFlagString -f mvn:io.uhndata.cards/cards-locking/${CARDS_VERSION}/slingosgifeature"
+fi
+
 if [[ "$SMTPS_LOCALHOST_PROXY" == "true" ]]
 then
   keytool -import -trustcacerts -file /etc/cert/smtps_certificate.crt -keystore /etc/ssl/certs/java/cacerts -keypass changeit -storepass changeit -noprompt

modules/data-entry/src/main/frontend/src/questionnaire/Form.jsx

@@ -73,7 +73,7 @@ import SessionExpiryWarningModal from "./SessionExpiryWarningModal.jsx";
  */
 function Form (props) {
   let { classes, id, contentOffset } = props;
-  let { mode, className, disableHeader, disableButton, doneButtonStyle, doneIcon, doneLabel, onDone, questionnaireAddons, paginationProps } = props;
+  let { mode, className, actionSwitches, disableHeader, disableButton, doneButtonStyle, doneIcon, doneLabel, onDone, questionnaireAddons, paginationProps } = props;
   // Record if the form was already checked out before opening it, which may indicate that another user is editing, or it is being edited in a different tab
   let [ wasCheckedOut, setWasCheckedOut ] = useState(false);
   // This holds the full form JSON, once it is received from the server
@@ -443,87 +443,108 @@ function Form (props) {
     );
   }
 
+  let isActionEnabled = (action) => (!!!actionSwitches || !!(actionSwitches[action]?.(data)));
+
+  let isDropdnEnabled = () => (
+    (isEdit && isActionEnabled("subject"))
+    || (!isEdit && isActionEnabled("text"))
+    || isActionEnabled("delete")
+  );
+
   let dropdownList = (
-                  <List>
-                    { isEdit ?
-                    <ListItem className={classes.actionsMenuItem}>
-                      <Button onClick={() => {setSelectorDialogOpen(true); setActionsMenu(null)}}>
-                        Change subject
-                      </Button>
-                    </ListItem>
-                    : <>
-                    <ListItem className={classes.actionsMenuItem}>
-                      <PrintButton
-                         variant="text"
-                         size="medium"
-                         resourcePath={formURL}
-                         resourceData={data}
-                         breadcrumb={getTextHierarchy(data?.subject, true)}
-                         date={DateTime.fromISO(data['jcr:created']).toLocaleString(DateTime.DATE_MED)}
-                         onClose={() => { setActionsMenu(null); }}
-                       />
-                    </ListItem>
-                    <ListItem className={classes.actionsMenuItem}>
-                      <Button
-                         size="medium"
-                         onClick={() => {
-                         window.open(formURL + ".txt");
-                         setActionsMenu(null);
-                        }}>
-                        Export as text
-                      </Button>
-                    </ListItem>
-                    </> }
-                    <ListItem className={classes.actionsMenuItem}>
-                      <DeleteButton
-                          entryPath={data ? data["@path"] : formURL}
-                          entryName={getEntityIdentifier(data)}
-                          entryType="Form"
-                          onComplete={onDelete}
-                          variant="text"
-                          size="medium"
-                        />
-                    </ListItem>
-                  </List>
+    <List>
+      { isEdit ?
+        ( isActionEnabled("subject") &&
+          <ListItem className={classes.actionsMenuItem}>
+            <Button onClick={() => {setSelectorDialogOpen(true); setActionsMenu(null)}}>
+              Change subject
+            </Button>
+          </ListItem>
+        )
+      :
+        ( isActionEnabled("text") &&
+          <ListItem className={classes.actionsMenuItem}>
+            <Button
+              size="medium"
+              onClick={() => {
+                window.open(formURL + ".txt");
+                setActionsMenu(null);
+              }}>
+              Export as text
+            </Button>
+          </ListItem>
+        )
+      }
+      { isActionEnabled("delete") &&
+        <ListItem className={classes.actionsMenuItem}>
+          <DeleteButton
+            entryPath={data ? data["@path"] : formURL}
+            entryName={getEntityIdentifier(data)}
+            entryType="Form"
+            onComplete={onDelete}
+            variant="text"
+            size="medium"
+          />
+        </ListItem>
+      }
+    </List>
   )
 
   let formMenu = (
-            <div className={classes.actionsMenu}>
-                {isEdit ?
-                  <Tooltip title="Save and view" onClick={onClose}>
-                    <IconButton color="primary" size="large">
-                      <DoneIcon />
-                    </IconButton>
-                  </Tooltip>
-                  :
-                  <Tooltip title="Edit">
-                    <IconButton color="primary" onClick={onEdit} size="large">
-                      <EditIcon />
-                    </IconButton>
-                  </Tooltip>
-                }
-                <Tooltip title="More actions" onClick={(event) => {setActionsMenu(event.currentTarget)}}>
-                  <IconButton size="large">
-                    <MoreIcon fontSize="small" />
-                  </IconButton>
-                </Tooltip>
-                { !actionsMenu && <div style={{display: "none"}}>{ dropdownList }</div> }
-                <Popover
-                    open={Boolean(actionsMenu)}
-                    anchorEl={actionsMenu}
-                    onClose={() => {setActionsMenu(null)}}
-                    anchorOrigin={{
-                        vertical: 'bottom',
-                        horizontal: 'right',
-                    }}
-                    transformOrigin={{
-                        vertical: 'top',
-                        horizontal: 'right',
-                    }}
-                >
-                  { dropdownList }
-                </Popover>
-            </div>
+    <div className={classes.actionsMenu}>
+    { isEdit ?
+      ( isActionEnabled("save") &&
+        <Tooltip title="Save and view" onClick={onClose}>
+          <IconButton color="primary" size="large">
+            <DoneIcon />
+          </IconButton>
+        </Tooltip>
+      )
+      :
+      ( isActionEnabled("edit") &&
+        <Tooltip title="Edit">
+          <IconButton color="primary" onClick={onEdit} size="large">
+            <EditIcon />
+          </IconButton>
+        </Tooltip>
+      )
+    }
+    { !isEdit && isActionEnabled("print") &&
+      <PrintButton
+        variant="icon"
+        size="large"
+        resourcePath={formURL}
+        resourceData={data}
+        breadcrumb={getTextHierarchy(data?.subject, true)}
+        date={DateTime.fromISO(data['jcr:created']).toLocaleString(DateTime.DATE_MED)}
+      />
+    }
+    { isDropdnEnabled() &&
+      <>
+        <Tooltip title="More actions" onClick={(event) => {setActionsMenu(event.currentTarget)}}>
+          <IconButton size="large">
+            <MoreIcon fontSize="small" />
+          </IconButton>
+        </Tooltip>
+        { !actionsMenu && <div style={{display: "none"}}>{ dropdownList }</div> }
+        <Popover
+          open={Boolean(actionsMenu)}
+          anchorEl={actionsMenu}
+          onClose={() => {setActionsMenu(null)}}
+          anchorOrigin={{
+            vertical: 'bottom',
+            horizontal: 'right',
+          }}
+          transformOrigin={{
+            vertical: 'top',
+            horizontal: 'right',
+          }}
+        >
+          { dropdownList }
+        </Popover>
+      </>
+    }
+    </div>
   )
 
   let getTimestampString  = (timestamp) => {

modules/data-entry/src/main/frontend/src/questionnaire/QuestionnaireStyle.jsx

@@ -577,6 +577,10 @@ const questionnaireStyle = theme => ({
         borderColor: theme.palette.error.main,
         color: theme.palette.error.main,
     },
+    LOCKEDFlag:{
+      backgroundColor: theme.palette.primary.main,
+      color: theme.palette.background.paper
+    },
     DefaultFlag: {
     },
     formPreview: {
@@ -733,6 +737,11 @@ const questionnaireStyle = theme => ({
         paddingTop: theme.spacing(4),
       },
     },
+    lockDialogInput: {
+      marginTop: theme.spacing(3),
+      marginRight: theme.spacing(3),
+      marginBottom: theme.spacing(3),
+    }
 });
 
 export default questionnaireStyle;