diff --git a/test/class/program.class.php b/test/class/program.class.php index 9f2a95e567..c80d39ce51 100644 --- a/test/class/program.class.php +++ b/test/class/program.class.php @@ -119,18 +119,6 @@ class programTest } } - /** - * getInvolvedPrograms - * - * @param string mixed $account - * @access public - * @return void - */ - public function getInvolvedPrograms($account) - { - return $this->program->getInvolvedPrograms($account); - } - /** * Test get pairs by list. * @@ -370,94 +358,6 @@ class programTest return $this->program->hasUnfinished($program); } - /** - * getKanbanGroup - * - * @param string $type - * @access public - * @return void - */ - public function getKanbanGroup($type = '') - { - $program = $this->program->getKanbanGroup(); - return $program; - } - - /** - * getListByProgramID - * - * @param int $programID - * @access public - * @return void - */ - public function getListByProgramID($programID = 0) - { - return count($this->program->getProjectList($programID)); - } - - /** - * getListByStatusNo - * - * @param string $browseType - * @access public - * @return void - */ - public function getListByStatusNo($browseType = 'all') - { - $projects = $this->program->getProjectList('0', $browseType); - - if(!$projects) return 0; - foreach($projects as $project) - { - if($project->status != $browseType and $browseType != 'all' and $browseType != 'undone') return 0; - if($browseType == 'undone' and ($project->status != ('wait' or 'doing'))) return 0; - } - - return count($projects); - } - - /** - * getListByOrderId - * - * @param string $orderBy - * @access public - * @return void - */ - public function getListByOrderId($orderBy = 'id_desc') - { - $projects = $this->program->getProjectList('0', 'all', '0', $orderBy); - - return checkOrder($projects, $orderBy); - } - - /** - * getListAddProgramTitle - * - * @param int $programTitle - * @access public - * @return void - */ - public function getListAddProgramTitle($programTitle = 0) - { - return $this->program->getProjectList('0', 'all', '0', 'id_desc', '', $programTitle); - } - - /** - * getListByInvolved - * - * @param int $involved - * @param string $count - * @access public - * @return void - */ - public function getListByInvolved($involved = 0, $count = '') - { - $projects = $this->program->getProjectList('0', 'all', '0', 'id_desc', '', '0', $involved); - - if($count == 'count') return count($projects); - return $projects; - } - /** * setTreePath * diff --git a/test/model/program/computeprogress.php b/test/model/program/computeprogress.php new file mode 100644 index 0000000000..06f576510c --- /dev/null +++ b/test/model/program/computeprogress.php @@ -0,0 +1,45 @@ +#!/usr/bin/env php +loadModel('program'); +$task1 = new stdclass(); +$task1->consumed = 2; +$task1->left = 2; +$task1->estimate = 2; +$task1->status = 'active'; + +$task2 = new stdclass(); +$task2->consumed = 4; +$task2->left = 5; +$task2->estimate = 6; +$task2->status = 'active'; + +$task3 = new stdclass(); +$task3->consumed = 7; +$task3->left = 7; +$task3->estimate = 7; +$task3->status = 'closed'; + +$tasks[] = $task1; +$tasks[] = $task2; +$tasks[] = $task3; + +$projectTasks[1] = $tasks; + +$hours = $tester->program->computeProgress($projectTasks); + +r($hours) && p('1:totalConsumed') && e('13'); // 传入任务数组，返回计算后的总消耗 +r($hours) && p('1:totalEstimate') && e('15'); // 传入任务数组，返回计算后的总预计 +r($hours) && p('1:totalLeft') && e('7'); // 传入任务数组，返回计算后的总剩余 +r($hours) && p('1:totalReal') && e('20'); // 传入任务数组，返回计算后的总工时 +r($hours) && p('1:progress') && e('65'); // 传入任务数组，返回计算后的进度 diff --git a/test/model/program/getinvolvedprograms.php b/test/model/program/getinvolvedprograms.php index 60b35606a5..f3a3fea74e 100755 --- a/test/model/program/getinvolvedprograms.php +++ b/test/model/program/getinvolvedprograms.php @@ -1,7 +1,7 @@ #!/usr/bin/env php loadModel('program'); +$adminPrograms = $tester->program->getInvolvedPrograms('admin'); +$test2Programs = $tester->program->getInvolvedPrograms('test2'); -$t_sulist = array('admin', 'test2'); - -r($listOfId->getInvolvedPrograms($t_sulist[0])) && p('1') && e('1'); // 查看用户admin可以看到的项目和执行id列表 -r($listOfId->getInvolvedPrograms($t_sulist[1])) && p('1') && e('1'); // 查看用户test2可以看到的项目和执行id列表 \ No newline at end of file +r(count($adminPrograms)) && p() && e('2'); // 获取admin参与的项目集数量 +r(count($test2Programs)) && p() && e('1'); // 获取test2参与的项目集数量 +r($adminPrograms) && p('10') && e('10'); // 获取admin参与的项目集ID +r($test2Programs) && p('1') && e('1'); // 获取test2参与的项目集ID diff --git a/test/model/program/getkanbangroup.php b/test/model/program/getkanbangroup.php index 0078c871fb..a615bf6718 100755 --- a/test/model/program/getkanbangroup.php +++ b/test/model/program/getkanbangroup.php @@ -1,7 +1,7 @@ #!/usr/bin/env php loadModel('program'); -$program = new Program($t_getKanban[0]); +$kanbanGroup = $tester->program->getKanbanGroup(); -r($program->getKanbanGroup()[$t_getKanban[1]]) && p('0:name') && e(''); //查看当前用户看板的所属项目 -r($program->getKanbanGroup()[$t_getKanban[2]]) && p('0:name') && e('项目集1'); //查看当前用户看板的其它项目 \ No newline at end of file +r(count($kanbanGroup['my'])) && p('') && e('2'); //查看当前用户负责的项目集看板数量 +r(count($kanbanGroup['others'])) && p('') && e('8'); //查看当前用户其他的项目集看板数量 +r($kanbanGroup['others']) && p('0:name') && e('项目集2'); //查看当前用户其他的项目集看板详情 diff --git a/test/model/program/getlist.php b/test/model/program/getlist.php index b7122802d9..443127d20d 100755 --- a/test/model/program/getlist.php +++ b/test/model/program/getlist.php @@ -17,14 +17,21 @@ pid=1 */ +global $tester; $program = new programTest(); +$tester->app->loadClass('pager', $static = true); +$pager = new pager(0, 10, 1); -$pro= array('all', 'wait', 'doing', 'suspended', 'closed', 'name_desc', 'id_asc'); +$allPorgrams = $program->getList('all'); +$pagerPrograms = $program->getList('all', 'id_asc', $pager); +$closedPrograms = $program->getList('closed'); +$suspendedPrograms = $program->getList('closed'); +$namedescPrograms = $program->getList('all', 'name_desc'); +$idascPrograms = $program->getList('all', 'id_asc'); -r($program->getList()) && p() && e('100'); // 查看所有项目和项目集的个数 -r($program->getList()) && p() && e('34'); // 查看所有'wait'的项目和项目集的个数 -r($program->getList()) && p() && e('44'); // 查看所有'doing'的项目和项目集的个数 -r($program->getList()) && p() && e('11'); // 查看所有'suspended'的项目和项目集的个数 -r($program->getList()) && p() && e('11'); // 查看所有'closed'的项目和项目集的个数 -r($program->getList()) && p() && e(1); // 按照项目和项目集名称倒序获取项目列表 -r($program->getList()) && p() && e(1); // 按照ID正序获取项目和项目集列表 +r(count($allPorgrams)) && p() && e('120'); // 查看所有项目和项目集的个数 +r(count($pagerPrograms)) && p() && e('10'); // 查看分页后项目集和项目的个数 +r(count($closedPrograms)) && p() && e('11'); // 查看所有'closed'的项目和项目集的个数 +r(count($suspendedPrograms)) && p() && e('11'); // 查看所有'suspended'的项目和项目集的个数 +r(key($namedescPrograms)) && p() && e('9'); // 按照项目和项目集名称倒序获取第一个ID +r(key($idascPrograms)) && p() && e('1'); // 按照ID正序获取项目和项目集列表第一个ID diff --git a/test/model/program/getprojectlist.php b/test/model/program/getprojectlist.php index 2247113605..72acf45f83 100755 --- a/test/model/program/getprojectlist.php +++ b/test/model/program/getprojectlist.php @@ -1,7 +1,7 @@ #!/usr/bin/env php > 90 -查看当前项目集下所有状态为进行中的项目的个数 >> 44 -根据name倒序查看所有项目 >> 1 -根据id倒序查看所有项目的个数 >> 1 -查看所有项目（包含所属项目集名称） >> 项目1 -查看当前用户参与的项目 >> 项目1 -查看当前用户参与的项目的个数 >> 1 - */ -$countProjects = new Program('admin'); +global $tester; +$tester->loadModel('program'); -$t_proNumber = array(0, 'doing', 'name_desc', 'id_desc', 0, 1, 1, 'count'); +$allProjects = $tester->program->getProjectList(0); +$undoneProjects = $tester->program->getProjectList(0, 'undone'); +$withProgramProjects = $tester->program->getProjectList(0, 'undone', 0, 'id_desc', null, 1); +$involvedProjects = $tester->program->getProjectList(0, 'undone', 0, 'id_desc', null, 1, true); -r($countProjects->getListByProgramID($t_proNumber[0])) && p() && e('90'); // 查看当前项目集下所有项目的个数 -r($countProjects->getListByStatusNo($t_proNumber[1])) && p() && e('44'); // 查看当前项目集下所有状态为进行中的项目的个数 -r($countProjects->getListByOrderId($t_proNumber[2])) && p() && e('1'); // 根据name倒序查看所有项目 -r($countProjects->getListByOrderId($t_proNumber[3])) && p() && e('1'); // 根据id倒序查看所有项目的个数 -r($countProjects->getListAddProgramTitle($t_proNumber[4])) && p('11:name') && e('项目1'); // 查看所有项目（包含所属项目集名称） -r($countProjects->getListByInvolved($t_proNumber[5])) && p('11:name') && e('项目1'); // 查看当前用户参与的项目 -r($countProjects->getListByInvolved($t_proNumber[6], $t_proNumber[7])) && p() && e('1'); // 查看当前用户参与的项目的个数 \ No newline at end of file +r(count($allProjects)) && p() && e('110'); // 获取所有项目列表数量 +r(count($undoneProjects)) && p() && e('88'); // 获取未完成项目列表数量 +r(count($withProgramProjects)) && p() && e('88'); // 带项目集名称的项目列表数量 +r(count($involvedProjects)) && p() && e('1'); // 获取我参与的项目列表数量 +r($allProjects) && p('12:name') && e('项目2'); // 不带项目集名称的项目名称 +r($withProgramProjects) && p('12:name') && e('项目集2/项目2'); // 带项目集名称的项目名称 +r($involvedProjects) && p('11:name') && e('项目集1/项目1'); // 我参与的项目的名称 diff --git a/test/model/program/getstakeholders.php b/test/model/program/getstakeholders.php index 2e25d25879..705621c1a7 100755 --- a/test/model/program/getstakeholders.php +++ b/test/model/program/getstakeholders.php @@ -1,7 +1,7 @@ #!/usr/bin/env php loadModel('program'); +$stakeholders1 = $tester->program->getStakeholders(2, 'id_desc'); +$stakeholders2 = $tester->program->getStakeholders(2, 'id_asc'); -$t_Stakeholder = array(2, 'id_desc', 'id_asc', 2); - -//var_dump($program->getByID1($t_Stakeholder[0]));die; -r($program->getByID1($t_Stakeholder[0])) && p('0:realname') && e('测试17'); // 查看项目集2的干系人信息 -r($program->getByOrder($t_Stakeholder[1])) && p() && e('1'); // 根据干系人id倒序排序 -r($program->getByOrder($t_Stakeholder[2])) && p() && e('1'); // 根据干系人id正序排序 -r($program->getCount5($t_Stakeholder[3])) && p() && e('3'); // 查看项目集2的干系人个数 \ No newline at end of file +r(count($stakeholders1)) && p() && e('3'); // 获取干系人数量 +r(count($stakeholders2)) && p() && e('3'); // 获取干系人数量 +r($stakeholders1) && p('0:realname') && e('测试17'); // id倒序排，获取第一个干系人真实姓名 +r($stakeholders2) && p('0:realname') && e('测试19'); // id正序排，获取第一个干系人真实姓名 diff --git a/test/model/program/getstakeholdersbyprograms.php b/test/model/program/getstakeholdersbyprograms.php index 8eb7e8801f..c095dfdd73 100755 --- a/test/model/program/getstakeholdersbyprograms.php +++ b/test/model/program/getstakeholdersbyprograms.php @@ -1,7 +1,7 @@ #!/usr/bin/env php loadModel('program'); -$Stakeholder = array('2', '2,3', '2', '2,3'); - -r($t->getByPrograms($Stakeholder[0])) && p('0:account') && e('user19'); // 获取项目集2的干系人名单 -r($t->getByPrograms($Stakeholder[0])) && p('1:account') && e('user18'); // 获取项目集2的干系人名单 -r($t->getByPrograms($Stakeholder[0])) && p('2:account') && e('user17'); // 获取项目集2的干系人名单 -r($t->getByPrograms($Stakeholder[1])) && p('0:account') && e('user19'); // 获取项目集2和项目集3的干系人名单 -r($t->getByPrograms($Stakeholder[1])) && p('1:account') && e('user18'); // 获取项目集2和项目集3的干系人名单 -r($t->getByPrograms($Stakeholder[1])) && p('2:account') && e('user17'); // 获取项目集2和项目集3的干系人名单... -r($t->getCount4($Stakeholder[2])) && p() && e('3'); // 获取项目集2的干系人个数 -r($t->getCount4($Stakeholder[3])) && p() && e('6'); // 获取项目集2和项目集3的干系人个数 \ No newline at end of file +r($tester->program->getStakeholdersByPrograms('2')) && p('0:account') && e('user19'); // 获取项目集2的干系人名单 +r($tester->program->getStakeholdersByPrograms('2')) && p('1:account') && e('user18'); // 获取项目集2的干系人名单 +r($tester->program->getStakeholdersByPrograms('2')) && p('2:account') && e('user17'); // 获取项目集2的干系人名单 +r($tester->program->getStakeholdersByPrograms('2,3')) && p('0:account') && e('user19'); // 获取项目集2和项目集3的干系人名单 +r($tester->program->getStakeholdersByPrograms('2,3')) && p('1:account') && e('user18'); // 获取项目集2和项目集3的干系人名单 +r($tester->program->getStakeholdersByPrograms('2,3')) && p('2:account') && e('user17'); // 获取项目集2和项目集3的干系人名单 +r(count($tester->program->getStakeholdersByPrograms('2'))) && p('') && e('3'); // 获取项目集2的干系人个数 +r(count($tester->program->getStakeholdersByPrograms('2,3'))) && p('') && e('6'); // 获取项目集2、3的干系人个数