=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-light/src/main/resources/struts.xml	2012-05-15 07:40:06 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/resources/struts.xml	2012-05-23 13:55:43 +0000
@@ -87,14 +87,14 @@
 			<result name="success" type="velocity">
 				/dhis-web-light/main.vm</result>
 			<param name="page">
-				/dhis-web-light/selectNamebasedOrganisationUnits.vm</param>
+				/dhis-web-light/namebased/selectNamebasedOrganisationUnits.vm</param>
 		</action>
 		
 		<action name="selectActivityType"
 			class="org.hisp.dhis.light.namebaseddataentry.action.ShowActivityTypeAction">
 			<result name="success" type="velocity">
 				/dhis-web-light/main.vm</result>
-			<param name="page">/dhis-web-light/selectActivityType.vm</param>
+			<param name="page">/dhis-web-light/namebased/selectActivityType.vm</param>
 		</action>
 		
 		<action name="selectBeneficiary"
@@ -108,14 +108,14 @@
 			class="org.hisp.dhis.light.namebaseddataentry.action.GetActivityListAction">
 			<result name="success" type="velocity">
 				/dhis-web-light/main.vm</result>
-			<param name="page">/dhis-web-light/selectActivity.vm</param>
+			<param name="page">/dhis-web-light/namebased/selectActivity.vm</param>
 		</action>
 		
 		<action name="showProgramStageForm"
 			class="org.hisp.dhis.light.namebaseddataentry.action.GetProgramStageFormAction">
 			<result name="success" type="velocity">
 				/dhis-web-light/main.vm</result>
-			<param name="page">/dhis-web-light/programStageForm.vm</param>
+			<param name="page">/dhis-web-light/namebased/programStageForm.vm</param>
 		</action>
 		
 		<action name="showCompletedProgramStageForm"
@@ -132,21 +132,21 @@
 			<result name="success_find" type="redirect">
 				/mobile/showPatientProgramStageList.action?patientId=${beneficiaryId}&amp;programInstanceId=${programInstanceId}&amp;programId=${programId}&amp;validated=true</result>
 			<result name="error" type="velocity">/dhis-web-light/main.vm</result>
-			<param name="page">/dhis-web-light/programStageForm.vm</param>
+			<param name="page">/dhis-web-light/namebased/programStageForm.vm</param>
 		</action>
 		
 		<action name="showBeneficiaryDetail"
 			class="org.hisp.dhis.light.namebaseddataentry.action.GetBeneficiaryDetailAction">
 			<result name="success" type="velocity">
 				/dhis-web-light/main.vm</result>
-			<param name="page">/dhis-web-light/beneficiaryDetail.vm</param>
+			<param name="page">/dhis-web-light/namebased/beneficiaryDetail.vm</param>
 		</action>
 		
 		<action name="showBeneficiaryDetailInSearchPage"
 			class="org.hisp.dhis.light.namebaseddataentry.action.GetBeneficiaryDetailAction">
 			<result name="success" type="velocity">
 				/dhis-web-light/main.vm</result>
-			<param name="page">/dhis-web-light/beneficiaryDetail.vm</param>
+			<param name="page">/dhis-web-light/namebased/beneficiaryDetail.vm</param>
 			<param name="previouspage">showPatientProgramList.action?patientId=${beneficiaryId}</param>
 		</action>
 		
@@ -189,7 +189,7 @@
 			<result name="success" type="velocity">
 				/dhis-web-light/main.vm</result>
 			<param name="page">
-				/dhis-web-light/selectRegistrationOrganisationUnits.vm</param>
+				/dhis-web-light/registration/selectRegistrationOrganisationUnits.vm</param>
 		</action>
 		
 		<action name="registerBeneficiary"
@@ -197,7 +197,7 @@
 			<result name="success" type="velocity">
 				/dhis-web-light/main.vm</result>
 			<param name="page">
-				/dhis-web-light/beneficiaryRegistrationForm.vm</param>
+				/dhis-web-light/registration/beneficiaryRegistrationForm.vm</param>
 		</action>
 		
 		<action name="saveBeneficiary"
@@ -205,7 +205,7 @@
 			<result name="success" type="velocity">
 				/dhis-web-light/main.vm</result>
 			<param name="page">
-				/dhis-web-light/beneficiaryRegistrationForm.vm</param>
+				/dhis-web-light/registration/beneficiaryRegistrationForm.vm</param>
 		</action>
 		
 		<!-- Beneficiary Enrollment -->
@@ -215,7 +215,7 @@
 			<result name="success" type="velocity">
 				/dhis-web-light/main.vm</result>
 			<param name="page">
-				/dhis-web-light/selectEnrollmentOrganisationUnits.vm</param>
+				/dhis-web-light/enrollment/selectEnrollmentOrganisationUnits.vm</param>
 		</action>
 		
 		<action name="showBeneficiarySearchingForm"
@@ -223,28 +223,28 @@
 			<result name="success" type="velocity">
 				/dhis-web-light/main.vm</result>
 			<param name="page">
-				/dhis-web-light/beneficiarySearchingForm.vm</param>
+				/dhis-web-light/enrollment/beneficiarySearchingForm.vm</param>
 		</action>
 		
 		<action name="searchBeneficiary"
 			class="org.hisp.dhis.light.beneficiaryenrollment.action.SearchBeneficiaryAction">
 			<result name="success" type="velocity">
 				/dhis-web-light/main.vm</result>
-			<param name="page"> /dhis-web-light/beneficiarySearchResult.vm</param>
+			<param name="page"> /dhis-web-light/enrollment/beneficiarySearchResult.vm</param>
 		</action>
 		
 		<action name="selectEnrollmentProgram"
 			class="org.hisp.dhis.light.beneficiaryenrollment.action.GetEnrollmentProgramListAction">
 			<result name="success" type="velocity">
 				/dhis-web-light/main.vm</result>
-			<param name="page"> /dhis-web-light/enrollmentProgramList.vm</param>
+			<param name="page"> /dhis-web-light/enrollment/enrollmentProgramList.vm</param>
 		</action>
 		
 		<action name="showProgramEnrollmentForm"
 			class="org.hisp.dhis.light.beneficiaryenrollment.action.GetProgramEnrollmentFormAction">
 			<result name="success" type="velocity">
 				/dhis-web-light/main.vm</result>
-			<param name="page"> /dhis-web-light/programEnrollmentForm.vm</param>
+			<param name="page"> /dhis-web-light/enrollment/programEnrollmentForm.vm</param>
 		</action>
 		
 		<action name="saveMobileProgramEnrollment"
@@ -252,7 +252,7 @@
 			<result name="success" type="redirect">
 				/mobile/selectEnrollmentProgram.action?beneficiaryId=${beneficiaryId}&amp;validated=true</result>
 			<result name="error" type="velocity">/dhis-web-light/main.vm</result>
-			<param name="page">/dhis-web-light/programEnrollmentForm.vm</param>
+			<param name="page">/dhis-web-light/enrollment/programEnrollmentForm.vm</param>
 		</action>
 		
 		<!-- Single Event -->
@@ -261,21 +261,21 @@
 			class="org.hisp.dhis.light.singleevent.action.GetSingleEventAction">
 			<result name="success" type="velocity">
 				/dhis-web-light/main.vm</result>
-			<param name="page">/dhis-web-light/selectSingleEvent.vm</param>
+			<param name="page">/dhis-web-light/singleevent/selectSingleEvent.vm</param>
 		</action>
 		
 		<action name="selectSingleEventBeneficiary"
 			class="org.hisp.dhis.light.singleevent.action.GetSingleEventBeneficiaryAction">
 			<result name="success" type="velocity">
 				/dhis-web-light/main.vm</result>
-			<param name="page">/dhis-web-light/selectSingleEventBeneficiary.vm</param>
+			<param name="page">/dhis-web-light/registration/selectSingleEventBeneficiary.vm</param>
 		</action>
 		
 		<action name="showSingleEventForm"
 			class="org.hisp.dhis.light.singleevent.action.GetSingleEventFormAction">
 			<result name="success" type="velocity">
 				/dhis-web-light/main.vm</result>
-			<param name="page">/dhis-web-light/singleEventForm.vm</param>
+			<param name="page">/dhis-web-light/singleevent/singleEventForm.vm</param>
 		</action>
 		
 		<action name="saveSingleEvent"
@@ -283,7 +283,7 @@
 			<result name="success" type="redirect">
 				/mobile/selectSingleEventBeneficiary.action?programId=${programId}&amp;organisationUnitId=${organisationUnitId}&amp;validated=true</result>
 			<result name="error" type="velocity">/dhis-web-light/main.vm</result>
-			<param name="page">/dhis-web-light/singleEventForm.vm</param>
+			<param name="page">/dhis-web-light/singleevent/singleEventForm.vm</param>
 		</action>
 		
 		<!-- Reports -->

=== removed file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/beneficiaryDetail.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/beneficiaryDetail.vm	2012-05-15 07:40:06 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/beneficiaryDetail.vm	1970-01-01 00:00:00 +0000
@@ -1,24 +0,0 @@
-<h2>$i18n.getString("details_for") $!encoder.htmlEncode( ${patient.getFullName()} )   </h2>
-<p>
-
-<ul>
-	<li><strong>$i18n.getString("id"):</strong>  $patient.id</li>
-	<li><b>$i18n.getString("gender"):</b>  #if ($patient.gender == "F") Female #else Male #end</li>
-	#set($day = $patient.birthDate.date)
-	#set($month = $patient.birthDate.month+1)
-	#set($year = $patient.birthDate.year + 1900)
-	<li><b>$i18n.getString("date_of_birth"):</b>  $year - $month - $day </li>			
-	<li><b>$i18n.getString("blood_group"):</b>  $patient.bloodGroup</li>
-</ul>
-
-<p>
-<div id="footer">
-<h2>$i18n.getString( "navigate_to" )</h2>
-<ul>
-	#if($organisationUnitId == "0")
-		<li><a href="showPatientProgramList.action?patientId=$patient.id">$!encoder.htmlEncode( ${patient.getFullName()} )</a></li>
-	#else
-		<li><a href="selectActivity.action?organisationUnitId=$organisationUnitId&beneficiaryId=$patient.id&current=$current"> $i18n.getString("activity_list")</a></li>
-	#end
-	<li><a href="index.action">$i18n.getString("home")</a></li>
-</ul>
\ No newline at end of file

=== removed file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/beneficiaryRegistrationForm.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/beneficiaryRegistrationForm.vm	2012-04-13 08:56:48 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/beneficiaryRegistrationForm.vm	1970-01-01 00:00:00 +0000
@@ -1,77 +0,0 @@
-<h2>$i18n.getString( "beneficiary_registration" )</h2>
-
-	#if( $validated )
-		<div class="header-box">
-			<h3 style="text-align: left;">$i18n.getString("successfully_saved")</h3>
-		</div>
-	#else
-	
-	#end
-
-<form action="saveBeneficiary.action" method="POST">
-<div class="header-box" align="center">
-<input type="hidden" name="orgUnitId" value="$orgUnitId"/>	
-	<p style="text-align: left;">
-		<label>$i18n.getString( "full_name" )</label>
-		#if( $validationMap.get( "fullName" ) )
-           	<br /><span style="color: #990000;"> $i18n.getString($validationMap.get( "fullName" ))</span>
-     	#end
-		<input type="text" name="patientFullName" value="$!previousValues.get("fullName")" />
-		
-		<label>$i18n.getString( "gender" )</label>
-		<select name="gender">
-			<option value="M"
-			#if($previousValues.get("gender") == "M")
-				selected
-			#end
-			>$i18n.getString( "male" )</option>
-			
-			<option value="F"
-			#if($previousValues.get("gender") == "F")
-				selected
-			#end
-			>$i18n.getString( "female" )</option>
-			
-			<option value="T"
-			#if($previousValues.get("gender") == "T")
-				selected
-			#end
-			>$i18n.getString( "transgender" )</option>
-		</select>
-		
-		<label>$i18n.getString( "date_of_birth" ) [yyyy-MM-dd] </label>
-		#if( $validationMap.get( "dob" ) )
-           	<br /><span style="color: #990000;"> $i18n.getString($validationMap.get( "dob" ))</span>
-     	#end
-		<input type="text" name="dateOfBirth" value="$!previousValues.get("dob")" />
-		
-		<label>$i18n.getString( "blood_group" )</label>
-		<select name="bloodGroup">
-			<option value="">[Please select]</option>
-			#set($bloodGroups = ["A+", "A-", "AB+", "AB-", "B+", "B-", "O+", "O-"])
-			#foreach($item in $bloodGroups) 
-			<option value="$item"
-			#if($previousValues.get("bloodGroup") == $item)
-				selected
-			#end
-			>$item</option>
-			#end
-		</select>
-	</p>
-</div>
-
-<div class="header-box" align="center">
-	<p>
-		<input type="submit" style="width: 100%;" value="$i18n.getString("save")" />
-	</p>
-</div>
-
-</form>
-
-<div id="footer">
-<h2>$i18n.getString( "navigate_to" )</h2>
-<ul>
-	<li> <a href="selectRegistrationOrganisationUnit.action"> $i18n.getString("organisation_unit")</a> </li>
-	<li><a href="index.action">$i18n.getString("home")</a></li>
-</ul>
-</div>

=== removed file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/beneficiarySearchResult.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/beneficiarySearchResult.vm	2012-04-20 02:32:43 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/beneficiarySearchResult.vm	1970-01-01 00:00:00 +0000
@@ -1,24 +0,0 @@
-<h2>$i18n.getString( "search_result_for" ) $keyword</h2>
-	#if( $validated && $current )
-		<div class="header-box">
-			<h3 style="text-align: left;">$i18n.getString("successfully_saved")</h3>
-		</div>
-	#else	
-	
-	#end
-<p>
-<ul>
-#foreach( $patient in $patientList )
-	#set($fullName = $patient.getFirstName() + " " + $patient.getMiddleName() + " " + $patient.getLastName())
-	<li><a href="selectEnrollmentProgram.action?beneficiaryId=$patient.Id">$!encoder.htmlEncode( ${fullName} )</a></li>
-#end
-</ul>
-</p>
-
-<div id="footer">
-<h2>$i18n.getString( "navigate_to" )</h2>
-<ul>
-	<li><a href="showBeneficiarySearchingForm.action">$i18n.getString("beneficiary_search")</a></li>
-	<li><a href="index.action">$i18n.getString("home")</a></li>
-</ul>
-</div>
\ No newline at end of file

=== removed file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/beneficiarySearchingForm.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/beneficiarySearchingForm.vm	2012-05-15 07:40:06 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/beneficiarySearchingForm.vm	1970-01-01 00:00:00 +0000
@@ -1,37 +0,0 @@
-<h2>$i18n.getString( "beneficiary_search" )</h2>
-
-	#if( $validated == true)
-		<div class="header-box">
-			<h3 style="text-align: left;">$i18n.getString("successfully_saved")</h3>
-		</div>
-	#else
-	
-	#end
-
-<form action="searchBeneficiary.action" method="POST">
-<div class="header-box" align="center">
-<input type="hidden" name="orgUnitId" value="$orgUnitId"/>	
-	<p style="text-align: left;">
-		<label>$i18n.getString( "beneficiary_name" )</label>
-		#if( $validationMap.get( "fullName" ) )
-           	<br /><span style="color: #990000;"> $i18n.getString($validationMap.get( "fullName" ))</span>
-     	#end
-		<input type="text" name="keyword" value="$!previousValues.get("fullName")" />
-	</p>
-</div>
-
-<div class="header-box" align="center">
-	<p>
-		<input type="submit" style="width: 100%;" value="$i18n.getString("search")" />
-	</p>
-</div>
-
-</form>
-
-<div id="footer">
-<h2>$i18n.getString( "navigate_to" )</h2>
-<ul>
-	<li><a href="trackingMenu.action"> $i18n.getString("tracking_menu")</a> </li>
-	<li><a href="index.action">$i18n.getString("home")</a></li>
-</ul>
-</div>

=== added file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/enrollment/beneficiarySearchResult.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/enrollment/beneficiarySearchResult.vm	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/enrollment/beneficiarySearchResult.vm	2012-05-23 13:55:43 +0000
@@ -0,0 +1,24 @@
+<h2>$i18n.getString( "search_result_for" ) $keyword</h2>
+	#if( $validated && $current )
+		<div class="header-box">
+			<h3 style="text-align: left;">$i18n.getString("successfully_saved")</h3>
+		</div>
+	#else	
+	
+	#end
+<p>
+<ul>
+#foreach( $patient in $patientList )
+	#set($fullName = $patient.getFirstName() + " " + $patient.getMiddleName() + " " + $patient.getLastName())
+	<li><a href="selectEnrollmentProgram.action?beneficiaryId=$patient.Id">$!encoder.htmlEncode( ${fullName} )</a></li>
+#end
+</ul>
+</p>
+
+<div id="footer">
+<h2>$i18n.getString( "navigate_to" )</h2>
+<ul>
+	<li><a href="showBeneficiarySearchingForm.action">$i18n.getString("beneficiary_search")</a></li>
+	<li><a href="index.action">$i18n.getString("home")</a></li>
+</ul>
+</div>
\ No newline at end of file

=== added file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/enrollment/beneficiarySearchingForm.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/enrollment/beneficiarySearchingForm.vm	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/enrollment/beneficiarySearchingForm.vm	2012-05-23 13:55:43 +0000
@@ -0,0 +1,37 @@
+<h2>$i18n.getString( "beneficiary_search" )</h2>
+
+	#if( $validated == true)
+		<div class="header-box">
+			<h3 style="text-align: left;">$i18n.getString("successfully_saved")</h3>
+		</div>
+	#else
+	
+	#end
+
+<form action="searchBeneficiary.action" method="POST">
+<div class="header-box" align="center">
+<input type="hidden" name="orgUnitId" value="$orgUnitId"/>	
+	<p style="text-align: left;">
+		<label>$i18n.getString( "beneficiary_name" )</label>
+		#if( $validationMap.get( "fullName" ) )
+           	<br /><span style="color: #990000;"> $i18n.getString($validationMap.get( "fullName" ))</span>
+     	#end
+		<input type="text" name="keyword" value="$!previousValues.get("fullName")" />
+	</p>
+</div>
+
+<div class="header-box" align="center">
+	<p>
+		<input type="submit" style="width: 100%;" value="$i18n.getString("search")" />
+	</p>
+</div>
+
+</form>
+
+<div id="footer">
+<h2>$i18n.getString( "navigate_to" )</h2>
+<ul>
+	<li><a href="trackingMenu.action"> $i18n.getString("tracking_menu")</a> </li>
+	<li><a href="index.action">$i18n.getString("home")</a></li>
+</ul>
+</div>

=== added file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/enrollment/enrollmentProgramList.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/enrollment/enrollmentProgramList.vm	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/enrollment/enrollmentProgramList.vm	2012-05-23 13:55:43 +0000
@@ -0,0 +1,32 @@
+<h2>$i18n.getString( "enrolled_programs" ) for $patient.firstName $patient.middleName $patient.lastName</h2>
+	#if( $validated)
+		<div class="header-box">
+			<h3 style="text-align: left;">$i18n.getString("successfully_saved")</h3>
+		</div>
+	#else	
+	
+	#end
+<p>
+<ul>
+#foreach( $program in $enrolledProgramList )
+	<li>$program.getName()</li>
+#end
+</ul>
+</p>
+
+<h2>$i18n.getString( "other_programs" )</h2>
+<p>
+<ul>
+#foreach( $program in $programList )
+	<li><a href="showProgramEnrollmentForm.action?beneficiaryId=$patient.Id&programId=$program.Id">$program.getName()</a></li>
+#end
+</ul>
+</p>
+
+<div id="footer">
+<h2>$i18n.getString( "navigate_to" )</h2>
+<ul>
+	<li><a href="showBeneficiarySearchingForm.action">$i18n.getString("beneficiary_search")</a></li>
+	<li><a href="index.action">$i18n.getString("home")</a></li>
+</ul>
+</div>
\ No newline at end of file

=== added file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/enrollment/programEnrollmentForm.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/enrollment/programEnrollmentForm.vm	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/enrollment/programEnrollmentForm.vm	2012-05-23 13:55:43 +0000
@@ -0,0 +1,35 @@
+<h2>$i18n.getString( "enroll" ) $patient.getFullName() to $program.getName()</h2>
+<form action="saveMobileProgramEnrollment.action" method="POST">
+<div class="header-box" align="center">
+<input type="hidden" name="beneficiaryId" value="$beneficiaryId"/>	
+<input type="hidden" name="programId" value="$programId"/>	
+	<p style="text-align: left;">
+		<label>$i18n.getString( "enrollment_date" ) [yyyy-MM-dd] </label>
+		#if( $validationMap.get( "enrollmentDate" ) )
+           	<br /><span style="color: #990000;"> $i18n.getString($validationMap.get( "enrollmentDate" ))</span>
+     	#end
+		<input type="text" name="enrollmentDate" value="$!previousValues.get("enrollmentDate")" />
+
+		<label>$i18n.getString( "incident_date" ) [yyyy-MM-dd] </label>
+		#if( $validationMap.get( "incidentDate" ) )
+           	<br /><span style="color: #990000;"> $i18n.getString($validationMap.get( "incidentDate" ))</span>
+     	#end
+		<input type="text" name="incidentDate" value="$!previousValues.get("incidentDate")" />
+	</p>
+</div>
+
+<div class="header-box" align="center">
+	<p>
+		<input type="submit" style="width: 100%;" value="$i18n.getString("enroll")" />
+	</p>
+</div>
+
+</form>
+
+<div id="footer">
+<h2>$i18n.getString( "navigate_to" )</h2>
+<ul>
+	<li> <a href="selectEnrollmentProgram.action?beneficiaryId=$beneficiaryId"> $i18n.getString("program_list")</a> </li>
+	<li><a href="index.action">$i18n.getString("home")</a></li>
+</ul>
+</div>

=== added file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/enrollment/selectEnrollmentOrganisationUnits.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/enrollment/selectEnrollmentOrganisationUnits.vm	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/enrollment/selectEnrollmentOrganisationUnits.vm	2012-05-23 13:55:43 +0000
@@ -0,0 +1,15 @@
+r<h2>$i18n.getString( "select_organisation_unit" )</h2>
+<p>
+<ul>
+#foreach( $organisationUnit in $organisationUnits )
+	<li><a href="selectEnrollmentProgram.action?orgUnitId=$organisationUnit.id">$!encoder.htmlEncode( ${organisationUnit.name} )</a></li>
+#end
+</ul>
+</p>
+
+<div id="footer">
+<h2>$i18n.getString( "navigate_to" )</h2>
+<ul>
+	<li><a href="index.action">$i18n.getString("home")</a></li>
+</ul>
+</div>
\ No newline at end of file

=== removed file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/enrollmentProgramList.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/enrollmentProgramList.vm	2012-04-20 02:32:43 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/enrollmentProgramList.vm	1970-01-01 00:00:00 +0000
@@ -1,32 +0,0 @@
-<h2>$i18n.getString( "enrolled_programs" ) for $patient.firstName $patient.middleName $patient.lastName</h2>
-	#if( $validated)
-		<div class="header-box">
-			<h3 style="text-align: left;">$i18n.getString("successfully_saved")</h3>
-		</div>
-	#else	
-	
-	#end
-<p>
-<ul>
-#foreach( $program in $enrolledProgramList )
-	<li>$program.getName()</li>
-#end
-</ul>
-</p>
-
-<h2>$i18n.getString( "other_programs" )</h2>
-<p>
-<ul>
-#foreach( $program in $programList )
-	<li><a href="showProgramEnrollmentForm.action?beneficiaryId=$patient.Id&programId=$program.Id">$program.getName()</a></li>
-#end
-</ul>
-</p>
-
-<div id="footer">
-<h2>$i18n.getString( "navigate_to" )</h2>
-<ul>
-	<li><a href="showBeneficiarySearchingForm.action">$i18n.getString("beneficiary_search")</a></li>
-	<li><a href="index.action">$i18n.getString("home")</a></li>
-</ul>
-</div>
\ No newline at end of file

=== added file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/beneficiaryDetail.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/beneficiaryDetail.vm	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/beneficiaryDetail.vm	2012-05-23 13:55:43 +0000
@@ -0,0 +1,24 @@
+<h2>$i18n.getString("details_for") $!encoder.htmlEncode( ${patient.getFullName()} )   </h2>
+<p>
+
+<ul>
+	<li><strong>$i18n.getString("id"):</strong>  $patient.id</li>
+	<li><b>$i18n.getString("gender"):</b>  #if ($patient.gender == "F") Female #else Male #end</li>
+	#set($day = $patient.birthDate.date)
+	#set($month = $patient.birthDate.month+1)
+	#set($year = $patient.birthDate.year + 1900)
+	<li><b>$i18n.getString("date_of_birth"):</b>  $year - $month - $day </li>			
+	<li><b>$i18n.getString("blood_group"):</b>  $patient.bloodGroup</li>
+</ul>
+
+<p>
+<div id="footer">
+<h2>$i18n.getString( "navigate_to" )</h2>
+<ul>
+	#if($organisationUnitId == "0")
+		<li><a href="showPatientProgramList.action?patientId=$patient.id">$!encoder.htmlEncode( ${patient.getFullName()} )</a></li>
+	#else
+		<li><a href="selectActivity.action?organisationUnitId=$organisationUnitId&beneficiaryId=$patient.id&current=$current"> $i18n.getString("activity_list")</a></li>
+	#end
+	<li><a href="index.action">$i18n.getString("home")</a></li>
+</ul>
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/beneficiaryProgramList.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/beneficiaryProgramList.vm	2012-05-15 07:40:06 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/beneficiaryProgramList.vm	2012-05-23 13:55:43 +0000
@@ -8,7 +8,7 @@
 <ul>
 #foreach( $programInstance in $programInstances )
 	<li>
-		<a href="showPatientProgramStageList.action?patientId=$patientId&programInstanceId=$programInstance.getId()&programId=$programInstance.getProgram().getId()">
+		<a href="showPatientProgramStageList.action?patientId=$patientId&programInstanceId=$programInstance.getId()&programId=$programInstance.getProgram().getId()&validated=false">
 			 $programInstance.getProgram().getName()
 		</a> 
 	</li>

=== added file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/programStageForm.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/programStageForm.vm	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/programStageForm.vm	2012-05-23 13:55:43 +0000
@@ -0,0 +1,112 @@
+<h2>$encoder.htmlEncode( $programStage.name )</h2>
+
+#set( $typeViolationsSize = $typeViolations.size() )
+
+#if( $typeViolationsSize > 0 )
+<div class="header-box" align="center">
+	<h3 style="text-align: left; background-color: #990000; color: white;">$i18n.getString("warnings_and_errors")</h3>
+	<p style="text-align: left;">
+		$typeViolationsSize $i18n.getString("type_violation_errors"). <br />
+	</p>
+</div>	
+#end
+
+<form action="saveProgramStageForm.action" method="POST">
+
+<input type="hidden" value=$programInstanceId name="programInstanceId"/>
+<input type="hidden" value=$programStageInstanceId name="programStageInstanceId"/>
+<input type="hidden" value=$programStageId name="programStageId"/>
+<input type="hidden" value=$orgUnitId name="orgUnitId"/>
+<input type="hidden" value=$programId name="programId" />
+<input type="hidden" value=$beneficiaryId name="beneficiaryId" />
+<input type="hidden" id="current" name="current" value=$current />
+
+<div class="header-box" align="center">
+	<p style="text-align: left;">
+		#foreach( $dataElement in $dataElements)
+			#if( $dataElement.shortName )
+				#set( $dataElementName = $dataElement.shortName )
+			#else
+				#set( $dataElementName = $dataElement.name )
+			#end
+				#if (! $dataElement.getOptionSet())			
+					#set( $categoryOptionCombo = $dataElement.getCategoryOptionCombos().getModels().get( 0 ) )
+					#set( $key = "DE${dataElement.id}" )
+
+					<label>$encoder.htmlEncode( $dataElementName ) #if( $categoryOptionCombo.name!="(default)")$encoder.htmlEncode( $categoryOptionCombo.name )#end 
+					#if($dataElement.type=="date") [yyyy-MM-dd] #end
+					</label>
+					
+					#if( $typeViolations.get( $key ) )
+                		#set( $typeViolation = $typeViolations.get( $key ) )
+            			<br /><span style="color: #990000;">$prevDataValues.get($key) $i18n.getString($typeViolation)</span>
+            		#end
+					
+					<input type=
+					#if($dataElement.type=="string") 
+						"text"
+					#elseif ($dataElement.type=="int" ) 
+						"text" 
+					#else 
+						"$dataElement.type" 
+					#end 
+					name="$key" value="$!prevDataValues.get($key)" />
+				
+				#elseif ($dataElement.getOptionSet())
+					
+					#set( $options = $dataElement.getOptionSet().getOptions() )
+					#set( $key = "DE${dataElement.id}" )
+
+					$dataElementName
+
+					#if( $typeViolations.get( $key ) )
+                    	#set( $typeViolation = $typeViolations.get( $key ) )
+                		<br /><span style="color: #990000;"> $prevDataValues.get($key) $i18n.getString($typeViolation)</span>
+                	#end
+                
+					<select type=
+					#if($dataElement.type=="string") 
+						"text"
+					#elseif($dataElement.type=="int" ) 
+						"text"
+					#else 
+						"$dataElement.type"
+					#end 
+					name="$key" />
+				
+					#set( $selected=false )
+
+					#foreach ($option in $options)
+						<option value="$option"
+						#if( $prevDataValues.get( $key ) == $option ) 
+							selected
+							#set( $selected=true )
+						#end
+						> $option </option>
+					#end
+
+					#if( !$selected ) 
+						<option selected > $i18n.getString("select_option") </option>
+					#end
+					
+					</select>
+				#end
+		#end
+	</p>
+</div>
+
+<div class="header-box" align="center">
+	<p>
+		<input type="submit" style="width: 100%;" value="$i18n.getString("save")" />
+	</p>
+</div>
+
+</form>
+
+<div id="footer">
+<h2>$i18n.getString( "navigate_to" )</h2>
+<ul>
+	<li><a href="trackingMenu.action"> $i18n.getString("tracking_menu")</a></li>
+	<li><a href="index.action">$i18n.getString("home")</a></li>
+</ul>
+</div>

=== added file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/selectActivity.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/selectActivity.vm	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/selectActivity.vm	2012-05-23 13:55:43 +0000
@@ -0,0 +1,25 @@
+<h2>$i18n.getString( "activity_list" )</h2>
+<p>
+	<ul>
+		<li>
+			<a href="showBeneficiaryDetail.action?organisationUnitId=$organisationUnitId&beneficiaryId=$beneficiaryId&current=$current"> $i18n.getString( "details" ) </a>
+		</li> 
+	</ul>
+<ul>
+#foreach( $activity in $activities )
+	<li>
+		<a href="showProgramStageForm.action?orgUnitId=$organisationUnitId&programStageId=$activity.getTask().getProgramStageId()&programId=$activity.getTask().getProgramId()&programStageInstanceId=$activity.task.id&current=$current&beneficiaryId=$beneficiaryId">
+			 $util.getProgramStage($activity.getTask().getProgramId(), $activity.getTask().getProgramStageId()).getName()
+		</a> 
+	</li>
+#end
+</ul>
+</p>
+
+<div id="footer">
+<h2>$i18n.getString( "navigate_to" )</h2>
+<ul>
+	<li><a href="selectBeneficiary.action?organisationUnitId=$organisationUnitId&current=$current">$i18n.getString("beneficiary_list")</a></li>
+	<li><a href="index.action">$i18n.getString("home")</a></li>
+</ul>
+</div>
\ No newline at end of file

=== added file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/selectActivityType.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/selectActivityType.vm	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/selectActivityType.vm	2012-05-23 13:55:43 +0000
@@ -0,0 +1,16 @@
+<h2>$i18n.getString( "activity_type" )</h2>
+<p>
+<ul>
+	<li><a href="selectBeneficiary.action?organisationUnitId=$organisationUnitId&current=true&validated=false">$i18n.getString( "current_activityplan" )</a></li>
+	<li><a href="selectBeneficiary.action?organisationUnitId=$organisationUnitId&current=false&validated=false">$i18n.getString( "all_activityplan" )</a></li>
+	<li><a href="selectSingleEvent.action?organisationUnitId=$organisationUnitId">$i18n.getString( "single_event" )</a></li>
+</ul>
+</p>
+
+<div id="footer">
+<h2>$i18n.getString( "navigate_to" )</h2>
+<ul>
+	<li><a href="selectNamebasedOrganisationUnit.action">$i18n.getString("organisation_unit")</a></li>
+	<li><a href="index.action">$i18n.getString("home")</a></li>
+</ul>
+</div>
\ No newline at end of file

=== added file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/selectNamebasedOrganisationUnits.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/selectNamebasedOrganisationUnits.vm	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/selectNamebasedOrganisationUnits.vm	2012-05-23 13:55:43 +0000
@@ -0,0 +1,15 @@
+<h2>$i18n.getString( "select_organisation_unit" )</h2>
+<p>
+<ul>
+#foreach( $organisationUnit in $organisationUnits )
+	<li><a href="selectActivityType.action?orgUnitId=$organisationUnit.id">$!encoder.htmlEncode( ${organisationUnit.name} )</a></li>
+#end
+</ul>
+</p>
+
+<div id="footer">
+<h2>$i18n.getString( "navigate_to" )</h2>
+<ul>
+	<li><a href="index.action">$i18n.getString("home")</a></li>
+</ul>
+</div>

=== removed file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/programEnrollmentForm.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/programEnrollmentForm.vm	2012-04-20 02:32:43 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/programEnrollmentForm.vm	1970-01-01 00:00:00 +0000
@@ -1,35 +0,0 @@
-<h2>$i18n.getString( "enroll" ) $patient.getFullName() to $program.getName()</h2>
-<form action="saveMobileProgramEnrollment.action" method="POST">
-<div class="header-box" align="center">
-<input type="hidden" name="beneficiaryId" value="$beneficiaryId"/>	
-<input type="hidden" name="programId" value="$programId"/>	
-	<p style="text-align: left;">
-		<label>$i18n.getString( "enrollment_date" ) [yyyy-MM-dd] </label>
-		#if( $validationMap.get( "enrollmentDate" ) )
-           	<br /><span style="color: #990000;"> $i18n.getString($validationMap.get( "enrollmentDate" ))</span>
-     	#end
-		<input type="text" name="enrollmentDate" value="$!previousValues.get("enrollmentDate")" />
-
-		<label>$i18n.getString( "incident_date" ) [yyyy-MM-dd] </label>
-		#if( $validationMap.get( "incidentDate" ) )
-           	<br /><span style="color: #990000;"> $i18n.getString($validationMap.get( "incidentDate" ))</span>
-     	#end
-		<input type="text" name="incidentDate" value="$!previousValues.get("incidentDate")" />
-	</p>
-</div>
-
-<div class="header-box" align="center">
-	<p>
-		<input type="submit" style="width: 100%;" value="$i18n.getString("enroll")" />
-	</p>
-</div>
-
-</form>
-
-<div id="footer">
-<h2>$i18n.getString( "navigate_to" )</h2>
-<ul>
-	<li> <a href="selectEnrollmentProgram.action?beneficiaryId=$beneficiaryId"> $i18n.getString("program_list")</a> </li>
-	<li><a href="index.action">$i18n.getString("home")</a></li>
-</ul>
-</div>

=== removed file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/programStageForm.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/programStageForm.vm	2012-05-16 09:33:38 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/programStageForm.vm	1970-01-01 00:00:00 +0000
@@ -1,112 +0,0 @@
-<h2>$encoder.htmlEncode( $programStage.name )</h2>
-
-#set( $typeViolationsSize = $typeViolations.size() )
-
-#if( $typeViolationsSize > 0 )
-<div class="header-box" align="center">
-	<h3 style="text-align: left; background-color: #990000; color: white;">$i18n.getString("warnings_and_errors")</h3>
-	<p style="text-align: left;">
-		$typeViolationsSize $i18n.getString("type_violation_errors"). <br />
-	</p>
-</div>	
-#end
-
-<form action="saveProgramStageForm.action" method="POST">
-
-<input type="hidden" value=$programInstanceId name="programInstanceId"/>
-<input type="hidden" value=$programStageInstanceId name="programStageInstanceId"/>
-<input type="hidden" value=$programStageId name="programStageId"/>
-<input type="hidden" value=$orgUnitId name="orgUnitId"/>
-<input type="hidden" value=$programId name="programId" />
-<input type="hidden" value=$beneficiaryId name="beneficiaryId" />
-<input type="hidden" id="current" name="current" value=$current />
-
-<div class="header-box" align="center">
-	<p style="text-align: left;">
-		#foreach( $dataElement in $dataElements)
-			#if( $dataElement.shortName )
-				#set( $dataElementName = $dataElement.shortName )
-			#else
-				#set( $dataElementName = $dataElement.name )
-			#end
-				#if (! $dataElement.getOptionSet())			
-					#set( $categoryOptionCombo = $dataElement.getCategoryOptionCombos().getModels().get( 0 ) )
-					#set( $key = "DE${dataElement.id}" )
-
-					<label>$encoder.htmlEncode( $dataElementName ) #if( $categoryOptionCombo.name!="(default)")$encoder.htmlEncode( $categoryOptionCombo.name )#end 
-					#if($dataElement.type=="date") [yyyy-MM-dd] #end
-					</label>
-					
-					#if( $typeViolations.get( $key ) )
-                		#set( $typeViolation = $typeViolations.get( $key ) )
-            			<br /><span style="color: #990000;">$prevDataValues.get($key) $i18n.getString($typeViolation)</span>
-            		#end
-					
-					<input type=
-					#if($dataElement.type=="string") 
-						"text"
-					#elseif ($dataElement.type=="int" ) 
-						"text" 
-					#else 
-						"$dataElement.type" 
-					#end 
-					name="$key" value="$!prevDataValues.get($key)" />
-				
-				#elseif ($dataElement.getOptionSet())
-					
-					#set( $options = $dataElement.getOptionSet().getOptions() )
-					#set( $key = "DE${dataElement.id}" )
-
-					$dataElementName
-
-					#if( $typeViolations.get( $key ) )
-                    	#set( $typeViolation = $typeViolations.get( $key ) )
-                		<br /><span style="color: #990000;"> $prevDataValues.get($key) $i18n.getString($typeViolation)</span>
-                	#end
-                
-					<select type=
-					#if($dataElement.type=="string") 
-						"text"
-					#elseif($dataElement.type=="int" ) 
-						"text"
-					#else 
-						"$dataElement.type"
-					#end 
-					name="$key" />
-				
-					#set( $selected=false )
-
-					#foreach ($option in $options)
-						<option value="$option"
-						#if( $prevDataValues.get( $key ) == $option ) 
-							selected
-							#set( $selected=true )
-						#end
-						> $option </option>
-					#end
-
-					#if( !$selected ) 
-						<option selected > $i18n.getString("select_option") </option>
-					#end
-					
-					</select>
-				#end
-		#end
-	</p>
-</div>
-
-<div class="header-box" align="center">
-	<p>
-		<input type="submit" style="width: 100%;" value="$i18n.getString("save")" />
-	</p>
-</div>
-
-</form>
-
-<div id="footer">
-<h2>$i18n.getString( "navigate_to" )</h2>
-<ul>
-	<li><a href="trackingMenu.action"> $i18n.getString("tracking_menu")</a></li>
-	<li><a href="index.action">$i18n.getString("home")</a></li>
-</ul>
-</div>

=== added file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/registration/beneficiaryRegistrationForm.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/registration/beneficiaryRegistrationForm.vm	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/registration/beneficiaryRegistrationForm.vm	2012-05-23 13:55:43 +0000
@@ -0,0 +1,77 @@
+<h2>$i18n.getString( "beneficiary_registration" )</h2>
+
+	#if( $validated )
+		<div class="header-box">
+			<h3 style="text-align: left;">$i18n.getString("successfully_saved")</h3>
+		</div>
+	#else
+	
+	#end
+
+<form action="saveBeneficiary.action" method="POST">
+<div class="header-box" align="center">
+<input type="hidden" name="orgUnitId" value="$orgUnitId"/>	
+	<p style="text-align: left;">
+		<label>$i18n.getString( "full_name" )</label>
+		#if( $validationMap.get( "fullName" ) )
+           	<br /><span style="color: #990000;"> $i18n.getString($validationMap.get( "fullName" ))</span>
+     	#end
+		<input type="text" name="patientFullName" value="$!previousValues.get("fullName")" />
+		
+		<label>$i18n.getString( "gender" )</label>
+		<select name="gender">
+			<option value="M"
+			#if($previousValues.get("gender") == "M")
+				selected
+			#end
+			>$i18n.getString( "male" )</option>
+			
+			<option value="F"
+			#if($previousValues.get("gender") == "F")
+				selected
+			#end
+			>$i18n.getString( "female" )</option>
+			
+			<option value="T"
+			#if($previousValues.get("gender") == "T")
+				selected
+			#end
+			>$i18n.getString( "transgender" )</option>
+		</select>
+		
+		<label>$i18n.getString( "date_of_birth" ) [yyyy-MM-dd] </label>
+		#if( $validationMap.get( "dob" ) )
+           	<br /><span style="color: #990000;"> $i18n.getString($validationMap.get( "dob" ))</span>
+     	#end
+		<input type="text" name="dateOfBirth" value="$!previousValues.get("dob")" />
+		
+		<label>$i18n.getString( "blood_group" )</label>
+		<select name="bloodGroup">
+			<option value="">[Please select]</option>
+			#set($bloodGroups = ["A+", "A-", "AB+", "AB-", "B+", "B-", "O+", "O-"])
+			#foreach($item in $bloodGroups) 
+			<option value="$item"
+			#if($previousValues.get("bloodGroup") == $item)
+				selected
+			#end
+			>$item</option>
+			#end
+		</select>
+	</p>
+</div>
+
+<div class="header-box" align="center">
+	<p>
+		<input type="submit" style="width: 100%;" value="$i18n.getString("save")" />
+	</p>
+</div>
+
+</form>
+
+<div id="footer">
+<h2>$i18n.getString( "navigate_to" )</h2>
+<ul>
+	<li> <a href="selectRegistrationOrganisationUnit.action"> $i18n.getString("organisation_unit")</a> </li>
+	<li><a href="index.action">$i18n.getString("home")</a></li>
+</ul>
+</div>

=== added file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/registration/selectRegistrationOrganisationUnits.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/registration/selectRegistrationOrganisationUnits.vm	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/registration/selectRegistrationOrganisationUnits.vm	2012-05-23 13:55:43 +0000
@@ -0,0 +1,15 @@
+<h2>$i18n.getString( "select_organisation_unit" )</h2>
+<p>
+<ul>
+#foreach( $organisationUnit in $organisationUnits )
+	<li><a href="registerBeneficiary.action?orgUnitId=$organisationUnit.id">$!encoder.htmlEncode( ${organisationUnit.name} )</a></li>
+#end
+</ul>
+</p>
+
+<div id="footer">
+<h2>$i18n.getString( "navigate_to" )</h2>
+<ul>
+	<li><a href="index.action">$i18n.getString("home")</a></li>
+</ul>
+</div>

=== removed file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/selectActivity.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/selectActivity.vm	2012-04-13 03:30:35 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/selectActivity.vm	1970-01-01 00:00:00 +0000
@@ -1,25 +0,0 @@
-<h2>$i18n.getString( "activity_list" )</h2>
-<p>
-	<ul>
-		<li>
-			<a href="showBeneficiaryDetail.action?organisationUnitId=$organisationUnitId&beneficiaryId=$beneficiaryId&current=$current"> $i18n.getString( "details" ) </a>
-		</li> 
-	</ul>
-<ul>
-#foreach( $activity in $activities )
-	<li>
-		<a href="showProgramStageForm.action?orgUnitId=$organisationUnitId&programStageId=$activity.getTask().getProgramStageId()&programId=$activity.getTask().getProgramId()&programStageInstanceId=$activity.task.id&current=$current&beneficiaryId=$beneficiaryId">
-			 $util.getProgramStage($activity.getTask().getProgramId(), $activity.getTask().getProgramStageId()).getName()
-		</a> 
-	</li>
-#end
-</ul>
-</p>
-
-<div id="footer">
-<h2>$i18n.getString( "navigate_to" )</h2>
-<ul>
-	<li><a href="selectBeneficiary.action?organisationUnitId=$organisationUnitId&current=$current">$i18n.getString("beneficiary_list")</a></li>
-	<li><a href="index.action">$i18n.getString("home")</a></li>
-</ul>
-</div>
\ No newline at end of file

=== removed file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/selectActivityType.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/selectActivityType.vm	2012-05-03 09:53:40 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/selectActivityType.vm	1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-<h2>$i18n.getString( "activity_type" )</h2>
-<p>
-<ul>
-	<li><a href="selectBeneficiary.action?organisationUnitId=$organisationUnitId&current=true&validated=false">$i18n.getString( "current_activityplan" )</a></li>
-	<li><a href="selectBeneficiary.action?organisationUnitId=$organisationUnitId&current=false&validated=false">$i18n.getString( "all_activityplan" )</a></li>
-	<li><a href="selectSingleEvent.action?organisationUnitId=$organisationUnitId">$i18n.getString( "single_event" )</a></li>
-</ul>
-</p>
-
-<div id="footer">
-<h2>$i18n.getString( "navigate_to" )</h2>
-<ul>
-	<li><a href="selectNamebasedOrganisationUnit.action">$i18n.getString("organisation_unit")</a></li>
-	<li><a href="index.action">$i18n.getString("home")</a></li>
-</ul>
-</div>
\ No newline at end of file

=== removed file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/selectEnrollmentOrganisationUnits.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/selectEnrollmentOrganisationUnits.vm	2012-04-13 03:30:35 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/selectEnrollmentOrganisationUnits.vm	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-r<h2>$i18n.getString( "select_organisation_unit" )</h2>
-<p>
-<ul>
-#foreach( $organisationUnit in $organisationUnits )
-	<li><a href="selectEnrollmentProgram.action?orgUnitId=$organisationUnit.id">$!encoder.htmlEncode( ${organisationUnit.name} )</a></li>
-#end
-</ul>
-</p>
-
-<div id="footer">
-<h2>$i18n.getString( "navigate_to" )</h2>
-<ul>
-	<li><a href="index.action">$i18n.getString("home")</a></li>
-</ul>
-</div>
\ No newline at end of file

=== removed file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/selectNamebasedOrganisationUnits.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/selectNamebasedOrganisationUnits.vm	2012-04-10 06:49:47 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/selectNamebasedOrganisationUnits.vm	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-<h2>$i18n.getString( "select_organisation_unit" )</h2>
-<p>
-<ul>
-#foreach( $organisationUnit in $organisationUnits )
-	<li><a href="selectActivityType.action?orgUnitId=$organisationUnit.id">$!encoder.htmlEncode( ${organisationUnit.name} )</a></li>
-#end
-</ul>
-</p>
-
-<div id="footer">
-<h2>$i18n.getString( "navigate_to" )</h2>
-<ul>
-	<li><a href="index.action">$i18n.getString("home")</a></li>
-</ul>
-</div>

=== removed file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/selectRegistrationOrganisationUnits.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/selectRegistrationOrganisationUnits.vm	2012-04-10 06:49:47 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/selectRegistrationOrganisationUnits.vm	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-<h2>$i18n.getString( "select_organisation_unit" )</h2>
-<p>
-<ul>
-#foreach( $organisationUnit in $organisationUnits )
-	<li><a href="registerBeneficiary.action?orgUnitId=$organisationUnit.id">$!encoder.htmlEncode( ${organisationUnit.name} )</a></li>
-#end
-</ul>
-</p>
-
-<div id="footer">
-<h2>$i18n.getString( "navigate_to" )</h2>
-<ul>
-	<li><a href="index.action">$i18n.getString("home")</a></li>
-</ul>
-</div>

=== removed file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/selectSingleEvent.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/selectSingleEvent.vm	2012-05-03 09:53:40 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/selectSingleEvent.vm	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-<h2>$i18n.getString( "single_event_list" )</h2>
-<ul>
-#foreach( $singleEvent in $singleEventList )
-	<li>
-		<a href="selectSingleEventBeneficiary.action?organisationUnitId=$organisationUnitId&programId=$singleEvent.getId()">
-			 $singleEvent.getName()
-		</a> 
-	</li>
-#end
-</ul>
-</p>
-
-<div id="footer">
-<h2>$i18n.getString( "navigate_to" )</h2>
-<ul>
-	<li><a href="selectActivityType.action?orgUnitId=$organisationUnitId">$i18n.getString("activity_type")</a></li>
-	<li><a href="index.action">$i18n.getString("home")</a></li>
-</ul>
-</div>
\ No newline at end of file

=== removed file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/selectSingleEventBeneficiary.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/selectSingleEventBeneficiary.vm	2012-05-03 09:53:40 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/selectSingleEventBeneficiary.vm	1970-01-01 00:00:00 +0000
@@ -1,23 +0,0 @@
-<h2>$i18n.getString( "beneficiary_list" )</h2>
-	#if( $validated)
-		<div class="header-box">
-			<h3 style="text-align: left;">$i18n.getString("successfully_saved")</h3>
-		</div>
-	#else	
-	
-	#end
-<p>
-<ul>
-#foreach( $patient in $singleEventBeneficiaryList )
-	<li><a href="showSingleEventForm.action?organisationUnitId=$organisationUnitId&beneficiaryId=$patient.id&programId=$programId">$!encoder.htmlEncode( ${patient.getFullName()} )</a></li>
-#end
-</ul>
-</p>
-
-<div id="footer">
-<h2>$i18n.getString( "navigate_to" )</h2>
-<ul>
-	<li><a href="selectSingleEvent.action?organisationUnitId=$organisationUnitId">$i18n.getString("single_event_list")</a></li>
-	<li><a href="index.action">$i18n.getString("home")</a></li>
-</ul>
-</div>
\ No newline at end of file

=== removed file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/singleEventForm.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/singleEventForm.vm	2012-05-03 09:53:40 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/singleEventForm.vm	1970-01-01 00:00:00 +0000
@@ -1,48 +0,0 @@
-<h2>Single Event: $eventName</h2>
-
-<form method="post" action="saveSingleEvent.action">
-	<div class="header-box" align="center">
-		<p style="text-align: left;">
-		
-		#set( $i = 0 )
-		#foreach( $element in $programStageDataElements )
-
-				<label>$element.getDataElement().getName() #if($element.getDataElement().getType() == "date") (yyyy-mm-dd) #end</label>
-				#set( $key = $element.getDataElement().getId() + '' )
-				#if($typeViolations.get($key))
-					#set( $typeViolation = $typeViolations.get($key) )
-					<label style="color:red;"> $i18n.getString($typeViolation) </label> 
-				#end
-
-				#if ($element.getDataElement().getType() == "bool")
-					<br />
-			    	<select name="dynForm">
-					<option value="please_select">$i18n.getString("please_select")</option>
-					<option value="true" #if($dynForm.isEmpty() == false) #if($!dynForm.get($i) == "true") selected="selected" #end #end >$i18n.getString("Yes")</option>
-					<option value="false" #if($dynForm.isEmpty() == false) #if($!dynForm.get($i) == "false") selected="selected" #end #end >$i18n.getString("No")</option>
-					</select>
-					<br />
-				#elseif ($element.getDataElement().getType() == "date")
-					<input type="date" maxlength="255" size="24" name="dynForm" value="#if($dynForm.isEmpty() == false)$!dynForm.get($i)#end" />
-				#else
-					<input type="text" maxlength="255" size="24" name="dynForm" value="#if($dynForm.isEmpty() == false)$!dynForm.get($i)#end" />
-				#end
-				#set( $i = $i + 1)
-		#end
-		
-		<input type="hidden" name="organisationUnitId" value="$organisationUnitId" />
-		<input type="hidden" name="programId" value="$programId" />
-		<input type="hidden" name="beneficiaryId" value="$beneficiaryId" />
-
-		<input type="submit" value=$i18n.getString("Submit") />
-	    </p>
-	</div>
-</form>
-
-<div id="footer">
-<h2>$i18n.getString( "navigate_to" )</h2>
-<ul>
-	<li><a href="selectSingleEventBeneficiary.action?organisationUnitId=$organisationUnitId&programId=$programId">$i18n.getString("beneficiary_list")</a></li>
-	<li><a href="index.action">$i18n.getString("home")</a></li>
-</ul>
-</div>

=== added file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/singleevent/selectSingleEvent.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/singleevent/selectSingleEvent.vm	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/singleevent/selectSingleEvent.vm	2012-05-23 13:55:43 +0000
@@ -0,0 +1,19 @@
+<h2>$i18n.getString( "single_event_list" )</h2>
+<ul>
+#foreach( $singleEvent in $singleEventList )
+	<li>
+		<a href="selectSingleEventBeneficiary.action?organisationUnitId=$organisationUnitId&programId=$singleEvent.getId()">
+			 $singleEvent.getName()
+		</a> 
+	</li>
+#end
+</ul>
+</p>
+
+<div id="footer">
+<h2>$i18n.getString( "navigate_to" )</h2>
+<ul>
+	<li><a href="selectActivityType.action?orgUnitId=$organisationUnitId">$i18n.getString("activity_type")</a></li>
+	<li><a href="index.action">$i18n.getString("home")</a></li>
+</ul>
+</div>
\ No newline at end of file

=== added file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/singleevent/selectSingleEventBeneficiary.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/singleevent/selectSingleEventBeneficiary.vm	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/singleevent/selectSingleEventBeneficiary.vm	2012-05-23 13:55:43 +0000
@@ -0,0 +1,23 @@
+<h2>$i18n.getString( "beneficiary_list" )</h2>
+	#if( $validated)
+		<div class="header-box">
+			<h3 style="text-align: left;">$i18n.getString("successfully_saved")</h3>
+		</div>
+	#else	
+	
+	#end
+<p>
+<ul>
+#foreach( $patient in $singleEventBeneficiaryList )
+	<li><a href="showSingleEventForm.action?organisationUnitId=$organisationUnitId&beneficiaryId=$patient.id&programId=$programId">$!encoder.htmlEncode( ${patient.getFullName()} )</a></li>
+#end
+</ul>
+</p>
+
+<div id="footer">
+<h2>$i18n.getString( "navigate_to" )</h2>
+<ul>
+	<li><a href="selectSingleEvent.action?organisationUnitId=$organisationUnitId">$i18n.getString("single_event_list")</a></li>
+	<li><a href="index.action">$i18n.getString("home")</a></li>
+</ul>
+</div>
\ No newline at end of file

=== added file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/singleevent/singleEventForm.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/singleevent/singleEventForm.vm	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/singleevent/singleEventForm.vm	2012-05-23 13:55:43 +0000
@@ -0,0 +1,48 @@
+<h2>Single Event: $eventName</h2>
+
+<form method="post" action="saveSingleEvent.action">
+	<div class="header-box" align="center">
+		<p style="text-align: left;">
+		
+		#set( $i = 0 )
+		#foreach( $element in $programStageDataElements )
+
+				<label>$element.getDataElement().getName() #if($element.getDataElement().getType() == "date") (yyyy-mm-dd) #end</label>
+				#set( $key = $element.getDataElement().getId() + '' )
+				#if($typeViolations.get($key))
+					#set( $typeViolation = $typeViolations.get($key) )
+					<label style="color:red;"> $i18n.getString($typeViolation) </label> 
+				#end
+
+				#if ($element.getDataElement().getType() == "bool")
+					<br />
+			    	<select name="dynForm">
+					<option value="please_select">$i18n.getString("please_select")</option>
+					<option value="true" #if($dynForm.isEmpty() == false) #if($!dynForm.get($i) == "true") selected="selected" #end #end >$i18n.getString("Yes")</option>
+					<option value="false" #if($dynForm.isEmpty() == false) #if($!dynForm.get($i) == "false") selected="selected" #end #end >$i18n.getString("No")</option>
+					</select>
+					<br />
+				#elseif ($element.getDataElement().getType() == "date")
+					<input type="date" maxlength="255" size="24" name="dynForm" value="#if($dynForm.isEmpty() == false)$!dynForm.get($i)#end" />
+				#else
+					<input type="text" maxlength="255" size="24" name="dynForm" value="#if($dynForm.isEmpty() == false)$!dynForm.get($i)#end" />
+				#end
+				#set( $i = $i + 1)
+		#end
+		
+		<input type="hidden" name="organisationUnitId" value="$organisationUnitId" />
+		<input type="hidden" name="programId" value="$programId" />
+		<input type="hidden" name="beneficiaryId" value="$beneficiaryId" />
+
+		<input type="submit" value=$i18n.getString("Submit") />
+	    </p>
+	</div>
+</form>
+
+<div id="footer">
+<h2>$i18n.getString( "navigate_to" )</h2>
+<ul>
+	<li><a href="selectSingleEventBeneficiary.action?organisationUnitId=$organisationUnitId&programId=$programId">$i18n.getString("beneficiary_list")</a></li>
+	<li><a href="index.action">$i18n.getString("home")</a></li>
+</ul>
+</div>

=== modified file 'local/in/dhis-mobile/J2ME/HP/CHC/CHCForm1/nbproject/build-impl.xml'
--- local/in/dhis-mobile/J2ME/HP/CHC/CHCForm1/nbproject/build-impl.xml	2012-05-23 06:15:36 +0000
+++ local/in/dhis-mobile/J2ME/HP/CHC/CHCForm1/nbproject/build-impl.xml	2012-05-23 13:55:43 +0000
@@ -180,6 +180,46 @@
             </and>
         </condition>
     </target>
+    <!--ricoh-init-->
+    <target name="ricoh-pre-init" if="cdc-platform.trigger">
+        <condition property="ricoh-platform.trigger">
+            <equals arg1="ricoh" arg2="${platform.type}" casesensitive="false"/>
+        </condition>
+    </target>
+    <target name="ricoh-init" depends="ricoh-pre-init" if="ricoh-platform.trigger">
+        <available property="jcifs" classname="jcifs.smb.SmbFile" classpath="${libs.RicohAntTools.classpath}"/>
+        <condition property="no.vendor.name" value="true">
+            <equals arg1="${application.vendor}" arg2="" trim="true"/>
+        </condition>
+        <condition property="ricoh.dalp.install.mode" value="auto" else="manual">
+            <istrue value="${ricoh.dalp.install.mode.auto}"/>
+        </condition>
+        <condition property="ricoh.dalp.display-mode.type" value="COLOR" else="MONO">
+            <istrue value="${ricoh.dalp.display-mode.color}"/>
+        </condition>
+        <property name="xml.dir" value="${build.dir}/dalp"/>
+        <property name="xlet.dalp" value="${application.name}.dalp"/>
+        <property name="xlet.dalp.name-only" value="${application.name}.dalp"/>
+        <property name="deploy.dir" value="${dist.dir}/deploy"/>
+        <property name="rideploy.zip" value="${dist.dir}/${application.name}.zip"/>
+        <property name="ricoh.dalp.is-managed" value="true"/>
+        <property name="ricoh.dalp.information.is-icon-used" value="true"/>
+        <property name="ricoh.platform.target.version" value="2.0"/>
+        <property name="ricoh.dalp.version" value="${deployment.number}"/>
+        <property name="ricoh.dalp.application-desc.visible" value="true"/>
+        <property name="ricoh.dalp.install.destination" value="hdd"/>
+        <property name="ricoh.dalp.install.work-dir" value="hdd"/>
+        <property name="ricoh.dalp.information.abbreviation" value="RICOH"/>
+        <taskdef name="taskIf" classname="ricoh.ant.ConditionalTask" classpath="${libs.ricoh-ant-utils.classpath}"/>
+        <taskdef name="dalp" classname="org.netbeans.modules.j2me.cdc.project.ricoh.DalpBuilder" classpath="${libs.ricoh-ant-utils.classpath}"/>
+        <property name="dalp.dist" value="${build.dir}/dalp/${application.name}.dalp"/>
+        <property name="deployment.dir" location="${dist.dir}"/>
+        <patternset id="deployment.patternset">
+            <include name="${dist.jar}"/>
+            <include name="${application.name}.dalp"/>
+            <include name="lib/*"/>
+        </patternset>
+    </target>
     <!--semc-init-->
     <target name="semc-pre-init" if="cdc-platform.trigger">
         <condition property="semc-platform.trigger">
@@ -294,10 +334,22 @@
             <include name="${dist.jar}"/>
         </patternset>
     </target>
+    <!--nsicom-init-->
+    <target name="nsicom-pre-init" if="cdc-platform.trigger">
+        <condition property="nsicom-platform.trigger">
+            <equals arg1="nsicom" arg2="${platform.type}" casesensitive="false"/>
+        </condition>
+    </target>
+    <target name="nsicom-init" depends="nsicom-pre-init" if="nsicom-platform.trigger">
+        <property name="deployment.dir" location="${dist.dir}"/>
+        <patternset id="deployment.patternset">
+            <include name="${dist.jar}"/>
+        </patternset>
+    </target>
     <!--init-->
     <target name="pre-init"/>
     <target name="post-init"/>
-    <target name="init" depends="pre-init,load-properties,basic-init,cldc-init,cdc-init,semc-init,savaje-init,sjmc-init,ojec-init,cdc-hi-init,nokiaS80-init,post-init"/>
+    <target name="init" depends="pre-init,load-properties,basic-init,cldc-init,cdc-init,ricoh-init,semc-init,savaje-init,sjmc-init,ojec-init,cdc-hi-init,nokiaS80-init,nsicom-init,post-init"/>
     <!--conditional clean-->
     <target name="conditional-clean-init">
         <uptodate property="no.clean.before.build" targetfile="${build.dir}/.timestamp">
@@ -611,6 +663,14 @@
             <fileset dir="${buildsystem.baton}"/>
         </jar>
     </target>
+    <!--nsicom-create-manifest-->
+    <target name="nsicom-create-manifest" if="nsicom-platform.trigger">
+        <jar jarfile="${dist.dir}/${dist.jar}" compress="${jar.compress}" update="true">
+            <manifest>
+                <attribute name="Main-Class" value="${main.class}"/>
+            </manifest>
+        </jar>
+    </target>
     <!--do-jar-no-manifest-->
     <target name="do-jar-no-manifest" unless="manifest.available">
         <dirname file="${dist.dir}/${dist.jar}" property="dist.jar.dir"/>
@@ -626,6 +686,79 @@
     <target name="sign-jar" if="sign.jar.trigger">
         <signjar jar="${dist.dir}/${dist.jar}" alias="${sign.alias}" keystore="${sign.keystore}" storepass="${sign.keystore.password}" keypass="${sign.alias.password}"/>
     </target>
+    <!--ricoh-init-dalp-->
+    <target name="ricoh-init-dalp" if="ricoh-platform.trigger">
+        <property name="ricoh.application.telephone" value=""/>
+        <property name="ricoh.application.fax" value=""/>
+        <property name="ricoh.application.email" value=""/>
+        <condition property="no.unmanaged.dalp">
+            <and>
+                <isfalse value="${ricoh.dalp.is-managed}"/>
+                <not>
+                    <available file="./${application.name}.dalp"/>
+                </not>
+            </and>
+        </condition>
+        <fail if="no.unmanaged.dalp" message="Dalp file ${application.name}.dalp is required in project directory when DALP management is set to off."/>
+        <condition property="no.vendor.name" value="true">
+            <equals arg1="${application.vendor}" arg2="" trim="true"/>
+        </condition>
+        <condition property="ricoh.icon.invalid" value="true">
+            <or>
+                <contains string="${ricoh.application.icon}" substring="$${"/>
+                <equals arg1="${ricoh.application.icon}" arg2="" trim="true"/>
+            </or>
+        </condition>
+        <mkdir dir="${dist.dir}/lib"/>
+    </target>
+    <!--ricoh-add-app-icon-->
+    <target name="ricoh-add-app-icon" depends="ricoh-init-dalp" if="ricoh-platform.trigger" unless="ricoh.icon.invalid">
+        <pathconvert property="icon.name" pathsep=" ">
+            <path path="${ricoh.application.icon}"/>
+            <chainedmapper>
+                <flattenmapper/>
+                <globmapper from="*" to="*"/>
+            </chainedmapper>
+        </pathconvert>
+        <jar jarfile="${dist.jar}" compress="${jar.compress}" update="true">
+            <fileset file="${ricoh.application.icon}"/>
+        </jar>
+    </target>
+    <!--ricoh-build-dalp-with-icon-->
+    <target name="ricoh-build-dalp-with-icon" depends="ricoh-add-app-icon" if="ricoh-platform.trigger" unless="ricoh.icon.invalid">
+        <mkdir dir="${build.dir}/dalp/"/>
+        <taskIf if="ricoh.dalp.is-managed" value="true">
+            <dalp file="${dalp.dist}" iconname="${icon.name}">
+                <fileset dir="${dist.dir}/lib"/>
+            </dalp>
+            <echo message="Managed dalp file ${dalp.dist} created w/ icon"/>
+        </taskIf>
+        <taskIf if="ricoh.dalp.is-managed" value="false">
+            <copy tofile="${dalp.dist}">
+                <fileset file="./${application.name}.dalp"/>
+            </copy>
+            <echo message="Non-managed dalp file ${dalp.dist} w/ icon imported"/>
+        </taskIf>
+    </target>
+    <!--ricoh-build-dalp-without-icon-->
+    <target name="ricoh-build-dalp-without-icon" if="ricoh.icon.invalid">
+        <mkdir dir="${build.dir}/dalp/"/>
+        <taskIf if="ricoh.dalp.is-managed" value="true">
+            <dalp file="${dalp.dist}">
+                <fileset dir="${dist.dir}/lib"/>
+            </dalp>
+            <echo message="Managed dalp file ${dalp.dist} created w/o icon"/>
+        </taskIf>
+        <taskIf if="ricoh.dalp.is-managed" value="false">
+            <copy tofile="${dalp.dist}">
+                <fileset file="./${application.name}.dalp"/>
+            </copy>
+            <echo message="Non-managed dalp file ${dalp.dist} w/o icon imported"/>
+        </taskIf>
+    </target>
+    <target name="ricoh-build-dalp" depends="ricoh-build-dalp-with-icon,ricoh-build-dalp-without-icon" if="ricoh-platform.trigger">
+        <copy todir="${dist.dir}" file="${dalp.dist}" overwrite="true"/>
+    </target>
     <!--savaje-build-jnlp-->
     <target name="savaje-prepare-icon" if="savaje-platform.trigger" unless="savaje.icon.invalid">
         <pathconvert property="savaje.application.icon.name" pathsep=" ">
@@ -659,7 +792,7 @@
     <!--jar-->
     <target name="pre-jar"/>
     <target name="post-jar"/>
-    <target name="jar" depends="preverify,pre-jar,set-password,create-jad,do-extra-libs,nokiaS80-create-manifest,jad-jsr211-properties,semc-build-j9,do-jar,do-jar-no-manifest,update-jad,sign-jar,savaje-build-jnlp,post-jar" description="Build jar and application descriptor."/>
+    <target name="jar" depends="preverify,pre-jar,set-password,create-jad,do-extra-libs,nokiaS80-create-manifest,jad-jsr211-properties,semc-build-j9,do-jar,nsicom-create-manifest,do-jar-no-manifest,update-jad,sign-jar,ricoh-build-dalp,savaje-build-jnlp,post-jar" description="Build jar and application descriptor."/>
     <!--override-jad-->
     <target name="override-jad" if="override.jarurl.trigger">
         <property name="deployment.jarurl" value="${dist.jar}"/>
@@ -781,6 +914,19 @@
     <target name="cldc-run" if="cldc-platform.trigger">
         <nb-run jadfile="${dist.dir}/${dist.jad}" jarfile="${dist.dir}/${dist.jar}" jadurl="${dist.jad.url}" device="${platform.device}" platformhome="${platform.home}" platformtype="${platform.type}" execmethod="${run.method}" securitydomain="${evaluated.run.security.domain}" commandline="${platform.runcommandline}" classpath="${platform.bootclasspath}:${dist.dir}/${dist.jar}" cmdoptions="${run.cmd.options}"/>
     </target>
+    <!--ricoh-run-->
+    <target name="ricoh-run" if="ricoh-platform.trigger">
+        <copy todir="${platform.home}/mnt/sd3/sdk/dsdk/dist/${ricoh.application.uid}" overwrite="true">
+            <fileset dir="${dist.dir}">
+                <patternset refid="deployment.patternset"/>
+            </fileset>
+            <flattenmapper/>
+        </copy>
+        <ant antfile="${platform.home}/startemulator.xml" target="start_emulator" dir="${platform.home}">
+            <property name="emulator.skin" value="WVGA.xml"/>
+            <property name="emulator.autolaunchid" value="${ricoh.application.uid}"/>
+        </ant>
+    </target>
     <!--semc-run-and-debug-prepare-targets-->
     <target name="semc-icon-assembly" if="semc-platform.trigger" unless="semc.icon.invalid">
         <copy file="${semc.application.icon}" tofile="${platform.home}/epoc32/release/winscw/udeb/z/Resource/Apps/${semc.application.uid}.mbm" failonerror="false"/>
@@ -851,6 +997,14 @@
             </fileset>
         </nokiaexec>
     </target>
+    <!--nsicom-run-->
+    <target name="nsicom-run" if="nsicom-platform.trigger">
+        <nsicomExecDeploy home="${platform.home}" mainclass="${main.class}" args="${application.args}" jvmargs="${run.jvmargs}" device="${platform.device}" profile="${platform.profile}" xlet="${main.class.xlet}" applet="${main.class.applet}" verbose="${nsicom.application.runverbose}" hostip="${nsicom.application.monitorhost}" runondevice="${nsicom.application.runremote}" remotevmlocation="${nsicom.remotevm.location}" remoteDataLocation="${nsicom.remoteapp.location}">
+            <fileset dir="${dist.dir}">
+                <exclude name="javadoc/**"/>
+            </fileset>
+        </nsicomExecDeploy>
+    </target>
     <!--cdc-hi-run-->
     <target name="-pre-cdc-hi-run" if="cdc-hi-platform.trigger"/>
     <target name="-cdc-hi-run" if="cdc-hi-platform.trigger">
@@ -887,8 +1041,8 @@
     </target>
     <!--run-->
     <target name="pre-run"/>
-    <target name="run" depends="jar,pre-run,open-netmon,cldc-run,semc-run,savaje-run,sjmc-run,ojec-run,nokiaS80-run,cdc-hi-run,open-profiler" description="Run MIDlet suite."/>
-    <target name="run-no-build" depends="init,pre-run,open-netmon,cldc-run,semc-run,savaje-run,sjmc-run,ojec-run,nokiaS80-run,cdc-hi-run,open-profiler" description="Quick Run already built MIDlet suite."/>
+    <target name="run" depends="jar,pre-run,open-netmon,cldc-run,ricoh-run,semc-run,savaje-run,sjmc-run,ojec-run,nokiaS80-run,nsicom-run,cdc-hi-run,open-profiler" description="Run MIDlet suite."/>
+    <target name="run-no-build" depends="init,pre-run,open-netmon,cldc-run,ricoh-run,semc-run,savaje-run,sjmc-run,ojec-run,nokiaS80-run,nsicom-run,cdc-hi-run,open-profiler" description="Quick Run already built MIDlet suite."/>
     <!--cldc-debug-->
     <target name="cldc-debug" if="cldc-platform.trigger">
         <parallel>
@@ -899,6 +1053,27 @@
             </sequential>
         </parallel>
     </target>
+    <!--ricoh-debug-->
+    <target name="ricoh-debug" if="ricoh-platform.trigger">
+        <copy todir="${platform.home}/mnt/sd3/sdk/dsdk/dist/${ricoh.application.uid}" overwrite="true">
+            <fileset dir="${dist.dir}">
+                <patternset refid="deployment.patternset"/>
+            </fileset>
+            <flattenmapper/>
+        </copy>
+        <parallel>
+            <ant antfile="${platform.home}/startemulator_debug.xml" target="debug_emulator" dir="${platform.home}">
+                <property name="emulator.skin" value="WVGA.xml"/>
+                <property name="emulator.autolaunchid" value="${ricoh.application.uid}"/>
+            </ant>
+            <sequential>
+                <sleep seconds="5"/>
+                <property name="jpda.port" value="8000"/>
+                <property name="debug.period" value="3000"/>
+                <antcall target="nbdebug" inheritall="true" inheritrefs="true"/>
+            </sequential>
+        </parallel>
+    </target>
     <!--semc-debug-->
     <!--semc-build-j9-debug-->
     <target name="semc-build-j9-debug" if="semc-platform.trigger">
@@ -978,10 +1153,8 @@
                 <arg value="-Xrunjdwp:transport=dt_socket,address=${active.debug.port},server=y,suspend=y"/>
                 <arg value="-Xdebug"/>
             </exec>
-            <sequential>
-                <property name="debug.delay" value="500"/>
-                <nb-mobility-debug address="${active.debug.port}" name="${app.codename}" delay="${debug.delay}" timeout="${debug.timeout}" period="2000"/>
-            </sequential>
+            <property name="debug.delay" value="500"/>
+            <nb-mobility-debug address="${active.debug.port}" name="${app.codename}" delay="${debug.delay}" timeout="${debug.timeout}" period="2000"/>
         </parallel>
     </target>
     <target name="-post-cdc-hi-debug" if="cdc-hi-platform.trigger"/>
@@ -1004,12 +1177,16 @@
             </sequential>
         </parallel>
     </target>
+    <!--nsicom-debug-->
+    <target name="nsicom-debug" if="nsicom-platform.trigger">
+        <fail message="Debugging is not supported in this NSIcom VM version. Use monitoring facility instead!"/>
+    </target>
     <!--debug-->
     <target name="remove-timestamp">
         <delete file="$/.timestamp"/>
     </target>
     <target name="pre-debug"/>
-    <target name="debug" description="Debug project." depends="clean,jar,remove-timestamp,pre-debug,cldc-debug,semc-debug,savaje-debug,sjmc-debug,ojec-debug,cdc-hi-debug,nokiaS80-debug"/>
+    <target name="debug" description="Debug project." depends="clean,jar,remove-timestamp,pre-debug,cldc-debug,ricoh-debug,semc-debug,savaje-debug,sjmc-debug,ojec-debug,cdc-hi-debug,nokiaS80-debug,nsicom-debug"/>
     <target name="nbdebug" description="Start NetBeans debugger" if="netbeans.home">
         <property name="debug.delay" value="5000"/>
         <nb-mobility-debug address="${jpda.port}" name="${app.codename}" delay="${debug.delay}" timeout="${debug.timeout}" period="2000"/>
@@ -1098,6 +1275,12 @@
     <target name="clean-j9" if="j9.dist">
         <delete file="${j9.dist}"/>
     </target>
+    <target name="clean-ricoh" if="ricoh-platform.trigger">
+        <delete dir="${platform.home}/mnt/sd3/sdk/dsdk/dist/${ricoh.application.uid}"/>
+        <delete dir="${build.dir}/dalp"/>
+        <delete file="${dist.dir}/${application.name}.dalp"/>
+        <delete dir="${dist.dir}/lib"/>
+    </target>
     <target name="clean-semc" if="semc-platform.trigger">
         <delete dir="${dist.dir}" includes="*.sis,*.SIS"/>
         <delete dir="${platform.home}/epoc32/tools/ppro-custom-launcher/output/win32/PProLauncher${semc.application.uid}"/>
@@ -1176,7 +1359,7 @@
         <delete dir="build" quiet="true"/>
         <delete dir="dist" quiet="true"/>
     </target>
-    <target name="do-clean" depends="pre-clean,clean-timestamp,clean-preprocessed,clean-classes,clean-obfuscated,clean-preverified,clean-manifest,clean-jar,clean-jad,clean-javadoc,clean-j9,clean-semc,clean-savaje,clean-sjmc,clean-ojec,-clean-default-configuration-root,-clean-configuration-root,-clean-completely,post-clean"/>
+    <target name="do-clean" depends="pre-clean,clean-timestamp,clean-preprocessed,clean-classes,clean-obfuscated,clean-preverified,clean-manifest,clean-jar,clean-jad,clean-javadoc,clean-j9,clean-ricoh,clean-semc,clean-savaje,clean-sjmc,clean-ojec,-clean-default-configuration-root,-clean-configuration-root,-clean-completely,post-clean"/>
     <target name="clean" depends="conditional-clean" if="no.clean.before.build" description="Clean build products.">
         <antcall target="do-clean" inheritall="true" inheritrefs="true"/>
     </target>

=== modified file 'local/in/dhis-mobile/J2ME/HP/CHC/CHCForm1/nbproject/genfiles.properties'
--- local/in/dhis-mobile/J2ME/HP/CHC/CHCForm1/nbproject/genfiles.properties	2012-05-23 06:15:36 +0000
+++ local/in/dhis-mobile/J2ME/HP/CHC/CHCForm1/nbproject/genfiles.properties	2012-05-23 13:55:43 +0000
@@ -4,5 +4,5 @@
 build.xml.script.CRC32=55c34314
 build.xml.stylesheet.CRC32=9c6a911d
 nbproject/build-impl.xml.data.CRC32=8a21a39d
-nbproject/build-impl.xml.script.CRC32=3d3e9492
-nbproject/build-impl.xml.stylesheet.CRC32=e46c2d22
+nbproject/build-impl.xml.script.CRC32=0c41a481
+nbproject/build-impl.xml.stylesheet.CRC32=7a0aeb65

=== modified file 'local/in/dhis-mobile/J2ME/HP/CHC/CHCForm1/nbproject/private/private.properties'
--- local/in/dhis-mobile/J2ME/HP/CHC/CHCForm1/nbproject/private/private.properties	2012-05-23 06:15:36 +0000
+++ local/in/dhis-mobile/J2ME/HP/CHC/CHCForm1/nbproject/private/private.properties	2012-05-23 13:55:43 +0000
@@ -1,6 +1,6 @@
 #Wed, 02 May 2012 10:31:12 +0530
 #Sat Jun 26 20:02:35 IST 2010
-netbeans.user=C\:\\Users\\ARUNIMA\\.netbeans\\7.1
+netbeans.user=C:\\Users\\Long\\.netbeans\\7.0
 javadoc.preview=true
 config.active=
 deployment.counter=349