From 1416cd04d2864341de36a8efd54b76902b503130 Mon Sep 17 00:00:00 2001
From: daovietanh99 <dv.anh1@samsung.com>
Date: Thu, 15 Feb 2024 14:36:01 +0700
Subject: [PATCH 1/4] update migrate csv

---
 cope2n-ai-fi/modules/sdsvkvu                          | 2 +-
 cope2n-api/fwd_api/management/commands/migrate-csv.py | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/cope2n-ai-fi/modules/sdsvkvu b/cope2n-ai-fi/modules/sdsvkvu
index b6d4fab..6907ea0 160000
--- a/cope2n-ai-fi/modules/sdsvkvu
+++ b/cope2n-ai-fi/modules/sdsvkvu
@@ -1 +1 @@
-Subproject commit b6d4fab46f7f8689dd6b050cfbff2faa6a6f3fec
+Subproject commit 6907ea0183b141e3b4f3c21758c9123f1e9b2a27
diff --git a/cope2n-api/fwd_api/management/commands/migrate-csv.py b/cope2n-api/fwd_api/management/commands/migrate-csv.py
index 2be1be0..ddb63d1 100644
--- a/cope2n-api/fwd_api/management/commands/migrate-csv.py
+++ b/cope2n-api/fwd_api/management/commands/migrate-csv.py
@@ -53,14 +53,14 @@ class Command(BaseCommand):
                         is_match = True
 
                         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)
-                            if not user_feedback == request_feedback:                                    
+                            if not user_feedback in request_feedback["imei_number"]:                                    
                                 request_feedback["imei_number"].append(user_feedback)
                         else:
-                            if not reviewed_result == request_review:
+                            if not reviewed_result == request_review[field]:
                                 request_review[field] = reviewed_result
-                            if not user_feedback == request_feedback:
+                            if not user_feedback == request_feedback[field]:
                                 request_feedback[field] = user_feedback
 
                         _predict_result = copy.deepcopy(predict_result_to_ready(request.predict_result))

From a7b86730aa761ccb08161d19ebe9d9237785f9e3 Mon Sep 17 00:00:00 2001
From: daovietanh99 <dv.anh1@samsung.com>
Date: Thu, 15 Feb 2024 15:21:53 +0700
Subject: [PATCH 2/4] UPDATE: update report xlsx and file utils

---
 cope2n-api/fwd_api/utils/file.py |  41 ++++++++++++++++---------------
 cope2n-api/report.xlsx           | Bin 6546 -> 6954 bytes
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/cope2n-api/fwd_api/utils/file.py b/cope2n-api/fwd_api/utils/file.py
index 4b5e55e..b71604e 100644
--- a/cope2n-api/fwd_api/utils/file.py
+++ b/cope2n-api/fwd_api/utils/file.py
@@ -443,20 +443,21 @@ def dict2xlsx(input: json, _type='report'):
         mapping = {
             'A': 'subs',
             'B': 'extraction_date',
-            'C': 'num_imei',
-            'D': 'num_invoice',
-            'E': 'total_images',
-            'F': 'images_quality.successful',
-            'G': 'images_quality.successful_percent',
-            'H': 'images_quality.bad',
-            'I': 'images_quality.bad_percent',
-            'J': 'average_accuracy_rate.imei',
-            'K': 'average_accuracy_rate.purchase_date',
-            'L': 'average_accuracy_rate.retailer_name',
-            'M': 'average_processing_time.imei',
-            'N': 'average_processing_time.invoice',
-            'O': 'usage.imei',
-            'P': 'usage.invoice',
+            'C': 'usage.total_images',
+            'D': 'usage.imei',
+            'E': 'usage.invoice',
+            'F': 'total_images',
+            'G': 'num_imei',
+            'H': 'num_invoice',
+            'I': 'images_quality.successful',
+            'J': 'images_quality.successful_percent',
+            'K': 'images_quality.bad',
+            'L': 'images_quality.bad_percent',
+            'M': 'average_accuracy_rate.imei',
+            'N': 'average_accuracy_rate.purchase_date',
+            'O': 'average_accuracy_rate.retailer_name',
+            'P': 'average_processing_time.imei',
+            'Q': 'average_processing_time.invoice',
         }
         start_index = 5
 
@@ -497,7 +498,7 @@ def dict2xlsx(input: json, _type='report'):
                 if subtotal['subs'] == '+':
                     ws[key + str(start_index)].font = font_black_bold
                     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):
                         ws[key + str(start_index)].fill = fill_gray
                     elif key_index == 1:
@@ -506,19 +507,19 @@ def dict2xlsx(input: json, _type='report'):
                         ws[key + str(start_index)].fill = fill_yellow
                 else: 
                     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)].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]:
                         if value > 2.0:
                             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]:
                         if value > 10:
                             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]:
-                        ws[key + str(start_index)].number_format  = numbers.FORMAT_NUMBER_00
+                        ws[key + str(start_index)].number_format  = '0.0'
                     else :
                         ws[key + str(start_index)].style = normal_cell
             elif _type == 'report_detail':
diff --git a/cope2n-api/report.xlsx b/cope2n-api/report.xlsx
index fc5b37d989c90238850317ab48fca2472ee7f76f..a7fa7e2ac06c6812f5f8a86c869885a2fce4a75e 100644
GIT binary patch
delta 4963
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

delta 4590
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


From 1e49e14e4ce706ec58600ba858fc5e1aafede85a Mon Sep 17 00:00:00 2001
From: daovietanh99 <dv.anh1@samsung.com>
Date: Thu, 15 Feb 2024 15:23:42 +0700
Subject: [PATCH 3/4] UPDATE: chang number format to 1 decimal place

---
 cope2n-api/fwd_api/utils/file.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/cope2n-api/fwd_api/utils/file.py b/cope2n-api/fwd_api/utils/file.py
index b71604e..1a49e30 100644
--- a/cope2n-api/fwd_api/utils/file.py
+++ b/cope2n-api/fwd_api/utils/file.py
@@ -524,8 +524,10 @@ def dict2xlsx(input: json, _type='report'):
                         ws[key + str(start_index)].style = normal_cell
             elif _type == 'report_detail':
                 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
                 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
                 else:
                     ws[key + str(start_index)].style = normal_cell

From f1baee2bf09e693ce27a01f58631176dae224366 Mon Sep 17 00:00:00 2001
From: daovietanh99 <dv.anh1@samsung.com>
Date: Thu, 15 Feb 2024 15:39:03 +0700
Subject: [PATCH 4/4] UPDATE: add subs field to report detail

---
 cope2n-api/fwd_api/utils/file.py |  41 ++++++++++++++++---------------
 cope2n-api/report_detail.xlsx    | Bin 6335 -> 6672 bytes
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/cope2n-api/fwd_api/utils/file.py b/cope2n-api/fwd_api/utils/file.py
index 1a49e30..c5094fb 100644
--- a/cope2n-api/fwd_api/utils/file.py
+++ b/cope2n-api/fwd_api/utils/file.py
@@ -465,26 +465,27 @@ def dict2xlsx(input: json, _type='report'):
         wb = load_workbook(filename = 'report_detail.xlsx')
         ws = wb['Sheet1']
         mapping = {
-            'A': 'request_id',
-            'B': 'redemption_number',
-            'C': 'image_type',
-            'D': 'imei_user_submitted',
-            'E': "imei_ocr_retrieved",
-            'F': "imei1_accuracy",
-            'G': "invoice_purchase_date_consumer",
-            'H': "invoice_purchase_date_ocr",
-            'I': "invoice_purchase_date_accuracy",
-            'J': "invoice_retailer_consumer",
-            'K': "invoice_retailer_ocr",
-            'L': "invoice_retailer_accuracy",
-            'M': "ocr_image_accuracy",
-            'N': "ocr_image_speed",
-            'O': "is_reviewed",
-            'P': "bad_image_reasons",
-            'Q': "countermeasures",
-            'R': 'imei_revised_accuracy',
-            'S': 'purchase_date_revised_accuracy',
-            'T': 'retailer_revised_accuracy',
+            'A': 'subs',
+            'B': 'request_id',
+            'C': 'redemption_number',
+            'D': 'image_type',
+            'E': 'imei_user_submitted',
+            'F': "imei_ocr_retrieved",
+            'G': "imei1_accuracy",
+            'H': "invoice_purchase_date_consumer",
+            'I': "invoice_purchase_date_ocr",
+            'J': "invoice_purchase_date_accuracy",
+            'K': "invoice_retailer_consumer",
+            'L': "invoice_retailer_ocr",
+            'M': "invoice_retailer_accuracy",
+            'N': "ocr_image_accuracy",
+            'O': "ocr_image_speed",
+            'P': "is_reviewed",
+            'Q': "bad_image_reasons",
+            'R': "countermeasures",
+            'S': 'imei_revised_accuracy',
+            'T': 'purchase_date_revised_accuracy',
+            'U': 'retailer_revised_accuracy',
         }
         start_index = 4
 
diff --git a/cope2n-api/report_detail.xlsx b/cope2n-api/report_detail.xlsx
index 6850d8eaf52e793f77fcda5caa9e394cdfbbd189..566defc618701c19499d939a6b24b26464033bd7 100644
GIT binary patch
delta 4562
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
K=R*kj{pepcsR@(-

delta 4283
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
SPXPdsUe1uq>$pRAwfaA1YK5i%