Skip to content

Commit f875367

Browse files
johannesjojohannesjo
committed
feat: prepare time sheet export
1 parent 4fe85d1 commit f875367

File tree

9 files changed

+133
-19
lines changed

9 files changed

+133
-19
lines changed

‎app-src/index.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@
108108
<script src="scripts/dialogs/simple-task-summary/simple-task-summary-c.js"></script>
109109
<script src="scripts/dialogs/task-selection/task-selection-c.js"></script>
110110
<script src="scripts/dialogs/time-estimate/time-estimate-c.js"></script>
111+
<script src="scripts/dialogs/time-sheet-export/time-sheet-export-c.js"></script>
111112
<script src="scripts/dialogs/was-idle/was-idle-c.js"></script>
112113
<script src="scripts/dialogs/welcome/welcome-c.js"></script>
113114
<script src="scripts/distraction-list/distraction-list-cp.js"></script>

‎app-src/scripts/daily-summary/daily-summary-d.html‎

Lines changed: 24 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,3 @@
1-
<div layout="row"
2-
layout-sm="column"
3-
layout-align="center center">
4-
<md-button class="md-raised md-primary"
5-
aria-label="Work View"
6-
ui-sref="work-view">
7-
<md-tooltip md-direction="bottom">
8-
Go back to work view
9-
</md-tooltip>
10-
<ng-md-icon icon="playlist_play"></ng-md-icon>
11-
Wait I forgot something!
12-
</md-button>
13-
</div>
141
<h1 class="md-headline">You're done for today! Take a moment to celebrate!</h1>
152

163
<p>
@@ -24,6 +11,30 @@ <h1 class="md-headline">You're done for today! Take a moment to celebrate!</h1>
2411
<ng-md-icon icon="timer"></ng-md-icon>
2512
Total time spent today: <strong ng-bind="vm.totalTimeSpentToday|duration"></strong></p>
2613

14+
15+
<div layout-align="center center">
16+
<md-button class="md-raised md-primary"
17+
aria-label="Work View"
18+
ui-sref="work-view">
19+
<md-tooltip md-direction="bottom">
20+
Go back to work view
21+
</md-tooltip>
22+
<ng-md-icon icon="playlist_play"></ng-md-icon>
23+
Wait I forgot something!
24+
</md-button>
25+
<md-button class="md-raised md-primary"
26+
ng-click="vm.showExportModal()">
27+
<ng-md-icon icon="call_made"></ng-md-icon>
28+
Export Task List for Today
29+
</md-button>
30+
31+
<md-button class="md-raised md-primary"
32+
ng-click="vm.showTimeSheetExportModal()">
33+
<ng-md-icon icon="call_made"></ng-md-icon>
34+
Export To Time Sheet
35+
</md-button>
36+
</div>
37+
2738
<h2 class="md-title">These are the tasks you worked on today</h2>
2839

2940
<table class="task-summary-table">
@@ -53,12 +64,6 @@ <h2 class="md-title">These are the tasks you worked on today</h2>
5364
</td>
5465
</tr>
5566
</table>
56-
<md-button class="md-raised md-primary"
57-
style="margin-top: 15px;"
58-
ng-click="vm.showExportModal()">
59-
<ng-md-icon icon="call_made"></ng-md-icon>
60-
Export Task List for Today
61-
</md-button>
6267

6368

6469
<section class="distractions"

‎app-src/scripts/daily-summary/daily-summary-d.js‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,14 @@
5757
}, true);
5858
};
5959

60+
vm.showTimeSheetExportModal = () => {
61+
Dialogs('TIME_SHEET_EXPORT', {
62+
settings: $rootScope.r.uiHelper.dailyTaskExportSettings,
63+
finishDayFn: vm.finishDay,
64+
tasks: Tasks.getToday()
65+
}, true);
66+
};
67+
6068
vm.finishDay = () => {
6169
$rootScope.r.tomorrowsNote = vm.tomorrowsNote;
6270

‎app-src/scripts/dialogs/dialogs-constant.js‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,10 @@
7676
POMODORO_BREAK: {
7777
controller: 'PomodoroBreakCtrl',
7878
templateUrl: 'scripts/dialogs/pomodoro-break/pomodoro-break-c.html'
79+
},
80+
TIME_SHEET_EXPORT: {
81+
controller: 'TimeSheetExportCtrl',
82+
templateUrl: 'scripts/dialogs/time-sheet-export/time-sheet-export-c.html'
7983
}
8084
});
8185
})();

‎app-src/scripts/dialogs/time-sheet-export/_time-sheet-export.scss‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
.dialog-time-sheet-export {
2+
}

‎app-src/scripts/dialogs/time-sheet-export/time-sheet-export-c.html‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
<md-dialog aria-label="Task list export"
2+
class="dialog-time-sheet-export fullscreen-dialog"
3+
md-theme="vm.theme">
4+
<md-toolbar>
5+
<div class="md-toolbar-tools">
6+
<h2>Time Sheet Export</h2>
7+
<span flex></span>
8+
<md-button class="md-icon-button"
9+
aria-label="Cancel"
10+
ng-click="vm.cancel()">
11+
<ng-md-icon icon="close"></ng-md-icon>
12+
</md-button>
13+
</div>
14+
</md-toolbar>
15+
16+
<form ng-submit="vm.export()">
17+
<md-dialog-content>
18+
<div class="md-dialog-content">
19+
20+
</div>
21+
</md-dialog-content>
22+
23+
24+
<md-dialog-actions>
25+
26+
<a class="md-button md-primary md-raised"
27+
text-to-file-download="vm.tasksTxt">
28+
<ng-md-icon icon="file_download"></ng-md-icon>
29+
Save to file
30+
</a>
31+
<md-button ng-click="vm.cancel()"
32+
type="button"
33+
class="md-raised">
34+
<ng-md-icon icon="close"></ng-md-icon>
35+
Close
36+
</md-button>
37+
</md-dialog-actions>
38+
</form>
39+
</md-dialog>

‎app-src/scripts/dialogs/time-sheet-export/time-sheet-export-c.js‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
/**
2+
* @ngdoc function
3+
* @name superProductivity.controller:TimeSheetExportCtrl
4+
* @description
5+
* # TimeSheetExportCtrl
6+
* Controller of the superProductivity
7+
*/
8+
9+
(function () {
10+
'use strict';
11+
12+
angular
13+
.module('superProductivity')
14+
.controller('TimeSheetExportCtrl', TimeSheetExportCtrl);
15+
16+
/* @ngInject */
17+
function TimeSheetExportCtrl($mdDialog, tasks, settings, TasksUtil, $scope, ParseDuration, SimpleToast, theme) {
18+
let vm = this;
19+
vm.theme = theme;
20+
21+
22+
vm.submit = () => {
23+
$mdDialog.hide();
24+
};
25+
26+
vm.cancel = () => {
27+
$mdDialog.hide();
28+
};
29+
}
30+
})();

‎app-src/scripts/dialogs/time-sheet-export/time-sheet-export-c.spec.js‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
//'use strict';
2+
//
3+
//describe('Controller: TimeSheetExportCtrl', function () {
4+
//
5+
// // load the controller's module
6+
// beforeEach(module('superProductivity'));
7+
//
8+
// var TimeSheetExportCtrl;
9+
// var scope;
10+
//
11+
// // Initialize the controller and a mock scope
12+
// beforeEach(inject(function ($controller, $rootScope) {
13+
// scope = $rootScope.$new();
14+
// TimeSheetExportCtrl = $controller('TimeSheetExportCtrl', {
15+
// $scope: scope
16+
// // place mocked dependencies here
17+
// });
18+
// }));
19+
//
20+
// it('should ...', function () {
21+
// expect(true).toBe(true);
22+
// });
23+
//});

‎app-src/styles/main.scss‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,8 @@ IMPORTANT NOTE:
113113

114114
@import '../scripts/dialogs/time-estimate/_time-estimate-c.scss';
115115

116+
@import '../scripts/dialogs/time-sheet-export/_time-sheet-export.scss';
117+
116118
@import '../scripts/dialogs/was-idle/_was-idle-c.scss';
117119

118120
@import '../scripts/dialogs/welcome/_welcome-c.scss';

0 commit comments

Comments
 (0)