dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #17640
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 7093: Remove unsed declare related to bloodgroup.
------------------------------------------------------------
revno: 7093
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2012-05-30 14:10:46 +0700
message:
Remove unsed declare related to bloodgroup.
added:
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/images/rightarrow.png
modified:
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/i18n.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/multiDataEntrySelect.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientRegistrationList.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/select.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/selectPatient.vm
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/i18n.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/i18n.vm 2012-05-30 06:36:41 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/i18n.vm 2012-05-30 07:10:46 +0000
@@ -43,7 +43,6 @@
full_name:'$encoder.jsEscape($i18n.getString( 'full_name' ) , "'")',
gender:'$encoder.jsEscape($i18n.getString( 'gender' ) , "'")',
date_of_birth:'$encoder.jsEscape($i18n.getString( 'date_of_birth' ) , "'")',
-blood_group:'$encoder.jsEscape($i18n.getString( 'blood_group' ) , "'")',
phone_number:'$encoder.jsEscape($i18n.getString( 'phone_number' ) , "'")',
death_date:'$encoder.jsEscape($i18n.getString( 'death_date' ) , "'")',
registration_date:'$encoder.jsEscape($i18n.getString( 'registration_date' ) , "'")',
=== added file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/images/rightarrow.png'
Binary files dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/images/rightarrow.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/images/rightarrow.png 2012-05-30 07:10:46 +0000 differ
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js 2012-05-26 17:38:10 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js 2012-05-30 07:10:46 +0000
@@ -100,10 +100,6 @@
{
element.replaceWith( genderSelector );
}
- else if ( attributeId=='-4' )
- {
- element.replaceWith( bloodTypeSelector );
- }
else if ( valueType=='YES/NO' )
{
element.replaceWith( trueFalseBox );
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/multiDataEntrySelect.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/multiDataEntrySelect.vm 2012-03-10 05:06:47 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/multiDataEntrySelect.vm 2012-05-30 07:10:46 +0000
@@ -59,7 +59,6 @@
var i18n_gender = '$encoder.jsEscape( $i18n.getString( "gender" ), "'")';
var i18n_dob_type = '$encoder.jsEscape( $i18n.getString( "dob_type" ), "'")';
var i18n_date_of_birth = '$encoder.jsEscape( $i18n.getString( "date_of_birth" ), "'")';
- var i18n_blood_group = '$encoder.jsEscape( $i18n.getString( "blood_group" ), "'")';
var i18n_none = '$encoder.jsEscape( $i18n.getString( "none" ), "'")';
var i18n_show_all_items = '$encoder.jsEscape( $i18n.getString( "show_all_items" ) , "'")';
</script>
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientRegistrationList.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientRegistrationList.vm 2012-05-03 10:18:41 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientRegistrationList.vm 2012-05-30 07:10:46 +0000
@@ -136,7 +136,6 @@
var i18n_gender = '$encoder.jsEscape( $i18n.getString( "gender" ), "'")';
var i18n_dob_type = '$encoder.jsEscape( $i18n.getString( "dob_type" ), "'")';
var i18n_date_of_birth = '$encoder.jsEscape( $i18n.getString( "date_of_birth" ), "'")';
- var i18n_blood_group = '$encoder.jsEscape( $i18n.getString( "blood_group" ), "'")';
var i18n_none = '$encoder.jsEscape( $i18n.getString( "none" ), "'")';
var i18n_select = '[' + '$encoder.jsEscape( $i18n.getString( "select" ), "'")' + ']';
var i18n_program_stages_history_plan = '$encoder.jsEscape( $i18n.getString( "program_stages_history_plan" ) , "'")';
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/select.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/select.vm 2012-05-24 16:51:34 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/select.vm 2012-05-30 07:10:46 +0000
@@ -27,8 +27,7 @@
<option value="-1">$i18n.getString( "date_of_birth" )</option>
<option value="-2">$i18n.getString( "gender" )</option>
<!-- option value="-3">$i18n.getString( "age" )</option -->
- <option value="-4">$i18n.getString( "blood_group" )</option>
- <option value="-5">$i18n.getString( "phone_number" )</option>
+ <option value="-4">$i18n.getString( "phone_number" )</option>
#foreach( $attribute in $patientAttributes )
<option value="$attribute.id" valueType='$attribute.valueType'>$encoder.htmlEncode( $attribute.name )</option>
#end
@@ -67,7 +66,6 @@
var i18n_gender = '$encoder.jsEscape( $i18n.getString( "gender" ), "'")';
var i18n_dob_type = '$encoder.jsEscape( $i18n.getString( "dob_type" ), "'")';
var i18n_date_of_birth = '$encoder.jsEscape( $i18n.getString( "date_of_birth" ), "'")';
- var i18n_blood_group = '$encoder.jsEscape( $i18n.getString( "blood_group" ), "'")';
var i18n_none = '$encoder.jsEscape( $i18n.getString( "none" ), "'")';
var i18n_select = '[' + '$encoder.jsEscape( $i18n.getString( "select" ), "'")' + ']';
var i18n_program_stages_history_plan = '$encoder.jsEscape( $i18n.getString( "program_stages_history_plan" ) , "'")';
@@ -107,18 +105,6 @@
genderSelector += '<option value="F">$i18n.getString( "female" )</option>';
genderSelector += '</select>';
- var bloodTypeSelector = "<select id='searchText' name='searchText' style='width:20.2em' >";
- bloodTypeSelector += "<option value=''>[$i18n.getString( "please_select" ) ]</option>";
- bloodTypeSelector += "<option value='A+'>A+</option>";
- bloodTypeSelector += "<option value='A-'>A-</option>";
- bloodTypeSelector += "<option value='AB+'>AB+</option>";
- bloodTypeSelector += "<option value='AB-'>AB-</option>";
- bloodTypeSelector += "<option value='B+'>B+</option>";
- bloodTypeSelector += "<option value='B-'>B-</option>";
- bloodTypeSelector += "<option value='O+'>O+</option>";
- bloodTypeSelector += "<option value='O-'>O-</option>";
- bloodTypeSelector += '</select>';
-
#foreach ( $program in $programs )
programComboBox += '<option value="$program.id">$program.name</option>';
#end
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/selectPatient.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/selectPatient.vm 2012-05-24 16:51:34 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/selectPatient.vm 2012-05-30 07:10:46 +0000
@@ -25,8 +25,7 @@
<option value="-1">$i18n.getString( "date_of_birth" )</option>
<option value="-2">$i18n.getString( "gender" )</option>
<!-- option value="-3">$i18n.getString( "age" )</option -->
- <option value="-4">$i18n.getString( "blood_group" )</option>
- <option value="-5">$i18n.getString( "phone_number" )</option>
+ <option value="-4">$i18n.getString( "phone_number" )</option>
#foreach( $attribute in $patientAttributes )
<option value="$attribute.id" valueType='$attribute.valueType'>$encoder.htmlEncode( $attribute.name )</option>
#end
@@ -93,7 +92,6 @@
var i18n_patient_date_of_birth = '$encoder.jsEscape( $i18n.getString( "date_of_birth" ) , "'")';
var i18n_patient_dob_type = '$encoder.jsEscape( $i18n.getString( "dob_type" ), "'")';
var i18n_patient_age = '$encoder.jsEscape( $i18n.getString( "age" ) , "'")';
- var i18n_patient_blood_group = '$encoder.jsEscape( $i18n.getString( "blood_group" ) , "'")';
var i18n_patient_phone_number = '$encoder.jsEscape( $i18n.getString( "phone_number" ) , "'")';
var i18n_edit_this_patient = '$encoder.jsEscape( $i18n.getString( "edit_this_patient" ) , "'")';
var i18n_no_duplicate_found = '$encoder.jsEscape( $i18n.getString( "no_duplicate_found" ) , "'")';
@@ -155,18 +153,6 @@
genderSelector += '<option value="F">$i18n.getString( "female" )</option>';
genderSelector += '</select>';
- var bloodTypeSelector = "<select id='searchText' name='searchText' style='width:20.2em' >";
- bloodTypeSelector += "<option value=''>[$i18n.getString( "please_select" ) ]</option>";
- bloodTypeSelector += "<option value='A+'>A+</option>";
- bloodTypeSelector += "<option value='A-'>A-</option>";
- bloodTypeSelector += "<option value='AB+'>AB+</option>";
- bloodTypeSelector += "<option value='AB-'>AB-</option>";
- bloodTypeSelector += "<option value='B+'>B+</option>";
- bloodTypeSelector += "<option value='B-'>B-</option>";
- bloodTypeSelector += "<option value='O+'>O+</option>";
- bloodTypeSelector += "<option value='O-'>O-</option>";
- bloodTypeSelector += '</select>';
-
var programComboBox = '<select id="searchText" name="searchText" style="width:20.2em" >';
#foreach ( $program in $programs )
programComboBox += '<option value="$program.id">$program.name</option>';
