From e7bb610e0e68d1d7b30f02714472c49675004c01 Mon Sep 17 00:00:00 2001
From: Edward Opoku-Agyemang <oaedward83@gmail.com>
Date: Sun, 29 Oct 2023 17:36:41 +0000
Subject: [PATCH 1/3] dashboard-responsivenenss

---
 .../BIOMD/BIOMD/BIOMD-DASHBOARD/DASHBOARD.vue | 66 ++++++++++---------
 1 file changed, 34 insertions(+), 32 deletions(-)

diff --git a/src/client/web/src/components/BIOMD/BIOMD/BIOMD-DASHBOARD/DASHBOARD.vue b/src/client/web/src/components/BIOMD/BIOMD/BIOMD-DASHBOARD/DASHBOARD.vue
index 218e36f..18bc0ca 100644
--- a/src/client/web/src/components/BIOMD/BIOMD/BIOMD-DASHBOARD/DASHBOARD.vue
+++ b/src/client/web/src/components/BIOMD/BIOMD/BIOMD-DASHBOARD/DASHBOARD.vue
@@ -53,7 +53,7 @@
     </div>
 
     <div class="row p-2 mt-4 mb-5">
-      <div class="col-md-6">
+      <div class="col-sm-12 col-lg-6 col-12">
         <div class="mb-5">
           <div class="">
             <span class="card-title fw-normal fs-4">Site Inventory</span>
@@ -94,37 +94,39 @@
               })
             "
           >
-            <div class="d-flex justify-content-between" style="cursor: pointer">
-              <td>
-                <div class="d-flex flex-column">
-                  <small class="text-secondary fsXs">Model</small>
-                  <small class="fw-normal">{{ model.modelName }}</small>
-                </div>
-              </td>
-              <td>
-                <div class="d-flex flex-column">
-                  <small class="text-secondary fsXs">Manufacturer</small>
-                  <small>{{ model.manufacturerName }}</small>
-                </div>
-              </td>
-              <!-- <td>
-                <div class="d-flex flex-column">
-                  <small class="text-secondary fsXs">Quantity</small>
-                  <small>10</small>
-                </div>
-              </td> -->
-              <!-- <td>
-                <div class="d-flex flex-column">
-                  <small class="text-secondary fsXs">Active</small>
-                  <small>6</small>
-                </div>
-              </td> -->
-              <!-- <td>
-                <div class="d-flex flex-column">
-                  <small class="text-secondary fsXs">In-Service</small>
-                  <small>4</small>
-                </div>
-              </td> -->
+            <div class="" style="cursor: pointer">
+              <div class="row">
+                <td class="col-4">
+                  <div class="d-flex flex-column">
+                    <small class="text-secondary fsXs">Model</small>
+                    <small class="fw-normal">{{ model.modelName }}</small>
+                  </div>
+                </td>
+                <td class="col-4">
+                  <div class="d-flex flex-column">
+                    <small class="text-secondary fsXs">Manufacturer</small>
+                    <small>{{ model.manufacturerName }}</small>
+                  </div>
+                </td>
+                <td class="col-2">
+                  <div class="d-flex flex-column justify-content-center">
+                    <small class="text-secondary fsXs">Quantity</small>
+                    <small>10</small>
+                  </div>
+                </td>
+                <td class="col-2">
+                  <div class="d-flex flex-column justify-content-center">
+                    <small class="text-secondary fsXs">Active</small>
+                    <small>6</small>
+                  </div>
+                </td>
+                <!-- <td class="col-2">
+                  <div class="d-flex flex-column justify-content-end">
+                    <small class="text-secondary fsXs">In-Service</small>
+                    <small>4</small>
+                  </div>
+                </td> -->
+              </div>
             </div>
           </div>
         </div>

From f481c5a2c9500382e098bc8703821508cafd509c Mon Sep 17 00:00:00 2001
From: Edward Opoku-Agyemang <oaedward83@gmail.com>
Date: Sun, 29 Oct 2023 19:40:38 +0000
Subject: [PATCH 2/3] modify status list

---
 .../components/BIOMD/BIOMD/BIOMD-ASSET/ASSET-AssetDetails.vue  | 3 +--
 .../web/src/components/BIOMD/BIOMD/BIOMD-ASSET/ASSET.vue       | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/client/web/src/components/BIOMD/BIOMD/BIOMD-ASSET/ASSET-AssetDetails.vue b/src/client/web/src/components/BIOMD/BIOMD/BIOMD-ASSET/ASSET-AssetDetails.vue
index 311e718..4ff39da 100644
--- a/src/client/web/src/components/BIOMD/BIOMD/BIOMD-ASSET/ASSET-AssetDetails.vue
+++ b/src/client/web/src/components/BIOMD/BIOMD/BIOMD-ASSET/ASSET-AssetDetails.vue
@@ -105,7 +105,7 @@
         aria-label="Default select example"
         v-model="AssetDetails.status"
       >
-        <option selected value="Active Deployed">Active Deployed</option>
+        <option selected value="Active in Service">Active in Service</option>
         <option
           v-for="list in statusList"
           :key="list.value"
@@ -134,7 +134,6 @@ const manufacturerList = ref(null);
 const modelList = ref(null);
 const statusList = ref([
   { name: "Active in Storage", value: "Active in Storage" },
-  { name: "Active in Service", value: "Active in Service" },
   { name: "Storage Repairable", value: "Storage Repairable" },
   { name: "Storage Parts", value: "Storage Parts" },
   { name: "Disposed", value: "Disposed" },
diff --git a/src/client/web/src/components/BIOMD/BIOMD/BIOMD-ASSET/ASSET.vue b/src/client/web/src/components/BIOMD/BIOMD/BIOMD-ASSET/ASSET.vue
index 9c7860c..029c842 100644
--- a/src/client/web/src/components/BIOMD/BIOMD/BIOMD-ASSET/ASSET.vue
+++ b/src/client/web/src/components/BIOMD/BIOMD/BIOMD-ASSET/ASSET.vue
@@ -135,7 +135,7 @@ export default {
         UMDNSCode: null,
       },
       manufactureDate: null,
-      status: "Active Deployed",
+      status: "Active in Service",
     });
 
     const AssetLocation = ref({

From bdafc49679f82ed7b177280642f0081cefc22902 Mon Sep 17 00:00:00 2001
From: Edward Opoku-Agyemang <oaedward83@gmail.com>
Date: Sat, 4 Nov 2023 03:00:32 +0000
Subject: [PATCH 3/3] refactor

---
 .../BIOMD/BIOMD/BIOMD-DASHBOARD/DASHBOARD.vue | 27 ++++++++++++-------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/client/web/src/components/BIOMD/BIOMD/BIOMD-DASHBOARD/DASHBOARD.vue b/src/client/web/src/components/BIOMD/BIOMD/BIOMD-DASHBOARD/DASHBOARD.vue
index 18bc0ca..84f6651 100644
--- a/src/client/web/src/components/BIOMD/BIOMD/BIOMD-DASHBOARD/DASHBOARD.vue
+++ b/src/client/web/src/components/BIOMD/BIOMD/BIOMD-DASHBOARD/DASHBOARD.vue
@@ -65,15 +65,15 @@
           <div class="mb-2 mt-2" v-if="modelList == 0">
             <UIToastGlobal
               message="Assets have not been assigned"
-              message2="Use New Asset to create and assign a record to this Model."
+              message2="Use New Vendor to create new Models and Manufacturers."
               :icon="'exclamation-triangle'"
               backgroundColor="#FFF0DA"
             >
               <UIBtn2
-                BtnName="New Asset"
+                BtnName="New Model"
                 backgroundColor="#FFFFFF"
                 class="text-success btn-sm"
-                @click="changePage('assetInfo')"
+                @click="changePage('vendorInfo')"
               />
             </UIToastGlobal>
           </div>
@@ -96,36 +96,42 @@
           >
             <div class="" style="cursor: pointer">
               <div class="row">
-                <td class="col-4">
+                <td class="col-3">
                   <div class="d-flex flex-column">
                     <small class="text-secondary fsXs">Model</small>
                     <small class="fw-normal">{{ model.modelName }}</small>
                   </div>
                 </td>
-                <td class="col-4">
+                <td class="col-3">
                   <div class="d-flex flex-column">
                     <small class="text-secondary fsXs">Manufacturer</small>
                     <small>{{ model.manufacturerName }}</small>
                   </div>
                 </td>
                 <td class="col-2">
-                  <div class="d-flex flex-column justify-content-center">
+                  <div
+                    class="d-flex flex-column justify-content-center text-center"
+                  >
                     <small class="text-secondary fsXs">Quantity</small>
                     <small>10</small>
                   </div>
                 </td>
                 <td class="col-2">
-                  <div class="d-flex flex-column justify-content-center">
+                  <div
+                    class="d-flex flex-column justify-content-center text-center"
+                  >
                     <small class="text-secondary fsXs">Active</small>
                     <small>6</small>
                   </div>
                 </td>
-                <!-- <td class="col-2">
-                  <div class="d-flex flex-column justify-content-end">
+                <td class="col-2">
+                  <div
+                    class="d-flex flex-column justify-content-end text-center"
+                  >
                     <small class="text-secondary fsXs">In-Service</small>
                     <small>4</small>
                   </div>
-                </td> -->
+                </td>
               </div>
             </div>
           </div>
@@ -139,6 +145,7 @@
 import { ref, onMounted } from "vue";
 import { useStore } from "vuex";
 import UIToastGlobal from "../BIOMD-UI/UI-ToastGlobal.vue";
+import UIBtn2 from "../BIOMD-UI/UI-Btn2.vue";
 
 const store = useStore();