dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #07665
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 2225: Minor fix.
------------------------------------------------------------
revno: 2225
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: trunk
timestamp: Fri 2010-09-24 16:50:39 +0700
message:
Minor fix.
modified:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patient/SearchPatientAction.java
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/addPatientForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updatePatientForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/validationCriteria.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/java/org/hisp/dhis/patient/action/patient/SearchPatientAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patient/SearchPatientAction.java 2010-09-22 06:44:36 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patient/SearchPatientAction.java 2010-09-24 09:50:39 +0000
@@ -240,6 +240,7 @@
{
patientAttribute = patientAttributeService.getPatientAttribute(sortPatientAttributeId);
}
+
organisationUnit = selectionManager.getSelectedOrganisationUnit();
patientAttributes = patientAttributeService.getAllPatientAttributes();
@@ -266,6 +267,7 @@
//System.out.println("listAll startPos "+ startPos+" endPos "+ endPos );
patients = patientService.getPatientsByOrgUnitAttr( organisationUnit , startPos,endPos, patientAttribute );
+
if( patients != null && patients.size() > 0 )
{
//System.out.println("patients size = "+patients.size());
@@ -278,7 +280,8 @@
mapRelationShip.put( patient.getId(), relationshipService.getRelationshipsForPatient( patient ) );
if(sortPatientAttributeId!=null && patientAttribute!=null)
{
- mapPatientPatientAttr.put(patient, patientAttributeValueService.getPatientAttributeValue( patient, patientAttribute ).getValue());
+ mapPatientPatientAttr.put(patient,
+ patientAttributeValueService.getPatientAttributeValue( patient, patientAttribute ).getValue());
}
}
}
@@ -309,12 +312,13 @@
//System.out.println(" searchingAttributeId != null && searchText != null ");
patients = patientAttributeValueService.searchPatientAttributeValue(
patientAttribute, searchText, pagingUtil.getStartPos(), pagingUtil.getPageSize() );
-
+
if( patients != null && patients.size() > 0 )
{
if(sortPatientAttributeId!=null && patientAttribute!=null)
{
patients = patientService.sortPatientsByAttribute(patients, patientAttribute);
+ System.out.println("\n\n\n 000 : " + patients);
}
for( Patient patient : patients )
{
@@ -325,7 +329,7 @@
}
}
}
-
+
return SUCCESS;
}
@@ -467,7 +471,7 @@
}
}
}
-
+
return SUCCESS;
}
=== 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 2010-09-23 15:16:08 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties 2010-09-24 09:50:39 +0000
@@ -390,4 +390,7 @@
add_dependent = Add dependent
inheritable = Inheritable
show_patient_relationships = Show Beneficiary's relationship
-add_new_relationship_for = Add new relationship for
\ No newline at end of file
+add_new_relationship_for = Add new relationship for
+sort_by = Sort by
+other_details = Other Details
+patient_attribute_details = Patient attribute details
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientForm.vm 2010-08-24 07:43:37 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientForm.vm 2010-09-24 09:50:39 +0000
@@ -40,15 +40,15 @@
</tr>
<tr>
<td><label for="firstName">$i18n.getString( "first_name" )</label></td>
- <td class="input-column" ><input type="text" id="firstName" name="firstName" maxlength="30" class="required_group {validate:{required_group:true,rangelength:[2,30]}}" ></td>
+ <td class="input-column" ><input type="text" id="firstName" name="firstName" maxlength="30" class="required_group {validate:{required_group:true,rangelength:[2,30], lettersonly: true}}" ></td>
</tr>
<tr>
<td><label for="middleName">$i18n.getString( "middle_name" ) </label></td>
- <td class="input-column"> <input type="text" id="middleName" name="middleName" maxlength="30" class="required_group {validate:{required_group:true,rangelength:[2,30]}}"></td>
+ <td class="input-column"> <input type="text" id="middleName" name="middleName" maxlength="30" class="required_group {validate:{required_group:true,rangelength:[2,30], lettersonly: true}}"></td>
</tr>
<tr>
<td><label for="lastName">$i18n.getString( "last_name" )</label></td>
- <td class="input-column"><input type="text" id="lastName" name="lastName" maxlength="30" class="required_group {validate:{required_group:true,rangelength:[2,30]}}"></td>
+ <td class="input-column"><input type="text" id="lastName" name="lastName" maxlength="30" class="required_group {validate:{required_group:true,rangelength:[2,30], lettersonly: true}}"></td>
</tr>
<tr><td> </td></tr>
<tr>
@@ -71,7 +71,7 @@
<input type="text" id="birthDate" name="birthDate" style="width:10em" onchange="bdOnchange()" >
<label for="age">$i18n.getString( "or" ) $i18n.getString( "age" ) </label>
- <input type="text" id="age" name="age" style="width:4em" onchange="ageOnchange()" class="{validate:{number:true}}">
+ <input type="text" id="age" name="age" style="width:4em" onchange="ageOnchange()" class="{validate:{number:true, alphanumeric: true}}">
<label for="estimated">$i18n.getString( "estimated" )</label>
<input type="checkbox" id="birthDateEstimated" name="birthDateEstimated" value="true">
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updatePatientForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updatePatientForm.vm 2010-08-17 07:26:22 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updatePatientForm.vm 2010-09-24 09:50:39 +0000
@@ -36,15 +36,15 @@
</tr>
<tr>
<td><label for="firstName">$i18n.getString( "first_name" )</label></td>
- <td><input type="text" id="firstName" name="firstName" value="$encoder.htmlEncode( $patient.firstName )" style="width:30em" class="required_group {validate:{required_group:true,rangelength:[2,30]}}"></td>
+ <td><input type="text" id="firstName" name="firstName" value="$encoder.htmlEncode( $patient.firstName )" style="width:30em" class="required_group {validate:{required_group:true,rangelength:[2,30], lettersonly: true}}"></td>
</tr>
<tr>
<td><label for="middleName">$i18n.getString( "middle_name" )</label></td>
- <td><input type="text" id="middleName" name="middleName" value="$encoder.htmlEncode( $patient.middleName )" style="width:30em" class="required_group {validate:{required_group:true,rangelength:[2,30]}}"></td>
+ <td><input type="text" id="middleName" name="middleName" value="$encoder.htmlEncode( $patient.middleName )" style="width:30em" class="required_group {validate:{required_group:true,rangelength:[2,30], lettersonly: true}}"></td>
</tr>
<tr>
<td><label for="lastName">$i18n.getString( "last_name" )</label></td>
- <td><input type="text" id="lastName" name="lastName" value="$encoder.htmlEncode( $patient.lastName )" style="width:30em" class="required_group {validate:{required_group:true,rangelength:[2,30]}}"></td>
+ <td><input type="text" id="lastName" name="lastName" value="$encoder.htmlEncode( $patient.lastName )" style="width:30em" class="required_group {validate:{required_group:true,rangelength:[2,30], lettersonly: true}}"></td>
</tr>
<tr><td> </td></tr>
<tr>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/validationCriteria.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/validationCriteria.vm 2010-06-19 15:32:24 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/validationCriteria.vm 2010-09-24 09:50:39 +0000
@@ -3,26 +3,23 @@
<table class="mainPageTable">
<tr>
<td style="vertical-align:top">
-
- <table class="listTable">
- <col>
- <col width="20">
-
- <thead>
+ <table width="100%">
<tr>
<td>
$i18n.getString( "filter_by_name" ): <input type="text" onkeyup="filterValues( this.value , 1)" style="width:250px"/>
</td>
<td >
- <input type="button" value="$i18n.getString( "add" )" onclick="window.location.href='showAddValidationCriteriaForm.action'" style="width:10em">
+ <input align="right" type="button" value="$i18n.getString( "add" )" onclick="window.location.href='showAddValidationCriteriaForm.action'" style="width:10em">
</td>
</tr>
- <tr>
+ </table>
+ <table class="listTable" id="criteriaList">
+ <thead>
+ <tr>
<th>$i18n.getString('name')</th>
- <th style="width:8em ">$i18n.getString('operator')</th>
+ <th style="width:10em ">$i18n.getString('operator')</th>
</tr>
- </thead>
-
+ </thead>
<tbody id="list">
#foreach($criteria in $criterias)
<tr id="tr${criteria.id}">
