last update

app/coi/settings.py

@@ -184,11 +184,11 @@ AUTH_PASSWORD_VALIDATORS = [
 
 LANGUAGE_CODE = "en-us"
 
-TIME_ZONE = "Asia/Bangkok"
+#TIME_ZONE = "Asia/Bangkok"
 
 USE_I18N = True
 
-USE_TZ = True
+#USE_TZ = True
 
 
 # Static files (CSS, JavaScript, Images)

app/core/utils.py

@@ -229,7 +229,8 @@ def queryFromMaster(lot_no):
 
 SHEET_NAMES = {
     'hardness_out': '1. Hardness Out',
-    'hardness_out_in': '2. Hardness Out/In', 
+    'hardness_out_in': '2.1 Hardness Out/In', 
+    'hardness_out_in_4': '2.2 Hardness Out/In 4 Points', 
     'hardness_both_size': '3. Hardness Both Size',
     'dimension': '4.1 Dimension',
     'dimension_weight_warp': '4.2 Dimension/Weight/Warp',

app/report/gen_report.py

@@ -15,7 +15,7 @@ from pprint import pprint
 from PIL import Image as PILImage
 from openpyxl.drawing.xdr import XDRPoint2D, XDRPositiveSize2D
 from openpyxl.utils.units import pixels_to_EMU
-from openpyxl.drawing.spreadsheet_drawing import AnchorMarker, TwoCellAnchor
+from openpyxl.drawing.spreadsheet_drawing import AnchorMarker, TwoCellAnchor,  OneCellAnchor
 from django.conf import settings
 
 def set_image_with_offset_old(sheet, img, cell_coordinate, offset_x=0, offset_y=0):
@@ -95,10 +95,64 @@ def set_image_with_offset(sheet, img, cell_coordinate, offset_x=0, offset_y=0):
     # Add the image to the worksheet
     sheet.add_image(img)
 
-
+from openpyxl.drawing.xdr import XDRPositiveSize2D
 
 def center_image_in_cell(sheet, img, cell_coordinate):
     """
+    Center an image inside a specified cell using OneCellAnchor.
+    """
+
+    # Extract column and row (e.g. "C3")
+    col_letter = ''.join(filter(str.isalpha, cell_coordinate))
+    row_number = int(''.join(filter(str.isdigit, cell_coordinate)))
+    col_idx = column_index_from_string(col_letter) - 1  # Zero-based index
+
+    # Get cell size (Excel default values if not set)
+    col_width = sheet.column_dimensions[col_letter].width or 8.43
+    row_height = sheet.row_dimensions[row_number].height or 15
+
+    # Convert Excel column/row units → pixels
+    col_pixels = col_width * 7.5
+    row_pixels = row_height * 0.75
+
+    # Image size (already in pixels)
+    img_width, img_height = img.width, img.height
+
+    # Calculate centering offset inside the cell
+    offset_x_px = max((col_pixels - img_width) / 2, 0)
+    offset_y_px = max((row_pixels - img_height) / 2, 0)
+
+    offset_x_px += 40
+    offset_y_px -= 50
+
+    # Convert pixel offset to EMU
+    offset_x = pixels_to_EMU(offset_x_px)
+    offset_y = pixels_to_EMU(offset_y_px)
+
+    # Create the `_from` anchor marker (top-left corner)
+    _from = AnchorMarker(
+        col=col_idx,
+        row=row_number - 1,
+        colOff=offset_x,
+        rowOff=offset_y
+    )
+
+    # Create XDRPositiveSize2D for ext (width & height in EMU)
+    ext = XDRPositiveSize2D(
+        cx=pixels_to_EMU(img_width),
+        cy=pixels_to_EMU(img_height)
+    )
+
+    # Final anchor using OneCellAnchor
+    img.anchor = OneCellAnchor(
+        _from=_from,
+        ext=ext
+    )
+
+    sheet.add_image(img)
+
+def center_image_in_cell_old(sheet, img, cell_coordinate):
+    """
     Center an image inside a specified cell.
 
     :param sheet: The worksheet
@@ -122,7 +176,7 @@ def center_image_in_cell(sheet, img, cell_coordinate):
     img_width, img_height = img.width, img.height
 
     # Calculate offsets to center the image
-    offset_x = int((col_pixels - img_width) / 2 * pixels_to_EMU(1))  # Center horizontally
+    offset_x = int((col_pixels - img_width) / 2 * pixels_to_EMU(1)) + 100 # Center horizontally
     offset_y = int((row_pixels - img_height) / 2 * pixels_to_EMU(1))  # Center vertically
 
     # Define the anchor for the image
@@ -201,9 +255,10 @@ def gen_xlsx(template_file, selected_sheets, prefix_filename, data):
 
                                 # Desired height (e.g., 40), calculate the new width to maintain aspect ratio
                                 row_height = sheet.row_dimensions[cell.row].height
-                                desired_height = int(row_height)
+                                desired_height = int(row_height) 
 
                                 fixed_pixel_height = int(desired_height * 1.33)  # Convert point → pixel
+                                fixed_pixel_height = 100  # Convert point → pixel
 
                                 aspect_ratio = original_width / original_height
                                 new_width = int(fixed_pixel_height * aspect_ratio)
@@ -224,7 +279,7 @@ def gen_xlsx(template_file, selected_sheets, prefix_filename, data):
                                 pprint(f"1.2 = {new_width}, {desired_height}")
                                 # Insert the resized image into the Excel sheet
                                 img = Image(resized_path)
-                                img.width, img.height = new_width, desired_height  # Set the dimensions
+                                img.width, img.height = new_width, fixed_pixel_height  # Set the dimensions
                                 # sheet.add_image(img, cell.coordinate)
                                 print(f"1.3 = {row_height}")
                                 center_image_in_cell(sheet, img, cell.coordinate, )
@@ -240,7 +295,7 @@ def gen_xlsx(template_file, selected_sheets, prefix_filename, data):
                             print(f"{cell.coordinate}")
                             # sheet.add_image(img, cell.coordinate)
                             # set_image_with_offset(sheet, img, cell.coordinate, offset_x=100)
-                            center_image_in_cell(sheet,img, cell.coordinate, )
+                            center_image_in_cell_old(sheet,img, cell.coordinate, )
                             cell.value = None  # Remove the placeholder text
                         elif value is False:
                             img = Image(unchecked_image_path)
@@ -250,7 +305,7 @@ def gen_xlsx(template_file, selected_sheets, prefix_filename, data):
                             img.height = pixels_to_points(10)
                             # sheet.add_image(img, cell.coordinate)
                             # set_image_with_offset(sheet, img, cell.coordinate, offset_x=100)
-                            center_image_in_cell(sheet, img, cell.coordinate, )
+                            center_image_in_cell_old(sheet, img, cell.coordinate, )
                             cell.value = None  # Remove the placeholder text
                         else:
                             # Insert the text value directly

app/report/views.py

@@ -165,29 +165,31 @@ def generate_hardness_out_in_values(lot_no, code):
     for record in records:
         if record.r_type.upper() in ["OUT", "TOP", "FA1", "UPP", "UPPE", "RIM"]:
             out_data.append(record)
-        elif record.r_type.upper() in ["IN", "UNDER", "UND", "FA2", "LOW", "LOWE", "BASE", "SOKO", "IN*"]:
+        elif record.r_type.upper() in ["IN", "UNDER", "UND", "FA2", "LOW", "LOWE", "BASE", "SOKO", "IN*", "INNER"]:
             in_data.append(record)
 
     # Prepare placeholders
     # placeholders = {}
-    placeholders = clear_values(4,5)
+    placeholders = clear_values(4,6)
     inspect_date = None
-    for idx, record in enumerate(out_data, start=1):
+    for idx, record in enumerate(out_data, start=0):
         if idx == 1:
             inspect_date = record.created_at
 
-        placeholders[f'v{idx}_1'] = record.p1
-        placeholders[f'v{idx}_2'] = record.p2
-        placeholders[f'v{idx}_3'] = record.p3
-        placeholders[f'v{idx}_4'] = record.avg
-        placeholders[f'v{idx}_5'] = record.rgrade
+        placeholders[f'v{2*idx+1}_1'] = record.p1
+        placeholders[f'v{2*idx+1}_2'] = record.p2
+        placeholders[f'v{2*idx+1}_3'] = record.p3
+        placeholders[f'v{2*idx+1}_6'] = record.p4  # Checkpoint 3 value
+        placeholders[f'v{2*idx+1}_4'] = record.avg
+        placeholders[f'v{2*idx+1}_5'] = record.rgrade
 
     for idx, record in enumerate(in_data, start=1):
-        placeholders[f'v{len(out_data) + idx}_1'] = record.p1
-        placeholders[f'v{len(out_data) + idx}_2'] = record.p2
-        placeholders[f'v{len(out_data) + idx}_3'] = record.p3
-        placeholders[f'v{len(out_data) + idx}_4'] = record.avg
-        placeholders[f'v{len(out_data) + idx}_5'] = record.rgrade
+        placeholders[f'v{idx*2}_1'] = record.p1
+        placeholders[f'v{idx*2}_2'] = record.p2
+        placeholders[f'v{idx*2}_3'] = record.p3
+        placeholders[f'v{idx*2}_6'] = record.p4
+        placeholders[f'v{idx*2}_4'] = record.avg
+        placeholders[f'v{idx*2}_5'] = record.rgrade
 
     # if "v3_1" in placeholders:
         # placeholders["v3_1"] = f"{placeholders['v3_1']}[25:28]"
@@ -691,11 +693,17 @@ def generate_dim_bal_app_hard_values(lot_no, first_result, code):
         except (TypeError, ValueError):
             out_limit = "Out 外"
 
-        try:
-            in_limit = f"In 内 ({float(first_result.MI22):.2f} - {float(first_result.MI23):.2f})"
-        except (TypeError, ValueError):
-            in_limit = "In 内"
+        mi22 = getattr(first_result, "MI22", None)
+        mi23 = getattr(first_result, "MI23", None)
 
+        # If MI22 is missing, None, 0, or ""
+        if mi22 in (None, 0, "", "0"):
+            in_limit = "In 内: -"
+        else:
+            try:
+                in_limit = f"In 内 ({float(mi22):.2f} - {float(mi23 or 0):.2f})"
+            except (TypeError, ValueError):
+                in_limit = "In 内: -"
         mid_limit = f"Middle   中  -"
     else:
         out_limit = f"Out 外"
@@ -719,19 +727,19 @@ def generate_dim_bal_app_hard_values(lot_no, first_result, code):
     pprint(manual_size_records) 
     if first_result:
         try:
-            w = first_result.PRO6
-            placeholders['v4_1'] = placeholders['v12_1'] = w
+            w = first_result.MI24
+            placeholders['v4_1'] = placeholders['v12_1'] = f"{w}"
         except:
             print("No PRO6")
 
     dimens = AllProductDimensionForInsProcess.objects.filter(ProductCode=code)
     for m in dimens:  # Changed from manual_size_records to dimens
         if m.Size_Name == "D":
-            placeholders['v1_1'] = placeholders['v9_1'] = f'D{m.Std:.2f} +{m.TolUp:.2f} {m.TolUn:.2f}'
+            placeholders['v1_1'] = placeholders['v9_1'] = f'D{m.Std:.2f} +{m.TolUp:.2f}/{m.TolUn:.2f}'
         if m.Size_Name == "T":
-            placeholders['v2_1'] = placeholders['v10_1'] = f'T{m.Std:.2f} +{m.TolUp:.2f} {m.TolUn:.2f}'
+            placeholders['v2_1'] = placeholders['v10_1'] = f'T{m.Std:.2f} +{m.TolUp:.2f}/{m.TolUn:.2f}'
         if m.Size_Name == "H":
-            placeholders['v3_1'] = placeholders['v11_1'] = f'H{m.Std:.2f} +{m.TolUp:.2f} {m.TolUn:.2f}'
+            placeholders['v3_1'] = placeholders['v11_1'] = f'H{m.Std:.2f} +{m.TolUp:.2f}/{m.TolUn:.2f}'
 
     inspect_date = None
     # Ensure that we map each manualSize entry to a corresponding DataMs entry
@@ -773,10 +781,10 @@ def generate_dim_bal_app_hard_values(lot_no, first_result, code):
 
     for r in data_wb:
         if r.row_no == 1:
-            placeholders["v4_2"] = r.weight
+            placeholders["v4_2"] = f"{r.weight:.1f}"
             placeholders["v4_3"] = r.judgement
         if r.row_no == 2:
-            placeholders["v12_2"] = r.weight
+            placeholders["v12_2"] = f"{r.weight:.1f}"
             placeholders["v12_3"] = r.judgement
 
     for r in data_ho:
@@ -827,10 +835,17 @@ def generate_dim_bal_app_rot_hard_values(lot_no, first_result, code):
         except (TypeError, ValueError):
             out_limit = "Out 外"
 
-        try:
-            in_limit = f"In 内 ({float(first_result.MI22):.2f} - {float(first_result.MI23):.2f})"
-        except (TypeError, ValueError):
+        mi22 = getattr(first_result, "MI22", None)
+        mi23 = getattr(first_result, "MI23", None)
+
+        # If MI22 is missing, None, 0, or ""
+        if mi22 in (None, 0, "", "0"):
             in_limit = "In 内"
+        else:
+            try:
+                in_limit = f"In 内 ({float(mi22):.2f} - {float(mi23 or 0):.2f})"
+            except (TypeError, ValueError):
+                in_limit = "In 内"
 
         mid_limit = f"Middle   中  -"
     else:
@@ -911,10 +926,10 @@ def generate_dim_bal_app_rot_hard_values(lot_no, first_result, code):
 
     for r in data_wb:
         if r.row_no == 1:
-            placeholders["v4_2"] = r.weight
+            placeholders["v4_2"] = f"{r.weight:.1f}"
             placeholders["v4_3"] = r.judgement
         if r.row_no == 2:
-            placeholders["v13_2"] = r.weight
+            placeholders["v13_2"] = f"{r.weight:.1f}"
             placeholders["v13_3"] = r.judgement
 
     for r in data_ho:
@@ -1061,6 +1076,8 @@ def create_coi_file(lot_no, sheets, user, md):
             sheet_data[sheet_name] = generate_hardness_out_values(lot_no, code)
         elif sheet_name == 'hardness_out_in':
             sheet_data[sheet_name] = generate_hardness_out_in_values(lot_no, code)
+        elif sheet_name == 'hardness_out_in_4':
+            sheet_data[sheet_name] = generate_hardness_out_in_values(lot_no, code)
         elif sheet_name == 'hardness_both_size':
             sheet_data[sheet_name] = generate_hardness_both_size_values(lot_no, first_result, code)
         elif sheet_name == 'dimension':
@@ -1139,7 +1156,42 @@ def create_coi_file(lot_no, sheets, user, md):
     tn = get_tool_no(mgt_code)
     if tn is None:
         tn = first_result.PRO_TOOL if first_result and first_result.PRO_TOOL else "-"
+# Helper function
+    def safe_float(value):
+        try:
+            return float(value)
+        except (TypeError, ValueError):
+            return 0
+
+    # MP45 or fallback MP34
+    mp45_value = getattr(first_result, "MP45", None)
+    mp45_or_34 = mp45_value if mp45_value not in (None, "") else getattr(first_result, "MP34", "")
+
+    # MP49 or fallback MP39
+    mp49_value = getattr(first_result, "MP49", None)
+    mp49_or_39 = mp49_value if mp49_value not in (None, "") else getattr(first_result, "MP39", None)
+
+    # Build first part (always present)
+    part1 = (
+        f"Hardness: {getattr(first_result, 'ob_Condition', '')}, "
+        f"{mp45_or_34} "
+        f"{safe_float(getattr(first_result, 'MI18', None)):.2f} - "
+        f"{safe_float(getattr(first_result, 'MI19', None)):.2f} "
+        f"({getattr(first_result, 'MI16', '')} {getattr(first_result, 'MI17', '')})"
+    )
+
+    # Build second part only if mp49_or_39 exists
+    if mp49_or_39 not in (None, ""):
+        part2 = (
+            f" {mp49_or_39}: "
+            f"{safe_float(getattr(first_result, 'MI22', None)):.2f} - "
+            f"{safe_float(getattr(first_result, 'MI23', None)):.2f} "
+            f"({getattr(first_result, 'MI20', '')} {getattr(first_result, 'MI21', '')})"
+        )
+    else:
+        part2 = ""  # exclude second part entirely
 
+    std_value = part1 + part2
     data = {
         # "code": first_result.PRO1 if first_result else "-",
         "code": code,
@@ -1149,6 +1201,7 @@ def create_coi_file(lot_no, sheets, user, md):
         "size": size_str,
         "lot_size": pcs,
         "spec": spec,
+        "std": std_value,
         # "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"
         "acc": accept,  # Hide rows 24 to 28 if the prefix is "0"