coi template update

app/core/utils.py

@@ -236,7 +236,8 @@ SHEET_NAMES = {
     'dimension_app': '5.1 Dimension Appearance',
     'dimension_app_drawing': '5.2 Dimension Appearance + Drawing',
     'dimension_bal_weight': '6. Dimension Balance/Weight',
-    'dim_bal_app_hard': '7. Dimension Balance/Appearance/Hardness',
+    'dim_bal_app_hard': '7.1 Dimension Balance/Appearance/Hardness',
+    'dim_bal_app_hard_stamp': '7.2 Dimension Balance/Appearance/Hardness + Stamp',
     'dim_bal_app_rot_hard': '8. Dimension Balance/Appearance/Rotation/Hardness',
     'thickness_8_point': '9. Thickness 8 Points',
     'centering': '10. Centering',

app/report/views.py

@@ -694,7 +694,7 @@ def generate_dim_bal_app_hard_values(lot_no, first_result, code):
             # 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
+    placeholders['v8_0'] = placeholders['v16_0'] = in_limit
 
     pprint(placeholders)
     pprint(manual_size_records) 
@@ -766,13 +766,13 @@ def generate_dim_bal_app_hard_values(lot_no, first_result, code):
             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) 
+                    placeholders[f'v{idx}_{index}']  = getattr(r, v, "-") 
         if r.row_no == 2:
             rmap = {'OUT': 14, 'MID': 15, 'IN': 16}
             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)
+                    placeholders[f'v{idx}_{index}']  = getattr(r, v, "-")
 
     # hide_con(placeholders, "v5_1", "26:32")
     placeholders['inspect_date'] = inspect_date.strftime('%Y/%m/%d') if inspect_date else "-"
@@ -1061,6 +1061,8 @@ def create_coi_file(lot_no, sheets, user, md):
             sheet_data[sheet_name] = generate_t8_values(lot_no, code)
         elif sheet_name == 'dim_bal_app_hard':
             sheet_data[sheet_name] = generate_dim_bal_app_hard_values(lot_no, first_result, code)
+        elif sheet_name == 'dim_bal_app_hard_stamp':
+            sheet_data[sheet_name] = generate_dim_bal_app_hard_values(lot_no, first_result, code)
         elif sheet_name == 'dim_bal_app_rot_hard':
             sheet_data[sheet_name] = generate_dim_bal_app_rot_hard_values(lot_no, first_result, code)