diff --git a/module/common/lang/zh-tw.php b/module/common/lang/zh-tw.php index 7972a580fa..b0d5350db7 100644 --- a/module/common/lang/zh-tw.php +++ b/module/common/lang/zh-tw.php @@ -252,12 +252,7 @@ $lang->project->dividerMenu = ',story,doc,'; $lang->task = new stdclass(); $lang->build = new stdclass(); $lang->task->menu = $lang->project->menu; -$lang->task->subMenu = $lang->project->subMenu; $lang->build->menu = $lang->project->menu; -$lang->build->subMenu = $lang->project->subMenu; - -$lang->task->dividerMenu = $lang->project->dividerMenu; -$lang->build->dividerMenu = $lang->project->dividerMenu; /* QA視圖菜單設置。*/ $lang->qa = new stdclass(); @@ -309,10 +304,7 @@ $lang->caselib->menu->caselib = array('link' => '用例庫|testsuite|library', /* 文檔視圖菜單設置。*/ $lang->doc = new stdclass(); $lang->doc->menu = new stdclass(); - -$lang->doc->menu->list = array('link' => '%s', 'fixed' => true); -$lang->doc->menu->crumb = array('link' => '%s', 'fixed' => true); -$lang->doc->menu->create = array('link' => ' 添加文檔庫|doc|createLib', 'float' => 'right'); +//$lang->doc->menu->createLib = array('link' => ' 添加檔案夾|doc|createLib', 'float' => 'right'); /* 統計視圖菜單設置。*/ $lang->report = new stdclass(); @@ -550,9 +542,9 @@ $lang->icons['edit'] = 'edit'; $lang->icons['delete'] = 'trash'; $lang->icons['copy'] = 'copy'; $lang->icons['report'] = 'bar-chart'; -$lang->icons['export'] = 'download-alt'; +$lang->icons['export'] = 'export'; $lang->icons['report-file'] = 'file-powerpoint'; -$lang->icons['import'] = 'upload-alt'; +$lang->icons['import'] = 'import'; $lang->icons['finish'] = 'checked'; $lang->icons['resolve'] = 'ok-sign'; $lang->icons['start'] = 'play'; diff --git a/module/common/model.php b/module/common/model.php index 23a92a32f7..c70de4db81 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -1580,6 +1580,7 @@ EOD; } $response = curl_exec($curl); + $errors = curl_error($curl); curl_close($curl); $logFile = $app->getLogRoot() . 'saas.'. date('Ymd') . '.log.php'; @@ -1590,7 +1591,9 @@ EOD; { fwrite($fh, date('Ymd H:i:s') . ": " . $app->getURI() . "\n"); fwrite($fh, "url: " . $url . "\n"); + if(!empty($data)) fwrite($fh, "data: " . print_r($data, true) . "\n"); fwrite($fh, "results:" . print_r($response, true) . "\n"); + if(!empty($errors)) fwrite($fh, "errors: " . $errors . "\n"); fclose($fh); } diff --git a/module/doc/lang/zh-tw.php b/module/doc/lang/zh-tw.php index 9f18df2444..720304d04e 100644 --- a/module/doc/lang/zh-tw.php +++ b/module/doc/lang/zh-tw.php @@ -46,13 +46,19 @@ $lang->doc->users = '用戶'; $lang->doc->moduleDoc = '按模組瀏覽'; $lang->doc->searchDoc = '搜索'; +$lang->doc->fast = '快速訪問'; $lang->doc->allDoc = '所有文檔'; $lang->doc->openedByMe = '由我創建'; $lang->doc->orderByOpen = '最近添加'; -$lang->doc->orderByEdit = '最近修改'; +$lang->doc->orderByEdit = '最近更新'; +$lang->doc->orderByVisit = '最近訪問'; +$lang->doc->todayEdited = '今日更新'; +$lang->doc->pastEdited = '往日更新'; +$lang->doc->myDoc = '我的文檔'; +$lang->doc->myCollection = '我的收藏'; /* 方法列表。*/ -$lang->doc->index = '首頁'; +$lang->doc->index = '文檔主頁'; $lang->doc->create = '創建文檔'; $lang->doc->edit = '編輯文檔'; $lang->doc->delete = '刪除文檔'; @@ -113,6 +119,16 @@ $lang->doc->browseTypeList['menu'] = '目錄'; $lang->doc->browseTypeList['tree'] = '樹狀圖'; $lang->doc->browseTypeList['card'] = '卡片'; +$lang->doc->fastMenuList['byediteddate'] = '最近更新'; +$lang->doc->fastMenuList['visiteddate'] = '最近訪問'; +$lang->doc->fastMenuList['openedbyme'] = '我的文檔'; +$lang->doc->fastMenuList['collectedbyme'] = '我的收藏'; + +$lang->doc->fastMenuIconList['byediteddate'] = 'icon-folder-upload'; +$lang->doc->fastMenuIconList['visiteddate'] = 'icon-folder-move'; +$lang->doc->fastMenuIconList['openedbyme'] = 'icon-folder-account'; +$lang->doc->fastMenuIconList['collectedbyme'] = 'icon-folder-star'; + $lang->doc->confirmDelete = "您確定刪除該文檔嗎？"; $lang->doc->confirmDeleteLib = "您確定刪除該文檔庫嗎？"; $lang->doc->errorEditSystemDoc = "系統文檔庫無需修改。"; diff --git a/module/project/control.php b/module/project/control.php index 9159e20402..5e994a9e3a 100644 --- a/module/project/control.php +++ b/module/project/control.php @@ -803,6 +803,14 @@ class project extends control $this->app->loadClass('pager', $static = true); $pager = pager::init($recTotal, $recPerPage, $pageID); + $tasks = $this->testtask->getProjectTasks($projectID, $orderBy, $pager); + foreach($tasks as $key => $task) + { + $tasks[$task->product][] = $task; + + unset($tasks[$key]); + } + $this->view->title = $this->projects[$projectID] . $this->lang->colon . $this->lang->testtask->common; $this->view->position[] = html::a($this->createLink('project', 'testtask', "projectID=$projectID"), $this->projects[$projectID]); $this->view->position[] = $this->lang->testtask->common; @@ -810,7 +818,7 @@ class project extends control $this->view->projectName = $this->projects[$projectID]; $this->view->pager = $pager; $this->view->orderBy = $orderBy; - $this->view->tasks = $this->testtask->getProjectTasks($projectID, $orderBy, $pager); + $this->view->tasks = $tasks; $this->view->users = $this->loadModel('user')->getPairs('noclosed|noletter'); $this->view->products = $this->loadModel('product')->getPairs(); diff --git a/module/project/css/testtask.css b/module/project/css/testtask.css new file mode 100644 index 0000000000..00e4b489c3 --- /dev/null +++ b/module/project/css/testtask.css @@ -0,0 +1 @@ +.table-group-btns {width: 200px;} diff --git a/module/project/lang/zh-tw.php b/module/project/lang/zh-tw.php index db1d970f28..f2e23caacc 100644 --- a/module/project/lang/zh-tw.php +++ b/module/project/lang/zh-tw.php @@ -23,6 +23,7 @@ $lang->project->days = '可用工作日'; $lang->project->day = '天'; $lang->project->workHour = '工時'; $lang->project->totalHours = '可用工時'; +$lang->project->totalDays = '可用工日'; $lang->project->status = $lang->projectCommon . '狀態'; $lang->project->desc = $lang->projectCommon . '描述'; $lang->project->owner = '負責人'; @@ -57,6 +58,8 @@ $lang->project->delayed = '已延期'; $lang->project->product = $lang->project->products; $lang->project->readjustTime = '調整項目起止時間'; $lang->project->readjustTask = '順延任務的起止時間'; +$lang->project->effort = '日誌'; +$lang->project->relatedMember = '相關成員'; $lang->project->start = '開始'; $lang->project->activate = '激活'; @@ -119,6 +122,7 @@ $lang->project->burnData = '燃盡圖數據'; $lang->project->fixFirst = '修改首天工時'; $lang->project->team = '團隊成員'; $lang->project->doc = '文檔列表'; +$lang->project->doclib = '文檔庫列表'; $lang->project->manageProducts = '關聯' . $lang->productCommon; $lang->project->linkStory = '關聯需求'; $lang->project->linkStoryByPlan = '按照計劃關聯'; @@ -188,17 +192,20 @@ $lang->project->aboveAllProject = "以上所有{$lang->projectCommon}"; /* 頁面提示。*/ $lang->project->selectProject = "請選擇{$lang->projectCommon}"; $lang->project->beginAndEnd = '起止時間'; +$lang->project->begin = '開始日期'; +$lang->project->end = '截止日期'; $lang->project->lblStats = '工時統計'; $lang->project->stats = '可用工時 %s 工時，總共預計 %s 工時，已經消耗 %s 工時，預計剩餘 %s 工時'; $lang->project->taskSummary = "本頁共 %s 個任務，未開始 %s，進行中 %s，總預計 %s 工時，已消耗 %s 工時，剩餘 %s 工時。"; $lang->project->checkedSummary = "選中 %total% 個任務，未開始 %wait%，進行中 %doing%，總預計 %estimate% 工時，已消耗 %consumed% 工時，剩餘 %left% 工時。"; -$lang->project->memberHours = "%s共有 %s 個可用工時，"; -$lang->project->groupSummary = "本組共 %s 個任務，未開始 %s，進行中 %s，總預計 %s 工時，已消耗 %s 工時，剩餘 %s 工時。"; -$lang->project->groupSummaryAB = "總任務 %s，未開始 %s，進行中 %s。
總預計 %s，已消耗 %s，剩餘 %s。"; -$lang->project->noTimeSummary = "本組共 %s 個任務，未開始 %s，進行中 %s"; +$lang->project->memberHoursAB = "
%s有 %s 工時
"; +$lang->project->memberHours = '
%s可用工時
%s
'; +$lang->project->countSummary = '
總任務
%s
進行中
%s
未開始
%s
'; +$lang->project->timeSummary = '
總消耗
%s
已消耗
%s
剩餘
%s
'; +$lang->project->groupSummaryAB = "
總任務 %s
未開始 %s   進行中 %s
總預計 %s
已消耗 %s   剩餘 %s
"; $lang->project->wbs = "分解任務"; $lang->project->batchWBS = "批量分解"; -$lang->project->howToUpdateBurn = "幫助"; +$lang->project->howToUpdateBurn = "幫助 "; $lang->project->whyNoStories = "看起來沒有需求可以關聯。請檢查下{$lang->projectCommon}關聯的{$lang->productCommon}中有沒有需求，而且要確保它們已經審核通過。"; $lang->project->productStories = "{$lang->projectCommon}關聯的需求是{$lang->productCommon}需求的子集，並且只有評審通過的需求才能關聯。請關聯需求。"; $lang->project->doneProjects = '已結束'; @@ -246,6 +253,8 @@ $lang->project->charts->burn->graph->formatNumber = 0; $lang->project->charts->burn->graph->animation = 0; $lang->project->charts->burn->graph->rotateNames = 1; $lang->project->charts->burn->graph->showValues = 0; +$lang->project->charts->burn->graph->reference = '參考'; +$lang->project->charts->burn->graph->actuality = '實際'; $lang->project->placeholder = new stdclass(); $lang->project->placeholder->code = '團隊內部的簡稱'; diff --git a/module/project/view/testtask.html.php b/module/project/view/testtask.html.php index b0c800149b..31e9c662ec 100644 --- a/module/project/view/testtask.html.php +++ b/module/project/view/testtask.html.php @@ -14,22 +14,30 @@ testtask->confirmDelete)?>
-
- + +
recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}";?> - + + - - + - - + $productTasks):?> + + + > + + + - @@ -84,6 +98,17 @@ + + + + +
testtask->product);?>
@@ -38,19 +46,26 @@ idAB);?>
testtask->product);?> testtask->name);?> testtask->build);?> testtask->owner);?> testtask->begin);?> testtask->end);?> statusAB);?>actions;?>actions;?>
+ +
testtask->allTasks;?>
+ 		id => sprintf('%03d', $task->id)));?> @@ -58,7 +73,6 @@ id);?> product, '');?> createLink('testtask', 'view', "taskID=$task->id"), $task->name);?> build == 'trunk' || empty($task->buildName)) ? $lang->trunk : html::a($this->createLink('build', 'view', "buildID=$task->build"), $task->buildName);?> owner];?>
diff --git a/module/story/lang/zh-tw.php b/module/story/lang/zh-tw.php index a4d159e343..8177e7d2d0 100644 --- a/module/story/lang/zh-tw.php +++ b/module/story/lang/zh-tw.php @@ -10,7 +10,7 @@ * @link http://www.zentao.net */ $lang->story->create = "提需求"; -$lang->story->batchCreate = "批量提需求"; +$lang->story->batchCreate = "批量創建"; $lang->story->change = "變更"; $lang->story->changed = '需求變更'; $lang->story->review = '評審'; diff --git a/module/task/lang/zh-tw.php b/module/task/lang/zh-tw.php index 3072ccd14f..d8dd5a2d93 100644 --- a/module/task/lang/zh-tw.php +++ b/module/task/lang/zh-tw.php @@ -11,7 +11,7 @@ */ $lang->task->index = "任務一覽"; $lang->task->create = "建任務"; -$lang->task->batchCreate = "批量建任務"; +$lang->task->batchCreate = "批量創建"; $lang->task->batchEdit = "批量編輯"; $lang->task->batchChangeModule = "批量修改模組"; $lang->task->batchClose = "批量關閉"; diff --git a/module/testtask/lang/en.php b/module/testtask/lang/en.php index a6a549b7e9..83902e59d4 100644 --- a/module/testtask/lang/en.php +++ b/module/testtask/lang/en.php @@ -40,6 +40,9 @@ $lang->testtask->blocked = "Blocked"; $lang->testtask->done = "Tested"; $lang->testtask->totalStatus = "All"; $lang->testtask->all = "All " . $lang->productCommon; +$lang->testtask->allTasks = 'All'; +$lang->testtask->collapseAll = 'Collapse'; +$lang->testtask->expandAll = 'Expand'; $lang->testtask->id = 'ID'; $lang->testtask->common = 'Test Task'; diff --git a/module/testtask/lang/zh-cn.php b/module/testtask/lang/zh-cn.php index 2c9056f3a8..61c9ff767f 100644 --- a/module/testtask/lang/zh-cn.php +++ b/module/testtask/lang/zh-cn.php @@ -40,6 +40,9 @@ $lang->testtask->blocked = "被阻塞版本"; $lang->testtask->done = "已测版本"; $lang->testtask->totalStatus = "全部"; $lang->testtask->all = "全部" . $lang->productCommon; +$lang->testtask->allTasks = '所有测试'; +$lang->testtask->collapseAll = '全部折叠'; +$lang->testtask->expandAll = '全部展开'; $lang->testtask->id = '编号'; $lang->testtask->common = '测试单'; diff --git a/module/testtask/lang/zh-tw.php b/module/testtask/lang/zh-tw.php index aed037b074..ab9121a286 100644 --- a/module/testtask/lang/zh-tw.php +++ b/module/testtask/lang/zh-tw.php @@ -40,6 +40,9 @@ $lang->testtask->blocked = "被阻塞版本"; $lang->testtask->done = "已測版本"; $lang->testtask->totalStatus = "全部"; $lang->testtask->all = "全部" . $lang->productCommon; +$lang->testtask->allTasks = '所有測試'; +$lang->testtask->collapseAll = '全部摺疊'; +$lang->testtask->expandAll = '全部展開'; $lang->testtask->id = '編號'; $lang->testtask->common = '測試單';