dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 1513
committer: Tran Thanh Tri <Tran Thanh Tri@compaq>
branch nick: trunk
timestamp: Fri 2010-02-26 10:26:44 +0700
message:
  minor fix in data element group editor view 1
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/pom.xml
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/META-INF/dhis/beans.xml
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/struts.xml


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription.

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/pom.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/pom.xml	2009-12-22 08:04:43 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/pom.xml	2010-02-26 03:26:44 +0000
@@ -10,7 +10,7 @@
   </parent>
   
   <artifactId>dhis-web-maintenance-datadictionary</artifactId>
-  <packaging>war</packaging>
+  <packaging>jar</packaging>
   <name>DHIS Data Dictionary</name>
   
   <build>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/META-INF/dhis/beans.xml	2010-02-25 08:57:19 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/META-INF/dhis/beans.xml	2010-02-26 03:26:44 +0000
@@ -345,6 +345,24 @@
 			<ref bean="org.hisp.dhis.indicator.IndicatorService" />
 		</property>
 	</bean>
+	
+	<bean
+		id="org.hisp.dhis.dd.action.indicatorgroup.AssignGroupsForIndicatorAction"
+		class="org.hisp.dhis.dd.action.indicatorgroup.AssignGroupsForIndicatorAction"
+		scope="prototype">
+		<property name="indicatorService">
+			<ref bean="org.hisp.dhis.indicator.IndicatorService" />
+		</property>
+	</bean>
+	
+	<bean
+		id="org.hisp.dhis.dd.action.indicatorgroup.GetAssignedIndicatorGroupsAction"
+		class="org.hisp.dhis.dd.action.indicatorgroup.GetAssignedIndicatorGroupsAction"
+		scope="prototype">
+		<property name="indicatorService">
+			<ref bean="org.hisp.dhis.indicator.IndicatorService" />
+		</property>
+	</bean>
 
 	<!-- Indicator Group Set -->
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/struts.xml	2010-02-26 03:07:42 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/struts.xml	2010-02-26 03:26:44 +0000
@@ -191,8 +191,8 @@
 			<param name="requiredAuthorities">F_DATAELEMENTGROUP_UPDATE</param>
 		</action>
 
-		<!-- DataElementGroup -->
-
+		<!-- DataElementGroup -->		
+		
 		<action name="dataElementGroup"
 			class="org.hisp.dhis.dd.action.dataelementgroup.GetDataElementGroupListAction">
 			<result name="success" type="velocity">/main.vm</result>
@@ -335,15 +335,46 @@
 		</action>
 
 		<!-- Indicator Group Editor -->
-
+		
 		<action name="indicatorGroupEditor"
-			class="org.hisp.dhis.dd.action.indicator.GetIndicatorListAction">
-			<result name="success" type="velocity">/main.vm</result>
-			<param name="page">/dhis-web-maintenance-datadictionary/indicatorGroupEditor.vm</param>
-			<param name="menu">/dhis-web-maintenance-datadictionary/menu.vm</param>
-			<param name="javascripts">javascript/indicatorGroupEditor.js</param>
-			<param name="stylesheets">style/indicatorGroupEditor.css</param>
-		</action>
+			class="org.hisp.dhis.dd.action.SwitchGroupEditorViewAction">
+			<result name="view1" type="chain">indicatorGroupEditorView1</result>
+			<result name="view2" type="chain">indicatorGroupEditorView2</result>
+		</action>
+
+		<action name="indicatorGroupEditorView1"
+			class="org.hisp.dhis.dd.action.indicator.GetIndicatorListAction">
+			<result name="success" type="velocity">/main.vm</result>
+			<param name="page">/dhis-web-maintenance-datadictionary/indicatorGroupEditorView1.vm</param>
+			<param name="menu">/dhis-web-maintenance-datadictionary/menu.vm</param>
+			<param name="javascripts">javascript/indicatorGroupEditorView1.js</param>
+			<param name="stylesheets">style/indicatorGroupEditor.css</param>
+		</action>
+		
+		<action name="indicatorGroupEditorView2"
+			class="org.hisp.dhis.dd.action.indicator.GetIndicatorListAction">
+			<result name="success" type="velocity">/main.vm</result>
+			<param name="page">/dhis-web-maintenance-datadictionary/indicatorGroupEditorView2.vm</param>
+			<param name="menu">/dhis-web-maintenance-datadictionary/menu.vm</param>
+			<param name="javascripts">javascript/indicatorGroupEditorView2.js</param>
+			<param name="stylesheets">style/indicatorGroupEditor.css</param>
+		</action>
+		
+		<action name="getAssignedIndicatorGroups"
+			class="org.hisp.dhis.dd.action.indicatorgroup.GetAssignedIndicatorGroupsAction">
+			<result name="success" type="velocity-xml">
+				/dhis-web-maintenance-datadictionary/responseIndicatorGroups.vm
+			</result>
+		</action>
+		
+		<action name="asignGroupsForIndicator"
+			class="org.hisp.dhis.dd.action.indicatorgroup.AssignGroupsForIndicatorAction">
+			<result name="success" type="velocity-xml">
+				/dhis-web-maintenance-datadictionary/responseSuccess.vm
+			</result>
+		</action>
+		
+		
 
 		<action name="getIndicatorGroupEditor"
 			class="org.hisp.dhis.dd.action.indicatorgroup.GetIndicatorGroupAction">