=== added directory 'local/bd/dhis-web-linelisting-manpower/src/main/java/org/hisp/dhis/ll/action/aggmap'
=== added file 'local/bd/dhis-web-linelisting-manpower/src/main/java/org/hisp/dhis/ll/action/aggmap/GetLineListElementsAction.java'
--- local/bd/dhis-web-linelisting-manpower/src/main/java/org/hisp/dhis/ll/action/aggmap/GetLineListElementsAction.java	1970-01-01 00:00:00 +0000
+++ local/bd/dhis-web-linelisting-manpower/src/main/java/org/hisp/dhis/ll/action/aggmap/GetLineListElementsAction.java	2011-04-15 11:15:30 +0000
@@ -0,0 +1,65 @@
+package org.hisp.dhis.ll.action.aggmap;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.hisp.dhis.linelisting.LineListElement;
+import org.hisp.dhis.linelisting.LineListGroup;
+import org.hisp.dhis.linelisting.LineListOption;
+import org.hisp.dhis.linelisting.LineListService;
+
+import com.opensymphony.xwork2.Action;
+
+public class GetLineListElementsAction implements Action
+{
+    // -------------------------------------------------------------------------
+    // Dependencies
+    // -------------------------------------------------------------------------
+    private LineListService lineListService;
+
+    public void setLineListService( LineListService lineListService )
+    {
+        this.lineListService = lineListService;
+    }
+
+    // -------------------------------------------------------------------------
+    // Input/output
+    // -------------------------------------------------------------------------
+
+    private List<LineListOption> lineListOptions;
+    
+    public List<LineListOption> getLineListOptions()
+    {
+        return lineListOptions;
+    }
+
+    private LineListElement lineListElement;
+    
+    public LineListElement getLineListElement()
+    {
+        return lineListElement;
+    }
+
+    private Integer lineListGroupId;
+    
+    public void setLineListGroupId( Integer lineListGroupId )
+    {
+        this.lineListGroupId = lineListGroupId;
+    }
+    
+    // -------------------------------------------------------------------------
+    // Action implementation
+    // -------------------------------------------------------------------------
+    public String execute()
+        throws Exception
+    {
+        LineListGroup lineListGroup = lineListService.getLineListGroup( lineListGroupId );
+        
+        lineListElement = lineListGroup.getLineListElements().iterator().next();
+        
+        lineListOptions = new ArrayList<LineListOption>( lineListElement.getLineListElementOptions() );
+        
+        return SUCCESS;
+    }
+
+}

=== added file 'local/bd/dhis-web-linelisting-manpower/src/main/java/org/hisp/dhis/ll/action/aggmap/GetSelDataElementAction.java'
--- local/bd/dhis-web-linelisting-manpower/src/main/java/org/hisp/dhis/ll/action/aggmap/GetSelDataElementAction.java	1970-01-01 00:00:00 +0000
+++ local/bd/dhis-web-linelisting-manpower/src/main/java/org/hisp/dhis/ll/action/aggmap/GetSelDataElementAction.java	2011-04-15 11:15:30 +0000
@@ -0,0 +1,76 @@
+package org.hisp.dhis.ll.action.aggmap;
+
+import java.util.List;
+
+import org.hisp.dhis.linelisting.LineListDataElementMap;
+import org.hisp.dhis.linelisting.LineListElement;
+import org.hisp.dhis.linelisting.LineListOption;
+import org.hisp.dhis.linelisting.LineListService;
+
+import com.opensymphony.xwork2.Action;
+
+public class GetSelDataElementAction implements Action
+{
+
+    // -------------------------------------------------------------------------
+    // Dependencies
+    // -------------------------------------------------------------------------
+
+    private LineListService lineListService;
+    
+    public void setLineListService( LineListService lineListService )
+    {
+        this.lineListService = lineListService;
+    }
+
+    // -------------------------------------------------------------------------
+    // Input & Output
+    // -------------------------------------------------------------------------
+
+    private Integer lineListElementId;
+
+    public void setLineListElementId( Integer lineListElementId )
+    {
+        this.lineListElementId = lineListElementId;
+    }
+
+    private Integer lineListOptionId;
+    
+    public void setLineListOptionId( Integer lineListOptionId )
+    {
+        this.lineListOptionId = lineListOptionId;
+    }
+    
+    private String id;
+    
+    public String getId()
+    {
+        return id;
+    }
+    
+    // -------------------------------------------------------------------------
+    // Action Implementation
+    // -------------------------------------------------------------------------
+
+    public String execute() throws Exception
+    {
+        LineListElement lineListElement = lineListService.getLineListElement( lineListElementId );
+        
+        LineListOption lineListOption = lineListService.getLineListOption( lineListOptionId );
+        
+        List<LineListDataElementMap> lineListDataElementMaps = lineListService.getLinelistDataelementMappings( lineListElement, lineListOption );
+        
+        if( lineListDataElementMaps != null && lineListDataElementMaps.size() !=0 )
+        {
+            LineListDataElementMap lineListDataElementMap = lineListDataElementMaps.get( 0 );
+            
+            id = lineListDataElementMap.getDataElement().getId() + ":" + lineListDataElementMap.getDataElementOptionCombo().getId();
+        }
+        else
+        {
+            id = "NA";
+        }
+        
+        return SUCCESS;
+    }
+}

=== added file 'local/bd/dhis-web-linelisting-manpower/src/main/java/org/hisp/dhis/ll/action/aggmap/SanctionedPostMappingForm.java'
--- local/bd/dhis-web-linelisting-manpower/src/main/java/org/hisp/dhis/ll/action/aggmap/SanctionedPostMappingForm.java	1970-01-01 00:00:00 +0000
+++ local/bd/dhis-web-linelisting-manpower/src/main/java/org/hisp/dhis/ll/action/aggmap/SanctionedPostMappingForm.java	2011-04-15 11:15:30 +0000
@@ -0,0 +1,106 @@
+package org.hisp.dhis.ll.action.aggmap;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.hisp.dhis.dataelement.DataElement;
+import org.hisp.dhis.dataelement.DataElementCategoryCombo;
+import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
+import org.hisp.dhis.dataelement.DataElementService;
+import org.hisp.dhis.linelisting.LineListGroup;
+import org.hisp.dhis.linelisting.LineListService;
+
+import com.opensymphony.xwork2.Action;
+
+public class SanctionedPostMappingForm implements Action
+{
+    // -------------------------------------------------------------------------
+    // Dependencies
+    // -------------------------------------------------------------------------
+
+    private LineListService lineListService;
+    
+    public void setLineListService( LineListService lineListService )
+    {
+        this.lineListService = lineListService;
+    }
+
+    private DataElementService dataElementService;
+    
+    public void setDataElementService( DataElementService dataElementService )
+    {
+        this.dataElementService = dataElementService;
+    }
+    
+    // -------------------------------------------------------------------------
+    // Output
+    // -------------------------------------------------------------------------
+
+    private List<LineListGroup> departments;
+    
+    public List<LineListGroup> getDepartments()
+    {
+        return departments;
+    }
+    
+    private List<String> optionComboNames;
+
+    public List<String> getOptionComboNames()
+    {
+        return optionComboNames;
+    }
+
+    private List<String> optionComboIds;
+
+    public List<String> getOptionComboIds()
+    {
+        return optionComboIds;
+    }
+
+    // -------------------------------------------------------------------------
+    // Action Implementation
+    // -------------------------------------------------------------------------
+
+    public String execute()
+    {
+        optionComboIds = new ArrayList<String>();
+        optionComboNames = new ArrayList<String>();
+
+        departments = new ArrayList<LineListGroup>( lineListService.getAllLineListGroups() );
+        
+        List<DataElement> dataElements = new ArrayList<DataElement>( dataElementService.getAllDataElements() );
+        
+        Iterator<DataElement> deIterator = dataElements.iterator();
+        while ( deIterator.hasNext() )
+        {
+            DataElement de1 = deIterator.next();
+            if ( !de1.getType().equals( DataElement.VALUE_TYPE_INT ) || !de1.getDomainType().equals( DataElement.DOMAIN_TYPE_AGGREGATE ) )    
+            {
+                deIterator.remove();
+            }
+        }
+
+        deIterator = dataElements.iterator();
+        while ( deIterator.hasNext() )
+        {
+            DataElement de = deIterator.next();
+
+            DataElementCategoryCombo dataElementCategoryCombo = de.getCategoryCombo();
+            List<DataElementCategoryOptionCombo> optionCombos = new ArrayList<DataElementCategoryOptionCombo>(
+                dataElementCategoryCombo.getOptionCombos() );
+
+            Iterator<DataElementCategoryOptionCombo> optionComboIterator = optionCombos.iterator();
+            while ( optionComboIterator.hasNext() )
+            {
+                DataElementCategoryOptionCombo decoc = optionComboIterator.next();
+                optionComboIds.add( de.getId() + ":" + decoc.getId() );
+                optionComboNames.add( de.getName() + ":" + decoc.getName() );
+            }
+
+        }
+
+        return SUCCESS;
+    }
+
+}

=== added file 'local/bd/dhis-web-linelisting-manpower/src/main/java/org/hisp/dhis/ll/action/aggmap/SaveSanctionedPostMapAction.java'
--- local/bd/dhis-web-linelisting-manpower/src/main/java/org/hisp/dhis/ll/action/aggmap/SaveSanctionedPostMapAction.java	1970-01-01 00:00:00 +0000
+++ local/bd/dhis-web-linelisting-manpower/src/main/java/org/hisp/dhis/ll/action/aggmap/SaveSanctionedPostMapAction.java	2011-04-15 11:15:30 +0000
@@ -0,0 +1,118 @@
+package org.hisp.dhis.ll.action.aggmap;
+
+import java.util.List;
+
+import org.hisp.dhis.dataelement.DataElement;
+import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
+import org.hisp.dhis.dataelement.DataElementCategoryService;
+import org.hisp.dhis.dataelement.DataElementService;
+import org.hisp.dhis.linelisting.LineListDataElementMap;
+import org.hisp.dhis.linelisting.LineListElement;
+import org.hisp.dhis.linelisting.LineListOption;
+import org.hisp.dhis.linelisting.LineListService;
+
+import com.opensymphony.xwork2.Action;
+
+public class SaveSanctionedPostMapAction implements Action
+{
+    // -------------------------------------------------------------------------
+    // Dependencies
+    // -------------------------------------------------------------------------
+
+    private LineListService lineListService;
+    
+    public void setLineListService( LineListService lineListService )
+    {
+        this.lineListService = lineListService;
+    }
+
+    private DataElementService dataElementService;
+    
+    public void setDataElementService( DataElementService dataElementService )
+    {
+        this.dataElementService = dataElementService;
+    }
+
+    private DataElementCategoryService dataElementCategoryService;
+    
+    public void setDataElementCategoryService( DataElementCategoryService dataElementCategoryService )
+    {
+        this.dataElementCategoryService = dataElementCategoryService;
+    }
+    
+    // -------------------------------------------------------------------------
+    // Input & Output
+    // -------------------------------------------------------------------------
+
+    private Integer lineListElementId;
+
+    public void setLineListElementId( Integer lineListElementId )
+    {
+        this.lineListElementId = lineListElementId;
+    }
+
+    private Integer lineListOptionId;
+    
+    public void setLineListOptionId( Integer lineListOptionId )
+    {
+        this.lineListOptionId = lineListOptionId;
+    }
+
+    private Integer dataElementId;
+
+    public void setDataElementId( Integer dataElementId )
+    {
+        this.dataElementId = dataElementId;
+    }
+
+    private Integer deCOCId;
+
+    public void setDeCOCId( Integer deCOCId )
+    {
+        this.deCOCId = deCOCId;
+    }
+
+    private String statusMsg;
+
+    public String getStatusMsg()
+    {
+        return statusMsg;
+    }
+
+    // -------------------------------------------------------------------------
+    // Action Implementation
+    // -------------------------------------------------------------------------
+
+    public String execute() throws Exception
+    {
+        try
+        {
+            LineListElement lineListElement = lineListService.getLineListElement( lineListElementId );
+            
+            LineListOption lineListOption = lineListService.getLineListOption( lineListOptionId );
+            
+            DataElement dataElement = dataElementService.getDataElement( dataElementId );
+            
+            DataElementCategoryOptionCombo deCOC = dataElementCategoryService.getDataElementCategoryOptionCombo( deCOCId );
+            
+            List<LineListDataElementMap> lineListDataElementMaps = lineListService.getLinelistDataelementMappings( lineListElement, lineListOption );
+            
+            for( LineListDataElementMap lineListDataElementMap : lineListDataElementMaps )
+            {
+                lineListService.deleteLinelistDataelementMapping( lineListDataElementMap );
+            }
+            
+            LineListDataElementMap lineListDataElementMap = new LineListDataElementMap( lineListElement, lineListOption, dataElement, deCOC );
+                
+            lineListService.addLinelistDataelementMapping( lineListDataElementMap );
+            
+            statusMsg = "Mapping has been saved Successfully";
+        }
+        catch( Exception e )
+        {
+            statusMsg = "ERROR: "+e.getMessage();
+        }
+        
+        return SUCCESS;
+    }
+}

=== modified file 'local/bd/dhis-web-linelisting-manpower/src/main/java/org/hisp/dhis/ll/action/employee/GetEmployeeListAction.java'
--- local/bd/dhis-web-linelisting-manpower/src/main/java/org/hisp/dhis/ll/action/employee/GetEmployeeListAction.java	2010-11-23 14:07:49 +0000
+++ local/bd/dhis-web-linelisting-manpower/src/main/java/org/hisp/dhis/ll/action/employee/GetEmployeeListAction.java	2011-04-15 11:15:30 +0000
@@ -5,10 +5,12 @@
 
 import org.hisp.dhis.linelisting.Employee;
 import org.hisp.dhis.linelisting.EmployeeService;
+import org.hisp.dhis.paging.ActionPagingSupport;
+import org.hisp.dhis.user.User;
 
 import com.opensymphony.xwork2.Action;
 
-public class GetEmployeeListAction implements Action
+public class GetEmployeeListAction extends ActionPagingSupport<Employee>
 {
 
     // -------------------------------------------------------------------------
@@ -39,7 +41,9 @@
 
     public String execute()
     {
-    	employeeList = new ArrayList<Employee>( employeeService.getAllEmployee() );
+        this.paging = createPaging( employeeService.getEmployeeCount() );
+        
+        employeeList = new ArrayList<Employee>( employeeService.getEmployeesBetween( paging.getStartPos(), paging.getPageSize() ) );
     	
         return SUCCESS;
     }

=== modified file 'local/bd/dhis-web-linelisting-manpower/src/main/java/org/hisp/dhis/ll/action/llOption/GetLineListOptionListAction.java'
--- local/bd/dhis-web-linelisting-manpower/src/main/java/org/hisp/dhis/ll/action/llOption/GetLineListOptionListAction.java	2010-10-20 06:14:25 +0000
+++ local/bd/dhis-web-linelisting-manpower/src/main/java/org/hisp/dhis/ll/action/llOption/GetLineListOptionListAction.java	2011-04-15 11:15:30 +0000
@@ -31,14 +31,15 @@
 import java.util.Collections;
 import java.util.List;
 
+import org.hisp.dhis.linelisting.LineListElement;
 import org.hisp.dhis.linelisting.LineListOption;
 import org.hisp.dhis.linelisting.LineListService;
 import org.hisp.dhis.linelisting.comparator.LineListOptionNameComparator;
+import org.hisp.dhis.paging.ActionPagingSupport;
 
 import com.opensymphony.xwork2.Action;
 
-public class GetLineListOptionListAction
-    implements Action
+public class GetLineListOptionListAction extends ActionPagingSupport<LineListElement>
 {
     // -------------------------------------------------------------------------
     // Dependencies
@@ -52,21 +53,6 @@
     }
 
     // -------------------------------------------------------------------------
-    // Comparator
-    // -------------------------------------------------------------------------
-/*
-    private Comparator<LineListOption> lineListOptionNameComparator;
-
-    public void setLineListOptionComparator( Comparator<LineListOption> lineListOptionNameComparator )
-    {
-        this.lineListOptionNameComparator = lineListOptionNameComparator;
-    }
-*/
-    // -------------------------------------------------------------------------
-    // DisplayPropertyHandler
-    // -------------------------------------------------------------------------
-
-    // -------------------------------------------------------------------------
     // Output
     // -------------------------------------------------------------------------
 
@@ -81,14 +67,12 @@
     // Action implementation
     // -------------------------------------------------------------------------
 
-   // @SuppressWarnings( "unchecked" )
-    public String execute()
+    public String execute() throws Exception
     {
-        lineListOptions = new ArrayList<LineListOption>( lineListService.getAllLineListOptions() );
-
-        Collections.sort( lineListOptions, new LineListOptionNameComparator() );
-
-        // displayPropertyHandler.handle( lineListOptions );
+        this.paging = createPaging( lineListService.getLineListOptionCount() );
+        
+        lineListOptions = new ArrayList<LineListOption>( lineListService.getLineListOptionsBetween( paging.getStartPos(), paging.getPageSize() ) );
+
 
         return SUCCESS;
     }

=== modified file 'local/bd/dhis-web-linelisting-manpower/src/main/java/org/hisp/dhis/ll/action/llValidation/GetExpressionAction.java'
--- local/bd/dhis-web-linelisting-manpower/src/main/java/org/hisp/dhis/ll/action/llValidation/GetExpressionAction.java	2010-10-20 06:14:25 +0000
+++ local/bd/dhis-web-linelisting-manpower/src/main/java/org/hisp/dhis/ll/action/llValidation/GetExpressionAction.java	2011-04-15 11:15:30 +0000
@@ -157,7 +157,7 @@
         Collections.sort( llElements, lineListElementComparator );
 
         //dataElements = displayPropertyHandler.handleDataElements( dataElements );
-        displayPropertyHandler.handle( llElements );
+        //displayPropertyHandler.handle( llElements );
         
         lineListGroups = new ArrayList<LineListGroup>( lineListService.getAllLineListGroups() );
 

=== modified file 'local/bd/dhis-web-linelisting-manpower/src/main/java/org/hisp/dhis/ll/action/llValidation/GetFilteredLineListElementsAction.java'
--- local/bd/dhis-web-linelisting-manpower/src/main/java/org/hisp/dhis/ll/action/llValidation/GetFilteredLineListElementsAction.java	2010-10-28 09:17:13 +0000
+++ local/bd/dhis-web-linelisting-manpower/src/main/java/org/hisp/dhis/ll/action/llValidation/GetFilteredLineListElementsAction.java	2011-04-15 11:15:30 +0000
@@ -136,7 +136,7 @@
 
         //dataElements = displayPropertyHandler.handleDataElements( dataElements );
         
-        displayPropertyHandler.handle( llElements );
+        //displayPropertyHandler.handle( llElements );
 
         // ---------------------------------------------------------------------
         // String filter

=== modified file 'local/bd/dhis-web-linelisting-manpower/src/main/java/org/hisp/dhis/ll/action/lldataelementmapping/LineListElementListAction.java'
--- local/bd/dhis-web-linelisting-manpower/src/main/java/org/hisp/dhis/ll/action/lldataelementmapping/LineListElementListAction.java	2010-10-20 06:14:25 +0000
+++ local/bd/dhis-web-linelisting-manpower/src/main/java/org/hisp/dhis/ll/action/lldataelementmapping/LineListElementListAction.java	2011-04-15 11:15:30 +0000
@@ -69,7 +69,7 @@
         
         Collections.sort( lineListElements, new LineListElementNameComparator() );
         
-        displayPropertyHandler.handle( lineListElements );
+        //displayPropertyHandler.handle( lineListElements );
 
         return SUCCESS;
     }

=== modified file 'local/bd/dhis-web-linelisting-manpower/src/main/java/org/hisp/dhis/ll/action/llelements/GetLineListElementOptionsAction.java'
--- local/bd/dhis-web-linelisting-manpower/src/main/java/org/hisp/dhis/ll/action/llelements/GetLineListElementOptionsAction.java	2010-10-20 06:14:25 +0000
+++ local/bd/dhis-web-linelisting-manpower/src/main/java/org/hisp/dhis/ll/action/llelements/GetLineListElementOptionsAction.java	2011-04-15 11:15:30 +0000
@@ -77,7 +77,7 @@
             
             //Collections.sort( lineListElementOptions, new LineListOptionNameComparator() );
 
-            displayPropertyHandler.handle( lineListElementOptions );
+            //displayPropertyHandler.handle( lineListElementOptions );
         }
 
         // ---------------------------------------------------------------------
@@ -90,7 +90,7 @@
 
         Collections.sort( availableLineListOptions, new LineListOptionNameComparator() );
 
-        displayPropertyHandler.handle( availableLineListOptions );
+       // displayPropertyHandler.handle( availableLineListOptions );
 
         return SUCCESS;
     }

=== modified file 'local/bd/dhis-web-linelisting-manpower/src/main/java/org/hisp/dhis/ll/action/llelements/LineListElementListAction.java'
--- local/bd/dhis-web-linelisting-manpower/src/main/java/org/hisp/dhis/ll/action/llelements/LineListElementListAction.java	2010-10-20 06:14:25 +0000
+++ local/bd/dhis-web-linelisting-manpower/src/main/java/org/hisp/dhis/ll/action/llelements/LineListElementListAction.java	2011-04-15 11:15:30 +0000
@@ -31,18 +31,17 @@
 import java.util.Collections;
 import java.util.List;
 
+import org.hisp.dhis.linelisting.Employee;
 import org.hisp.dhis.linelisting.LineListElement;
 import org.hisp.dhis.linelisting.LineListService;
 import org.hisp.dhis.linelisting.comparator.LineListElementNameComparator;
 import org.hisp.dhis.options.displayproperty.DisplayPropertyHandler;
+import org.hisp.dhis.paging.ActionPagingSupport;
 
 import com.opensymphony.xwork2.Action;
 
-public class LineListElementListAction
-    implements Action
+public class LineListElementListAction extends ActionPagingSupport<LineListElement>
 {
-    private List<LineListElement> lineListElements;
-
     // -------------------------------------------------------------------------
     // Dependencies
     // -------------------------------------------------------------------------
@@ -54,17 +53,12 @@
         this.lineListService = lineListService;
     }
 
-    private DisplayPropertyHandler displayPropertyHandler;
-
-    public void setDisplayPropertyHandler( DisplayPropertyHandler displayPropertyHandler )
-    {
-        this.displayPropertyHandler = displayPropertyHandler;
-    }
-
     // -------------------------------------------------------------------------
     // Getters & Setters
     // -------------------------------------------------------------------------
 
+    private List<LineListElement> lineListElements;
+
     public List<LineListElement> getLineListElements()
     {
         return lineListElements;
@@ -77,12 +71,10 @@
     public String execute()
         throws Exception
     {
-        lineListElements = new ArrayList<LineListElement>( lineListService.getAllLineListElements() );
-        
-        Collections.sort( lineListElements, new LineListElementNameComparator() );
-        
-        displayPropertyHandler.handle( lineListElements );
-
+        this.paging = createPaging( lineListService.getLineListElementCount() );
+        
+        lineListElements = new ArrayList<LineListElement>( lineListService.getLineListElementsBetween( paging.getStartPos(), paging.getPageSize() ) );
+       
         return SUCCESS;
     }
 }

=== modified file 'local/bd/dhis-web-linelisting-manpower/src/main/java/org/hisp/dhis/ll/action/llelements/LineListOptionListAction.java'
--- local/bd/dhis-web-linelisting-manpower/src/main/java/org/hisp/dhis/ll/action/llelements/LineListOptionListAction.java	2010-10-20 06:14:25 +0000
+++ local/bd/dhis-web-linelisting-manpower/src/main/java/org/hisp/dhis/ll/action/llelements/LineListOptionListAction.java	2011-04-15 11:15:30 +0000
@@ -81,7 +81,7 @@
 
         Collections.sort( lineListOptions, new LineListOptionNameComparator() );
 
-        displayPropertyHandler.handle( lineListOptions );
+        //displayPropertyHandler.handle( lineListOptions );
 
         return SUCCESS;
     }

=== modified file 'local/bd/dhis-web-linelisting-manpower/src/main/java/org/hisp/dhis/ll/action/llgroup/GetLLGroupAction.java'
--- local/bd/dhis-web-linelisting-manpower/src/main/java/org/hisp/dhis/ll/action/llgroup/GetLLGroupAction.java	2010-10-20 06:14:25 +0000
+++ local/bd/dhis-web-linelisting-manpower/src/main/java/org/hisp/dhis/ll/action/llgroup/GetLLGroupAction.java	2011-04-15 11:15:30 +0000
@@ -134,7 +134,7 @@
 
         //Collections.sort( llElements, new LineListElementNameComparator() );
                 	
-        displayPropertyHandler.handle( llElements );
+        //displayPropertyHandler.handle( llElements );
 
         //dataEntryForm = dataEntryFormService.getDataEntryFormByDataSet( lineListGroup );
         

=== modified file 'local/bd/dhis-web-linelisting-manpower/src/main/java/org/hisp/dhis/ll/action/llgroup/GetLineListGroupListAction.java'
--- local/bd/dhis-web-linelisting-manpower/src/main/java/org/hisp/dhis/ll/action/llgroup/GetLineListGroupListAction.java	2010-10-20 06:14:25 +0000
+++ local/bd/dhis-web-linelisting-manpower/src/main/java/org/hisp/dhis/ll/action/llgroup/GetLineListGroupListAction.java	2011-04-15 11:15:30 +0000
@@ -32,14 +32,15 @@
 import java.util.Comparator;
 import java.util.List;
 
+import org.hisp.dhis.linelisting.Employee;
 import org.hisp.dhis.linelisting.LineListGroup;
 import org.hisp.dhis.linelisting.LineListService;
 
 import com.opensymphony.xwork2.Action;
 import org.hisp.dhis.linelisting.comparator.LineListGroupNameComparator;
+import org.hisp.dhis.paging.ActionPagingSupport;
 
-public class GetLineListGroupListAction
-    implements Action
+public class GetLineListGroupListAction extends ActionPagingSupport<LineListGroup>
 {
     // -------------------------------------------------------------------------
     // Dependencies
@@ -85,9 +86,14 @@
     @SuppressWarnings( "unchecked" )
     public String execute()
     {
-        lineListGroups = new ArrayList<LineListGroup>( lineListService.getAllLineListGroups() );
-
-        Collections.sort( lineListGroups, new LineListGroupNameComparator() );
+
+        this.paging = createPaging( lineListService.getLineListGroupCount() );
+        
+        lineListGroups = new ArrayList<LineListGroup>( lineListService.getLineListGroupsBetween( paging.getStartPos(), paging.getPageSize() ) );
+
+        //lineListGroups = new ArrayList<LineListGroup>( lineListService.getAllLineListGroups() );
+
+        //Collections.sort( lineListGroups, new LineListGroupNameComparator() );
 
         // displayPropertyHandler.handle( lineListGroups );
 

=== modified file 'local/bd/dhis-web-linelisting-manpower/src/main/java/org/hisp/dhis/ll/action/llgroup/LineListElementListFilteredByGroup.java'
--- local/bd/dhis-web-linelisting-manpower/src/main/java/org/hisp/dhis/ll/action/llgroup/LineListElementListFilteredByGroup.java	2010-10-20 06:14:25 +0000
+++ local/bd/dhis-web-linelisting-manpower/src/main/java/org/hisp/dhis/ll/action/llgroup/LineListElementListFilteredByGroup.java	2011-04-15 11:15:30 +0000
@@ -199,7 +199,7 @@
 
         //Collections.sort( lineListElements, new LineListElementNameComparator() );
 
-        displayPropertyHandler.handle( lineListElements );
+        //displayPropertyHandler.handle( lineListElements );
 
         return SUCCESS;
     }

=== modified file 'local/bd/dhis-web-linelisting-manpower/src/main/java/org/hisp/dhis/ll/action/llgroup/LineListGroupElementListAction.java'
--- local/bd/dhis-web-linelisting-manpower/src/main/java/org/hisp/dhis/ll/action/llgroup/LineListGroupElementListAction.java	2010-10-20 06:14:25 +0000
+++ local/bd/dhis-web-linelisting-manpower/src/main/java/org/hisp/dhis/ll/action/llgroup/LineListGroupElementListAction.java	2011-04-15 11:15:30 +0000
@@ -111,7 +111,7 @@
 
         //Collections.sort( lineListElements, new LineListElementNameComparator() );
 
-        displayPropertyHandler.handle( lineListElements );
+        //displayPropertyHandler.handle( lineListElements );
 
         return SUCCESS;
     }

=== modified file 'local/bd/dhis-web-linelisting-manpower/src/main/resources/META-INF/dhis/beans.xml'
--- local/bd/dhis-web-linelisting-manpower/src/main/resources/META-INF/dhis/beans.xml	2010-11-22 07:28:23 +0000
+++ local/bd/dhis-web-linelisting-manpower/src/main/resources/META-INF/dhis/beans.xml	2011-04-15 11:15:30 +0000
@@ -5,20 +5,18 @@
 http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
 
-	<bean id="org.hisp.dhis.ll.action.NoAction"
-		class="org.hisp.dhis.ll.action.NoAction"
-		scope="prototype">
-		<property name="employeeService" ref="org.hisp.dhis.linelisting.EmployeeService" />
-	</bean> 
+    <bean id="org.hisp.dhis.ll.action.NoAction"
+        class="org.hisp.dhis.ll.action.NoAction"
+        scope="prototype">
+        <property name="employeeService" ref="org.hisp.dhis.linelisting.EmployeeService" />
+    </bean> 
 
   <!-- Line List Option -->
 
     <bean id="org.hisp.dhis.ll.action.llOption.GetLineListOptionListAction"
-    class="org.hisp.dhis.ll.action.llOption.GetLineListOptionListAction"
-    scope="prototype">
-        <property name="lineListService">
-            <ref bean="org.hisp.dhis.linelisting.LineListService"/>
-        </property>
+        class="org.hisp.dhis.ll.action.llOption.GetLineListOptionListAction"
+        scope="prototype">
+        <property name="lineListService" ref="org.hisp.dhis.linelisting.LineListService" />
     </bean>
     
     <bean id="org.hisp.dhis.ll.action.llOption.AddLineListOptionAction"
@@ -82,11 +80,9 @@
   <!-- Overview -->
 
     <bean id="org.hisp.dhis.ll.action.llelements.LineListElementListAction"
-    class="org.hisp.dhis.ll.action.llelements.LineListElementListAction"
-    scope="prototype">
-        <property name="lineListService">
-            <ref bean="org.hisp.dhis.linelisting.LineListService"/>
-        </property>
+        class="org.hisp.dhis.ll.action.llelements.LineListElementListAction"
+        scope="prototype">
+        <property name="lineListService" ref="org.hisp.dhis.linelisting.LineListService" />
     </bean>
 
     <bean id="org.hisp.dhis.ll.action.llelements.LineListOptionListAction"
@@ -232,7 +228,7 @@
         </property>
     </bean>
 
-	    <bean id="org.hisp.dhis.ll.action.llgroup.ValidateLineListGroupAddAction"
+        <bean id="org.hisp.dhis.ll.action.llgroup.ValidateLineListGroupAddAction"
     class="org.hisp.dhis.ll.action.llgroup.ValidateLineListGroupAddAction" scope="prototype">
         <property name="lineListService">
             <ref bean="org.hisp.dhis.linelisting.LineListService"/>
@@ -330,71 +326,71 @@
 <!--    <property name="dataEntryFormService">
             <ref bean="org.hisp.dhis.dataset.DataEntryFormService"/>
         </property>-->
-		<property name="displayPropertyHandler">
+        <property name="displayPropertyHandler">
             <ref bean="org.hisp.dhis.options.displayproperty.DisplayPropertyHandler"/>
         </property>
-		
+        
     </bean>
 <!-- Line List Employee List 16/10/2010 start -->
-	
+    
     <bean id="org.hisp.dhis.ll.action.employee.GetEmployeeListAction"
     class="org.hisp.dhis.ll.action.employee.GetEmployeeListAction"
     scope="prototype">
         <property name="employeeService">
             <ref bean="org.hisp.dhis.linelisting.EmployeeService"/>
         </property>
-    </bean>	
-	
-	<bean id="org.hisp.dhis.ll.action.employee.AddEmployeeAction"
+    </bean> 
+    
+    <bean id="org.hisp.dhis.ll.action.employee.AddEmployeeAction"
     class="org.hisp.dhis.ll.action.employee.AddEmployeeAction"
     scope="prototype">
         <property name="employeeService">
             <ref bean="org.hisp.dhis.linelisting.EmployeeService"/>
         </property>
-    </bean>	
-	
-	<bean id="org.hisp.dhis.ll.action.employee.UpdateEmployeeAction"
+    </bean> 
+    
+    <bean id="org.hisp.dhis.ll.action.employee.UpdateEmployeeAction"
     class="org.hisp.dhis.ll.action.employee.UpdateEmployeeAction"
     scope="prototype">
         <property name="employeeService">
             <ref bean="org.hisp.dhis.linelisting.EmployeeService"/>
         </property>
-    </bean>	
-	
-	<bean id="org.hisp.dhis.ll.action.employee.ShowUpdateEmployeeFormAction"
+    </bean> 
+    
+    <bean id="org.hisp.dhis.ll.action.employee.ShowUpdateEmployeeFormAction"
     class="org.hisp.dhis.ll.action.employee.ShowUpdateEmployeeFormAction"
     scope="prototype">
         <property name="employeeService">
             <ref bean="org.hisp.dhis.linelisting.EmployeeService"/>
         </property>
-    </bean>	
-	
-	<bean id="org.hisp.dhis.ll.action.employee.RemoveEmployeeAction"
+    </bean> 
+    
+    <bean id="org.hisp.dhis.ll.action.employee.RemoveEmployeeAction"
     class="org.hisp.dhis.ll.action.employee.RemoveEmployeeAction"
     scope="prototype">
         <property name="employeeService">
             <ref bean="org.hisp.dhis.linelisting.EmployeeService"/>
         </property>
-    </bean>	
-	
-	<bean id="org.hisp.dhis.ll.action.employee.GetEmployeeAction"
+    </bean> 
+    
+    <bean id="org.hisp.dhis.ll.action.employee.GetEmployeeAction"
     class="org.hisp.dhis.ll.action.employee.GetEmployeeAction"
     scope="prototype">
         <property name="employeeService">
             <ref bean="org.hisp.dhis.linelisting.EmployeeService"/>
         </property>
-    </bean>	
-	
-	<bean id="org.hisp.dhis.ll.action.employee.ValidateEmployeeAction"
+    </bean> 
+    
+    <bean id="org.hisp.dhis.ll.action.employee.ValidateEmployeeAction"
     class="org.hisp.dhis.ll.action.employee.ValidateEmployeeAction"
     scope="prototype">
         <property name="employeeService">
             <ref bean="org.hisp.dhis.linelisting.EmployeeService"/>
         </property>
-    </bean>	
-	
+    </bean> 
+    
 <!-- Line List Employee List 16/10/2010 end -->
-	
+    
     <!-- Line List Data Entry -->
 
     <bean id="org.hisp.dhis.ll.action.lldataentry.SelectedStateManager"
@@ -410,7 +406,7 @@
     <bean id="org.hisp.dhis.ll.action.lldataentry.SelectAction"
     class="org.hisp.dhis.ll.action.lldataentry.SelectAction" scope="prototype">
        
-		 <property name="selectedStateManager">
+         <property name="selectedStateManager">
             <ref bean="org.hisp.dhis.ll.action.lldataentry.SelectedStateManager"/>
         </property>
         <property name="lineListService">
@@ -458,7 +454,7 @@
         <property name="dataValueService">
             <ref bean="org.hisp.dhis.datavalue.DataValueService"/>
         </property>
-		<property name="employeeService">
+        <property name="employeeService">
             <ref bean="org.hisp.dhis.linelisting.EmployeeService"/>
         </property>
     </bean>
@@ -467,7 +463,7 @@
     class="org.hisp.dhis.ll.action.lldataentry.SaveValueAction" scope="prototype">
         <property name="currentUserService"
             ref="org.hisp.dhis.user.CurrentUserService"/>
-	
+    
         <property name="dataBaseManagerInterface">
             <ref bean="org.hisp.dhis.dbmanager.DataBaseManagerInterface"/>
         </property>
@@ -484,25 +480,25 @@
         </property>
 
     </bean>
-	
-	<bean id="org.hisp.dhis.ll.action.lldataentry.GetValidatePostVacantAction"
+    
+    <bean id="org.hisp.dhis.ll.action.lldataentry.GetValidatePostVacantAction"
     class="org.hisp.dhis.ll.action.lldataentry.GetValidatePostVacantAction" scope="prototype">
-		<property name="selectedStateManager" ref="org.hisp.dhis.ll.action.lldataentry.SelectedStateManager"/>
-		<property name="currentUserService" ref="org.hisp.dhis.user.CurrentUserService"/>
+        <property name="selectedStateManager" ref="org.hisp.dhis.ll.action.lldataentry.SelectedStateManager"/>
+        <property name="currentUserService" ref="org.hisp.dhis.user.CurrentUserService"/>
         <property name="dataBaseManagerInterface" ref="org.hisp.dhis.dbmanager.DataBaseManagerInterface"/>
         <property name="periodService" ref="org.hisp.dhis.period.PeriodService"/>
         <property name="dataValueService" ref="org.hisp.dhis.datavalue.DataValueService"/>
-		<property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService"/>
-		<property name="optionComboService" ref="org.hisp.dhis.dataelement.DataElementCategoryService"/>
-	</bean>
-	
-	<bean id="org.hisp.dhis.ll.action.lldataentry.ValidateEmployeeExistAction"
+        <property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService"/>
+        <property name="optionComboService" ref="org.hisp.dhis.dataelement.DataElementCategoryService"/>
+    </bean>
+    
+    <bean id="org.hisp.dhis.ll.action.lldataentry.ValidateEmployeeExistAction"
     class="org.hisp.dhis.ll.action.lldataentry.ValidateEmployeeExistAction" scope="prototype">
-		<property name="selectedStateManager" ref="org.hisp.dhis.ll.action.lldataentry.SelectedStateManager"/>
+        <property name="selectedStateManager" ref="org.hisp.dhis.ll.action.lldataentry.SelectedStateManager"/>
         <property name="dataBaseManagerInterface" ref="org.hisp.dhis.dbmanager.DataBaseManagerInterface"/>
-		<property name="employeeService" ref="org.hisp.dhis.linelisting.EmployeeService"/>
-	</bean>
-		
+        <property name="employeeService" ref="org.hisp.dhis.linelisting.EmployeeService"/>
+    </bean>
+        
     <bean id="org.hisp.dhis.ll.action.llValidation.GetLineListValidationRuleListAction"
     class="org.hisp.dhis.ll.action.llValidation.GetLineListValidationRuleListAction">
         <property name="validationRuleService">
@@ -511,7 +507,7 @@
     </bean>
 
     <bean id="org.hisp.dhis.ll.action.llValidation.ShowAddLineListValidationForm"
-		class="org.hisp.dhis.ll.action.llValidation.ShowAddLineListValidationForm" scope="prototype">
+        class="org.hisp.dhis.ll.action.llValidation.ShowAddLineListValidationForm" scope="prototype">
         <property name="lineListService">
             <ref bean="org.hisp.dhis.linelisting.LineListService"/>
         </property>
@@ -528,93 +524,93 @@
     </bean>
 
     <bean id="org.hisp.dhis.ll.action.llValidation.GetFilteredLineListElementsAction"
-		class="org.hisp.dhis.ll.action.llValidation.GetFilteredLineListElementsAction" scope="prototype">
-        <property name="lineListService">
-            <ref bean="org.hisp.dhis.linelisting.LineListService"/>
-        </property>
-    </bean>
-	
-	<bean id="org.hisp.dhis.ll.action.lldataentry.ShowEmployeePostFormAction"
-		class="org.hisp.dhis.ll.action.lldataentry.ShowEmployeePostFormAction" scope="prototype">
-        <property name="selectedStateManager">
-            <ref bean="org.hisp.dhis.ll.action.lldataentry.SelectedStateManager"/>
-        </property>
-    </bean>
-	
-	<bean id="org.hisp.dhis.ll.action.lldataentry.SaveEmplyeePostAction"
-		class="org.hisp.dhis.ll.action.lldataentry.SaveEmplyeePostAction" scope="prototype">
-        <property name="selectedStateManager">
-            <ref bean="org.hisp.dhis.ll.action.lldataentry.SelectedStateManager"/>
-        </property>
-		<property name="lineListService">
-            <ref bean="org.hisp.dhis.linelisting.LineListService"/>
-        </property>
-		<property name="currentUserService">
-            <ref bean="org.hisp.dhis.user.CurrentUserService"/>
-        </property>
-		<property name="dbManagerInterface">
-            <ref bean="org.hisp.dhis.dbmanager.DataBaseManagerInterface"/>
-        </property>
-		<property name="periodService">
-            <ref bean="org.hisp.dhis.period.PeriodService"/>
-        </property>
-		<property name="employeeService">
-            <ref bean="org.hisp.dhis.linelisting.EmployeeService"/>
-        </property>
-    </bean>
-	
-	
-	<bean id="org.hisp.dhis.ll.action.lldataentry.ShowUpdateEmployeePostFormAction"
-		class="org.hisp.dhis.ll.action.lldataentry.ShowUpdateEmployeePostFormAction" scope="prototype">
-        <property name="selectedStateManager">
-            <ref bean="org.hisp.dhis.ll.action.lldataentry.SelectedStateManager"/>
-        </property>
-		<property name="dataBaseManagerInterface">
-            <ref bean="org.hisp.dhis.dbmanager.DataBaseManagerInterface"/>
-        </property>
-    </bean>
-	
-	<bean id="org.hisp.dhis.ll.action.lldataentry.UpdateEmployeePostAction"
-		class="org.hisp.dhis.ll.action.lldataentry.UpdateEmployeePostAction" scope="prototype">
-        <property name="selectedStateManager">
-            <ref bean="org.hisp.dhis.ll.action.lldataentry.SelectedStateManager"/>
-        </property>
-		<property name="lineListService">
-            <ref bean="org.hisp.dhis.linelisting.LineListService"/>
-        </property>
-		<property name="currentUserService">
-            <ref bean="org.hisp.dhis.user.CurrentUserService"/>
-        </property>
-		<property name="dbManagerInterface">
-            <ref bean="org.hisp.dhis.dbmanager.DataBaseManagerInterface"/>
-        </property>
-		<property name="periodService">
-            <ref bean="org.hisp.dhis.period.PeriodService"/>
-        </property>
-		<property name="employeeService">
-            <ref bean="org.hisp.dhis.linelisting.EmployeeService"/>
-        </property>
-    </bean>
-	
- 	
-	
+        class="org.hisp.dhis.ll.action.llValidation.GetFilteredLineListElementsAction" scope="prototype">
+        <property name="lineListService">
+            <ref bean="org.hisp.dhis.linelisting.LineListService"/>
+        </property>
+    </bean>
+    
+    <bean id="org.hisp.dhis.ll.action.lldataentry.ShowEmployeePostFormAction"
+        class="org.hisp.dhis.ll.action.lldataentry.ShowEmployeePostFormAction" scope="prototype">
+        <property name="selectedStateManager">
+            <ref bean="org.hisp.dhis.ll.action.lldataentry.SelectedStateManager"/>
+        </property>
+    </bean>
+    
+    <bean id="org.hisp.dhis.ll.action.lldataentry.SaveEmplyeePostAction"
+        class="org.hisp.dhis.ll.action.lldataentry.SaveEmplyeePostAction" scope="prototype">
+        <property name="selectedStateManager">
+            <ref bean="org.hisp.dhis.ll.action.lldataentry.SelectedStateManager"/>
+        </property>
+        <property name="lineListService">
+            <ref bean="org.hisp.dhis.linelisting.LineListService"/>
+        </property>
+        <property name="currentUserService">
+            <ref bean="org.hisp.dhis.user.CurrentUserService"/>
+        </property>
+        <property name="dbManagerInterface">
+            <ref bean="org.hisp.dhis.dbmanager.DataBaseManagerInterface"/>
+        </property>
+        <property name="periodService">
+            <ref bean="org.hisp.dhis.period.PeriodService"/>
+        </property>
+        <property name="employeeService">
+            <ref bean="org.hisp.dhis.linelisting.EmployeeService"/>
+        </property>
+    </bean>
+    
+    
+    <bean id="org.hisp.dhis.ll.action.lldataentry.ShowUpdateEmployeePostFormAction"
+        class="org.hisp.dhis.ll.action.lldataentry.ShowUpdateEmployeePostFormAction" scope="prototype">
+        <property name="selectedStateManager">
+            <ref bean="org.hisp.dhis.ll.action.lldataentry.SelectedStateManager"/>
+        </property>
+        <property name="dataBaseManagerInterface">
+            <ref bean="org.hisp.dhis.dbmanager.DataBaseManagerInterface"/>
+        </property>
+    </bean>
+    
+    <bean id="org.hisp.dhis.ll.action.lldataentry.UpdateEmployeePostAction"
+        class="org.hisp.dhis.ll.action.lldataentry.UpdateEmployeePostAction" scope="prototype">
+        <property name="selectedStateManager">
+            <ref bean="org.hisp.dhis.ll.action.lldataentry.SelectedStateManager"/>
+        </property>
+        <property name="lineListService">
+            <ref bean="org.hisp.dhis.linelisting.LineListService"/>
+        </property>
+        <property name="currentUserService">
+            <ref bean="org.hisp.dhis.user.CurrentUserService"/>
+        </property>
+        <property name="dbManagerInterface">
+            <ref bean="org.hisp.dhis.dbmanager.DataBaseManagerInterface"/>
+        </property>
+        <property name="periodService">
+            <ref bean="org.hisp.dhis.period.PeriodService"/>
+        </property>
+        <property name="employeeService">
+            <ref bean="org.hisp.dhis.linelisting.EmployeeService"/>
+        </property>
+    </bean>
+    
+    
+    
 <!-- 15/10/2010 Start -->
     <bean id="org.hisp.dhis.ll.action.llValidation.GetLineListElementsAction"
         class="org.hisp.dhis.ll.action.llValidation.GetLineListElementsAction" scope="prototype">
         
-		<property name="dataElementService">
+        <property name="dataElementService">
             <ref bean="org.hisp.dhis.dataelement.DataElementService"/>
         </property>
-		<property name="dataElementCategoryOptionComboService">
+        <property name="dataElementCategoryOptionComboService">
             <ref bean="org.hisp.dhis.dataelement.DataElementCategoryService"/>
         </property>
-    </bean>		
+    </bean>     
 <!-- 15/10/2010 End -->
-		
-	<!-- Line List and Data Element Mapping-->
+        
+    <!-- Line List and Data Element Mapping-->
 
     <bean id="org.hisp.dhis.ll.action.lldataelementmapping.GetOptionCombosAction"
-		class="org.hisp.dhis.ll.action.lldataelementmapping.GetOptionCombosAction" scope="prototype">
+        class="org.hisp.dhis.ll.action.lldataelementmapping.GetOptionCombosAction" scope="prototype">
         <property name="dataElementService">
             <ref bean="org.hisp.dhis.dataelement.DataElementService"/>
         </property>
@@ -624,30 +620,30 @@
     </bean>
 
     <bean id="org.hisp.dhis.ll.action.lldataelementmapping.LineListElementListAction"
-		class="org.hisp.dhis.ll.action.lldataelementmapping.LineListElementListAction" scope="prototype">
+        class="org.hisp.dhis.ll.action.lldataelementmapping.LineListElementListAction" scope="prototype">
         <property name="lineListService">
             <ref bean="org.hisp.dhis.linelisting.LineListService"/>
         </property>
     </bean>
 
-	
+    
     <bean id="org.hisp.dhis.ll.action.lldataelementmapping.LineListOptionListAction"
-		class="org.hisp.dhis.ll.action.lldataelementmapping.LineListOptionListAction" scope="prototype">
+        class="org.hisp.dhis.ll.action.lldataelementmapping.LineListOptionListAction" scope="prototype">
         <property name="lineListService">
             <ref bean="org.hisp.dhis.linelisting.LineListService"/>
         </property>
     </bean>
 
-	
+    
     <bean id="org.hisp.dhis.ll.action.lldataelementmapping.LineListGroupListAction"
-		class="org.hisp.dhis.ll.action.lldataelementmapping.LineListGroupListAction" scope="prototype">
+        class="org.hisp.dhis.ll.action.lldataelementmapping.LineListGroupListAction" scope="prototype">
         <property name="lineListService">
             <ref bean="org.hisp.dhis.linelisting.LineListService"/>
         </property>
     </bean>
 
     <bean id="org.hisp.dhis.ll.action.lldataelementmapping.AddLineListDataElementMapping"
-		class="org.hisp.dhis.ll.action.lldataelementmapping.AddLineListDataElementMapping" scope="prototype">
+        class="org.hisp.dhis.ll.action.lldataelementmapping.AddLineListDataElementMapping" scope="prototype">
 <!--    <property name="lineListService">
             <ref bean="org.hisp.dhis.linelisting.LineListService"/>
         </property>-->
@@ -667,9 +663,9 @@
         </property>
         <property name="dataElementService">
             <ref bean="org.hisp.dhis.dataelement.DataElementService"/>
-        </property>		
+        </property>     
     </bean>
-	
+    
     <bean id="org.hisp.dhis.ll.action.llagg.SaveLLAggQueryAction"
         class="org.hisp.dhis.ll.action.llagg.SaveLLAggQueryAction" scope="prototype">
         <property name="linelistAggMapService">
@@ -683,7 +679,7 @@
         </property>
     </bean>
    
-	
+    
    <bean id="org.hisp.dhis.ll.action.llagg.GetAggDataElementsAction"
         class="org.hisp.dhis.ll.action.llagg.GetAggDataElementsAction" scope="prototype">
         <property name="dataElementService">
@@ -696,7 +692,7 @@
             <ref bean="org.hisp.dhis.linelisting.LineListService"/>
         </property>
     </bean>
-	
+    
     <bean id="org.hisp.dhis.ll.action.llagg.GetLinelistAggExpressionAction"
         class="org.hisp.dhis.ll.action.llagg.GetLinelistAggExpressionAction" scope="prototype">
         <property name="linelistAggMapService">
@@ -760,7 +756,7 @@
         class="org.hisp.dhis.ll.action.llimport.LineListingImportingResultAction" scope="prototype">
         <property name="lineListService">
             <ref bean="org.hisp.dhis.linelisting.LineListService"/>
-        </property>		
+        </property>     
         <property name="organisationUnitService">
             <ref bean="org.hisp.dhis.organisationunit.OrganisationUnitService"/>
         </property>
@@ -778,21 +774,11 @@
 <!-- Linelisting Reports -->
     <bean id="org.hisp.dhis.ll.action.reports.SummaryReportAction"
         class="org.hisp.dhis.ll.action.reports.SummaryReportAction" scope="prototype">
-        <property name="lineListService">
-            <ref bean="org.hisp.dhis.linelisting.LineListService"/>
-        </property>     
-        <property name="periodService">
-            <ref bean="org.hisp.dhis.period.PeriodService"/>
-        </property>
-        <property name="dataBaseManagerInterface">
-            <ref bean="org.hisp.dhis.dbmanager.DataBaseManagerInterface"/>
-        </property>
-        <property name="dataValueService">
-            <ref bean="org.hisp.dhis.datavalue.DataValueService"/>
-        </property>
-        <property name="selectedStateManager">
-            <ref bean="org.hisp.dhis.ll.action.lldataentry.SelectedStateManager"/>
-        </property>
+        <property name="lineListService" ref="org.hisp.dhis.linelisting.LineListService" />
+        <property name="periodService" ref="org.hisp.dhis.period.PeriodService" />
+        <property name="dataBaseManagerInterface" ref="org.hisp.dhis.dbmanager.DataBaseManagerInterface" />
+        <property name="dataValueService" ref="org.hisp.dhis.datavalue.DataValueService" />
+        <property name="selectedStateManager" ref="org.hisp.dhis.ll.action.lldataentry.SelectedStateManager" />
     </bean>
 
     <bean id="org.hisp.dhis.ll.action.reports.EmployeePostDetailsReportAction"
@@ -801,5 +787,29 @@
         <property name="dataBaseManagerInterface" ref="org.hisp.dhis.dbmanager.DataBaseManagerInterface" />
         <property name="selectedStateManager" ref="org.hisp.dhis.ll.action.lldataentry.SelectedStateManager" />
     </bean>
-		
+
+<!-- Sanctioned Post Mapping -->
+    <bean id="org.hisp.dhis.ll.action.aggmap.SanctionedPostMappingForm"
+        class="org.hisp.dhis.ll.action.aggmap.SanctionedPostMappingForm" scope="prototype">
+        <property name="lineListService" ref="org.hisp.dhis.linelisting.LineListService" />
+        <property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService" />
+    </bean>
+
+    <bean id="org.hisp.dhis.ll.action.aggmap.GetLineListElementsAction"
+        class="org.hisp.dhis.ll.action.aggmap.GetLineListElementsAction" scope="prototype">
+        <property name="lineListService" ref="org.hisp.dhis.linelisting.LineListService" />
+    </bean>
+
+    <bean id="org.hisp.dhis.ll.action.aggmap.GetSelDataElementAction"
+        class="org.hisp.dhis.ll.action.aggmap.GetSelDataElementAction" scope="prototype">
+        <property name="lineListService" ref="org.hisp.dhis.linelisting.LineListService" />
+    </bean>
+
+    <bean id="org.hisp.dhis.ll.action.aggmap.SaveSanctionedPostMapAction"
+        class="org.hisp.dhis.ll.action.aggmap.SaveSanctionedPostMapAction" scope="prototype">
+        <property name="lineListService" ref="org.hisp.dhis.linelisting.LineListService" />
+        <property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService" />
+        <property name="dataElementCategoryService" ref="org.hisp.dhis.dataelement.DataElementCategoryService" />
+    </bean>
+        
 </beans>

=== modified file 'local/bd/dhis-web-linelisting-manpower/src/main/resources/struts.xml'
--- local/bd/dhis-web-linelisting-manpower/src/main/resources/struts.xml	2010-11-23 13:59:22 +0000
+++ local/bd/dhis-web-linelisting-manpower/src/main/resources/struts.xml	2011-04-15 11:15:30 +0000
@@ -8,35 +8,33 @@
 
     <package name="dhis-web-linelisting-mp" extends="dhis-web-commons" namespace="/dhis-web-linelisting-mp">
 
-		<action name="index"
-			class="org.hisp.dhis.ll.action.NoAction">
-			<result name="success" type="velocity">/main.vm</result>
-			<param name="page">/dhis-web-linelisting-mp/welcome.vm</param>
-			<param name="menu">/dhis-web-linelisting-mp/menu.vm</param>
+        <action name="index"
+            class="org.hisp.dhis.ll.action.NoAction">
+            <result name="success" type="velocity">/main.vm</result>
+            <param name="page">/dhis-web-linelisting-mp/welcome.vm</param>
+            <param name="menu">/dhis-web-linelisting-mp/menu.vm</param>
             <param name="javascripts">javascript/employee.js,javascript/filterTable.js</param>
-		</action>
+        </action>
     
     <!-- LineListOption -->
     
         <action name="getLineListOptions"
-			class="org.hisp.dhis.ll.action.llOption.GetLineListOptionListAction">
+            class="org.hisp.dhis.ll.action.llOption.GetLineListOptionListAction">
             <result name="success" type="velocity">/main.vm</result>
             <param name="page">/dhis-web-linelisting-mp/lineListOption.vm</param>
             <param name="menu">/dhis-web-linelisting-mp/menu.vm</param>
-            <param name="javascripts">
-				javascript/lineListOption.js,javascript/filterTable.js
-            </param>
-            <param name="stylesheets">css/StylesForTags.css</param>
+            <param name="javascripts">javascript/lineListOption.js,javascript/filterTable.js</param>
+            <param name="stylesheets">css/StylesForTags.css,../dhis-web-commons/paging/paging.css</param>
             <interceptor-ref name="organisationUnitTreeStack"/>
         </action>
         <action name="getLineListOption"
-      class="org.hisp.dhis.ll.action.llOption.GetLineListOptionAction">
+            class="org.hisp.dhis.ll.action.llOption.GetLineListOptionAction">
             <result name="success" type="velocity-xml">/dhis-web-linelisting-mp/responseLineListOption.vm</result>
             <param name="onExceptionReturn">plainTextError</param>
         </action>
 
         <action name="removeLineListOption"
-      class="org.hisp.dhis.ll.action.llOption.RemoveLineListOptionAction">
+            class="org.hisp.dhis.ll.action.llOption.RemoveLineListOptionAction">
             <result name="success" type="velocity-xml">/dhis-web-linelisting-mp/responseSuccess.vm</result>
             <result name="error" type="velocity-xml">/dhis-web-linelisting-mp/responseError.vm</result>
             <param name="onExceptionReturn">plainTextError</param>
@@ -44,7 +42,7 @@
         </action>
 
         <action name="showAddLineListOptionForm"
-      class="org.hisp.dhis.ll.action.llOption.ShowAddLineListOptionForm">
+            class="org.hisp.dhis.ll.action.llOption.ShowAddLineListOptionForm">
             <result name="success" type="velocity">/main.vm</result>
             <param name="page">/dhis-web-linelisting-mp/addLineListOptionForm.vm</param>
             <param name="javascripts">javascript/shortName.js,javascript/lineListOption.js</param>
@@ -53,7 +51,7 @@
         </action>
 
         <action name="addLineListOption"
-      class="org.hisp.dhis.ll.action.llOption.AddLineListOptionAction">
+            class="org.hisp.dhis.ll.action.llOption.AddLineListOptionAction">
             <result name="success" type="redirect">getLineListOptions.action</result>
             <param name="requiredAuthorities">F_LINELISTOPTION_ADD</param>
         </action>
@@ -80,14 +78,12 @@
             <result name="input" type="velocity-xml">/dhis-web-linelisting-mp/responseInput.vm</result>
             <param name="onExceptionReturn">plainTextError</param>
         </action>
-	
+    
 
-	  
- 
   <!-- Line List Element -->
     
         <action name="getLineListElement"
-      class="org.hisp.dhis.ll.action.llelements.GetLineListElementAction">
+            class="org.hisp.dhis.ll.action.llelements.GetLineListElementAction">
             <result name="success" type="velocity-xml">/dhis-web-linelisting-mp/responseLineListElementObject.vm</result>
             <param name="onExceptionReturn">plainTextError</param>
         </action>
@@ -97,12 +93,13 @@
             <param name="page">/dhis-web-linelisting-mp/lineListElements.vm</param>
             <param name="menu">/dhis-web-linelisting-mp/menu.vm</param>
             <param name="javascripts">javascript/lineListElement.js</param>
+            <param name="stylesheets">css/StylesForTags.css,../dhis-web-commons/paging/paging.css</param>
         </action>
     
     <!-- Show add Line List Element form-->
     
         <action name="addLineListElementForm"
-      class="org.hisp.dhis.ll.action.llelements.LineListOptionListAction">
+            class="org.hisp.dhis.ll.action.llelements.LineListOptionListAction">
             <result name="success" type="velocity">/main.vm</result>
             <param name="page">/dhis-web-linelisting-mp/addLineListElementForm.vm</param>
             <param name="javascripts">javascript/lineListElement.js,javascript/lineListElementOptions.js</param>
@@ -112,16 +109,16 @@
     <!-- Show edit Line List Element form-->
     
         <action name="showEditLineListElementForm"
-			class="org.hisp.dhis.ll.action.llelements.GetLineListElementAction">
+            class="org.hisp.dhis.ll.action.llelements.GetLineListElementAction">
             <result name="success" type="chain">editLineListElementForm</result>
         </action>
     
     
         <action name="editLineListElementForm"
-			class="org.hisp.dhis.ll.action.llelements.GetLineListElementOptionsAction">
+            class="org.hisp.dhis.ll.action.llelements.GetLineListElementOptionsAction">
             <result name="success" type="velocity">/main.vm</result>
             <param name="page">
-				/dhis-web-linelisting-mp/editLineListElementForm.vm
+                /dhis-web-linelisting-mp/editLineListElementForm.vm
             </param>
             <param name="javascripts">javascript/lineListElement.js,javascript/lineListElementOptions.js</param>
             <param name="requiredAuthorities">F_DATASET_UPDATE</param>
@@ -153,7 +150,7 @@
       class="org.hisp.dhis.ll.action.llelements.RemoveLineListElementAction">
 <!--        <result name="success" type="redirect">lineListElements.action</result>-->
              <result name="success" type="velocity-xml">/dhis-web-linelisting-mp/responseSuccess.vm</result>
-			 <result name="error" type="velocity-xml">/dhis-web-linelisting-mp/responseError.vm</result>
+             <result name="error" type="velocity-xml">/dhis-web-linelisting-mp/responseError.vm</result>
             <param name="onExceptionReturn">plainTextError</param>
             <param name="requiredAuthorities">F_LINELISTELEMENT_DELETE</param>
         </action>
@@ -174,14 +171,14 @@
      <!-- LineListGroup -->
 
         <action name="getLineListGroups"
-			class="org.hisp.dhis.ll.action.llgroup.GetLineListGroupListAction">
+            class="org.hisp.dhis.ll.action.llgroup.GetLineListGroupListAction">
             <result name="success" type="velocity">/main.vm</result>
             <param name="page">/dhis-web-linelisting-mp/lineListGroup.vm</param>
             <param name="menu">/dhis-web-linelisting-mp/menu.vm</param>
             <param name="javascripts">
-				javascript/lineListGroup.js,javascript/filterTable.js
+                javascript/lineListGroup.js,javascript/filterTable.js
             </param>
-            <param name="stylesheets">css/StylesForTags.css</param>
+            <param name="stylesheets">css/StylesForTags.css,../dhis-web-commons/paging/paging.css</param>
             <interceptor-ref name="organisationUnitTreeStack"/>
         </action>
 
@@ -230,14 +227,14 @@
         </action>
         
         <action name="updateLineListGroup"
-      	class="org.hisp.dhis.ll.action.llgroup.UpdateLineListGroupAction">
+        class="org.hisp.dhis.ll.action.llgroup.UpdateLineListGroupAction">
             <result name="success" type="redirect">getLineListGroups.action</result>
             <result name="error" type="velocity-xml">/dhis-web-linelisting-mp/responseError.vm</result>
             <param name="requiredAuthorities">F_LINELISTGroup_UPDATE</param>
         </action>
 
         <action name="validateLineListGroup"
-      	class="org.hisp.dhis.ll.action.llgroup.ValidateLineListGroupAction">
+        class="org.hisp.dhis.ll.action.llgroup.ValidateLineListGroupAction">
             <result name="success" type="velocity-xml">/dhis-web-linelisting-mp/responseSuccess.vm</result>
             <result name="error" type="velocity-xml">/dhis-web-linelisting-mp/responseError.vm</result>
             <result name="input" type="velocity-xml">/dhis-web-linelisting-mp/responseInput.vm</result>
@@ -245,14 +242,14 @@
         </action>
 
         <action name="validateLineListGroupAdd"
-      	class="org.hisp.dhis.ll.action.llgroup.ValidateLineListGroupAddAction">
+        class="org.hisp.dhis.ll.action.llgroup.ValidateLineListGroupAddAction">
             <result name="success" type="velocity-xml">/dhis-web-linelisting-mp/responseSuccess.vm</result>
             <result name="error" type="velocity-xml">/dhis-web-linelisting-mp/responseError.vm</result>
             <result name="input" type="velocity-xml">/dhis-web-linelisting-mp/responseInput.vm</result>
             <param name="onExceptionReturn">plainTextError</param>
         </action>
-		
-	  <!-- LLGroup association -->
+        
+      <!-- LLGroup association -->
     
         <action name="defineLLGroupAssociationsForm"
       class="org.hisp.dhis.ll.action.llgroup.GetNumberOfLevelsAction">
@@ -314,7 +311,7 @@
             <param name="page">/dhis-web-linelisting-mp/employeeList.vm</param>
             <param name="menu">/dhis-web-linelisting-mp/menu.vm</param>
             <param name="javascripts">javascript/employee.js,javascript/filterTable.js</param>
-            <param name="stylesheets">css/StylesForTags.css</param>
+            <param name="stylesheets">css/StylesForTags.css,../dhis-web-commons/paging/paging.css</param>
             <interceptor-ref name="organisationUnitTreeStack"/>
         </action>
         
@@ -336,7 +333,7 @@
             <result name="success" type="velocity">/main.vm</result>
             <param name="page">/dhis-web-linelisting-mp/updateEmployeeForm.vm</param>
             <param name="javascripts">javascript/employee.js,javascript/filterTable.js</param>
-        </action>	
+        </action>   
         
         <action name="updateEmployee"
             class="org.hisp.dhis.ll.action.employee.UpdateEmployeeAction">
@@ -348,7 +345,7 @@
             class="org.hisp.dhis.ll.action.employee.RemoveEmployeeAction">
             <result name="success" type="velocity-json">
                 /dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
-			<result name="error" type="velocity-json">
+            <result name="error" type="velocity-json">
                 /dhis-web-commons/ajax/jsonResponseError.vm</result>
         </action>
         
@@ -359,18 +356,18 @@
         </action>
         
         <action name="validateEmployee"
-			class="org.hisp.dhis.ll.action.employee.ValidateEmployeeAction">
-			<result name="success" type="velocity-json">../dhis-web-commons/ajax/jsonResponseSuccess.vm
-			</result>
-			<result name="error" type="velocity-json">../dhis-web-commons/ajax/jsonResponseError.vm
-			</result>
-			<param name="onExceptionReturn">plainTextError</param>
-		</action>
-		
-	<!-- LL EmployeeList 16/10/2010 end -->  				
-		
-		
-		    
+            class="org.hisp.dhis.ll.action.employee.ValidateEmployeeAction">
+            <result name="success" type="velocity-json">../dhis-web-commons/ajax/jsonResponseSuccess.vm
+            </result>
+            <result name="error" type="velocity-json">../dhis-web-commons/ajax/jsonResponseError.vm
+            </result>
+            <param name="onExceptionReturn">plainTextError</param>
+        </action>
+        
+    <!-- LL EmployeeList 16/10/2010 end -->                 
+        
+        
+            
     <!-- LLDataentry -->
     
         <action name="select" class="org.hisp.dhis.ll.action.lldataentry.SelectAction">
@@ -401,7 +398,7 @@
         </action>
         
         <action name="showEmployeePostForm" class="org.hisp.dhis.ll.action.lldataentry.ShowEmployeePostFormAction">
-      		<result name="success" type="velocity">/dhis-web-linelisting-mp/employeePost.vm</result>
+            <result name="success" type="velocity">/dhis-web-linelisting-mp/employeePost.vm</result>
         </action>
 
         <action name="saveValueAction" class="org.hisp.dhis.ll.action.lldataentry.SaveValueAction">
@@ -413,7 +410,7 @@
         </action>
 
         <action name="updateLineListEntry"
-      	class="org.hisp.dhis.ll.action.lldataentry.SaveValueAction">
+        class="org.hisp.dhis.ll.action.lldataentry.SaveValueAction">
             <result name="success" type="redirect">select.action</result>
             <param name="requiredAuthorities">F_LINELISTEntry_UPDATE</param>
         </action>
@@ -422,14 +419,14 @@
             class="org.hisp.dhis.ll.action.lldataentry.ValidateEmployeeExistAction">
             <result name="success" type="velocity-xml">/dhis-web-linelisting-mp/responseSuccess.vm</result>
             <result name="input" type="velocity-xml">/dhis-web-linelisting-mp/responseInput.vm</result>
-			<result name="employeeexist" type="velocity-xml">/dhis-web-linelisting-mp/responseEmployeeExist.vm</result>
+            <result name="employeeexist" type="velocity-xml">/dhis-web-linelisting-mp/responseEmployeeExist.vm</result>
             <param name="onExceptionReturn">plainTextError</param>
         </action>
-		
-		<action name="getValidatePostVacant"
+        
+        <action name="getValidatePostVacant"
             class="org.hisp.dhis.ll.action.lldataentry.GetValidatePostVacantAction">
-			<!--<result name="success" type="velocity">/main.vm</result>
-			<param name="page">/dhis-web-linelisting-mp/responseSuccess.vm</param>-->
+            <!--<result name="success" type="velocity">/main.vm</result>
+            <param name="page">/dhis-web-linelisting-mp/responseSuccess.vm</param>-->
             <result name="success" type="velocity-xml">/dhis-web-linelisting-mp/responseSuccess.vm</result>
             <result name="input" type="velocity-xml">/dhis-web-linelisting-mp/responseInput.vm</result>
             <param name="onExceptionReturn">plainTextError</param>
@@ -437,19 +434,19 @@
         
         <action name="showEditEmployeePostForm"
             class="org.hisp.dhis.ll.action.lldataentry.ShowUpdateEmployeePostFormAction">
-			<result name="success" type="velocity">/dhis-web-linelisting-mp/updateEmployeePostForm.vm</result>
+            <result name="success" type="velocity">/dhis-web-linelisting-mp/updateEmployeePostForm.vm</result>
         </action>
         
         <action name="updateEmployeePost"
             class="org.hisp.dhis.ll.action.lldataentry.UpdateEmployeePostAction">
-			<result name="success" type="redirect">select.action</result>
+            <result name="success" type="redirect">select.action</result>
         </action>
         
     <!-- Org unit -->
         <action name="getOrgUnitDetails"
-			class="org.hisp.dhis.ll.action.lldataentry.GetOrgUnitsAction">
+            class="org.hisp.dhis.ll.action.lldataentry.GetOrgUnitsAction">
             <result name="success" type="velocity">
-				/dhis-web-linelisting-mp/responseOrgUnit.vm
+                /dhis-web-linelisting-mp/responseOrgUnit.vm
             </result>
             <param name="onExceptionReturn">plainTextError</param>
         </action>
@@ -496,7 +493,7 @@
             <param name="javascripts">javascript/hashtable.js</param>
         </action>
     
-	<action name="showAddLineListMappingForm" class="org.hisp.dhis.validationrule.action.NoAction">
+    <action name="showAddLineListMappingForm" class="org.hisp.dhis.validationrule.action.NoAction">
       <result name="success" type="velocity">/main.vm</result>
       <param name="page">/dhis-web-linelisting-mp/addLineListDataElementMappingForm.vm</param>
       <param name="menu">/dhis-web-linelisting-mp/menu.vm</param>
@@ -513,13 +510,13 @@
       <param name="menu">/dhis-web-linelisting-mp/menu.vm</param>
       <param name="javascripts">javascript/general.js</param>
     </action> 
-	
-<!-- Linelisting Aggregation Query Builder -->	
+    
+<!-- Linelisting Aggregation Query Builder -->  
         <action name="showLLAggQueryBuilderForm" class="org.hisp.dhis.ll.action.llagg.LinelistingAggQueryBuilderFormAction">
             <result name="success" type="velocity">/main.vm</result>
             <param name="page">/dhis-web-linelisting-mp/llAggQueryBuilderForm.vm</param>
             <param name="menu">/dhis-web-linelisting-mp/menu.vm</param>
-			<param name="javascripts">javascript/linelistagg.js,../dhis-web-commons/util/jquery.metadata.js</param>
+            <param name="javascripts">javascript/linelistagg.js,../dhis-web-commons/util/jquery.metadata.js</param>
         </action>
 
         <action name="saveLinelistAggMapping"
@@ -531,20 +528,20 @@
             class="org.hisp.dhis.ll.action.llagg.GetAggDataElementsAction">
             <result name="success" type="velocity-xml">/dhis-web-linelisting-mp/responseAggDataElement.vm</result>
         </action>
-		
+        
         <action name="getLLGroupElements"
             class="org.hisp.dhis.ll.action.llagg.GetLinelistGroupDataElementsAction">
             <result name="success" type="velocity-xml">/dhis-web-linelisting-mp/responseLineListElement.vm</result>
         </action>
-		
+        
         <action name="getLinelistAggExpression"
             class="org.hisp.dhis.ll.action.llagg.GetLinelistAggExpressionAction">
             <result name="success" type="velocity-xml">/dhis-web-linelisting-mp/responseExpression.vm</result>
         </action>
-		
+        
 <!-- Linelisting Aggregation -->
         <action name="linelistAggForm" class="org.hisp.dhis.ll.action.llagg.LinelistingAggregationFormAction">
-			<interceptor-ref name="organisationUnitTreeStack"/>
+            <interceptor-ref name="organisationUnitTreeStack"/>
             <result name="success" type="velocity">/main.vm</result>
             <param name="page">/dhis-web-linelisting-mp/linelistAggForm.vm</param>
             <param name="menu">/dhis-web-linelisting-mp/menuForLinelistAgg.vm</param>
@@ -556,11 +553,11 @@
             <result name="success" type="velocity-xml">/dhis-web-linelisting-mp/dSetResponsePeriod.vm</result>
         </action>
 
-		<action name="linelistAggregationResult" class="org.hisp.dhis.ll.action.llagg.LinelistingAggregationResultAction">                 
-		  <result name="success" type="velocity">/main.vm</result>
-		  <param name="page">/dhis-web-linelisting-mp/summaryReportResult.vm</param>
-		  <param name="menu">/dhis-web-linelisting-mp/menu.vm</param>      
-		</action>
+        <action name="linelistAggregationResult" class="org.hisp.dhis.ll.action.llagg.LinelistingAggregationResultAction">                 
+          <result name="success" type="velocity">/main.vm</result>
+          <param name="page">/dhis-web-linelisting-mp/summaryReportResult.vm</param>
+          <param name="menu">/dhis-web-linelisting-mp/menu.vm</param>      
+        </action>
 
 <!-- Linelisting Importing -->
     <action name="lldataImport" class="org.hisp.dhis.ll.action.llimport.LineListingImportingResultAction">
@@ -571,16 +568,36 @@
 
 <!-- Linelisting Reports -->
     <action name="summaryReport" class="org.hisp.dhis.ll.action.reports.SummaryReportAction">
-		<interceptor-ref name="organisationUnitTreeStack"/>
-		<result name="success" type="velocity">/main.vm</result>
-		<param name="page">/dhis-web-linelisting-mp/summaryReportResult.vm</param>
-		<param name="menu">/dhis-web-linelisting-mp/menuForSummaryReport.vm</param>      	  
-        <param name="javascripts">../dhis-web-commons/ouwt/ouwt.js</param>	         
+        <interceptor-ref name="organisationUnitTreeStack"/>
+        <result name="success" type="velocity">/main.vm</result>
+        <param name="page">/dhis-web-linelisting-mp/summaryReportResult.vm</param>
+        <param name="menu">/dhis-web-linelisting-mp/menuForSummaryReport.vm</param>           
+        <param name="javascripts">../dhis-web-commons/ouwt/ouwt.js</param>           
     </action>
-		
+        
     <action name="showEmployeePostDetails" class="org.hisp.dhis.ll.action.reports.EmployeePostDetailsReportAction">
         <result name="success" type="velocity">/dhis-web-linelisting-mp/employeePostDetailsResult.vm</result>
     </action>
     
+<!-- Sanctioned Post Mapping -->
+    <action name="sanctionedPostMapping" class="org.hisp.dhis.ll.action.aggmap.SanctionedPostMappingForm">
+        <result name="success" type="velocity">/main.vm</result>
+        <param name="page">/dhis-web-linelisting-mp/sanctionedPostMappingForm.vm</param>
+        <param name="menu">/dhis-web-linelisting-mp/menu.vm</param>
+        <param name="javascripts">javascript/sancPostMap.js</param>
+    </action>
+    
+    <action name="getPosts" class="org.hisp.dhis.ll.action.aggmap.GetLineListElementsAction">
+        <result name="success" type="velocity-xml">/dhis-web-linelisting-mp/responseDepartment.vm</result>
+    </action>
+
+    <action name="getPostDataElement" class="org.hisp.dhis.ll.action.aggmap.GetSelDataElementAction">
+        <result name="success" type="velocity-xml">/dhis-web-linelisting-mp/responseSelDe.vm</result>
+    </action>
+
+    <action name="saveSanctionedPostMapping" class="org.hisp.dhis.ll.action.aggmap.SaveSanctionedPostMapAction">
+        <result name="success" type="velocity-xml">/dhis-web-linelisting-mp/responseSaveMapStatus.vm</result>
+    </action>
+    
     </package>
 </struts>
\ No newline at end of file

=== modified file 'local/bd/dhis-web-linelisting-manpower/src/main/webapp/dhis-web-linelisting-mp/employeeList.vm'
--- local/bd/dhis-web-linelisting-manpower/src/main/webapp/dhis-web-linelisting-mp/employeeList.vm	2010-11-22 11:37:31 +0000
+++ local/bd/dhis-web-linelisting-manpower/src/main/webapp/dhis-web-linelisting-mp/employeeList.vm	2011-04-15 11:15:30 +0000
@@ -5,6 +5,10 @@
 <table class="mainPageTable">
     <tr>
         <td style="vertical-align:top">
+            <p></p>
+            <div class="paging-container">
+                #parse( "/dhis-web-commons/paging/paging.vm" )
+            </div>
 
             <table class="listTable" id="listTable">
                 <col>
@@ -49,11 +53,11 @@
                 <p><label>$i18n.getString( "pdscode" )</label><br><span id="pdsCodeField"></span></p>
                 <p><label>$i18n.getString( "name" )</label><br><span id="nameField"></span></p>
                 <p><label>$i18n.getString( "dob" ):</label><br/><span id="dateOfBirthField"></span></p>
-				<p><label>$i18n.getString( "lprDate" ):</label><br/><span id="lprDateField"></span></p>
-				<p><label>$i18n.getString( "sex" ):</label><br/><span id="sexField"></span></p>
-				<p><label>$i18n.getString( "joinDate" ):</label><br/><span id="joinDateToGovtServiceField"></span></p>
-				<p><label>$i18n.getString( "res_Add" ):</label><br/><span id="resAddressField"></span></p>
-				<p><label>$i18n.getString( "contact_no" ):</label><br/><span id="contactNumberField"></span></p>
+                <p><label>$i18n.getString( "lprDate" ):</label><br/><span id="lprDateField"></span></p>
+                <p><label>$i18n.getString( "sex" ):</label><br/><span id="sexField"></span></p>
+                <p><label>$i18n.getString( "joinDate" ):</label><br/><span id="joinDateToGovtServiceField"></span></p>
+                <p><label>$i18n.getString( "res_Add" ):</label><br/><span id="resAddressField"></span></p>
+                <p><label>$i18n.getString( "contact_no" ):</label><br/><span id="contactNumberField"></span></p>
                 <p><label>$i18n.getString( "emer_cont_no" ):</label><br/><span id="emergencyContactNumberField"></span></p>
             </div>
 

=== added file 'local/bd/dhis-web-linelisting-manpower/src/main/webapp/dhis-web-linelisting-mp/javascript/sancPostMap.js'
--- local/bd/dhis-web-linelisting-manpower/src/main/webapp/dhis-web-linelisting-mp/javascript/sancPostMap.js	1970-01-01 00:00:00 +0000
+++ local/bd/dhis-web-linelisting-manpower/src/main/webapp/dhis-web-linelisting-mp/javascript/sancPostMap.js	2011-04-15 11:15:30 +0000
@@ -0,0 +1,87 @@
+var selPostId = "";
+
+function getPosts( )
+{
+	var linelistgroup = document.getElementById('lineListGroupId');
+	var selLineListGroupId = linelistgroup.options[ linelistgroup.selectedIndex ].value;
+	
+	var postList = document.getElementById( "lineListOptId" );
+	clearList( postList );
+	addOption( 'lineListOptId', '[Select]', 'NA' );
+	
+	var deList = document.getElementById( "deId" );
+	deList.options[0].selected = true;
+	
+	if( selLineListGroupId == 'NA' )
+	{
+		return;
+	}
+	
+	jQuery.postJSON("getPosts.action",{
+  	  lineListGroupId : selLineListGroupId
+   }, function( json ){
+	   for ( var i=0; i<json.linelistOptions.length; i++ )
+	      {
+	        var id = json.linelistOptions[i].id;
+	        var name = json.linelistOptions[i].name;
+	        selPostId = json.linelistOptions[i].llelement;
+	        
+	        addOption( 'lineListOptId', name, id );
+	      }
+   });
+}
+
+
+function getSelDataElement( )
+{
+	var postList = document.getElementById( "lineListOptId" );
+	var selOptionId = postList.options[ postList.selectedIndex ].value;
+	var deList = document.getElementById( "deId" );
+
+	deList.options[0].selected = true;
+
+	if( selOptionId == 'NA' )
+	{
+		return;
+	}
+	
+	jQuery.postJSON("getPostDataElement.action",{
+		lineListElementId : selPostId, 
+		lineListOptionId : selOptionId
+   }, function( json ){
+	   		var id = json.selde[0].id; 
+	   		for( var i=0; i<deList.options.length; i++)
+	   		{
+	   			if( deList.options[i].value == id )
+	   			{
+	   				deList.options[i].selected = true;
+	   			}	
+	   		}
+   });
+}
+
+
+function saveSanctionedPostMapping()
+{
+	var postList = document.getElementById( "lineListOptId" );
+	var selOptionId = postList.options[ postList.selectedIndex ].value;
+	var deList = document.getElementById( "deId" );
+	var selDeId = deList.options[ deList.selectedIndex ].value;
+	var deArray = selDeId.split(":");
+	
+	if( selOptionId == 'NA' || selDeId == 'NA')
+	{
+		alert("Please select Post and corresponding dataelement");
+		return;
+	}
+	
+	jQuery.postJSON("saveSanctionedPostMapping.action",{
+		lineListElementId : selPostId, 
+		lineListOptionId : selOptionId,
+		dataElementId : deArray[0],
+		deCOCId : deArray[1]
+   }, function( json ){
+	   var statusMsg = json.saveMap[0].statusMsg; 
+  		alert( statusMsg );
+   });
+}

=== modified file 'local/bd/dhis-web-linelisting-manpower/src/main/webapp/dhis-web-linelisting-mp/lineListElements.vm'
--- local/bd/dhis-web-linelisting-manpower/src/main/webapp/dhis-web-linelisting-mp/lineListElements.vm	2010-11-22 14:00:26 +0000
+++ local/bd/dhis-web-linelisting-manpower/src/main/webapp/dhis-web-linelisting-mp/lineListElements.vm	2011-04-15 11:15:30 +0000
@@ -4,6 +4,11 @@
 <table class="mainPageTable">
   <tr>
     <td style="vertical-align:top">
+            <p></p>
+            <div class="paging-container">
+                #parse( "/dhis-web-commons/paging/paging.vm" )
+            </div>
+        
       <table class="listTable">
           <col>          
           <col width="20">
@@ -11,13 +16,13 @@
           <col width="20">
           <col width="20">
           <col width="20">
-		  
-		  <tr>
-			<td>$i18n.getString( "filter_by_name" ): <form style="display:inline" action="none" onsubmit="return false"><div style="inline"><input type="text" onkeyup="filterValues( this.value )"></div></form></td>
-			<td colspan="5" style="text-align:right">
-				<input type="button" value="$i18n.getString( "add_new" )" onclick="window.location.href='addLineListElementForm.action'" style="width:80px">
-			</td>
-		  </tr>
+          
+          <tr>
+            <td>$i18n.getString( "filter_by_name" ): <form style="display:inline" action="none" onsubmit="return false"><div style="inline"><input type="text" onkeyup="filterValues( this.value )"></div></form></td>
+            <td colspan="5" style="text-align:right">
+                <input type="button" value="$i18n.getString( "add_new" )" onclick="window.location.href='addLineListElementForm.action'" style="width:80px">
+            </td>
+          </tr>
 
           <tr>
             <th>$i18n.getString( "name" )</th>
@@ -42,31 +47,31 @@
                   <a href="javascript:showLineListElementDetails( $lineListElement.id )" title="$i18n.getString( "show_details" )"><img src="../images/information.png" alt="$i18n.getString( "show_details" )"></a>
                 </td>
               </tr>
-			  #if( $mark )
-				#set( $mark = false )
-			  #else
-				#set( $mark = true )
-			  #end
+              #if( $mark )
+                #set( $mark = false )
+              #else
+                #set( $mark = true )
+              #end
             #end
 
           </tbody>
 
         </table>
     </td>
-		<td style="width:20em; padding-left:2em; vertical-align:top">
+        <td style="width:20em; padding-left:2em; vertical-align:top">
 
-			<div id="detailsArea" style="display:none">
-				<div style="float:right">
-					<a href="javascript:hideDetails()" title="$i18n.getString( "hide_details" )"><img src="../images/close.png" alt="$i18n.getString( "hide_details" )"></a>
-				</div>				
-				<p><label>$i18n.getString( "id" ):</label><br><span id="idField"></span></p>
-				<p><label>$i18n.getString( "name" ):</label><br><span id="nameField"></span></p>
-				<p><label>$i18n.getString( "shortName" ):</label><br><span id="shortNameField"></span></p>
-				<p><label>$i18n.getString( "Description" ):</label><br><span id="descriptionField"></span></p>
-				<p><label>Data Type:</label><br><span id="dataTypeField"></span></p>
-				<p><label>Presentation Type:</label><br><span id="presentationTypeField"></span></p>
-				<p><label>Number of  Line List Options:</label><br><span id="memberCountField"></span></p>
-			</div>
+            <div id="detailsArea" style="display:none">
+                <div style="float:right">
+                    <a href="javascript:hideDetails()" title="$i18n.getString( "hide_details" )"><img src="../images/close.png" alt="$i18n.getString( "hide_details" )"></a>
+                </div>              
+                <p><label>$i18n.getString( "id" ):</label><br><span id="idField"></span></p>
+                <p><label>$i18n.getString( "name" ):</label><br><span id="nameField"></span></p>
+                <p><label>$i18n.getString( "shortName" ):</label><br><span id="shortNameField"></span></p>
+                <p><label>$i18n.getString( "Description" ):</label><br><span id="descriptionField"></span></p>
+                <p><label>Data Type:</label><br><span id="dataTypeField"></span></p>
+                <p><label>Presentation Type:</label><br><span id="presentationTypeField"></span></p>
+                <p><label>Number of  Line List Options:</label><br><span id="memberCountField"></span></p>
+            </div>
 
              <div id="warningArea" style="display:none">
                 <div style="float:right">
@@ -74,14 +79,14 @@
                 </div>
                 <p><span id="warningField"></span></p>
             </div>
-		</td>
+        </td>
   </tr>
 </table>
 
 <script type="text/javascript">
 function showsection(lineListElementId)
 {
-	window.location.href="section.action?lineListElementId=" + lineListElementId;
+    window.location.href="section.action?lineListElementId=" + lineListElementId;
 }
 var none = '$encoder.jsEscape( $i18n.getString( "none" ) , "'" )';
 var i18n_confirm_delete = '$encoder.jsEscape( $i18n.getString( "confirm_delete_line_list_element" ) , "'" )';

=== modified file 'local/bd/dhis-web-linelisting-manpower/src/main/webapp/dhis-web-linelisting-mp/lineListGroup.vm'
--- local/bd/dhis-web-linelisting-manpower/src/main/webapp/dhis-web-linelisting-mp/lineListGroup.vm	2010-11-22 14:00:26 +0000
+++ local/bd/dhis-web-linelisting-manpower/src/main/webapp/dhis-web-linelisting-mp/lineListGroup.vm	2011-04-15 11:15:30 +0000
@@ -2,72 +2,76 @@
 <h3>$i18n.getString( "department_management" )</h3>
 
 <table class="mainPageTable">
-	<tr>
-		<td style="vertical-align:top">
-
-			<table class="listTable">
-				<col>
-				<col width="20">
-				<col width="20">
-				<col width="20">
-				<col width="20">
-				<tr>
-					<td>$i18n.getString( "filter_by_name" ): <form style="display:inline" action="none" onsubmit="return false"><div style="inline"><input type="text" onkeyup="filterValues( this.value )"></div></form></td>
-					<td colspan="6" style="text-align:right"><input type="button" value="$i18n.getString( "add_new" )" onclick="window.location.href='addLineListGroupElementForm.action'" style="width:80px"></td>
-				</tr>
-				<tr>
-					<th>$i18n.getString( "name" )</th>
-					<th colspan="6">$i18n.getString( "operations" )</th>
-				</tr>
-				<tbody id="list">
-				#set( $mark = false )
-				#foreach( $lineListGroup in $lineListGroups )
-				<tr>
-					<td#alternate( $mark )>$encoder.htmlEncode( $lineListGroup.name )</td>
-                    <td style="text-align:center"#alternate( $mark )>
-                      	<a href="defineLLGroupAssociationsForm.action?id=$lineListGroup.id" title="$i18n.getString( "define_associations" )"><img src="../images/assign.png" alt="$i18n.getString( "define_associations" )"></a>
-                    </td>
-					<td style="text-align:center"#alternate( $mark )>
-						<a href="showUpdateLineListGroupForm.action?id=$lineListGroup.id" title="$i18n.getString( "edit" )"><img src="../images/edit.png" alt="$i18n.getString( "edit" )"></a>
-					</td>
-					<td style="text-align:center"#alternate( $mark )>
-						<a href="javascript:removeLineListGroup( $lineListGroup.id, '$encoder.jsEncode( $lineListGroup.name )' )" title="$i18n.getString( "remove" )"><img src="../images/delete.png" alt="$i18n.getString( "remove" )"></a>
-					</td>
-					<td style="text-align:center"#alternate( $mark )>
-						<a href="javascript:showLineListGroupDetails( $lineListGroup.id )" title="$i18n.getString( "show_details" )"><img src="../images/information.png" alt="$i18n.getString( "show_details" )"></a>
-					</td>
-				</tr>
-					#if( $mark )
-						#set( $mark = false )
-					#else
-						#set( $mark = true )
-					#end
-				#end
-				</tbody>
-			</table>
-
-		</td>
-		<td style="width:20em; padding-left:2em; vertical-align:top">
-
-			<div id="detailsArea" style="display:none">
-				<div style="float:right">
-					<a href="javascript:hideDetails()" title="$i18n.getString( "hide_details" )"><img src="../images/close.png" alt="$i18n.getString( "hide_details" )"></a>
-				</div>
-				<p><label>$i18n.getString( "id" )</label><br><span id="idField"></span></p>
-				<p><label>$i18n.getString( "name" ):</label><br><span id="nameField"></span></p>
+    <tr>
+        <td style="vertical-align:top">
+            <p></p>
+            <div class="paging-container">
+                #parse( "/dhis-web-commons/paging/paging.vm" )
+            </div>
+
+            <table class="listTable">
+                <col>
+                <col width="20">
+                <col width="20">
+                <col width="20">
+                <col width="20">
+                <tr>
+                    <td>$i18n.getString( "filter_by_name" ): <form style="display:inline" action="none" onsubmit="return false"><div style="inline"><input type="text" onkeyup="filterValues( this.value )"></div></form></td>
+                    <td colspan="6" style="text-align:right"><input type="button" value="$i18n.getString( "add_new" )" onclick="window.location.href='addLineListGroupElementForm.action'" style="width:80px"></td>
+                </tr>
+                <tr>
+                    <th>$i18n.getString( "name" )</th>
+                    <th colspan="6">$i18n.getString( "operations" )</th>
+                </tr>
+                <tbody id="list">
+                #set( $mark = false )
+                #foreach( $lineListGroup in $lineListGroups )
+                <tr>
+                    <td#alternate( $mark )>$encoder.htmlEncode( $lineListGroup.name )</td>
+                    <td style="text-align:center"#alternate( $mark )>
+                        <a href="defineLLGroupAssociationsForm.action?id=$lineListGroup.id" title="$i18n.getString( "define_associations" )"><img src="../images/assign.png" alt="$i18n.getString( "define_associations" )"></a>
+                    </td>
+                    <td style="text-align:center"#alternate( $mark )>
+                        <a href="showUpdateLineListGroupForm.action?id=$lineListGroup.id" title="$i18n.getString( "edit" )"><img src="../images/edit.png" alt="$i18n.getString( "edit" )"></a>
+                    </td>
+                    <td style="text-align:center"#alternate( $mark )>
+                        <a href="javascript:removeLineListGroup( $lineListGroup.id, '$encoder.jsEncode( $lineListGroup.name )' )" title="$i18n.getString( "remove" )"><img src="../images/delete.png" alt="$i18n.getString( "remove" )"></a>
+                    </td>
+                    <td style="text-align:center"#alternate( $mark )>
+                        <a href="javascript:showLineListGroupDetails( $lineListGroup.id )" title="$i18n.getString( "show_details" )"><img src="../images/information.png" alt="$i18n.getString( "show_details" )"></a>
+                    </td>
+                </tr>
+                    #if( $mark )
+                        #set( $mark = false )
+                    #else
+                        #set( $mark = true )
+                    #end
+                #end
+                </tbody>
+            </table>
+
+        </td>
+        <td style="width:20em; padding-left:2em; vertical-align:top">
+
+            <div id="detailsArea" style="display:none">
+                <div style="float:right">
+                    <a href="javascript:hideDetails()" title="$i18n.getString( "hide_details" )"><img src="../images/close.png" alt="$i18n.getString( "hide_details" )"></a>
+                </div>
+                <p><label>$i18n.getString( "id" )</label><br><span id="idField"></span></p>
+                <p><label>$i18n.getString( "name" ):</label><br><span id="nameField"></span></p>
                 <p><label>$i18n.getString( "Short Name" ):</label><br><span id="shortNameField"></span></p>
                 <p><label>$i18n.getString( "period Type" ):</label><br><span id="periodTypeField"></span></p>
                 <p><label>$i18n.getString( "Description" ):</label><br><span id="descriptionField"></span></p>
-				<p><label>$i18n.getString( "number_of_members" ):</label><br><span id="memberCountField"></span></p>
-			</div>
+                <p><label>$i18n.getString( "number_of_members" ):</label><br><span id="memberCountField"></span></p>
+            </div>
            
-		</td>
-	</tr>
+        </td>
+    </tr>
 </table>
 
 <script type="text/javascript">
-	var none = '$encoder.jsEscape( $i18n.getString( "none" ) , "'" )';
+    var none = '$encoder.jsEscape( $i18n.getString( "none" ) , "'" )';
     var i18n_confirm_delete = '$encoder.jsEscape( $i18n.getString( "confirm_delete_department" ) , "'")';
-	var i18n_adding_line_list_group_failed = '$encoder.jsEscape( $i18n.getString( "adding_department_failed" ) , "'")';
-	var	i18n_saving_line_list_group_failed = '$encoder.jsEscape( $i18n.getString( "saving_department_failed" ) , "'")';
+    var i18n_adding_line_list_group_failed = '$encoder.jsEscape( $i18n.getString( "adding_department_failed" ) , "'")';
+    var i18n_saving_line_list_group_failed = '$encoder.jsEscape( $i18n.getString( "saving_department_failed" ) , "'")';
 </script>

=== modified file 'local/bd/dhis-web-linelisting-manpower/src/main/webapp/dhis-web-linelisting-mp/lineListOption.vm'
--- local/bd/dhis-web-linelisting-manpower/src/main/webapp/dhis-web-linelisting-mp/lineListOption.vm	2010-10-20 06:14:25 +0000
+++ local/bd/dhis-web-linelisting-manpower/src/main/webapp/dhis-web-linelisting-mp/lineListOption.vm	2011-04-15 11:15:30 +0000
@@ -1,57 +1,61 @@
 
-    <font face"Arial" color="blue"><H1>Line List Option Page</H1></font>
+<font face"Arial" color="blue"><H1>Line List Option Page</H1></font>
 
 <table class="mainPageTable">
-	<tr>
-		<td style="vertical-align:top">
-
-			<table class="listTable">
-				<col>
-				<col width="20">
-				<col width="20">
-				<col width="20">
-				<col width="20">
-				<tr>
-					<td>$i18n.getString( "filter_by_name" ) : <form style="display:inline" action="none" onsubmit="return false"><div style="inline"><input type="text" onkeyup="filterValues( this.value )"></div></form></td>
-					<td colspan="4" style="text-align:right"><input type="button" value="$i18n.getString( "add_new" )" onclick="window.location.href='showAddLineListOptionForm.action'"></td>
-				</tr>
-				<tr>
-					<th>$i18n.getString( "name" )</th>
-					<th colspan="4">$i18n.getString( "operations" )</th>
-				</tr>
-				<tbody id="list">
-				#set( $mark = false )
-				#foreach( $lineListOption in $lineListOptions )
-				
-				<tr>
-					<td#alternate( $mark )>$encoder.htmlEncode( $lineListOption.name )</td>
-					<td style="text-align:center"#alternate( $mark )><a href="showUpdateLineListOptionForm.action?id=$lineListOption.id" title="$i18n.getString( "edit" )"><img src="../images/edit.png" alt="$i18n.getString( "edit" )"></a></td>
-					<td style="text-align:center"#alternate( $mark )><a href="$i18n.getString( "translation_translate" )" title="$i18n.getString( "translation_translate" )" onclick="this.href='javascript:location.href= \'../dhis-web-commons/i18n.action?className=LineListOption&amp;objectId=$lineListOption.id&amp;returnUrl=\' + location.href'"><img src="../images/i18n.png" alt="$i18n.getString( "translation_translate" )"></a></td>
-					<td style="text-align:center"#alternate( $mark )><a href="javascript:removeLineListOption( $lineListOption.id, '$encoder.jsEncode( $lineListOption.name )' )" title="$i18n.getString( "remove" )"><img src="../images/delete.png" alt="$i18n.getString( "remove" )"></a></td>
-					<td style="text-align:center"#alternate( $mark )><a href="javascript:showLineListOptionDetails( $lineListOption.id )" title="$i18n.getString( "show_details" )"><img src="../images/information.png" alt="$i18n.getString( "show_details" )"></a></td>
-				</tr>
-					#if( $mark )
-						#set( $mark = false )
-					#else
-						#set( $mark = true )
-					#end
-				
-				#end
-				</tbody>
-			</table>
-
-		</td>
-		<td style="width:20em; padding-left:2em; vertical-align:top">
-
-			<div id="detailsArea" style="display:none">
-				<div style="float:right">
-					<a href="javascript:hideDetails()" title="$i18n.getString( "hide_details" )"><img src="../images/close.png" alt="$i18n.getString( "hide_details" )"></a>
-				</div>
-				<p><label>$i18n.getString( "id" ):</label><br><span id="idField"></span></p>
-				<p><label>$i18n.getString( "name" ):</label><br><span id="nameField"></span></p>
-				<p><label>$i18n.getString( "shortName" ):</label><br><span id="shortNameField"></span></p>
-				<p><label>$i18n.getString( "Description" ):</label><br><span id="descriptionField"></span></p>
-			</div>
+    <tr>
+        <td style="vertical-align:top">
+            <p></p>
+            <div class="paging-container">
+                #parse( "/dhis-web-commons/paging/paging.vm" )
+            </div>
+
+            <table class="listTable">
+                <col>
+                <col width="20">
+                <col width="20">
+                <col width="20">
+                <col width="20">
+                <tr>
+                    <td>$i18n.getString( "filter_by_name" ) : <form style="display:inline" action="none" onsubmit="return false"><div style="inline"><input type="text" onkeyup="filterValues( this.value )"></div></form></td>
+                    <td colspan="4" style="text-align:right"><input type="button" value="$i18n.getString( "add_new" )" onclick="window.location.href='showAddLineListOptionForm.action'"></td>
+                </tr>
+                <tr>
+                    <th>$i18n.getString( "name" )</th>
+                    <th colspan="4">$i18n.getString( "operations" )</th>
+                </tr>
+                <tbody id="list">
+                #set( $mark = false )
+                #foreach( $lineListOption in $lineListOptions )
+                
+                <tr>
+                    <td#alternate( $mark )>$encoder.htmlEncode( $lineListOption.name )</td>
+                    <td style="text-align:center"#alternate( $mark )><a href="showUpdateLineListOptionForm.action?id=$lineListOption.id" title="$i18n.getString( "edit" )"><img src="../images/edit.png" alt="$i18n.getString( "edit" )"></a></td>
+                    <td style="text-align:center"#alternate( $mark )><a href="$i18n.getString( "translation_translate" )" title="$i18n.getString( "translation_translate" )" onclick="this.href='javascript:location.href= \'../dhis-web-commons/i18n.action?className=LineListOption&amp;objectId=$lineListOption.id&amp;returnUrl=\' + location.href'"><img src="../images/i18n.png" alt="$i18n.getString( "translation_translate" )"></a></td>
+                    <td style="text-align:center"#alternate( $mark )><a href="javascript:removeLineListOption( $lineListOption.id, '$encoder.jsEncode( $lineListOption.name )' )" title="$i18n.getString( "remove" )"><img src="../images/delete.png" alt="$i18n.getString( "remove" )"></a></td>
+                    <td style="text-align:center"#alternate( $mark )><a href="javascript:showLineListOptionDetails( $lineListOption.id )" title="$i18n.getString( "show_details" )"><img src="../images/information.png" alt="$i18n.getString( "show_details" )"></a></td>
+                </tr>
+                    #if( $mark )
+                        #set( $mark = false )
+                    #else
+                        #set( $mark = true )
+                    #end
+                
+                #end
+                </tbody>
+            </table>
+
+        </td>
+        <td style="width:20em; padding-left:2em; vertical-align:top">
+
+            <div id="detailsArea" style="display:none">
+                <div style="float:right">
+                    <a href="javascript:hideDetails()" title="$i18n.getString( "hide_details" )"><img src="../images/close.png" alt="$i18n.getString( "hide_details" )"></a>
+                </div>
+                <p><label>$i18n.getString( "id" ):</label><br><span id="idField"></span></p>
+                <p><label>$i18n.getString( "name" ):</label><br><span id="nameField"></span></p>
+                <p><label>$i18n.getString( "shortName" ):</label><br><span id="shortNameField"></span></p>
+                <p><label>$i18n.getString( "Description" ):</label><br><span id="descriptionField"></span></p>
+            </div>
 
             <div id="warningArea" style="display:none">
                 <div style="float:right">
@@ -60,11 +64,11 @@
                 <p><span id="warningField"></span></p>
             </div>
 
-		</td>
-	</tr>
+        </td>
+    </tr>
 </table>
 
 <script type="text/javascript">
-	var none = '$encoder.jsEscape( $i18n.getString( "none" ) , "'" )';
-	var i18n_confirm_delete = '$encoder.jsEscape( $i18n.getString( "confirm_delete_line_list_option" ) , "'")';
+    var none = '$encoder.jsEscape( $i18n.getString( "none" ) , "'" )';
+    var i18n_confirm_delete = '$encoder.jsEscape( $i18n.getString( "confirm_delete_line_list_option" ) , "'")';
 </script>

=== modified file 'local/bd/dhis-web-linelisting-manpower/src/main/webapp/dhis-web-linelisting-mp/menu.vm'
--- local/bd/dhis-web-linelisting-manpower/src/main/webapp/dhis-web-linelisting-mp/menu.vm	2010-11-22 14:00:26 +0000
+++ local/bd/dhis-web-linelisting-manpower/src/main/webapp/dhis-web-linelisting-mp/menu.vm	2011-04-15 11:15:30 +0000
@@ -1,23 +1,24 @@
 <h2>Linelisting Meta Data</h2>
-	<ul>
-		<li><a href="getLineListOptions.action">Linelist Option</a></li>
-		<li><a href="lineListElements.action">Linelist Element</a></li>
-		<li><a href="getLineListGroups.action">Department Management</a></li>
-		<li><a href="getEmployeeList.action">Employee Management</a></li>
-	</ul>
+    <ul>
+        <li><a href="getLineListOptions.action">Linelist Option</a></li>
+        <li><a href="lineListElements.action">Linelist Element</a></li>
+        <li><a href="getLineListGroups.action">Department Management</a></li>
+        <li><a href="getEmployeeList.action">Employee Management</a></li>
+        <li><a href="sanctionedPostMapping.action">Sanctioned Post Mapping</a></li>
+    </ul>
 <h2>Linelisting DataEntry</h2>
-	<ul>
-		<li><a href="select.action">DataEntry</a></li>
-	</ul>
+    <ul>
+        <li><a href="select.action">DataEntry</a></li>
+    </ul>
 <h2>Linelisting Reports</h2>
     <ul>
         <li><a href="summaryReport.action">Linelist Summary Report</a></li>
     </ul>
 <!--
 <h2>Linelisting Validation Rules</h2>
-	<ul>
-		<li><a href="showValidationRules.action">Linelist Validation Rules</a></li>
-	</ul>
+    <ul>
+        <li><a href="showValidationRules.action">Linelist Validation Rules</a></li>
+    </ul>
 <h2>Linelisting Aggregation Engine</h2>
     <ul>
         <li><a href="showLLAggQueryBuilderForm.action">Linelisting Aggregation Query Builder</a></li>

=== modified file 'local/bd/dhis-web-linelisting-manpower/src/main/webapp/dhis-web-linelisting-mp/menuForLLDataEntry.vm'
--- local/bd/dhis-web-linelisting-manpower/src/main/webapp/dhis-web-linelisting-mp/menuForLLDataEntry.vm	2010-11-22 14:00:26 +0000
+++ local/bd/dhis-web-linelisting-manpower/src/main/webapp/dhis-web-linelisting-mp/menuForLLDataEntry.vm	2011-04-15 11:15:30 +0000
@@ -1,13 +1,8 @@
 
-<h2>Linelisting DataEntry</h2>
+<a href="index.action"><h2>Linelisting DataEntry</h2></a>
 <ul>
     <li>DataEntry</li>
 </ul>
 
-<div style=" float:right; font-size:6pt; cursor:pointer; margin-top:-20px; ">
-        <a href="index.action">
-          <img src="images/goback.png" width="36" height="30" alt="$i18n.getString( "go_back" )"></a>
-</div>
-
 <br/>
 #parse( "/dhis-web-commons/ouwt/orgunittree.vm" )

=== modified file 'local/bd/dhis-web-linelisting-manpower/src/main/webapp/dhis-web-linelisting-mp/menuForLinelistAgg.vm'
--- local/bd/dhis-web-linelisting-manpower/src/main/webapp/dhis-web-linelisting-mp/menuForLinelistAgg.vm	2010-10-20 06:14:25 +0000
+++ local/bd/dhis-web-linelisting-manpower/src/main/webapp/dhis-web-linelisting-mp/menuForLinelistAgg.vm	2011-04-15 11:15:30 +0000
@@ -1,28 +1,24 @@
 
-<h2>Linelisting Aggregation Engine</h2>
-    <ul>
-        <li><a href="linelistAggForm.action">$i18n.getString( "linelisting_aggregation" )</a></li>     
-    </ul>
-<div style=" float:right; font-size:6pt; cursor:pointer; margin-top:-20px; ">
-    <a href="index.action"><img src="images/goback.png" width="36" height="30" alt="$i18n.getString( "go_back" )"></a>
-</div>
+<a href="index.action"><h2>Linelisting Aggregation Engine</h2></a>
+<ul>
+    <li><a href="linelistAggForm.action">$i18n.getString( "linelisting_aggregation" )</a></li>     
+</ul>
 
 #parse( "/dhis-web-commons/ouwt/orgunittree.vm" )
 
-
 <script type="text/javascript">
 
-	function orgUnitHasBeenSelected( orgUnitIds )
-	{    
-	    if(orgUnitIds == null || orgUnitIds == "" )
-	    {
-	        return;
-	    }
-	
-	    if(orgUnitIds != null)
-	        getOrgUDetails(orgUnitIds); 
-	}
-	
-	selection.setListenerFunction( orgUnitHasBeenSelected );
+    function orgUnitHasBeenSelected( orgUnitIds )
+    {    
+        if(orgUnitIds == null || orgUnitIds == "" )
+        {
+            return;
+        }
+    
+        if(orgUnitIds != null)
+            getOrgUDetails(orgUnitIds); 
+    }
+    
+    selection.setListenerFunction( orgUnitHasBeenSelected );
 
 </script>

=== modified file 'local/bd/dhis-web-linelisting-manpower/src/main/webapp/dhis-web-linelisting-mp/menuForSummaryReport.vm'
--- local/bd/dhis-web-linelisting-manpower/src/main/webapp/dhis-web-linelisting-mp/menuForSummaryReport.vm	2010-11-23 09:50:29 +0000
+++ local/bd/dhis-web-linelisting-manpower/src/main/webapp/dhis-web-linelisting-mp/menuForSummaryReport.vm	2011-04-15 11:15:30 +0000
@@ -1,15 +1,9 @@
 
-<h2>Linelisting Reports</h2>
+<a href="index.action"><h2>Linelisting Reports</h2></a>
 <ul>
     <li>Summary Report</li>
 </ul>
 
-<div style=" float:right; font-size:6pt; cursor:pointer; margin-top:-20px; ">
-	<a href="index.action">
-		<img src="images/goback.png" width="36" height="30" alt="$i18n.getString( "go_back" )">			
-	</a>
-</div>
-
 <br />
 
 #parse( "/dhis-web-commons/ouwt/orgunittree.vm" )

=== added file 'local/bd/dhis-web-linelisting-manpower/src/main/webapp/dhis-web-linelisting-mp/responseDepartment.vm'
--- local/bd/dhis-web-linelisting-manpower/src/main/webapp/dhis-web-linelisting-mp/responseDepartment.vm	1970-01-01 00:00:00 +0000
+++ local/bd/dhis-web-linelisting-manpower/src/main/webapp/dhis-web-linelisting-mp/responseDepartment.vm	2011-04-15 11:15:30 +0000
@@ -0,0 +1,9 @@
+{ "linelistOptions": [
+#foreach ( $llOption in $lineListOptions )
+  {
+    "id": $!{llOption.id},
+    "name": "$!{llOption.name}",
+	"llelement": $!{lineListElement.id}
+  },
+#end
+] }
\ No newline at end of file

=== added file 'local/bd/dhis-web-linelisting-manpower/src/main/webapp/dhis-web-linelisting-mp/responseSaveMapStatus.vm'
--- local/bd/dhis-web-linelisting-manpower/src/main/webapp/dhis-web-linelisting-mp/responseSaveMapStatus.vm	1970-01-01 00:00:00 +0000
+++ local/bd/dhis-web-linelisting-manpower/src/main/webapp/dhis-web-linelisting-mp/responseSaveMapStatus.vm	2011-04-15 11:15:30 +0000
@@ -0,0 +1,5 @@
+{ "saveMap": [
+  {
+    "statusMsg": "$!{statusMsg}",
+  },
+] }
\ No newline at end of file

=== added file 'local/bd/dhis-web-linelisting-manpower/src/main/webapp/dhis-web-linelisting-mp/responseSelDe.vm'
--- local/bd/dhis-web-linelisting-manpower/src/main/webapp/dhis-web-linelisting-mp/responseSelDe.vm	1970-01-01 00:00:00 +0000
+++ local/bd/dhis-web-linelisting-manpower/src/main/webapp/dhis-web-linelisting-mp/responseSelDe.vm	2011-04-15 11:15:30 +0000
@@ -0,0 +1,5 @@
+{ "selde": [
+  {
+    "id": "$!{id}",
+  },
+] }
\ No newline at end of file

=== added file 'local/bd/dhis-web-linelisting-manpower/src/main/webapp/dhis-web-linelisting-mp/sanctionedPostMappingForm.vm'
--- local/bd/dhis-web-linelisting-manpower/src/main/webapp/dhis-web-linelisting-mp/sanctionedPostMappingForm.vm	1970-01-01 00:00:00 +0000
+++ local/bd/dhis-web-linelisting-manpower/src/main/webapp/dhis-web-linelisting-mp/sanctionedPostMappingForm.vm	2011-04-15 11:15:30 +0000
@@ -0,0 +1,52 @@
+
+<h3>Sanctioned Post Mapping Form</h3>
+<table>
+    <tr>
+        <td>Department : </td>
+        <td>
+            <select id="lineListGroupId" name="lineListGroupId" style="min-width:300px" onchange="getPosts()">
+                <option value="NA">[$i18n.getString( "select" )]</option>
+				#foreach( $department in $departments )
+					<option value="$department.id">$encoder.htmlEncode( $department.name )</option>
+				#end
+            </select>
+        </td>
+    </tr>
+    <tr>
+        <td>&nbsp;</td>
+        <td>&nbsp;</td>
+    </tr>
+    <tr>
+        <td>Post Name : </td>
+        <td>
+            <select id="lineListOptId" name="lineListOptId" style="min-width:300px" onchange="getSelDataElement()" >
+				<option value="NA">[$i18n.getString( "select" )]</option>
+            </select>
+        </td>
+    </tr>
+    <tr>
+        <td>&nbsp;</td>
+        <td>&nbsp;</td>
+    </tr>
+    <tr>
+        <td>Dataelement : </td>
+        <td>
+            <select id="deId" name="deId" style="min-width:300px" >
+                <option value="NA">[$i18n.getString( "select" )]</option>
+				#set( $count = 0 )
+                #foreach( $optionComboName in $optionComboNames )
+                    <option value="$optionComboIds.get($count)">$encoder.htmlEncode( $optionComboName )</option>
+					#set( $count = $count + 1 )
+                #end
+            </select>
+        </td>
+    </tr>
+    <tr>
+        <td>&nbsp;</td>
+        <td>&nbsp;</td>
+    </tr>
+    <tr>
+        <td>&nbsp;</td>
+        <td><input type="button" value="Save" style="min-width:300px" onclick="saveSanctionedPostMapping()" /></td>
+    </tr>
+</table>
\ No newline at end of file