------------------------------------------------------------ revno: 13807 committer: Bharath <chbhara...@gmail.com> branch nick: dhis2 timestamp: Wed 2014-01-22 11:29:04 +0000 message: PBF: QualityMaxScore, QualityScore Fixes removed: local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/loadQualityStoreEntryForm.vm local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/qualityStoreEntrySelection.vm added: local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/quality/dataentry/ValidateQualityMaxDataAction.java local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/menuMaxEntry.vm local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/menuScoreEntry.vm modified: local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/aggregation/DefaultCCEIAggregationService.java local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/action/ValidateTariffDataAction.java local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/quality/dataentry/LoadQualityMaxDetailsAction.java local/in/dhis-web-maintenance-pbf/src/main/resources/META-INF/dhis/beans.xml local/in/dhis-web-maintenance-pbf/src/main/resources/org/hisp/dhis/pbf/i18n_module.properties local/in/dhis-web-maintenance-pbf/src/main/resources/struts.xml local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/javascript/qualityMaxDataEntry.js local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/menu.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 'local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/aggregation/DefaultCCEIAggregationService.java' --- local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/aggregation/DefaultCCEIAggregationService.java 2014-01-12 16:56:05 +0000 +++ local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/aggregation/DefaultCCEIAggregationService.java 2014-01-22 11:29:04 +0000 @@ -425,8 +425,7 @@ } } - System.out.println( vsReqLiveBirthData + " : " + vsReqVaccineVolumePerChildData + " : " - + vsReqSupplyIntervalData + " : " + vsReqReserveStockData ); + //System.out.println( vsReqLiveBirthData + " : " + vsReqVaccineVolumePerChildData + " : " + vsReqSupplyIntervalData + " : " + vsReqReserveStockData ); // Formula for calculating Requirement try { @@ -442,6 +441,7 @@ vaccineRequirement = Math.round( vaccineRequirement * Math.pow( 10, 1 ) ) / Math.pow( 10, 1 ); numberOfData.put( "Required", vaccineRequirement + "" ); + //System.out.println( vaccineRequirement + " : " + vaccineActualValue ); Double diffVaccineReq = vaccineActualValue - vaccineRequirement; diffVaccineReq = Math.round( diffVaccineReq * Math.pow( 10, 1 ) ) / Math.pow( 10, 1 ); numberOfData.put( "Difference", "" + diffVaccineReq ); === modified file 'local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/action/ValidateTariffDataAction.java' --- local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/action/ValidateTariffDataAction.java 2013-12-24 12:23:11 +0000 +++ local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/action/ValidateTariffDataAction.java 2014-01-22 11:29:04 +0000 @@ -115,7 +115,7 @@ private String message; - public String getMessage() { + public String getMessage() { return message; } @@ -140,11 +140,7 @@ List<TariffDataValue> tariffDataValues = new ArrayList<TariffDataValue>( tariffDataValueService.getTariffDataValues(organisationUnit, dataElement)); //boolean status = false; for(TariffDataValue tdv : tariffDataValues) - { - System.out.println(tdv.getDataSet().getId()); - System.out.println(dataSet.getId()); - System.out.println(tdv.getStartDate().before(sDate)); - System.out.println(tdv.getEndDate().after(eDate)); + { if(tdv.getDataSet().getId() == dataSet.getId() && tdv.getStartDate().before(sDate) && tdv.getEndDate().after(eDate) ) { message = "true"; === modified file 'local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/quality/dataentry/LoadQualityMaxDetailsAction.java' --- local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/quality/dataentry/LoadQualityMaxDetailsAction.java 2014-01-18 12:25:59 +0000 +++ local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/quality/dataentry/LoadQualityMaxDetailsAction.java 2014-01-22 11:29:04 +0000 @@ -140,7 +140,7 @@ List<DataElement> dataElementList = new ArrayList<DataElement>(dataSet.getDataElements()); for( DataElement de : dataElementList ) { - Set<AttributeValue> attrValueSet = new HashSet<AttributeValue>( de.getAttributeValues() ); + Set<AttributeValue> attrValueSet = new HashSet<AttributeValue>( de.getAttributeValues() ); for ( AttributeValue attValue : attrValueSet ) { if(attValue.getAttribute().getId() == qualityMaxDataElement.getValue()) === added file 'local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/quality/dataentry/ValidateQualityMaxDataAction.java' --- local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/quality/dataentry/ValidateQualityMaxDataAction.java 1970-01-01 00:00:00 +0000 +++ local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/quality/dataentry/ValidateQualityMaxDataAction.java 2014-01-22 11:29:04 +0000 @@ -0,0 +1,138 @@ +package org.hisp.dhis.pbf.quality.dataentry; + +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.hisp.dhis.dataelement.DataElement; +import org.hisp.dhis.dataset.DataSet; +import org.hisp.dhis.dataset.DataSetService; +import org.hisp.dhis.organisationunit.OrganisationUnit; +import org.hisp.dhis.organisationunit.OrganisationUnitService; +import org.hisp.dhis.pbf.api.QualityMaxValue; +import org.hisp.dhis.pbf.api.QualityMaxValueService; + +import com.opensymphony.xwork2.Action; + +public class ValidateQualityMaxDataAction + implements Action +{ + // ------------------------------------------------------------------------- + // Dependencies + // ------------------------------------------------------------------------- + + private QualityMaxValueService qualityMaxValueService; + + public void setQualityMaxValueService( QualityMaxValueService qualityMaxValueService ) + { + this.qualityMaxValueService = qualityMaxValueService; + } + + private DataSetService dataSetService; + + public void setDataSetService( DataSetService dataSetService ) + { + this.dataSetService = dataSetService; + } + + private OrganisationUnitService organisationUnitService; + + public void setOrganisationUnitService( OrganisationUnitService organisationUnitService ) + { + this.organisationUnitService = organisationUnitService; + } + + // ------------------------------------------------------------------------- + // Input / Output + // ------------------------------------------------------------------------- + + private String orgUnitId; + + public void setOrgUnitId( String orgUnitId ) + { + this.orgUnitId = orgUnitId; + } + + private String dataSetId; + + public void setDataSetId( String dataSetId ) + { + this.dataSetId = dataSetId; + } + + private String startDate; + + public void setStartDate( String startDate ) + { + this.startDate = startDate; + } + + private String endDate; + + public void setEndDate( String endDate ) + { + this.endDate = endDate; + } + + List<DataElement> dataElements = new ArrayList<DataElement>(); + + public List<DataElement> getDataElements() + { + return dataElements; + } + + private SimpleDateFormat simpleDateFormat = new SimpleDateFormat( "yyyy-MM-dd" );; + + public SimpleDateFormat getSimpleDateFormat() + { + return simpleDateFormat; + } + + private Map<Integer, QualityMaxValue> qualityMaxValueMap = new HashMap<Integer, QualityMaxValue>(); + + public Map<Integer, QualityMaxValue> getQualityMaxValueMap() + { + return qualityMaxValueMap; + } + + private String message; + + public String getMessage() + { + return message; + } + + // ------------------------------------------------------------------------- + // Action implementation + // ------------------------------------------------------------------------- + + public String execute() + throws Exception + { + SimpleDateFormat dateFormat = new SimpleDateFormat( "yyyy-MM-dd" ); + + Date sDate = dateFormat.parse( startDate ); + Date eDate = dateFormat.parse( endDate ); + OrganisationUnit organisationUnit = organisationUnitService.getOrganisationUnit( orgUnitId ); + DataSet dataSet = dataSetService.getDataSet( Integer.parseInt( dataSetId ) ); + + List<QualityMaxValue> qualityMaxValues = new ArrayList<QualityMaxValue>( + qualityMaxValueService.getQuanlityMaxValues( organisationUnit, dataSet ) ); + for ( QualityMaxValue qualityMaxValue : qualityMaxValues ) + { + if ( qualityMaxValue.getStartDate().getTime() <= sDate.getTime() && qualityMaxValue.getEndDate().getTime() >= eDate.getTime() ) + { + message = "true"; + break; + } + else + { + message = "false"; + } + } + return SUCCESS; + } +} \ No newline at end of file === modified file 'local/in/dhis-web-maintenance-pbf/src/main/resources/META-INF/dhis/beans.xml' --- local/in/dhis-web-maintenance-pbf/src/main/resources/META-INF/dhis/beans.xml 2014-01-18 12:25:59 +0000 +++ local/in/dhis-web-maintenance-pbf/src/main/resources/META-INF/dhis/beans.xml 2014-01-22 11:29:04 +0000 @@ -173,6 +173,13 @@ </bean> <!-- Quality Max Data Entry --> + + <bean id="org.hisp.dhis.pbf.quality.dataentry.ValidateQualityMaxDataAction" class="org.hisp.dhis.pbf.quality.dataentry.ValidateQualityMaxDataAction" scope="prototype"> + <property name="qualityMaxValueService" ref="org.hisp.dhis.pbf.api.QualityMaxValueService" /> + <property name="dataSetService" ref="org.hisp.dhis.dataset.DataSetService" /> + <property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" /> + </bean> + <bean id="org.hisp.dhis.pbf.quality.dataentry.GetOrganisationUnitAction" class="org.hisp.dhis.pbf.quality.dataentry.GetOrganisationUnitAction" scope="prototype"> <property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" /> <property name="lookupService" ref="org.hisp.dhis.pbf.api.LookupService" /> === modified file 'local/in/dhis-web-maintenance-pbf/src/main/resources/org/hisp/dhis/pbf/i18n_module.properties' --- local/in/dhis-web-maintenance-pbf/src/main/resources/org/hisp/dhis/pbf/i18n_module.properties 2014-01-18 12:25:59 +0000 +++ local/in/dhis-web-maintenance-pbf/src/main/resources/org/hisp/dhis/pbf/i18n_module.properties 2014-01-22 11:29:04 +0000 @@ -1,8 +1,8 @@ pbf_setup = PBF Setup -dataelement_tariff_management = Tariff Management Dataelement +dataelement_tariff_management = Tariff Management pbf_management = PBF Management -dataentry = Data Entry +pbf_dataentry = PBF Data Entry bank_details_management = Bank Details Management pbf_dataentry = PBF Data Entry @@ -21,8 +21,8 @@ qty_reported = Quantity Reported qty_validated = Quantity Validated tariff_amount = Tariff Amount -quality_max_entry = Quality Max Data Entry -quality_store_entry = Quality Store Data Entry +quality_max_entry = Quality Max Score +quality_score_entry = Quality Score Entry quality_score = Score quality_max = Max quality_percentage = Percentage \ No newline at end of file === modified file 'local/in/dhis-web-maintenance-pbf/src/main/resources/struts.xml' --- local/in/dhis-web-maintenance-pbf/src/main/resources/struts.xml 2014-01-18 12:25:59 +0000 +++ local/in/dhis-web-maintenance-pbf/src/main/resources/struts.xml 2014-01-22 11:29:04 +0000 @@ -110,6 +110,12 @@ </action> <!-- Quality Max Data Entry --> + + <action name="validateMaxData" class="org.hisp.dhis.pbf.quality.dataentry.ValidateQualityMaxDataAction"> + <result name="success" type="velocity-json">/dhis-web-maintenance-pbf/tariffStatus.vm</result> + <param name="onExceptionReturn">plainTextError</param> + </action> + <action name="getOrganisationUnitForQuality" class="org.hisp.dhis.pbf.quality.dataentry.GetOrganisationUnitAction"> <result name="success" type="velocity-json">/dhis-web-maintenance-pbf/jsonResponseSuccess.vm</result> <result name="input" type="velocity-json">/dhis-web-maintenance-pbf/jsonResponseInput.vm</result> @@ -119,7 +125,7 @@ <interceptor-ref name="organisationUnitTreeStack" /> <result name="success" type="velocity">/main.vm</result> <param name="page">/dhis-web-maintenance-pbf/qualityMaxEntrySelection.vm</param> - <param name="menu">/dhis-web-maintenance-pbf/menuDataEntry.vm</param> + <param name="menu">/dhis-web-maintenance-pbf/menuMaxEntry.vm</param> <param name="javascripts">../dhis-web-commons/ouwt/ouwt.js,javascript/qualityMaxDataEntry.js</param> <param name="stylesheets">css/dataentry.css</param> </action> @@ -142,8 +148,8 @@ <action name="qualityScoreDataEntry" class="org.hisp.dhis.pbf.quality.dataentry.QualityMaxInitAction"> <interceptor-ref name="organisationUnitTreeStack" /> <result name="success" type="velocity">/main.vm</result> - <param name="page">/dhis-web-maintenance-pbf/qualityStoreEntrySelection.vm</param> - <param name="menu">/dhis-web-maintenance-pbf/menuDataEntry.vm</param> + <param name="page">/dhis-web-maintenance-pbf/qualityScoreEntrySelection.vm</param> + <param name="menu">/dhis-web-maintenance-pbf/menuScoreEntry.vm</param> <param name="javascripts">../dhis-web-commons/ouwt/ouwt.js,javascript/qualityScoreDataEntry.js</param> <param name="stylesheets">css/dataentry.css</param> </action> @@ -151,7 +157,7 @@ <!-- Load DataEntry Form --> <action name="loadQualityScoreForm" class="org.hisp.dhis.pbf.quality.dataentry.LoadQualityScoreDetailsAction"> <result name="success" type="velocity">/content.vm</result> - <param name="page">/dhis-web-maintenance-pbf/loadQualityStoreEntryForm.vm</param> + <param name="page">/dhis-web-maintenance-pbf/loadQualityScoreEntryForm.vm</param> </action> <!-- Save Quality Score Value --> === modified file 'local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/javascript/qualityMaxDataEntry.js' --- local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/javascript/qualityMaxDataEntry.js 2014-01-18 12:25:59 +0000 +++ local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/javascript/qualityMaxDataEntry.js 2014-01-22 11:29:04 +0000 @@ -62,10 +62,29 @@ var startDate = $("#startDate").val(); var endDate = $("#endDate").val(); + var date1 = Date.parse( startDate ); + var date2 = Date.parse( endDate ); + if (date1 > date2) { + alert ("Please enter correct date"); + return false; + } if(startDate != "" && endDate != "") { - jQuery('#loaderDiv').show(); - + /* var dataValue = { + 'orgUnitId' : orgUnitId, + 'startDate' : startDate, + 'endDate' : endDate, + 'dataSetId': dataSetId + }; + jQuery.ajax( { + url: 'validateMaxData.action', + data: dataValue, + dataType: 'json', + success: handleSuccess, + error: handleError + } ); + */ + jQuery('#loaderDiv').show(); jQuery('#dataEntryFormDiv').load('loadQualityMaxForm.action', { orgUnitId:orgUnitId, @@ -79,8 +98,38 @@ }); hideLoader(); } + +/* function handleSuccess( json ) + { + if(json.message == "true") + { + alert("Max quality score exist between this range"); + } + else + { + jQuery('#loaderDiv').show(); + jQuery('#dataEntryFormDiv').load('loadQualityMaxForm.action', + { + orgUnitId:orgUnitId, + dataSetId:dataSetId, + startDate:startDate, + endDate:endDate + }, function() + { + showById('dataEntryFormDiv'); + jQuery('#loaderDiv').hide(); + }); + hideLoader(); + } + } + function handleError( json ) + { + alert("Error!"); + } + */ } + function saveQualityDataValue( dataElementId ) { var dataSetId = $( '#dataSetId' ).val(); === removed file 'local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/loadQualityStoreEntryForm.vm' --- local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/loadQualityStoreEntryForm.vm 2014-01-18 12:25:59 +0000 +++ local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/loadQualityStoreEntryForm.vm 1970-01-01 00:00:00 +0000 @@ -1,103 +0,0 @@ - -#macro( validate $type $require ) - #if( $type == "NUMBER" || $type == "number" ) - {validate:{ number:true #if($require), required:true #end }} - - #elseif( $type == "int" ) - {validate:{ integer:true #if($require), required:true #end }} - - #elseif( $type == "positiveNumber" ) - {validate:{ positive_integer:true #if($require), required:true #end }} - - #elseif( $type == "negativeNumber" ) - {validate:{ negative_integer:true #if($require), required:true #end }} - - - #elseif( $require ) - {validate:{required:true}} - #end -#end - -#set( $tabIndex = 1 ) -#if ( $dataElements.size() > 0) - -<table class="formSection" id="dataEntryTable"> - <tr bgcolor="#CBDDEB"> - <th style="text-align: left;">$i18n.getString( "dataelement" )</th> - <th style="text-align: center;">$i18n.getString( "quality_score" )</th> - <th style="text-align: center;">$i18n.getString( "quality_max" )</th> - <th style="text-align: center;">$i18n.getString( "quality_percentage" )</th> - </tr> - <script> - var allTotal = 0.0; - </script> - - #set( $mark = false ) - #set( $count = 0) - #foreach($dataElement in $dataElements ) - #set( $count = $count + 1) - #if( $mark1 ) - #set( $mark1 = false ) - #else - #set( $mark1 = true ) - #end - <tr #if( $mark1 ) bgcolor = "#FFFFFF" #else bgcolor="#E0ECF8" #end> - <td><label>$dataElement.getFormNameFallback()</label></td> - - #set( $qualityMaxValue = $!qualityMaxValueMap.get( $dataElement.id ) ) - #set( $dataValue = $!dataValueMap.get( $dataElement.id ) ) - <td> - <input onkeyup="calPercenVal( $dataElement.id )" onblur="saveValue('$dataElement.id')" type="text" name="score_$dataElement.id" id="score_$dataElement.id" - value="$!dataValue.value" tabindex="$tabIndex" style="text-align: center;" - #if($dataElement.type =='number') class="{validate:{number:true}}" - #elseif($dataElement.type =='int') class="{validate:{integer:true}}" - #elseif($dataElement.type =='positiveNumber') class="{validate:{positive_integer:true}}" - #elseif($dataElement.type =='negativeNumber') class="{validate:{negative_integer:true}}" - #end /> - </td> - <script> - function changeInt() - { - var percentage = 0.0; - if('$!dataValue.value' != '' && $!qualityMaxValue.value != '') - { - percentage = (parseFloat($dataValue.value) * 100) / parseFloat($qualityMaxValue.value); - $('#percentage_'+$dataElement.id).val(percentage.toFixed(2)); - } - - allTotal = (allTotal + percentage)/$count; - - $('#all-total').val(allTotal.toFixed(2)); - } - changeInt(); - </script> - <td> - <input type="text" name="max_$dataElement.id" id="max_$dataElement.id" value="$!qualityMaxValue.value" tabindex="$tabIndex" style="text-align: center;" readonly/> - </td> - <td > - <input type="text" id="percentage_$dataElement.id" style="text-align: center;" readonly/> - </td> - - </tr> - #end - #end - <tr> - <td colspan="3" style="text-align: right;">Overall Score ( Sum Score/Sum Max Score )</td> - <td > - <input type="text" id="all-total" style="text-align: center;" readonly size="18"/>% - </td> - </tr> -</table> -<script > - function calPercenVal( dataElementId ) - { - var percentage = 0.0; - if($("#score_"+dataElementId).val() != '' && $("#max_"+dataElementId).val() != '') - { - percentage = (parseFloat($("#score_"+dataElementId).val()) * 100) / parseFloat($("#max_"+dataElementId).val()); - $('#percentage_'+dataElementId).val(percentage.toFixed(2)); - } - allTotal = (allTotal + percentage) / $count; - $('#all-total').val(allTotal.toFixed(2)); - } -</script> === modified file 'local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/menu.vm' --- local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/menu.vm 2014-01-18 12:25:59 +0000 +++ local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/menu.vm 2014-01-22 11:29:04 +0000 @@ -1,13 +1,13 @@ <h2>$i18n.getString( "pbf_setup" )</h2> <ul> - <li><a href="pbfDataEntry.action">$i18n.getString( "dataentry" )</a></li> + <li><a href="pbfDataEntry.action">$i18n.getString( "pbf_dataentry" )</a></li> + + <li><a href="qualityScoreDataEntry.action">$i18n.getString( "quality_score_entry" )</a></li> + + <li><a href="qualityMaxDataEntry.action">$i18n.getString( "quality_max_entry" )</a></li> <li><a href="dataElementTariffManagement.action">$i18n.getString( "dataelement_tariff_management" )</a></li> - <li><a href="bankDetailsManagement.action">$i18n.getString( "bank_details_management" )</a></li> - - <li><a href="qualityMaxDataEntry.action">$i18n.getString( "quality_max_entry" )</a></li> - - <li><a href="qualityScoreDataEntry.action">$i18n.getString( "quality_store_entry" )</a></li> + <li><a href="bankDetailsManagement.action">$i18n.getString( "bank_details_management" )</a></li> </ul> === added file 'local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/menuMaxEntry.vm' --- local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/menuMaxEntry.vm 1970-01-01 00:00:00 +0000 +++ local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/menuMaxEntry.vm 2014-01-22 11:29:04 +0000 @@ -0,0 +1,9 @@ + +<a href="index.action"><h2>$i18n.getString( "quality_max_entry" ) </h2></a> +<ul> + <!--<li></li>--> + <!--<li></li>--> +</ul> +<br> + +#parse( "/dhis-web-commons/ouwt/orgunittreesearch.vm" ) \ No newline at end of file === added file 'local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/menuScoreEntry.vm' --- local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/menuScoreEntry.vm 1970-01-01 00:00:00 +0000 +++ local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/menuScoreEntry.vm 2014-01-22 11:29:04 +0000 @@ -0,0 +1,9 @@ + +<a href="index.action"><h2>Quality Score Data Entry </h2></a> +<ul> + <!--<li></li>--> + <!--<li></li>--> +</ul> +<br> + +#parse( "/dhis-web-commons/ouwt/orgunittreesearch.vm" ) \ No newline at end of file === removed file 'local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/qualityStoreEntrySelection.vm' --- local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/qualityStoreEntrySelection.vm 2014-01-18 12:25:59 +0000 +++ local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/qualityStoreEntrySelection.vm 1970-01-01 00:00:00 +0000 @@ -1,80 +0,0 @@ -<script> - - jQuery(document).ready( function(){ - currentDiv = 'pbfDataEntryForm'; - isSubmit = true; - jQuery("#pbfDataEntryForm").validate({ - meta:"validate" - ,errorElement:"span" - ,submitHandler: function(form) - { - if( isSubmit ) - { - savePBFDataEntryForm(); - } - } - }); - }); - -</script> - -<h3>Quality Score Data Entry</h3> - -<form id="pbfDataEntryForm" name="pbfDataEntryForm" method="post" > -<div> - <input type="hidden" id='selectedOrgunitID' name = 'selectedOrgunitID' value="$!organisationUnit.uid" /> - <input type="hidden" id='selectedOrgunitName' name = 'selectedOrgunitName' value="$!organisationUnit.name" /> - -</div> - -<div class="inputCriteria" style="width:480px;height:90px;"> -<table> - <tr> - <td><label for="orgUnitName">$i18n.getString( "organisation_unit" )</label></td> - <td><input type="text" id="orgUnitName" name = "orgUnitName" readonly="readonly" value="$!organisationUnit.name" style="width:352px"></td> - </tr> - - <tr> - <td><label>$i18n.getString( "dataset" )</label></td> - <td> - <select id="dataSetId" name = "dataSetId" style="width:354px" onchange="loadPeriods();" #if( $dataSets.size() == 0 ) disabled="disabled" #end> - <option value="-1">$i18n.getString( "select_dataSet" )</option> - #foreach( $dataSet in $dataSets ) - <option value="$dataSet.id">$dataSet.name</option> - #end - </select> - </td> - </tr> - - <tr> - <td><label for="selectedPeriodId">$i18n.getString( "period" )</label></td> - <td><select id="selectedPeriodId" name="selectedPeriodId" style="width:200px" disabled="disabled" onchange="loadDataEntryForm()"> - <option value="-1">[$i18n.getString( "select" )]</option> - #foreach( $period in $periods ) - <option value="$period.iso">$encoder.htmlEncode( $period.name )</option> - #end - </select> - <input type="button" id="prevButton" disabled="disabled" style="width:75px" value="$i18n.getString( 'prev_year' )" title="$i18n.getString('earlier_periods')" onclick="getAvailablePeriodsTemp( 'selectedPeriodId', 'selectedPeriodId', '-1' )" > - <input type="button" id="nextButton" disabled="disabled" style="width:75px" value="$i18n.getString( 'next_year' )" title="$i18n.getString('later_periods')" onclick="getAvailablePeriodsTemp( 'selectedPeriodId', 'selectedPeriodId', '1' )" > - - </td> - </tr> - -</table> -</div> - - -#parse( "/dhis-web-commons/loader/loader.vm" ) -<div id='dataEntryFormDiv'></div> <!-- DataEntry Form --> - -</form> - -<script type="text/javascript"> - -var i18n_select_dataset = '$encoder.jsEscape( $i18n.getString( "select_dataSet" ) , "'")'; - - -jQuery( document ).ready( function() -{ -}); -</script> \ No newline at end of file
_______________________________________________ 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