← Back to branch summary

~dhis2-devs-core/dhis2/synchmanager_2.19

« back to all changes in this revision

Viewing changes to local/dhis-synchmanager/dhis-web-synchmanager/src/main/java/org/hisp/dhis/sm/action/ShowAcceptanceListAction.java

  • Committer: Mithilesh Kumar Thakur
  • Date: 2015-06-05 07:55:18 UTC
  • Revision ID: mithilesh.hisp@gmail.com-20150605075518-oh2wboe6wdwnt6bb
Bug fixed in synch manager

Show diffs side-by-side

added added

removed removed

Lines of Context:
local/dhis-synchmanager/dhis-web-synchmanager/src/main/java/org/hisp/dhis/sm/action/ShowAcceptanceListAction.java
144
144
    }
145
145
 
146
146
    public List<Indicator> newIndicators = new ArrayList<>();
147
 
    
 
147
 
148
148
    public List<String> newIndicatorsDetails = new ArrayList<>();
149
 
    
150
 
    public List<String> getNewIndicatorsDetails() {
151
 
                return newIndicatorsDetails;
152
 
        }
153
 
 
154
 
        public void setNewIndicatorsDetails(List<String> newIndicatorsDetails) {
155
 
                this.newIndicatorsDetails = newIndicatorsDetails;
156
 
        }
157
 
 
158
 
        public List<Indicator> updatedIndicators = new ArrayList<>();
 
149
 
 
150
    public List<String> getNewIndicatorsDetails()
 
151
    {
 
152
        return newIndicatorsDetails;
 
153
    }
 
154
 
 
155
    public void setNewIndicatorsDetails( List<String> newIndicatorsDetails )
 
156
    {
 
157
        this.newIndicatorsDetails = newIndicatorsDetails;
 
158
    }
 
159
 
 
160
    public List<Indicator> updatedIndicators = new ArrayList<>();
159
161
 
160
162
    public List<String> indicatorUpdates = new ArrayList<>();
161
163
 
162
164
    public List<OrganisationUnit> newOrgUnits = new ArrayList<>();
163
 
  
 
165
 
164
166
    public List<OrganisationUnit> updatedOrgUnits = new ArrayList<>();
165
167
 
166
168
    public List<String> orgUnitUpdates = new ArrayList<>();
260
262
    {
261
263
        this.indicatorUpdates = indicatorUpdates;
262
264
    }
263
 
    
 
265
 
264
266
    /*
265
 
    private String thisUrl;
 
267
     * private String thisUrl;
 
268
     * 
 
269
     * public void setThisUrl( String thisUrl ) { this.thisUrl = thisUrl; }
 
270
     */
266
271
 
267
 
    public void setThisUrl( String thisUrl )
268
 
    {
269
 
        this.thisUrl = thisUrl;
270
 
    }
271
 
    */
272
 
    
273
272
    @Override
274
273
    public String execute()
275
274
        throws Exception
276
275
    {
277
276
        Set<SynchInstance> instances = synchInstanceService.getInstancesByType( "meta-data" );
278
 
        
 
277
 
279
278
        HttpServletRequest request = ServletActionContext.getRequest();
280
 
        
 
279
 
281
280
        String thisUrlTemp = request.getRequestURL().toString();
282
 
        
283
 
        String [] urlFrgmant = thisUrlTemp.split("/");
284
 
                
285
 
        //System.out.println( "This URL is " + urlFrgmant[0]+"/"+urlFrgmant[1]+"/"+urlFrgmant[2]+"/"+urlFrgmant[3]+"/api" );
286
 
        
287
 
        String thisUrl = urlFrgmant[0]+"/"+urlFrgmant[1]+"/"+urlFrgmant[2]+"/"+urlFrgmant[3]+"/api";
288
 
        
 
281
 
 
282
        String[] urlFrgmant = thisUrlTemp.split( "/" );
 
283
 
 
284
        // System.out.println( "This URL is " +
 
285
        // urlFrgmant[0]+"/"+urlFrgmant[1]+"/"+urlFrgmant[2]+"/"+urlFrgmant[3]+"/api"
 
286
        // );
 
287
 
 
288
        String thisUrl = urlFrgmant[0] + "/" + urlFrgmant[1] + "/" + urlFrgmant[2] + "/" + urlFrgmant[3] + "/api";
 
289
 
289
290
        try
290
291
        {
291
292
 
303
304
 
304
305
            MetaData orgUnitList = synchManager.getMetaData( instances.iterator().next(), orgUnitURL, thisUrl );
305
306
 
306
 
            MetaData validationRuleList = synchManager.getMetaData( instances.iterator().next(), validationURL, thisUrl );
 
307
            MetaData validationRuleList = synchManager
 
308
                .getMetaData( instances.iterator().next(), validationURL, thisUrl );
307
309
 
308
310
            dataElementUpdates.add( "Cushion Item" );
309
311
 
390
392
                    if ( indicatorService.getIndicator( indicator.getUid() ) == null )
391
393
                    {
392
394
                        newIndicators.add( indicator );
393
 
                        
394
 
                        String details= new String("");
395
 
                        
 
395
 
 
396
                        String details = new String( "" );
 
397
 
396
398
                        details = details.concat( "<tr>" + "<td>Name:</td>" + "<td>" + indicator.getName()
397
 
                                + "</td></tr>" );
398
 
                        
399
 
                        details = details.concat( "<tr>" + "<td>Type:</td>" + "<td>" + indicator.getIndicatorType().getName()
400
 
                                + "</td></tr>" );
401
 
                      
402
 
                        details = details.concat( "<tr>" + "<td>Description:</td>" + "<td>" + indicator.getDescription()
403
 
                                + "</td></tr>" );
404
 
                        
405
 
                        details = details.concat( "<tr>" + "<td>Numerator:</td>" + "<td>" + indicator.getNumeratorDescription()
406
 
                                + "</td></tr>" );
407
 
                        
408
 
                        details = details.concat( "<tr>" + "<td>Denominator:</td>" + "<td>" + indicator.getDenominatorDescription()
409
 
                                + "</td></tr>" );
 
399
                            + "</td></tr>" );
 
400
 
 
401
                        details = details.concat( "<tr>" + "<td>Type:</td>" + "<td>"
 
402
                            + indicator.getIndicatorType().getName() + "</td></tr>" );
 
403
 
 
404
                        details = details.concat( "<tr>" + "<td>Description:</td>" + "<td>"
 
405
                            + indicator.getDescription() + "</td></tr>" );
 
406
 
 
407
                        details = details.concat( "<tr>" + "<td>Numerator:</td>" + "<td>"
 
408
                            + indicator.getNumeratorDescription() + "</td></tr>" );
 
409
 
 
410
                        details = details.concat( "<tr>" + "<td>Denominator:</td>" + "<td>"
 
411
                            + indicator.getDenominatorDescription() + "</td></tr>" );
410
412
 
411
413
                        newIndicatorsDetails.add( details );
412
414