dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #14224
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 4751: Consistent add/update form with the rest of the system (Patient module).
------------------------------------------------------------
revno: 4751
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2011-09-29 11:17:34 +0700
message:
Consistent add/update form with the rest of the system (Patient module).
modified:
dhis-2/dhis-services/dhis-service-options/src/main/resources/help_content.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addCaseAggregation.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientAttributeForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientAttributeGroupForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientChartForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientIdentifierTypeForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramAttributeForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramStageForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addRelationshipTypeForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addValidationCriteria.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/caseAggregation.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/relationship.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/listPatientIdentifierType.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/orgunitRegistration.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientAttribute.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientAttributeGroup.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programAttributeList.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programList.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programValidationList.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/showAddCaseAggregationForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateCaseAggregation.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateMultiProgramValidationForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updatePatientAttibuteForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updatePatientAttibuteGroupForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updatePatientChartForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updatePatientIdentifierType.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramAttributeForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramStageForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateRelationshipTypeForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateSingleProgramValidationForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateValidationCriteria.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-services/dhis-service-options/src/main/resources/help_content.xml'
--- dhis-2/dhis-services/dhis-service-options/src/main/resources/help_content.xml 2011-09-14 06:36:13 +0000
+++ dhis-2/dhis-services/dhis-service-options/src/main/resources/help_content.xml 2011-09-29 04:17:34 +0000
@@ -2498,25 +2498,25 @@
<para>To define a new beneficiary attribute, click the "Add new" button. Fill all fields with red asterisk, and click "Add" button.</para>
</section>
<section id="patient_attribute_group">
- <title>Beneficiary Attribute Group</title>
+ <title>Beneficiary attribute group</title>
<para>Beneficiary attribute group section provides a mechanism for classifying beneficiary attributes. For instance, two attributes "Register person Phone number" and "Register person Address" might be grouped together into a beneficiary attribute group "Details of Registered person".</para>
<para>To access the beneficiary attribute group maintenance module, choose Maintenance->Beneficiaries and Programs->Beneficiary Attribute Group.</para>
<para>To define a new attribute group, click the "Add new" button. Fill in the "Name" and "Description" fields and then select attributes that should belong to the group from the left panel. Click the "Move selected items" button to add the selected attributes to the attribute group. Click the "Remove selected items" button to remove attributes from the group that have been selected in the right panel. Finally, click the "Add" button to save changes, or the "Cancel" button to discard any changes.</para>
</section>
<section id="patient_identifier_type">
- <title>Beneficiary Identifier Type</title>
+ <title>Beneficiary identifier type</title>
<para>Beneficiary identifier type section provides a mechanism for defining identifiers associated with the registration of a beneficiary, such as Passport number, PAN, driving license, driving license, health identifier and so on.</para>
<para>To access the beneficiary identifier type maintenance module, choose Maintenance->Beneficiaries and Programs->Beneficiary Identifier Type.</para>
<para>To define a new identifier type, click the "Add new" button. Fill all fields with red asterisk, and click "Add" button.</para>
</section>
<section id="relationship_type">
- <title>Relationship Type</title>
+ <title>Relationship type</title>
<para>Relationship type section provides a mechanism for defining any relationship types and link beneficiaries through these relationship types by creating specific relationships.</para>
<para>To access the relationship type maintenance module, choose Maintenance->Beneficiaries and Programs->Relationship Type.</para>
<para>To define a new relationship type, click the "Add new" button. Fill all fields in "Add new Relationship Type" form, and click "Add" button.</para>
</section>
<section id="patient_registration">
- <title>Beneficiary Registration </title>
+ <title>Beneficiary registration </title>
<para>Beneficiary registration section provides a mechanism for managing facilities which allow to registry new beneficiaries or not.</para>
<para>To access the beneficiary registration maintenance module, choose Maintenance->Beneficiaries and Programs->Beneficiary Registration.</para>
<para>There are two process for registering facilities. The first one is where the administrator will say which facility can register. The second is when end user logs in and then select a facility, system will display a waring message if the selected facility cannot register beneficiaries; else, the system will display the functions to register beneficiaries.</para>
@@ -2536,14 +2536,14 @@
<para>Your program will then be ready to be used to enroll beneficiaries (which are modified/created under Maintenance->Beneficiaries and Programs->Beneficiaries) and enter data under the data-entry function Services->Name Based Data Records->Data Entry or Multiple Data.</para>
</section>
<section id="program_attribute">
- <title>Program Attribute</title>
+ <title>Program attribute</title>
<para>Program attribute section provides a mechanism for defining a program attribute. The defined program attributes will be used when a beneficiary unenroll from a program. You can create/edit program attributes in Maintenance->Beneficiaries and Programs->Progam Attribute.</para>
<para>To access the program attribute maintenance module, choose Maintenance->Beneficiaries and Programs->Program Attribute.</para>
<para>To create a new program, click the "Add new" button. Fill all fields with read asterisk, and click "Add" button.</para>
<para>NOTE: There are two program attributes are created for all programs as default to track up program un-enrollment when a beneficiary is announced to un-enrol the program or to be dead. And these two attributes are: Dead (with Yes/No value type) and Closed Date (with Date value type). Moreover, when a beneficiary un-enrolls from a program, the un-enrolled date is required.</para>
</section>
<section id="beneficiary_aggregation_query_builder">
- <title>Beneficiary Aggregation Query Builder</title>
+ <title>Beneficiary aggregation query builder</title>
<para>Beneficiary aggregation query builder section is the core functionality for linking data between name-based information tracking system – NBITS ( beneficiaries, programs, etc ) and aggregate management system ( dataset, report, charts, etc.) by defining the linking/aggregating rules.</para>
<para>This provides two functions. The first is the "Beneficiaries Aggregation Query Builder", a tool to define a formula, an expression, a rule for aggregation data from the tracking (name-based) system to the aggregation system. The second is the "Beneficiary Aggregation" used for generating routine data values from patient data value by periods ( or other interval if desired ) and by a facility.</para>
<para>To access "Beneficiaries Aggregation Query Builder" module, choose Maintenance->Beneficiaries and Programs->Beneficiary Aggregation Query Builder.</para>
@@ -2579,23 +2579,19 @@
<para>8.4. Click the "Aggregate" button. The result will be shown after running successfully.</para>
</section>
<section id="validation_criteria">
- <title>Validation Criteria</title>
+ <title>Validation criteria</title>
<para>Validation criteria section provide a mechanism for defining criteria for beneficiaries when enrolling a program.</para>
<para>To access the validation criteria maintenance module, choose Maintenance->Beneficiaries and Programs->Validation Criteria.</para>
<para>To create a new validation criterion, click the "Add new" button. Fill all fields with read asterisk, and click "Add" button.</para>
<para>You can assign facilities to a validation criterion in the Validation Criteria Management ( list of available validation criteria are shown ) by clicking on the blue folder icon, the first icon under Operations, corresponding to the validation criterion you would like to assign. Click the "Move selected" button to add the selected programs to the validation criterion. Click the "Remove selected" button to remove programs from the group that have been selected in the right panel. Finally, click the "Save" button to save changes, or the "Cancel" button to discard any changes.</para>
</section>
- <section id="patient_mobile_setting">
- <title>Beneficiary Mobile Setting</title>
- <para>Beneficiary mobile setting section provides a mechanism for specifying beneficiary attributes of beneficiaries shown into activities when end user downloads them to mobile.</para>
- </section>
<section id="import_beneficiary_configuration">
- <title>Import Beneficiary Configuration</title>
+ <title>Import beneficiary configuration</title>
<para>Import beneficiary configuration section provides a mechanism for specifying a path to an Excel file which contains private information of many beneficiaries and corresponding treatment cases.</para>
<para>The Excel file have two sheets. One saves patient registration information like name, birthdate, gender, village, etc. Two saves treatment cases according to the beneficiaries into the sheet one.</para>
</section>
<section id="import_beneficiary_data">
- <title>Import Beneficiary Data</title>
+ <title>Import beneficiary data</title>
<para>Import beneficiary data section provides a mechanism for importing private information of beneficiaries and treatment cases from an Excel file.</para>
</section>
</chapter>
@@ -2619,7 +2615,7 @@
</itemizedlist>
</para>
<section id="single_patient_entry_form">
- <title>Beneficiary Data entry</title>
+ <title>Beneficiary data entry</title>
<para>Beneficiary data entry section provides a mechanism for inputting data in treatment stages for each beneficiary.</para>
<para>To access the beneficiary data entry module, choose Services->Name-Based Data Records->Data Entry.</para>
<para>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.</para>
@@ -2643,15 +2639,15 @@
<para>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.</para>
</section>
<section id="patient_summary_report">
- <title>Report Management</title>
- <para>Report Management section provides a mechanism for getting an overview of the services provided for a program.</para>
+ <title>Report</title>
+ <para>Report section provides a mechanism for getting an overview of the services provided for a program.</para>
<para>To access the report Management module, choose Services->Name-Based Data Records->Summary Report.</para>
<para>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.</para>
<para>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.</para>
<para>Finally, click the Generate button.</para>
</section>
<section id="patient_visit_plan">
- <title>Visit Plans</title>
+ <title>Visit plans</title>
<para>Visit plans section provides feedbacks report to the facilities to help them in planning activities. This is also called as activity plan or visit plan. Basically, view the visit plan to get an overview of outstanding, pending, and completed visits.</para>
<para>To access the report Management module, choose Services->Name-Based Data Records->Visit Plans.</para>
<para>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.</para>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties 2011-09-28 07:48:12 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties 2011-09-29 04:17:34 +0000
@@ -1,5 +1,5 @@
-available_patient_attributes = Available Patient Attributes
-selected_patient_attributes = Selected Patient Attributes
+available_patient_attributes = Available Beneficiary Attributes
+selected_patient_attributes = Selected Beneficiary Attributes
groupBy = Group By
filters = Filters
any = Any
@@ -19,8 +19,6 @@
selected_aggregate_data_element = Selected Aggregate Data Element
aggregate_data_elements = Aggregate Data Elements
patient_data_elements = Beneficiary Data Elements
-aggregation_mapping_management = Aggregation Mapping Management
-aggregation_mapping = Aggregation Mapping
invalid_date = Incorrect format for date value
format_date = The correct format should be
duplicate_names = Name is already in use
@@ -39,14 +37,14 @@
please_select_relationship_type = Please select relationship type
confirm_delete_relationship_type = Are you sure you want to delete relationship type?
relationship_type = Relationship Type
-relationship_type_details = Relationship Type Details
+relationship_type_details = Relationship type details
a_is_to_b = A is to B
b_is_to_a = B is to A
-update_relationship_type = Update Relationship Type
-add_new_relationship_type = Add new Relationship Type
+edit_relationship_type = Edit relationship type
+create_new_relationship_type = Create new relationship type
please_specify_the_a_side_of_the_relationship_type = Please specify the A side of the relationship type
please_specify_the_b_side_of_the_relationship_type = Please specify the B side of the relationship type
-relationship_type_management = Relationship Type Management
+relationship_type_management = Relationship type management
or = or
age_month = Age(months)
specify_name_s = Please specify name(s)
@@ -60,17 +58,12 @@
program_stage = Program Stage
date_selector = Date Selector
close = Close
-edit_attribute_values = Edit Attribute Values
-update_patient_attribute = Update Beneficiary Attribute
+edit_patient_attribute = Edit beneficiary attribute
attribute = Attribute
-attributes = ATTRIBUTES
value_type = Value Type
-add_new_patient_attribute = Add New Beneficiary Attribute
-updating_patient_attribute_failed = Updating Beneficiary Attribute failed
-adding_patient_attribute_failed = Adding Beneficiary Attribute failed
+create_new_patient_attribute = Create new beneficiary attribute
confirm_delete_patient_attribute = Are you sure you want to delete beneficiary attribute?
-attribute_name = Attribute name
-patient_attribute_management = Beneficiary Attribute Management
+patient_attribute_management = Beneficiary attribute management
name_in_use = Name in use
please_select_village = Please Select a village from the tree
no_matching_found = No matching found
@@ -85,8 +78,8 @@
patients_and_programs = Beneficiaries and Programs
please_select_program = Please select a program
select_program = Select Program
-program_stage_management = Program Stage Management
-view_stage_management = Program Stage Management
+program_stage_management = Program stage management
+view_program_stages = View program stages
select_all_in_group = Select all in group
unselect_all_in_group = Unselect all in group
unselect_all_at_level = Unselect all at level
@@ -109,16 +102,14 @@
available_data_elements = Available Data Elements
selected_data_elements = Selected Data Elements
program_stage_details = Details of Program Stage
-update_program_stage = Update Program Stage
-add_new_program_stage = Add New Program Stage
+edit_program_stage = Edit program stage
+create_new_program_stage = Create new program stage
order = Order in Program
max_days_from_start = Max no of days to wait from start of Program
-program_details = Program Details
-update_program = Update Program
-updating_program_failed = Updating Program failed
-adding_program_failed = Adding Program failed
+program_details = Program details
+edit_program = Edit program
confirm_delete_prorgam = Are you sure you want to delete this program ?
-add_new_program = Add New Program
+create_new_program = Create new program
number_of_days = Duration of Program (no. of days)
please_specify_a_name = Please specify a name
please_specify_a_description = Please specify a description
@@ -167,19 +158,17 @@
check_if_this_person_is_deceased = Check if this person is deceased
id = Id
add = Add
-edit_profile = Edit Profile
-confirm_death_patient = Are you sure this person is dead?
-adding_individual_failed = Adding Individual failed
-updating_individual_failed = Updating Individual failed
+edit_profile = Edit profile
address_management = Address Management
household_management = Household Management
-program_management = Program Management
+program_management = Program management
please_select_item_from_menu = Please select an item from the menu
everything_is_ok = Everything is OK
patient_attribute = Beneficiary Attribute
program = Program
beneficiary_aggregation = Beneficiary Aggregation
beneficiary_aggregation_query_builder = Beneficiary Aggregation Query Builder
+beneficiary_aggregation_query_builder_management = Beneficiary aggregation query builder management
dataelement_group = Data Element Group
dataelement = Data Element
program_stage_de = ProgramStageDataElement
@@ -196,23 +185,23 @@
add_more_option = Add Option
remove_option = Remove Option
mandatory = Mandatory
-patient_attribute_group_management = Beneficiary Attribute Group Management
+patient_attribute_group_management = Beneficiary attribute group management
move_selected = Move selected items
remove_selected = Remove selected items
availableAttribute = Available attributes
selectedAttribute = Selected attributes
-attribute_group_deltails = Attribute group details
+patient_attribute_group_deltails = Beneficiary attribute group details
patient_attribute_group = Beneficiary Attribute Group
please_specify_attributes = Please specify attributes for group
patient_attribute_group_association = Beneficiary Attribute Group Association
-update_patient_attribute_group = Update Beneficiary Attribute Group
-add_new_patient_attribute_group = Add New Beneficiary Attribute Group
+edit_patient_attribute_group = Edit beneficiary attribute group
+create_new_patient_attribute_group = Create new beneficiary attribute group
patient_attributes = Beneficiary Attributes
identifier_format = Identifier Format
-patient_identifier_type_management = Beneficiary Identifier Type Management
+patient_identifier_type_management = Beneficiary identifier type management
patient_identifier_type = Beneficiary Identifier Type
-add_new_patient_identifier_type = Add new Beneficiary Identifier Type
-update_patient_identifier_type = Update Beneficiary Identifier Type
+create_new_patient_identifier_type = Create new beneficiary identifier type
+edit_patient_identifier_type = Edit beneficiary identifier type
delete_successfull = Deleted successfully
father = Father
mother = Mother
@@ -220,8 +209,8 @@
child_contact_type = Child contact type
child_contact_name = Child contact name
warning_delete_patient_attribute_option = This option has relationship with BeneficiaryAttributeValue. You must not delete it.
-success_delete_patient_attribute_option = Delete patient attribute option successfully.
-error_delete_patient_attribute_option = Can not find BeneficiaryAttributeOption to delete.
+success_delete_patient_attribute_option = Delete beneficiary attribute option successfully.
+error_delete_patient_attribute_option = Can not find Beneficiary attribute option to delete.
attribute_combo_type = Predefined value
at_least_2_option = Please add at least two attribute options
identifier_type = Identifier type
@@ -234,8 +223,8 @@
please_select_identifier_type = Please select Identifier type
please_select_attribute_type = Please select Attribute type
validation_criteria = Validation Criteria
-update_validation_criteria = Update validation criteria
-add_validation_criteria = Add validation criteria
+edit_validation_criteria = Edit validation criteria
+create_validation_criteria = Create validation criteria
intro_patient_attribute = Create, modify and view Beneficiary attributes. An attribute can be used to register extra information for a Beneficiary.
intro_patient_attribute_group = Create, modify and view Beneficiary attribute groups. Groups makes it more convenient to add attributes to a Beneficiary.
intro_patient_identifier_type = Create, modify and view Beneficiary identifier types. Any type and multiple identifiers can be registered.
@@ -244,12 +233,12 @@
intro_beneficiary_aggregation_query_builder = Set up aggregation rules for the process of aggregating Beneficiary data to statistical data.
intro_validation_criteria = Create, modify and view validation criteria. A criteria is used for validation of Beneficiary data.
intro_program_attribute = Create, modify and view Program attributes. A program can have any number of attributes.
-intro_import_data = Import information of patients automatically from an Excel template file into the patient database.
-intro_configuration = Set the Excel XML template file used for automatically importing patient data.
+intro_import_data = Import information of patients automatically from an Excel template file into the beneficiary database.
+intro_configuration = Set the Excel XML template file used for automatically importing beneficiary data.
add_dependent = Add dependent
inheritable = Inheritable
other_details = Other Details
-patient_attribute_details = Patient attribute details
+patient_attribute_details = Beneficiary attribute details
search_result = Search result
criteria = Criteria
operator_less_then = <
@@ -289,20 +278,20 @@
letter = Letter
no_max_days_allowed_input_data = Maximum number of days allowed to input data
program_attribute = Program Attribute
-program_attribute_management = Program Attribute Management
-add_new_program_attribute = Add New Program Attribute
-update_new_program_attribute = Update New Program Attribute
+program_attribute_management = Program attribute management
+create_new_program_attribute = Create new program attribute
+edit_program_attribute = Edit program attribute
program_infor = Program information
import = Import
import_data = Import Data
import_file = Import file
upload = Upload
configuration = Configuration
-patient_xml_template_file = Patient XML template file
-not_save_patient = Patients not saved
+patient_xml_template_file = Beneficiary XML template file
+not_save_patient = Beneficiaries not saved
row = Row
reason = Reason
-patient_name_is_null = The name of patient is missing
+patient_name_is_null = The name of beneficiary is missing
birthday_is_null = Birthday is missing
duplicate = Duplicate
excel_file = Excel file.
@@ -311,12 +300,12 @@
dataelement_group = Data Element Group
option_combo = Option Combo
case_aggregation_condition = Beneficiary Aggregation Query Builder
-case_aggregation_condition_detail = Beneficiary Aggregation Query Builder details
-add_case_aggregation_condition = Add Beneficiary Aggregation Query Builder
+case_aggregation_condition_detail = Beneficiary aggregation query builder details
+create_new_case_aggregation_condition = Create new beneficiary aggregation query builder
case_attributes_and_properties = Case Attributes and Properties
condition = Condition
condition_detail = Condition details
-update_case_aggregation_condition = Update Beneficiary Aggregation Query Builder
+edit_case_aggregation_condition = Edit beneficiary aggregation query builder
enrolldate_minus_incidentdate = Date of Enrollment - Date of Incident
program_properties = Program properties
not_enough_mandatory_identifier = Not enough data for the mandatory identifier(s)
@@ -325,8 +314,8 @@
hierachy_orgunit = Hierarchy Organisation Unit
similar_patients = Similar patients
orgunit = Organisation Unit
-criteria_details = Criteria Details
-program_attribute_details = Program Attribute Details
+validation_criteria_details = Validation criteria details
+program_attribute_details = Program attribute details
patient_registration = Beneficiary Registration
intro_patient_registration = Select organisation units which can register beneficiaries
select_program = Select program
@@ -334,12 +323,12 @@
define_single_dataelement_validation = Define Single Data Element Validation
add_single_program_validation = Add Single Program Validation
add_multi_program_validation = Add Multi Program Validation
-update_single_program_validation = Update Single Program Validation
-update_multi_program_validation = Update Multi Program Validation
+edit_single_program_validation = Edit single program validation
+edit_multi_program_validation = Edit multi program validation
program_validation_details = Program Validation Details
define_program_validation = Define Program Validation
-add_new_single_validation = Add New Single Validation
-add_new_multi_validation = Add New Multi Validation
+create_new_single_validation = Create new single validation
+create_new_multi_validation = Create new multi validation
save_success = Save successfully
configuration_xml_file_null = Configuration of folder where contains xml file is null
there_is_no_defination_xml_file_in_user_home = There is no any definition related XML file in the user home
@@ -354,9 +343,9 @@
aggregation_data_element_in_use = Aggregation data element is in use
add_more_option_to_search = Add more option to search
delete_program_data_entry_confirm = Do you want to delete program data entry ?
-patient_chart_management = Patient Chart Management
-add_patient_chart = Add Patient Chart
-update_patient_chart = Update Patient Chart
+patient_chart_management = neneficiary chart management
+create_new_patient_chart = Create new beneficiary Chart
+edit_patient_chart = Edit beneficiary chart
chart_type = Chart type
chart_size = Chart size
save = Save
@@ -372,7 +361,7 @@
normal= Normal
wide= Wide
tall= Tall
-patient_chart_details = Patient chart details
+patient_chart_details = Beneficiary chart details
single_event = Single event
paitents_and_programs = Beneficiaries and Programs
gender = Gender
@@ -380,4 +369,9 @@
date_of_enrollment_description = Description of enrollment date
date_of_incident_description = Description of incident date
date_of_enrollment = Date of enrollment
-date_of_incident = Date of incident
\ No newline at end of file
+date_of_incident = Date of incident
+patient_registration_title = Beneficiary registration
+patient_identifier_type_details = Beneficiary identifier type details
+male = Male
+female = Female
+transgender = Transgender
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addCaseAggregation.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addCaseAggregation.vm 2011-09-22 05:46:07 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addCaseAggregation.vm 2011-09-29 04:17:34 +0000
@@ -8,7 +8,7 @@
});
</script>
-<h3>$i18n.getString( "add_case_aggregation_condition" )</h3>
+<h3>$i18n.getString( "create_new_case_aggregation_condition" )</h3>
<form id="addCaseAggregationForm" action="addCaseAggregation.action" method="post" >
<table>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientAttributeForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientAttributeForm.vm 2011-07-21 06:26:43 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientAttributeForm.vm 2011-09-29 04:17:34 +0000
@@ -27,7 +27,7 @@
</script>
-<h3>$i18n.getString( "add_new_patient_attribute" )</h3>
+<h3>$i18n.getString( "create_new_patient_attribute" )</h3>
<form id="addPatientAttributeForm" action="addPatientAttribute.action" method="post" >
<table id="attrTable">
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientAttributeGroupForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientAttributeGroupForm.vm 2011-05-19 08:14:24 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientAttributeGroupForm.vm 2011-09-29 04:17:34 +0000
@@ -16,13 +16,13 @@
});
</script>
-<h3>$i18n.getString( "add_new_patient_attribute_group" )</h3>
+<h3>$i18n.getString( "create_new_patient_attribute_group" )</h3>
<div id="tooltip"></div>
<form id="addPatientAttributeGroupForm" action="addPatientAttributeGroup.action" method="post" >
<table>
<tr>
- <th colspan="4">$i18n.getString( "attribute_group_deltails" ) </th>
+ <th colspan="4">$i18n.getString( "patient_attribute_group_deltails" ) </th>
</tr>
<tr>
<td><label>$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientChartForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientChartForm.vm 2011-09-06 02:47:21 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientChartForm.vm 2011-09-29 04:17:34 +0000
@@ -10,7 +10,7 @@
var i18n_must_select_one_dataelement = '$encoder.jsEscape( $i18n.getString( "must_select_one_dataelement" ), "'")';
</script>
-<h3>$i18n.getString( "add_patient_chart" )</h3>
+<h3>$i18n.getString( "create_new_patient_chart" )</h3>
<form id="addPatientChartForm" name="addPatientChartForm" method="post" action="addPatientChart.action">
<input type='hidden' id='programId' name='programId' value='$programId'>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientIdentifierTypeForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientIdentifierTypeForm.vm 2011-07-21 06:26:43 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientIdentifierTypeForm.vm 2011-09-29 04:17:34 +0000
@@ -7,75 +7,82 @@
form.submit();
});
-
checkValueIsExist( "name", "validatePatientIdentifierType.action");
});
</script>
-<h3>$i18n.getString( "add_new_patient_identifier_type" )</h3>
+<h3>$i18n.getString( "create_new_patient_identifier_type" )</h3>
<form id="addPatientIdentifierTypeForm" name="addPatientIdentifierTypeForm" action="addPatientIdentifierType.action" method="post" >
<table>
- <tr>
- <td><label>$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td><input type="text" id="name" name="name" maxlength="30" style="width:30em" class="{validate:{required:true,rangelength:[4,100]}}"/></td>
- <td></td>
- </tr>
-
- <tr>
- <td><label>$i18n.getString( "description" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td><input type="text" id="description" name="description" style="width:30em" class="{validate:{required:true,minlength:4, maxlength: 150}}"/></td>
- <td></td>
- </tr>
-
- <tr>
- <td><label for="mandatory">$i18n.getString( "mandatory" )<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td>
- <select id="mandatory" name="mandatory" style="min-width:30.2em" class="{validate:{required:true}}">
- <option value="true">$i18n.getString( "yes" )</option>
- <option value="false" selected="selected">$i18n.getString( "no" )</option>
- </select>
- </td>
- <td></td>
- </tr>
-
- <tr>
- <td><label for="related">$i18n.getString( "related" )<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td>
- <select id="related" name="related" style="min-width:30.2em" class="{validate:{required:true}}">
- <option value="true" >$i18n.getString( "yes" )</option>
- <option value="false" selected="selected">$i18n.getString( "no" )</option>
- </select>
- </td>
- <td></td>
- </tr>
- <tr>
- <td><label for="noChar">$i18n.getString( "no_of_char" )</label></td>
- <td>
- <input type="text" name="noChars" id="noChars" class="{validate:{required:false, number:true}}" style="min-width:30em" />
- </td>
- <td></td>
- </tr>
-
- <tr>
- <td><label for="type">$i18n.getString( "type" )<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td>
- <select id="type" name="type" style="min-width:30.2em" class="{validate:{required:true}}">
- <option value="text" selected="selected">$i18n.getString( "text" )</option>
- <option value="number">$i18n.getString( "number" )</option>
- <option value="letter">$i18n.getString( "letter" )</option>
- </select>
- </td>
- <td></td>
- </tr>
- <tr>
- <td></td>
- <td>
- <input type="submit" value="$i18n.getString( 'add' )" style="width:10em"/>
- <input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='program.action'" style="width:10em"/>
- </td>
- </tr>
+ <thead>
+ <tr>
+ <th colspan="4">$i18n.getString( "patient_identifier_type_details" ) </th>
+ </tr>
+ </thead>
+
+ <tbody>
+ <tr>
+ <td><label>$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+ <td><input type="text" id="name" name="name" maxlength="30" style="width:30em" class="{validate:{required:true,rangelength:[4,100]}}"/></td>
+ <td></td>
+ </tr>
+
+ <tr>
+ <td><label>$i18n.getString( "description" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+ <td><input type="text" id="description" name="description" style="width:30em" class="{validate:{required:true,minlength:4, maxlength: 150}}"/></td>
+ <td></td>
+ </tr>
+
+ <tr>
+ <td><label for="mandatory">$i18n.getString( "mandatory" )<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+ <td>
+ <select id="mandatory" name="mandatory" style="min-width:30.2em" class="{validate:{required:true}}">
+ <option value="true">$i18n.getString( "yes" )</option>
+ <option value="false" selected="selected">$i18n.getString( "no" )</option>
+ </select>
+ </td>
+ <td></td>
+ </tr>
+
+ <tr>
+ <td><label for="related">$i18n.getString( "related" )<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+ <td>
+ <select id="related" name="related" style="min-width:30.2em" class="{validate:{required:true}}">
+ <option value="true" >$i18n.getString( "yes" )</option>
+ <option value="false" selected="selected">$i18n.getString( "no" )</option>
+ </select>
+ </td>
+ <td></td>
+ </tr>
+ <tr>
+ <td><label for="noChar">$i18n.getString( "no_of_char" )</label></td>
+ <td>
+ <input type="text" name="noChars" id="noChars" class="{validate:{required:false, number:true}}" style="min-width:30em" />
+ </td>
+ <td></td>
+ </tr>
+
+ <tr>
+ <td><label for="type">$i18n.getString( "type" )<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+ <td>
+ <select id="type" name="type" style="min-width:30.2em" class="{validate:{required:true}}">
+ <option value="text" selected="selected">$i18n.getString( "text" )</option>
+ <option value="number">$i18n.getString( "number" )</option>
+ <option value="letter">$i18n.getString( "letter" )</option>
+ </select>
+ </td>
+ <td></td>
+ </tr>
+ <tr>
+ <td></td>
+ <td>
+ <input type="submit" value="$i18n.getString( 'add' )" style="width:10em"/>
+ <input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='patientIdentifierType.action'" style="width:10em"/>
+ </td>
+ </tr>
+ </tbody>
</table>
</form>
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramAttributeForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramAttributeForm.vm 2011-05-19 08:13:38 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramAttributeForm.vm 2011-09-29 04:17:34 +0000
@@ -27,7 +27,7 @@
</script>
-<h3>$i18n.getString( "add_new_program_attribute" )</h3>
+<h3>$i18n.getString( "create_new_program_attribute" )</h3>
<form id="addProgramAttributeForm" action="addProgramAttribute.action" method="post" >
<table id="attrTable">
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramForm.vm 2011-09-28 08:23:38 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramForm.vm 2011-09-29 04:17:34 +0000
@@ -8,50 +8,58 @@
});
</script>
-<h3>$i18n.getString( "add_new_program" )</h3>
+<h3>$i18n.getString( "create_new_program" )</h3>
<form id="addProgramForm" name="addProgramForm" action="addProgram.action" method="post" >
-<table>
- <tr>
- <td><label>$i18n.getString( "name" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
- <td><input type="text" id="name" name="name" style="width:30em" class="{validate:{required:true,minlength:4}}"></td>
- <td></td>
- </tr>
-
- <tr>
- <td><label>$i18n.getString( "description" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
- <td><input type="text" id="description" name="description" style="width:30em" class="{validate:{required:true,minlength:4}}"></td>
- <td></td>
- </tr>
-
- <tr>
- <td><label>$i18n.getString( "date_of_enrollment_description" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
- <td><input type="text" id="dateOfEnrollmentDescription" name="dateOfEnrollmentDescription" style="width:30em" class="{validate:{required:true,minlength:4}}"></td>
- <td></td>
- </tr>
-
- <tr>
- <td><label>$i18n.getString( "date_of_incident_description" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
- <td><input type="text" id="dateOfIncidentDescription" name="dateOfIncidentDescription" style="width:30em" class="{validate:{required:true,minlength:4}}"></td>
- <td></td>
- </tr>
-
- <tr>
- <td><label>$i18n.getString( "no_max_days_allowed_input_data" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
- <td><input type="text" id="maxDaysAllowedInputData" name="maxDaysAllowedInputData" style="width:30em" class="{validate:{required:true,number:true}}"></td>
- <td></td>
- </tr>
-
- <tr>
- <td><label>$i18n.getString( "single_event" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
- <td><input type="checkbox" id="singleEvent" name="singleEvent" value='true'></td>
- <td></td>
- </tr>
-
- <tr>
- <td colspan="2" style="height:15px"></td>
- </tr>
+<table>
+ <thead>
+ <tr>
+ <th colspan="2">$i18n.getString( "program_details" )</th>
+ </tr>
+ </thead>
+
+ <tbody>
+ <tr>
+ <td><label>$i18n.getString( "name" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
+ <td><input type="text" id="name" name="name" style="width:30em" class="{validate:{required:true,minlength:4}}"></td>
+ <td></td>
+ </tr>
+
+ <tr>
+ <td><label>$i18n.getString( "description" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
+ <td><input type="text" id="description" name="description" style="width:30em" class="{validate:{required:true,minlength:4}}"></td>
+ <td></td>
+ </tr>
+
+ <tr>
+ <td><label>$i18n.getString( "date_of_enrollment_description" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
+ <td><input type="text" id="dateOfEnrollmentDescription" name="dateOfEnrollmentDescription" style="width:30em" class="{validate:{required:true,minlength:4}}"></td>
+ <td></td>
+ </tr>
+
+ <tr>
+ <td><label>$i18n.getString( "date_of_incident_description" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
+ <td><input type="text" id="dateOfIncidentDescription" name="dateOfIncidentDescription" style="width:30em" class="{validate:{required:true,minlength:4}}"></td>
+ <td></td>
+ </tr>
+
+ <tr>
+ <td><label>$i18n.getString( "no_max_days_allowed_input_data" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
+ <td><input type="text" id="maxDaysAllowedInputData" name="maxDaysAllowedInputData" style="width:30em" class="{validate:{required:true,number:true}}"></td>
+ <td></td>
+ </tr>
+
+ <tr>
+ <td><label>$i18n.getString( "single_event" )</label></td>
+ <td><input type="checkbox" id="singleEvent" name="singleEvent" value='true'></td>
+ <td></td>
+ </tr>
+
+ <tr>
+ <td colspan="2" style="height:15px"></td>
+ </tr>
+ </tbody>
</table>
<p>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramStageForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramStageForm.vm 2011-08-10 03:41:48 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramStageForm.vm 2011-09-29 04:17:34 +0000
@@ -26,7 +26,7 @@
}
</style>
-<h3>$i18n.getString( "add_new_program_stage" )</h3>
+<h3>$i18n.getString( "create_new_program_stage" )</h3>
<form id="addProgramStageForm" name="addProgramStageForm" action="addProgramStage.action" method="post">
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addRelationshipTypeForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addRelationshipTypeForm.vm 2011-05-19 08:14:24 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addRelationshipTypeForm.vm 2011-09-29 04:17:34 +0000
@@ -9,26 +9,33 @@
});
</script>
-<h3>$i18n.getString( "add_new_relationship_type" )</h3>
+<h3>$i18n.getString( "create_new_relationship_type" )</h3>
<form id="addRelationshipTypeForm" name="addRelationshipTypeForm" action="addRelationshipType.action" method="post">
<table>
- <tr>
- <td><label>$i18n.getString( "a_is_to_b" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td><input type="text" id="aIsToB" name="aIsToB" maxlength="30" style="width:30em" class="{validate:{required:true,rangelength:[2,160]}}"/></td>
- </tr>
-
- <tr>
- <td><label>$i18n.getString( "b_is_to_a" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td><input type="text" id="bIsToA" name="bIsToA" maxlength="30" style="width:30em" class="{validate:{required:true,rangelength:[2,160]}}"/></td>
- </tr>
-
- <tr>
- <td><label>$i18n.getString( "description" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td><input type="text" id="description" name="description" style="width:30em" class="{validate:{required:true,rangelength:[2,160]}}"/></td>
- </tr>
-
+ <thead>
+ <tr>
+ <th colspan="4">$i18n.getString( "relationship_type_details" ) </th>
+ </tr>
+ </thead>
+
+ <tbody>
+ <tr>
+ <td><label>$i18n.getString( "a_is_to_b" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+ <td><input type="text" id="aIsToB" name="aIsToB" maxlength="30" style="width:30em" class="{validate:{required:true,rangelength:[2,160]}}"/></td>
+ </tr>
+
+ <tr>
+ <td><label>$i18n.getString( "b_is_to_a" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+ <td><input type="text" id="bIsToA" name="bIsToA" maxlength="30" style="width:30em" class="{validate:{required:true,rangelength:[2,160]}}"/></td>
+ </tr>
+
+ <tr>
+ <td><label>$i18n.getString( "description" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+ <td><input type="text" id="description" name="description" style="width:30em" class="{validate:{required:true,rangelength:[2,160]}}"/></td>
+ </tr>
+ </tbody>
</table>
<p>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addValidationCriteria.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addValidationCriteria.vm 2011-05-19 08:12:45 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addValidationCriteria.vm 2011-09-29 04:17:34 +0000
@@ -11,10 +11,10 @@
);
</script>
-<h3>$i18n.getString( "add_validation_criteria" )</h3>
+<h3>$i18n.getString( "create_validation_criteria" )</h3>
<form id="validationCriteriaForm" action="addValidationCriteria.action" method="post" >
<table>
- <tr><th colspan="3">$i18n.getString('details')</th></tr>
+ <tr><th colspan="3">$i18n.getString('validation_criteria_details')</th></tr>
<tr>
<td><label>$i18n.getString('name')<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
<td colspan="2"><input type='text' id='name' name='name' style='width: 40em' class="{validate:{required:true,rangelength:[2,160]}}"/></td>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/caseAggregation.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/caseAggregation.vm 2011-07-28 06:36:51 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/caseAggregation.vm 2011-09-29 04:17:34 +0000
@@ -1,4 +1,4 @@
-<h3>$i18n.getString( 'beneficiary_aggregation_query_builder' ) #openHelp( "beneficiary_aggregation_query_builder" )</h3>
+<h3>$i18n.getString( 'beneficiary_aggregation_query_builder_management' ) #openHelp( "beneficiary_aggregation_query_builder" )</h3>
<table class="mainPageTable">
<tr>
@@ -63,8 +63,6 @@
<script type="text/javascript">
var i18n_confirm_delete = '$encoder.jsEscape( $i18n.getString( "confirm_delete_patient_attribute" ) , "'" )';
- var i18n_adding_patient_atttibute_failed = '$encoder.jsEscape( $i18n.getString( "adding_patient_attribute_failed" ), "'")';
- var i18n_updating_house_hold_failed = '$encoder.jsEscape( $i18n.getString( "updating_patient_attribute_failed" ), "'")';
var i18n_none = '$encoder.jsEscape( $i18n.getString( "none" ), "'")';
var i18n_yes = '$encoder.jsEscape( $i18n.getString( "yes" ) , "'")';
var i18n_no = '$encoder.jsEscape( $i18n.getString( "no" ) , "'")';
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/relationship.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/relationship.js 2011-09-28 07:11:18 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/relationship.js 2011-09-29 04:17:34 +0000
@@ -38,7 +38,7 @@
}
else if ( json.response == "error" )
{
- setHeaderMessage( "i18n_adding_patient_atttibute_failed + ':' + '\n'" +json.message );
+ setHeaderMessage( json.message );
}
}
);
@@ -69,7 +69,7 @@
}
else if ( json.response == "error" )
{
- setHeaderMessage( "i18n_adding_patient_atttibute_failed + ':' + '\n'" +json.message );
+ setHeaderMessage( json.message );
}
}
);
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/listPatientIdentifierType.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/listPatientIdentifierType.vm 2011-07-27 08:12:52 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/listPatientIdentifierType.vm 2011-09-29 04:17:34 +0000
@@ -63,8 +63,6 @@
<script type="text/javascript">
var i18n_confirm_delete = '$encoder.jsEscape( $i18n.getString( "confirm_delete_patientIdentifierType" ) , "'" )';
- var i18n_adding_program_failed = '$encoder.jsEscape( $i18n.getString( "adding_patientIdentifierType_failed" ), "'")';
- var i18n_updating_program_failed = '$encoder.jsEscape( $i18n.getString( "updating_patientIdentifierType_failed" ), "'")';
var i18n_none = '$encoder.jsEscape( $i18n.getString( "none" ), "'")';
var i18n_string = '$encoder.jsEscape( $i18n.getString( "string" ), "'")';
var i18n_number = '$encoder.jsEscape( $i18n.getString( "number" ), "'")';
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/orgunitRegistration.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/orgunitRegistration.vm 2011-07-27 08:12:52 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/orgunitRegistration.vm 2011-09-29 04:17:34 +0000
@@ -1,5 +1,5 @@
-<h3>$i18n.getString( "patient_registration" ) #openHelp( "patient_registration" )</h3>
+<h3>$i18n.getString( "patient_registration_title" ) #openHelp( "patient_registration" )</h3>
<form action='defineOrgunitRegistration.action' method='post'>
<table>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientAttribute.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientAttribute.vm 2011-07-27 08:12:52 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientAttribute.vm 2011-09-29 04:17:34 +0000
@@ -15,7 +15,7 @@
<td colspan="3" style="text-align:right"><input type="button" value="$i18n.getString( "add_new" )" onclick="window.location.href='showAddPatientAttributeForm.action'" style="width:70px"></td>
</tr>
<tr>
- <th>$i18n.getString( "attribute_name" )</th>
+ <th>$i18n.getString( "name" )</th>
<th colspan="3">$i18n.getString( "operations" )</th>
</tr>
@@ -62,8 +62,6 @@
<script type="text/javascript">
var i18n_confirm_delete = '$encoder.jsEscape( $i18n.getString( "confirm_delete_patient_attribute" ) , "'" )';
- var i18n_adding_patient_atttibute_failed = '$encoder.jsEscape( $i18n.getString( "adding_patient_attribute_failed" ), "'")';
- var i18n_updating_house_hold_failed = '$encoder.jsEscape( $i18n.getString( "updating_patient_attribute_failed" ), "'")';
var i18n_none = '$encoder.jsEscape( $i18n.getString( "none" ), "'")';
var i18n_yes = '$encoder.jsEscape( $i18n.getString( "yes" ) , "'")';
var i18n_no = '$encoder.jsEscape( $i18n.getString( "no" ) , "'")';
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientAttributeGroup.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientAttributeGroup.vm 2011-07-27 08:12:52 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientAttributeGroup.vm 2011-09-29 04:17:34 +0000
@@ -18,7 +18,7 @@
</td>
</tr>
<tr>
- <th>$i18n.getString( "attribute_name" )</th>
+ <th>$i18n.getString( "name" )</th>
<th colspan="3">$i18n.getString( "operations" )</th>
</tr>
@@ -65,8 +65,6 @@
<script type="text/javascript">
var i18n_confirm_delete = '$encoder.jsEscape( $i18n.getString( "confirm_delete_patient_attribute" ) , "'" )';
- var i18n_adding_patient_atttibute_failed = '$encoder.jsEscape( $i18n.getString( "adding_patient_attribute_failed" ), "'")';
- var i18n_updating_house_hold_failed = '$encoder.jsEscape( $i18n.getString( "updating_patient_attribute_failed" ), "'")';
var i18n_none = '$encoder.jsEscape( $i18n.getString( "none" ), "'")';
var i18n_yes = '$encoder.jsEscape( $i18n.getString( "yes" ) , "'")';
var i18n_no = '$encoder.jsEscape( $i18n.getString( "no" ) , "'")';
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programAttributeList.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programAttributeList.vm 2011-07-28 02:46:09 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programAttributeList.vm 2011-09-29 04:17:34 +0000
@@ -60,8 +60,6 @@
<script type="text/javascript">
var i18n_confirm_delete = '$encoder.jsEscape( $i18n.getString( "confirm_delete_patient_attribute" ) , "'" )';
- var i18n_adding_patient_atttibute_failed = '$encoder.jsEscape( $i18n.getString( "adding_patient_attribute_failed" ), "'")';
- var i18n_updating_house_hold_failed = '$encoder.jsEscape( $i18n.getString( "updating_patient_attribute_failed" ), "'")';
var i18n_none = '$encoder.jsEscape( $i18n.getString( "none" ), "'")';
var i18n_yes = '$encoder.jsEscape( $i18n.getString( "yes" ) , "'")';
var i18n_no = '$encoder.jsEscape( $i18n.getString( "no" ) , "'")';
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programList.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programList.vm 2011-09-06 02:47:21 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programList.vm 2011-09-29 04:17:34 +0000
@@ -26,7 +26,7 @@
<a href="defineProgramAssociationsForm.action?id=$program.id" title="$i18n.getString( 'define_associations' )"><img src="../images/assign.png" alt="$i18n.getString( 'define_associations' )"></a>
<a href="programValidation.action?programId=$program.id" title="$i18n.getString( 'define_program_validation' )"><img src="../images/assign_b.png" alt="$i18n.getString( 'define_program_validation' )"></a>
<a href="showUpdateProgramForm.action?id=$program.id" title="$i18n.getString( 'edit' )"><img src="../images/edit.png" alt="$i18n.getString( 'edit' )"></a>
- <a href="programStage.action?id=$program.id" title="$i18n.getString( 'view_stage_management' )"><img src="../images/add_section.png" alt="$i18n.getString( 'view_stage_management' )"></a>
+ <a href="programStage.action?id=$program.id" title="$i18n.getString( 'view_program_stages' )"><img src="../images/add_section.png" alt="$i18n.getString( 'view_stage_management' )"></a>
<a href="patientChartList.action?programId=$program.id" title="$i18n.getString( 'patient_chart_management' )"><img src="../images/add_to_dashboard.png" alt="$i18n.getString( 'remove' )"></a>
<a href="javascript:removeProgram( '$program.id', '$encoder.jsEncode( $program.name )' )" title="$i18n.getString( "remove" )"><img src="../images/delete.png" alt="$i18n.getString( 'remove' )"></a>
<a href="javascript:showProgramDetails( $program.id )" title="$i18n.getString( 'show_details' )"><img src="../images/information.png" alt="$i18n.getString( 'show_details' )"></a>
@@ -57,8 +57,6 @@
<script type="text/javascript">
var i18n_confirm_delete = '$encoder.jsEscape( $i18n.getString( "confirm_delete_prorgam" ) , "'" )';
- var i18n_adding_program_failed = '$encoder.jsEscape( $i18n.getString( "adding_program_failed" ), "'")';
- var i18n_updating_program_failed = '$encoder.jsEscape( $i18n.getString( "updating_program_failed" ), "'")';
var i18n_none = '$encoder.jsEscape( $i18n.getString( "none" ), "'")';
jQuery(document).ready(function(){
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programValidationList.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programValidationList.vm 2011-07-08 05:52:59 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programValidationList.vm 2011-09-29 04:17:34 +0000
@@ -9,8 +9,8 @@
<tr>
<td></td>
<td>
- <input type="button" value="$i18n.getString( "add_new_single_validation" )" onclick="window.location.href='showAddSingleProgramValidationForm.action?id=$programId'" style="width:200px">
- <input type="button" value="$i18n.getString( "add_new_multi_validation" )" onclick="window.location.href='showAddMultiProgramValidationForm.action?id=$programId'" style="width:200px">
+ <input type="button" value="$i18n.getString( "create_new_single_validation" )" onclick="window.location.href='showAddSingleProgramValidationForm.action?id=$programId'" style="width:200px">
+ <input type="button" value="$i18n.getString( "create_new_multi_validation" )" onclick="window.location.href='showAddMultiProgramValidationForm.action?id=$programId'" style="width:200px">
<input type="button" value="$i18n.getString( "cancel" )" onclick="window.location.href='program.action'" style="width:200px">
</td>
</tr>
@@ -60,8 +60,6 @@
<script type="text/javascript">
var i18n_confirm_delete = '$encoder.jsEscape( $i18n.getString( "confirm_delete_patient_attribute" ) , "'" )';
- var i18n_adding_patient_atttibute_failed = '$encoder.jsEscape( $i18n.getString( "adding_patient_attribute_failed" ), "'")';
- var i18n_updating_house_hold_failed = '$encoder.jsEscape( $i18n.getString( "updating_patient_attribute_failed" ), "'")';
var i18n_none = '$encoder.jsEscape( $i18n.getString( "none" ), "'")';
var i18n_yes = '$encoder.jsEscape( $i18n.getString( "yes" ) , "'")';
var i18n_no = '$encoder.jsEscape( $i18n.getString( "no" ) , "'")';
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/showAddCaseAggregationForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/showAddCaseAggregationForm.vm 2010-11-25 22:22:10 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/showAddCaseAggregationForm.vm 2011-09-29 04:17:34 +0000
@@ -26,7 +26,7 @@
</script>
-<h3>$i18n.getString( "add_new_patient_attribute" )</h3>
+<h3>$i18n.getString( "create_new_patient_attribute" )</h3>
<form id="addPatientAttributeForm" action="addPatientAttribute.action" method="post" >
<table id="attrTable">
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateCaseAggregation.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateCaseAggregation.vm 2011-09-22 05:46:07 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateCaseAggregation.vm 2011-09-29 04:17:34 +0000
@@ -9,7 +9,7 @@
</script>
-<h3>$i18n.getString( "update_case_aggregation_condition" )</h3>
+<h3>$i18n.getString( "edit_case_aggregation_condition" )</h3>
<form id="updateCaseAggregationForm" action="updateCaseAggregation.action" method="post" >
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateMultiProgramValidationForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateMultiProgramValidationForm.vm 2011-07-08 05:52:59 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateMultiProgramValidationForm.vm 2011-09-29 04:17:34 +0000
@@ -1,4 +1,4 @@
-<h3>$i18n.getString( "update_program_validation" )</h3>
+<h3>$i18n.getString( "edit_program_validation" )</h3>
<form id='programValidationForm' name='programValidationForm' method='post' action='updateProgramValidation.action'>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updatePatientAttibuteForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updatePatientAttibuteForm.vm 2011-05-19 08:17:24 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updatePatientAttibuteForm.vm 2011-09-29 04:17:34 +0000
@@ -28,7 +28,7 @@
</script>
-<h3>$i18n.getString( "update_patient_attribute" )</h3>
+<h3>$i18n.getString( "edit_patient_attribute" )</h3>
<form id="updatePatientAttributeForm" name="updatePatientAttributeForm" action="updatePatientAttribute.action" method="post" >
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updatePatientAttibuteGroupForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updatePatientAttibuteGroupForm.vm 2011-07-21 06:26:43 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updatePatientAttibuteGroupForm.vm 2011-09-29 04:17:34 +0000
@@ -15,7 +15,7 @@
checkValueIsExist( "name", "validatePatientAttributeGroup.action", {id:getFieldValue('id')});
});
</script>
-<h3>$i18n.getString( "update_patient_attribute_group" )</h3>
+<h3>$i18n.getString( "edit_patient_attribute_group" )</h3>
<form id="updatePatientAttributeGroupForm" name="updatePatientAttributeGroupForm" action="updatePatientAttributeGroup.action" method="post" >
<div style="display:inline">
@@ -25,7 +25,7 @@
<table id="detailsList">
<thead>
<tr>
- <th colspan="4">$i18n.getString( "attribute_group_deltails" ) </th>
+ <th colspan="4">$i18n.getString( "patient_attribute_group_deltails" ) </th>
</tr>
</thead>
<tbody>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updatePatientChartForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updatePatientChartForm.vm 2011-09-07 09:09:25 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updatePatientChartForm.vm 2011-09-29 04:17:34 +0000
@@ -10,7 +10,7 @@
var i18n_must_select_one_dataelement = '$encoder.jsEscape( $i18n.getString( "must_select_one_dataelement" ), "'")';
</script>
-<h3>$i18n.getString( "update_patient_chart" )</h3>
+<h3>$i18n.getString( "edit_patient_chart" )</h3>
<form id="updatePatientChartForm" name="addPatientChartForm" method="post" action="updatePatientChart.action">
<input type='hidden' id='id' name='id' value='$patientChart.id'>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updatePatientIdentifierType.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updatePatientIdentifierType.vm 2011-07-21 06:26:43 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updatePatientIdentifierType.vm 2011-09-29 04:17:34 +0000
@@ -12,64 +12,72 @@
</script>
-<h3>$i18n.getString( "update_patient_identifier_type" )</h3>
+<h3>$i18n.getString( "edit_patient_identifier_type" )</h3>
<form id="updatePatientIdentifierTypeForm" action="updatePatientIdentifierType.action" method="post" >
<input type="hidden" id="id" name="id" value="$patientIdentifierType.id"/>
<table>
- <tr>
- <td><label>$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td><input type="text" id="name" name="name" value="$encoder.htmlEncode($patientIdentifierType.name)" maxlength="30" style="width:30em" class="{validate:{required:true,rangelength:[4,100]}}"/></td>
- <td></td>
- </tr>
-
- <tr>
- <td><label>$i18n.getString( "description" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td><input type="text" id="description" name="description" value="$encoder.htmlEncode($patientIdentifierType.description)" style="width:30em" class="{validate:{required:true,minlength:4, maxlength: 150}}"/></td>
- <td></td>
- </tr>
-
- <tr>
- <td><label for="mandatory">$i18n.getString( "mandatory" )<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td>
- <select id="mandatory" name="mandatory" style="min-width:20em">
- <option value="true" #if( $patientIdentifierType.mandatory ) selected="selected" #end>$i18n.getString( "yes" )</option>
- <option value="false" #if( !$patientIdentifierType.mandatory ) selected="selected" #end>$i18n.getString( "no" )</option>
- </select>
- </td>
- <td></td>
- </tr>
-
- <tr>
- <td><label for="related">$i18n.getString( "related" )<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td>
- <select id="related" name="related" style="min-width:20em" class="{validate:{required:true}}">
- <option value="true" #if( $patientIdentifierType.related ) selected="selected" #end>$i18n.getString( "yes" )</option>
- <option value="false" #if( !$patientIdentifierType.related ) selected="selected" #end>$i18n.getString( "no" )</option>
- </select>
- </td>
- <td></td>
- </tr>
-
- <tr>
- <td><label for="noChars">$i18n.getString( "no_of_char" )</label></td>
- <td>
- <input type="text" name="noChars" id="noChars" value="$!patientIdentifierType.noChars" class="{validate:{required:false, number:true}}" style="min-width:30em" />
- </td>
- <td></td>
- </tr>
-
- <tr>
- <td><label for="type">$i18n.getString( "type" )<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td>
- <select id="type" name="type" style="min-width:30.2em" class="{validate:{required:true}}">
- <option value="text" #if( $patientIdentifierType.type=='text' ) selected="selected" #end>$i18n.getString( "string" )</option>
- <option value="number" #if( $patientIdentifierType.type=='number' ) selected="selected" #end>$i18n.getString( "number" )</option>
- <option value="letter" #if( $patientIdentifierType.type=='letter' ) selected="selected" #end>$i18n.getString( "alphabet" )</option>
- </select>
- </td>
- <td></td>
- </tr>
+ <thead>
+ <tr>
+ <th colspan="4">$i18n.getString( "patient_identifier_type_details" ) </th>
+ </tr>
+ </thead>
+
+ <tbody>
+ <tr>
+ <td><label>$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+ <td><input type="text" id="name" name="name" value="$encoder.htmlEncode($patientIdentifierType.name)" maxlength="30" style="width:30em" class="{validate:{required:true,rangelength:[4,100]}}"/></td>
+ <td></td>
+ </tr>
+
+ <tr>
+ <td><label>$i18n.getString( "description" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+ <td><input type="text" id="description" name="description" value="$encoder.htmlEncode($patientIdentifierType.description)" style="width:30em" class="{validate:{required:true,minlength:4, maxlength: 150}}"/></td>
+ <td></td>
+ </tr>
+
+ <tr>
+ <td><label for="mandatory">$i18n.getString( "mandatory" )<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+ <td>
+ <select id="mandatory" name="mandatory" style="min-width:20em">
+ <option value="true" #if( $patientIdentifierType.mandatory ) selected="selected" #end>$i18n.getString( "yes" )</option>
+ <option value="false" #if( !$patientIdentifierType.mandatory ) selected="selected" #end>$i18n.getString( "no" )</option>
+ </select>
+ </td>
+ <td></td>
+ </tr>
+
+ <tr>
+ <td><label for="related">$i18n.getString( "related" )<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+ <td>
+ <select id="related" name="related" style="min-width:20em" class="{validate:{required:true}}">
+ <option value="true" #if( $patientIdentifierType.related ) selected="selected" #end>$i18n.getString( "yes" )</option>
+ <option value="false" #if( !$patientIdentifierType.related ) selected="selected" #end>$i18n.getString( "no" )</option>
+ </select>
+ </td>
+ <td></td>
+ </tr>
+
+ <tr>
+ <td><label for="noChars">$i18n.getString( "no_of_char" )</label></td>
+ <td>
+ <input type="text" name="noChars" id="noChars" value="$!patientIdentifierType.noChars" class="{validate:{required:false, number:true}}" style="min-width:30em" />
+ </td>
+ <td></td>
+ </tr>
+
+ <tr>
+ <td><label for="type">$i18n.getString( "type" )<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+ <td>
+ <select id="type" name="type" style="min-width:30.2em" class="{validate:{required:true}}">
+ <option value="text" #if( $patientIdentifierType.type=='text' ) selected="selected" #end>$i18n.getString( "string" )</option>
+ <option value="number" #if( $patientIdentifierType.type=='number' ) selected="selected" #end>$i18n.getString( "number" )</option>
+ <option value="letter" #if( $patientIdentifierType.type=='letter' ) selected="selected" #end>$i18n.getString( "alphabet" )</option>
+ </select>
+ </td>
+ <td></td>
+ </tr>
+ </tbody>
</table>
<p>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramAttributeForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramAttributeForm.vm 2011-05-19 08:13:38 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramAttributeForm.vm 2011-09-29 04:17:34 +0000
@@ -24,7 +24,7 @@
</script>
-<h3>$i18n.getString( "update_new_program_attribute" )</h3>
+<h3>$i18n.getString( "edit_program_attribute" )</h3>
<form id="updateProgramAttributeForm" action="updateProgramAttribute.action" method="post" >
<input type="hidden" id="id" name='id' value='$programAttribute.id'/>
<table id="attrTable">
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramForm.vm 2011-09-28 08:23:38 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramForm.vm 2011-09-29 04:17:34 +0000
@@ -11,7 +11,7 @@
</script>
-<h3>$i18n.getString( "update_program" )</h3>
+<h3>$i18n.getString( "edit_program" )</h3>
<form id="updateProgramForm" name="updateProgramForm" action="updateProgram.action" method="post" >
<div style="display:inline">
@@ -58,7 +58,7 @@
</tr>
<tr>
- <td><label>$i18n.getString( "single_event" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
+ <td><label>$i18n.getString( "single_event" )</td>
<td><input type="checkbox" id="singleEvent" name="singleEvent" #if( $program.singleEvent=='true' ) checked #end></td>
<td></td>
</tr>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramStageForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramStageForm.vm 2011-07-07 05:00:40 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramStageForm.vm 2011-09-29 04:17:34 +0000
@@ -35,7 +35,7 @@
}
</style>
-<h3>$i18n.getString( "update_program_stage" )</h3>
+<h3>$i18n.getString( "edit_program_stage" )</h3>
<form id="updateProgramStageForm" name="updateProgramStageForm" action="updateProgramStage.action" method="post">
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateRelationshipTypeForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateRelationshipTypeForm.vm 2011-05-19 08:14:24 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateRelationshipTypeForm.vm 2011-09-29 04:17:34 +0000
@@ -10,7 +10,7 @@
});
</script>
-<h3>$i18n.getString( "update_relationship_type" )</h3>
+<h3>$i18n.getString( "edit_relationship_type" )</h3>
<form id="updateRelationshipTypeForm" name="updateRelationshipTypeForm" action="updateRelationshipType.action" method="post">
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateSingleProgramValidationForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateSingleProgramValidationForm.vm 2011-07-08 05:52:59 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateSingleProgramValidationForm.vm 2011-09-29 04:17:34 +0000
@@ -1,4 +1,4 @@
-<h3>$i18n.getString( "update_program_validation" )</h3>
+<h3>$i18n.getString( "edit_program_validation" )</h3>
<form id='programValidationForm' name='programValidationForm' method='post' action='updateProgramValidation.action'>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateValidationCriteria.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateValidationCriteria.vm 2011-05-19 08:12:45 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateValidationCriteria.vm 2011-09-29 04:17:34 +0000
@@ -13,13 +13,13 @@
</script>
-<h3>$i18n.getString( "update_validation_criteria" )</h3>
+<h3>$i18n.getString( "edit_validation_criteria" )</h3>
<form id="validationCriteriaForm" action="updateValidationCriteria.action" method="post" >
<table>
<input type='hidden' id='id' name='id' value='$validationCriteria.id'/>
<tr>
- <th colspan="3">$i18n.getString('criteria_details')</th>
+ <th colspan="3">$i18n.getString('validation_criteria_details')</th>
</tr>
<tr>
<td><label>$i18n.getString('name')<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
