tum 1 年間 前
コミット
cae275e4f5
共有7 個のファイルを変更した52 個の追加5 個の削除を含む
  1. 1 1
      app/core/utils.py
  2. 14 1
      app/legacy/filters.py
  3. 7 1
      app/legacy/urls.py
  4. 26 2
      app/legacy/views.py
  5. BIN
      app/report/~$coi_templates.xlsx
  6. 1 0
      app/sysadmin/views.py
  7. 3 0
      app/templates/base.html

+ 1 - 1
app/core/utils.py

@@ -34,7 +34,7 @@ class ConfigurableCRUDView:
34 34
     config_readonly_fields = []  # Fields that should be read-only in update view
35 35
 
36 36
     config_edit_fields = "__all__"  # "all" or a list of field names to display
37
-    ordering = ["-id","-created_at"]
37
+    ordering = None
38 38
     form_class = None
39 39
 
40 40
     def get_fields(self):

+ 14 - 1
app/legacy/filters.py

@@ -1,6 +1,6 @@
1 1
 import django_filters
2 2
 from .models import Data, DataMs, TbFgPressinfoLotlist, LotSummary, DataRl, DataWb, \
3
-        LotSummaryRl, LotSummaryWb, RotateData
3
+        LotSummaryRl, LotSummaryWb, RotateData, Manualsize
4 4
 
5 5
 class DataFilter(django_filters.FilterSet):
6 6
     lot_no = django_filters.CharFilter(field_name='lot_no', lookup_expr='icontains')
@@ -85,3 +85,16 @@ class RotateDataFilter(django_filters.FilterSet):
85 85
     class Meta:
86 86
         model = RotateData
87 87
         fields = ['lot_no', 'code']  # Add fields you want to filter
88
+
89
+
90
+class ManualsizeFilter(django_filters.FilterSet):
91
+    lotno = django_filters.CharFilter(field_name='lotno', lookup_expr='icontains')
92
+    size_name = django_filters.CharFilter(field_name='size_name', lookup_expr='icontains')
93
+    std = django_filters.NumberFilter(field_name='std')
94
+    tolun = django_filters.NumberFilter(field_name='tolun')
95
+    tolup = django_filters.NumberFilter(field_name='tolup')
96
+    created_at = django_filters.DateTimeFilter(field_name='created_at', lookup_expr='gte')  # Filter for recent entries
97
+    productcode = django_filters.CharFilter(field_name='productcode', lookup_expr='icontains')
98
+    class Meta:
99
+        model = Manualsize
100
+        fields = ['lotno', 'size_name', 'std', 'tolun', 'tolup', 'created_at', 'productcode']

+ 7 - 1
app/legacy/urls.py

@@ -2,7 +2,7 @@ from django.urls import path
2 2
 from .views import DataListView, DataDetailView, DataCreateView, DataUpdateView, DataDeleteView,\
3 3
 DataMsCRUDView, TbFgPressInfoLotListCRUDView, LotSummaryCRUDView, VMasterViewCRUDView, MgMasterViewCRUDView,\
4 4
 BelMasterViewCRUDView, EMasterViewCRUDView, DataRLCRUDView, DataWbCRUDView, LotSummaryRlCRUDView, \
5
-LotSummaryWbCRUDView, RotateDataCRUDView
5
+LotSummaryWbCRUDView, RotateDataCRUDView, ManualsizeCRUDView
6 6
 
7 7
 app_name = 'legacy'  # Namespace for this app
8 8
 
@@ -18,6 +18,7 @@ datawb_crud = DataWbCRUDView()
18 18
 lsrl_crud = LotSummaryRlCRUDView()
19 19
 lswb_crud = LotSummaryWbCRUDView()
20 20
 rotate_crud = RotateDataCRUDView()
21
+manualsize_crud = ManualsizeCRUDView()
21 22
 
22 23
 urlpatterns = [
23 24
     path('data/', DataListView.as_view(), name='data-list'),            # data/
@@ -86,4 +87,9 @@ urlpatterns = [
86 87
     path('rotate/create/', rotate_crud.get_create_view().as_view(), name='rotate-create'),
87 88
     path('rotate/<int:pk>/update/', rotate_crud.get_update_view().as_view(), name='rotate-update'),
88 89
     path('rotate/<int:pk>/delete/', rotate_crud.get_delete_view().as_view(), name='rotate-delete'),
90
+    # Add this line at line 88
91
+    path('manualsize/', manualsize_crud.get_list_view().as_view(), name='manualsize-list'),
92
+    path('manualsize/create/', manualsize_crud.get_create_view().as_view(), name='manualsize-create'),
93
+    path('manualsize/<str:pk>/update/', manualsize_crud.get_update_view().as_view(), name='manualsize-update'),
94
+    path('manualsize/<str:pk>/delete/', manualsize_crud.get_delete_view().as_view(), name='manualsize-delete'),
89 95
 ]

+ 26 - 2
app/legacy/views.py

@@ -12,9 +12,9 @@ from django.views.generic import (
12 12
 )
13 13
 from django.core.paginator import Paginator
14 14
 from .models import Data, DataMs, TbFgPressinfoLotlist, LotSummary, DataRl, DataWb, LotSummaryRl, \
15
-        RotateData, LotSummaryWb
15
+        RotateData, LotSummaryWb, Manualsize
16 16
 from .filters import DataFilter, DataMsFilter, TbFgPressFilter, LotSummaryFilter, \
17
-        DataRlFilter, DataWbFilter, LotSummaryRlFilter, LotSummaryWbFilter, RotateDataFilter
17
+        DataRlFilter, DataWbFilter, LotSummaryRlFilter, LotSummaryWbFilter, RotateDataFilter, ManualsizeFilter
18 18
 from django.urls import reverse
19 19
 from django.contrib import messages
20 20
 from pprint import pprint
@@ -137,6 +137,7 @@ class DataMsCRUDView(ConfigurableCRUDView):
137 137
     delete_url_name = 'legacy:datams-delete'
138 138
     excludes = ["splitdata"]
139 139
     config_field_orders = ["id", "lot_no", "code"]  # Display these fields first
140
+    ordering = ['-id',]
140 141
 
141 142
 class TbFgPressInfoLotListCRUDView(ConfigurableCRUDView):
142 143
     model = TbFgPressinfoLotlist
@@ -321,6 +322,7 @@ class DataRLCRUDView(ConfigurableCRUDView):
321 322
     delete_url_name = 'legacy:datarl-delete'
322 323
     # excludes = ["splitdata"]
323 324
     config_field_orders = ["id", "lot_no", "code"]  # Display these fields first
325
+    ordering = ["-id"]
324 326
 
325 327
 class DataWbCRUDView(ConfigurableCRUDView):
326 328
     model = DataWb
@@ -339,6 +341,7 @@ class DataWbCRUDView(ConfigurableCRUDView):
339 341
     delete_url_name = 'legacy:datawb-delete'
340 342
     # excludes = ["splitdata"]
341 343
     config_field_orders = ["id", "lot_no", "code"]  # Display these fields first
344
+    ordering = ["-id"]
342 345
 
343 346
 class LotSummaryRlCRUDView(ConfigurableCRUDView):
344 347
     model = LotSummaryRl
@@ -393,3 +396,24 @@ class RotateDataCRUDView(ConfigurableCRUDView):
393 396
     delete_url_name = 'legacy:rotate-delete'
394 397
     # excludes = ["splitdata"]
395 398
     config_field_orders = ["id", "lot_no", "code"]  # Display these fields first
399
+
400
+class ManualsizeCRUDView(ConfigurableCRUDView):
401
+    model = Manualsize
402
+    list_template_name = 'legacy/datacrud_list.html'
403
+    detail_template_name = 'legacy/datacrud_detail.html'
404
+    form_template_name = 'legacy/datacrud_form.html'
405
+    confirm_delete_template_name = 'legacy/datacrud_confirm_delete.html'
406
+    
407
+    filterset_class = ManualsizeFilter  # If you have a filter for this model
408
+
409
+    page_title = "Manual Size Data"
410
+
411
+    # URL name mappings
412
+    list_url_name = 'legacy:manualsize-list'
413
+    create_url_name = 'legacy:manualsize-create'
414
+    update_url_name = 'legacy:manualsize-update'
415
+    delete_url_name = 'legacy:manualsize-delete'
416
+
417
+    # Define the order of fields to be displayed
418
+    config_field_orders = ["lotno", "size_name", "std", "tolun", "tolup", "created_at", "productcode"]
419
+

BIN
app/report/~$coi_templates.xlsx


+ 1 - 0
app/sysadmin/views.py

@@ -86,3 +86,4 @@ class UserCRUDView(ConfigurableCRUDView):
86 86
     config_field_orders = ["id",]  # Display these fields first
87 87
     form_class = UserCustomForm
88 88
     config_edit_fields = None
89
+    ordering = ["-id"]

+ 3 - 0
app/templates/base.html

@@ -120,6 +120,9 @@
120 120
                           <li>
121 121
                             <a href="{% url "legacy:em-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">EMaster</a>
122 122
                           </li>
123
+                          <li>
124
+                            <a href="{% url "legacy:manualsize-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">Manual Size</a>
125
+                          </li>
123 126
                     </ul>
124 127
                  </li>
125 128
                  <li>