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

Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms

Browse Source
This commit is contained in:
hufangzhou
2021-07-16 13:20:05 +08:00
parent 382f829564 7bb10b58db
commit 2c8a1ef5ef
27 changed files with 97 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/control.php
+2 -2
View File
@@ -1411,7 +1411,7 @@ class execution extends control
{
$projectID = $this->dao->select('project')->from(TABLE_EXECUTION)->where('id')->eq($executionID)->fetch('project');
$this->loadModel('productplan')->linkProject($executionID, $_POST['plans'], $oldPlanStories);
$this->loadModel('productplan')->linkProject($projectID, $_POST['plans']);
$this->productplan->linkProject($projectID, $_POST['plans']);
}
$this->executeHooks($executionID);
@@ -1432,7 +1432,7 @@ class execution extends control
$position[] = html::a($browseExecutionLink, $execution->name);
$position[] = $this->lang->execution->edit;
$allProducts = array(0 => '');
$allProducts = array(0 => '');
$executionProsucts = $this->execution->getProducts($execution->project, true, 'noclosed');
foreach($executionProsucts as $product) $allProducts[$product->id] = $product->name;
module/execution/lang/de.php
+3 -2
View File
@@ -405,8 +405,9 @@ $lang->execution->featureBar['all']['doing'] = $lang->execution->statusList[
$lang->execution->featureBar['all']['suspended'] = $lang->execution->statusList['suspended'];
$lang->execution->featureBar['all']['closed'] = $lang->execution->statusList['closed'];
$lang->execution->myExecutions = 'Ich bin beteiligt.';
$lang->execution->doingProject = 'Laufende Projekte';
$lang->execution->myExecutions = 'Ich bin beteiligt.';
$lang->execution->doingProject = 'Laufende Projekte';
$lang->execution->kanbanColType['wait'] = $lang->execution->statusList['wait'] . ' ' . $lang->execution->common;
$lang->execution->kanbanColType['doing'] = $lang->execution->statusList['doing'] . ' ' . $lang->execution->common;
$lang->execution->kanbanColType['suspended'] = $lang->execution->statusList['suspended']. ' ' . $lang->execution->common;
module/execution/lang/en.php
+3 -2
View File
@@ -405,8 +405,9 @@ $lang->execution->featureBar['all']['doing'] = $lang->execution->statusList[
$lang->execution->featureBar['all']['suspended'] = $lang->execution->statusList['suspended'];
$lang->execution->featureBar['all']['closed'] = $lang->execution->statusList['closed'];
$lang->execution->myExecutions = 'Mine';
$lang->execution->doingProject = 'Ongoing Projects';
$lang->execution->myExecutions = 'Mine';
$lang->execution->doingProject = 'Ongoing Projects';
$lang->execution->kanbanColType['wait'] = $lang->execution->statusList['wait'] . ' ' . $lang->execution->common;
$lang->execution->kanbanColType['doing'] = $lang->execution->statusList['doing'] . ' ' . $lang->execution->common;
$lang->execution->kanbanColType['suspended'] = $lang->execution->statusList['suspended'] . ' ' . $lang->execution->common;
module/execution/lang/fr.php
+3 -2
View File
@@ -405,8 +405,9 @@ $lang->execution->featureBar['all']['doing'] = $lang->execution->statusList[
$lang->execution->featureBar['all']['suspended'] = $lang->execution->statusList['suspended'];
$lang->execution->featureBar['all']['closed'] = $lang->execution->statusList['closed'];
$lang->execution->myExecutions = "J'étais impliqué";
$lang->execution->doingProject = 'Projets en cours';
$lang->execution->myExecutions = "J'étais impliqué";
$lang->execution->doingProject = 'Projets en cours';
$lang->execution->kanbanColType['wait'] = $lang->execution->statusList['wait'] . ' ' . $lang->execution->common;
$lang->execution->kanbanColType['doing'] = $lang->execution->statusList['doing'] . ' ' . $lang->execution->common;
$lang->execution->kanbanColType['suspended'] = $lang->execution->statusList['suspended'] . ' ' . $lang->execution->common;
module/execution/lang/vi.php
+3 -2
View File
@@ -406,8 +406,9 @@ $lang->execution->featureBar['all']['doing'] = $lang->execution->statusList[
$lang->execution->featureBar['all']['suspended'] = $lang->execution->statusList['suspended'];
$lang->execution->featureBar['all']['closed'] = $lang->execution->statusList['closed'];
$lang->execution->myExecutions = 'Tôi tham gia';
$lang->execution->doingProject = 'Hiện trường';
$lang->execution->myExecutions = 'Tôi tham gia';
$lang->execution->doingProject = 'Hiện trường';
$lang->execution->kanbanColType['wait'] = $lang->execution->statusList['wait'] . ' ' . $lang->execution->common;
$lang->execution->kanbanColType['doing'] = $lang->execution->statusList['doing'] . ' ' . $lang->execution->common;
$lang->execution->kanbanColType['suspended'] = $lang->execution->statusList['suspended'] . ' ' . $lang->execution->common;
module/execution/lang/zh-cn.php
+3 -2
View File
@@ -405,8 +405,9 @@ $lang->execution->featureBar['all']['doing'] = $lang->execution->statusList[
$lang->execution->featureBar['all']['suspended'] = $lang->execution->statusList['suspended'];
$lang->execution->featureBar['all']['closed'] = $lang->execution->statusList['closed'];
$lang->execution->myExecutions = '我参与的';
$lang->execution->doingProject = '进行中的项目';
$lang->execution->myExecutions = '我参与的';
$lang->execution->doingProject = '进行中的项目';
$lang->execution->kanbanColType['wait'] = $lang->execution->statusList['wait'] . '的' . $lang->execution->common;
$lang->execution->kanbanColType['doing'] = $lang->execution->statusList['doing'] . '的' . $lang->execution->common;
$lang->execution->kanbanColType['suspended'] = $lang->execution->statusList['suspended'] . '的' . $lang->execution->common;
module/execution/model.php
+8 -8
View File
@@ -1575,7 +1575,7 @@ class executionModel extends model
* Get products of a execution.
*
* @param int $executionID
* @param bool $withBranch
* @param bool $withBranch
* @access public
* @return array
*/
@@ -1739,13 +1739,13 @@ class executionModel extends model
public function updateProducts($executionID, $products = '')
{
$this->loadModel('user');
$products = isset($_POST['products']) ? $_POST['products'] : $products;
$oldExecutionProducts = $this->dao->select('*')->from(TABLE_PROJECTPRODUCT)->where('project')->eq((int)$executionID)->fetchGroup('product', 'branch');
$products = isset($_POST['products']) ? $_POST['products'] : $products;
$oldProdcuts = $this->dao->select('*')->from(TABLE_PROJECTPRODUCT)->where('project')->eq((int)$executionID)->fetchGroup('product', 'branch');
$this->dao->delete()->from(TABLE_PROJECTPRODUCT)->where('project')->eq((int)$executionID)->exec();
$members = array_keys($this->getTeamMembers($executionID));
if(empty($products))
{
$this->user->updateUserView(array_keys($oldExecutionProducts), 'product', $members);
$this->user->updateUserView(array_keys($oldProdcuts), 'product', $members);
return true;
}
@@ -1760,10 +1760,10 @@ class executionModel extends model
$oldPlan = 0;
$branch = isset($branches[$i]) ? $branches[$i] : 0;
if(isset($oldExecutionProducts[$productID][$branch]))
if(isset($oldProdcuts[$productID][$branch]))
{
$oldExecutionProduct = $oldExecutionProducts[$productID][$branch];
$oldPlan = $oldExecutionProduct->plan;
$oldProdcuts= $oldProdcuts[$productID][$branch];
$oldPlan = $oldProdcuts>plan;
}
$data = new stdclass();
@@ -1775,7 +1775,7 @@ class executionModel extends model
$existedProducts[$productID] = true;
}
$oldProductKeys = array_keys($oldExecutionProducts);
$oldProductKeys = array_keys($oldProdcuts);
$needUpdate = array_merge(array_diff($oldProductKeys, $products), array_diff($products, $oldProductKeys));
if($needUpdate) $this->user->updateUserView($needUpdate, 'product', $members);
}
module/execution/view/executionkanban.html.php
+1 -1
View File
@@ -27,7 +27,7 @@
</tr>
</thead>
<tbody>
<?php $rowIndex = 0; ?>
<?php $rowIndex = 0;?>
<?php foreach($kanbanGroup as $projectID => $executionList):?>
<tr>
<td class='board-project color-<?php echo $rowIndex;?>'>