From ae3e7230d4bb88cbc61ca390f1c7aa6383a8253a Mon Sep 17 00:00:00 2001 From: a3rtgm-ds Date: Wed, 24 May 2023 18:03:16 +0200 Subject: [PATCH 001/175] fix webgl behavior, add average fct for calcRatio --- .../components/CalculateRatio.vue | 37 +++++++++++++++++-- cosi/utils/calculateRatio.js | 20 ++++++++-- 2 files changed, 49 insertions(+), 8 deletions(-) diff --git a/cosi/CalculateRatio/components/CalculateRatio.vue b/cosi/CalculateRatio/components/CalculateRatio.vue index a2e9b6cbb..6d152602a 100644 --- a/cosi/CalculateRatio/components/CalculateRatio.vue +++ b/cosi/CalculateRatio/components/CalculateRatio.vue @@ -72,6 +72,10 @@ export default { perCalc_A: 1, // Modifier "berechnen pro" for Field B perCalc_B: 1, + // operation to perform on field A values + operation_A: "sum", + // operation to perform on field A values + operation_B: "sum", // Helper Array to use selected values beyond function scope featureVals: [], // Object that helps calculating the data in prepareCoverage function @@ -221,7 +225,6 @@ export default { ...mapMutations("Tools/CalculateRatio", Object.keys(mutations)), ...mapActions("Alerting", ["addSingleAlert", "cleanup"]), ...mapActions("Tools/ChartGenerator", ["channelGraphData"]), - ...mapMutations("Tools/ChartGenerator", ["setNewDataset"]), /** * @description Updates theme layer selection and sorting/ grouping it for display in multiselect. * @todo triggers too often!!! refactor @@ -471,7 +474,7 @@ export default { allData.push(combined); }); - this.setResults(utils.calculateRatio(allData, this.selectedYear)); + this.setResults(utils.calculateRatio(allData, this.selectedYear, [this.operation_A, this.operation_B])); this.setResultHeaders({ typeA: resultHeader_A, typeB: resultHeader_B, @@ -656,7 +659,7 @@ export default { dataArray.push(result.data); }); - this.setResults(utils.calculateRatio(dataArray, this.selectedYear)); + this.setResults(utils.calculateRatio(dataArray, this.selectedYear, [this.operation_A, this.operation_B])); this.dataSets[this.activeSet].results = this.results; }, /** @@ -753,7 +756,7 @@ export default { }); this.availableYears.forEach(year => { - const dataPerYear = utils.calculateRatio(dataArray, year) + const dataPerYear = utils.calculateRatio(dataArray, year, [this.operation_A, this.operation_B]) .filter(dataset => dataset.scope); dataPerYear.forEach(dataset => { @@ -947,6 +950,19 @@ export default { return-object :disabled="facilityPropertyList_A.length < 2" /> + + + diff --git a/cosi/TemplateAdmin/components/TemplateAdminForm.vue b/cosi/TemplateAdmin/components/TemplateAdminForm.vue new file mode 100644 index 000000000..c74c54fd0 --- /dev/null +++ b/cosi/TemplateAdmin/components/TemplateAdminForm.vue @@ -0,0 +1,352 @@ + + +