[Branch ~dhis2-devs-core/dhis2/trunk] Rev 2228: Merged r 2080 from 2.0.5

revision-diff.txt (7.47 KB)

Trunk should now be updated with all bugfixes from 2.0.5.

···

On Mon, Nov 29, 2010 at 6:24 PM, noreply@launchpad.net wrote:


revno: 2228

committer: Lars Helge Overland larshelge@gmail.com

branch nick: dhis2

timestamp: Mon 2010-11-29 18:23:10 +0100

message:

Merged r 2080 from 2.0.5

modified:

dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTableService.java

dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/reporttable/ReportTableInternalProcess.java

dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/reporttable/impl/DefaultReportTableService.java

dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/tablecreator/action/CreateTableAction.java

dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/inputReportParamsForm.vm

dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/table.js

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 ‘dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTableService.java’

— dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTableService.java 2010-07-05 23:45:39 +0000

+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTableService.java 2010-11-29 17:23:10 +0000

@@ -48,14 +48,12 @@

  * @param mode the mode, can be <l>dataelements</i>, <i>indicators</i>, and <i>datasets</i>.

  * @param reportingPeriod the number of months back in time which will be used

  *        as basis for the generation of relative periods.
  • * @param parentOrganisationUnitId the identifier of the parent organisation
    
  • *        unit of the report parameter.
    
    * @param organisationUnitId the identifier of the organisation unit of the
    
  • *        report parameter.
    
  • *        report parameter, bot parent organisation unit and organisation unit.
    
    * @param format the I18nFormat to use.
    
    */
    

    void createReportTables( int id, String mode, Integer reportingPeriod,

  •    Integer parentOrganisationUnitId, Integer organisationUnitId, boolean doDataMart, I18nFormat format );
    
  •    Integer organisationUnitId, boolean doDataMart, I18nFormat format );
    

    /**

    * Creates a report table. Exports the relevant data to data mart, updates
    

=== modified file ‘dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/reporttable/ReportTableInternalProcess.java’

— dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/reporttable/ReportTableInternalProcess.java 2010-07-05 23:45:39 +0000

+++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/reporttable/ReportTableInternalProcess.java 2010-11-29 17:23:10 +0000

@@ -79,13 +79,6 @@

     this.reportingPeriod = reportingPeriod;

 }
  • private Integer parentOrganisationUnitId;

  • public void setParentOrganisationUnitId( Integer parentOrganisationUnitId )

  • {

  •    this.parentOrganisationUnitId = parentOrganisationUnitId;
    
  • }

 private Integer organisationUnitId;



 public void setOrganisationUnitId( Integer organisationUnitId )

@@ -123,6 +116,6 @@

 @Override

 public void executeStatements()

 {
  •    reportTableService.createReportTables( id, mode, reportingPeriod, parentOrganisationUnitId, organisationUnitId, doDataMart, format );
    
  •    reportTableService.createReportTables( id, mode, reportingPeriod, organisationUnitId, doDataMart, format );
    

    }

}

=== modified file ‘dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/reporttable/impl/DefaultReportTableService.java’

— dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/reporttable/impl/DefaultReportTableService.java 2010-10-29 14:37:54 +0000

+++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/reporttable/impl/DefaultReportTableService.java 2010-11-29 17:23:10 +0000

@@ -152,7 +152,7 @@

 @Transactional

 public void createReportTables( int id, String mode, Integer reportingPeriod,
  •    Integer parentOrganisationUnitId, Integer organisationUnitId, boolean doDataMart, I18nFormat format )
    
  •    Integer organisationUnitId, boolean doDataMart, I18nFormat format )
    

    {

       for ( ReportTable reportTable : getReportTables( id, mode ) )
    
       {
    

@@ -181,7 +181,7 @@

         if ( reportTable.getReportParams() != null && reportTable.getReportParams().isParamParentOrganisationUnit() )

         {
  •            OrganisationUnit organisationUnit = organisationUnitService.getOrganisationUnit( parentOrganisationUnitId );
    
  •            OrganisationUnit organisationUnit = organisationUnitService.getOrganisationUnit( organisationUnitId );
    
               reportTable.getRelativeUnits().addAll( new ArrayList<OrganisationUnit>( organisationUnit.getChildren() ) );
    
    
    
               [log.info](http://log.info)( "Parent organisation unit: " + organisationUnit.getName() );
    

=== modified file ‘dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/tablecreator/action/CreateTableAction.java’

— dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/tablecreator/action/CreateTableAction.java 2010-07-05 23:45:39 +0000

+++ dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/tablecreator/action/CreateTableAction.java 2010-11-29 17:23:10 +0000

@@ -96,13 +96,6 @@

     this.reportingPeriod = reportingPeriod;

 }
  • private Integer parentOrganisationUnitId;

  • public void setParentOrganisationUnitId( Integer parentOrganisationUnitId )

  • {

  •    this.parentOrganisationUnitId = parentOrganisationUnitId;
    
  • }

 private Integer organisationUnitId;



 public void setOrganisationUnitId( Integer organisationUnitId )

@@ -133,7 +126,6 @@

     process.setId( id );

     process.setMode( mode );

     process.setReportingPeriod( reportingPeriod );
  •    process.setParentOrganisationUnitId( parentOrganisationUnitId );
    
       process.setOrganisationUnitId( organisationUnitId );
    
       process.setDoDataMart( doDataMart );
    
       process.setFormat( format );
    

=== modified file ‘dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/inputReportParamsForm.vm’

— dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/inputReportParamsForm.vm 2010-08-19 09:43:45 +0000

+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/inputReportParamsForm.vm 2010-11-29 17:23:10 +0000

@@ -51,31 +51,9 @@

 #end
  • #if ( $!reportParams.isParamParentOrganisationUnit() )

  •    <th>$i18n.getString( "parent_organisationunit" )</th>
    
  •           <div id="selectionTree" style="width:325px; height:270px"></div>
    
  •           <script type="text/javascript">
    
  •                   selectionTreeSelection.setMultipleSelectionAllowed( false );
    
  •                   selectionTreeSelection.setListenerFunction( paramParentOrganisationUnitSet );
    
  •                   selectionTree.clearSelectedOrganisationUnits();
    
  •               selectionTree.buildSelectionTree();
    
  •           </script>
    
  •    <td colspan="4" style="height:10px"></td>
    
  • #end

 <!-- OrganisationUnit -->
  • #if ( $!reportParams.isParamOrganisationUnit() )
  • #if ( $!reportParams.isParamParentOrganisationUnit() || $!reportParams.isParamOrganisationUnit() )

    <th>$i18n.getString( "organisation_unit" )</th>
    

    === modified file ‘dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/table.js’

    — dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/table.js 2010-09-01 16:55:23 +0000

    +++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/table.js 2010-11-29 17:23:10 +0000

    @@ -1,12 +1,6 @@

    -var paramParentOrganisationUnit = null;

    var paramOrganisationUnit = null;

    -function paramParentOrganisationUnitSet( id )

    -{

    •   paramParentOrganisationUnit = id;
      

    -}

    function paramOrganisationUnitSet( id )

    {

        paramOrganisationUnit = id;
    

    @@ -24,12 +18,7 @@

     {
    
         url += "&reportingPeriod=" + getListValue( "reportingPeriod" );
    
     }
    
    • if ( paramParentOrganisationUnit != null )

    • {

    •    url += "&parentOrganisationUnitId=" + paramParentOrganisationUnit;
      
    • }

     if ( paramOrganisationUnit != null )
    
     {
    
         url += "&organisationUnitId=" + paramOrganisationUnit;
    

    Mailing list: https://launchpad.net/~dhis2-devs

    Post to : dhis2-devs@lists.launchpad.net

    Unsubscribe : https://launchpad.net/~dhis2-devs

    More help : https://help.launchpad.net/ListHelp