-
- @($"{dtCurr:HH}")
-
-
:
-
- @($"{dtCurr:mm}")
+ @if (!isCompactMode)
+ {
+
+
+
+ @($"{dtCurr:dddd dd MMMM}")
+
+
+
+
+ @($"{dtCurr:HH}")
+
+
:
+
+ @($"{dtCurr:mm}")
+
-
+ }
+ else
+ {
+
+
+
@($"{dtCurr:dddd dd MMMM}")
+
+
+
+ @($"{dtCurr:HH}")
+
+
:
+
+ @($"{dtCurr:mm}")
+
+
+
+
+
+ }
}
diff --git a/GPW.CORE.SMART/Components/DtCard.razor.cs b/GPW.CORE.SMART/Components/DtCard.razor.cs
index 063ddce..634da71 100644
--- a/GPW.CORE.SMART/Components/DtCard.razor.cs
+++ b/GPW.CORE.SMART/Components/DtCard.razor.cs
@@ -15,7 +15,9 @@ namespace GPW.CORE.Smart.Components
[Parameter]
public bool NextIsExtrata { get; set; } = true;
-
+ [Parameter]
+ public bool isCompactMode { get; set; } = false;
+
#endregion Public Properties
#region Public Methods
diff --git a/GPW.CORE.SMART/Components/DtCard.razor.css b/GPW.CORE.SMART/Components/DtCard.razor.css
index a6fe3b1..28aebe2 100644
--- a/GPW.CORE.SMART/Components/DtCard.razor.css
+++ b/GPW.CORE.SMART/Components/DtCard.razor.css
@@ -1,11 +1,43 @@
-.cardContainer {
- padding-bottom: 1rem;
- min-height: 8.5rem;
+.cardContainerAll {
border-radius: 12px;
width: 100%;
box-shadow: 0px 3px 4px rgba(0, 0, 0, 0.7);
color: #fff;
}
+.cardContainer {
+ border-radius: 12px;
+ width: 100%;
+ box-shadow: 0px 3px 4px rgba(0, 0, 0, 0.7);
+ color: #fff;
+ min-height: 8.5rem;
+ padding-bottom: 1rem;
+}
+.cardContainerCompact {
+ border-radius: 12px;
+ width: 100%;
+ box-shadow: 0px 3px 4px rgba(0, 0, 0, 0.7);
+ color: #fff;
+ min-height: 4rem;
+}
+.cardContainerCompact .data {
+ font-weight: bold;
+ padding-top: 1.5rem;
+ padding-left: 1.5rem;
+ position: relative;
+ font-size: 1.25rem;
+ text-transform: uppercase;
+ display: flex;
+ justify-content: space-between;
+ font-size: 1rem;
+}
+.cardContainerCompact .ora {
+ width: 100%;
+ font-weight: bold;
+ position: relative;
+ font-size: 3.5rem;
+ text-align: center;
+ font-size: 2.8rem;
+}
.cardContainerMancTimb {
padding-bottom: 1rem;
min-height: 8.5rem;
diff --git a/GPW.CORE.SMART/Components/DtCard.razor.less b/GPW.CORE.SMART/Components/DtCard.razor.less
index 0e99c4c..530351e 100644
--- a/GPW.CORE.SMART/Components/DtCard.razor.less
+++ b/GPW.CORE.SMART/Components/DtCard.razor.less
@@ -1,12 +1,32 @@
-.cardContainer {
- padding-bottom: 1rem;
- min-height: 8.5rem;
+.cardContainerAll {
border-radius: 12px;
width: 100%;
box-shadow: 0px 3px 4px rgba(0,0,0,0.7);
color: #fff;
}
+
+.cardContainer {
+ .cardContainerAll;
+ min-height: 8.5rem;
+ padding-bottom: 1rem;
+}
+
+.cardContainerCompact {
+ .cardContainerAll;
+ min-height: 4rem;
+}
+
+.cardContainerCompact .data{
+ .data;
+ font-size: 1rem;
+}
+
+.cardContainerCompact .ora {
+ .ora;
+ font-size: 2.8rem;
+}
+
.cardContainerMancTimb {
padding-bottom: 1rem;
min-height: 8.5rem;
diff --git a/GPW.CORE.SMART/Components/DtCard.razor.min.css b/GPW.CORE.SMART/Components/DtCard.razor.min.css
index 9eaa740..adc3e9f 100644
--- a/GPW.CORE.SMART/Components/DtCard.razor.min.css
+++ b/GPW.CORE.SMART/Components/DtCard.razor.min.css
@@ -1 +1 @@
-.cardContainer{padding-bottom:1rem;min-height:8.5rem;border-radius:12px;width:100%;box-shadow:0 3px 4px rgba(0,0,0,.7);color:#fff;}.cardContainerMancTimb{padding-bottom:1rem;min-height:8.5rem;border-radius:12px;width:100%;box-shadow:0 3px 4px rgba(0,0,0,.7);color:#fff;background-color:#f1c40f;}.titolo{font-size:1rem;}.data{font-weight:bold;padding-top:1.5rem;padding-left:1.5rem;position:relative;font-size:1.25rem;text-transform:uppercase;display:flex;justify-content:space-between;}.ora{width:100%;font-weight:bold;position:relative;font-size:3.5rem;text-align:center;}.oraRichiesta{width:100%;font-weight:bold;position:relative;font-size:2rem;text-align:center;padding-top:1.5rem;}.oraRichiesta input{border-radius:.5rem;border:0;padding:.25rem;}.defaultCard{background-color:rgba(0,128,255,.8);}.cardEntrata{background-color:#9b59b6;}.cardUscita{background-color:#4caf50;}.txtSec{font-weight:normal;font-size:2rem;}.pulse-warning{box-shadow:0 0 20px 5px rgba(0,128,255,.8);animation:pulse-warning 2.5s infinite;}@-webkit-keyframes pulse-warning{0%{-webkit-box-shadow:0 0 20px 5px rgba(0,128,255,.8);color:#fff;}70%{-webkit-box-shadow:0 0 20px 5px rgba(0,128,255,0);}100%{-webkit-box-shadow:0 0 20px 5px rgba(0,128,255,.8);color:#fff;}}@keyframes pulse-warning{0%{-moz-box-shadow:0 0 20px 5px rgba(0,128,255,.8);box-shadow:0 0 20px 5px rgba(0,128,255,.8);color:#fff;}70%{-moz-box-shadow:0 0 20px 5px rgba(0,128,255,0);box-shadow:0 0 20px 5px rgba(0,128,255,0);}100%{-moz-box-shadow:0 0 20px 5px rgba(255,170,0,.8);box-shadow:0 0 20px 5px rgba(0,128,255,.8);color:#fff;}}
\ No newline at end of file
+.cardContainerAll{border-radius:12px;width:100%;box-shadow:0 3px 4px rgba(0,0,0,.7);color:#fff;}.cardContainer{border-radius:12px;width:100%;box-shadow:0 3px 4px rgba(0,0,0,.7);color:#fff;min-height:8.5rem;padding-bottom:1rem;}.cardContainerCompact{border-radius:12px;width:100%;box-shadow:0 3px 4px rgba(0,0,0,.7);color:#fff;min-height:4rem;}.cardContainerCompact .data{font-weight:bold;padding-top:1.5rem;padding-left:1.5rem;position:relative;font-size:1.25rem;text-transform:uppercase;display:flex;justify-content:space-between;font-size:1rem;}.cardContainerCompact .ora{width:100%;font-weight:bold;position:relative;font-size:3.5rem;text-align:center;font-size:2.8rem;}.cardContainerMancTimb{padding-bottom:1rem;min-height:8.5rem;border-radius:12px;width:100%;box-shadow:0 3px 4px rgba(0,0,0,.7);color:#fff;background-color:#f1c40f;}.titolo{font-size:1rem;}.data{font-weight:bold;padding-top:1.5rem;padding-left:1.5rem;position:relative;font-size:1.25rem;text-transform:uppercase;display:flex;justify-content:space-between;}.ora{width:100%;font-weight:bold;position:relative;font-size:3.5rem;text-align:center;}.oraRichiesta{width:100%;font-weight:bold;position:relative;font-size:2rem;text-align:center;padding-top:1.5rem;}.oraRichiesta input{border-radius:.5rem;border:0;padding:.25rem;}.defaultCard{background-color:rgba(0,128,255,.8);}.cardEntrata{background-color:#9b59b6;}.cardUscita{background-color:#4caf50;}.txtSec{font-weight:normal;font-size:2rem;}.pulse-warning{box-shadow:0 0 20px 5px rgba(0,128,255,.8);animation:pulse-warning 2.5s infinite;}@-webkit-keyframes pulse-warning{0%{-webkit-box-shadow:0 0 20px 5px rgba(0,128,255,.8);color:#fff;}70%{-webkit-box-shadow:0 0 20px 5px rgba(0,128,255,0);}100%{-webkit-box-shadow:0 0 20px 5px rgba(0,128,255,.8);color:#fff;}}@keyframes pulse-warning{0%{-moz-box-shadow:0 0 20px 5px rgba(0,128,255,.8);box-shadow:0 0 20px 5px rgba(0,128,255,.8);color:#fff;}70%{-moz-box-shadow:0 0 20px 5px rgba(0,128,255,0);box-shadow:0 0 20px 5px rgba(0,128,255,0);}100%{-moz-box-shadow:0 0 20px 5px rgba(255,170,0,.8);box-shadow:0 0 20px 5px rgba(0,128,255,.8);color:#fff;}}
\ No newline at end of file
diff --git a/GPW.CORE.SMART/Components/ProjectsLIst.razor.css b/GPW.CORE.SMART/Components/ProjectsLIst.razor.css
index b5a0139..1a63247 100644
--- a/GPW.CORE.SMART/Components/ProjectsLIst.razor.css
+++ b/GPW.CORE.SMART/Components/ProjectsLIst.razor.css
@@ -1,32 +1,44 @@
.prjCard {
background-color: #fff;
- height: 4rem;
width: 100%;
- border-radius: 1.2rem;
+ border-radius: 1.5rem;
display: flex;
justify-content: space-between;
align-content: start;
}
-.prjTime,
+.extBase {
+ padding: 0.5rem;
+ font-size: 1rem;
+ background-color: #304FFE;
+ height: 100%;
+}
+.prjTime {
+ padding: 0.5rem;
+ font-size: 1rem;
+ background-color: #304FFE;
+ height: 100%;
+ border-radius: 0.8rem 1.2rem 1.2rem 0.8rem;
+}
.prjTotHour {
padding: 0.5rem;
- font-size: 1.25rem;
+ font-size: 1rem;
background-color: #304FFE;
- border-radius: 1.2rem;
height: 100%;
+ border-radius: 1.2rem 0.8rem 0.8rem 1.2rem;
+ display: table-cell;
+ vertical-align: middle;
}
.prjContent {
font-size: 1rem;
color: #000;
text-align: start;
padding-left: 0.5rem;
+ width: 100%;
}
.prjContent .fase {
font-size: 0.85rem;
color: rgba(128, 128, 128, 0.8);
-}
-.prjContent .group {
- font-weight: bold;
+ text-transform: capitalize;
}
.prjContent .desc {
display: inline-block;
@@ -35,6 +47,7 @@
.up {
display: flex;
justify-content: space-between;
+ width: 100%;
}
/*
.prjContent .group {
diff --git a/GPW.CORE.SMART/Components/ProjectsLIst.razor.less b/GPW.CORE.SMART/Components/ProjectsLIst.razor.less
index 2f9d969..5ec478a 100644
--- a/GPW.CORE.SMART/Components/ProjectsLIst.razor.less
+++ b/GPW.CORE.SMART/Components/ProjectsLIst.razor.less
@@ -1,19 +1,30 @@
.prjCard {
background-color: #fff;
- height: 4rem;
width: 100%;
- border-radius: 1.2rem;
+ border-radius: 1.5rem;
display: flex;
justify-content: space-between;
align-content: start;
}
-.prjTime, .prjTotHour {
+.extBase {
padding: 0.5rem;
- font-size: 1.25rem;
+ font-size: 1rem;
background-color: #304FFE;
- border-radius: 1.2rem;
- height: 100%;
+ height: 100%;
+}
+
+
+.prjTime{
+ .extBase;
+ border-radius: 0.8rem 1.2rem 1.2rem 0.8rem;
+}
+
+.prjTotHour {
+ .extBase;
+ border-radius: 1.2rem 0.8rem 0.8rem 1.2rem;
+ display: table-cell;
+ vertical-align: middle
}
.prjContent{
@@ -21,15 +32,13 @@
color: #000;
text-align: start;
padding-left: 0.5rem;
+ width: 100%;
}
.prjContent .fase {
font-size: 0.85rem;
- color: rgba(128, 128, 128, 0.8)
-}
-
-.prjContent .group {
- font-weight: bold;
+ color: rgba(128, 128, 128, 0.8);
+ text-transform: capitalize;
}
.prjContent .desc {
@@ -40,6 +49,7 @@
.up {
display: flex;
justify-content: space-between;
+ width: 100%;
}
/*
diff --git a/GPW.CORE.SMART/Components/ProjectsLIst.razor.min.css b/GPW.CORE.SMART/Components/ProjectsLIst.razor.min.css
index ee59bed..7546eba 100644
--- a/GPW.CORE.SMART/Components/ProjectsLIst.razor.min.css
+++ b/GPW.CORE.SMART/Components/ProjectsLIst.razor.min.css
@@ -1 +1 @@
-.prjCard{background-color:#fff;height:4rem;width:100%;border-radius:1.2rem;display:flex;justify-content:space-between;align-content:start;}.prjTime,.prjTotHour{padding:.5rem;font-size:1.25rem;background-color:#304ffe;border-radius:1.2rem;height:100%;}.prjContent{font-size:1rem;color:#000;text-align:start;padding-left:.5rem;}.prjContent .fase{font-size:.85rem;color:rgba(128,128,128,.8);}.prjContent .group{font-weight:bold;}.prjContent .desc{display:inline-block;word-break:break-word;}.up{display:flex;justify-content:space-between;}
\ No newline at end of file
+.prjCard{background-color:#fff;width:100%;border-radius:1.5rem;display:flex;justify-content:space-between;align-content:start;}.extBase{padding:.5rem;font-size:1rem;background-color:#304ffe;height:100%;}.prjTime{padding:.5rem;font-size:1rem;background-color:#304ffe;height:100%;border-radius:.8rem 1.2rem 1.2rem .8rem;}.prjTotHour{padding:.5rem;font-size:1rem;background-color:#304ffe;height:100%;border-radius:1.2rem .8rem .8rem 1.2rem;display:table-cell;vertical-align:middle;}.prjContent{font-size:1rem;color:#000;text-align:start;padding-left:.5rem;width:100%;}.prjContent .fase{font-size:.85rem;color:rgba(128,128,128,.8);text-transform:capitalize;}.prjContent .desc{display:inline-block;word-break:break-word;}.up{display:flex;justify-content:space-between;width:100%;}
\ No newline at end of file
diff --git a/GPW.CORE.SMART/Components/ProjectsList.razor b/GPW.CORE.SMART/Components/ProjectsList.razor
index a4266af..6eceea8 100644
--- a/GPW.CORE.SMART/Components/ProjectsList.razor
+++ b/GPW.CORE.SMART/Components/ProjectsList.razor
@@ -1,25 +1,28 @@
@using GPW.CORE.Data.DbModels
@using GPW.CORE.Smart.Data
-@for (int i = 0; i < 5; i++)
+@if (ListRA != null)
{
-
-
-
-
-
-
EgalwSW
-
Sviluppo
-
Aggiunte nuove funzionalità
+ @foreach (var item in ListRA)
+ {
+
+
+
+
+
@($"{item.Inizio:HH:mm}")
+
@($"{item.Fine:HH:mm}")
+
+
+
@item.FasiNav?.ProgettoNav?.ClienteNav?.RagSociale @item.FasiNav?.ProgettoNav?.NomeProj
+
@item.FasiNav?.DescrizioneFase
+
@item.Descrizione
+
+
@($"{item.Durata.Hours:00}"):@($"{item.Durata.Minutes:00}")
-
2:00
-
+ }
+
}
-
diff --git a/GPW.CORE.SMART/Components/ProjectsList.razor.cs b/GPW.CORE.SMART/Components/ProjectsList.razor.cs
index 38474d1..39ccc42 100644
--- a/GPW.CORE.SMART/Components/ProjectsList.razor.cs
+++ b/GPW.CORE.SMART/Components/ProjectsList.razor.cs
@@ -22,18 +22,23 @@ namespace GPW.CORE.Smart.Components
private bool isLoading { get; set; } = false;
[Parameter]
- public List
ListTimb
- {
- get
- {
- return _ListTimb.OrderByDescending(x => x.DataOra).ToList();
- }
+ public List? ListRA { get; set; } = null!;
+ //{
+ // get
+ // {
+ // return _ListRA.OrderByDescending(x => x.).ToList();
+ // }
- set
- {
- _ListTimb = value;
- }
- }
+ // set
+ // {
+ // _ListRA = value;
+ // }
+ //}
+
+ //protected override Task OnParametersSetAsync()
+ //{
+ // //var lista = ListRA.Select(x=>x.Select(s=>s.))
+ //}
private bool canDelete(TimbratureModel currRec)
{
@@ -104,7 +109,7 @@ namespace GPW.CORE.Smart.Components
#region Private Properties
- private List _ListTimb { get; set; } = new List();
+ private List?> _ListRA { get; set; } = new List?>();
[Inject]
private CoreSmartDataService CDService { get; set; } = null!;
diff --git a/GPW.CORE.SMART/Pages/Jumper.razor b/GPW.CORE.SMART/Pages/Jumper.razor
index 433b748..40dc015 100644
--- a/GPW.CORE.SMART/Pages/Jumper.razor
+++ b/GPW.CORE.SMART/Pages/Jumper.razor
@@ -1,5 +1,6 @@
@page "/Jumper"
-Jumper
+Logging in...
+
\ No newline at end of file