← Back to team overview

dhis2-devs team mailing list archive

  1. dhis2-devs team
  2. Mailing list archive
  3. Message #20777

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 9652: Add authorities for single event with registation and anonymous progam entry form.

  Thread Previous • Date Previous • • Thread Next 
------------------------------------------------------------
revno: 9652
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2013-01-29 22:19:42 +0700
message:
  Add authorities for single event with registation and anonymous progam entry form.
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryMenu.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/index.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/menu.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties


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

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

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml	2013-01-24 04:15:05 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml	2013-01-29 15:19:42 +0000
@@ -123,7 +123,7 @@
 				,javascript/entry.js
 				,../dhis-web-commons/javascripts/date.js</param>
 			<param name="stylesheets">style/style.css</param>
-			<param name="requiredAuthorities">F_NAME_BASED_DATA_ENTRY</param>
+			<param name="requiredAuthorities">F_ANONYMOUS_DATA_ENTRY</param>
 		</action>
 
 		<action name="anonymousPrograms"
@@ -288,7 +288,7 @@
 				,../dhis-web-commons/javascripts/date.js
 			</param>
 			<param name="stylesheets">style/style.css</param>
-			<param name="requiredAuthorities">F_NAME_BASED_DATA_ENTRY</param>
+			<param name="requiredAuthorities">F_SINGLE_EVENT_DATA_ENTRY</param>
 		</action>
 
 		<action name="singleEventPrograms"

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryMenu.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryMenu.vm	2012-12-10 12:54:54 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryMenu.vm	2013-01-29 15:19:42 +0000
@@ -1,9 +1,15 @@
 <a href="index.action"><h2>$i18n.getString( "data_entry" )&nbsp;</h2></a>
 <div id="dataEntryMenu">
 	<ul>
-		<li><a href="multipledataEntrySelect.action">$i18n.getString( "multiple_individual_records" )&nbsp;</a></li>
-		<li><a href="singleEventSelect.action">$i18n.getString( "single_event_with_registration" )</a></li>
-		<li><a href="anonymousRegistration.action">$i18n.getString( "anonymous_events" )</a></li>
+		#if( $auth.hasAccess( "dhis-web-caseentry", "multipledataEntrySelect" ) )
+			<li><a href="multipledataEntrySelect.action">$i18n.getString( "multiple_individual_records" )&nbsp;</a></li>
+		#end
+		#if( $auth.hasAccess( "dhis-web-caseentry", "singleEventSelect" ) )
+			<li><a href="singleEventSelect.action">$i18n.getString( "single_event_with_registration" )</a></li>
+		#end
+		#if( $auth.hasAccess( "dhis-web-caseentry", "anonymousRegistration" ) )
+			<li><a href="anonymousRegistration.action">$i18n.getString( "anonymous_events" )</a></li>
+		#end
 	</ul>
 
 	<br>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/index.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/index.vm	2012-12-14 17:07:44 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/index.vm	2013-01-29 15:19:42 +0000
@@ -15,7 +15,11 @@
 		
 	#if( $auth.hasAccess( "dhis-web-caseentry", "multipledataEntrySelect" ) )
 		#introListImgItem( "multipledataEntrySelect.action" "multiple_individual_records" "attribute" )
+	#end
+	#if( $auth.hasAccess( "dhis-web-caseentry", "singleEventSelect" ) )
 		#introListImgItem( "singleEventSelect.action" "single_event_with_registration" "attribute" )
+	#end
+	#if( $auth.hasAccess( "dhis-web-caseentry", "anonymousRegistration" ) )
 		#introListImgItem( "anonymousRegistration.action" "anonymous_events" "attribute" )
 	#end
 	

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/menu.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/menu.vm	2012-12-14 17:07:44 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/menu.vm	2013-01-29 15:19:42 +0000
@@ -17,15 +17,22 @@
 		<li><a href="smsReminderSelect.action">$i18n.getString( "program_tracking" )</a></li>     
 	#end
 </ul>
-
-#if( $auth.hasAccess( "dhis-web-caseentry", "multipledataEntrySelect" ) )
+#if( $auth.hasAccess( "dhis-web-caseentry", "multipledataEntrySelect" ) 
+	|| $auth.hasAccess( "dhis-web-caseentry", "singleEventSelect" ) 
+	|| $auth.hasAccess( "dhis-web-caseentry", "anonymousRegistration" ) )
 <h2>$i18n.getString( "data_entry" )&nbsp;</h2>
+#end
 <ul>
-	<li><a href="multipledataEntrySelect.action">$i18n.getString( "multiple_individual_records" )&nbsp;</a></li>
-	<li><a href="singleEventSelect.action">$i18n.getString( "single_event_with_registration" )</a></li>
-	<li><a href="anonymousRegistration.action">$i18n.getString( "anonymous_events" )</a></li>
+	#if( $auth.hasAccess( "dhis-web-caseentry", "multipledataEntrySelect" ) )
+		<li><a href="multipledataEntrySelect.action">$i18n.getString( "multiple_individual_records" )&nbsp;</a></li>
+	#end
+	#if( $auth.hasAccess( "dhis-web-caseentry", "singleEventSelect" ) )
+		<li><a href="singleEventSelect.action">$i18n.getString( "single_event_with_registration" )</a></li>
+	#end
+	#if( $auth.hasAccess( "dhis-web-caseentry", "anonymousRegistration" ) )
+		<li><a href="anonymousRegistration.action">$i18n.getString( "anonymous_events" )</a></li>
+	#end
 </ul>
-#end
 
 #if( $auth.hasAccess( "dhis-web-caseentry", "reportSelect" ) 
 	|| $auth.hasAccess( "dhis-web-caseentry", "generateTabularReport" ) )	

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties	2013-01-22 15:07:52 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties	2013-01-29 15:19:42 +0000
@@ -179,7 +179,9 @@
 F_PATIENT_AGGREGATION = Person Aggregation
 F_GENERATE_PATIENT_CHART = Generate Person Chart
 F_PATIENT_MANAGEMENT = Person Management
-F_NAME_BASED_DATA_ENTRY = Name-Based Data Entry
+F_NAME_BASED_DATA_ENTRY = Multiple Individual Data Entry
+F_SINGLE_EVENT_DATA_ENTRY = Single Event With Registration Data Entry
+F_ANONYMOUS_DATA_ENTRY = Single Event Without Registration Data Entry
 F_PROGRAM_ENROLLMENT = Program Enrollment
 F_PROGRAM_UNENROLLMENT = Program Un-Enrollment
 F_PROGRAM_STAGE_INSTANCE_DELETE = Delete Person Visit
  Thread Previous • Date Previous • • Thread Next