dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #16945
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 6591: (patient) Removed unused files.
------------------------------------------------------------
revno: 6591
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2012-04-16 12:10:40 +0700
message:
(patient) Removed unused files.
removed:
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/GetTabularParamsAction.java
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/tabularReport.js
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responseTabularParams.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/searchTabularReportResult.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/tabularReportResult.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/tabularReportSelect.vm
modified:
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageInstanceStore.java
dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml
--
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-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageInstanceStore.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageInstanceStore.java 2012-04-15 08:08:22 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageInstanceStore.java 2012-04-16 05:10:40 +0000
@@ -270,9 +270,10 @@
}
}
- condition += "WHERE psi.executiondate >= '" + DateUtils.getMediumDateString( startDate )
+ condition += " WHERE psi.executiondate >= '" + DateUtils.getMediumDateString( startDate )
+ "' AND psi.executiondate <= '" + DateUtils.getMediumDateString( endDate ) + "' "
- + " AND psi.organisationunitid in " + splitListHelper( orgunitIds ) + " ";
+ + " AND psi.organisationunitid in " + splitListHelper( orgunitIds )
+ + " psi.programstageid = " + programStage.getId() + " ";
// ---------------------------------------------------------------------
// Searching program-stage-instances by patient-identifiers
=== removed file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/GetTabularParamsAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/GetTabularParamsAction.java 2012-04-11 06:25:02 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/GetTabularParamsAction.java 1970-01-01 00:00:00 +0000
@@ -1,134 +0,0 @@
-/*
- * Copyright (c) 2004-2012, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * * Neither the name of the HISP project nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.caseentry.action.report;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.hisp.dhis.patient.PatientAttribute;
-import org.hisp.dhis.patient.PatientAttributeService;
-import org.hisp.dhis.patient.PatientIdentifierType;
-import org.hisp.dhis.patient.PatientIdentifierTypeService;
-import org.hisp.dhis.program.Program;
-import org.hisp.dhis.program.ProgramService;
-import org.hisp.dhis.program.ProgramStage;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Chau Thu Tran
- *
- * @version $GetTabularParamsAction.java Apr 3, 2012 8:42:24 AM$
- */
-public class GetTabularParamsAction
- implements Action
-{
- // -------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------
-
- private PatientIdentifierTypeService identifierTypeService;
-
- private PatientAttributeService attributeService;
-
- private ProgramService programService;
-
- // -------------------------------------------------------------------------
- // Input/Output
- // -------------------------------------------------------------------------
-
- private Integer programId;
-
- private Collection<PatientIdentifierType> identifierTypes = new HashSet<PatientIdentifierType>();
-
- private Collection<PatientAttribute> attributes = new HashSet<PatientAttribute>();
-
- private Set<ProgramStage> programStages = new HashSet<ProgramStage>();
-
- // -------------------------------------------------------------------------
- // Getter && Setters
- // -------------------------------------------------------------------------
-
- public Collection<PatientIdentifierType> getIdentifierTypes()
- {
- return identifierTypes;
- }
-
- public Collection<PatientAttribute> getAttributes()
- {
- return attributes;
- }
-
- public void setIdentifierTypeService( PatientIdentifierTypeService identifierTypeService )
- {
- this.identifierTypeService = identifierTypeService;
- }
-
- public void setAttributeService( PatientAttributeService attributeService )
- {
- this.attributeService = attributeService;
- }
-
- public void setProgramService( ProgramService programService )
- {
- this.programService = programService;
- }
-
- public void setProgramId( Integer programId )
- {
- this.programId = programId;
- }
-
- public Set<ProgramStage> getProgramStages()
- {
- return programStages;
- }
-
- // -------------------------------------------------------------------------
- // Action implementation
- // -------------------------------------------------------------------------
-
- @Override
- public String execute()
- throws Exception
- {
- Program program = programService.getProgram( programId );
-
- programStages = program.getProgramStages();
-
- identifierTypes = identifierTypeService.getPatientIdentifierTypesWithoutProgram();
- identifierTypes.addAll( identifierTypeService.getPatientIdentifierTypes( program ) );
-
- attributes = attributeService.getPatientAttributes( null, null );
- attributes.addAll( attributeService.getPatientAttributes( program ) );
-
- return SUCCESS;
- }
-
-}
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/META-INF/dhis/beans.xml 2012-04-15 08:08:22 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/META-INF/dhis/beans.xml 2012-04-16 05:10:40 +0000
@@ -318,17 +318,6 @@
scope="prototype">
<property name="programStageService" ref="org.hisp.dhis.program.ProgramStageService" />
</bean>
-
- <bean
- id="org.hisp.dhis.caseentry.action.report.GetTabularParamsAction"
- class="org.hisp.dhis.caseentry.action.report.GetTabularParamsAction"
- scope="prototype">
- <property name="identifierTypeService"
- ref="org.hisp.dhis.patient.PatientIdentifierTypeService" />
- <property name="attributeService"
- ref="org.hisp.dhis.patient.PatientAttributeService" />
- <property name="programService" ref="org.hisp.dhis.program.ProgramService" />
- </bean>
<bean
id="org.hisp.dhis.caseentry.action.report.GenerateTabularReportAction"
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml 2012-04-15 08:08:22 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml 2012-04-16 05:10:40 +0000
@@ -293,11 +293,6 @@
<result name="success" type="velocity-json">
/dhis-web-commons/ajax/jsonPrograms.vm</result>
</action>
-
- <action name="getTabularParams"
- class="org.hisp.dhis.caseentry.action.report.GetTabularParamsAction">
- <result name="success" type="velocity-json">/dhis-web-caseentry/responseTabularParams.vm</result>
- </action>
<action name="loadReportIdentifierTypes"
class="org.hisp.dhis.caseentry.action.report.LoadIdentifierTypesAction">
@@ -339,15 +334,6 @@
/dhis-web-commons/ajax/jsonResponseInput.vm</result>
</action>
- <!-- action name="generateTabularReport"
- class="org.hisp.dhis.caseentry.action.report.GenerateTabularReportAction">
- <result name="success" type="velocity">/content.vm</result>
- <result name="xls" type="gridXlsResult" />
- <result name="pdf" type="gridPdfResult" />
- <param name="page">/dhis-web-caseentry/tabularReportResult.vm</param>
- <param name="requiredAuthorities">F_GENERATE_BENEFICIARY_TABULAR_REPORT</param>
- </action -->
-
<action name="generateTabularReport"
class="org.hisp.dhis.caseentry.action.report.GenerateTabularReportAction">
<result name="success" type="velocity-json">/dhis-web-caseentry/jsonTabularReport.vm</result>
@@ -355,13 +341,7 @@
<result name="pdf" type="gridPdfResult" />
<param name="requiredAuthorities">F_GENERATE_BENEFICIARY_TABULAR_REPORT</param>
</action>
-
- <action name="searchTabularReport"
- class="org.hisp.dhis.caseentry.action.report.GenerateTabularReportAction">
- <result name="success" type="velocity">/dhis-web-caseentry/searchTabularReportResult.vm</result>
- <param name="requiredAuthorities">F_GENERATE_BENEFICIARY_TABULAR_REPORT</param>
- </action>
-
+
<!-- i18n -->
<action name="i18n" class="org.hisp.dhis.caseentry.action.NoAction">
=== removed file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/tabularReport.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/tabularReport.js 2012-04-11 06:25:02 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/tabularReport.js 1970-01-01 00:00:00 +0000
@@ -1,439 +0,0 @@
-
-function organisationUnitSelected( orgUnits, orgUnitNames )
-{
- setInnerHTML( 'contentDiv' , '');
- setFieldValue( 'orgunitname', orgUnitNames[0] );
-
- showCriteria();
-}
-
-selection.setListenerFunction( organisationUnitSelected );
-
-
-// ---------------------------------------------------------------------
-// Load patient-identifiers && patient-attributes
-// ---------------------------------------------------------------------
-
-function getTabularParams()
-{
- clearListById( 'availableIdenIds' );
- clearListById( 'availableAttrIds' );
- clearListById( 'programStageId');
- if( getFieldValue('programStageId') == '' )
- {
- return;
- }
- else
- {
- clearListById( 'availableAttrIds' );
- $.getJSON( 'getTabularParams.action',
- {
- programId: getFieldValue('programId')
- }
- , function( json )
- {
- // Load patient-identifier-types
- for ( i in json.identifierTypes )
- {
- $('#availableIdenIds').append('<option value="iden_' + json.identifierTypes[i].id + '_" >' + json.identifierTypes[i].name + '</option>');
- }
-
- // Load patient-attributes
- for ( i in json.patientAttributes )
- {
- $('#availableAttrIds').append('<option value="attr_' + json.patientAttributes[i].id + '_" >' + json.patientAttributes[i].name + '</option>');
- }
-
- // Load program-stages
- var noProgramStage = 0;
- for ( i in json.programStages )
- {
- if( !json.programStages[i].irregular )
- {
- $('#programStageId').append('<option value=' + json.programStages[i].id + '>' + json.programStages[i].name + '</option>');
- noProgramStage++;
- }
- }
-
- if( noProgramStage > 1 )
- {
- $('#programStageId').prepend('<option value="">' + i18n_please_select_a_program_stage + '</option>');
- $('#programStageId option:first-child').attr("selected", "selected");
- }
- else if( noProgramStage == 1 )
- {
- loadDataElements();
- }
- } );
- }
-}
-
-// ---------------------------------------------------------------------
-// Load dataelements by stage
-// ---------------------------------------------------------------------
-
-function loadDataElements()
-{
- clearListById( 'availableDataElementIds' );
- if( getFieldValue('programStageId') == '' )
- {
- return;
- }
- else
- {
- var result = false;
- if( byId( 'dataElementIds' ).options.length > 0 )
- {
- result = window.confirm( i18n_remove_selected_data_elements );
- }
-
- if ( result || byId( 'dataElementIds' ).options.length == 0 )
- {
- clearListById( 'dataElementIds' );
- $.getJSON( 'loadDataElements.action',
- {
- programStageId: getFieldValue('programStageId')
- }
- , function( json )
- {
- for ( i in json.dataElements )
- {
- $('#availableDataElementIds').append('<option value="de_' + json.dataElements[i].id + '_" >' + json.dataElements[i].name + '</option>');
- }
- } );
- }
- }
-}
-
-
-function showCriteria()
-{
- $( "#criteriaDiv" ).show( "fast" );
-}
-
-function hideCriteria()
-{
- $( "#criteriaDiv" ).hide( "fast" );
-}
-
-function entryFormContainerOnReady()
-{
- jQuery("#gridTable :input").each(function()
- {
- if( jQuery(this).attr( 'options' )!= null )
- {
- autocompletedField( jQuery(this).attr('id') );
- }
- });
-}
-
-function autocompletedField( idField )
-{
- var input = jQuery( "#" + idField )
- var dataElementId = input.attr( 'dataElementId' );
- var options = new Array();
- var attrValues = input.attr('options').replace('[', '').replace(']', '').split(', ');
- for( var i in attrValues )
- {
- options.push( attrValues[i] )
- }
- options.push(" ");
-
- input.autocomplete({
- delay: 0,
- minLength: 0,
- source: options,
- select: function( event, ui ) {
- input.val(ui.item.value);
- input.autocomplete( "close" );
- },
- change: function( event, ui ) {
- if ( !ui.item ) {
- var matcher = new RegExp( "^" + $.ui.autocomplete.escapeRegex( $(this).val() ) + "$", "i" ),
- valid = false;
- for (var i = 0; i < options.length; i++)
- {
- if (options[i].match( matcher ) ) {
- this.selected = valid = true;
- break;
- }
- }
- }
- }
- })
- .addClass( "ui-widget" );
-
- this.button = $( "<button type='button'> </button>" )
- .attr( "tabIndex", -1 )
- .attr( "title", i18n_show_all_items )
- .insertAfter( input )
- .button({
- icons: {
- primary: "ui-icon-triangle-1-s"
- },
- text: false
- })
- .addClass( "small-button" )
- .click(function() {
- // close if already visible
- if ( input.autocomplete( "widget" ).is( ":visible" ) ) {
- input.autocomplete( "close" );
- return;
- }
-
- // work around a bug (likely same cause as #5265)
- $( this ).blur();
-
- // pass empty string as value to search for, displaying all results
- input.autocomplete( "search", "" );
- input.focus();
- });
-}
-
-function validateTabularReport()
-{
- $.post( 'validateTabularReport.action',
- {
- facilityLB: getFieldValue('facilityLB')
- }
- , function( json )
- {
- if( json.response == 'success' )
- {
- loadGeneratedReport();
- }
- else
- {
- setMessage( json.message );
- }
- } );
-}
-
-function loadGeneratedReport()
-{
- hideCriteria();
- showLoader();
- isAjax = true;
- contentDiv = 'contentDiv';
- jQuery( "#gridContent" ).html( "" );
-
- var params = getParams();
- if( params != '' )
- {
- setInnerHTML( 'contentDiv' , '');
- $.ajax({
- type: "POST",
- url: "generateTabularReport.action",
- data: params,
- dataType: "html",
- success: function( result ){
- hideLoader();
- jQuery( "#contentDiv" ).html( result );
- }
- });
- }
-}
-
-function onkeypressSearch( event )
-{
-var key = event.keyCode || event.charCode || event.which;
-
- if ( key == 13 || key == 1 ) // Enter
- {
- searchTabularReport();
- }
-}
-
-function searchTabularReport()
-{
- showById('loaderDiv');
- hideById('gridContent');
- hideById('pagingDiv');
-
- isAjax = true;
- contentDiv = 'gridContent';
-
- var params = getParams();
- if( params == '' )
- {
- hideById('loaderDiv');
- }
- else
- {
- $.ajax({
- type: "POST",
- url: "searchTabularReport.action",
- data: params,
- dataType: "html",
- success: function( result ){
- hideById('loaderDiv');
- jQuery( "#gridContent" ).html( result );
- showById( "gridContent" );
- showById('pagingDiv');
- }
- });
- }
-}
-
-function exportTabularReport( type )
-{
- var params = getParams();
- if( params != '' )
- {
- var url = "generateTabularReport.action?" + params + "&type=" + type;
- window.location.href = url;
- }
-}
-
-function onchangeOrderBy( elementId )
-{
- searchTabularReport();
-
- var element = jQuery( "#" + elementId );
- var isAcs = jQuery( element ).attr( 'orderBy' );
- if( isAcs == 'true')
- {
- element.src = "../images/desc.gif";
- jQuery( element ).attr( 'orderBy' ,'false' );
- }
- else
- {
- element.src = "../images/asc.gif";
- jQuery( element ).attr( 'orderBy' ,'true' );
- }
-}
-
-function getParams()
-{
- hideMessage();
-
- var searchingValues = "";
- var listSeachingValues = jQuery("#gridTable input[type=text]");
-
- if( listSeachingValues.length > 0 )
- {
- listSeachingValues.each( function( i, item ){
- var value = getFormula( item.value );
- searchingValues += "&searchingValues=" + item.id + "_" ;
- if( item.value != '' )
- {
- searchingValues += htmlEncode( value );
- }
- });
- }
- else
- {
- var listIdentifierTypes = jQuery( "select[id=selectedIdenIds] option" );
- listIdentifierTypes.each( function( i, item ){
- searchingValues += "searchingValues=" + item.value;
- searchingValues += ( i < listIdentifierTypes.length - 1 ) ? "&" : "";
- });
-
- var listPatientAttributes = jQuery( "select[id=selectedAttrIds] option" );
- listPatientAttributes.each( function( i, item ){
- searchingValues += "searchingValues=" + item.value;
- searchingValues += ( i < listPatientAttributes.length - 1 ) ? "&" : "";
- });
-
- var listDataElementIds = jQuery( "select[id=dataElementIds] option" );
- listDataElementIds.each( function( i, item ){
- searchingValues += "searchingValues=" + item.value;
- searchingValues += ( i < listDataElementIds.length - 1 ) ? "&" : "";
- });
- }
-
- var orderByOrgunitAsc = jQuery( '#orderByOrgunitAsc' ).attr('orderBy');
- if( orderByOrgunitAsc == null )
- {
- orderByOrgunitAsc = 'true';
- }
-
- var orderByExecutionDateByAsc = jQuery( '#orderByExecutionDateByAsc' ).attr('orderBy');
- if( orderByExecutionDateByAsc == null )
- {
- orderByExecutionDateByAsc = 'true';
- }
-
- return searchingValues + "&programStageId=" + getFieldValue('programStageId')
- + "&startDate=" + getFieldValue('startDate')
- + "&endDate=" + getFieldValue('endDate')
- + "&facilityLB=" + getFieldValue('facilityLB')
- + "&orderByOrgunitAsc=" + orderByOrgunitAsc
- + "&orderByExecutionDateByAsc=" + orderByExecutionDateByAsc
- + "&level=" + getFieldValue('level');
-}
-
-function getFormula( value )
-{
- if( value.indexOf('"') != value.lastIndexOf('"') )
- {
- value = value.replace(/"/g,"'");
- }
- if( value.indexOf("'") == value.lastIndexOf("'") )
- {
- value += "'";
- var flag = value.match(/[>|>=|<|<=|=|!=]+[ ]*/);
-
- if( flag == null )
- {
- value = "='"+ value;
- }
- else
- {
- value.replace( flag, flag + "'")
- }
- }
- else
- {
- var flag = value.match(/[>|>=|<|<=|=|!=]+/);
-
- if( flag == null )
- {
- value = "="+ value;
- }
- }
- return value;
-}
-
-function clearFilter()
-{
- var listSeachingValues = jQuery("#gridTable input[type=text]");
- listSeachingValues.each( function( i, item ){
- item.value = '';
- });
-}
-
-
-//------------------------------------------------------------------------------
-// Filter data-element
-//------------------------------------------------------------------------------
-
-function filterDE( event, value, fieldName )
-{
- var field = byId(fieldName);
- for ( var index = 0; index < field.options.length; index++ )
- {
- var option = field.options[index];
-
- if(value.length == 0 )
- {
- option.style.display = "block";
- }
- else
- {
- if (option.text.toLowerCase().indexOf( value.toLowerCase() ) != -1 )
- {
- option.style.display = "block";
- }
- else
- {
- option.style.display = "none";
- }
- }
- }
-}
-
-function toogleTB(tbody)
-{
- jQuery( '#' + tbody ).toggle();
-}
=== removed file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responseTabularParams.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responseTabularParams.vm 2012-04-11 06:25:02 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responseTabularParams.vm 1970-01-01 00:00:00 +0000
@@ -1,29 +0,0 @@
-#set( $size = $identifierTypes.size() )
-{
-"identifierTypes": [
- #foreach( $identifierType in $identifierTypes )
- {
- "id": ${identifierType.id} ,
- "name": "$!encoder.jsonEncode( ${identifierType.name} )"
- }#if( $velocityCount < $size ),#end
- #end],
-
-#set( $size = $attributes.size() )
-"patientAttributes": [
- #foreach( $attribute in $attributes )
- {
- "id": ${attribute.id} ,
- "name": "$!encoder.jsonEncode( ${attribute.name} )"
- }#if( $velocityCount < $size ),#end
- #end],
-
-#set( $size = $programStages.size() )
-"programStages": [
- #foreach( $programStage in $programStages )
- {
- "id": ${programStage.id} ,
- "name": "$!encoder.jsonEncode( ${programStage.name} )",
- "irregular":${programStage.irregular}
- }#if( $velocityCount < $size ),#end
- #end]
-}
\ No newline at end of file
=== removed file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/searchTabularReportResult.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/searchTabularReportResult.vm 2012-04-11 06:25:02 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/searchTabularReportResult.vm 1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-
-#set( $mark = false )
-#set( $i = 1 )
-
-#foreach( $row in $grid.getRows() )
- <tr id="tr${i}" class='rowGrid'>
- <td>
- #set( $nr = ( ( $paging.getCurrentPage() - 1 ) * $paging.pageSize ) + $velocityCount )
- $nr
- </td>
- #foreach( $col in $row )
- <td>
- $!encoder.htmlEncode( $col )
- </td>
- #end
- </tr>
- #set( $mark = !$mark)
-#end
=== removed file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/tabularReportResult.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/tabularReportResult.vm 2012-04-11 06:25:02 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/tabularReportResult.vm 1970-01-01 00:00:00 +0000
@@ -1,87 +0,0 @@
-#if( $grid.getRows().size() > 0 )
- <script>
- $(document).ready(function() {
- entryFormContainerOnReady();
- });
- </script>
-
- <h3>$!encoder.htmlEncode( $grid.title )</h3>
-
- <div>
- <input type="button" value="$i18n.getString( 'get_report_as_xls' )" onclick="exportTabularReport( 'xls' )" class="button" >
- <input type="button" value="$i18n.getString( 'get_report_as_pdf' )" onclick="exportTabularReport( 'pdf' )" class="button" >
- <input type="button" value="$i18n.getString( 'filter' )" onclick="searchTabularReport()" class="button" >
- </div>
-
- <h5>$!encoder.htmlEncode( $grid.subtitle )</h5>
-
- <table class="listTable grid" id='gridTable'>
- <tr>
- <th>#</th>
- <th>
- $i18n.getString('report_unit')
- <a href="javascript:onchangeOrderBy( 'orderByOrgunitAsc' );" title='$i18n.getString( "order_by_orgunit" )'><img src="../images/asc.gif" alt='$i18n.getString( "asc" )' id='orderByOrgunitAsc' orderBy='true' style='curser:pointer;'></a>
- </th>
- <th>
- $i18n.getString('report_date')
- <a href="javascript:onchangeOrderBy( 'orderByExecutionDateByAsc' );" title='$i18n.getString( "order_by_report_date" )'><img src="../images/asc.gif" alt='$i18n.getString( "desc" )' id='orderByExecutionDateByAsc' orderBy='true' style='curser:pointer;'></a>
- </th>
- #foreach( $identifierType in $identifierTypes )
- <th>
- $!encoder.htmlEncode( $identifierType.name )
- </th>
- #end
- #foreach( $patientAttribute in $patientAttributes )
- <th>
- $!encoder.htmlEncode( $patientAttribute.name )
- </th>
- #end
- #foreach( $dataElement in $dataElements )
- <th>
- $!encoder.htmlEncode( $dataElement.name )
- </th>
- #end
- #if( $anonymous == "false" )
- <th>$i18n.getString('operator')</th>
- #end
- </tr>
-
- <tr class='filter'>
- <td>
- <input type="button" value="$i18n.getString( 'clear_filter' )" onclick="clearFilter();" class="button" >
- </td>
- <td></td>
- <td></td>
- #foreach( $identifierType in $identifierTypes )
- <td>
- <input type='text' id='iden_$identifierType.id' title='$i18n.getString("how_to_search_tabular_report")' onkeypress='onkeypressSearch( event );' #if($dataElement.optionSet) options='$dataElement.optionSet.options' #end />
- </td>
- #end
- #foreach( $patientAttribute in $patientAttributes )
- <td>
- <input type='text' id='attr_$patientAttribute.id' title='$i18n.getString("how_to_search_tabular_report")' onkeypress='onkeypressSearch( event );' #if($dataElement.optionSet) options='$dataElement.optionSet.options' #end />
- </td>
- #end
- #foreach( $dataElement in $dataElements )
- <td>
- <input type='text' id='de_$dataElement.id' title='$i18n.getString("how_to_search_tabular_report")' onkeypress='onkeypressSearch( event );' #if($dataElement.optionSet) options='$dataElement.optionSet.options' #end />
- </td>
- #end
- </tr>
-
- <tbody id="gridContent">
- #parse( "/dhis-web-caseentry/searchTabularReportResult.vm" )
- </tbody>
-
- </table>
-
- <p></p>
-
- <div class="paging-container" id='pagingDiv'>
- #parse( "/dhis-web-commons/paging/paging.vm" )
- </div>
-
- <div id='viewRecordsDiv'></div>
-#else
- $i18n.getString('no_result')
-#end
\ No newline at end of file
=== removed file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/tabularReportSelect.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/tabularReportSelect.vm 2012-04-11 06:25:02 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/tabularReportSelect.vm 1970-01-01 00:00:00 +0000
@@ -1,244 +0,0 @@
-<script>
- jQuery(document).ready( function(){
- validation2( 'reportForm', function(form){
- validateTabularReport();
- }, {
- 'beforeValidateHandler' : function()
- {
- listValidator( 'memberDEValidator', 'dataElementIds' );
- }
- } );
-
- datePickerInRange( 'startDate' , 'endDate' );
- });
-</script>
-
-<h3>$i18n.getString( "tabular_report" )</h3>
-<form id="reportForm" name="reportForm" method="post">
-<p><input type="button" value="$i18n.getString('data')" onclick="showCriteria();" ></p>
-
-<div class="inputCriteria" id='criteriaDiv' style="width:900px;height:590px;margin-bottom:20px;">
-
-<table>
-
- <tr>
- <td><label>$i18n.getString( "orgunit_boundary" )</label></td>
- <td colspan='2'><input type="text" readonly="readonly" id='orgunitname' name='orgunitname' #if($!orgunit) value="$!orgunit.name" #else value="[$i18n.getString( 'select' )]" #end ></td>
- </tr>
-
- <tr>
- <td>
- $i18n.getString( "use_data_from_level" )
- </td>
- <td>
- <select id="facilityLB" name="facilityLB">
- <option value="all" selected="selected" >$i18n.getString( "all" )</option>
- <option value="childrenOnly" >$i18n.getString( "children_only" )</option>
- <option value="selected" >$i18n.getString( "selected_boundary" )</option>
- </select>
- </td>
- </tr>
-
- <tr>
- <td>
- $i18n.getString( "include_parent_orgunits_starting_from_level" )
- </td>
- <td>
- <select id="level" name="level">
- #foreach( $level in $levels )
- <option value="$level.level">$i18n.getString( "level" ) $level.level</option>
- #end
- </select>
- </td>
- </tr>
-
- <tr>
- <td><label>$i18n.getString( "start_date" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td colspan='2'>
- <input type="text" id="startDate" name="startDate" />
- </td>
- </tr>
-
- <tr>
- <td><label>$i18n.getString( "end_date" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td colspan='2'>
- <input type="text" id="endDate" name="endDate" />
- </td>
- </tr>
-
- <tr>
- <td><label>$i18n.getString( "program" )</label></td>
- <td>
- <select id="programId" name="programId" #if($!programs) #else disabled #end onchange='getTabularParams();'>
- <option value=''>[$i18n.getString('please_select')]</option>
- #foreach( $program in $programs )
- <option value='$program.id' singleevent='$program.singleEvent'>$program.name</option>
- #end
- </select>
- </td>
- </tr>
-
-</table>
-
-<p></p>
-<table width='100%'>
- <tr onclick='toogleTB("idenTB")' style='cursor:pointer'>
- <th>$i18n.getString( "available_identifier_types" )</td>
- <th>$i18n.getString( "filter" )</th>
- <th>$i18n.getString( "selected_identifier_types" ) <em title="$i18n.getString( 'required' )" class="required">*</em></td>
- </tr>
-
- <tbody id='idenTB' style='display:none;'>
- <tr>
- <td>
- <input type='text' id='searchAvailableIdenText' onkeyup="filterDE(event, this.value, 'searchAvailableIdenText');"/>
- <input type="button" value="$i18n.getString( 'clear' )" onclick="setFieldValue('searchAvailableIdenText', '');" style="width:60px" >
- </td>
- <td></td>
- <td>
- <input type='text' id='searchSelectedIdenText' onkeyup="filterDE(event, this.value, 'searchSelectedIdenText');"/>
- <input type="button" value="$i18n.getString( 'clear' )" onclick="setFieldValue('searchSelectedIdenText', '');" class="button" >
- </td>
- </tr>
-
- <tr>
- <td>
- <select id="availableIdenIds" name="availableAttrIds" multiple='true' size='16' ondblclick="moveSelectedById( 'availableIdenIds', 'selectedIdenIds' )" ></select>
- </td>
- <td>
- <input type="button" value="$i18n.getString( '>' )" title="$i18n.getString( 'add_selected' )" onclick="moveSelectedById( 'availableIdenIds', 'selectedIdenIds' )" class="button" />
- <input type="button" value="$i18n.getString( '>>' )" title="$i18n.getString( 'add_all' )" onclick="moveAllById( 'availableIdenIds', 'selectedIdenIds' )" class="button" /> <br>
- <input type="button" value="$i18n.getString( '<' )" title="$i18n.getString( 'remove_selected' )" onclick="moveSelectedById( 'selectedIdenIds', 'availableIdenIds' )" class="button" />
- <input type="button" value="$i18n.getString( '<<' )" title="$i18n.getString( 'remove_all' )" onclick="moveAllById( 'selectedIdenIds', 'availableIdenIds' )" class="button" />
- </td>
- <td>
- <select id="selectedIdenIds" name="selectedIdenIds" multiple='true' size='16' ondblclick="moveSelectedById( 'selectedIdenIds', 'availableIdenIds' )" ></select>
- </td>
- <td>
- <a href="javascript:moveUpSelectedOption('selectedIdenIds')"><img src="../images/move_up.png"/></a><br/><br/>
- <a href="javascript:moveDownSelectedOption('selectedIdenIds')"><img src="../images/move_down.png"/></a><br/><br/>
- </td>
- </tr>
-
- </tbody>
-
- <tr onclick='toogleTB("attrTB")' style='cursor:pointer'>
- <th>$i18n.getString( "available_attribute" )</td>
- <th>$i18n.getString( "filter" )</th>
- <th>$i18n.getString( "selected_attribute" ) <em title="$i18n.getString( 'required' )" class="required">*</em></td>
- </tr>
-
- <tbody id='attrTB' style='display:none;'>
-
- <tr>
- <td>
- <input type='text' id='searchAvailableAttrText' onkeyup="filterDE(event, this.value, 'searchAvailableAttrText');"/>
- <input type="button" value="$i18n.getString( 'clear' )" onclick="setFieldValue('searchAvailableAttrText', '');" style="width:60px" >
- </td>
- <td></td>
- <td>
- <input type='text' id='searchSelectedAttrText' onkeyup="filterDE(event, this.value, 'searchSelectedAttrText');"/>
- <input type="button" value="$i18n.getString( 'clear' )" onclick="setFieldValue('searchSelectedAttrText', '');" class="button" >
- </td>
- </tr>
-
- <tr>
- <td>
- <select id="availableAttrIds" name="availableAttrIds" multiple='true' size='16' ondblclick="moveSelectedById( 'availableAttrIds', 'selectedAttrIds' )" ></select>
- </td>
- <td>
- <input type="button" value="$i18n.getString( '>' )" title="$i18n.getString( 'add_selected' )" onclick="moveSelectedById( 'availableAttrIds', 'selectedAttrIds' )" class="button" />
- <input type="button" value="$i18n.getString( '>>' )" title="$i18n.getString( 'add_all' )" onclick="moveAllById( 'availableAttrIds', 'selectedAttrIds' )" class="button" /> <br>
- <input type="button" value="$i18n.getString( '<' )" title="$i18n.getString( 'remove_selected' )" onclick="moveSelectedById( 'selectedAttrIds', 'availableAttrIds' )" class="button" />
- <input type="button" value="$i18n.getString( '<<' )" title="$i18n.getString( 'remove_all' )" onclick="moveAllById( 'selectedAttrIds', 'availableAttrIds' )" class="button" />
- </td>
- <td>
- <select id="selectedAttrIds" name="selectedAttrIds" multiple='true' size='16' ondblclick="moveSelectedById( 'selectedAttrIds', 'availableAttrIds' )" ></select>
- </td>
- <td>
- <a href="javascript:moveUpSelectedOption('selectedAttrIds')"><img src="../images/move_up.png"/></a><br/><br/>
- <a href="javascript:moveDownSelectedOption('selectedAttrIds')"><img src="../images/move_down.png"/></a><br/><br/>
- </td>
- </tr>
- </tbody>
-
- <tr onclick='toogleTB("deTB")' style='cursor:pointer'>
- <th>$i18n.getString( "available_data_elements" )</td>
- <th>$i18n.getString( "filter" )</th>
- <th>$i18n.getString( "selected_data_elements" ) <em title="$i18n.getString( 'required' )" class="required">*</em></td>
- </tr>
-
- <tbody id='deTB' style='display:none;'>
-
- <tr>
- <td>
- <select id="programStageId" name="programStageId" onchange='loadDataElements();'></select>
- </td>
- </tr>
-
- <tr>
- <td>
- <input type='text' id='searchAvailableDEText' onkeyup="filterDE(event, this.value, 'availableDataElementIds');"/>
- <input type="button" value="$i18n.getString( 'clear' )" onclick="setFieldValue('searchAvailableDEText', '');" style="width:60px" >
- </td>
- <td></td>
- <td>
- <input type='text' id='searchSelectedDEText' onkeyup="filterDE(event, this.value, 'dataElementIds');"/>
- <input type="button" value="$i18n.getString( 'clear' )" onclick="setFieldValue('searchSelectedDEText', '');" class="button" >
- </td>
- </tr>
-
- <tr>
- <td>
- <select id="availableDataElementIds" name="availableDataElementIds" multiple='true' size='16' ondblclick="moveSelectedById( 'availableDataElementIds', 'dataElementIds' )" ></select>
- </td>
- <td>
- <input type="button" value="$i18n.getString( '>' )" title="$i18n.getString( 'add_selected' )" onclick="moveSelectedById( 'availableDataElementIds', 'dataElementIds' )" class="button" />
- <input type="button" value="$i18n.getString( '>>' )" title="$i18n.getString( 'add_all' )" onclick="moveAllById( 'availableDataElementIds', 'dataElementIds' )" class="button" /> <br>
- <input type="button" value="$i18n.getString( '<' )" title="$i18n.getString( 'remove_selected' )" onclick="moveSelectedById( 'dataElementIds', 'availableDataElementIds' )" class="button" />
- <input type="button" value="$i18n.getString( '<<' )" title="$i18n.getString( 'remove_all' )" onclick="moveAllById( 'dataElementIds', 'availableDataElementIds' )" class="button" />
- </td>
- <td>
- <select id="dataElementIds" name="dataElementIds" multiple='true' size='16' ondblclick="moveSelectedById( 'dataElementIds', 'availableDataElementIds' )" ></select>
- <select id="memberDEValidator" multiple="multiple" class="{validate:{required:true}} hidden"/>
- </td>
- <td>
- <a href="javascript:moveUpSelectedOption('dataElementIds')"><img src="../images/move_up.png"/></a><br/><br/>
- <a href="javascript:moveDownSelectedOption('dataElementIds')"><img src="../images/move_down.png"/></a><br/><br/>
- </td>
- </tr>
- </tbody>
-
- <tr><td><p></p></td></tr>
- <tr>
- <td>
- <input type="submit" id='generateBtn' name='generateBtn' #if($!programs) #else disabled #end value="$i18n.getString( 'generate' )" />
- <input type="button" value="$i18n.getString( 'cancel' )" onclick="hideCriteria();" />
- </td>
- </tr>
-</table>
-
-</div>
-
-</form>
-
-<span id="message"></span>
-<div id="detailsInfo"></div>
-
-<div id="contentDiv">
-</div>
-
-#parse( "dhis-web-commons/loader/loader.vm" )
-
-<script type="text/javascript">
- var i18n_report_generation_failed = '$encoder.jsEscape( $i18n.getString( "report_generation_failed" ), "'")';
- var i18n_please_select_a_program = '[' + '$encoder.jsEscape( $i18n.getString( "please_select_a_program" ), "'")' + ']';
- var i18n_reports = '$encoder.jsEscape( $i18n.getString( "reports" ), "'")';
- var i18n_please_select = "[" + '$encoder.jsEscape( $i18n.getString( "please_select" ) , "'" )' + "]";
- var i18n_show_all_items = "[" + '$encoder.jsEscape( $i18n.getString( "show_all_items" ) , "'" )' + "]";
- var i18n_complete_confirm_message = '$encoder.jsEscape( $i18n.getString( "complete_confirm_message" ) , "'")';
- var i18n_syntax_error_in_search_value = '$encoder.jsEscape( $i18n.getString( "syntax_error_in_search_value" ) , "'")';
- var i18n_remove_selected_data_elements = '$encoder.jsEscape( $i18n.getString( "remove_selected_data_elements" ) , "'")';
- var i18n_patient_details_and_history = '$encoder.jsEscape( $i18n.getString( "patient_details_and_history" ) , "'" )';
- var i18n_please_select_a_program_stage = '[' + '$encoder.jsEscape( $i18n.getString( "please_select_a_program_stage" ), "'")' + ']';
-</script>
