Subversion Repositories SmartDukaan

Rev

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

Rev 7410 Rev 7711
Line 21... Line 21...
21 
 
 21 
 
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 
    private SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
27
27
28 
	private List<Scan> scans;
 28 
	private List<Scan> scans;
29 
	public String index() {
 29 
	public String index() {
30 
		if(filterTypeSelector!=null ||filterTypeSelector!=null ||fromDate!=null){
 30 
		if(filterTypeSelector!=null ||filterTypeSelector!=null ||fromDate!=null){
31 
			try {
 31 
			try {
Line 39... Line 39...
39 
		}
 39 
		}
40 
    }
 40 
    }
41
41
42 
	public String search() throws ParseException, TException {
 42 
	public String search() throws ParseException, TException {
43 
		try {
 43 
		try {
44 
			SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
 - 
 
45
44
46 
			Client warehouseClient = new WarehouseClient().getClient();
 45 
			Client warehouseClient = new WarehouseClient().getClient();
47 
			if(filterTypeSelector.equals("itemId")) {
 46 
			if(filterTypeSelector.equals("itemId")) {
48 
				Date fromDate = formatter.parse(this.fromDate);
 47 
				Date fromDate = formatter.parse(this.fromDate);
49 
				Date toDate = formatter.parse(this.toDate);
 48 
				Date toDate = formatter.parse(this.toDate);
Line 60... Line 59...
60 
			e.printStackTrace();
 59 
			e.printStackTrace();
61 
		}
 60 
		}
62 
		return INDEX;
 61 
		return INDEX;
63 
	}
 62 
	}
64 
 
 63 
 
- 
 
 64 
	public String getDateTime(long milliseconds) {
- 
 
 65 
        Calendar cal = Calendar.getInstance();
- 
 
 66 
        cal.setTimeInMillis(milliseconds);
- 
 
 67 
        return formatter.format(cal.getTime());
- 
 
 68 
    }
- 
 
 69
65 
	public String getFilterTypeSelector() {
 70 
	public String getFilterTypeSelector() {
66 
		return filterTypeSelector;
 71 
		return filterTypeSelector;
67 
	}
 72 
	}
68 
 
 73 
 
69 
	public void setFilterTypeSelector(String filterTypeSelector) {
 74 
	public void setFilterTypeSelector(String filterTypeSelector) {