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

* change for burn.

Browse Source
This commit is contained in:
wyd621
2014-03-25 02:43:02 +00:00
parent 0ceae4a8b2
commit f9b210c075
3 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/project/control.php
+4 -2
View File
@@ -708,8 +708,10 @@ class project extends control
$charts = $this->report->createJSChartFlot($project->name, $flotJSON, 900, 400);
/* Set a space when assemble the string for english. */
$space = $this->app->getClientLang() == 'en' ? ' ' : '';
$dayList = array_fill(1, floor(count($dateList) / $this->config->project->maxBurnDay) + 5, '');
foreach($dayList as $key => $val) $dayList[$key] = $this->lang->project->interval . ($key + 1) . $this->lang->day;
foreach($dayList as $key => $val) $dayList[$key] = $this->lang->project->interval . $space . ($key + 1) . $space . $this->lang->day;
/* Assign. */
$this->view->title = $title;
@@ -719,7 +721,7 @@ class project extends control
$this->view->projectID = $projectID;
$this->view->type = $type;
$this->view->interval = $interval;
$this->view->dayList = array('full' => $this->lang->project->interval . 1 . $this->lang->day) + $dayList;
$this->view->dayList = array('full' => $this->lang->project->interval . $space . 1 . $space . $this->lang->day) + $dayList;
$this->display();
}
module/project/lang/en.php
+1 -1
View File
@@ -194,7 +194,7 @@ $lang->project->createTask = 'Create task';
$lang->project->goback = 'Go back';
$lang->project->linkProduct = 'Select product to link...';
$lang->project->noweekend = 'No weekend';
$lang->project->widthweekend = 'Width weekend';
$lang->project->withweekend = 'With weekend';
$lang->project->interval = 'Interval';
/* Report. */
module/report/model.php
+8 -1
View File
@@ -137,7 +137,14 @@ $(function ()
firstDay = month;
}
title = tick.getFullYear() + '/' + month + '/' + tick.getDate();
if(config.clientLang == 'en')
{
title = month + '/' + tick.getDate() + '/' + tick.getFullYear();
}
else
{
title = tick.getFullYear() + '/' + month + '/' + tick.getDate();
}
if(ticks.length <= 30) dateTail = '/' + month;
return '<span title="' + title + '">' + tick.getDate() + dateTail + '</span>';