Merge pull request #72 from chronic-care/develop

Develop
chronic-care · May 31, 2024 · 7b20bda · 7b20bda
2 parents 3a67bc5 + 6674cc0
commit 7b20bda
Show file tree

Hide file tree

Showing 17 changed files with 904 additions and 1,285 deletions.
diff --git a/.env b/.env
@@ -89,6 +89,6 @@ REACT_APP_LOG_ENABLED=false
 REACT_APP_LOG_API_KEY=<...>
 REACT_APP_LOG_ENDPOINT_URI="http://localhost:8085"
 
-REACT_APP_VERSION="version - 2.1.2"
+REACT_APP_VERSION="version -  2.2.1"
 # Set to have HHS Banner
-# REACT_APP_HHS_BANNER=true
+REACT_APP_HHS_BANNER=false
diff --git a/public/content/ncqa-goal-domain-questionnaire.json b/public/content/ncqa-goal-domain-questionnaire.json
@@ -0,0 +1,95 @@
+{
+    "resourceType": "Questionnaire",
+    "id": "questionnaire-ncqa-goal-domains",
+    "url": "http://hl7.org/Questionnaire/ncqa-goal-domains",
+    "name": "NCQA_Goal_Domains",
+    "title": "NCQA Health Outcomes",
+    "status": "draft",
+    "publisher": "NCQA",
+    "copyright": "Copyright (c) NCQA",
+    "code": [
+        {
+            "system": "http://hl7.org",
+            "code": "ncqa-goal-domains",
+            "display": "NCQA Health Outcomes"
+        }
+    ],
+    "item": [
+        {
+            "linkId": "housing-group",
+            "code": [
+                {
+                    "code": "no-code",
+                    "display": "No code"
+                }
+            ],
+            "text": "Housing",
+            "type": "group",
+            "required": true,
+            "item": [
+                {
+                    "linkId": "housing-q1",
+                    "code": [
+                        {
+                            "system": "http://ncqa.org/fhir/goal-domains",
+                            "code": "housing",
+                            "display": "Housing"
+                        }
+                    ],
+                    "text": "Do you have acceptable housing that is appropriate for your needs?",
+                    "type": "boolean"
+                },
+                {
+                    "linkId": "housing-q2",
+                    "code": [
+                        {
+                            "system": "http://ncqa.org/fhir/goal-domains",
+                            "code": "housing",
+                            "display": "Housing"
+                        }
+                    ],
+                    "text": "What would you like to do?",
+                    "type": "string"
+                }
+            ]
+        },
+        {
+            "linkId": "accessToServices-group",
+            "code": [
+                {
+                    "code": "no-code",
+                    "display": "No code"
+                }
+            ],
+            "text": "Access to Services & Supports",
+            "type": "group",
+            "required": true,
+            "item": [
+                {
+                    "linkId": "accessToServices-q1",
+                    "code": [
+                        {
+                            "system": "http://ncqa.org/fhir/goal-domains",
+                            "code": "accessToServices",
+                            "display": "accessToServices"
+                        }
+                    ],
+                    "text": "Do you have the ability to access, afford, and utilize appropriate health and community resources such as transportation, food, and assistance with financial concerns?",
+                    "type": "boolean"
+                },
+                {
+                    "linkId": "accessToServices-q2",
+                    "code": [
+                        {
+                            "system": "http://ncqa.org/fhir/goal-domains",
+                            "code": "accessToServices",
+                            "display": "accessToServices"
+                        }
+                    ],
+                    "text": "What would you like to do?",
+                    "type": "string"
+                }
+            ]
+        }
+    ]
+}
diff --git a/public/content/patient-priorities-care-questionnaire.json b/public/content/patient-priorities-care-questionnaire.json
@@ -0,0 +1,171 @@
+{
+    "resourceType": "Questionnaire",
+    "id": "questionnaire-patient-priorities-care",
+    "url": "http://patientprioritiescare.org/Questionnaire/patient-priorities-care",
+    "name": "Patient_Priorities_Care",
+    "title": "Patient Priorities Care",
+    "status": "draft",
+    "publisher": "Mountain Lotus WellBeing LLC",
+    "copyright": "Copyright (c) 2024 Patient Priorities Care",
+    "code": [
+        {
+            "system": "http://patientprioritiescare.org",
+            "code": "patient-priorities-care",
+            "display": "Patient Priorities Care"
+        }
+    ],
+    "item": [
+        {
+            "linkId": "connecting-group",
+            "code": [
+                {
+                    "code": "no-code",
+                    "display": "No code"
+                }
+            ],
+            "text": "Connecting",
+            "type": "group",
+            "required": true,
+            "item": [
+                {
+                    "linkId": "connecting-q1",
+                    "code": [
+                        {
+                            "system": "http://patientprioritiescare.org/fhir/goal-domains",
+                            "code": "connecting",
+                            "display": "Connecting"
+                        }
+                    ],
+                    "text": "Do you connect with the people, places, and spiritual practices that provide meaning, happiness, and contentment in your life?",
+                    "type": "boolean"
+                },
+                {
+                    "linkId": "connecting-q2",
+                    "code": [
+                        {
+                            "system": "http://patientprioritiescare.org/fhir/goal-domains",
+                            "code": "connecting",
+                            "display": "Connecting"
+                        }
+                    ],
+                    "text": "What would you like to do?",
+                    "type": "string"
+                }
+            ]
+        },
+        {
+            "linkId": "functioning-group",
+            "code": [
+                {
+                    "code": "no-code",
+                    "display": "No code"
+                }
+            ],
+            "text": "Functioning",
+            "type": "group",
+            "required": true,
+            "item": [
+                {
+                    "linkId": "functioning-q1",
+                    "code": [
+                        {
+                            "system": "http://patientprioritiescare.org/fhir/goal-domains",
+                            "code": "functioning",
+                            "display": "Functioning"
+                        }
+                    ],
+                    "text": "Do you have the capacity to perform self-care needs (independence) or maintaining self-respect (dignity) when needing assistance to perform self-care tasks?",
+                    "type": "boolean"
+                },
+                {
+                    "linkId": "functioning-q2",
+                    "code": [
+                        {
+                            "system": "http://patientprioritiescare.org/fhir/goal-domains",
+                            "code": "functioning",
+                            "display": "Functioning"
+                        }
+                    ],
+                    "text": "What would you like to do?",
+                    "type": "string"
+                }
+            ]
+        },
+        {
+            "linkId": "managing-health-group",
+            "code": [
+                {
+                    "code": "no-code",
+                    "display": "No code"
+                }
+            ],
+            "text": "Managing Health",
+            "type": "group",
+            "required": true,
+            "item": [
+                {
+                    "linkId": "managing-health-q1",
+                    "code": [
+                        {
+                            "system": "http://patientprioritiescare.org/fhir/goal-domains",
+                            "code": "managing-health",
+                            "display": "Managing Healthe"
+                        }
+                    ],
+                    "text": "How well do you balance the desire to maintain how you feel today (quality of life) with the desire to live as long as possible (longevity)?",
+                    "type": "boolean"
+                },
+                {
+                    "linkId": "managing-health-q2",
+                    "code": [
+                        {
+                            "system": "http://patientprioritiescare.org/fhir/goal-domains",
+                            "code": "managing-health",
+                            "display": "Managing Health"
+                        }
+                    ],
+                    "text": "What would you like to do?",
+                    "type": "string"
+                }
+            ]
+        },
+        {
+            "linkId": "enjoying-life-group",
+            "code": [
+                {
+                    "code": "no-code",
+                    "display": "No code"
+                }
+            ],
+            "text": "Enjoying Life",
+            "type": "group",
+            "required": true,
+            "item": [
+                {
+                    "linkId": "enjoying-life-q1",
+                    "code": [
+                        {
+                            "system": "http://patientprioritiescare.org/fhir/goal-domains",
+                            "code": "enjoying-life",
+                            "display": "Enjoying Life"
+                        }
+                    ],
+                    "text": "How well do you balance the desire to be actively engaged in all aspects of decisions regarding your health and health care with the desire to allow family, care partners, and clinicians to help make decisions on your behalf?",
+                    "type": "boolean"
+                },
+                {
+                    "linkId": "enjoying-life-q2",
+                    "code": [
+                        {
+                            "system": "http://patientprioritiescare.org/fhir/goal-domains",
+                            "code": "enjoying-life",
+                            "display": "Enjoying Life"
+                        }
+                    ],
+                    "text": "What would you like to do?",
+                    "type": "string"
+                }
+            ]
+        }
+    ]
+}
diff --git a/src/App.tsx b/src/App.tsx
@@ -300,7 +300,7 @@ class App extends React.Component<AppProps, AppState> {
                     console.log('launcherData: Check for patient name...is it in here to use vs using launcherClient.tokenResponse?.patient from client itself?', launcherData)
                     const launcherPatientId = launcherData.patient?.id
                     console.log('launcherPatientId: ', launcherPatientId)
-                    launcherData.serverName = 'Launch Data'
+                    launcherData.serverName = 'Original Provider'
 
                     // SDS
                     // Note that this else always happens at least once, as the launcher is always chosen first
@@ -356,7 +356,7 @@ class App extends React.Component<AppProps, AppState> {
                     const sdsData: FHIRData = await getFHIRData(true, serverUrl, this.state.supplementalDataClient,
                         this.setAndLogProgressState, this.setResourcesLoadedCountState, this.setAndLogErrorMessageState)
                     console.log('SDS data: ', sdsData)
-                    sdsData.serverName = 'SDS Data'
+                    sdsData.serverName = 'SDS'
 
                     // Merge launcher and SDS Data and set states
                     const mergedFhirDataCollection: FHIRData[] = [sdsData, launcherData]
@@ -892,7 +892,7 @@ class App extends React.Component<AppProps, AppState> {
                                     <TabPanel value="1" sx={{ padding: '0px 15px 100px' }}>
                                         <Home fhirDataCollection={this.state.fhirDataCollection} patientSummaries={this.state.patientSummaries} screenings={this.state.screenings}
                                             progressMessage={this.state.progressMessage} progressValue={this.state.progressValue} resourcesLoadedCount={this.state.resourcesLoadedCount}
-                                            errorType={this.state.errorType} userErrorMessage={this.state.userErrorMessage} developerErrorMessage={this.state.developerErrorMessage} errorCaught={this.state.errorCaught} 
+                                            errorType={this.state.errorType} userErrorMessage={this.state.userErrorMessage} developerErrorMessage={this.state.developerErrorMessage} errorCaught={this.state.errorCaught}
                                             canShareData={this.state.canShareData}
                                             />
                                     </TabPanel>

diff --git a/src/Home.tsx b/src/Home.tsx
@@ -61,7 +61,7 @@ export default class Home extends React.Component<HomeProps, HomeState> {
     let screenings = this.props.screenings?.filter(s => s.notifyPatient)
     // let tasks = this.props.tasks;
 
-    const hhsBanner = process.env.REACT_APP_HHS_BANNER === 'false'
+    const hhsBanner = process.env.REACT_APP_HHS_BANNER === 'true'
 
     return (
       <div className="home-view">
@@ -147,12 +147,8 @@ export default class Home extends React.Component<HomeProps, HomeState> {
               pathname: '/questionnaire',
               state: { patientSummaries: this.props.patientSummaries, questionnaireId: 'caregiver-strain-questionnaire' }
             }} ><strong>Caregiver Strain Assessment</strong></Link><br />
-            {/* <Link to={{pathname: '/questionnaire',
-                      state: { patientSummary: this.props.patientSummary, questionnaireId: 'mypain-questionnaire' }
-                    }} ><strong>My Pain Assessment</strong></Link><br/> */}
-
-            <p />
 
+
             {/* {(tasks === undefined)
                 ? <p>You have no tasks today!</p>
                 : <ul>

diff --git a/src/components/modal/modal.css b/src/components/modal/modal.css
@@ -9,13 +9,6 @@ p {
     color: #0056B3;
 }
 
-.modal-body {
-    color: var(--color-dark);
-    border: 1px solid #000000;
-    padding: 10px;
-    border-radius: 0 0 5px 5px;
-}
-
 .modal-style {
     position: absolute;
     top: 50%;
@@ -27,5 +20,20 @@ p {
     border: 1px solid #ccc;
     border-radius: 8px;
     box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
-  }
-
+    z-index: 1001; /* Higher z-index to ensure it appears above other elements */
+}
+
+.modal-overlay {
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background-color: rgba(0, 0, 0, 0.5); /* Semi-transparent background */
+    z-index: 1000; /* Ensure overlay appears above other content */
+}
+
+.modal-content {
+    color: var(--color-dark);
+    padding: 10px;
+}
diff --git a/src/components/questionnaire-item/QuestionnaireItemComponent.tsx b/src/components/questionnaire-item/QuestionnaireItemComponent.tsx
@@ -230,7 +230,7 @@ export default class QuestionnaireItemComponent extends React.Component<any, Que
           }
         </div>
         <Button className="btn btn-primary next-button" value={this.props.QuestionnaireItem.linkId} onClick={(event: any) => this.handleNextQuestionScroll(event.target.value)}>Next</Button>
-        <Button className="exit-button" onClick={this.handleCancelClick}>Cancel</Button>
+
         <Modal show={this.state.showCancelPopup} onHide={this.handleCancelDeny} className="custom-modal">
             <Modal.Header>
               <Modal.Title>Leave questionnaire?</Modal.Title>

diff --git a/src/components/shared-data/ProviderLogin.tsx b/src/components/shared-data/ProviderLogin.tsx
@@ -527,7 +527,7 @@ export default function ProviderLogin(props: Props) {
           Health Provider Login
         </Typography>
         <Typography variant="subtitle1" align="left" gutterBottom>
-          <span style={{ fontStyle: 'italic' }}>Original Provider:</span> {launcherEndpointFromForage ?
+          <span style={{ fontStyle: 'italic' }}>Currently includes:</span> {launcherEndpointFromForage ?
             launcherEndpointFromForage?.name :
             'Unknown: Please select the original provider manually from the list in addtion to other providers.'}
         </Typography>