← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs/dhis2/dhis2-chis] Rev 403: CHIS Menu Layout

 

------------------------------------------------------------
revno: 403
committer: abyot <abyota@xxxxxxxxx>
branch nick: dhis2-chis
timestamp: Sun 2009-07-12 16:59:09 +0200
message:
  CHIS Menu Layout
modified:
  dhis-2/dhis-services/dhis-service-chis/pom.xml
  dhis-2/dhis-support/dhis-support-webwork/src/main/resources/dhis-support-webwork.xml
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/blue/blue.css
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/india.css
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/vietnam.css
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vista/vista.css
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.js
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm
  dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/interceptor/WebWorkPortalModuleInterceptor.java
  dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/module/DefaultModuleManager.java
  dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/module/ModuleManager.java
  dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/beans.xml
  dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties
  dhis-2/dhis-web/dhis-web-portal/pom.xml
  dhis-2/dhis-web/pom.xml
  dhis-2/pom.xml

=== modified file 'dhis-2/dhis-services/dhis-service-chis/pom.xml'
--- dhis-2/dhis-services/dhis-service-chis/pom.xml	2009-07-01 12:17:56 +0000
+++ dhis-2/dhis-services/dhis-service-chis/pom.xml	2009-07-12 14:59:09 +0000
@@ -32,19 +32,7 @@
     <dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-service-user-hibernate</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.hisp.dhis</groupId>
-      <artifactId>dhis-service-datamart-default</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.hisp.dhis</groupId>
-      <artifactId>dhis-service-jdbc</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.hisp.dhis</groupId>
-      <artifactId>dhis-service-reporting</artifactId>
-    </dependency>
+    </dependency>    
     <dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-support-hibernate</artifactId>
@@ -52,11 +40,7 @@
     <dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-support-system</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.hisp.dhis</groupId>
-      <artifactId>dhis-support-external</artifactId>
-    </dependency>
+    </dependency>   
     
     <!-- Other -->
     

=== modified file 'dhis-2/dhis-support/dhis-support-webwork/src/main/resources/dhis-support-webwork.xml'
--- dhis-2/dhis-support/dhis-support-webwork/src/main/resources/dhis-support-webwork.xml	2009-06-10 22:25:07 +0000
+++ dhis-2/dhis-support/dhis-support-webwork/src/main/resources/dhis-support-webwork.xml	2009-07-12 14:59:09 +0000
@@ -32,6 +32,7 @@
       <interceptor name="styleInterceptor"
         class="org.hisp.dhis.webwork.interceptor.WebWorkStyleInterceptor"/>
     </interceptors>
+    
   </package>
   
 </xwork>

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/blue/blue.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/blue/blue.css	2009-04-17 23:13:07 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/blue/blue.css	2009-07-12 14:59:09 +0000
@@ -93,6 +93,13 @@
   left: 970px;
 }
 
+img#menuSeparator6
+{
+  position: absolute;
+  top: 0px;
+  left: 1070px;
+}
+
 .menuLink
 {
   height: 68px;
@@ -133,6 +140,13 @@
   left: 872px;
 }
 
+div#menuLink5
+{
+  position: absolute;
+  top: 7px;
+  left: 972px;
+}
+
 span#headerText
 {
   position: absolute;
@@ -184,6 +198,13 @@
   left: 770px;
 }
 
+div#menuDropDown4
+{
+  position: absolute;
+  top: 76px;
+  left: 870px;
+}
+
 .menuDropDownArea
 {
   font-size: 12px;

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css	2009-06-11 09:39:07 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css	2009-07-12 14:59:09 +0000
@@ -93,6 +93,13 @@
   left: 970px;
 }
 
+img#menuSeparator6
+{
+  position: absolute;
+  top: 0px;
+  left: 1070px;
+}
+
 .menuLink
 {
   height: 68px;
@@ -133,6 +140,13 @@
   left: 872px;
 }
 
+div#menuLink5
+{
+  position: absolute;
+  top: 7px;
+  left: 972px;
+}
+
 span#headerText
 {
   position: absolute;
@@ -184,6 +198,13 @@
   left: 770px;
 }
 
+div#menuDropDown4
+{
+  position: absolute;
+  top: 76px;
+  left: 870px;
+}
+
 .menuDropDownArea
 {
   font-size: 12px;

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/india.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/india.css	2009-04-17 23:13:07 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/india.css	2009-07-12 14:59:09 +0000
@@ -93,6 +93,13 @@
   left: 970px;
 }
 
+img#menuSeparator6
+{
+  position: absolute;
+  top: 0px;
+  left: 1070px;
+}
+
 .menuLink
 {
   height: 68px;
@@ -133,6 +140,13 @@
   left: 872px;
 }
 
+div#menuLink5
+{
+  position: absolute;
+  top: 7px;
+  left: 972px;
+}
+
 span#headerText
 {
   position: absolute;
@@ -184,6 +198,13 @@
   left: 770px;
 }
 
+div#menuDropDown4
+{
+  position: absolute;
+  top: 76px;
+  left: 870px;
+}
+
 .menuDropDownArea
 {
   font-size: 12px;

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css	2009-06-11 09:39:07 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css	2009-07-12 14:59:09 +0000
@@ -93,6 +93,13 @@
   left: 970px;
 }
 
+img#menuSeparator6
+{
+  position: absolute;
+  top: 0px;
+  left: 1070px;
+}
+
 .menuLink
 {
   height: 68px;
@@ -133,6 +140,13 @@
   left: 872px;
 }
 
+div#menuLink5
+{
+  position: absolute;
+  top: 7px;
+  left: 972px;
+}
+
 span#headerText
 {
   position: absolute;
@@ -184,6 +198,13 @@
   left: 770px;
 }
 
+div#menuDropDown4
+{
+  position: absolute;
+  top: 76px;
+  left: 870px;
+}
+
 .menuDropDownArea
 {
   font-size: 12px;

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/vietnam.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/vietnam.css	2009-06-11 09:39:07 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/vietnam.css	2009-07-12 14:59:09 +0000
@@ -93,6 +93,13 @@
   left: 970px;
 }
 
+img#menuSeparator6
+{
+  position: absolute;
+  top: 0px;
+  left: 1070px;
+}
+
 .menuLink
 {
   height: 68px;
@@ -133,6 +140,13 @@
   left: 872px;
 }
 
+div#menuLink5
+{
+  position: absolute;
+  top: 7px;
+  left: 972px;
+}
+
 span#headerText
 {
   position: absolute;
@@ -184,6 +198,13 @@
   left: 770px;
 }
 
+div#menuDropDown4
+{
+  position: absolute;
+  top: 76px;
+  left: 870px;
+}
+
 .menuDropDownArea
 {
   font-size: 12px;

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vista/vista.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vista/vista.css	2009-06-11 09:39:07 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vista/vista.css	2009-07-12 14:59:09 +0000
@@ -93,6 +93,13 @@
   left: 970px;
 }
 
+img#menuSeparator6
+{
+  position: absolute;
+  top: 0px;
+  left: 1070px;
+}
+
 .menuLink
 {
   height: 68px;
@@ -133,6 +140,13 @@
   left: 872px;
 }
 
+div#menuLink5
+{
+  position: absolute;
+  top: 7px;
+  left: 972px;
+}
+
 span#headerText
 {
   position: absolute;
@@ -184,6 +198,13 @@
   left: 770px;
 }
 
+div#menuDropDown4
+{
+  position: absolute;
+  top: 76px;
+  left: 870px;
+}
+
 .menuDropDownArea
 {
   font-size: 12px;

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.js	2009-05-03 21:40:52 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.js	2009-07-12 14:59:09 +0000
@@ -5,16 +5,19 @@
     {
         $('img#menuSeparator1').css('left','400px');
         $('img#menuSeparator2').css('left','490px');
-        $('img#menuSeparator3').css('left','580px');
-        $('img#menuSeparator4').css('left','670px');
-        $('img#menuSeparator5').css('left','750px');
+        $('img#menuSeparator3').css('left','570px');
+        $('img#menuSeparator4').css('left','650px');
+        $('img#menuSeparator5').css('left','700px');
+        $('img#menuSeparator6').css('left','750px');
         $('div#menuLink1').css('left','398px');
         $('div#menuLink2').css('left','485px');
-        $('div#menuLink3').css('left','580px');
-        $('div#menuLink4').css('left','665px');
+        $('div#menuLink3').css('left','565px');
+        $('div#menuLink4').css('left','645px');
+        $('div#menuLink5').css('left','695px');
         $('div#menuDropDown1').css('left','400px');
         $('div#menuDropDown2').css('left','490px');
-        $('div#menuDropDown3').css('left','580px');
+        $('div#menuDropDown3').css('left','570px');
+        $('div#menuDropDown4').css('left','650px');
 
         $('#leftBar').css('width','175px');
         $('#leftBarContents h2').css('margin-right','10px');

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm	2009-03-14 09:02:39 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm	2009-07-12 14:59:09 +0000
@@ -45,11 +45,13 @@
       <img id="menuSeparator3" src="../dhis-web-commons/css/${stylesheetDirectory}/logo_separator.png">
       <img id="menuSeparator4" src="../dhis-web-commons/css/${stylesheetDirectory}/logo_separator.png">
       <img id="menuSeparator5" src="../dhis-web-commons/css/${stylesheetDirectory}/logo_separator.png">
+      <img id="menuSeparator6" src="../dhis-web-commons/css/${stylesheetDirectory}/logo_separator.png">
 
       <div id="menuLink1" class="menuLink" #if ( $maintenanceModules.size() > 0 ) onmouseover="showDropDown( 'menuDropDown1' )" onmouseout="hideDropDownTimeout()" #end>$i18n.getString( "maintenance" )</div>
       <div id="menuLink2" class="menuLink" #if ( $serviceModules.size() > 0 ) onmouseover="showDropDown( 'menuDropDown2' )" onmouseout="hideDropDownTimeout()" #end>$i18n.getString( "services" )</div>
-      <div id="menuLink3" class="menuLink" onmouseover="showDropDown( 'menuDropDown3' )" onmouseout="hideDropDownTimeout()">$i18n.getString( "help" )</div>
-      <div id="menuLink4" class="menuLink" onclick="window.location.href='../dhis-web-commons-security/logout.action'">$i18n.getString( "log_out" )</div>
+      <div id="menuLink3" class="menuLink" #if ( $chisModules.size() > 0 ) onmouseover="showDropDown( 'menuDropDown3' )" onmouseout="hideDropDownTimeout()" #end>$i18n.getString( "patient" )</div>
+      <div id="menuLink4" class="menuLink" onmouseover="showDropDown( 'menuDropDown4' )" onmouseout="hideDropDownTimeout()">$i18n.getString( "help" )</div>
+      <div id="menuLink5" class="menuLink" onclick="window.location.href='../dhis-web-commons-security/logout.action'">$i18n.getString( "log_out" )</div>
 
       <div id="menuDropDown1" class="menuDropDownArea" onmouseover="cancelHideDropDownTimeout()" onmouseout="hideDropDownTimeout()">
         <ul class="menuDropDownBox">
@@ -76,6 +78,18 @@
       </div>
       
       <div id="menuDropDown3" class="menuDropDownArea" onmouseover="cancelHideDropDownTimeout()" onmouseout="hideDropDownTimeout()">
+        <ul class="menuDropDownBox">
+        #foreach( $module in $chisModules )
+          #set( $i18nName = false )
+          #set( $i18nName = $i18n.getString( $module.name ) )
+          #if( $auth.hasAccess( $module.name, "index" ) )
+            <li class="menuDropDownItem" onclick="window.location.href='$module.defaultAction'">#if( $i18nName )$i18nName #else$module.name #end&nbsp;</li>
+          #end
+        #end
+        </ul>      
+      </div>
+      
+      <div id="menuDropDown4" class="menuDropDownArea" onmouseover="cancelHideDropDownTimeout()" onmouseout="hideDropDownTimeout()">
       	<ul class="menuDropDownBox">
           <li class="menuDropDownItem" onclick="window.location.href='../dhis-web-commons-about/help.action'">$i18n.getString( "help_contents" )&nbsp;</li>
       	  <li class="menuDropDownItem" onclick="window.location.href='../dhis-web-commons-about/displayFeedbackForm.action'">$i18n.getString( "feedback" )&nbsp;</li>

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/interceptor/WebWorkPortalModuleInterceptor.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/interceptor/WebWorkPortalModuleInterceptor.java	2009-05-26 08:39:14 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/interceptor/WebWorkPortalModuleInterceptor.java	2009-07-12 14:59:09 +0000
@@ -44,6 +44,7 @@
 {
     private static final String KEY_MAINTENANCE_MODULES = "maintenanceModules";
     private static final String KEY_SERVICE_MODULES = "serviceModules";
+    private static final String KEY_CHIS_MODULES = "chisModules";
 
     // -------------------------------------------------------------------------
     // Dependencies
@@ -79,7 +80,8 @@
 
         handle.put( KEY_MAINTENANCE_MODULES, moduleManager.getMaintenanceMenuModules() );
         handle.put( KEY_SERVICE_MODULES, moduleManager.getServiceMenuModules() );
-
+        handle.put( KEY_CHIS_MODULES, moduleManager.getChisMenuModules() );	
+        
         actionInvocation.getStack().push( handle );
         
         return actionInvocation.invoke();

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/module/DefaultModuleManager.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/module/DefaultModuleManager.java	2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/module/DefaultModuleManager.java	2009-07-12 14:59:09 +0000
@@ -62,6 +62,8 @@
     private List<Module> maintenanceMenuModules = new ArrayList<Module>();
     
     private List<Module> serviceMenuModules = new ArrayList<Module>();
+    
+    private List<Module> chisMenuModules = new ArrayList<Module>();
 
     private ThreadLocal<Module> currentModule = new ThreadLocal<Module>();
 
@@ -90,6 +92,13 @@
         this.maintenanceModuleIdentifier = maintenanceModuleIdentifier;
     }
     
+    private String chisModuleIdentifier;
+
+    public void setChisModuleIdentifier( String chisModuleIdentifier )
+    {
+        this.chisModuleIdentifier = chisModuleIdentifier;
+    }
+    
     // -------------------------------------------------------------------------
     // ModuleManager
     // -------------------------------------------------------------------------
@@ -127,7 +136,14 @@
         detectModules();
         
         return serviceMenuModules;
-    }
+    }   
+
+	public List<Module> getChisMenuModules() 
+	{
+		detectModules();
+		
+		return chisMenuModules;
+	}
 
     public Collection<Module> getAllModules()
     {
@@ -203,6 +219,10 @@
                 {
                     maintenanceMenuModules.add( module );
                 }
+                else if( name.toLowerCase().contains( chisModuleIdentifier ) )
+                {                	
+                	chisMenuModules.add( module );
+                }
                 else
                 {
                     serviceMenuModules.add( module );
@@ -212,8 +232,8 @@
             {
                 LOG.debug( "Doesn't have default action: " + name );
             }
-        }
-
+        }       
+        
         Collections.sort( menuModules, moduleComparator );
 
         modulesDetected = true;
@@ -227,5 +247,5 @@
         Map<String, PackageConfig> packageConfigs = configuration.getPackageConfigs();
 
         return packageConfigs.values();
-    }
+    }	
 }

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/module/ModuleManager.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/module/ModuleManager.java	2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/module/ModuleManager.java	2009-07-12 14:59:09 +0000
@@ -45,6 +45,8 @@
     List<Module> getMaintenanceMenuModules();
     
     List<Module> getServiceMenuModules();
+    
+    List<Module> getChisMenuModules();
 
     Collection<Module> getAllModules();
 

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/beans.xml	2009-06-10 22:25:07 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/beans.xml	2009-07-12 14:59:09 +0000
@@ -17,6 +17,9 @@
     <property name="maintenanceModuleIdentifier">
       <value>maintenance</value>
     </property>
+    <property name="chisModuleIdentifier">
+      <value>chis</value>
+    </property>
   </bean>
   
   <bean id="org.hisp.dhis.webportal.module.ConfigurableModuleComparator"
@@ -30,6 +33,10 @@
         <value>dhis-web-maintenance-datadictionary</value>
         <value>dhis-web-maintenance-dataset</value>
         <value>dhis-web-maintenance-dataadmin</value>
+        <value>dhis-web-chis-patient</value>
+        <value>dhis-web-chis-activityplan</value>
+        <value>dhis-web-chis-dataentry</value>
+        <value>dhis-web-chis-administration</value>
         <value>dhis-web-dataentry</value>
       </list>
     </property>

=== 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-04-30 15:57:41 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties	2009-07-12 14:59:09 +0000
@@ -10,6 +10,7 @@
 
 #-- dhis-wp -------------------------------------------------------------------#
 
+home = Home
 no_page_specified = No page specified
 an_exception_occured = An exception occurred
 exception_explanation_text = Sorry! The system failed to execute the operation. Usually, no data is lost and you can continue working by going back to the previous page. If you wish to report the incident, please save this page by choosing "File -> Save (page as)" in your browser and include the saved page in the report. The problem details are listed below.
@@ -26,7 +27,7 @@
 main_menu = Main menu
 maintenance = Maintenance
 services = Services
-
+patient = Patient Module 
 #-- dhis-ouwt -----------------------------------------------------------------#
 
 org_unit_tree = Organisation Unit Tree
@@ -55,6 +56,10 @@
 dhis-web-dataentry-national = Linelisting Data Entry
 dhis-web-validationrule-local-in = Validation Analysis
 dhis-web-mapping = Mapping
+dhis-web-chis-patient = Patient Management
+dhis-web-chis-dataentry = Individual Case Entry
+dhis-web-chis-activityplan = Visit Plan Management
+dhis-web-chis-administration = Administration
 
 #-- Common --------------------------------------------------------------------#
 

=== modified file 'dhis-2/dhis-web/dhis-web-portal/pom.xml'
--- dhis-2/dhis-web/dhis-web-portal/pom.xml	2009-04-22 21:31:10 +0000
+++ dhis-2/dhis-web/dhis-web-portal/pom.xml	2009-07-12 14:59:09 +0000
@@ -133,6 +133,33 @@
     </dependency>
     -->
     
+    <!-- CHIS modules -->
+    
+    <dependency>
+      <groupId>org.hisp.dhis</groupId>
+      <artifactId>dhis-web-chis-patient</artifactId>
+      <version>${version}</version>
+      <type>war</type>
+    </dependency>
+    <dependency>
+      <groupId>org.hisp.dhis</groupId>
+      <artifactId>dhis-web-chis-activityplan</artifactId>
+      <version>${version}</version>
+      <type>war</type>
+    </dependency>
+    <dependency>
+      <groupId>org.hisp.dhis</groupId>
+      <artifactId>dhis-web-chis-dataentry</artifactId>
+      <version>${version}</version>
+      <type>war</type>
+    </dependency>
+    <dependency>
+      <groupId>org.hisp.dhis</groupId>
+      <artifactId>dhis-web-chis-administration</artifactId>
+      <version>${version}</version>
+      <type>war</type>
+    </dependency>
+    
     <!-- India modules -->
     
     <!--

=== modified file 'dhis-2/dhis-web/pom.xml'
--- dhis-2/dhis-web/pom.xml	2009-06-18 14:50:49 +0000
+++ dhis-2/dhis-web/pom.xml	2009-07-12 14:59:09 +0000
@@ -25,7 +25,7 @@
     <module>dhis-web-reporting</module>
     <module>dhis-web-openhealth-integration</module>
     <module>dhis-web-dashboard-integration</module>
-    <module>dhis-web-portal</module>
+	<module>dhis-web-chis</module>
   </modules>
 
   <distributionManagement>

=== modified file 'dhis-2/pom.xml'
--- dhis-2/pom.xml	2009-06-28 18:24:10 +0000
+++ dhis-2/pom.xml	2009-07-12 14:59:09 +0000
@@ -21,7 +21,7 @@
     <module>dhis-options</module>
     <module>dhis-services</module>
     <module>dhis-support</module>
-    <module>dhis-useradminandsecurity</module>
+    <module>dhis-useradminandsecurity</module>	     
   </modules>
   
   <repositories>



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

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