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 13:56:42 +08:00
parent d7f5868875 5e1b253d58
commit c5a003ab2c
6 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/custom/control.php
+1 -3
View File
@@ -361,9 +361,7 @@ class custom extends control
{
/* Load module and get the data from the post. */
$this->loadModel('setting');
$data = fixer::input('post')
->setIF(!isset($_POST['efficiency']), 'efficiency', 1)
->get();
$data = fixer::input('post')->get();
/* Judgment of required items. */
if(($unit != $_POST['hourPoint']) and empty($_POST['scaleFactor']))
module/custom/js/estimate.js
+2 -2
View File
@@ -18,13 +18,13 @@ $(document).ready(function()
$('#scaleFactor + span').text(workingHours);
$('#efficiency + span').text(workingHours);
$('#efficiency').val("1");
$('#efficiency').attr('disabled', 'diabled');
$('.efficiency').addClass('hidden');
}
if($(this).val() == 1 || $(this).val() == 2)
{
$('#efficiency').val('');
$('#efficiency').removeAttr('disabled');
$('.efficiency').removeClass('hidden');
if($(this).val() == 1)
{
$('#scaleFactor + span').text(storyPoint);
module/custom/view/estimate.html.php
+3 -3
View File
@@ -37,13 +37,13 @@ $lang->custom->system[] = 'estimate';
</td>
<td></td>
</tr>
<tr>
<?php $hidden = $unit == 0 ? 'hidden' : '';?>
<tr class="efficiency <?php echo $hidden;?>">
<th class='w-150px'><?php echo $lang->custom->estimateEfficiency;?></th>
<td>
<div class='input-group w-300px'>
<?php
$disabled = $unit == 0 ? 'disabled' : '';
echo html::input('efficiency', $efficiency, "class='form-control' $disabled");
echo html::input('efficiency', $efficiency, "class='form-control'");
?>
<span class='input-group-addon unify-padding'>
<?php
module/my/control.php
-1
View File
@@ -468,7 +468,6 @@ class my extends control
$this->app->session->set('programList', $this->app->getURI(true));
$this->app->session->set('PRJBrowse', $this->app->getURI(true));
$this->app->session->set('PRJEdit', $this->app->getURI(true));
$this->app->session->set('whitelist', $this->app->getURI(true));
$this->app->session->set('PRJManageProducts', $this->app->getURI(true));
module/program/control.php
+5 -5
View File
@@ -63,7 +63,6 @@ class program extends control
if(common::hasPriv('program', 'pgmcreate')) $this->lang->pageActions = html::a($this->createLink('program', 'pgmcreate'), "<i class='icon icon-sm icon-plus'></i> " . $this->lang->program->PGMCreate, '', "class='btn btn-secondary'");
$this->app->session->set('programList', $this->app->getURI(true));
$this->app->session->set('PRJEdit', $this->app->getURI(true));
$this->app->session->set('whitelist', $this->app->getURI(true));
$this->app->session->set('PRJManageProducts', $this->app->getURI(true));
@@ -416,7 +415,7 @@ class program extends control
if(!$programID) $this->locate($this->createLink('program', 'PGMbrowse'));
setCookie("lastPGM", $programID, $this->config->cookieLife, $this->config->webRoot, '', false, true);
$this->app->session->set('PRJEdit', $this->app->getURI(true));
$this->app->session->set('PGMProject', $this->app->getURI(true));
$this->app->session->set('whitelist', $this->app->getURI(true));
$this->app->session->set('PRJManageProducts', $this->app->getURI(true));
@@ -798,7 +797,6 @@ class program extends control
$this->lang->program->menu = $this->lang->PRJ->menu;
$this->lang->program->mainMenuAction = html::a('javascript:history.go(-1);', '<i class="icon icon-back"></i> ' . $this->lang->goback, '', "class='btn btn-link'");
$this->app->session->set('PRJBrowse', $this->app->getURI(true));
$this->app->session->set('PRJEdit', $this->app->getURI(true));
$this->app->session->set('whitelist', $this->app->getURI(true));
$this->app->session->set('PRJManageProducts', $this->app->getURI(true));
$this->loadModel('datatable');
@@ -994,7 +992,9 @@ class program extends control
$this->action->logHistory($actionID, $changes);
}
$locateLink = $this->session->PRJEdit ? $this->session->PRJEdit : inLink('PRJView', "projectID=$projectID");
$locateLink = $this->session->PRJBrowse ? $this->session->PRJBrowse : inLink('PRJView', "projectID=$projectID");
if($from == 'pgmbrowse') $locateLink = inLink('PGMBrowse');
if($from == 'pgmproject') $locateLink = $this->session->PGMProject ? $this->session->PGMProject : inLink('PGMProject', "programID=$programID");
$this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $locateLink));
}
@@ -1066,7 +1066,7 @@ class program extends control
$moduleIndex = array_search('program', $this->lang->noMenuModule);
if($moduleIndex !== false) unset($this->lang->noMenuModule[$moduleIndex]);
$this->app->session->set('PRJEdit', $this->app->getURI(true));
$this->app->session->set('PRJBrowse', $this->app->getURI(true));
$products = $this->loadModel('product')->getProductsByProject($projectID);;
$linkedBranches = array();
module/workestimation/view/index.html.php
+3 -3
View File
@@ -32,12 +32,12 @@
<td></td>
<td></td>
</tr>
<tr>
<?php $hidden = $hourPoint == 0 ? 'hidden' : '';?>
<tr class="efficiency <?php echo $hidden?>">
<th><?php echo $lang->workestimation->productivity;?></th>
<td>
<div class='input-group'>
<?php $disabled = $hourPoint == 0 ? 'disabled' : '';?>
<?php echo html::input('productivity', zget($budget, 'productivity', ''), "class='form-control' $disabled");?>
<?php echo html::input('productivity', zget($budget, 'productivity', ''), "class='form-control'");?>
<span class='input-group-addon unify-padding'>
<?php
if($hourPoint == 0) echo $lang->hourCommon;