dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #17625
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 7081: (patient) Removed bloodgroup property.
------------------------------------------------------------
revno: 7081
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2012-05-29 22:37:40 +0700
message:
(patient) Removed bloodgroup property.
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/Patient.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientMobileSetting.java
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/Beneficiary.java
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/ActivityReportingServiceImpl.java
dhis-2/dhis-services/dhis-service-mobile/src/main/resources/org/hisp/dhis/mobile/PatientMobileSetting.hbm.xml
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/startup/TableAlteror.java
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patientattributevalue/hibernate/HibernatePatientAttributeValueStore.java
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramInstanceService.java
dhis-2/dhis-services/dhis-service-patient/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/patient/hibernate/Patient.hbm.xml
dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisConvenienceTest.java
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/AddPatientAction.java
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/AddRelationshipPatientAction.java
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/AddRepresentativeAction.java
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/UpdatePatientAction.java
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/webapp/dhis-web-caseentry/javascript/patient.js
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/underage.js
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientForm.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responseDuplicate.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responsePatient.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responsePatientDetails.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responsePatients.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/updatePatientForm.vm
dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/beneficiaryregistration/action/SaveBeneficiaryAction.java
dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/beneficiaryDetail.vm
dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/registration/beneficiaryRegistrationForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/UpdateMobileSettingAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/javascript/caseentry-patient.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/patientSettings.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/javascript/validationcriteria.js
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-api/src/main/java/org/hisp/dhis/patient/Patient.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/Patient.java 2012-04-17 04:39:03 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/Patient.java 2012-05-29 15:37:40 +0000
@@ -76,8 +76,6 @@
private Date birthDate;
- private String bloodGroup;
-
private String phoneNumber;
private Date deathDate;
@@ -531,17 +529,7 @@
return name;
}
-
- public String getBloodGroup()
- {
- return bloodGroup;
- }
-
- public void setBloodGroup( String bloodGroup )
- {
- this.bloodGroup = bloodGroup;
- }
-
+
public String getPhoneNumber()
{
return phoneNumber;
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientMobileSetting.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientMobileSetting.java 2011-11-24 14:36:19 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientMobileSetting.java 2012-05-29 15:37:40 +0000
@@ -36,7 +36,10 @@
private static final long serialVersionUID = -5947521380646718129L;
- private Boolean gender, dobtype, birthdate, bloodgroup, registrationdate;
+ private Boolean gender;
+ private Boolean dobtype;
+ private Boolean birthdate;
+ private Boolean registrationdate;
private List<PatientAttribute> patientAttributes;
@@ -84,16 +87,6 @@
this.birthdate = birthdate;
}
- public Boolean getBloodgroup()
- {
- return bloodgroup;
- }
-
- public void setBloodgroup( Boolean bloodgroup )
- {
- this.bloodgroup = bloodgroup;
- }
-
public Boolean getRegistrationdate()
{
return registrationdate;
=== modified file 'dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/Beneficiary.java'
--- dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/Beneficiary.java 2012-05-24 14:51:18 +0000
+++ dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/Beneficiary.java 2012-05-29 15:37:40 +0000
@@ -75,8 +75,6 @@
private Date birthDate;
- private String bloodGroup;
-
private Date registrationDate;
private Character dobType;
@@ -142,16 +140,6 @@
this.birthDate = birthDate;
}
- public String getBloodGroup()
- {
- return bloodGroup;
- }
-
- public void setBloodGroup( String bloodGroup )
- {
- this.bloodGroup = bloodGroup;
- }
-
public Date getRegistrationDate()
{
return registrationDate;
@@ -280,16 +268,6 @@
dout.writeBoolean( false );
}
- if ( bloodGroup != null )
- {
- dout.writeBoolean( true );
- dout.writeUTF( bloodGroup );
- }
- else
- {
- dout.writeBoolean( false );
- }
-
if ( registrationDate != null )
{
dout.writeBoolean( true );
=== modified file 'dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/ActivityReportingServiceImpl.java'
--- dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/ActivityReportingServiceImpl.java 2012-05-15 07:40:06 +0000
+++ dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/ActivityReportingServiceImpl.java 2012-05-29 15:37:40 +0000
@@ -341,10 +341,6 @@
{
beneficiary.setBirthDate( patient.getBirthDate() );
}
- if ( setting.getBloodgroup() )
- {
- beneficiary.setBloodGroup( patient.getBloodGroup() );
- }
if ( setting.getRegistrationdate() )
{
beneficiary.setRegistrationDate( patient.getRegistrationDate() );
=== modified file 'dhis-2/dhis-services/dhis-service-mobile/src/main/resources/org/hisp/dhis/mobile/PatientMobileSetting.hbm.xml'
--- dhis-2/dhis-services/dhis-service-mobile/src/main/resources/org/hisp/dhis/mobile/PatientMobileSetting.hbm.xml 2011-10-18 20:23:09 +0000
+++ dhis-2/dhis-services/dhis-service-mobile/src/main/resources/org/hisp/dhis/mobile/PatientMobileSetting.hbm.xml 2012-05-29 15:37:40 +0000
@@ -16,8 +16,6 @@
<property name="birthdate" column="birthdate" not-null="true" />
- <property name="bloodgroup" column="bloodgroup" not-null="true" />
-
<property name="registrationdate" column="registrationdate" not-null="true" />
<list name="patientAttributes">
=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/startup/TableAlteror.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/startup/TableAlteror.java 2012-05-28 09:46:00 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/startup/TableAlteror.java 2012-05-29 15:37:40 +0000
@@ -35,6 +35,8 @@
import org.amplecode.quick.StatementManager;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.hisp.dhis.patient.PatientAttribute;
+import org.hisp.dhis.patient.PatientAttributeService;
import org.hisp.dhis.system.startup.AbstractStartupRoutine;
import org.springframework.transaction.annotation.Transactional;
@@ -61,6 +63,13 @@
this.statementManager = statementManager;
}
+ private PatientAttributeService patientAttributeService;
+
+ public void setPatientAttributeService( PatientAttributeService patientAttributeService )
+ {
+ this.patientAttributeService = patientAttributeService;
+ }
+
// -------------------------------------------------------------------------
// Action Implementation
// -------------------------------------------------------------------------
@@ -78,24 +87,28 @@
executeSql( "ALTER TABLE patientdatavalue DROP COLUMN categoryoptioncomboid" );
executeSql( "ALTER TABLE patientdatavaluearchive DROP COLUMN providedbyanotherfacility" );
executeSql( "ALTER TABLE patientdatavaluearchive DROP COLUMN organisationunitid" );
- executeSql( "ALTER TABLE patientdatavaluearchive DROP COLUMN storedby" );
- executeSql( "DROP TABLE patientchart" );
-
+ executeSql( "ALTER TABLE patientdatavaluearchive DROP COLUMN storedby" );
+ executeSql( "DROP TABLE patientchart" );
+
executeSql( "ALTER TABLE program DROP COLUMN hidedateofincident" );
-
+
executeSql( "UPDATE program SET type=2 where singleevent=true" );
executeSql( "UPDATE program SET type=3 where anonymous=true" );
executeSql( "ALTER TABLE program DROP COLUMN singleevent" );
- executeSql( "ALTER TABLE program DROP COLUMN anonymous" );
+ executeSql( "ALTER TABLE program DROP COLUMN anonymous" );
executeSql( "UPDATE program SET type=1 where type is null" );
-
+
executeSql( "DROP TABLE programattributevalue" );
- executeSql( "DROP TABLE programinstance_attributes");
+ executeSql( "DROP TABLE programinstance_attributes" );
executeSql( "DROP TABLE programattributeoption" );
executeSql( "DROP TABLE programattribute" );
-
+
executeSql( "ALTER TABLE patientattribute DROP COLUMN noChars" );
executeSql( "ALTER TABLE programstageinstance ALTER executiondate TYPE date" );
+
+ createPatientAttribute();
+ executeSql( "ALTER TABLE patientidentifier ALTER COLUMN patientid DROP NOT NULL" );
+ //executeSql( "ALTER TABLE patientmobilesetting DROP COLUMN bloodGroup" );
}
// -------------------------------------------------------------------------
@@ -112,7 +125,7 @@
ResultSet resultSet = statement
.executeQuery( "SELECT distinct programstageinstanceid, organisationunitid, providedByAnotherFacility FROM patientdatavalue" );
-
+
while ( resultSet.next() )
{
executeSql( "UPDATE programstageinstance SET organisationunitid=" + resultSet.getInt( 2 )
@@ -134,6 +147,47 @@
}
}
+ private void createPatientAttribute()
+ {
+ PatientAttribute patientAttribute = patientAttributeService.getPatientAttributeByName( "Blood group" );
+ if( patientAttribute == null )
+ {
+ patientAttribute = new PatientAttribute();
+ patientAttribute.setName( "Blood group" );
+ patientAttribute.setDescription( "Blood group" );
+ patientAttribute.setValueType( PatientAttribute.TYPE_STRING );
+ patientAttribute.setMandatory( false );
+ patientAttribute.setInheritable( false );
+ patientAttribute.setGroupBy( false );
+ int patientAttributeId = patientAttributeService.savePatientAttribute( patientAttribute );
+
+ StatementHolder holder = statementManager.getHolder();
+
+ try
+ {
+ Statement statement = holder.getStatement();
+
+ ResultSet resultSet = statement.executeQuery( "SELECT patientid, bloodgroup FROM patient where bloodgroup is not null and bloodgroup != '' " );
+
+ while ( resultSet.next() )
+ {
+ executeSql( "INSERT INTO patientattributevalue(patientid, patientattributeid, value) VALUES ( " +
+ resultSet.getInt( 1 )+ "," + patientAttributeId + ",'" + resultSet.getString( 2 ) + "' )" );
+ }
+
+ executeSql( "ALTER TABLE patient DROP COLUMN bloodgroup" );
+ }
+ catch ( Exception ex )
+ {
+ log.error( ex );
+ }
+ finally
+ {
+ holder.close();
+ }
+ }
+ }
+
private int executeSql( String sql )
{
try
=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patientattributevalue/hibernate/HibernatePatientAttributeValueStore.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patientattributevalue/hibernate/HibernatePatientAttributeValueStore.java 2012-05-24 16:51:34 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patientattributevalue/hibernate/HibernatePatientAttributeValueStore.java 2012-05-29 15:37:40 +0000
@@ -311,17 +311,10 @@
+ " WHERE p" + index + ".integerValueOfAge='" + searchText + "'";
isSearchByAttribute = false;
}
- // blood-group
+ // phone number
else if ( patientAttributeId == -4 )
{
hql += " ( SELECT p" + index + " FROM Patient AS p" + index
- + " WHERE p" + index + ".bloodGroup='" + searchText + "'";
- isSearchByAttribute = false;
- }
- // phone number
- else if ( patientAttributeId == -5 )
- {
- hql += " ( SELECT p" + index + " FROM Patient AS p" + index
+ " WHERE p" + index + ".phoneNumber='" + searchText + "'";
isSearchByAttribute = false;
}
=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramInstanceService.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramInstanceService.java 2012-05-02 08:15:45 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramInstanceService.java 2012-05-29 15:37:40 +0000
@@ -221,10 +221,6 @@
attrGrid.addValue( i18n.getString( patient.getDobType() + "" ) );
attrGrid.addRow();
- attrGrid.addValue( i18n.getString( "blood_group" ) );
- attrGrid.addValue( ( patient.getBloodGroup() == null || patient.getBloodGroup().isEmpty() ) ? PatientAttributeValue.UNKNOWN : patient.getBloodGroup() );
-
- attrGrid.addRow();
attrGrid.addValue( i18n.getString( "phoneNumber" ) );
attrGrid.addValue( ( patient.getPhoneNumber() == null || patient.getPhoneNumber().isEmpty() ) ? PatientAttributeValue.UNKNOWN : patient.getPhoneNumber() );
=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-services/dhis-service-patient/src/main/resources/META-INF/dhis/beans.xml 2012-05-27 22:33:33 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/resources/META-INF/dhis/beans.xml 2012-05-29 15:37:40 +0000
@@ -364,6 +364,7 @@
<bean id="org.hisp.dhis.patient.startup.TableAlteror" class="org.hisp.dhis.patient.startup.TableAlteror" >
<property name="statementManager" ref="statementManager" />
+ <property name="patientAttributeService" ref="org.hisp.dhis.patient.PatientAttributeService" />
<property name="name" value="PatientTableAlteror" />
<property name="runlevel" value="4" />
<property name="skipInTests" value="true" />
=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/patient/hibernate/Patient.hbm.xml'
--- dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/patient/hibernate/Patient.hbm.xml 2012-04-17 04:39:03 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/patient/hibernate/Patient.hbm.xml 2012-05-29 15:37:40 +0000
@@ -24,8 +24,6 @@
<property name="isDead" column="isdead" />
- <property name="bloodGroup" column="bloodgroup" length="5" />
-
<property name="gender" column="gender" length="5" not-null="true" />
<property name="phoneNumber" length="25" />
=== modified file 'dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisConvenienceTest.java'
--- dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisConvenienceTest.java 2012-04-12 20:05:29 +0000
+++ dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisConvenienceTest.java 2012-05-29 15:37:40 +0000
@@ -891,7 +891,6 @@
patient.setLastName( "LastName" + uniqueChar );
patient.setGender( Patient.MALE );
patient.setBirthDate( getDate( 1970, 1, 1 ) );
- patient.setBloodGroup( "A" );
patient.setRegistrationDate( new Date() );
return patient;
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/AddPatientAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/AddPatientAction.java 2012-05-28 21:23:50 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/AddPatientAction.java 2012-05-29 15:37:40 +0000
@@ -100,8 +100,6 @@
private String gender;
- private String bloodGroup;
-
private String phoneNumber;
private String registrationDate;
@@ -168,7 +166,6 @@
patient.setGender( gender );
patient.setIsDead( false );
- patient.setBloodGroup( bloodGroup );
patient.setPhoneNumber( phoneNumber );
patient.setUnderAge( underAge );
patient.setOrganisationUnit( organisationUnit );
@@ -384,11 +381,6 @@
this.gender = gender;
}
- public void setBloodGroup( String bloodGroup )
- {
- this.bloodGroup = bloodGroup;
- }
-
public void setPhoneNumber( String phoneNumber )
{
this.phoneNumber = phoneNumber;
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/AddRelationshipPatientAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/AddRelationshipPatientAction.java 2012-04-17 04:39:03 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/AddRelationshipPatientAction.java 2012-05-29 15:37:40 +0000
@@ -102,8 +102,6 @@
private Character dobType;
private String gender;
-
- private String bloodGroup;
private String phoneNumber;
@@ -174,7 +172,6 @@
patient.setGender( gender );
patient.setIsDead( false );
- patient.setBloodGroup( bloodGroup );
patient.setPhoneNumber( phoneNumber );
patient.setUnderAge( underAge );
patient.setOrganisationUnit( organisationUnit );
@@ -383,11 +380,6 @@
this.gender = gender;
}
- public void setBloodGroup( String bloodGroup )
- {
- this.bloodGroup = bloodGroup;
- }
-
public void setPatientAttributeOptionService( PatientAttributeOptionService patientAttributeOptionService )
{
this.patientAttributeOptionService = patientAttributeOptionService;
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/AddRepresentativeAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/AddRepresentativeAction.java 2011-09-14 06:36:13 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/AddRepresentativeAction.java 2012-05-29 15:37:40 +0000
@@ -80,8 +80,6 @@
private String gender;
- private String bloodGroup;
-
private String registrationDate;
private Integer relationshipTypeId;
@@ -120,7 +118,7 @@
String middleName = "";
String lastName = "";
- if ( fullName.indexOf( ' ' ) != -1 ) // TODO fix hack
+ if ( fullName.indexOf( ' ' ) != -1 )
{
firstName = fullName.substring( 0, startIndex );
if ( startIndex == endIndex )
@@ -145,7 +143,6 @@
patient.setGender( gender );
patient.setIsDead( false );
- patient.setBloodGroup( bloodGroup );
patient.setOrganisationUnit( organisationUnit );
if ( dobType == Patient.DOB_TYPE_VERIFIED || dobType == Patient.DOB_TYPE_DECLARED )
@@ -276,11 +273,6 @@
this.gender = gender;
}
- public void setBloodGroup( String bloodGroup )
- {
- this.bloodGroup = bloodGroup;
- }
-
public Integer getRelationshipTypeId()
{
return relationshipTypeId;
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/UpdatePatientAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/UpdatePatientAction.java 2012-05-26 17:38:10 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/UpdatePatientAction.java 2012-05-29 15:37:40 +0000
@@ -99,9 +99,7 @@
private Boolean verified;
private String gender;
-
- private String bloodGroup;
-
+
private String phoneNumber;
private boolean underAge;
@@ -167,7 +165,6 @@
patient.setGender( gender );
patient.setIsDead( isDead );
- patient.setBloodGroup( bloodGroup );
patient.setPhoneNumber( phoneNumber );
if ( deathDate != null )
@@ -232,7 +229,7 @@
else if ( identifier != null )
{
patient.getIdentifiers().remove( identifier );
- patientIdentifierService.deletePatientIdentifier( identifier );
+// patientIdentifierService.deletePatientIdentifier( identifier );
}
}
}
@@ -398,12 +395,7 @@
{
this.gender = gender;
}
-
- public void setBloodGroup( String bloodGroup )
- {
- this.bloodGroup = bloodGroup;
- }
-
+
public void setPhoneNumber( String phoneNumber )
{
this.phoneNumber = phoneNumber;
=== 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-05-29 09:23:37 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties 2012-05-29 15:37:40 +0000
@@ -95,7 +95,6 @@
violate_validation=Violate validation
common_info=Common information
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
is_null=is null
@@ -321,7 +320,6 @@
lastName = Last name
gender = Gender
birthDate = Date of birth
-bloodGroup = Blood group
phoneNumber = Mobile phone number
deathdate = Death date
registrationDate = Date of registration
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/patient.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/patient.js 2012-05-24 05:13:57 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/patient.js 2012-05-29 15:37:40 +0000
@@ -203,7 +203,6 @@
sPatient += "<tr><td class='bold'>" + i18n_patient_gender + "</td><td>" + jQuery(patient).find('gender').text() + "</td></tr>" ;
sPatient += "<tr><td class='bold'>" + i18n_patient_date_of_birth + "</td><td>" + jQuery(patient).find('dateOfBirth').text() + "</td></tr>" ;
sPatient += "<tr><td class='bold'>" + i18n_patient_age + "</td><td>" + jQuery(patient).find('age').text() + "</td></tr>" ;
- sPatient += "<tr><td class='bold'>" + i18n_patient_blood_group + "</td><td>" + jQuery(patient).find('bloodGroup').text() + "</td></tr>";
sPatient += "<tr><td class='bold'>" + i18n_patient_phone_number + "</td><td>" + jQuery(patient).find('phoneNumber').text() + "</td></tr>";
var identifiers = jQuery(patient).find('identifier');
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/underage.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/underage.js 2012-04-17 04:39:03 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/underage.js 2012-05-29 15:37:40 +0000
@@ -105,7 +105,6 @@
sPatient += "<tr><td class='bold'>" + i18n_patient_gender + "</td><td>" + $( patient ).find('gender').text() + "</td></tr>" ;
sPatient += "<tr><td class='bold'>" + i18n_patient_date_of_birth + "</td><td>" + $( patient ).find('dateOfBirth').text() + "</td></tr>" ;
sPatient += "<tr><td class='bold'>" + i18n_patient_age + "</td><td>" + $( patient ).find('age').text() + "</td></tr>" ;
- sPatient += "<tr><td class='bold'>" + i18n_patient_blood_group + "</td><td>" + $( patient ).find('bloodGroup').text() + "</td></tr>";
sPatient += "<tr><td class='bold'>" + i18n_patient_phone_number + "</td><td>" + $( patient ).find('phoneNumber').text() + "</td></tr>";
var identifiers = $( patient ).find('identifier');
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientForm.vm 2012-05-26 17:38:10 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientForm.vm 2012-05-29 15:37:40 +0000
@@ -62,23 +62,6 @@
<input id="memberValidator" class="hidden {validate:{required:true}}"/>
</td>
</tr>
-
-<tr>
- <td class='text-column'><label for="bloodGroup">$i18n.getString( "blood_group" )</label></td>
- <td class="input-column" colspan='2'>
- <select id="bloodGroup" name="bloodGroup">
- <option value="">[$i18n.getString( "please_select" )]</option>
- <option value="A+">A+</option>
- <option value="A-">A-</option>
- <option value="AB+">AB+</option>
- <option value="AB-">AB-</option>
- <option value="B+">B+</option>
- <option value="B-">B-</option>
- <option value="O+">O+</option>
- <option value="O-">O-</option>
- </select>
- </td>
-</tr>
<tr>
<td class='text-column'><label for="phoneNumber">$i18n.getString( "phone_number" )</label></td>
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responseDuplicate.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responseDuplicate.vm 2011-09-14 06:36:13 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responseDuplicate.vm 2012-05-29 15:37:40 +0000
@@ -7,7 +7,6 @@
<gender>$encoder.xmlEncode( $i18n.getString($patient.gender ))</gender>
<dateOfBirth>$format.formatDate( $patient.birthDate )</dateOfBirth>
<age>$encoder.xmlEncode( $patient.getAge() )</age>
- <bloodGroup>#if( $patient.bloodGroup ) $encoder.xmlEncode( $patient.bloodGroup ) #else N/A #end</bloodGroup>
#foreach( $identifier in $patient.identifiers )
#if( $identifier.identifierType )
<identifier>
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responsePatient.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responsePatient.vm 2012-04-17 04:39:03 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responsePatient.vm 2012-05-29 15:37:40 +0000
@@ -6,7 +6,6 @@
<dobType>#if($!patient.dobType)$!patient.dobType#else $i18n.getString('none') #end</dobType>
<dateOfBirth>$!format.formatDate( $!patient.birthDate )</dateOfBirth>
<age>$!encoder.xmlEncode( $patient.getAge() )</age>
- <bloodGroup>#if($!patient.bloodGroup) $patient.bloodGroup #else $i18n.getString('none') #end</bloodGroup>
<phoneNumber>#if($!patient.phoneNumber) $patient.phoneNumber #else $i18n.getString('none') #end</phoneNumber>
#foreach( $patientIdentifier in $patient.identifiers )
<identifier>
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responsePatientDetails.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responsePatientDetails.vm 2012-04-17 04:39:03 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responsePatientDetails.vm 2012-05-29 15:37:40 +0000
@@ -5,8 +5,7 @@
<gender>$!encoder.xmlEncode( $i18n.getString($patient.gender ))</gender>
<dateOfBirth>$!format.formatDate( $patient.birthDate )</dateOfBirth>
<age>$!encoder.xmlEncode( $patient.getAge() )</age>
- <bloodGroup>$!encoder.xmlEncode( $patient.getBloodGroup() )</bloodGroup>
- <phoneNumber>$!encoder.xmlEncode( $patient.phoneNumber )</bloodGroup>
+ <phoneNumber>$!encoder.xmlEncode( $patient.phoneNumber )</phoneNumber>
#foreach( $patientIdentifier in $!patient.identifiers )
<identifier>
<identifierText>$!encoder.xmlEncode( $!patientIdentifier.identifier )</identifierText>
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responsePatients.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responsePatients.vm 2012-04-17 04:39:03 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responsePatients.vm 2012-05-29 15:37:40 +0000
@@ -7,8 +7,7 @@
<gender>$!encoder.xmlEncode( $i18n.getString( $patient.gender ))</gender>
<dateOfBirth>$format.formatDate( $patient.birthDate )</dateOfBirth>
<age>$!encoder.xmlEncode( $patient.getAge() )</age>
- <bloodGroup>#if( $patient.bloodGroup ) $!encoder.xmlEncode( $patient.bloodGroup ) #else N/A #end</bloodGroup>
- <phoneNumber>#if( $patient.phoneNumber ) $!encoder.xmlEncode( $patient.phoneNumber ) #else N/A #end</bloodGroup>
+ <phoneNumber>#if( $patient.phoneNumber ) $!encoder.xmlEncode( $patient.phoneNumber ) #else N/A #end</phoneNumber>
#foreach( $identifier in $patient.identifiers )
#if( $identifier.identifierType )
<identifier>
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/updatePatientForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/updatePatientForm.vm 2012-05-26 17:38:10 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/updatePatientForm.vm 2012-05-29 15:37:40 +0000
@@ -115,23 +115,6 @@
<input id="memberValidator" class="hidden {validate:{required:true}}"/>
</td>
</tr>
-
- <tr>
- <td class='text-column'><label for="bloodGroup">$i18n.getString( "blood_group" )</label></td>
- <td class="input-column" colspan='2'>
- <select type="text" id="bloodGroup" name="bloodGroup">
- <option value="">[$i18n.getString( "please_select" )]</option>
- <option value="A+" #if($!patient.bloodGroup == "A+") selected="selected" #end>A+</option>
- <option value="A-" #if($!patient.bloodGroup == "A-") selected="selected" #end>A-</option>
- <option value="AB+" #if($!patient.bloodGroup == "AB+") selected="selected" #end>AB+</option>
- <option value="AB-" #if($!patient.bloodGroup == "AB-") selected="selected" #end>AB-</option>
- <option value="B+" #if($!patient.bloodGroup == "B+") selected="selected" #end>B+</option>
- <option value="B-" #if($!patient.bloodGroup == "B-") selected="selected" #end>B-</option>
- <option value="O+" #if($!patient.bloodGroup == "O+") selected="selected" #end>O+</option>
- <option value="O-" #if($!patient.bloodGroup == "O-") selected="selected" #end>O-</option>
- </select>
- </td>
- </tr>
<tr>
<td class='text-column'><label for="phoneNumber">$i18n.getString( "phone_number" )</label></td>
@@ -188,7 +171,7 @@
##set( $identifier = '' )
#set( $identifier = $identiferMap.get( $identifierType.id ) )
<tr>
- <td class='text-column'><label for="bloodGroup">$identifierType.name #if($identifierType.mandatory)<em title="$i18n.getString( "required" )" class="required">*</em> #end</label></td>
+ <td class='text-column'><label>$identifierType.name #if($identifierType.mandatory)<em title="$i18n.getString( "required" )" class="required">*</em> #end</label></td>
<td class="input-column" colspan='2'><input type="text" id="iden$identifierType.id" name="iden$identifierType.id" value="$!identifier" data="{related:$identifierType.related}" #if($identifierType.related && $!patient.underAge) disabled="disabled" #end class="{validate:{required:$identifierType.mandatory, #if($!identifierType.noChars) maxlength:$identifierType.noChars, #end #if($identifierType.type=='number') number:true #elseif($!identifierType.type=='letter') lettersonly:true #end }}" /></td>
</tr>
#end
@@ -297,10 +280,6 @@
<td class="bold text-column">$i18n.getString("age"):</td>
<td> $!representative.getAge() </td>
</tr>
- <tr>
- <td class="bold text-column">$i18n.getString("blood_group"):</td>
- <td>$!representative.getBloodGroup()</td>
- </tr>
#foreach( $patientIdentifier in $representative.identifiers )
<tr>
<td class="bold text-column">#if( $patientIdentifier.identifierType )$patientIdentifier.identifierType.name: #else $i18n.getString("system_identifier"): #end</td>
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties 2012-04-05 13:13:13 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties 2012-05-29 15:37:40 +0000
@@ -331,7 +331,7 @@
first_name=First name
email=E-mail
username=Username
-phone_number=Phone number
+phone_number=Mobile phone number
organisation_units=Organisation units
user_roles=User roles
update_user_success=Updated information successfully
=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/beneficiaryregistration/action/SaveBeneficiaryAction.java'
--- dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/beneficiaryregistration/action/SaveBeneficiaryAction.java 2012-05-24 14:51:18 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/beneficiaryregistration/action/SaveBeneficiaryAction.java 2012-05-29 15:37:40 +0000
@@ -98,19 +98,7 @@
{
this.patientFullName = patientFullName;
}
-
- private String bloodGroup;
-
- public String getBloodGroup()
- {
- return bloodGroup;
- }
-
- public void setBloodGroup( String bloodGroup )
- {
- this.bloodGroup = bloodGroup;
- }
-
+
private String gender;
public String getGender()
@@ -215,7 +203,6 @@
}
patient.setGender( gender );
- patient.setBloodGroup( bloodGroup );
patient.setRegistrationDate( new Date() );
try
{
@@ -233,7 +220,6 @@
this.validated = false;
this.previousValues.put( "fullName", this.patientFullName );
this.previousValues.put( "gender", this.gender );
- this.previousValues.put( "bloodGroup", this.bloodGroup );
this.previousValues.put( "dob", this.dateOfBirth );
return SUCCESS;
}
=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/beneficiaryDetail.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/beneficiaryDetail.vm 2012-05-24 14:51:18 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/beneficiaryDetail.vm 2012-05-29 15:37:40 +0000
@@ -8,7 +8,6 @@
#set($month = $patient.birthDate.month+1)
#set($year = $patient.birthDate.year + 1900)
<li><b>$i18n.getString("date_of_birth"):</b> $year - $month - $day </li>
- <li><b>$i18n.getString("blood_group"):</b> $patient.bloodGroup</li>
</ul>
<p>
=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/registration/beneficiaryRegistrationForm.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/registration/beneficiaryRegistrationForm.vm 2012-05-23 13:55:43 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/registration/beneficiaryRegistrationForm.vm 2012-05-29 15:37:40 +0000
@@ -44,19 +44,6 @@
<br /><span style="color: #990000;"> $i18n.getString($validationMap.get( "dob" ))</span>
#end
<input type="text" name="dateOfBirth" value="$!previousValues.get("dob")" />
-
- <label>$i18n.getString( "blood_group" )</label>
- <select name="bloodGroup">
- <option value="">[Please select]</option>
- #set($bloodGroups = ["A+", "A-", "AB+", "AB-", "B+", "B-", "O+", "O-"])
- #foreach($item in $bloodGroups)
- <option value="$item"
- #if($previousValues.get("bloodGroup") == $item)
- selected
- #end
- >$item</option>
- #end
- </select>
</p>
</div>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/UpdateMobileSettingAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/UpdateMobileSettingAction.java 2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/UpdateMobileSettingAction.java 2012-05-29 15:37:40 +0000
@@ -81,7 +81,7 @@
this.selectedList = selectedList;
}
- private String gender, dobtype, birthdate, bloodgroup, registrationdate;
+ private String gender, dobtype, birthdate, registrationdate;
public void setGender( String gender )
{
@@ -98,16 +98,6 @@
this.birthdate = birthdate;
}
- public void setBloodgroup( String bloodgroup )
- {
- this.bloodgroup = bloodgroup;
- }
-
- public void setRegistrationdate( String registrationdate )
- {
- this.registrationdate = registrationdate;
- }
-
// -------------------------------------------------------------------------
// Action implementation
// -------------------------------------------------------------------------
@@ -129,7 +119,6 @@
setting.setGender( Boolean.parseBoolean( gender ) );
setting.setDobtype( Boolean.parseBoolean( dobtype ) );
setting.setBirthdate( Boolean.parseBoolean( birthdate ) );
- setting.setBloodgroup( Boolean.parseBoolean( bloodgroup ) );
setting.setRegistrationdate( Boolean.parseBoolean( registrationdate ) );
patientMobileSettingService.updatePatientMobileSetting( setting );
}
@@ -141,7 +130,6 @@
setting.setGender( Boolean.parseBoolean( gender ) );
setting.setDobtype( Boolean.parseBoolean( dobtype ) );
setting.setBirthdate( Boolean.parseBoolean( birthdate ) );
- setting.setBloodgroup( Boolean.parseBoolean( bloodgroup ) );
setting.setRegistrationdate( Boolean.parseBoolean( registrationdate ) );
fillValues( attributes );
patientMobileSettingService.savePatientMobileSetting( setting );
@@ -158,7 +146,6 @@
setting.setGender( Boolean.parseBoolean( gender ) );
setting.setDobtype( Boolean.parseBoolean( dobtype ) );
setting.setBirthdate( Boolean.parseBoolean( birthdate ) );
- setting.setBloodgroup( Boolean.parseBoolean( bloodgroup ) );
setting.setRegistrationdate( Boolean.parseBoolean( registrationdate ) );
fillValues( attributes );
patientMobileSettingService.updatePatientMobileSetting( setting );
@@ -171,7 +158,6 @@
setting.setGender( Boolean.parseBoolean( gender ) );
setting.setDobtype( Boolean.parseBoolean( dobtype ) );
setting.setBirthdate( Boolean.parseBoolean( birthdate ) );
- setting.setBloodgroup( Boolean.parseBoolean( bloodgroup ) );
setting.setRegistrationdate( Boolean.parseBoolean( registrationdate ) );
fillValues( attributes );
patientMobileSettingService.savePatientMobileSetting( setting );
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/javascript/caseentry-patient.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/javascript/caseentry-patient.js 2012-05-24 05:13:57 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/javascript/caseentry-patient.js 2012-05-29 15:37:40 +0000
@@ -198,7 +198,6 @@
sPatient += "<tr><td class='bold'>" + i18n_patient_gender + "</td><td>" + jQuery(patient).find('gender').text() + "</td></tr>" ;
sPatient += "<tr><td class='bold'>" + i18n_patient_date_of_birth + "</td><td>" + jQuery(patient).find('dateOfBirth').text() + "</td></tr>" ;
sPatient += "<tr><td class='bold'>" + i18n_patient_age + "</td><td>" + jQuery(patient).find('age').text() + "</td></tr>" ;
- sPatient += "<tr><td class='bold'>" + i18n_patient_blood_group + "</td><td>" + jQuery(patient).find('bloodGroup').text() + "</td></tr>";
sPatient += "<tr><td class='bold'>" + i18n_patient_phone_number + "</td><td>" + jQuery(patient).find('phoneNumber').text() + "</td></tr>";
var identifiers = jQuery(patient).find('identifier');
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/patientSettings.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/patientSettings.vm 2011-10-18 20:23:09 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/patientSettings.vm 2012-05-29 15:37:40 +0000
@@ -20,10 +20,6 @@
<td><input type="checkbox" id="birthdate" name="birthdate" value="true" #if( $setting.birthdate == 'true' ) checked #end/></td>
</tr>
<tr>
- <td>$i18n.getString( "blood_group" )</td>
- <td><input type="checkbox" id="bloodgroup" name="bloodgroup" value="true" #if( $setting.bloodgroup == 'true' ) checked #end/></td>
- </tr>
- <tr>
<td>$i18n.getString( "registration_date" )</td>
<td><input type="checkbox" id="registrationdate" name="registrationdate" value="true" #if( $setting.registrationdate == 'true' ) checked #end/></td>
</tr>
=== 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 2012-03-19 09:35:42 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addValidationCriteria.vm 2012-05-29 15:37:40 +0000
@@ -25,7 +25,6 @@
<option value="dobType">$i18n.getString( "dob_type" )</option>
<option value="birthDate">$i18n.getString( "date_of_birth" )</option>
<option value="integerValueOfAge">$i18n.getString( "age" )</option>
- <option value="bloodGroup">$i18n.getString( "blood_group" )</option>
</select>
<!-- Operator -->
@@ -70,20 +69,6 @@
</script>
</div>
- <!-- bloodGroup -->
- <div id="bloodGroupDiv" style="display:none ">
- <select id="bloodGroupValue" name="bloodGroupValue" onChange="fillValue(this.value);" style="width: 16em">
- <option value="" selected="selected">[$i18n.getString( "please_select" )]</option>
- <option value="A+">A+</option>
- <option value="A-">A-</option>
- <option value="AB+">AB+</option>
- <option value="AB-">AB-</option>
- <option value="B+">B+</option>
- <option value="B-">B-</option>
- <option value="O+">O+</option>
- <option value="O-">O-</option>
- </select>
- </div>
<!-- value -->
<input type="hidden" id="value" name="value" class="{validate:{required:true,rangelength:[1,160]}}"/>
</td>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/validationcriteria.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/validationcriteria.js 2012-03-13 09:47:39 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/validationcriteria.js 2012-05-29 15:37:40 +0000
@@ -50,8 +50,7 @@
div.style.display = 'block';
if( propertyName == 'gender' ||
- propertyName == 'dobType' ||
- propertyName == 'bloodGroup' ){
+ propertyName == 'dobType' ){
byId('operator').selectedIndex = 1;
disable('operator');
@@ -66,8 +65,7 @@
hideById('genderDiv');
hideById('integerValueOfAgeDiv');
hideById('birthDateDiv');
- hideById('dobTypeDiv');
- hideById('bloodGroupDiv');
+ hideById('dobTypeDiv');
}
function fillValue( value ){
=== 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 2012-03-19 09:35:42 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateValidationCriteria.vm 2012-05-29 15:37:40 +0000
@@ -28,7 +28,6 @@
<option value="birthDate" #if("$validationCriteria.property" == "birthDate") selected #end>$i18n.getString( "date_of_birth" )</option>
<option value="dobType" #if("$validationCriteria.property" == "dobType") selected #end>$i18n.getString( "dob_type" )</option>
<option value="integerValueOfAge" #if("$validationCriteria.property" == "integerValueOfAge") selected #end>$i18n.getString( "age" )</option>
- <option value="bloodGroup" #if("$validationCriteria.property" == "bloodGroup") selected #end>$i18n.getString( "blood_group" )</option>
</select>
<select id='operator' name='operator' style='width: 7em'>
<option value='-1' #if( "$validationCriteria.operator"=='-1') selected #end>$i18n.getString('operator_less_then')</option>
@@ -69,20 +68,6 @@
<script type="text/javascript">datePickerValid( 'birthDateValue' );</script>
</div>
- <!-- bloodGroup -->
- <div id="bloodGroupDiv" style="display:none ">
- <select id="bloodGroupValue" name="bloodGroupValue" onChange="fillValue(this.value);" style="width: 16em">
- <option value="">[$i18n.getString( "please_select" )]</option>
- <option value="A+">A+</option>
- <option value="A-">A-</option>
- <option value="AB+">AB+</option>
- <option value="AB-">AB-</option>
- <option value="B+">B+</option>
- <option value="B-">B-</option>
- <option value="O+">O+</option>
- <option value="O-">O-</option>
- </select>
- </div>
<input type='hidden' id='value' name='value' value="$validationCriteria.value" class="{validate:{required:true}}"/>
</td>
</tr>
