← Back to branch summary

~dhis2-devs-core/+junk/dhis2-xml-ng

« back to all changes in this revision

Viewing changes to dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/lock/GetDataSetsForLockAction.java

  • Committer: Bob Jolliffe
  • Date: 2009-12-28 00:10:10 UTC
  • mfrom: (1265.1.24 trunk)
  • Revision ID: bobj@bobj-laptop-20091228001010-74keze4t25s96xi0
Merged in changes from trunk (trying to stay in synch)

Show diffs side-by-side

added added

removed removed

Lines of Context:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/lock/GetDataSetsForLockAction.java
92
92
    // Action implementation
93
93
    // -------------------------------------------------------------------------
94
94
 
95
 
    public String execute()
96
 
    {
97
 
        if ( periodId != null )
98
 
        {
 
95
    public String execute(){
 
96
        
 
97
        if ( periodId != null ){
 
98
                
99
99
            Period period = new Period();
100
100
            period = periodService.getPeriod( periodId.intValue() );
101
 
 
102
 
            for ( DataSet dataSet : dataSetService.getAssignedDataSetsByPeriodType( period.getPeriodType() ) )
103
 
            {
104
 
                if ( dataSetLockService.getDataSetLockByDataSetAndPeriod( dataSet, period ) != null )
105
 
                {
106
 
                        if( dataSetLockService.getDataSetLockByDataSetAndPeriod( dataSet, period ).getSources() != null )
107
 
                        {
 
101
            
 
102
            for ( DataSet dataSet : dataSetService.getAssignedDataSetsByPeriodType( period.getPeriodType() ) ){
 
103
                if ( dataSetLockService.getDataSetLockByDataSetAndPeriod( dataSet, period ) != null ){  
 
104
                        if( dataSetLockService.getDataSetLockByDataSetAndPeriod( dataSet, period ).getSources() != null ){
108
105
                            dataSet.setLocked( true );
109
106
                            dataSetService.updateDataSet( dataSet );
110
107
                            dataSets.add( dataSet );
111
108
                        }
112
 
                        else
113
 
                        {                                                
 
109
                        else{                                                
114
110
                            dataSetLockService.deleteDataSetLock( dataSetLockService.getDataSetLockByDataSetAndPeriod( dataSet, period ) );
115
111
                            dataSet.setLocked( false );
116
112
                            dataSetService.updateDataSet( dataSet );
117
113
                            dataSets.add( dataSet );
118
114
                        }
119
115
                }
120
 
                else
121
 
                {
 
116
                else{
122
117
                    dataSet.setLocked( false );
123
118
                    dataSetService.updateDataSet( dataSet );
124
119
                    dataSets.add( dataSet );
 
120
                    System.out.println("unlocked data sets in outer loop :" + dataSets.toString());
125
121
                }
126
 
            }            
 
122
            }
127
123
        }
128
 
        
129
124
        return SUCCESS;
130
125
    }
131
 
}
 
 
b'\\ No newline at end of file'
 
126
}