Revize dacbd84d
Přidáno uživatelem Štěpán Červenka před téměř 4 roky(ů)
src/app/shared/graph-loading/multigraph.ts | ||
---|---|---|
66 | 66 |
} |
67 | 67 |
|
68 | 68 |
private getTooltipMessage() { |
69 |
let message = "{title: timeFormat(datum.dateTime, '%A, %e. %B %Y, %X')";
|
|
69 |
let message = "{title: timeFormat(datum.dateTime, '%A, %B %e, %Y %X')";
|
|
70 | 70 |
this.data.forEach(function (e) { |
71 | 71 |
message += (", '" + e.sensor.sensorName + "': datum['" + e.sensor.sensorName + "'] + ' " + e.sensor.phenomenon.unit +"' "); |
72 | 72 |
}) |
src/app/shared/graph-loading/singlegraph.ts | ||
---|---|---|
119 | 119 |
|
120 | 120 |
|
121 | 121 |
private getValueTooltip() { |
122 |
return "{title: timeFormat(datum.dateTime, '%A, %e. %B %Y, %X') , 'value': datum.value + ' " + this.legend['phenomenon']['unit'] + "'}"
|
|
122 |
return "{title: timeFormat(datum.dateTime, '%A, %B %e, %Y %X') , 'value': datum.value + ' " + this.legend['phenomenon']['unit'] + "'}"
|
|
123 | 123 |
} |
124 | 124 |
|
125 | 125 |
private getSammTooltip() { |
126 |
return "{title: timeFormat(datum.dateTime, '%A, %e. %B %Y, %X') " +
|
|
126 |
return "{title: timeFormat(datum.dateTime, '%A, %B %e, %Y %X') " +
|
|
127 | 127 |
" , 'avg': datum.avg + ' " + this.legend['phenomenon']['unit'] + |
128 | 128 |
"', 'sum': datum.sum + ' " + this.legend['phenomenon']['unit'] + |
129 | 129 |
"', 'max': datum.max + ' " + this.legend['phenomenon']['unit'] + |
... | ... | |
154 | 154 |
(this.sensorId >= 470130000 && this.sensorId < 470140000) || (this.sensorId >= 470180000 && this.sensorId < 470190000)) { |
155 | 155 |
return SingleGraphType.WINDCHART; |
156 | 156 |
} else { |
157 |
//TODO pridat min/max |
|
158 | 157 |
return SingleGraphType.LINECHART; |
159 | 158 |
} |
160 | 159 |
} |
src/vega/body/barchart.json | ||
---|---|---|
65 | 65 |
}, |
66 | 66 |
{ |
67 | 67 |
"type": "formula", |
68 |
"expr": "datum.prevObj == null ? data('range')[0].dateMin : (time(datum.prevObj.dateTime) + time(datum.dateTime)) / 2",
|
|
68 |
"expr": "datum.prevObj != null ? (time(datum.prevObj.dateTime) + time(datum.dateTime)) / 2 : (datum.nextObj != null ? (3 * time(datum.dateTime) - time(datum.nextObj.dateTime)) / 2 : data('range')[0].dateMin)",
|
|
69 | 69 |
"as": "tempDateStart" |
70 | 70 |
}, |
71 | 71 |
{ |
72 | 72 |
"type": "formula", |
73 |
"expr": "datum.nextObj == null ? data('range')[0].dateMax : (time(datum.nextObj.dateTime) + time(datum.dateTime)) / 2",
|
|
73 |
"expr": "datum.nextObj != null ? (time(datum.nextObj.dateTime) + time(datum.dateTime)) / 2 : (datum.prevObj != null ? ( 3 * time(datum.dateTime) - time(datum.prevObj.dateTime)) / 2 : data('range')[0].dateMax)",
|
|
74 | 74 |
"as": "tempDateEnd" |
75 | 75 |
}, |
76 | 76 |
{ |
Také k dispozici: Unified diff
Re #XXXX - Oprava několika jednoduchých chyb v rámci meetingu se zadavatelem