← All changes | includes/admin/dashboard.php +21 -12 5.0.7 → 6.0.6 View file →

		@@ -39,8 +39,9 @@
39	39	)
40	40	AND Task.status != %d
41	41	AND Task.active = 1
42	42	AND Task.is_archived = 0
	43	+ AND Task.parent_task_id = 0
43	44	LIMIT 5",
44	45	$current_user_id, // for JOIN pu
45	46	$current_user_id, // role_id
46	47	4 // status
		@@ -65,10 +66,11 @@
65	66	)
66	67	AND Task.status = %d
67	68	AND Task.active = 1
68	69	AND Task.is_archived = 0
	70	+ AND Task.parent_task_id = 0
69	71	LIMIT 5",
70		-
	72	+
71	73	$current_user_id, // 1 → pu.user_id
72	74	$is_admin, // 2
73	75	$current_user_id, // 3
74	76	$current_user_id, // 4
		@@ -96,10 +98,11 @@
96	98	OR pm.meta_value = '1'
97	99	)
98	100	AND Task.status = %d
99	101	AND Task.active = 1
100		- AND Task.is_archived = 0",
101		-
	102	+ AND Task.is_archived = 0
	103	+ AND Task.parent_task_id = 0",
	104	+
102	105	$current_user_id, // pu.user_id
103	106	$is_admin,
104	107	$current_user_id,
105	108	$current_user_id,
		@@ -118,8 +121,9 @@
118	121	)
119	122	AND Task.status != %d
120	123	AND Task.active = 1
121	124	AND Task.is_archived = 0
	125	+ AND Task.parent_task_id = 0
122	126	LIMIT 5",
123	127	$current_user_id, // for JOIN pu
124	128	$current_user_id, // role_id
125	129	4 // status
		@@ -145,8 +149,9 @@
145	149	AND DATE(Task.end_date) = CURDATE()
146	150	AND Task.status != %d
147	151	AND Task.active = 1
148	152	AND Task.is_archived = 0
	153	+ AND Task.parent_task_id = 0
149	154	LIMIT 5",
150	155	$current_user_id, // for JOIN pu
151	156	$is_admin,
152	157	$current_user_id,
		@@ -182,8 +187,9 @@
182	187	)
183	188	AND Task.status = %d
184	189	AND Task.active = 1
185	190	AND Task.is_archived = 0
	191	+ AND Task.parent_task_id = 0
186	192	LIMIT 5",
187	193	$current_user_id, // for JOIN pu
188	194	$is_admin,
189	195	$current_user_id,
		@@ -240,8 +246,9 @@
240	246	t.end_date < CURDATE()
241	247	AND t.status != 4
242	248	AND t.active = 1
243	249	AND t.is_archived = 0
	250	+ AND t.parent_task_id = 0
244	251	AND (
245	252	%d = 1
246	253	OR FIND_IN_SET(%d, t.users)
247	254	OR t.created_by = %d
		@@ -315,9 +322,9 @@
315	322	</div>
316	323	<div class="wppm-divider"></div>
317	324	<div class="wppm-row">
318	325	<div class="wppm-widget">
319		- <h2><?php echo esc_html_e('Today\'s Tasks', 'taskbuilder'); ?><a href="<?php echo esc_url(admin_url('admin.php?page=wppm-tasks')); ?>" class="wppm-view-all" target="_blank"><?php echo esc_html_e('View All', 'taskbuilder'); ?></a></h2>
	326	+ <h2><?php echo esc_html_e('Today\'s Tasks', 'taskbuilder'); ?><a href="<?php echo esc_url(admin_url('admin.php?page=wppm-tasks&wppm_task_filter=today')); ?>" class="wppm-view-all" target="_blank"><?php echo esc_html_e('View All', 'taskbuilder'); ?></a></h2>
320	327	<form id="wppm_get_my_tasks_frm" name="wppm_get_my_tasks_frm">
321	328	<div class="table-responsive">
322	329	<table id="tbl_todays_tasks" class="table table-striped table-bordered" cellspacing="0" width="100%">
323	330	<thead>
		@@ -416,9 +423,9 @@
416	423	</div>
417	424	</form>
418	425	</div>
419	426	<div class="wppm-widget">
420		- <h2><?php echo esc_html__('Upcoming Tasks(Next 7 Days)', 'taskbuilder'); ?> <a href="<?php echo esc_url(admin_url('admin.php?page=wppm-tasks')); ?>" class="wppm-view-all" target="_blank"><?php echo esc_html__('View All','taskbuilder');?></a></h2>
	427	+ <h2><?php echo esc_html__('Upcoming Tasks(Next 7 Days)', 'taskbuilder'); ?> <a href="<?php echo esc_url(admin_url('admin.php?page=wppm-tasks&wppm_task_filter=upcoming')); ?>" class="wppm-view-all" target="_blank"><?php echo esc_html__('View All','taskbuilder');?></a></h2>
421	428	<?php
422	429	$query = $wpdb->prepare(
423	430	"SELECT t.*, p.project_name
424	431	FROM {$wpdb->prefix}wppm_task t
		@@ -438,13 +445,14 @@
438	445	WHERE created_by = %d
439	446	OR FIND_IN_SET(%d, users)
440	447	)
441	448	)
442		- AND DATE(t.end_date) BETWEEN CURDATE()
	449	+ AND DATE(t.end_date) BETWEEN CURDATE()
443	450	AND DATE_ADD(CURDATE(), INTERVAL 7 DAY)
444	451	AND t.status != 4
445	452	AND t.active = 1
446	453	AND t.is_archived = 0
	454	+ AND t.parent_task_id = 0
447	455
448	456	ORDER BY t.end_date ASC
449	457	LIMIT 5",
450	458	$current_user_id,
		@@ -557,9 +565,9 @@
557	565	</div>
558	566	</div>
559	567	<div class="wppm-row">
560	568	<div class="wppm-widget">
561		- <h2><?php echo esc_html_e('My Tasks','taskbuilder'); ?> <a href="<?php echo esc_url(admin_url('admin.php?page=wppm-tasks')); ?>" class="wppm-view-all" target="_blank"><?php echo esc_html_e('View All','taskbuilder'); ?></a></h2>
	569	+ <h2><?php echo esc_html_e('My Tasks','taskbuilder'); ?> <a href="<?php echo esc_url(admin_url('admin.php?page=wppm-tasks&wppm_task_filter=mytasks')); ?>" class="wppm-view-all" target="_blank"><?php echo esc_html_e('View All','taskbuilder'); ?></a></h2>
562	570	<form id="wppm_get_my_tasks_frm" name="wppm_get_my_tasks_frm">
563	571	<div class="table-responsive">
564	572	<table id="tbl_my_tasks" class="table table-striped table-bordered" cellspacing="0" width="100%">
565	573	<thead>
		@@ -658,9 +666,9 @@
658	666	</div>
659	667	</form>
660	668	</div>
661	669	<div class="wppm-widget">
662		- <h2><?php echo esc_html_e('Active Projects','taskbuilder'); ?> <a href="<?php echo esc_url(admin_url('admin.php?page=wppm-projects')); ?>" class="wppm-view-all" target="_blank"><?php echo esc_html_e('View All','taskbuilder'); ?></a></h2>
	670	+ <h2><?php echo esc_html_e('Active Projects','taskbuilder'); ?> <a href="<?php echo esc_url(admin_url('admin.php?page=wppm-projects&wppm_project_filter=active')); ?>" class="wppm-view-all" target="_blank"><?php echo esc_html_e('View All','taskbuilder'); ?></a></h2>
663	671	<?php
664	672	$query = $wpdb->prepare(
665	673	"SELECT
666	674	p.id,
		@@ -676,9 +684,9 @@
676	684	ON p.status = ps.id
677	685	LEFT JOIN {$wpdb->prefix}wppm_project_users pu
678	686	ON p.id = pu.proj_id
679	687	LEFT JOIN {$wpdb->prefix}wppm_task t
680		- ON p.id = t.project
	688	+ ON p.id = t.project AND t.parent_task_id = 0
681	689	LEFT JOIN {$wpdb->prefix}wppm_project_meta pm
682	690	ON p.id = pm.project_id
683	691	AND pm.meta_key = 'public_project'
684	692	WHERE (FIND_IN_SET(%d, p.users) OR p.created_by = %d OR %d = 1 OR pm.meta_value = 1)
		@@ -780,12 +788,13 @@
780	788	ON u.ID = pu.user_id
781	789	INNER JOIN {$wpdb->prefix}wppm_task t
782	790	ON FIND_IN_SET(u.ID, t.users)
783	791	AND t.project = pu.proj_id AND pu.role_id!=3
784		- WHERE
785		- t.status != 4
786		- AND t.active = 1
	792	+ WHERE
	793	+ t.status != 4
	794	+ AND t.active = 1
787	795	AND t.is_archived = 0
	796	+ AND t.parent_task_id = 0
788	797	AND (
789	798	%d = 1
790	799	OR EXISTS (
791	800	SELECT 1