both side

app/report/views.py

     else:
         placeholders[mark_value] = f"0[{hide_rows}]"
 
+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}'] = " "
+    return placeholders
+
 def generate_hardness_out_values(lot_no):
     """
     Generate a dictionary of placeholder values for a given lot_no.
     :return: A dictionary with placeholders (e.g., v1_1, v1_2, ...) as keys and their respective values.
     """
     # Query the Data model for records matching the given lot_no
-    records = Data.objects.filter(lot_no=lot_no).order_by('row_no')
+    # records = Data.objects.filter(lot_no=lot_no).order_by('row_no')
+    data_h1 = list(Data.objects.filter(lot_no=lot_no).order_by('row_no'))
+    data_h2 = list(DataRl.objects.filter(lot_no=lot_no).order_by('row_no'))
+
+    records = list(chain(data_h1, data_h2))
+    
     print(f"records {lot_no} = {records.values()}")
     # Initialize an empty dictionary to store placeholder values
-    placeholders = {}
+    placeholders = clear_values(2,5)
 
     # Iterate over the records to populate placeholder values
     for record_idx, record in enumerate(records, start=1):
 
 def generate_hardness_out_in_values(lot_no):
     # Fetch records from the Data model
-    records = Data.objects.filter(lot_no=lot_no).order_by('row_no')
+    # records = Data.objects.filter(lot_no=lot_no).order_by('row_no')
+    data_h1 = list(Data.objects.filter(lot_no=lot_no).order_by('row_no'))
+    data_h2 = list(DataRl.objects.filter(lot_no=lot_no).order_by('row_no'))
+
+    records = list(chain(data_h1, data_h2))
+
     out_data = []
     in_data = []
 
             in_data.append(record)
 
     # Prepare placeholders
-    placeholders = {}
+    # placeholders = {}
+    placeholders = clear_values(4,5)
     for idx, record in enumerate(out_data, start=1):
         placeholders[f'v{idx}_1'] = record.p1
         placeholders[f'v{idx}_2'] = record.p2
     
     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}'] = " "
+def generate_hardness_both_size_values(lot_no, ms):
+    # Fetch records from the Data model
+    # records = Data.objects.filter(lot_no=lot_no).order_by('row_no')
+    data_h1 = list(Data.objects.filter(lot_no=lot_no).order_by('row_no', 'sub_order'))
+    data_h2 = list(DataRl.objects.filter(lot_no=lot_no).order_by('row_no', 'sub_order'))
+
+    records = list(chain(data_h1, data_h2))
+
+    out_data = []
+    in_data = []
+
+    placeholders = clear_values(20,5)
+    # Separate OUT and IN data
+    for idx, record in enumerate(records, start=0):
+        if record.sub_order == 1:
+            for i,v in enumerate(["p1", "p2", "p3", "avg", "rgrade"],start=1):
+                placeholders[f"v{idx*2+1}_{i}"] = getattr(record,v)
+        if record.sub_order == 2:
+            for i,v in enumerate(["p1", "p2", "p3", "avg", "rgrade"],start=1):
+                placeholders[f"v{idx*2+2}_{i}"] = getattr(record,v)
+    # Prepare placeholders
+    # placeholders = {}
     return placeholders
 
+
 # # Example usage:
 # placeholders_dict = clear_values(6, 3)
 # print(placeholders_dict)
     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]
+    data_ms_records = DataMs.objects.filter(lot_no=lot_no).order_by('row_no')
 
     # Prepare placeholders
 
             placeholders[f'v6_2'] = r.hsize
             placeholders[f'v6_3'] = r.hsizeok
 
-    hide_con(placeholders, "v4_2", "24:28")
+    hide_con(placeholders, "v4_1", "24:28")
     return placeholders
 
 def is_ok(instance):
     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]
+    data_ms_records = DataMs.objects.filter(lot_no=lot_no).order_by('row_no')
 
     # Prepare placeholders
 
     hide_con(placeholders, "v5_1", "26:32")
     return placeholders
 
+def generate_dimension_bal_weight_values(lot_no, ms):
+    """
+    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')
+
+    data_wb = DataWb.objects.filter(lot_no=lot_no).order_by('row_no')
+    
+    data_h1 = list(Data.objects.filter(lot_no=lot_no).order_by('row_no'))
+    data_h2 = list(DataRl.objects.filter(lot_no=lot_no).order_by('row_no'))
+
+    data_ho = list(chain(data_h1, data_h2))
+    # 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) 
+    
+    if ms:
+        w = ms.PRO6
+        placeholders['v4_1'] = placeholders['v9_1'] = w
+
+    for m in manual_size_records:
+        if m.size_name == "D":
+            placeholders['v1_1'] = placeholders['v6_1'] = f'D{m.std} +{m.tolup} {m.tolun}'
+        if m.size_name == "T":
+            placeholders['v2_1'] = placeholders['v7_1'] = f'T{m.std} +{m.tolup} {m.tolun}'
+        if m.size_name == "H":
+            placeholders['v3_1'] = placeholders['v8_1'] = f'H{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'v6_2'] = r.dsize
+            placeholders[f'v6_3'] = r.dsizeok
+            
+            placeholders[f'v7_2'] = r.tsize
+            placeholders[f'v7_3'] = r.tsizeok
+            
+            placeholders[f'v8_2'] = r.hsize
+            placeholders[f'v8_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'
+
+    for r in data_wb:
+        if r.row_no == 1:
+            placeholders["v4_2"] = r.result
+            placeholders["v4_3"] = r.judgement
+            placeholders["v5_2"] = r.weight
+            placeholders["v5_3"] = r.judgement
+        if r.row_no == 2:
+            placeholders["v9_2"] = r.result
+            placeholders["v9_3"] = r.judgement
+            placeholders["v10_2"] = r.weight
+            placeholders["v10_3"] = r.judgement
+    # hide_con(placeholders, "v5_1", "26:32")
+    return placeholders
+
 def generate_dim_bal_app_hard_values(lot_no, first_result):
     """
     Fetch dimension records from manualSize and DataMs models
     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]
-    data_wb = DataWb.objects.filter(lot_no=lot_no).order_by('row_no')[:2]
+    data_ms_records = DataMs.objects.filter(lot_no=lot_no).order_by('row_no')
+    data_wb = DataWb.objects.filter(lot_no=lot_no).order_by('row_no')
     
-    data_h1 = list(Data.objects.filter(lot_no=lot_no).order_by('row_no')[:2])
-    data_h2 = list(DataRl.objects.filter(lot_no=lot_no).order_by('row_no')[:2])
+    data_h1 = list(Data.objects.filter(lot_no=lot_no).order_by('row_no'))
+    data_h2 = list(DataRl.objects.filter(lot_no=lot_no).order_by('row_no'))
 
     data_ho = list(chain(data_h1, data_h2))
 
     # hide_con(placeholders, "v5_1", "26:32")
     return placeholders
 
+def generate_dim_bal_app_rot_hard_values(lot_no, first_result):
+    """
+    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')
+    data_wb = DataWb.objects.filter(lot_no=lot_no).order_by('row_no')
+    
+    data_h1 = list(Data.objects.filter(lot_no=lot_no).order_by('row_no'))
+    data_h2 = list(DataRl.objects.filter(lot_no=lot_no).order_by('row_no'))
+
+    data_ho = list(chain(data_h1, data_h2))
+
+
+    rotates = RotateData.objects.filter(lot_no=lot_no).order_by('row_no')
+
+    if first_result:
+        out_limit = f"Out 外  ({first_result.MI18} - {first_result.MI19})"
+        in_limit = f"In 内 ({first_result.MI22} - {first_result.MI23})"
+        mid_limit = f"Middle   中  -"
+    else:
+        out_limit = f"Out 外"
+        in_limit = f"In 内"
+        mid_limit = f"Middle   中"
+    
+    
+
+    # Prepare placeholders
+
+    # placeholders = {}
+    placeholders = clear_values(18,5)
+    # for i in range(1,7):
+        # for j in range(1,4):
+            # placeholders[f'v{i}_{j}'] = 0
+    placeholders['v6_0'] = placeholders['v14_0'] = out_limit
+    placeholders['v7_0'] = placeholders['v15_0'] = mid_limit
+    placeholders['v18_0'] = placeholders['v16_0'] = in_limit
+
+    pprint(placeholders)
+    pprint(manual_size_records) 
+    if first_result:
+        w = first_result.PRO6
+        placeholders['v4_1'] = placeholders['v13_1'] = w
+
+    for m in manual_size_records:
+        if m.size_name == "D":
+            placeholders['v1_1'] = placeholders['v10_1'] = f'D{m.std} +{m.tolup} {m.tolun}'
+        if m.size_name == "T":
+            placeholders['v2_1'] = placeholders['v11_1'] = f'T{m.std} +{m.tolup} {m.tolun}'
+        if m.size_name == "H":
+            placeholders['v3_1'] = placeholders['v12_1'] = f'H{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'v10_2'] = r.dsize
+            placeholders[f'v10_3'] = r.dsizeok
+            
+            placeholders[f'v11_2'] = r.tsize
+            placeholders[f'v11_3'] = r.tsizeok
+            
+            placeholders[f'v12_2'] = r.hsize
+            placeholders[f'v12_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'
+
+    for r in data_wb:
+        if r.row_no == 1:
+            placeholders["v4_2"] = r.weight
+            placeholders["v4_3"] = r.judgement
+        if r.row_no == 2:
+            placeholders["v13_2"] = r.weight
+            placeholders["v13_3"] = r.judgement
+
+    for r in data_ho:
+        if r.row_no == 1:
+            rmap = {'OUT': 7, 'MID': 8, 'IN': 9}
+            for index, v in enumerate(["p1", "p2", "p3", "avg", "rgrade"], start=1):
+                idx = rmap.get(r.r_type, None)
+                if idx:
+                    placeholders[f'v{idx}_{index}']  = getattr(r, v) 
+        if r.row_no == 2:
+            rmap = {'OUT': 16, 'MID': 17, 'IN': 18}
+            for index, v in enumerate(["p1", "p2", "p3", "avg", "rgrade"], start=1):
+                idx = rmap.get(r.r_type, None)
+                if idx:
+                    placeholders[f'v{idx}_{index}']  = getattr(r, v)
+
+    for r in rotates:
+        if r.row_no == 1:
+            placeholders["v6_1"] = r.speed_spec
+            placeholders["v6_2"] = r.speed_test
+            placeholders["v6_3"] = r.speedok
+        if r.row_no == 2:
+            placeholders["v15_1"] = r.speed_spec
+            placeholders["v15_2"] = r.speed_test
+            placeholders["v15_3"] = r.speedok
+
+    # hide_con(placeholders, "v5_1", "26:32")
+    return placeholders
+
 def generate_centering_values(lot_no):
     """
     Fetch dimension records from manualSize and DataMs models
     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]
+    data_ms_records = DataMs.objects.filter(lot_no=lot_no).order_by('row_no')
 
     # Prepare placeholders
 
                 sheet_data[sheet_name] = generate_hardness_out_values(lot_no)
             case 'hardness_out_in':
                 sheet_data[sheet_name] = generate_hardness_out_in_values(lot_no)
+            case 'hardness_both_size':
+                sheet_data[sheet_name] = generate_hardness_both_size_values(lot_no, first_result)
             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)
+            case 'dimension_bal_weight':
+                sheet_data[sheet_name] = generate_dimension_bal_weight_values(lot_no, first_result)
             case 'centering':
                 sheet_data[sheet_name] = generate_centering_values(lot_no)
             case 'thickness_8_point':
                 sheet_data[sheet_name] = generate_t8_values(lot_no)
             case 'dim_bal_app_hard':
                 sheet_data[sheet_name] = generate_dim_bal_app_hard_values(lot_no, first_result)
+            case 'dim_bal_app_rot_hard':
+                sheet_data[sheet_name] = generate_dim_bal_app_rot_hard_values(lot_no, first_result)
     
     converted_data = convert_sheet_data(sheet_data)