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

WebDoorCreator.UI/Components/Buttons/ButtonsDoorDef.razor.cs

@@ -102,7 +102,7 @@ namespace WebDoorCreator.UI.Components.Buttons
             List<DoorOpModel>? listOpAll = await WDCService.DoorOpGetByDoorId(DoorId);
             if (listOpAll != null)
             {
-                List<DoorOpModel> listOp = listOpAll.Where(x => x.userConfirm != "" && x.DtConfirm != null).ToList();
+                List<DoorOpModel> listOp = listOpAll.Where(x => x.userConfirm != "" && x.DtConfirm != null && x.ObjectId != "Size" && x.ObjectId != "Profiles").ToList();
                 if (listOp != null)
                 {
                     // chiamo metodo x avewre DDF serializzato

WebDoorCreator.UI/Components/DoorDef/DoorDefSizingSI.razor

@@ -21,7 +21,7 @@ else
                                 @foreach (var param in comboSet(item.Key))
                                 {
                                     <option value="@param">
-                                        @param)
+                                        @param
                                     </option>
                                 }
                             </select>

WebDoorCreator.UI/Pages/DoorDefinition.razor.cs

@@ -80,7 +80,7 @@ namespace WebDoorCreator.UI.Pages
             var ListRecordDoorOp = await WDService.DoorOpGetByDoorId(idDoor);
             if (ListRecordDoorOp != null)
             {
-                ListBaseDoorOp = ListRecordDoorOp.Where(x => x.ObjectId == "1" || x.ObjectId == "2").ToList();
+                ListBaseDoorOp = ListRecordDoorOp.Where(x => x.ObjectId == "Size" || x.ObjectId == "Profiles").ToList();
             }
             var domani = DateTime.Today.AddDays(1);
             ListOrdersStatus = null;

WebDoorCreator.UI/Pages/OrderDetails.razor.cs

@@ -25,6 +25,7 @@ namespace WebDoorCreator.UI.Pages
         #region Protected Properties
 
         protected DoorModel? currDoor { get; set; } = null;
+        protected WebDoorCreator.Data.DbModels.Edges edgesFirstInst { get; set; } = new WebDoorCreator.Data.DbModels.Edges();
 
         protected int currDoorType { get; set; } = 0;
 
@@ -108,7 +109,7 @@ namespace WebDoorCreator.UI.Pages
                     DateMod = adesso,
                     UserIdIns = WDCUService.userId,
                     UserIdMod = WDCUService.userId,
-                    ObjectId = "1",
+                    ObjectId = "Size",
                     DoorId = doorId,
                     JsoncConfigVal = jsonDef,
                     JsoncActVal = jsonAct,
@@ -138,8 +139,8 @@ namespace WebDoorCreator.UI.Pages
                 }
                 //actDict.Add(HwToShow.TableName, actParamsList);
 
-                jsonDef = JsonConvert.SerializeObject(defaultDict);
-                jsonAct = JsonConvert.SerializeObject(actDict);
+                jsonDef = JsonConvert.SerializeObject(edgesFirstInst);
+                jsonAct = JsonConvert.SerializeObject(edgesFirstInst);
 
                 doorOpToAdd = new DoorOpModel()
                 {
@@ -147,7 +148,7 @@ namespace WebDoorCreator.UI.Pages
                     DateMod = adesso,
                     UserIdIns = WDCUService.userId,
                     UserIdMod = WDCUService.userId,
-                    ObjectId = "2",
+                    ObjectId = "Profiles",
                     DoorId = doorId,
                     JsoncConfigVal = jsonDef,
                     JsoncActVal = jsonAct,

WebDoorCreator.UI/temp/Conf.yaml

@@ -12,6 +12,10 @@ order:
   project: 
   pO: 
   line: 
+<<<<<<< HEAD
+date: 2023-04-19T12:47:14.6842406+02:00
+=======
+>>>>>>> 7b61d49767d77faa7513f4f237adadd704a7631d
 piece: DO_1
 produce: false
 profiles:
@@ -31,6 +35,8 @@ profiles:
     type: BV
     machining: ON
     overmaterial: 0.1
+<<<<<<< HEAD
+=======
 secure: UP
 size:
   width: 33.8125
@@ -58,5 +64,6 @@ locks:
     back_set: 2.0
     offset_WS: 0.0
     side: lock_top
+>>>>>>> 7b61d49767d77faa7513f4f237adadd704a7631d
 
 ---