@@ -36,3 +41,10 @@
#assigntomeBlock > .nav {position: absolute; top: -41px; left: 120px;}
#assigntomeBlock .block-todoes .todoes-form{top: -50px;}
+
diff --git a/module/block/view/programstatisticblock.html.php b/module/block/view/programstatisticblock.html.php
index 00d3380f4b..e739b2941e 100644
--- a/module/block/view/programstatisticblock.html.php
+++ b/module/block/view/programstatisticblock.html.php
@@ -62,6 +62,14 @@ html[lang="en"] .product-info .type-info {color: #A6AAB8; text-align: center; po
.status-count{margin:auto}
.status-count tr:first-child td:last-child{color:#000;font-weight:bold}
+
+.block-statistic .progress-group{margin-top: 20px; height: 65px;}
+.block-statistic .weekly-title{font-weight: bold; font-size:14px; color: #3C4253;}
+.block-statistic .weekly-small{font-size:12px; color: #838A9D;}
+.block-statistic .weekly-progress {font-weight: bold; font-size:24px;}
+.block-statistic .weekly-name{font-size:14px; color: #838A9D;}
+.block-statistic .weekly-value{font-size:18px; color: #3C4253;}
+.block-statistic .col-6 .stage{margin-left: 10px}
diff --git a/module/story/view/track.html.php b/module/story/view/track.html.php
new file mode 100644
index 0000000000..7b2deee001
--- /dev/null
+++ b/module/story/view/track.html.php
@@ -0,0 +1,86 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ | story->requirement;?> |
+ story->story;?> |
+ story->design;?> |
+ story->case;?> |
+ story->repoCommit;?> |
+ story->bug;?> |
+
+
+
+ $requirement):?>
+ track;?>
+
+
+ | id"), $requirement->title, '', "title=$requirement->title");?>
+
+ story->statusList, $requirement->status);?>
+
+ |
+
+
+ $story):?>
+ ';?>
+ createLink('story', 'view', "storyID=$storyID"), $story->title, '',"title='$story->title'");?> |
+
+ design as $designID => $design):?>
+ createLink('design', 'view', "designID=$designID"), $design->name, '', "title='$design->name'") . '
';?>
+
+ |
+
+ case as $caseID => $case):?>
+ createLink('testcase', 'view', "caseID=$caseID"), $case->title, '', "title='$case->title'") . '
';?>
+
+ |
+
+ revision as $revision => $repoID):?>
+ createLink('design', 'revision', "repoID=$revision"), '#'. $revision) . '
';
+ ?>
+
+ |
+
+ bug as $bugID => $bug):?>
+ createLink('bug', 'view', "bugID=$bugID"), $bug->title, '', "title='$bug->title'") . '
';?>
+
+ |
+ ';?>
+
+
+
+ |
+ |
+ |
+ |
+ |
+
+
+
+
+
+
+
+
+
+
diff --git a/module/story/view/view.html.php b/module/story/view/view.html.php
index e93fc565ec..ecac3587f9 100644
--- a/module/story/view/view.html.php
+++ b/module/story/view/view.html.php
@@ -62,6 +62,56 @@
story->legendVerify;?>
verify;?>
+ template == 'cmmi'):?>
+
+
+ id] = $item->title;
+ foreach($relation as $id => $title)
+ {
+ echo "- " . html::a($this->createLink('story', 'view', "id=$id", '', true), "#$id $title", '', "class='iframe' data-width='80%'");
+ echo html::a($this->createLink('story', 'linkStory', "storyID=$story->id&type=remove&linkedID=$id"), '', 'hiddenwin', "class='deleter hide removeButton'");
+ }
+ ?>
+ type == 'story') ? $lang->story->requirement : $lang->story->story;?>
+
- createLink('story', 'linkStory', "storyID=$story->id", '', true), $lang->story->link . $linkLang, '', "class='btn btn-info iframe' data-width='95%' id='linkButton'");?>
+ story->unlink . $linkLang, '', "class='btn btn-info' id='unlinkStory'");?>
+
+
+
global->flow != 'onlyStory'):?>
@@ -454,6 +526,8 @@ js::set('productID', $story->product);
js::set('branch', $story->branch);
js::set('moduleID', $story->module);
js::set('storyType', $story->type);
+js::set('unlink', $lang->story->unlink);
+js::set('cancel', $lang->cancel);
?>
diff --git a/module/weekly/control.php b/module/weekly/control.php
index 605ccc07ed..77f740e14b 100644
--- a/module/weekly/control.php
+++ b/module/weekly/control.php
@@ -40,7 +40,7 @@ class weekly extends control
$this->view->postponed = $this->weekly->getPostponed($program);
$this->view->nextWeek = $this->weekly->getTasksOfNextWeek($program, $date);
$this->view->workload = $this->weekly->getWorkloadByType($program, $date);
- $this->weekly->save($program, $this->view, $date);
+ $this->weekly->save($program, $date);
$this->lang->modulePageNav = $this->weekly->getPageNav($this->view->program, $date);
$this->display();
diff --git a/module/weekly/model.php b/module/weekly/model.php
index 7e0937f656..9ca9330d2d 100644
--- a/module/weekly/model.php
+++ b/module/weekly/model.php
@@ -60,19 +60,18 @@ class weeklyModel extends model
->fetch();
}
- public function save($program, $data, $date)
+ public function save($program, $date)
{
$report = new stdclass;
- $report->pv = zget($data, 'pv', '');
- $report->ev = zget($data, 'ev', '');
- $report->ac = zget($data, 'ac', '');
- $report->sv = zget($data, 'sv', '');
- $report->cv = zget($data, 'cv', '');
+ $report->pv = $this->getPV($program, $date);
+ $report->ev = $this->getEV($program, $date);
+ $report->ac = $this->getAC($program, $date);
+ $report->sv = $this->getSV($report->ev, $report->pv);
+ $report->cv = $this->getCV($report->ev, $report->ac);
$report->program = $program;
$report->weekStart = $this->getThisMonday($date);
- $report->staff = zget($data, 'staff', '');
- $report->progress = zget($data, 'progress', '');
- $report->workload = json_encode(zget($data, 'workload', ''));
+ $report->staff = $this->getStaff($program);
+ $report->workload = json_encode($this->getWorkloadByType($program, $date));
$this->dao->replace(TABLE_WEEKLYREPORT)->data($report)->exec();
}