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

* Move stage method to zentaopms.

Browse Source
This commit is contained in:
Yagami
2020-08-17 14:41:58 +08:00
parent 5ab40d872f
commit 4fe2e5f278
16 changed files with 328 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/programplan/control.php
-4
View File
@@ -9,8 +9,6 @@ class programplan extends control
public function commonAction($programID, $productID = 0, $extra = '')
{
//$this->loadModel('project')->saveState($programID, array());
$products = $this->loadModel('product')->getPairs($programID);
$productID = $this->product->saveState($productID, $products);
$this->product->setMenu($products, $productID, 0, 0, '', $extra);
@@ -89,7 +87,6 @@ class programplan extends control
$this->view->stages = $stages;
$this->view->plans = $plans;
$this->view->planID = $planID;
$this->view->documentList = $this->programplan->getDocumentList();
$this->view->type = 'lists';
$this->display();
@@ -116,7 +113,6 @@ class programplan extends control
$this->app->loadLang('stage');
$this->view->title = $this->lang->programplan->edit;
$this->view->position[] = $this->lang->programplan->edit;
$this->view->documentList = $this->programplan->getDocumentList();
$this->view->parentStage = $this->programplan->getParentStageList($planID, $plan->product);
$this->view->plan = $plan;
$this->view->isParent = $this->programplan->isParent($planID);
module/programplan/model.php
+2 -43
View File
@@ -3,30 +3,7 @@ class programplanModel extends model
{
public function setMenu($programID, $productID)
{
$baselines = "";
$subMenu = array();
if(!empty($baselines))
{
foreach($baselines as $id => $version)
{
$link = array();
$link['module'] = 'programplan';
$link['method'] = 'browse';
$link['vars'] = "program=$programID&productID=$productID&type=gantt&orderBy=id_desc&baselineID=$id";
$menu = new stdclass();
$menu->name = $id;
$menu->link = $link;
$menu->text = $version;
$menu->subModule = '';
$menu->alias = '';
$menu->hidden = false;
$subMenu[$id] = $menu;
}
$this->lang->programplan->menu->gantt['subMenu'] = $subMenu;
$this->lang->programplan->menu->gantt['class'] = 'dropdown dropdown-hover';
}
return true;
}
public function getByID($planID)
@@ -92,22 +69,11 @@ class programplanModel extends model
public function getPlans($programID = 0, $productID = 0, $orderBy = 'id_asc')
{
$plans = $this->getList($programID, $productID, 0, 'all', $orderBy);
$documentList = $this->getDocumentList();
$plans = $this->getList($programID, $productID, 0, 'all', $orderBy);
$parents = array();
foreach($plans as $planID => $plan)
{
$document = '';
if(!empty($plan->output))
{
$output = explode(',', $plan->output);
foreach($output as $title) if(isset($documentList[$title])) $document .= $documentList[$title];
}
$plan->output = empty($plan->output) ? '' : $document;
$plan->parent == 0 ? $parents[$planID] = $plan : $children[$plan->parent][] = $plan;
}
@@ -719,13 +685,6 @@ class programplanModel extends model
->fetchPairs();
}
public function getDocumentList()
{
return $document = $this->dao->select('*')->from(TABLE_OUTPUT)
->where('deleted')->eq(0)
->fetchPairs('id', 'name');
}
public function isParent($planID)
{
$children = $this->dao->select('id')->from(TABLE_PROJECT)->where('parent')->eq($planID)->andWhere('deleted')->eq('0')->fetch();
module/programplan/view/create.html.php
+1 -6
View File
@@ -21,7 +21,6 @@
<th class='w-110px required'><?php echo $lang->programplan->end;?></th>
<th class='w-110px'><?php echo $lang->programplan->realStarted;?></th>
<th class='w-110px'><?php echo $lang->programplan->realFinished;?></th>
<th class='w-110px'><?php echo $lang->programplan->output;?></th>
<th class="w-90px"> <?php echo $lang->actions;?></th>
</tr>
</thead>
@@ -43,7 +42,6 @@
<td><input type='text' name='end[]' id='end<?php echo $i;?>' value='' class='form-control form-date' /></td>
<td><input type='text' name='realStarted[]' id='realStarted<?php echo $i;?>' value='' class='form-control form-date' /></td>
<td><input type='text' name='realFinished[]' id='realFinished<?php echo $i;?>' value='' class='form-control form-date' /></td>
<td><?php echo html::select("output[$i][]", $documentList, '', "class='form-control chosen' multiple");?></td>
<td class='c-actions text-center'>
<a href='javascript:;' onclick='addItem(this)' class='btn btn-link'><i class='icon-plus'></i></a>
<a href='javascript:;' onclick='deleteItem(this)' class='btn btn-link'><i class='icon icon-close'></i></a>
@@ -72,7 +70,6 @@
<td><input type='text' name='realStarted[] ' id='realStarted<?php echo $i;?>' value='<?php echo $plan->realStarted;?>' class='form-control form-date' /></td>
<td><input type='text' name='realFinished[]' id='realFinished<?php echo $i;?>' value='<?php echo $plan->realFinished;?>' class='form-control form-date' /></td>
<?php $option = empty($plan->output) ? 0 : explode(',', $plan->output);?>
<td><?php echo html::select("output[$i][]", $documentList, $option, "class='form-control chosen' multiple");?></td>
<td class='c-actions text-center'>
<a href='javascript:;' onclick='addItem(this)' class='btn btn-link'><i class='icon-plus'></i></a>
</td>
@@ -96,7 +93,6 @@
<td><input type='text' name='end[]' id='end<?php echo $i;?>' value='' class='form-control form-date' /></td>
<td><input type='text' name='realStarted[] ' id='realStarted<?php echo $i;?>' value='' class='form-control form-date' /></td>
<td><input type='text' name='realFinished[]' id='realFinished<?php echo $i;?>' value='' class='form-control form-date' /></td>
<td><?php echo html::select("output[$i][]", $documentList, '', "class='form-control chosen' multiple");?></td>
<td class='c-actions text-center'>
<a href='javascript:;' onclick='addItem(this)' class='btn btn-link'><i class='icon-plus'></i></a>
<a href='javascript:;' onclick='deleteItem(this)' class='btn btn-link'><i class='icon icon-close'></i></a>
@@ -107,7 +103,7 @@
</tbody>
<tfoot>
<tr>
<?php $colspan = $planID == 0 ? 10 : 9;?>
<?php $colspan = $planID == 0 ? 9 : 8;?>
<td colspan='<?php echo $colspan?>' class='text-center form-actions'><?php echo html::submitButton() . ' ' . html::backButton(); ?></td>
</tr>
</tfoot>
@@ -132,7 +128,6 @@
<td><input type='text' name='end[]' id='end<?php echo $i;?>' class='form-control form-date' /></td>
<td><input type='text' name='realStarted[] ' id='realStarted<?php echo $i;?>' class='form-control form-date' /></td>
<td><input type='text' name='realFinished[]' id='realFinished<?php echo $i;?>' class='form-control form-date' /></td>
<td><?php echo html::select("output[$i][]", $documentList, '', "class='form-control chosen ' multiple");?></td>
<td class='c-actions text-center'>
<a href='javascript:;' onclick='addItem(this)' class='btn btn-link'><i class='icon-plus'></i></a>
<a href='javascript:;' onclick='deleteItem(this)' class='btn btn-link'><i class='icon icon-close'></i></a>
module/programplan/view/edit.html.php
-4
View File
@@ -61,10 +61,6 @@ js::set('parentID', $plan->parent);
<th><?php echo $lang->programplan->realFinished;?> </th>
<td><?php echo html::input('realFinished', $plan->realFinished, "class='form-control form-date'");?></td>
</tr>
<tr>
<th><?php echo $lang->programplan->output;?> </th>
<td colspan='2'><?php echo html::select('output[]', $documentList, $plan->output, "class='form-control chosen ' multiple");?></td>
</tr>
<tr>
<td colspan='4' class='form-actions text-center'><?php echo html::submitButton() . html::backButton()?></td>
</tr>
module/programplan/view/tags
-41
View File
@@ -1,41 +0,0 @@
!_TAG_FILE_FORMAT 2 /extended format; --format=1 will not append ;" to lines/
!_TAG_FILE_SORTED 1 /0=unsorted, 1=sorted, 2=foldcase/
!_TAG_PROGRAM_AUTHOR Darren Hiebert /dhiebert@users.sourceforge.net/
!_TAG_PROGRAM_NAME Exuberant Ctags //
!_TAG_PROGRAM_URL http://ctags.sourceforge.net /official site/
!_TAG_PROGRAM_VERSION 5.9~svn20110310 //
afterFinish gantt.html.php /^ var afterFinish = function(canvas)$/;" j
afterFinish gantt.html.php /^ var afterFinish = function(url)$/;" j
canvas.onerror gantt.html.php /^ canvas.onerror = function()$/;" j
columns list.html.php /^ $columns = 0;$/;" v
delayHandleFullscreen gantt.html.php /^ var delayHandleFullscreen = function()$/;" j
drawGanttToCanvas gantt.html.php /^function drawGanttToCanvas(exportType, sucessCallback, errorCallback)$/;" f
exportGantt gantt.html.php /^function exportGantt(exportType)$/;" f
gantt.templates.grid_file gantt.html.php /^ gantt.templates.grid_file = function(item) {$/;" j
gantt.templates.grid_folder gantt.html.php /^ gantt.templates.grid_folder = function(item) {$/;" j
gantt.templates.scale_cell_class gantt.html.php /^ gantt.templates.scale_cell_class = function(date)$/;" j
gantt.templates.timeline_cell_class gantt.html.php /^ gantt.templates.timeline_cell_class = function(item, date)$/;" j
ganttContainer gantt.html.php /^ var $ganttContainer = $('#ganttContainer');$/;" v
ganttDataArea gantt.html.php /^ var $ganttDataArea = $ganttView.find('.gantt_data_area');$/;" v
ganttDridData gantt.html.php /^ var $ganttDridData = $ganttView.find('.gantt_grid_data');$/;" v
ganttView gantt.html.php /^ var $ganttView = $('#ganttView');$/;" v
getByIdForGantt gantt.html.php /^function getByIdForGantt(list, id)$/;" f
getRemoteScript gantt.html.php /^function getRemoteScript(url, sucessCallback, errorCallback)$/;" f
grid_file gantt.html.php /^ gantt.templates.grid_file = function(item) {$/;" j
grid_folder gantt.html.php /^ gantt.templates.grid_folder = function(item) {$/;" j
handleFullscreen gantt.html.php /^ var handleFullscreen = function()$/;" j
mainContent gantt.html.php /^ var $mainContent = $('#mainContent');$/;" v
onerror gantt.html.php /^ canvas.onerror = function()$/;" j
resizeGanttView gantt.html.php /^ var resizeGanttView = function()$/;" j
scale_cell_class gantt.html.php /^ gantt.templates.scale_cell_class = function(date)$/;" j
setting list.html.php /^ $setting = $this->datatable->getSetting('programplan');$/;" v
success gantt.html.php /^ success: function(result)$/;" j
task gantt.html.php /^ var $task = $(this).closest('.gantt_row_task');$/;" v
template gantt.html.php /^ {name: 'percent', align: 'center', resize: true, width:70, template: function(plan)$/;" j
timeline_cell_class gantt.html.php /^ gantt.templates.timeline_cell_class = function(item, date)$/;" j
toggle list.html.php /^ var $toggle = $(this);$/;" v
updateCriticalPath gantt.html.php /^function updateCriticalPath()$/;" f
updateProgress gantt.html.php /^function updateProgress(progress)$/;" f
vars list.html.php /^ $vars = "programID=$programID&productID=$productID&type=lists&orderBy=%s";$/;" v
widths list.html.php /^ $widths = $this->datatable->setFixedFieldWidth($setting);$/;" v
zoomTasks gantt.html.php /^function zoomTasks(node)$/;" f