dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #18951
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 8072: Remove the old activity-plan function.
------------------------------------------------------------
revno: 8072
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2012-09-13 16:25:01 +0700
message:
Remove the old activity-plan function.
removed:
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/visitplan/
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/visitplan/SearchVisitPlanAction.java
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/visitplan/VisitPlanAction.java
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/activityPlanningMenu.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/visitPlan.js
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/loadVisitPlan.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/visitPlan.vm
modified:
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
=== removed directory 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/visitplan'
=== removed file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/visitplan/SearchVisitPlanAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/visitplan/SearchVisitPlanAction.java 2011-09-28 07:00:14 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/visitplan/SearchVisitPlanAction.java 1970-01-01 00:00:00 +0000
@@ -1,227 +0,0 @@
-/*
- * Copyright (c) 2004-2009, 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.visitplan;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import org.hisp.dhis.activityplan.Activity;
-import org.hisp.dhis.activityplan.ActivityPlanService;
-import org.hisp.dhis.organisationunit.OrganisationUnit;
-import org.hisp.dhis.ouwt.manager.OrganisationUnitSelectionManager;
-import org.hisp.dhis.paging.ActionPagingSupport;
-import org.hisp.dhis.patient.Patient;
-import org.hisp.dhis.patient.PatientAttribute;
-import org.hisp.dhis.patient.PatientAttributeService;
-import org.hisp.dhis.patient.PatientService;
-import org.hisp.dhis.patientattributevalue.PatientAttributeValue;
-import org.hisp.dhis.patientattributevalue.PatientAttributeValueService;
-import org.hisp.dhis.program.ProgramStageInstance;
-
-/**
- * @author Dang Duy Hieu
- * @version $Id$
- */
-public class SearchVisitPlanAction
- extends ActionPagingSupport<Patient>
-{
- // -------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------
-
- private OrganisationUnitSelectionManager selectionManager;
-
- public void setSelectionManager( OrganisationUnitSelectionManager selectionManager )
- {
- this.selectionManager = selectionManager;
- }
-
- private PatientService patientService;
-
- public void setPatientService( PatientService patientService )
- {
- this.patientService = patientService;
- }
-
- private PatientAttributeValueService patientAttributeValueService;
-
- public void setPatientAttributeValueService( PatientAttributeValueService patientAttributeValueService )
- {
- this.patientAttributeValueService = patientAttributeValueService;
- }
-
- private PatientAttributeService patientAttributeService;
-
- public void setPatientAttributeService( PatientAttributeService patientAttributeService )
- {
- this.patientAttributeService = patientAttributeService;
- }
-
- private ActivityPlanService activityPlanService;
-
- public void setActivityPlanService( ActivityPlanService activityPlanService )
- {
- this.activityPlanService = activityPlanService;
- }
-
- // -------------------------------------------------------------------------
- // Input/output
- // -------------------------------------------------------------------------
-
- private Integer sortingAttributeId;
-
- public void setSortingAttributeId( Integer sortingAttributeId )
- {
- this.sortingAttributeId = sortingAttributeId;
- }
-
- public Integer getSortingAttributeId()
- {
- return sortingAttributeId;
- }
-
- private PatientAttribute sortingAttribute;
-
- public PatientAttribute getSortingAttribute()
- {
- return sortingAttribute;
- }
-
- private OrganisationUnit organisationUnit;
-
- public OrganisationUnit getOrganisationUnit()
- {
- return organisationUnit;
- }
-
- private Map<Patient, Set<ProgramStageInstance>> visitsByPatients = new HashMap<Patient, Set<ProgramStageInstance>>();
-
- public Map<Patient, Set<ProgramStageInstance>> getVisitsByPatients()
- {
- return visitsByPatients;
- }
-
- private Map<Integer, Collection<PatientAttributeValue>> attributeValueMap = new HashMap<Integer, Collection<PatientAttributeValue>>();
-
- public Map<Integer, Collection<PatientAttributeValue>> getAttributeValueMap()
- {
- return attributeValueMap;
- }
-
- private Collection<Patient> sortedPatients = new ArrayList<Patient>();
-
- public Collection<Patient> getSortedPatients()
- {
- return sortedPatients;
- }
-
- private Collection<Activity> activities = new ArrayList<Activity>();
-
- public Collection<Activity> getActivities()
- {
- return activities;
- }
-
- private Integer total;
-
- public Integer getTotal()
- {
- return total;
- }
-
- // -------------------------------------------------------------------------
- // Action implementation
- // -------------------------------------------------------------------------
-
- public String execute()
- throws Exception
- {
- // ---------------------------------------------------------------------
- // Get the facility planning to do a visit
- // ---------------------------------------------------------------------
-
- organisationUnit = selectionManager.getSelectedOrganisationUnit();
-
- total = activityPlanService.countActivitiesByProvider( organisationUnit );
-
- this.paging = createPaging( total );
-
- activities = new ArrayList<Activity>( activityPlanService.getActivitiesByProvider( organisationUnit, paging
- .getStartPos(), paging.getPageSize() ) );
-
- for ( Activity activity : activities )
- {
- if ( visitsByPatients.containsKey( activity.getBeneficiary() ) )
- {
- visitsByPatients.get( activity.getBeneficiary() ).add( activity.getTask() );
- }
- else
- {
- Set<ProgramStageInstance> programStageInstancess = new HashSet<ProgramStageInstance>();
-
- programStageInstancess.add( activity.getTask() );
-
- visitsByPatients.put( activity.getBeneficiary(), programStageInstancess );
- }
- }
-
- if ( !visitsByPatients.keySet().isEmpty() )
- {
- Collection<Patient> patientsToBeVisited = visitsByPatients.keySet();
-
- // -------------------------------------------------------------
- // Get all the attributes of the patients to be visited (in case
- // users want to make sorting based on attributes
- // -------------------------------------------------------------
-
- attributeValueMap = patientAttributeValueService
- .getPatientAttributeValueMapForPatients( patientsToBeVisited );
-
- // -------------------------------------------------------------
- // Sort patients to be visited based on the chosen attribute
- // -------------------------------------------------------------
-
- if ( sortingAttributeId != null )
- {
- sortingAttribute = patientAttributeService.getPatientAttribute( sortingAttributeId );
-
- sortedPatients = patientService.sortPatientsByAttribute( patientsToBeVisited, sortingAttribute );
- }
- else
- {
- sortedPatients = patientsToBeVisited;
- }
- }
-
- return SUCCESS;
- }
-}
=== removed file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/visitplan/VisitPlanAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/visitplan/VisitPlanAction.java 2011-05-12 08:32:03 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/visitplan/VisitPlanAction.java 1970-01-01 00:00:00 +0000
@@ -1,103 +0,0 @@
-/*
- * Copyright (c) 2004-2009, 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.visitplan;
-
-import java.util.Collection;
-import java.util.HashSet;
-
-import org.hisp.dhis.organisationunit.OrganisationUnit;
-import org.hisp.dhis.ouwt.manager.OrganisationUnitSelectionManager;
-import org.hisp.dhis.patient.PatientAttribute;
-import org.hisp.dhis.patient.PatientAttributeService;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Abyot Asalefew Gizaw
- * @version $Id$
- * @modifier Dang Duy Hieu
- * @since 2011-12-05
- */
-public class VisitPlanAction
- implements Action
-{
- // -------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------
-
- private OrganisationUnitSelectionManager selectionManager;
-
- public void setSelectionManager( OrganisationUnitSelectionManager selectionManager )
- {
- this.selectionManager = selectionManager;
- }
-
- private PatientAttributeService patientAttributeService;
-
- public void setPatientAttributeService( PatientAttributeService patientAttributeService )
- {
- this.patientAttributeService = patientAttributeService;
- }
-
- // -------------------------------------------------------------------------
- // Output
- // -------------------------------------------------------------------------
-
- private Collection<PatientAttribute> attributes = new HashSet<PatientAttribute>();
-
- public Collection<PatientAttribute> getAttributes()
- {
- return attributes;
- }
-
- private OrganisationUnit organisationUnit;
-
- public OrganisationUnit getOrganisationUnit()
- {
- return organisationUnit;
- }
-
- // -------------------------------------------------------------------------
- // Action implementation
- // -------------------------------------------------------------------------
-
- public String execute()
- throws Exception
- {
- organisationUnit = selectionManager.getSelectedOrganisationUnit();
-
- if ( organisationUnit == null )
- {
- return SUCCESS;
- }
-
- attributes = patientAttributeService.getAllPatientAttributes();
-
- 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-09-12 04:14:03 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/META-INF/dhis/beans.xml 2012-09-13 09:25:01 +0000
@@ -231,31 +231,6 @@
<property name="currentUserService" ref="org.hisp.dhis.user.CurrentUserService" />
</bean>
- <!-- Visit Plan -->
-
- <bean id="org.hisp.dhis.caseentry.action.visitplan.VisitPlanAction"
- class="org.hisp.dhis.caseentry.action.visitplan.VisitPlanAction"
- scope="prototype">
- <property name="selectionManager"
- ref="org.hisp.dhis.ouwt.manager.OrganisationUnitSelectionManager" />
- <property name="patientAttributeService"
- ref="org.hisp.dhis.patient.PatientAttributeService" />
- </bean>
-
- <bean id="org.hisp.dhis.caseentry.action.visitplan.SearchVisitPlanAction"
- class="org.hisp.dhis.caseentry.action.visitplan.SearchVisitPlanAction"
- scope="prototype">
- <property name="selectionManager"
- ref="org.hisp.dhis.ouwt.manager.OrganisationUnitSelectionManager" />
- <property name="patientService" ref="org.hisp.dhis.patient.PatientService" />
- <property name="patientAttributeValueService"
- ref="org.hisp.dhis.patientattributevalue.PatientAttributeValueService" />
- <property name="patientAttributeService"
- ref="org.hisp.dhis.patient.PatientAttributeService" />
- <property name="activityPlanService"
- ref="org.hisp.dhis.activityplan.ActivityPlanService" />
- </bean>
-
<!-- Report -->
<bean id="org.hisp.dhis.caseentry.action.report.ReportSelectAction"
=== 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-09-12 09:03:33 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml 2012-09-13 09:25:01 +0000
@@ -295,26 +295,6 @@
<param name="requiredAuthorities">F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_UPDATE,F_PATIENT_DATAVALUE_DELETE</param>
</action>
- <!-- Visit Plan -->
-
- <action name="visitplan"
- class="org.hisp.dhis.caseentry.action.visitplan.VisitPlanAction">
- <interceptor-ref name="organisationUnitTreeStack" />
- <result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-caseentry/visitPlan.vm</param>
- <param name="menu">/dhis-web-caseentry/activityPlanningMenu.vm</param>
- <param name="javascripts">../dhis-web-commons/ouwt/ouwt.js,javascript/visitPlan.js</param>
- <param name="requiredAuthorities">F_GENERATE_ACTIVITY_PLANS</param>
- </action>
-
- <action name="visitplanSortByAttribute"
- class="org.hisp.dhis.caseentry.action.visitplan.SearchVisitPlanAction">
- <result name="success" type="velocity">/content.vm</result>
- <param name="page">/dhis-web-caseentry/loadVisitPlan.vm</param>
- <param name="javascripts">javascript/visitPlan.js</param>
- <param name="requiredAuthorities">F_GENERATE_ACTIVITY_PLANS</param>
- </action>
-
<!-- Report -->
<action name="reportSelect"
=== removed file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/activityPlanningMenu.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/activityPlanningMenu.vm 2012-03-05 12:03:06 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/activityPlanningMenu.vm 1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-
-<a href="index.action"><h2>$i18n.getString( "activity_planning" ) </h2></a>
-<ul>
- <li><a href="visitplan.action">$i18n.getString( "visit_plan" ) </a></li>
-</ul>
-
-<br>
-#parse( "/dhis-web-commons/ouwt/orgunittree.vm" )
\ No newline at end of file
=== removed file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/visitPlan.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/visitPlan.js 2011-09-30 08:37:26 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/visitPlan.js 1970-01-01 00:00:00 +0000
@@ -1,31 +0,0 @@
-isAjax = true;
-
-function organisationUnitSelected( orgUnits )
-{
- window.location.href = 'visitplan.action';
-}
-
-selection.setListenerFunction( organisationUnitSelected );
-
-function sortByAttribute( sortingAttributeId )
-{
- var url = "visitplanSortByAttribute.action";
-
- showLoader();
-
- if ( url.length > 0 )
- {
- jQuery( "#contentDiv" ).load( url,
- { "sortingAttributeId": sortingAttributeId },
- function()
- {
- jQuery( "table.listTable tbody tr" ).removeClass( "listRow listAlternateRow" );
- jQuery( "table.listTable tbody tr:odd" ).addClass( "listAlternateRow" );
- jQuery( "table.listTable tbody tr:even" ).addClass( "listRow" );
- jQuery( "table.listTable tbody" ).trigger( "update" );
-
- hideLoader();
- }
- );
- }
-}
=== removed file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/loadVisitPlan.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/loadVisitPlan.vm 2012-02-28 08:07:22 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/loadVisitPlan.vm 1970-01-01 00:00:00 +0000
@@ -1,54 +0,0 @@
-#foreach( $patient in $sortedPatients )
-<div id="visitPlanContainer" style="border:1px solid #808080; width:465px;">
- <table class="mainPageTable">
- <tr>
- <td>
- <span class='bold'>$i18n.getString( "full_name" ):</span>$encoder.htmlEncode( $!patient.getFullName() )<br>
- <span class='bold'>$i18n.getString( "gender" ):</span>$i18n.getString( "$!patient.gender" )<br>
- <span class='bold'>$i18n.getString( "date_of_birth" ):</span>$format.formatDate( $!patient.birthDate )<br>
- <span class='bold'>$i18n.getString( "age" ):</span>$encoder.htmlEncode( $!patient.getAge() )
- </td>
- <td style="vertical-align:top">
- <div style="float:right">
- #set( $attributeValues = false )
- #set( $attributeValues = $attributeValueMap.get( $patient.id ) )
- #foreach( $attributeValue in $attributeValues )
- <span class='bold'>$encoder.htmlEncode( $attributeValue.patientAttribute.name ):</span>$encoder.htmlEncode( $attributeValue.value )<br>
- #end
- </div>
- </td>
- </tr>
- </table>
- #set( $stageInstances = false )
- #set( $stageInstances = $visitsByPatients.get( $patient ) )
- <table class="listTable">
- <col>
- <col>
- <col>
- <tr>
- <th>$i18n.getString( "program" )</th>
- <th>$i18n.getString( "stage" )</th>
- <th>$i18n.getString( "due_date" )</th>
- </tr>
- <tbody id="list">
- #set( $mark = false )
- #foreach( $stageInstance in $stageInstances )
- <tr #alternate( $mark )>
- <td>$!stageInstance.programInstance.program.name</td>
- <td>$!stageInstance.programStage.name</td>
- <td>$!format.formatDate( $!stageInstance.dueDate )</td>
- </tr>
- #if( $mark )
- #set( $mark = false )
- #else
- #set( $mark = true )
- #end
- #end
- </tbody>
- </table>
-</div>
-<p></p>
-#end
-<div class="paging-container">
- #parse( "/dhis-web-commons/paging/paging.vm" )
-</div>
\ No newline at end of file
=== removed file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/visitPlan.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/visitPlan.vm 2012-07-04 05:06:10 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/visitPlan.vm 1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-<h3>$i18n.getString( "visit_plan" )</h3>
-
-<table>
- <tr>
- <td><label>$i18n.getString( "registering_unit" )</label></td>
- <td>
- <input type="text" readonly="readonly" #if( $organisationUnit ) value="$encoder.htmlEncode( $organisationUnit.name )" #else value="[$i18n.getString( "select" )]" #end style="min-width:350px">
- </td>
- </tr>
- <tr>
- <td>$i18n.getString( "sort_by" )</td>
- <td>
- <select id="sortingAttributeId" name="sortingAttributeId" style="min-width:350px" onchange="sortByAttribute( this.options[this.selectedIndex].value )" #if( $attributes && $attributes.size() == 0 ) disabled="disabled" #end>
- <option value="-1">[ $i18n.getString( "select_sorting_attribute" ) ]</option>
- #foreach( $attribute in $attributes )
- <option value="$attribute.id" #if( $sortingAttribute && $attribute.id == $sortingAttribute.id ) selected="selected" #end>$encoder.htmlEncode( $attribute.name )</option>
- #end
- </select>
- </td>
- </tr>
-</table>
-
-<hr style="clear:both">
-
-#parse( "dhis-web-commons/loader/loader.vm" )
-
-<div id="contentDiv"></div>
\ No newline at end of file
