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

* Fix gantt style.

Browse Source
This commit is contained in:
tanghucheng
2022-10-27 16:27:30 +08:00
parent 376ce75e79
commit e9d18a77fb
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/programplan/control.php
+7 -1
View File
@@ -68,11 +68,15 @@ class programplan extends control
$dateDetails = 1; // Gantt chart detail date display.
if($type == 'gantt')
{
$this->loadModel('setting');
$owner = $this->app->user->account;
$module = 'programplan';
$section = 'browse';
$object = 'stageCustom';
$selectCustom = $this->loadModel('setting')->getItem("owner={$owner}&module={$module}&section={$section}&key={$object}");
if(!isset($this->config->programplan->browse->stageCustom)) $this->setting->setItem("$owner.$module.browse.stageCustom", 'date,task');
$selectCustom = $this->setting->getItem("owner={$owner}&module={$module}&section={$section}&key={$object}");
if(strpos($selectCustom, 'date') !== false) $dateDetails = 0;
$plans = $this->programplan->getDataForGantt($projectID, $this->productID, $baselineID, $selectCustom, false);
@@ -107,6 +111,7 @@ class programplan extends control
$plans = $this->programplan->getPlans($projectID, $this->productID, $sort);
}
$zooming = !empty($this->config->programplan->ganttCustom->zooming) ? $this->config->programplan->ganttCustom->zooming : 'day';
$this->view->title = $this->lang->programplan->browse;
$this->view->position[] = $this->lang->programplan->browse;
$this->view->projectID = $projectID;
@@ -119,6 +124,7 @@ class programplan extends control
$this->view->selectCustom = $selectCustom;
$this->view->dateDetails = $dateDetails;
$this->view->users = $this->loadModel('user')->getPairs('noletter');
$this->view->zooming = $zooming;
$this->view->ganttType = $type;
$this->display();
}
module/programplan/view/gantt.html.php
+4 -2
View File
@@ -46,6 +46,7 @@ form {display: block; margin-top: 0em; margin-block-end: 1em;}
#ganttDownload, #ganttHeader {display: none;}
#ganttContainer {margin-top: 40px;}
#mainContent {padding: 10px 20px 20px 20px;}
#mainContent:before {background: #fff;}
#mainContent.loading {overflow: hidden}
#mainContent.loading #ganttView {overflow: hidden}
@@ -68,6 +69,7 @@ form {display: block; margin-top: 0em; margin-block-end: 1em;}
.button-group{position: relative;}
.flax{display: flex; margin-bottom: 10px;}
.switchBtn > i {padding-left: 7px;}
#mainContent > .pull-left > .btn-group{padding: 7px;}
</style>
<?php js::set('customUrl', $this->createLink('programplan', 'ajaxCustom'));?>
<?php js::set('dateDetails', $dateDetails);?>
@@ -76,7 +78,7 @@ form {display: block; margin-top: 0em; margin-block-end: 1em;}
<?php js::set('ganttType', $ganttType);?>
<?php js::set('showFields', $this->config->programplan->ganttCustom->ganttFields);?>
<?php js::set('canGanttEdit', common::hasPriv('programplan', 'ganttEdit'));?>
<?php js::set('zooming', $this->config->programplan->ganttCustom->zooming);?>
<?php js::set('zooming', $zooming);?>
<div id='mainContent' class='main-content load-indicator' data-loading='<?php echo $lang->programplan->exporting;?>'>
<?php if($this->app->getModuleName() == 'programplan'):?>
<div class='btn-toolbar pull-left'>
@@ -96,7 +98,7 @@ form {display: block; margin-top: 0em; margin-block-end: 1em;}
?>
</ul>
<?php else:?>
<?php echo $lang->programplan->gantt;?>
<?php echo "<span class='text'>{$lang->programplan->gantt}</span>";?>
<?php endif;?>
</div>
</div>