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

* finish task #6160.

Browse Source
This commit is contained in:
wangyidong
2019-07-29 16:30:55 +08:00
parent 4e3df671e3
commit 6b3c34dba2
6 changed files with 6 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/action/model.php
+1 -1
View File
@@ -1052,7 +1052,7 @@ class actionModel extends model
foreach($actions as $action)
{
$timeStamp = strtotime(isset($action->originalDate) ? $action->originalDate : $action->date);
$date = common::checkNotCN() ? date('M d', $timeStamp) : date(DT_DATE4, $timeStamp);
$date = date(DT_DATE4, $timeStamp);
$action->time = date(DT_TIME2, $timeStamp);
$dateGroup[$date][] = $action;
}
module/common/lang/de.php
+1 -1
View File
@@ -557,7 +557,7 @@ if(!defined('DT_MONTHTIME2'))define('DT_MONTHTIME2', 'n/d H:i');
if(!defined('DT_DATE1')) define('DT_DATE1', 'Y-m-d');
if(!defined('DT_DATE2')) define('DT_DATE2', 'Ymd');
if(!defined('DT_DATE3')) define('DT_DATE3', 'Y/m/d');
if(!defined('DT_DATE4')) define('DT_DATE4', 'n/j');
if(!defined('DT_DATE4')) define('DT_DATE4', 'M d');
if(!defined('DT_TIME1')) define('DT_TIME1', 'H:i:s');
if(!defined('DT_TIME2')) define('DT_TIME2', 'H:i');
module/common/lang/en.php
+1 -1
View File
@@ -557,7 +557,7 @@ if(!defined('DT_MONTHTIME2'))define('DT_MONTHTIME2', 'n/d H:i');
if(!defined('DT_DATE1')) define('DT_DATE1', 'Y-m-d');
if(!defined('DT_DATE2')) define('DT_DATE2', 'Ymd');
if(!defined('DT_DATE3')) define('DT_DATE3', 'Y/m/d');
if(!defined('DT_DATE4')) define('DT_DATE4', 'n/j');
if(!defined('DT_DATE4')) define('DT_DATE4', 'M d');
if(!defined('DT_TIME1')) define('DT_TIME1', 'H:i:s');
if(!defined('DT_TIME2')) define('DT_TIME2', 'H:i');
module/company/view/dynamic.html.php
+1 -10
View File
@@ -39,16 +39,7 @@
<div id='dynamics'>
<?php $firstAction = '';?>
<?php foreach($dateGroups as $date => $actions):?>
<?php
if(common::checkNotCN())
{
$isToday = date('M d') == $date;
}
else
{
$isToday = date(DT_DATE4) == $date;
}
?>
<?php $isToday = date(DT_DATE4) == $date;?>
<div class="dynamic <?php if($isToday) echo 'active';?>">
<div class="dynamic-date">
<?php if($isToday):?>
module/product/view/dynamic.html.php
+1 -10
View File
@@ -65,16 +65,7 @@
<?php else:?>
<?php $firstAction = '';?>
<?php foreach($dateGroups as $date => $actions):?>
<?php
if(common::checkNotCN())
{
$isToday = date('M d') == $date;
}
else
{
$isToday = date(DT_DATE4) == $date;
}
?>
<?php $isToday = date(DT_DATE4) == $date;?>
<div class="dynamic <?php if($isToday) echo 'active';?>">
<div class="dynamic-date">
<?php if($isToday):?>
module/project/view/dynamic.html.php
+1 -10
View File
@@ -66,16 +66,7 @@
<div id="dynamics">
<?php $firstAction = '';?>
<?php foreach($dateGroups as $date => $actions):?>
<?php
if(common::checkNotCN())
{
$isToday = date('M d') == $date;
}
else
{
$isToday = date(DT_DATE4) == $date;
}
?>
<?php $isToday = date(DT_DATE4) == $date;?>
<div class="dynamic <?php if($isToday) echo 'active';?>">
<div class="dynamic-date">
<?php if($isToday):?>