dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #24374
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 11935: Small fix for program UI.
------------------------------------------------------------
revno: 11935
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2013-09-06 01:16:26 +0700
message:
Small fix for program UI.
modified:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramForm.vm
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramForm.vm 2013-09-05 17:59:57 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramForm.vm 2013-09-05 18:16:26 +0000
@@ -135,46 +135,6 @@
</tr>
<tr name='nonAnonymous'>
- <th colspan="2">$i18n.getString( "program_related" )</th>
- </tr>
-
- <tr name='nonAnonymous'>
- <td>$i18n.getString("relationship_text")</td>
- <td><input type='text' id='relationshipText' name='relationshipText' ></td>
- </tr>
-
- <tr name='nonAnonymous'>
- <td>$i18n.getString("relationship_type")</td>
- <td>
- <select type='text' id='relationshipTypeId' name='relationshipTypeId' onchange='relationshipTypeOnchange()' >
- <option value=''>[$i18n.getString("please_select")]</option>
- #foreach($relationshipType in $relationshipTypes)
- <option value='$relationshipType.id' aIsToB='$relationshipType.aIsToB' bIsToA='$relationshipType.bIsToA'>$relationshipType.name</option>
- #end
- </select>
- </td>
- </tr>
-
- <tr name='nonAnonymous'>
- <td>$i18n.getString("relationship_details")</td>
- <td>
- <select type='text' id='relationshipFromA' name='relationshipFromA'></select>
- </td>
- </tr>
-
- <tr name='nonAnonymous'>
- <td>$i18n.getString("program_related")</td>
- <td>
- <select type='text' id='relatedProgramId' name='relatedProgramId' >
- <option value=''>[$i18n.getString("please_select")]</option>
- #foreach($program in $programs)
- <option value='$program.id'>$program.name</option>
- #end
- </select>
- </td>
- </tr>
-
- <tr name='nonAnonymous'>
<th colspan="2">$i18n.getString( "enrollment_details" )</th>
</tr>
@@ -237,6 +197,46 @@
<td><input style="width: 330px;" type="text" id="dateOfEnrollmentDescription" name="dateOfEnrollmentDescription" class="{validate:{required:true,minlength:4}}"></td>
<td></td>
</tr>
+
+ <tr name='nonAnonymous'>
+ <th colspan="2">$i18n.getString( "program_management" )</th>
+ </tr>
+
+ <tr name='nonAnonymous'>
+ <td>$i18n.getString("relationship_text")</td>
+ <td><input type='text' id='relationshipText' name='relationshipText' ></td>
+ </tr>
+
+ <tr name='nonAnonymous'>
+ <td>$i18n.getString("relationship_type")</td>
+ <td>
+ <select type='text' id='relationshipTypeId' name='relationshipTypeId' onchange='relationshipTypeOnchange()' >
+ <option value=''>[$i18n.getString("please_select")]</option>
+ #foreach($relationshipType in $relationshipTypes)
+ <option value='$relationshipType.id' aIsToB='$relationshipType.aIsToB' bIsToA='$relationshipType.bIsToA'>$relationshipType.name</option>
+ #end
+ </select>
+ </td>
+ </tr>
+
+ <tr name='nonAnonymous'>
+ <td>$i18n.getString("relationship_details")</td>
+ <td>
+ <select type='text' id='relationshipFromA' name='relationshipFromA'></select>
+ </td>
+ </tr>
+
+ <tr name='nonAnonymous'>
+ <td>$i18n.getString("program_related")</td>
+ <td>
+ <select type='text' id='relatedProgramId' name='relatedProgramId' >
+ <option value=''>[$i18n.getString("please_select")]</option>
+ #foreach($program in $programs)
+ <option value='$program.id'>$program.name</option>
+ #end
+ </select>
+ </td>
+ </tr>
<tr><td> </td><td> </td></tr>
<tbody>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramForm.vm 2013-09-05 17:59:57 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramForm.vm 2013-09-05 18:16:26 +0000
@@ -148,52 +148,6 @@
</tr>
<tr name='nonAnonymous'>
- <th colspan="2">$i18n.getString( "program_related" )</th>
- </tr>
-
- <tr name='nonAnonymous'>
- <td>$i18n.getString("relationship_text")</td>
- <td><input type='text' id='relationshipText' name='relationshipText' value='$!program.relationshipText' ></td>
- </tr>
-
- <tr name='nonAnonymous'>
- <td>$i18n.getString("relationship")</td>
- <td>
- <select type='text' id='relationshipTypeId' name='relationshipTypeId' onchange='relationshipTypeOnchange()' >
- <option value=''>[$i18n.getString("please_select")]</option>
- #foreach($relationshipType in $relationshipTypes)
- <option value='$relationshipType.id' aIsToB='$relationshipType.aIsToB' bIsToA='$relationshipType.bIsToA' #if($program.relationshipType.id==$relationshipType.id) selected #end >$relationshipType.name</option>
- #end
- </select>
- </td>
- </tr>
-
- <tr name='nonAnonymous'>
- <td>$i18n.getString("relationship_details")</td>
- <td>
- <select id='relationshipFromA' name='relationshipFromA'>
- #if($!program.relationshipType)
- <option value='false' #if($!program.relationshipFromA=='true') selected #end>$!program.relationshipType.aIsToB</option>
- <option value='true' #if($!program.relationshipFromA=='false') selected #end>$!program.relationshipType.bIsToA</option>
- #end
- </select>
- </td>
- </tr>
-
- <tr name='nonAnonymous'>
- <td>$i18n.getString("program_related")</td>
- <td>
- <select type='text' id='relatedProgramId' name='relatedProgramId' >
- <option value=''>[$i18n.getString("please_select")]</option>
- #set( $relatedProgram = $program.relatedProgram)
- #foreach($program in $programs)
- <option value='$program.id' #if($relatedProgram.id==$program.id) selected #end >$program.name</option>
- #end
- </select>
- </td>
- </tr>
-
- <tr name='nonAnonymous'>
<th colspan="2">$i18n.getString( "enrollment_details" )</th>
</tr>
@@ -257,6 +211,52 @@
<td></td>
</tr>
+ <tr name='nonAnonymous'>
+ <th colspan="2">$i18n.getString( "program_management" )</th>
+ </tr>
+
+ <tr name='nonAnonymous'>
+ <td>$i18n.getString("relationship_text")</td>
+ <td><input type='text' id='relationshipText' name='relationshipText' value='$!program.relationshipText' ></td>
+ </tr>
+
+ <tr name='nonAnonymous'>
+ <td>$i18n.getString("relationship")</td>
+ <td>
+ <select type='text' id='relationshipTypeId' name='relationshipTypeId' onchange='relationshipTypeOnchange()' >
+ <option value=''>[$i18n.getString("please_select")]</option>
+ #foreach($relationshipType in $relationshipTypes)
+ <option value='$relationshipType.id' aIsToB='$relationshipType.aIsToB' bIsToA='$relationshipType.bIsToA' #if($program.relationshipType.id==$relationshipType.id) selected #end >$relationshipType.name</option>
+ #end
+ </select>
+ </td>
+ </tr>
+
+ <tr name='nonAnonymous'>
+ <td>$i18n.getString("relationship_details")</td>
+ <td>
+ <select id='relationshipFromA' name='relationshipFromA'>
+ #if($!program.relationshipType)
+ <option value='false' #if($!program.relationshipFromA=='true') selected #end>$!program.relationshipType.aIsToB</option>
+ <option value='true' #if($!program.relationshipFromA=='false') selected #end>$!program.relationshipType.bIsToA</option>
+ #end
+ </select>
+ </td>
+ </tr>
+
+ <tr name='nonAnonymous'>
+ <td>$i18n.getString("program_related")</td>
+ <td>
+ <select type='text' id='relatedProgramId' name='relatedProgramId' >
+ <option value=''>[$i18n.getString("please_select")]</option>
+ #set( $relatedProgram = $program.relatedProgram)
+ #foreach($program in $programs)
+ <option value='$program.id' #if($relatedProgram.id==$program.id) selected #end >$program.name</option>
+ #end
+ </select>
+ </td>
+ </tr>
+
<tr><td> </td><td> </td></tr>
<tbody>
