en template

app/core/forms.py

@@ -19,7 +19,7 @@ class CustomerTemplateMappingForm(forms.ModelForm):
 
     class Meta:
         model = CustomerTemplateMapping
-        fields = ['customer_name', 'template_names']
+        fields = ['customer_name', 'export_template', 'template_names']
 
     def clean_template_names(self):
         # convert data to list of selected template keys

app/core/management/commands/import_customer_templates.py

@@ -1,53 +1,178 @@
 import csv
+import json
+import re
+from pathlib import Path
+
+from django.contrib.auth.models import User
 from django.core.management.base import BaseCommand
+
 from core.models import CustomerTemplateMapping
-from django.contrib.auth.models import User
-import json
+from core.utils import SHEET_NAMES
+
+
+SKIPPED_SHEET_KEYS = {"hardness_out_in_4"}
+INDEXED_SHEET_KEYS = [
+    key for key in SHEET_NAMES.keys() if key not in SKIPPED_SHEET_KEYS
+]
+
 
 class Command(BaseCommand):
-    help = "Import CustomerTemplateMapping records from a CSV file"
+    help = "Import CustomerTemplateMapping records from legacy JSON CSV or tabular template-index data"
 
     def add_arguments(self, parser):
-        parser.add_argument('csv_path', type=str, help='Path to the CSV file')
-        parser.add_argument('--created_by', type=int, help='User ID to assign as created_by')
+        parser.add_argument("csv_path", type=str, help="Path to the source file")
+        parser.add_argument("--created_by", type=int, help="User ID to assign as created_by")
+        parser.add_argument(
+            "--export-template",
+            dest="export_template",
+            choices=[choice[0] for choice in CustomerTemplateMapping.TEMPLATE_TYPE_CHOICES],
+            default="asean",
+            help="Export template value to assign to imported rows",
+        )
 
     def handle(self, *args, **options):
-        csv_path = options['csv_path']
-        created_by = None
+        source_path = Path(options["csv_path"])
+        if not source_path.exists():
+            self.stderr.write(self.style.ERROR(f"Source file not found: {source_path}"))
+            return
 
-        if options.get('created_by'):
-            try:
-                created_by = User.objects.get(id=options['created_by'])
-            except User.DoesNotExist:
-                self.stdout.write(self.style.ERROR(f"User with ID {options['created_by']} does not exist."))
-                return
+        created_by = self.get_created_by(options.get("created_by"))
+        if options.get("created_by") and created_by is None:
+            return
+
+        rows = self.read_rows(source_path)
+        if not rows:
+            self.stderr.write(self.style.WARNING(f"No rows found in {source_path}"))
+            return
 
-        with open(csv_path, newline='', encoding='utf-8') as csvfile:
-            reader = csv.DictReader(csvfile)
-            count = 0
+        if self.is_legacy_json_format(rows):
+            count = self.import_legacy_json_rows(
+                rows,
+                created_by=created_by,
+                export_template=options["export_template"],
+            )
+        else:
+            count = self.import_tabular_rows(
+                rows,
+                created_by=created_by,
+                export_template=options["export_template"],
+            )
+
+        self.stdout.write(self.style.SUCCESS(f"Imported {count} customer template mappings."))
 
-            for row in reader:
-                name = row.get("customer_name")
-                templates = row.get("template_names")
+    def get_created_by(self, user_id):
+        if not user_id:
+            return None
+        try:
+            return User.objects.get(id=user_id)
+        except User.DoesNotExist:
+            self.stdout.write(self.style.ERROR(f"User with ID {user_id} does not exist."))
+            return None
 
-                if not name or not templates:
-                    self.stderr.write(f"Skipping incomplete row: {row}")
-                    continue
+    def read_rows(self, source_path):
+        with source_path.open(newline="", encoding="utf-8-sig") as handle:
+            sample = handle.read(2048)
+            handle.seek(0)
 
+            if "\t" in sample:
+                dialect = csv.excel_tab
+            else:
                 try:
-                    template_list = json.loads(templates)
-                except json.JSONDecodeError:
-                    self.stderr.write(f"Skipping row with invalid JSON: {templates}")
-                    continue
+                    dialect = csv.Sniffer().sniff(sample, delimiters=",")
+                except csv.Error:
+                    dialect = csv.excel
 
-                CustomerTemplateMapping.objects.update_or_create(
-                    customer_name=name,
-                    defaults={
-                        "template_names": template_list,
-                        "created_by": created_by,
-                    }
-                )
+            reader = csv.reader(handle, dialect)
+            return [row for row in reader if any(cell.strip() for cell in row)]
 
-                count += 1
+    def is_legacy_json_format(self, rows):
+        header = [cell.strip() for cell in rows[0]]
+        return "customer_name" in header and "template_names" in header
 
-        self.stdout.write(self.style.SUCCESS(f"Imported {count} customer template mappings."))
+    def import_legacy_json_rows(self, rows, created_by, export_template):
+        header = [cell.strip() for cell in rows[0]]
+        count = 0
+
+        for row in rows[1:]:
+            data = dict(zip(header, row))
+            customer_name = data.get("customer_name", "").strip()
+            template_names = data.get("template_names", "").strip()
+
+            if not customer_name or not template_names:
+                self.stderr.write(f"Skipping incomplete row: {data}")
+                continue
+
+            try:
+                template_list = json.loads(template_names)
+            except json.JSONDecodeError:
+                self.stderr.write(f"Skipping row with invalid JSON: {template_names}")
+                continue
+
+            CustomerTemplateMapping.objects.update_or_create(
+                customer_name=customer_name,
+                defaults={
+                    "template_names": template_list,
+                    "export_template": export_template,
+                    "created_by": created_by,
+                },
+            )
+            count += 1
+
+        return count
+
+    def import_tabular_rows(self, rows, created_by, export_template):
+        merged = {}
+
+        for row in rows:
+            if len(row) < 6:
+                self.stderr.write(f"Skipping incomplete row: {row}")
+                continue
+
+            customer_name = self.normalize_customer_name(row[1])
+            template_index = row[3].strip()
+
+            if not customer_name:
+                self.stderr.write(f"Skipping row with empty customer_name: {row}")
+                continue
+
+            try:
+                template_key = self.template_key_from_index(template_index)
+            except ValueError as exc:
+                self.stderr.write(f"Skipping row {row}: {exc}")
+                continue
+
+            merged.setdefault(customer_name, set()).add(template_key)
+
+        count = 0
+        for customer_name, template_names in merged.items():
+            ordered_templates = [
+                key for key in INDEXED_SHEET_KEYS if key in template_names
+            ]
+            CustomerTemplateMapping.objects.update_or_create(
+                customer_name=customer_name,
+                defaults={
+                    "template_names": ordered_templates,
+                    "export_template": export_template,
+                    "created_by": created_by,
+                },
+            )
+            count += 1
+
+        return count
+
+    def normalize_customer_name(self, value):
+        cleaned = re.sub(r"\s+", " ", value or "")
+        return cleaned.strip()
+
+    def template_key_from_index(self, raw_value):
+        try:
+            index = int(raw_value)
+        except (TypeError, ValueError) as exc:
+            raise ValueError(f"invalid template index '{raw_value}'") from exc
+
+        if index < 1 or index > len(INDEXED_SHEET_KEYS):
+            raise ValueError(
+                f"template index '{raw_value}' is out of range 1..{len(INDEXED_SHEET_KEYS)}"
+            )
+
+        return INDEXED_SHEET_KEYS[index - 1]

app/core/migrations/0010_customertemplatemapping_export_template.py

@@ -0,0 +1,20 @@
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("core", "0009_mkscodemap"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="customertemplatemapping",
+            name="export_template",
+            field=models.CharField(
+                choices=[("japanese", "Japanese"), ("asean", "ASEAN")],
+                default="japanese",
+                max_length=20,
+            ),
+        ),
+    ]

app/core/models.py

@@ -493,7 +493,17 @@ TEMPLATE_CHOICES = [
 ]
 
 class CustomerTemplateMapping(models.Model):
+    TEMPLATE_TYPE_CHOICES = [
+        ("japanese", "Japanese"),
+        ("asean", "ASEAN"),
+    ]
+
     customer_name = models.CharField(max_length=255)
+    export_template = models.CharField(
+        max_length=20,
+        choices=TEMPLATE_TYPE_CHOICES,
+        default="japanese",
+    )
     template_names = models.JSONField(default=list, blank=True, null=True)  # stores list of template names
 
     created_by = models.ForeignKey(

app/customer_template_mapping_import.tsv

@@ -0,0 +1,75 @@
+1	TAK SPRING INDUSTRY CO.,LTD.	4366866770	10	Paper&E mail	Dimensin and Hardness
+2	TAK SPRING INDUSTRY CO.,LTD.	2366845379	10	Paper&E mail	Dimensin and Hardness
+3	TT FUJI TOOL SUPPORT CO., LTD.	1370235390	1	Paper&E mail	Hardness
+4	Y.S.S. (THAILAND) PUBLIC CO., LTD.	2366866139	10	Paper&E mail	Hardness& Balance
+5	OKAMOTO (THAI) CO.,LTD.	1370020050	1	Paper&E mail	Hardness
+6	MITSUBISHI MATERIALS (THAILAND) CO., LTD.	1366810629	13	Paper&E mail	Centering
+7	MAZDA POWERTRAIN MANUFACTURING (THAILAND) CO., LTD.	1370110091	13	Paper&E mail	Dimensin and Centering
+8	Y.S.S. (THAILAND) PUBLIC CO., LTD.	4370091656	10	Paper&E mail	Dimensin and Hardness
+9	YANGCHING ENTERPRISE CO., LTD.	2366860025	1	Paper&E mail	Hardness
+10	NHK PRECISION (THAILAND) CO., LTD.	5366802066	1	Paper&E mail	Hardness
+11	SIAM CHITA CO.,LTD.	2366866201	1	Paper&E mail	Hardness
+12	NHK PRECISION (THAILAND) CO., LTD.	5366802023	1	Paper&E mail	Hardness
+13	TAKAHASHI SPRING (THAILAND) CO., LTD.	2366825041	1	Paper&E mail	Hardness
+14	SIAM CHITA CO.,LTD.	2366861390	1	Paper&E mail	Hardness
+14	SIAM CHITA CO.,LTD.	1366816228	1	Paper&E mail	Hardness
+14	THAI KYOWA GMB CO., LTD.	1370645858	13	Paper&E mail	Thickness(mm) 8 Point
+15	STARCORE CO.,LTD.	4370091710	1	Paper&E mail	Hardness
+16	THAI KJK CO.,LTD.	4370161778	7	Paper&E mail	Dimension(mm) &Appearance
+17	THAI KJK CO.,LTD.	4370061811	7	Paper&E mail	Dimension(mm) &Appearance
+18	THAI COLD ROLLED STE	4370091273	1	Paper&E mail	Hardness
+19	HIGHLY MARELLI (THAILAND) CO.,LTD.	1370951550	4	Paper&E mail	Dimension(mm)
+20	YANGCHING ENTERPRISE CO., LTD.	4366860160	1	Paper&E mail	Hardness
+21	YANGCHING ENTERPRISE CO., LTD.	4370140711	1	Paper&E mail	Hardness
+22	YANGCHING ENTERPRISE CO., LTD.	4370140738	1	Paper&E mail	Hardness
+23	YANGCHING ENTERPRISE CO., LTD.	4370140690	1	Paper&E mail	Hardness
+24	THAI KJK CO.,LTD.	4370561492	7	Paper&E mail	Dimension(mm) &Appearance
+25	THAI KJK CO.,LTD	1371261727	7	Paper&E mail	Dimension(mm) &Appearance
+26	TAK SPRING INDUSTRY CO.,LTD.	2366845395	10	Paper&E mail	Dimensin and Hardness
+27	JTEKT (THAILAND) CO., LTD.	1371145620	1	Paper&E mail	Hardness
+28	TT FUJI TOOL SUPPORT CO., LTD.	1370535254	1	Paper&E mail	Hardness
+29	SIAM MOLEX CO.,LTD	1371340830	1	Paper&E mail	Hardness
+30	JFE STEEL GALVANIZING (THAILAND) LTD.	4366875095	1	Paper&E mail	Hardness
+31	STARCORE CO.,LTD.	4370091460	1	Paper&E mail	Hardness
+32	THAI KYOWA GMB CO., LTD.	1371140962	13	Paper&E mail	Thickness(mm) 8 Point
+33	AA FINE BLANKING CO.,LTD.	1366843810	1	Paper&E mail	Hardness
+34	SIAM METAL TECHNOLOGY CO.,LTD.	1371261654	1	Paper&E mail	Hardness
+35	SIAM CHITA CO.,LTD.	4366866711	1	Paper&E mail	Hardness
+36	STARCORE CO.,LTD.	4370091567	3	Paper&E mail	Hardness_both_size
+37	THAI KJK CO.,LTD	1371261727	7	Paper&E mail	Dimension(mm) &Appearance
+38	TT FUJI TOOL SUPPORT CO., LTD.	1371651665	1	Paper&E mail	Hardness
+39	TT FUJI TOOL SUPPORT CO., LTD.	1371651657	1	Paper&E mail	Hardness
+39	TT FUJI TOOL SUPPORT CO., LTD.	1371935353	1	Paper&E mail	Hardness
+40	TT FUJI TOOL SUPPORT CO., LTD.	1371640493	1	Paper&E mail	Hardness
+41	JTEKT (THAILAND) CO., LTD.	1370002590	1	Paper&E mail	Hardness
+42	JTEKT (THAILAND) CO., LTD.	1370002582	1	Paper&E mail	Hardness
+43	JTEKT (THAILAND) CO., LTD.	1371245675	1	Paper&E mail	Hardness
+44	JTEKT (THAILAND) CO., LTD.	1371261832	1	Paper&E mail	Hardness
+45	JTEKT (THAILAND) CO., LTD.	1371261840	1	Paper&E mail	Hardness
+46	JTEKT (THAILAND) CO., LTD.	1371245705	1	Paper&E mail	Hardness
+48	JTEKT (THAILAND) CO., LTD.	1371245691	1	Paper&E mail	Hardness
+49	JTEKT (THAILAND) CO., LTD.	1371430740	1	Paper&E mail	Hardness
+50	JTEKT (THAILAND) CO., LTD.	1371245799	1	Paper&E mail	Hardness
+51	JTEKT (THAILAND) CO., LTD.	1371245780	1	Paper&E mail	Hardness
+52	JTEKT (THAILAND) CO., LTD.	1371245772	1	Paper&E mail	Hardness
+53	JTEKT (THAILAND) CO., LTD.	1371245837	1	Paper&E mail	Hardness
+54	JTEKT (THAILAND) CO., LTD.	1371245829	1	Paper&E mail	Hardness
+55	JTEKT (THAILAND) CO., LTD.	1371651789	1	Paper&E mail	Hardness
+56	JTEKT (THAILAND) CO., LTD.	1371245764	1	Paper&E mail	Hardness
+57	JTEKT (THAILAND) CO., LTD.	1371245802	1	Paper&E mail	Hardness
+58	JTEKT (THAILAND) CO., LTD.	1371245810	1	Paper&E mail	Hardness
+59	JTEKT (THAILAND) CO., LTD.	1371245861	1	Paper&E mail	Hardness
+60	JTEKT (THAILAND) CO., LTD.	1371245888	1	Paper&E mail	Hardness
+61	JTEKT (THAILAND) CO., LTD.	1371245870	1	Paper&E mail	Hardness
+62	JTEKT (THAILAND) CO., LTD.	1371261930	1	Paper&E mail	Hardness
+63	JTEKT (THAILAND) CO., LTD.	1371245993	1	Paper&E mail	Hardness
+64	JTEKT (THAILAND) CO., LTD.	1371245985	1	Paper&E mail	Hardness
+65	TT FUJI TOOL SUPPORT CO., LTD.	1370225190	1	Paper&E mail	Hardness
+66	MITSUBISHI MATERIALS (THAILAND) CO., LTD.	1366810637	13	Paper&E mail	Centering
+67	NIHON PARTS (THAILAND) CO., LTD.	4366838211	10	Paper&E mail	Dimensin and Hardness
+68	SAHAVIRIYA STEEL INDUSTRIES PUBLIC CO., LTD.	4370091117	1	Paper&E mail	Hardness A,B
+69	AIZEN SB (THAILAND) CO.,LTD.	5366876183	1	Paper&E mail	Hardness
+70	SIAM CHITA CO.,LTD.	2366861382	1	Paper&E mail	Hardness
+71	E & H PRECISION (THAILAND) CO., LTD.	1370530716	1	Paper&E mail	Hardness
+72	SIAM CHITA CO.,LTD.	4370145454	1	Paper&E mail	Hardness
+73	MITSUBISHI MATERIALS (THAILAND) CO., LTD.	1370012154	13	Paper&E mail	Centering

app/report/filters.py

@@ -34,6 +34,11 @@ class CustomerTemplateFilter(django_filters.FilterSet):
         lookup_expr='icontains',
         label='Customer Name'
     )
+    export_template = django_filters.ChoiceFilter(
+        field_name='export_template',
+        choices=CustomerTemplateMapping.TEMPLATE_TYPE_CHOICES,
+        label='Export Template'
+    )
 
     template_names = django_filters.CharFilter(
         method='filter_template_names',
@@ -42,7 +47,7 @@ class CustomerTemplateFilter(django_filters.FilterSet):
 
     class Meta:
         model = CustomerTemplateMapping
-        fields = ['customer_name', 'template_names']
+        fields = ['customer_name', 'export_template', 'template_names']
 
     def filter_template_names(self, queryset, name, value):
         return queryset.filter(template_names__icontains=value)

app/report/gen_report.py

@@ -244,6 +244,8 @@ def gen_xlsx(template_file, selected_sheets, prefix_filename, data):
                     if value is not None:
                         if isinstance(value, ImageFieldFile):
                             pprint("ImageField")
+                            if not value.name:
+                                continue
                             image_path = value.path
                             if os.path.exists(image_path):
                                 # img = Image(image_path)

app/report/templates/report/coi.html

@@ -7,30 +7,35 @@
 {% block content %}
 <div class="container mx-auto px-4 py-8" x-data="COIReport">
   <h1 class="text-2xl font-bold text-gray-800">Export Center</h1>
-  <form method='post'>
-    {% csrf_token %}
-    <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" value="{{ lot_no }}">
-      <button class="bg-blue-500 text-white px-4 py-2 rounded hover:bg-blue-600" type="submit" name="search_lot">
-        🔍
-      </button>
+  <div class="rounded-xl border border-gray-200 bg-white p-4 shadow-sm">
+    <form method='post'>
+      {% csrf_token %}
+      <div class="flex flex-col gap-3 sm:flex-row sm:items-center">
+        <label for="lot-number" class="text-sm font-semibold text-gray-700 sm:min-w-20">Lot No.</label>
+        <input id="lot-number" type="text" class="w-full rounded-md border border-gray-300 px-3 py-2 focus:outline-blue-500" placeholder="Enter Lot No." name='lot_no' required x-model="lot_no" value="{{ lot_no }}">
+        <button class="shrink-0 rounded-md bg-blue-500 px-4 py-2 text-white hover:bg-blue-600" type="submit" name="search_lot">
+          Search
+        </button>
+      </div>
+    </form>
+
+    <div class="mt-4">
+      <div class="mb-2 inline-flex rounded-md bg-blue-100 px-3 py-1 text-sm font-medium text-blue-700">
+        Export Options
+      </div>
+      <div class="grid grid-cols-1 gap-x-4 gap-y-2 md:grid-cols-2 xl:grid-cols-4">
+      {% for key,value in SHEET_NAMES.items %}
+      <label class="flex items-center gap-2 text-sm text-gray-700">
+        <input type="checkbox" class="rounded" name='exports' value='{{ key }}'
+        x-model='exports' required>
+        <span>{{ value }}</span>
+      </label>
+      {% endfor %}
+      </div>
     </div>
-  </form>
-      <button class="bg-blue-100 text-blue-700 px-4 py-2 rounded hover:bg-blue-200">
-        Option for Export :
-      </button>
-        <div class="grid grid-cols-1 md: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='{{ key }}'
-          x-model='exports' required>
-          <span>{{ value }}</span>
-        </label>
-        {% endfor %}
-        </div>
-        <div class="grid grid-cols-2 gap-4">
-          <div class="my-4">
+
+    <div class="mt-4 grid grid-cols-1 gap-3 lg:grid-cols-3">
+      <div>
             <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" x-model='qa1' required>
               <option value="" disabled selected>Choose a user</option>
@@ -38,8 +43,8 @@
               <option value="{{ user.id }}">{{ user.profile }}</option>
               {% endfor %}
             </select>
-          </div>
-          <div class="my-4">
+      </div>
+      <div>
             <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" x-model='qa2' required>
               <option value="" disabled selected>Choose a user</option>
@@ -47,36 +52,52 @@
               <option value="{{ user.id }}">{{ user.profile }}</option>
               {% endfor %}
             </select>
-          </div>
+      </div>
+      <div class="rounded-lg border border-gray-200 bg-gray-50 px-4 py-3">
+        <div class="mb-2 text-sm font-medium text-gray-900">Accept Status</div>
+        <div class="flex flex-wrap items-center gap-4">
+          <label class="flex items-center gap-2 text-sm text-gray-700">
+            <input type="radio" name="status" id="accepted" value="accepted" 
+              class="rounded" x-model="acceptStatus" />
+            <span>Accepted</span>
+          </label>
+          <label class="flex items-center gap-2 text-sm text-gray-700">
+            <input type="radio" name="status" id="special_accepted" value="special_accepted" 
+              class="rounded" x-model="acceptStatus" />
+            <span>Special Accepted</span>
+          </label>
         </div>
-        <div class="flex justify-end my-3 space-x-4">
-          <div class="flex items-center space-x-4 my-4">
-            <!-- Radio button for 'Accepted' -->
-            <label class="flex items-center space-x-2">
-              <input type="radio" name="status" id="accepted" value="accepted" 
-                class="rounded" x-model="acceptStatus" />
-              <span>Accepted</span>
-            </label>
+      </div>
+    </div>
 
-            <!-- Radio button for 'Special Accepted' -->
-            <label class="flex items-center space-x-2">
-              <input type="radio" name="status" id="special_accepted" value="special_accepted" 
-                class="rounded" x-model="acceptStatus" />
-              <span>Special Accepted</span>
+    <div class="mt-4 flex justify-end">
+      <div class="w-full rounded-lg border border-blue-100 bg-blue-50 px-4 py-3 lg:w-auto lg:min-w-[28rem]">
+        <div class="flex flex-col gap-3 lg:flex-row lg:items-center lg:justify-between">
+          <div class="flex flex-wrap items-center gap-4">
+            <span class="text-sm font-medium text-gray-900">Export Template</span>
+            <label class="flex items-center gap-2 text-sm text-gray-700">
+              <input type="radio" name="export_template" value="japanese" class="rounded" x-model="exportTemplate" />
+              <span>Japanese</span>
+            </label>
+            <label class="flex items-center gap-2 text-sm text-gray-700">
+              <input type="radio" name="export_template" value="asean" class="rounded" x-model="exportTemplate" />
+              <span>ASEAN</span>
             </label>
           </div>
-          <div>
-            <button  type='button' class="bg-blue-500 text-white px-4 py-2 rounded hover:bg-blue-600" 
-                                   @click="exportCOI">
+          <div class="flex flex-wrap items-center justify-center gap-3 lg:justify-end">
+            <button  type='button' class="rounded-md bg-blue-500 px-4 py-2 text-white 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 x-text="downText">
-            </a>
+            <div class="text-center" x-show="downloadUrl">
+              <a :href="downloadUrl"  class="block rounded-md bg-green-600 px-4 py-2 text-white hover:bg-green-700 focus:outline-none focus:ring-2 focus:ring-green-500 focus:ring-offset-2" download x-text="downText">
+              </a>
+            </div>
           </div>
         </div>
+      </div>
+    </div>
+  </div>
   
   <div class="bg-white shadow-md rounded-md p-4">
 
@@ -153,6 +174,7 @@ th, td {
     return {
       lot_no: '{{ lot_no }}', // Bind this to the input value
       exports: {{ selected_templates|default:"[]"|safe }},
+      exportTemplate: '{{ export_template|default:"japanese" }}',
       qa1: null,
       qa2: null,
       gen_report_url: '{% url "report:gen_report" %}', 
@@ -187,6 +209,7 @@ th, td {
                   const response = await axios.post(this.gen_report_url, {
                       lot_no: this.lot_no,
                       exports: this.exports,
+                      export_template: this.exportTemplate,
                       qa1: this.qa1,
                       qa2: this.qa2,
                       acceptStatus: this.acceptStatus

app/report/views.py

@@ -32,6 +32,26 @@ from django.db.models import Q, Func, Value, F
 from django.views.generic import (
     ListView,)
 
+COI_TEMPLATE_FILES = {
+    "japanese": "coi_templates.xlsx",
+    "asean": "coi_templates_en.xlsx",
+}
+
+
+def get_coi_template_file(template_name):
+    template_key = (template_name or "japanese").lower()
+    filename = COI_TEMPLATE_FILES.get(template_key, COI_TEMPLATE_FILES["japanese"])
+    return f"{settings.BASE_DIR}/report/{filename}"
+
+
+def get_customer_template_mapping(master_row):
+    if not master_row or not master_row.PRO1C:
+        return None
+    return CustomerTemplateMapping.objects.filter(
+        customer_name__icontains=master_row.PRO1C
+    ).first()
+
+
 def index(request):
     reports = Report.objects.all()
     report_filter = ReportFilter(request.GET, queryset=reports)
@@ -975,7 +995,7 @@ def generate_centering_values(lot_no, code):
     # Prepare placeholders
 
     # placeholders = {}
-    placeholders = clear_values(10,3)
+    placeholders = clear_values(20, 3)
     # for i in range(1,7):
         # for j in range(1,4):
             # placeholders[f'v{i}_{j}'] = 0
@@ -986,12 +1006,17 @@ def generate_centering_values(lot_no, code):
 
     # Ensure that we map each manualSize entry to a corresponding DataMs entry
     inspect_date = None
+    record_count = 0
     for i,r in enumerate(data_ms_records, start=1):
+        record_count = i
         if i == 1:
             inspect_date = r.created_at
         placeholders[f'v{i}_2'] = r.censize
         placeholders[f'v{i}_3'] = r.censizeok
 
+    if record_count <= 10:
+        hide_con(placeholders, "v11_2", "47:93")
+
     placeholders['inspect_date'] = inspect_date.strftime('%Y/%m/%d') if inspect_date else "-"
     return placeholders
 
@@ -1220,8 +1245,9 @@ def create_coi_file(lot_no, sheets, user, md):
     pprint(f"---- merged_data ---")
     pprint(merged_data)
 
+    template_file = get_coi_template_file(md.get("export_template"))
     output_file = gen_xlsx(
-        template_file=f"{settings.BASE_DIR}/report/coi_templates.xlsx",
+        template_file=template_file,
         selected_sheets=sheets,  # Replace with your actual sheet names
         prefix_filename=f"{settings.BASE_DIR}/media/coi_{lot_no}_",
         data=merged_data
@@ -1274,11 +1300,13 @@ def filter_by_lot_no(lot_no):
 def coi_view(request):
     pprint(f"xxxx method = xxx {request.method}")
     users = User.objects.all()
+    export_template = "japanese"
 
     if request.method == "POST":
         pprint(request.POST)
         exports = request.POST.getlist("exports")  # Retrieve the list of selected values
         pprint(f"Selected Export Options: {exports}")
+        export_template = request.POST.get("export_template", "japanese")
         
         if 'export' in request.POST:
 
@@ -1301,7 +1329,7 @@ def coi_view(request):
                 "dimension_app.spe_acc": True,  # Hide rows 24 to 28 if the prefix is "0"
             }
             output_file = gen_xlsx(
-                template_file="/app/report/coi_templates.xlsx",
+                template_file=get_coi_template_file(export_template),
                 selected_sheets=exports,  # Replace with your actual sheet names
                 prefix_filename="/app/media/coi",
                 data=data
@@ -1332,11 +1360,9 @@ def coi_view(request):
                 if first_result:
                     size_str = f"{first_result.PRO10}x{first_result.PRO11}x{first_result.PRO12}";
                     spec = f"{first_result.PRO13} {first_result.PRO14} {first_result.PRO15} {first_result.PRO16} {first_result.PRO17} {first_result.PRO18}"
-                    #first_result.PRO1C = "TUM"
-                    #selected_templates  = CustomerTemplateMapping.objects.filter(customer_name=first_result.PRO1C).first().template_names
-                    # first_result.PRO1C = 'OSAKA SEIMITSU'
-                    mapping = CustomerTemplateMapping.objects.filter(customer_name__icontains=first_result.PRO1C).first()
+                    mapping = get_customer_template_mapping(first_result)
                     selected_templates = mapping.template_names if mapping else []
+                    export_template = mapping.export_template if mapping else export_template
 
                     mgt_code = first_result.PRO1 if first_result else "-"
                     mks_code = convert_mgt_to_mks(mgt_code)
@@ -1367,11 +1393,13 @@ def coi_view(request):
                                                            'size_str': size_str,
                                                            'lot_no': lot_no,
                                                            'spec': spec, 'users': users, 'SHEET_NAMES': SHEET_NAMES, 
-                                                           'results': results, 'fields': fields, 'selected_templates': selected_templates, 'code': code})
+                                                           'results': results, 'fields': fields, 'selected_templates': selected_templates, 'code': code,
+                                                           'export_template': export_template})
 
         messages.success(request, "Request Sent")
         return redirect(request.path_info)
-    return render(request, 'report/coi.html', {'SHEET_NAMES': SHEET_NAMES, 'users': users})
+    return render(request, 'report/coi.html', {'SHEET_NAMES': SHEET_NAMES, 'users': users,
+                                               'export_template': export_template})
 
 
 @csrf_exempt  # Disable CSRF for API requests (ensure this is secure in production)
@@ -1385,14 +1413,21 @@ def gen_report_view(request):
             exports = data.get("exports")
             qa1 = data.get('qa1')
             qa2 = data.get('qa2')
+            export_template = data.get("export_template")
             print(f"data = {data}")
 
             if not lot_no:
                 return HttpResponseBadRequest("Missing 'lot_no' in request data")
 
+            if not export_template:
+                results = queryFromMaster(lot_no)
+                first_result = results[0] if results else None
+                mapping = get_customer_template_mapping(first_result)
+                export_template = mapping.export_template if mapping else "japanese"
+
             # Call the `create_coi_file` function with the provided lot_no
             report = create_coi_file(lot_no, exports, request.user, {'qa1': qa1, 'qa2': qa2, \
-                    'acceptStatus': data.get('acceptStatus')})
+                    'acceptStatus': data.get('acceptStatus'), 'export_template': export_template})
 
             # Return a success response with the report details
             return JsonResponse({
@@ -1426,8 +1461,8 @@ class CustomerTemplateCRUDView(ConfigurableCRUDView):
     create_url_name = 'report:customer_templates-create'
     update_url_name = 'report:customer_templates-update'
     delete_url_name = 'report:customer_templates-delete'
-    config_fields = ["id", "customer_name", "template_names", "created_at"] 
-    config_field_orders = ["id", "customer_name", "template_names", "created_at",  "created_by"]
+    config_fields = ["id", "customer_name", "export_template", "template_names", "created_at"] 
+    config_field_orders = ["id", "customer_name", "export_template", "template_names", "created_at",  "created_by"]
     # config_readonly_fields = ["lot_no"]
     config_edit_fields = None
     ordering = ["-created_at", "-id",]