From d43150d5cc21ff9bc8447ef3af2f2d9c2e50b7a3 Mon Sep 17 00:00:00 2001
From: Johannes Millan <johannes.millan@gmail.com>
Date: Thu, 22 Mar 2018 23:21:52 +0100
Subject: [PATCH] feat: show optional time worked without break

---
 app-src/scripts/constants.js                  |  1 +
 .../main/global-services/time-tracking-s.js   |  3 ++
 .../misc-settings/misc-settings-d.html        |  5 +++
 app-src/scripts/work-view/_work-view-d.scss   | 17 +++++++++
 app-src/scripts/work-view/work-view-d.html    | 36 +++++++++++++------
 app-src/scripts/work-view/work-view-d.js      |  2 ++
 6 files changed, 54 insertions(+), 10 deletions(-)

diff --git a/app-src/scripts/constants.js b/app-src/scripts/constants.js
index aa9e215891..09ce901b00 100644
--- a/app-src/scripts/constants.js
+++ b/app-src/scripts/constants.js
@@ -160,6 +160,7 @@
           isPlaySound: true,
           isGoToWorkView: false,
         },
+        isShowTimeWorkedWithoutBreak: false,
         isTakeABreakEnabled: false,
         takeABreakMinWorkingTime: undefined,
         isAutoStartNextTask: true,
diff --git a/app-src/scripts/main/global-services/time-tracking-s.js b/app-src/scripts/main/global-services/time-tracking-s.js
index 2114eb1402..bf1bfa93c5 100644
--- a/app-src/scripts/main/global-services/time-tracking-s.js
+++ b/app-src/scripts/main/global-services/time-tracking-s.js
@@ -65,11 +65,14 @@
               current: this.$rootScope.r.currentTask,
               lastActiveTask: this.Tasks.getLastActiveIfStartable()
             });
+          }
 
+          if (this.IS_ELECTRON || this.IS_EXTENSION) {
             if (!this.isIdle) {
               this.TakeABreakReminder.update(realPeriodDuration, this.isIdle);
             }
           }
+
         } else {
           // reset currentTrackingStart
           currentTrackingStart = moment();
diff --git a/app-src/scripts/settings/misc-settings/misc-settings-d.html b/app-src/scripts/settings/misc-settings/misc-settings-d.html
index be6a5cc5ed..d0c813e675 100644
--- a/app-src/scripts/settings/misc-settings/misc-settings-d.html
+++ b/app-src/scripts/settings/misc-settings/misc-settings-d.html
@@ -42,6 +42,11 @@
            ng-model="vm.settings.minIdleTime">
   </md-input-container>
 
+  <md-switch ng-model="vm.settings.isShowTimeWorkedWithoutBreak"
+             aria-label="Show time worked without break in work view">
+    Show time worked without break in work view
+  </md-switch>
+
   <md-switch ng-model="vm.settings.isTakeABreakEnabled"
              aria-label="Enable take a break reminder">
     Enable take a break reminder
diff --git a/app-src/scripts/work-view/_work-view-d.scss b/app-src/scripts/work-view/_work-view-d.scss
index 12089e11a7..3453377c4f 100644
--- a/app-src/scripts/work-view/_work-view-d.scss
+++ b/app-src/scripts/work-view/_work-view-d.scss
@@ -14,4 +14,21 @@ work-view {
       margin: 0;
     }
   }
+}
+
+.status-bar {
+  display: flex;
+  align-items: center;
+  flex-direction: row;
+  justify-content: center;
+  margin-top: -4px;
+  padding: 10px 0;
+
+  .item {
+    margin: 0 12px;
+  }
+  .no-wrap {
+    display: inline-block;
+    white-space: nowrap;
+  }
 }
\ No newline at end of file
diff --git a/app-src/scripts/work-view/work-view-d.html b/app-src/scripts/work-view/work-view-d.html
index 5ed76cd03a..e6e83e2376 100644
--- a/app-src/scripts/work-view/work-view-d.html
+++ b/app-src/scripts/work-view/work-view-d.html
@@ -1,18 +1,34 @@
 <header class="work-view-header">
-  <p>
-    <ng-md-icon icon="playlist_play"></ng-md-icon>
-    <span class="label">Working today:</span>
-    <strong ng-bind="vm.totalTimeWorkedToday|duration"></strong>
-    <ng-md-icon icon="timer"></ng-md-icon>
-    –
-    <span class="label">Estimate remaining:</span> ~<strong ng-bind="vm.totalEstimationRemaining|duration"></strong>
-    <ng-md-icon icon="timer"></ng-md-icon>
+  <div class="status-bar">
+    <div class="item"><span class="label">Working today:</span>
+      <span class="no-wrap">
+      <strong ng-bind="vm.totalTimeWorkedToday|duration"></strong>
+      <ng-md-icon icon="timer"></ng-md-icon>
+      </span>
+    </div>
+
+    <div class="item">
+      <span class="label">Estimate remaining:</span>
+      <span class="no-wrap">
+      ~<strong ng-bind="vm.totalEstimationRemaining|duration"></strong>
+      <ng-md-icon icon="timer"></ng-md-icon>
+      </span>
+    </div>
+
+    <div class="item"
+         ng-if="vm.config.isShowTimeWorkedWithoutBreak">
+      <span class="label">Without break: </span>
+      <span class="no-wrap">
+        <strong ng-bind="vm.session.timeWorkedWithoutBreak|duration"></strong><ng-md-icon icon="timer"></ng-md-icon>
+      </span>
+    </div>
 
     <md-button ng-click="vm.collapseAllNotesAndSubTasks()"
                class="md-icon-button md-primary">
-      <ng-md-icon icon="vertical_align_center" aria-label="collapse sub tasks and notes"></ng-md-icon>
+      <ng-md-icon icon="vertical_align_center"
+                  aria-label="collapse sub tasks and notes"></ng-md-icon>
     </md-button>
-  </p>
+  </div>
 </header>
 
 <section class="work-view-tasks work-view-tasks--undone">
diff --git a/app-src/scripts/work-view/work-view-d.js b/app-src/scripts/work-view/work-view-d.js
index 262545f268..dd926690a4 100644
--- a/app-src/scripts/work-view/work-view-d.js
+++ b/app-src/scripts/work-view/work-view-d.js
@@ -30,6 +30,8 @@
     const _ = $window._;
 
     // INIT
+    vm.session = $rootScope.r.currentSession;
+    vm.config = $rootScope.r.config;
     vm.tasksUndone = Tasks.getUndoneToday();
     vm.tasksDone = Tasks.getDoneToday();
     updateTimeTotals();