Merge branch 'develop' into devTee
This commit is contained in:
commit
d0adda4e87
1 changed files with 38 additions and 16 deletions
|
|
@ -47,12 +47,19 @@ function fetchListPlanned() {
|
||||||
evaluationResults: (e.point / 5) * e.weight,
|
evaluationResults: (e.point / 5) * e.weight,
|
||||||
}));
|
}));
|
||||||
rows_01.value = newRow;
|
rows_01.value = newRow;
|
||||||
const result = newRow.reduce(
|
|
||||||
(sum: number, e: any) => sum + e.evaluationResults,
|
|
||||||
0
|
|
||||||
);
|
|
||||||
|
|
||||||
totalResults1.value = (result * 80) / 100;
|
if (newRow.length > 0) {
|
||||||
|
const result = newRow.reduce(
|
||||||
|
(sum: number, e: any) => sum + e.evaluationResults,
|
||||||
|
0
|
||||||
|
);
|
||||||
|
const weight = newRow.reduce(
|
||||||
|
(sum: number, e: any) => sum + e.weight,
|
||||||
|
0
|
||||||
|
);
|
||||||
|
|
||||||
|
totalResults1.value = (result * 60) / weight;
|
||||||
|
}
|
||||||
})
|
})
|
||||||
.catch((err) => {
|
.catch((err) => {
|
||||||
messageError($q, err);
|
messageError($q, err);
|
||||||
|
|
@ -73,11 +80,19 @@ function fetchListRole() {
|
||||||
evaluationResults: (e.point / 5) * e.weight,
|
evaluationResults: (e.point / 5) * e.weight,
|
||||||
}));
|
}));
|
||||||
rows_02.value = newRow;
|
rows_02.value = newRow;
|
||||||
const result = newRow.reduce(
|
|
||||||
(sum: number, e: any) => sum + e.evaluationResults,
|
if (newRow.length > 0) {
|
||||||
0
|
const result = newRow.reduce(
|
||||||
);
|
(sum: number, e: any) => sum + e.evaluationResults,
|
||||||
totalResults2.value = (result * 80) / 100;
|
0
|
||||||
|
);
|
||||||
|
const weight = newRow.reduce(
|
||||||
|
(sum: number, e: any) => sum + e.weight,
|
||||||
|
0
|
||||||
|
);
|
||||||
|
|
||||||
|
totalResults2.value = (result * 60) / weight;
|
||||||
|
}
|
||||||
})
|
})
|
||||||
.catch((err) => {
|
.catch((err) => {
|
||||||
messageError($q, err);
|
messageError($q, err);
|
||||||
|
|
@ -99,12 +114,19 @@ function fetchAssigned() {
|
||||||
}));
|
}));
|
||||||
|
|
||||||
rows_03.value = newRow;
|
rows_03.value = newRow;
|
||||||
const result = newRow.reduce(
|
|
||||||
(sum: number, e: any) => sum + e.evaluationResults,
|
|
||||||
0
|
|
||||||
);
|
|
||||||
|
|
||||||
totalResults3.value = (result * 80) / 100;
|
if (newRow.length > 0) {
|
||||||
|
const result = newRow.reduce(
|
||||||
|
(sum: number, e: any) => sum + e.evaluationResults,
|
||||||
|
0
|
||||||
|
);
|
||||||
|
const weight = newRow.reduce(
|
||||||
|
(sum: number, e: any) => sum + e.weight,
|
||||||
|
0
|
||||||
|
);
|
||||||
|
|
||||||
|
totalResults3.value = (result * 20) / weight;
|
||||||
|
}
|
||||||
})
|
})
|
||||||
.catch((err) => {
|
.catch((err) => {
|
||||||
messageError($q, err);
|
messageError($q, err);
|
||||||
|
|
@ -119,7 +141,7 @@ function onInfo() {
|
||||||
}
|
}
|
||||||
const resultWork = computed(() => {
|
const resultWork = computed(() => {
|
||||||
const total = totalResults1.value + totalResults2.value + totalResults3.value;
|
const total = totalResults1.value + totalResults2.value + totalResults3.value;
|
||||||
return parseFloat(((total * 80) ).toFixed(2));
|
return total.toFixed(2);
|
||||||
});
|
});
|
||||||
|
|
||||||
function getCriteria() {
|
function getCriteria() {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue