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

* Finish task #8558.

Browse Source
This commit is contained in:
holan20180123
2020-12-01 09:41:15 +08:00
parent f0bd5d9057
commit d3f6be0e1a
12 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/common/lang/de.php
+1
View File
@@ -756,6 +756,7 @@ if(!defined('DT_DATE4')) define('DT_DATE4', 'M d');
if(!defined('DT_DATE5')) define('DT_DATE5', 'j/n');
if(!defined('DT_TIME1')) define('DT_TIME1', 'H:i:s');
if(!defined('DT_TIME2')) define('DT_TIME2', 'H:i');
if(!defined('LONG_TIME')) define('LONG_TIME', '2059-12-31');
/* Datepicker. */
$lang->datepicker = new stdclass();
module/common/lang/en.php
+1
View File
@@ -756,6 +756,7 @@ if(!defined('DT_DATE4')) define('DT_DATE4', 'M d');
if(!defined('DT_DATE5')) define('DT_DATE5', 'j/n');
if(!defined('DT_TIME1')) define('DT_TIME1', 'H:i:s');
if(!defined('DT_TIME2')) define('DT_TIME2', 'H:i');
if(!defined('LONG_TIME')) define('LONG_TIME', '2059-12-31');
/* Datepicker. */
$lang->datepicker = new stdclass();
module/common/lang/fr.php
+1
View File
@@ -756,6 +756,7 @@ if(!defined('DT_DATE4')) define('DT_DATE4', 'n/j');
if(!defined('DT_DATE5')) define('DT_DATE5', 'j/n');
if(!defined('DT_TIME1')) define('DT_TIME1', 'H:i:s');
if(!defined('DT_TIME2')) define('DT_TIME2', 'H:i');
if(!defined('LONG_TIME')) define('LONG_TIME', '2059-12-31');
/* Datepicker. */
$lang->datepicker = new stdclass();
module/common/lang/vi.php
+1
View File
@@ -756,6 +756,7 @@ if(!defined('DT_DATE4')) define('DT_DATE4', 'M d');
if(!defined('DT_DATE5')) define('DT_DATE5', 'j/n');
if(!defined('DT_TIME1')) define('DT_TIME1', 'H:i:s');
if(!defined('DT_TIME2')) define('DT_TIME2', 'H:i');
if(!defined('LONG_TIME')) define('LONG_TIME', '2059-12-31');
/* Datepicker. */
$lang->datepicker = new stdclass();
module/common/lang/zh-cn.php
+1
View File
@@ -763,6 +763,7 @@ if(!defined('DT_DATE4')) define('DT_DATE4', 'n月j日');
if(!defined('DT_DATE5')) define('DT_DATE5', 'j/n');
if(!defined('DT_TIME1')) define('DT_TIME1', 'H:i:s');
if(!defined('DT_TIME2')) define('DT_TIME2', 'H:i');
if(!defined('LONG_TIME')) define('LONG_TIME', '2059-12-31');
/* datepicker 时间*/
$lang->datepicker = new stdclass();
module/common/lang/zh-tw.php
+1
View File
@@ -756,6 +756,7 @@ if(!defined('DT_DATE4')) define('DT_DATE4', 'n月j日');
if(!defined('DT_DATE5')) define('DT_DATE5', 'j/n');
if(!defined('DT_TIME1')) define('DT_TIME1', 'H:i:s');
if(!defined('DT_TIME2')) define('DT_TIME2', 'H:i');
if(!defined('LONG_TIME')) define('LONG_TIME', '2059-12-31');
/* datepicker 時間*/
$lang->datepicker = new stdclass();
module/program/js/common.js
+1 -1
View File
@@ -103,7 +103,7 @@ function computeEndDate(delta)
delta = parseInt(delta);
if(delta == 999)
{
$('#end').val('2059-12-31');
$('#end').val(longTime);
$('#end').attr('disabled', 'disabled');
return false;
}
module/program/model.php
+4 -4
View File
@@ -121,7 +121,7 @@ class programModel extends model
->setDefault('parent', 0)
->setDefault('openedDate', helper::now())
->setIF($this->post->acl == 'open', 'whitelist', '')
->setIF($this->post->delta == 999, 'end', '2059-12-31')
->setIF($this->post->delta == 999, 'end', LONG_TIME)
->add('type', 'program')
->join('whitelist', ',')
->cleanInt('budget')
@@ -221,7 +221,7 @@ class programModel extends model
->setIF($this->post->begin == '0000-00-00', 'begin', '')
->setIF($this->post->end == '0000-00-00', 'end', '')
->setIF($this->post->acl == 'open', 'whitelist', '')
->setIF($this->post->delta == 999, 'end', '2059-12-31')
->setIF($this->post->delta == 999, 'end', LONG_TIME)
->join('whitelist', ',')
->stripTags($this->config->program->editor->pgmedit['id'], $this->config->allowedTags)
->remove('uid,delta')
@@ -1208,7 +1208,7 @@ class programModel extends model
{
$project = fixer::input('post')
->setDefault('status', 'wait')
->setIF($this->post->delta == 999, 'end', '2059-12-31')
->setIF($this->post->delta == 999, 'end', LONG_TIME)
->setIF($this->post->delta == 999, 'days', 0)
->setIF($this->post->acl == 'open', 'whitelist', '')
->setDefault('openedBy', $this->app->user->account)
@@ -1350,7 +1350,7 @@ class programModel extends model
$project = fixer::input('post')
->setDefault('team', substr($this->post->name, 0, 30))
->setIF($this->post->delta == 999, 'end', '2059-12-31')
->setIF($this->post->delta == 999, 'end', LONG_TIME)
->setIF($this->post->delta == 999, 'days', 0)
->setIF($this->post->begin == '0000-00-00', 'begin', '')
->setIF($this->post->end == '0000-00-00', 'end', '')
module/program/view/pgmcreate.html.php
+1
View File
@@ -34,6 +34,7 @@
<?php js::set('weekend', $config->project->weekend);?>
<?php js::set('holders', $lang->project->placeholder);?>
<?php js::set('errorSameProducts', $lang->project->errorSameProducts);?>
<?php js::set('longTime', LONG_TIME);?>
<?php $requiredFields = $config->program->PGMCreate->requiredFields;?>
<div id='mainContent' class='main-content'>
<div class='center-block'>
module/program/view/pgmedit.html.php
+3 -2
View File
@@ -13,6 +13,7 @@
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/kindeditor.html.php';?>
<?php js::set('weekend', $config->project->weekend);?>
<?php js::set('longTime', LONG_TIME);?>
<?php $aclList = $program->parent ? $lang->program->subPGMAclList : $lang->program->PGMAclList;?>
<?php $requiredFields = $config->program->PGMEdit->requiredFields;?>
<div id='mainContent' class='main-content'>
@@ -54,11 +55,11 @@
<div class='input-group'>
<?php echo html::input('begin', $program->begin, "class='form-control form-date' placeholder='" . $lang->program->begin . "' required");?>
<span class='input-group-addon'><?php echo $lang->program->to;?></span>
<?php $disabledEnd = $program->end == '2059-12-31' ? 'disabled' : '';?>
<?php $disabledEnd = $program->end == LONG_TIME ? 'disabled' : '';?>
<?php echo html::input('end', $program->end, "class='form-control form-date' $disabledEnd placeholder='" . $lang->program->end . "' required");?>
</div>
</td>
<?php $endValue = $program->end == '2059-12-31' ? 999 : '';?>
<?php $endValue = $program->end == LONG_TIME ? 999 : '';?>
<td colspan='2'><?php echo html::radio('delta', $lang->program->endList , $endValue, "onclick='computeEndDate(this.value)'");?></td>
</tr>
<tr>
module/program/view/prjcreate.html.php
+1
View File
@@ -19,6 +19,7 @@
<?php js::set('from', $from);?>
<?php js::set('weekend', $config->project->weekend);?>
<?php js::set('errorSameProducts', $lang->program->errorSameProducts);?>
<?php js::set('longTime', LONG_TIME);?>
<?php $requiredFields = $config->program->PRJCreate->requiredFields;?>
<div id='mainContent' class='main-content'>
<div class='center-block'>
module/program/view/prjedit.html.php
+3 -2
View File
@@ -18,6 +18,7 @@
<?php js::set('oldParent', $project->parent);?>
<?php js::set('projectID', $project->id);?>
<?php js::set('PGMChangeTips', $lang->program->PGMChangeTips);?>
<?php js::set('longTime', LONG_TIME);?>
<?php $aclList = $project->parent ? $lang->program->PGMPRJAclList : $lang->program->PRJAclList;?>
<?php $requiredFields = $config->program->PRJEdit->requiredFields;?>
<div id='mainContent' class='main-content'>
@@ -108,12 +109,12 @@
<?php echo html::input('begin', $project->begin, "class='form-control form-date' onchange='computeWorkDays();' placeholder='" . $lang->program->begin . "' required");?>
<span class='input-group-addon'><?php echo $lang->program->to;?></span>
<?php
$disabledEnd = $project->end == '2059-12-31' ? 'disabled' : '';
$disabledEnd = $project->end == LONG_TIME ? 'disabled' : '';
echo html::input('end', $project->end, "class='form-control form-date' onchange='computeWorkDays();' $disabledEnd placeholder='" . $lang->program->end . "' required");
?>
</div>
</td>
<?php $deltaValue = $project->end == '2059-12-31' ? 999 : '';?>
<?php $deltaValue = $project->end == LONG_TIME ? 999 : '';?>
<td colspan='2'><?php echo html::radio('delta', $lang->program->endList , $deltaValue, "onclick='computeEndDate(this.value)'");?></td>
</tr>
<?php if($project->model == 'scrum'):?>