Dockerfile

Dockerfile

@@ -1,5 +1,7 @@
 # Use Python 3.10-slim as a base
 FROM python:3.10-slim
+ENV PYTHONUNBUFFERED=1
+
 
 # Install system dependencies for MS SQL ODBC (comment out if not using MSSQL)
 # Install system dependencies for MS SQL ODBC and command-line tools

app/legacy/templates/legacy/datacrud_list.html

@@ -30,7 +30,7 @@
     <thead>
         <tr class="bg-gray-100 text-left text-sm uppercase">
             {% for field in fields %}
-                <th class="border border-gray-200 px-4 py-2 text-left">{{ field.verbose_name }}</th>
+            <th class="border border-gray-200 px-4 py-2 text-left">{% firstof field.verbose_name field.name %} </th>
             {% endfor %}
             <th class="py-2 px-4 border-b">Actions</th>
         </tr>

app/report/gen_report.py

@@ -7,53 +7,133 @@ import re
 from openpyxl.drawing.spreadsheet_drawing import AbsoluteAnchor
 from openpyxl.drawing.xdr import XDRPoint2D, XDRPositiveSize2D
 from openpyxl.utils.units import pixels_to_EMU
-from openpyxl.utils import get_column_letter
+from openpyxl.utils import get_column_letter, column_index_from_string
 from django.db import models
 import os
 from django.db.models.fields.files import ImageFieldFile
 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
+
 
-def center_image_in_cell(ws, cell_address, img_path):
+def set_image_with_offset_old(sheet, img, cell_coordinate, offset_x=0, offset_y=0):
     """
-    Center an image in a specific cell.
+    Add an image to the sheet with an offset relative to the top-left corner of a cell.
 
-    Args:
-        ws: The worksheet object.
-        cell_address (str): The cell address (e.g., "B2") where the image will be centered.
-        img_path (str): Path to the image file.
+    :param sheet: The worksheet
+    :param img: The openpyxl Image object
+    :param cell_coordinate: Cell to place the image (e.g., "B2")
+    :param offset_x: Horizontal offset in pixels
+    :param offset_y: Vertical offset in pixels
+    """
+    col_letter = ''.join(filter(str.isalpha, cell_coordinate))  # Extract column letter
+    row_number = int(''.join(filter(str.isdigit, cell_coordinate)))  # Extract row number
 
-    Returns:
-        None
+    # Get column width and row height in pixels
+    col_width = sheet.column_dimensions[get_column_letter(column_index_from_string(col_letter))].width or 10
+    row_height = sheet.row_dimensions[row_number].height or 15
+
+    # Approximate conversion of Excel units to pixels
+    col_pixels = col_width * 7.5  # Excel's ~7.5 pixels per width unit
+    row_pixels = row_height * 0.75  # Approximation for row height in pixels
+
+    # Calculate absolute positions based on offsets
+    anchor_x = col_pixels + offset_x
+    anchor_y = row_pixels + offset_y
+
+    # Set the anchor for the image
+    img.anchor = cell_coordinate
+    img.anchor.dx = int(anchor_x * 9525)  # Convert to EMUs (Excel Measurement Units)
+    img.anchor.dy = int(anchor_y * 9525)  # Convert to EMUs (Excel Measurement Units)
+
+    sheet.add_image(img)
+
+
+def set_image_with_offset(sheet, img, cell_coordinate, offset_x=0, offset_y=0):
     """
-    # Load the image
-    img = Image(img_path)
-    img.width = img.height = 20
-
-    # Get the cell
-    cell = ws[cell_address]
-
-    # Approximate pixel dimensions of the cell
-    col_letter = get_column_letter(cell.column)
-    col_width = ws.column_dimensions[col_letter].width or 10  # Default width
-    row_height = ws.row_dimensions[cell.row].height or 15  # Default height
-
-    # Convert dimensions to pixels
-    col_width_pixels = col_width * 7  # Approximation: 1 Excel unit = ~7 pixels
-    row_height_pixels = row_height * 0.75  # Approximation: 1 Excel unit = ~0.75 pixels
-
-    # Calculate the center position
-    cell_left = pixels_to_EMU(cell.column - 1)  # Column start position in EMU
-    cell_top = pixels_to_EMU((cell.row - 1) * row_height_pixels)  # Row start position in EMU
-    x_center = cell_left + pixels_to_EMU((col_width_pixels - img.width) / 2)
-    y_center = cell_top + pixels_to_EMU((row_height_pixels - img.height) / 2)
-
-    # Set the image position and size
-    position = XDRPoint2D(x_center, y_center)
+    Add an image to the sheet with an offset relative to the top-left corner of a cell.
+
+    :param sheet: The worksheet
+    :param img: The openpyxl Image object
+    :param cell_coordinate: Cell to place the image (e.g., "B2")
+    :param offset_x: Horizontal offset in pixels
+    :param offset_y: Vertical offset in pixels
+    """
+    # Extract the column and row from the cell coordinate
+    col_letter = ''.join(filter(str.isalpha, cell_coordinate))  # Extract column letter
+    row_number = int(''.join(filter(str.isdigit, cell_coordinate)))  # Extract row number
+
+    # Get the zero-based indices for the cell
+    col_idx = column_index_from_string(col_letter) - 1
+    row_idx = row_number - 1
+
+    # Approximate column width and row height to pixels
+    col_width = sheet.column_dimensions[col_letter].width or 10  # Default column width
+    row_height = sheet.row_dimensions[row_number].height or 15  # Default row height
+
+    # Convert column width and row height to pixels
+    col_pixels = col_width * 7.5  # Approximation: ~7.5 pixels per width unit
+    row_pixels = row_height * 0.75  # Approximation: ~0.75 pixels per height unit
+
+    # Calculate the position in pixels for the top-left corner of the cell
+    cell_x = col_idx * col_pixels
+    cell_y = row_idx * row_pixels
+
+    # Apply the offsets
+    final_x = cell_x + offset_x
+    final_y = cell_y + offset_y
+
+    # Convert to EMUs
+    pos = XDRPoint2D(pixels_to_EMU(final_x), pixels_to_EMU(final_y))
     size = XDRPositiveSize2D(pixels_to_EMU(img.width), pixels_to_EMU(img.height))
-    img.anchor = AbsoluteAnchor(pos=position, ext=size)
+
+    # Set the image's anchor with the position and size
+    img.anchor = AbsoluteAnchor(pos=pos, ext=size)
 
     # Add the image to the worksheet
-    ws.add_image(img)
+    sheet.add_image(img)
+
+
+
+def center_image_in_cell(sheet, img, cell_coordinate):
+    """
+    Center an image inside a specified cell.
+
+    :param sheet: The worksheet
+    :param img: The openpyxl Image object
+    :param cell_coordinate: The cell to center the image in (e.g., "C3")
+    """
+    # Extract column and row from the cell coordinate
+    col_letter = ''.join(filter(str.isalpha, cell_coordinate))  # Extract column letter
+    row_number = int(''.join(filter(str.isdigit, cell_coordinate)))  # Extract row number
+    col_idx = column_index_from_string(col_letter) - 1  # Convert to zero-based column index
+
+    # Get cell dimensions
+    col_width = sheet.column_dimensions[col_letter].width or 10  # Default width if not set
+    row_height = sheet.row_dimensions[row_number].height or 15  # Default height if not set
+
+    # Convert dimensions to pixels (approximation)
+    col_pixels = col_width * 7.5  # 1 Excel column width unit ≈ 7.5 pixels
+    row_pixels = row_height * 0.75  # 1 Excel row height unit ≈ 0.75 pixels
+
+    # Get image dimensions
+    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_y = int((row_pixels - img_height) / 2 * pixels_to_EMU(1))  # Center vertically
+
+    # Define the anchor for the image
+    _from = AnchorMarker(col=col_idx, row=row_number - 1, colOff=offset_x, rowOff=offset_y)
+    to = AnchorMarker(col=col_idx + 1, row=row_number, colOff=-offset_x, rowOff=-offset_y)
+
+    # Use TwoCellAnchor for positioning
+    img.anchor = TwoCellAnchor(editAs="oneCell", _from=_from, to=to)
+
+    # Add the image to the sheet
+    sheet.add_image(img)
 
 
 def gen_xlsx(template_file, selected_sheets, prefix_filename, data):
@@ -89,7 +169,7 @@ def gen_xlsx(template_file, selected_sheets, prefix_filename, data):
 
         # Replace placeholders with actual values
         # Handle hiding rows based on patterns in data
-        
+         
         for row in sheet.iter_rows():
             for cell in row:
                 if cell.value and isinstance(cell.value, str) and cell.value.startswith("<") and cell.value.endswith(">"):
@@ -108,21 +188,41 @@ def gen_xlsx(template_file, selected_sheets, prefix_filename, data):
                             pprint("ImageField")
                             image_path = value.path
                             if os.path.exists(image_path):
+                                # img = Image(image_path)
+                                # img.height = 40  # Adjust size as needed
+                                pil_img = PILImage.open(image_path)
+                                original_width, original_height = pil_img.size
+
+                                # Desired height (e.g., 40), calculate the new width to maintain aspect ratio
+                                desired_height = 40
+                                aspect_ratio = original_width / original_height
+                                new_width = int(desired_height * aspect_ratio)
+
+                                # Resize the image using Pillow (optional, for saving memory during export)
+                                resized_img = pil_img.resize((new_width, desired_height), PILImage.Resampling.LANCZOS)
+                                resized_img.save(image_path)  # Save the resized image back to the same path
+
+                                # Insert the resized image into the Excel sheet
                                 img = Image(image_path)
-                                img.height = 40  # Adjust size as needed
-                                sheet.add_image(img, cell.coordinate)
+                                img.width, img.height = new_width, desired_height  # Set the dimensions
+                                # sheet.add_image(img, cell.coordinate)
+                                center_image_in_cell(sheet, img, cell.coordinate, )
                                 cell.value = None  # Clear placeholder
+
                         elif value is True:
                             img = Image(checked_image_path)
-                            img.width = img.height = 20
+                            img.width = img.height = 10
                             print(f"{cell.coordinate}")
-                            sheet.add_image(img, 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, )
                             cell.value = None  # Remove the placeholder text
                         elif value is False:
                             img = Image(unchecked_image_path)
-                            img.width = img.height = 20
-                            sheet.add_image(img, cell.coordinate)
-                            # center_image_in_cell(sheet, cell.coordinate, unchecked_image_path)
+                            img.width = img.height = 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, )
                             cell.value = None  # Remove the placeholder text
                         else:
                             # Insert the text value directly

app/report/templates/report/coi.html

@@ -8,12 +8,6 @@
   <h1 class="text-2xl font-bold text-gray-800">Export Center</h1>
   <form method='post'>
     {% csrf_token %}
-    <div class="flex items-center justify-between mb-4">
-      <h1 class="text-lg font-bold text-gray-800">TKX Certificate Issue</h1>
-      <button class="bg-gray-300 text-gray-700 px-4 py-2 rounded hover:bg-gray-400">
-        รายละเอียด CheckedBy|ApproveBy
-      </button>
-    </div>
     <div class="flex items-center gap-2 mb-4">
       <label for="lot-number" class="text-gray-700 font-medium">Lot No. :</label>
       <input id="lot-number" type="text" class="border border-gray-300 rounded px-4 py-2 focus:outline-blue-500" placeholder="Enter Lot No." name='lot_no' required x-model="lot_no">
@@ -35,7 +29,7 @@
         <div class="grid grid-cols-2 gap-4">
           <div class="my-4">
             <label for="qa1" class="block mb-2 text-sm font-medium text-gray-900">Select QA.1</label>
-            <select id="qa1" name="qa1" class="block w-full px-3 py-2 bg-white border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500">
+            <select id="qa1" name="qa1" class="block w-full px-3 py-2 bg-white border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500" x-model='qa1'>
               <option value="" disabled selected>Choose a user</option>
               {% for user in users %}
               <option value="{{ user.id }}">{{ user.profile }}</option>
@@ -44,7 +38,7 @@
           </div>
           <div class="my-4">
             <label for="qa2" class="block mb-2 text-sm font-medium text-gray-900">Select QA.2</label>
-            <select id="qa2" name="qa2" class="block w-full px-3 py-2 bg-white border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500">
+            <select id="qa2" name="qa2" class="block w-full px-3 py-2 bg-white border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500" x-model='qa2'>
               <option value="" disabled selected>Choose a user</option>
               {% for user in users %}
               <option value="{{ user.id }}">{{ user.profile }}</option>
@@ -139,10 +133,14 @@
     return {
       lot_no: '', // Bind this to the input value
       exports: [],
+      qa1: null,
+      qa2: null,
       gen_report_url: '{% url "report:gen_report" %}', 
       downloadUrl: null, // Stores the download link after export success
       init() {
         //alert("COI Report");
+        this.qa1 = '';
+        this.qa2 = '';
       },
       async exportCOI() {
               if (!this.lot_no) {
@@ -155,6 +153,8 @@
                   const response = await axios.post(this.gen_report_url, {
                       lot_no: this.lot_no,
                       exports: this.exports,
+                      qa1: this.qa1,
+                      qa2: this.qa2
                   });
 
                   if (response.status === 200) {

app/report/views.py

@@ -16,6 +16,7 @@ from django.http import JsonResponse, HttpResponseBadRequest
 import json
 from django.contrib.auth.decorators import login_required
 from django.contrib.auth.models import User
+from legacy.models import Data
 
 
 def index(request):
@@ -67,7 +68,76 @@ class ReportCRUDView(ConfigurableCRUDView):
     # config_edit_fields = ["lot_no", "code"]
     ordering = ["-created_at", "-id",]
 
-def create_coi_file(lot_no, sheets, user):
+def convert_sheet_data(sheet_data):
+    """
+    Convert sheet_data to the required form with prefixed keys.
+    
+    :param sheet_data: Dictionary with sheet names as keys and their data as values.
+    :return: Dictionary in the required key-value format.
+    """
+    converted_data = {}
+
+    for sheet_name, data in sheet_data.items():
+        for key, value in data.items():
+            # Prefix each key with the sheet name
+            converted_key = f"{sheet_name}.{key}"
+            converted_data[converted_key] = value
+
+    return converted_data
+
+def generate_hardness_out_values(lot_no):
+    """
+    Generate a dictionary of placeholder values for a given lot_no.
+
+    :param lot_no: The lot number to query data for.
+    :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')
+    print(f"records {lot_no} = {records.values()}")
+    # Initialize an empty dictionary to store placeholder values
+    placeholders = {}
+
+    # Iterate over the records to populate placeholder values
+    for record_idx, record in enumerate(records, start=1):
+        placeholders[f'v{record_idx}_1'] = record.p1  # Checkpoint 1 value
+        placeholders[f'v{record_idx}_2'] = record.p2  # Checkpoint 2 value
+        placeholders[f'v{record_idx}_3'] = record.p3  # Checkpoint 3 value
+        placeholders[f'v{record_idx}_4'] = record.avg  # Average value
+        placeholders[f'v{record_idx}_5'] = record.rgrade  # Judgment value
+
+    return placeholders
+
+def merge_sheet_data_with_data(sheet_data, data):
+    """
+    Merge `sheet_data` with `data`.
+
+    :param sheet_data: Dictionary containing the sheet-specific data.
+    :param data: Dictionary containing general data.
+    :return: A merged dictionary combining both `sheet_data` and `data`.
+    """
+    # Merge dictionaries using unpacking
+    merged_data = {**data, **sheet_data}
+
+    return merged_data
+
+def create_coi_file(lot_no, sheets, user, md):
+    pprint("---- create_coi_file ---")
+    pprint(md)
+    qa1 = User.objects.get(pk=md['qa1'])
+    qa2 = User.objects.get(pk=md['qa2'])
+
+    pprint(qa1)
+    pprint(qa2)
+    
+    sheet_data = {}
+    for sheet_name in sheets:
+        if sheet_name == 'hardness_out':
+            sheet_data[sheet_name] = generate_hardness_out_values(lot_no)
+    converted_data = convert_sheet_data(sheet_data)
+
+    print(f"sheet_data \n {sheet_data}") 
+    print(f"converted_data \n {converted_data}")
 
     data = {
         "customer": "Tum Coder",
@@ -78,30 +148,32 @@ def create_coi_file(lot_no, sheets, user):
         "size": "Large",
         "pcs": "10 pcs",
         "spec": "Spec-A",
-        "hardness_out.d1_act": "10",
-        "hardness_out.d2_act": "0[24:28]",  # Hide rows 24 to 28 if the prefix is "0"
         "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"
-        "hardness_out.qa1": "Hello world",
-        "hardness_out.qa2": "Unknow person",
-        "hardness_out.v11": 5,
-        "hardness_out.v12": 15,
-        "hardness_out.v13": 10,
-        "hardness_out.v21": 9,
-        "hardness_out.v22": 8,
-        "hardness_out.v23": 7,
+        "acc": True,  # Hide rows 24 to 28 if the prefix is "0"
+        "spe_acc": True,  # Hide rows 24 to 28 if the prefix is "0"
+        # "hardness_out.qa1": f"{qa1.first_name} {qa1.last_name}",
+        # "hardness_out.qa2": f"{qa2.first_name} {qa2.last_name}",
+        "qa1": f"{qa1.first_name} {qa1.last_name}",
+        "qa2": f"{qa2.first_name} {qa2.last_name}",
         "dimension_app.d1_act": "33",
         "dimension_app.d2_act": "0[26:32]",  # Hide rows 24 to 28 if the prefix is "0"
         "dimension_app.acc": True,  # Hide rows 24 to 28 if the prefix is "0"
         "dimension_app.spe_acc": True,  # Hide rows 24 to 28 if the prefix is "0"
-        "sign1": user.profile.signed_picture,
-        "sign2": user.profile.signed_picture,
+        "sign1": qa1.profile.signed_picture,
+        "sign2": qa2.profile.signed_picture,
+        "pos1": qa1.profile.get_position_display(),
+        "pos2": qa2.profile.get_position_display()
     }
+    merged_data = merge_sheet_data_with_data(converted_data, data)
+    pprint(f"---- merged_data ---")
+    pprint(merged_data)
+
     output_file = gen_xlsx(
         template_file="/app/report/coi_templates.xlsx",
         selected_sheets=sheets,  # Replace with your actual sheet names
         prefix_filename="/app/media/coi",
-        data=data
+        data=merged_data
     )
     report = Report.objects.create(
         name=lot_no,
@@ -201,14 +273,17 @@ def gen_report_view(request):
         try:
             # Parse JSON data from the request body
             data = json.loads(request.body)
-            lot_no = data.get("lot_no")
+            lot_no = data.get("lot_no").strip()
             exports = data.get("exports")
+            qa1 = data.get('qa1')
+            qa2 = data.get('qa2')
+            print(f"data = {data}")
 
             if not lot_no:
                 return HttpResponseBadRequest("Missing 'lot_no' in request data")
 
             # Call the `create_coi_file` function with the provided lot_no
-            report = create_coi_file(lot_no, exports, request.user)
+            report = create_coi_file(lot_no, exports, request.user, {'qa1': qa1, 'qa2': qa2})
 
             # Return a success response with the report details
             return JsonResponse({

app/sysadmin/models.py

@@ -19,4 +19,5 @@ class UserProfile(models.Model):
     position = models.CharField(max_length=20, choices=POSITION_CHOICES, blank=True, null=True)  # New position field
 
     def __str__(self):
-        return f"{self.user.username} / {self.user.first_name} {self.user.last_name} #{self.position}"
+        pos = self.get_position_display()
+        return f"{self.user.username} / {self.user.first_name} {self.user.last_name} #{pos}"