diff --git a/WebDoorCreator.Data/DTO/DDFDto.cs b/WebDoorCreator.Data/DTO/DDFDto.cs index 3c2444a..195d954 100644 --- a/WebDoorCreator.Data/DTO/DDFDto.cs +++ b/WebDoorCreator.Data/DTO/DDFDto.cs @@ -22,11 +22,8 @@ namespace WebDoorCreator.Data.DTO public string code { get; set; } = "0015943"; public OrderDto order { get; set; } = new OrderDto(); - public DateTime date { get; set; } = DateTime.Now; + public DateTime date { get; set; } = DateTime.Today; public string piece { get; set; } = "DO_1"; - - - //public Edges profiles { get; set; } = new Edges(); #endregion Public Properties diff --git a/WebDoorCreator.Data/DTO/SizeDto.cs b/WebDoorCreator.Data/DTO/SizeDto.cs index 398ed36..27ee22b 100644 --- a/WebDoorCreator.Data/DTO/SizeDto.cs +++ b/WebDoorCreator.Data/DTO/SizeDto.cs @@ -34,7 +34,8 @@ namespace WebDoorCreator.Data.DTO { if (item.StartsWith(" ")) { - sb.AppendLine(item.Substring(2)); + //sb.AppendLine(item.Substring(2)); + sb.AppendLine($" {char.ToLower(item.Substring(4)[0])}{item.Substring(5)}"); } else { diff --git a/WebDoorCreator.UI/Components/DoorDef/DoorDataBlock.razor b/WebDoorCreator.UI/Components/DoorDef/DoorDataBlock.razor index dd73f06..8ad7181 100644 --- a/WebDoorCreator.UI/Components/DoorDef/DoorDataBlock.razor +++ b/WebDoorCreator.UI/Components/DoorDef/DoorDataBlock.razor @@ -1,43 +1,52 @@ @if (bdpList != null) {
-
-
-
@BlockDoorOp.ObjectId
+ +
+
+
+
@BlockDoorOp.ObjectId
+
+
+ + @if (paramsChanged) + { +
+
+ + +
+
+ } + else + { +
+
+ + +
+
+ } +
+
+ +
+ @foreach (var item in bdpList) + { +
+ +
+ }
- @foreach (var item in bdpList) - { - - }
-
- @if (paramsChanged) - { -
-
- - -
-
- } - else - { -
-
- - -
-
- } -
} \ No newline at end of file diff --git a/WebDoorCreator.UI/Data/WebDoorCreatorService.cs b/WebDoorCreator.UI/Data/WebDoorCreatorService.cs index 7ad7cb1..31db8d4 100644 --- a/WebDoorCreator.UI/Data/WebDoorCreatorService.cs +++ b/WebDoorCreator.UI/Data/WebDoorCreatorService.cs @@ -247,33 +247,32 @@ namespace WebDoorCreator.UI.Data { TableName = "Profiles", FieldName = "DoorDef", - Value = "HingeEdge", - Label = "50006", + Value = "lockedge", + Label = "50005", Ordinal = 1, DefaultVal = "", InputType = "", isSerializable = true }; listValues.Add(listValObj); - listValObj = new ListValuesTempModel() { TableName = "Profiles", FieldName = "DoorDef", - Value = "TopEdge", - Label = "50007", + Value = "hingeedge", + Label = "50006", Ordinal = 2, DefaultVal = "", InputType = "", isSerializable = true }; - listValues.Add(listValObj); + listValues.Add(listValObj); listValObj = new ListValuesTempModel() { TableName = "Profiles", FieldName = "DoorDef", - Value = "BottomEdge", - Label = "50008", + Value = "top", + Label = "50007", Ordinal = 3, DefaultVal = "", InputType = "", @@ -284,14 +283,14 @@ namespace WebDoorCreator.UI.Data { TableName = "Profiles", FieldName = "DoorDef", - Value = "LockEdge", - Label = "50005", + Value = "bottom", + Label = "50008", Ordinal = 4, DefaultVal = "", InputType = "", isSerializable = true }; - listValues.Add(listValObj); + listValues.Add(listValObj); listValObj = new ListValuesTempModel() { TableName = "Profiles", @@ -935,7 +934,7 @@ namespace WebDoorCreator.UI.Data { TableName = $"{compoCode}".Replace(" ", "_"), FieldName = "Folder", - Value = @$"{tName[tName.Length - 1]}".Replace(" ", "_"), + Value = @$"{tName[tName.Length - 1]}", Label = @$"{tName[tName.Length - 1]}", Ordinal = 0, DefaultVal = " ", @@ -950,7 +949,7 @@ namespace WebDoorCreator.UI.Data { TableName = $"{compoCode}".Replace(" ", "_"), FieldName = "template", - Value = @$"{tName[tName.Length - 1]}\{Path.GetFileName(templateFile).Split(".")[0]}".Replace(" ", "_"), + Value = @$"{tName[tName.Length - 1]}\{Path.GetFileName(templateFile).Split(".")[0]}", Label = Path.GetFileName(templateFile).Split(".")[0], Ordinal = ordin, DefaultVal = " ", diff --git a/WebDoorCreator.UI/Pages/DoorDefinition.razor.cs b/WebDoorCreator.UI/Pages/DoorDefinition.razor.cs index cea9212..291ac3b 100644 --- a/WebDoorCreator.UI/Pages/DoorDefinition.razor.cs +++ b/WebDoorCreator.UI/Pages/DoorDefinition.razor.cs @@ -91,7 +91,7 @@ namespace WebDoorCreator.UI.Pages if (ListRecordDoorOp != null) { ListHwDoorOp = ListRecordDoorOp; - ListBaseDoorOp = ListRecordDoorOp.Where(x => x.ObjectId == "Size" || x.ObjectId == "Profiles").ToList(); + ListBaseDoorOp = ListRecordDoorOp.Where(x => x.ObjectId == "Size" || x.ObjectId == "Profiles" || x.ObjectId == "Swing").ToList(); // calcolo gli hw togliendo DoorOpBase foreach (var item in ListBaseDoorOp) { diff --git a/WebDoorCreator.UI/Pages/OrderDetails.razor.cs b/WebDoorCreator.UI/Pages/OrderDetails.razor.cs index 0dea6d0..0c380f9 100644 --- a/WebDoorCreator.UI/Pages/OrderDetails.razor.cs +++ b/WebDoorCreator.UI/Pages/OrderDetails.razor.cs @@ -142,19 +142,28 @@ namespace WebDoorCreator.UI.Pages actDict.Clear(); itemsDictDef.Clear(); itemsDictAct.Clear(); - + listDefVal.Clear(); #region Gestione Swing if (listRecordSwing != null) { foreach (var item in listRecordSwing) { - listDefVal = new List() { item.DefaultVal.Trim() }; - if (!actDict.ContainsKey(item.Value)) + foreach (var param in item.DefaultVal.Split(",")) { - actDict.Add(item.Value, item.DefaultVal.Trim().Split(",")[0]); - paramsDict.Add(item.Value, listDefVal); + listDefVal.Add(param.Trim()); + if (!actDict.ContainsKey(item.Value)) + { + actDict.Add(item.Value, item.DefaultVal.Trim().Split(",")[0]); + paramsDict.Add(item.Value, listDefVal); + } + //itemsDict.Add(item.Value, paramsDict); + //paramsDict.Clear(); + } + + //listDefVal = new List() { item.DefaultVal.Trim() }; + } itemsDictDef.Add("Swing", paramsDict); itemsDictAct.Add("Swing", actDict); @@ -208,11 +217,18 @@ namespace WebDoorCreator.UI.Pages if (profCurrMach != null) { //listDefVal.Clear(); - if (!paramsDict.ContainsKey(profCurrMach.Value)) + foreach (var param in profCurrMach.DefaultVal.Split(",")) { - listDefValCurrMach.Add(profCurrMach.DefaultVal.Trim()); - paramsDict.Add(profCurrMach.Value, listDefValCurrMach); - actDict.Add(profCurrMach.Value, profCurrMach.DefaultVal.Trim().Split(",")[0]); + listDefValCurrMach.Add(param.Trim()); + if (!actDict.ContainsKey(profCurrMach.Value)) + { + paramsDict.Add(profCurrMach.Value, listDefValCurrMach); + actDict.Add(profCurrMach.Value, profCurrMach.DefaultVal.Trim().Split(",")[0]); + //listDefVal.Clear(); + } + //itemsDict.Add(item.Value, paramsDict); + //paramsDict.Clear(); + } } if (profCurrOverMat != null) diff --git a/WebDoorCreator.UI/temp/Conf.yaml b/WebDoorCreator.UI/temp/Conf.yaml index 1e2bdc4..40f60e5 100644 --- a/WebDoorCreator.UI/temp/Conf.yaml +++ b/WebDoorCreator.UI/temp/Conf.yaml @@ -12,32 +12,38 @@ order: project: pO: line: -date: 2023-04-27T11:54:07.9289042+02:00 +date: 2023-04-27T00:00:00.0000000+02:00 piece: DO_1 size: - Width: 33.8125 - Height: 81.25 - Thickness: 1.75 + width: 33.8125 + height: 81.25 + thickness: 1.75 swing: LH secure: UP material: wood profiles: - HingeEdge: + lockedge: type: SQ machining: ON overmaterial: 0.1 - TopEdge: + hingeedge: type: SQ machining: ON overmaterial: 0.1 - BottomEdge: + top: type: SQ machining: ON overmaterial: 0.1 - LockEdge: + bottom: type: SQ machining: ON overmaterial: 0.1 -hardware: {} +hardware: + hinges: + - template: Generic Conceiled\StdConHingeDeepR + ToptoTop: 4.875 + back_set: 0.125 + thickness: 0.25 + ---