Skip to content

Commit 99d6290

Browse files
committed
check for activities
1 parent 7affa1d commit 99d6290

3 files changed

Lines changed: 19 additions & 5 deletions

File tree

classes/class-suggested-tasks.php

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,21 @@ public function get_tasks_manager(): Tasks_Manager {
177177
*/
178178
public function was_task_completed( $task_id ): bool {
179179
$task = \progress_planner()->get_suggested_tasks_db()->get_post( $task_id );
180-
return $task && $task->is_completed();
180+
181+
// Checks for task (post) status, trash or pending.
182+
if ( $task && $task->is_completed() ) {
183+
return true;
184+
}
185+
186+
// Checks for activity, if there is an activity for the task, it means that the task was completed (and post might already be deleted from the trash).
187+
$activity = \progress_planner()->get_activities__query()->query_activities(
188+
[
189+
'category' => 'suggested_task',
190+
'data_id' => $task_id,
191+
]
192+
);
193+
194+
return ! empty( $activity );
181195
}
182196

183197
/**

classes/suggested-tasks/providers/class-select-locale.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,14 +175,14 @@ function ( $locale ) {
175175
* @return bool
176176
*/
177177
public function is_task_completed( $task_id = '' ) {
178-
$locale_activity = \progress_planner()->get_activities__query()->query_activities(
178+
$activity = \progress_planner()->get_activities__query()->query_activities(
179179
[
180180
'category' => 'suggested_task',
181181
'data_id' => static::PROVIDER_ID,
182182
]
183183
);
184184

185-
return ! empty( $locale_activity );
185+
return ! empty( $activity );
186186
}
187187

188188
/**

classes/suggested-tasks/providers/class-select-timezone.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,14 +87,14 @@ protected function get_description() {
8787
* @return bool
8888
*/
8989
public function should_add_task() {
90-
$timezone_activity = \progress_planner()->get_activities__query()->query_activities(
90+
$activity = \progress_planner()->get_activities__query()->query_activities(
9191
[
9292
'category' => 'suggested_task',
9393
'data_id' => static::PROVIDER_ID,
9494
]
9595
);
9696

97-
return ! $timezone_activity;
97+
return ! $activity;
9898
}
9999

100100
/**

0 commit comments

Comments
 (0)