fix: patient match filter component

dnpm-dip · Nov 20, 2023 · 3db2f20 · 3db2f20
1 parent d466c3c
commit 3db2f20
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/packages/portal/assets/css/bootstrap-override.css b/packages/portal/assets/css/bootstrap-override.css
@@ -51,6 +51,10 @@ a:focus{
     box-shadow: 0 4px 6px rgba(50,50,93,.1), 0 1px 3px rgba(0,0,0,.08);
 }
 
+.btn-close {
+    filter: var(--bs-btn-close-white-filter);
+}
+
 .btn:active, .btn:active:focus, .btn:active:hover, .btn:hover:not(.btn-icon-only) {
     box-shadow: 0 7px 14px rgba(50,50,93,.1), 0 3px 6px rgba(0,0,0,.08);
     transform: translateY(-0.5px);

diff --git a/packages/rare-diseases/src/runtime/components/core/QueryPatientMatchFilters.vue b/packages/rare-diseases/src/runtime/components/core/QueryPatientMatchFilters.vue
@@ -177,10 +177,10 @@ export default defineComponent({
                     :key="item.code"
                 >
                     <div class="form-check">
-                        <FormInputCheckbox
+                        <VCFormInputCheckbox
                             v-model="gender"
                             :label="true"
-                            :label-content="item.display"
+                            :label-content="(item.display || item.code)"
                             :value="item.code"
                         />
                     </div>
@@ -196,10 +196,10 @@ export default defineComponent({
                     :key="item.code"
                 >
                     <div class="form-check">
-                        <FormInputCheckbox
+                        <VCFormInputCheckbox
                             v-model="vitalStatus"
                             :label="true"
-                            :label-content="item.display"
+                            :label-content="(item.display || item.code)"
                             :value="item.code"
                         />
                     </div>

diff --git a/packages/rare-diseases/src/runtime/components/utility/Tags.vue b/packages/rare-diseases/src/runtime/components/utility/Tags.vue
@@ -1,9 +1,9 @@
 <script lang="ts">
-import type { ColorVariant } from 'bootstrap-vue-next';
 import { BFormTag } from 'bootstrap-vue-next';
 import type { PropType } from 'vue';
 import { defineComponent, ref } from 'vue';
 
+type ColorVariant = 'primary' | 'secondary' | 'success' | 'danger' | 'warning' | 'info' | 'light' | 'dark' | null;
 type Tag = {
     id: string | number,
     value: string
@@ -91,8 +91,3 @@ export default defineComponent({
         </ul>
     </slot>
 </template>
-<style>
-.btn-close {
-    color: #eee !important;
-}
-</style>