From 84cb398e0bda5911685a23f2b23b1f3a837bf693 Mon Sep 17 00:00:00 2001
From: hot13399 <hot13399@163.com>
Date: Tue, 9 Jun 2015 11:11:03 +0800
Subject: [PATCH] rafactor requeststatus.jsp

---
 .../mvc/mini/web/RequestStatusController.java | 44 +++++++++----------
 .../webapp/WEB-INF/views/requeststatus.jsp    | 26 +++++------
 2 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/src/main/java/com/spring/mvc/mini/web/RequestStatusController.java b/src/main/java/com/spring/mvc/mini/web/RequestStatusController.java
index c113188..4b8d361 100644
--- a/src/main/java/com/spring/mvc/mini/web/RequestStatusController.java
+++ b/src/main/java/com/spring/mvc/mini/web/RequestStatusController.java
@@ -43,7 +43,7 @@ public class RequestStatusController {
 	
 	@RequestMapping(method = RequestMethod.GET)
 	public void handleObjectClassForm(Model model) {
-		model.addAttribute("miniequeststatus", new RequestStatus());
+		model.addAttribute("requestStatus", new RequestStatus());
 	}
 	
 	@RequestMapping(params={"mocrid"},method=RequestMethod.GET)
@@ -55,26 +55,26 @@ public class RequestStatusController {
 			
 			if(mrs.getmocrid() == Integer.parseInt(mocrid)){
 				LOGGER.debug("mrs.getmocrid() is:"+mrs.getmocrid());
-				model.addAttribute("miniequeststatus", mrs);
+				model.addAttribute("requestStatus", mrs);
 			}
 		}
 		
 	}
 
 	@RequestMapping(method=RequestMethod.POST)
-	public String submit(@ModelAttribute("miniequeststatus") RequestStatus miniequeststatus,
+	public String submit(@ModelAttribute("requestStatus") RequestStatus requestStatus,
 						 @ModelAttribute("ajaxRequest") boolean ajaxRequest,
 						 Model model, RedirectAttributes redirectAttrs) {
 		
-		if(miniequeststatus.getObjectClassesType() == null){
+		if(requestStatus.getObjectClassesType() == null){
 			ArrayList<RequestStatus> mrsList = requestStatusJsonParser.readStatus();
 			
-			if (isMocridEquals(miniequeststatus, model, mrsList)){
-				model.addAttribute("message", "SUCCESS:MO CR ID:"+miniequeststatus.getmocrid()+" is presenting.");
+			if (isMocridEquals(requestStatus, model, mrsList)){
+				model.addAttribute("message", "SUCCESS:MO CR ID:"+requestStatus.getmocrid()+" is presenting.");
 				return null;
 			} else {
-				model.addAttribute("miniequeststatus", new RequestStatus());
-				model.addAttribute("message", "FAILED:MO CR ID:"+miniequeststatus.getmocrid()+" is not existing.");
+				model.addAttribute("requestStatus", new RequestStatus());
+				model.addAttribute("message", "FAILED:MO CR ID:"+requestStatus.getmocrid()+" is not existing.");
 			}
 		}
 		
@@ -82,14 +82,14 @@ public class RequestStatusController {
 		
 		int index = 0;
 		for (RequestStatus item:requestStatuses){
-			if(item.getmocrid() == miniequeststatus.getmocrid()){
+			if(item.getmocrid() == requestStatus.getmocrid()){
 				index = requestStatuses.indexOf(item);
 				break;
 			}
 		}
 		
-		requestStatuses.get(index).setComments(miniequeststatus.getComments());
-		requestStatuses.get(index).setObjectClassesType(miniequeststatus.getObjectClassesType());
+		requestStatuses.get(index).setComments(requestStatus.getComments());
+		requestStatuses.get(index).setObjectClassesType(requestStatus.getObjectClassesType());
 		
 		RequestStatusListType type = new RequestStatusListType();
 		
@@ -99,7 +99,7 @@ public class RequestStatusController {
 		LOGGER.debug(type.toString());
 
 		try {
-			this.commentAndSendMail(requestStatuses.get(index).getUserinfo(), constructMailSubject(miniequeststatus), constructMailText(miniequeststatus, requestStatuses, index));
+			this.commentAndSendMail(requestStatuses.get(index).getUserinfo(), constructMailSubject(requestStatus), constructMailText(requestStatus, requestStatuses, index));
 		} catch (Exception e) {
 			model.addAttribute("message", e.toString());
 			return null;
@@ -115,39 +115,39 @@ public class RequestStatusController {
 		}
 	}
 
-	private String constructMailText(@ModelAttribute("miniequeststatus") RequestStatus miniequeststatus, ArrayList<RequestStatus> requestStatuses, int index) {
+	private String constructMailText(@ModelAttribute("requestStatus") RequestStatus requestStatus, ArrayList<RequestStatus> requestStatuses, int index) {
 		StringBuffer textsb = new StringBuffer();
 		textsb.append("New Comments: \r\n");
-		textsb.append(miniequeststatus.getComments());
+		textsb.append(requestStatus.getComments());
 		textsb.append(" \r\n");
 
-		if(!requestStatuses.get(index).getObjectClassesType().equals(miniequeststatus.getObjectClassesType())){
+		if(!requestStatuses.get(index).getObjectClassesType().equals(requestStatus.getObjectClassesType())){
 			textsb.append("Object Classes updated: \r\n");
-			textsb.append(miniequeststatus.getObjectClassesType().toString());
+			textsb.append(requestStatus.getObjectClassesType().toString());
 		}
 
 		textsb.append("http://localhost:8080/spring-mvc-mini/requeststatus?mocrid=");
-		textsb.append(miniequeststatus.getmocrid());
+		textsb.append(requestStatus.getmocrid());
 		textsb.append(" \r\n");
 		textsb.append(" \r\n");
 		return textsb.toString();
 	}
 
-	private String constructMailSubject(@ModelAttribute("miniequeststatus") RequestStatus miniequeststatus) {
+	private String constructMailSubject(@ModelAttribute("requestStatus") RequestStatus requestStatus) {
 		StringBuffer subjectsb = new StringBuffer();
 		subjectsb.append("MO CR:");
-		subjectsb.append(miniequeststatus.getmocrid());
+		subjectsb.append(requestStatus.getmocrid());
 		subjectsb.append(" Updated");
 		return subjectsb.toString();
 	}
 
-	private boolean isMocridEquals(@ModelAttribute("miniequeststatus") RequestStatus miniequeststatus, Model model, ArrayList<RequestStatus> mrsList) {
+	private boolean isMocridEquals(@ModelAttribute("requestStatus") RequestStatus requestStatus, Model model, ArrayList<RequestStatus> mrsList) {
 		boolean boo = false;
 		for(RequestStatus mrs:mrsList){
 
-            if(mrs.getmocrid() == miniequeststatus.getmocrid()){
+            if(mrs.getmocrid() == requestStatus.getmocrid()){
 
-                model.addAttribute("miniequeststatus", mrs);
+                model.addAttribute("requestStatus", mrs);
                 boo = true;
             }
         }
diff --git a/src/main/webapp/WEB-INF/views/requeststatus.jsp b/src/main/webapp/WEB-INF/views/requeststatus.jsp
index dd8ad88..344b9d6 100644
--- a/src/main/webapp/WEB-INF/views/requeststatus.jsp
+++ b/src/main/webapp/WEB-INF/views/requeststatus.jsp
@@ -16,7 +16,7 @@
 		<p>
 			Enter the MO CR id to check request status and give comments.
 		</p>
-		<form:form id="form3" method="post" modelAttribute="miniequeststatus" cssClass="cleanform">
+		<form:form id="form3" method="post" modelAttribute="requestStatus" cssClass="cleanform">
 			<div class="header">
 		  		<c:if test="${not empty message}">
 					<div id="message" class="success">${message}</div>	
@@ -31,62 +31,62 @@
 		  			<label>
 					MO CR id
 					</label>
-			  		<input name="mocrid" value="${miniequeststatus.mocrid}">
+			  		<input name="mocrid" value="${requestStatus.mocrid}">
 			  		
 					<label>
 					Applicant email
 					</label>
-			  		<input name="userinfo.email" value="${miniequeststatus.userinfo.email}" readonly>
+			  		<input name="userinfo.email" value="${requestStatus.userinfo.email}" readonly>
 			  					  		
 					<label>
 					Status
 					</label>
-					<input name="status" value="${miniequeststatus.status}" readonly>
+					<input name="status" value="${requestStatus.status}" readonly>
 					
 					<label>
 					comments
 					</label>
-					<textarea form ="form3" name="comments" cols="45" wrap="soft">${miniequeststatus.comments}</textarea>		
+					<textarea form ="form3" name="comments" cols="45" wrap="soft">${requestStatus.comments}</textarea>		
 			  		
 			  		
 		  	</fieldset>						  			
-            <c:forEach items="${miniequeststatus.ojbclslisttype.objectclasslist}" var="objcls" varStatus="i" begin="0">
+            <c:forEach items="${requestStatus.objectClassesType.objectClasses}" var="objectClass" varStatus="i" begin="0">
             	<fieldset>	
             			<legend>Object Class Info: ${i.index+1} </legend>
 					<label>
 						id
 					</label>
-			  		<input name="ojbclslisttype.objectclasslist[${i.index}].id" value="${objcls.id}">
+			  		<input name="objectClassesType.objectClasses[${i.index}].id" value="${objectClass.id}">
 			
 			  		<label>
 				  		intclass 
 				 	</label>
-			  		<input name="ojbclslisttype.objectclasslist[${i.index}].intclass" value="${objcls.intclass}" readonly>
+			  		<input name="objectClassesType.objectClasses[${i.index}].intclass" value="${objectClass.intclass}" readonly>
 			  		
 			  		<label>
 			  			abbrev 
 			 		</label>
-			  		<input name="ojbclslisttype.objectclasslist[${i.index}].abbrev" value="${objcls.abbrev}">
+			  		<input name="objectClassesType.objectClasses[${i.index}].abbreviation" value="${objectClass.abbrev}">
 			  		 
 			  		<label>
 			  			adaID
 			  		</label>
-			  		<input name="ojbclslisttype.objectclasslist[${i.index}].adaID" value="${objcls.adaID}">
+			  		<input name="objectClassesType.objectClasses[${i.index}].packageName" value="${objectClass.packageName}">
 			
 			  		<label>
 			  			name 
 			  		</label>
-			  		<input name="ojbclslisttype.objectclasslist[${i.index}].name" value="${objcls.name}">
+			  		<input name="objectClassesType.objectClasses[${i.index}].name" value="${objectClass.name}">
 			  		
 			  		<label>
 			  			parents
 			  		</label>
-		  			<input name="ojbclslisttype.objectclasslist[${i.index}].parents" value="${objcls.parents}">
+		  			<input name="objectClassesType.objectClasses[${i.index}].parents" value="${objectClass.parents}">
 		  			
 		  			<label>
 			  			comment
 			  		</label>
-		  			<input name="ojbclslisttype.objectclasslist[${i.index}].comment" value="${objcls.comment}" readonly>
+		  			<input name="objectClassesType.objectClasses[${i.index}].comment" value="${objectClass.comment}" readonly>
 				</fieldset>
 		      </c:forEach>
 			<p><button type="submit">Submit</button></p>
-- 
GitLab