dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 15393
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2014-05-25 12:29:18 +0800
message:
  Remove the Single event without registration in DataEntry menu.
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addSingleEventRegistration.vm
  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/javascript/singleEvent.js
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/singleEventSelect.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/org/hisp/dhis/trackedentity/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/org/hisp/dhis/caseentry/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties	2014-04-17 16:00:32 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties	2014-05-25 04:29:18 +0000
@@ -357,7 +357,7 @@
 from_to=(from-to)
 add_and_continue = Add and continue
 tracking = Tracking
-program_tracking = Lost to follow-up
+program_tracking = Lost To Follow-Up
 intro_program_tracking = Support the work practices around tracking tracked entity instances within a health program that have not shown up for visits.
 sms_reminder_list = SMS reminder list
 tracked_entity_instance_did_not_register_a_phone_number = The tracked entity instance did not register a phone number

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addSingleEventRegistration.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addSingleEventRegistration.vm	2014-04-29 09:56:41 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addSingleEventRegistration.vm	2014-05-25 04:29:18 +0000
@@ -14,8 +14,8 @@
 	
 </script>
 
-<h3 id='entityInstanceMamagementLink'>
-	<a href="javascript:onClickBackBtn();">$i18n.getString( 'tracked_entity_instance_management' )</a>
+<h3>
+	<a href="javascript:onClickBackBtn();" id='entityInstanceMamagementLink'>$i18n.getString( 'tracked_entity_instance_management' )</a>
 	#if($!relatedProgram)
 		&#8226; <a href="javascript:showTrackedEntityInstanceDashboardForm('$!entityInstanceUid');">$i18n.getString( 'dashboard' )</a>
 	#end

=== 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	2014-04-06 18:03:57 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryMenu.vm	2014-05-25 04:29:18 +0000
@@ -4,9 +4,6 @@
 		#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/javascript/singleEvent.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/singleEvent.js	2014-04-30 12:57:22 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/singleEvent.js	2014-05-25 04:29:18 +0000
@@ -59,6 +59,7 @@
 			unSave = true;
 			showById('addNewDiv');
 			jQuery('#loaderDiv').hide();
+			setInnerHTML('entityInstanceMamagementLink', i18n_single_event_with_registration_management);
 		});
 }
 

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/singleEventSelect.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/singleEventSelect.vm	2014-04-30 12:57:22 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/singleEventSelect.vm	2014-05-25 04:29:18 +0000
@@ -162,7 +162,7 @@
 	var i18n_data_entry = '$encoder.jsEscape( $i18n.getString( "data_entry" ) , "'")';
 	var i18n_next = '$encoder.jsEscape( $i18n.getString( "yes" ) , "'")';
 	var i18n_no = '$encoder.jsEscape( $i18n.getString( "no" ) , "'")';
-
+	var i18n_single_event_with_registration_management = '$encoder.jsEscape( $i18n.getString( "single_event_with_registration_management" ) , "'")';
 	datePickerValid( 'executionDateNewEvent', true );
 	
 	//  0: no search anything

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/org/hisp/dhis/trackedentity/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/org/hisp/dhis/trackedentity/i18n_module.properties	2014-05-17 12:04:42 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/org/hisp/dhis/trackedentity/i18n_module.properties	2014-05-25 04:29:18 +0000
@@ -316,7 +316,7 @@
 sort_by = Sort by
 block_entry_form_after_completed = Block entry form after completed
 select_operator_number_of_visits_for_this_condition = Please select operator number of visit for this condition
-add_tracked_entity_registration_form = Add tracked entity form
+design_tracked_entity_registration_form = Design tracked entity form
 intro_tracked_entity_form = Create custom tracked entity data capture forms with tracked entity attributes.
 tracked_entity_registration_form_management = Tracked entity form management
 properties = Properties
@@ -494,4 +494,5 @@
 in = in
 whole_system = Whole system
 orgunit = Organisation unit
-program_within_orgunit = Program within organisation unit
\ No newline at end of file
+program_within_orgunit = Program within organisation unit
+auto_save_registration_forms = Auto save registration form 
\ No newline at end of file