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

* [refac] Adjust programplan gantt.

Browse Source
This commit is contained in:
wangyidong
2024-07-16 15:45:38 +08:00
committed by 田淑杰
parent a66f5211bb
commit 1d3c3bc894
6 changed files with 66 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/zin/wg/gantt/js/v1.js
+1 -1
View File
@@ -448,7 +448,7 @@ function initGantt()
{
css: "gantt_container",
cols:[{
width:600,
width: colsWidth,
rows:[
{view: "grid", scrollX: "gridScroll", scrollable: true, scrollY: "scrollVer"},
{view: "scrollbar", id: "gridScroll", group:"horizontal"}
lib/zin/wg/gantt/v1.php
+6 -2
View File
@@ -58,8 +58,11 @@ class gantt extends wg
$cssFile = $app->getWebRoot() . 'js/dhtmlxgantt/min.css';
$jsFile = $app->getWebRoot() . 'js/dhtmlxgantt/min.js';
$id = $this->prop('id') ? $this->prop('id') : 'ganttView';
$zooming = $this->prop('zooming') ? $this->prop('zooming') : 'day';
list($id, $zooming, $colsWidth) = $this->prop(array('id', 'zooming', 'colsWidth'));
if(empty($id)) $id = 'ganttView';
if(empty($zooming)) $zooming = 'day';
if(empty($colsWidth)) $colsWidth = '600';
$fileName = data('fileName');
$ganttType = data('ganttType');
$project = data('project');
@@ -79,6 +82,7 @@ class gantt extends wg
jsVar('reviewPoints', $reviewPoints),
jsVar('ganttType', $ganttType),
jsVar('showFields', $showFields),
jsVar('colsWidth', $colsWidth),
jsVar('userList', $this->getUserList()),
jsVar('ganttLang', $this->prop('ganttLang')),
jsVar('canGanttEdit', $this->prop('canEdit')),
module/programplan/ui/gantt.html.php
+2 -43
View File
@@ -13,48 +13,7 @@ declare(strict_types=1);
namespace zin;
data('fileName', 'gantt-export-' . $projectID);
$ganttLang = new stdclass();
$ganttLang->exporting = $lang->programplan->exporting;
$ganttLang->exportFail = $lang->programplan->exportFail;
$ganttLang->zooming = $lang->execution->gantt->zooming;
$ganttLang->hideCriticalPath = $lang->programplan->hideCriticalPath;
$ganttLang->showCriticalPath = $lang->programplan->showCriticalPath;
$ganttLang->taskStatusList = $lang->task->statusList;
$ganttLang->errorTaskDrag = $lang->programplan->error->taskDrag;
$ganttLang->errorPlanDrag = $lang->programplan->error->planDrag;
$ganttLang->edit = $lang->programplan->edit;
$ganttLang->submit = $lang->programplan->submit;
$ganttLang->today = $lang->programplan->today;
$typeHtml = '<a data-toggle="dropdown" href="#browseTypeList"><span class="text">' . $lang->programplan->ganttBrowseType[$ganttType] . '</span><span class="caret"></span></a>';
$typeHtml .= '<menu class="dropdown-menu menu" id="browseTypeList">';
foreach($lang->programplan->ganttBrowseType as $browseType => $typeName)
{
$link = $this->createLink('programplan', 'browse', "projectID=$projectID&productID=$productID&type=$browseType");
if($app->rawModule == 'review' and $app->rawMethod == 'assess') $this->createLink('review', 'assess', "reivewID=$reviewID&from=&type=$browseType");
$typeHtml .= '<li class="menu-item' . ($ganttType == $browseType ? " active" : '') . '">' . html::a($link, $typeName) . '</li>';
}
$typeHtml .= '</menu>';
$ganttFields = array();
$ganttFields['column_text'] = $typeHtml;
$ganttFields['column_owner_id'] = $lang->programplan->PMAB;
$ganttFields['column_status'] = $lang->statusAB;
$ganttFields['column_percent'] = $lang->programplan->percentAB;
$ganttFields['column_taskProgress'] = $lang->programplan->taskProgress;
$ganttFields['column_begin'] = $lang->programplan->begin;
$ganttFields['column_start_date'] = $lang->programplan->begin;
$ganttFields['column_deadline'] = $lang->programplan->end;
$ganttFields['column_end_date'] = $lang->programplan->end;
$ganttFields['column_realBegan'] = $lang->programplan->realBegan;
$ganttFields['column_realEnd'] = $lang->programplan->realEnd;
$ganttFields['column_duration'] = $lang->programplan->duration;
$ganttFields['column_estimate'] = $lang->programplan->estimate;
$ganttFields['column_consumed'] = $lang->programplan->consumed;
$ganttFields['column_delay'] = $lang->programplan->delay;
$ganttFields['column_delayDays'] = $lang->programplan->delayDays;
include './ganttfields.html.php';
if($app->rawModule == 'programplan')
{
@@ -104,7 +63,7 @@ gantt
set('canEdit', common::hasPriv('programplan', 'ganttEdit')),
set('canEditDeadline', common::hasPriv('review', 'edit')),
set('ganttFields', $ganttFields),
set('showChart', !(($app->rawModule == 'review' && $app->rawMethod == 'assess') || $dateDetails)),
set('showChart', true),
set('zooming', isset($zooming) ? $zooming : 'day'),
set('options', $plans)
);
module/programplan/ui/ganttfields.html.php
+55
View File
@@ -0,0 +1,55 @@
<?php
declare(strict_types=1);
/**
* The ganttData view file of programplan module of ZenTaoPMS.
*
* @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
* @license ZPL (http://zpl.pub/page/zplv12.html)
* @author Yidong Wang <yidong@cnezsoft.com>
* @package programplan
* @version $Id$
* @link http://www.zentao.net
*/
namespace zin;
$ganttLang = new stdclass();
$ganttLang->exporting = $lang->programplan->exporting;
$ganttLang->exportFail = $lang->programplan->exportFail;
$ganttLang->zooming = $lang->execution->gantt->zooming;
$ganttLang->hideCriticalPath = $lang->programplan->hideCriticalPath;
$ganttLang->showCriticalPath = $lang->programplan->showCriticalPath;
$ganttLang->taskStatusList = $lang->task->statusList;
$ganttLang->errorTaskDrag = $lang->programplan->error->taskDrag;
$ganttLang->errorPlanDrag = $lang->programplan->error->planDrag;
$ganttLang->edit = $lang->programplan->edit;
$ganttLang->submit = $lang->programplan->submit;
$ganttLang->today = $lang->programplan->today;
$typeHtml = '<a data-toggle="dropdown" href="#browseTypeList"><span class="text">' . $lang->programplan->ganttBrowseType[$ganttType] . '</span><span class="caret"></span></a>';
$typeHtml .= '<menu class="dropdown-menu menu" id="browseTypeList">';
foreach($lang->programplan->ganttBrowseType as $browseType => $typeName)
{
$link = $this->createLink('programplan', 'browse', "projectID=$projectID&productID=$productID&type=$browseType");
if($app->rawModule == 'review' and $app->rawMethod == 'assess') $this->createLink('review', 'assess', "reivewID=$reviewID&from=&type=$browseType");
$typeHtml .= '<li class="menu-item' . ($ganttType == $browseType ? " active" : '') . '">' . html::a($link, $typeName) . '</li>';
}
$typeHtml .= '</menu>';
$ganttFields = array();
$ganttFields['column_text'] = $typeHtml;
$ganttFields['column_owner_id'] = $lang->programplan->PMAB;
$ganttFields['column_status'] = $lang->statusAB;
$ganttFields['column_percent'] = $lang->programplan->percentAB;
$ganttFields['column_taskProgress'] = $lang->programplan->taskProgress;
$ganttFields['column_begin'] = $lang->programplan->begin;
$ganttFields['column_start_date'] = $lang->programplan->begin;
$ganttFields['column_deadline'] = $lang->programplan->end;
$ganttFields['column_end_date'] = $lang->programplan->end;
$ganttFields['column_realBegan'] = $lang->programplan->realBegan;
$ganttFields['column_realEnd'] = $lang->programplan->realEnd;
$ganttFields['column_duration'] = $lang->programplan->duration;
$ganttFields['column_estimate'] = $lang->programplan->estimate;
$ganttFields['column_consumed'] = $lang->programplan->consumed;
$ganttFields['column_delay'] = $lang->programplan->delay;
$ganttFields['column_delayDays'] = $lang->programplan->delayDays;
module/story/ui/view.html.php
+1 -1
View File
@@ -261,7 +261,7 @@ detail
set::actions(array_values($actions)),
$parentTitle,
$parentUrl,
$versionBtn,
$versionBtn
);
/**
module/upgrade/model.php
+1 -4
View File
@@ -392,10 +392,7 @@ class upgradeModel extends model
catch(PDOException $e)
{
$message = $e->getMessage();
if($message)
{
if(strpos($message, '1146') !== false) return array($sql);
}
if($message && strpos($message, '1146') !== false) return array($sql);
}
if(empty($fields)) return $changes;