dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #25583
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 12732: renamed and reorganized some labes in add/edit program
------------------------------------------------------------
revno: 12732
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2013-10-16 16:35:52 +0200
message:
renamed and reorganized some labes in add/edit program
modified:
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/addProgramForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/style/basic.css
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramForm.vm
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-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 2013-10-16 13:51:30 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties 2013-10-16 14:35:52 +0000
@@ -11,6 +11,7 @@
please_select=Please select
is=is
confirm_delete_relationship_type=Are you sure you want to delete relationship type?
+relationship_description=Relationship (e.g. Mother-Child)
relationship_type = Relationship type
relationship_type_details=Relationship type details
a_is_to_b=A is to B
@@ -239,7 +240,7 @@
insert = Insert
visit_selected_program_stage = Visited selected program stage
intro_patient_aggregation_query_builder = Define formulas, expressions, rules for aggregation data from name-based to aggregation system
-show_incident_date = Show incident date
+show_incident_date = Show incidence date
display_date_of_incident = Display date of incident
patient_attribute_group_sort_order = Person attribute group sort order
visit_selected_program_stage_x_th_time = Visit selected program stage x(th) time
@@ -290,7 +291,7 @@
not_null = Not null
confirm_delete_prorgam_stage_section = Are you sure you want to delete this program stage section ?
form_details = Form details
-enrollment_details = Enrollment details
+enrollment_details = Enrollment
repeatable_program_stage_details = Repeatable program stage details
schedule_automated_aggregation = Automated Aggregation
schedule_automated_aggregation_form = Schedule automated aggregation
@@ -310,7 +311,7 @@
description_not_null = Description is not null
expression_not_null = Expression is not null
complete_allowed_only_if_validation_passes = Complete allowed only if validation passes
-skip_to_generate_overdue_events = Skip to generate overdue events
+skip_to_generate_overdue_events = Skip generation of events that are overdue (before enrollment date)
display_generate_event_box_after_completed = Display generate event box after completed
calculated = Calculated
enrollment_date = Enrollment date
@@ -351,7 +352,7 @@
insert_images = Insert images
patient_registration_form = Person Registration Form
insert_data_elements = Insert data elements
-only_enroll_once = Only enroll once
+only_enroll_once = Only enroll once (per person lifetime)
insert_a_due_date = Please insert a due-date
capture_coordinates = Capture coordinates
task_stragely = Task strategy
@@ -433,14 +434,14 @@
healthWorker = Health worker
create_default_registration_form = Create default registration form
minus_with_dataelement = Data Element Date Diff
-use_birth_date_as_incident_date = Use birthdate as incident date
-use_birth_date_as_enrollment_date = Use birthdate as enrollment date
+use_birth_date_as_incident_date = Set incidence date to date of birth
+use_birth_date_as_enrollment_date = Set enrollment date to date of birth
default_form_name = Default form name
custom_form_name = Custom form name
allow_select_enrollment_dates_in_future = Allow seleting enrollment dates in future
related_patient = Related person
-allow_select_enrollment_date_in_future = Allow to select enrollment date in future
-allow_select_incident_date_in_future = Allow to select incident date in future
+allow_select_enrollment_date_in_future = Allow future enrollment dates
+allow_select_incident_date_in_future = Allow future incidence dates
relationship_text = Relationship text
relationship_details = Relationship details
program_related = Program related
@@ -466,16 +467,17 @@
scope = Scope
drop_down_lists = Drop-down lists
radio_buttons = Radio buttons
-open_data_entry_form_after_enrolment = Open data entry form after enrolment
+open_data_entry_form_after_enrolment = Open data entry form after enrollment
report_date_to_use = Report Date to use
-the_properties_to_open_data_entry_form_after_enrolment_is_active_in_the_stage = The properties to open data entry form after enrolment is active in the stage
+the_properties_to_open_data_entry_form_after_enrolment_is_active_in_the_stage = The properties to open data entry form after enrollment is active in the stage
add_relative = Add relative
who_is_the_new_relative_to_the_existing_person = Who is the new relative to the existing person?
program_for_new_relative_to_be_enrolled_in = Program for new relative to be enrolled in
health_worker = Health worker
is_hidden = Is hidden ?
default_value = Default value
-dashboard_shortcut_to_add_relative = Dashboard shortcut to add relative
+dashboard_shortcut_to_add_relative = Shortcut link to add a relative
shortcut_link_label_eg_add_child = Shortcut link label (e.g. Add Child)
relationship = Relationship
select_at_least_one_scope=Select at least one scope for local id
+scheduling_of_events = Scheduling of events
=== 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 2013-10-16 13:45:47 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramForm.vm 2013-10-16 14:35:52 +0000
@@ -66,11 +66,10 @@
selectedPropertyIds.empty();
var personDisplayNames = jQuery( "#personDisplayNames" );
personDisplayNames.empty();
-
- if(getFieldValue('type')!=3){
- jQuery("#selectedList").find("tr").each( function( i, item ){
-
- selectedPropertyIds.append( "<option value='" + item.id + "' selected='true'>" + item.id + "</option>" );
+
+ if( getFieldValue('type') != 3 ) {
+ jQuery("#selectedList").find("tr").each( function( i, item ){
+ selectedPropertyIds.append( "<option value='" + item.id + "' selected='true'>" + item.id + "</option>" );
var displayed = jQuery( item ).find( "input[name='displayed']:first");
var checked = displayed.attr('checked') ? true : false;
@@ -95,10 +94,10 @@
<select id='messageType' name="messageType" multiple="multiple" class="hidden"></select>
<select id='userGroup' name="userGroup" multiple="multiple" class="hidden"></select>
-<table>
+<table>
<thead>
<tr>
- <th colspan="2">$i18n.getString( "program_details" )</th>
+ <th colspan="2" style="width: 590px;">$i18n.getString( "program_details" )</th>
</tr>
</thead>
@@ -126,20 +125,20 @@
</td>
<td></td>
</tr>
-
+
<tr>
<td><label>$i18n.getString( "data_entry_method" ) </label></td>
<td>
- <select id='dataEntryMethod' name='dataEntryMethod' >
+ <select id='dataEntryMethod' name='dataEntryMethod' style="width: 335px;">
<option value='false' selected>$i18n.getString('drop_down_lists')</option>
<option value='true'>$i18n.getString('radio_buttons')</option>
</select>
</td>
<td></td>
</tr>
-
+
<tr name='nonAnonymous'>
- <th colspan="2">$i18n.getString( "enrollment_details" )</th>
+ <th colspan="2" style="width: 590px;">$i18n.getString( "enrollment_details" )</th>
</tr>
<tr name='nonAnonymous'>
@@ -153,43 +152,31 @@
<td><input type="checkbox" id="selectIncidentDatesInFuture" name="selectIncidentDatesInFuture" value='true' ></td>
<td></td>
</tr>
-
- <tr name='nonAnonymous'>
- <td><label>$i18n.getString( "skip_to_generate_overdue_events" )</label></td>
- <td><input type="checkbox" id="ignoreOverdueEvents" name="ignoreOverdueEvents" value='true'></td>
- <td></td>
- </tr>
-
- <tr name='nonAnonymous'>
- <td><label>$i18n.getString( "only_enroll_once" )</label></td>
- <td><input type="checkbox" id="onlyEnrollOnce" name="onlyEnrollOnce" value='true'></td>
- <td></td>
- </tr>
-
- <tr>
- <td><label>$i18n.getString( "used_by_all_orgunits" )</label></td>
- <td><input type="checkbox" id="displayOnAllOrgunit" name="displayOnAllOrgunit" value='true'></td>
- <td></td>
- </tr>
-
- <tr name='nonAnonymous'>
- <td><label>$i18n.getString( "use_birth_date_as_incident_date" )</label></td>
- <td><input type="checkbox" id="useBirthDateAsIncidentDate" name="useBirthDateAsIncidentDate" value='true'></td>
- <td></td>
- </tr>
-
- <tr name='nonAnonymous'>
- <td><label>$i18n.getString( "use_birth_date_as_enrollment_date" )</label></td>
- <td><input type="checkbox" id="useBirthDateAsEnrollmentDate" name="useBirthDateAsEnrollmentDate" value='true' ></td>
- <td></td>
- </tr>
-
- <tr name='nonAnonymous'>
- <td><label>$i18n.getString( "show_incident_date" )</label></td>
- <td><input type="checkbox" id="displayIncidentDate" name="displayIncidentDate" value='true' onchange='programOnChange();' checked ></td>
- <td></td>
- </tr>
-
+
+ <tr name='nonAnonymous'>
+ <td><label>$i18n.getString( "use_birth_date_as_incident_date" )</label></td>
+ <td><input type="checkbox" id="useBirthDateAsIncidentDate" name="useBirthDateAsIncidentDate" value='true'></td>
+ <td></td>
+ </tr>
+
+ <tr name='nonAnonymous'>
+ <td><label>$i18n.getString( "use_birth_date_as_enrollment_date" )</label></td>
+ <td><input type="checkbox" id="useBirthDateAsEnrollmentDate" name="useBirthDateAsEnrollmentDate" value='true' ></td>
+ <td></td>
+ </tr>
+
+ <tr name='nonAnonymous'>
+ <td><label>$i18n.getString( "only_enroll_once" )</label></td>
+ <td><input type="checkbox" id="onlyEnrollOnce" name="onlyEnrollOnce" value='true'></td>
+ <td></td>
+ </tr>
+
+ <tr name='nonAnonymous'>
+ <td><label>$i18n.getString( "show_incident_date" )</label></td>
+ <td><input type="checkbox" id="displayIncidentDate" name="displayIncidentDate" value='true' onchange='programOnChange();' checked ></td>
+ <td></td>
+ </tr>
+
<tr name='nonAnonymous'>
<td><label>$i18n.getString( "date_of_incident_description" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
<td><input style="width: 330px;" type="text" id="dateOfIncidentDescription" name="dateOfIncidentDescription" class="{validate:{required:true,minlength:2}}" value="Incident Date"></td>
@@ -202,6 +189,13 @@
<td></td>
</tr>
+ <tr>
+ <td><label>$i18n.getString( "used_by_all_orgunits" )</label></td>
+ <td><input type="checkbox" id="displayOnAllOrgunit" name="displayOnAllOrgunit" value='true'></td>
+ <td></td>
+ </tr>
+
+
<tr name='nonAnonymous'>
<th colspan="2">$i18n.getString( "dashboard_shortcut_to_add_relative" )</th>
</tr>
@@ -210,9 +204,9 @@
<td>$i18n.getString("shortcut_link_label_eg_add_child")</td>
<td><input type='text' id='relationshipText' name='relationshipText' ></td>
</tr>
-
+
<tr name='nonAnonymous'>
- <td>$i18n.getString("relationship")</td>
+ <td>$i18n.getString("relationship_description")</td>
<td>
<select type='text' id='relationshipTypeId' name='relationshipTypeId' onchange='relationshipTypeOnchange()' >
<option value=''>[$i18n.getString("please_select")]</option>
@@ -222,7 +216,7 @@
</select>
</td>
</tr>
-
+
<tr name='nonAnonymous'>
<td>$i18n.getString("who_is_the_new_relative_to_the_existing_person")</td>
<td>
@@ -245,18 +239,41 @@
<tr><td> </td><td> </td></tr>
<tbody>
</table>
-
+
+<table name='nonAnonymous'>
+ <thead>
+ <tr>
+ <th colspan="2" style="width: 590px;">$i18n.getString( "scheduling_of_events" )</th>
+ </tr>
+ </thead>
+
+ <tbody>
+ <tr name='nonAnonymous'>
+ <td><label>$i18n.getString( "skip_to_generate_overdue_events" )</label></td>
+ <td><input type="checkbox" id="ignoreOverdueEvents" name="ignoreOverdueEvents" value='true'></td>
+ <td></td>
+ </tr>
+ </tbody>
+</table>
+
+<br />
+
<table name='nonAnonymous'>
<colgroup>
<col style="width:400px;"/>
<col/>
<col style="width:400px;"/>
</colgroup>
+ <thead>
+ <tr>
+ <th colspan="3" style="width: 590px;">$i18n.getString( "identifiers_and_attributes" )</th>
+ </tr>
+ </thead>
<thead>
<tr>
- <th>$i18n.getString( "available_identifiers_and_attributes" )</th>
+ <th>$i18n.getString( "available" )</th>
<th></th>
- <th>$i18n.getString( "select_identifiers_and_attributes" )
+ <th>$i18n.getString( "selected" )
<select style='display:none;' multiple id="selectedPropertyIds" name="selectedPropertyIds" ></select>
<select style='display:none;' multiple id="personDisplayNames" name="personDisplayNames" ></select>
</th>
@@ -288,8 +305,9 @@
</colgroup>
<thead>
<tr>
- <th>$i18n.getString( "identifiers_and_attributes" )</th>
- <th>$i18n.getString( "displayed_in_patient_list" )</th>
+ <th style="width:180px;">$i18n.getString( "identifiers_and_attributes" )</th>
+ <th style="width:20px;">$i18n.getString( "displayed_in_patient_list" )</th>
+ </tr>
</thead>
<tbody id="selectedList"></tbody>
</table>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/style/basic.css'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/style/basic.css 2012-10-26 04:16:25 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/style/basic.css 2013-10-16 14:35:52 +0000
@@ -14,7 +14,7 @@
select
{
- width:325px;
+ width:325px;
text-align:left;
}
=== 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 2013-10-16 13:45:47 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramForm.vm 2013-10-16 14:35:52 +0000
@@ -98,7 +98,7 @@
<table id="detailsList">
<thead>
<tr>
- <th colspan="2">$i18n.getString( "program_details" )</th>
+ <th colspan="2" style="width: 590px;">$i18n.getString( "program_details" )</th>
</tr>
</thead>
<tbody>
@@ -129,7 +129,7 @@
<tr>
<td><label>$i18n.getString( "data_entry_method" ) </label></td>
<td>
- <select id='dataEntryMethod' name='dataEntryMethod' >
+ <select id='dataEntryMethod' name='dataEntryMethod' style="width: 335px;">
<option value='false' #if( $program.dataEntryMethod=='false' ) selected #end>$i18n.getString('drop_down_lists')</option>
<option value='true' #if( $program.dataEntryMethod=='true' ) selected #end>$i18n.getString('radio_buttons')</option>
</select>
@@ -158,37 +158,26 @@
<td><input type="checkbox" id="selectIncidentDatesInFuture" name="selectIncidentDatesInFuture" value='true' #if($program.selectIncidentDatesInFuture=='true') checked #end ></td>
<td></td>
</tr>
-
- <tr name='nonAnonymous'>
- <td><label>$i18n.getString( "skip_to_generate_overdue_events" )</label></td>
- <td><input type="checkbox" id="ignoreOverdueEvents" name="ignoreOverdueEvents" value='true' #if($program.ignoreOverdueEvents=='true') checked #end #if( $program.type!='1' ) disabled #end ></td>
- <td></td>
- </tr>
-
+
+ <tr name='nonAnonymous'>
+ <td><label>$i18n.getString( "use_birth_date_as_incident_date" )</label></td>
+ <td><input type="checkbox" id="useBirthDateAsIncidentDate" name="useBirthDateAsIncidentDate" value='true' #if($program.useBirthDateAsIncidentDate=='true') checked #end /></td>
+ <td></td>
+ </tr>
+
+ <tr name='nonAnonymous'>
+ <td><label>$i18n.getString( "use_birth_date_as_enrollment_date" )</label></td>
+ <td><input type="checkbox" id="useBirthDateAsEnrollmentDate" name="useBirthDateAsEnrollmentDate" value='true' #if($program.useBirthDateAsEnrollmentDate=='true') checked #end ></td>
+ <td></td>
+ </tr>
+
+
<tr name='nonAnonymous'>
<td><label>$i18n.getString( "only_enroll_once" )</label></td>
<td><input type="checkbox" id="onlyEnrollOnce" name="onlyEnrollOnce" value='true' onchange='programOnChange();' #if( $program.type!='1' ) disabled #end #if($program.onlyEnrollOnce=='true') checked #end></td>
<td></td>
</tr>
-
- <tr>
- <td><label>$i18n.getString( "used_by_all_orgunits" )</label></td>
- <td><input type="checkbox" id="displayOnAllOrgunit" name="displayOnAllOrgunit" value='true' #if($program.displayOnAllOrgunit) checked #end></td>
- <td></td>
- </tr>
-
- <tr name='nonAnonymous'>
- <td><label>$i18n.getString( "use_birth_date_as_incident_date" )</label></td>
- <td><input type="checkbox" id="useBirthDateAsIncidentDate" name="useBirthDateAsIncidentDate" value='true' #if($program.useBirthDateAsIncidentDate=='true') checked #end /></td>
- <td></td>
- </tr>
-
- <tr name='nonAnonymous'>
- <td><label>$i18n.getString( "use_birth_date_as_enrollment_date" )</label></td>
- <td><input type="checkbox" id="useBirthDateAsEnrollmentDate" name="useBirthDateAsEnrollmentDate" value='true' #if($program.useBirthDateAsEnrollmentDate=='true') checked #end ></td>
- <td></td>
- </tr>
-
+
<tr name='nonAnonymous'>
<td><label>$i18n.getString( "show_incident_date" )</label></td>
<td><input type="checkbox" id="displayIncidentDate" name="displayIncidentDate" value='true' onchange='programOnChange();' #if( $program.type=='3' ) disabled #elseif($program.displayIncidentDate=='true') checked #end></td>
@@ -207,6 +196,13 @@
<td></td>
</tr>
+ <tr>
+ <td><label>$i18n.getString( "used_by_all_orgunits" )</label></td>
+ <td><input type="checkbox" id="displayOnAllOrgunit" name="displayOnAllOrgunit" value='true' #if($program.displayOnAllOrgunit) checked #end></td>
+ <td></td>
+ </tr>
+
+
<tr name='nonAnonymous'>
<th colspan="2">$i18n.getString( "dashboard_shortcut_to_add_relative" )</th>
</tr>
@@ -258,17 +254,39 @@
<tbody>
</table>
+ <table name='nonAnonymous'>
+ <thead>
+ <tr>
+ <th colspan="2" style="width: 590px;">$i18n.getString( "scheduling_of_events" )</th>
+ </tr>
+ </thead>
+
+ <tbody>
+ <tr name='nonAnonymous'>
+ <td><label>$i18n.getString( "skip_to_generate_overdue_events" )</label></td>
+ <td><input type="checkbox" id="ignoreOverdueEvents" name="ignoreOverdueEvents" value='true' #if($program.ignoreOverdueEvents=='true') checked #end #if( $program.type!='1' ) disabled #end ></td>
+ <td></td>
+ </tr>
+ </tbody>
+ </table>
+
+
<table name='nonAnonymous'>
<colgroup>
<col style="width:400px;"/>
<col/>
<col style="width:400px;"/>
</colgroup>
+ <thead>
+ <tr>
+ <th colspan="3" style="width: 590px;">$i18n.getString( "identifiers_and_attributes" )</th>
+ </tr>
+ </thead>
<thead>
<tr>
- <th>$i18n.getString( "available_identifiers_and_attributes" )</th>
+ <th>$i18n.getString( "available" )</th>
<th></th>
- <th>$i18n.getString( "select_identifiers_and_attributes" )
+ <th>$i18n.getString( "selected" )
<select style='display:none;' multiple id="selectedPropertyIds" name="selectedPropertyIds" ></select>
<select style='display:none;' multiple id="personDisplayNames" name="personDisplayNames" ></select>
</th>
@@ -303,6 +321,7 @@
<tr>
<th style="width:180px;">$i18n.getString( "identifiers_and_attributes" )</th>
<th style="width:20px;">$i18n.getString( "displayed_in_patient_list" )</th>
+ </tr>
</thead>
<tbody id="selectedList" #if($program.type==3) style="display:none;" #end>
#foreach( $identifier in $program.patientIdentifierTypes )
