From 28b9f8de227bd1300a51c1511d041e14b54052c3 Mon Sep 17 00:00:00 2001 From: zhujinyong Date: Tue, 18 Dec 2012 07:46:26 +0000 Subject: [PATCH] * code for task#951. * add time for date. --- module/todo/model.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/module/todo/model.php b/module/todo/model.php index 283065b3e1..274fdd31fe 100644 --- a/module/todo/model.php +++ b/module/todo/model.php @@ -484,8 +484,8 @@ class todoModel extends model public function getThisWeek() { $baseTime = $this->getMiddleOfThisWeek(); - $begin = date(DT_DATE1, strtotime('last monday', $baseTime)); - $end = date(DT_DATE1, strtotime('next sunday', $baseTime)); + $begin = date(DT_DATE1, strtotime('last monday', $baseTime)) . ' 00:00:00'; + $end = date(DT_DATE1, strtotime('next sunday', $baseTime)) . ' 23:59:59'; return array('begin' => $begin, 'end' => $end); } @@ -498,8 +498,8 @@ class todoModel extends model public function getLastWeek() { $baseTime = $this->getMiddleOfLastWeek(); - $begin = date(DT_DATE1, strtotime('last monday', $baseTime)); - $end = date(DT_DATE1, strtotime('next sunday', $baseTime)); + $begin = date(DT_DATE1, strtotime('last monday', $baseTime)) . ' 00:00:00'; + $end = date(DT_DATE1, strtotime('next sunday', $baseTime)) . ' 23:59:59'; return array('begin' => $begin, 'end' => $end); } @@ -544,8 +544,8 @@ class todoModel extends model */ public function getThisMonth() { - $begin = date('Y-m'); - $end = date('Y-m', strtotime('next month')); + $begin = date('Y-m') . '-01 00:00:00'; + $end = date('Y-m', strtotime('next month')) . '-00 23:59:59'; return array('begin' => $begin, 'end' => $end); } @@ -557,8 +557,8 @@ class todoModel extends model */ public function getLastMonth() { - $begin = date('Y-m', strtotime('last month')); - $end = date('Y-m', strtotime('this month')); + $begin = date('Y-m', strtotime('last month')) . '-01 00:00:00'; + $end = date('Y-m', strtotime('this month')) . '-00 23:59:59'; return array('begin' => $begin, 'end' => $end); }