Merge branch 'dev'

mellisphera · Jun 5, 2019 · 3637dff · 3637dff
2 parents b88a306 + 15ba704
commit 3637dff
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 37 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/app/dashboard/admin/admin.component.html b/src/app/dashboard/admin/admin.component.html
@@ -1,5 +1,5 @@
 <div class="row content">
-    <div class="container-fluid" style="background-color: white;">
+<!--     <div class="container-fluid" style="background-color: white;">
         <div class="content">
             <ul class="nav nav-tabs">
                 <li class="active"><a data-toggle="tab" href="#map">Sign-up</a></li>
@@ -14,5 +14,39 @@
                 </div>
             </div>
         </div>
-    </div>
+    </div> -->
+
+    <nav class="navbar navbar-default" role="navigation">
+        <!-- Brand and toggle get grouped for better mobile display -->
+        <div class="navbar-header">
+            <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex1-collapse">
+                <span class="sr-only">Toggle navigation</span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+            </button>
+            <a class="navbar-brand" href="#">Title</a>
+        </div>
+
+        <!-- Collect the nav links, forms, and other content for toggling -->
+        <div class="collapse navbar-collapse navbar-ex1-collapse">
+            <ul class="nav navbar-nav">
+                <li class="active"><a href="#">Link</a></li>
+                <li><a href="#">Link</a></li>
+            </ul>
+            <ul class="nav navbar-nav navbar-right">
+                <li><a href="#">Link</a></li>
+                <li class="dropdown">
+                    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
+                    <ul class="dropdown-menu">
+                        <li><a href="#">Action</a></li>
+                        <li><a href="#">Another action</a></li>
+                        <li><a href="#">Something else here</a></li>
+                        <li><a href="#">Separated link</a></li>
+                    </ul>
+                </li>
+            </ul>
+        </div><!-- /.navbar-collapse -->
+    </nav>
+
 </div>
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
@@ -62,7 +62,6 @@ export class DailyStockHoneyService {
   getDailyStockHoneyByHIve(idHive: string) {
     this.typeFlower = [];
     return this.http.get<DailyStockHoney[]>(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
@@ -22,7 +22,7 @@ export class CalendrierPoidsService {
             trigger: 'item',
             formatter: (params: any) => {
                 return params.marker + this.unitService.getDailyDate(params.data[0].split('T')[0]) + 
-                '<br/>' + 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;
+                '<br/>' + 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
@@ -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;