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

* Adjust code.

Browse Source
This commit is contained in:
leiyong
2020-12-07 15:05:19 +08:00
parent 611cda4fe7
commit 7aaf8a9014
11 changed files with 40 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/common/lang/de.php
+2 -2
View File
@@ -875,7 +875,7 @@ $lang->menu->scrum->morelink = array('link' => 'More|project|morelink', 'c
$lang->scrum = new stdclass();
$lang->scrum->subMenu = new stdclass();
$lang->scrum->subMenu->morelink = new stdclass();
$lang->scrum->subMenu->morelink->program = 'Program|program|edit|';
$lang->scrum->subMenu->morelink->program = 'Program|program|PRJEdit|';
/* Waterfall menu. */
$lang->menu->waterfall = new stdclass();
@@ -898,7 +898,7 @@ $lang->waterfall->subMenu = new stdclass();
$lang->waterfall->subMenu->morelink = new stdclass();
$lang->waterfall->subMenu->morelink->workestimation = array('link' => 'Workestimation|workestimation|index|program=%s', 'subModule' => 'durationestimation,budget');
$lang->waterfall->subMenu->morelink->stakeholder = array('link' => 'Stakeholder|stakeholder|browse|', 'subModule' => 'stakeholder');
$lang->waterfall->subMenu->morelink->program = 'Project|program|edit|';
$lang->waterfall->subMenu->morelink->program = 'Project|program|PRJEdit|';
$lang->waterfallproduct = new stdclass();
$lang->workestimation = new stdclass();
module/common/lang/en.php
+2 -2
View File
@@ -875,7 +875,7 @@ $lang->menu->scrum->morelink = array('link' => 'More|project|morelink', 'c
$lang->scrum = new stdclass();
$lang->scrum->subMenu = new stdclass();
$lang->scrum->subMenu->morelink = new stdclass();
$lang->scrum->subMenu->morelink->program = 'Program|program|edit|';
$lang->scrum->subMenu->morelink->program = 'Program|program|PRJEdit|';
/* Waterfall menu. */
$lang->menu->waterfall = new stdclass();
@@ -898,7 +898,7 @@ $lang->waterfall->subMenu = new stdclass();
$lang->waterfall->subMenu->morelink = new stdclass();
$lang->waterfall->subMenu->morelink->workestimation = array('link' => 'Workestimation|workestimation|index|program=%s', 'subModule' => 'durationestimation,budget');
$lang->waterfall->subMenu->morelink->stakeholder = array('link' => 'Stakeholder|stakeholder|browse|', 'subModule' => 'stakeholder');
$lang->waterfall->subMenu->morelink->program = 'Project|program|edit|';
$lang->waterfall->subMenu->morelink->program = 'Project|program|PRJEdit|';
$lang->waterfallproduct = new stdclass();
$lang->workestimation = new stdclass();
module/common/lang/fr.php
+2 -2
View File
@@ -875,7 +875,7 @@ $lang->menu->scrum->morelink = array('link' => 'More|project|morelink', 'c
$lang->scrum = new stdclass();
$lang->scrum->subMenu = new stdclass();
$lang->scrum->subMenu->morelink = new stdclass();
$lang->scrum->subMenu->morelink->program = 'Program|program|edit|';
$lang->scrum->subMenu->morelink->program = 'Program|program|PRJEdit|';
/* Waterfall menu. */
$lang->menu->waterfall = new stdclass();
@@ -898,7 +898,7 @@ $lang->waterfall->subMenu = new stdclass();
$lang->waterfall->subMenu->morelink = new stdclass();
$lang->waterfall->subMenu->morelink->workestimation = array('link' => 'Workestimation|workestimation|index|program=%s', 'subModule' => 'durationestimation,budget');
$lang->waterfall->subMenu->morelink->stakeholder = array('link' => 'Stakeholder|stakeholder|browse|', 'subModule' => 'stakeholder');
$lang->waterfall->subMenu->morelink->program = 'Project|program|edit|';
$lang->waterfall->subMenu->morelink->program = 'Project|program|PRJEdit|';
$lang->waterfallproduct = new stdclass();
$lang->workestimation = new stdclass();
module/common/lang/vi.php
+2 -2
View File
@@ -875,7 +875,7 @@ $lang->menu->scrum->morelink = array('link' => 'More|project|morelink', 'c
$lang->scrum = new stdclass();
$lang->scrum->subMenu = new stdclass();
$lang->scrum->subMenu->morelink = new stdclass();
$lang->scrum->subMenu->morelink->program = 'Program|program|edit|';
$lang->scrum->subMenu->morelink->program = 'Program|program|PRJEdit|';
/* Waterfall menu. */
$lang->menu->waterfall = new stdclass();
@@ -898,7 +898,7 @@ $lang->waterfall->subMenu = new stdclass();
$lang->waterfall->subMenu->morelink = new stdclass();
$lang->waterfall->subMenu->morelink->workestimation = array('link' => 'Workestimation|workestimation|index|program=%s', 'subModule' => 'durationestimation,budget');
$lang->waterfall->subMenu->morelink->stakeholder = array('link' => 'Stakeholder|stakeholder|browse|', 'subModule' => 'stakeholder');
$lang->waterfall->subMenu->morelink->program = 'Project|program|edit|';
$lang->waterfall->subMenu->morelink->program = 'Project|program|PRJEdit|';
$lang->waterfallproduct = new stdclass();
$lang->workestimation = new stdclass();
module/common/lang/zh-cn.php
+2 -2
View File
@@ -875,7 +875,7 @@ $lang->menu->scrum->morelink = array('link' => '更多|project|morelink',
$lang->scrum = new stdclass();
$lang->scrum->subMenu = new stdclass();
$lang->scrum->subMenu->morelink = new stdclass();
$lang->scrum->subMenu->morelink->program = '项目|program|edit|';
$lang->scrum->subMenu->morelink->program = '项目|program|PRJEdit|';
/* Waterfall menu. */
$lang->menu->waterfall = new stdclass();
@@ -898,7 +898,7 @@ $lang->waterfall->subMenu = new stdclass();
$lang->waterfall->subMenu->morelink = new stdclass();
$lang->waterfall->subMenu->morelink->workestimation = array('link' => '估算|workestimation|index|program=%s', 'subModule' => 'durationestimation,budget');
$lang->waterfall->subMenu->morelink->stakeholder = array('link' => '干系人|stakeholder|browse|', 'subModule' => 'stakeholder');
$lang->waterfall->subMenu->morelink->program = '项目|program|edit|';
$lang->waterfall->subMenu->morelink->program = '项目|program|PRJEdit|';
$lang->waterfallproduct = new stdclass();
$lang->workestimation = new stdclass();
module/common/lang/zh-tw.php
+2 -2
View File
@@ -875,7 +875,7 @@ $lang->menu->scrum->morelink = array('link' => '更多|project|morelink',
$lang->scrum = new stdclass();
$lang->scrum->subMenu = new stdclass();
$lang->scrum->subMenu->morelink = new stdclass();
$lang->scrum->subMenu->morelink->program = '項目|program|edit|';
$lang->scrum->subMenu->morelink->program = '項目|program|PRJEdit|';
/* Waterfall menu. */
$lang->menu->waterfall = new stdclass();
@@ -898,7 +898,7 @@ $lang->waterfall->subMenu = new stdclass();
$lang->waterfall->subMenu->morelink = new stdclass();
$lang->waterfall->subMenu->morelink->workestimation = array('link' => '估算|workestimation|index|program=%s', 'subModule' => 'durationestimation,budget');
$lang->waterfall->subMenu->morelink->stakeholder = array('link' => '干係人|stakeholder|browse|', 'subModule' => 'stakeholder');
$lang->waterfall->subMenu->morelink->program = '項目|program|edit|';
$lang->waterfall->subMenu->morelink->program = '項目|program|PRJEdit|';
$lang->waterfallproduct = new stdclass();
$lang->workestimation = new stdclass();
module/common/model.php
+11 -6
View File
@@ -898,17 +898,19 @@ class commonModel extends model
echo '<li>' . html::a(helper::createLink('my', 'index'), $lang->zentaoPMS) . '</li>';
if($moduleName != 'index')
{
if(!isset($lang->menu->$mainMenu)) return print("</ul>");
$menuLink = $lang->menu->$mainMenu;
if(is_array($menuLink)) $menuLink = $menuLink['link'];
list($menuLabel, $module, $method) = explode('|', $menuLink);
echo '<li>' . html::a(helper::createLink($module, $method), $menuLabel) . '</li>';
if(isset($lang->menu->$mainMenu))
{
$menuLink = $lang->menu->$mainMenu;
if(is_array($menuLink)) $menuLink = $menuLink['link'];
list($menuLabel, $module, $method) = explode('|', $menuLink);
echo '<li>' . html::a(helper::createLink($module, $method), $menuLabel) . '</li>';
}
}
else
{
echo '<li>' . $lang->index->common . '</li>';
}
if(empty($position))
{
echo '</ul>';
@@ -1718,6 +1720,9 @@ EOD;
$module = strtolower($module);
$method = strtolower($method);
/* More menus do not require permission control. */
if($module == 'project' && $method == 'morelink') return true;
/* Check the parent object is closed. */
if(!empty($method) and strpos('close|batchclose', $method) === false and !commonModel::canBeChanged($module, $object)) return false;
module/weekly/control.php
+1 -1
View File
@@ -7,7 +7,7 @@
* @author Xiying Guan <guanxiying@xirangit.com>
* @package weekly
* @version $Id$
* @link http://www.chanzhi.org
* @link http://www.zentao.net
*/
class weekly extends control
{
module/weekly/model.php
+1 -1
View File
@@ -7,7 +7,7 @@
* @author Xiying Guan <guanxiying@xirangit.com>
* @package weekly
* @version $Id$
* @link http://www.chanzhi.org
* @link http://www.zentao.net
*/
class weeklyModel extends model
{
module/workestimation/control.php
+14 -13
View File
@@ -7,44 +7,45 @@
* @author Xiying Guan <guanxiying@xirangit.com>
* @package workestimation
* @version $Id$
* @link http://www.chanzhi.org
* @link http://www.zentao.net
*/
class workestimation extends control
{
/**
* Index.
* Project workload estimations.
*
* @param int $program
* @param int $projectID
* @access public
* @return void
*/
public function index($program = 0)
public function index($projectID = 0)
{
$program = $program ? $program : $this->session->PRJ;
$projectID = $projectID ? $projectID : $this->session->PRJ;
if($_POST)
{
$result = $this->workestimation->save($program);
$result = $this->workestimation->save($projectID);
if($result) $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $this->server->http_referer));
$this->send(array('result' => 'fail', 'message' => dao::getError()));
}
$this->view->title = $this->lang->workestimation->common;
$this->view->programScale = $this->workestimation->getProgramScale($program);
$this->view->hourPoint = $this->config->custom->hourPoint;
$budget = $this->workestimation->getBudget($program);
$scale = $this->workestimation->getProgramScale($projectID);
$budget = $this->workestimation->getBudget($projectID);
if(!isset($this->config->project)) $this->config->project = new stdclass();
if(empty($budget))
{
$this->app->loadConfig('estimate');
$budget = new stdclass();
$budget->scale = $this->view->programScale;
$budget->scale = $scale;
$budget->productivity = zget($this->config->custom, 'efficiency', '');
$budget->unitLaborCost = zget($this->config->custom, 'cost', '');
$budget->dayHour = zget($this->config->project, 'defaultWorkhours', '');
}
$this->view->budget = $budget;
$this->view->title = $this->lang->workestimation->common;
$this->view->position[] = $this->lang->workestimation->common;
$this->view->hourPoint = $this->config->custom->hourPoint;
$this->view->programScale = $scale;
$this->view->budget = $budget;
$this->display();
}
}
module/workestimation/model.php
+1 -1
View File
@@ -7,7 +7,7 @@
* @author Xiying Guan <guanxiying@xirangit.com>
* @package workestimation
* @version $Id$
* @link http://www.chanzhi.org
* @link http://www.zentao.net
*/
class workestimationModel extends model
{