------------------------------------------------------------ revno: 8635 committer: Tran Chau <[email protected]> branch nick: dhis2 timestamp: Mon 2012-10-22 16:04:43 +0700 message: Don't display orgunit name columnn in single event without registration. modified: dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/GenerateTabularReportAction.java dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/anonymousRegistration.vm dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageInstancesList.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/java/org/hisp/dhis/caseentry/action/report/GenerateTabularReportAction.java' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/GenerateTabularReportAction.java 2012-10-16 04:05:28 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/GenerateTabularReportAction.java 2012-10-22 09:04:43 +0000 @@ -27,7 +27,12 @@ package org.hisp.dhis.caseentry.action.report; -import static org.hisp.dhis.patientreport.PatientTabularReport.*; +import static org.hisp.dhis.patientreport.PatientTabularReport.PREFIX_DATA_ELEMENT; +import static org.hisp.dhis.patientreport.PatientTabularReport.PREFIX_FIXED_ATTRIBUTE; +import static org.hisp.dhis.patientreport.PatientTabularReport.PREFIX_IDENTIFIER_TYPE; +import static org.hisp.dhis.patientreport.PatientTabularReport.PREFIX_NUMBER_DATA_ELEMENT; +import static org.hisp.dhis.patientreport.PatientTabularReport.PREFIX_PATIENT_ATTRIBUTE; +import static org.hisp.dhis.patientreport.PatientTabularReport.VALUE_TYPE_OPTION_SET; import java.util.ArrayList; import java.util.Collection; @@ -57,7 +62,6 @@ import org.hisp.dhis.program.ProgramStageInstance; import org.hisp.dhis.program.ProgramStageInstanceService; import org.hisp.dhis.program.ProgramStageService; -import org.hisp.dhis.system.util.ConversionUtils; import org.hisp.dhis.system.util.TextUtils; /** === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/anonymousRegistration.vm' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/anonymousRegistration.vm 2012-10-19 07:56:04 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/anonymousRegistration.vm 2012-10-22 09:04:43 +0000 @@ -25,7 +25,7 @@ <table> <tr> <td><label>$i18n.getString( "registering_unit" )</label></td> - <td><input type="text" id='orgunitName' name='orgunitName' value='$!orgunit.name' readonly></td> + <td><input type="text" id='orgunitName' name='orgunitName' #if( $orgunit ) value="$encoder.htmlEncode( $orgunit.name )" #else value="[$i18n.getString( 'please_select_village' )]" #end readonly></td> </tr> <tr> <td> === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageInstancesList.vm' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageInstancesList.vm 2012-10-06 04:54:55 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageInstancesList.vm 2012-10-22 09:04:43 +0000 @@ -24,9 +24,11 @@ <thead> <tr> <th>#</th> + #set($noCols = $grid.getHeaders().size() ) + #set($metaData = $noCols - $valueTypes.size() - 1) #set($index = 0) #foreach( $col in $grid.getHeaders() ) - #if( $index > 0 ) + #if( $index==1 || $index > $metaData ) <th>$col.name</th> #end #set($index = $index + 1) @@ -36,7 +38,6 @@ </thead> <tbody id="list"> - #set($noCols = $grid.getHeaders().size()) #foreach( $row in $grid.getRows() ) #set($index = 0) <tr id="row" #alternate( $mark )> @@ -48,7 +49,7 @@ #foreach( $col in $row ) #if( $index == 0 ) #set($psid = $col) - #elseif( $index < $noCols ) + #elseif( $index==1 || $index > $metaData ) <td>$!col</td> #end #set($index = $index + 1)
_______________________________________________ Mailing list: https://launchpad.net/~dhis2-devs Post to : [email protected] Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
