------------------------------------------------------------
revno: 11371
committer: Tran Chau <tran.hispviet...@gmail.com>
branch nick: dhis2
timestamp: Tue 2013-07-09 14:14:55 +0700
message:
Minor change registration form management.
modified:
dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientRegistrationForm.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-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 2013-07-09 03:26:26 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties 2013-07-09 07:14:55 +0000
@@ -662,4 +662,6 @@
enter_age_in_years = Enter age in years...
send_to = Send to
table_layout = Layout
-is_hidden = Is hidden
\ No newline at end of file
+is_hidden = Is hidden
+default_form_name = Default form name
+custom_form_name = Custom form name
\ 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/patientRegistrationForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientRegistrationForm.vm 2013-07-04 06:08:28 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientRegistrationForm.vm 2013-07-09 07:14:55 +0000
@@ -13,12 +13,14 @@
<table class="listTable">
<col>
- <col>
+ <col>
+ <col>
<col width="100">
<thead>
<tr>
- <th>$i18n.getString( "name" )</th>
<th>$i18n.getString( "program" )</th>
+ <th>$i18n.getString( "default_form_name" )</th>
+ <th>$i18n.getString( "custom_form_name" )</th>
<th class="{sorter: false}">$i18n.getString( "operations" )</th>
</tr>
</thead>
@@ -27,9 +29,6 @@
#foreach( $registrationForm in $registrationForms )
<tr id="tr${registrationForm.program.id}">
<td>
- $encoder.htmlEncode( $registrationForm.name )
- </td>
- <td>
#if($registrationForm.program)
$encoder.htmlEncode( $registrationForm.program.name )
#else
@@ -37,6 +36,12 @@
#set($hasCommonForm = 'true')
#end
</td>
+ <td>
+ $!encoder.htmlEncode( $registrationForm.name )
+ </td>
+ <td>
+ $!encoder.htmlEncode( $registrationForm.dataEntryForm.name )
+ </td>
<td style="text-align:center">
<a href="javascript:showDefaultRegistrationForm('$!registrationForm.program.id');" title="$i18n.getString( 'edit' )"><img src='../images/edit.png' alt="$i18n.getString( 'edit' )"></a>
@@ -52,7 +57,8 @@
#foreach($program in $programs)
<tr id="tr${registrationForm.id}">
<td>$encoder.htmlEncode( $program.name )</td>
- <td>[$i18n.getString('none')]</td>
+ <td>[$i18n.getString('none')]</td>
+ <td>[$i18n.getString('none')]</td>
<td style="text-align:center">
<a href="javascript:showDefaultRegistrationForm($program.id);" title="$i18n.getString( 'edit' )"><img src='../images/edit.png' alt="$i18n.getString( 'edit' )"></a>
<a href="javascript:addNewForm($program.id)" title="$i18n.getString( 'design_data_entry_form' )"><img src="../images/edit_layout.png" alt="$i18n.getString( 'design_data_entry_form' )"></a>
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
