feat: integrate export task list nicely into daily summary

johannesjo · Jan 13, 2019 · ecf92e8 · ecf92e8
1 parent 6e0c455
commit ecf92e8
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 26 deletions.
diff --git a/src/app/pages/daily-summary/daily-summary.component.html b/src/app/pages/daily-summary/daily-summary.component.html
@@ -73,32 +73,29 @@ <h1 class="done-headline mat-headline">Take a moment to <i class="TODO-animate">
           </td>
         </tr>
       </table>
+
+      <div style="text-align: center; margin-top: 8px; margin-bottom: 16px;">
+        <button mat-raised-button=""
+                (click)="showExportModal()">
+          <mat-icon>call_made</mat-icon>
+          <mat-icon>playlist_play</mat-icon>
+          Export Task List
+        </button>
+      </div>
     </mat-tab>
 
     <mat-tab label="Google Sheet Export">
       <google-export-time></google-export-time>
     </mat-tab>
-    <mat-tab label="Simple Export">
-      <h1>Some tab content</h1>
-      <p>...</p>
-    </mat-tab>
-
-
-
+    <!--<mat-tab label="Simple Export">-->
+    <!--<h1>Some tab content</h1>-->
+    <!--<p>...</p>-->
+    <!--</mat-tab>-->
   </mat-tab-group>
 
 
-
   <section class="daily-summary-actions">
     <div class="bottom-buttons">
-      <button mat-raised-button=""
-      color="primary"
-      (click)="showExportModal()">
-      <mat-icon>call_made</mat-icon>
-      <mat-icon>playlist_play</mat-icon>
-      Export Task List
-      </button>
-
       <!--<button mat-raised-button=""-->
       <!--[color]="cfg.isBlockFinishDayUntilTimeTimeTracked && !isTimeSheetExported && 'accent' ||'primary'"-->
       <!--(click)="showTimeSheetExportModal()">-->

diff --git a/src/app/pages/daily-summary/daily-summary.component.ts b/src/app/pages/daily-summary/daily-summary.component.ts
@@ -78,10 +78,6 @@ export class DailySummaryComponent implements OnInit, OnDestroy {
     ).subscribe(() => {
       this._taskService.setCurrentId(null);
     }));
-
-    setTimeout(() => {
-      this.showExportModal();
-    }, 1000);
   }
 
   ngOnDestroy() {
@@ -101,12 +97,6 @@ export class DailySummaryComponent implements OnInit, OnDestroy {
     });
   }
 
-  showTimeSheetExportModal() {
-    this._matDialog.open(DialogGoogleExportTimeComponent, {
-      restoreFocus: true,
-    });
-  }
-
   finishDay() {
     this._taskService.moveToArchive(this._doneTasks);
     if (IS_ELECTRON) {