Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bugfix/show metrics UI #122

Merged
merged 3 commits into from
Nov 5, 2023
Merged

Bugfix/show metrics UI #122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e7bb610
dashboard-responsivenenss
oaedward Oct 29, 2023
f481c5a
modify status list
oaedward Oct 29, 2023
bdafc49
refactor
oaedward Nov 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/client/web/src/components/BIOMD/BIOMD/BIOMD-ASSET/ASSET-AssetDetails.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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" },
Expand Down
2 changes: 1 addition & 1 deletion src/client/web/src/components/BIOMD/BIOMD/BIOMD-ASSET/ASSET.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ export default {
UMDNSCode: null,
},
manufactureDate: null,
status: "Active Deployed",
status: "Active in Service",
});

const AssetLocation = ref({
Expand Down
79 changes: 44 additions & 35 deletions src/client/web/src/components/BIOMD/BIOMD/BIOMD-DASHBOARD/DASHBOARD.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -94,37 +94,45 @@
})
"
>
<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-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-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 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 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 text-center"
>
<small class="text-secondary fsXs">In-Service</small>
<small>4</small>
</div>
</td>
</div>
</div>
</div>
</div>
Expand All @@ -137,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();

Expand Down