Mirrors/super-productivity
1
0
Fork 0
mirror of https://github.com/johannesjo/super-productivity.git synced 2026-08-01 12:10:33 +00:00
Code Issues Projects Releases Wiki Activity

improve take a break notifier with idle time (don't show when idle) and add a longer delay to give more time to respond and snooze take a break reminder

Browse source
This commit is contained in:
Johannes Millan 2017-01-19 01:33:04 +01:00
parent 9ab4e4830f
commit cdc2f77437
2 changed files with 19 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
app/scripts/main/global-services/tasks-s.js
View file

@ -27,13 +27,16 @@
let that = this;
// handler for time spent tracking
window.ipcRenderer.on(IPC_EVENT_UPDATE_TIME_SPEND_FOR_CURRENT, (ev, timeSpentInMs) => {
window.ipcRenderer.on(IPC_EVENT_UPDATE_TIME_SPEND_FOR_CURRENT, (ev, evData) => {
let timeSpentInMs = evData.timeSpentInMs;
let idleTimeInMs = evData.idleTimeInMs
// only track if there is a task
if ($rootScope.r.currentTask) {
that.addTimeSpent($rootScope.r.currentTask, timeSpentInMs);
that.updateCurrent($rootScope.r.currentTask, true);
that.checkTakeToTakeABreak(timeSpentInMs);
that.checkTakeToTakeABreak(timeSpentInMs, idleTimeInMs);
// we need to manually call apply as this is an outside event
$rootScope.$apply();
@ -59,7 +62,9 @@
});
}
this.checkTakeToTakeABreak = (timeSpentInMs) => {
this.checkTakeToTakeABreak = (timeSpentInMs, idleTimeInMs) => {
const MIN_IDLE_VAL_TO_TAKE_A_BREAK_FROM_TAKE_A_BREAK = 9999;
if ($rootScope.r.config && $rootScope.r.config.isTakeABreakEnabled) {
if (!$rootScope.r.currentSession) {
$rootScope.r.currentSession = {};
@ -76,10 +81,15 @@
if (moment.duration($rootScope.r.config.takeABreakMinWorkingTime)
.asSeconds() < $rootScope.r.currentSession.timeWorkedWithoutBreak.asSeconds()) {
if (idleTimeInMs > MIN_IDLE_VAL_TO_TAKE_A_BREAK_FROM_TAKE_A_BREAK) {
return;
}
if (isShowTakeBreakNotification) {
let toast = $mdToast.simple()
.textContent('Take a break! You have been working for ' + ParseDuration.toString($rootScope.r.currentSession.timeWorkedWithoutBreak) + ' without one. Go away from the computer! Makes you more productive in the long run!')
.action('I already did!')
.hideDelay(20000)
.position('bottom');
$mdToast.show(toast).then(function (response) {
if (response === 'ok') {

9
electron/main.js
View file

@ -187,9 +187,9 @@ electron.ipcMain.on('CHANGED_CURRENT_TASK', (ev, task) => {
//tray.setContextMenu(contextMenu)
});
function showIdleDialog(lastIdleTime) {
function showIdleDialog(realIdleTime) {
// first show, then send again
mainWindow.webContents.send('WAS_IDLE', (lastIdleTime - CONFIG.MIN_IDLE_TIME + CONFIG.PING_INTERVAL));
mainWindow.webContents.send('WAS_IDLE', (realIdleTime));
}
let currentIdleStart;
@ -221,7 +221,10 @@ function trackTimeFn() {
}
// track regularly
else {
mainWindow.webContents.send('UPDATE_TIME_SPEND', CONFIG.PING_INTERVAL);
mainWindow.webContents.send('UPDATE_TIME_SPEND', {
timeSpentInMs: CONFIG.PING_INTERVAL,
idleTimeInMs: idleTime
});
}
// save last idle time