- programSwapper)) echo $lang->programSwapper;?>
+
+ programSwapper)) echo $lang->programSwapper;?>
+
diff --git a/module/program/control.php b/module/program/control.php
index 7fa590859b..56af6ba54c 100644
--- a/module/program/control.php
+++ b/module/program/control.php
@@ -34,7 +34,20 @@ class program extends control
$this->app->loadClass('pager', $static = true);
$pager = new pager($recTotal, $recPerPage, $pageID);
- $this->view->projectList = $this->program->getList($status, $orderBy, $pager);
+ if($programType === 'bygrid')
+ {
+ $projectList = $this->project->getProjectStats($status == 'byproduct' ? 'all' : $status, 0, 0, 30, $orderBy, $pager);
+ foreach($projectList as $projectID => $project)
+ {
+ $project->teamCount = count($this->project->getTeamMembers($projectID));
+ }
+ }
+ else
+ {
+ $projectList = $this->program->getList($status, $orderBy, $pager);
+ }
+
+ $this->view->projectList = $projectList;
$this->view->status = $status;
$this->view->orderBy = $orderBy;
$this->view->pager = $pager;
diff --git a/module/program/css/index.css b/module/program/css/index.css
index ada4c5d23b..c7345a84e4 100644
--- a/module/program/css/index.css
+++ b/module/program/css/index.css
@@ -1,9 +1,27 @@
-.panel-title {height:55px; padding:10px;}
-.main-table.flow-block {height:203px;}
-.main-table.panel-heading > strong,.main-table.panel-heading > span {margin-bottom:5px}
-#mainMenu .pull-left .checkbox-primary{display: inline-block; margin-left: 10px;}
+#mainMenu .pull-left .checkbox-primary {display: inline-block; margin-left: 10px;}
+#mainMenu .pull-right > .btn-group + .btn {margin-left: 10px;}
+#mainMenu .pull-right > .btn-group > .btn-icon {background: transparent;}
+#mainMenu .pull-right > .btn-group > .btn-icon:hover {background: #fff;}
-.footerbar .right-info{position: absolute; bottom: 10px; right: 10px;}
-.footerbar .left-info{position: absolute; bottom: 15px; left: 20px;}
-.flow-block {height: 230px;}
-.panel-body .card-content{overflow-y: scroll; height: 100px;}
+#cards {margin: 0 10px;}
+#cards > .col {width: 25%;}
+#cards .panel {margin: 10px 0; border: 1px solid #DCDCDC; border-radius: 2px; box-shadow: none; height: 146px; cursor: pointer;}
+#cards .panel:hover {border-color: #006AF1; box-shadow: 0 0 10px 0 rgba(0,0,100,.25);}
+#cards .panel-heading {padding: 12px 40px 10px 16px;}
+#cards .panel-body {padding: 0 16px 16px;}
+#cards .panel-actions {padding: 7px 0;}
+#cards .panel-actions .dropdown-menu > li > a {padding-left: 5px; text-align: left;}
+#cards .panel-actions .dropdown-menu > li > a > i {opacity: .5; display: inline-block; margin-right: 4px; width: 18px; text-align: center;}
+#cards .panel-actions .dropdown-menu > li > a:hover > i {opacity: 1;}
+#cards .project-type-label {padding: 1px 2px; position: relative; top: -2px}
+#cards .project-name {font-size: 16px; font-weight: normal;}
+#cards .project-infos {font-size: 12px;}
+#cards .project-infos > span {display: inline-block; line-height: 12px;}
+#cards .project-infos > span > .icon {font-size: 12px; display: inline-block; position: relative; top: -1px}
+#cards .project-infos > span + span {margin-left: 15px;}
+#cards .project-detail {position: absolute; bottom: 16px; left: 16px; right: 16px; font-size: 12px;}
+#cards .project-detail > p {margin-bottom: 8px;}
+#cards .project-detail .progress {height: 4px;}
+#cards .project-detail .progress-text-left .progress-text {width: 50px; left: -50px;}
+#cards .pager {margin: 0; float: right;}
+#cards .pager .btn{border: none}
diff --git a/module/program/js/index.js b/module/program/js/index.js
index 969da7b7c9..e4e9b47b34 100644
--- a/module/program/js/index.js
+++ b/module/program/js/index.js
@@ -4,6 +4,33 @@ $(function()
{
var mine = $(this).is(':checked') ? 1 : 0;
$.cookie('mine', mine, {expires:config.cookieLife, path:config.webRoot});
+ window.location.reload();
+ });
+
+ // Auto resize cards size
+ var minCardWidth = 280;
+ var $cards = $('#cards');
+ var resizeCards = function()
+ {
+ var cardsWidth = $cards.width();
+ var bestColsSize = 1;
+ while((cardsWidth / (bestColsSize + 1)) > minCardWidth)
+ {
+ bestColsSize++;
+ }
+ console.log('bestColsSize', bestColsSize);
+ $cards.children('.col').css('width', (100 / bestColsSize) + '%');
+ };
+ resizeCards();
+ $(window).on('resize', resizeCards);
+
+ // Make cards clickable
+ $cards.on('click', '.panel', function(e)
+ {
+ if(!$(e.target).closest('.panel-actions').length)
+ {
+ window.location.href = $(this).data('url');
+ }
})
$('#programTableList').on('sort.sortable', function(e, data)
diff --git a/module/program/lang/zh-cn.php b/module/program/lang/zh-cn.php
index 52d6424c39..5969c5e980 100644
--- a/module/program/lang/zh-cn.php
+++ b/module/program/lang/zh-cn.php
@@ -50,9 +50,13 @@ $lang->program->featureBar['closed'] = '已关闭';
$lang->program->chooseProgramType = '选择项目管理方式';
$lang->program->nextStep = '下一步';
+$lang->program->hoursUnit = '%s工时';
+$lang->program->membersUnit = '%s人';
+$lang->program->lastIteration = '近期迭代';
+$lang->program->ongoingStage = '进行中的阶段';
$lang->program->scrum = 'Scrum';
$lang->program->scrumTitle = '敏捷开发全流程项目管理';
$lang->program->scrumDesc = '简介：小步迭代，快速发布
包含功能点：项目概览、迭代、计划、需求等'; -$lang->program->cmmi = 'CMMI'; +$lang->program->cmmi = '瀑布'; $lang->program->cmmiTitle = '瀑布式项目管理'; $lang->program->cmmiDesc = '简介：按阶段规范化管理
包含功能点：估算、计划、阶段、报告'; diff --git a/module/program/view/index.html.php b/module/program/view/index.html.php index 9a99bab32d..ae2bb755cd 100644 --- a/module/program/view/index.html.php +++ b/module/program/view/index.html.php @@ -45,41 +45,66 @@
包含功能点：项目概览、迭代、计划、需求等'; -$lang->program->cmmi = 'CMMI'; +$lang->program->cmmi = '瀑布'; $lang->program->cmmiTitle = '瀑布式项目管理'; $lang->program->cmmiDesc = '简介：按阶段规范化管理
包含功能点：估算、计划、阶段、报告'; diff --git a/module/program/view/index.html.php b/module/program/view/index.html.php index 9a99bab32d..ae2bb755cd 100644 --- a/module/program/view/index.html.php +++ b/module/program/view/index.html.php @@ -45,41 +45,66 @@
- $project):?>
-
-
-
- name;?>
- parent);?>
- project->statusList, $project->status);?>
- PM);?>
- budget . ' ' . zget($lang->program->unitList, $project->budgetUnit);?>
-
-
-
-
-