coi

app/report/views.py

     
     return placeholders
 
+def clear_values(n, m):
+    placeholders = {}
+    for i in range(1, n + 1):
+        for j in range(1, m + 1):
+            placeholders[f'v{i}_{j}'] = 0
+    return placeholders
+
+# # Example usage:
+# placeholders_dict = clear_values(6, 3)
+# print(placeholders_dict)
 def generate_dimension_values(lot_no):
     """
     Fetch dimension records from manualSize and DataMs models
 
     # Prepare placeholders
 
-    placeholders = {}
-    for i in range(1,7):
-        for j in range(1,4):
-            placeholders[f'v{i}_{j}'] = 0
+    # placeholders = {}
+    placeholders = clear_values(7,4)
+    # for i in range(1,7):
+        # for j in range(1,4):
+            # placeholders[f'v{i}_{j}'] = 0
     
     pprint(placeholders)
     pprint(manual_size_records) 
     hide_con(placeholders, "v4_2", "24:28")
     return placeholders
 
+def is_ok(instance):
+    fields_and_values = {}
+    for field in instance._meta.get_fields():
+        field_name = field.name
+        if field_name.endswith('ok'):
+            v = getattr(instance, field_name)
+            if v is not None and v != "OK":
+                return False
+    return True
+
+def generate_dimension_app_values(lot_no):
+    """
+    Fetch dimension records from manualSize and DataMs models
+    and generate placeholder values for Standard, Actual, and Judgement.
+    Supports two row_no entries per lot.
+    """
+    # Fetch standard values from manualSize (limit to 2 rows)
+    manual_size_records = Manualsize.objects.filter(lotno=lot_no)
+
+    # Fetch actual and judgement values from DataMs ordered by row_no (limit to 2 rows)
+    data_ms_records = DataMs.objects.filter(lot_no=lot_no).order_by('row_no')[:2]
+
+    # Prepare placeholders
+
+    # placeholders = {}
+    placeholders = clear_values(8,3)
+    # for i in range(1,7):
+        # for j in range(1,4):
+            # placeholders[f'v{i}_{j}'] = 0
+    
+    pprint(placeholders)
+    pprint(manual_size_records) 
+    for m in manual_size_records:
+        if m.size_name == "D":
+            placeholders['v1_1'] = placeholders['v5_1'] = f'{m.std} +{m.tolup} {m.tolun}'
+        if m.size_name == "T":
+            placeholders['v2_1'] = placeholders['v6_1'] = f'{m.std} +{m.tolup} {m.tolun}'
+        if m.size_name == "H":
+            placeholders['v3_1'] = placeholders['v7_1'] = f'{m.std} +{m.tolup} {m.tolun}'
+
+
+
+    # Ensure that we map each manualSize entry to a corresponding DataMs entry
+    for r in data_ms_records:
+        if r.row_no == 1:
+            placeholders[f'v1_2'] = r.dsize
+            placeholders[f'v1_3'] = r.dsizeok
+            
+            placeholders[f'v2_2'] = r.tsize
+            placeholders[f'v2_3'] = r.tsizeok
+            
+            placeholders[f'v3_2'] = r.hsize
+            placeholders[f'v3_3'] = r.hsizeok
+
+            if is_ok(r):
+                placeholders[f'v4_1'] = 'OK'
+                placeholders[f'v4_2'] = 'OK'
+            else:
+                placeholders[f'v4_1'] = 'NG'
+                placeholders[f'v4_2'] = 'OK'
+        
+        if r.row_no == 2:
+            placeholders[f'v5_2'] = r.dsize
+            placeholders[f'v5_3'] = r.dsizeok
+            
+            placeholders[f'v6_2'] = r.tsize
+            placeholders[f'v6_3'] = r.tsizeok
+            
+            placeholders[f'v7_2'] = r.hsize
+            placeholders[f'v7_3'] = r.hsizeok
+
+            if is_ok(r):
+                placeholders[f'v8_1'] = 'OK'
+                placeholders[f'v8_2'] = 'OK'
+            else:
+                placeholders[f'v8_1'] = 'NG'
+                placeholders[f'v8_2'] = 'NG'
+
+    hide_con(placeholders, "v5_1", "26:32")
+    return placeholders
+
+def generate_centering_values(lot_no):
+    """
+    Fetch dimension records from manualSize and DataMs models
+    and generate placeholder values for Standard, Actual, and Judgement.
+    Supports two row_no entries per lot.
+    """
+    # Fetch standard values from manualSize (limit to 2 rows)
+    manual_size_records = Manualsize.objects.filter(lotno=lot_no)
+
+    # Fetch actual and judgement values from DataMs ordered by row_no (limit to 2 rows)
+    data_ms_records = DataMs.objects.filter(lot_no=lot_no).order_by('row_no')[:2]
+
+    # Prepare placeholders
+
+    # placeholders = {}
+    placeholders = clear_values(10,3)
+    # for i in range(1,7):
+        # for j in range(1,4):
+            # placeholders[f'v{i}_{j}'] = 0
+    
+    pprint(placeholders)
+    pprint(manual_size_records) 
+
+
+    # Ensure that we map each manualSize entry to a corresponding DataMs entry
+    for i,r in enumerate(data_ms_records, start=1):
+        placeholders[f'v{i}_2'] = r.censize
+        placeholders[f'v{i}_3'] = r.censizeok
+
+    return placeholders
+
 def merge_sheet_data_with_data(sheet_data, data):
     """
     Merge `sheet_data` with `data`.
                 sheet_data[sheet_name] = generate_hardness_out_in_values(lot_no)
             case 'dimension':
                 sheet_data[sheet_name] = generate_dimension_values(lot_no)
+            case 'dimension_app':
+                sheet_data[sheet_name] = generate_dimension_app_values(lot_no)
+            case 'centering':
+                sheet_data[sheet_name] = generate_centering_values(lot_no)
     
     converted_data = convert_sheet_data(sheet_data)
 
         spec = ""
 
     data = {
+        "code": first_result.PRO1,
         "customer": first_result.PRO1C,
         "inspect_date": "2025-01-15",
         "lot_no": lot_no,
         "size": size_str,
-        "pcs": pcs,
+        "lot_size": pcs,
         "spec": spec,
         # "hardness_out.acc": True,  # Hide rows 24 to 28 if the prefix is "0"
         # "hardness_out.spe_acc": False,  # Hide rows 24 to 28 if the prefix is "0"