dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 7928
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2012-08-17 19:39:05 +0700
message:
  Don't show advanced search div in single event program.
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/anonymousRegistration.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/searchPatientCriteria.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/singleEventSelect.vm


--
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	2012-08-17 07:24:13 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties	2012-08-17 12:39:05 +0000
@@ -412,8 +412,9 @@
 overdue = Overdue
 scheduled_in_future = Scheduled in future
 sent_message_success = Sent message successfully
-please_select_program_stage = Please select program stage
 send_sms_to_list = Send SMS to list
 post_comment = Post comment
 comments = Comments
-no_sms_service_available = No Sms service available
\ No newline at end of file
+no_sms_service_available = No Sms service available
+due_date_from_to = Due date (from-to)
+please_select_status = Please select status
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/anonymousRegistration.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/anonymousRegistration.vm	2012-08-07 05:43:56 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/anonymousRegistration.vm	2012-08-17 12:39:05 +0000
@@ -21,7 +21,7 @@
 
 <select multiple id='compulsoryDE' name='compulsoryDE' class='hidden'></select>
 
-<div id='advanced-search'>
+<div>
 	<div id='selectDiv'>
 		<table>		
 			<tr>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/searchPatientCriteria.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/searchPatientCriteria.vm	2012-08-17 09:17:56 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/searchPatientCriteria.vm	2012-08-17 12:39:05 +0000
@@ -29,7 +29,7 @@
 <div id='advanced-search' class='hidden'>
 	<table id='advancedSearchTB'>	
 		<thead>
-		<tr id='programStageAddPatientTR'>
+		<tr id='programStageAddPatientTR' class='hidden'>
 			<td>
 				<select id='programStageAddPatient' name='programStageAddPatient' onchange='enableRadioButton();'>
 					<option value=''>[$i18n.getString('')]</option>

=== 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	2012-08-16 16:31:03 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/singleEventSelect.vm	2012-08-17 12:39:05 +0000
@@ -8,7 +8,7 @@
 			}
 		});
 		disable('advancedSearchBtn');
-	});	
+	});
 </script>
 
 <h3>$i18n.getString( "single_event_with_registration" ) #openHelp('single_event_with_registration')</h3>
@@ -86,7 +86,7 @@
 	var i18n_representative_info = '$encoder.jsEscape( $i18n.getString( "representative_info" ) , "'")';
 	var i18n_select = '[' + '$encoder.jsEscape( $i18n.getString( "select" ), "'")' + ']';
 	var i18n_program_stages_history_plan = '$encoder.jsEscape( $i18n.getString( "program_stages_history_plan" ) , "'")';
-	
+	var i18n_please_select_program_stage = '$encoder.jsEscape( $i18n.getString( "please_select_program_stage" ) , "'")';
 	var i18n_value_must_integer = '$encoder.jsEscape( $i18n.getString( "value_must_integer" ) , "'")';
 	var i18n_value_must_number = '$encoder.jsEscape( $i18n.getString( "value_must_number" ) , "'")';
 	var i18n_value_must_positive_integer = '$encoder.jsEscape( $i18n.getString( "value_must_positive_integer" ) , "'")';