← Back to branch summary

~registry/dhis2-academy/trunk

« back to all changes in this revision

Viewing changes to dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/reportviewer/action/GetReportOptionsAction.java

  • Committer: Abyot Asalefew Gizaw
  • Date: 2012-10-12 00:08:27 UTC
  • Revision ID: abyota@gmail.com-20121012000827-qqmmfllx0s5vtkqi
Updating the acadmy trunk with the main DHIS2 trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/reportviewer/action/GetReportOptionsAction.java
1
1
package org.hisp.dhis.reporting.reportviewer.action;
2
2
 
3
3
/*
4
 
 * Copyright (c) 2004-2010, University of Oslo
 
4
 * Copyright (c) 2004-2012, University of Oslo
5
5
 * All rights reserved.
6
6
 *
7
7
 * Redistribution and use in source and binary forms, with or without
29
29
 
30
30
import java.util.ArrayList;
31
31
import java.util.Collections;
32
 
import java.util.Comparator;
33
32
import java.util.List;
34
33
 
 
34
import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
 
35
import org.hisp.dhis.period.RelativePeriods;
35
36
import org.hisp.dhis.report.Report;
36
37
import org.hisp.dhis.report.ReportService;
37
38
import org.hisp.dhis.reporttable.ReportTable;
38
39
import org.hisp.dhis.reporttable.ReportTableService;
39
 
import org.hisp.dhis.reporttable.comparator.ReportTableComparator;
40
40
 
41
41
import com.opensymphony.xwork2.Action;
42
42
 
47
47
public class GetReportOptionsAction
48
48
    implements Action
49
49
{
50
 
    private static final Comparator<ReportTable> COMPARATOR = new ReportTableComparator();
51
 
    
52
50
    // -------------------------------------------------------------------------
53
51
    // Dependencies
54
52
    // -------------------------------------------------------------------------
88
86
    {
89
87
        return report;
90
88
    }
91
 
    
 
89
 
 
90
    private RelativePeriods relatives;
 
91
 
 
92
    public RelativePeriods getRelatives()
 
93
    {
 
94
        return relatives;
 
95
    }
 
96
 
92
97
    private List<ReportTable> reportTables;
93
98
 
94
99
    public List<ReportTable> getReportTables()
104
109
    {
105
110
        reportTables = new ArrayList<ReportTable>( reportTableService.getAllReportTables() );
106
111
        
107
 
        Collections.sort( reportTables, COMPARATOR );
 
112
        Collections.sort( reportTables, IdentifiableObjectNameComparator.INSTANCE );
108
113
        
109
114
        if ( id != null )
110
115
        {
111
 
            report = reportService.getReport( id );            
 
116
            report = reportService.getReport( id );
 
117
            
 
118
            relatives = report.getRelatives();
112
119
        }
113
120
        
114
121
        return SUCCESS;