Merge pull request #584 from mozzy11/2.8

Minor Fixes and cleanups
I-TECH-UW · Nov 7, 2023 · be9c218 · be9c218
2 parents 4e37a9f + 5f46524
commit be9c218
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 18 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -88,13 +88,8 @@ services:
     frontend.openelis.org:
         image: ghcr.io/i-tech-uw/openelis-global-2-frontend:2.8
         container_name: openelisglobal-front-end
-        # ports:
-        #   - 80:80
         networks:
         - default
-        volumes:
-        - './react-ui/src:/app/src'
-        - './react-ui/public:/app/public'
         environment:
         - CHOKIDAR_USEPOLLING=true
         tty: true

diff --git a/frontend/src/components/addOrder/Index.js b/frontend/src/components/addOrder/Index.js
@@ -54,6 +54,7 @@ const Index = () => {
         <FormattedMessage id="save.order.success.msg" />,
         NotificationKinds.success,
       );
+      setPage(page + 1);
     } else {
       showAlertMessage(
         <FormattedMessage id="server.error.msg" />,
@@ -63,7 +64,6 @@ const Index = () => {
   };
   const handleSubmitOrderForm = (e) => {
     e.preventDefault();
-    setPage(page + 1);
     console.log(JSON.stringify(orderFormValues))
     postToOpenElisServer(
       "/rest/SamplePatientEntry",

diff --git a/frontend/src/components/patient/CreatePatientForm.js b/frontend/src/components/patient/CreatePatientForm.js
@@ -97,23 +97,26 @@ function CreatePatientForm(props) {
     }));
   }
 
-  function handleYearsChange(e){
+  function handleYearsChange(e, values) {
+    setPatientDetails(values)
     let years = e.target.value;
     setDateOfBirthFormatter({
       ...dateOfBirthFormatter,
       years: years
     });
   }
 
-  function handleMonthsChange(e){
+  function handleMonthsChange(e, values) {
+    setPatientDetails(values);
     let months = e.target.value;
     setDateOfBirthFormatter({
       ...dateOfBirthFormatter,
       months: months
     });
   }
 
-  function handleDaysChange(e){
+  function handleDaysChange(e, values) {
+    setPatientDetails(values)
     let days = e.target.value;
     setDateOfBirthFormatter({
       ...dateOfBirthFormatter,
@@ -487,23 +490,26 @@ function CreatePatientForm(props) {
                     name="years"
                     labelText="Age/Years"
                     id="years"
-                    onChange={ handleYearsChange }
+                    type="number"
+                    onChange={ (e) => handleYearsChange(e ,values) }
                     className="inputText"
                 />
 
                 <TextInput
                     value={dateOfBirthFormatter.months}
                     name="months"
                     labelText="Months"
-                    onChange={  handleMonthsChange }
+                    type="number"
+                    onChange={ (e) => handleMonthsChange(e,values) }
                     id="months"
                     className="inputText"
                 />
 
                 <TextInput
                     value={dateOfBirthFormatter.days}
                     name="days"
-                    onChange={ handleDaysChange}
+                    type="number"
+                    onChange={ (e) => handleDaysChange(e ,values)}
                     labelText="Days"
                     id="days"
                     className="inputText"

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
@@ -1,6 +1,47 @@
-# org.openelisglobal.facilitylist.fhirstore = http://localhost:4000/fhir/DEFAULT
-# org.openelisglobal.facilitylist.authurl= http://localhost:4000/auth/token
-# org.openelisglobal.facilitylist.username= [email protected]
-# org.openelisglobal.facilitylist.password= gofr
-# org.openelisglobal.facilitylist.auth= token
-facilitylist.schedule.fixedRate=864000000
+#Faclity FHIR server
+#org.openelisglobal.facilitylist.fhirstore = https://hub.openelisci.org:5000/gofr/exemple4
+#org.openelisglobal.facilitylist.authurl= https://hub.openelisci.org:5000/gofr/token
+#org.openelisglobal.facilitylist.username= [email protected]
+#org.openelisglobal.facilitylist.password= gofr
+#org.openelisglobal.facilitylist.auth= token
+facilitylist.schedule.fixedRate=864000000
+
+#Liquibase Profile
+#spring.liquibase.contexts=
+
+
+#Local FHIR server
+#org.openelisglobal.server.uri=https://oe.openelis.org:8443/OpenELIS-Global/fhir/
+#org.openelisglobal.datasubscriber.uri=https://datasubscriber.openelis.org:8443/subscription/fhirResourceGroup/
+org.openelisglobal.fhirstore.uri=http://localhost:8082/fhir/
+
+# Remote FHIR server/Consolidated Server
+#org.openelisglobal.remote.source.uri=http://localhost:8081/fhir/
+#org.openelisglobal.remote.source.identifier=Practitioner/f9badd80-ab76-11e2-9e96-0800200c9a66
+#org.openelisglobal.remote.source.updateStatus=false
+#org.openelisglobal.task.useBasedOn=true
+#org.openelisglobal.fhirstore.username=openelis
+#org.openelisglobal.fhirstore.password=Openelis123!
+#org.openelisglobal.fhir.subscriber.allowHTTP=true
+
+#org.openelisglobal.fhir.subscriber=http://localhost:8081/fhir/
+#org.openelisglobal.fhir.subscriber.resources=Task,Patient,ServiceRequest,DiagnosticReport,Observation,Specimen,Practitioner,Encounter
+
+#provider FHIR server
+#org.openelisglobal.providerlist.fhirstore=http://localhost:8081/fhir/
+#org.openelisglobal.requester.identifier=Practitioner/f9badd80-ab76-11e2-9e96-0800200c9a66
+#org.openelisglobal.requester.lastName=Dr. Mauritius
+#org.openelisglobal.requester.firstName=Felix
+#org.openelisglobal.requester.phone=230 5123 1234
+
+#Hibernate Config 
+#spring.jpa.show-sql=true
+#spring.jpa.properties.hibernate.format_sql=true
+
+# SSL Config
+server.ssl.key-store = file:/ssl/lf.keystore
+server.ssl.key-store-password = testtest
+server.ssl.key-password = testtest
+server.ssl.trust-store=file:/ssl/lf.truststore
+server.ssl.trust-store-password=testtest
+