=== removed file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/java/org/hisp/dhis/visualizer/action/GetDataElementTreeNodesAction.java'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/java/org/hisp/dhis/visualizer/action/GetDataElementTreeNodesAction.java	2011-09-28 15:21:59 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/java/org/hisp/dhis/visualizer/action/GetDataElementTreeNodesAction.java	1970-01-01 00:00:00 +0000
@@ -1,119 +0,0 @@
-package org.hisp.dhis.visualizer.action;
-
-/*
- * Copyright (c) 2004-2010, 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.
- */
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.hisp.dhis.dataelement.DataElement;
-import org.hisp.dhis.dataelement.DataElementGroup;
-import org.hisp.dhis.dataelement.DataElementService;
-import org.hisp.dhis.dataelement.comparator.DataElementGroupNameComparator;
-import org.hisp.dhis.dataelement.comparator.DataElementNameComparator;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Jan Henrik Overland
- */
-public class GetDataElementTreeNodesAction
-    implements Action
-{
-    // -------------------------------------------------------------------------
-    // Dependencies
-    // -------------------------------------------------------------------------
-
-    private DataElementService dataElementService;
-
-    public void setDataElementService( DataElementService dataElementService )
-    {
-        this.dataElementService = dataElementService;
-    }
-
-    // -------------------------------------------------------------------------
-    // Input
-    // -------------------------------------------------------------------------
-
-    private Integer node;
-
-    public void setNode( Integer node )
-    {
-        this.node = node;
-    }
-
-    // -------------------------------------------------------------------------
-    // Output
-    // -------------------------------------------------------------------------
-
-    private List<DataElementGroup> groups;
-
-    public List<DataElementGroup> getGroups()
-    {
-        return groups;
-    }
-
-    private List<DataElement> members;
-
-    public List<DataElement> getMembers()
-    {
-        return members;
-    }
-
-    // -------------------------------------------------------------------------
-    // Action implementation
-    // -------------------------------------------------------------------------
-
-    @Override
-    public String execute()
-        throws Exception
-    {
-        if ( node != null )
-        {
-            if ( node == 0 )
-            {
-                groups = new ArrayList<DataElementGroup>( dataElementService.getAllDataElementGroups() );
-
-                Collections.sort( groups, new DataElementGroupNameComparator() );
-
-                return "groups";
-            }
-
-            else
-            {
-                members = new ArrayList<DataElement>( dataElementService.getDataElementGroup( node ).getMembers() );
-
-                Collections.sort( members, new DataElementNameComparator() );
-
-                return "members";
-            }
-        }
-
-        return NONE;
-    }
-}

=== removed file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/java/org/hisp/dhis/visualizer/action/GetIndicatorTreeNodesAction.java'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/java/org/hisp/dhis/visualizer/action/GetIndicatorTreeNodesAction.java	2011-09-20 11:28:18 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/java/org/hisp/dhis/visualizer/action/GetIndicatorTreeNodesAction.java	1970-01-01 00:00:00 +0000
@@ -1,119 +0,0 @@
-package org.hisp.dhis.visualizer.action;
-
-/*
- * Copyright (c) 2004-2010, 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.
- */
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.hisp.dhis.indicator.Indicator;
-import org.hisp.dhis.indicator.IndicatorGroup;
-import org.hisp.dhis.indicator.IndicatorService;
-import org.hisp.dhis.indicator.comparator.IndicatorGroupNameComparator;
-import org.hisp.dhis.indicator.comparator.IndicatorNameComparator;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Jan Henrik Overland
- */
-public class GetIndicatorTreeNodesAction
-    implements Action
-{
-    // -------------------------------------------------------------------------
-    // Dependencies
-    // -------------------------------------------------------------------------
-    
-    private IndicatorService indicatorService;
-
-    public void setIndicatorService( IndicatorService indicatorService )
-    {
-        this.indicatorService = indicatorService;
-    }
-
-    // -------------------------------------------------------------------------
-    // Input
-    // -------------------------------------------------------------------------
-
-    private Integer node;
-    
-    public void setNode( Integer node )
-    {
-        this.node = node;
-    }
-
-    // -------------------------------------------------------------------------
-    // Output
-    // -------------------------------------------------------------------------
-
-    private List<IndicatorGroup> groups;
-
-    public List<IndicatorGroup> getGroups()
-    {
-        return groups;
-    }
-
-    private List<Indicator> members;
-
-    public List<Indicator> getMembers()
-    {
-        return members;
-    }
-
-    // -------------------------------------------------------------------------
-    // Action implementation
-    // -------------------------------------------------------------------------
-
-    @Override
-    public String execute()
-        throws Exception
-    {
-        if ( node != null )
-        {
-            if ( node == 0 )
-            {
-                groups = new ArrayList<IndicatorGroup>( indicatorService.getAllIndicatorGroups() );
-                
-                Collections.sort( groups, new IndicatorGroupNameComparator() );
-                
-                return "groups";
-            }
-            
-            else
-            {
-                members = new ArrayList<Indicator>( indicatorService.getIndicatorGroup( node ).getMembers() );
-                
-                Collections.sort( members, new IndicatorNameComparator() );
-                
-                return "members";
-            }
-        }
-        
-        return NONE;
-    }
-}

=== removed file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/java/org/hisp/dhis/visualizer/action/GetPeriodTreeNodesAction.java'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/java/org/hisp/dhis/visualizer/action/GetPeriodTreeNodesAction.java	2011-09-20 11:28:18 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/java/org/hisp/dhis/visualizer/action/GetPeriodTreeNodesAction.java	1970-01-01 00:00:00 +0000
@@ -1,141 +0,0 @@
-package org.hisp.dhis.visualizer.action;
-
-/*
- * Copyright (c) 2004-2010, 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.
- */
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.hisp.dhis.i18n.I18nFormat;
-import org.hisp.dhis.period.Period;
-import org.hisp.dhis.period.PeriodService;
-import org.hisp.dhis.period.PeriodStore;
-import org.hisp.dhis.period.PeriodType;
-import org.hisp.dhis.period.comparator.PeriodComparator;
-import org.hisp.dhis.system.filter.PastAndCurrentPeriodFilter;
-import org.hisp.dhis.system.util.FilterUtils;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Jan Henrik Overland
- */
-public class GetPeriodTreeNodesAction
-    implements Action
-{
-    // -------------------------------------------------------------------------
-    // Dependencies
-    // -------------------------------------------------------------------------
-
-    private PeriodStore periodStore;
-
-    public void setPeriodStore( PeriodStore periodStore )
-    {
-        this.periodStore = periodStore;
-    }
-
-    private PeriodService periodService;
-
-    public void setPeriodService( PeriodService periodService )
-    {
-        this.periodService = periodService;
-    }
-
-    private I18nFormat format;
-
-    public void setFormat( I18nFormat format )
-    {
-        this.format = format;
-    }
-
-    // -------------------------------------------------------------------------
-    // Input
-    // -------------------------------------------------------------------------
-
-    private Integer node;
-
-    public void setNode( Integer node )
-    {
-        this.node = node;
-    }
-
-    // -------------------------------------------------------------------------
-    // Output
-    // -------------------------------------------------------------------------
-
-    private List<PeriodType> groups;
-
-    public List<PeriodType> getGroups()
-    {
-        return groups;
-    }
-
-    private List<Period> members;
-
-    public List<Period> getMembers()
-    {
-        return members;
-    }
-
-    // -------------------------------------------------------------------------
-    // Action implementation
-    // -------------------------------------------------------------------------
-
-    @Override
-    public String execute()
-        throws Exception
-    {
-        if ( node != null )
-        {
-            if ( node == 0 )
-            {
-                groups = new ArrayList<PeriodType>( periodStore.getAllPeriodTypes() );
-
-                return "groups";
-            }
-
-            else
-            {
-                members = new ArrayList<Period>( periodService.getPeriodsByPeriodType( periodService.getPeriodType( node ) ) );
-                
-                FilterUtils.filter( members, new PastAndCurrentPeriodFilter() );
-                
-                for ( Period period : members )
-                {
-                    period.setName( format.formatPeriod( period ) );
-                }
-                
-                Collections.sort( members, new PeriodComparator() );
-
-                return "members";
-            }
-        }
-
-        return NONE;
-    }    
-}

=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/META-INF/dhis/beans.xml	2011-09-29 13:48:07 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/META-INF/dhis/beans.xml	2011-10-05 14:19:53 +0000
@@ -18,35 +18,6 @@
         <property name="periodService" ref="org.hisp.dhis.period.PeriodService" />
     </bean>
     
-    <!-- Indicator -->
-
-    <bean id="org.hisp.dhis.visualizer.action.GetIndicatorTreeNodesAction"
-        class="org.hisp.dhis.visualizer.action.GetIndicatorTreeNodesAction"
-        scope="prototype">
-        <property name="indicatorService"
-            ref="org.hisp.dhis.indicator.IndicatorService" />
-    </bean>
-    
-    <!-- DataElement -->
-
-    <bean id="org.hisp.dhis.visualizer.action.GetDataElementTreeNodesAction"
-        class="org.hisp.dhis.visualizer.action.GetDataElementTreeNodesAction"
-        scope="prototype">
-        <property name="dataElementService"
-            ref="org.hisp.dhis.dataelement.DataElementService" />
-    </bean>
-    
-    <!-- Period -->
-
-    <bean id="org.hisp.dhis.visualizer.action.GetPeriodTreeNodesAction"
-        class="org.hisp.dhis.visualizer.action.GetPeriodTreeNodesAction"
-        scope="prototype">
-        <property name="periodStore"
-            ref="org.hisp.dhis.period.PeriodStore" />
-        <property name="periodService"
-            ref="org.hisp.dhis.period.PeriodService" />
-    </bean>
-    
     <!-- OrganisationUnit -->
 
 	<bean id="org.hisp.dhis.visualizer.action.GetOrganisationUnitChildrenAction"

=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/struts.xml	2011-09-29 09:10:42 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/struts.xml	2011-10-05 14:19:53 +0000
@@ -23,42 +23,6 @@
                 /dhis-web-visualizer/jsonInitialize.vm</result>
         </action>
 
-        <!-- Indicator -->
-
-        <action name="getIndicatorTreeNodes"
-            class="org.hisp.dhis.visualizer.action.GetIndicatorTreeNodesAction">
-            <result name="groups" type="velocity-json">
-                /dhis-web-visualizer/jsonminTreeGroups.vm</result>
-            <result name="members" type="velocity-json">
-                /dhis-web-visualizer/jsonminTreeGroupMembers.vm</result>
-			<result name="none" type="velocity-json">
-                /dhis-web-visualizer/void.vm</result>
-        </action>
-
-        <!-- DataElement -->
-
-        <action name="getDataElementTreeNodes"
-            class="org.hisp.dhis.visualizer.action.GetDataElementTreeNodesAction">
-            <result name="groups" type="velocity-json">
-                /dhis-web-visualizer/jsonminTreeGroups.vm</result>
-            <result name="members" type="velocity-json">
-                /dhis-web-visualizer/jsonminTreeGroupMembers.vm</result>
-            <result name="none" type="velocity-json">
-                /dhis-web-visualizer/void.vm</result>
-        </action>
-
-        <!-- Period -->
-
-        <action name="getPeriodTreeNodes"
-            class="org.hisp.dhis.visualizer.action.GetPeriodTreeNodesAction">
-            <result name="groups" type="velocity-json">
-                /dhis-web-visualizer/jsonminTreeGroups.vm</result>
-            <result name="members" type="velocity-json">
-                /dhis-web-visualizer/jsonminTreeGroupMembers.vm</result>
-            <result name="none" type="velocity-json">
-                /dhis-web-visualizer/void.vm</result>
-        </action>
-
         <!-- OrganisationUnit -->
 
 		<action name="getOrganisationUnitChildren"

=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js	2011-10-05 11:45:45 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js	2011-10-05 15:04:54 +0000
@@ -1317,8 +1317,25 @@
                                             }
                                         }),
                                         listeners: {
-                                            itemcontextmenu: function(a,b,c,d,e) {
-                                                //console.log(e);
+                                            itemcontextmenu: function(v, r, h, i, e) {
+                                                var menu = Ext.create('Ext.menu.Menu');
+                                                if (!r.data.leaf) {
+                                                    menu.add({
+                                                        text: 'Select all children',
+                                                        icon: 'images/node-select-child.png',
+                                                        handler: function() {
+                                                            r.expand(false, function() {
+                                                                v.getSelectionModel().select(r.childNodes, true);
+                                                                v.getSelectionModel().deselect(r);
+                                                            });
+                                                        }
+                                                    });
+                                                }
+                                                else {
+                                                    return;
+                                                }
+                                                
+                                                menu.showAt(e.xy);
                                             }
                                         }
                                     }
@@ -1327,8 +1344,11 @@
                                     expand: function(fs) {
                                         DV.util.fieldset.collapseOthers(this.name);
                                         var tp = fs.down('treepanel');
-                                        tp.isRendered = true;
-                                        tp.selectRoot();
+                                        if (!tp.isRendered) {
+                                            tp.isRendered = true;
+                                            tp.getRootNode().expand();
+                                            tp.selectRoot();
+                                        }
                                     }
                                 }
                             }

=== added file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/node-select-child.png'
Binary files dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/node-select-child.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/node-select-child.png	2011-10-05 14:19:53 +0000 differ
=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/jsonOrganisationUnitChildren.vm'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/jsonOrganisationUnitChildren.vm	2011-09-22 13:17:39 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/jsonOrganisationUnitChildren.vm	2011-10-05 14:19:53 +0000
@@ -1,1 +1,1 @@
-#set( $size = $units.size() )[#foreach( $unit in $units ){"id":${unit.id},"level":${unit.level},"text":"$encoder.jsonEncode( ${unit.name} )",#if( $unit.hasChild() )"children":[#set( $innerSize = $unit.children.size() )#set( $level = $unit.level + 1 )#foreach( $child in $unit.getSortedChildren() ){"id":${child.id},"level":${level},"text":"$encoder.jsonEncode( ${child.name} )"}#if( $velocityCount < $innerSize ),#end#end]#else"leaf":true#end}#if( $velocityCount < $size ),#end#end]
\ No newline at end of file
+#set($size = $units.size())[#foreach($unit in $units){"id":${unit.id},"level":${unit.level},"text":"$encoder.jsonEncode(${unit.name})"#if(!$unit.hasChild()),"leaf":true#end}#if($velocityCount < $size),#end#end]
\ No newline at end of file

=== removed file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/jsonminTreeGroupMembers.vm'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/jsonminTreeGroupMembers.vm	2011-09-20 10:34:32 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/jsonminTreeGroupMembers.vm	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-#set( $size = $members.size() )
-[#foreach( $member in $members ){"id":"$!{member.id}","text":"$!encoder.jsonEncode(${member.name})","leaf":true}#if( $velocityCount < $size ),#end#end]
\ No newline at end of file

=== removed file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/jsonminTreeGroups.vm'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/jsonminTreeGroups.vm	2011-09-20 10:34:32 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/jsonminTreeGroups.vm	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-#set( $size = $groups.size() )
-[#foreach( $group in $groups ){"id":"$!{group.id}","text":"$!encoder.jsonEncode(${group.name})"}#if( $velocityCount < $size ),#end#end]
\ No newline at end of file