=== modified file 'dhis-2/dhis-services/dhis-service-options/src/main/resources/help_content.xml' --- dhis-2/dhis-services/dhis-service-options/src/main/resources/help_content.xml 2012-01-13 07:32:03 +0000 +++ dhis-2/dhis-services/dhis-service-options/src/main/resources/help_content.xml 2012-01-15 15:59:31 +0000 @@ -2614,9 +2614,9 @@ -
- Beneficiary data entry - Beneficiary data entry section provides a mechanism for inputting data in treatment stages for each beneficiary. +
+ Name-based data entry + Name-based data entry section provides a mechanism for inputting data in treatment stages for each beneficiary. To access the beneficiary data entry module, choose Services->Name-Based Data Records->Data Entry. To enter data, you will first have to select a facility for which beneficiaries belong to in order to enter data. Simply clicking the concerned facility from the facilities hierarchy displayed on the left side of the data entry screen. To open data entry form for a beneficiary, please do the steps as follows: @@ -2627,9 +2627,9 @@ 5. Enter a report data for this stage. The form is shown below. You will now enter data for the data entry form. The disabled data fields in data entry form are corresponding to these data elements belong to other stages.
-
- Multiple beneficiary data entry - Multiple beneficiary data entry section provides a mechanism for inputting data for treatment stages of beneficiaries. The benefits of this advanced function is to optimize the time-transition consuming when entering data for a long list beneficiaries by not switching the main window/interface. +
+ Multiple name-based data entry + Multiple name-based data entry section provides a mechanism for inputting data for treatment stages of beneficiaries. The benefits of this advanced function is to optimize the time-transition consuming when entering data for a long list beneficiaries by not switching the main window/interface. To access the multiple beneficiary data entry module, choose Services->Name-Based Data Records->Multiple Data Entry. To enter data, you will first have to select the facility for which beneficiaries belong to in order to enter data. Simply clicking the concerned facility from the facilities hierarchy displayed on the left side of the data entry screen. To open data entry form for a beneficiary with Multiple Data Entry function, please do the steps as follows: @@ -2638,9 +2638,9 @@ 3. Enter a report data in the form. The data entry form is shown. You will now enter data for the data entry form. The disabled data fields in data entry form are corresponding to these data elements belong to other stages.
-
- Report - Report section provides a mechanism for getting an overview of the services provided for a program. +
+ Program summary report + Program summary report section provides a mechanism for getting an overview of the services provided for a program. To access the report Management module, choose Services->Name-Based Data Records->Summary Report. The first, you have to select the facility where you want to report. Simply clicking on the concerned organisation unit from the facilities hierarchy displayed on the left side of the data entry screen. The second, select a program to report. Then enter a start date and an end date for which cases with report data should be included. The date picker widget may be used to select dates. === 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-01-15 14:53:46 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties 2012-01-15 15:59:31 +0000 @@ -5,8 +5,9 @@ completed_on=Completed On scheduled_for=Scheduled For list_all_patients=List all beneficiaries -summary_report=Summary Report +program_summary=Program Summary data_entry=Data Entry +name_based = Name-based reports=Reports data_entry_and_reports=Data Entry and Reports please_choose_a_valid_start_date=Please choose a valid start date @@ -71,11 +72,11 @@ registering_unit=Registering Unit select=Select name_based_data_entry_and_reports=Name based data entry and reports -report_management=Report management -name_based_data_entry=Name based data entry +program_summary_report=Program Summary Report +name_based_data_entry=Name-based data entry visit_plan=Visit Plans -intro_data_entry=Enter data for beneficiaries and their respective programs and program stages. -intro_summary_report=View the summary report to get an overview of the services provided for a program. +intro_name_based=Enter data for beneficiaries and their respective programs and program stages. +intro_program_summary=View the summary report to get an overview of the services provided for a program. intro_visit_plan=View the visit plan to get an overview of outstanding, pending and completed visits. use_default_form=Use default form use_custom_form=Use custom form @@ -261,7 +262,7 @@ aefi_vacine_type=AEFI Vacine Type case_aggregation_form=Beneficiary aggregation form dataset_list=Dataset List -multiple_data_entry=Multiple Data Entry +multiple_name_based=Multiple Name-based intro_case_aggregation=Generate routine data values from patient data by month (or other intervals if desired) and organisation unit. from=From to=To @@ -293,7 +294,7 @@ blood_group=Blood group some_data_element_not_exist=Some data elements don't exist. multiple_dataentry=Multiple Data Entry -intro_multiple_dataentry=Enter data for multiple program stages and beneficiaries for a program. The entry screen gives an overview of the stage status. +intro_multiple_name_based=Enter data for multiple program stages and beneficiaries for a program. The entry screen gives an overview of the stage status. in=In is_null=is null data_value=datavalue @@ -315,7 +316,7 @@ view_patient_chart=View Patient chart generate_patient_chart=Generate patient chart patient_chart_management=Patient Chart Management -intro_patient_registration=Create, modify and search for beneficiaries. Any type of data can be registered for a beneficiary by including attributes. +intro_patient=Create, modify and search for beneficiaries. Any type of data can be registered for a beneficiary by including attributes. registration=Registration select_relationship=Select Relationship please_select_a_representative=Please select a representing relationship @@ -355,7 +356,7 @@ add_new_patient=Register new beneficiary patient_identifier=Beneficiary Identifier system_identifier=System Generated Identifier -patient_registration_management=Beneficiary registration management +patient_management=Beneficiary management patient_duplicate=Beneficiary duplicate edit_this_patient=Edit profile of this beneficiary check_duplicate=Check duplicate @@ -410,7 +411,7 @@ specfiy_birth_date_or_age=Specfiy birth date or age update_this_patient=Update this beneficiary search_patients_by_attributes=Search beneficiaries by attributes -patient_registration=Beneficiary Registration +patient=Beneficiary confirm_delete_patient=Are you sure you want to delete the Beneficiary? specify_date_of_birth=Please specify a date of birth please_enter_a_valid_birth_date=Please enter a valid date of birth @@ -439,8 +440,8 @@ enter_new_encounter=Enter new encounter date_of_edit=Date of edit can_not_enrol_into_the_program_because=Could not enroll into the program because -event_registration=Event registration -intro_event_registration=Register anonymous events. The data to register is defined by a single event anonymous program. +anonymous_events=Anonymous Events +intro_anonymous_events=Register anonymous events. The data to register is defined by a single event anonymous program. create_new_event=Create new event delete_current_event = Deleted current event delete_current_event_success=Delete current event successfully @@ -463,4 +464,6 @@ leftSide = Left Side rightSide = Right Side in_range_due_date_plus_or_minus = In range Due date +/- -single_event_report = Single Event Report \ No newline at end of file +anonymous_event_reports = Anonymous Event Reports +intro_anonymous_event_reports = Create anonymous events report by reported date. +activity_planning = Activity Planning \ No newline at end of file === 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 2012-01-15 02:14:29 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml 2012-01-15 15:59:31 +0000 @@ -179,7 +179,7 @@ /main.vm /dhis-web-caseentry/visitPlan.vm - /dhis-web-caseentry/reportsMenu.vm + /dhis-web-caseentry/activityPlanningMenu.vm ../dhis-web-commons/ouwt/ouwt.js,javascript/visitPlan.js @@ -458,7 +458,7 @@ /main.vm /dhis-web-caseentry/anonymousRegistration.vm - /dhis-web-caseentry/registrationMenu.vm + /dhis-web-caseentry/dataEntryMenu.vm ../dhis-web-commons/ouwt/ouwt.js ,javascript/commons.js ,javascript/anonymousRegistration.js === added file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/activityPlanningMenu.vm' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/activityPlanningMenu.vm 1970-01-01 00:00:00 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/activityPlanningMenu.vm 2012-01-15 15:59:31 +0000 @@ -0,0 +1,5 @@ + +

$i18n.getString( "activity_planning" ) 

+ \ 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-01-15 02:14:29 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/anonymousRegistration.vm 2012-01-15 15:59:31 +0000 @@ -1,6 +1,6 @@ -

$i18n.getString( "event_registration" )

- - +

$i18n.getString( "anonymous_events" )

+ +
=== 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 2011-08-04 06:25:28 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryMenu.vm 2012-01-15 15:59:31 +0000 @@ -2,8 +2,9 @@

$i18n.getString( "data_entry" ) 


=== 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-01-15 02:14:29 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/index.vm 2012-01-15 15:59:31 +0000 @@ -2,12 +2,12 @@

$i18n.getString( "dhis-web-caseentry" )

    - #introListImgItem( "patient.action" "patient_registration" "patient" ) - #introListImgItem( "anonymousRegistration.action" "event_registration" "patient" ) - #introListImgItem( "dataEntrySelect.action" "data_entry" "dataentry" ) - #introListImgItem( "multipledataEntrySelect.action" "multiple_dataentry" "dataentry" ) - #introListImgItem( "reportSelect.action" "summary_report" "summaryreport" ) - #introListImgItem( "showSingleEventReportForm.action" "single_event_report" "summaryreport" ) + #introListImgItem( "patient.action" "patient" "patient" ) + #introListImgItem( "dataEntrySelect.action" "name_based" "dataentry" ) + #introListImgItem( "multipledataEntrySelect.action" "multiple_name_based" "dataentry" ) + #introListImgItem( "anonymousRegistration.action" "anonymous_events" "dataentry" ) + #introListImgItem( "reportSelect.action" "program_summary" "summaryreport" ) + #introListImgItem( "showSingleEventReportForm.action" "anonymous_event_reports" "summaryreport" ) #introListImgItem( "visitplan.action" "visit_plan" "visitplan" ) #introListImgItem( "caseAggregationForm.action" "case_aggregation" "caseaggregation" )
\ No newline at end of file === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/anonymousRegistration.js' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/anonymousRegistration.js 2012-01-15 02:14:29 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/anonymousRegistration.js 2012-01-15 15:59:31 +0000 @@ -8,7 +8,6 @@ disable('createEventBtn'); disable('deleteCurrentEventBtn'); - disable('showEventBtn'); $.postJSON( 'loadAnonymousPrograms.action',{} , function( json ) @@ -56,7 +55,6 @@ var programId = getFieldValue('programId'); if( programId == '' ) { - disable('showEventBtn'); $('#executionDate').unbind('change'); return; } @@ -69,7 +67,6 @@ }, function( json ) { - enable('showEventBtn'); setFieldValue( 'programStageId', json.programStages[0].id ); setFieldValue( 'selectedProgramId', programId ); $('#executionDate').bind('change'); === 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-01-15 02:14:29 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/menu.vm 2012-01-15 15:59:31 +0000 @@ -1,22 +1,25 @@

$i18n.getString( "registration" ) 

$i18n.getString( "data_entry" ) 

$i18n.getString( "reports" ) 

+ +

$i18n.getString( "activity_planning" ) 

+

$i18n.getString( "case_aggregation" ) 

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/multiDataEntrySelect.vm' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/multiDataEntrySelect.vm 2011-12-28 06:21:57 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/multiDataEntrySelect.vm 2012-01-15 15:59:31 +0000 @@ -1,4 +1,4 @@ -

$i18n.getString( "multiple_data_entry" ) #openHelp('multi_patient_entry_form')

+

$i18n.getString( "multiple_name_based" ) #openHelp('multi_name_based_data_entry')

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/registrationMenu.vm' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/registrationMenu.vm 2011-12-14 07:33:18 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/registrationMenu.vm 2012-01-15 15:59:31 +0000 @@ -2,8 +2,7 @@

$i18n.getString( "registration" ) 


=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportSelect.vm' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportSelect.vm 2011-12-21 02:54:41 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportSelect.vm 2012-01-15 15:59:31 +0000 @@ -6,7 +6,7 @@ }); -

$i18n.getString( "report_management" ) #openHelp('patient_summary_report')

+

$i18n.getString( "program_summary_report" ) #openHelp('program_summary_report')

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportsMenu.vm' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportsMenu.vm 2012-01-15 02:14:29 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportsMenu.vm 2012-01-15 15:59:31 +0000 @@ -1,9 +1,8 @@

$i18n.getString( "reports" ) 


=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/select.vm' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/select.vm 2012-01-11 08:34:43 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/select.vm 2012-01-15 15:59:31 +0000 @@ -1,4 +1,4 @@ -

$i18n.getString( "name_based_data_entry" ) #openHelp('single_patient_entry_form')

+

$i18n.getString( "name_based_data_entry" ) #openHelp('name_based_data_entry')

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/selectPatient.vm' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/selectPatient.vm 2011-10-06 09:06:31 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/selectPatient.vm 2012-01-15 15:59:31 +0000 @@ -1,6 +1,6 @@
-

$i18n.getString( "patient_registration_management" ) #openHelp( "patient" )

+

$i18n.getString( "patient_management" ) #openHelp( "patient" )

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/singleEventReportForm.vm' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/singleEventReportForm.vm 2012-01-15 02:14:29 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/singleEventReportForm.vm 2012-01-15 15:59:31 +0000 @@ -6,7 +6,7 @@ }); -

$i18n.getString( "single_event_report" )

+

$i18n.getString( "anonymous_event_reports" )