Subversion Repositories SmartDukaan

Rev

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

Rev 6388 Rev 7410
Line 22... Line 22...
22 
	private String filterTypeSelector;
 22 
	private String filterTypeSelector;
23 
    private String toDate;
 23 
    private String toDate;
24 
    private String fromDate;
 24 
    private String fromDate;
25 
    private String searchNumber;
 25 
    private String searchNumber;
26
26
27 
    private final DateFormat formatter = new SimpleDateFormat("EEE, dd-MMM-yyyy hh:mm a");
 - 
 
28
27
29 
	private List<Scan> scans;
 28 
	private List<Scan> scans;
30 
	public String index() {
 29 
	public String index() {
31 
		if(filterTypeSelector!=null ||filterTypeSelector!=null ||fromDate!=null){
 30 
		if(filterTypeSelector!=null ||filterTypeSelector!=null ||fromDate!=null){
32 
			try {
 31 
			try {
Line 50... Line 49...
50 
				Date toDate = formatter.parse(this.toDate);
 49 
				Date toDate = formatter.parse(this.toDate);
51 
				Long itemId = Long.parseLong(searchNumber);
 50 
				Long itemId = Long.parseLong(searchNumber);
52 
				scans = warehouseClient.getInventoryScansForItem(itemId,
51 
				scans = warehouseClient.getInventoryScansForItem(itemId,
53 
						fromDate.getTime(), toDate.getTime());
 52 
						fromDate.getTime(), toDate.getTime());
54 
			} else if(filterTypeSelector.equals("serialNumber")) {
 53 
			} else if(filterTypeSelector.equals("serialNumber")) {
55 
				Long serialNumber = Long.parseLong(searchNumber);
 - 
 
56 
				scans = warehouseClient.getScanRecordsForSerialNumber(serialNumber);
 54 
				scans = warehouseClient.getScanRecordsForSerialNumber(searchNumber);
57 
			}
 55 
			}
58 
			else
56 
			else
59 
				return INDEX;
 57 
				return INDEX;
60 
		} catch (TTransportException e) {
 58 
		} catch (TTransportException e) {
61 
			// TODO Auto-generated catch block
 59 
			// TODO Auto-generated catch block
62 
			e.printStackTrace();
 60 
			e.printStackTrace();
63 
		}
 61 
		}
64 
		return INDEX;
 62 
		return INDEX;
65 
	}
 63 
	}
66 
 
 64 
 
67 
	public String getDateTime(long milliseconds) {
 - 
 
68 
        Calendar cal = Calendar.getInstance();
 - 
 
69 
        cal.setTimeInMillis(milliseconds);
 - 
 
70 
        return formatter.format(cal.getTime());
 - 
 
71 
    }
 - 
 
72
- 
 
73 
	public String getFilterTypeSelector() {
 65 
	public String getFilterTypeSelector() {
74 
		return filterTypeSelector;
 66 
		return filterTypeSelector;
75 
	}
 67 
	}
76 
 
 68 
 
77 
	public void setFilterTypeSelector(String filterTypeSelector) {
 69 
	public void setFilterTypeSelector(String filterTypeSelector) {