diff --git a/test/class/weekly.class.php b/test/class/weekly.class.php index 8a1f67ee13..a183c45b6d 100644 --- a/test/class/weekly.class.php +++ b/test/class/weekly.class.php @@ -4,26 +4,91 @@ class weeklyTest public function __construct() { global $tester; - $this->objectModel = $tester->loadModel('weekly'); + $this->objectModel = $tester->loadModel('weekly'); + $this->projectModel = $tester->loadModel('project'); } - public function getPageNavTest($project, $date) + + /** + * GetPageNav + * + * @param int $projectID + * @param string $date + * @access public + * @return string + */ + + public function getPageNavTest($projectID, $date) { - $objects = $this->objectModel->getPageNav($project, $date); + $project = $this->projectModel->getById($projectID); + $pageNav = $this->objectModel->getPageNav($project, $date); + + if(dao::isError()) return dao::getError(); + + $start_str = mb_strpos($pageNav,"ass='btn'>") + mb_strlen("class='btn'>"); + $end_str = mb_strpos($pageNav,"") - $start_str; + $objects = mb_substr($pageNav,$start_str,$end_str); + return $objects; + } + + /** + * GetWeekPairs + * + * @param int $begin + * @param int $end + * @access public + * @return array + */ + + public function getWeekPairsTest($begin, $end) + { + switch($begin) + { + case '1': + $begin = date('Y-m-d'); + break; + case '2': + $begin = date('Y-m-d', strtotime(date('Y-m-d')."- 6 days")); + break; + case '3': + $begin = date('Y-m-d', strtotime(date('Y-m-d') . "+ 6 days")); + break; + case '': + $begin = ''; + break; + } + + switch($begin) + { + case '1': + $end = date('Y-m-d'); + break; + case '2': + $end = date('Y-m-d', strtotime(date('Y-m-d')."- 6 days")); + break; + case '3': + $end = date('Y-m-d', strtotime(date('Y-m-d') . "+ 6 days")); + break; + case '': + $end = ''; + break; + } + + $objects = $this->objectModel->getWeekPairs($begin, $end); if(dao::isError()) return dao::getError(); return $objects; } - public function getWeekPairsTest($begin, $end = '') - { - $objects = $this->objectModel->getWeekPairs($begin, $end = ''); - - if(dao::isError()) return dao::getError(); - - return $objects; - } + /** + * GetFromDB + * + * @param int $project + * @param string $date + * @access public + * @return object + */ public function getFromDBTest($project, $date) { @@ -34,15 +99,34 @@ class weeklyTest return $objects; } + /** + * Save data. + * + * @param int $project + * @param string $date + * @access public + * @return void + */ + public function saveTest($project, $date) { $objects = $this->objectModel->save($project, $date); if(dao::isError()) return dao::getError(); - return $objects; + $weekly = $this->objectModel->getFromDB($project, $date); + return $weekly; } + /** + * GetWeekSN + * + * @param string $begin + * @param string $date + * @access public + * @return int + */ + public function getWeekSNTest($begin, $date) { $objects = $this->objectModel->getWeekSN($begin, $date); @@ -52,6 +136,14 @@ class weeklyTest return $objects; } + /** + * Get monday for a date. + * + * @param string $date + * @access public + * @return date + */ + public function getThisMondayTest($date) { $objects = $this->objectModel->getThisMonday($date); @@ -61,6 +153,14 @@ class weeklyTest return $objects; } + /** + * GetThisSunday + * + * @param string $date + * @access public + * @return date + */ + public function getThisSundayTest($date) { $objects = $this->objectModel->getThisSunday($date); @@ -70,6 +170,14 @@ class weeklyTest return $objects; } + /** + * GetLastDay + * + * @param string $date + * @access public + * @return string + */ + public function getLastDayTest($date) { $objects = $this->objectModel->getLastDay($date); diff --git a/test/model/weekly/getfromdb.php b/test/model/weekly/getfromdb.php old mode 100644 new mode 100755 index b782bf4e3a..03e54c0367 --- a/test/model/weekly/getfromdb.php +++ b/test/model/weekly/getfromdb.php @@ -10,8 +10,25 @@ title=测试 weeklyModel->getFromDB(); cid=1 pid=1 +查询项目为已挂起、日期不为空的数据 >> 1,41 +查询项目为已挂起、日期为空的数据 >> 0 +查询项目为已关闭、日期不为空的数据 >> 2,42 +查询项目为已关闭、日期为空的数据 >> 0 +查询项目为未开始、日期不为空的数据 >> 3,43 +查询项目为未开始、日期为空的数据 >> 0 +查询项目为进行中、日期不为空的数据 >> 5,45 +查询项目为金箱子、日期为空的数据 >> 0 + */ +$productID = array('41', '42', '43', '45'); +$date = array('2022-05-03', ''); $weekly = new weeklyTest(); - -r($weekly->getFromDBTest()) && p() && e(); \ No newline at end of file +r($weekly->getFromDBTest($productID[0], $date[0])) && p('id,project') && e('1,41'); //查询项目为已挂起、日期不为空的数据 +r($weekly->getFromDBTest($productID[0], $date[1])) && p() && e('0'); //查询项目为已挂起、日期为空的数据 +r($weekly->getFromDBTest($productID[1], $date[0])) && p('id,project') && e('2,42'); //查询项目为已关闭、日期不为空的数据 +r($weekly->getFromDBTest($productID[1], $date[1])) && p() && e('0'); //查询项目为已关闭、日期为空的数据 +r($weekly->getFromDBTest($productID[2], $date[0])) && p('id,project') && e('3,43'); //查询项目为未开始、日期不为空的数据 +r($weekly->getFromDBTest($productID[2], $date[1])) && p() && e('0'); //查询项目为未开始、日期为空的数据 +r($weekly->getFromDBTest($productID[3], $date[0])) && p('id,project') && e('5,45'); //查询项目为进行中、日期不为空的数据 +r($weekly->getFromDBTest($productID[3], $date[1])) && p() && e('0'); //查询项目为金箱子、日期为空的数据 \ No newline at end of file diff --git a/test/model/weekly/getlastday.php b/test/model/weekly/getlastday.php old mode 100644 new mode 100755 index bcb22f10d6..0595add63b --- a/test/model/weekly/getlastday.php +++ b/test/model/weekly/getlastday.php @@ -10,8 +10,16 @@ title=测试 weeklyModel->getLastDay(); cid=1 pid=1 +查询日期为星期日 >> 2022-05-07 +查询日期为其他 >> 2022-05-01 +查询日期为空 >> 2022-05-10 + */ +$date = array('2022-05-08', '2022-04-29', ''); + $weekly = new weeklyTest(); -r($weekly->getLastDayTest()) && p() && e(); \ No newline at end of file +r($weekly->getLastDayTest($date[0])) && p() && e('2022-05-07'); //查询日期为星期日 +r($weekly->getLastDayTest($date[1])) && p() && e('2022-05-01'); //查询日期为其他 +r($weekly->getLastDayTest($date[2])) && p() && e('2022-05-10'); //查询日期为空 \ No newline at end of file diff --git a/test/model/weekly/getpagenav.php b/test/model/weekly/getpagenav.php old mode 100644 new mode 100755 index 0c301c5f95..b61229aab8 --- a/test/model/weekly/getpagenav.php +++ b/test/model/weekly/getpagenav.php @@ -1,4 +1,4 @@ -#!/usr/bin/env php +usr/bin/env php getPageNav(); cid=1 pid=1 +查询项目为未开始，日期为当天的数据 >> 周报-项目9 +查询项目为未开始，日期为一周前的数据 >> 周报-项目9 +查询项目为进行中，日期为当天的数据 >> 周报-项目3 +查询项目为进行中，日期为一周前的数据 >> 周报-项目3 +查询项目为已挂起，日期为当天的数据 >> 周报-项目7 +查询项目为已挂起，日期为一周前的数据 >> 周报-项目7 +查询项目为已关闭，日期为当天的数据 >> 周报-项目8 +查询项目为已关闭，日期为一周前的数据 >> 周报-项目8 + */ +$productID = array('19', '13', '17', '18'); +$date = array('2022-05-07', ''); $weekly = new weeklyTest(); - -r($weekly->getPageNavTest()) && p() && e(); \ No newline at end of file +r($weekly->getPageNavTest($productID[0], $date[0])) && p() && e('周报-项目9'); //查询项目为未开始，日期为当天的数据 +r($weekly->getPageNavTest($productID[0], $date[1])) && p() && e('周报-项目9'); //查询项目为未开始，日期为一周前的数据 +r($weekly->getPageNavTest($productID[1], $date[0])) && p() && e('周报-项目3'); //查询项目为进行中，日期为当天的数据 +r($weekly->getPageNavTest($productID[1], $date[1])) && p() && e('周报-项目3'); //查询项目为进行中，日期为一周前的数据 +r($weekly->getPageNavTest($productID[2], $date[0])) && p() && e('周报-项目7'); //查询项目为已挂起，日期为当天的数据 +r($weekly->getPageNavTest($productID[2], $date[1])) && p() && e('周报-项目7'); //查询项目为已挂起，日期为一周前的数据 +r($weekly->getPageNavTest($productID[3], $date[0])) && p() && e('周报-项目8'); //查询项目为已关闭，日期为当天的数据 +r($weekly->getPageNavTest($productID[3], $date[1])) && p() && e('周报-项目8'); //查询项目为已关闭，日期为一周前的数据 diff --git a/test/model/weekly/getthismonday.php b/test/model/weekly/getthismonday.php old mode 100644 new mode 100755 index f622ac65b2..07a4de5dcb --- a/test/model/weekly/getthismonday.php +++ b/test/model/weekly/getthismonday.php @@ -10,8 +10,15 @@ title=测试 weeklyModel->getThisMonday(); cid=1 pid=1 +查询日期为星期日 >> 2022-05-02 +查询日期为其他 >> 2022-04-25 +查询日期为空 >> 2022-05-04 + */ +$date = array('2022-05-08', '2022-04-29', ''); $weekly = new weeklyTest(); -r($weekly->getThisMondayTest()) && p() && e(); \ No newline at end of file +r($weekly->getThisMondayTest($date[0])) && p() && e('2022-05-02'); //查询日期为星期日 +r($weekly->getThisMondayTest($date[1])) && p() && e('2022-04-25'); //查询日期为其他 +r($weekly->getThisMondayTest($date[2])) && p() && e('2022-05-04'); //查询日期为空 \ No newline at end of file diff --git a/test/model/weekly/getthissunday.php b/test/model/weekly/getthissunday.php old mode 100644 new mode 100755 index 30182dd1cb..e3f4b574e5 --- a/test/model/weekly/getthissunday.php +++ b/test/model/weekly/getthissunday.php @@ -10,8 +10,15 @@ title=测试 weeklyModel->getThisSunday(); cid=1 pid=1 +查询日期为星期日 >> 2022-05-08 +查询日期为其他 >> 2022-05-01 +查询日期为空 >> 2022-05-10 + */ +$date = array('2022-05-08', '2022-04-29', ''); $weekly = new weeklyTest(); -r($weekly->getThisSundayTest()) && p() && e(); \ No newline at end of file +r($weekly->getThisSundayTest($date[0])) && p() && e('2022-05-08'); //查询日期为星期日 +r($weekly->getThisSundayTest($date[1])) && p() && e('2022-05-01'); //查询日期为其他 +r($weekly->getThisSundayTest($date[2])) && p() && e('2022-05-10'); //查询日期为空 \ No newline at end of file diff --git a/test/model/weekly/getweekpairs.php b/test/model/weekly/getweekpairs.php old mode 100644 new mode 100755 index 0ddaeca4c9..38a1b6dbb4 --- a/test/model/weekly/getweekpairs.php +++ b/test/model/weekly/getweekpairs.php @@ -10,8 +10,39 @@ title=测试 weeklyModel->getWeekPairs(); cid=1 pid=1 + >> 0 + >> 0 + >> 0 + >> 0 + >> 第 1 周( 2022-04-25 ~ 2022-05-01) + >> 0 + >> 0 + >> 0 + >> 0 + >> 第 1 周( 2022-05-03 ~ 2022-05-09) + >> 第 4 周( 2022-05-23 ~ 2022-05-29) + >> 第 239 周( 2026-11-23 ~ 2026-11-29) + >> 第 5 周( 2022-05-30 ~ 2022-06-05) + */ +$begin = array(1, 2, 3, ''); +$end = array(1, 2, 3, ''); $weekly = new weeklyTest(); -r($weekly->getWeekPairsTest()) && p() && e(); \ No newline at end of file +r($weekly->getWeekPairsTest($begin[0], $end[0])) && p() && e('0'); +r($weekly->getWeekPairsTest($begin[0], $end[1])) && p() && e('0'); +r($weekly->getWeekPairsTest($begin[0], $end[2])) && p() && e('0'); +r($weekly->getWeekPairsTest($begin[0], $end[3])) && p() && e('0'); +r($weekly->getWeekPairsTest($begin[1], $end[0])) && p() && e(); +r($weekly->getWeekPairsTest($begin[1], $end[1])) && p() && e(); +r($weekly->getWeekPairsTest($begin[1], $end[2])) && p() && e(); +r($weekly->getWeekPairsTest($begin[1], $end[3])) && p('20220425') && e('第 1 周( 2022-04-25 ~ 2022-05-01)'); +r($weekly->getWeekPairsTest($begin[2], $end[0])) && p() && e('0'); +r($weekly->getWeekPairsTest($begin[2], $end[1])) && p() && e('0'); +r($weekly->getWeekPairsTest($begin[2], $end[2])) && p() && e('0'); +r($weekly->getWeekPairsTest($begin[2], $end[3])) && p() && e('0'); +r($weekly->getWeekPairsTest($begin[3], $end[0])) && p('20220503') && e('第 1 周( 2022-05-03 ~ 2022-05-09)'); +r($weekly->getWeekPairsTest($begin[3], $end[1])) && p('20220523') && e('第 4 周( 2022-05-23 ~ 2022-05-29)'); +r($weekly->getWeekPairsTest($begin[3], $end[2])) && p('20261123') && e('第 239 周( 2026-11-23 ~ 2026-11-29)'); +r($weekly->getWeekPairsTest($begin[3], $end[3])) && p('20220530') && e('第 5 周( 2022-05-30 ~ 2022-06-05)'); \ No newline at end of file diff --git a/test/model/weekly/getweeksn.php b/test/model/weekly/getweeksn.php old mode 100644 new mode 100755 index 2ab539e49e..456289c5c0 --- a/test/model/weekly/getweeksn.php +++ b/test/model/weekly/getweeksn.php @@ -10,8 +10,18 @@ title=测试 weeklyModel->getWeekSN(); cid=1 pid=1 +开始时间和结束时间都不为空 >> 1 +开始时间不为空，结束时间为空 >> -2730 +开始时间为空，结束时间不为空 >> 2732 +开始时间和结束时间都为空 >> 0 + */ +$begin = array('2022-05-02', ''); +$end = array('2022-05-06', ''); $weekly = new weeklyTest(); -r($weekly->getWeekSNTest()) && p() && e(); \ No newline at end of file +r($weekly->getWeekSNTest($begin[0], $end[0])) && p() && e('1'); //开始时间和结束时间都不为空 +r($weekly->getWeekSNTest($begin[0], $end[1])) && p() && e('-2730'); //开始时间不为空，结束时间为空 +r($weekly->getWeekSNTest($begin[1], $end[0])) && p() && e('2732'); //开始时间为空，结束时间不为空 +r($weekly->getWeekSNTest($begin[1], $end[1])) && p() && e('0'); //开始时间和结束时间都为空 \ No newline at end of file diff --git a/test/model/weekly/save.php b/test/model/weekly/save.php old mode 100644 new mode 100755 index 751897ec2f..7816a6cfa6 --- a/test/model/weekly/save.php +++ b/test/model/weekly/save.php @@ -10,8 +10,27 @@ title=测试 weeklyModel->save(); cid=1 pid=1 +保存项目为已挂起、日期不为空的数据 >> 11,41 +保存项目为已挂起、日期为空的数据 >> 12,41 +保存项目为已关闭、日期不为空的数据 >> 13,42 +保存项目为已关闭、日期为空的数据 >> 14,42 +保存项目为未开始、日期不为空的数据 >> 15,43 +保存项目为未开始、日期为空的数据 >> 16,43 +保存项目为进行中、日期不为空的数据 >> 17,45 +保存项目为进行中、日期为空的数据 >> 18,45 + */ +$productID = array('41', '42', '43', '45'); +$date = array('2022-04-29', ''); $weekly = new weeklyTest(); +r($weekly->saveTest($productID[0], $date[0])) && p('id,project') && e('11,41'); //保存项目为已挂起、日期不为空的数据 +r($weekly->saveTest($productID[0], $date[1])) && p('id,project') && e('12,41'); //保存项目为已挂起、日期为空的数据 +r($weekly->saveTest($productID[1], $date[0])) && p('id,project') && e('13,42'); //保存项目为已关闭、日期不为空的数据 +r($weekly->saveTest($productID[1], $date[1])) && p('id,project') && e('14,42'); //保存项目为已关闭、日期为空的数据 +r($weekly->saveTest($productID[2], $date[0])) && p('id,project') && e('15,43'); //保存项目为未开始、日期不为空的数据 +r($weekly->saveTest($productID[2], $date[1])) && p('id,project') && e('16,43'); //保存项目为未开始、日期为空的数据 +r($weekly->saveTest($productID[3], $date[0])) && p('id,project') && e('17,45'); //保存项目为进行中、日期不为空的数据 +r($weekly->saveTest($productID[3], $date[1])) && p('id,project') && e('18,45'); //保存项目为进行中、日期为空的数据 -r($weekly->saveTest()) && p() && e(); \ No newline at end of file +system("./ztest init"); \ No newline at end of file