From ea550f37b6cf1964f74ace202226a9bf64b2b8f9 Mon Sep 17 00:00:00 2001 From: "zaccaria.majid" Date: Mon, 15 May 2023 14:32:25 +0200 Subject: [PATCH] fix grafici --- .../Hardware/HwSingleInstance.razor | 10 ++-- .../Hardware/HwSingleInstance.razor.css | 2 +- .../Hardware/HwSingleInstance.razor.less | 2 +- .../Hardware/HwSingleInstance.razor.min.css | 2 +- .../Components/Order/OrderList.razor | 2 +- .../Components/Order/OrderList.razor.cs | 29 ++++++----- .../Components/SvgComp/DoorSvgObj.razor | 2 + .../Components/SvgComp/DoorSvgObj.razor.css | 14 +++++ .../Components/SvgComp/DoorSvgObj.razor.less | 16 ++++++ .../SvgComp/DoorSvgObj.razor.min.css | 1 + WebDoorCreator.UI/compilerconfig.json | 4 ++ WebDoorCreator.UI/temp/Conf.yaml | 48 +++++++++++------- WebDoorCreator.UI/temp/Minus.svg | 3 ++ WebDoorCreator.UI/temp/Plus.svg | 4 ++ WebDoorCreator.UI/wwwroot/images/Minus.png | Bin 0 -> 490 bytes WebDoorCreator.UI/wwwroot/images/Plus.png | Bin 0 -> 526 bytes 16 files changed, 97 insertions(+), 42 deletions(-) create mode 100644 WebDoorCreator.UI/Components/SvgComp/DoorSvgObj.razor.css create mode 100644 WebDoorCreator.UI/Components/SvgComp/DoorSvgObj.razor.less create mode 100644 WebDoorCreator.UI/Components/SvgComp/DoorSvgObj.razor.min.css create mode 100644 WebDoorCreator.UI/temp/Minus.svg create mode 100644 WebDoorCreator.UI/temp/Plus.svg create mode 100644 WebDoorCreator.UI/wwwroot/images/Minus.png create mode 100644 WebDoorCreator.UI/wwwroot/images/Plus.png diff --git a/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor b/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor index d0df140..f3d6b84 100644 --- a/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor +++ b/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor @@ -109,14 +109,10 @@ else } } +
-
-
- -
-
@if (isChangedVal()) { diff --git a/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor.css b/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor.css index 5c12066..1db664c 100644 --- a/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor.css +++ b/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor.css @@ -48,7 +48,7 @@ border: 5px solid #00838F; z-index: 99999; background: #03A9F4; - transform: translate(1.6rem, 1rem); + transform: translate(17.6rem, -8rem); } .btnCancel { border-radius: 50%; diff --git a/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor.less b/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor.less index 55a60f5..4b81b05 100644 --- a/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor.less +++ b/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor.less @@ -36,7 +36,7 @@ .btnHighlight { .btnGen; background: #03A9F4; - transform: translate(1.6rem, 1rem); + transform: translate(17.6rem, -8rem); } .btnCancel { .btnGen; diff --git a/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor.min.css b/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor.min.css index 22bb871..293fec7 100644 --- a/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor.min.css +++ b/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor.min.css @@ -1 +1 @@ -.btnGen{border-radius:50%;width:3.5rem;height:3.5rem;border:5px solid #00838f;z-index:99999;}.btnDelete{border-radius:50%;width:3.5rem;height:3.5rem;border:5px solid #00838f;z-index:99999;background:#b71c1c;transform:translate(25px,-1rem);}.btnClone{border-radius:50%;width:3.5rem;height:3.5rem;border:5px solid #00838f;z-index:99999;background:#fff;transform:translate(1.6rem,-1rem);}.btnPDFSuccess{border-radius:50%;width:3.5rem;height:3.5rem;border:5px solid #00838f;z-index:99999;background:#8e44ad;transform:translate(1rem,1rem);}.btnPDFPending{border-radius:50%;width:3.5rem;height:3.5rem;border:5px solid #00838f;z-index:99999;background:#f1c40f;transform:translate(16rem,1rem);}.btnHighlight{border-radius:50%;width:3.5rem;height:3.5rem;border:5px solid #00838f;z-index:99999;background:#03a9f4;transform:translate(1.6rem,1rem);}.btnCancel{border-radius:50%;width:3.5rem;height:3.5rem;border:5px solid #00838f;z-index:99999;background:var(--colorCode);transform:translate(-2rem,1rem);}.btnSave{border-radius:50%;width:3.5rem;height:3.5rem;border:5px solid #00838f;z-index:99999;background:var(--colorCode);transform:translate(-2.6rem,1rem);}.btnHeadTail{width:100%;padding:.8rem 0 .8rem 0;background:none;border:0;}.btnConfirm{width:100%;padding:.8rem 0 .8rem 0;background:none;border:0;border-bottom:3px solid #000;}.btnHead{width:100%;padding:.8rem 0 .8rem 0;background:none;border:0;}.borderTop{border-top:7px solid #00838f;}.borderBottom{border-bottom:7px solid #00838f;width:100%;}.modal-dialog{overflow-y:initial!important;}.modal-body{height:18.75rem;overflow-y:auto;}.testata{width:100%;}select,input{border:0;border-bottom:2px solid #000;background:none;height:2rem;}i{display:flex;align-items:center;justify-content:center;flex-wrap:wrap;font-size:1.1rem;} \ No newline at end of file +.btnGen{border-radius:50%;width:3.5rem;height:3.5rem;border:5px solid #00838f;z-index:99999;}.btnDelete{border-radius:50%;width:3.5rem;height:3.5rem;border:5px solid #00838f;z-index:99999;background:#b71c1c;transform:translate(25px,-1rem);}.btnClone{border-radius:50%;width:3.5rem;height:3.5rem;border:5px solid #00838f;z-index:99999;background:#fff;transform:translate(1.6rem,-1rem);}.btnPDFSuccess{border-radius:50%;width:3.5rem;height:3.5rem;border:5px solid #00838f;z-index:99999;background:#8e44ad;transform:translate(1rem,1rem);}.btnPDFPending{border-radius:50%;width:3.5rem;height:3.5rem;border:5px solid #00838f;z-index:99999;background:#f1c40f;transform:translate(16rem,1rem);}.btnHighlight{border-radius:50%;width:3.5rem;height:3.5rem;border:5px solid #00838f;z-index:99999;background:#03a9f4;transform:translate(17.6rem,-8rem);}.btnCancel{border-radius:50%;width:3.5rem;height:3.5rem;border:5px solid #00838f;z-index:99999;background:var(--colorCode);transform:translate(-2rem,1rem);}.btnSave{border-radius:50%;width:3.5rem;height:3.5rem;border:5px solid #00838f;z-index:99999;background:var(--colorCode);transform:translate(-2.6rem,1rem);}.btnHeadTail{width:100%;padding:.8rem 0 .8rem 0;background:none;border:0;}.btnConfirm{width:100%;padding:.8rem 0 .8rem 0;background:none;border:0;border-bottom:3px solid #000;}.btnHead{width:100%;padding:.8rem 0 .8rem 0;background:none;border:0;}.borderTop{border-top:7px solid #00838f;}.borderBottom{border-bottom:7px solid #00838f;width:100%;}.modal-dialog{overflow-y:initial!important;}.modal-body{height:18.75rem;overflow-y:auto;}.testata{width:100%;}select,input{border:0;border-bottom:2px solid #000;background:none;height:2rem;}i{display:flex;align-items:center;justify-content:center;flex-wrap:wrap;font-size:1.1rem;} \ No newline at end of file diff --git a/WebDoorCreator.UI/Components/Order/OrderList.razor b/WebDoorCreator.UI/Components/Order/OrderList.razor index 6afc7e5..675a1c4 100644 --- a/WebDoorCreator.UI/Components/Order/OrderList.razor +++ b/WebDoorCreator.UI/Components/Order/OrderList.razor @@ -11,7 +11,7 @@ else Order Date Order Number Order Description - Doors Number + Quantity Model Number Order Status TOTAL COST diff --git a/WebDoorCreator.UI/Components/Order/OrderList.razor.cs b/WebDoorCreator.UI/Components/Order/OrderList.razor.cs index cc3f796..89014f4 100644 --- a/WebDoorCreator.UI/Components/Order/OrderList.razor.cs +++ b/WebDoorCreator.UI/Components/Order/OrderList.razor.cs @@ -194,28 +194,29 @@ namespace WebDoorCreator.UI.Components.Order { switch (sortField) { - - case "OrderNumber": - if (sortAsc) - { - ListOrdersStatus = SearchRecords.OrderBy(x => x.OrderExtCode).ToList(); - } - else - { - ListOrdersStatus = SearchRecords.OrderByDescending(x => x.OrderExtCode).ToList(); - } - break; - default: case "OrderDate": if (sortAsc) { - ListOrdersStatus = SearchRecords.OrderByDescending(x => x.DateIns).ToList(); + ListOrdersStatus = ListOrdersStatus.OrderBy(x => x.DateIns).ToList(); } else { - ListOrdersStatus = SearchRecords.OrderBy(x => x.DateIns).ToList(); + ListOrdersStatus = ListOrdersStatus.OrderByDescending(x => x.DateIns).ToList(); } break; + case "OrderNumber": + if (sortAsc) + { + ListOrdersStatus = ListOrdersStatus.OrderBy(x => x.OrderExtCode).ToList(); + } + else + { + ListOrdersStatus = ListOrdersStatus.OrderByDescending(x => x.OrderExtCode).ToList(); + } + break; + default: + ListOrdersStatus = ListOrdersStatus.OrderByDescending(x => x.DateIns).ToList(); + break; } } diff --git a/WebDoorCreator.UI/Components/SvgComp/DoorSvgObj.razor b/WebDoorCreator.UI/Components/SvgComp/DoorSvgObj.razor index c49079b..451d005 100644 --- a/WebDoorCreator.UI/Components/SvgComp/DoorSvgObj.razor +++ b/WebDoorCreator.UI/Components/SvgComp/DoorSvgObj.razor @@ -22,6 +22,8 @@ + + diff --git a/WebDoorCreator.UI/Components/SvgComp/DoorSvgObj.razor.css b/WebDoorCreator.UI/Components/SvgComp/DoorSvgObj.razor.css new file mode 100644 index 0000000..325bbda --- /dev/null +++ b/WebDoorCreator.UI/Components/SvgComp/DoorSvgObj.razor.css @@ -0,0 +1,14 @@ +.plusAnim { + opacity: 0; + transition: 0.3s; +} +.plusAnim:hover { + opacity: 1; +} +.minusAnim { + opacity: 0; + transition: 0.3s; +} +.minusAnim:hover { + opacity: 1; +} \ No newline at end of file diff --git a/WebDoorCreator.UI/Components/SvgComp/DoorSvgObj.razor.less b/WebDoorCreator.UI/Components/SvgComp/DoorSvgObj.razor.less new file mode 100644 index 0000000..23e48e0 --- /dev/null +++ b/WebDoorCreator.UI/Components/SvgComp/DoorSvgObj.razor.less @@ -0,0 +1,16 @@ +.plusAnim { + opacity: 0; + transition: 0.3s; +} + +.plusAnim:hover { + opacity: 1 +} +.minusAnim { + opacity: 0; + transition: 0.3s; +} + +.minusAnim:hover { + opacity: 1 +} \ No newline at end of file diff --git a/WebDoorCreator.UI/Components/SvgComp/DoorSvgObj.razor.min.css b/WebDoorCreator.UI/Components/SvgComp/DoorSvgObj.razor.min.css new file mode 100644 index 0000000..00c9481 --- /dev/null +++ b/WebDoorCreator.UI/Components/SvgComp/DoorSvgObj.razor.min.css @@ -0,0 +1 @@ +.plusAnim{opacity:0;transition:.3s;}.plusAnim:hover{opacity:1;}.minusAnim{opacity:0;transition:.3s;}.minusAnim:hover{opacity:1;} \ No newline at end of file diff --git a/WebDoorCreator.UI/compilerconfig.json b/WebDoorCreator.UI/compilerconfig.json index c8e2006..5271010 100644 --- a/WebDoorCreator.UI/compilerconfig.json +++ b/WebDoorCreator.UI/compilerconfig.json @@ -62,5 +62,9 @@ { "outputFile": "Components/Report/ReportList.razor.css", "inputFile": "Components/Report/ReportList.razor.less" + }, + { + "outputFile": "Components/SvgComp/DoorSvgObj.razor.css", + "inputFile": "Components/SvgComp/DoorSvgObj.razor.less" } ] \ No newline at end of file diff --git a/WebDoorCreator.UI/temp/Conf.yaml b/WebDoorCreator.UI/temp/Conf.yaml index fc11bd9..1fab737 100644 --- a/WebDoorCreator.UI/temp/Conf.yaml +++ b/WebDoorCreator.UI/temp/Conf.yaml @@ -15,10 +15,10 @@ order: date: 2023-05-15T00:00:00.0000000+02:00 piece: DO_1 size: - width: 50 - height: 50 + width: 33.8125 + height: 81.25 thickness: 1.75 -swing: LHI +swing: LH secure: UP material: wood profiles: @@ -39,23 +39,37 @@ profiles: machining: ON overmaterial: 0.1 hardware: - louver_cut_outs: + vision_cut_outs: - shape: Generic\Rect - length: 10.0000 - width: 18.8125 - bottom_rail: 8.0 - lock_stile: 0.0 + length: 30 + width: 16 + top_rail: 5.5 + lock_stile: 0 + radius: 0 door_center: center - face_decoration: - - template: General\Decor_C - type: lines - depth: 0.0625 - topdistance: 5.0 - bottomdistance: 7.0 - lockstiledistance: 4.0 - hingestiledistance: 4.0 - face: secure + mail_slots: + - template: Generic\Rect + height: 3 + bottom_rail: 20 + delta_center: 0 + + hinges: + - template: Generic Conceiled\StdConHingeDeepR + ToptoCL: 4.875 + back_set: 0.125 + thickness: 0.25 + - template: Generic Conceiled\StdConHingeDeepR + ToptoCL: 4.875 + back_set: 0.125 + thickness: 0.25 + + locks: + - template: Generic\Std86 + position: 45.875 + back_set: 2.0 + offset_WS: 0.0 + side: lock_top --- diff --git a/WebDoorCreator.UI/temp/Minus.svg b/WebDoorCreator.UI/temp/Minus.svg new file mode 100644 index 0000000..672619b --- /dev/null +++ b/WebDoorCreator.UI/temp/Minus.svg @@ -0,0 +1,3 @@ + + + diff --git a/WebDoorCreator.UI/temp/Plus.svg b/WebDoorCreator.UI/temp/Plus.svg new file mode 100644 index 0000000..cbd42b2 --- /dev/null +++ b/WebDoorCreator.UI/temp/Plus.svg @@ -0,0 +1,4 @@ + + + + diff --git a/WebDoorCreator.UI/wwwroot/images/Minus.png b/WebDoorCreator.UI/wwwroot/images/Minus.png new file mode 100644 index 0000000000000000000000000000000000000000..3d9fa6a8b97781ad08581af8dd58489a64279b5d GIT binary patch literal 490 zcmeAS@N?(olHy`uVBq!ia0vp^JApWsgAGXjtT=uGNO2Z;L>4nJa0`PlBg3pY55jgR3=A9lx&I`x0_EyGT^vIy7~fvoIFTbk#P#8BH-*J4jEh-W zIZ{FtgO2nak&w+`k>wCoxX>s#ajog?gYV?${@f>ZuDV!%-L}(?H}*QtIdM|hvQkOi z|H+fiIW`j~s~3H8@ta38!SBZn-)~QUzwLVccJ|#%r{CUw{`U349{;)v$6vd>7y3~j zzwP<_ZO0!=OqBnUUA=|5E{FfPp_2WJm*0xnZEn`}C+B=>wu{Msx&8KP`|=q&`rF>; r^T~3X>w!EoW2Y1C+>JGW{xj^a7M--E;4>pIY8X6S{an^LB{Ts5uny98 literal 0 HcmV?d00001 diff --git a/WebDoorCreator.UI/wwwroot/images/Plus.png b/WebDoorCreator.UI/wwwroot/images/Plus.png new file mode 100644 index 0000000000000000000000000000000000000000..3c8e29f3c5644967850810d2c693c9dfae33afae GIT binary patch literal 526 zcmeAS@N?(olHy`uVBq!ia0vp^JApWsgAGXjtT=uGNO2Z;L>4nJa0`PlBg3pY55jgR3=A9lx&I`x0_7Hax;TbZFuuKM=rz|-#NlDK$NV=6>o4Xm z5!}R-ZGE?G2lv}cx3hPp@Ro%+3h1mo;y1tb>E@5&4?olz7#IZ0wKeWG?JqVF_?D{R z_vA_E9Gi)g)r&s4_{}?UQrNOmN!_0+g7poDE&mjnhW|eQy5?Lxul%dmAKqviFS6}}5 z?#;Su@e}5s|2=!>PTP5p?PtG>JNNYN291gO531J5`#t~if7$1`H-CQHw158Z@b{Z+ r?u(*&P4e~R=V;bb*W;kToX3#2RMUOSomsbl(Z}HF>gTe~DWM4fJMi_y literal 0 HcmV?d00001