Subversion Repositories SmartDukaan

Rev

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

Rev 5387 Rev 7422
Line 68... Line 68...
68
        public String getValue(Order order) {
68
        public String getValue(Order order) {
69
            return order.isCod() ? "COD" : "Prepaid";
69
            return order.isCod() ? "COD" : "Prepaid";
70
        }
70
        }
71
    };
71
    };
72
    
72
    
-
 
73
    private TextColumn<Order> orderFromColumn = new TextColumn<Order>() {
-
 
74
    	@Override
-
 
75
        public String getValue(Order order) {
-
 
76
            return order.getSource();
-
 
77
        }
-
 
78
    };
-
 
79
    
73
    private TextColumn<Order> idColumn = new TextColumn<Order>() {
80
    private TextColumn<Order> idColumn = new TextColumn<Order>() {
74
        @Override
81
        @Override
75
        public String getValue(Order order) {
82
        public String getValue(Order order) {
76
            return "" + order.getOrderId();
83
            return "" + order.getOrderId();
77
        }
84
        }
Line 102... Line 109...
102
        public String getValue(Order order) {
109
        public String getValue(Order order) {
103
            return getDisplayableDate(new Date(order.getCreatedOn()))+"";
110
            return getDisplayableDate(new Date(order.getCreatedOn()))+"";
104
        }
111
        }
105
    };
112
    };
106
    
113
    
107
    private TextColumn<Order> promisedDeliveryDateColumn = new TextColumn<Order>() {
114
//    private TextColumn<Order> promisedDeliveryDateColumn = new TextColumn<Order>() {
108
        @Override
115
//        @Override
109
        public String getValue(Order order) {
116
//        public String getValue(Order order) {
110
            return getDisplayableDate(new Date(order.getPromisedDeliveryTime()))+"";
117
//            return getDisplayableDate(new Date(order.getPromisedDeliveryTime()))+"";
111
        }
118
//        }
112
    };
119
//    };
113
    
120
//    
114
    private TextColumn<Order> expectedDeliveryDateColumn = new TextColumn<Order>() {
121
//    private TextColumn<Order> expectedDeliveryDateColumn = new TextColumn<Order>() {
115
        @Override
122
//        @Override
116
        public String getValue(Order order) {
123
//        public String getValue(Order order) {
117
            return getDisplayableDate(new Date(order.getExpectedDeliveryTime()))+"";
124
//            return getDisplayableDate(new Date(order.getExpectedDeliveryTime()))+"";
118
        }
125
//        }
119
    };
126
//    };
120
    
127
    
121
    private TextColumn<Order> statusMessageColumn = new TextColumn<Order>() {
128
    private TextColumn<Order> statusMessageColumn = new TextColumn<Order>() {
122
        @Override
129
        @Override
123
        public String getValue(Order order) {
130
        public String getValue(Order order) {
124
            return order.getStatusMessage();
131
            return order.getStatusMessage();
Line 197... Line 204...
197
	      
204
	      
198
        // Add the columns.
205
        // Add the columns.
199
	    table.addColumn(checkboxColumn,"");
206
	    table.addColumn(checkboxColumn,"");
200
        table.addColumn(promisedShippingDateColumn, "Promised Shipping");
207
        table.addColumn(promisedShippingDateColumn, "Promised Shipping");
201
        table.addColumn(paymentModeColumn, "Type");
208
        table.addColumn(paymentModeColumn, "Type");
-
 
209
        table.addColumn(orderFromColumn, "Order From");
202
        table.addColumn(idColumn, "Order Id");
210
        table.addColumn(idColumn, "Order Id");
203
        table.addColumn(productDescriptionColumn, "Product Description");
211
        table.addColumn(productDescriptionColumn, "Product Description");
204
        table.addColumn(creationDateColumn, "Creation Date");
212
        table.addColumn(creationDateColumn, "Creation Date");
205
        table.addColumn(promisedDeliveryDateColumn, "Promised Delivery");
213
//        table.addColumn(promisedDeliveryDateColumn, "Promised Delivery");
206
        table.addColumn(expectedDeliveryDateColumn, "Expected Delivery");
214
//        table.addColumn(expectedDeliveryDateColumn, "Expected Delivery");
207
        table.addColumn(statusMessageColumn, "Current Status");
215
        table.addColumn(statusMessageColumn, "Current Status");
208
 
216
 
209
        //Set the widths
217
        //Set the widths
210
        table.setWidth("100%");
218
        table.setWidth("100%");
211
        table.setColumnWidth(checkboxColumn, 30, Unit.PX);
219
        table.setColumnWidth(checkboxColumn, 30, Unit.PX);
212
        table.setColumnWidth(promisedShippingDateColumn, 140.0, Unit.PX);
220
        table.setColumnWidth(promisedShippingDateColumn, 140.0, Unit.PX);
213
        table.setColumnWidth(paymentModeColumn, 60.0, Unit.PX);
221
        table.setColumnWidth(paymentModeColumn, 60.0, Unit.PX);
214
        table.setColumnWidth(idColumn, 70.0, Unit.PX);
222
        table.setColumnWidth(idColumn, 70.0, Unit.PX);
-
 
223
        table.setColumnWidth(orderFromColumn, 70.0, Unit.PX);
215
        table.setColumnWidth(productDescriptionColumn, 230.0, Unit.PX);
224
        table.setColumnWidth(productDescriptionColumn, 230.0, Unit.PX);
216
        table.setColumnWidth(creationDateColumn, 140.0, Unit.PX);
225
        table.setColumnWidth(creationDateColumn, 140.0, Unit.PX);
217
        table.setColumnWidth(promisedDeliveryDateColumn, 140.0, Unit.PX);
226
//        table.setColumnWidth(promisedDeliveryDateColumn, 140.0, Unit.PX);
218
        table.setColumnWidth(expectedDeliveryDateColumn, 140.0, Unit.PX);
227
//        table.setColumnWidth(expectedDeliveryDateColumn, 140.0, Unit.PX);
219
        table.setColumnWidth(statusMessageColumn, 180.0, Unit.PX);
228
        table.setColumnWidth(statusMessageColumn, 180.0, Unit.PX);
220
        
229
        
221
        table.setRowCount(count, true);
230
        table.setRowCount(count, true);
222
        table.setVisibleRange(start, orders.size());
231
        table.setVisibleRange(start, orders.size());
223
		
232