Add shortcuts for next and after next quarters

scyv · Aug 15, 2018 · 167a319 · 167a319
1 parent c922870
commit 167a319
Show file tree

Hide file tree

Showing 6 changed files with 59 additions and 15 deletions.
diff --git a/both/methods.js b/both/methods.js
@@ -9,11 +9,11 @@ function checkUserLoggedIn(ctx) {
 }
 
 Meteor.methods({
-    "startPomodoro"() {
+    "startPomodoro"(customLength) {
         checkUserLoggedIn(this);
         const pomodoro = Factory.createPomodoro(this.userId);
         pomodoro.start = new Date();
-        pomodoro.targetLength = Meteor.user().profile.settings.pomodoroLength;
+        pomodoro.targetLength = customLength || Meteor.user().profile.settings.pomodoroLength;
         Pomodoros.insert(pomodoro);
     },
     "stopPomodoro"(comment) {

diff --git a/client/css/main.less b/client/css/main.less
@@ -9,6 +9,8 @@ body {
   cursor: pointer;
 }
 
+
+
 .row {
   margin-bottom: 10px;
 }
@@ -57,6 +59,10 @@ body {
     color: #ffffff;
   }
 
+  .col-sm-12 {
+    padding: 0;
+  }
+
 }
 
 .save-success {
@@ -68,6 +74,15 @@ body {
     margin-top: 1rem;
     width: 100%;
   }
+
+  .btn-group {
+    padding: 0;
+    width: 100%;
+  }
+
+  .btn-group button {
+    width: 50%;
+  }
 }
 
 .timeLeft {

diff --git a/client/js/pomodoro.js b/client/js/pomodoro.js
@@ -5,6 +5,13 @@ import { ProgressCircle} from "./progressCircle";
 
 let progressIndicator = undefined;
 
+function calcNextQuarter(quarter) {
+    return moment().startOf('hour').add((Math.floor((moment().minute() + 3) / 15) + quarter) * 15, 'minute');
+}
+
+function calcNextQuarterMinutes(quarter) {
+    return calcNextQuarter(quarter).diff(new Date(), 'minutes');
+}
 
 Template.pomodoro.helpers({
     pomodoroLoading() {
@@ -16,7 +23,7 @@ Template.pomodoro.helpers({
     },
     runningPomodoro() {
         Session.get("reactiveTimer");
-        if (!progressIndicator  || !progressIndicator.isRendered()) {
+        if (!progressIndicator || !progressIndicator.isRendered()) {
             renderPomodoroPie();
         }
 
@@ -53,6 +60,14 @@ Template.pomodoro.helpers({
     },
     wideScreen() {
         return Session.get("isWideScreen") && Teams.find().count() > 0;
+    },
+    nextQuarter() {
+        Session.get("reactiveTimer");
+        return calcNextQuarter(1).format("LT");
+    },
+    afterNextQuarter() {
+        Session.get("reactiveTimer");
+        return calcNextQuarter(2).format("LT");
     }
 });
 
@@ -67,6 +82,16 @@ Template.pomodoro.events({
     },
     "click .btn-remove-subscription"() {
         Meteor.call("removeIncomingSubscription", this.from);
+    },
+    "click .btn-next-quarter"() {
+        Meteor.call("startPomodoro", calcNextQuarterMinutes(1), ()=> {
+            NotificationCenter.notifyStarted();
+        });
+    },
+    "click .btn-after-next-quarter"() {
+        Meteor.call("startPomodoro", calcNextQuarterMinutes(2), ()=> {
+            NotificationCenter.notifyStarted();
+        });
     }
 });
 

diff --git a/client/views/main.html b/client/views/main.html
@@ -28,6 +28,6 @@
         </div>
         {{> yield}}
     </div>
-    <footer class="text-muted small text-center"><hr>Version: 1.6.0 | Powered by <a href="https://meteor.com">Meteor</a> | Having issues? Want to contribute? Go to the <a href="https://github.com/scyv/ketchup">Github Repository</a>!</footer>
+    <footer class="text-muted small text-center"><hr>Version: 1.7.0 | Powered by <a href="https://meteor.com">Meteor</a> | Having issues? Want to contribute? Go to the <a href="https://github.com/scyv/ketchup">Github Repository</a>!</footer>
 
 </template>
diff --git a/client/views/pomodoro.html b/client/views/pomodoro.html
@@ -1,19 +1,19 @@
 <template name="pomodoro">
     <div class="{{rowClass}}">
-    <div class="row">
-        <div class="col-xs-12 text-center">
-            <div class="pie"></div>
-        </div>
-    </div>
-    {{#if pomodoroLoading}}
         <div class="row">
             <div class="col-xs-12 text-center">
-                Laden...
+                <div class="pie"></div>
             </div>
         </div>
-    {{else}}
+        {{#if pomodoroLoading}}
+            <div class="row">
+                <div class="col-xs-12 text-center">
+                    Laden...
+                </div>
+            </div>
+        {{else}}
             <div class="row timer">
-                <div class=" text-center">
+                <div class="text-center">
                     {{#if runningPomodoro}}
                         {{#with runningPomodoro}}
                             <button class="btn btn-lg btn-interrupt btn-danger">
@@ -24,6 +24,10 @@
                         <button class="btn btn-lg btn-start btn-success">
                             <i class="glyphicon glyphicon-play"></i> Starten
                         </button>
+                        <div class="btn-group" role="group" aria-label="Shortcuts">
+                            <button type="button" class="btn btn-default col-md-6 btn-next-quarter">Bis {{nextQuarter}}</button>
+                            <button type="button" class="btn btn-default col-md-6 btn-after-next-quarter">Bis {{afterNextQuarter}}</button>
+                        </div>
                     {{/if}}
                 </div>
             </div>
@@ -39,7 +43,7 @@
                     </ul>
                 </div>
             </div>
-    {{/if}}
+        {{/if}}
     </div>
     {{#if wideScreen}}
         <div class="col-xs-6 widescreen teams">

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ketchup",
-  "version": "1.5.0",
+  "version": "1.7.0",
   "private": true,
   "scripts": {
     "start": "meteor run"