diff --git a/module/programplan/js/create.ui.js b/module/programplan/js/create.ui.js index c0e37368be..49cbc848ee 100644 --- a/module/programplan/js/create.ui.js +++ b/module/programplan/js/create.ui.js @@ -5,6 +5,8 @@ window.onRenderRow = function(row, rowIdx, data) if(project.model == 'ipd') { + $('thead [data-name="ACTIONS"]').css('display', 'none'); + row.find('[data-name="ACTIONS"]').css('display', 'none'); row.find('[data-name="attribute"]').find('.picker-box').on('inited', function(e, info) { let $attributePicker = info[0]; diff --git a/module/programplan/ui/create.html.php b/module/programplan/ui/create.html.php index 63606038a7..fd72b24c8a 100644 --- a/module/programplan/ui/create.html.php +++ b/module/programplan/ui/create.html.php @@ -259,5 +259,4 @@ formBatchPanel set::items($fnGenerateFields()), set::data($fnGenerateDefaultData()), $project->model == 'ipd' ? set::maxRows(count($fnGenerateDefaultData())) : null, - $project->model == 'ipd' ? set::mode('edit') : null ); diff --git a/module/programplan/zen.php b/module/programplan/zen.php index bf832eed3c..3430ff5c78 100644 --- a/module/programplan/zen.php +++ b/module/programplan/zen.php @@ -48,6 +48,7 @@ class programplanZen extends programplan { $project = $this->loadModel('project')->getByID($projectID); if($parentID) $parentStage = $this->programplan->getByID($parentID); + if(!$parentID) $oldPlans = $this->programplan->getStage($projectID); $fields = $this->config->programplan->form->create; foreach(explode(',', $this->config->programplan->create->requiredFields) as $field) @@ -62,6 +63,7 @@ class programplanZen extends programplan $orders = $this->programplan->computeOrders(array(), $plans); foreach($plans as $rowID => $plan) { + if(empty($parentID) and empty($oldPlans)) $plan->id = ''; $plan->days = helper::diffDate($plan->end, $plan->begin) + 1; $plan->project = $projectID; $plan->parent = $parentID ? $parentID : $projectID;