dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3392
committer: Bharath <chbharathk@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2011-04-15 16:43:19 +0530
message:
  Merging Code from 2.1 - work in progress
modified:
  local/in/dhis-in-api/src/main/java/org/hisp/dhis/linelisting/EmployeeService.java
  local/in/dhis-in-api/src/main/java/org/hisp/dhis/linelisting/EmployeeStore.java
  local/in/dhis-in-api/src/main/java/org/hisp/dhis/linelisting/LineListService.java
  local/in/dhis-in-api/src/main/java/org/hisp/dhis/linelisting/LineListStore.java
  local/in/dhis-in-api/src/main/java/org/hisp/dhis/reports/ReportType.java
  local/in/dhis-in-api/src/main/java/org/hisp/dhis/reports/Report_in.java


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/linelisting/EmployeeService.java'
--- local/in/dhis-in-api/src/main/java/org/hisp/dhis/linelisting/EmployeeService.java	2010-11-15 08:26:40 +0000
+++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/linelisting/EmployeeService.java	2011-04-15 11:13:19 +0000
@@ -54,5 +54,9 @@
     Collection<Employee> getAllEmployee();
     
     Collection<Employee> getEmployeeByisTransferred( Boolean isTransferred );
+    
+    int getEmployeeCount();
+    
+    Collection<Employee> getEmployeesBetween( int first, int max );
 }
 

=== modified file 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/linelisting/EmployeeStore.java'
--- local/in/dhis-in-api/src/main/java/org/hisp/dhis/linelisting/EmployeeStore.java	2010-11-15 08:26:40 +0000
+++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/linelisting/EmployeeStore.java	2011-04-15 11:13:19 +0000
@@ -55,4 +55,9 @@
     Collection<Employee> getAllEmployee();
     
     Collection<Employee> getEmployeeByisTransferred( Boolean isTransferred );
+    
+    int getEmployeeCount();
+    
+    Collection<Employee> getEmployeesBetween( int first, int max );
+
 }
\ No newline at end of file

=== modified file 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/linelisting/LineListService.java'
--- local/in/dhis-in-api/src/main/java/org/hisp/dhis/linelisting/LineListService.java	2010-10-20 06:14:25 +0000
+++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/linelisting/LineListService.java	2011-04-15 11:13:19 +0000
@@ -30,6 +30,8 @@
 import java.util.Collection;
 import java.util.List;
 
+import org.hisp.dhis.dataelement.DataElement;
+import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
 import org.hisp.dhis.source.Source;
 
 public interface LineListService
@@ -274,4 +276,18 @@
 
     List<LineListDataElementMap> getLinelistDataelementMappings( LineListElement linelistElement, LineListOption linelistOption );
     
+    LineListDataElementMap getLinelistDataelementMapping( LineListElement linelistElement, LineListOption linelistOption, DataElement dataElement, DataElementCategoryOptionCombo deCOC );
+    
+    int getLineListGroupCount();
+    
+    Collection<LineListGroup> getLineListGroupsBetween( int first, int max );
+    
+    int getLineListElementCount();
+    
+    Collection<LineListElement> getLineListElementsBetween( int first, int max );
+
+    int getLineListOptionCount();
+    
+    Collection<LineListOption> getLineListOptionsBetween( int first, int max );
+
 }

=== modified file 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/linelisting/LineListStore.java'
--- local/in/dhis-in-api/src/main/java/org/hisp/dhis/linelisting/LineListStore.java	2010-10-20 06:14:25 +0000
+++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/linelisting/LineListStore.java	2011-04-15 11:13:19 +0000
@@ -30,6 +30,8 @@
 import java.util.Collection;
 import java.util.List;
 
+import org.hisp.dhis.dataelement.DataElement;
+import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
 import org.hisp.dhis.source.Source;
 
 public interface LineListStore
@@ -242,5 +244,18 @@
     void deleteLinelistDataelementMapping( LineListDataElementMap lineListDataElementMap );
 
     List<LineListDataElementMap> getLinelistDataelementMappings( LineListElement linelistElement, LineListOption linelistOption );
-
+    
+    LineListDataElementMap getLinelistDataelementMapping( LineListElement linelistElement, LineListOption linelistOption, DataElement dataElement, DataElementCategoryOptionCombo deCOC );
+
+    int getLineListGroupCount();
+    
+    Collection<LineListGroup> getLineListGroupsBetween( int first, int max );
+
+    int getLineListElementCount();
+    
+    Collection<LineListElement> getLineListElementsBetween( int first, int max );
+
+    int getLineListOptionCount();
+    
+    Collection<LineListOption> getLineListOptionsBetween( int first, int max );
 }

=== modified file 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/reports/ReportType.java'
--- local/in/dhis-in-api/src/main/java/org/hisp/dhis/reports/ReportType.java	2010-08-28 10:15:38 +0000
+++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/reports/ReportType.java	2011-04-15 11:13:19 +0000
@@ -52,7 +52,7 @@
     
     public final static String RT_ADVANCED_REPORT = "Advanced Reports";      
     
-   // public final static String RT_ = "";
+    public final static String RT_BULK_REPORT = "Bulk Reports";
 
     public static List<String> getReportTypes()
     {
@@ -78,7 +78,8 @@
         
         reportTypes.add( RT_ADVANCED_REPORT );
         
-          
+        reportTypes.add( RT_BULK_REPORT );
+        
         return reportTypes;
     }
 }

=== modified file 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/reports/Report_in.java'
--- local/in/dhis-in-api/src/main/java/org/hisp/dhis/reports/Report_in.java	2010-08-19 10:40:50 +0000
+++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/reports/Report_in.java	2011-04-15 11:13:19 +0000
@@ -31,6 +31,7 @@
 import java.util.HashSet;
 import java.util.Set;
 
+import org.hisp.dhis.organisationunit.OrganisationUnitGroup;
 import org.hisp.dhis.period.PeriodType;
 import org.hisp.dhis.source.Source;
 
@@ -66,6 +67,8 @@
 
     private String reportType;
 
+    private OrganisationUnitGroup orgunitGroup;
+    
     /**
      * All Sources that are generating this Report_in.
      */
@@ -91,6 +94,18 @@
         this.reportType = reportType;
     }
 
+    public Report_in( String name, String model, PeriodType periodType, String excelTemplateName,
+        String xmlTemplateName, String reportType, OrganisationUnitGroup orgunitGroup )
+    {
+        this.name = name;
+        this.model = model;
+        this.periodType = periodType;
+        this.excelTemplateName = excelTemplateName;
+        this.xmlTemplateName = xmlTemplateName;
+        this.reportType = reportType;
+        this.orgunitGroup = orgunitGroup;
+    }
+
     // -------------------------------------------------------------------------
     // hashCode and equals
     // -------------------------------------------------------------------------
@@ -208,4 +223,15 @@
         this.sources = sources;
     }
 
+    public OrganisationUnitGroup getOrgunitGroup()
+    {
+        return orgunitGroup;
+    }
+
+    public void setOrgunitGroup( OrganisationUnitGroup orgunitGroup )
+    {
+        this.orgunitGroup = orgunitGroup;
+    }
+
+    
 }
\ No newline at end of file