sign

app/report/gen_report.py

@@ -8,6 +8,10 @@ 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 django.db import models
+import os
+from django.db.models.fields.files import ImageFieldFile
+from pprint import pprint
 
 def center_image_in_cell(ws, cell_address, img_path):
     """
@@ -98,9 +102,17 @@ def gen_xlsx(template_file, selected_sheets, prefix_filename, data):
                         value = data[sheet_specific_key]
                     elif placeholder in data:
                         value = data[placeholder]
-
+                        
                     if value is not None:
-                        if value is True:
+                        if isinstance(value, ImageFieldFile):
+                            pprint("ImageField")
+                            image_path = value.path
+                            if os.path.exists(image_path):
+                                img = Image(image_path)
+                                img.height = 40  # Adjust size as needed
+                                sheet.add_image(img, cell.coordinate)
+                                cell.value = None  # Clear placeholder
+                        elif value is True:
                             img = Image(checked_image_path)
                             img.width = img.height = 20
                             print(f"{cell.coordinate}")

app/report/templates/report/coi.html

@@ -21,55 +21,31 @@
         🔍
       </button>
     </div>
-    <div class="flex items-center gap-4 mb-4">
       <button class="bg-blue-100 text-blue-700 px-4 py-2 rounded hover:bg-blue-200">
         Option for Export :
       </button>
-      <div class="flex items-center space-x-2">
+        <div class="grid grid-cols-4 gap-4">
+        {% for key,value in SHEET_NAMES.items %}
         <label class="flex items-center space-x-1">
-          <input type="checkbox" class="rounded" name='exports' value='size_dimension'>
-          <span>Size Dimension</span>
+          <input type="checkbox" class="rounded" name='exports' value='{{ key }}' x-model='exports'>
+          <span>{{ value }}</span>
         </label>
-        <label class="flex items-center space-x-1">
-          <input type="checkbox" class="rounded" name='exports' value='grade'>
-          <span>Grade</span>
-        </label>
-        <label class="flex items-center space-x-1">
-          <input type="checkbox" class="rounded" name='exports' value='wb'>
-          <span>WB</span>
-        </label>
-        <label class="flex items-center space-x-1">
-          <input type="checkbox" class="rounded" name='exports' value='fg_weight'>
-          <span>FG Weight</span>
-        </label>
-        <label class="flex items-center space-x-1">
-          <input type="checkbox" class="rounded" name='exports' value='centering'>
-          <span>Centering</span>
-        </label>
-        <label class="flex items-center space-x-1">
-          <input type="checkbox" class="rounded" name='exports' value='ring_test'>
-          <span>Ring Test</span>
-        </label>
-        <label class="flex items-center space-x-1">
-          <input type="checkbox" class="rounded" name='exports' value='rotate'>
-          <span>Rotate</span>
-        </label>
-        <label class="flex items-center space-x-1">
-          <input type="checkbox" class="rounded" name='exports' value='final_judge'>
-          <span>Final Judge</span>
-        </label>
-      </div>
-      <button  type='button' class="bg-blue-500 text-white px-4 py-2 rounded hover:bg-blue-600" 
-        @click="exportCOI">
-        Export Excel
-      </button>
-      <!-- TODO: add download here -->
-      <div class=" text-center" x-show="downloadUrl">
-        <a :href="downloadUrl"  class="px-4 py-2 bg-green-600 text-white font-medium rounded-md hover:bg-green-700 focus:outline-none focus:ring-2 focus:ring-green-500 focus:ring-offset-2" download>
-          Download Report
-        </a>
-      </div>
-    </div>
+        {% endfor %}
+        </div>
+        <div class="flex justify-end my-3 space-x-4">
+          <div>
+            <button  type='button' class="bg-blue-500 text-white px-4 py-2 rounded hover:bg-blue-600" 
+                                   @click="exportCOI">
+              Export Excel
+            </button>
+          </div>
+          <!-- TODO: add download here -->
+          <div class=" text-center" x-show="downloadUrl">
+            <a :href="downloadUrl"  class="block px-4 py-2 bg-green-600 text-white  rounded-md hover:bg-green-700 focus:outline-none focus:ring-2 focus:ring-green-500 focus:ring-offset-2" download>
+              Download Report
+            </a>
+          </div>
+        </div>
   </form>
   {{ result }}
   
@@ -142,6 +118,7 @@
   function COIReport() {
     return {
       lot_no: '', // Bind this to the input value
+      exports: [],
       gen_report_url: '{% url "report:gen_report" %}', 
       downloadUrl: null, // Stores the download link after export success
       init() {
@@ -157,6 +134,7 @@
                   // Make POST request using Axios
                   const response = await axios.post(this.gen_report_url, {
                       lot_no: this.lot_no,
+                      exports: this.exports,
                   });
 
                   if (response.status === 200) {

app/report/views.py

@@ -65,7 +65,7 @@ class ReportCRUDView(ConfigurableCRUDView):
     # config_edit_fields = ["lot_no", "code"]
     ordering = ["-created_at", "-id",]
 
-def create_coi_file(lot_no, user):
+def create_coi_file(lot_no, sheets, user):
 
     data = {
         "customer": "Tum Coder",
@@ -92,10 +92,12 @@ def create_coi_file(lot_no, user):
         "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,
     }
     output_file = gen_xlsx(
         template_file="/app/report/coi_templates.xlsx",
-        selected_sheets=["hardness_out", "dimension_app"],  # Replace with your actual sheet names
+        selected_sheets=sheets,  # Replace with your actual sheet names
         prefix_filename="/app/media/coi",
         data=data
     )
@@ -111,10 +113,25 @@ def create_coi_file(lot_no, user):
     pprint(f"outputfile = {output_file}")
     return report
 
+SHEET_NAMES = {
+    'hardness_out': 'Hardness Out',
+    'hardness_out_in': 'Hardness Out/In', 
+    'hardness_both_size': 'Hardness Both Size',
+    'dimension': 'Dimension',
+    'dimension_app': 'Dimension Appearance',
+    'dimension_bal_weight': 'Dimension Balance/Weight',
+    'dim_bal_app_hard': 'Dimension Balance/Appearance/Hardness',
+    'dim_bal_app_rot_hard': 'Dimension Balance/Appearance/Rotation/Hardness',
+    'thickness_8_point': 'Thickness 8 Points',
+    'centering': 'Centering',
+}
 def coi_view(request):
     pprint(f"xxxx method = xxx {request.method}")
     if request.method == "POST":
         pprint(request.POST)
+        exports = request.POST.getlist("exports")  # Retrieve the list of selected values
+        pprint(f"Selected Export Options: {exports}")
+        
         if 'export' in request.POST:
 
             data = {
@@ -137,7 +154,7 @@ def coi_view(request):
             }
             output_file = gen_xlsx(
                 template_file="/app/report/coi_templates.xlsx",
-                selected_sheets=["hardness_out", "dimension_app"],  # Replace with your actual sheet names
+                selected_sheets=exports,  # Replace with your actual sheet names
                 prefix_filename="/app/media/coi",
                 data=data
             )
@@ -168,11 +185,10 @@ def coi_view(request):
                                                            'size_str': size_str,
                                                            'spec': spec})
 
-        exports = request.POST.getlist("exports")  # Retrieve the list of selected values
-        pprint(f"Selected Export Options: {exports}")
         messages.success(request, "Request Sent")
         return redirect(request.path_info)
-    return render(request, 'report/coi.html')
+    return render(request, 'report/coi.html', {'SHEET_NAMES': SHEET_NAMES})
+
 
 @csrf_exempt  # Disable CSRF for API requests (ensure this is secure in production)
 @login_required
@@ -182,12 +198,13 @@ def gen_report_view(request):
             # Parse JSON data from the request body
             data = json.loads(request.body)
             lot_no = data.get("lot_no")
+            exports = data.get("exports")
 
             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, request.user)
+            report = create_coi_file(lot_no, exports, request.user)
 
             # Return a success response with the report details
             return JsonResponse({