Merge branch 'develop' of https://gitlab.steamware.net/steamware/gpw_next into develop
This commit is contained in:
Samuele Locatelli
@@ -20,7 +20,7 @@ else
|
||||
@foreach (var item in BoxItems())
|
||||
{
|
||||
<g transform="translate(@(item.pX),@(item.pY))">
|
||||
<rect x="0" y="0" width="@item.width" height="@item.height" class="boxClass" rx="30"></rect>
|
||||
<rect x="0" y="0" width="@item.width" height="@item.height" class="@item.cssClass" rx="30"></rect>
|
||||
<foreignObject x="@mFO" y="@mFO" width="@item.width" height="@item.height">
|
||||
<a href="#">
|
||||
<div class="textTitle">@item.title</div>
|
||||
|
||||
@@ -152,6 +152,7 @@ namespace GPW.CORE.Comp
|
||||
value = x.Description,
|
||||
start = x.Inizio,
|
||||
end = x.Fine,
|
||||
cssClass = x.CssClass
|
||||
})
|
||||
.ToList();
|
||||
}
|
||||
@@ -185,6 +186,7 @@ namespace GPW.CORE.Comp
|
||||
public DateTime end { get; set; } = DateTime.Today;
|
||||
public string title { get; set; } = "";
|
||||
public string value { get; set; } = "";
|
||||
public string cssClass { get; set; } = "";
|
||||
|
||||
#endregion Public Properties
|
||||
}
|
||||
|
||||
@@ -24,19 +24,24 @@
|
||||
.canv {
|
||||
fill: rgba(130, 130, 130, 0.4);
|
||||
}
|
||||
.boxClass {
|
||||
fill: rgba(45, 128, 189, 0.75);
|
||||
stroke: rgba(45, 128, 189, 0.9);
|
||||
.blue {
|
||||
fill: rgba(3, 155, 229, 0.75);
|
||||
stroke: rgba(3, 155, 229, 0.9);
|
||||
stroke-width: 0.75rem;
|
||||
}
|
||||
.boxClass2 {
|
||||
fill: rgba(130, 28, 189, 0.75);
|
||||
stroke: rgba(130, 28, 189, 0.9);
|
||||
.purple {
|
||||
fill: rgba(153, 102, 222, 0.75);
|
||||
stroke: rgba(153, 102, 222, 0.9);
|
||||
stroke-width: 1rem;
|
||||
}
|
||||
.boxClass3 {
|
||||
fill: rgba(245, 28, 89, 0.75);
|
||||
stroke: rgba(245, 28, 89, 0.9);
|
||||
.green {
|
||||
fill: rgba(0, 255, 0, 0.75);
|
||||
stroke: rgba(0, 255, 0, 0.9);
|
||||
stroke-width: 1rem;
|
||||
}
|
||||
.pink {
|
||||
fill: rgba(222, 0, 171, 0.75);
|
||||
stroke: rgba(222, 0, 171, 0.9);
|
||||
stroke-width: 1rem;
|
||||
}
|
||||
.hour-label {
|
||||
|
||||
@@ -33,21 +33,27 @@
|
||||
fill: rgba(130, 130, 130, 0.4);
|
||||
}
|
||||
|
||||
.boxClass {
|
||||
fill: rgba(45, 128, 189, 0.75);
|
||||
stroke: rgba(45, 128, 189, 0.9);
|
||||
.blue {
|
||||
fill: rgba(3, 155, 229, 0.75);
|
||||
stroke: rgba(3, 155, 229, 0.9);
|
||||
stroke-width: 0.75rem;
|
||||
}
|
||||
|
||||
.boxClass2 {
|
||||
fill: rgba(130, 28, 189, 0.75);
|
||||
stroke: rgba(130, 28, 189, 0.9);
|
||||
.purple {
|
||||
fill: rgba(153, 102, 222, 0.75);
|
||||
stroke: rgba(153, 102, 222, 0.9);
|
||||
stroke-width: 1rem;
|
||||
}
|
||||
|
||||
.boxClass3 {
|
||||
fill: rgba(245, 28, 89, 0.75);
|
||||
stroke: rgba(245, 28, 89, 0.9);
|
||||
.green {
|
||||
fill: rgba(0, 255, 0, 0.75);
|
||||
stroke: rgba(0, 255, 0, 0.9);
|
||||
stroke-width: 1rem;
|
||||
}
|
||||
|
||||
.pink {
|
||||
fill: rgba(222, 0, 171, 0.75);
|
||||
stroke: rgba(222, 0, 171, 0.9);
|
||||
stroke-width: 1rem;
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -1 +1 @@
|
||||
.lblText{font-size:.3rem;fill:white;}.lblBoxTitle{font-size:.25rem;fill:white;}.lblBoxText{font-size:.2rem;fill:white;word-wrap:break-word;}.heavy{font:bold 30px sans-serif;fill:white;}.Rrrrr{font:italic 40px serif;fill:red;}.canv{fill:rgba(130,130,130,.4);}.boxClass{fill:rgba(45,128,189,.75);stroke:rgba(45,128,189,.9);stroke-width:.75rem;}.boxClass2{fill:rgba(130,28,189,.75);stroke:rgba(130,28,189,.9);stroke-width:1rem;}.boxClass3{fill:rgba(245,28,89,.75);stroke:rgba(245,28,89,.9);stroke-width:1rem;}.hour-label{color:#abcdff;font-size:2rem;}.textTitle{color:#fff;font-size:2.5rem;}.textTime{color:#dedede;font-size:6rem;}.textBody{color:#abefff;font-size:1.5rem;word-break:break-word;}.textBody1{color:#c8dcff;font-size:1.9rem;word-break:break-word;}.textBody2{color:#fac8ff;font-size:1.5rem;word-break:break-word;}.textBody3{color:#ffdcd7;font-size:1.5rem;word-break:break-word;}
|
||||
.lblText{font-size:.3rem;fill:white;}.lblBoxTitle{font-size:.25rem;fill:white;}.lblBoxText{font-size:.2rem;fill:white;word-wrap:break-word;}.heavy{font:bold 30px sans-serif;fill:white;}.Rrrrr{font:italic 40px serif;fill:red;}.canv{fill:rgba(130,130,130,.4);}.blue{fill:rgba(3,155,229,.75);stroke:rgba(3,155,229,.9);stroke-width:.75rem;}.purple{fill:rgba(153,102,222,.75);stroke:rgba(153,102,222,.9);stroke-width:1rem;}.green{fill:rgba(0,255,0,.75);stroke:rgba(0,255,0,.9);stroke-width:1rem;}.pink{fill:rgba(222,0,171,.75);stroke:rgba(222,0,171,.9);stroke-width:1rem;}.hour-label{color:#abcdff;font-size:2rem;}.textTitle{color:#fff;font-size:2.5rem;}.textTime{color:#dedede;font-size:6rem;}.textBody{color:#abefff;font-size:1.5rem;word-break:break-word;}.textBody1{color:#c8dcff;font-size:1.9rem;word-break:break-word;}.textBody2{color:#fac8ff;font-size:1.5rem;word-break:break-word;}.textBody3{color:#ffdcd7;font-size:1.5rem;word-break:break-word;}
|
||||
@@ -4,7 +4,7 @@
|
||||
<div><i class="fa-solid fa-bars"></i></div>
|
||||
</div>Accesso Rapido
|
||||
</button>
|
||||
<section class="menu__body" style="visibility: @hideMenuCSS">
|
||||
<section class="menu__body text-center" style="visibility: @hideMenuCSS">
|
||||
<div class="menu__header text-light d-flex justify-content-around" @onclick="()=>hideMenu()">
|
||||
<div class="d-flex justify-content-around">
|
||||
<div class="px-2"><i class="fa-solid fa-bars"></i></div>
|
||||
|
||||
@@ -46,11 +46,11 @@ namespace GPW.CORE.Smart.Components
|
||||
{
|
||||
if (MService.IdxDipendente > 0)
|
||||
{
|
||||
hideMenuCSS = "visible; height: 18%";
|
||||
hideMenuCSS = "visible; height: 30%; display:block;";
|
||||
hideButtonCSS = "hidden";
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
protected void slideIn()
|
||||
{
|
||||
cssAll = "bottom: 0rem;";
|
||||
|
||||
@@ -82,6 +82,14 @@ body:after {
|
||||
position: absolute;
|
||||
z-index: 100;
|
||||
}
|
||||
@keyframes menuSlide {
|
||||
0% {
|
||||
height: 0%;
|
||||
}
|
||||
100% {
|
||||
height: 100%;
|
||||
}
|
||||
}
|
||||
.menu__body {
|
||||
--x: 0;
|
||||
--y: 0;
|
||||
@@ -94,13 +102,14 @@ body:after {
|
||||
border-top-right-radius: 20px;
|
||||
box-shadow: 0px -9px 50px -30px black;
|
||||
font-family: 'Montserrat', sans-serif;
|
||||
position: absolute;
|
||||
position: fixed;
|
||||
bottom: 0;
|
||||
z-index: 105;
|
||||
transform: translate3d(var(--x), var(--y), var(--z));
|
||||
height: 0;
|
||||
/*transition: height 200ms ease-in-out 400ms, opacity 700ms;*/
|
||||
transition: height 0.3s cubic-bezier(0.54, 0.57, 0.36, 0.98) 0.2s;
|
||||
transition: height 200ms ease-in-out 400ms, opacity 700ms;
|
||||
/*animation-name: menuSlide;
|
||||
animation-delay: 2s;*/
|
||||
background: linear-gradient(to bottom, #606c88, #3f4c6b);
|
||||
}
|
||||
.menu__body[hidden] {
|
||||
@@ -183,6 +192,7 @@ body:after {
|
||||
.menu__contact {
|
||||
display: flex;
|
||||
padding: 8px;
|
||||
justify-content: center;
|
||||
}
|
||||
.menu__contact svg {
|
||||
width: 100%;
|
||||
|
||||
@@ -96,7 +96,14 @@ body {
|
||||
position: absolute;
|
||||
z-index: 100;
|
||||
}
|
||||
|
||||
@keyframes menuSlide{
|
||||
0%{
|
||||
height: 0%;
|
||||
}
|
||||
100%{
|
||||
height: 100%;
|
||||
}
|
||||
}
|
||||
.menu__body {
|
||||
--x: 0;
|
||||
--y: 0;
|
||||
@@ -109,15 +116,18 @@ body {
|
||||
border-top-right-radius: 20px;
|
||||
box-shadow: 0px -9px 50px -30px black;
|
||||
font-family: 'Montserrat', sans-serif;
|
||||
position: absolute;
|
||||
position: fixed;
|
||||
bottom: 0;
|
||||
z-index: 105;
|
||||
transform: translate3d(var(--x), var(--y), var(--z));
|
||||
//transition: .2s cubic-bezier(.33,1,.53,1);
|
||||
height: 0;
|
||||
/*transition: height 200ms ease-in-out 400ms, opacity 700ms;*/
|
||||
transition: height 0.3s cubic-bezier(0.54, 0.57, 0.36, 0.98) 0.2s;
|
||||
transition: height 200ms ease-in-out 400ms, opacity 700ms;
|
||||
/*animation-name: menuSlide;
|
||||
animation-delay: 2s;*/
|
||||
background: linear-gradient(to bottom, #606c88, #3f4c6b);
|
||||
|
||||
|
||||
|
||||
&[hidden] {
|
||||
--y: 150%;
|
||||
@@ -214,6 +224,7 @@ body {
|
||||
.menu__contact {
|
||||
display: flex;
|
||||
padding: 8px;
|
||||
justify-content: center;
|
||||
|
||||
svg {
|
||||
width: 100%;
|
||||
|
||||
+1
-1
@@ -1 +1 @@
|
||||
:root{--dark:#333;--light:#fff;--neutral:#f6f6f6;--neutral-dark:#d1d1d1;--color:#5607d7;--color-light:#941ed2;--color-dark:#2719cd;--font-stack:'Josefin Sans','Montserrat','sans-serif';}body{display:flex;align-items:center;justify-content:center;background:url('data:image/svg+xml,%3Csvg width="300" height="300" viewBox="0 0 64 64" xmlns="http://www.w3.org/2000/svg"%3E%3Cpath d="M8 16c4.418 0 8-3.582 8-8s-3.582-8-8-8-8 3.582-8 8 3.582 8 8 8zm0-2c3.314 0 6-2.686 6-6s-2.686-6-6-6-6 2.686-6 6 2.686 6 6 6zm33.414-6l5.95-5.95L45.95.636 40 6.586 34.05.636 32.636 2.05 38.586 8l-5.95 5.95 1.414 1.414L40 9.414l5.95 5.95 1.414-1.414L41.414 8zM40 48c4.418 0 8-3.582 8-8s-3.582-8-8-8-8 3.582-8 8 3.582 8 8 8zm0-2c3.314 0 6-2.686 6-6s-2.686-6-6-6-6 2.686-6 6 2.686 6 6 6zM9.414 40l5.95-5.95-1.414-1.414L8 38.586l-5.95-5.95L.636 34.05 6.586 40l-5.95 5.95 1.414 1.414L8 41.414l5.95 5.95 1.414-1.414L9.414 40z" fill="%239C92AC" fill-opacity="0.1" fill-rule="evenodd"/%3E%3C/svg%3E') fixed;font-family:var(--font-stack);}body:before{content:'';width:400px;height:400px;background:linear-gradient(135deg,#ffa500,#ff4500);border-radius:50%;position:fixed;top:-50px;left:10vw;z-index:-1;}body:after{content:'';width:300px;height:300px;background:linear-gradient(135deg,#0ff,#00f);border-radius:50%;position:fixed;bottom:-50px;right:-5vw;z-index:-1;}.menu__button{--x:-50%;--y:0;--z:0;display:flex;align-items:center;justify-content:space-between;background:linear-gradient(to right,#606c88,#3f4c6b);padding:.75rem 3rem;border-radius:1.5rem 1.5rem 0 0;border:0;box-shadow:0 2px 40px -10px #000;color:#fff;font-size:16px;white-space:nowrap;position:fixed;bottom:0;left:50%;transform:translate3d(var(--x),var(--y),var(--z));cursor:pointer;z-index:105;}.menu__button[hidden]{--y:200%;}.menu__button div{display:flex;align-items:center;width:12px;height:12px;margin-right:20px;}.menu__button div div{display:table;height:1px;background:var(--light);box-shadow:0 4px 0 var(--light),0 -4px 0 var(--light);}.menu__overlay{width:100%;height:100%;background:rgba(0,0,0,.1);position:absolute;z-index:100;}.menu__body{--x:0;--y:0;--z:0;display:block;width:100%;background-color:#fff;padding-bottom:15px;border-top-left-radius:20px;border-top-right-radius:20px;box-shadow:0 -9px 50px -30px black;font-family:'Montserrat',sans-serif;position:absolute;bottom:0;z-index:105;transform:translate3d(var(--x),var(--y),var(--z));height:0;transition:height .3s cubic-bezier(.54,.57,.36,.98) .2s;background:linear-gradient(to bottom,#606c88,#3f4c6b);}.menu__body[hidden]{--y:150%;}.menu__body>*:not(:last-child){border-bottom:2px solid var(--neutral);}.menu__header{display:flex;justify-content:space-between;padding:15px 20px;}.menu__header label div{width:15px;height:15px;border:2px solid var(--dark);border-radius:50%;position:relative;transform:rotate(5.5rad);}.menu__header label div:after{content:'';width:2px;height:10px;background:var(--dark);position:absolute;top:100%;left:50%;transform:translateX(-50%);}.menu__header p{font-size:18px;vertical-align:center;white-space:nowrap;}.menu__header h3{font-weight:normal;}.menu__header button{display:flex;align-items:center;justify-content:center;width:25px;height:25px;background:var(--neutral-dark);border-radius:50%;cursor:pointer;}.menu__header button div{width:15px;height:3px;background:var(--light);position:relative;transform:rotate(5.5rad);}.menu__header button div:before{content:'';width:3px;height:15px;background:var(--light);position:absolute;top:50%;left:50%;transform:translate(-50%,-50%);}.menu__links{display:flex;padding:10px 15px;font-weight:bold;overflow-x:auto;}.menu__links a{flex:1 1 1px;padding:10px 8px;color:var(--dark);text-decoration:none;white-space:nowrap;}.menu__contact{display:flex;padding:8px;}.menu__contact svg{width:100%;fill:var(--color);}.menu__contact a{flex:1 1 30%;padding:1.5rem;margin:5px;border-radius:8px;background:#d1d1d1;color:var(--color);text-align:center;font-size:14px;font-weight:bold;text-decoration:none;}
|
||||
:root{--dark:#333;--light:#fff;--neutral:#f6f6f6;--neutral-dark:#d1d1d1;--color:#5607d7;--color-light:#941ed2;--color-dark:#2719cd;--font-stack:'Josefin Sans','Montserrat','sans-serif';}body{display:flex;align-items:center;justify-content:center;background:url('data:image/svg+xml,%3Csvg width="300" height="300" viewBox="0 0 64 64" xmlns="http://www.w3.org/2000/svg"%3E%3Cpath d="M8 16c4.418 0 8-3.582 8-8s-3.582-8-8-8-8 3.582-8 8 3.582 8 8 8zm0-2c3.314 0 6-2.686 6-6s-2.686-6-6-6-6 2.686-6 6 2.686 6 6 6zm33.414-6l5.95-5.95L45.95.636 40 6.586 34.05.636 32.636 2.05 38.586 8l-5.95 5.95 1.414 1.414L40 9.414l5.95 5.95 1.414-1.414L41.414 8zM40 48c4.418 0 8-3.582 8-8s-3.582-8-8-8-8 3.582-8 8 3.582 8 8 8zm0-2c3.314 0 6-2.686 6-6s-2.686-6-6-6-6 2.686-6 6 2.686 6 6 6zM9.414 40l5.95-5.95-1.414-1.414L8 38.586l-5.95-5.95L.636 34.05 6.586 40l-5.95 5.95 1.414 1.414L8 41.414l5.95 5.95 1.414-1.414L9.414 40z" fill="%239C92AC" fill-opacity="0.1" fill-rule="evenodd"/%3E%3C/svg%3E') fixed;font-family:var(--font-stack);}body:before{content:'';width:400px;height:400px;background:linear-gradient(135deg,#ffa500,#ff4500);border-radius:50%;position:fixed;top:-50px;left:10vw;z-index:-1;}body:after{content:'';width:300px;height:300px;background:linear-gradient(135deg,#0ff,#00f);border-radius:50%;position:fixed;bottom:-50px;right:-5vw;z-index:-1;}.menu__button{--x:-50%;--y:0;--z:0;display:flex;align-items:center;justify-content:space-between;background:linear-gradient(to right,#606c88,#3f4c6b);padding:.75rem 3rem;border-radius:1.5rem 1.5rem 0 0;border:0;box-shadow:0 2px 40px -10px #000;color:#fff;font-size:16px;white-space:nowrap;position:fixed;bottom:0;left:50%;transform:translate3d(var(--x),var(--y),var(--z));cursor:pointer;z-index:105;}.menu__button[hidden]{--y:200%;}.menu__button div{display:flex;align-items:center;width:12px;height:12px;margin-right:20px;}.menu__button div div{display:table;height:1px;background:var(--light);box-shadow:0 4px 0 var(--light),0 -4px 0 var(--light);}.menu__overlay{width:100%;height:100%;background:rgba(0,0,0,.1);position:absolute;z-index:100;}@keyframes menuSlide{0%{height:0%;}100%{height:100%;}}.menu__body{--x:0;--y:0;--z:0;display:block;width:100%;background-color:#fff;padding-bottom:15px;border-top-left-radius:20px;border-top-right-radius:20px;box-shadow:0 -9px 50px -30px black;font-family:'Montserrat',sans-serif;position:fixed;bottom:0;z-index:105;transform:translate3d(var(--x),var(--y),var(--z));height:0;transition:height 200ms ease-in-out 400ms,opacity 700ms;background:linear-gradient(to bottom,#606c88,#3f4c6b);}.menu__body[hidden]{--y:150%;}.menu__body>*:not(:last-child){border-bottom:2px solid var(--neutral);}.menu__header{display:flex;justify-content:space-between;padding:15px 20px;}.menu__header label div{width:15px;height:15px;border:2px solid var(--dark);border-radius:50%;position:relative;transform:rotate(5.5rad);}.menu__header label div:after{content:'';width:2px;height:10px;background:var(--dark);position:absolute;top:100%;left:50%;transform:translateX(-50%);}.menu__header p{font-size:18px;vertical-align:center;white-space:nowrap;}.menu__header h3{font-weight:normal;}.menu__header button{display:flex;align-items:center;justify-content:center;width:25px;height:25px;background:var(--neutral-dark);border-radius:50%;cursor:pointer;}.menu__header button div{width:15px;height:3px;background:var(--light);position:relative;transform:rotate(5.5rad);}.menu__header button div:before{content:'';width:3px;height:15px;background:var(--light);position:absolute;top:50%;left:50%;transform:translate(-50%,-50%);}.menu__links{display:flex;padding:10px 15px;font-weight:bold;overflow-x:auto;}.menu__links a{flex:1 1 1px;padding:10px 8px;color:var(--dark);text-decoration:none;white-space:nowrap;}.menu__contact{display:flex;padding:8px;justify-content:center;}.menu__contact svg{width:100%;fill:var(--color);}.menu__contact a{flex:1 1 30%;padding:1.5rem;margin:5px;border-radius:8px;background:#d1d1d1;color:var(--color);text-align:center;font-size:14px;font-weight:bold;text-decoration:none;}
|
||||
@@ -232,6 +232,7 @@ namespace GPW.CORE.Smart.Pages
|
||||
ListRichiesteDip = await CDService.RegRichiesteGetByDip(0, dtMin, dtMax);
|
||||
if (ListRichiesteDip.Count > 0)
|
||||
{
|
||||
eventList = new List<CalendarEvent>();
|
||||
#if false
|
||||
// conversione fermate in elenco task x calendario...
|
||||
var taskDip = ListRichiesteDip.Select(x => new BlazorCalendar.Models.Tasks
|
||||
@@ -277,12 +278,28 @@ namespace GPW.CORE.Smart.Pages
|
||||
|
||||
}
|
||||
}
|
||||
string css = "";
|
||||
DateTime dtFine = item.DtEnd;
|
||||
if (item.CodGiust == "PERM")
|
||||
{
|
||||
css = "purple";
|
||||
}
|
||||
else if (item.CodGiust == "104")
|
||||
{
|
||||
css = "pink";
|
||||
}
|
||||
else if (item.CodGiust == "FER")
|
||||
{
|
||||
css = "green";
|
||||
}
|
||||
|
||||
eventList.Add(new CalendarEvent()
|
||||
{
|
||||
id = 0,
|
||||
Inizio = item.DtStart,
|
||||
Fine = item.DtEnd,
|
||||
Type = item.CodGiust
|
||||
Type = item.CodGiust,
|
||||
CssClass= css
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -327,7 +344,9 @@ namespace GPW.CORE.Smart.Pages
|
||||
Title = "MAL",
|
||||
Description = "MAL",
|
||||
Type = "MAL",
|
||||
ToolTip = "MAL"
|
||||
ToolTip = "MAL",
|
||||
CssClass = "blue"
|
||||
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user