Merge pull request #31 from SDSRV-IDP/vietanh99-update-xlsx
Vietanh99 update xlsx
This commit is contained in:
commit
a5b7473ede
@ -1 +1 @@
|
|||||||
Subproject commit b6d4fab46f7f8689dd6b050cfbff2faa6a6f3fec
|
Subproject commit 6907ea0183b141e3b4f3c21758c9123f1e9b2a27
|
@ -53,14 +53,14 @@ class Command(BaseCommand):
|
|||||||
is_match = True
|
is_match = True
|
||||||
|
|
||||||
if field == 'imei_number':
|
if field == 'imei_number':
|
||||||
if not reviewed_result == request_review:
|
if not reviewed_result in request_review["imei_number"]:
|
||||||
request_review["imei_number"].append(reviewed_result)
|
request_review["imei_number"].append(reviewed_result)
|
||||||
if not user_feedback == request_feedback:
|
if not user_feedback in request_feedback["imei_number"]:
|
||||||
request_feedback["imei_number"].append(user_feedback)
|
request_feedback["imei_number"].append(user_feedback)
|
||||||
else:
|
else:
|
||||||
if not reviewed_result == request_review:
|
if not reviewed_result == request_review[field]:
|
||||||
request_review[field] = reviewed_result
|
request_review[field] = reviewed_result
|
||||||
if not user_feedback == request_feedback:
|
if not user_feedback == request_feedback[field]:
|
||||||
request_feedback[field] = user_feedback
|
request_feedback[field] = user_feedback
|
||||||
|
|
||||||
_predict_result = copy.deepcopy(predict_result_to_ready(request.predict_result))
|
_predict_result = copy.deepcopy(predict_result_to_ready(request.predict_result))
|
||||||
|
@ -443,20 +443,21 @@ def dict2xlsx(input: json, _type='report'):
|
|||||||
mapping = {
|
mapping = {
|
||||||
'A': 'subs',
|
'A': 'subs',
|
||||||
'B': 'extraction_date',
|
'B': 'extraction_date',
|
||||||
'C': 'num_imei',
|
'C': 'usage.total_images',
|
||||||
'D': 'num_invoice',
|
'D': 'usage.imei',
|
||||||
'E': 'total_images',
|
'E': 'usage.invoice',
|
||||||
'F': 'images_quality.successful',
|
'F': 'total_images',
|
||||||
'G': 'images_quality.successful_percent',
|
'G': 'num_imei',
|
||||||
'H': 'images_quality.bad',
|
'H': 'num_invoice',
|
||||||
'I': 'images_quality.bad_percent',
|
'I': 'images_quality.successful',
|
||||||
'J': 'average_accuracy_rate.imei',
|
'J': 'images_quality.successful_percent',
|
||||||
'K': 'average_accuracy_rate.purchase_date',
|
'K': 'images_quality.bad',
|
||||||
'L': 'average_accuracy_rate.retailer_name',
|
'L': 'images_quality.bad_percent',
|
||||||
'M': 'average_processing_time.imei',
|
'M': 'average_accuracy_rate.imei',
|
||||||
'N': 'average_processing_time.invoice',
|
'N': 'average_accuracy_rate.purchase_date',
|
||||||
'O': 'usage.imei',
|
'O': 'average_accuracy_rate.retailer_name',
|
||||||
'P': 'usage.invoice',
|
'P': 'average_processing_time.imei',
|
||||||
|
'Q': 'average_processing_time.invoice',
|
||||||
}
|
}
|
||||||
start_index = 5
|
start_index = 5
|
||||||
|
|
||||||
@ -464,26 +465,27 @@ def dict2xlsx(input: json, _type='report'):
|
|||||||
wb = load_workbook(filename = 'report_detail.xlsx')
|
wb = load_workbook(filename = 'report_detail.xlsx')
|
||||||
ws = wb['Sheet1']
|
ws = wb['Sheet1']
|
||||||
mapping = {
|
mapping = {
|
||||||
'A': 'request_id',
|
'A': 'subs',
|
||||||
'B': 'redemption_number',
|
'B': 'request_id',
|
||||||
'C': 'image_type',
|
'C': 'redemption_number',
|
||||||
'D': 'imei_user_submitted',
|
'D': 'image_type',
|
||||||
'E': "imei_ocr_retrieved",
|
'E': 'imei_user_submitted',
|
||||||
'F': "imei1_accuracy",
|
'F': "imei_ocr_retrieved",
|
||||||
'G': "invoice_purchase_date_consumer",
|
'G': "imei1_accuracy",
|
||||||
'H': "invoice_purchase_date_ocr",
|
'H': "invoice_purchase_date_consumer",
|
||||||
'I': "invoice_purchase_date_accuracy",
|
'I': "invoice_purchase_date_ocr",
|
||||||
'J': "invoice_retailer_consumer",
|
'J': "invoice_purchase_date_accuracy",
|
||||||
'K': "invoice_retailer_ocr",
|
'K': "invoice_retailer_consumer",
|
||||||
'L': "invoice_retailer_accuracy",
|
'L': "invoice_retailer_ocr",
|
||||||
'M': "ocr_image_accuracy",
|
'M': "invoice_retailer_accuracy",
|
||||||
'N': "ocr_image_speed",
|
'N': "ocr_image_accuracy",
|
||||||
'O': "is_reviewed",
|
'O': "ocr_image_speed",
|
||||||
'P': "bad_image_reasons",
|
'P': "is_reviewed",
|
||||||
'Q': "countermeasures",
|
'Q': "bad_image_reasons",
|
||||||
'R': 'imei_revised_accuracy',
|
'R': "countermeasures",
|
||||||
'S': 'purchase_date_revised_accuracy',
|
'S': 'imei_revised_accuracy',
|
||||||
'T': 'retailer_revised_accuracy',
|
'T': 'purchase_date_revised_accuracy',
|
||||||
|
'U': 'retailer_revised_accuracy',
|
||||||
}
|
}
|
||||||
start_index = 4
|
start_index = 4
|
||||||
|
|
||||||
@ -497,7 +499,7 @@ def dict2xlsx(input: json, _type='report'):
|
|||||||
if subtotal['subs'] == '+':
|
if subtotal['subs'] == '+':
|
||||||
ws[key + str(start_index)].font = font_black_bold
|
ws[key + str(start_index)].font = font_black_bold
|
||||||
if key_index in [6, 8, 9, 10, 11, 12, 13]:
|
if key_index in [6, 8, 9, 10, 11, 12, 13]:
|
||||||
ws[key + str(start_index)].number_format = numbers.FORMAT_NUMBER_00
|
ws[key + str(start_index)].number_format = '0.0'
|
||||||
if key_index == 0 or (key_index >= 9 and key_index <= 15):
|
if key_index == 0 or (key_index >= 9 and key_index <= 15):
|
||||||
ws[key + str(start_index)].fill = fill_gray
|
ws[key + str(start_index)].fill = fill_gray
|
||||||
elif key_index == 1:
|
elif key_index == 1:
|
||||||
@ -506,25 +508,27 @@ def dict2xlsx(input: json, _type='report'):
|
|||||||
ws[key + str(start_index)].fill = fill_yellow
|
ws[key + str(start_index)].fill = fill_yellow
|
||||||
else:
|
else:
|
||||||
if 'average_accuracy_rate' in mapping[key] and type(value) in [int, float]:
|
if 'average_accuracy_rate' in mapping[key] and type(value) in [int, float]:
|
||||||
if value < 95:
|
if value < 98:
|
||||||
ws[key + str(start_index)].style = normal_cell_red
|
ws[key + str(start_index)].style = normal_cell_red
|
||||||
ws[key + str(start_index)].number_format = numbers.FORMAT_NUMBER_00
|
ws[key + str(start_index)].number_format = '0.0'
|
||||||
elif 'average_processing_time' in mapping[key] and type(value) in [int, float]:
|
elif 'average_processing_time' in mapping[key] and type(value) in [int, float]:
|
||||||
if value > 2.0:
|
if value > 2.0:
|
||||||
ws[key + str(start_index)].style = normal_cell_red
|
ws[key + str(start_index)].style = normal_cell_red
|
||||||
ws[key + str(start_index)].number_format = numbers.FORMAT_NUMBER_00
|
ws[key + str(start_index)].number_format = '0.0'
|
||||||
elif 'bad_percent' in mapping[key] and type(value) in [int, float]:
|
elif 'bad_percent' in mapping[key] and type(value) in [int, float]:
|
||||||
if value > 10:
|
if value > 10:
|
||||||
ws[key + str(start_index)].style = normal_cell_red
|
ws[key + str(start_index)].style = normal_cell_red
|
||||||
ws[key + str(start_index)].number_format = numbers.FORMAT_NUMBER_00
|
ws[key + str(start_index)].number_format = '0.0'
|
||||||
elif 'percent' in mapping[key] and type(value) in [int, float]:
|
elif 'percent' in mapping[key] and type(value) in [int, float]:
|
||||||
ws[key + str(start_index)].number_format = numbers.FORMAT_NUMBER_00
|
ws[key + str(start_index)].number_format = '0.0'
|
||||||
else :
|
else :
|
||||||
ws[key + str(start_index)].style = normal_cell
|
ws[key + str(start_index)].style = normal_cell
|
||||||
elif _type == 'report_detail':
|
elif _type == 'report_detail':
|
||||||
if 'accuracy' in mapping[key] and type(value) in [int, float] and value < 75:
|
if 'accuracy' in mapping[key] and type(value) in [int, float] and value < 75:
|
||||||
|
ws[key + str(start_index)].number_format = '0.0'
|
||||||
ws[key + str(start_index)].style = normal_cell_red
|
ws[key + str(start_index)].style = normal_cell_red
|
||||||
elif 'speed' in mapping[key] and type(value) in [int, float] and value > 2.0:
|
elif 'speed' in mapping[key] and type(value) in [int, float] and value > 2.0:
|
||||||
|
ws[key + str(start_index)].number_format = '0.0'
|
||||||
ws[key + str(start_index)].style = normal_cell_red
|
ws[key + str(start_index)].style = normal_cell_red
|
||||||
else:
|
else:
|
||||||
ws[key + str(start_index)].style = normal_cell
|
ws[key + str(start_index)].style = normal_cell
|
||||||
|
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue
Block a user