Commit @977c725740cce382a7d98a1056f8c12c56bfa30f

[Notice] Announcing the End of Demo Server [Read me]

doortts 2013-04-30

Merge pull request #42.ㅍㄿㄹOpen from wansoon/HIVE-192

HIVE-192 마일스톤 보기에서 '완료율 순'을 누르면 에러

@977c725740cce382a7d98a1056f8c12c56bfa30f

6d5027c

977c725

app/models/Milestone.java

--- app/models/Milestone.java

+++ app/models/Milestone.java


     }
 
     public int getNumClosedIssues() {
-        return Issue.finder.where().eq("milestone", this).eq("state", State.CLOSED).findRowCount();
+    	return Issue.finder.where().eq("milestone", this).eq("state", State.CLOSED).findRowCount();
     }
 
     public int getNumOpenIssues() {
-        return Issue.finder.where().eq("milestone", this).eq("state", State.OPEN).findRowCount();
+    	return Issue.finder.where().eq("milestone", this).eq("state", State.OPEN).findRowCount();
     }
 
     public int getNumTotalIssues() {

      * @return
      */
     public static List<Milestone> findMilestones(Long projectId,
-                                                 State state, String sort, Direction direction) {
-        OrderParams orderParams = new OrderParams().add(sort, direction);
+                                                 State state, String sort, final Direction direction) {
+    	
+    	OrderParams orderParams = new OrderParams();
+    	
+    	if(!"completionRate".equals(sort)) {
+    		orderParams.add(sort, direction);	
+    	}
+    	    	
         SearchParams searchParams = new SearchParams().add("project.id", projectId, Matching.EQUALS);
-        if (state != null && state != State.ALL) {
+        if(state != null && state != State.ALL) {
             searchParams.add("state", state, Matching.EQUALS);
         }
-        return FinderTemplate.findBy(orderParams, searchParams, find);
+        
+        List<Milestone> milestones = FinderTemplate.findBy(orderParams, searchParams, find);
+
+        if("completionRate".equals(sort)) {
+        	Collections.sort(milestones, new Comparator<Milestone>() {
+				@Override
+				public int compare(Milestone o1, Milestone o2) {
+					int o1CompletionRate = o1.getCompletionRate();
+					int o2CompletionRate = o2.getCompletionRate();
+					
+					if(direction == Direction.ASC) {
+				        return (o1CompletionRate < o2CompletionRate ? -1 : (o1CompletionRate == o2CompletionRate ? 0 : 1));
+					} else {
+						return (o1CompletionRate < o2CompletionRate ? 1 : (o1CompletionRate == o2CompletionRate ? 0 : -1));
+					}
+				}
+			});
+        }
+        
+        return milestones;
     }
 
     public void updateWith(Milestone newMilestone) {

6d5027c

977c725

app/views/milestone/manage.scala.html

--- app/views/milestone/manage.scala.html

+++ app/views/milestone/manage.scala.html


 				<td><a href="@makeSortLink("title")">@Messages("label.title") @sortMark("title")</a></td>
 				<td>@Messages("label.contents")</td>
 				<td><a href="@makeSortLink("dueDate")">@Messages("label.dueDate") @sortMark("dueDate")</a></td>
-				<td><a href="@makeSortLink("completionRate")">@Messages("label.state") @sortMark("completionRate")</a></td>
+				<td><a href="@makeSortLink("state")">@Messages("label.state") @sortMark("state")</a></td>
 				<td>&nbsp;</td>
 			</tr>
 		</thead>

Add a comment

Open 0
Closed 0

List

...	...	@@ -58,11 +58,11 @@
58	58	}
59	59
60	60	public int getNumClosedIssues() {
61		- return Issue.finder.where().eq("milestone", this).eq("state", State.CLOSED).findRowCount();
	61	+ return Issue.finder.where().eq("milestone", this).eq("state", State.CLOSED).findRowCount();
62	62	}
63	63
64	64	public int getNumOpenIssues() {
65		- return Issue.finder.where().eq("milestone", this).eq("state", State.OPEN).findRowCount();
	65	+ return Issue.finder.where().eq("milestone", this).eq("state", State.OPEN).findRowCount();
66	66	}
67	67
68	68	public int getNumTotalIssues() {
...	...	@@ -139,13 +139,38 @@
139	139	* @return
140	140	*/
141	141	public static List<Milestone> findMilestones(Long projectId,
142		- State state, String sort, Direction direction) {
143		- OrderParams orderParams = new OrderParams().add(sort, direction);
	142	+ State state, String sort, final Direction direction) {
	143	+
	144	+ OrderParams orderParams = new OrderParams();
	145	+
	146	+ if(!"completionRate".equals(sort)) {
	147	+ orderParams.add(sort, direction);
	148	+ }
	149	+
144	150	SearchParams searchParams = new SearchParams().add("project.id", projectId, Matching.EQUALS);
145		- if (state != null && state != State.ALL) {
	151	+ if(state != null && state != State.ALL) {
146	152	searchParams.add("state", state, Matching.EQUALS);
147	153	}
148		- return FinderTemplate.findBy(orderParams, searchParams, find);
	154	+
	155	+ List<Milestone> milestones = FinderTemplate.findBy(orderParams, searchParams, find);
	156	+
	157	+ if("completionRate".equals(sort)) {
	158	+ Collections.sort(milestones, new Comparator<Milestone>() {
	159	+ @Override
	160	+ public int compare(Milestone o1, Milestone o2) {
	161	+ int o1CompletionRate = o1.getCompletionRate();
	162	+ int o2CompletionRate = o2.getCompletionRate();
	163	+
	164	+ if(direction == Direction.ASC) {
	165	+ return (o1CompletionRate < o2CompletionRate ? -1 : (o1CompletionRate == o2CompletionRate ? 0 : 1));
	166	+ } else {
	167	+ return (o1CompletionRate < o2CompletionRate ? 1 : (o1CompletionRate == o2CompletionRate ? 0 : -1));
	168	+ }
	169	+ }
	170	+ });
	171	+ }
	172	+
	173	+ return milestones;
149	174	}
150	175
151	176	public void updateWith(Milestone newMilestone) {

...	...	@@ -55,7 +55,7 @@
55	55	<td><a href="@makeSortLink("title")">@Messages("label.title") @sortMark("title")</a></td>
56	56	<td>@Messages("label.contents")</td>
57	57	<td><a href="@makeSortLink("dueDate")">@Messages("label.dueDate") @sortMark("dueDate")</a></td>
58		- <td><a href="@makeSortLink("completionRate")">@Messages("label.state") @sortMark("completionRate")</a></td>
	58	+ <td><a href="@makeSortLink("state")">@Messages("label.state") @sortMark("state")</a></td>
59	59	<td> </td>
60	60	</tr>
61	61	</thead>

Delete comment