Merge pull request #115 from anehx/activity_split

Handle activities over multiple days

Author: sliverc

app/adapters/activity-block.js

@@ -25,5 +25,19 @@ export default ApplicationAdapter.extend({
    */
   urlForUpdateRecord() {
     return `${this._super(...arguments)}?include=activity`
+  },
+
+  /**
+   * Custom url for creating records
+   *
+   * This causes a reload of the activity so we don't have to do the reload
+   * ourselves
+   *
+   * @method urlForCreateRecord
+   * @return {String} The URL
+   * @public
+   */
+  urlForCreateRecord() {
+    return `${this._super(...arguments)}?include=activity`
   }
 })

app/index/activities/controller.js

@@ -31,15 +31,12 @@ export default Controller.extend({
    * @property {Activity[]} activities
    * @public
    */
-  @computed(
-    '_allActivities.@each.{start,user,isNew,isDeleted}',
-    'model',
-    'user'
-  )
+  @computed('_allActivities.@each.{date,user,isNew,isDeleted}', 'model', 'user')
   activities(activities, day, user) {
     return activities.filter(a => {
       return (
-        a.get('start').isSame(day, 'day') &&
+        a.get('date') &&
+        a.get('date').isSame(day, 'day') &&
         a.get('user.id') === user.get('id') &&
         !a.get('isNew') &&
         !a.get('isDeleted')

app/index/activities/edit/template.hbs

@@ -23,7 +23,6 @@
         <tbody>
           {{#each (reject-by 'isDeleted' true blocks) as |block|}}
             <tr
-              class="{{if block.model.overlaps 'danger'}}"
               data-test-activity-block-row
               data-test-activity-block-row-id={{block.model.id}}
             >
@@ -57,11 +56,6 @@
                 }}
               </td>
               <td>
-                {{#if block.model.overlaps}}
-                  <span title="This block overlaps the day of the activity" class="error-text">
-                    {{fa-icon 'warning'}}
-                  </span>
-                {{/if}}
                 {{#if (and block.changeset.from block.changeset.to)}}
                   {{format-duration (moment-diff block.changeset.from block.changeset.to) false}}
                 {{/if}}

app/index/activities/route.js

@@ -79,8 +79,9 @@ export default Route.extend(RouteAutostartTourMixin, {
      * @public
      */
     async startActivity(activity) {
-      if (!activity.get('start').isSame(moment(), 'day')) {
+      if (!activity.get('date').isSame(moment(), 'day')) {
         activity = this.store.createRecord('activity', {
+          date: moment(),
           ...activity.getProperties('task', 'comment')
         })
       }
@@ -120,9 +121,11 @@ export default Route.extend(RouteAutostartTourMixin, {
         'task.id',
         undefined
       )
-      let hasOverlapping = !!this.get('controller.activities').findBy(
-        'overlaps'
-      )
+      let hasOverlapping = !!this.get('controller.activities').find(a => {
+        return (
+          a.get('active') && !a.get('activeBlock.from').isSame(moment(), 'day')
+        )
+      })
 
       this.set('controller.showUnknownWarning', hasUnknown)
       this.set('controller.showOverlappingWarning', hasOverlapping)
@@ -145,7 +148,14 @@ export default Route.extend(RouteAutostartTourMixin, {
       try {
         await RSVP.all(
           this.get('controller.activities')
-            .filter(a => a.get('task.id') && !a.get('overlaps'))
+            .filter(
+              a =>
+                a.get('task.id') &&
+                !(
+                  a.get('active') &&
+                  !a.get('activeBlock.from').isSame(moment(), 'day')
+                )
+            )
             .map(async activity => {
               let duration = moment.duration(activity.get('duration'))
 
@@ -156,7 +166,7 @@ export default Route.extend(RouteAutostartTourMixin, {
               let data = {
                 activity,
                 duration,
-                date: activity.get('start'),
+                date: activity.get('date'),
                 task: activity.get('task'),
                 comment: activity.get('comment')
               }

app/index/activities/template.hbs

@@ -9,7 +9,6 @@
         <tbody>
           {{#each activities as |activity|}}
           <tr
-            class="{{if activity.overlaps 'danger'}}"
             title="Click to edit"
             data-test-activity-row
             data-test-activity-row-id={{activity.id}}
@@ -29,12 +28,6 @@
               </td>
               <td>{{activity.comment}}</td>
               <td>
-                {{#if activity.overlaps}}
-                  <span title="This activity has an overlapping block" class="error-text">
-                    {{fa-icon 'warning'}}
-                    &nbsp;
-                  </span>
-                {{/if}}
                 {{#if activity.active}}
                   {{duration-since activity.activeBlock.from elapsed=activity.duration}}
                 {{else}}
@@ -79,7 +72,7 @@
   {{#modal.body}}
     Overlapping activities will not be taken into account for the timesheet.
   {{/modal.body}}
-  {{#modal.footer data-test-overlap-warning}}
+  {{#modal.footer data-test-overlapping-warning}}
    <button class="btn btn-primary" {{action (if showUnknownWarning (action (mut showOverlappingWarning) false) 'generateReports')}}>That's fine</button>
    <button class="btn btn-default" {{action (queue (action (mut showOverlappingWarning) false) (action (mut showUnknownWarning) false))}}>Cancel</button>
   {{/modal.footer}}

app/index/controller.js

@@ -82,11 +82,12 @@ export default Controller.extend({
    * @property {Activity[]} _activities
    * @private
    */
-  @computed('date', '_allActivities.@each.{start,user,isDeleted}', 'user')
+  @computed('date', '_allActivities.@each.{date,user,isDeleted}', 'user')
   _activities(day, activities, user) {
     let activitiesThen = activities.filter(a => {
       return (
-        a.get('start').isSame(day, 'day') &&
+        a.get('date') &&
+        a.get('date').isSame(day, 'day') &&
         a.get('user.id') === user.get('id') &&
         !a.get('isDeleted')
       )
@@ -107,7 +108,7 @@ export default Controller.extend({
    * @property {moment.duration} activitySum
    * @public
    */
-  @computed('_activities.@each.{from,to}', '_activeActivityBlockDuration')
+  @computed('_activities.@each.duration', '_activeActivityBlockDuration')
   activitySum(activities, additional) {
     return activities.reduce((dur, cur) => {
       return dur.add(cur.get('duration'))
@@ -166,6 +167,7 @@ export default Controller.extend({
   _attendances(date, attendances, user) {
     return attendances.filter(a => {
       return (
+        a.get('date') &&
         a.get('date').isSame(date, 'day') &&
         a.get('user.id') === user.get('id') &&
         !a.get('isDeleted')

app/models/activity-block.js

@@ -19,22 +19,20 @@ import { belongsTo } from 'ember-data/relationships'
  */
 export default Model.extend({
   /**
-   * The start date and time
+   * The start time
    *
-   * @property from
-   * @type {moment}
+   * @property {moment} fromTime
    * @public
    */
-  from: attr('django-datetime'),
+  fromTime: attr('django-time'),
 
   /**
-   * The end date and time
+   * The end time
    *
-   * @property to
-   * @type {moment}
+   * @property {moment} toTime
    * @public
    */
-  to: attr('django-datetime'),
+  toTime: attr('django-time'),
 
   /**
    * The activity
@@ -46,13 +44,40 @@ export default Model.extend({
   activity: belongsTo('activity'),
 
   /**
-   * Whether the blocks overlaps a day
-   *
-   * @property {Boolean} overlaps
+   * The start time, with the date of the related activity
+   * 
+   * @property {moment} from
+   * @public
+   */
+  @computed('activity.date', 'fromTime')
+  from(date, time) {
+    return (
+      time &&
+      moment(date).set({
+        h: time.hours(),
+        m: time.minutes(),
+        s: time.seconds(),
+        ms: time.milliseconds()
+      })
+    )
+  },
+
+  /**
+   * The end time, with the date of the related activity
+   * 
+   * @property {moment} to
    * @public
    */
-  @computed('activity.start', 'to')
-  overlaps(start, to) {
-    return !(to || moment()).isSame(start, 'day')
+  @computed('activity.date', 'toTime')
+  to(date, time) {
+    return (
+      time &&
+      moment(date).set({
+        h: time.hours(),
+        m: time.minutes(),
+        s: time.seconds(),
+        ms: time.milliseconds()
+      })
+    )
   }
 })

app/models/activity.js

@@ -7,9 +7,13 @@ import Model from 'ember-data/model'
 import attr from 'ember-data/attr'
 import moment from 'moment'
 import computed from 'ember-computed-decorators'
+import RSVP from 'rsvp'
+import { inject as service } from '@ember/service'
 
 import { belongsTo, hasMany } from 'ember-data/relationships'
 
+const { min } = Math
+
 /**
  * The activity model
  *
@@ -28,13 +32,12 @@ export default Model.extend({
   comment: attr('string', { defaultValue: '' }),
 
   /**
-   * The start date and time
+   * The date
    *
-   * @property start
-   * @type {moment}
+   * @property {moment} date
    * @public
    */
-  start: attr('django-datetime', { defaultValue: () => moment() }),
+  date: attr('django-date'),
 
   /**
    * The duration
@@ -72,6 +75,14 @@ export default Model.extend({
    */
   blocks: hasMany('activity-block'),
 
+  /**
+   * The notify service
+   *
+   * @property {EmberNotify.NotifyService} notify
+   * @public
+   */
+  notify: service('notify'),
+
   /**
    * The currently active block
    *
@@ -99,13 +110,100 @@ export default Model.extend({
   },
 
   /**
-   * Whether the activity has any overlapping blocks
+   * Start the activity
    *
-   * @property {Boolean} overlaps
+   * @method start
    * @public
    */
-  @computed('start', 'blocks.@each.to')
-  overlaps(start, blocks) {
-    return blocks.any(b => b.get('overlaps'))
+  async start() {
+    /* istanbul ignore next */
+    if (this.get('active')) {
+      return
+    }
+
+    if (this.get('isNew')) {
+      await this.save()
+    }
+
+    let block = this.get('store').createRecord('activity-block', {
+      activity: this,
+      fromTime: moment()
+    })
+
+    await block.save()
+
+    // Sadly, we need to do this here since the computed property
+    // 'activeBlock' on the activity does not sense a change when the blocks
+    // change from new to actually loaded
+    this.notifyPropertyChange('blocks')
+  },
+
+  /**
+   * Stop the activity
+   *
+   * If the activity was started yesterday, we create a new identical
+   * activity today so we handle working over midnight
+   *
+   * If the activity was started even before, we ignore it since it must be
+   * a mistake, so we end the activity a second before midnight that day
+   *
+   * @method stop
+   * @public
+   */
+  async stop() {
+    /* istanbul ignore next */
+    if (!this.get('active')) {
+      return
+    }
+
+    let activities = [this]
+
+    if (moment().diff(this.get('date'), 'days') === 1) {
+      activities.push(
+        this.get('store').createRecord('activity', {
+          task: this.get('task'),
+          comment: this.get('comment'),
+          user: this.get('user'),
+          date: moment(this.get('date')).add(1, 'days')
+        })
+      )
+    }
+
+    await RSVP.all(
+      activities.map(async activity => {
+        if (activity.get('isNew')) {
+          await activity.save()
+        }
+
+        let block =
+          activity.get('activeBlock') ||
+          this.get('store').createRecord('activity-block', {
+            activity,
+            fromTime: moment({ h: 0, m: 0, s: 0 })
+          })
+
+        block.set(
+          'toTime',
+          moment(
+            min(
+              moment(activity.get('date')).set({
+                h: 23,
+                m: 59,
+                s: 59
+              }),
+              moment()
+            )
+          )
+        )
+
+        await block.save({ adapterOptions: { include: 'activity' } })
+      })
+    )
+
+    if (moment().diff(this.get('date'), 'days') > 1) {
+      this.get('notify').info(
+        'The activity overlapped multiple days, which is not possible. The activity was stopped at midnight of the day it was started.'
+      )
+    }
   }
 })