Egalware/webdoorcreator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix grafixo + fix popolamento

Browse Source
This commit is contained in:
zaccaria.majid
2023-04-27 15:24:03 +02:00
parent 371eab4f65
commit ef916c4aa2
7 changed files with 100 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WebDoorCreator.Data/DTO/DDFDto.cs
+1 -4
View File
@@ -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
WebDoorCreator.Data/DTO/SizeDto.cs
+2 -1
View File
@@ -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
{
WebDoorCreator.UI/Components/DoorDef/DoorDataBlock.razor
+44 -35
View File
@@ -1,43 +1,52 @@
@if (bdpList != null)
{
<div class="row">
<div class="col-6">
<div class="text-center">
<h5>@BlockDoorOp.ObjectId</h5>
<div class="col-12">
<div class="text-center d-flex justify-content-between">
<div>
<h5>@BlockDoorOp.ObjectId</h5>
</div>
<div>
@if (paramsChanged)
{
<div class="col-10">
<div class="btn-group w-100">
<button class="btn btn-outline-dark" style="cursor: pointer;">
CANCEL
</button>
<button class="btn btn-outline-dark" style="cursor: pointer;">
SAVE
</button>
</div>
</div>
}
else
{
<div class="col-10">
<div class="btn-group w-100">
<button class="btn btn-outline-secondary" style="cursor: pointer;" disabled>
CANCEL
</button>
<button class="btn btn-outline-secondary" style="cursor: pointer;" disabled>
SAVE
</button>
</div>
</div>
}
</div>
</div>
<div class="row">
@foreach (var item in bdpList)
{
<div class="col-5 rounded border border-info m-1">
<DoorDefSizingSI Lingua="@userLang" currValRef="@item.Value" paramsConfig="@getParamsConfig(item.Key)" HwCode="@item.Key" E_ItemChanged="@doSaveBlock"></DoorDefSizingSI>
</div>
}
</div>
@foreach (var item in bdpList)
{
<DoorDefSizingSI Lingua="@userLang" currValRef="@item.Value" paramsConfig="@getParamsConfig(item.Key)" HwCode="@item.Key" E_ItemChanged="@doSaveBlock"></DoorDefSizingSI>
}
<hr />
</div>
<div class="col-6">
@if (paramsChanged)
{
<div class="col-10">
<div class="btn-group w-100">
<button class="btn btn-outline-dark" style="cursor: pointer;">
CANCEL
</button>
<button class="btn btn-outline-dark" style="cursor: pointer;">
SAVE
</button>
</div>
</div>
}
else
{
<div class="col-10">
<div class="btn-group w-100">
<button class="btn btn-outline-secondary" style="cursor: pointer;" disabled>
CANCEL
</button>
<button class="btn btn-outline-secondary" style="cursor: pointer;" disabled>
SAVE
</button>
</div>
</div>
}
</div>
</div>
}
WebDoorCreator.UI/Data/WebDoorCreatorService.cs
+12 -13
View File
@@ -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 = " ",
WebDoorCreator.UI/Pages/DoorDefinition.razor.cs
+1 -1
View File
@@ -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)
{
WebDoorCreator.UI/Pages/OrderDetails.razor.cs
+25 -9
View File
@@ -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<string>() { 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<string>() { 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)
WebDoorCreator.UI/temp/Conf.yaml
+15 -9
View File
@@ -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
---