Merge branch 'develop' of https://gitlab.steamware.net/egalware/webdoorcreator into develop

WebDoorCreator.Data/Controllers/WebDoorCreatorController.cs

@@ -736,7 +736,7 @@ namespace WebDoorCreator.Data.Controllers
                 }
                 catch (Exception exc)
                 {
-                    Log.Error($"Eccezione durante OrderAd: {Environment.NewLine}{exc}");
+                    Log.Error($"Eccezione durante OrderAdd: {Environment.NewLine}{exc}");
                 }
             }
             return fatto;

WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor.cs

@@ -51,6 +51,7 @@ namespace WebDoorCreator.UI.Components.Hardware
             {
                 if (value != null)
                 {
+                    //if (int.TryParse(value["Size"], out int result))
                     _currVal = value;
                 }
             }

WebDoorCreator.UI/Components/Report/ReportList.razor

@@ -6,7 +6,7 @@
         <thead>
             <tr class="">
                 <th>Object Name</th>
-                <th>Template</th>
+                <th>Template/Shape</th>
                 <th>Approved By:</th>
                 <th class="text-end">Approval Date</th>
             </tr>

WebDoorCreator.UI/Components/Report/ReportList.razor.cs

@@ -26,7 +26,14 @@ namespace WebDoorCreator.UI.Components.Report
         {
             string answ = "";
 
-            answ = currDoorOp.CurrVals["template"];
+            if (currDoorOp.CurrVals.ContainsKey("template"))
+            {
+                answ = currDoorOp.CurrVals["template"];
+            }
+            else
+            {
+                answ = currDoorOp.CurrVals["shape"];
+            }
 
             return answ;
 

WebDoorCreator.UI/temp/Conf.yaml

@@ -12,7 +12,7 @@ order:
   project: 
   pO: 
   line: 
-date: 2023-11-05T00:00:00.0000000
+date: 2023-12-05T00:00:00.0000000
 piece: DO_1
 size:
   width: 33.8125
@@ -39,26 +39,12 @@ profiles:
     machining: ON
     overmaterial: 0.1
 hardware:
-  vision_cut_outs:
-    - shape: Generic\Circle
-      radius: 10
-      center_from_top: 20
-      center_from_lock: 0
-      door_center: center
- 
-  louver_cut_outs:
-    - shape: Generic\Cuore2.nge
-      length: 10.0000
-      width: 18.8125
-      bottom_rail: 8.0
-      lock_stile: 0.0
-      door_center: center
- 
-  mail_slots:
-    - template: Generic\Rect
-      height: 3
-      bottom_rail: 20
-      delta_center: 5
+  flush_pulls:
+    - template: Generic\Circle
+      position: 35
+      back_set: 5
+      depth: 1
+      face: secure
  
   hinges:
     - template: Generic Conceiled\StdConHingeDeepR
@@ -66,48 +52,5 @@ hardware:
       back_set: 0.125
       thickness: 0.25
  
-  ept:
-    - template: Generic\StdEPT
-      ToptoCL: 15
-      FacetoCL: 0.875
- 
-  locks:
-    - template: Generic\DocMyTest5Bore.nge
-      position: 45.875
-      back_set: 2.0
-      offset_WS: 0.0
-      side: lock_top
- 
-  edge_pulls:
-    - template: Generic\EdgePull230B
-      position: 45
-      offset_WS: 0.0
- 
-  pivot:
-    - template: Generic\CenterHungPivot
-      type: centerhung
-      side: top
-      radius: 0
-      position: 2
-      back_set: 0.25
-      depth: 0.125
-      offset_WS: 0.0
- 
-  stops_and_closers:
-    - template: Generic\OHCloserArm_103_1_90
-      position: 0.000
- 
-  strikes:
-    - template: Generic\StdFaceStrike
-      position: 57.875
-      back_set: 2.75
-      offset_WS: 0.0
- 
-  rabbet:
-    - template: Generic\Rabbet
-      side: top
-      width: 0.6
-      depth: 0.8
- 
 
 ---