dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 189
committer: Lars Helge Oeverland larshelge@xxxxxxxxx
branch nick: trunk
timestamp: Sat 2009-04-18 00:18:50 +0200
message:
  Work on mapping web module
added:
  gis/dhis-web-mapping/src/main/webapp/dhis-web-mapping/void.vm
modified:
  dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties
  gis/dhis-web-mapping/src/main/resources/META-INF/dhis/beans.xml
  gis/dhis-web-mapping/src/main/resources/xwork.xml

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties	2009-03-13 11:51:35 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties	2009-04-17 22:18:50 +0000
@@ -54,6 +54,7 @@
 dhis-web-jforum-integration = Forum
 dhis-web-dataentry-national = Linelisting Data Entry
 dhis-web-validationrule-local-in = Validation Analysis
+dhis-web-mapping = Mapping
 
 #-- Common --------------------------------------------------------------------#
 

=== modified file 'gis/dhis-web-mapping/src/main/resources/META-INF/dhis/beans.xml'
--- gis/dhis-web-mapping/src/main/resources/META-INF/dhis/beans.xml	2009-04-17 21:35:32 +0000
+++ gis/dhis-web-mapping/src/main/resources/META-INF/dhis/beans.xml	2009-04-17 22:18:50 +0000
@@ -91,15 +91,15 @@
   <bean id="org.hisp.dhis.mapping.action.GetAllPeriodTypesAction"
     class="org.hisp.dhis.mapping.action.GetAllPeriodTypesAction"
     scope="prototype">
+    <property name="periodStore"
+      ref="org.hisp.dhis.period.PeriodStore"/>
+  </bean>
+  
+  <bean id="org.hisp.dhis.mapping.action.GetPeriodsByPeriodTypeAction"
+    class="org.hisp.dhis.mapping.action.GetPeriodsByPeriodTypeAction"
+    scope="prototype">
     <property name="periodService"
       ref="org.hisp.dhis.period.PeriodService"/>
   </bean>
   
-  <bean id="org.hisp.dhis.mapping.action.GetPeriodsByPeriodTypeAction"
-    class="org.hisp.dhis.mapping.action.GetPeriodsByPeriodTypeAction"
-    scope="prototype">
-    <property name="periodStore"
-      ref="org.hisp.dhis.period.PeriodStore"/>
-  </bean>
-  
 </beans>

=== modified file 'gis/dhis-web-mapping/src/main/resources/xwork.xml'
--- gis/dhis-web-mapping/src/main/resources/xwork.xml	2009-04-17 21:35:32 +0000
+++ gis/dhis-web-mapping/src/main/resources/xwork.xml	2009-04-17 22:18:50 +0000
@@ -7,6 +7,8 @@
   <package name="dhis-web-mapping" extends="dhis-web-commons"
     namespace="/dhis-web-mapping">
         
+    <!-- No -->
+  
     <action name="index" class="org.hisp.dhis.mapping.action.NoAction">
       <result name="success" type="velocity">/main.vm</result>
       <param name="page">/dhis-web-mapping/index.vm</param>
@@ -18,5 +20,55 @@
       <result name="success" type="velocity-json">/dhis-web-mapping/jsonOrganisationUnitLevels.vm</result>
     </action>
         
+    <action name="getOrganisationUnitsAtLevel" class="org.hisp.dhis.mapping.action.GetOrganisationUnitsAtLevelAction">
+      <result name="success" type="velocity-json">/dhis-web-mapping/jsonOrganisationUnits.vm</result>
+    </action>
+        
+    <!-- Map -->
+    
+    <action name="addOrUpdateMap" class="org.hisp.dhis.mapping.action.AddOrUpdateMapAction">
+      <result name="success" type="velocity-json">/dhis-web-mapping/void.vm</result>
+    </action>
+    
+    <action name="getAllMaps" class="org.hisp.dhis.mapping.action.GetAllMapsAction">
+      <result name="success" type="velocity-json">/dhis-web-mapping/jsonminMaps.vm</result>
+    </action>
+    
+    <action name="getMapByMapLayerPath" class="org.hisp.dhis.mapping.action.GetMapByMapLayerPathAction">
+      <result name="success" type="velocity-json">/dhis-web-mapping/jsonMap.vm</result>
+    </action>
+    
+    <action name="getMapValues" class="org.hisp.dhis.mapping.action.GetMapValuesAction">
+      <result name="success" type="velocity-json">/dhis-web-mapping/jsonAggregatedMapValues.vm</result>
+    </action>
+    
+    <action name="addOrUpdateMapOrganisationUnitRelation" class="org.hisp.dhis.mapping.action.AddOrUpdateMapOrganisationUnitRelationAction">
+      <result name="success" type="velocity-json">/dhis-web-mapping/void.vm</result>
+    </action>
+    
+    <action name="getAvailableMapOrganisationUnitRelations" class="org.hisp.dhis.mapping.action.GetAvailableMapOrganisationUnitRelationsAction">
+      <result name="success" type="velocity-json">/dhis-web-mapping/jsonMapOrganisationUnitRelations.vm</result>
+    </action>
+    
+    <!-- Indicator -->
+    
+    <action name="getAllIndicatorGroups" class="org.hisp.dhis.mapping.action.GetAllIndicatorGroupsAction">
+      <result name="success" type="velocity-json">/dhis-web-mapping/jsonIndicatorGroups.vm</result>
+    </action>
+    
+    <action name="getIndicatorsByIndicatorGroup" class="org.hisp.dhis.mapping.action.GetIndicatorsByIndicatorGroupAction">
+      <result name="success" type="velocity-json">/dhis-web-mapping/jsonminIndicators.vm</result>
+    </action>
+    
+    <!-- Period -->
+    
+    <action name="getAllPeriodTypes" class="org.hisp.dhis.mapping.action.GetAllPeriodTypesAction">
+      <result name="success" type="velocity-json">/dhis-web-mapping/jsonPeriodTypes.vm</result>
+    </action>
+    
+    <action name="getPeriodsByPeriodType" class="org.hisp.dhis.mapping.action.GetPeriodsByPeriodTypeAction">
+      <result name="success" type="velocity-json">/dhis-web-mapping/jsonPeriods.vm</result>
+    </action>
+      
   </package>
 </xwork>

=== added file 'gis/dhis-web-mapping/src/main/webapp/dhis-web-mapping/void.vm'


--
Trunk
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.