- programplan->full, 'id="fullScreenBtn"', 'btn btn-primary btn-sm')?> - rawModule == 'review' and $app->rawMethod == 'assess') unset($lang->programplan->stageCustom->date); ?> - programplan->stageCustom, $selectCustom);?> + programplan->full, 'id="fullScreenBtn"', 'btn btn-primary btn-sm')?> + rawModule == 'review' and $app->rawMethod == 'assess') unset($lang->programplan->stageCustom->date); ?> + programplan->stageCustom, $selectCustom);?> +
@@ -75,15 +104,14 @@ function drawGanttToCanvas(exportType, successCallback, errorCallback) var $ganttContainer = $('#ganttContainer'); var $ganttDataArea = $ganttView.find('.gantt_data_area'); var $ganttDridData = $ganttView.find('.gantt_grid_data'); - var ganttHeight = $ganttView.find('.gantt_task_bg').outerHeight() + $ganttView.find('.gantt_grid_scale').outerHeight() + 1; + + var ganttHeight = $ganttView.find('.gantt_grid_scale').outerHeight(); + ganttHeight += * 25; var ganttWidth = $ganttDridData.width() - 100; - var ganttHeight = $ganttView.find('.gantt_grid_scale').outerHeight(); - $ganttDridData.find('.gantt_row').each(function() {ganttHeight += $(this).outerHeight();}); - var ganttWidth = $ganttDataArea.outerWidth() + $ganttDridData.outerWidth(); - var ganttHeight = $ganttView.find('.gantt_task_bg').outerHeight() + $ganttView.find('.gantt_grid_scale').outerHeight() + 1; + var ganttWidth = $ganttDataArea.outerWidth() + $ganttDridData.outerWidth(); $ganttContainer.css( @@ -245,13 +273,14 @@ function updateCriticalPath() $("#fullScreenBtn").on("click", function() { - $("#mainContent").css("z-index", "9999"); - $("#ganttView").css("z-index", "9999"); + $("#mainContent").css("z-index", "5"); + $("#ganttView").css("z-index", "5"); }); function exitHandler() { - if (module == 'review' && method == 'assess' && !document.fullscreenElement && !document.webkitIsFullScreen && !document.mozFullScreen && !document.msFullscreenElement) { + if (module == 'review' && method == 'assess' && !document.fullscreenElement && !document.webkitIsFullScreen && !document.mozFullScreen && !document.msFullscreenElement) + { location.reload(); } } @@ -268,7 +297,7 @@ $(function() $('#ganttView').css('height', Math.max(200, Math.floor($(window).height() - $('#footer').outerHeight() - $('#header').outerHeight() - $('#mainMenu').outerHeight() - 80))); }; - var ganttData = $.parseJSON(); + var ganttData = $.parseJSON(); if(!ganttData.data) ganttData.data = []; gantt.config.readonly = true; @@ -304,19 +333,7 @@ $(function() if((module == 'review' && method == 'assess') || dateDetails) { - layout = gantt.config.layout; - - gantt.config.layout = { - css: "gantt_container", - cols: [ - { - rows:[ - {view: "grid", scrollX: "gridScroll", scrollable: true, scrollY: "scrollVer"}, - {view: "scrollbar", id: "gridScroll", group:"horizontal"} - ] - } - ] - }; + gantt.config.show_chart = false; } var date2Str = gantt.date.date_to_str(gantt.config.task_date); @@ -329,11 +346,21 @@ $(function() title: todayTips + ": " + date2Str(today) }); + gantt.templates.task_class = function(start, end, task){return 'pri-' + (task.pri || 0);}; gantt.templates.scale_cell_class = function(date) { if(date.getDay() == 0 || date.getDay() == 6) return 'weekend'; }; + gantt.templates.link_class = function(link) + { + var types = gantt.config.links; + if(link.type == types.finish_to_start) return 'finish_to_start'; + if(link.type == types.start_to_start) return 'start_to_start'; + if(link.type == types.finish_to_finish) return 'finish_to_finish'; + if(link.type == types.start_to_finish) return 'start_to_finish'; + }; + gantt.templates.timeline_cell_class = function(item, date) { if(date.getDay() == 0 || date.getDay() == 6) return 'weekend'; diff --git a/module/repo/css/diff.css b/module/repo/css/diff.css index 5db97ecce4..c35af3a9d7 100644 --- a/module/repo/css/diff.css +++ b/module/repo/css/diff.css @@ -20,3 +20,5 @@ table.diff {margin-bottom: 0px;} .label-exchange {background-color: #566F7C; cursor: pointer;} .label-exchange i {padding: 0;} .btn-download {border-right: none;} +.body-modal .repo-diff {display: none;} +.body-modal #mainMenu {padding-bottom: 40px;} diff --git a/module/search/view/buildform.html.php b/module/search/view/buildform.html.php index 52918a87dc..d4c84f37e0 100644 --- a/module/search/view/buildform.html.php +++ b/module/search/view/buildform.html.php @@ -295,6 +295,14 @@ $(function() $chosen.toggleClass('chosen-up', $drop.height() + $drop.offset().top - $(document).scrollTop() > $(window).height()); }); + $searchForm.find('.picker-select').each(function() + { + var $select = $(this); + var pickerOptions = {chosenMode: true} + if($select.attr('data-pickertype') == 'remote') pickerOptions.remote = $select.attr('data-pickerremote'); + $select.picker(pickerOptions); + }); + /* Toggle user queries action. */ $('#toggle-queries').click(function() { diff --git a/module/story/lang/zh-cn.php b/module/story/lang/zh-cn.php index e0303c441a..e93141a2b5 100644 --- a/module/story/lang/zh-cn.php +++ b/module/story/lang/zh-cn.php @@ -137,8 +137,8 @@ $lang->story->comment = '备注'; $lang->story->children = "子需求"; $lang->story->childrenAB = "子"; $lang->story->linkStories = "相关{$lang->SRCommon}"; -$lang->story->childStories = "细分{$lang->SRCommon}"; -$lang->story->duplicateStory = "重复{$lang->SRCommon}ID"; +$lang->story->childStories = "细分需求"; +$lang->story->duplicateStory = "重复需求ID"; $lang->story->reviewResult = '评审意见'; $lang->story->preVersion = '之前版本'; $lang->story->keywords = '关键词'; diff --git a/module/story/lang/zh-tw.php b/module/story/lang/zh-tw.php index 723d3bbf03..ce380f2a41 100644 --- a/module/story/lang/zh-tw.php +++ b/module/story/lang/zh-tw.php @@ -136,8 +136,8 @@ $lang->story->comment = '備註'; $lang->story->children = "子需求"; $lang->story->childrenAB = "子"; $lang->story->linkStories = "相關{$lang->SRCommon}"; -$lang->story->childStories = "細分{$lang->SRCommon}"; -$lang->story->duplicateStory = "重複{$lang->SRCommon}ID"; +$lang->story->childStories = "細分需求"; +$lang->story->duplicateStory = "重複需求ID"; $lang->story->reviewResult = '評審意見'; $lang->story->preVersion = '之前版本'; $lang->story->keywords = '關鍵詞'; diff --git a/module/story/model.php b/module/story/model.php index 4240c85c9e..2cd9faee00 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -4275,7 +4275,10 @@ class storyModel extends model $stories[$id]->tasks = $this->loadModel('task')->getStoryTasks($id); if($this->config->edition == 'max') { - $stories[$id]->designs = $this->dao->select('id, name')->from(TABLE_DESIGN)->where('story')->eq($id)->fetchAll('id'); + $stories[$id]->designs = $this->dao->select('id, name')->from(TABLE_DESIGN) + ->where('story')->eq($id) + ->andWhere('deleted')->eq('0') + ->fetchAll('id'); $stories[$id]->revisions = $this->dao->select('BID, extra')->from(TABLE_RELATION) ->where('AType')->eq('design') ->andWhere('BType')->eq('commit') @@ -4345,7 +4348,10 @@ class storyModel extends model $stories[$id]->tasks = $this->loadModel('task')->getStoryTasks($id); if($this->config->edition == 'max') { - $stories[$id]->designs = $this->dao->select('id, name')->from(TABLE_DESIGN)->where('story')->eq($id)->fetchAll('id'); + $stories[$id]->designs = $this->dao->select('id, name')->from(TABLE_DESIGN) + ->where('story')->eq($id) + ->andWhere('deleted')->eq('0') + ->fetchAll('id'); $stories[$id]->revisions = $this->dao->select('BID, extra')->from(TABLE_RELATION) ->where('AType')->eq('design') ->andWhere('BType')->eq('commit') @@ -4385,7 +4391,10 @@ class storyModel extends model $track[$id]->task = $this->loadModel('task')->getStoryTasks($id); if($this->config->edition == 'max') { - $track[$id]->design = $this->dao->select('id, name')->from(TABLE_DESIGN)->where('story')->eq($id)->fetchAll('id'); + $track[$id]->design = $this->dao->select('id, name')->from(TABLE_DESIGN) + ->where('story')->eq($id) + ->andWhere('deleted')->eq('0') + ->fetchAll('id'); $track[$id]->revision = $this->dao->select('BID, extra')->from(TABLE_RELATION)->where('AType')->eq('design')->andWhere('BType')->eq('commit')->andWhere('AID')->in(array_keys($track[$id]->design))->fetchPairs(); } } diff --git a/module/story/view/edit.html.php b/module/story/view/edit.html.php index 63fe2c1d49..401800657f 100644 --- a/module/story/view/edit.html.php +++ b/module/story/view/edit.html.php @@ -244,7 +244,7 @@