diff --git a/module/product/control.php b/module/product/control.php index cb532aedbd..dbe54bcad4 100644 --- a/module/product/control.php +++ b/module/product/control.php @@ -72,11 +72,11 @@ class product extends control * @param string $status * @param int $productID * @param int $branch - * @param int $PRJMine + * @param int $projectMine * @access public * @return void */ - public function project($status = 'all', $productID = 0, $branch = 0, $PRJMine = 0) + public function project($status = 'all', $productID = 0, $branch = 0, $projectMine = 0) { $this->product->setMenu($this->products, $productID, $branch); $this->lang->product->switcherMenu = $this->product->getSwitcher($productID); @@ -87,7 +87,7 @@ class product extends control /* Get PM id list. */ $accounts = array(); - $projectStats = $this->product->getProjectStatsByProduct($productID, $status, $branch, $PRJMine); + $projectStats = $this->product->getProjectStatsByProduct($productID, $status, $branch, $projectMine); foreach($projectStats as $project) { if(!empty($project->PM) and !in_array($project->PM, $accounts)) $accounts[] = $project->PM; @@ -200,11 +200,11 @@ class product extends control if($this->app->rawModule == 'projectstory') { $this->session->set('currentProductType', $product->type); - $projectProducts = $this->product->getProductsByProject($this->session->PRJ); + $projectProducts = $this->product->getProductsByProject($this->session->project); $productPlans = $this->loadModel('project')->getPlans($projectProducts); if($browseType == 'bybranch') $param = $branch; - $stories = $this->story->getProjectStories($this->session->PRJ, $productID, $branch, $sort, $browseType, $param, 'story', '', $pager); + $stories = $this->story->getProjectStories($this->session->project, $productID, $branch, $sort, $browseType, $param, 'story', '', $pager); } /* Process the sql, get the conditon partion, save it to session. */ @@ -299,7 +299,7 @@ class product extends control $this->executeHooks($productID); $moduleName = $programID ? 'program' : $this->moduleName; - $methodName = $programID ? 'pgmproduct' : 'browse'; + $methodName = $programID ? 'product' : 'browse'; $param = $programID ? "programID=$programID" : "productID=$productID"; $locate = $this->createLink($moduleName, $methodName, $param); $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $locate)); @@ -308,7 +308,7 @@ class product extends control if($programID) { $this->app->rawModule = 'program'; - $this->app->rawMethod = 'pgmproduct'; + $this->app->rawMethod = 'product'; $this->lang->navGroup->program = 'program'; $this->loadModel('program')->setPGMViewMenu($programID); $this->lang->program->switcherMenu = $this->program->getPGMSwitcher($programID, true); @@ -435,7 +435,7 @@ class product extends control $this->executeHooks($productID); $moduleName = $programID ? 'program' : 'product'; - $methodName = $programID ? 'pgmproduct' : 'view'; + $methodName = $programID ? 'product' : 'view'; $param = $programID ? "programID=$programID" : "product=$productID"; $locate = $this->createLink($moduleName, $methodName, $param); $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $locate)); @@ -450,7 +450,7 @@ class product extends control if($programID) { $this->app->rawModule = 'program'; - $this->app->rawMethod = 'pgmproduct'; + $this->app->rawMethod = 'product'; $this->lang->navGroup->program = 'program'; $this->loadModel('program')->setPGMViewMenu($programID); $this->lang->program->switcherMenu = $this->program->getPGMSwitcher($programID, true); @@ -520,7 +520,7 @@ class product extends control } } - $locate = $this->createLink('program', 'pgmproduct', "programID=$programID"); + $locate = $this->createLink('program', 'product', "programID=$programID"); die(js::locate($locate, 'parent')); } @@ -542,7 +542,7 @@ class product extends control /* Navigation remains under the program. */ $this->app->rawModule = 'program'; - $this->app->rawMethod = 'pgmproduct'; + $this->app->rawMethod = 'product'; $this->lang->navGroup->program = 'program'; $this->loadModel('program')->setPGMViewMenu($programID); $this->lang->program->switcherMenu = $this->program->getPGMSwitcher($programID, true); @@ -899,7 +899,7 @@ class product extends control $moduleGroup = zget($this->lang->navGroup, $module); $moduleGroup = in_array($moduleGroup, array('product', 'qa'))? $moduleGroup : 'project'; - $products = $moduleGroup == 'project' ? $this->product->getProductsByProject($this->session->PRJ) : $this->product->getList(); + $products = $moduleGroup == 'project' ? $this->product->getProductsByProject($this->session->project) : $this->product->getList(); $this->view->link = $this->product->getProductLink($module, $method, $extra); $this->view->productID = $productID; @@ -907,7 +907,7 @@ class product extends control $this->view->method = $method; $this->view->extra = $extra; $this->view->products = $products; - $this->view->projectID = $moduleGroup == 'project' ? $this->session->PRJ : 0; + $this->view->projectID = $moduleGroup == 'project' ? $this->session->project : 0; $this->view->programs = $this->loadModel('program')->getPGMPairs(true); $this->view->openApp = $moduleGroup; $this->display(); @@ -957,7 +957,7 @@ class product extends control $moduleIndex = array_search('product', $this->lang->noMenuModule); if($moduleIndex !== false) unset($this->lang->noMenuModule[$moduleIndex]); - $this->view->project = $this->loadModel('program')->getPRJById($this->session->PRJ); + $this->view->project = $this->loadModel('project')->getById($this->session->project); } $this->loadModel($fromModule)->setMenu($this->products, key($this->products)); @@ -1168,7 +1168,7 @@ class product extends control $this->session->set('productList', $this->app->getURI(true)); /* Get all product list. Locate to the create product page if there is no product. */ - $this->products = $this->product->getPairs('', $this->session->PRJ); + $this->products = $this->product->getPairs('', $this->session->project); if(empty($this->products) and strpos('create|view', $this->methodName) === false) $this->locate($this->createLink('product', 'create')); /* Get current product. */ diff --git a/module/product/model.php b/module/product/model.php index 679d0236b4..2c51361194 100644 --- a/module/product/model.php +++ b/module/product/model.php @@ -864,11 +864,11 @@ class productModel extends model * @param int $productID * @param string $browseType * @param int $branch - * @param int $PRJMine + * @param int $projectMine * @access public * @return array */ - public function getProjectListByProduct($productID, $browseType = 'all', $branch = 0, $PRJMine = 0) + public function getProjectListByProduct($productID, $browseType = 'all', $branch = 0, $projectMine = 0) { $projectList = $this->dao->select('t2.*')->from(TABLE_PROJECTPRODUCT)->alias('t1') ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project = t2.id') @@ -876,7 +876,7 @@ class productModel extends model ->andWhere('t2.type')->eq('project') ->beginIF($browseType != 'all')->andWhere('t2.status')->eq($browseType)->fi() ->beginIF(!$this->app->user->admin)->andWhere('id')->in($this->app->user->view->projects)->fi() - ->beginIF($this->cookie->PRJMine or $PRJMine) + ->beginIF($this->cookie->projectMine or $projectMine) ->andWhere('t2.openedBy', true)->eq($this->app->user->account) ->orWhere('t2.PM')->eq($this->app->user->account) ->markRight(1) @@ -899,13 +899,13 @@ class productModel extends model * @param int $productID * @param string $browseType * @param int $branch - * @param int $PRJMine + * @param int $projectMine * @access public * @return array */ - public function getProjectStatsByProduct($productID, $browseType = 'all', $branch = 0, $PRJMine = 0) + public function getProjectStatsByProduct($productID, $browseType = 'all', $branch = 0, $projectMine = 0) { - $projects = $this->getProjectListByProduct($productID, $browseType, $branch, $PRJMine); + $projects = $this->getProjectListByProduct($productID, $browseType, $branch, $projectMine); if(empty($projects)) return array(); $projectKeys = array_keys($projects); @@ -914,12 +914,12 @@ class productModel extends model $emptyHour = array('totalEstimate' => 0, 'totalConsumed' => 0, 'totalLeft' => 0, 'progress' => 0); /* Get all tasks and compute totalEstimate, totalConsumed, totalLeft, progress according to them. */ - $tasks = $this->dao->select('id, PRJ, estimate, consumed, `left`, status, closedReason') + $tasks = $this->dao->select('id, project, estimate, consumed, `left`, status, closedReason') ->from(TABLE_TASK) - ->where('PRJ')->in($projectKeys) + ->where('project')->in($projectKeys) ->andWhere('parent')->lt(1) ->andWhere('deleted')->eq(0) - ->fetchGroup('PRJ', 'id'); + ->fetchGroup('project', 'id'); /* Compute totalEstimate, totalConsumed, totalLeft. */ foreach($tasks as $projectID => $projectTasks) @@ -990,7 +990,7 @@ class productModel extends model if(empty($productID)) return array(); if(empty($projectID)) return $this->getAllExecutionPairsByProduct($productID, $branch); - $project = $this->loadModel('program')->getPRJByID($projectID); + $project = $this->loadModel('project')->getByID($projectID); $orderBy = $project->model == 'waterfall' ? 'begin_asc,id_asc' : 'begin_desc,id_desc'; $executions = $this->dao->select('t2.id,t2.name,t2.grade,t2.parent')->from(TABLE_PROJECTPRODUCT)->alias('t1') @@ -1059,7 +1059,7 @@ class productModel extends model foreach($executions as $id => $execution) $projectIdList[$execution->project] = $execution->project; $executionPairs = array(); - $projectPairs = $this->loadModel('program')->getPRJPairsByIdList($projectIdList); + $projectPairs = $this->loadModel('project')->getPairsByIdList($projectIdList); foreach($executions as $id => $execution) { if($execution->grade == 2 && isset($executions[$execution->parent])) diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php index f9c7c8721e..d113442d97 100644 --- a/module/product/view/browse.html.php +++ b/module/product/view/browse.html.php @@ -14,7 +14,7 @@ -session->PRJ);?> +session->project);?> app->rawModule);?> app->rawModule == 'projectstory'; if(commonModel::isTutorialMode()) { $wizardParams = helper::safe64Encode("productID=$productID&branch=$branch&moduleID=$moduleID"); - if($isProjectStory) $wizardParams = helper::safe64Encode("productID=$productID&branch=$branch&moduleID=$moduleID&storyID=&projectID={$this->session->PRJ}"); + if($isProjectStory) $wizardParams = helper::safe64Encode("productID=$productID&branch=$branch&moduleID=$moduleID&storyID=&projectID={$this->session->project}"); $link = $this->createLink('tutorial', 'wizard', "module=story&method=create¶ms=$wizardParams"); echo html::a($link, $lang->story->createCommon, '', "data-group='$openApp'"); } else { $link = $this->createLink('story', 'create', "product=$productID&branch=$branch&moduleID=$moduleID&storyID=0&projectID=0&bugID=0&planID=0&todoID=0&extra=&type=$storyType"); - if($isProjectStory) $link = $this->createLink('story', 'create', "product=$productID&branch=$branch&moduleID=$moduleID&storyID=0&projectID={$this->session->PRJ}"); + if($isProjectStory) $link = $this->createLink('story', 'create', "product=$productID&branch=$branch&moduleID=$moduleID&storyID=0&projectID={$this->session->project}"); $disabled = ''; if(!common::hasPriv('story', 'create')) { @@ -158,7 +158,7 @@ $isProjectStory = $this->app->rawModule == 'projectstory';
  • > createLink('story', 'batchCreate', "productID=$productID&branch=$branch&moduleID=$moduleID&storyID=0&project=0&plan=0&type=$storyType"); - if($isProjectStory) $batchLink = $this->createLink('story', 'batchCreate', "productID=$productID&branch=$branch&moduleID=$moduleID&storyID=0&project={$this->session->PRJ}"); + if($isProjectStory) $batchLink = $this->createLink('story', 'batchCreate', "productID=$productID&branch=$branch&moduleID=$moduleID&storyID=0&project={$this->session->project}"); echo html::a($batchLink, $lang->story->batchCreate, '', "data-group='$openApp'"); ?>
    • @@ -178,7 +178,7 @@ $isProjectStory = $this->app->rawModule == 'projectstory'; echo " {$lang->project->linkStory} "; echo ''; echo "'; } @@ -212,7 +212,7 @@ $isProjectStory = $this->app->rawModule == 'projectstory';

    story->noStory : $lang->story->noRequirement;?> - session->PRJ : 0;?> + session->project : 0;?> createLink('story', 'create', "productID={$productID}&branch={$branch}&moduleID={$moduleID}&storyID=0&projectID=$projectID&bugID=0&planID=0&todoID=0&extra=&type=$storyType"), " " . $lang->story->createCommon, '', "class='btn btn-info' data-group='$openApp'");?> diff --git a/module/product/view/project.html.php b/module/product/view/project.html.php index 779319baab..7645c461ab 100644 --- a/module/product/view/project.html.php +++ b/module/product/view/project.html.php @@ -15,7 +15,7 @@ project->featureBar['all'] as $key => $label):?> {$label}" . ($status == $key ? " " . count($projectStats) . "" : ''), '', "class='btn btn-link" . ($status == $key ? ' btn-active-text' : '') . "' id='{$key}Tab'");?> - $lang->program->mine), '', $this->cookie->PRJMine ? 'checked=checked' : '');?> + $lang->program->mine), '', $this->cookie->projectMine ? 'checked=checked' : '');?>

    product->projectInfo;?>>
    @@ -23,7 +23,7 @@

    - program->noPRJ;?> + project->empty;?>

    @@ -32,16 +32,16 @@ idAB;?> - program->PRJName;?> - program->common;?> - program->PM;?> - program->begin;?> - program->end;?> - program->PRJStatus;?> - program->PRJBudget;?> - program->PRJEstimate;?> - program->PRJConsume;?> - program->PRJProgress;?> + project->name;?> + project->common;?> + project->PM;?> + project->begin;?> + project->end;?> + project->status;?> + project->budget;?> + project->estimate;?> + project->consume;?> + project->progress;?> diff --git a/module/product/view/showerrornone.html.php b/module/product/view/showerrornone.html.php index c19aa47663..fc223900bd 100644 --- a/module/product/view/showerrornone.html.php +++ b/module/product/view/showerrornone.html.php @@ -13,7 +13,7 @@
    -

    product->noProduct;?> id&programID=$project->parent", " " . $lang->program->PRJManageProducts, '', "class='btn btn-info'");?>

    +

    product->noProduct;?> id&programID=$project->parent", " " . $lang->project->manageProducts, '', "class='btn btn-info'");?>

    diff --git a/module/program/control.php b/module/program/control.php index d4b9caeda5..b57a202211 100644 --- a/module/program/control.php +++ b/module/program/control.php @@ -152,14 +152,14 @@ class program extends control $this->view->title = $this->lang->program->create; $this->view->position[] = $this->lang->program->create; - $this->view->pmUsers = $this->loadModel('user')->getPairs('noclosed|nodeleted|pmfirst'); - $this->view->poUsers = $this->user->getPairs('noclosed|nodeleted|pofirst'); - $this->view->users = $this->user->getPairs('noclosed|nodeleted'); - $this->view->parentProgram = $parentProgram; - $this->view->parents = $this->program->getParentPairs(); - $this->view->programList = $this->program->getList(); - $this->view->budgetUnitList = $this->project->getBudgetUnitList(); - $this->view->availableBudget = $this->program->getBudgetLeft($parentProgram); + $this->view->pmUsers = $this->loadModel('user')->getPairs('noclosed|nodeleted|pmfirst'); + $this->view->poUsers = $this->user->getPairs('noclosed|nodeleted|pofirst'); + $this->view->users = $this->user->getPairs('noclosed|nodeleted'); + $this->view->parentProgram = $parentProgram; + $this->view->parents = $this->program->getParentPairs(); + $this->view->programList = $this->program->getList(); + $this->view->budgetUnitList = $this->project->getBudgetUnitList(); + $this->view->budgetLeft = $this->program->getBudgetLeft($parentProgram); $this->display(); } @@ -633,7 +633,7 @@ class program extends control * @access public * @return void */ - public function ajaxGetPGMDropMenu($programID = 0, $module, $method) + public function ajaxGetDropMenu($programID = 0, $module, $method) { $this->view->programID = $programID; $this->view->module = $module; diff --git a/module/program/model.php b/module/program/model.php index 313324a30d..9c81240fe4 100644 --- a/module/program/model.php +++ b/module/program/model.php @@ -128,11 +128,11 @@ class programModel extends model * @param string $orderBy * @param object $pager * @param int $programTitle - * @param int $PRJMine + * @param int $projectMine * @access public * @return object */ - public function getProjectList($programID = 0, $browseType = 'all', $queryID = 0, $orderBy = 'id_desc', $pager = null, $programTitle = 0, $PRJMine = 0) + public function getProjectList($programID = 0, $browseType = 'all', $queryID = 0, $orderBy = 'id_desc', $pager = null, $programTitle = 0, $projectMine = 0) { $path = ''; if($programID) @@ -148,7 +148,7 @@ class programModel extends model ->beginIF($path)->andWhere('path')->like($path . '%')->fi() ->beginIF(!$this->app->user->admin and $this->config->systemMode == 'new')->andWhere('id')->in($this->app->user->view->projects)->fi() ->beginIF(!$this->app->user->admin and $this->config->systemMode == 'classic')->andWhere('id')->in($this->app->user->view->sprints)->fi() - ->beginIF($this->cookie->PRJMine or $PRJMine) + ->beginIF($this->cookie->projectMine or $projectMine) ->andWhere('openedBy', true)->eq($this->app->user->account) ->orWhere('PM')->eq($this->app->user->account) ->markRight(1) @@ -308,28 +308,28 @@ class programModel extends model $this->loadModel('personnel')->updateWhitelist($whitelist, 'program', $programID); if($program->acl != 'open') $this->loadModel('user')->updateUserView($programID, 'program'); - $this->file->updateObjectID($this->post->uid, $programID, 'project'); + $this->file->updateObjectID($this->post->uid, $programID, 'program'); $this->setTreePath($programID); /* Add program admin.*/ $groupPriv = $this->dao->select('t1.*')->from(TABLE_USERGROUP)->alias('t1') ->leftJoin(TABLE_GROUP)->alias('t2')->on('t1.group = t2.id') ->where('t1.account')->eq($this->app->user->account) - ->andWhere('t2.role')->eq('PRJAdmin') + ->andWhere('t2.role')->eq('programAdmin') ->fetch(); if(!empty($groupPriv)) { - $newProgram = $groupPriv->PRJ . ",$programID"; - $this->dao->update(TABLE_USERGROUP)->set('PRJ')->eq($newProgram)->where('account')->eq($groupPriv->account)->andWhere('`group`')->eq($groupPriv->group)->exec(); + $newProgram = $groupPriv->project . ",$programID"; + $this->dao->update(TABLE_USERGROUP)->set('program')->eq($newProgram)->where('account')->eq($groupPriv->account)->andWhere('`group`')->eq($groupPriv->group)->exec(); } else { - $PRJAdminID = $this->dao->select('id')->from(TABLE_GROUP)->where('role')->eq('PRJAdmin')->fetch('id'); + $programAdminID = $this->dao->select('id')->from(TABLE_GROUP)->where('role')->eq('programAdmin')->fetch('id'); $groupPriv = new stdclass(); $groupPriv->account = $this->app->user->account; - $groupPriv->group = $PRJAdminID; - $groupPriv->PRJ = $programID; + $groupPriv->group = $programAdminID; + $groupPriv->project = $programID; $this->dao->insert(TABLE_USERGROUP)->data($groupPriv)->exec(); } @@ -624,12 +624,12 @@ class programModel extends model $this->loadModel('user')->updateUserView($programID, 'program', $changedAccounts); /* Update children user view. */ - $childPGMList = $this->dao->select('id')->from(TABLE_PROJECT)->where('path')->like("%,$programID,%")->andWhere('type')->eq('program')->fetchPairs(); - $childPRJList = $this->dao->select('id')->from(TABLE_PROJECT)->where('path')->like("%,$programID,%")->andWhere('type')->eq('project')->fetchPairs(); + $childPrograms = $this->dao->select('id')->from(TABLE_PROJECT)->where('path')->like("%,$programID,%")->andWhere('type')->eq('program')->fetchPairs(); + $childProjects = $this->dao->select('id')->from(TABLE_PROJECT)->where('path')->like("%,$programID,%")->andWhere('type')->eq('project')->fetchPairs(); $childProducts = $this->dao->select('id')->from(TABLE_PRODUCT)->where('program')->eq($programID)->fetchPairs(); - if(!empty($childPGMList)) $this->user->updateUserView($childPGMList, 'program', $changedAccounts); - if(!empty($childPRJList)) $this->user->updateUserView($childPRJList, 'project', $changedAccounts); + if(!empty($childPrograms)) $this->user->updateUserView($childPrograms, 'program', $changedAccounts); + if(!empty($childProjects)) $this->user->updateUserView($childProjects, 'project', $changedAccounts); if(!empty($childProducts)) $this->user->updateUserView($childProducts, 'product', $changedAccounts); } @@ -799,14 +799,14 @@ class programModel extends model * @param string $orderBy * @param object $pager * @param string $programTitle - * @param int $PRJMine + * @param int $projectMine * @access public * @return array */ - public function getProjectStats($programID = 0, $browseType = 'undone', $queryID = 0, $orderBy = 'id_desc', $pager = null, $programTitle = 0, $PRJMine = 0) + public function getProjectStats($programID = 0, $browseType = 'undone', $queryID = 0, $orderBy = 'id_desc', $pager = null, $programTitle = 0, $projectMine = 0) { /* Init vars. */ - $projects = $this->getProjectList($programID, $browseType, $queryID, $orderBy, $pager, $programTitle, $PRJMine); + $projects = $this->getProjectList($programID, $browseType, $queryID, $orderBy, $pager, $programTitle, $projectMine); if(empty($projects)) return array(); $projectKeys = array_keys($projects); @@ -815,12 +815,12 @@ class programModel extends model $emptyHour = array('totalEstimate' => 0, 'totalConsumed' => 0, 'totalLeft' => 0, 'progress' => 0); /* Get all tasks and compute totalEstimate, totalConsumed, totalLeft, progress according to them. */ - $tasks = $this->dao->select('id, PRJ, estimate, consumed, `left`, status, closedReason') + $tasks = $this->dao->select('id, project, estimate, consumed, `left`, status, closedReason') ->from(TABLE_TASK) - ->where('PRJ')->in($projectKeys) + ->where('project')->in($projectKeys) ->andWhere('parent')->lt(1) ->andWhere('deleted')->eq(0) - ->fetchGroup('PRJ', 'id'); + ->fetchGroup('project', 'id'); /* Compute totalEstimate, totalConsumed, totalLeft. */ foreach($tasks as $projectID => $projectTasks) diff --git a/module/program/view/ajaxgetpgmdropmenu.html.php b/module/program/view/ajaxgetdropmenu.html.php similarity index 100% rename from module/program/view/ajaxgetpgmdropmenu.html.php rename to module/program/view/ajaxgetdropmenu.html.php diff --git a/module/program/view/ajaxgetprjdropmenu.html.php b/module/program/view/ajaxgetprjdropmenu.html.php deleted file mode 100644 index 2974492017..0000000000 --- a/module/program/view/ajaxgetprjdropmenu.html.php +++ /dev/null @@ -1,57 +0,0 @@ - - - -
    -
    -
    - -
    -
    - ' . $lang->project->all, '', 'class="not-list-item"'); ?> - project->doneProjects;?> -
    -
    -
    -
    - -
    -
    -
    - - diff --git a/module/project/control.php b/module/project/control.php index 45aad7835b..d34efd0379 100644 --- a/module/project/control.php +++ b/module/project/control.php @@ -219,7 +219,7 @@ class project extends control $this->view->pager = $pager; $this->view->projectID = $projectID; $this->view->project = $this->project->getByID($projectID); - $this->view->ProjectTree = $this->project->getTreeMenu(0, array('projectmodel', 'createManageLink'), 0, 'list'); + $this->view->projectTree = $this->project->getTreeMenu(0, array('projectmodel', 'createManageLink'), 0, 'list'); $this->view->users = $this->loadModel('user')->getPairs('noletter|pofirst|nodeleted'); $this->view->browseType = $browseType; $this->view->param = $param; diff --git a/module/project/js/prjbatchedit.js b/module/project/js/batchedit.js similarity index 100% rename from module/project/js/prjbatchedit.js rename to module/project/js/batchedit.js diff --git a/module/project/js/browse.js b/module/project/js/browse.js index af9e6c0e54..6efb00afd4 100644 --- a/module/project/js/browse.js +++ b/module/project/js/browse.js @@ -1,9 +1,12 @@ $(function() { - $('input[name^="mine"]').click(function() + $('#projectMine').click(function() { var mine = $(this).is(':checked') ? 1 : 0; - $.cookie('mine', mine, {expires:config.cookieLife, path:config.webRoot}); + $.cookie('projectMine', mine, {expires:config.cookieLife, path:config.webRoot}); window.location.reload(); }); }); + +$('#project' + projectID).addClass('active'); +$(".tree .active").parent('li').addClass('active'); diff --git a/module/project/js/create.js b/module/project/js/create.js index b4abdeec28..98844fb4a8 100644 --- a/module/project/js/create.js +++ b/module/project/js/create.js @@ -1,33 +1,238 @@ $(function() { - $('#copyProjects a').click(function(){setCopyProject($(this).data('id')); $('#copyProjectModal').modal('hide')}); - $('#isCat').change(function() + $('#copyProjects a').click(function() { - if($(this).prop('checked')) - { - $('#longTimeBox').removeClass('hidden'); - } - else - { - $('#longTimeBox').addClass('hidden'); - $('#longTimeBox').find('#longTime').prop('checked', false).change(); - } + setCopyProject($(this).data('id')); + $('#copyProjectModal').modal('hide') }); - $('#longTime').change(function() + setAclList($("#parent").val()); + + if(typeof(currentPlanID) == 'undefined') { - if($(this).prop('checked')) + $('#productsBox select[id^="products"]').each(function() { - $('#end').val('').attr('disabled', 'disabled'); - } - else - { - $('#end').removeAttr('disabled'); - } - }); + var branchID = 0; + if($(this).closest('.input-group').find('select[id^="branch"]').size() > 0) + { + var branchID = $(this).closest('.input-group').find('select[id^="branch"]').val(); + } + loadPlans($(this), branchID); + }); + } + + $('[data-toggle="popover"]').popover(); }); -function setCopyProject(copiedProgramID) +/** + * Set parent project. + * + * @access public + * @return void + */ +function setParentProgram() { - location.href = createLink('project', 'create', 'template=' + template + '&projectID=' + parentProgramID + '©ProgramID=' + copiedProgramID); + var parentProgram = $("#parent").val(); + location.href = createLink('project', 'create', 'model=' + model + '&projectID=' + parentProgram + '&from=' + from); } + +/** + * Set copy project. + * + * @param int $copyProjectID + * @access public + * @return void + */ +function setCopyProject(copyProjectID) +{ + location.href = createLink('project', 'create', 'model=' + model + '&projectID=' + projectID + '&from=' + from + '©ProjectID=' + copyProjectID); +} + +/** + * Add new product. + * + * @param obj $obj + * @access public + * @return void + */ +function addNewProduct(obj) +{ + if($(obj).attr('checked')) + { + $('#productName').removeAttr('disabled', true); + $('#productName').closest('tr').removeClass('hidden'); + $('#plansBox .col-sm-4').find('select').attr('disabled', true).trigger("chosen:updated"); + $('#plansBox').closest('tr').addClass('hidden'); + $('#productsBox .col-sm-4 .input-group').find('select').attr('disabled', true).trigger("chosen:updated"); + } + else + { + $('#productName').attr('disabled', true); + $('#productName').closest('tr').addClass('hidden'); + $('#plansBox .col-sm-4').find('select').removeAttr('disabled', true).trigger("chosen:updated"); + $('#plansBox').closest('tr').removeClass('hidden'); + $('#productsBox .col-sm-4 .input-group').find('select').removeAttr('disabled').trigger("chosen:updated"); + } +} + +/** + * Set access control box. + * + * @param int $projectID + * @access public + * @return void + */ +function setAclList(projectID) +{ + if(projectID != 0) + { + $('.aclBox').html($('#programAcl').html()); + } + else + { + $('.aclBox').html($('#projectAcl').html()); + } +} + +/** + * Load branches. + * + * @param int $product + * @access public + * @return void + */ +function loadBranches(product) +{ + $('#productsBox select').each(function() + { + var $product = $(product); + if($product.val() != 0 && $product.val() == $(this).val() && $product.attr('id') != $(this).attr('id')) + { + alert(errorSameProducts); + $product.val(0); + $product.trigger("chosen:updated"); + return false; + } + }); + + if($('#productsBox .input-group:last select:first').val() != 0) + { + var length = $('#productsBox .input-group').size(); + var $html = $('#productsBox .col-sm-4:last').html(); + $('#productsBox .col-sm-4:last').find('.input-group-addon').remove(); + $('#productsBox .row').append('
    ' + $html + '
    '); + if($('#productsBox .input-group:last select').size() >= 2) $('#productsBox .input-group:last select:last').remove(); + $('#productsBox .input-group:last .chosen-container').remove(); + $('#productsBox .input-group:last select:first').attr('name', 'products[' + length + ']').attr('id', 'products' + length); + $('#productsBox .input-group:last .chosen').chosen(); + + adjustProductBoxMargin(); + } + + var $inputgroup = $(product).closest('.input-group'); + if($inputgroup.find('select').size() >= 2) $inputgroup.removeClass('has-branch').find('select:last').remove(); + if($inputgroup.find('.chosen-container').size() >= 2) $inputgroup.find('.chosen-container:last').remove(); + + var index = $inputgroup.find('select:first').attr('id').replace('products' , ''); + $.get(createLink('branch', 'ajaxGetBranches', "productID=" + $(product).val()), function(data) + { + if(data) + { + $inputgroup.addClass('has-branch').append(data); + $inputgroup.find('select:last').attr('name', 'branch[' + index + ']').attr('id', 'branch' + index).attr('onchange', "loadPlans('#products" + index + "', this.value)").chosen(); + } + }); + + loadPlans(product); +} + +/** + * Load plans. + * + * @param obj $product + * @param int $branchID + * @access public + * @return void + */ +function loadPlans(product, branchID) +{ + if($('#plansBox').size() == 0) return false; + + var productID = $(product).val(); + var branchID = typeof(branchID) == 'undefined' ? 0 : branchID; + var index = $(product).attr('id').replace('products', ''); + + if(productID != 0) + { + if(typeof(planID) == 'undefined') planID = 0; + planID = $("select#plans" + productID).val() != '' ? $("select#plans" + productID).val() : planID; + $.get(createLink('product', 'ajaxGetPlans', "productID=" + productID + '&branch=' + branchID + '&planID=' + planID + '&fieldID&needCreate=&expired=' + ((config.currentMethod == 'create' || config.currentMethod == 'edit') ? 'unexpired' : '')), function(data) + { + if(data) + { + if($("div#plan" + index).size() == 0) $("#plansBox .row").append('
    '); + $("div#plan" + index).html(data).find('select').attr('name', 'plans[' + productID + ']').attr('id', 'plans' + productID).chosen(); + + adjustPlanBoxMargin(); + } + }); + } +} + +/** + * Adjust product box margin. + * + * @access public + * @return void + */ +function adjustProductBoxMargin() +{ + var productRows = Math.ceil($('#productsBox > .row > .col-sm-4').length / 3); + if(productRows > 1) + { + for(i = 1; i <= productRows - 1; i++) + { + $('#productsBox .col-sm-4:lt(' + (i * 3) + ')').css('margin-bottom', '10px'); + } + } +} + +/** + * Adjust plan box margin. + * + * @access public + * @return void + */ +function adjustPlanBoxMargin() +{ + var planRows = Math.ceil($('#plansBox > .row > .col-sm-4').length / 3); + if(planRows > 1) + { + for(j = 1; j <= planRows - 1; j++) + { + $('#plansBox .col-sm-4:lt(' + (j * 3) + ')').css('margin-bottom', '10px'); + } + } +} + +/** + * Fuzzy search projects by project name. + * + * @access public + * @return void + */ +$('#projectName').on('keyup', function() +{ + var name = $(this).val(); + name = name.replace(/\s+/g, ''); + link = createLink('project', 'ajaxGetCopyProjects'); + $.post(link, {name: name, cpoyProjectID : copyProjectID}, function(data) + { + $('#copyProjects').html(data); + $('#copyProjects a').click(function() + { + setCopyProject($(this).data('id')); + $('#copyProjectModal').modal('hide'); + }); + }) +}) diff --git a/module/project/js/edit.js b/module/project/js/edit.js index 1dcb3582f2..6058478862 100644 --- a/module/project/js/edit.js +++ b/module/project/js/edit.js @@ -1,31 +1,86 @@ $(function() { - var endDate = $('#end').val(); - $('#isCat').change(function() + $('#parent').change(function() { - if($(this).prop('checked')) + var projectID = $(this).val(); + + /* Determine whether the project can change the project set. */ + link = createLink('project', 'ajaxCheckProduct', 'projectID=' + projectID + '&projectID=' + projectID); + $.getJSON(link, function(data) { - $('#longTimeBox').removeClass('hidden'); - $('#longTime').change(); - } - else + var changed = true; + + if(data && data.result) + { + changed = confirm(data.message); + if(changed) + { + $('#productsBox select').prop('disabled', true).trigger("chosen:updated"); + } + } + + if(data && !data.result) + { + $('#promptTable tbody tr').remove(); + for(var i in data.message) + { + var product = data.message[i]; + $('#promptTable').append(" " + product +" " + linkedProjectsTip +""); + for(var j in data.multiLinkedProjects) + { + if(i == j) + { + html = '' + for(k in data.multiLinkedProjects[j]) + { + var project = data.multiLinkedProjects[j][k]; + html += "

    " + project +"

    "; + } + $('#promptTable').append("" + html + ""); + } + } + } + + changed = false; + $('#promptBox').modal({show: true}); + } + + if(!changed) $("#parent").val(oldParent).trigger("chosen:updated"); + oldParent = $('#parent').val(); + }); + }); + + adjustProductBoxMargin(); + adjustPlanBoxMargin(); + + /* If the story of the product which linked the execution under the project, you don't allow to remove the product. */ + $("#productsBox select").each(function() + { + var isExisted = $.inArray($(this).attr('data-last'), unmodifiableProducts); + if(isExisted != -1) { - $('#longTimeBox').addClass('hidden'); - $('#longTimeBox').find('#longTime').prop('checked', false).change(); + $(this).prop('disabled', true).trigger("chosen:updated"); + $(this).siblings('div').find('span').attr('title', tip); } }); - $('#longTime').change(function() - { - if($(this).prop('checked')) - { - $('#end').val('').attr('disabled', 'disabled'); - } - else - { - $('#end').val(endDate).removeAttr('disabled'); - } - }); - - $('#isCat').change(); }); + +/** + * Set aclList. + * + * @param int $projectID + * @access public + * @return void + */ +function setAclList(projectID) +{ + if(projectID != 0) + { + $('.aclBox').html($('#programAcl').html()); + } + else + { + $('.aclBox').html($('#projectAcl').html()); + } +} diff --git a/module/project/js/prjmanagemembers.js b/module/project/js/managemembers.js similarity index 86% rename from module/project/js/prjmanagemembers.js rename to module/project/js/managemembers.js index 7512542b09..9fd244022d 100644 --- a/module/project/js/prjmanagemembers.js +++ b/module/project/js/managemembers.js @@ -31,6 +31,6 @@ function deleteItem(obj) function setDeptUsers(obj) { dept = $(obj).val(); // Get dept ID. - link = createLink('project', 'PRJManageMembers', 'projectID=' + projectID + '&dept=' + dept); // Create manageMembers link. + link = createLink('project', 'manageMembers', 'projectID=' + projectID + '&dept=' + dept); // Create manageMembers link. location.href=link; } diff --git a/module/project/js/prjmanageproducts.js b/module/project/js/manageproducts.js similarity index 100% rename from module/project/js/prjmanageproducts.js rename to module/project/js/manageproducts.js diff --git a/module/project/js/pgmbrowse.js b/module/project/js/pgmbrowse.js deleted file mode 100644 index 8189da11db..0000000000 --- a/module/project/js/pgmbrowse.js +++ /dev/null @@ -1,9 +0,0 @@ -$(function() -{ - $('input[name^="showClosed"]').click(function() - { - var showClosed = $(this).is(':checked') ? 1 : 0; - $.cookie('showClosed', showClosed, {expires:config.cookieLife, path:config.webRoot}); - window.location.reload(); - }); -}); diff --git a/module/project/js/prjbrowse.js b/module/project/js/prjbrowse.js deleted file mode 100644 index f85d07b85a..0000000000 --- a/module/project/js/prjbrowse.js +++ /dev/null @@ -1,12 +0,0 @@ -$(function() -{ - $('#PRJMine1').click(function() - { - var PRJMine = $(this).is(':checked') ? 1 : 0; - $.cookie('PRJMine', PRJMine, {expires:config.cookieLife, path:config.webRoot}); - window.location.reload(); - }); -}); - -$('#project' + projectID).addClass('active'); -$(".tree .active").parent('li').addClass('active'); diff --git a/module/project/js/prjcreate.js b/module/project/js/prjcreate.js deleted file mode 100644 index ec64ee66db..0000000000 --- a/module/project/js/prjcreate.js +++ /dev/null @@ -1,238 +0,0 @@ -$(function() -{ - $('#copyProjects a').click(function() - { - setCopyProject($(this).data('id')); - $('#copyProjectModal').modal('hide') - }); - - setAclList($("#parent").val()); - - if(typeof(currentPlanID) == 'undefined') - { - $('#productsBox select[id^="products"]').each(function() - { - var branchID = 0; - if($(this).closest('.input-group').find('select[id^="branch"]').size() > 0) - { - var branchID = $(this).closest('.input-group').find('select[id^="branch"]').val(); - } - loadPlans($(this), branchID); - }); - } - - $('[data-toggle="popover"]').popover(); -}); - -/** - * Set parent project. - * - * @access public - * @return void - */ -function setParentProgram() -{ - var parentProgram = $("#parent").val(); - location.href = createLink('project', 'PRJCreate', 'model=' + model + '&projectID=' + parentProgram + '&from=' + from); -} - -/** - * Set copy project. - * - * @param int $copyProjectID - * @access public - * @return void - */ -function setCopyProject(copyProjectID) -{ - location.href = createLink('project', 'PRJCreate', 'model=' + model + '&projectID=' + projectID + '&from=' + from + '©ProjectID=' + copyProjectID); -} - -/** - * Add new product. - * - * @param obj $obj - * @access public - * @return void - */ -function addNewProduct(obj) -{ - if($(obj).attr('checked')) - { - $('#productName').removeAttr('disabled', true); - $('#productName').closest('tr').removeClass('hidden'); - $('#plansBox .col-sm-4').find('select').attr('disabled', true).trigger("chosen:updated"); - $('#plansBox').closest('tr').addClass('hidden'); - $('#productsBox .col-sm-4 .input-group').find('select').attr('disabled', true).trigger("chosen:updated"); - } - else - { - $('#productName').attr('disabled', true); - $('#productName').closest('tr').addClass('hidden'); - $('#plansBox .col-sm-4').find('select').removeAttr('disabled', true).trigger("chosen:updated"); - $('#plansBox').closest('tr').removeClass('hidden'); - $('#productsBox .col-sm-4 .input-group').find('select').removeAttr('disabled').trigger("chosen:updated"); - } -} - -/** - * Set access control box. - * - * @param int $projectID - * @access public - * @return void - */ -function setAclList(projectID) -{ - if(projectID != 0) - { - $('.aclBox').html($('#PGMAcl').html()); - } - else - { - $('.aclBox').html($('#PRJAcl').html()); - } -} - -/** - * Load branches. - * - * @param int $product - * @access public - * @return void - */ -function loadBranches(product) -{ - $('#productsBox select').each(function() - { - var $product = $(product); - if($product.val() != 0 && $product.val() == $(this).val() && $product.attr('id') != $(this).attr('id')) - { - alert(errorSameProducts); - $product.val(0); - $product.trigger("chosen:updated"); - return false; - } - }); - - if($('#productsBox .input-group:last select:first').val() != 0) - { - var length = $('#productsBox .input-group').size(); - var $html = $('#productsBox .col-sm-4:last').html(); - $('#productsBox .col-sm-4:last').find('.input-group-addon').remove(); - $('#productsBox .row').append('
    ' + $html + '
    '); - if($('#productsBox .input-group:last select').size() >= 2) $('#productsBox .input-group:last select:last').remove(); - $('#productsBox .input-group:last .chosen-container').remove(); - $('#productsBox .input-group:last select:first').attr('name', 'products[' + length + ']').attr('id', 'products' + length); - $('#productsBox .input-group:last .chosen').chosen(); - - adjustProductBoxMargin(); - } - - var $inputgroup = $(product).closest('.input-group'); - if($inputgroup.find('select').size() >= 2) $inputgroup.removeClass('has-branch').find('select:last').remove(); - if($inputgroup.find('.chosen-container').size() >= 2) $inputgroup.find('.chosen-container:last').remove(); - - var index = $inputgroup.find('select:first').attr('id').replace('products' , ''); - $.get(createLink('branch', 'ajaxGetBranches', "productID=" + $(product).val()), function(data) - { - if(data) - { - $inputgroup.addClass('has-branch').append(data); - $inputgroup.find('select:last').attr('name', 'branch[' + index + ']').attr('id', 'branch' + index).attr('onchange', "loadPlans('#products" + index + "', this.value)").chosen(); - } - }); - - loadPlans(product); -} - -/** - * Load plans. - * - * @param obj $product - * @param int $branchID - * @access public - * @return void - */ -function loadPlans(product, branchID) -{ - if($('#plansBox').size() == 0) return false; - - var productID = $(product).val(); - var branchID = typeof(branchID) == 'undefined' ? 0 : branchID; - var index = $(product).attr('id').replace('products', ''); - - if(productID != 0) - { - if(typeof(planID) == 'undefined') planID = 0; - planID = $("select#plans" + productID).val() != '' ? $("select#plans" + productID).val() : planID; - $.get(createLink('product', 'ajaxGetPlans', "productID=" + productID + '&branch=' + branchID + '&planID=' + planID + '&fieldID&needCreate=&expired=' + ((config.currentMethod == 'create' || config.currentMethod == 'edit') ? 'unexpired' : '')), function(data) - { - if(data) - { - if($("div#plan" + index).size() == 0) $("#plansBox .row").append('
    '); - $("div#plan" + index).html(data).find('select').attr('name', 'plans[' + productID + ']').attr('id', 'plans' + productID).chosen(); - - adjustPlanBoxMargin(); - } - }); - } -} - -/** - * Adjust product box margin. - * - * @access public - * @return void - */ -function adjustProductBoxMargin() -{ - var productRows = Math.ceil($('#productsBox > .row > .col-sm-4').length / 3); - if(productRows > 1) - { - for(i = 1; i <= productRows - 1; i++) - { - $('#productsBox .col-sm-4:lt(' + (i * 3) + ')').css('margin-bottom', '10px'); - } - } -} - -/** - * Adjust plan box margin. - * - * @access public - * @return void - */ -function adjustPlanBoxMargin() -{ - var planRows = Math.ceil($('#plansBox > .row > .col-sm-4').length / 3); - if(planRows > 1) - { - for(j = 1; j <= planRows - 1; j++) - { - $('#plansBox .col-sm-4:lt(' + (j * 3) + ')').css('margin-bottom', '10px'); - } - } -} - -/** - * Fuzzy search projects by project name. - * - * @access public - * @return void - */ -$('#projectName').on('keyup', function() -{ - var name = $(this).val(); - name = name.replace(/\s+/g, ''); - link = createLink('project', 'ajaxGetCopyProjects'); - $.post(link, {name: name, cpoyProjectID : copyProjectID}, function(data) - { - $('#copyProjects').html(data); - $('#copyProjects a').click(function() - { - setCopyProject($(this).data('id')); - $('#copyProjectModal').modal('hide'); - }); - }) -}) diff --git a/module/project/js/prjedit.js b/module/project/js/prjedit.js deleted file mode 100644 index a329222e4c..0000000000 --- a/module/project/js/prjedit.js +++ /dev/null @@ -1,86 +0,0 @@ -$(function() -{ - $('#parent').change(function() - { - var projectID = $(this).val(); - - /* Determine whether the project can change the project set. */ - link = createLink('project', 'ajaxCheckProduct', 'projectID=' + projectID + '&projectID=' + projectID); - $.getJSON(link, function(data) - { - var changed = true; - - if(data && data.result) - { - changed = confirm(data.message); - if(changed) - { - $('#productsBox select').prop('disabled', true).trigger("chosen:updated"); - } - } - - if(data && !data.result) - { - $('#promptTable tbody tr').remove(); - for(var i in data.message) - { - var product = data.message[i]; - $('#promptTable').append(" " + product +" " + linkedProjectsTip +""); - for(var j in data.multiLinkedProjects) - { - if(i == j) - { - html = '' - for(k in data.multiLinkedProjects[j]) - { - var project = data.multiLinkedProjects[j][k]; - html += "

    " + project +"

    "; - } - $('#promptTable').append("" + html + ""); - } - } - } - - changed = false; - $('#promptBox').modal({show: true}); - } - - if(!changed) $("#parent").val(oldParent).trigger("chosen:updated"); - oldParent = $('#parent').val(); - }); - }); - - adjustProductBoxMargin(); - adjustPlanBoxMargin(); - - /* If the story of the product which linked the execution under the project, you don't allow to remove the product. */ - $("#productsBox select").each(function() - { - var isExisted = $.inArray($(this).attr('data-last'), unmodifiableProducts); - if(isExisted != -1) - { - $(this).prop('disabled', true).trigger("chosen:updated"); - $(this).siblings('div').find('span').attr('title', tip); - } - }); - -}); - -/** - * Set aclList. - * - * @param int $projectID - * @access public - * @return void - */ -function setAclList(projectID) -{ - if(projectID != 0) - { - $('.aclBox').html($('#PGMAcl').html()); - } - else - { - $('.aclBox').html($('#PRJAcl').html()); - } -} diff --git a/module/project/view/ajaxgetprjdropmenu.html.php b/module/project/view/ajaxgetdropmenu.html.php similarity index 94% rename from module/project/view/ajaxgetprjdropmenu.html.php rename to module/project/view/ajaxgetdropmenu.html.php index 846f4385ea..3ba19ce033 100644 --- a/module/project/view/ajaxgetprjdropmenu.html.php +++ b/module/project/view/ajaxgetdropmenu.html.php @@ -7,7 +7,7 @@
    - ' . $lang->project->all, '', 'class="not-list-item"'); ?> + ' . $lang->project->all, '', 'class="not-list-item"'); ?> project->doneProjects;?>
    diff --git a/module/project/view/ajaxgetpgmdropmenu.html.php b/module/project/view/ajaxgetpgmdropmenu.html.php deleted file mode 100644 index 33c956d0dd..0000000000 --- a/module/project/view/ajaxgetpgmdropmenu.html.php +++ /dev/null @@ -1,68 +0,0 @@ - - - -name; -$projectsPinYin = common::convert2Pinyin($projectNames); -?> -
    -
    -
    - project->getPGMTreeMenu(); - ?> -
    -
    -
    - $lang->project->PGMShowClosed), '', $this->cookie->showClosed ? 'checked=checked' : '');?> -
    -
    -
    -
    - - diff --git a/module/project/view/batchedit.html.php b/module/project/view/batchedit.html.php index 674eaaff9d..c15a6aa94b 100644 --- a/module/project/view/batchedit.html.php +++ b/module/project/view/batchedit.html.php @@ -14,19 +14,19 @@ project->weekend);?> project->linkedProjectsTip);?> project->changeProgram);?> -project->PRJEdit->requiredFields;?> +project->edit->requiredFields;?>
    -

    project->PRJBatchEdit;?>

    +

    project->batchEdit;?>

    - - - + + + @@ -34,7 +34,7 @@ $project):?> - parent ? $lang->project->PGMPRJAcls : $lang->project->PRJAcls;?> + parent ? $lang->program->aclList : $lang->project->aclList;?> @@ -46,7 +46,7 @@
    idAB;?>project->PGMParent;?>project->PRJName;?> project->PRJPM;?>project->parent;?>project->name;?> project->PM;?> project->begin;?> project->end;?> project->acl;?>
    parent, "class='form-control chosen' data-id='$projectID' data-name='{$project->name}' data-parent='{$project->parent}'");?> end == LONG_TIME ? 'disabled' : ''; - $end = $project->end == LONG_TIME ? $lang->project->PRJLongTime : $project->end; + $end = $project->end == LONG_TIME ? $lang->project->longTime : $project->end; echo html::input("ends[$projectID]", $end, "class='form-control form-date' $disabledEnd onchange='computeWorkDays(this.id);' placeholder='" . $lang->project->end . "'"); echo html::hidden("dayses[$projectID]", $project->days); ?> diff --git a/module/project/view/browse.html.php b/module/project/view/browse.html.php index 7fd686ab50..5239b1bb39 100644 --- a/module/project/view/browse.html.php +++ b/module/project/view/browse.html.php @@ -21,7 +21,7 @@ js::set('browseType', $browseType);
    project->common : $project->name;?> - ", '', 'class="text-muted"');?> + ", '', 'class="text-muted"');?>
    @@ -30,9 +30,9 @@ js::set('browseType', $browseType); $label";?> {$pager->recTotal}";?> - + - $lang->project->mine), '', $this->cookie->PRJMine ? 'checked=checked' : '');?> + $lang->project->mine), '', $this->cookie->projectMine ? 'checked=checked' : '');?>
    config->maxVersion)):?> @@ -49,9 +49,9 @@ js::set('browseType', $browseType); @@ -60,16 +60,16 @@ js::set('browseType', $browseType);

    - project->noPRJ;?> + project->empty;?> config->systemMode == 'new'):?> - ' . $lang->project->PRJCreate, '', 'class="btn btn-info btn-wide " data-toggle="modal" data-target="#guideDialog"');?> + ' . $lang->project->create, '', 'class="btn btn-info btn-wide " data-toggle="modal" data-target="#guideDialog"');?> - ' . $lang->project->PRJCreate, '', 'class="btn btn-info btn-wide"');?> + ' . $lang->project->create, '', 'class="btn btn-info btn-wide"');?>

    - +
    @@ -78,13 +78,13 @@ js::set('browseType', $browseType); $setting = $this->datatable->getSetting('project'); ?> - config->systemMode == 'new' ? common::hasPriv('project', 'PRJBatchEdit') : common::hasPriv('project', 'batchEdit');?> + config->systemMode == 'new' ? common::hasPriv('project', 'batchEdit') : common::hasPriv('project', 'batchEdit');?> id == 'PRJStatus' and $browseType !== 'all') $value->show = false; + if($value->id == 'status' and $browseType !== 'all') $value->show = false; if($value->show) $this->datatable->printHead($value, $orderBy, $vars, $canBatchEdit); } ?> @@ -92,7 +92,7 @@ js::set('browseType', $browseType); - from = 'PRJ';?> + from = 'project';?> project->printCell($value, $project, $users, $projectID);?> @@ -107,7 +107,7 @@ js::set('browseType', $browseType); config->systemMode == 'new' ? $this->createLink('project', 'PRJBatchEdit', 'from=prjbrowse') : $this->createLink('project', 'batchEdit'); + $actionLink = $this->config->systemMode == 'new' ? $this->createLink('project', 'batchEdit', 'from=prjbrowse') : $this->createLink('project', 'batchEdit'); $misc = "data-form-action='$actionLink'"; echo html::commonButton($lang->edit, $misc); } diff --git a/module/project/view/create.html.php b/module/project/view/create.html.php index 8f9f631876..e80d6a5e8a 100644 --- a/module/project/view/create.html.php +++ b/module/project/view/create.html.php @@ -19,39 +19,39 @@ project->weekend);?> project->errorSameProducts);?> -project->PRJLongTime);?> -project->PRJCreate->requiredFields;?> +project->longTime);?> +project->create->requiredFields;?>
    -

    project->PRJCreate . ' - ' . zget($lang->project->modelList, $model, '');?>

    +

    project->create . ' - ' . zget($lang->project->modelList, $model, '');?>

    - +
    - + - + - + - + printExtendFields('', 'table');?> - + - + @@ -155,7 +155,7 @@ - +
    project->PGMParent;?>project->parent;?> - +
    project->PRJName;?>project->name;?>
    project->PRJPM;?>project->PM;?>
    project->PRJBudget;?>project->budget;?>
    - budget != 0) ? 'placeholder=' . $lang->project->PGMParentBudget . zget($lang->project->currencySymbol, $parentProgram->budgetUnit) . $availableBudget : '';?> + budget != 0) ? 'placeholder=' . $lang->program->parentBudget . zget($lang->project->currencySymbol, $parentProgram->budgetUnit) . $budgetLeft : '';?> budgetUnit);?> @@ -138,14 +138,14 @@
    project->PRJDesc;?>project->desc;?>
    project->acl;?>project->PRJAclList, $acl, "onclick='setWhite(this.value);'", 'block'));?>project->aclList, $acl, "onclick='setWhite(this.value);'", 'block'));?>
    project->auth;?>project->PRJAuthList, $auth, '', 'block');?>project->authList, $auth, '', 'block');?>
    @@ -196,10 +196,10 @@ -