summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjbouthillie2011-09-15 11:51:02 (EDT)
committerjbouthillie2011-09-16 10:46:41 (EDT)
commit900deef9813de1f54d25c3009bd87a97adebd592 (patch)
tree4aadab1d6eafe0dda6c29e4b03673bdb8e8fe1f5
parent44b2615e072ae2b2bc19db9d09279ce46e4e9907 (diff)
downloadorg.eclipse.mylyn.reviews.r4e-900deef9813de1f54d25c3009bd87a97adebd592.zip
org.eclipse.mylyn.reviews.r4e-900deef9813de1f54d25c3009bd87a97adebd592.tar.gz
org.eclipse.mylyn.reviews.r4e-900deef9813de1f54d25c3009bd87a97adebd592.tar.bz2
NEW - bug 348901: [report] Define the report Layout
https://bugs.eclipse.org/bugs/show_bug.cgi?id=348901 Re-adjust the report template for the start date time line
-rw-r--r--org.eclipse.mylyn.reviews.r4e.report/src/org/eclipse/mylyn/reviews/r4e/report/internal/design/globalReport.rptdesign40
-rw-r--r--org.eclipse.mylyn.reviews.r4e.report/src/org/eclipse/mylyn/reviews/r4e/report/internal/design/inspectionRecord.rptdesign40
2 files changed, 50 insertions, 30 deletions
diff --git a/org.eclipse.mylyn.reviews.r4e.report/src/org/eclipse/mylyn/reviews/r4e/report/internal/design/globalReport.rptdesign b/org.eclipse.mylyn.reviews.r4e.report/src/org/eclipse/mylyn/reviews/r4e/report/internal/design/globalReport.rptdesign
index ff213f9..5932b9f 100644
--- a/org.eclipse.mylyn.reviews.r4e.report/src/org/eclipse/mylyn/reviews/r4e/report/internal/design/globalReport.rptdesign
+++ b/org.eclipse.mylyn.reviews.r4e.report/src/org/eclipse/mylyn/reviews/r4e/report/internal/design/globalReport.rptdesign
@@ -9491,7 +9491,7 @@ if ( (phase == "R4E_REVIEW_PHASE_PLANNING" || phase == "" || phase == null) ) {
phase = row["PhaseInfo::type"];

if ( phase == "R4E_REVIEW_PHASE_DECISION" ) {
- startDate = row["startDate"];
+ startDate = row["PhaseInfo::startDate"];
endDate = row["endDate"];

if (startDate == null || startDate == "" ) {
@@ -9515,7 +9515,7 @@ if ( phase == "R4E_REVIEW_PHASE_DECISION" ) {
phase = row["PhaseInfo::type"];

if ( phase == "R4E_REVIEW_PHASE_REWORK" ) {
- startDate = row["startDate"];
+ startDate = row["PhaseInfo::startDate"];
endDate = row["endDate"];

if (startDate == null || startDate == "" ) {
@@ -9592,6 +9592,11 @@ if ( phase == "R4E_REVIEW_PHASE_COMPLETED" ) {
<text-property name="displayName">PhaseInfo::phaseOwnerID</text-property>
</structure>
<structure>
+ <property name="columnName">Reviews::ReviewType</property>
+ <property name="alias">ReviewType</property>
+ <text-property name="displayName">Reviews::ReviewType</text-property>
+ </structure>
+ <structure>
<property name="columnName">Reviews::href_1</property>
<property name="alias">href_1</property>
<text-property name="displayName">Reviews::href_1</text-property>
@@ -9786,71 +9791,76 @@ if ( phase == "R4E_REVIEW_PHASE_COMPLETED" ) {&#13;
</structure>
<structure>
<property name="position">20</property>
- <property name="name">PhaseInfo::xmi:id</property>
+ <property name="name">ReviewType</property>
<property name="dataType">string</property>
</structure>
<structure>
<property name="position">21</property>
- <property name="name">endDate</property>
+ <property name="name">PhaseInfo::xmi:id</property>
<property name="dataType">string</property>
</structure>
<structure>
<property name="position">22</property>
- <property name="name">phaseOwnerID</property>
+ <property name="name">endDate</property>
<property name="dataType">string</property>
</structure>
<structure>
<property name="position">23</property>
- <property name="name">PhaseInfo::startDate</property>
+ <property name="name">phaseOwnerID</property>
<property name="dataType">string</property>
</structure>
<structure>
<property name="position">24</property>
- <property name="name">PhaseInfo::type</property>
+ <property name="name">PhaseInfo::startDate</property>
<property name="dataType">string</property>
</structure>
<structure>
<property name="position">25</property>
- <property name="name">CurrentPhase</property>
+ <property name="name">PhaseInfo::type</property>
<property name="dataType">string</property>
</structure>
<structure>
<property name="position">26</property>
- <property name="name">ReviewStart</property>
+ <property name="name">CurrentPhase</property>
<property name="dataType">string</property>
</structure>
<structure>
<property name="position">27</property>
- <property name="name">ReviewCompletion</property>
+ <property name="name">ReviewStart</property>
<property name="dataType">string</property>
</structure>
<structure>
<property name="position">28</property>
+ <property name="name">ReviewCompletion</property>
+ <property name="dataType">string</property>
+ </structure>
+ <structure>
+ <property name="position">29</property>
<property name="name">PreparationPhase</property>
<property name="dataType">integer</property>
</structure>
<structure>
- <property name="position">29</property>
+ <property name="position">30</property>
<property name="name">PlanningPhase</property>
<property name="dataType">integer</property>
</structure>
<structure>
- <property name="position">30</property>
+ <property name="position">31</property>
<property name="name">DecisionPhase</property>
<property name="dataType">integer</property>
</structure>
<structure>
- <property name="position">31</property>
+ <property name="position">32</property>
<property name="name">ReworkPhase</property>
<property name="dataType">integer</property>
</structure>
<structure>
- <property name="position">32</property>
+ <property name="position">33</property>
<property name="name">ReviewCycleDays</property>
<property name="dataType">integer</property>
</structure>
<structure>
- <property name="position">33</property>
+ <property name="position">34</property>
<property name="name">TestCycle</property>
<property name="dataType">string</property>
</structure>
diff --git a/org.eclipse.mylyn.reviews.r4e.report/src/org/eclipse/mylyn/reviews/r4e/report/internal/design/inspectionRecord.rptdesign b/org.eclipse.mylyn.reviews.r4e.report/src/org/eclipse/mylyn/reviews/r4e/report/internal/design/inspectionRecord.rptdesign
index fea1eef..72ec449 100644
--- a/org.eclipse.mylyn.reviews.r4e.report/src/org/eclipse/mylyn/reviews/r4e/report/internal/design/inspectionRecord.rptdesign
+++ b/org.eclipse.mylyn.reviews.r4e.report/src/org/eclipse/mylyn/reviews/r4e/report/internal/design/inspectionRecord.rptdesign
@@ -9468,7 +9468,7 @@ if ( (phase == "R4E_REVIEW_PHASE_PLANNING" || phase == "" || phase == null) ) {
phase = row["PhaseInfo::type"];&#13;
&#13;
if ( phase == "R4E_REVIEW_PHASE_DECISION" ) {&#13;
- startDate = row["startDate"];&#13;
+ startDate = row["PhaseInfo::startDate"];&#13;
endDate = row["endDate"];&#13;
&#13;
if (startDate == null || startDate == "" ) {&#13;
@@ -9492,7 +9492,7 @@ if ( phase == "R4E_REVIEW_PHASE_DECISION" ) {&#13;
phase = row["PhaseInfo::type"];&#13;
&#13;
if ( phase == "R4E_REVIEW_PHASE_REWORK" ) {&#13;
- startDate = row["startDate"];&#13;
+ startDate = row["PhaseInfo::startDate"];&#13;
endDate = row["endDate"];&#13;
&#13;
if (startDate == null || startDate == "" ) {&#13;
@@ -9569,6 +9569,11 @@ if ( phase == "R4E_REVIEW_PHASE_COMPLETED" ) {&#13;
<text-property name="displayName">PhaseInfo::phaseOwnerID</text-property>
</structure>
<structure>
+ <property name="columnName">Reviews::ReviewType</property>
+ <property name="alias">ReviewType</property>
+ <text-property name="displayName">Reviews::ReviewType</text-property>
+ </structure>
+ <structure>
<property name="columnName">Reviews::href_1</property>
<property name="alias">href_1</property>
<text-property name="displayName">Reviews::href_1</text-property>
@@ -9763,71 +9768,76 @@ if ( phase == "R4E_REVIEW_PHASE_COMPLETED" ) {&#13;
</structure>
<structure>
<property name="position">20</property>
- <property name="name">PhaseInfo::xmi:id</property>
+ <property name="name">ReviewType</property>
<property name="dataType">string</property>
</structure>
<structure>
<property name="position">21</property>
- <property name="name">endDate</property>
+ <property name="name">PhaseInfo::xmi:id</property>
<property name="dataType">string</property>
</structure>
<structure>
<property name="position">22</property>
- <property name="name">phaseOwnerID</property>
+ <property name="name">endDate</property>
<property name="dataType">string</property>
</structure>
<structure>
<property name="position">23</property>
- <property name="name">PhaseInfo::startDate</property>
+ <property name="name">phaseOwnerID</property>
<property name="dataType">string</property>
</structure>
<structure>
<property name="position">24</property>
- <property name="name">PhaseInfo::type</property>
+ <property name="name">PhaseInfo::startDate</property>
<property name="dataType">string</property>
</structure>
<structure>
<property name="position">25</property>
- <property name="name">CurrentPhase</property>
+ <property name="name">PhaseInfo::type</property>
<property name="dataType">string</property>
</structure>
<structure>
<property name="position">26</property>
- <property name="name">ReviewStart</property>
+ <property name="name">CurrentPhase</property>
<property name="dataType">string</property>
</structure>
<structure>
<property name="position">27</property>
- <property name="name">ReviewCompletion</property>
+ <property name="name">ReviewStart</property>
<property name="dataType">string</property>
</structure>
<structure>
<property name="position">28</property>
+ <property name="name">ReviewCompletion</property>
+ <property name="dataType">string</property>
+ </structure>
+ <structure>
+ <property name="position">29</property>
<property name="name">PreparationPhase</property>
<property name="dataType">integer</property>
</structure>
<structure>
- <property name="position">29</property>
+ <property name="position">30</property>
<property name="name">PlanningPhase</property>
<property name="dataType">integer</property>
</structure>
<structure>
- <property name="position">30</property>
+ <property name="position">31</property>
<property name="name">DecisionPhase</property>
<property name="dataType">integer</property>
</structure>
<structure>
- <property name="position">31</property>
+ <property name="position">32</property>
<property name="name">ReworkPhase</property>
<property name="dataType">integer</property>
</structure>
<structure>
- <property name="position">32</property>
+ <property name="position">33</property>
<property name="name">ReviewCycleDays</property>
<property name="dataType">integer</property>
</structure>
<structure>
- <property name="position">33</property>
+ <property name="position">34</property>
<property name="name">TestCycle</property>
<property name="dataType">string</property>
</structure>