modify the cat

cat-home/src/main/java/com/dianping/cat/report/view/DomainNavManager.java

@@ -31,6 +31,10 @@ public class DomainNavManager implements Initializable {
 		return m_projects.get(domain);
 	}
 
+	public static Map<String, Project> getProjects() {
+		return m_projects;
+	}
+
 	public static Map<String, Department> getDepartment(Collection<String> domains) {
 		Map<String, Department> result = new TreeMap<String, Department>();
 

cat-home/src/main/java/com/dianping/cat/system/page/project/Handler.java

@@ -12,6 +12,7 @@ import com.dainping.cat.consumer.dal.report.Project;
 import com.dainping.cat.consumer.dal.report.ProjectDao;
 import com.dainping.cat.consumer.dal.report.ProjectEntity;
 import com.dianping.cat.Cat;
+import com.dianping.cat.report.view.DomainNavManager;
 import com.dianping.cat.system.SystemPage;
 import com.site.dal.jdbc.DalException;
 import com.site.lookup.annotation.Inject;
@@ -27,6 +28,9 @@ public class Handler implements PageHandler<Context> {
 	@Inject
 	private ProjectDao m_projectDao;
 
+	@Inject
+	private DomainNavManager m_domainNavManager;
+
 	@Override
 	@PayloadMeta(Payload.class)
 	@InboundActionMeta(name = "project")
@@ -59,7 +63,8 @@ public class Handler implements PageHandler<Context> {
 		m_jspViewer.view(ctx, model);
 	}
 
-	private void updateProject(Payload payload) {
+	@SuppressWarnings("static-access")
+   private void updateProject(Payload payload) {
 		int projectId = payload.getProjectId();
 		String department = payload.getDepartment();
 		String email = payload.getEmail();
@@ -78,6 +83,7 @@ public class Handler implements PageHandler<Context> {
 
 		try {
 			m_projectDao.updateByPK(project, ProjectEntity.UPDATESET_FULL);
+			m_domainNavManager.getProjects().put(project.getDomain(), project);
 		} catch (DalException e) {
 			Cat.logError(e);
 		}
@@ -121,7 +127,7 @@ public class Handler implements PageHandler<Context> {
 					return productLine1.compareTo(productLine2);
 				}
 			} else {
-				return department1.compareTo(productLine2);
+				return department1.compareTo(department2);
 			}
 		}
 

cat-home/src/main/resources/META-INF/plexus/components.xml

@@ -2504,6 +2504,9 @@
 				<requirement>
 					<role>com.dainping.cat.consumer.dal.report.ProjectDao</role>
 				</requirement>
+				<requirement>
+					<role>com.dianping.cat.report.view.DomainNavManager</role>
+				</requirement>
 			</requirements>
 		</component>
 		<component>
@@ -2519,6 +2522,15 @@
 				</requirement>
 			</requirements>
 		</component>
+		<component>
+			<role>com.dianping.cat.report.view.DomainNavManager</role>
+			<implementation>com.dianping.cat.report.view.DomainNavManager</implementation>
+			<requirements>
+				<requirement>
+					<role>com.dainping.cat.consumer.dal.report.ProjectDao</role>
+				</requirement>
+			</requirements>
+		</component>
 		<component>
 			<role>com.dianping.cat.system.alarm.AlarmRuleCreator</role>
 			<implementation>com.dianping.cat.system.alarm.AlarmRuleCreator</implementation>

cat-home/src/main/webapp/WEB-INF/tags/historyReport.tag

@@ -39,16 +39,16 @@
 	</table>
 	<div class="position">Current Domain:&nbsp;&nbsp;${model.department} &nbsp;&nbsp;>&nbsp;&nbsp;${model.projectLine} &nbsp;&nbsp;
 	>&nbsp;&nbsp;${model.domain}&nbsp;&nbsp;
-	&nbsp;&nbsp;[&nbsp;&nbsp;<a href="javascript:showDomain()" id="switch">ShowDomain</a>&nbsp;&nbsp;]&nbsp;&nbsp;
+	&nbsp;&nbsp;[&nbsp;&nbsp;<a href="javascript:showDomain()" id="switch">More</a>&nbsp;&nbsp;]&nbsp;&nbsp;
 			<script>
 				function showDomain() {
 					var b = $('#switch').html();
-					if (b == 'ShowDomain') {
+					if (b == 'More') {
 						$('.navbar').slideDown();
-						$('#switch').html("HiddenDomain");
+						$('#switch').html("Less");
 					} else {
 						$('.navbar').slideUp();
-						$('#switch').html("ShowDomain");
+						$('#switch').html("More");
 					}
 				}
 			</script>

cat-home/src/main/webapp/WEB-INF/tags/hourlyReport.tag

@@ -29,16 +29,16 @@
 	</table>
 	<div class="position">	Current Domain:&nbsp;&nbsp;${model.department} &nbsp;&nbsp;>&nbsp;&nbsp;${model.projectLine} &nbsp;&nbsp;
 	>&nbsp;&nbsp;${model.domain}&nbsp;&nbsp;
-	&nbsp;&nbsp;[&nbsp;&nbsp;<a href="javascript:showDomain()" id="switch">ShowDomain</a>&nbsp;&nbsp;]&nbsp;&nbsp;
+	&nbsp;&nbsp;[&nbsp;&nbsp;<a href="javascript:showDomain()" id="switch">More</a>&nbsp;&nbsp;]&nbsp;&nbsp;
 			<script>
 				function showDomain() {
 					var b = $('#switch').html();
-					if (b == 'ShowDomain') {
+					if (b == 'More') {
 						$('.navbar').slideDown();
-						$('#switch').html("HiddenDomain");
+						$('#switch').html("Less");
 					} else {
 						$('.navbar').slideUp();
-						$('#switch').html("ShowDomain");
+						$('#switch').html("More");
 					}
 				}
 			</script>

cat-home/src/main/webapp/css/report.css

@@ -81,7 +81,7 @@
 
 .report .position{
 	padding:4px;
-	padding-left:8px;
+	padding-left:10px;
 	font-weight: bold;
 	font-size: 14px;
 	background: lightBlue;

cat-home/src/main/webapp/jsp/system/projectUpdate.jsp

@@ -21,22 +21,27 @@
 		<tr>
 			<td>项目名称</td>
 			<td>${model.project.domain}</td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>所属部门</td>
 			<td><input type="name" name="department" value="${model.project.department}"/></td>
+			<td style='color:red'>（一级分类）建议填写，主站、手机、团购、搜索、架构</td>
 		</tr>
 		<tr>
 			<td>产品线</td>
 			<td><input type="name" name="projectLine" value="${model.project.projectLine}"/></td>
-		</tr>
-		<tr>
-			<td>项目组邮件(多个，逗号分割)</td>
-			<td><input type="name" name="email" value="${model.project.email}"/></td>
+			<td style='color:red'>（二级分类）由各自业务线决定,建议字数小于4</td>
 		</tr>
 		<tr>
 			<td>负责人</td>
 			<td><input type="name" name="owner" value="${model.project.owner}"/></td>
+			<td>可选字段</td>
+		</tr>
+		<tr>
+			<td>项目组邮件</td>
+			<td><input type="name" name="email" size="50" value="${model.project.email}"/></td>
+			<td>可选字段(多个，逗号分割)</td>
 		</tr>
 		<tr>
 			<td>&nbsp;</td>