Merge pull request #141 from ImisDevelopers/dev

Dev
ImisDevelopers · Apr 6, 2020 · 9ff0be4 · 9ff0be4
2 parents a9bc757 + 156826c
commit 9ff0be4
Show file tree

Hide file tree

Showing 73 changed files with 1,223 additions and 15,474 deletions.
diff --git a/.gitignore b/.gitignore
@@ -50,3 +50,5 @@ fabric.properties
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
 /.project
+
+node_modules
diff --git a/client/package.json b/client/package.json
@@ -14,7 +14,8 @@
     "ant-design-vue": "^1.4.12",
     "core-js": "^3.6.4",
     "vue": "^2.6.11",
-    "vue-router": "^3.1.6"
+    "vue-router": "^3.1.6",
+    "moment": "^2.24.0"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "^4.2.0",

diff --git a/client/src/App.vue b/client/src/App.vue
@@ -34,18 +34,20 @@
             >
               <Navigation />
             </a-layout-sider>
-            <a-layout-content
-              style="margin: auto; box-sizing: border-box; width: 100%;"
-            >
-              <div :style="{ padding: '0px', minHeight: '360px', width: '100%' }">
-                <router-view></router-view>
-              </div>
-            </a-layout-content>
+            <div style="display: flex; flex-direction: column; justify-content: space-between; width: 100%">
+              <a-layout-content
+                style="margin: 0 auto; box-sizing: border-box; width: 100%;"
+              >
+                <div :style="{ padding: '0px', minHeight: '360px', width: '100%' }">
+                  <router-view></router-view>
+                </div>
+              </a-layout-content>
+              <a-layout-footer style="textAlign: center">
+                IMIS ©2020 with <a-icon type="heart" style="color:red;">❤</a-icon> by
+                <a-button type="link" href="https://wirvsvirushackathon.org" target="_blank" style="padding-left: 0">#WeVsVirus</a-button>
+              </a-layout-footer>
+            </div>
           </a-layout>
-          <a-layout-footer style="textAlign: center">
-            IMIS ©2020 with <a-icon type="heart" style="color:red;">❤</a-icon> by
-            <a-button type="link" href="https://wirvsvirushackathon.org" target="_blank" style="padding-left: 0">#WeVsVirus</a-button>
-          </a-layout-footer>
         </a-layout>
       </a-layout>
     </div>

diff --git a/client/src/api/Api.js b/client/src/api/Api.js
@@ -64,6 +64,14 @@ class Api {
         return this.executeRequest("institutions", METHOD.POST, request);
     }
 
+    queryPatients(request) {
+        return this.executeRequest("patients/query", METHOD.POST, request);
+    }
+
+    countPatients(request) {
+        return this.executeRequest("patients/query/count", METHOD.POST, request);
+    }
+
     postPatient(request) {
         return this.executeRequest("patients", METHOD.POST, request);
     }

diff --git a/client/src/assets/imis-workflow.png b/client/src/assets/imis-workflow.png
diff --git a/client/src/assets/wave-bg.svg b/client/src/assets/wave-bg.svg
diff --git a/client/src/components/BarcodeInput.vue b/client/src/components/BarcodeInput.vue
@@ -1,11 +1,11 @@
 <template>
 	<a-form-item :label="label">
-		<a-input v-model="value" v-bind="$props" v-decorator="validation">
-			<a-tooltip slot="suffix" title="Scan Barcode/QR using your Camera">
-				<a-icon type="camera" style="color: rgba(0,0,0,.45)" v-on:click="showScanner = true" />
-			</a-tooltip>
+		<a-input v-decorator="validation">
+<!--			<a-tooltip slot="suffix" title="Scan Barcode/QR using your Camera">-->
+<!--				<a-icon type="camera" style="color: rgba(0,0,0,.45)" v-on:click="showScanner = true" />-->
+<!--			</a-tooltip>-->
 		</a-input>
-		<BarcodeScanner v-if="showScanner" @result="onResult" />
+<!--		<BarcodeScanner v-if="showScanner" @result="onResult" />-->
 	</a-form-item>
 </template>
 
@@ -16,22 +16,23 @@
 	 * props:
 	 * - validation: put in v-decorator object
    */
-  import BarcodeScanner from "./BarcodeScanner";
+  // import BarcodeScanner from "./BarcodeScanner";
 
 export default {
   name: 'BarcodeInput',
-	props: ['placeholder', 'validation', 'label'],
-  components: {BarcodeScanner},
+	props: ['placeholder', 'validation', 'label', 'form'],
+  // components: {BarcodeScanner},
   data() {
 		return {
-			value: '',
 			showScanner: false,
 		}
 	},
 	methods: {
 		onResult(result) {
 			if (result != null) {
-				this.value = result;
+				this.form.setFieldsValue({
+					[this.validation[0]]: result,
+				})
 			}
 			this.showScanner = false;
 		},