@abi-software/map-side-bar 2.12.0-acupoints.1 → 2.12.0-acupoints.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abi-software/map-side-bar",
-  "version": "2.12.0-acupoints.1",
+  "version": "2.12.0-acupoints.2",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",

package/src/acupoints.js

@@ -14,6 +14,7 @@ export const acupointEntries = {
       "Vasculature": "Test data",
       "Innervation": "Test data",
       "Curated": false,
+      "onMRI": true
   },
   "LU 2": {
       "Acupoint": "LU 2",
@@ -30,6 +31,7 @@ export const acupointEntries = {
       "Vasculature": "Test data",
       "Innervation": "Test data",
       "Curated": true,
+      "onMRI": true
   },
   "ST 3": {
     "Acupoint": "ST 3",
@@ -44,6 +46,25 @@ export const acupointEntries = {
     "Indications": "Test data",
     "Acupuncture Method": "Test data",
     "Vasculature": "Test data",
-    "Innervation": "Test data"
+    "Innervation": "Test data",
+    "Curated": true,
+    "onMRI": false
+  },
+  "LR 4": {
+    "Acupoint": "LR 4",
+    "Label": "LR 4",
+    "Synonym": "Test data",
+    "UMLS CUI": "",
+    "Meridian": "STest data",
+    "Chinese Name": "Zhongfeng",
+    "English Name": "Not Available",
+    "Location": " z zxcxadadadzc.",
+    "Reference": "Test data",
+    "Indications": "Test data",
+    "Acupuncture Method": "Test data",
+    "Vasculature": "Test data",
+    "Innervation": "Test data",
+    "Curated": false,
+    "onMRI": false
   }
 }

package/src/components/AcupointsInfoSearch.vue

@@ -22,11 +22,24 @@
       </el-row>
       <el-row>
         <span class="filterText">
-          Display:&nbsp;&nbsp;
+          Curated:&nbsp;&nbsp;
         </span>
-        <el-radio-group v-model="currentFilter" size="small" class="acuRadioGroup">
+        <el-radio-group v-model="currentFilters['curated']" size="small" class="acuRadioGroup">
           <el-radio-button
-            v-for="(value, key) in filters"
+            v-for="(value, key) in curatedFilters"
+            :key="key"
+            :label="key"
+            :value="value"
+          />
+        </el-radio-group>
+      </el-row>
+      <el-row>
+        <span class="filterText">
+          On MRI:&nbsp;&nbsp;
+        </span>
+        <el-radio-group v-model="currentFilters['mri']" size="small" class="acuRadioGroup">
+          <el-radio-button
+            v-for="(value, key) in mriFilters"
             :key="key"
             :label="key"
             :value="value"
@@ -97,13 +110,24 @@ export default {
   },
   data: function () {
     return {
-      filters: {
-        "Curated Only": "Curated",
-        "Uncurated Only": "Uncurated",
+      curatedFilters: {
+        "Yes": "Curated",
+        "No": "Uncurated",
+        "Both": "Both"
+      },
+      mriFilters: {
+        "Yes": "On",
+        "No": "Off",
         "Both": "Both"
       },
-      currentFilter: "Both",
-      previousFilter: undefined,
+      currentFilters: {
+        curated: "Both",
+        mri: "Both",
+      },
+      previousFilters: {
+        curated: "Both",
+        mri: "Both",
+      },
       previousInput: undefined,
       results: [],
       paginatedResults: [],
@@ -115,7 +139,16 @@ export default {
     }
   },
   watch: {
-    currentFilter: {
+    "currentFilters.curated": {
+      handler: function () {
+        this.search(
+          this.searchInput,
+          this.numberPerPage,
+          this.page
+        )
+      },
+    },
+    "currentFilters.mri": {
       handler: function () {
         this.search(
           this.searchInput,
@@ -151,15 +184,23 @@ export default {
     search: function(input) {
       this.results = []
       if ((input !== this.previousInput) ||
-        (this.currentFilter !== this.previousFilter)) {
-        this.previousFilter = this.currentFilter
+        (this.currentFilters['curated'] !== this.previousFilters['curated']) ||
+        (this.currentFilters['mri'] !== this.previousFilters['mri'])
+        ) {
+        this.previousFilters['curated'] = this.currentFilters['curated'];
+        this.previousFilters['mri'] = this.currentFilters['mri'];
         this.previousInput = this.input
         let filteredList = Object.values(this.entry)
-        if (this.currentFilter !== "Both") {
-          const curated = this.currentFilter === "Curated" ? true : false
+        if (this.currentFilters['curated'] !== "Both") {
+          const curated = this.currentFilters['curated'] === "Curated" ? true : false
           filteredList = filteredList.filter(
             item => (item.Curated ? true : false) === curated)
         }
+        if (this.currentFilters['mri'] !== "Both") {
+          const curated = this.currentFilters['mri'] === "On" ? true : false
+          filteredList = filteredList.filter(
+            item => (item.onMRI ? true : false) === curated)
+        }
         if (input === "") {
           this.results = filteredList
         } else {