Skip to content
Permalink
Browse files

task recurrent activity text

  • Loading branch information...
mshossain110 committed Nov 20, 2018
1 parent ee188ed commit 967fd8cdfda902d87451508da488a5786a1fc077
@@ -114,13 +114,23 @@ public function payable( Task $item, $old_value ) {
}
public function recurrent( Task $item, $old_value ) {
$recurrent = [
0 => 'none recurrent',
1 => 'weekly recurrent',
2 => 'Monthly recurrent',
3 => 'Annually recurrent',
9 => 'never recurrent'
];
$meta = [
'task_title' => $item->title,
'task_recurrent_old' => $old_value,
'task_recurrent_new' => $item->recurrent,
'task_recurrent_old' => $recurrent[ intval( $old_value) ],
'task_recurrent_new' => $recurrent[ intval( $item->recurrent ) ],
];
$this->log_activity( $item, 'update_task_recurrent_status', 'update', $meta );
$this->log_activity( $item, 'update_task_recurrent', 'update', $meta );
}
public function status( Task $item, $old_value ) {
@@ -159,8 +159,8 @@
['actor.data.display_name', 'meta.task_title', 'meta.task_payable_old', 'meta.task_payable_new']
],
'update_task_recurrent' => [
__( '%1$s has updated the recurrency of a task, %2$s, from %3$s to %4$s.', 'wedevs-project-manager' ),
['actor.data.display_name', 'meta.task_title', 'meta.task_recurrent_old', 'meta.task_recurrent_old']
__( '%1$s has updated the recurrency of a task, %2$s, %3$s to %4$s.', 'wedevs-project-manager' ),
['actor.data.display_name', 'meta.task_title', 'meta.task_recurrent_old', 'meta.task_recurrent_new']
],
'update_task_status' => [
__( '%1$s has updated the status of a task, %2$s, from %3$s to %4$s.', 'wedevs-project-manager' ),
@@ -163,24 +163,14 @@

<span id="pm-calendar-wrap" @click.prevent="isTaskDateEditMode()" class="individual-group-icon calendar-group icon-pm-calendar pm-font-size-16">
<span v-if="(task.start_at.date || task.due_date.date )" :class="taskDateWrap(task.due_date.date) + ' pm-task-date-wrap pm-date-window'">
<<<<<<< HEAD

<span :title="getFullDate(task.start_at.timestamp)" v-if="task_start_field">
=======

<span :title="getFullDate(task.start_at.datetime)" v-if="task_start_field">
>>>>>>> a4f8766a9e7382b20d7943ce47a0176c9461f25b
{{ dateFormat( task.start_at.date ) }}
</span>

<span v-if="task_start_field && task.start_at.date && task.due_date.date">&ndash;</span>
<<<<<<< HEAD
<span :title="getFullDate(task.due_date.timestamp)" v-if="task.due_date">

=======
<span :title="getFullDate(task.due_date.datetime)" v-if="task.due_date">

>>>>>>> a4f8766a9e7382b20d7943ce47a0176c9461f25b
{{ dateFormat( task.due_date.date ) }}
</span>
</span>

0 comments on commit 967fd8c

Please sign in to comment.
You can’t perform that action at this time.