Merge branch 'main' of http://git2.simplico.net/tum/coi

app/report/views.py

@@ -236,11 +236,11 @@ def generate_dimension_values(lot_no, code):
     pprint(manual_size_records) 
     for m in dimens:
         if m.Size_Name == "D":
-            placeholders['v1_1'] = placeholders['v4_1'] = f'D{m.Std} +{m.TolUp} {m.TolUn}'
+            placeholders['v1_1'] = placeholders['v4_1'] = f'D{m.Std:.2f} +{m.TolUp:.2f} {m.TolUn:.2f}'
         if m.Size_Name == "T":
-            placeholders['v2_1'] = placeholders['v5_1'] = f'T{m.Std} +{m.TolUp} {m.TolUn}'
+            placeholders['v2_1'] = placeholders['v5_1'] = f'T{m.Std:.2f} +{m.TolUp:.2f} {m.TolUn:.2f}'
         if m.Size_Name == "H":
-            placeholders['v3_1'] = placeholders['v6_1'] = f'H{m.Std} +{m.TolUp} {m.TolUn}'
+            placeholders['v3_1'] = placeholders['v6_1'] = f'H{m.Std:.2f} +{m.TolUp:.2f} {m.TolUn:.2f}'
 
 
 
@@ -305,18 +305,18 @@ def generate_dimension_app_values(lot_no, code):
 
     # for m in manual_size_records:
         # if m.size_name == "D":
-            # placeholders['v1_1'] = placeholders['v5_1'] = f'{m.std} +{m.tolup} {m.tolun}'
+            # placeholders['v1_1'] = placeholders['v5_1'] = f'{m.Std:.2f} +{m.TolUp:.2f} {m.TolUn:.2f}'
         # if m.size_name == "T":
-            # placeholders['v2_1'] = placeholders['v6_1'] = f'{m.std} +{m.tolup} {m.tolun}'
+            # placeholders['v2_1'] = placeholders['v6_1'] = f'{m.Std:.2f} +{m.TolUp:.2f} {m.TolUn:.2f}'
         # if m.size_name == "H":
-            # placeholders['v3_1'] = placeholders['v7_1'] = f'{m.std} +{m.tolup} {m.tolun}'
+            # placeholders['v3_1'] = placeholders['v7_1'] = f'{m.Std:.2f} +{m.TolUp:.2f} {m.TolUn:.2f}'
     for m in dimens:  # Changed from manual_size_records to dimens
         if m.Size_Name == "D":
-            placeholders['v1_1'] = placeholders['v5_1'] = f'D{m.Std} +{m.TolUp} {m.TolUn}'
+            placeholders['v1_1'] = placeholders['v5_1'] = f'D{m.Std:.2f} +{m.TolUp:.2f} {m.TolUn:.2f}'
         if m.Size_Name == "T":
-            placeholders['v2_1'] = placeholders['v6_1'] = f'T{m.Std} +{m.TolUp} {m.TolUn}'
+            placeholders['v2_1'] = placeholders['v6_1'] = f'T{m.Std:.2f} +{m.TolUp:.2f} {m.TolUn:.2f}'
         if m.Size_Name == "H":
-            placeholders['v3_1'] = placeholders['v7_1'] = f'H{m.Std} +{m.TolUp} {m.TolUn}'
+            placeholders['v3_1'] = placeholders['v7_1'] = f'H{m.Std:.2f} +{m.TolUp:.2f} {m.TolUn:.2f}'
 
 
 
@@ -395,11 +395,11 @@ def generate_dimension_bal_weight_values(lot_no, ms, code):
     dimens = AllProductDimensionForInsProcess.objects.filter(ProductCode=code)
     for m in dimens:  # Changed from manual_size_records to dimens
         if m.Size_Name == "D":
-            placeholders['v1_1'] = placeholders['v6_1'] = f'D{m.Std} +{m.TolUp} {m.TolUn}'
+            placeholders['v1_1'] = placeholders['v6_1'] = f'D{m.Std:.2f} +{m.TolUp:.2f} {m.TolUn:.2f}'
         if m.Size_Name == "T":
-            placeholders['v2_1'] = placeholders['v7_1'] = f'T{m.Std} +{m.TolUp} {m.TolUn}'
+            placeholders['v2_1'] = placeholders['v7_1'] = f'T{m.Std:.2f} +{m.TolUp:.2f} {m.TolUn:.2f}'
         if m.Size_Name == "H":
-            placeholders['v3_1'] = placeholders['v8_1'] = f'H{m.Std} +{m.TolUp} {m.TolUn}'
+            placeholders['v3_1'] = placeholders['v8_1'] = f'H{m.Std:.2f} +{m.TolUp:.2f} {m.TolUn:.2f}'
 
 
 
@@ -502,11 +502,11 @@ def generate_dim_bal_app_hard_values(lot_no, first_result, code):
     dimens = AllProductDimensionForInsProcess.objects.filter(ProductCode=code)
     for m in dimens:  # Changed from manual_size_records to dimens
         if m.Size_Name == "D":
-            placeholders['v1_1'] = placeholders['v9_1'] = f'D{m.Std} +{m.TolUp} {m.TolUn}'
+            placeholders['v1_1'] = placeholders['v9_1'] = f'D{m.Std:.2f} +{m.TolUp:.2f} {m.TolUn:.2f}'
         if m.Size_Name == "T":
-            placeholders['v2_1'] = placeholders['v10_1'] = f'T{m.Std} +{m.TolUp} {m.TolUn}'
+            placeholders['v2_1'] = placeholders['v10_1'] = f'T{m.Std:.2f} +{m.TolUp:.2f} {m.TolUn:.2f}'
         if m.Size_Name == "H":
-            placeholders['v3_1'] = placeholders['v11_1'] = f'H{m.Std} +{m.TolUp} {m.TolUn}'
+            placeholders['v3_1'] = placeholders['v11_1'] = f'H{m.Std:.2f} +{m.TolUp:.2f} {m.TolUn:.2f}'
 
 
     # Ensure that we map each manualSize entry to a corresponding DataMs entry
@@ -622,11 +622,11 @@ def generate_dim_bal_app_rot_hard_values(lot_no, first_result, code):
     dimens = AllProductDimensionForInsProcess.objects.filter(ProductCode=code)
     for m in dimens:  # Changed from manual_size_records to dimens
         if m.Size_Name == "D":
-            placeholders['v1_1'] = placeholders['v10_1'] = f'D{m.Std} +{m.TolUp} {m.TolUn}'
+            placeholders['v1_1'] = placeholders['v10_1'] = f'D{m.Std:.2f} +{m.TolUp:.2f} {m.TolUn:.2f}'
         if m.Size_Name == "T":
-            placeholders['v2_1'] = placeholders['v11_1'] = f'T{m.Std} +{m.TolUp} {m.TolUn}'
+            placeholders['v2_1'] = placeholders['v11_1'] = f'T{m.Std:.2f} +{m.TolUp:.2f} {m.TolUn:.2f}'
         if m.Size_Name == "H":
-            placeholders['v3_1'] = placeholders['v12_1'] = f'H{m.Std} +{m.TolUp} {m.TolUn}'
+            placeholders['v3_1'] = placeholders['v12_1'] = f'H{m.Std:.2f} +{m.TolUp:.2f} {m.TolUn:.2f}'
 
 
 
@@ -747,7 +747,7 @@ def generate_t8_values(lot_no, code):
     for m in dimens:  # Changed from manual_size_records to dimens
         if m.Size_Name == "Thickness":
             for i in range(1, 9):
-                placeholders[f'v{i}_1'] = f'{m.Std} +{m.TolUp} {m.TolUn}'
+                placeholders[f'v{i}_1'] = f'{m.Std:.2f} +{m.TolUp:.2f} {m.TolUn:.2f}'
                 # pprint("set std")
     # 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')