diff --git a/module/design/config.php b/module/design/config.php new file mode 100644 index 0000000000..3dd9d6c3d1 --- /dev/null +++ b/module/design/config.php @@ -0,0 +1,7 @@ +design = new stdclass(); +$config->design->editor = new stdclass(); +$config->design->editor->create = array('id' => 'desc', 'tools' => 'simpleTools'); +$config->design->editor->edit = array('id' => 'desc', 'tools' => 'simpleTools'); + +$config->design->affectedFixedNum = 7; diff --git a/module/design/css/commit.css b/module/design/css/commit.css new file mode 100644 index 0000000000..71e8d1ff9e --- /dev/null +++ b/module/design/css/commit.css @@ -0,0 +1,7 @@ +.searchBox{min-height: 45px;} +.searchBox .srearch-date{float: left; width: 20%} +.searchBox h4{float:left;display: inline-block} +.searchBox span{float:left;line-height:30px} +#logForm .table thead th{background: #efefef} +#begin{margin-right:5px} +#end{margin-left:5px} diff --git a/module/design/js/commit.js b/module/design/js/commit.js new file mode 100644 index 0000000000..3d87736b51 --- /dev/null +++ b/module/design/js/commit.js @@ -0,0 +1,20 @@ +$('#begin, #end').change(function() +{ + var begin = $('#begin').val(); + var end = $('#end').val(); + + if(begin.indexOf('-') != -1) + { + var beginarray = begin.split("-"); + var begin = ''; + for(i = 0; i < beginarray.length; i++) begin = begin + beginarray[i]; + } + if(end.indexOf('-') != -1) + { + var endarray = end.split("-"); + var end = ''; + for(i = 0 ; i < endarray.length ; i++) end = end + endarray[i]; + } + + location.href = createLink('design', 'commit', "designID=" + designID + '&begin=' + begin + '&end=' + end); +}) diff --git a/module/design/js/common.js b/module/design/js/common.js new file mode 100644 index 0000000000..7005b0242f --- /dev/null +++ b/module/design/js/common.js @@ -0,0 +1,5 @@ +$(document).on('click', '.ajaxPager', function() +{ + $('#logBox').load($(this).attr('href')); + return false; +}) diff --git a/module/design/lang/zh-cn.php b/module/design/lang/zh-cn.php new file mode 100644 index 0000000000..78f3a669d2 --- /dev/null +++ b/module/design/lang/zh-cn.php @@ -0,0 +1,46 @@ +design->common = '设计'; +$lang->design->browse = '浏览列表'; +$lang->design->commit = '关联提交'; +$lang->design->submission = '相关提交'; +$lang->design->version = '版本号'; +$lang->design->assignedTo = '指派给'; +$lang->design->actions = '操作'; +$lang->design->delete = '删除'; +$lang->design->confirmDelete = '您确定要删除这个设计吗？'; +$lang->design->edit = '变更'; +$lang->design->products = '所属产品'; +$lang->design->story = '相关需求'; +$lang->design->file = '附件'; +$lang->design->type = '设计类型'; +$lang->design->name = '设计名称'; +$lang->design->create = '创建设计'; +$lang->design->view = '查看设计'; +$lang->design->desc = '设计描述'; +$lang->design->product = '所属产品'; +$lang->design->basicInfo = '基础信息'; +$lang->design->commitDate = '提交时间'; +$lang->design->affectedStory = "影响{$lang->storyCommon}"; +$lang->design->affectedTasks = '影响任务'; +$lang->design->submit = '提交评审'; +$lang->design->revision = '查看关联代码'; +$lang->design->designView = '查看详情'; +$lang->design->reviewObject = '评审对象'; +$lang->design->createdBy = '由谁创建'; +$lang->design->createdDate = '创建时间'; + +$lang->design->typeList = array(); +$lang->design->typeList['all'] = '所有'; +$lang->design->typeList['HLDS'] = '概要设计'; +$lang->design->typeList['DDS'] = '详细设计'; +$lang->design->typeList['DBDS'] = '数据库设计'; +$lang->design->typeList['ADS'] = '接口设计'; + +$lang->design->range = '影响范围'; +$lang->design->errorSelection = '还没有选中记录!'; +$lang->design->noDesign = '暂时没有记录'; + +$lang->design->rangeList = array(); +$lang->design->rangeList['all'] = '全部记录'; +$lang->design->rangeList['assign'] = '选中记录'; + diff --git a/module/design/view/browse.html.php b/module/design/view/browse.html.php new file mode 100644 index 0000000000..91e63a28da --- /dev/null +++ b/module/design/view/browse.html.php @@ -0,0 +1,123 @@ + + * @package flow + * @version $Id$ + * @link http://www.ranzhico.com + */ +?> +loadModel('common')->getRelations('design', $data->id, 'commit'); + $data->commit = ''; + foreach($relations as $relation) $data->commit .= html::a(helper::createLink('design', 'revision', "repoID=$relation->BID", '', true), "#$relation->BID", '', "class='iframe' data-width='80%' data-height='550'"); + } +} +?> + + + + +category == 'single' ? 'hidden' : 'show'; +js::set('showSubHeader', $showSubHeader); +?> + +
+ +
+

design->noDesign;?>

+
+ +
+ + recTotal&recPerPage=$pager->recPerPage&pageID=$pager->pageID";?> + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ idAB);?> + 		+ design->type);?> + + design->name);?> + + design->submission);?> + + design->version);?> + + design->createdBy);?> + + design->createdDate);?> + + design->assignedTo);?> + + design->actions;?> +
id);?>design->typeList, $design->type);?>createLink('design', 'view', "id={$design->id}"), $design->name);?>design->submission, $design->commit);?>design->version, $design->version);?>createdBy;?>createdDate;?>assignedTo;?> + id}"; + common::printIcon('design', 'edit', $vars, $design, 'list', 'fork', '', '', '', '', '', $design->program); + common::printIcon('design', 'commit', $vars, $design, 'list', 'link', '', 'iframe showinonlybody', true); + common::printIcon('design', 'delete', $vars, $design, 'list', 'trash', 'hiddenwin', '', '', '', '', $design->program); + ?> +
+
+ show('right', 'pagerjs');?> +
+
+ +
+ diff --git a/module/design/view/commit.html.php b/module/design/view/commit.html.php new file mode 100644 index 0000000000..edd4424200 --- /dev/null +++ b/module/design/view/commit.html.php @@ -0,0 +1,62 @@ + + +
+
+

+ id;?> + name?> + arrow . $lang->design->commit;?> +

+
+
+

design->commitDate . '：';?>

+ + ~ + +
+
method='post'> + + + + + + SCM) and $repo->SCM == 'Git'):?> + + + + + + + + + + + + + SCM == 'Git'):?> + + + + + comment, ENT_QUOTES);?> + + + + +
repo->revisionA?>repo->commit?>repo->time?>repo->committer?>repo->comment?>
+
+ revision, $linkedRevisions)) echo 'checked="checked"'?>/> + +
+ 		repo->createLink('revision', "repoID=$repoID&revision={$log->revision}"), $repo->SCM == 'Git' ? substr($log->revision, 0, 10) : $log->revision);?>commit?>time, 0, 10);?>committer;?>comment?>
+
+
+
+ +
+ show('right', 'pagerjs');?> +
+
+
+ + diff --git a/module/design/view/create.html.php b/module/design/view/create.html.php new file mode 100644 index 0000000000..504da92c35 --- /dev/null +++ b/module/design/view/create.html.php @@ -0,0 +1,71 @@ + + +category == 'single' ? 'hidden' : 'show'; +js::set('showSubHeader', $showSubHeader); +?> +
+
+
+

design->create;?>

+
+
+ + + category == 'multiple'):?> + + + + + + + category == 'single'):?> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
design->product;?>
design->story;?>
design->type;?>design->typeList, '', "class='form-control chosen'");?>
design->name;?>
design->desc;?>
design->file;?>fetch('file', 'buildform', 'fileCount=1&percent=0.85');?>
+
+
+
+ + diff --git a/module/design/view/edit.html.php b/module/design/view/edit.html.php new file mode 100644 index 0000000000..4878f0beea --- /dev/null +++ b/module/design/view/edit.html.php @@ -0,0 +1,107 @@ + + +category == 'single' ? 'hidden' : 'show'; +js::set('showSubHeader', $showSubHeader); +?> + +
+
+
+

design->edit;?>

+
+
+ + + category == 'multiple'):?> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
design->product;?>product, "class='form-control chosen'");?>
design->story;?>story, "class='form-control chosen'");?>
design->type;?>design->typeList, $design->type, "class='form-control chosen'");?>
design->name;?>name, "class='form-control'");?>
design->desc;?>desc, 'class="form-control"');?>
design->file;?>fetch('file', 'buildform', 'fileCount=1&percent=0.85');?>
story->checkAffection;?> +
+ +
+
+ + + + + + + + + + + + + tasks as $task):?> + + + ; + + + + + + + +
task->id;?>task->name;?>task->assignedTo;?>task->status;?>task->consumed;?>task->left;?>
id?>createLink('task', 'view', "taskID=$task->id"), $task->name, '_blank');?>assignedTo);?>processStatus('task', $task);?>consumed;?>left;?>
+
+
+
+
+
+
+
+ + diff --git a/module/design/view/submit.html.php b/module/design/view/submit.html.php new file mode 100644 index 0000000000..16e8c8ffef --- /dev/null +++ b/module/design/view/submit.html.php @@ -0,0 +1,35 @@ + +
+
+
+
+

design->submit;?>

+
+
+ + + + + + + + + + + + + + +
design->reviewObject;?> + design->typeList, $designType, "class='form-control'");?> +
design->range;?> + design->rangeList, '', "class='form-control'");?> +
+
+
+
+ +
diff --git a/module/design/view/view.html.php b/module/design/view/view.html.php new file mode 100644 index 0000000000..3926d89ba4 --- /dev/null +++ b/module/design/view/view.html.php @@ -0,0 +1,87 @@ + +commit = ''; + foreach($relations as $relation) $data->commit .= " #$relation->BID"; + $data->story = $storyTitle; +} +?> + +
+
+
+
+
design->desc;?>
+
+ desc;?> + fetch('file', 'printFiles', array('files' => $data->files, 'fieldset' => 'true'));?> +
+
+
+
+
+
+ session->designList);?> +
";?> + deleted):?> + id", $data, 'button', 'link', '', 'iframe showinonlybody', true); + common::printIcon('design', 'edit', "designID=$data->id", $data, 'button', '', '', '', true); + common::printIcon('design', 'delete', "designID=$data->id", $data, 'button', 'trash', 'hiddenwin'); + ?> + +
+
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + +
design->type;?>design->typeList, $data->type);?>
design->product;?>productName;?>
design->story;?>story;?>
design->commit;?>commit;?>
design->createdBy;?>createdBy);?>
design->createdDate;?>createdDate;?>
+
+
+
+ + +