[IT-2825] Refactoring

Author: DanielSteger

frontend/src/app/modules/time-series/services/line-chart.service.ts

@@ -136,31 +136,15 @@ export class LineChartService {
    */
   public setLegendData(incomingData: EventResultDataDTO) {
     let labelDataMap = {};
-    let translateMeasurands: boolean = incomingData.summaryLabels.length > 0 && incomingData.summaryLabels[0].key != "measurand";
     incomingData.series.forEach((data: EventResultSeriesDTO) => {
-      if (translateMeasurands) {
-        let splitLabelList: string[] = data.identifier.split(' | ', 2);
-        this.translationService
-          .get('frontend.de.iteratec.isr.measurand.' + splitLabelList[0])
-          .pipe(take(1))
-          .subscribe((splitLabel: string) => {
-            if (!splitLabel.startsWith('frontend.de.iteratec.isr.measurand.')) {
-              splitLabelList[0] = splitLabel;
-            }
-            let key = this.generateKey(data);
-            labelDataMap[key] = {
-              text: splitLabelList.join(' | '),
-              key: key,
-              show: true,
-            }
-          });
-      } else {
-        let key = this.generateKey(data);
-        labelDataMap[key] = {
-          text: data.identifier,
-          key: key,
-          show: true,
-        }
+      if (incomingData.summaryLabels.length > 0 && incomingData.summaryLabels[0].key != "measurand") {
+        data.identifier = this.translateMeasurand(data);
+      }
+      let key = this.generateKey(data);
+      labelDataMap[key] = {
+        text: data.identifier,
+        key: key,
+        show: true
       }
     });
     this.legendDataMap = labelDataMap;
@@ -170,25 +154,36 @@ export class LineChartService {
    * Prepares the incoming data for drawing with D3.js
    */
   private prepareData(incomingData: EventResultDataDTO): TimeSeries[] {
-
     return incomingData.series.map((data: EventResultSeriesDTO) => {
       let lineChartData: TimeSeries = new TimeSeries();
+      if (incomingData.summaryLabels.length > 0 && incomingData.summaryLabels[0].key != "measurand") {
+        data.identifier = this.translateMeasurand(data);
+      }
       lineChartData.key = this.generateKey(data);
 
       lineChartData.values = data.data.map((point: EventResultPointDTO) => {
         let lineChartDataPoint: TimeSeriesPoint = new TimeSeriesPoint();
         lineChartDataPoint.date = parseDate(point.date);
         lineChartDataPoint.value = point.value;
-        lineChartDataPoint.tooltipText = data.jobGroup + ' | ' + data.measuredEvent + ' : '; // TODO Set exact label text when IT-2793 is implemented
+        lineChartDataPoint.tooltipText = data.identifier + ' : ';
         return lineChartDataPoint;
       });
 
       return lineChartData;
     });
   }
 
+  private translateMeasurand(data: EventResultSeriesDTO): string {
+    let splitLabelList: string[] = data.identifier.split(' | ');
+    let splitLabel: string = this.translationService.instant('frontend.de.iteratec.isr.measurand.' + splitLabelList[0]);
+    if (!splitLabel.startsWith('frontend.de.iteratec.isr.measurand.')) {
+      splitLabelList[0] = splitLabel;
+    }
+    return splitLabelList.join(' | ');
+  }
+
   private generateKey(data: EventResultSeriesDTO): string {
-    return data.identifier.split(' | ').join().split(':').join("");
+    return data.identifier.split(' | ').join().split(':').join("").split("?").join("");
   }
 
   /**
@@ -576,7 +571,7 @@ export class LineChartService {
       })
       // fade in
       .transition().duration(500).style('opacity', (timeSeries: TimeSeries) => {
-      return (this.legendDataMap[timeSeries.key].show) ? '1' : '0.2';
+      return (this.legendDataMap[timeSeries.key].show) ? '1' : '0.1';
     });
 
     return resultingSelection;

grails-app/i18n/messages.properties

@@ -1069,6 +1069,9 @@ frontend.default.button.save=Save
 frontend.default.button.cancel=Cancel
 frontend.de.iteratec.osm.measurement.setup.title=Measurement Setup
 frontend.de.iteratec.osm.applicationDashboard.kpi.title=Total Customer Satisfaction
+frontend.de.iteratec.isr.measurand.PAGE_CONSTRUCTION_STARTED=Is it happening?
+frontend.de.iteratec.isr.measurand.PAGE_SHOWS_USEFUL_CONTENT=Is it useful?
+frontend.de.iteratec.isr.measurand.PAGE_IS_USABLE=Is it useable?
 frontend.de.iteratec.isr.measurand.DOC_COMPLETE_TIME=Document Complete
 frontend.de.iteratec.isr.measurand.DOM_TIME=DOM Time
 frontend.de.iteratec.isr.measurand.FIRST_BYTE=First Byte

grails-app/i18n/messages_de.properties

@@ -1051,6 +1051,9 @@ frontend.default.button.save=Speichern
 frontend.default.button.cancel=Abbrechen
 frontend.de.iteratec.osm.measurement.setup.title=Setup Messungen
 frontend.de.iteratec.osm.applicationDashboard.kpi.title=Gesamte Kundenzufriedenheit
+frontend.de.iteratec.isr.measurand.PAGE_CONSTRUCTION_STARTED=Is it happening?
+frontend.de.iteratec.isr.measurand.PAGE_SHOWS_USEFUL_CONTENT=Is it useful?
+frontend.de.iteratec.isr.measurand.PAGE_IS_USABLE=Is it useable?
 frontend.de.iteratec.isr.measurand.DOC_COMPLETE_TIME=Document Complete
 frontend.de.iteratec.isr.measurand.DOM_TIME=DOM Time
 frontend.de.iteratec.isr.measurand.FIRST_BYTE=First Byte