dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #13202
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 4176: Ajax Request stuff don't work does not work with IE9; edit codestyle ( Patient module ).
------------------------------------------------------------
revno: 4176
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2011-07-21 13:26:43 +0700
message:
Ajax Request stuff don't work does not work with IE9; edit codestyle ( Patient module ).
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/addPatientAttributeForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientIdentifierTypeForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientAttribute.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientAttributeGroup.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientIdentifierType.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/relationship.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/listPatientIdentifierType.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/orgunitRegistration.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientAttribute.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientAttributeGroup.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programAttributeList.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/relationshipList.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/relationshipType.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/responsePatientIdentifierType.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/sortPatientAttributeGroupForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updatePatientAttibuteGroupForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updatePatientIdentifierType.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 2011-07-19 03:48:05 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties 2011-07-21 06:26:43 +0000
@@ -469,4 +469,5 @@
configuration_xml_file_null = Configuration of folder where contains xml file is null
there_is_no_defination_xml_file_in_user_home = There is no any definition related XML file in the user home
patient_attribute_group_sort_order = Beneficiary Attribute Group Sort Order
-enrol_success = Enrol successfully.
\ No newline at end of file
+enrol_success = Enrol successfully.
+beneficiary_attribute_group_sort_order = Beneficiary Attribute Group Sort Order
\ 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/addPatientAttributeForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientAttributeForm.vm 2011-05-19 08:17:24 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientAttributeForm.vm 2011-07-21 06:26:43 +0000
@@ -37,19 +37,19 @@
<tbody>
<tr>
- <td width="20em"><label>$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td><input type="text" id="name" name="name" style="width:30em" class="{validate:{required:true,rangelength:[2,160]}}"/></td>
+ <td><label>$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+ <td><input type="text" id="name" name="name" style="width:30em" class="{validate:{required:true,rangelength:[2,160]}}"/></td>
<td></td>
</tr>
<tr>
- <td width="20em" ><label>$i18n.getString( "description" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+ <td><label>$i18n.getString( "description" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
<td><input type="text" id="description" name="description" style="width:30em" class="{validate:{required:true,minlength:2}}"/></td>
<td></td>
</tr>
<tr>
- <td width="20em"><label for="mandatory">$i18n.getString( "mandatory" )<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+ <td><label for="mandatory">$i18n.getString( "mandatory" )<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
<td>
<select id="mandatory" name="mandatory" style="min-width:30.5em">
<option value="true" >$i18n.getString( "yes" )</option>
@@ -60,7 +60,7 @@
</tr>
<tr>
- <td width="20em"><label for="inheritable">$i18n.getString( "inheritable" )<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+ <td><label for="inheritable">$i18n.getString( "inheritable" )<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
<td>
<select id="inheritable" name="inheritable" style="min-width:30.5em">
<option value="true" >$i18n.getString( "yes" )</option>
@@ -70,14 +70,14 @@
<td></td>
</tr>
<tr>
- <td width="30em"><label for="noChar">$i18n.getString( "no_of_char" )</label></td>
+ <td><label for="noChar">$i18n.getString( "no_of_char" )</label></td>
<td>
<input type="text" name="noChars" id="noChars" class="{validate:{required:false, number:true}}" style="min-width:30em" />
</td>
<td></td>
</tr>
<tr>
- <td width="20em"><label for="valueType">$i18n.getString( "value_type" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+ <td><label for="valueType">$i18n.getString( "value_type" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
<td>
<select id="valueType" name="valueType" style="min-width:30.5em" onchange="ATTRIBUTE_OPTION.selectValueType(this);">
<option value="NUMBER" selected="selected">$i18n.getString( "number" )</option>
@@ -90,13 +90,13 @@
<td></td>
</tr>
<tr id="attributeComboRow">
- <td width="20em"><label>$i18n.getString( "attribute_options" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+ <td><label>$i18n.getString( "attribute_options" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
<td ><table id="attrOptionContainer"></table><a href="#" style="text-decoration: none;margin-top: 0.5em" onclick="ATTRIBUTE_OPTION.addOption()">[ $i18n.getString( "add_more_option" ) ]</a>
</td>
<td><span id="attrMessage" name="attrMessage" style="color:red;"></span></td>
</tr>
<tr>
- <td width="20em"><label for="groupBy">$i18n.getString( "groupBy" )</td>
+ <td><label for="groupBy">$i18n.getString( "groupBy" )</td>
<td><input type="checkbox" name="groupBy" value="true"/></td>
</tr>
</tbody>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientIdentifierTypeForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientIdentifierTypeForm.vm 2011-05-25 06:27:29 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientIdentifierTypeForm.vm 2011-07-21 06:26:43 +0000
@@ -30,30 +30,28 @@
</tr>
<tr>
- <td width="30em"><label for="mandatory">$i18n.getString( "mandatory" )<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+ <td><label for="mandatory">$i18n.getString( "mandatory" )<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
<td>
<select id="mandatory" name="mandatory" style="min-width:30.2em" class="{validate:{required:true}}">
- <option value="" selected="selected">[$i18n.getString( "please_select" )]</option>
- <option value="true" >$i18n.getString( "yes" )</option>
- <option value="false">$i18n.getString( "no" )</option>
+ <option value="true">$i18n.getString( "yes" )</option>
+ <option value="false" selected="selected">$i18n.getString( "no" )</option>
</select>
</td>
<td></td>
</tr>
<tr>
- <td width="30em"><label for="related">$i18n.getString( "related" )<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+ <td><label for="related">$i18n.getString( "related" )<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
<td>
<select id="related" name="related" style="min-width:30.2em" class="{validate:{required:true}}">
- <option value="" selected="selected">[$i18n.getString( "please_select" )]</option>
<option value="true" >$i18n.getString( "yes" )</option>
- <option value="false">$i18n.getString( "no" )</option>
+ <option value="false" selected="selected">$i18n.getString( "no" )</option>
</select>
</td>
<td></td>
</tr>
<tr>
- <td width="30em"><label for="noChar">$i18n.getString( "no_of_char" )</label></td>
+ <td><label for="noChar">$i18n.getString( "no_of_char" )</label></td>
<td>
<input type="text" name="noChars" id="noChars" class="{validate:{required:false, number:true}}" style="min-width:30em" />
</td>
@@ -61,11 +59,10 @@
</tr>
<tr>
- <td width="30em"><label for="type">$i18n.getString( "type" )<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+ <td><label for="type">$i18n.getString( "type" )<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
<td>
<select id="type" name="type" style="min-width:30.2em" class="{validate:{required:true}}">
- <option value="" selected="selected">[$i18n.getString( "please_select" )]</option>
- <option value="text" >$i18n.getString( "text" )</option>
+ <option value="text" selected="selected">$i18n.getString( "text" )</option>
<option value="number">$i18n.getString( "number" )</option>
<option value="letter">$i18n.getString( "letter" )</option>
</select>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientAttribute.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientAttribute.js 2011-05-19 08:17:24 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientAttribute.js 2011-07-21 06:26:43 +0000
@@ -4,20 +4,22 @@
function showPatientAttributeDetails( patientAttributeId )
{
- var request = new Request();
- request.setResponseTypeXML( 'patientAttribute' );
- request.setCallbackSuccess( patientAttributeReceived );
- request.send( 'getPatientAttribute.action?id=' + patientAttributeId );
+ $.ajax({
+ url: 'getPatientAttribute.action?id=' + patientAttributeId,
+ cache: false,
+ dataType: "xml",
+ success: patientAttributeReceived
+ });
}
function patientAttributeReceived( patientAttributeElement )
{
- setInnerHTML( 'idField', getElementValue( patientAttributeElement, 'id' ) );
- setInnerHTML( 'nameField', getElementValue( patientAttributeElement, 'name' ) );
- setInnerHTML( 'descriptionField', getElementValue( patientAttributeElement, 'description' ) );
+ setInnerHTML( 'idField', $( patientAttributeElement).find('id' ).text() );
+ setInnerHTML( 'nameField', $( patientAttributeElement).find('name' ).text() );
+ setInnerHTML( 'descriptionField', $( patientAttributeElement).find('description' ).text() );
var valueTypeMap = { 'NUMBER':i18n_number, 'BOOL':i18n_yes_no, 'TEXT':i18n_text, 'DATE':i18n_date, 'COMBO':i18n_combo };
- var valueType = getElementValue( patientAttributeElement, 'valueType' );
+ var valueType = $( patientAttributeElement ).find('valueType' ).text();
setInnerHTML( 'valueTypeField', valueTypeMap[valueType] );
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientAttributeGroup.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientAttributeGroup.js 2011-05-19 08:14:24 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientAttributeGroup.js 2011-07-21 06:26:43 +0000
@@ -14,10 +14,11 @@
function showPatientAttributeGroupDetails( patientAttributeGroupId )
{
- var request = new Request();
- request.setResponseTypeXML( 'patientAttributeGroup' );
- request.setCallbackSuccess( patientAttributeGroupReceived );
- request.send( 'getPatientAttributeGroup.action?id=' + patientAttributeGroupId );
+ $.ajax({
+ url: 'getPatientAttributeGroup.action?id=' + patientAttributeGroupId,
+ cache: false,
+ success: patientAttributeGroupReceived
+ });
}
function patientAttributeGroupReceived( patientAttributeGroupElement )
@@ -43,9 +44,12 @@
// Show and Hide tooltip
// -----------------------------------------------------------------------------
-function patientAttributeGroupAssociation(){
+function patientAttributeGroupAssociation()
+{
selectAllById('selectedAttributeGroups');
+
var form = document.getElementById( 'patientAttributeGroupAssociationForm' );
+
form.submit();
}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientIdentifierType.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientIdentifierType.js 2011-05-19 08:14:24 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientIdentifierType.js 2011-07-21 06:26:43 +0000
@@ -4,18 +4,32 @@
function showPatientIdentifierTypeDetails( patientIdentifierTypeId )
{
- var request = new Request();
- request.setResponseTypeXML( 'patientIdentifierType' );
- request.setCallbackSuccess( patientIdentifierTypeReceived );
- request.send( 'getPatientIdentifierType.action?id=' + patientIdentifierTypeId );
+ $.ajax({
+ url: 'getPatientIdentifierType.action?id=' + patientIdentifierTypeId,
+ cache: false,
+ dataType: "xml",
+ success: patientIdentifierTypeReceived
+ });
}
function patientIdentifierTypeReceived( patientIdentifierTypeElement )
{
- setInnerHTML( 'idField', getElementValue( patientIdentifierTypeElement, 'id' ) );
- setInnerHTML( 'nameField', getElementValue( patientIdentifierTypeElement, 'name' ) );
- setInnerHTML( 'descriptionField', getElementValue( patientIdentifierTypeElement, 'description' ) );
- setInnerHTML( 'formatField', getElementValue( patientIdentifierTypeElement, 'format' ) );
+ setInnerHTML( 'idField', $( patientIdentifierTypeElement).find('id' ).text() );
+ setInnerHTML( 'nameField', $( patientIdentifierTypeElement).find('name' ).text() );
+ setInnerHTML( 'descriptionField', $( patientIdentifierTypeElement).find('description' ).text() );
+
+ var boolValueMap = { 'true':i18n_yes, 'false':i18n_no };
+ var boolType = $( patientIdentifierTypeElement ).find('mandatory').text();
+ setInnerHTML( 'mandatoryField', boolValueMap[boolType] );
+
+ boolType = $( patientIdentifierTypeElement ).find('related').text();
+ setInnerHTML( 'relatedField', boolValueMap[boolType] );
+ setInnerHTML( 'noCharsField', $( patientIdentifierTypeElement).find('noChars' ).text() );
+
+ var valueTypeMap = { 'text':i18n_string, 'number':i18n_number, 'letter':i18n_alphabet };
+ var valueType = $( patientIdentifierTypeElement ).find('type' ).text();
+ setInnerHTML( 'typeField', valueTypeMap[valueType] );
+
showDetails();
}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/relationship.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/relationship.js 2011-07-20 06:34:34 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/relationship.js 2011-07-21 06:26:43 +0000
@@ -4,10 +4,12 @@
function showRelationshipTypeDetails( relationshipTypeId )
{
- var request = new Request();
- request.setResponseTypeXML( 'relationshipType' );
- request.setCallbackSuccess( relationshipTypeReceived );
- request.send( 'getRelationshipType.action?id=' + relationshipTypeId );
+ $.ajax({
+ url: 'getRelationshipType.action?id=' + relationshipTypeId,
+ cache: false,
+ dataType: "xml",
+ success: relationshipTypeReceived
+ });
}
function relationshipTypeReceived( relationshipTypeElement )
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/listPatientIdentifierType.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/listPatientIdentifierType.vm 2011-05-19 08:14:24 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/listPatientIdentifierType.vm 2011-07-21 06:26:43 +0000
@@ -8,16 +8,15 @@
<table class="listTable">
<col>
<col width="20">
- <col width="20">
<col width="20">
<col width="20">
<tr>
<td></td>
- <td colspan="5" style="text-align:right"><input type="button" value="$i18n.getString( "add_new" )" onclick="window.location.href='showAddPatientIdentifierTypeForm.action'" style="width:70px"></td>
+ <td colspan="4" style="text-align:right"><input type="button" value="$i18n.getString( "add_new" )" onclick="window.location.href='showAddPatientIdentifierTypeForm.action'" style="width:70px"></td>
</tr>
<tr>
<th>$i18n.getString( "name" )</th>
- <th colspan="5">$i18n.getString( "operations" )</th>
+ <th colspan="4">$i18n.getString( "operations" )</th>
</tr>
<tbody id="list">
@@ -53,7 +52,10 @@
<p><label>$i18n.getString( "id" ):</label><br><span id="idField"></span></p>
<p><label>$i18n.getString( "name" ):</label><br><span id="nameField"></span></p>
<p><label>$i18n.getString( "description" ):</label><br><span id="descriptionField"></span></p>
- <p><label>$i18n.getString( "format" ):</label><br><span id="formatField"></span></p>
+ <p><label>$i18n.getString( "mandatory" ):</label><br><span id="mandatoryField"></span></p>
+ <p><label>$i18n.getString( "related" ):</label><br><span id="relatedField"></span></p>
+ <p><label>$i18n.getString( "no_of_char" ):</label><br><span id="noCharsField"></span></p>
+ <p><label>$i18n.getString( "type" ):</label><br><span id="typeField"></span></p>
</div>
</td>
</tr>
@@ -64,4 +66,9 @@
var i18n_adding_program_failed = '$encoder.jsEscape( $i18n.getString( "adding_patientIdentifierType_failed" ), "'")';
var i18n_updating_program_failed = '$encoder.jsEscape( $i18n.getString( "updating_patientIdentifierType_failed" ), "'")';
var i18n_none = '$encoder.jsEscape( $i18n.getString( "none" ), "'")';
+ var i18n_string = '$encoder.jsEscape( $i18n.getString( "string" ), "'")';
+ var i18n_number = '$encoder.jsEscape( $i18n.getString( "number" ), "'")';
+ var i18n_alphabet = '$encoder.jsEscape( $i18n.getString( "alphabet" ), "'")';
+ var i18n_yes = '$encoder.jsEscape( $i18n.getString( "yes" ), "'")';
+ var i18n_no = '$encoder.jsEscape( $i18n.getString( "no" ), "'")';
</script>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/orgunitRegistration.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/orgunitRegistration.vm 2011-03-30 04:59:34 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/orgunitRegistration.vm 2011-07-21 06:26:43 +0000
@@ -1,4 +1,3 @@
-
<h3>$i18n.getString( "patient_orgunit_registration" ) </h3>
<form action='defineOrgunitRegistration.action' method='post'>
@@ -16,4 +15,4 @@
<td></td>
<td></td>
</tr>
-</table>
\ No newline at end of file
+</table>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientAttribute.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientAttribute.vm 2011-05-19 08:17:24 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientAttribute.vm 2011-07-21 06:26:43 +0000
@@ -26,15 +26,15 @@
<td>$encoder.htmlEncode( $patientAttribute.name )</td>
<td style="text-align:center">
- <a href="showUpdatePatientAttributeForm.action?id=$patientAttribute.id" title="$i18n.getString( "edit" )"><img src="../images/edit.png" alt="$i18n.getString( "edit" )"></a>
+ <a href="showUpdatePatientAttributeForm.action?id=$patientAttribute.id" title="$i18n.getString( 'edit' )"><img src="../images/edit.png" alt="$i18n.getString( 'edit' )"></a>
</td>
<td style="text-align:center">
- <a href="javascript:removePatientAttribute( '$patientAttribute.id', '$encoder.jsEncode( $patientAttribute.name )' )" title="$i18n.getString( "remove" )"><img src="../images/delete.png" alt="$i18n.getString( "remove" )"></a>
+ <a href="javascript:removePatientAttribute( '$patientAttribute.id', '$encoder.jsEncode( $patientAttribute.name )' )" title="$i18n.getString( 'remove' )"><img src="../images/delete.png" alt="$i18n.getString( 'remove' )"></a>
</td>
<td style="text-align:center">
- <a href="javascript:showPatientAttributeDetails( $patientAttribute.id )" title="$i18n.getString( "show_details" )"><img src="../images/information.png" alt="$i18n.getString( "show_details" )"></a>
+ <a href="javascript:showPatientAttributeDetails( $patientAttribute.id )" title="$i18n.getString( 'show_details' )"><img src="../images/information.png" alt="$i18n.getString( 'show_details' )"></a>
</td>
</tr>
@@ -48,7 +48,7 @@
<div id="detailsArea" style="display:none">
<div style="float:right">
- <a href="javascript:hideDetails()" title="$i18n.getString( "hide_details" )"><img src="../images/close.png" alt="$i18n.getString( "hide_details" )"></a>
+ <a href="javascript:hideDetails()" title="$i18n.getString( 'hide_details' )"><img src="../images/close.png" alt="$i18n.getString( 'hide_details' )"></a>
</div>
<p><label>$i18n.getString( "id" ):</label><br><span id="idField"></span></p>
<p><label>$i18n.getString( "name" ):</label><br><span id="nameField"></span></p>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientAttributeGroup.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientAttributeGroup.vm 2011-07-05 05:23:57 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientAttributeGroup.vm 2011-07-21 06:26:43 +0000
@@ -13,8 +13,8 @@
<tr>
<td></td>
<td colspan="3" style="text-align:right">
- <input type="button" value="$i18n.getString( "sort" )" onclick="window.location.href='showSortPatientAttributeGroup.action'" style="width:75px"><br>
- <input type="button" value="$i18n.getString( "add_new" )" onclick="window.location.href='showAddPatientAttributeGroupForm.action'" style="width:75px">
+ <input type="button" value="$i18n.getString( 'sort' )" onclick="window.location.href='showSortPatientAttributeGroup.action'" style="width:75px"><br>
+ <input type="button" value="$i18n.getString( 'add_new' )" onclick="window.location.href='showAddPatientAttributeGroupForm.action'" style="width:75px">
</td>
</tr>
<tr>
@@ -29,15 +29,15 @@
<td>$encoder.htmlEncode( $patientAttributeGroup.name )</td>
<td style="text-align:center"#alternate( $mark )>
- <a href="showUpdatePatientAttributeGroupForm.action?id=$patientAttributeGroup.id" title="$i18n.getString( "edit" )"><img src="../images/edit.png" alt="$i18n.getString( "edit" )"></a>
+ <a href="showUpdatePatientAttributeGroupForm.action?id=$patientAttributeGroup.id" title="$i18n.getString( 'edit' )"><img src="../images/edit.png" alt="$i18n.getString( 'edit' )"></a>
</td>
<td style="text-align:center"#alternate( $mark )>
- <a href="javascript:removePatientAttributeGroup( '$patientAttributeGroup.id', '$encoder.jsEncode( $patientAttributeGroup.name )' )" title="$i18n.getString( "remove" )"><img src="../images/delete.png" alt="$i18n.getString( "remove" )"></a>
+ <a href="javascript:removePatientAttributeGroup( '$patientAttributeGroup.id', '$encoder.jsEncode( $patientAttributeGroup.name )' )" title="$i18n.getString( 'remove' )"><img src="../images/delete.png" alt="$i18n.getString( 'remove' )"></a>
</td>
<td style="text-align:center"#alternate( $mark )>
- <a href="javascript:showPatientAttributeGroupDetails( $patientAttributeGroup.id )" title="$i18n.getString( "show_details" )"><img src="../images/information.png" alt="$i18n.getString( "show_details" )"></a>
+ <a href="javascript:showPatientAttributeGroupDetails( $patientAttributeGroup.id )" title="$i18n.getString( 'show_details' )"><img src="../images/information.png" alt="$i18n.getString( 'show_details' )"></a>
</td>
</tr>
@@ -51,10 +51,10 @@
<div id="detailsArea" style="display:none">
<div style="float:right">
- <a href="javascript:hideDetails()" title="$i18n.getString( "hide_details" )"><img src="../images/close.png" alt="$i18n.getString( "hide_details" )"></a>
+ <a href="javascript:hideDetails()" title="$i18n.getString( "hide_details" )"><img src="../images/close.png" alt="$i18n.getString( 'hide_details' )"></a>
</div>
<p><label>$i18n.getString( "id" ):</label><br><span id="idField"></span></p>
- <p><label>$i18n.getString( "name" ):</label><br><span id="nameField"></span></p>
+ <p><label>$i18n.getString( "name" )</label><br><span id="nameField"></span></p>
<p><label>$i18n.getString( "description" ):</label><br><span id="descriptionField"></span></p>
<p><label>$i18n.getString( "number_of_attribute" ):</label><br><span id="noAttributeField"></span></p>
</div>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programAttributeList.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programAttributeList.vm 2011-05-19 08:13:38 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programAttributeList.vm 2011-07-21 06:26:43 +0000
@@ -23,15 +23,15 @@
<td>$programAttribute.name</td>
<td style="text-align:center">
- <a href="showUpdateProgramAttributeForm.action?id=$programAttribute.id" title="$i18n.getString( "edit" )"><img src="../images/edit.png" alt="$i18n.getString( "edit" )"></a>
+ <a href="showUpdateProgramAttributeForm.action?id=$programAttribute.id" title="$i18n.getString( 'edit' )"><img src="../images/edit.png" alt="$i18n.getString( 'edit' )"></a>
</td>
<td style="text-align:center">
- <a href="javascript:removeProgramAttribute( '$programAttribute.id', '$encoder.jsEncode( $programAttribute.name )' )" title="$i18n.getString( "remove" )"><img src="../images/delete.png" alt="$i18n.getString( "remove" )"></a>
+ <a href="javascript:removeProgramAttribute( '$programAttribute.id', '$encoder.jsEncode( $programAttribute.name )' )" title="$i18n.getString( 'remove' )"><img src="../images/delete.png" alt="$i18n.getString( 'remove' )"></a>
</td>
<td style="text-align:center">
- <a href="javascript:showProgramAttributeDetails( $programAttribute.id )" title="$i18n.getString( "show_details" )"><img src="../images/information.png" alt="$i18n.getString( "show_details" )"></a>
+ <a href="javascript:showProgramAttributeDetails( $programAttribute.id )" title="$i18n.getString( 'show_details' )"><img src="../images/information.png" alt="$i18n.getString( 'show_details' )"></a>
</td>
</tr>
@@ -45,12 +45,12 @@
<div id="detailsArea" style="display:none">
<div style="float:right">
- <a href="javascript:hideDetails()" title="$i18n.getString( "hide_details" )"><img src="../images/close.png" alt="$i18n.getString( "hide_details" )"></a>
+ <a href="javascript:hideDetails()" title="$i18n.getString( 'hide_details' )"><img src="../images/close.png" alt="$i18n.getString( 'hide_details' )"></a>
</div>
- <p><label>$i18n.getString( "id" ):</label><br><span id="idField"></span></p>
- <p><label>$i18n.getString( "name" ):</label><br><span id="nameField"></span></p>
- <p><label>$i18n.getString( "description" ):</label><br><span id="descriptionField"></span></p>
- <p><label>$i18n.getString( "value_type" ):</label><br><span id="valueTypeField"></span></p>
+ <p><label><strong>$i18n.getString( "id" ):</strong></label><br><span id="idField"></span></p>
+ <p><label><strong>$i18n.getString( "name" ):</strong></label><br><span id="nameField"></span></p>
+ <p><label><strong>$i18n.getString( "description" ):</strong></label><br><span id="descriptionField"></span></p>
+ <p><label><strong>$i18n.getString( "value_type" ):</strong></label><br><span id="valueTypeField"></span></p>
</div>
</td>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/relationshipList.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/relationshipList.vm 2011-07-19 03:48:05 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/relationshipList.vm 2011-07-21 06:26:43 +0000
@@ -39,10 +39,10 @@
<tr>
<td></td>
<td style="text-align:right">
- <input type="button" value="$i18n.getString( "add_new" )" onclick="javascript:showAddRelationship('$patient.id')">
+ <input type="button" value="$i18n.getString( 'add_new' )" onclick="javascript:showAddRelationship('$patient.id')">
</td>
<td style="text-align:right">
- <input type="button" value="$i18n.getString( "add_new_patient" )" onclick="javascript:showAddRelationshipPatient( '$patient.id',false )">
+ <input type="button" value="$i18n.getString( 'add_new_patient' )" onclick="javascript:showAddRelationshipPatient( '$patient.id',false )">
</td>
</tr>
@@ -77,8 +77,8 @@
#end
<td style="text-align:center">
- <a href="javascript:manageRepresentative( '$patient.id', $partnerId )" title="$i18n.getString( "manage_representative" )"><img src="../images/assign.png" alt="$i18n.getString( "manage_representative" )"></a>
- <a href="javascript:removeRelationship( '$relationship.id', '$encoder.jsEncode( $relationship.patientA.getFullName() )', '$encoder.jsEncode( $relationship.relationshipType.aIsToB )', '$encoder.jsEncode( $relationship.patientB.getFullName() )' )" title="$i18n.getString( "remove" )"><img src="../images/delete.png" alt="$i18n.getString( "remove" )"></a>
+ <a href="javascript:manageRepresentative( '$patient.id', $partnerId )" title="$i18n.getString( 'manage_representative' )"><img src="../images/assign.png" alt="$i18n.getString( 'manage_representative' )"></a>
+ <a href="javascript:removeRelationship( '$relationship.id', '$encoder.jsEncode( $relationship.patientA.getFullName() )', '$encoder.jsEncode( $relationship.relationshipType.aIsToB )', '$encoder.jsEncode( $relationship.patientB.getFullName() )' )" title="$i18n.getString( 'remove' )"><img src="../images/delete.png" alt="$i18n.getString( 'remove' )"></a>
</td>
</tr>
#set( $mark = !$mark)
@@ -89,21 +89,13 @@
</tr>
</table>
-<div id="relationshipPartnerContainer" style="border:1px solid #808080; padding:10px; display:none;">
+<div id="relationshipPartnerContainer" style="width:20em; padding-left:2em; vertical-align:top">
- <table class="mainPageTable">
- <tr>
- <td style="text-align:left">
- <strong>
- <span id="labelField"></span>
- </strong>
- </td>
- <td style="text-align:right">
- <a href="javascript:hideRelationshipPartnerContainer()" title="$i18n.getString( "hide_details" )"><img src="../images/close.png" alt="$i18n.getString( "hide_details" )"></a>
- </td>
- </tr>
- <tr>
- <td>
+ <div id="detailsArea" style="display:none">
+ <div style="float:right">
+ <a href="javascript:hideDetails()" title="$i18n.getString( 'hide_details' )"><img src="../images/close.png" alt="$i18n.getString( 'hide_details' )"></a>
+ </div>
+
<strong>$i18n.getString( "full_name" ):</strong><span id="fullNameField"></span><br>
<strong>$i18n.getString( "gender" ):</strong><span id="genderField"></span><br>
<strong>$i18n.getString( "date_of_birth" ):</strong><span id="dateOfBirthField"></span><br>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/relationshipType.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/relationshipType.vm 2011-05-19 08:14:24 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/relationshipType.vm 2011-07-21 06:26:43 +0000
@@ -31,15 +31,15 @@
<td>$encoder.htmlEncode( $relationshipType.description )</td>
<td style="text-align:center"#alternate( $mark )>
- <a href="showUpdateRelationshipTypeForm.action?id=$relationshipType.id" title="$i18n.getString( "edit" )"><img src="../images/edit.png" alt="$i18n.getString( "edit" )"></a>
+ <a href="showUpdateRelationshipTypeForm.action?id=$relationshipType.id" title="$i18n.getString( 'edit' )"><img src="../images/edit.png" alt="$i18n.getString( 'edit' )"></a>
</td>
<td style="text-align:center"#alternate( $mark )>
- <a href="javascript:removeRelationshipType( '$relationshipType.id', '$encoder.jsEncode( $relationshipType.aIsToB )', '$encoder.jsEncode( $relationshipType.bIsToA )' )" title="$i18n.getString( "remove" )"><img src="../images/delete.png" alt="$i18n.getString( "remove" )"></a>
+ <a href="javascript:removeRelationshipType( '$relationshipType.id', '$encoder.jsEncode( $relationshipType.aIsToB )', '$encoder.jsEncode( $relationshipType.bIsToA )' )" title="$i18n.getString( 'remove' )"><img src="../images/delete.png" alt="$i18n.getString( 'remove' )"></a>
</td>
<td style="text-align:center"#alternate( $mark )>
- <a href="javascript:showRelationshipTypeDetails( $relationshipType.id )" title="$i18n.getString( "show_details" )"><img src="../images/information.png" alt="$i18n.getString( "show_details" )"></a>
+ <a href="javascript:showRelationshipTypeDetails( $relationshipType.id )" title="$i18n.getString( 'show_details' )"><img src="../images/information.png" alt="$i18n.getString( 'show_details' )"></a>
</td>
</tr>
@@ -50,9 +50,9 @@
</table>
</td>
<td style="width:20em; padding-left:2em; vertical-align:top">
- <div id="detailsArea" style="display:none; position:absolute; overflow:auto; right: 10px">
+ <div id="detailsArea" style="display:none;">
<div style="float:right;">
- <a href="javascript:hideDetails()" title="$i18n.getString( "hide_details" )"><img src="../images/close.png" alt="$i18n.getString( "hide_details" )"></a>
+ <a href="javascript:hideDetails()" title="$i18n.getString( 'hide_details' )"><img src="../images/close.png" alt="$i18n.getString( 'hide_details' )"></a>
</div>
<p><label>$i18n.getString( "id" ):</label><br><span id="idField"></span></p>
<p><label>$i18n.getString( "a_is_to_b" ):</label><br><span id="aIsToBField"></span></p>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/responsePatientIdentifierType.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/responsePatientIdentifierType.vm 2011-05-25 06:27:29 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/responsePatientIdentifierType.vm 2011-07-21 06:26:43 +0000
@@ -1,6 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
<patientIdentifierType>
<id>$patientIdentifierType.id</id>
<name>$encoder.xmlEncode( $patientIdentifierType.name )</name>
<description>$encoder.xmlEncode( $patientIdentifierType.description )</description>
+ <mandatory>$patientIdentifierType.mandatory</mandatory>
+ <related>$patientIdentifierType.related</related>
+ <noChars>$!patientIdentifierType.noChars</noChars>
+ <type>$patientIdentifierType.type</type>
</patientIdentifierType>
\ 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/sortPatientAttributeGroupForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/sortPatientAttributeGroupForm.vm 2011-07-05 05:23:57 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/sortPatientAttributeGroupForm.vm 2011-07-21 06:26:43 +0000
@@ -21,7 +21,7 @@
<p>
<input type="submit" value="$i18n.getString( "save" )" style="width:10em">
- <input type="button" value="$i18n.getString( "cancel" )" onclick="window.location.href='programStage.action?id=$program.id'" style="width:10em">
+ <input type="button" value="$i18n.getString( "cancel" )" onclick="window.location.href='patientAttributeGroup.action'" style="width:10em">
</p>
</form>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updatePatientAttibuteGroupForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updatePatientAttibuteGroupForm.vm 2011-05-19 08:14:24 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updatePatientAttibuteGroupForm.vm 2011-07-21 06:26:43 +0000
@@ -16,7 +16,7 @@
});
</script>
<h3>$i18n.getString( "update_patient_attribute_group" )</h3>
-<form id="updatePatientAttributeGroupForm" name="updatePatientAttributeGroupForm" action="updatePatientAttributeGroup.action" method="post" onsubmit="return validateUpdatePatientAttributeGroup();">
+<form id="updatePatientAttributeGroupForm" name="updatePatientAttributeGroupForm" action="updatePatientAttributeGroup.action" method="post" >
<div style="display:inline">
<input type="hidden" id="id" name="id" value="$!patientAttributeGroup.id"/>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updatePatientIdentifierType.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updatePatientIdentifierType.vm 2011-05-25 06:27:29 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updatePatientIdentifierType.vm 2011-07-21 06:26:43 +0000
@@ -30,7 +30,7 @@
</tr>
<tr>
- <td width="20em"><label for="mandatory">$i18n.getString( "mandatory" )<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+ <td><label for="mandatory">$i18n.getString( "mandatory" )<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
<td>
<select id="mandatory" name="mandatory" style="min-width:20em">
<option value="true" #if( $patientIdentifierType.mandatory ) selected="selected" #end>$i18n.getString( "yes" )</option>
@@ -41,10 +41,9 @@
</tr>
<tr>
- <td width="20em"><label for="related">$i18n.getString( "related" )<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+ <td><label for="related">$i18n.getString( "related" )<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
<td>
<select id="related" name="related" style="min-width:20em" class="{validate:{required:true}}">
- <option value="" >[$i18n.getString( "please_select" )]</option>
<option value="true" #if( $patientIdentifierType.related ) selected="selected" #end>$i18n.getString( "yes" )</option>
<option value="false" #if( !$patientIdentifierType.related ) selected="selected" #end>$i18n.getString( "no" )</option>
</select>
@@ -53,7 +52,7 @@
</tr>
<tr>
- <td width="30em"><label for="noChar">$i18n.getString( "no_of_char" )</label></td>
+ <td><label for="noChars">$i18n.getString( "no_of_char" )</label></td>
<td>
<input type="text" name="noChars" id="noChars" value="$!patientIdentifierType.noChars" class="{validate:{required:false, number:true}}" style="min-width:30em" />
</td>
@@ -61,10 +60,9 @@
</tr>
<tr>
- <td width="30em"><label for="type">$i18n.getString( "type" )<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+ <td><label for="type">$i18n.getString( "type" )<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
<td>
<select id="type" name="type" style="min-width:30.2em" class="{validate:{required:true}}">
- <option value="" selected="selected">[$i18n.getString( "please_select" )]</option>
<option value="text" #if( $patientIdentifierType.type=='text' ) selected="selected" #end>$i18n.getString( "string" )</option>
<option value="number" #if( $patientIdentifierType.type=='number' ) selected="selected" #end>$i18n.getString( "number" )</option>
<option value="letter" #if( $patientIdentifierType.type=='letter' ) selected="selected" #end>$i18n.getString( "alphabet" )</option>
