tum 11 mēneši atpakaļ
vecāks
revīzija
8d9d2c43d4
3 mainītis faili ar 22 papildinājumiem un 23 dzēšanām
  1. 1 1
      app/core/utils.py
  2. 1 1
      app/legacy/views.py
  3. 20 21
      app/report/views.py

+ 1 - 1
app/core/utils.py

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

+ 1 - 1
app/legacy/views.py

26
 class DataListView(FilterView, ListView):
26
 class DataListView(FilterView, ListView):
27
     model = Data
27
     model = Data
28
     template_name = 'legacy/data_list.html'
28
     template_name = 'legacy/data_list.html'
29
-    ordering = ['id', 'row_no']  # Order by id (ascending), then row_no (ascending)
29
+    ordering = ['-id', 'row_no']  # Order by id (ascending), then row_no (ascending)
30
     # context_object_name = 'data_list'
30
     # context_object_name = 'data_list'
31
     paginate_by = 50  # Enable pagination
31
     paginate_by = 50  # Enable pagination
32
 
32
 

+ 20 - 21
app/report/views.py

791
     
791
     
792
     sheet_data = {}
792
     sheet_data = {}
793
     for sheet_name in sheets:
793
     for sheet_name in sheets:
794
-        match sheet_name:
795
-            case 'hardness_out':
796
-                sheet_data[sheet_name] = generate_hardness_out_values(lot_no)
797
-            case 'hardness_out_in':
798
-                sheet_data[sheet_name] = generate_hardness_out_in_values(lot_no)
799
-            case 'hardness_both_size':
800
-                sheet_data[sheet_name] = generate_hardness_both_size_values(lot_no, first_result)
801
-            case 'dimension':
802
-                sheet_data[sheet_name] = generate_dimension_values(lot_no)
803
-            case 'dimension_app':
804
-                sheet_data[sheet_name] = generate_dimension_app_values(lot_no)
805
-            case 'dimension_bal_weight':
806
-                sheet_data[sheet_name] = generate_dimension_bal_weight_values(lot_no, first_result)
807
-            case 'centering':
808
-                sheet_data[sheet_name] = generate_centering_values(lot_no)
809
-            case 'thickness_8_point':
810
-                sheet_data[sheet_name] = generate_t8_values(lot_no)
811
-            case 'dim_bal_app_hard':
812
-                sheet_data[sheet_name] = generate_dim_bal_app_hard_values(lot_no, first_result)
813
-            case 'dim_bal_app_rot_hard':
814
-                sheet_data[sheet_name] = generate_dim_bal_app_rot_hard_values(lot_no, first_result)
794
+        if sheet_name == 'hardness_out':
795
+            sheet_data[sheet_name] = generate_hardness_out_values(lot_no)
796
+        elif sheet_name == 'hardness_out_in':
797
+            sheet_data[sheet_name] = generate_hardness_out_in_values(lot_no)
798
+        elif sheet_name == 'hardness_both_size':
799
+            sheet_data[sheet_name] = generate_hardness_both_size_values(lot_no, first_result)
800
+        elif sheet_name == 'dimension':
801
+            sheet_data[sheet_name] = generate_dimension_values(lot_no)
802
+        elif sheet_name == 'dimension_app':
803
+            sheet_data[sheet_name] = generate_dimension_app_values(lot_no)
804
+        elif sheet_name == 'dimension_bal_weight':
805
+            sheet_data[sheet_name] = generate_dimension_bal_weight_values(lot_no, first_result)
806
+        elif sheet_name == 'centering':
807
+            sheet_data[sheet_name] = generate_centering_values(lot_no)
808
+        elif sheet_name == 'thickness_8_point':
809
+            sheet_data[sheet_name] = generate_t8_values(lot_no)
810
+        elif sheet_name == 'dim_bal_app_hard':
811
+            sheet_data[sheet_name] = generate_dim_bal_app_hard_values(lot_no, first_result)
812
+        elif sheet_name == 'dim_bal_app_rot_hard':
813
+            sheet_data[sheet_name] = generate_dim_bal_app_rot_hard_values(lot_no, first_result)
815
     
814
     
816
     converted_data = convert_sheet_data(sheet_data)
815
     converted_data = convert_sheet_data(sheet_data)
817
 
816