code map

app/coi/urls.py

@@ -19,10 +19,13 @@ from django.contrib import admin
 from django.urls import path, include
 from django.conf.urls.static import static
 from django.conf import settings
+from report.views import coi_view
+
 
 urlpatterns = [
     path("admin/", admin.site.urls),
-    path('', include('dashboard.urls')),  # Include dashboard app's URLs
+    # path('', coi_view, name='home'),
+    path('', include('dashboard.urls')),  # include dashboard app's urls
     path('report/', include('report.urls')),  # Include report app's URLs
     path('sysadmin/', include('sysadmin.urls')),  # Include sysadmin app's URLs
     path('legacy/', include('legacy.urls')),  # Include legacy app's URLs

app/core/migrations/0009_mkscodemap.py

@@ -0,0 +1,23 @@
+# Generated by Django 4.2 on 2025-05-10 06:27
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0008_productdrawing'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='MksCodeMap',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('mgt_code', models.CharField(max_length=100)),
+                ('mks_code', models.CharField(max_length=100)),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('updated_at', models.DateTimeField(auto_now=True)),
+            ],
+        ),
+    ]

app/core/models.py

@@ -41,7 +41,7 @@ class MgMasterView(models.Model):
     PRO27 = models.CharField(max_length=255, null=True)
     P2 = models.CharField(max_length=255, null=True)  # PRO-P2
     SPEED = models.CharField(max_length=255, null=True)  # PRO-SPEED
-    #PRO_TOOL = models.CharField(max_length=255, null=True)  # PRO-TOOL
+    PRO_TOOL = models.CharField(max_length=255, null=True)  # PRO-TOOL
     PRO4 = models.CharField(max_length=255, null=True)
     
     # dbo.[MG-MAS-1]
@@ -124,7 +124,7 @@ class VMasterView(models.Model):
     P2 = models.CharField(max_length=255, null=True)  # PRO-P2
     PRO6 = models.CharField(max_length=255, null=True)
     SPEED = models.CharField(max_length=255, null=True)  # PRO-SPEED
-    #PRO_TOOL = models.CharField(max_length=255, null=True)  # PRO-TOOL
+    PRO_TOOL = models.CharField(max_length=255, null=True)  # PRO-TOOL
     PRO4 = models.CharField(max_length=255, null=True)
     
     # Fields from dbo.[V-MAS-1]
@@ -244,7 +244,7 @@ class BelMasterView(models.Model):
     P2 = models.CharField(max_length=255, null=True)  # PRO-P2
     PRO6 = models.CharField(max_length=255, null=True)
     SPEED = models.CharField(max_length=255, null=True)  # PRO-SPEED
-    #PRO_TOOL = models.CharField(max_length=255, null=True)  # PRO-TOOL
+    PRO_TOOL = models.CharField(max_length=255, null=True)  # PRO-TOOL
     PRO4 = models.CharField(max_length=255, null=True)
     
     # Fields from dbo.[BEL-MAS-1]
@@ -326,7 +326,7 @@ class EMasterView(models.Model):
     P2 = models.CharField(max_length=255, null=True)  # PRO-P2
     PRO6 = models.CharField(max_length=255, null=True)
     SPEED = models.CharField(max_length=255, null=True)  # PRO-SPEED
-    #PRO_TOOL = models.CharField(max_length=255, null=True)  # PRO-TOOL
+    PRO_TOOL = models.CharField(max_length=255, null=True)  # PRO-TOOL
     PRO4 = models.CharField(max_length=255, null=True)
     
     # Fields from dbo.[E-MAS-1]
@@ -521,3 +521,12 @@ class ProductDrawing(models.Model):
     
     def __str__(self):
         return f"{self.code_no} - {self.lot_no}"
+
+class MksCodeMap(models.Model):
+    mgt_code = models.CharField(max_length=100)
+    mks_code = models.CharField(max_length=100)
+    created_at = models.DateTimeField(auto_now_add=True)
+    updated_at = models.DateTimeField(auto_now=True)
+
+    def __str__(self):
+        return f"{self.mgt_code} ⇄ {self.mks_code}"

app/dashboard/templates/dashboard/index.html

@@ -9,48 +9,52 @@
         <!-- Card 1 -->
         <div class="bg-white p-6 rounded-lg shadow-md">
             <h2 class="text-xl font-semibold text-gray-700">Total Users</h2>
-            <p class="text-gray-600 text-lg mt-2">150</p>
+            <p class="text-gray-600 text-lg mt-2">{{ total_users }}</p>
         </div>
         <!-- Card 2 -->
         <div class="bg-white p-6 rounded-lg shadow-md">
             <h2 class="text-xl font-semibold text-gray-700">Reports Generated</h2>
-            <p class="text-gray-600 text-lg mt-2">45</p>
+            <p class="text-gray-600 text-lg mt-2">{{ total_reports }}</p>
         </div>
         <!-- Card 3 -->
         <div class="bg-white p-6 rounded-lg shadow-md">
             <h2 class="text-xl font-semibold text-gray-700">Active Sessions</h2>
-            <p class="text-gray-600 text-lg mt-2">20</p>
+            <p class="text-gray-600 text-lg mt-2">{{ total_sessions }}</p>
         </div>
     </div>
 
     <div class="mt-8">
-        <h2 class="text-2xl font-bold text-gray-800 mb-4">Recent Activities</h2>
+        <h2 class="text-2xl font-bold text-gray-800 mb-4">Latest Reports</h2>
         <div class="bg-white rounded-lg shadow-md overflow-hidden">
             <table class="w-full border-collapse border border-gray-200">
                 <thead class="bg-gray-100">
                     <tr>
                         <th class="border border-gray-200 px-4 py-2 text-left">Date</th>
-                        <th class="border border-gray-200 px-4 py-2 text-left">Activity</th>
+                        <th class="border border-gray-200 px-4 py-2 text-left">Report Name</th>
+                        <th class="border border-gray-200 px-4 py-2 text-left">File</th>
                         <th class="border border-gray-200 px-4 py-2 text-left">User</th>
                     </tr>
                 </thead>
                 <tbody>
-                    <tr class="hover:bg-gray-50">
-                        <td class="border border-gray-200 px-4 py-2">2024-12-22</td>
-                        <td class="border border-gray-200 px-4 py-2">Generated a report</td>
-                        <td class="border border-gray-200 px-4 py-2">John Doe</td>
-                    </tr>
-                    <tr class="hover:bg-gray-50">
-                        <td class="border border-gray-200 px-4 py-2">2024-12-21</td>
-                        <td class="border border-gray-200 px-4 py-2">Logged in</td>
-                        <td class="border border-gray-200 px-4 py-2">Jane Smith</td>
-                    </tr>
-                    <tr class="hover:bg-gray-50">
-                        <td class="border border-gray-200 px-4 py-2">2024-12-20</td>
-                        <td class="border border-gray-200 px-4 py-2">Updated profile</td>
-                        <td class="border border-gray-200 px-4 py-2">Emily Johnson</td>
-                    </tr>
-                </tbody>
+  {% for report in latest_reports %}
+    <tr class="hover:bg-gray-50">
+      <td class="border border-gray-200 px-4 py-2">{{ report.created_at|date:"d/m/Y H:i" }}</td>
+      <td class="border border-gray-200 px-4 py-2">{{ report.name }}</td>
+      <td class="border border-gray-200 px-4 py-2">
+        {% if report.file %}
+        <a href="{{ report.file.url }}" target="_blank" class="text-blue-600 underline">View</a>
+        {% else %}
+        <span class="text-gray-400">No file</span>
+        {% endif %}
+      </td>
+      <td class="border border-gray-200 px-4 py-2">{{ report.created_by.username }}</td>
+    </tr>
+  {% empty %}
+    <tr>
+      <td colspan="3" class="text-center text-gray-500 py-2">No reports found.</td>
+    </tr>
+  {% endfor %}
+</tbody>
             </table>
         </div>
     </div>

app/dashboard/views.py

@@ -1,6 +1,22 @@
 from django.contrib.auth.decorators import login_required
 from django.shortcuts import render
+from django.contrib.auth.models import User
+from django.contrib.sessions.models import Session
+from core.models import Report
+from django.utils.timezone import now
+
+
 
 @login_required
 def index_view(request):
-    return render(request, 'dashboard/index.html')
+    total_users = User.objects.count()
+    total_reports = Report.objects.count()
+    total_sessions = Session.objects.filter(expire_date__gt=now()).count()
+    latest_reports = Report.objects.order_by('-created_at')[:25]
+
+    return render(request, 'dashboard/index.html', {
+        'total_users': total_users,
+        'total_reports': total_reports,
+        'total_sessions': total_sessions,
+        'latest_reports': latest_reports,
+    })

app/report/filters.py

@@ -1,5 +1,5 @@
 import django_filters
-from core.models import Report, CustomerTemplateMapping, ProductDrawing
+from core.models import Report, CustomerTemplateMapping, ProductDrawing, MksCodeMap
 
 class ReportFilter(django_filters.FilterSet):
     name = django_filters.CharFilter(
@@ -55,3 +55,12 @@ class ProductDrawingFilter(django_filters.FilterSet):
     class Meta:
         model = ProductDrawing
         fields = ['code_no', 'code_no_mks', 'lot_no',]
+
+
+class MksCodeMapFilter(django_filters.FilterSet):
+    mgt_code = django_filters.CharFilter(lookup_expr='icontains', label='MGT Code')
+    mks_code = django_filters.CharFilter(lookup_expr='icontains', label='MKS Code')
+
+    class Meta:
+        model = MksCodeMap
+        fields = ['mgt_code', 'mks_code']

app/report/templates/report/coi.html

@@ -6,7 +6,6 @@
 
 {% 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 %}
@@ -21,10 +20,11 @@
       <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-4 gap-4">
+        <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>
+          <input type="checkbox" class="rounded" name='exports' value='{{ key }}'
+          x-model='exports' required>
           <span>{{ value }}</span>
         </label>
         {% endfor %}
@@ -102,6 +102,10 @@
                             <td class="border border-gray-300 px-4 py-2 font-medium text-gray-700">Shape | Size :</td>
                             <td class="border border-gray-300 px-4 py-2 text-gray-700">{{ size_str }}</td>
                         </tr>
+                        <tr class="bg-blue-100">
+                            <td class="border border-gray-300 px-4 py-2 font-medium text-gray-700">Tool :</td>
+                            <td class="border border-gray-300 px-4 py-2 text-gray-700">{{ result.PRO_TOOL }}</td>
+                        </tr>
                         <tr>
                             <td class="border border-gray-300 px-4 py-2 font-medium text-gray-700">Specification :</td>
                             <td class="border border-gray-300 px-4 py-2 text-gray-700">{{ spec }}</td>
@@ -148,7 +152,7 @@ th, td {
   function COIReport() {
     return {
       lot_no: '{{ lot_no }}', // Bind this to the input value
-      exports: [],
+      exports: {{ selected_templates|safe }},
       qa1: null,
       qa2: null,
       gen_report_url: '{% url "report:gen_report" %}', 

app/report/urls.py

@@ -1,10 +1,11 @@
 from django.urls import path
 from . import views
-from .views import ReportCRUDView, CustomerTemplateCRUDView, ProductDrawingCRUDView
+from .views import ReportCRUDView, CustomerTemplateCRUDView, ProductDrawingCRUDView, MksCodeMapCRUDView
 
 report_crud = ReportCRUDView()
 customer_templates_crud = CustomerTemplateCRUDView()
 product_drawings_crud = ProductDrawingCRUDView()
+code_maps_crud = MksCodeMapCRUDView()
 
 app_name = "report"  # Use this namespace for reverse URL lookups
 
@@ -27,6 +28,11 @@ urlpatterns = [
     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('code_maps/', code_maps_crud.get_list_view().as_view(), name='code_maps-list'),
+    path('code_maps/create/', code_maps_crud.get_create_view().as_view(), name='code_maps-create'),
+    path('code_maps/<str:pk>/update/', code_maps_crud.get_update_view().as_view(), name='code_maps-update'),
+    path('code_maps/<str:pk>/delete/', code_maps_crud.get_delete_view().as_view(), name='code_maps-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

@@ -2,10 +2,10 @@ 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, CustomerTemplateMapping, \
-                ProductDrawing
+                ProductDrawing, MksCodeMap
 from core.forms import ReportForm, CustomerTemplateMappingForm, ProductDrawingForm
 from core.utils import ConfigurableCRUDView, queryFromMaster, SHEET_NAMES
-from .filters import ReportFilter, CustomerTemplateFilter, ProductDrawingFilter
+from .filters import ReportFilter, CustomerTemplateFilter, ProductDrawingFilter, MksCodeMapFilter
 from .forms import ExportOptionsForm
 from pprint import pprint
 
@@ -896,6 +896,7 @@ def create_coi_file(lot_no, sheets, user, md):
         # "hardness_out.spe_acc": False,  # Hide rows 24 to 28 if the prefix is "0"
         "acc": accept,  # Hide rows 24 to 28 if the prefix is "0"
         "spe_acc": specialAccept,  # Hide rows 24 to 28 if the prefix is "0"
+        "tool": first_result.PRO_TOOL,
         # "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}",
@@ -1011,6 +1012,7 @@ def coi_view(request):
             if lot_no:
                 results = queryFromMaster(lot_no)
                 first_result = results[0] if results else None
+                selected_templates = None
                 try:
                     pcs = int(first_result.PRO5) - int(first_result.PRO27)
                 except:
@@ -1018,6 +1020,8 @@ 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
                 else:
                     size_str = ""
                     spec = ""
@@ -1036,7 +1040,7 @@ def coi_view(request):
                                                            'size_str': size_str,
                                                            'lot_no': lot_no,
                                                            'spec': spec, 'users': users, 'SHEET_NAMES': SHEET_NAMES, 
-                                                           'results': results, 'fields': fields})
+                                                           'results': results, 'fields': fields, 'selected_templates': selected_templates})
 
         messages.success(request, "Request Sent")
         return redirect(request.path_info)
@@ -1155,3 +1159,22 @@ class ProductDrawingCRUDView(ConfigurableCRUDView):
     form_class = ProductDrawingForm
 
 
+class MksCodeMapCRUDView(ConfigurableCRUDView):
+    model = MksCodeMap
+    page_title = "MKS Code Mapping"
+    filterset_class = MksCodeMapFilter
+
+    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"
+
+    config_fields = ["id", "mgt_code", "mks_code", "created_at"]
+    config_edit_fields = ["mgt_code", "mks_code"]
+
+    list_url_name = "report:code_maps-list"
+    create_url_name = "report:code_maps-create"
+    update_url_name = "report:code_maps-update"
+    delete_url_name = "report:code_maps-delete"
+
+    ordering = ["-created_at", "-id"]