all data

app/legacy/models.py

@@ -472,14 +472,14 @@ class DataRl(models.Model):
 
 class DataWb(models.Model):
     row_no = models.IntegerField(blank=True, null=True)
+    lot_no = models.CharField(max_length=50, db_collation='SQL_Latin1_General_CP1_CI_AS', blank=True, null=True)
+    code = models.CharField(max_length=50, db_collation='SQL_Latin1_General_CP1_CI_AS', blank=True, null=True)
     result = models.FloatField(blank=True, null=True)
     weight = models.FloatField(blank=True, null=True)
     judgement = models.CharField(max_length=10, db_collation='SQL_Latin1_General_CP1_CI_AS', blank=True, null=True)
     created_at = models.DateTimeField(blank=True, null=True)
     updated_at = models.DateTimeField(blank=True, null=True)
-    lot_no = models.CharField(max_length=50, db_collation='SQL_Latin1_General_CP1_CI_AS', blank=True, null=True)
     machine_id = models.IntegerField(blank=True, null=True)
-    code = models.CharField(max_length=50, db_collation='SQL_Latin1_General_CP1_CI_AS', blank=True, null=True)
     emp_id = models.IntegerField(blank=True, null=True)
     repair_by = models.CharField(max_length=30, db_collation='SQL_Latin1_General_CP1_CI_AS', blank=True, null=True)
 
@@ -712,6 +712,8 @@ class PressCal(models.Model):
 
 class RotateData(models.Model):
     row_no = models.IntegerField(blank=True, null=True)
+    lot_no = models.CharField(max_length=50, db_collation='SQL_Latin1_General_CP1_CI_AS', blank=True, null=True)
+    code = models.CharField(max_length=50, db_collation='SQL_Latin1_General_CP1_CI_AS', blank=True, null=True)
     speed_spec = models.FloatField(blank=True, null=True)
     speed_test = models.FloatField(blank=True, null=True)
     speedok = models.CharField(db_column='speedOk', max_length=4, db_collation='SQL_Latin1_General_CP1_CI_AS', blank=True, null=True)  # Field name made lowercase.
@@ -719,9 +721,7 @@ class RotateData(models.Model):
     station_no = models.IntegerField()
     created_at = models.DateTimeField(blank=True, null=True)
     updated_at = models.DateTimeField(blank=True, null=True)
-    lot_no = models.CharField(max_length=50, db_collation='SQL_Latin1_General_CP1_CI_AS', blank=True, null=True)
     machine_id = models.IntegerField(blank=True, null=True)
-    code = models.CharField(max_length=50, db_collation='SQL_Latin1_General_CP1_CI_AS', blank=True, null=True)
     emp_id = models.IntegerField()
     devid = models.CharField(max_length=40, db_collation='SQL_Latin1_General_CP1_CI_AS', blank=True, null=True)
     mode = models.CharField(max_length=10, db_collation='SQL_Latin1_General_CP1_CI_AS', blank=True, null=True)

app/legacy/templatetags/legacy_filters.py

@@ -44,3 +44,7 @@ def safe_floatformat(value, decimal_places):
     except (ValueError, TypeError):
         # If the value is not a number, return it as is
         return value
+
+@register.filter
+def get_item(dictionary, key):
+    return dictionary.get(key, None)

app/report/templates/report/_tbl.html

@@ -0,0 +1,35 @@
+{% load legacy_filters %}
+<div class="clear-both bg-white shadow rounded-lg overflow-x-auto my-6">
+<h2 class="text-2xl md:text-2xl font-semibold text-gray-700 dark:text-gray-200  m-3 tracking-wide leading-snug">
+  {{ header }}</h2>
+<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 %}
+        </tr>
+    </thead>
+    <tbody>
+        {% for obj in objs %}
+            <tr class="hover:bg-gray-50">
+                {% for field in fields %}
+                <td class="border border-gray-200 px-4 py-2">
+                    {% if field.name == 'id' %}
+                            {{ obj|attr:field.name }}
+                    {% elif field.name == 'file' and obj.file %}
+                    <a href="{{ obj.file.url }}" target="_blank">View</a>
+                    {% else %}
+                        {{ obj|attr:field.name | safe_floatformat:2 }}
+                    {% endif %}
+                </td>
+                {% endfor %}
+            </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>

app/report/templates/report/coi.html

@@ -1,5 +1,7 @@
 {% extends 'base.html' %}
 {% load tailwind_filters %}
+{% load legacy_filters %}
+
 {% block title %}Report Dashboard{% endblock %}
 
 {% block content %}
@@ -108,27 +110,28 @@
                 </table>
                     </div>
 </div>
-{% include "report/_hardnessout.html" %}
-<div class="border-t border-gray-300 my-4"></div>
-{% include "report/_hardness_outin.html" %}
-<div class="border-t border-gray-300 my-4"></div>
-{% include "report/_hardnessboth.html" %}
-<div class="border-t border-gray-300 my-4"></div>
-{% include "report/_dimen.html" %}
-<div class="border-t border-gray-300 my-4"></div>
-{% include "report/_dimen_app.html" %}
-<div class="border-t border-gray-300 my-4"></div>
-{% include "report/_dimen_bal.html" %}
-<div class="border-t border-gray-300 my-4"></div>
-{% include "report/_dim_bl_app_hard.html" %}
-<div class="border-t border-gray-300 my-4"></div>
-{% include "report/_dim_bal_app_rot_hard.html" %}
-<div class="border-t border-gray-300 my-4"></div>
-{% include "report/_t8p.html" %}
-<div class="border-t border-gray-300 my-4"></div>
-{% include "report/_cen.html" %}
+{% for model_name, objs in results.items %}
+  {% if objs %}
+    {% include "report/_tbl.html" with objs=objs fields=fields|get_item:model_name header=model_name %}
+  {% endif %}
+{% endfor %}
+
 {% endblock %}
 {% block footer_script %}
+<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>
+
 <script type="text/javascript">
   function COIReport() {
     return {

app/report/views.py

@@ -8,6 +8,8 @@ from .filters import ReportFilter
 from .forms import ExportOptionsForm
 from pprint import pprint
 
+from legacy.models import Data, DataMs, DataRl, DataWb, LotSummary, LotSummaryRl, LotSummaryWb, PressCal, RotateData, TbFgPressinfoLotlist
+
 from .gen_report import gen_xlsx
 from django.core.files.base import File
 from pathlib import Path
@@ -250,6 +252,38 @@ SHEET_NAMES = {
     '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())
+    # return fields
+    fields = [f for f in model._meta.get_fields() if not f.auto_created]
+    return fields
+
+def filter_by_lot_no(lot_no):
+    models = [Data, DataMs, DataRl, DataWb, LotSummary, LotSummaryRl, LotSummaryWb, PressCal, RotateData ]  # List of models to process
+    results = {}
+    fields = {}
+
+    for model in models:
+
+        model_fields = [f.name for f in model._meta.get_fields()]
+        # Check if "id" and "row_no" are in the model's fields
+        order_fields = []
+        if "id" in model_fields:
+            order_fields.append("id")
+        if "row_no" in model_fields:
+            order_fields.append("row_no")
+        # Dynamically filter and order results
+        model_name = model.__name__
+        if order_fields:
+            results[model_name] = model.objects.filter(lot_no=lot_no).order_by(*order_fields)
+        else:
+            results[model_name] = model.objects.filter(lot_no=lot_no)  # No 
+        
+        fields[model_name] = get_fields(model)
+
+    return results, fields
+
 def coi_view(request):
     pprint(f"xxxx method = xxx {request.method}")
     users = User.objects.all()
@@ -312,11 +346,22 @@ def coi_view(request):
                 else:
                     size_str = ""
                     spec = ""
+                results, fields = filter_by_lot_no(lot_no)
+                # results1 = Data.objects.filter(lot_no=lot_no).order_by("id", "row_no")
+                # fields1 =  get_fields(Data)
+
+                # results2 = DataMs.objects.filter(lot_no=lot_no).order_by("id", "row_no")
+                # fields2 =  get_fields(DataMs)
+
+
+
+
                 return render(request, 'report/coi.html', {'result': first_result, 
                                                            'pcs':pcs, 
                                                            'size_str': size_str,
                                                            'lot_no': lot_no,
-                                                           'spec': spec, 'users': users, 'SHEET_NAMES': SHEET_NAMES})
+                                                           'spec': spec, 'users': users, 'SHEET_NAMES': SHEET_NAMES, 
+                                                           'results': results, 'fields': fields})
 
         messages.success(request, "Request Sent")
         return redirect(request.path_info)