=== modified file 'local/in/dhis-web-excelimport/src/main/resources/META-INF/dhis/beans.xml'
--- local/in/dhis-web-excelimport/src/main/resources/META-INF/dhis/beans.xml	2011-01-18 12:01:24 +0000
+++ local/in/dhis-web-excelimport/src/main/resources/META-INF/dhis/beans.xml	2011-04-15 11:43:00 +0000
@@ -1,145 +1,144 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="
 http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
-	
-	<!-- Import Form -->
-	
-	<bean id="org.hisp.dhis.excelimport.action.ExcelImportFormAction"
-		class="org.hisp.dhis.excelimport.action.ExcelImportFormAction"
-		scope="prototype">
-		<property name="periodService">
-			<ref bean="org.hisp.dhis.period.PeriodService"/>
-		</property>
-		<property name="organisationUnitService">
-			<ref bean="org.hisp.dhis.organisationunit.OrganisationUnitService"/>
-		</property>
-<!--        <property name="reportService">
-            <ref bean="org.hisp.dhis.excelimport.util.ReportService"/>
-        </property>-->
-	</bean>
-	
-	<!-- Import Result -->
-	
-	<bean id="org.hisp.dhis.excelimport.action.ExcelImportResultAction"
-		class="org.hisp.dhis.excelimport.action.ExcelImportResultAction"
-		scope="prototype">		
-	    <property name="statementManager" ref="statementManager"/>
-	    <property name="dataElementCategoryService">
-			<ref bean="org.hisp.dhis.dataelement.DataElementCategoryService"/>
-	    </property>
-		<property name="periodService">
-			<ref bean="org.hisp.dhis.period.PeriodService"/>
-		</property>
-		<property name="organisationUnitService">
-			<ref bean="org.hisp.dhis.organisationunit.OrganisationUnitService"/>
-		</property>
-		<property name="dataElementService">
-			<ref bean="org.hisp.dhis.dataelement.DataElementService"/>
-		</property>
-		<property name="dataSetService">
-			<ref bean="org.hisp.dhis.dataset.DataSetService"/>
-		</property>
-		<property name="dataValueService">
-			<ref bean="org.hisp.dhis.datavalue.DataValueService"/>
-		</property>
-		<property name="reportService">
-			<ref bean="org.hisp.dhis.excelimport.util.ReportService"/>
-		</property>
-		<property name="dataSetLockService">
-            <ref bean="org.hisp.dhis.datalock.DataSetLockService"/>
-        </property>
-		<property name="currentUserService">
-			<ref bean="org.hisp.dhis.user.CurrentUserService"/>
-		</property>
-		<property name="sessionFactory" ref="sessionFactory"/>
-		
-	</bean>
-	
-	<!-- Get Data Elements -->
-	<bean id="org.hisp.dhis.excelimport.action.GetDataElementsAction"
-		class="org.hisp.dhis.excelimport.action.GetDataElementsAction"
-		scope="prototype">		
-		<property name="dataElementService">
-			<ref bean="org.hisp.dhis.dataelement.DataElementService"/>
-		</property>
-		<property name="dataElementCategoryOptionComboService">
-			<ref bean="org.hisp.dhis.dataelement.DataElementCategoryOptionComboService"/>
-		</property>
-	</bean>
-	
-	<!-- Get Periods -->
-	<bean id="org.hisp.dhis.excelimport.action.GetPeriodsAction"
-		class="org.hisp.dhis.excelimport.action.GetPeriodsAction"
-		scope="prototype">
-		<property name="periodService">
-			<ref bean="org.hisp.dhis.period.PeriodService"/>
-		</property>
-	</bean>
-	
-	<!-- Get Organisation Units -->
-	<bean id="org.hisp.dhis.excelimport.action.GetOrgUnitsAction"
-		class="org.hisp.dhis.excelimport.action.GetOrgUnitsAction"
-		scope="prototype">
-		<property name="organisationUnitService">
-			<ref bean="org.hisp.dhis.organisationunit.OrganisationUnitService"/>
-		</property>
-		
-	</bean>
-	
-	<!-- reports nome page Form -->
-	<bean id="org.hisp.dhis.excelimport.action.ReportsHomePageAction"
-		class="org.hisp.dhis.excelimport.action.ReportsHomePageAction"
-		scope="prototype">
-		<property name="reportService">
-			<ref bean="org.hisp.dhis.excelimport.util.ReportService"/>
-		</property>		
-	</bean>
-	
-	<!-- Get Reports -->
-	<bean id="org.hisp.dhis.excelimport.action.GetReportsAction"
-		class="org.hisp.dhis.excelimport.action.GetReportsAction"
-		scope="prototype">
-		<property name="reportService">
-			<ref bean="org.hisp.dhis.excelimport.util.ReportService"/>
-		</property>
-		<property name="organisationUnitService">
-			<ref bean="org.hisp.dhis.organisationunit.OrganisationUnitService"/>
-		</property>
-		<property name="dataSetService">
-            <ref bean="org.hisp.dhis.dataset.DataSetService"/>
-        </property>
-	</bean>
-	
-	<!-- Report Service -->
-	<bean id="org.hisp.dhis.excelimport.util.ReportService"
-		class="org.hisp.dhis.excelimport.util.ReportService" scope="prototype">		
-		<property name="periodService">
-			<ref bean="org.hisp.dhis.period.PeriodService"/>
-		</property>
-		<property name="jdbcTemplate" ref="jdbcTemplate"/>	  
-		<property name="dataElementService">
-			<ref bean="org.hisp.dhis.dataelement.DataElementService"/>
-		</property>
-		<property name="indicatorService">
-			<ref bean="org.hisp.dhis.indicator.IndicatorService"/>
-		</property>
-		<property name="dataSetService">
-			<ref bean="org.hisp.dhis.dataset.DataSetService"/>
-		</property>
-		<property name="aggregationService">
-			<ref bean="org.hisp.dhis.aggregation.AggregationService"/>
-		</property>
-		<property name="dataValueService">
-			<ref bean="org.hisp.dhis.datavalue.DataValueService"/>
-		</property>
-		<property name="dataElementCategoryService">
-			<ref bean="org.hisp.dhis.dataelement.DataElementCategoryService"/>
-		</property>
-		<property name="configurationService">
-			<ref bean="org.hisp.dhis.config.ConfigurationService"/>
-		</property>
-	</bean>
-	
+    
+    <!-- Static Excel Import -->
+    <bean id="org.hisp.dhis.excelimport.action.ExcelImportFormAction"
+        class="org.hisp.dhis.excelimport.action.ExcelImportFormAction"
+        scope="prototype">
+        <property name="periodService" ref="org.hisp.dhis.period.PeriodService" />
+        <property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
+    </bean>
+    <bean id="org.hisp.dhis.excelimport.action.ExcelImportResultAction"
+        class="org.hisp.dhis.excelimport.action.ExcelImportResultAction"
+        scope="prototype">
+        <property name="statementManager" ref="statementManager" />
+        <property name="dataElementCategoryService" ref="org.hisp.dhis.dataelement.DataElementCategoryService" />
+        <property name="periodService" ref="org.hisp.dhis.period.PeriodService" />
+        <property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
+        <property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService" />
+        <property name="dataSetService" ref="org.hisp.dhis.dataset.DataSetService" />
+        <property name="dataValueService" ref="org.hisp.dhis.datavalue.DataValueService" />
+        <property name="reportService" ref="org.hisp.dhis.excelimport.util.ReportService" />
+        <property name="dataSetLockService" ref="org.hisp.dhis.datalock.DataSetLockService" />
+        <property name="currentUserService" ref="org.hisp.dhis.user.CurrentUserService" />
+        <property name="sessionFactory" ref="sessionFactory"/>
+    </bean>
+
+    <!-- Portal Data Import -->
+    <bean id="org.hisp.dhis.excelimport.portal.action.PortalExcelImportFormAction"
+        class="org.hisp.dhis.excelimport.portal.action.PortalExcelImportFormAction"
+        scope="prototype">
+        <property name="reportService" ref="org.hisp.dhis.excelimport.util.ReportService" />
+    </bean>
+    <bean id="org.hisp.dhis.excelimport.portal.action.PortalExcelImportResultAction"
+        class="org.hisp.dhis.excelimport.portal.action.PortalExcelImportResultAction"
+        scope="prototype">
+        <property name="statementManager" ref="statementManager" />
+        <property name="reportService" ref="org.hisp.dhis.excelimport.util.ReportService" />
+        <property name="periodService" ref="org.hisp.dhis.period.PeriodService" />
+        <property name="jdbcTemplate" ref="jdbcTemplate" />
+        <property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
+        <property name="organisationUnitGroupService" ref="org.hisp.dhis.organisationunit.OrganisationUnitGroupService" />
+        <property name="currentUserService" ref="org.hisp.dhis.user.CurrentUserService" />
+        <property name="dataSetLockService" ref="org.hisp.dhis.datalock.DataSetLockService" />
+        <property name="dataSetService" ref="org.hisp.dhis.dataset.DataSetService" />
+    </bean>
+    
+    <!-- TCS Data Import -->
+    <bean id="org.hisp.dhis.excelimport.tcs.action.TCSXmlImportFormAction"
+        class="org.hisp.dhis.excelimport.tcs.action.TCSXmlImportFormAction"
+        scope="prototype">
+    </bean>
+    <bean id="org.hisp.dhis.excelimport.tcs.action.TCSXmlImportResultAction"
+        class="org.hisp.dhis.excelimport.tcs.action.TCSXmlImportResultAction"
+        scope="prototype">
+        <property name="statementManager" ref="statementManager" />
+        <property name="reportService" ref="org.hisp.dhis.excelimport.util.ReportService" />
+        <property name="periodService" ref="org.hisp.dhis.period.PeriodService" />
+        <property name="jdbcTemplate" ref="jdbcTemplate" />
+        <property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
+        <property name="currentUserService" ref="org.hisp.dhis.user.CurrentUserService" />
+        <property name="dataSetLockService" ref="org.hisp.dhis.datalock.DataSetLockService" />
+        <property name="dataSetService" ref="org.hisp.dhis.dataset.DataSetService" />
+    </bean>
+    
+    <!-- Get Data Elements -->
+    <bean id="org.hisp.dhis.excelimport.action.GetDataElementsAction"
+        class="org.hisp.dhis.excelimport.action.GetDataElementsAction"
+        scope="prototype">      
+        <property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService" />
+        <property name="dataElementCategoryService" ref="org.hisp.dhis.dataelement.DataElementCategoryService" />
+    </bean>
+    
+    <!-- Get Periods -->
+    <bean id="org.hisp.dhis.excelimport.action.GetPeriodsAction"
+        class="org.hisp.dhis.excelimport.action.GetPeriodsAction"
+        scope="prototype">
+        <property name="periodService" ref="org.hisp.dhis.period.PeriodService" />
+    </bean>
+    
+    <!-- Get Organisation Units -->
+    <bean id="org.hisp.dhis.excelimport.action.GetOrgUnitsAction"
+        class="org.hisp.dhis.excelimport.action.GetOrgUnitsAction"
+        scope="prototype">
+        <property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
+    </bean>
+    
+    <!-- reports home page Form -->
+    <bean id="org.hisp.dhis.excelimport.action.ReportsHomePageAction"
+        class="org.hisp.dhis.excelimport.action.ReportsHomePageAction"
+        scope="prototype">
+        <property name="reportService">
+            <ref bean="org.hisp.dhis.excelimport.util.ReportService"/>
+        </property>     
+    </bean>
+    
+    <!-- Get Reports -->
+    <bean id="org.hisp.dhis.excelimport.action.GetReportsAction"
+        class="org.hisp.dhis.excelimport.action.GetReportsAction"
+        scope="prototype">
+        <property name="reportService">
+            <ref bean="org.hisp.dhis.excelimport.util.ReportService"/>
+        </property>
+        <property name="organisationUnitService">
+            <ref bean="org.hisp.dhis.organisationunit.OrganisationUnitService"/>
+        </property>
+        <property name="dataSetService">
+            <ref bean="org.hisp.dhis.dataset.DataSetService"/>
+        </property>
+    </bean>
+    
+    <!-- Report Service -->
+    <bean id="org.hisp.dhis.excelimport.util.ReportService"
+        class="org.hisp.dhis.excelimport.util.ReportService" scope="prototype">     
+        <property name="periodService">
+            <ref bean="org.hisp.dhis.period.PeriodService"/>
+        </property>
+        <property name="jdbcTemplate" ref="jdbcTemplate"/>    
+        <property name="dataElementService">
+            <ref bean="org.hisp.dhis.dataelement.DataElementService"/>
+        </property>
+        <property name="indicatorService">
+            <ref bean="org.hisp.dhis.indicator.IndicatorService"/>
+        </property>
+        <property name="dataSetService">
+            <ref bean="org.hisp.dhis.dataset.DataSetService"/>
+        </property>
+        <property name="aggregationService">
+            <ref bean="org.hisp.dhis.aggregation.AggregationService"/>
+        </property>
+        <property name="dataValueService">
+            <ref bean="org.hisp.dhis.datavalue.DataValueService"/>
+        </property>
+        <property name="dataElementCategoryService">
+            <ref bean="org.hisp.dhis.dataelement.DataElementCategoryService"/>
+        </property>
+        <property name="configurationService">
+            <ref bean="org.hisp.dhis.config.ConfigurationService"/>
+        </property>
+    </bean>
+    
 </beans>

=== modified file 'local/in/dhis-web-excelimport/src/main/resources/struts.xml'
--- local/in/dhis-web-excelimport/src/main/resources/struts.xml	2010-09-23 08:27:50 +0000
+++ local/in/dhis-web-excelimport/src/main/resources/struts.xml	2011-04-15 11:43:00 +0000
@@ -6,26 +6,28 @@
   <!-- use the DHIS web portal default -->
   <include file="dhis-web-commons.xml"/>
 
-	<package name="dhis-web-excelimport" extends="dhis-web-commons"
-		namespace="/dhis-web-excelimport">
-		
-		<action name="index" class="org.hisp.dhis.excelimport.action.NoAction">
-			<result name="success" type="redirect">excelImportForm.action</result>
-		</action>
-		
-		<action name="excelImportForm"
-			class="org.hisp.dhis.excelimport.action.ExcelImportFormAction">
-			<result name="success" type="velocity">/main.vm</result>
- 			<param name="page">/dhis-web-excelimport/excelImportForm.vm</param>
-			<param name="menu">/dhis-web-excelimport/menuWithTree.vm</param>
-			<param name="javascripts">
-				../dhis-web-commons/ouwt/ouwt.js,../dhis-web-commons/lists/lists.js,javascript/reports.js,javascript/reports.js,javascript/hashtable.js
+    <package name="dhis-web-excelimport" extends="dhis-web-commons"
+        namespace="/dhis-web-excelimport">
+        
+        <action name="index" class="org.hisp.dhis.excelimport.action.NoAction">
+            <result name="success" type="velocity">/main.vm</result>
+            <param name="page">/dhis-web-excelimport/welcome.vm</param>
+            <param name="menu">/dhis-web-excelimport/menu.vm</param>
+        </action>
+        
+        <action name="excelImportForm"
+            class="org.hisp.dhis.excelimport.action.ExcelImportFormAction">
+            <result name="success" type="velocity">/main.vm</result>
+            <param name="page">/dhis-web-excelimport/excelImportForm.vm</param>
+            <param name="menu">/dhis-web-excelimport/menuWithTree.vm</param>
+            <param name="javascripts">
+                ../dhis-web-commons/ouwt/ouwt.js,../dhis-web-commons/lists/lists.js,javascript/reports.js,javascript/reports.js,javascript/hashtable.js
                  ,../dhis-web-commons/util/validate/jquery.validate.js,../dhis-web-commons/util/jquery.metadata.js
                 ,../dhis-web-commons/util/validate/additional-methods.js,../dhis-web-commons/util/validate/messages_locale.js</param>
-			<param name="stylesheets">css/StylesForTags.css</param>
-			<interceptor-ref name="organisationUnitTreeStack"/>
-		</action>
-		
+            <param name="stylesheets">css/StylesForTags.css</param>
+            <interceptor-ref name="organisationUnitTreeStack"/>
+        </action>
+        
         <action name="excelResultForm" class="org.hisp.dhis.excelimport.action.ExcelImportResultAction">
             <result name="success" type="velocity">/main.vm</result>
             <param name="page">/dhis-web-excelimport/responseStatus.vm</param>
@@ -33,47 +35,76 @@
             <interceptor-ref name="fileUploadStack"/>
         </action>
 
-		<action name="rejectImport"
-			class="org.hisp.dhis.excelimport.action.RejectAction">
-			<result name="success" type="velocity">/main.vm</result>
-			<param name="page">/dhis-web-excelimport/invalidReport.vm</param>
-			<param name="menu">/dhis-web-excelimport/menuWithTree.vm</param>
-			<param name="javascripts">
-				../dhis-web-commons/ouwt/ouwt.js,../dhis-web-commons/lists/lists.js,javascript/reports.js,javascript/reports.js,javascript/hashtable.js</param>
-			<param name="stylesheets">css/StylesForTags.css</param>
-			<interceptor-ref name="organisationUnitTreeStack"/>
-	        <interceptor-ref name="fileUploadStack"/>
-		</action>
-		
-		<!-- AJAX Requests -->
-		<action name="getDataElements"
-			class="org.hisp.dhis.excelimport.action.GetDataElementsAction">
-			<result name="success" type="velocity-xml">
-				/dhis-web-excelimport/responseDataElement.vm</result>
-			<param name="onExceptionReturn">plainTextError</param>
-		</action>
-		
-		<action name="getPeriods"
-			class="org.hisp.dhis.excelimport.action.GetPeriodsAction">
-			<result name="success" type="velocity-xml">
-				/dhis-web-excelimport/responsePeriod.vm</result>
-			<param name="onExceptionReturn">plainTextError</param>
-		</action>
-		
-		<action name="getReports"
-			class="org.hisp.dhis.excelimport.action.GetReportsAction">
-			<result name="success" type="velocity-xml">
-				/dhis-web-excelimport/responseImportReport.vm</result>
-			<param name="javascripts">../dhis-web-commons/ouwt/ouwt.js,javascript/reports.js,../dhis-web-commons/lists/lists.js,javascript/hashtable.js</param>
-			<param name="onExceptionReturn">plainTextError</param>
-		</action>
-		
-		<action name="getOrgUnitDetails"
-			class="org.hisp.dhis.excelimport.action.GetOrgUnitsAction">
-			<result name="success" type="velocity-xml">
-				/dhis-web-excelimport/responseOrgUnit.vm</result>
-			<param name="onExceptionReturn">plainTextError</param>
-		</action>
-		
-	</package>
+        <action name="rejectImport"
+            class="org.hisp.dhis.excelimport.action.RejectAction">
+            <result name="success" type="velocity">/main.vm</result>
+            <param name="page">/dhis-web-excelimport/invalidReport.vm</param>
+            <param name="menu">/dhis-web-excelimport/menuWithTree.vm</param>
+            <param name="javascripts">
+                ../dhis-web-commons/ouwt/ouwt.js,../dhis-web-commons/lists/lists.js,javascript/reports.js,javascript/reports.js,javascript/hashtable.js</param>
+            <param name="stylesheets">css/StylesForTags.css</param>
+            <interceptor-ref name="organisationUnitTreeStack"/>
+            <interceptor-ref name="fileUploadStack"/>
+        </action>
+
+    <!-- Portal Data Import -->
+    <action name="portalDataImportForm"
+        class="org.hisp.dhis.excelimport.portal.action.PortalExcelImportFormAction">
+        <result name="success" type="velocity">/main.vm</result>
+        <param name="page">/dhis-web-excelimport/portalDataImportForm.vm</param>
+        <param name="menu">/dhis-web-excelimport/menu.vm</param>
+        <param name="javascripts">javascript/hashtable.js</param>
+        <param name="stylesheets">css/StylesForTags.css</param>
+    </action>
+
+    <action name="portalExcelImportResult" class="org.hisp.dhis.excelimport.portal.action.PortalExcelImportResultAction">
+        <result name="success" type="velocity">/main.vm</result>
+        <param name="page">/dhis-web-excelimport/portalDataImportResult.vm</param>
+        <param name="menu">/dhis-web-excelimport/menu.vm</param>
+        <interceptor-ref name="fileUploadStack"/>
+    </action>
+
+    <!-- TCS Data Import -->
+    <action name="tcsDataImportForm"
+        class="org.hisp.dhis.excelimport.tcs.action.TCSXmlImportFormAction">
+        <result name="success" type="velocity">/main.vm</result>
+        <param name="page">/dhis-web-excelimport/tcsDataImportForm.vm</param>
+        <param name="menu">/dhis-web-excelimport/menu.vm</param>
+        <param name="stylesheets">css/StylesForTags.css</param>
+        <param name="requiredAuthorities">F_DATAINTEGRATION_TNHMIS</param>
+    </action>
+    <action name="tcsXmlImportResult" class="org.hisp.dhis.excelimport.tcs.action.TCSXmlImportResultAction">
+        <result name="success" type="velocity">/main.vm</result>
+        <param name="page">/dhis-web-excelimport/tcsDataImportResult.vm</param>
+        <param name="menu">/dhis-web-excelimport/menu.vm</param>
+        <interceptor-ref name="fileUploadStack"/>
+    </action>
+
+    <!-- AJAX Requests -->
+        <action name="getDataElements"
+            class="org.hisp.dhis.excelimport.action.GetDataElementsAction">
+            <result name="success" type="velocity-xml">/dhis-web-excelimport/responseDataElement.vm</result>
+            <param name="onExceptionReturn">plainTextError</param>
+        </action>
+
+        <action name="getPeriods"
+            class="org.hisp.dhis.excelimport.action.GetPeriodsAction">
+            <result name="success" type="velocity-xml">/dhis-web-excelimport/responsePeriod.vm</result>
+            <param name="onExceptionReturn">plainTextError</param>
+        </action>
+
+        <action name="getReports"
+            class="org.hisp.dhis.excelimport.action.GetReportsAction">
+            <result name="success" type="velocity-xml">/dhis-web-excelimport/responseImportReport.vm</result>
+            <param name="javascripts">../dhis-web-commons/ouwt/ouwt.js,javascript/reports.js,../dhis-web-commons/lists/lists.js,javascript/hashtable.js</param>
+            <param name="onExceptionReturn">plainTextError</param>
+        </action>
+
+        <action name="getOrgUnitDetails"
+            class="org.hisp.dhis.excelimport.action.GetOrgUnitsAction">
+            <result name="success" type="velocity-xml">/dhis-web-excelimport/responseOrgUnit.vm</result>
+            <param name="onExceptionReturn">plainTextError</param>
+        </action>
+
+    </package>
 </struts>

=== modified file 'local/in/dhis-web-excelimport/src/main/webapp/dhis-web-excelimport/excelImportForm.vm'
--- local/in/dhis-web-excelimport/src/main/webapp/dhis-web-excelimport/excelImportForm.vm	2010-09-23 08:27:50 +0000
+++ local/in/dhis-web-excelimport/src/main/webapp/dhis-web-excelimport/excelImportForm.vm	2011-04-15 11:43:00 +0000
@@ -45,20 +45,7 @@
                 jQuery("#name").focus();
             }
     );
-	
-/*	
-function orgUnitHasBeenSelected( orgUnitIds )
-{    
-	if(orgUnitIds == null || orgUnitIds == "" )
-	{
-		return;
-	}
-
-	if(orgUnitIds != null)
-		getOUDetails(orgUnitIds);	
-}
-*/
-//selection.setListenerFunction( orgUnitHasBeenSelected );
+    
 
 </script>
 
@@ -70,7 +57,7 @@
     <table align="center" style=" border-collapse: collapse; margin-top: 0;" cellpadding="0" cellspacing="0" width="730" border=0>
         <tr>
             <td class="NormalB">
-                PeriodType : <br />
+                1. PeriodType : <br />
                 <select id="periodTypeId" name="periodTypeId" style="width:200px" onchange="getPeriods()">
                     <option value="NA">[ Select PeriodType ]</option>
                     #foreach ( $type in $periodTypes )
@@ -79,8 +66,9 @@
                 </select>
             </td>
             <td class="NormalB">                            
-                OrganisationUnit : <br />
-                <input type="text" name="ouNameTB" id="ouNameTB" size="20" class="{validate:{required:true}}" disabled >
+                4. Import Sheets :<br />
+                <select id="reportList" name="reportList" style="width:250px" class="{validate:{required:true}}">
+                </select>
             </td>
         </tr>
         <tr>
@@ -93,48 +81,53 @@
         </tr>
         <tr>
             <td class="NormalB">
-                Periods : <br />
+                2. Periods : <br />
                 <select id="availablePeriods" name="availablePeriods" style="width:200px" class="{validate:{required:true}}">
                     <option value="EMPTY_PLACEHOLDER_VALUE"></option>
                 </select>
             </td>
             <td class="NormalB">
-                Reports :<br />
-                <select id="reportList" name="reportList" style="width:200px" class="{validate:{required:true}}">
-                	
-                </select>
-            </td>
-        </tr>
-        <tr>
-            <td>&nbsp;</td>
-            <td>&nbsp;</td>
-        </tr>
-        <tr>
-            <td>&nbsp;</td>
-            <td>&nbsp;</td>
-        </tr>
-        <tr>
+                5. Upload/Import (XLS) File : <br/>
+                <input type="file" id="upload" name="upload" size="31" class="{validate:{required:true}}">
+            </td>
+        </tr>
+        <tr>
+            <td>&nbsp;</td>
+            <td>&nbsp;</td>
+        </tr>
+        <tr>
+            <td>&nbsp;</td>
+            <td>&nbsp;</td>
+        </tr>
+
+        <tr>
+            <td class="NormalB">
+                3. OrganisationUnit : <br />
+                <input type="text" name="ouNameTB" id="ouNameTB" style="width:200px" class="{validate:{required:true}}" disabled >
+            </td>
             <td class="NormalB">
                 <input type="radio" id="riRadio" name="riRadio" value="overWrite" checked> New And Updates
-                &nbsp;<br>
                 <input type="radio" id="riRadio" name="riRadio" value="reject" > New (No Updates)
+                <br />
+                <input type="submit" name="importReport" value='Import Data' style="width:250px">
             </td>
-            <td class="NormalB"><input type="file" id="upload" name="upload" size="45" class="{validate:{required:true}}"></td>
+        </tr>                   
+        
+        <tr>
+            <td>&nbsp;</td>
             <td>&nbsp;</td>
         </tr>
+        
         <tr>
             <td>&nbsp;</td>
             <td>
-                <br /><br />
-                <input type="submit" name="importReport" value='Import Data' style="width:13em">
                 <input type="hidden" name="autogen" id="autogen" value="0" >
-                <input type="hidden" name="ouIDTB" id="ouIDTB">
+                <input type="hidden" name="ouIDTB" id="ouIDTB" />
                 <input type="hidden" name="reportModelTB" id="reportModelTB">
                 <input type="hidden" name="reportFileNameTB" id="reportFileNameTB">
                 <input type="hidden" name="checkerFileNameTB" id="checkerFileNameTB">
                 <input type="hidden" name="dataSetId" id="dataSetId">
                 <input type="hidden" name="reportListFileNameTB" id="reportListFileNameTB" value="excelImportReportsList.xml">
-                
             </td>
         </tr>
         <tr>

=== added directory 'local/in/dhis-web-excelimport/src/main/webapp/dhis-web-excelimport/images'
=== added file 'local/in/dhis-web-excelimport/src/main/webapp/dhis-web-excelimport/images/ajax-loader.gif'
Binary files local/in/dhis-web-excelimport/src/main/webapp/dhis-web-excelimport/images/ajax-loader.gif	1970-01-01 00:00:00 +0000 and local/in/dhis-web-excelimport/src/main/webapp/dhis-web-excelimport/images/ajax-loader.gif	2011-04-15 11:43:00 +0000 differ
=== modified file 'local/in/dhis-web-excelimport/src/main/webapp/dhis-web-excelimport/menu.vm'
--- local/in/dhis-web-excelimport/src/main/webapp/dhis-web-excelimport/menu.vm	2010-06-04 11:50:05 +0000
+++ local/in/dhis-web-excelimport/src/main/webapp/dhis-web-excelimport/menu.vm	2011-04-15 11:43:00 +0000
@@ -1,11 +1,16 @@
-<h2>Data Import</h2>
+
+<h2>Data Integration</h2>
 <ul>
     <li>Data Import</li>
     <ul>
         <li>
-            <a href = "excelImportForm.action">Excel Import</a>
+            <a href = "excelImportForm.action">Data Import From Excel</a>
+        </li>
+        <li>
+            <a href = "portalDataImportForm.action">Data Import From Portal</a>
+        </li>
+        <li>
+            <a href = "tcsDataImportForm.action">Import XML From TNHMIS</a>
         </li>
     </ul>
 </ul>
-<br>
-

=== modified file 'local/in/dhis-web-excelimport/src/main/webapp/dhis-web-excelimport/menuWithTree.vm'
--- local/in/dhis-web-excelimport/src/main/webapp/dhis-web-excelimport/menuWithTree.vm	2011-01-18 12:01:24 +0000
+++ local/in/dhis-web-excelimport/src/main/webapp/dhis-web-excelimport/menuWithTree.vm	2011-04-15 11:43:00 +0000
@@ -1,30 +1,32 @@
-<h2>Data Import</h2>
-<ul>
-    <li>Data Import</li>
-    <ul>
-        <li>
-            <a href = "excelImportForm.action">Excel Import</a>
-        </li>
-    </ul>
-</ul>
-<br>
-##parse( "/dhis-web-commons/ouwt/orgunittree.vm" )
-#parse( "/dhis-web-commons/ouwt/orgunittreesearch.vm" )
-<!-- The script that registeres selctions in the orgunit tree -->
-<script type="text/javascript">
-
-function orgUnitHasBeenSelected( orgUnitIds )
-{    
-    document.reportForm.ouIDTB.value = orgUnitIds;
-    
-    reportListFileName = document.reportForm.reportListFileNameTB.value;
-
-    if(orgUnitIds != null && orgUnitIds != "" )
-    {
-        getReports(orgUnitIds, reportListFileName)      
-    }
-}
-
-selection.setListenerFunction( orgUnitHasBeenSelected );
-
-</script>
+
+<a href="index.action"><h2>Data Integration</h2></a>
+<ul>
+    <li>Data Import</li>
+    <ul>
+        <li><a href = "excelImportForm.action">Data Import From Excel</a></li>
+    </ul>
+</ul>
+
+<br/>
+
+#parse( "/dhis-web-commons/ouwt/orgunittreesearch.vm" )
+
+<script type="text/javascript">
+
+    function orgUnitHasBeenSelected( orgUnitIds )
+    {
+        document.reportForm.ouIDTB.value = orgUnitIds;
+        
+        document.getElementById("ouNameTB").value = "";
+
+        reportListFileName = document.reportForm.reportListFileNameTB.value;
+
+        if( orgUnitIds != null && orgUnitIds != "" )
+        {
+            getReports( orgUnitIds, reportListFileName )
+        }
+    }
+
+    selection.setListenerFunction( orgUnitHasBeenSelected );
+
+</script>

=== added file 'local/in/dhis-web-excelimport/src/main/webapp/dhis-web-excelimport/portalDataImportForm.vm'
--- local/in/dhis-web-excelimport/src/main/webapp/dhis-web-excelimport/portalDataImportForm.vm	1970-01-01 00:00:00 +0000
+++ local/in/dhis-web-excelimport/src/main/webapp/dhis-web-excelimport/portalDataImportForm.vm	2011-04-15 11:43:00 +0000
@@ -0,0 +1,131 @@
+<style>
+	#overlay 
+	{
+		z-index:9998;
+		position:absolute;
+		top:0;
+		bottom:0;
+		left:0;
+		width:100%;
+		background:#000;
+		opacity:0.45;
+		-moz-opacity:0.45;
+		filter:alpha(opacity=45);
+		visibility:hidden;
+	}
+
+	#overlayImg{ width: 50px; height: 50px; z-index: 9999; position: absolute; left:50%}
+</style>
+
+<div id="overlay">
+	<div id="overlayImg"><img  width="50" height="50" src="images/ajax-loader.gif" /></div>
+</div>
+
+<script>
+
+    //Global Variables
+    var proformas = new HashTable();
+    var checkerTemplateNames = new HashTable();
+	var checkerRangeForHeaders = new HashTable();
+	var checkerRangeForData = new HashTable();
+	var datasetIds = new HashTable();
+	var orgunitGroupIds = new HashTable();
+	var facilityStarts = new HashTable();
+
+	#foreach ( $excelImportSheet in $excelImportSheetList )
+		var excelImportSheetId = ""+"$excelImportSheet.xmlTemplateName";
+		proformas.put( excelImportSheetId, "$excelImportSheet.proforma" );
+		checkerTemplateNames.put( excelImportSheetId, "$excelImportSheet.checkerTemplateName" );
+		checkerRangeForHeaders.put( excelImportSheetId, "$excelImportSheet.checkerRangeForHeader" );
+        checkerRangeForData.put( excelImportSheetId, "$excelImportSheet.checkerRangeForData" );
+        datasetIds.put( excelImportSheetId, "$excelImportSheet.datasetId" );
+		orgunitGroupIds.put( excelImportSheetId, "$excelImportSheet.orgunitGroupId" );
+		facilityStarts.put( excelImportSheetId, "$excelImportSheet.facilityStart" );
+	#end
+
+    function formValidations()
+    {
+		var importSheetList = document.getElementById("importSheetId");
+        var importSheetListSelectedIndex = importSheetList.selectedIndex;
+
+        if( importSheetListSelectedIndex < 0 || importSheetList.options[importSheetListSelectedIndex].text == null) { alert("Please Select Import Sheet"); return false; }
+
+        document.dataImportForm.proforma.value = proformas.get( importSheetList.options[importSheetListSelectedIndex].value );
+        document.dataImportForm.checkerTemplateName.value = checkerTemplateNames.get( importSheetList.options[importSheetListSelectedIndex].value );
+        document.dataImportForm.checkerRangeForHeader.value = checkerRangeForHeaders.get( importSheetList.options[importSheetListSelectedIndex].value );
+        document.dataImportForm.checkerRangeForData.value = checkerRangeForData.get( importSheetList.options[importSheetListSelectedIndex].value );
+        document.dataImportForm.datasetId.value = datasetIds.get( importSheetList.options[importSheetListSelectedIndex].value );
+        document.dataImportForm.orgunitGroupId.value = orgunitGroupIds.get( importSheetList.options[importSheetListSelectedIndex].value );
+        document.dataImportForm.facilityStart.value = facilityStarts.get( importSheetList.options[importSheetListSelectedIndex].value );
+		
+		showOverlay();
+        
+		return true;
+    }
+	
+	function showOverlay() 
+	{
+		var o = document.getElementById('overlay');
+		o.style.visibility = 'visible';
+		jQuery("#overlay").css({
+			"height": jQuery(document).height()
+		});
+		jQuery("#overlayImg").css({
+			"top":jQuery(window).height()/2
+		});
+	}
+	function hideOverlay() 
+	{
+		var o = document.getElementById('overlay');
+		o.style.visibility = 'hidden';
+	}
+
+</script>
+
+<h3>Portal Data Import Form</h3>
+<hr /><br />
+
+<form id="dataImportForm" name="dataImportForm" method="post" enctype="multipart/form-data" action="portalExcelImportResult.action" onsubmit="formValidations()">
+	<table align="center" style=" border-collapse: collapse; margin-top: 0;" cellpadding="0" cellspacing="0" width="730" border="0" >
+		<tr>
+			<td class="NormalB">
+				Import Sheets :<br />
+				<select id="importSheetId" name="importSheetId" style="width:325px" class="{validate:{required:true}}">
+				#foreach ( $excelImportSheet in $excelImportSheetList )
+					<option value="$excelImportSheet.xmlTemplateName">$excelImportSheet.displayName</option>
+                #end
+				</select>
+			</td>
+		</tr>
+        <tr>
+            <td class="NormalB">&nbsp;</td>
+        </tr>
+        <tr>
+            <td class="NormalB">&nbsp;</td>
+        </tr>
+        <tr>
+            <td class="NormalB">
+                Upload/Import (XLS) File :<br />
+                <input type="file" id="upload" name="upload" size="45" class="{validate:{required:true}}" />
+            </td>
+        </tr>
+        <tr>
+            <td class="NormalB">&nbsp;</td>
+        </tr>
+        <tr>
+            <td class="NormalB">&nbsp;</td>
+        </tr>
+        <tr>
+            <td class="NormalB">
+                <input type="submit" name="importReport" value='Import Data' style="width:325px" />
+                <input type="hidden" name="proforma" id="proforma" />
+                <input type="hidden" name="checkerTemplateName" id="checkerTemplateName" />
+                <input type="hidden" name="checkerRangeForHeader" id="checkerRangeForHeader" />
+                <input type="hidden" name="checkerRangeForData" id="checkerRangeForData" />
+                <input type="hidden" name="datasetId" id="datasetId" />
+				<input type="hidden" name="orgunitGroupId" id="orgunitGroupId" />
+				<input type="hidden" name="facilityStart" id="facilityStart" />
+            </td>
+        </tr>
+	</table>
+</form>
\ No newline at end of file

=== added file 'local/in/dhis-web-excelimport/src/main/webapp/dhis-web-excelimport/portalDataImportResult.vm'
--- local/in/dhis-web-excelimport/src/main/webapp/dhis-web-excelimport/portalDataImportResult.vm	1970-01-01 00:00:00 +0000
+++ local/in/dhis-web-excelimport/src/main/webapp/dhis-web-excelimport/portalDataImportResult.vm	2011-04-15 11:43:00 +0000
@@ -0,0 +1,4 @@
+
+<input type="button" value="Back" onclick="window.location.href='portalDataImportForm.action'" />
+<br/><br/>
+<span id="message" style="display:block">$message</span>

=== added file 'local/in/dhis-web-excelimport/src/main/webapp/dhis-web-excelimport/tcsDataImportForm.vm'
--- local/in/dhis-web-excelimport/src/main/webapp/dhis-web-excelimport/tcsDataImportForm.vm	1970-01-01 00:00:00 +0000
+++ local/in/dhis-web-excelimport/src/main/webapp/dhis-web-excelimport/tcsDataImportForm.vm	2011-04-15 11:43:00 +0000
@@ -0,0 +1,81 @@
+<style>
+    #overlay 
+    {
+        z-index:9998;
+        position:absolute;
+        top:0;
+        bottom:0;
+        left:0;
+        width:100%;
+        background:#000;
+        opacity:0.45;
+        -moz-opacity:0.45;
+        filter:alpha(opacity=45);
+        visibility:hidden;
+    }
+
+    #overlayImg{ width: 50px; height: 50px; z-index: 9999; position: absolute; left:50%}
+</style>
+
+<div id="overlay">
+    <div id="overlayImg"><img  width="50" height="50" src="images/ajax-loader.gif" /></div>
+</div>
+
+<script>
+
+    function formValidations()
+    {
+        if( document.getElementById('upload').value == null || document.getElementById('upload').value == "" )
+        {
+            alert("Please select upload file"); return false;
+        }
+        
+        showOverlay();
+        
+        return true;
+    }
+    
+    function showOverlay() 
+    {
+        var o = document.getElementById('overlay');
+        o.style.visibility = 'visible';
+        jQuery("#overlay").css({
+            "height": jQuery(document).height()
+        });
+        jQuery("#overlayImg").css({
+            "top":jQuery(window).height()/2
+        });
+    }
+    function hideOverlay() 
+    {
+        var o = document.getElementById('overlay');
+        o.style.visibility = 'hidden';
+    }
+
+</script>
+
+<h3>TNHMIS Data Import Form</h3>
+<hr /><br />
+
+<form id="dataImportForm" name="dataImportForm" method="post" enctype="multipart/form-data" action="tcsXmlImportResult.action" onsubmit="return formValidations()">
+    <table align="center" style=" border-collapse: collapse; margin-top: 0;" cellpadding="0" cellspacing="0" width="730" border="0" >
+        <tr>
+        <tr>
+            <td class="NormalB">
+                Upload/Import (XML) File :<br />
+                <input type="file" id="upload" name="upload" size="45" class="{validate:{required:true}}" />
+            </td>
+        </tr>
+        <tr>
+            <td class="NormalB">&nbsp;</td>
+        </tr>
+        <tr>
+            <td class="NormalB">&nbsp;</td>
+        </tr>
+        <tr>
+            <td class="NormalB">
+                <input type="submit" name="importReport" value='Import Data' style="width:325px" />
+            </td>
+        </tr>
+    </table>
+</form>
\ No newline at end of file

=== added file 'local/in/dhis-web-excelimport/src/main/webapp/dhis-web-excelimport/tcsDataImportResult.vm'
--- local/in/dhis-web-excelimport/src/main/webapp/dhis-web-excelimport/tcsDataImportResult.vm	1970-01-01 00:00:00 +0000
+++ local/in/dhis-web-excelimport/src/main/webapp/dhis-web-excelimport/tcsDataImportResult.vm	2011-04-15 11:43:00 +0000
@@ -0,0 +1,4 @@
+
+<input type="button" value="Back" onclick="window.location.href='tcsDataImportForm.action'" />
+<br/><br/>
+<span id="message" style="display:block">$message</span>

=== modified file 'local/in/dhis-web-excelimport/src/main/webapp/dhis-web-excelimport/welcome.vm'
--- local/in/dhis-web-excelimport/src/main/webapp/dhis-web-excelimport/welcome.vm	2010-06-04 11:50:05 +0000
+++ local/in/dhis-web-excelimport/src/main/webapp/dhis-web-excelimport/welcome.vm	2011-04-15 11:43:00 +0000
@@ -1,2 +1,2 @@
 
-    <font face"Arial" color="blue"><H1>Home Page</H1></font>
\ No newline at end of file
+<font face"Arial" color="blue"><H3>Home Page</H3></font>
\ No newline at end of file