Subversion Repositories SmartDukaan

Rev

Rev 26402 | Rev 27071 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 26402 Rev 26420
Line 397... Line 397...
397
			} else if(priceDropImeis.get(imeiDropSummaryModel.getSerialNumber()) != null) {
397
			} else if(priceDropImeis.get(imeiDropSummaryModel.getSerialNumber()) != null) {
398
				rows.add(this.getRow(imeiDropSummaryModel, priceDropImeis.get(imeiDropSummaryModel.getSerialNumber())));
398
				rows.add(this.getRow(imeiDropSummaryModel, priceDropImeis.get(imeiDropSummaryModel.getSerialNumber())));
399
			}
399
			}
400
		}
400
		}
401
		return FileUtil.getCSVByteStream(Arrays.asList("IMEI Number", "Store Name", "Store Code", "Item ID", "Brand", 
401
		return FileUtil.getCSVByteStream(Arrays.asList("IMEI Number", "Store Name", "Store Code", "Item ID", "Brand", 
402
				"Model Name", "Model Number", "Color", "Status", "Rejection Reason", "Last Scanned", "Vendor Name", "Activation Timestamp", "Activation Added On"), rows);
402
				"Model Name", "Model Number", "Color", "Status", "Rejection Reason", "Last Scanned", "Vendor Name", "Grn On", "Activation Timestamp", "Activation Added On"), rows);
403
	}
403
	}
404
 
404
 
405
	private List<? extends Serializable> getRow(ImeiDropSummaryModel imeiDropSummaryModel, PriceDropIMEI priceDropIMEI) {
405
	private List<? extends Serializable> getRow(ImeiDropSummaryModel imeiDropSummaryModel, PriceDropIMEI priceDropIMEI) {
406
		List<Serializable> row = new ArrayList<>();
406
		List<Serializable> row = new ArrayList<>();
407
		row.add(imeiDropSummaryModel.getSerialNumber());
407
		row.add(imeiDropSummaryModel.getSerialNumber());
Line 419... Line 419...
419
			row.add(PriceDropImeiStatus.PENDING);
419
			row.add(PriceDropImeiStatus.PENDING);
420
			row.add("");
420
			row.add("");
421
		}
421
		}
422
		row.add(FormattingUtils.formatReporitcoDate(imeiDropSummaryModel.getLastScanned()));
422
		row.add(FormattingUtils.formatReporitcoDate(imeiDropSummaryModel.getLastScanned()));
423
		row.add(imeiDropSummaryModel.getVendorName());
423
		row.add(imeiDropSummaryModel.getVendorName());
-
 
424
		row.add(FormattingUtils.formatReporitcoDate(imeiDropSummaryModel.getGrnOn()));
424
		row.add(imeiDropSummaryModel.getActivationTimestamp());
425
		row.add(imeiDropSummaryModel.getActivationTimestamp());
425
		row.add(imeiDropSummaryModel.getActivationAddedOn());
426
		row.add(imeiDropSummaryModel.getActivationAddedOn());
426
		return row;
427
		return row;
427
	}
428
	}
428
 
429