=== 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-04-19 10:02:59 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties 2012-04-19 22:00:04 +0000 @@ -1,11 +1,11 @@ back_to_search=Back to search back_to_registration=Back to registration back_to_relationship=Back to relationship -program_stages_history_plan=Program Stages History/Plan -scheduled_for=Scheduled For +program_stages_history_plan=Program stages history/plan +scheduled_for=Scheduled for list_all_patients=List all beneficiaries -program_summary=Program Summary -data_entry=Data Entry +program_summary=Program summary +data_entry=Data entry name_based=Name-based reports=Reports please_select_a_program=Please select a program @@ -13,35 +13,35 @@ please_choose_a_valid_start_end_date=Please choose a valid start and end date combination report_generation_failed=Report generation failed generate=Generate -start_date=Start Date -end_date=End Date +start_date=Start date +end_date=End date orgunit_boundary= Organisation unit boundary -invalid_date=Invalid Date -report_date=Report Date +invalid_date=Invalid date +report_date=Report date program=Program -due_date=Due Date +due_date=Due date stage=Stage -sort_by=Sort By -no_value=Please Select +sort_by=Sort by +no_value=Please select provided_elsewhere=Provided elsewhere fixed_attributes=Fixed attributes dynamic_attributes=Dynamic attributes attributes=Attributes -enrolled_in_program=Enrolled in Programs +enrolled_in_program=Enrolled in programs saving_value_failed_status_code=Saving value failed with status code saving_value_failed_error_code=Saving value failed with error code value_must_integer=Value must be an integer -searching_patient_failed=Searching Beneficiary failed -select_value=Select Value +searching_patient_failed=Searching beneficiary failed +select_value=Select value address=Address village=Village -registration_date=Date of Registration -full_name=Full Name +registration_date=Date of registration +full_name=Full name entry=Entry available_data_elements=Available Data Element selected_data_elements=Selected Data Element nr=Number -program_stage=Program Stage +program_stage=Program stage specify_a_search_criteria=Please specify your search criteria search=Search patient_identifier=Beneficiary Identifier @@ -89,12 +89,12 @@ date_less_incident_date=This date is less then the incident date. deleted=Deleted old_value=Old Value -case_aggregation=Beneficiary Aggregation +case_aggregation=Beneficiary aggregation please_specify_an_orgunit=Please specify an organisation unit please_select_to_date_greater_or_equals_to_from_date=Please select to-date greater or equals to from-date violate_validation=Violate validation common_info=Common information -dob_type=DOB Type +dob_type=DOB type blood_group=Blood group intro_multiple_name_based_data_entry=Enter data for multiple program stages and beneficiaries for a program. The entry screen gives an overview of the stage status. in=In @@ -103,71 +103,71 @@ successful_validation=The data entry screen successfully passed validation unsuccessful_validation=The data entry screen has validation errors, please correct these before proceeding the_following_dataelements_are_in_multi_stages=The following dataelements are in multi-program stages -validation_result=Validation Result +validation_result=Validation result should=should run_validation=Run validation please_select_village=Please select village select_sorting_attribute=Select a specfied attribute / ALL no_result=No result -hierachy_orgunit=Hierarchy Organisation Unit +hierachy_orgunit=Hierarchy organisation unit F=F M=M view_patient_chart=View patient chart generate_patient_chart=Generate patient chart -patient_chart_management=Patient Chart Management +patient_chart_management=Patient chart management 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 representative=Representative -manage_representative=Manage Representative +manage_representative=Manage representative confirm_delete_relationship=Are you sure you want to delete relationship? the_relationship_already_exists=The relationship already exists - choose a different relationship or partner please_select_partner=Please select relationship partner -assign_relationship=Assign Relationship +assign_relationship=Assign relationship result_matching_the_search_criteria=Result matching the search criteria adding_new_relationship_for=Adding new relationship for relationship=Relationship -manage_relationship=Relationship Management +manage_relationship=Relationship management relationship_already_exists=Relationship already exists -list_all_patients=List All Beneficiaries +list_all_patients=List all beneficiaries nr=No unenroll=Unenroll enroll=Enroll -date_of_incident=Date of Incident -date_of_enrollment=Date of Enrollment +date_of_incident=Date of incident +date_of_enrollment=Date of enrollment program_enrollment_management=Program enrollment management patient_registered=Beneficiary registered -patient_details=Beneficiary Details -enrolled_in_program=Enrolled in Programs +patient_details=Beneficiary details +enrolled_in_program=Enrolled in programs update_patient=Edit profile of beneficiary -search_by_name_identifier=Search by Name or Identifier +search_by_name_identifier=Search by name or identifier add_new_patient=Register new beneficiary -patient_identifier=Beneficiary Identifier -system_identifier=System Generated Identifier +patient_identifier=Beneficiary identifier +system_identifier=System generated identifier patient_management=Beneficiary management patient_duplicate=Beneficiary duplicate edit_this_patient=Edit profile of this beneficiary check_duplicate=Check duplicate -patient_identifiers=Beneficiary Identifiers -patient_attributes=Beneficiary Attributes -duplicate_warning=We found some Beneficiaries that have the same information. You can choose Continue creating this Beneficiary, or choose one of existing Beneficiaries to update information. +patient_identifiers=Beneficiary identifiers +patient_attributes=Beneficiary attributes +duplicate_warning=We found some beneficiaries that have the same information. You can choose continue creating this beneficiary, or choose one of existing beneficiaries to update information. create_new_patient=Continue register this beneficiary -no_duplicate_found=No duplicate Beneficiary found +no_duplicate_found=No duplicate beneficiary found patient_system_id=System generated ID -identifier_duplicate=Beneficiary Identifier duplicate -is_underage=Is Under-age +identifier_duplicate=Beneficiary identifier duplicate +is_underage=Is under-age add_new_person=Add new person search_existing_person=Search existing person search_by=Search by search_value=Search value -add_person_successfully=Add Person successfully -please_select_relationshipType=Please select Relationship type -please_choose_representative_for_this_under_age_patient=Please chose representative for this under age Beneficiary -please_choose_relationshipType_for_this_under_age_patient=Please choose relationship type for this under age Beneficiary -dateOfEnrollmentDescription=Date of Enrollment description -dateOfIncidentDescription=Date of Incident description -child_representative=Child's Representative +add_person_successfully=Add person successfully +please_select_relationshipType=Please select relationship type +please_choose_representative_for_this_under_age_patient=Please chose representative for this under age beneficiary +please_choose_relationshipType_for_this_under_age_patient=Please choose relationship type for this under age beneficiary +dateOfEnrollmentDescription=Date of enrollment description +dateOfIncidentDescription=Date of incident description +child_representative=Child's representative total_result=Total number of results add_new_relationship_for=Add new relationship for sort_by=Sort by @@ -180,32 +180,32 @@ year=Year please_verify_birthday=Please verify the birthday have_to_be_greater_or_equals_to=have to be greater and equals to -no_patients_found=No Patients Found +no_patients_found=No patients found please_enter_a_valid_full_name=Please enter a valid full name -program_unenrollment=Program UnEnrollment +program_unenrollment=Program un-enrollment death_date=Death date is_dead=is dead search_result=Search result date_invalid=The date is invalid date_less_incident=The date is less than date of incident can_not_register_patient_for_orgunit=Can not register patients for this organisation unit -search_by_program=Search by Program -list_patients_by_program=List Beneficiaries by Program -program_unenrollment_management=Program Un-Enrollment Management +search_by_program=Search by program +list_patients_by_program=List beneficiaries by program +program_unenrollment_management=Program un-enrollment management enrol_success=Beneficiary enrolled successfully duplicated_patient_list=Duplicated patient list 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=Beneficiary -confirm_delete_patient=Are you sure you want to delete the Beneficiary? +confirm_delete_patient=Are you sure you want to delete the beneficiary? please_enter_a_valid_birth_date=Please enter a valid date of birth relationship_management=Relationship management save_success=Save successfully -yes_and_attribute=Yes and Inherit Attribute +yes_and_attribute=Yes and inherit attribute identifiers=Identifiers -relationship_type=Relationship Type -identifier_type=Beneficiary Identifier Type +relationship_type=Relationship type +identifier_type=Beneficiary identifier type choose_this_person=Choose this person format_date=Format Date specify_search_criteria=Please specify search criteria @@ -218,17 +218,17 @@ case_aggregation_result=Beneficiary aggregation result aggregate_details=Aggregate details show_details=Show details -representative_info=Representative's Information +representative_info=Representative's information relationship_for=Relationship for create_new_encounter=Create new encounter date_of_edit=Date of edit -anonymous_events=Anonymous Events +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 please_enter_report_date=Please enter report date -comfirm_delete_current_event=Are you sure you want to delete the current event ? +comfirm_delete_current_event=Are you sure you want to delete the current event? registered_by_orgunit=Registered by facility event_information=Event information history_events=History events @@ -242,10 +242,10 @@ before_or_equals_to_due_date=Before or equals to due date after_due_date=After due date after_or_equals_to_due_date=After or equals to due date -leftSide=Left Side -rightSide=Right Side +leftSide=Left side +rightSide=Right side in_range_due_date_plus_or_minus=In range due date +/- -activity_planning=Activity Planning +activity_planning=Activity planning back_to_main_menu=Back to main menu of=of show_all_items=Show all items @@ -256,7 +256,7 @@ saved = Saved save_selected_values = Save selected values save_all_values = Save all values -intro_tabular_report=Use an interactive reporting tool for tracker-data using tabular presentation with dynamic filters for each data element. +intro_tabular_report= Use an interactive reporting tool for tracker-data using tabular presentation with dynamic filters for each data element. tabular_report = Tabular report true = Yes false = No @@ -267,14 +267,14 @@ orgunit_provided_service = Organisation unit provided service how_to_search_tabular_report = Quotes (") match phrases. Text values support %%, %=, =% and =. Numeric values support >=, >, <=, <, = and != operators. syntax_error_in_search_value = Syntax error is in search value -remove_selected_data_elements = Please remove selected data elements to select other program stage. Do you want to remove them ? +remove_selected_data_elements = Please remove selected data elements to select other program stage. Do you want to remove them? add_selected = Add selected program_enrollment = Program enrollment date_of_enrollment=Date of enrollment date_of_incident=Date of incident patient_details_and_history = Beneficiary details and history selected = Selected -orgunit = Organisation Unit +orgunit = Organisation unit add_all = Add all report_unit = Report unit order_by_orgunit = Order by organisation unit @@ -292,13 +292,13 @@ please_fill_out_only_one_of_these_fields = Please fill out at only one of these fields. age_year = Age(year) create = Create -migration_patient = Migration Beneficiary -patient_info = Beneficiary Information +migration_patient = Migration beneficiary +patient_info = Beneficiary information program_enrolled_for = Program enrolled for identifier_and_attribute = Identifier/Attribute -unenrollment = Un-Enrollment -modify_due_date_or_visit_date = Modify Due/Visit dates -data_entry_screen = Data entry Screen +unenrollment = Un-enrollment +modify_due_date_or_visit_date = Modify due/Visit dates +data_entry_screen = Data entry screen unenrol_success = Beneficiary un-enrolled successfully enrolled_for = Enrolled for selected_boundary = Selected (boundary) @@ -311,21 +311,20 @@ download = Download xls = XLS pdf = PDF -show_hide_settings_panel = Show/Hide Settings Panel +show_hide_settings_panel = Show/hide settings panel page = Page et_no_data = No data returned from server et_no_dataelement = Please select at least one data element. em_no_orgunits = Please select an organisation unit. reset = Reset -no = No. +no = No options = Options fullName = Full name gender = Gender -birthDate = Date of Birth +birthDate = Date of birth bloodGroup = Blood group phoneNumber = Phone number deathdate = Death date registrationDate = Date of registration -dobType = DOB Type report = Report et_no_program = Please select one program \ No newline at end of file === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js 2012-04-19 10:02:59 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js 2012-04-19 22:00:04 +0000 @@ -100,7 +100,7 @@ west_fieldset_width: 402, west_width_subtractor: 18, west_fill: 117, - west_fill_accordion_organisationunit: 75, + west_fill_accordion_organisationunit: 50, west_maxheight_accordion_organisationunit: 225, center_tbar_height: 31, east_gridcolumn_height: 30, @@ -240,7 +240,7 @@ }, setHeight: function(ms, panel, fill) { for (var i = 0; i < ms.length; i++) { - ms[i].setHeight(panel.getHeight() - fill); + ms[i].setHeight(panel.getHeight() - 45); } } }, @@ -1213,28 +1213,24 @@ items: [ { xtype: 'panel', - bodyStyle: 'border-style:none; background-color:transparent; padding:0 6px', + bodyStyle: 'border-style:none; background-color:transparent; padding:4px 0 0 8px', items: [ { xtype: 'label', text: TR.i18n.programs, - style: 'font-size:11px; font-weight:bold; padding:0 3px' + style: 'font-size:11px; font-weight:bold; padding:0 0 0 3px' }, { bodyStyle: 'padding:1px 0; border-style:none; background-color:transparent' }, { xtype: 'combobox', cls: 'tr-combo', - id:'programCombobox', - fieldLabel: TR.i18n.program, - labelStyle: 'padding-left:7px;font-weight:bold;', - labelWidth: TR.conf.layout.form_label_width, name: TR.init.system.programs, emptyText: TR.i18n.please_select, queryMode: 'local', editable: false, valueField: 'id', displayField: 'name', - width: TR.conf.layout.west_fieldset_width - TR.conf.layout.west_width_subtractor, + width: TR.conf.layout.west_fieldset_width, store: TR.store.program.available, listeners: { added: function() { @@ -1277,22 +1273,20 @@ }, { xtype: 'panel', - bodyStyle: 'border-style:none; background-color:transparent; padding:0 2px', + bodyStyle: 'border-style:none; background-color:transparent; padding:3px 0 0 0', layout: 'column', items: [ - { bodyStyle: 'padding:1px 0; border-style:none; background-color:transparent' }, { xtype: 'datefield', cls: 'tr-textfield-alt1', - id:'startDate', + id: 'startDate', fieldLabel: TR.i18n.start_date, - labelStyle: 'padding-left:7px;font-weight:bold;', - labelWidth: TR.conf.layout.form_label_width, + labelStyle: 'padding-left:3px; font-weight:bold', labelAlign: 'top', labelSeparator: '', editable: false, - style: 'margin-right:6px', - width: ( TR.conf.layout.west_fieldset_width - TR.conf.layout.west_width_subtractor)/2 - 8, + style: 'margin-right:8px', + width: TR.conf.layout.west_fieldset_width / 2 - 4, format: TR.i18n.format_date, value: new Date(), listeners: { @@ -1304,15 +1298,14 @@ { xtype: 'datefield', cls: 'tr-textfield-alt1', - style: 'margin-left:6px', - id:'endDate', + id: 'endDate', fieldLabel: TR.i18n.end_date, - labelStyle: 'padding-left:7px;font-weight:bold;', + labelStyle: 'padding-left:3px; font-weight:bold', labelWidth: TR.conf.layout.form_label_width, labelAlign: 'top', labelSeparator: '', editable: false, - width: ( TR.conf.layout.west_fieldset_width - TR.conf.layout.west_width_subtractor)/2 - 8, + width: TR.conf.layout.west_fieldset_width / 2 - 4, format: TR.i18n.format_date, value: new Date(), listeners: { @@ -1350,7 +1343,7 @@ xtype: 'treepanel', cls: 'tr-tree', width: TR.conf.layout.west_fieldset_width - TR.conf.layout.west_width_subtractor, - height: TR.conf.layout.west_maxheight_accordion_organisationunit, + height: 273, autoScroll: true, multiSelect: false, isrendered: false, @@ -1546,8 +1539,8 @@ TR.cmp.params.identifierType.panel ); - var programId = Ext.getCmp('programCombobox').getValue(); - if ( programId!=null && !TR.store.identifierType.available.isloaded ) { + var programId = TR.cmp.settings.program.getValue(); + if (programId != null && !TR.store.identifierType.available.isloaded) { TR.store.identifierType.available.load({params: {programId: programId}}); } } @@ -1560,18 +1553,19 @@ hideCollapseTool: true, items: [ { - xtype: 'label', - text: TR.i18n.fixed_attributes + xtype: 'label', + text: TR.i18n.fixed_attributes, + style: 'font-size:11px; font-weight:bold; color:#444; padding:0 0 0 3px' }, { xtype: 'panel', layout: 'column', - bodyStyle: 'border-style:none; padding:10px 10px;', + bodyStyle: 'border-style:none; padding:5px 0 10px 8px;', items: [ { xtype: 'panel', layout: 'anchor', - bodyStyle: 'border-style:none; ', + bodyStyle: 'border-style:none; padding:0 0 0 5px', defaults: { labelSeparator: '', listeners: { @@ -1662,21 +1656,22 @@ } ] - }, - + }, { xtype: 'label', - text: TR.i18n.dynamic_attributes + text: TR.i18n.dynamic_attributes, + style: 'font-size:11px; font-weight:bold; color:#444; padding:0 0 0 3px' }, { xtype: 'panel', layout: 'column', - bodyStyle: 'border-style:none', + bodyStyle: 'border-style:none; padding:5px 0 0 0', items: [ Ext.create('Ext.ux.form.MultiSelect', { name: 'availablePatientAttributes', cls: 'tr-toolbar-multiselect-left', width: (TR.conf.layout.west_fieldset_width - TR.conf.layout.west_width_subtractor) / 2, + height: 159, displayField: 'name', valueField: 'id', queryMode: 'local', @@ -1722,6 +1717,7 @@ name: 'selectedPatientAttribute', cls: 'tr-toolbar-multiselect-right', width: (TR.conf.layout.west_fieldset_width - TR.conf.layout.west_width_subtractor) / 2, + height: 159, displayField: 'name', valueField: 'id', ddReorder: true, @@ -1771,12 +1767,7 @@ TR.cmp.params.patientAttribute.panel = this; }, expand: function() { - TR.util.multiselect.setHeight( - [TR.cmp.params.patientAttribute.available, TR.cmp.params.patientAttribute.selected], - TR.cmp.params.patientAttribute.panel - ); - - var programId = Ext.getCmp('programCombobox').getValue(); + var programId = TR.cmp.settings.program.getValue(); if ( programId!=null && !TR.store.patientAttribute.available.isloaded ) { TR.store.patientAttribute.available.load({params: {programId: programId}}); } @@ -1832,6 +1823,7 @@ name: 'availableDataelementAttributes', cls: 'tr-toolbar-multiselect-left', width: (TR.conf.layout.west_fieldset_width - TR.conf.layout.west_width_subtractor) / 2, + height: 241, displayField: 'name', valueField: 'id', queryMode: 'remote', @@ -1877,6 +1869,7 @@ name: 'selectedDataelementAttribute', cls: 'tr-toolbar-multiselect-right', width: (TR.conf.layout.west_fieldset_width - TR.conf.layout.west_width_subtractor) / 2, + height: 241, displayField: 'name', valueField: 'id', ddReorder: true, @@ -1924,12 +1917,6 @@ listeners: { added: function() { TR.cmp.params.dataelement.panel = this; - }, - expand: function() { - TR.util.multiselect.setHeight( - [TR.cmp.params.dataelement.available, TR.cmp.params.dataelement.selected], - TR.cmp.params.dataelement.panel - ); } } }, @@ -1938,18 +1925,20 @@ { title: '
' + TR.i18n.options + '
', hideCollapseTool: true, + cls: 'tr-accordion-options', items: [ { xtype: 'combobox', cls: 'tr-combo', - id:'facilityLBCombobox', + id: 'facilityLBCombobox', fieldLabel: TR.i18n.use_data_from_level, + labelWidth: 135, emptyText: TR.i18n.please_select, queryMode: 'local', editable: false, valueField: 'value', displayField: 'name', - width: TR.conf.layout.west_fieldset_width - TR.conf.layout.west_width_subtractor - 20, + width: TR.conf.layout.west_fieldset_width - TR.conf.layout.west_width_subtractor, store: new Ext.data.ArrayStore({ fields: ['value', 'name'], data: [['all', TR.i18n.all], ['childrenOnly', TR.i18n.children_only], ['selected', TR.i18n.selected]], @@ -1966,13 +1955,14 @@ cls: 'tr-combo', id:'levelCombobox', fieldLabel: TR.i18n.show_hierachy_from_level, + labelWidth: 135, name: TR.conf.finals.programs, emptyText: TR.i18n.please_select, queryMode: 'local', editable: false, valueField: 'value', displayField: 'name', - width: TR.conf.layout.west_fieldset_width - TR.conf.layout.west_width_subtractor - 20, + width: TR.conf.layout.west_fieldset_width - TR.conf.layout.west_width_subtractor, store: Ext.create('Ext.data.Store', { fields: ['value', 'name'], data: TR.init.system.level, @@ -2054,7 +2044,7 @@ }, { xtype: 'button', - cls: 'tr-toolbar-btn-1', + cls: 'tr-toolbar-btn-2', text: TR.i18n.reset, width: 50, listeners: { @@ -2065,7 +2055,7 @@ }, { xtype: 'button', - text: TR.i18n.download, + text: TR.i18n.download + '..', execute: function(type) { TR.exe.execute( type ); }, @@ -2163,4 +2153,4 @@ }); }}); -}); \ No newline at end of file +}); === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/css/style.css' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/css/style.css 2012-04-19 10:02:59 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/css/style.css 2012-04-19 18:09:52 +0000 @@ -502,7 +502,7 @@ /* Textfield */ .tr-textfield .x-form-field, .tr-textfield-alt1 .x-form-field { - height: 24px; + height: 22px; padding-left: 4px; -moz-border-radius: 2px 2px 2px 2px; -webkit-border-radius: 2px 2px 2px 2px; === added file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/images/checkbox.gif' Binary files dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/images/checkbox.gif 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/images/checkbox.gif 2012-04-19 19:22:59 +0000 differ