dimension

app/core/utils.py

@@ -20,7 +20,7 @@ class ConfigurableCRUDView:
     form_template_name = None
     confirm_delete_template_name = None
     fields = '__all__'  # Default to all fields
-    paginate_by = 10
+    paginate_by = 50
     filterset_class = None
     page_title = "Page Title"
     create_url_name = None

app/legacy/filters.py

@@ -1,6 +1,6 @@
 import django_filters
 from .models import Data, DataMs, TbFgPressinfoLotlist, LotSummary, DataRl, DataWb, \
-        LotSummaryRl, LotSummaryWb
+        LotSummaryRl, LotSummaryWb, RotateData
 
 class DataFilter(django_filters.FilterSet):
     lot_no = django_filters.CharFilter(field_name='lot_no', lookup_expr='icontains')
@@ -78,3 +78,10 @@ class LotSummaryWbFilter(django_filters.FilterSet):
         model = LotSummaryWb
         fields = ['lot_no', 'code']  # Add fields you want to filter
 
+class RotateDataFilter(django_filters.FilterSet):
+    lot_no = django_filters.CharFilter(field_name='lot_no', lookup_expr='icontains')
+    code = django_filters.CharFilter(field_name='code', lookup_expr='icontains')
+
+    class Meta:
+        model = RotateData
+        fields = ['lot_no', 'code']  # Add fields you want to filter

app/legacy/urls.py

@@ -1,7 +1,8 @@
 from django.urls import path
 from .views import DataListView, DataDetailView, DataCreateView, DataUpdateView, DataDeleteView,\
 DataMsCRUDView, TbFgPressInfoLotListCRUDView, LotSummaryCRUDView, VMasterViewCRUDView, MgMasterViewCRUDView,\
-BelMasterViewCRUDView, EMasterViewCRUDView, DataRLCRUDView, DataWbCRUDView, LotSummaryRlCRUDView, LotSummaryWbCRUDView
+BelMasterViewCRUDView, EMasterViewCRUDView, DataRLCRUDView, DataWbCRUDView, LotSummaryRlCRUDView, \
+LotSummaryWbCRUDView, RotateDataCRUDView
 
 app_name = 'legacy'  # Namespace for this app
 
@@ -16,6 +17,7 @@ datarl_crud = DataRLCRUDView()
 datawb_crud = DataWbCRUDView()
 lsrl_crud = LotSummaryRlCRUDView()
 lswb_crud = LotSummaryWbCRUDView()
+rotate_crud = RotateDataCRUDView()
 
 urlpatterns = [
     path('data/', DataListView.as_view(), name='data-list'),            # data/
@@ -79,4 +81,9 @@ urlpatterns = [
     path('lswb/create/', lswb_crud.get_create_view().as_view(), name='lswb-create'),
     path('lswb/<int:pk>/update/', lswb_crud.get_update_view().as_view(), name='lswb-update'),
     path('lswb/<int:pk>/delete/', lswb_crud.get_delete_view().as_view(), name='lswb-delete'),
+
+    path('rotate/', rotate_crud.get_list_view().as_view(), name='rotate-list'),
+    path('rotate/create/', rotate_crud.get_create_view().as_view(), name='rotate-create'),
+    path('rotate/<int:pk>/update/', rotate_crud.get_update_view().as_view(), name='rotate-update'),
+    path('rotate/<int:pk>/delete/', rotate_crud.get_delete_view().as_view(), name='rotate-delete'),
 ]

app/legacy/views.py

@@ -11,9 +11,10 @@ from django.views.generic import (
     DeleteView,
 )
 from django.core.paginator import Paginator
-from .models import Data, DataMs, TbFgPressinfoLotlist, LotSummary, DataRl, DataWb, LotSummaryRl, LotSummaryWb
+from .models import Data, DataMs, TbFgPressinfoLotlist, LotSummary, DataRl, DataWb, LotSummaryRl, \
+        RotateData, LotSummaryWb
 from .filters import DataFilter, DataMsFilter, TbFgPressFilter, LotSummaryFilter, \
-        DataRlFilter, DataWbFilter, LotSummaryRlFilter, LotSummaryWbFilter
+        DataRlFilter, DataWbFilter, LotSummaryRlFilter, LotSummaryWbFilter, RotateDataFilter
 from django.urls import reverse
 from django.contrib import messages
 from pprint import pprint
@@ -374,3 +375,21 @@ class LotSummaryWbCRUDView(ConfigurableCRUDView):
     delete_url_name = 'legacy:lswb-delete'
     # excludes = ["splitdata"]
     config_field_orders = ["id", "lot_no", "code"]  # Display these fields first
+
+class RotateDataCRUDView(ConfigurableCRUDView):
+    model = RotateData
+    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 = RotateDataFilter
+
+    page_title = "Rotate Data"
+
+    # URL name mappings
+    list_url_name = 'legacy:rotate-list'
+    create_url_name = 'legacy:rotate-create'
+    update_url_name = 'legacy:rotate-update'
+    delete_url_name = 'legacy:rotate-delete'
+    # excludes = ["splitdata"]
+    config_field_orders = ["id", "lot_no", "code"]  # Display these fields first

app/report/templates/report/coi.html

@@ -24,7 +24,7 @@
         <div class="grid grid-cols-4 gap-4">
         {% for key,value in SHEET_NAMES.items %}
         <label class="flex items-center space-x-1">
-          <input type="checkbox" class="rounded" name='exports' value='{{ key }}' x-model='exports'>
+          <input type="checkbox" class="rounded" name='exports' value='{{ key }}' x-model='exports' required>
           <span>{{ value }}</span>
         </label>
         {% endfor %}
@@ -32,7 +32,7 @@
         <div class="grid grid-cols-2 gap-4">
           <div class="my-4">
             <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'>
+            <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>
               {% for user in users %}
               <option value="{{ user.id }}">{{ user.profile }}</option>
@@ -41,7 +41,7 @@
           </div>
           <div class="my-4">
             <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'>
+            <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>
               {% for user in users %}
               <option value="{{ user.id }}">{{ user.profile }}</option>
@@ -50,6 +50,21 @@
           </div>
         </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>
+
+            <!-- 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>
+            </label>
+          </div>
           <div>
             <button  type='button' class="bg-blue-500 text-white px-4 py-2 rounded hover:bg-blue-600" 
                                    @click="exportCOI">
@@ -140,6 +155,7 @@ th, td {
       qa1: null,
       qa2: null,
       gen_report_url: '{% url "report:gen_report" %}', 
+      acceptStatus: 'accepted', 
       downloadUrl: null, // Stores the download link after export success
       init() {
         //alert("COI Report");
@@ -151,6 +167,18 @@ th, td {
                   alert("Please enter a Lot No.");
                   return;
               }
+              if (!this.qa1) {
+                  alert("Select QA.1");
+                  return;
+              }
+              if (!this.qa2) {
+                  alert("Select QA.2");
+                  return;
+              }
+              if (this.exports.length == 0) {
+                  alert("Select Export Template");
+                  return;
+              }
 
               try {
                   // Make POST request using Axios
@@ -158,7 +186,8 @@ th, td {
                       lot_no: this.lot_no,
                       exports: this.exports,
                       qa1: this.qa1,
-                      qa2: this.qa2
+                      qa2: this.qa2,
+                      acceptStatus: this.acceptStatus
                   });
 
                   if (response.status === 200) {

app/report/views.py

@@ -8,7 +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 legacy.models import Data, DataMs, DataRl, DataWb, LotSummary, LotSummaryRl, LotSummaryWb, PressCal, RotateData, TbFgPressinfoLotlist,\
+        Manualsize
 
 from .gen_report import gen_xlsx
 from django.core.files.base import File
@@ -161,6 +162,62 @@ def generate_hardness_out_in_values(lot_no):
     
     return placeholders
 
+def generate_dimension_values(lot_no):
+    """
+    Fetch dimension records from manualSize and DataMs models
+    and generate placeholder values for Standard, Actual, and Judgement.
+    Supports two row_no entries per lot.
+    """
+    # Fetch standard values from manualSize (limit to 2 rows)
+    manual_size_records = Manualsize.objects.filter(lotno=lot_no)
+
+    # Fetch actual and judgement values from DataMs ordered by row_no (limit to 2 rows)
+    data_ms_records = DataMs.objects.filter(lot_no=lot_no).order_by('row_no')[:2]
+
+    # Prepare placeholders
+
+    placeholders = {}
+    for i in range(1,7):
+        for j in range(1,4):
+            placeholders[f'v{i}_{j}'] = 0
+    
+    pprint(placeholders)
+    pprint(manual_size_records) 
+    for m in manual_size_records:
+        if m.size_name == "D":
+            placeholders['v1_1'] = placeholders['v4_1'] = f'{m.std} +{m.tolup} {m.tolun}'
+        if m.size_name == "T":
+            placeholders['v2_1'] = placeholders['v5_1'] = f'{m.std} +{m.tolup} {m.tolun}'
+        if m.size_name == "H":
+            placeholders['v3_1'] = placeholders['v6_1'] = f'{m.std} +{m.tolup} {m.tolun}'
+
+
+
+    # Ensure that we map each manualSize entry to a corresponding DataMs entry
+    for r in data_ms_records:
+        if r.row_no == 1:
+            placeholders[f'v1_2'] = r.dsize
+            placeholders[f'v1_3'] = r.dsizeok
+            
+            placeholders[f'v2_2'] = r.tsize
+            placeholders[f'v2_3'] = r.tsizeok
+            
+            placeholders[f'v3_2'] = r.hsize
+            placeholders[f'v3_3'] = r.hsizeok
+        
+        if r.row_no == 2:
+            placeholders[f'v4_2'] = r.dsize
+            placeholders[f'v4_3'] = r.dsizeok
+            
+            placeholders[f'v5_2'] = r.tsize
+            placeholders[f'v5_3'] = r.tsizeok
+            
+            placeholders[f'v6_2'] = r.hsize
+            placeholders[f'v6_3'] = r.hsizeok
+
+    hide_con(placeholders, "v4_2", "24:28")
+    return placeholders
+
 def merge_sheet_data_with_data(sheet_data, data):
     """
     Merge `sheet_data` with `data`.
@@ -180,6 +237,13 @@ def create_coi_file(lot_no, sheets, user, md):
     qa1 = User.objects.get(pk=md['qa1'])
     qa2 = User.objects.get(pk=md['qa2'])
 
+    accept = specialAccept = False
+    if md['acceptStatus'] == "accepted":
+        accept = True
+    if md['acceptStatus'] == "special_accepted":
+        specialAccept = True
+
+
     pprint(qa1)
     pprint(qa2)
     
@@ -190,25 +254,38 @@ def create_coi_file(lot_no, sheets, user, md):
                 sheet_data[sheet_name] = generate_hardness_out_values(lot_no)
             case 'hardness_out_in':
                 sheet_data[sheet_name] = generate_hardness_out_in_values(lot_no)
+            case 'dimension':
+                sheet_data[sheet_name] = generate_dimension_values(lot_no)
     
     converted_data = convert_sheet_data(sheet_data)
 
     print(f"sheet_data \n {sheet_data}") 
     print(f"converted_data \n {converted_data}")
 
+    results = queryFromMaster(lot_no)
+    first_result = results[0] if results else None
+    try:
+        pcs = int(first_result.PRO5) - int(first_result.PRO27)
+    except:
+        pcs = 0
+    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}"
+    else:
+        size_str = ""
+        spec = ""
+
     data = {
-        "customer": "Tum Coder",
+        "customer": first_result.PRO1C,
         "inspect_date": "2025-01-15",
-        "lot_no": "12345",
-        "staff_name":  "Tum 8888",
-        "man_name":  "Tum 999",
-        "size": "Large",
-        "pcs": "10 pcs",
-        "spec": "Spec-A",
-        "hardness_out.acc": True,  # Hide rows 24 to 28 if the prefix is "0"
-        "hardness_out.spe_acc": False,  # Hide rows 24 to 28 if the prefix is "0"
-        "acc": True,  # Hide rows 24 to 28 if the prefix is "0"
-        "spe_acc": True,  # Hide rows 24 to 28 if the prefix is "0"
+        "lot_no": lot_no,
+        "size": size_str,
+        "pcs": pcs,
+        "spec": spec,
+        # "hardness_out.acc": True,  # Hide rows 24 to 28 if the prefix is "0"
+        # "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"
         # "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}",
@@ -385,7 +462,8 @@ def gen_report_view(request):
                 return HttpResponseBadRequest("Missing 'lot_no' in request data")
 
             # Call the `create_coi_file` function with the provided lot_no
-            report = create_coi_file(lot_no, exports, request.user, {'qa1': qa1, 'qa2': qa2})
+            report = create_coi_file(lot_no, exports, request.user, {'qa1': qa1, 'qa2': qa2, \
+                    'acceptStatus': data.get('acceptStatus')})
 
             # Return a success response with the report details
             return JsonResponse({

app/templates/base.html

@@ -94,6 +94,9 @@
                             <a href="{% url "legacy:datams-list" %}" class="flex items-center w-full p-2 text-gray-900 transition duration-75 rounded-lg pl-11 group hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700">Measurement</a>
                           </li>
                           <li>
+                            <a href="{% url "legacy:rotate-list" %}" class="flex items-center w-full p-2 text-gray-900 transition duration-75 rounded-lg pl-11 group hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700">Rotate Data</a>
+                          </li>
+                          <li>
                             <a href="{% url "legacy:fg-list" %}" class="flex items-center w-full p-2 text-gray-900 transition duration-75 rounded-lg pl-11 group hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700">Fg Press Info</a>
                           </li>
                           <li>