dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #15801
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 5833: Cannot assign validation criteria for program.
------------------------------------------------------------
revno: 5833
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2012-01-31 13:40:20 +0700
message:
Cannot assign validation criteria for program.
modified:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programsForValidationCriteriaAssociations.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/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml 2012-01-13 02:14:28 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml 2012-01-31 06:40:20 +0000
@@ -827,8 +827,7 @@
class="org.hisp.dhis.patient.action.validation.GetProgramListForValidationCriteriaAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-patient/programsForValidationCriteriaAssociations.vm</param>
- <param name="javascripts">
- ,javascript/program.js</param>
+ <param name="javascripts">javascript/program.js</param>
<param name="requiredAuthorities">F_PROGRAM_UPDATE</param>
</action>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programsForValidationCriteriaAssociations.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programsForValidationCriteriaAssociations.vm 2012-01-11 07:31:29 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programsForValidationCriteriaAssociations.vm 2012-01-31 06:40:20 +0000
@@ -1,49 +1,50 @@
-<h3>$i18n.getString( "assign_validation_for_programs" ) </h3
+<h3>$i18n.getString( "assign_validation_for_programs" ) </h3>
<form action='defineProgramsForValidationCriteria.action' method='post' onsubmit="selectAllById('programIds');">
-<table>
-<input type='hidden' id='criteriaId' name='criteriaId' value="$validationCriteria.id">
-<tr>
- <th colspan="3">$i18n.getString('program')</th>
-</tr>
-<tr>
- <td><label>$i18n.getString('available_program')</label></td>
- <td> </td>
- <td><label>$i18n.getString('selected_program')</label></td>
-</tr>
-<tr>
- <td>
- <select multiple id='avalableProgramIds' name='avalableProgramIds' size="8" style="width:30em " ondblclick="moveSelectedById('avalableProgramIds', 'programIds');">
- #foreach($p in $availablePrograms)
- <option value='$p.id'>$p.name</option>
- #end
- </select>
- </td>
- <td width="42" align='center'>
- <input type="button" value=">" onclick="moveSelectedById('avalableProgramIds', 'programIds');" style="width:42px">
- <input type="button" value="<" onclick="moveSelectedById('programIds', 'avalableProgramIds');" style="width:42px"><br>
- <input type="button" value=">>" onclick="moveAllById('avalableProgramIds', 'programIds');" style="width:42px"><br>
- <input type="button" value="<<" onclick="moveAllById('programIds', 'avalableProgramIds');" style="width:42px">
- </td>
- <td>
- <select multiple id='programIds' name='programIds' size="8" style="width:30em " ondblClick="moveSelectedById('programIds', 'avalableProgramIds');">
- #foreach($p in $selectedPrograms)
- <option value='$p.id'>$p.name</option>
- #end
- </select>
- </td>
-</tr>
+ <input type='hidden' id='criteriaId' name='criteriaId' value="$validationCriteria.id">
+ <table>
+ <tr>
+ <th colspan="3">$i18n.getString('program')</th>
+ </tr>
+ <tr>
+ <td><label>$i18n.getString('available_program')</label></td>
+ <td> </td>
+ <td><label>$i18n.getString('selected_program')</label></td>
+ </tr>
+ <tr>
+ <td>
+ <select multiple id='avalableProgramIds' name='avalableProgramIds' size="8" style="width:30em " ondblclick="moveSelectedById('avalableProgramIds', 'programIds');">
+ #foreach($p in $availablePrograms)
+ <option value='$p.id'>$p.name</option>
+ #end
+ </select>
+ </td>
+ <td width="42" align='center'>
+ <input type="button" value=">" onclick="moveSelectedById('avalableProgramIds', 'programIds');" style="width:42px">
+ <input type="button" value="<" onclick="moveSelectedById('programIds', 'avalableProgramIds');" style="width:42px"><br>
+ <input type="button" value=">>" onclick="moveAllById('avalableProgramIds', 'programIds');" style="width:42px"><br>
+ <input type="button" value="<<" onclick="moveAllById('programIds', 'avalableProgramIds');" style="width:42px">
+ </td>
+ <td>
+ <select multiple id='programIds' name='programIds' size="8" style="width:30em " ondblClick="moveSelectedById('programIds', 'avalableProgramIds');">
+ #foreach($p in $selectedPrograms)
+ <option value='$p.id'>$p.name</option>
+ #end
+ </select>
+ </td>
+ </tr>
-<tr>
- <td>
- <input type="submit"value="$i18n.getString('save')" style="width:10em">
- <input type="button" onClick="window.location.href = 'validationCriteria.action';" value="$i18n.getString('cancel')" style="width:10em">
- </td>
- <td></td>
- <td></td>
-</tr>
-</table>
+ <tr>
+ <td>
+ <input type="submit"value="$i18n.getString('save')" style="width:10em">
+ <input type="button" onClick="window.location.href = 'validationCriteria.action';" value="$i18n.getString('cancel')" style="width:10em">
+ </td>
+ <td></td>
+ <td></td>
+ </tr>
+ </table>
+</form>
<script>
var i18n_confirm_delete = '$encoder.jsEscape( $i18n.getString( "confirm_delete_patient" ) , "'" )';