beak-insights/felicity-lims
1
1
Fork 0
mirror of https://github.com/beak-insights/felicity-lims.git synced 2025-02-23 16:33:11 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

added dashboard indcator custom sorting

Browse source
This commit is contained in:
Aurthur Musendame 2022-11-27 12:35:59 +02:00
parent 11b08b8254
commit 0008cf316b
2 changed files with 25 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
frontend/vite/src/stores/dashboard.ts
View file

@ -13,6 +13,7 @@ import {
GET_SAMPLE_GROUPS_BY_ACTION,
GET_SAMPLE_LAGGARDS,
} from '../graphql/dashboard.queries'
import { mapOrder } from '../utils'
import { useApiUtil } from "../composables";
const { withClientQuery } = useApiUtil();
@ -107,7 +108,7 @@ export const useDashBoardStore = defineStore('dashboard', () => {
endDate: dashboard.value.filterRange.to
}
await withClientQuery(GET_SAMPLE_GROUP_BY_STATUS, filters , 'countSampleGroupByStatus', 'network-only')
.then(payload => dashboard.value.overViewStats.samples = payload.data)
.then(payload => dashboard.value.overViewStats.samples = mapOrder(payload.data, ["scheduled","expected","received", "awaiting", "approved"], "group"))
}
// GET_ANALYSIS_GROUP_BY_STATUS
@ -117,7 +118,7 @@ export const useDashBoardStore = defineStore('dashboard', () => {
endDate: dashboard.value.filterRange.to
}
await withClientQuery(GET_ANALYSIS_GROUP_BY_STATUS, filters , 'countAnalyteGroupByStatus', 'network-only')
.then(payload => dashboard.value.overViewStats.analyses = payload.data)
.then(payload => dashboard.value.overViewStats.analyses = mapOrder(payload.data, ["pending","resulted"], "group"))
}
// GET_WORKSHEET_GROUP_BY_STATUS
@ -127,7 +128,7 @@ export const useDashBoardStore = defineStore('dashboard', () => {
endDate: dashboard.value.filterRange.to
}
await withClientQuery(GET_WORKSHEET_GROUP_BY_STATUS,filters, 'countWorksheetGroupByStatus', 'network-only')
.then(payload => dashboard.value.overViewStats.worksheets = payload.data)
.then(payload => dashboard.value.overViewStats.worksheets = mapOrder(payload.data, ["empty","awaiting","pending"], "group"))
}
// GET_extras_GROUP_BY_STATUS
@ -137,7 +138,7 @@ export const useDashBoardStore = defineStore('dashboard', () => {
endDate: dashboard.value.filterRange.to
}
await withClientQuery(GET_EXTRAS_GROUP_BY_STATUS, filters , 'countExtrasGroupByStatus', 'network-only')
.then(payload => dashboard.value.overViewStats.extras = payload.data)
.then(payload => dashboard.value.overViewStats.extras = mapOrder(payload.data, ["sample cancelled", "sample rejected", "sample invalidated", "analysis retracted", "analysis retested"], "group"))
}
// GET_ANALYSIS_GROUP_BY_INSTRUMENT

20
frontend/vite/src/utils.ts
View file

@ -149,9 +149,29 @@ export const stringifyNumber = (n: number):string => {
return deca[Math.floor(n/10)-2] + 'y-' + special[n%10];
}
/**
* Sort array of objects based on another array
*/
export const mapOrder = (array, order, key) => {
return array.sort( function (a, b) {
var A = a[key], B = b[key];
if (order.indexOf(A) > order.indexOf(B)) {
return 1;
} else {
return -1;
}
});
};
export default {
isNullOrWs,
parseUrlParams,
startsWith,
mapOrder,
};