fix reminders

imdone · Mar 21, 2018 · e231fbe · e231fbe
1 parent 68a6c0f
commit e231fbe
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,8 @@
 ## 2.4.1
 - Don't remind if task has completed metadata
 - Set reminder to notify every 5 minutes until remind metadata is removed or changed
+- Remove reminder if completed
+- Fix issue #360
 
 ## 2.4.0
 - Add export to imdone-export.json with alt-x

diff --git a/lib/services/imdoneio-store.coffee b/lib/services/imdoneio-store.coffee
@@ -10,6 +10,7 @@ module.exports =  (repo) ->
   log = require('debug') 'imdoneio-store'
   transform = require('./transform')
   Task = require 'imdone-core/lib/task'
+  Reminders = require './reminders'
   fs = require 'fs'
   _ = require 'lodash'
   async = require 'async'
@@ -100,6 +101,7 @@ module.exports =  (repo) ->
         return cb err
       repo.saveModifiedFiles (err) =>
         repo.resume()
+        repo.reminders.schedule()
         return cb err if err
         cb(null, repo.getTasks())
 
@@ -222,10 +224,12 @@ module.exports =  (repo) ->
         if sortEnabled()
           _init (err, files) ->
             return cb err if err
+            repo.reminders = new Reminders(repo);
             checkForIIOProject()
             populateSort (err) -> cb null, files
         else
           _init (err, files) ->
+            repo.reminders = new Reminders(repo);
             return cb err if err
             checkForIIOProject()
             cb null, files

diff --git a/lib/services/reminders.js b/lib/services/reminders.js
@@ -39,10 +39,11 @@ class Reminders {
         this.notify(task, job)
         task.meta.remind[0] = reminder.add(5, 'minutes').format()
         task.updateMetaData()
-        repo.modifyTask(task, true)
+        repo.modifyTask(task, (err) => repo.emit('tasks.updated', [task]))
       });
       this.jobs.push(job)
     })
+    console.log(`reminders: ${this.jobs.length}`)
   }
 
   notify(task, job) {

diff --git a/lib/services/transform.js b/lib/services/transform.js
@@ -76,7 +76,7 @@ const getTransformers = function (config) {
         if (task.meta.completed) return task.text
         if (task.list !== list) return task.text
         task.addMetaData("completed", this.parseDate('now').format())
-        task.updateMetaData()
+        task.removeMetaData('remind')
         return task.text
       },
       pattern: /^((?!\scompleted:).)*$/,
@@ -95,7 +95,7 @@ const transformTask = function (task, transformers) {
 
 const transformTasks = function (config, tasks) {
   const transformers = getTransformers(config)
-  return tasks.map(task => transformTask(new Task(task), transformers))
+  return tasks.map(task => transformTask(task, transformers))
 }
 
 module.exports = {

diff --git a/lib/services/worker-watched-fs-store.js b/lib/services/worker-watched-fs-store.js
@@ -10,7 +10,6 @@ var fs           = require('fs'),
     File         = require('imdone-core/lib/file'),
     constants    = require('imdone-core/lib/constants'),
     path         = require('path'),
-    Reminders    = require('./reminders'),
     config       = require('./imdone-config');
 
 var workerPath = path.join(config.getPackagePath(), 'lib', 'services', 'worker.js')
@@ -33,7 +32,6 @@ function mixin(repo, fs) {
   repo.init = function(cb) {
     _init.call(repo, function(err, files) {
         repo.initWatcher();
-        repo.reminders = new Reminders(repo);
         if (cb) cb(err, files);
     });
   };

diff --git a/lib/views/imdone-atom-view.coffee b/lib/views/imdone-atom-view.coffee
@@ -422,7 +422,6 @@ class ImdoneAtomView extends ScrollView
   onRepoUpdate: (tasks) ->
     # BACKLOG: This should be queued so two updates don't colide gh:241 id:90
     @imdoneRepo.transformTasks tasks, (err, tasks) =>
-      @imdoneRepo.reminders.schedule()
       @updateBoard(tasks)
       @boardWrapper.css 'bottom', 0
       @bottomView.attr 'style', ''

diff --git a/package.json b/package.json
@@ -42,7 +42,7 @@
     "fs-plus": "^2.8.1",
     "git-up": "^2.0.1",
     "ignore": "^3.3.7",
-    "imdone-core": "1.4.1",
+    "imdone-core": "1.4.2",
     "json-editor": "^0.7.28",
     "laconic": "^0.2.2",
     "lodash": "^4.12.0",