diff --git a/package-lock.json b/package-lock.json index 4675b9058..0f8ef5635 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6234,8 +6234,7 @@ }, "ansi-regex": { "version": "2.1.1", - "bundled": true, - "optional": true + "bundled": true }, "aproba": { "version": "1.2.0", @@ -6253,13 +6252,11 @@ }, "balanced-match": { "version": "1.0.0", - "bundled": true, - "optional": true + "bundled": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, - "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -6272,18 +6269,15 @@ }, "code-point-at": { "version": "1.1.0", - "bundled": true, - "optional": true + "bundled": true }, "concat-map": { "version": "0.0.1", - "bundled": true, - "optional": true + "bundled": true }, "console-control-strings": { "version": "1.1.0", - "bundled": true, - "optional": true + "bundled": true }, "core-util-is": { "version": "1.0.2", @@ -6386,8 +6380,7 @@ }, "inherits": { "version": "2.0.3", - "bundled": true, - "optional": true + "bundled": true }, "ini": { "version": "1.3.5", @@ -6397,7 +6390,6 @@ "is-fullwidth-code-point": { "version": "1.0.0", "bundled": true, - "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -6410,20 +6402,17 @@ "minimatch": { "version": "3.0.4", "bundled": true, - "optional": true, "requires": { "brace-expansion": "^1.1.7" } }, "minimist": { "version": "0.0.8", - "bundled": true, - "optional": true + "bundled": true }, "minipass": { "version": "2.3.5", "bundled": true, - "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -6440,7 +6429,6 @@ "mkdirp": { "version": "0.5.1", "bundled": true, - "optional": true, "requires": { "minimist": "0.0.8" } @@ -6513,8 +6501,7 @@ }, "number-is-nan": { "version": "1.0.1", - "bundled": true, - "optional": true + "bundled": true }, "object-assign": { "version": "4.1.1", @@ -6524,7 +6511,6 @@ "once": { "version": "1.4.0", "bundled": true, - "optional": true, "requires": { "wrappy": "1" } @@ -6600,8 +6586,7 @@ }, "safe-buffer": { "version": "5.1.2", - "bundled": true, - "optional": true + "bundled": true }, "safer-buffer": { "version": "2.1.2", @@ -6631,7 +6616,6 @@ "string-width": { "version": "1.0.2", "bundled": true, - "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -6649,7 +6633,6 @@ "strip-ansi": { "version": "3.0.1", "bundled": true, - "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -6688,13 +6671,11 @@ }, "wrappy": { "version": "1.0.2", - "bundled": true, - "optional": true + "bundled": true }, "yallist": { "version": "3.0.3", - "bundled": true, - "optional": true + "bundled": true } } }, diff --git a/src/app/dashboard/admin/admin.component.html b/src/app/dashboard/admin/admin.component.html index 73c5bc5d7..737c8dc21 100644 --- a/src/app/dashboard/admin/admin.component.html +++ b/src/app/dashboard/admin/admin.component.html @@ -1,5 +1,5 @@
-
+ + + +
\ No newline at end of file diff --git a/src/app/dashboard/apiary/ruche-rucher/ruche-detail/service/daily-stock-honey.service.ts b/src/app/dashboard/apiary/ruche-rucher/ruche-detail/service/daily-stock-honey.service.ts index 841cb5479..ab1a010ef 100644 --- a/src/app/dashboard/apiary/ruche-rucher/ruche-detail/service/daily-stock-honey.service.ts +++ b/src/app/dashboard/apiary/ruche-rucher/ruche-detail/service/daily-stock-honey.service.ts @@ -62,7 +62,6 @@ export class DailyStockHoneyService { getDailyStockHoneyByHIve(idHive: string) { this.typeFlower = []; return this.http.get(CONFIG.URL + 'dailyStockHoney' + '/hive/' + idHive).map(dailyStock => { - console.log(dailyStock); const series = []; dailyStock.forEach(element => { if (this.typeFlower.indexOf(element.nom) === -1) { diff --git a/src/app/dashboard/apiary/ruche-rucher/ruche-detail/stock/service/calendrier-poids.service.ts b/src/app/dashboard/apiary/ruche-rucher/ruche-detail/stock/service/calendrier-poids.service.ts index 45add7e69..56596499e 100644 --- a/src/app/dashboard/apiary/ruche-rucher/ruche-detail/stock/service/calendrier-poids.service.ts +++ b/src/app/dashboard/apiary/ruche-rucher/ruche-detail/stock/service/calendrier-poids.service.ts @@ -22,7 +22,7 @@ export class CalendrierPoidsService { trigger: 'item', formatter: (params: any) => { return params.marker + this.unitService.getDailyDate(params.data[0].split('T')[0]) + - '
' + params.seriesName + ' : ' + this.unitService.getUserPref().unitSystem === 'METRIC' ? this.graphGlobal.getNumberFormat(this.unitService.getValRound(params.data[1])) : this.graphGlobal.getNumberFormat(this.unitService.getValRound(params.data[1] * 2.205)) + ' ' + this.graphGlobal.weight.unitW; + '
' + params.seriesName + ' : ' + this.graphGlobal.getNumberFormat(this.unitService.getValRound(params.data[1])) + ' ' + this.graphGlobal.weight.unitW; } }, toolbox: { diff --git a/src/app/dashboard/graph-echarts/GlobalGraph.ts b/src/app/dashboard/graph-echarts/GlobalGraph.ts index 5543e92b2..cd32b88e1 100644 --- a/src/app/dashboard/graph-echarts/GlobalGraph.ts +++ b/src/app/dashboard/graph-echarts/GlobalGraph.ts @@ -47,7 +47,6 @@ export class GraphGlobal { }else{ this.weight.name = 'Weight lbs'; } - this.weight.name = 'Weight lbs'; this.weight.min = 40; this.weight.max = null; this.weight.unitW = 'lbs'; @@ -64,8 +63,13 @@ export class GraphGlobal { this.temp.max = null; } else { // FR - - this.weight.name = 'Weight Kg'; + // If he is French + if(this.userService.getJwtReponse().country === "FR"){ + this.weight.name = 'Poids Kg'; + // EN + }else{ + this.weight.name = 'Weight Kg'; + } this.weight.min = 0; this.weight.unitW = 'Kg'; this.weight.interval = 10;