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

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

Browse Source
This commit is contained in:
hufangzhou
2021-01-25 09:22:44 +08:00
parent b5bd5ec421 4952dffe1f
commit 6df21e56f3
17 changed files with 33 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/block/view/storyblock.html.php
+1 -1
View File
@@ -54,7 +54,7 @@
<td class="c-pri"><span class="label-pri label-pri-<?php echo $story->pri?>" title="<?php echo zget($lang->story->priList, $story->pri, $story->pri);?>"><?php echo zget($lang->story->priList, $story->pri, $story->pri)?></span></td>
<td class="c-name" style='color: <?php echo $story->color?>' title='<?php echo $story->title?>'><?php echo $story->title?></td>
<?php if($longBlock):?>
<td class='c-estimate text-center' title="<?php echo $story->estimate . ' ' . $lang->custom->conceptOptions->hourPoint[$config->custom->hourPoint];?>"><?php echo $story->estimate . ' ' . $config->hourUnit?></td>
<td class='c-estimate text-center' title="<?php echo $story->estimate . ' ' . $lang->hourCommon;?>"><?php echo $story->estimate . ' ' . $config->hourUnit?></td>
<?php endif;?>
<?php $status = $this->processStatus('story', $story);?>
<td class='c-status' title='<?php echo $status;?>'>
module/custom/control.php
+6 -2
View File
@@ -53,7 +53,7 @@ class custom extends control
$this->app->loadConfig($module);
$unitList = zget($this->config->$module, 'unitList', '');
$this->view->unitList = explode(',', $unitList);
$this->view->mainCurrency = zget($this->config->$module, 'mainCurrency', 'rmb');
$this->view->mainCurrency = zget($this->config->$module, 'mainCurrency', 'CNY');
}
if(($module == 'story' or $module == 'testcase') and $field == 'review')
{
@@ -387,7 +387,7 @@ class custom extends control
/* Update story estimate field. */
if($unit != $_POST['hourPoint'])
{
$stories = $this->dao->select('*')->from(TABLE_STORY)->fetchAll();
$stories = $this->dao->select('id,estimate')->from(TABLE_STORY)->fetchAll();
foreach($stories as $story)
{
$this->dao->update(TABLE_STORY)->set('estimate')->eq($story->estimate * $this->post->scaleFactor)->where('id')->eq($story->id)->exec();
@@ -460,6 +460,7 @@ class custom extends control
/**
* Edit story concept.
* @param int $key
*
* @access public
* @return void
@@ -489,6 +490,7 @@ class custom extends control
/**
* Delete story concept.
* @param int $key
*
* @access public
* @return void
@@ -502,6 +504,8 @@ class custom extends control
/**
* Delete story concept.
* @param int $key
* @param string $confirm yse|no
*
* @access public
* @return void
module/custom/lang/de.php
+1 -1
View File
@@ -49,7 +49,7 @@ $lang->custom->deleteStoryConcept = "Delete story Concept";
$lang->custom->configureScrum = "Scrum Model Custom";
$lang->custom->URConcept = "UR Concept";
$lang->custom->SRConcept = "SR Concept";
$lang->custom->one = "One";
$lang->custom->one = " One";
$lang->custom->unitList['efficiency'] = 'Working Hours/';
$lang->custom->unitList['manhour'] = 'Man-hour/';
module/custom/lang/en.php
+1 -1
View File
@@ -49,7 +49,7 @@ $lang->custom->deleteStoryConcept = "Delete story Concept";
$lang->custom->configureScrum = "Scrum Model Custom";
$lang->custom->URConcept = "UR Concept";
$lang->custom->SRConcept = "SR Concept";
$lang->custom->one = "One";
$lang->custom->one = " One";
$lang->custom->unitList['efficiency'] = 'Working Hours/';
$lang->custom->unitList['manhour'] = 'Man-hour/';
module/custom/lang/fr.php
+1 -1
View File
@@ -49,7 +49,7 @@ $lang->custom->deleteStoryConcept = "Delete story Concept";
$lang->custom->configureScrum = "Scrum Model Custom";
$lang->custom->URConcept = "UR Concept";
$lang->custom->SRConcept = "SR Concept";
$lang->custom->one = "One";
$lang->custom->one = " One";
$lang->custom->unitList['efficiency'] = 'Working Hours/';
$lang->custom->unitList['manhour'] = 'Man-hour/';
module/custom/lang/vi.php
+1 -1
View File
@@ -49,7 +49,7 @@ $lang->custom->deleteStoryConcept = "Delete story Concept";
$lang->custom->configureScrum = "Scrum Model Custom";
$lang->custom->URConcept = "UR Concept";
$lang->custom->SRConcept = "SR Concept";
$lang->custom->one = "One";
$lang->custom->one = " One";
$lang->custom->unitList['efficiency'] = 'Working Hours/';
$lang->custom->unitList['manhour'] = 'Man-hour/';
module/custom/view/estimate.html.php
+12 -7
View File
@@ -42,15 +42,20 @@ $lang->custom->system[] = 'estimate';
<td>
<div class='input-group w-300px'>
<?php
if($unit == 0) echo html::input('efficiency', $efficiency, "class='form-control' disabled");
if($unit != 0) echo html::input('efficiency', $efficiency, "class='form-control'");
$disabled = $unit == 0 ? 'disabled' : '';
echo html::input('efficiency', $efficiency, "class='form-control' $disabled");
?>
<span class='input-group-addon unify-padding'>
<?php
if($unit == 0) echo $lang->custom->conceptOptions->hourPoint[0];
if($unit == 1) echo $lang->custom->unitList['efficiency'] . $lang->custom->conceptOptions->hourPoint[1];
if($unit == 2) echo $lang->custom->unitList['efficiency'] . $lang->custom->conceptOptions->hourPoint[2];
?>
<?php
if($unit == 0)
{
echo $lang->custom->conceptOptions->hourPoint[0];
}
else
{
echo $lang->custom->unitList['efficiency'] . $lang->custom->conceptOptions->hourPoint[$unit];
}
?>
</span>
</div>
</td>
module/group/lang/resource.php
+1 -1
View File
@@ -1338,7 +1338,7 @@ $lang->user->methodOrder[35] = 'task';
$lang->user->methodOrder[40] = 'bug';
$lang->user->methodOrder[45] = 'project';
$lang->user->methodOrder[50] = 'dynamic';
$lang->user->methodOrder[55] = 'profile';
$lang->user->methodOrder[55] = 'cropAvatar';
$lang->user->methodOrder[60] = 'profile';
$lang->user->methodOrder[65] = 'batchEdit';
$lang->user->methodOrder[70] = 'unbind';
module/my/view/profile.html.php
+2 -2
View File
@@ -18,11 +18,11 @@
<?php
if($user->avatar)
{
echo html::image($app->user->avatar);
echo html::image($user->avatar);
}
else
{
echo strtoupper($app->user->account[0]);
echo strtoupper($user->account[0]);
}
?>
</span>
module/my/view/requirement.html.php
+1 -1
View File
@@ -85,7 +85,7 @@
</td>
<td class='c-product'><?php echo $story->productTitle;?></td>
<td class='c-user'><?php echo zget($users, $story->openedBy);?></td>
<td class='c-hours' title="<?php echo $story->estimate . ' ' . $lang->custom->conceptOptions->hourPoint[$config->custom->hourPoint];?>"><?php echo $story->estimate . ' ' . $config->hourUnit;?></td>
<td class='c-hours' title="<?php echo $story->estimate . ' ' . $lang->hourCommon;?>"><?php echo $story->estimate . ' ' . $config->hourUnit;?></td>
<td class='c-status'><span class='status-story status-<?php echo $story->status;?>'> <?php echo $this->processStatus('story', $story);?></span></td>
<td class='c-stage'><?php echo zget($lang->story->stageList, $story->stage);?></td>
<td class='c-actions'>
module/my/view/story.html.php
+1 -1
View File
@@ -87,7 +87,7 @@
<td class='c-product'><?php echo $story->productTitle;?></td>
<td class='c-plan'><?php echo $story->planTitle;?></td>
<td class='c-user'><?php echo zget($users, $story->openedBy);?></td>
<td class='c-hours' title="<?php echo $story->estimate . ' ' . $lang->custom->conceptOptions->hourPoint[$config->custom->hourPoint];?>"><?php echo $story->estimate . ' ' . $config->hourUnit;?></td>
<td class='c-hours' title="<?php echo $story->estimate . ' ' . $lang->hourCommon;?>"><?php echo $story->estimate . ' ' . $config->hourUnit;?></td>
<td class='c-status'><span class='status-story status-<?php echo $story->status;?>'> <?php echo $this->processStatus('story', $story);?></span></td>
<td class='c-stage'><?php echo zget($lang->story->stageList, $story->stage);?></td>
<td class='c-actions'>
module/productplan/view/linkstory.html.php
+1 -1
View File
@@ -56,7 +56,7 @@
</td>
<td><?php echo zget($users, $story->openedBy);?></td>
<td><?php echo zget($users, $story->assignedTo);?></td>
<td title="<?php echo $story->estimate . ' ' . $lang->custom->conceptOptions->hourPoint[$config->custom->hourPoint];?>"><?php echo $story->estimate . ' ' . $config->hourUnit;?></td>
<td title="<?php echo $story->estimate . ' ' . $lang->hourCommon;?>"><?php echo $story->estimate . ' ' . $config->hourUnit;?></td>
<td>
<span class='status-story status-<?php echo $story->status?>'>
<?php echo $this->processStatus('story', $story);?>
module/productplan/view/view.html.php
+1 -1
View File
@@ -154,7 +154,7 @@
</td>
<td><?php echo zget($users, $story->openedBy);?></td>
<td><?php echo zget($users, $story->assignedTo);?></td>
<td title="<?php echo $story->estimate . ' ' . $lang->custom->conceptOptions->hourPoint[$this->config->custom->hourPoint];?>"><?php echo $story->estimate . ' ' . $config->hourUnit;?></td>
<td title="<?php echo $story->estimate . ' ' . $lang->hourCommon;?>"><?php echo $story->estimate . ' ' . $config->hourUnit;?></td>
<td>
<span class='status-story status-<?php echo $story->status?>'>
<?php echo $this->processStatus('story', $story);?>
module/project/view/linkstory.html.php
+1 -1
View File
@@ -81,7 +81,7 @@
<td><?php if(isset($branchGroups[$story->product][$story->branch])) echo $branchGroups[$story->product][$story->branch];?></td>
<?php endif;?>
<td><?php echo zget($users, $story->openedBy);?></td>
<td class='text-center' title="<?php echo $story->estimate . ' ' . $lang->custom->conceptOptions->hourPoint[$config->custom->hourPoint];?>"><?php echo $story->estimate . $config->hourUnit;?></td>
<td class='text-center' title="<?php echo $story->estimate . ' ' . $lang->hourCommon;?>"><?php echo $story->estimate . $config->hourUnit;?></td>
</tr>
<?php $storyCount++;?>
<?php endforeach;?>
module/project/view/story.html.php
+1 -1
View File
@@ -173,7 +173,7 @@
</td>
<td class='c-user' title='<?php echo zget($users, $story->openedBy);?>'><?php echo zget($users, $story->openedBy);?></td>
<td class='c-user' title='<?php echo zget($users, $story->assignedTo);?>'><?php echo zget($users, $story->assignedTo);?></td>
<td class='c-estimate' title="<?php echo $story->estimate . ' ' . $lang->custom->conceptOptions->hourPoint[$config->custom->hourPoint];?>"><?php echo $story->estimate . ' ' . $config->hourUnit;?></td>
<td class='c-estimate' title="<?php echo $story->estimate . ' ' . $lang->hourCommon;?>"><?php echo $story->estimate . ' ' . $config->hourUnit;?></td>
<?php $status = $this->processStatus('story', $story);?>
<td class='c-status' title='<?php echo $status;?>'>
<span class='status-story status-<?php echo $story->status;?>'><?php echo $status;?></span>
module/story/model.php
+1 -1
View File
@@ -3316,7 +3316,7 @@ class storyModel extends model
}
else if($id == 'estimate')
{
$title = $story->estimate . ' ' . $this->lang->custom->conceptOptions->hourPoint[$this->config->custom->hourPoint];
$title = $story->estimate . ' ' . $this->lang->hourCommon;
}
else if($id == 'reviewedBy')
{
module/upgrade/model.php
-31
View File
@@ -663,7 +663,6 @@ class upgradeModel extends model
case '20_0_beta3':
$this->saveLogs('Execute 20_0_beta3');
$this->execSQL($this->getUpgradeFile('20.0.beta3'));
$this->addPriv20_0_bata3();
$this->adjustBudgetUnit();
$this->appendExec('20_0_beta3');
}
@@ -4477,36 +4476,6 @@ class upgradeModel extends model
return true;
}
public function addPriv20_0_bata3()
{
$this->saveLogs('Run Method ' . __FUNCTION__);
$groups = $this->dao->select('`group`')->from(TABLE_GROUPPRIV)->where('module')->eq('user')->andWhere('method')->eq('view')->fetchPairs('group', 'group');
foreach($groups as $groupID)
{
$this->dao->replace(TABLE_GROUPPRIV)
->set('module')->eq('user')
->set('method')->eq('execution')
->set('`group`')->eq($groupID)
->exec();
$this->saveLogs($this->dao->get());
$this->dao->replace(TABLE_GROUPPRIV)
->set('module')->eq('user')
->set('method')->eq('issue')
->set('`group`')->eq($groupID)
->exec();
$this->saveLogs($this->dao->get());
$this->dao->replace(TABLE_GROUPPRIV)
->set('module')->eq('user')
->set('method')->eq('risk')
->set('`group`')->eq($groupID)
->exec();
$this->saveLogs($this->dao->get());
}
return true;
}
/**
* Adjust budget units and values.
*