drawing

app/coi/routers.py

@@ -4,30 +4,28 @@ class DatabaseRouter:
     targeting separate databases.
     """
 
-    # Define app labels that use the secondary database
-    route_app_labels = {"legacy"}
+    route_app_labels = {
+        "legacy": "OB2011DB",
+        "trans": "MGT_Trans",
+    }
 
     def db_for_read(self, model, **hints):
         """
-        Direct read operations for legacy_app models to OB2011DB.
+        Direct read operations to the appropriate database.
         """
-        if model._meta.app_label in self.route_app_labels:
-            return "OB2011DB"
-        return "default"
+        return self.route_app_labels.get(model._meta.app_label, "default")
 
     def db_for_write(self, model, **hints):
         """
-        Direct write operations for legacy_app models to OB2011DB.
+        Direct write operations to the appropriate database.
         """
-        if model._meta.app_label in self.route_app_labels:
-            return "OB2011DB"
-        return "default"
+        return self.route_app_labels.get(model._meta.app_label, "default")
 
     def allow_relation(self, obj1, obj2, **hints):
         """
         Allow relations if both objects belong to the same database.
         """
-        db_set = {"default", "OB2011DB"}
+        db_set = {"default", "OB2011DB", "MGT_Trans"}
         if obj1._state.db in db_set and obj2._state.db in db_set:
             return True
         return None
@@ -37,5 +35,5 @@ class DatabaseRouter:
         Ensure migrations are applied only to the appropriate database.
         """
         if app_label in self.route_app_labels:
-            return db == "OB2011DB"
+            return db == self.route_app_labels[app_label]
         return db == "default"

app/coi/settings.py

@@ -145,6 +145,18 @@ DATABASES = {
             'extra_params':  'Encrypt=no',
         },
     },
+    'MGT_Trans': {
+        'ENGINE': DB2_ENGINE,
+        'NAME': 'MGT_Trans',
+        'USER': DB2_USER,
+        'PASSWORD': DB2_PASSWORD,
+        'HOST': DB2_HOST,
+        #'PORT': DB2_PORT,
+        'OPTIONS': {
+            'driver': DB2_DRIVER,
+            'extra_params':  'Encrypt=no',
+        },
+    },
 }
 
 

app/core/forms.py

@@ -1,7 +1,31 @@
 from django import forms
-from .models import Report
+from .models import Report, CustomerTemplateMapping, ProductDrawing
+
+
+from core.utils import SHEET_NAMES
 
 class ReportForm(forms.ModelForm):
     class Meta:
         model = Report
         fields = ['name', 'created_by', 'file']  # Include the fields you want in the form
+
+class CustomerTemplateMappingForm(forms.ModelForm):
+    template_names = forms.MultipleChoiceField(
+        choices=[(key, label) for key, label in SHEET_NAMES.items()],
+        widget=forms.CheckboxSelectMultiple,
+        required=False,
+        label="Templates"
+    )
+
+    class Meta:
+        model = CustomerTemplateMapping
+        fields = ['customer_name', 'template_names']
+
+    def clean_template_names(self):
+        # convert data to list of selected template keys
+        return self.cleaned_data['template_names']
+
+class ProductDrawingForm(forms.ModelForm):
+    class Meta:
+        model = ProductDrawing
+        fields = ['code_no', 'code_no_mks',  'lot_no', 'drawing', 'description']

app/core/migrations/0006_customertemplatemapping_and_more.py

@@ -0,0 +1,30 @@
+# Generated by Django 4.2 on 2025-05-06 04:36
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0005_delete_belmasterview_delete_emasterview_and_more'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='CustomerTemplateMapping',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('customer_name', models.CharField(max_length=255)),
+                ('template_names', models.JSONField(blank=True, default=list, null=True)),
+            ],
+        ),
+        migrations.DeleteModel(
+            name='AllProductAverageObMinMaxView',
+        ),
+        migrations.DeleteModel(
+            name='AllProductDimensionForInsProcess',
+        ),
+        migrations.DeleteModel(
+            name='AllProductPressPositionPressWeight',
+        ),
+    ]

app/core/migrations/0007_customertemplatemapping_created_at_and_more.py

@@ -0,0 +1,33 @@
+# Generated by Django 4.2 on 2025-05-06 04:52
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('core', '0006_customertemplatemapping_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='customertemplatemapping',
+            name='created_at',
+            field=models.DateTimeField(auto_now_add=True, default=django.utils.timezone.now),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name='customertemplatemapping',
+            name='created_by',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL),
+        ),
+        migrations.AddField(
+            model_name='customertemplatemapping',
+            name='updated_at',
+            field=models.DateTimeField(auto_now=True),
+        ),
+    ]

app/core/migrations/0008_productdrawing.py

@@ -0,0 +1,30 @@
+# Generated by Django 4.2 on 2025-05-06 08:47
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('core', '0007_customertemplatemapping_created_at_and_more'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='ProductDrawing',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('code_no', models.CharField(blank=True, max_length=100, null=True)),
+                ('code_no_mks', models.CharField(blank=True, max_length=100, null=True)),
+                ('lot_no', models.CharField(blank=True, max_length=100, null=True)),
+                ('drawing', models.ImageField(upload_to='drawings/')),
+                ('description', models.TextField(blank=True, null=True)),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('updated_at', models.DateTimeField(auto_now=True)),
+                ('created_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL)),
+            ],
+        ),
+    ]

app/core/models.py

@@ -463,3 +463,61 @@ class RotateBrokenTest(models.Model):
         managed = False  # This model corresponds to a database view
         app_label = "legacy"
         db_table = "rotate_broken_test"  # Matches SQL Server table name
+
+class LotType(models.Model):
+    lot_no = models.CharField(primary_key=True,max_length=20, db_column='LotNo')
+    group = models.CharField(max_length=10, db_column='Group')
+    sub_group = models.CharField(max_length=10, db_column='SubGroup')
+
+    class Meta:
+        db_table = 'T-LotType'
+        managed = False  # Since it's an existing table in SQL Server
+        app_label = "trans"
+
+
+TEMPLATE_CHOICES = [
+    "hardness_out",
+    "hardness_out_in",
+    "hardness_both_size",
+    "dimension",
+    "dimension_app",
+    "dimension_bal_weight",
+    "dim_bal_app_hard",
+    "dim_bal_app_rot_hard",
+    "thickness_8_point",
+    "centering"
+]
+
+class CustomerTemplateMapping(models.Model):
+    customer_name = models.CharField(max_length=255)
+    template_names = models.JSONField(default=list, blank=True, null=True)  # stores list of template names
+
+    created_by = models.ForeignKey(
+        User,
+        on_delete=models.SET_NULL,
+        null=True,
+        blank=True, 
+    )  # Reference to the user who created the report
+    created_at = models.DateTimeField(auto_now_add=True)  # Automatically set when created
+    updated_at = models.DateTimeField(auto_now=True)  # Automatically updated when modified
+    def __str__(self):
+        return self.customer_name
+
+class ProductDrawing(models.Model):
+    code_no = models.CharField(max_length=100, null=True, blank=True)
+    code_no_mks = models.CharField(max_length=100, null=True, blank=True)
+    lot_no = models.CharField(max_length=100, null=True, blank=True)
+    drawing = models.ImageField(upload_to='drawings/')
+    description = models.TextField(null=True, blank=True)
+    created_at = models.DateTimeField(auto_now_add=True)
+    updated_at = models.DateTimeField(auto_now=True)
+
+    created_by = models.ForeignKey(
+        User,
+        on_delete=models.SET_NULL,
+        null=True,
+        blank=True, 
+    )  # Reference to the user who created the report
+    
+    def __str__(self):
+        return f"{self.code_no} - {self.lot_no}"

app/core/utils.py

@@ -12,6 +12,7 @@ from django.views.generic import (
 )
 from django.core.paginator import Paginator
 from core.models import MgMasterView, VMasterView, BelMasterView, EMasterView
+from pprint import pprint
 
 class ConfigurableCRUDView:
     model = None
@@ -44,6 +45,7 @@ class ConfigurableCRUDView:
         - Respects `config_field_orders` and `config_excludes`.
         Returns field instances instead of field names.
         """
+        pprint("get_fields")
         model_fields = {f.name: f for f in self.model._meta.get_fields()}
 
         # Filter based on `config_fields` configuration
@@ -65,7 +67,6 @@ class ConfigurableCRUDView:
         # Reorder fields to match the order specified in `config_field_orders`
         ordered_field_names = set(self.config_field_orders)
         ordered_fields.sort(key=lambda f: self.config_field_orders.index(f.name) if f.name in ordered_field_names else len(ordered_field_names))
-
         return ordered_fields + remaining_fields
 
 
@@ -226,3 +227,15 @@ def queryFromMaster(lot_no):
         results.extend(queryset)
     return results
 
+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',
+}

app/legacy/migrations/0003_allproductaverageobminmaxview_and_more.py

@@ -0,0 +1,104 @@
+# Generated by Django 4.2 on 2025-05-06 04:36
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('legacy', '0002_belmasterview_emasterview_mgmasterview_vmasterview'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='AllProductAverageObMinMaxView',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('ProductCode', models.CharField(max_length=255, null=True)),
+                ('out_min', models.DecimalField(decimal_places=2, max_digits=10, null=True)),
+                ('out_max', models.DecimalField(decimal_places=2, max_digits=10, null=True)),
+                ('in_min', models.DecimalField(decimal_places=2, max_digits=10, null=True)),
+                ('in_max', models.DecimalField(decimal_places=2, max_digits=10, null=True)),
+            ],
+            options={
+                'db_table': 'AllProduct_Average_OB_MIN_MAX_view',
+                'managed': False,
+            },
+        ),
+        migrations.CreateModel(
+            name='AllProductDimensionForInsProcess',
+            fields=[
+                ('ProdType', models.CharField(max_length=255, null=True)),
+                ('ProductCode', models.CharField(max_length=255, primary_key=True, serialize=False)),
+                ('Size_Id', models.CharField(max_length=255, null=True)),
+                ('Size_Name', models.CharField(max_length=255, null=True)),
+                ('Std', models.DecimalField(decimal_places=2, max_digits=10, null=True)),
+                ('TolUn', models.DecimalField(decimal_places=2, max_digits=10, null=True)),
+                ('TolUp', models.DecimalField(decimal_places=2, max_digits=10, null=True)),
+            ],
+            options={
+                'db_table': 'AllProduct_Dimension_ForInsProcess',
+                'managed': False,
+            },
+        ),
+        migrations.CreateModel(
+            name='AllProductPressPositionPressWeight',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('ProductCode', models.CharField(max_length=255, null=True)),
+                ('Lot_No', models.CharField(max_length=255, null=True)),
+                ('PO_Qty', models.DecimalField(decimal_places=2, max_digits=10, null=True)),
+                ('UWeight', models.DecimalField(decimal_places=2, max_digits=10, null=True)),
+                ('Current_ProNo', models.CharField(max_length=255, null=True)),
+                ('Press_Time', models.DecimalField(decimal_places=2, max_digits=10, null=True)),
+                ('PressType_1', models.CharField(max_length=255, null=True)),
+                ('PressWeight_1', models.DecimalField(decimal_places=2, max_digits=10, null=True)),
+                ('PressType_2', models.CharField(max_length=255, null=True)),
+                ('PressWeight_2', models.DecimalField(decimal_places=2, max_digits=10, null=True)),
+                ('Press_Ton', models.DecimalField(decimal_places=2, max_digits=10, null=True)),
+                ('Press_T', models.DecimalField(decimal_places=2, max_digits=10, null=True)),
+                ('Press_T_Tol', models.DecimalField(decimal_places=2, max_digits=10, null=True)),
+                ('Mold_D', models.DecimalField(decimal_places=2, max_digits=10, null=True)),
+                ('Mold_T', models.DecimalField(decimal_places=2, max_digits=10, null=True)),
+                ('SegMold_T', models.DecimalField(decimal_places=2, max_digits=10, null=True)),
+                ('SegMold_D', models.DecimalField(decimal_places=2, max_digits=10, null=True)),
+                ('Center_D', models.DecimalField(decimal_places=2, max_digits=10, null=True)),
+                ('Center_T', models.DecimalField(decimal_places=2, max_digits=10, null=True)),
+                ('LowerPlate_T', models.DecimalField(decimal_places=2, max_digits=10, null=True)),
+                ('StudPlate_T', models.DecimalField(decimal_places=2, max_digits=10, null=True)),
+                ('UpperPlate_T', models.DecimalField(decimal_places=2, max_digits=10, null=True)),
+                ('PinPlate_T', models.DecimalField(decimal_places=2, max_digits=10, null=True)),
+                ('TopConcave_T', models.DecimalField(decimal_places=2, max_digits=10, null=True)),
+                ('BottomConcave_T', models.DecimalField(decimal_places=2, max_digits=10, null=True)),
+            ],
+            options={
+                'db_table': 'AllProduct_PressPosition_PressWeight',
+                'managed': False,
+            },
+        ),
+        migrations.CreateModel(
+            name='RotateBrokenTest',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('row_no', models.IntegerField(blank=True, null=True)),
+                ('speed_spec', models.FloatField(blank=True, null=True)),
+                ('speed_test', models.FloatField(blank=True, null=True)),
+                ('speedOk', models.CharField(blank=True, max_length=4, null=True)),
+                ('qty', models.IntegerField()),
+                ('station_no', models.IntegerField()),
+                ('created_at', models.DateTimeField(blank=True, null=True)),
+                ('updated_at', models.DateTimeField(blank=True, null=True)),
+                ('lot_no', models.CharField(blank=True, max_length=50, null=True)),
+                ('machine_id', models.IntegerField(blank=True, null=True)),
+                ('code', models.CharField(blank=True, max_length=50, null=True)),
+                ('emp_id', models.IntegerField()),
+                ('devid', models.CharField(blank=True, max_length=40, null=True)),
+                ('mode', models.CharField(blank=True, max_length=10, null=True)),
+                ('cal_mode', models.IntegerField(blank=True, null=True)),
+            ],
+            options={
+                'db_table': 'rotate_broken_test',
+                'managed': False,
+            },
+        ),
+    ]

app/legacy/templates/legacy/datacrud_list.html

@@ -46,6 +46,8 @@
                         </a>
                     {% elif field.name == 'file' and obj.file %}
                     <a href="{{ obj.file.url }}" target="_blank">View</a>
+                    {% elif field.name == 'drawing' and obj.drawing %}
+                    <a href="{{ obj.drawing.url }}" target="_blank">View</a>
                     {% elif field.get_internal_type == "DateTimeField" %}
                         {{ obj|attr:field.name|date:"d/m/Y H:i" }}
                     {% else %}

app/report/filters.py

@@ -1,5 +1,5 @@
 import django_filters
-from core.models import Report
+from core.models import Report, CustomerTemplateMapping, ProductDrawing
 
 class ReportFilter(django_filters.FilterSet):
     name = django_filters.CharFilter(
@@ -26,3 +26,32 @@ class ReportFilter(django_filters.FilterSet):
     class Meta:
         model = Report
         fields = ['name', 'created_by', 'created_at']
+
+
+class CustomerTemplateFilter(django_filters.FilterSet):
+    customer_name = django_filters.CharFilter(
+        field_name='customer_name',
+        lookup_expr='icontains',
+        label='Customer Name'
+    )
+
+    template_names = django_filters.CharFilter(
+        method='filter_template_names',
+        label='Template Name Contains'
+    )
+
+    class Meta:
+        model = CustomerTemplateMapping
+        fields = ['customer_name', 'template_names']
+
+    def filter_template_names(self, queryset, name, value):
+        return queryset.filter(template_names__icontains=value)
+
+class ProductDrawingFilter(django_filters.FilterSet):
+    code_no = django_filters.CharFilter(lookup_expr='icontains', label='Code No')
+    code_no_mks = django_filters.CharFilter(lookup_expr='icontains', label='Code No (MKS)')
+    lot_no = django_filters.CharFilter(lookup_expr='icontains', label='Lot No')
+
+    class Meta:
+        model = ProductDrawing
+        fields = ['code_no', 'code_no_mks', 'lot_no',]

app/report/templates/report/customer_template_form.html

@@ -0,0 +1,42 @@
+{% extends "base.html" %}
+{% load legacy_filters %}
+{% load tailwind_filters %}
+
+{% block title %}
+    {% if view.title %}
+        {{ view.title }}
+    {% else %}
+        {{ view|class_name }}
+    {% endif %}
+{% endblock %}
+
+{% block content %}
+<div class="container mx-auto px-4 py-6">
+    <h1 class="text-2xl font-bold mb-6">
+        {% if view.title %}
+            {{ view.title }}
+        {% elif view|class_name == "CreateViewClass" %}
+            Create {{ model_verbose_name }}
+        {% else %}
+            Update {{ model_verbose_name }}
+        {% endif %}
+    </h1>
+
+    <!-- Render the Form -->
+    <form method="post" enctype="multipart/form-data" >
+        {% csrf_token %}
+        <div>
+          
+        {{ form|crispy }}
+        </div>
+        <div class='mt-4'>
+            <button type="submit" class="bg-blue-500 text-white px-4 py-2 rounded hover:bg-blue-600">
+                Save
+            </button>
+            <a href="{% url list_url_name %}" class="bg-gray-300 text-gray-800 px-4 py-2 rounded hover:bg-gray-400">
+                Cancel
+            </a>
+        </div>
+    </form>
+</div>
+{% endblock %}

app/report/templates/report/customer_template_list.html

@@ -0,0 +1,126 @@
+{% extends "base.html" %}
+{% load legacy_filters %}
+{% load tailwind_filters %}
+{% block title %}{{ page_title }}{% endblock %}
+
+{% block content %}
+<div class="container mx-auto px-4 py-6">
+    <h1 class="text-3xl font-bold text-gray-800 mb-4">{{ page_title }}</h1>
+
+    <!-- Filter Form -->
+    <form method="get" class="flex items-center space-x-4 mb-4">
+        {{ filter.form | crispy }}
+        <button type="submit" class="bg-blue-500 text-white px-4 py-2 rounded hover:bg-blue-600">Filter</button>
+        <a href="?" class="bg-gray-300 text-gray-800 px-4 py-2 rounded hover:bg-gray-400">Reset</a>
+    </form>
+
+    <!-- Create Button -->
+    <div class="my-4 flex">
+        <p class="text-gray-600 mb-4 mr-auto">
+            Total Records: {{ page_obj.paginator.count }}
+        </p>
+        <a href="{% url create_url %}" class="ml-auto bg-green-500 text-white px-4 py-2 rounded hover:bg-green-600">
+            Create New Data
+        </a>
+    </div>
+
+    <!-- Data Table -->
+    <div class="clear-both bg-white shadow rounded-lg overflow-x-auto">
+<table class="w-full border-collapse border border-gray-200">
+    <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">{% firstof field.verbose_name field.name %} </th>
+            {% endfor %}
+            <th class="py-2 px-4 border-b">Actions</th>
+        </tr>
+    </thead>
+    <tbody>
+        {% for obj in page_obj %}
+            <tr class="hover:bg-gray-50">
+                {% for field in fields %}
+                <td class="border border-gray-200 px-4 py-2">
+                    {% if field.name == 'id' %}
+                        <a href="{% url update_url obj.pk %}" class="text-blue-500 hover:underline">
+                            {{ obj|attr:field.name }}
+                        </a>
+                    {% elif field.name == 'template_names' %}
+
+                      {% with template_list=obj|attr:field.name %}
+                          {% for t in template_list %}
+                              {{ sheet_names | get_item:t }}
+                              {% if not forloop.last %}, {% endif %}
+                          {% endfor %}
+                      {% endwith %}
+                    {% elif field.name == 'file' and obj.file %}
+                    <a href="{{ obj.file.url }}" target="_blank">View</a>
+                    {% elif field.get_internal_type == "DateTimeField" %}
+                        {{ obj|attr:field.name|date:"d/m/Y H:i" }}
+                    {% else %}
+                        {{ obj|attr:field.name | safe_floatformat:2 }}
+                    {% endif %}
+                </td>
+                {% endfor %}
+                <td class="py-2 px-4 border-b">
+                    <a href="{% url update_url obj.pk %}" 
+                       class="bg-blue-500 text-white px-3 py-2 rounded hover:bg-blue-600">Edit</a>
+                    <a href="{% url delete_url obj.pk %}" 
+                       class="bg-red-500 text-white px-3 py-2 rounded hover:bg-red-600">Delete</a>
+                </td>
+            </tr>
+        {% empty %}
+            <tr>
+                <td colspan="5" class="py-4 px-4 text-center text-gray-600">No data available.</td>
+            </tr>
+        {% endfor %}
+    </tbody>
+</table>
+    </div>
+
+    <!-- Pagination -->
+    <div class="mt-6 flex justify-between items-center">
+        <div>
+            <span class="text-sm text-gray-600">
+                Page {{ page_obj.number }} of {{ page_obj.paginator.num_pages }}
+            </span>
+        </div>
+        <div class="space-x-2">
+            {% if page_obj.has_previous %}
+                <a href="?{% for key, value in request.GET.items %}{% if key != 'page' %}{{ key }}={{ value|urlencode }}&{% endif %}{% endfor %}page=1" 
+                   class="text-blue-500 hover:underline">First</a>
+                <a href="?{% for key, value in request.GET.items %}{% if key != 'page' %}{{ key }}={{ value|urlencode }}&{% endif %}{% endfor %}page={{ page_obj.previous_page_number }}" 
+                   class="text-blue-500 hover:underline">Previous</a>
+            {% endif %}
+            {% for page_num in page_obj.paginator.page_range %}
+                {% if page_num == page_obj.number %}
+                    <span class="font-bold text-gray-700">{{ page_num }}</span>
+                {% elif page_num == 1 or page_num == page_obj.paginator.num_pages or page_num >= page_obj.number|add:"-2" and page_num <= page_obj.number|add:"2" %}
+                    <a href="?{% for key, value in request.GET.items %}{% if key != 'page' %}{{ key }}={{ value|urlencode }}&{% endif %}{% endfor %}page={{ page_num }}" 
+                       class="text-blue-500 hover:underline">{{ page_num }}</a>
+                {% elif page_num == page_obj.number|add:-3 or page_num == page_obj.number|add:3 %}
+                    <span class="mx-1">...</span>
+                {% endif %}
+            {% endfor %}
+            {% if page_obj.has_next %}
+                <a href="?{% for key, value in request.GET.items %}{% if key != 'page' %}{{ key }}={{ value|urlencode }}&{% endif %}{% endfor %}page={{ page_obj.next_page_number }}" 
+                   class="text-blue-500 hover:underline">Next</a>
+                <a href="?{% for key, value in request.GET.items %}{% if key != 'page' %}{{ key }}={{ value|urlencode }}&{% endif %}{% endfor %}page={{ page_obj.paginator.num_pages }}" 
+                   class="text-blue-500 hover:underline">Last</a>
+            {% endif %}
+        </div>
+    </div>
+</div>
+<style>
+/* Remove fixed layout and allow columns to grow dynamically */
+table {
+    table-layout: auto; /* Default is auto, can be explicitly set */
+    width: 100%; /* Ensures table spans available space */
+}
+
+th, td {
+    white-space: nowrap; /* Prevents text wrapping */
+    text-overflow: ellipsis; /* Adds ellipsis for overflowed content if combined with max-width */
+    vertical-align: top; /* Aligns content to the top */
+}
+</style>
+{% endblock %}

app/report/urls.py

@@ -1,8 +1,10 @@
 from django.urls import path
 from . import views
-from .views import ReportCRUDView
+from .views import ReportCRUDView, CustomerTemplateCRUDView, ProductDrawingCRUDView
 
 report_crud = ReportCRUDView()
+customer_templates_crud = CustomerTemplateCRUDView()
+product_drawings_crud = ProductDrawingCRUDView()
 
 app_name = "report"  # Use this namespace for reverse URL lookups
 
@@ -16,6 +18,15 @@ urlpatterns = [
     path('coi/', views.coi_view, name='coi-view'),
     path('report/generate/', views.gen_report_view, name='gen_report'),
 
+    path('customer_templates/', customer_templates_crud.get_list_view().as_view(), name='customer_templates-list'),
+    path('customer_templates/create/', customer_templates_crud.get_create_view().as_view(), name='customer_templates-create'),
+    path('customer_templates/<str:pk>/update/', customer_templates_crud.get_update_view().as_view(), name='customer_templates-update'),
+    path('customer_templates/<str:pk>/delete/', customer_templates_crud.get_delete_view().as_view(), name='customer_templates-delete'),
+    
+    path('product_drawings/', product_drawings_crud.get_list_view().as_view(), name='product_drawings-list'),
+    path('product_drawings/create/', product_drawings_crud.get_create_view().as_view(), name='product_drawings-create'),
+    path('product_drawings/<str:pk>/update/', product_drawings_crud.get_update_view().as_view(), name='product_drawings-update'),
+    path('product_drawings/<str:pk>/delete/', product_drawings_crud.get_delete_view().as_view(), name='product_drawings-delete'),
     # path('create/', views.create_report, name='create'),  # Create a new report
     # path('<int:pk>/', views.detail_report, name='detail'),  # View details of a specific report
     # path('<int:pk>/update/', views.update_report, name='update'),  # Update a specific report

app/report/views.py

@@ -1,10 +1,11 @@
 from django.shortcuts import render, redirect, get_object_or_404
 from django.core.paginator import Paginator
 from django.contrib import messages
-from core.models import Report, AllProductDimensionForInsProcess
-from core.forms import ReportForm
-from core.utils import ConfigurableCRUDView, queryFromMaster
-from .filters import ReportFilter
+from core.models import Report, AllProductDimensionForInsProcess, CustomerTemplateMapping, \
+                ProductDrawing
+from core.forms import ReportForm, CustomerTemplateMappingForm, ProductDrawingForm
+from core.utils import ConfigurableCRUDView, queryFromMaster, SHEET_NAMES
+from .filters import ReportFilter, CustomerTemplateFilter, ProductDrawingFilter
 from .forms import ExportOptionsForm
 from pprint import pprint
 
@@ -24,6 +25,10 @@ from django.conf import settings
 
 from itertools import chain
 
+from django_filters.views import FilterView
+
+from django.views.generic import (
+    ListView,)
 
 def index(request):
     reports = Report.objects.all()
@@ -886,18 +891,6 @@ def create_coi_file(lot_no, sheets, user, md):
     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 get_fields(model):
     # model_fields = {f.name: f for f in model._meta.get_fields()}
     # fields = list(model_fields.values())
@@ -1051,3 +1044,78 @@ def gen_report_view(request):
 
 
 
+class CustomerTemplateCRUDView(ConfigurableCRUDView):
+    model = CustomerTemplateMapping
+    list_template_name = 'report/customer_template_list.html'
+    detail_template_name = 'legacy/datacrud_detail.html'
+    form_template_name = 'report/customer_template_form.html'
+    confirm_delete_template_name = 'legacy/datacrud_confirm_delete.html'
+    filterset_class = CustomerTemplateFilter
+
+    page_title = "Customer Template Mapping"
+
+    # URL name mappings
+    list_url_name = 'report:customer_templates-list'
+    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_readonly_fields = ["lot_no"]
+    config_edit_fields = None
+    ordering = ["-created_at", "-id",]
+    form_class = CustomerTemplateMappingForm
+
+
+    def get_list_view(self):
+        class ListViewClass(FilterView, ListView):
+            model = self.model
+            template_name = self.list_template_name
+            paginate_by = self.paginate_by
+            filterset_class = self.filterset_class
+            ordering = self.ordering
+
+            def get_context_data(inner_self, **kwargs):
+                context = super().get_context_data(**kwargs)
+                fields = self.get_fields()
+                context.update({
+                    'fields': [f for f in fields],
+                    'sheet_names': SHEET_NAMES,
+
+                    # 'fields': [field for field in self.model._meta.get_fields()],
+                    'page_title': self.page_title,
+                    'list_url': self.list_url_name,
+                    'create_url': self.create_url_name,
+                    'update_url': self.update_url_name,
+                    'delete_url': self.delete_url_name,
+                    'bs': self.get_breadcrumbs('list'),
+                })
+                return context
+
+        return ListViewClass
+
+
+
+class ProductDrawingCRUDView(ConfigurableCRUDView):
+    model = ProductDrawing
+    list_template_name = 'legacy/datacrud_list.html'
+    detail_template_name = 'legacy/datacrud_detail.html'
+    form_template_name = 'legacy/datacrud_form.html'
+    confirm_delete_template_name = 'legacy/datacrud_confirm_delete.html'
+    filterset_class = ProductDrawingFilter
+
+    page_title = "Product Drawing"
+
+    # URL name mappings
+    list_url_name = 'report:product_drawings-list'
+    create_url_name = 'report:product_drawings-create'
+    update_url_name = 'report:product_drawings-update'
+    delete_url_name = 'report:product_drawings-delete'
+    config_fields = ["id", "code_no", "code_no_mks", "lot_no", "drawing", "description", "created_at"] 
+    #config_field_orders = ["id", "customer_name", "template_names", "created_at",  "created_by"]
+    # config_readonly_fields = ["lot_no"]
+    config_edit_fields = None
+    ordering = ["-created_at", "-id",]
+    form_class = ProductDrawingForm
+
+

app/sysadmin/migrations/0002_alter_userprofile_position.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2 on 2025-05-06 04:36
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('sysadmin', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='userprofile',
+            name='position',
+            field=models.CharField(blank=True, choices=[('QA_STAFF', 'QA Staff'), ('QA_MANAGER', 'QA. MG.'), ('QA_AST_MANAGER', 'QA. Asst. MG.'), ('QA_ENGINEER', 'QA. Engineer')], max_length=20, null=True),
+        ),
+    ]

app/templates/base.html

@@ -66,6 +66,8 @@
                 <li><a href="/dashboard/" class="flex items-center p-2 text-gray-900 rounded-lg hover:bg-gray-100 dark:hover:bg-gray-700 dark:text-white"><span class="ml-3">Dashboard</span></a></li>
                 <li><a href="{% url "report:coi-view" %}" class="flex items-center p-2 text-gray-900 rounded-lg hover:bg-gray-100 dark:hover:bg-gray-700 dark:text-white"><span class="ml-3">COI</span></a></li>
                 <li><a href="{% url "report:report-list" %}" class="flex items-center p-2 text-gray-900 rounded-lg hover:bg-gray-100 dark:hover:bg-gray-700 dark:text-white"><span class="ml-3">Reports</span></a></li>
+                <li><a href="{% url "report:customer_templates-list" %}" class="flex items-center p-2 text-gray-900 rounded-lg hover:bg-gray-100 dark:hover:bg-gray-700 dark:text-white"><span class="ml-3">Customer Templates</span></a></li>
+                <li><a href="{% url "report:product_drawings-list" %}" class="flex items-center p-2 text-gray-900 rounded-lg hover:bg-gray-100 dark:hover:bg-gray-700 dark:text-white"><span class="ml-3">Drawing</span></a></li>
                  <li>
                     <button type="button" class="flex items-center w-full p-2 text-base text-gray-900 transition duration-75 rounded-lg group hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700" aria-controls="dropdown-example" data-collapse-toggle="dropdown-example">
                           <svg class="w-6 h-6 text-gray-800 dark:text-white" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">