tweaks

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@904580 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 26 insertions, 8 deletions

diff --git a/sandbox/kgoodson/jagg/src/main/resources/uiservices/plan.html b/sandbox/kgoodson/jagg/src/main/resources/uiservices/plan.html
index b5b3cba24c..90e34be917 100644
--- a/sandbox/kgoodson/jagg/src/main/resources/uiservices/plan.html
+++ b/sandbox/kgoodson/jagg/src/main/resources/uiservices/plan.html
@@ -34,18 +34,36 @@
 			alert(exception.message);
 			return;
 		}
+		ms = plan.milestone.list;
 		var mscontent = "<table border=\"1\" align=\"left\">";
-	 	ms = plan.milestone.list;
 		for(var i=0; i<ms.length; i++) {
-			mscontent += "<tr><th colspan=\"4\" align=\"left\">Milestone " + ms[i].ID + "</th></tr>";
+			mscontent += "<tr><th colspan=\"6\" align=\"left\">Milestone " + ms[i].ID + "</th></tr>";
 			var mswi = ms[i].workItem.list;
-			mscontent +="<tr><th align=\"left\">Title</th><td>JIRA</th><td>Responsible</th><th>Status</th></tr>";
+			mscontent +="<tr>"+
+
+							"<th>Work Item</th>"+
+							"<th>Owner</th>"+
+							"<th>Jira</th>"+
+							"<th>Jira title</th>"+
+							"<th>Jira Assigned To</th>"+
+							"<th>Status</th>"+
+
+							"</tr>";
 			for (var j=0; j<mswi.length; j++) {
-				mscontent +=
-					"<tr>"
-					+"<td>"+mswi[j].title+"</td>" + "<td><A HREF=\""+plan.issueBase+mswi[j].jira+"\">"+mswi[j].jira
-						+"</td>"+ "<td>"+mswi[j].jiraData.assignedTo+"</td>"+ "<td>"+mswi[j].jiraData.status+"</td>"+ "<td></td>"
-					+"</tr>";
+				mscontent +="<tr>"+"<td>"+mswi[j].title+"</td>"+
+				"<td>"+mswi[j].responsible+"</td>";
+				if(mswi[j].jira) {
+					mscontent += 
+					"<td><A HREF=\""+plan.issueBase+mswi[j].jira+"\">"+mswi[j].jira+"</A></td>"+
+
+					"<td>"+mswi[j].jiraData.title+"</td>"+
+					"<td>"+mswi[j].jiraData.assignedTo+"</td>"+
+					"<td>"+mswi[j].jiraData.status+"</td>"+
+					"<td></td>"
+				} else {
+					mscontent += "<td colspan=\"4\"></td>";
+				}
+				mscontent += "</tr>";
 			}
 
 		}