From 12e6e65d81971a21f514fb36bb1f3c3e1a329661 Mon Sep 17 00:00:00 2001
From: monika-Dianomic <monika@dianomic.com>
Date: Mon, 22 Oct 2018 17:07:10 +0530
Subject: [PATCH 1/4] added saperate dropdown for group by

---
 .../series-graph/series-graph.component.html  | 62 +++++++++++++------
 .../series-graph/series-graph.component.ts    |  8 ++-
 src/app/services/assets.service.ts            |  4 +-
 3 files changed, 51 insertions(+), 23 deletions(-)

diff --git a/src/app/components/core/asset-readings/series-graph/series-graph.component.html b/src/app/components/core/asset-readings/series-graph/series-graph.component.html
index 4abdda8c..f21b63ef 100644
--- a/src/app/components/core/asset-readings/series-graph/series-graph.component.html
+++ b/src/app/components/core/asset-readings/series-graph/series-graph.component.html
@@ -9,27 +9,49 @@
       </div>
     </header>
     <section class="modal-card-body">
-      <div class="columns is-mobile">
-        <div class="field">
-          <div *ngIf='readings' class="select is-small">
-            <select #selectedKey (change)="setReading(selectedKey.value)">
-              <option *ngFor="let reading of readings" [value]='reading' [selected]="readingKey == reading">{{reading}}</option>
-            </select>
-          </div>
-        </div>&nbsp;&nbsp;&nbsp;
-        <div class="field has-addons">
-          <p class="control">
-            <app-number-input-debounce placeholder="time (default 10)" (value)="setTimeValue($event)" [val]="timeValue"></app-number-input-debounce>
-          </p>
-          <p class="control">
-            <span class="select is-small">
-              <select #selectedTime (change)="setGroup(selectedTime.value)">
-                <option value="minutes" [selected]="optedGroup == 'minutes'">minutes</option>
-                <option value="hours" [selected]="optedGroup == 'hours'">hours</option>
-                <option value="seconds" [selected]="optedGroup == 'seconds'">seconds</option>
+      <div class="columns">
+        <div class="column is-3">
+          <div class="field">
+            <div *ngIf='readings' class="select is-small">
+              <select #selectedKey (change)="setReading(selectedKey.value)">
+                <option *ngFor="let reading of readings" [value]='reading' [selected]="readingKey == reading">{{reading}}</option>
               </select>
-            </span>
-          </p>
+            </div>
+          </div>
+        </div>
+        <div class="column">
+          <div class="field has-addons">
+            <p class="control">
+              <app-number-input-debounce placeholder="time (default 10)" (value)="setTimeValue($event)" [val]="timeValue"></app-number-input-debounce>
+            </p>
+            <p class="control">
+              <span class="select is-small">
+                <select #selectedTimeUnit (change)="setTimeUnit(selectedTimeUnit.value)">
+                  <option value="minutes" [selected]="timeUnit == 'minutes'">minutes</option>
+                  <option value="hours" [selected]="timeUnit == 'hours'">hours</option>
+                  <option value="seconds" [selected]="timeUnit == 'seconds'">seconds</option>
+                </select>
+              </span>
+            </p>
+          </div>
+        </div>
+        <div class="column">
+          <div class="field has-addons">
+            <p class="control">
+              <span class="select is-small">
+                <select #selectedTime (change)="setGroup(selectedTime.value)">
+                  <option value="minutes" [selected]="optedGroup == 'minutes'">minutes</option>
+                  <option value="hours" [selected]="optedGroup == 'hours'">hours</option>
+                  <option value="seconds" [selected]="optedGroup == 'seconds'">seconds</option>
+                </select>
+              </span>
+            </p>
+            <p class="control">
+              <a class="button is-small is-static">
+                Group By
+              </a>
+            </p>
+          </div>
         </div>
       </div>
       <div *ngIf="showSpinner" class="app-loading">
diff --git a/src/app/components/core/asset-readings/series-graph/series-graph.component.ts b/src/app/components/core/asset-readings/series-graph/series-graph.component.ts
index 3f2d11c0..39fbae84 100644
--- a/src/app/components/core/asset-readings/series-graph/series-graph.component.ts
+++ b/src/app/components/core/asset-readings/series-graph/series-graph.component.ts
@@ -25,6 +25,7 @@ export class SeriesGraphComponent implements OnDestroy {
   public readingKey = '';
   public optedGroup = 'minutes';
   public timeValue = 10;
+  public timeUnit = 'minutes';
   public readKeyColorLabel = [];
   public showSpinner = false;
   public MAX_RANGE = MAX_INT_SIZE;
@@ -92,6 +93,11 @@ export class SeriesGraphComponent implements OnDestroy {
     this.plotSeriesGraph();
   }
 
+  setTimeUnit(timeUnit) {
+    this.timeUnit = timeUnit;
+    this.plotSeriesGraph();
+  }
+
   setTimeValue(time) {
     if (time === null || time === undefined) {
       time = 10;
@@ -153,7 +159,7 @@ export class SeriesGraphComponent implements OnDestroy {
     if (this.readingKey === '') {
       this.readingKey = this.readings[0];
     }
-    this.assetService.getAssetAverage(this.assetCode, this.readingKey, this.optedGroup, this.timeValue).
+    this.assetService.getAssetAverage(this.assetCode, this.readingKey, this.optedGroup, this.timeValue, this.timeUnit).
       subscribe(
         (data: any[]) => {
           if (data.length === 0) {
diff --git a/src/app/services/assets.service.ts b/src/app/services/assets.service.ts
index a5d32ce2..77940cc1 100644
--- a/src/app/services/assets.service.ts
+++ b/src/app/services/assets.service.ts
@@ -64,10 +64,10 @@ export class AssetsService {
       catchError((error: Response) => observableThrowError(error)));
   }
 
-  public getAssetAverage(assetCode: string, reading: string, group, time) {
+  public getAssetAverage(assetCode: string, reading: string, group, time, timeUnit) {
     let params = new HttpParams();
     params = params.append('group', group);
-    params = params.append(group, time);
+    params = params.append(timeUnit, time);
     return this.http.get(this.GET_ASSET + '/' + encodeURIComponent(assetCode) + '/' + encodeURIComponent(reading) + '/series',
     { params: params }).pipe(
       map(response => response),

From 0d6e2ad6a56f8fbada9bbf27a05abc2b9a9d0a23 Mon Sep 17 00:00:00 2001
From: monika-Dianomic <monika@dianomic.com>
Date: Mon, 22 Oct 2018 17:28:16 +0530
Subject: [PATCH 2/4] changes in field addon

---
 .../series-graph/series-graph.component.html           | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/app/components/core/asset-readings/series-graph/series-graph.component.html b/src/app/components/core/asset-readings/series-graph/series-graph.component.html
index f21b63ef..e4669a15 100644
--- a/src/app/components/core/asset-readings/series-graph/series-graph.component.html
+++ b/src/app/components/core/asset-readings/series-graph/series-graph.component.html
@@ -37,6 +37,11 @@
         </div>
         <div class="column">
           <div class="field has-addons">
+            <p class="control">
+              <a class="button is-small is-static">
+                Group By
+              </a>
+            </p>
             <p class="control">
               <span class="select is-small">
                 <select #selectedTime (change)="setGroup(selectedTime.value)">
@@ -46,11 +51,6 @@
                 </select>
               </span>
             </p>
-            <p class="control">
-              <a class="button is-small is-static">
-                Group By
-              </a>
-            </p>
           </div>
         </div>
       </div>

From 7824c1edec263560d84d9a02588b44247f58d7f4 Mon Sep 17 00:00:00 2001
From: monika-Dianomic <monika@dianomic.com>
Date: Tue, 23 Oct 2018 13:34:33 +0530
Subject: [PATCH 3/4] don't show dropdown if there is only one metric

---
 .../series-graph/series-graph.component.html             | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/app/components/core/asset-readings/series-graph/series-graph.component.html b/src/app/components/core/asset-readings/series-graph/series-graph.component.html
index e4669a15..28124184 100644
--- a/src/app/components/core/asset-readings/series-graph/series-graph.component.html
+++ b/src/app/components/core/asset-readings/series-graph/series-graph.component.html
@@ -10,19 +10,20 @@
     </header>
     <section class="modal-card-body">
       <div class="columns">
-        <div class="column is-3">
-          <div class="field">
-            <div *ngIf='readings' class="select is-small">
+        <div class="column">
+          <div *ngIf='readings' class="field">
+            <div *ngIf='readings.length > 1' class="select is-small">
               <select #selectedKey (change)="setReading(selectedKey.value)">
                 <option *ngFor="let reading of readings" [value]='reading' [selected]="readingKey == reading">{{reading}}</option>
               </select>
             </div>
+            <input *ngIf="readings.length == 1" class="input is-fullwidth is-small" disabled type="text" [value]='readings[0]' />
           </div>
         </div>
         <div class="column">
           <div class="field has-addons">
             <p class="control">
-              <app-number-input-debounce placeholder="time (default 10)" (value)="setTimeValue($event)" [val]="timeValue"></app-number-input-debounce>
+              <app-number-input-debounce placeholder="(default) 10" (value)="setTimeValue($event)" [val]="timeValue"></app-number-input-debounce>
             </p>
             <p class="control">
               <span class="select is-small">

From 4d3ec2d4be5cf02d2230b895c95d25533ef6c65d Mon Sep 17 00:00:00 2001
From: monika-Dianomic <monika@dianomic.com>
Date: Wed, 24 Oct 2018 12:06:01 +0530
Subject: [PATCH 4/4] changes as per feedback

---
 .../asset-readings/series-graph/series-graph.component.html   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/components/core/asset-readings/series-graph/series-graph.component.html b/src/app/components/core/asset-readings/series-graph/series-graph.component.html
index 28124184..95a67ddf 100644
--- a/src/app/components/core/asset-readings/series-graph/series-graph.component.html
+++ b/src/app/components/core/asset-readings/series-graph/series-graph.component.html
@@ -12,12 +12,12 @@
       <div class="columns">
         <div class="column">
           <div *ngIf='readings' class="field">
-            <div *ngIf='readings.length > 1' class="select is-small">
+            <div *ngIf='readings.length > 1' class="select is-small is-fullwidth">
               <select #selectedKey (change)="setReading(selectedKey.value)">
                 <option *ngFor="let reading of readings" [value]='reading' [selected]="readingKey == reading">{{reading}}</option>
               </select>
             </div>
-            <input *ngIf="readings.length == 1" class="input is-fullwidth is-small" disabled type="text" [value]='readings[0]' />
+            <label *ngIf="readings.length == 1">{{readings[0]}}</label>
           </div>
         </div>
         <div class="column">