{
);
document.getElementById( 'new-todo-content' ).value = '';
+
+ // Focus the new task input element.
+ document.getElementById( 'new-todo-content' ).focus();
} );
} );
diff --git a/classes/actions/class-content.php b/classes/actions/class-content.php
index 4291c1e8c..3f299e351 100644
--- a/classes/actions/class-content.php
+++ b/classes/actions/class-content.php
@@ -27,11 +27,9 @@ public function __construct() {
* @return void
*/
public function register_hooks() {
- // Add activity when a post is updated.
- \add_action( 'post_updated', [ $this, 'post_updated' ], 10, 2 );
- // Add activity when a post is added.
- \add_action( 'wp_insert_post', [ $this, 'insert_post' ], 10, 2 );
+ // Add activity when a post is added or updated.
+ \add_action( 'wp_insert_post', [ $this, 'insert_post' ], 10, 3 );
\add_action( 'transition_post_status', [ $this, 'transition_post_status' ], 10, 3 );
// Add activity when a post is trashed or deleted.
@@ -40,84 +38,41 @@ public function register_hooks() {
}
/**
- * Post updated.
+ * Insert a post.
*
- * Runs on post_updated hook.
+ * Runs on wp_insert_post hook.
*
* @param int $post_id The post ID.
* @param \WP_Post $post The post object.
- *
+ * @param bool $update Whether this is an update.
* @return void
*/
- public function post_updated( $post_id, $post ) {
+ public function insert_post( $post_id, $post, $update ) {
// Bail if we should skip saving.
if ( $this->should_skip_saving( $post ) ) {
return;
}
- // Reset the words count.
- \progress_planner()->get_settings()->set( [ 'word_count', $post_id ], false );
-
- if ( 'publish' !== $post->post_status ) {
- return;
- }
-
- // Check if there is an update activity for this post, on this date.
- $existing = \progress_planner()->get_query()->query_activities(
- [
- 'category' => 'content',
- 'type' => 'update',
- 'data_id' => (string) $post_id,
- 'start_date' => \progress_planner()->get_date()->get_datetime_from_mysql_date( $post->post_modified )->modify( '-12 hours' ),
- 'end_date' => \progress_planner()->get_date()->get_datetime_from_mysql_date( $post->post_modified )->modify( '+12 hours' ),
- ],
- 'RAW'
- );
+ // Set the type of activity.
+ $type = $update ? 'update' : 'publish';
- // If there is an update activity for this post, on this date, bail.
- if ( ! empty( $existing ) ) {
- return;
- }
-
- $this->add_post_activity( $post, 'update' );
- }
-
- /**
- * Insert a post.
- *
- * Runs on wp_insert_post hook.
- *
- * @param int $post_id The post ID.
- * @param \WP_Post $post The post object.
- * @return void
- */
- public function insert_post( $post_id, $post ) {
- // Bail if we should skip saving.
- if ( $this->should_skip_saving( $post ) ) {
- return;
+ // Reset the words count if it's an update.
+ if ( 'update' === $type ) {
+ \progress_planner()->get_settings()->set( [ 'word_count', $post_id ], false );
}
+ // Bail if the post is not published.
if ( 'publish' !== $post->post_status ) {
return;
}
- // Check if there is a publish activity for this post.
- $existing = \progress_planner()->get_query()->query_activities(
- [
- 'category' => 'content',
- 'type' => 'publish',
- 'data_id' => (string) $post_id,
- ],
- 'RAW'
- );
-
- // If there is a publish activity for this post, bail.
- if ( ! empty( $existing ) ) {
+ // Bail if there is a recent activity for this post.
+ if ( $this->is_there_recent_activity( $post, $type ) ) {
return;
}
- // Add a publish activity.
- $this->add_post_activity( $post, 'publish' );
+ // Finally add an activity.
+ $this->add_post_activity( $post, $type );
}
/**
@@ -138,6 +93,11 @@ public function transition_post_status( $new_status, $old_status, $post ) {
return;
}
+ // Bail if there is a recent activity for this post.
+ if ( $this->is_there_recent_activity( $post, $new_status ) ) {
+ return;
+ }
+
// Add activity.
$this->add_post_activity( $post, $new_status === 'publish' ? 'publish' : 'update' );
}
@@ -236,6 +196,38 @@ private function should_skip_saving( $post ) {
return false;
}
+ /**
+ * Check if there is a recent activity for this post.
+ *
+ * @param \WP_Post $post The post object.
+ * @param string $type The type of activity (ie publish, update, trash, delete etc).
+ *
+ * @return bool
+ */
+ private function is_there_recent_activity( $post, $type ) {
+ // Query arguments.
+ $query_args = [
+ 'category' => 'content',
+ 'type' => $type,
+ 'data_id' => (string) $post->ID,
+ ];
+
+ // If it's an update add the start and end date. We don't want to add multiple update activities for the same post on the same day.
+ if ( 'update' === $type ) {
+ $query_args['start_date'] = \progress_planner()->get_date()->get_datetime_from_mysql_date( $post->post_modified )->modify( '-12 hours' );
+ $query_args['end_date'] = \progress_planner()->get_date()->get_datetime_from_mysql_date( $post->post_modified )->modify( '+12 hours' );
+ }
+
+ // Check if there is an activity for this post.
+ $existing = \progress_planner()->get_query()->query_activities(
+ $query_args,
+ 'RAW'
+ );
+
+ // If there is an activity for this post, bail.
+ return ! empty( $existing ) ? true : false;
+ }
+
/**
* Add an update activity.
*
diff --git a/classes/badges/class-monthly.php b/classes/badges/class-monthly.php
index 85092b6ef..06a0af062 100644
--- a/classes/badges/class-monthly.php
+++ b/classes/badges/class-monthly.php
@@ -57,7 +57,7 @@ public static function init_badges() {
$start_date = $activation_date->modify( 'first day of this month' );
// Year when plugin was released.
- $end_date = ( 2024 === (int) $start_date->format( 'Y' ) )
+ $end_date = ( 2024 === (int) $start_date->format( 'Y' ) && 2024 === (int) \gmdate( 'Y' ) )
? new \DateTime( 'last day of December next year' )
: new \DateTime( 'last day of December this year' );
diff --git a/classes/widgets/class-suggested-tasks.php b/classes/widgets/class-suggested-tasks.php
index 0ceb62d22..424a34d7d 100644
--- a/classes/widgets/class-suggested-tasks.php
+++ b/classes/widgets/class-suggested-tasks.php
@@ -89,6 +89,8 @@ public function register_scripts() {
public function enqueue_scripts() {
$handle = 'progress-planner-' . $this->id;
+ $current_screen = function_exists( 'get_current_screen' ) ? get_current_screen() : null;
+
// Enqueue the script.
\wp_enqueue_script( $handle );
@@ -123,9 +125,10 @@ public function enqueue_scripts() {
$handle,
'progressPlannerSuggestedTasks',
[
- 'ajaxUrl' => \admin_url( 'admin-ajax.php' ),
- 'nonce' => \wp_create_nonce( 'progress_planner' ),
- 'tasks' => $tasks,
+ 'ajaxUrl' => \admin_url( 'admin-ajax.php' ),
+ 'nonce' => \wp_create_nonce( 'progress_planner' ),
+ 'tasks' => $tasks,
+ 'maxItems' => $current_screen && 'dashboard' === $current_screen->id ? 3 : 5,
]
);
}
diff --git a/views/admin-page-header.php b/views/admin-page-header.php
index 0d0d43fb6..493fc10b0 100644
--- a/views/admin-page-header.php
+++ b/views/admin-page-header.php
@@ -19,7 +19,13 @@
?>
- the_asset( 'images/logo_progress_planner.svg' ); ?>
+ is_pro_site() ) {
+ \progress_planner()->the_asset( 'images/logo_progress_planner_pro.svg' );
+ } else {
+ \progress_planner()->the_asset( 'images/logo_progress_planner.svg' );
+ }
+ ?>
diff --git a/views/admin-page-settings.php b/views/admin-page-settings.php
index 9a5b16a83..ebf4e299d 100644
--- a/views/admin-page-settings.php
+++ b/views/admin-page-settings.php
@@ -14,7 +14,13 @@
diff --git a/views/dashboard-widgets/score.php b/views/dashboard-widgets/score.php
index d7480f598..daaa60ce0 100644
--- a/views/dashboard-widgets/score.php
+++ b/views/dashboard-widgets/score.php
@@ -10,10 +10,10 @@
?>
-
- the_asset( 'images/logo_progress_planner.svg' ); ?>
+ is_pro_site() ) {
+ \progress_planner()->the_asset( 'images/logo_progress_planner_pro.svg' );
+ } else {
+ \progress_planner()->the_asset( 'images/logo_progress_planner.svg' );
+ }
+ ?>
; ?>){kind=icon}
+