Merge branch 'sprint/285_getDate' into 'sprint/285'
Sprint/285 get date See merge request easycorp/zentaopms!6887
This commit is contained in:
王怡栋
@@ -305,6 +305,43 @@ class helper extends baseHelper
|
||||
{
|
||||
throw EndResponseException::create($content);
|
||||
}
|
||||
|
||||
/**
|
||||
* Get date interval.
|
||||
*
|
||||
* @param string|int $begin
|
||||
* @param string|int $end
|
||||
* @param string $format %Y-%m-%d %H:%i:%s
|
||||
* @static
|
||||
* @access public
|
||||
* @return object|string
|
||||
*/
|
||||
public static function getDateInterval($begin, $end = '', $format = '')
|
||||
{
|
||||
if(empty($end)) $end = time();
|
||||
if(is_int($begin)) $begin = date('Y-m-d H:i:s', $begin);
|
||||
if(is_int($end)) $end = date('Y-m-d H:i:s', $end);
|
||||
|
||||
$begin = date_create($begin);
|
||||
$end = date_create($end);
|
||||
$interval = date_diff($begin, $end);
|
||||
|
||||
if($format)
|
||||
{
|
||||
$dateInterval = $interval->format($format);
|
||||
}
|
||||
else
|
||||
{
|
||||
$dateInterval = new stdClass();
|
||||
$dateInterval->year = $interval->format('%Y');
|
||||
$dateInterval->month = $interval->format('%m');
|
||||
$dateInterval->day = $interval->format('%d');
|
||||
$dateInterval->hour = $interval->format('%H');
|
||||
$dateInterval->minute = $interval->format('%i');
|
||||
$dateInterval->secound = $interval->format('%s');
|
||||
}
|
||||
return $dateInterval;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -37,11 +37,13 @@ class admin extends control
|
||||
$hasInternet = $this->admin->checkInternet();
|
||||
$clientLang = $this->app->getClientLang();
|
||||
$langNotCN = common::checkNotCN();
|
||||
$dateUsed = $this->admin->genDateUsed();
|
||||
|
||||
$this->view->title = $this->lang->admin->common;
|
||||
$this->view->position[] = $this->lang->admin->index;
|
||||
$this->view->plugins = $this->admin->getExtensionsByAPI('plugin', $langNotCN ? 5 : 6, $hasInternet);
|
||||
$this->view->patches = $this->admin->getExtensionsByAPI('patch', 3, $hasInternet);
|
||||
$this->view->dateUsed = $dateUsed;
|
||||
$this->view->hasInternet = $hasInternet;
|
||||
$this->view->publicClass = ($hasInternet and !$langNotCN) ? $this->admin->getPublicClassByAPI(3) : array();
|
||||
$this->view->langNotCN = $langNotCN;
|
||||
|
||||
@@ -25,6 +25,13 @@ $lang->admin->resetPWDSetting = 'Reset password Setting';
|
||||
$lang->admin->tableEngine = 'Table Engine';
|
||||
$lang->admin->setModuleIndex = 'Set Module';
|
||||
|
||||
$lang->admin->mon = 'month';
|
||||
$lang->admin->day = 'day';
|
||||
$lang->admin->updateDynamics = 'updateDynamics';
|
||||
$lang->admin->updatePatch = 'updatePatch';
|
||||
$lang->admin->upgradeRecommend = 'upgradeRecommend';
|
||||
$lang->admin->zentaoUsed = '';
|
||||
|
||||
$lang->admin->api = 'API';
|
||||
$lang->admin->log = 'Log';
|
||||
$lang->admin->setting = 'Einstellungen';
|
||||
@@ -170,10 +177,4 @@ $lang->admin->menuSetting['dev']['desc'] = 'Support for secondary developm
|
||||
$lang->admin->menuSetting['convert']['name'] = 'Data Import';
|
||||
$lang->admin->menuSetting['convert']['desc'] = 'Data import from third-party systems.';
|
||||
|
||||
$lang->admin->mon = 'month';
|
||||
$lang->admin->day = 'day';
|
||||
$lang->admin->updateDynamics = 'updateDynamics';
|
||||
$lang->admin->updatePatch = 'updatePatch';
|
||||
$lang->admin->upgradeRecommend = 'upgradeRecommend';
|
||||
|
||||
include dirname(__FILE__) . '/menu.php';
|
||||
|
||||
@@ -25,6 +25,13 @@ $lang->admin->resetPWDSetting = 'Reset password Setting';
|
||||
$lang->admin->tableEngine = 'Table Engine';
|
||||
$lang->admin->setModuleIndex = 'Set Module';
|
||||
|
||||
$lang->admin->mon = 'month';
|
||||
$lang->admin->day = 'day';
|
||||
$lang->admin->updateDynamics = 'updateDynamics';
|
||||
$lang->admin->updatePatch = 'updatePatch';
|
||||
$lang->admin->upgradeRecommend = 'upgradeRecommend';
|
||||
$lang->admin->zentaoUsed = '';
|
||||
|
||||
$lang->admin->api = 'API';
|
||||
$lang->admin->log = 'Log';
|
||||
$lang->admin->setting = 'Setting';
|
||||
@@ -170,10 +177,4 @@ $lang->admin->menuSetting['dev']['desc'] = 'Support for secondary developm
|
||||
$lang->admin->menuSetting['convert']['name'] = 'Data Import';
|
||||
$lang->admin->menuSetting['convert']['desc'] = 'Data import from third-party systems.';
|
||||
|
||||
$lang->admin->mon = 'month';
|
||||
$lang->admin->day = 'day';
|
||||
$lang->admin->updateDynamics = 'updateDynamics';
|
||||
$lang->admin->updatePatch = 'updatePatch';
|
||||
$lang->admin->upgradeRecommend = 'upgradeRecommend';
|
||||
|
||||
include dirname(__FILE__) . '/menu.php';
|
||||
|
||||
@@ -25,6 +25,13 @@ $lang->admin->resetPWDSetting = 'Reset password Setting';
|
||||
$lang->admin->tableEngine = 'Table Engine';
|
||||
$lang->admin->setModuleIndex = 'Set Module';
|
||||
|
||||
$lang->admin->mon = 'month';
|
||||
$lang->admin->day = 'day';
|
||||
$lang->admin->updateDynamics = 'updateDynamics';
|
||||
$lang->admin->updatePatch = 'updatePatch';
|
||||
$lang->admin->upgradeRecommend = 'upgradeRecommend';
|
||||
$lang->admin->zentaoUsed = '';
|
||||
|
||||
$lang->admin->api = 'API';
|
||||
$lang->admin->log = 'Log';
|
||||
$lang->admin->setting = 'Paramétrage';
|
||||
@@ -170,10 +177,4 @@ $lang->admin->menuSetting['dev']['desc'] = 'Support for secondary developm
|
||||
$lang->admin->menuSetting['convert']['name'] = 'Data Import';
|
||||
$lang->admin->menuSetting['convert']['desc'] = 'Data import from third-party systems.';
|
||||
|
||||
$lang->admin->mon = 'month';
|
||||
$lang->admin->day = 'day';
|
||||
$lang->admin->updateDynamics = 'updateDynamics';
|
||||
$lang->admin->updatePatch = 'updatePatch';
|
||||
$lang->admin->upgradeRecommend = 'upgradeRecommend';
|
||||
|
||||
include dirname(__FILE__) . '/menu.php';
|
||||
|
||||
@@ -25,6 +25,13 @@ $lang->admin->resetPWDSetting = '重置密码设置';
|
||||
$lang->admin->tableEngine = '表引擎';
|
||||
$lang->admin->setModuleIndex = '系统功能配置';
|
||||
|
||||
$lang->admin->mon = '月';
|
||||
$lang->admin->day = '天';
|
||||
$lang->admin->updateDynamics = '更新动态';
|
||||
$lang->admin->updatePatch = '补丁更新';
|
||||
$lang->admin->upgradeRecommend = '推荐升级';
|
||||
$lang->admin->zentaoUsed = '您已使用禅道';
|
||||
|
||||
$lang->admin->api = '接口';
|
||||
$lang->admin->log = '日志';
|
||||
$lang->admin->setting = '设置';
|
||||
@@ -170,10 +177,4 @@ $lang->admin->menuSetting['dev']['desc'] = '支持对系统进行二次开
|
||||
$lang->admin->menuSetting['convert']['name'] = '数据导入';
|
||||
$lang->admin->menuSetting['convert']['desc'] = '第三方系统的数据导入。';
|
||||
|
||||
$lang->admin->mon = '月';
|
||||
$lang->admin->day = '天';
|
||||
$lang->admin->updateDynamics = '更新动态';
|
||||
$lang->admin->updatePatch = '补丁更新';
|
||||
$lang->admin->upgradeRecommend = '推荐升级';
|
||||
|
||||
include dirname(__FILE__) . '/menu.php';
|
||||
|
||||
@@ -593,4 +593,21 @@ class adminModel extends model
|
||||
|
||||
return (bool)$connected;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get date used object.
|
||||
*
|
||||
* @access public
|
||||
* @return object
|
||||
*/
|
||||
public function genDateUsed()
|
||||
{
|
||||
$firstUseDate = $this->dao->select('date')->from(TABLE_ACTION)
|
||||
->where('date')->gt('0000-00-00')
|
||||
->andWhere('actor')->eq($this->app->user->account)
|
||||
->orderBy('date_asc')
|
||||
->fetch('date');
|
||||
|
||||
return helper::getDateInterval($firstUseDate);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -90,7 +90,16 @@
|
||||
<div class="side panel" style="background: #FCFDFE">
|
||||
<div class="h-56 flex align-center justify-between">
|
||||
<div class="panel-title"><?php echo $lang->admin->zentaoInfo?></div>
|
||||
<div class="time-count">您已使用禅道<span class="time-block">5</span><?php echo $lang->year?><span class="time-block">9</span><?php echo $lang->admin->mon?><span class="time-block">19</span><?php echo $lang->admin->day?></div>
|
||||
<div class="time-count">
|
||||
<?php echo $lang->admin->zentaoUsed;?>
|
||||
<?php if($dateUsed->year):?>
|
||||
<span class="time-block"><?php echo $dateUsed->year;?></span><?php echo $lang->year;?>
|
||||
<?php endif;?>
|
||||
<?php if($dateUsed->month):?>
|
||||
<span class="time-block"><?php echo $dateUsed->month;?></span><?php echo $lang->admin->mon;?>
|
||||
<?php endif;?>
|
||||
<span class="time-block"><?php echo $dateUsed->day;?></span><?php echo $lang->admin->day;?>
|
||||
</div>
|
||||
</div>
|
||||
<div class="border-gray mb-16 radius-4">
|
||||
<div class="h-40 pl-16 flex align-center justify-between">
|
||||
|
||||
Reference in New Issue
Block a user