feat(gDriveSync): add promise buttons also to time sheet export

johannesjo · Mar 9, 2018 · af9e5af · af9e5af
1 parent c3885ac
commit af9e5af
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/app-src/scripts/dialogs/time-sheet-export/time-sheet-export-c.html b/app-src/scripts/dialogs/time-sheet-export/time-sheet-export-c.html
@@ -103,14 +103,17 @@ <h2>Time Sheet Export</h2>
 
         <div>
           <md-button class="md-raised md-primary"
+                     promise-btn
                      ng-show="!vm.isLoggedIn"
                      ng-click="vm.login()">Login
           </md-button>
           <md-button class="md-raised md-primary"
+                     promise-btn
                      ng-show="vm.isLoggedIn"
                      ng-click="vm.logout()">Logout
           </md-button>
           <md-button class="md-raised md-primary"
+                     promise-btn
                      ng-disabled="!vm.opts.spreadsheetId"
                      ng-show="vm.isLoggedIn"
                      ng-click="vm.readSpreadsheet()">Read spreadsheet
@@ -193,7 +196,8 @@ <h2>Time Sheet Export</h2>
       <md-button ng-click="vm.save()"
                  ng-show="vm.actualValues.length > 0 && vm.isLoggedIn"
                  type="button"
-                 class="md-raised md-primary">
+                 class="md-raised md-primary"
+                 promise-btn>
         <ng-md-icon icon="save"></ng-md-icon>
         Save row
       </md-button>

diff --git a/app-src/scripts/dialogs/time-sheet-export/time-sheet-export-c.js b/app-src/scripts/dialogs/time-sheet-export/time-sheet-export-c.js
@@ -18,6 +18,7 @@
     let vm = this;
     vm.theme = theme;
     vm.opts = $rootScope.r.uiHelper.timeSheetExportSettings;
+    vm.GoogleApi = GoogleApi;
     vm.actualValues = [];
 
     vm.roundTimeOptions = [
@@ -53,7 +54,7 @@
 
     vm.logout = () => {
       vm.isLoading = true;
-      GoogleApi.logout()
+      return GoogleApi.logout()
         .then(() => {
           vm.isLoggedIn = false;
           vm.isLoading = false;