Subversion Repositories SmartDukaan

Rev

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

Rev 2624 Rev 2625
Line 110... Line 110...
110 
    sheet = workbook.sheet_by_index(0)
 110 
    sheet = workbook.sheet_by_index(0)
111 
    num_rows = sheet.nrows
 111 
    num_rows = sheet.nrows
112 
    delivered_orders = {}
 112 
    delivered_orders = {}
113 
    returned_orders = {}
 113 
    returned_orders = {}
114 
    for rownum in range(1, num_rows):
 114 
    for rownum in range(1, num_rows):
115 
        unused_customer_code, awb, unused_ref_no, timeval, date, unused_status, receiver, reason_for_return = sheet.row_values(rownum)[0:7]
 115 
        unused_customer_code, awb, unused_ref_no, timeval, date, unused_status, receiver, reason_for_return = sheet.row_values(rownum)[0:8]
116 
        delivery_date = str(get_py_datetime(date, timeval))
 116 
        delivery_date = str(get_py_datetime(date, timeval))
117 
        if receiver: #TODO: Use status for this check
 117 
        if receiver: #TODO: Use status for this check
118 
            delivered_orders[awb] = delivery_date + "|" +  receiver
 118 
            delivered_orders[awb] = delivery_date + "|" +  receiver
119 
        else:
 119 
        else:
120 
            returned_orders[awb] = delivery_date + "|" + reason_for_return
 120 
            returned_orders[awb] = delivery_date + "|" + reason_for_return
Line 131... Line 131...
131 
    workbook = xlrd.open_workbook(filename)
 131 
    workbook = xlrd.open_workbook(filename)
132 
    sheet = workbook.sheet_by_index(0)
 132 
    sheet = workbook.sheet_by_index(0)
133 
    num_rows = sheet.nrows
 133 
    num_rows = sheet.nrows
134 
    undelivered_orders = {}
 134 
    undelivered_orders = {}
135 
    for rownum in range(1, num_rows):
 135 
    for rownum in range(1, num_rows):
136 
        unused_cusotmer_code, awb, unused_ref_no, reason, timeval, date = sheet.row_values(rownum)[0:5]
 136 
        unused_cusotmer_code, awb, unused_ref_no, reason, timeval, date = sheet.row_values(rownum)[0:6]
137 
        try:
 137 
        try:
138 
            unused_status_date = str(get_py_datetime(date, timeval))
 138 
            unused_status_date = str(get_py_datetime(date, timeval))
139 
        except ValueError:
 139 
        except ValueError:
140 
            #ValueError can be expected if the date or time are not in the expected format
 140 
            #ValueError can be expected if the date or time are not in the expected format
141 
            #Harmless error for now since we are not storing the status date
 141 
            #Harmless error for now since we are not storing the status date