Dashboard : GWM
This commit is contained in:
parent
b47cd582e2
commit
dcf29111c5
@ -1020,7 +1020,7 @@ class PlanController extends ResourceController
|
|||||||
$todayEnd = date('Y-m-d 23:59:59');
|
$todayEnd = date('Y-m-d 23:59:59');
|
||||||
// $startOfWeek = date('Y-m-d 00:00:00', strtotime('monday this week'));
|
// $startOfWeek = date('Y-m-d 00:00:00', strtotime('monday this week'));
|
||||||
// $endOfWeek = date('Y-m-d 23:59:59', strtotime('sunday this week'));
|
// $endOfWeek = date('Y-m-d 23:59:59', strtotime('sunday this week'));
|
||||||
$startOfWeek = date('Y-m-d 00:00:00', strtotime('-6 days'));
|
$startOfWeek = date('Y-m-d 00:00:00', strtotime('-7 days'));
|
||||||
$endOfWeek = date('Y-m-d 23:59:59'); // today
|
$endOfWeek = date('Y-m-d 23:59:59'); // today
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -416,7 +416,7 @@ class ReportsModel extends Model
|
|||||||
|
|
||||||
JOIN m_plan mp ON cf.plan_id = mp.plan_id
|
JOIN m_plan mp ON cf.plan_id = mp.plan_id
|
||||||
|
|
||||||
WHERE cf.created_on >= DATE_SUB(CURDATE(), INTERVAL 6 DAY)
|
WHERE cf.created_on >= DATE_SUB(CURDATE(), INTERVAL 7 DAY)
|
||||||
AND cf.created_on < DATE_ADD(CURDATE(), INTERVAL 1 DAY)
|
AND cf.created_on < DATE_ADD(CURDATE(), INTERVAL 1 DAY)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user