Merge pull request #57 from matallen/master

update to support pages only
redhat-cop · Oct 24, 2019 · 6d06f31 · 6d06f31
2 parents ad83776 + 3d899c2
commit 6d06f31
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 6 deletions.
diff --git a/src/main/webapp/support-trello-all.jsp b/src/main/webapp/support-trello-all.jsp
@@ -96,7 +96,7 @@ $(document).ready(function() {
     	var list=document.getElementById("list").value;
     	var org=document.getElementById("org").value;
     	
-    	document.getElementById("cardData").innerHTML="<tr><td colspan='6'><center>Loading...</center></td></tr>";
+    	document.getElementById("cardData").innerHTML="<tr><td colspan='7'><center>Loading...</center></td></tr>";
     	
     	Http.httpGetObject("/community-ninja-board/api/support/trello/"+username+"/cards?org="+org+"&daysOld="+daysOld+(list.length>0?"&list="+list:""), function(data){
     		document.getElementById("cardData").innerHTML="";
@@ -127,10 +127,11 @@ $(document).ready(function() {
 							<td>`+(undefined!=dateMovedToDone?dateMovedToDone:"Never")+`</td>
 							<td>`+eventFound+`</td>
 							<td class='`+dupeWarn+`'>`+data[key]['hasDupeRecord']+`</td>
+							<td><a href='support-trello-card.jsp?username=`+username+`&cardShortId=`+data[key]['shortId']+`'>open</a></td>
     				</tr>`;
    				
     		}
-    		document.getElementById("cardData").innerHTML+=`<tr><td></td><td></td><td id='totals' style='font-weight:bold;'></td><td colspan='3'></td></tr>`;
+    		document.getElementById("cardData").innerHTML+=`<tr><td></td><td></td><td id='totals' style='font-weight:bold;'></td><td colspan='4'></td></tr>`;
    			calc();
     	},function(statusCode, errorText){
     		console.log("Error -> "+statusCode +" -> "+errorText);
@@ -225,6 +226,7 @@ $(document).ready(function() {
 		    		<th><span title="Using Trello Activity logs, this is the date this card moved to (or passed) Done. It doesnt mean it's in the Done column now, it means it has been in the past">Date moved to Done</span></th>
 		    		<th>Ninja Event Found</th>
 		    		<th><span title="Does a 'duplicate check' record exist for this card + user ID in the Ninja database? If so, then the card has been counted and they've accrued points for this card">Has been counted?</span></th>
+		    		<th>Investigate further</th>
 		    	</tr>
 	    	</thead>
 	    	<tbody id="cardData">

diff --git a/src/main/webapp/support-trello-card.jsp b/src/main/webapp/support-trello-card.jsp
@@ -77,6 +77,19 @@ $(document).ready(function() {
     var username;
     var errors=[];
     
+    
+    $( document ).ready(function() {
+	    <%if (request.getParameter("cardShortId")!=null){%>
+	    getById("cardShortId").value="<%=request.getParameter("cardShortId")%>";
+	    <%}%>
+	    <%if (request.getParameter("username")!=null){%>
+	    getById("supportUsername").value="<%=request.getParameter("username")%>";
+	    <%}%>
+	    <%if (request.getParameter("cardShortId")!=null && request.getParameter("username")!=null){%>
+	    go('supportUsername');
+	    <%}%>
+    });
+    
     function go(objId){
     	username=document.getElementById(objId).value;
     	Http.httpGetObject("/community-ninja-board/api/support/user/"+username, function(data){
@@ -130,7 +143,7 @@ $(document).ready(function() {
     	
     	//document.getElementById("cardData").innerHTML="<tr><td colspan='6'><center>Loading...</center></td></tr>";
     	
-    	Http.httpGetObject("/community-ninja-board/api/support/trello/"+username+"/card/"+getById("cardshortId").value+"", function(data){
+    	Http.httpGetObject("/community-ninja-board/api/support/trello/"+username+"/card/"+getById("cardShortId").value+"", function(data){
     		//document.getElementById("cardData").innerHTML="";
     		for (var key in data){
     			var boardShortId=data[key]['boardShortId'];
@@ -306,9 +319,10 @@ $(document).ready(function() {
     		<tr>
     			<td class="title">Trello ShortId:</td>
     			<!--
-    			<td><input type="text" id="cardshortId" value="fK2OKjD8"/></td>
+    			<td><input type="text" id="cardShortId" value="fK2OKjD8"/></td>
+    			<td><input type="text" id="cardShortId" value="7N1IZgPA"/></td>
     			-->
-    			<td><input type="text" id="cardshortId" value="7N1IZgPA"/></td>
+    			<td><input type="text" id="cardShortId" value=""/></td>
     		</tr>
     		<!--
     		<tr>
@@ -327,7 +341,7 @@ $(document).ready(function() {
     		-->
     		<tr>
     			<td class="title">Red Hat username:</td>
-    			<td><input type="text" id="supportUsername" value="mallen"/></td>
+    			<td><input type="text" id="supportUsername" value=""/></td>
     			<td><input type="button" name="go" value="Go!" onclick="go('supportUsername');"/></td>
     		</tr>
     	</table>