Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* finish task#797and781

Browse Source
This commit is contained in:
areyou123456
2012-05-20 09:45:34 +00:00
parent c2a19ea3c5
commit 6a3996c8ab
4 changed files with 65 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/todo/model.php
+36
View File
@@ -179,6 +179,11 @@ class todoModel extends model
$begin = $this->today();
$end = $begin;
}
if($date == 'yesterday')
{
$begin = $this->yesterday();
$end = $begin;
}
elseif($date == 'thisweek')
{
extract($this->getThisWeek());
@@ -187,6 +192,22 @@ class todoModel extends model
{
extract($this->getLastWeek());
}
elseif($date == 'thismonth')
{
extract($this->getThisMonth());
}
elseif($date == 'lastmonth')
{
extract($this->getLastMonth());
}
elseif($date == 'thisseason')
{
extract($this->getThisSeason());
}
elseif($date == 'thisyear')
{
extract($this->getThisYear());
}
elseif($date == 'future')
{
$begin = '2030-01-01';
@@ -480,4 +501,19 @@ class todoModel extends model
$end = date('Y-m', strtotime('this month'));
return array('begin' => $begin, 'end' => $end);
}
public function getThisSeason()
{
$getMonthDays = date("t", mktime(0,0,0,date('n')-(date('n')-1)%3,1,date("Y")));
$begin = date('Y-m-d H:i:s', mktime(0,0,0,date('n')-(date('n')-1)%3,1,date("Y")));
$end = date('Y-m-d H:i:s', mktime(23,59,59,date('n')+(date('n')-1)%3,$getMonthDays,date('Y')));
return array('begin' => $begin, 'end' => $end);
}
public function getThisYear()
{
$begin = date(DT_DATE1, strtotime('1/1 this year'));
$end = date(DT_DATE1, strtotime('1/1 next year -1 day'));
return array('begin' => $begin, 'end' => $end);
}
}