Merge branch 'develop' into filip/alternative-lock

Author: ilicfilip

CHANGELOG.md

@@ -1,15 +1,17 @@
-
 = 1.8.0 =
 
-Added these recommendations from Ravi:
-
-* Set date format.
-
 Enhancements:
 
 * Redesign of the admin pages.
+* Improved capability checks.
+* a11y improvements.
+
+Added these recommendations from Ravi:
+
+* Set date format.
 
 Bugs we fixed:
+
 * Fix redirecting to Progress Planner Dashboard after login.
 
 = 1.7.2 =

assets/css/page-widgets/todo.css

@@ -121,11 +121,51 @@
 \*------------------------------------*/
 #progress_planner_dashboard_widget_todo {
 
+	/* Silver task */
+	&:not(:has(#todo-list li[data-task-points="1"])) {
+
+		#todo-list > .prpl-suggested-task:first-child {
+
+			border: 1px solid #796da2;
+			background-color: #f6f7f9;
+
+			.prpl-suggested-task-points-wrapper {
+
+				&::after {
+					content: "";
+					display: inline-block;
+					width: 24px;
+					height: 24px;
+					background-image: url("../../images/icon_progress_planner.svg");
+					background-size: contain;
+					background-repeat: no-repeat;
+				}
+			}
+		}
+	}
+
+	/* Golden task */
+	&:has(#todo-list li[data-task-points="1"]) {
+
+		#todo-list {
+
+			.prpl-suggested-task[data-task-points="1"] {
+				border: 1px solid var(--prpl-color-accent-orange);
+				background-color: var(--prpl-background-orange);
+			}
+		}
+	}
+
 	.prpl-suggested-task {
 
 		h3 {
 			margin-bottom: 0;
 		}
+
+		/* Override the default position of the move buttons. */
+		.prpl-move-buttons-wrapper {
+			left: calc(-5px - 0.5rem);
+		}
 	}
 
 	#create-todo-item {

assets/css/suggested-task.css

@@ -80,6 +80,7 @@
 		display: flex;
 		gap: 0.5rem;
 		align-items: center;
+		justify-content: flex-end;
 		grid-row-end: span 2;
 	}
 

assets/js/web-components/prpl-badge-progress-bar.js

@@ -113,10 +113,8 @@ const prplUpdatePreviousMonthBadgeProgressBar = ( pointsDiff ) => {
 	);
 
 	if ( remainingPointsEl ) {
-		remainingPointsEl.textContent = remainingPointsEl.textContent.replace(
-			remainingPointsEl.getAttribute( 'data-remaining' ),
-			badgeMaxPoints - badgeNewPoints
-		);
+		// The points in the remaining points element are updated in the prplUpdatePreviousMonthBadgeCounters function.
+
 		remainingPointsEl.setAttribute(
 			'data-remaining',
 			badgeMaxPoints - badgeNewPoints

classes/class-suggested-tasks.php

@@ -439,6 +439,14 @@ public function rest_prepare_recommendation( $response, $post ) {
 
 			// This has to be the last item to be added because actions use data from previous items.
 			$response->data['prpl_task_actions'] = $provider->get_task_actions( $response->data );
+
+			/*
+			Check if task was completed before - for example, comments were disabled and then re-enabled, and remove points if so.
+			 * Those are tasks which are completed by toggling an option, so non repetitive & not user tasks.
+			*/
+			if ( ! $provider->is_repetitive() && $provider->task_has_activity( $response->data['meta']['prpl_task_id'] ) ) {
+				$response->data['meta']['prpl_points'] = 0;
+			}
 		}
 
 		$category_term = \wp_get_object_terms( $post->ID, 'prpl_recommendations_category' );

classes/suggested-tasks/class-tasks-interface.php

@@ -120,4 +120,13 @@ public function get_popover_id();
 	 * @return array
 	 */
 	public function add_task_actions( $data = [], $actions = [] );
+
+	/**
+	 * Check if the task has activity.
+	 *
+	 * @param string $task_id The task ID.
+	 *
+	 * @return bool
+	 */
+	public function task_has_activity( $task_id = '' );
 }

classes/suggested-tasks/providers/class-email-sending.php

@@ -188,6 +188,11 @@ protected function get_description( $task_data = [] ) {
 	 * @return void
 	 */
 	public function enqueue_scripts( $hook ) {
+		// Enqueue the script only on Progress Planner and WP dashboard pages.
+		if ( 'toplevel_page_progress-planner' !== $hook && 'index.php' !== $hook ) {
+			return;
+		}
+
 		// Don't enqueue the script if the task is already completed.
 		if ( true === \progress_planner()->get_suggested_tasks()->was_task_completed( $this->get_task_id() ) ) {
 			return;

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

@@ -173,14 +173,14 @@ function ( $locale ) {
 	 * @return bool
 	 */
 	public function is_task_completed( $task_id = '' ) {
-		$locale_activity = \progress_planner()->get_activities__query()->query_activities(
+		$activity = \progress_planner()->get_activities__query()->query_activities(
 			[
 				'category' => 'suggested_task',
 				'data_id'  => static::PROVIDER_ID,
 			]
 		);
 
-		return ! empty( $locale_activity );
+		return ! empty( $activity );
 	}
 
 	/**

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

@@ -85,14 +85,14 @@ protected function get_title() {
 	 * @return bool
 	 */
 	public function should_add_task() {
-		$timezone_activity = \progress_planner()->get_activities__query()->query_activities(
+		$activity = \progress_planner()->get_activities__query()->query_activities(
 			[
 				'category' => 'suggested_task',
 				'data_id'  => static::PROVIDER_ID,
 			]
 		);
 
-		return ! $timezone_activity;
+		return ! $activity;
 	}
 
 	/**

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

@@ -626,14 +626,14 @@ public function get_task_actions( $data = [] ) {
 			return $actions;
 		}
 
-		if ( $this->is_dismissable() && 'user' !== static::PROVIDER_ID ) {
+		if ( $this->capability_required() && $this->is_dismissable() && 'user' !== static::PROVIDER_ID ) {
 			$actions[] = [
 				'priority' => 20,
 				'html'     => '<button type="button" class="prpl-suggested-task-button" data-task-id="' . \esc_attr( $data['meta']['prpl_task_id'] ) . '" data-task-title="' . \esc_attr( $data['title']['rendered'] ) . '" data-action="complete" data-target="complete" title="' . \esc_html__( 'Mark as complete', 'progress-planner' ) . '" onclick="prplSuggestedTask.maybeComplete(' . (int) $data['id'] . ');"><span class="prpl-tooltip-action-text">' . \esc_html__( 'Mark as complete', 'progress-planner' ) . '</span><span class="screen-reader-text">' . \esc_html__( 'Mark as complete', 'progress-planner' ) . '</span></button>',
 			];
 		}
 
-		if ( $this->is_snoozable() ) {
+		if ( $this->capability_required() && $this->is_snoozable() ) {
 			$snooze_html  = '<prpl-tooltip class="prpl-suggested-task-snooze"><slot name="open"><button type="button" class="prpl-suggested-task-button" data-task-id="' . \esc_attr( $data['meta']['prpl_task_id'] ) . '" data-task-title="' . \esc_attr( $data['title']['rendered'] ) . '" data-action="snooze" data-target="snooze" title="' . \esc_attr__( 'Snooze', 'progress-planner' ) . '"><span class="prpl-tooltip-action-text">' . \esc_html__( 'Snooze', 'progress-planner' ) . '</span><span class="screen-reader-text">' . \esc_html__( 'Snooze', 'progress-planner' ) . '</span></button></slot><slot name="content">';
 			$snooze_html .= '<fieldset><legend><span>' . \esc_html__( 'Snooze this task?', 'progress-planner' ) . '</span><button type="button" class="prpl-toggle-radio-group" onclick="this.closest(\'.prpl-suggested-task-snooze\').classList.toggle(\'prpl-toggle-radio-group-open\');"><span class="prpl-toggle-radio-group-text">' . \esc_html__( 'How long?', 'progress-planner' ) . '</span><span class="prpl-toggle-radio-group-arrow">&rsaquo;</span></button></legend><div class="prpl-snooze-duration-radio-group">';
 			foreach (
@@ -704,4 +704,26 @@ function ( $a, $b ) {
 	public function add_task_actions( $data = [], $actions = [] ) {
 		return $actions;
 	}
+
+	/**
+	 * Check if the task has activity.
+	 *
+	 * @param string $task_id The task ID.
+	 *
+	 * @return bool
+	 */
+	public function task_has_activity( $task_id = '' ) {
+		if ( empty( $task_id ) ) {
+			$task_id = $this->get_task_id();
+		}
+
+		$activity = \progress_planner()->get_activities__query()->query_activities(
+			[
+				'category' => 'suggested_task',
+				'data_id'  => $task_id,
+			]
+		);
+
+		return ! empty( $activity );
+	}
 }