From f24dcb85a3b3dde2a9099695f11d99ae94ff7a4e Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 4 Jan 2022 17:15:55 +0100 Subject: [PATCH] Update gestione edit/clona/add/rem durata --- GPW.CORE.UI/Components/DayHoriz.razor | 4 +- GPW.CORE.UI/Components/DayHoriz.razor.cs | 22 ++++++- GPW.CORE.UI/Components/RegAtt.razor | 78 +++++++++++++++++------ GPW.CORE.UI/Components/RegAttEditor.razor | 18 ------ GPW.CORE.UI/Pages/Planner.razor | 2 +- GPW.CORE.UI/wwwroot/css/site.css | 27 ++++++++ GPW.CORE.UI/wwwroot/css/site.less | 33 ++++++++++ GPW.CORE.UI/wwwroot/css/site.min.css | 2 +- 8 files changed, 144 insertions(+), 42 deletions(-) diff --git a/GPW.CORE.UI/Components/DayHoriz.razor b/GPW.CORE.UI/Components/DayHoriz.razor index e0eeb27..964afa8 100644 --- a/GPW.CORE.UI/Components/DayHoriz.razor +++ b/GPW.CORE.UI/Components/DayHoriz.razor @@ -27,13 +27,13 @@ { @if (@noData) { - + } else if (@DayDTO != null && @DayDTO.ListRA != null) { @foreach (var item in ListRegAtt()) { - + } } } diff --git a/GPW.CORE.UI/Components/DayHoriz.razor.cs b/GPW.CORE.UI/Components/DayHoriz.razor.cs index 6acc3cd..1eb3e8e 100644 --- a/GPW.CORE.UI/Components/DayHoriz.razor.cs +++ b/GPW.CORE.UI/Components/DayHoriz.razor.cs @@ -42,6 +42,9 @@ namespace GPW.CORE.UI.Components [Parameter] public EventCallback ItemSelected { get; set; } + [Parameter] + public EventCallback ItemUpdated { get; set; } + private bool noData { get => DayDTO == null || DayDTO.ListRA == null || DayDTO.ListRA.Count == 0; } private string TotLav @@ -138,10 +141,25 @@ namespace GPW.CORE.UI.Components /// /// Indico item selezionato /// - protected async void ReportSelect(RegAttivitaModel selRecord) + protected async void ReportSelected(RegAttivitaModel selRecord) { await ItemSelected.InvokeAsync(selRecord); } - + + /// + /// Indico item selezionato + /// + protected async void ReportCloned() + { + await ItemSelected.InvokeAsync(null); + } + + /// + /// Indico item aggiornato + /// + protected async void ReportUpdated() + { + await ItemUpdated.InvokeAsync(null); + } } } \ No newline at end of file diff --git a/GPW.CORE.UI/Components/RegAtt.razor b/GPW.CORE.UI/Components/RegAtt.razor index b9d9e0b..d29d9da 100644 --- a/GPW.CORE.UI/Components/RegAtt.razor +++ b/GPW.CORE.UI/Components/RegAtt.razor @@ -1,6 +1,7 @@ @using CORE.Data.DbModels @using UI.Data @inject GpwDataService GDataServ +@inject MessageService AppMServ
@@ -8,20 +9,38 @@ @if (@CurrData.IdxFase > 0) { @*
*@ - +
+ +
+ + +
+ + + + +
+
+ + + + +
+
+
@(trimLine($"{CurrData.FasiNav?.ProgettoNav?.ClienteNav?.RagSociale}",65)) - @(trimLine($"{CurrData.FasiNav?.ProgettoNav?.NomeProj}",75))
@(trimLine($"{CurrData.FasiNav?.DescrizioneFase}",130))
@@ -29,12 +48,12 @@
@*
- +
- +
-
*@ +
*@ } else { @@ -60,9 +79,14 @@ [Parameter] public List ListFasi { get; set; } = null!; - + [Parameter] + public EventCallback ItemCloned { get; set; } [Parameter] public EventCallback ItemSelected { get; set; } + [Parameter] + public EventCallback ItemUpdated { get; set; } + + private int deltaTime = 0; /// /// Trim linea di testo secondo regole @@ -133,6 +157,15 @@ await ItemSelected.InvokeAsync(CurrData); } + /// + /// Indico item selezionato + /// + protected async void Clone() + { + AppMServ.clonedRA = CurrData; + await ItemCloned.InvokeAsync(CurrData); + } + /// /// Indico item selezionato /// @@ -140,4 +173,13 @@ { await ItemSelected.InvokeAsync(selRecord); } + + protected async void AddTime(int deltaMin) + { + // Aggiungo durata e salvo... + CurrData.Fine = CurrData.Fine.AddMinutes(deltaMin); + // salvo + await GDataServ.RegAttUpdate(CurrData); + await ItemUpdated.InvokeAsync(CurrData); + } } diff --git a/GPW.CORE.UI/Components/RegAttEditor.razor b/GPW.CORE.UI/Components/RegAttEditor.razor index a9fa995..50c545b 100644 --- a/GPW.CORE.UI/Components/RegAttEditor.razor +++ b/GPW.CORE.UI/Components/RegAttEditor.razor @@ -88,24 +88,6 @@
- @*
-
- - - -
-
@currRecord.Durata.TotalMinutes min
-
- - - - - - - - -
-
*@
diff --git a/GPW.CORE.UI/Pages/Planner.razor b/GPW.CORE.UI/Pages/Planner.razor index de855ce..102fa2f 100644 --- a/GPW.CORE.UI/Pages/Planner.razor +++ b/GPW.CORE.UI/Pages/Planner.razor @@ -55,7 +55,7 @@ @foreach (var currItem in ListRecords) {
- +
}
diff --git a/GPW.CORE.UI/wwwroot/css/site.css b/GPW.CORE.UI/wwwroot/css/site.css index 8a88701..b43add1 100644 --- a/GPW.CORE.UI/wwwroot/css/site.css +++ b/GPW.CORE.UI/wwwroot/css/site.css @@ -33,6 +33,33 @@ a, .regionclicked { fill: red; } +.dropdown { + position: relative; + display: inline-block; +} +.dropdown-content { + display: none; + position: absolute; + background-color: #f1f1f1; + min-width: 16em; + box-shadow: 0px 8px 16px 0px rgba(0, 0, 0, 0.2); + z-index: 1; +} +.dropdown-content a { + color: black; + padding: 12px 16px; + text-decoration: none; + display: block; +} +.dropdown-content a:hover { + background-color: #ddd; +} +.dropdown:hover .dropdown-content { + display: block; +} +.dropdown:hover .dropbtn { + background-color: #3e8e41; +} .textTrim { white-space: nowrap; overflow: hidden; diff --git a/GPW.CORE.UI/wwwroot/css/site.less b/GPW.CORE.UI/wwwroot/css/site.less index 6ab66f1..15c8ead 100644 --- a/GPW.CORE.UI/wwwroot/css/site.less +++ b/GPW.CORE.UI/wwwroot/css/site.less @@ -43,6 +43,39 @@ a, .btn-link { } +.dropdown { + position: relative; + display: inline-block; +} + +.dropdown-content { + display: none; + position: absolute; + background-color: #f1f1f1; + min-width: 16em; + box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2); + z-index: 1; +} + +.dropdown-content a { + color: black; + padding: 12px 16px; + text-decoration: none; + display: block; +} + +.dropdown-content a:hover { + background-color: #ddd; +} + +.dropdown:hover .dropdown-content { + display: block; +} + +.dropdown:hover .dropbtn { + background-color: #3e8e41; +} + .textTrim { white-space: nowrap; overflow: hidden; diff --git a/GPW.CORE.UI/wwwroot/css/site.min.css b/GPW.CORE.UI/wwwroot/css/site.min.css index 0c6f73c..4241a25 100644 --- a/GPW.CORE.UI/wwwroot/css/site.min.css +++ b/GPW.CORE.UI/wwwroot/css/site.min.css @@ -1 +1 @@ -@import url('open-iconic/font/css/open-iconic-bootstrap.min.css');html,body{font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;}h1:focus{outline:none;}a,.btn-link{color:#0071c1;}.btn-primary{color:#fff;background-color:#1b6ec2;border-color:#1861ac;}.content{padding-top:1.1rem;}.valid.modified:not([type=checkbox]){outline:1px solid #26b050;}.invalid{outline:1px solid #f00;}.validation-message{color:#f00;}.regionnotclicked{fill:white;}.regionclicked{fill:red;}.textTrim{white-space:nowrap;overflow:hidden;text-overflow:ellipsis;}.max5Char{white-space:nowrap;width:10rem;overflow:hidden;text-overflow:ellipsis;}.max10Char{white-space:nowrap;width:10rem;overflow:hidden;text-overflow:ellipsis;}.max20Char{white-space:nowrap;width:20rem;overflow:hidden;text-overflow:ellipsis;}#blazor-error-ui{background:#ffffe0;bottom:0;box-shadow:0 -1px 2px rgba(0,0,0,.2);display:none;left:0;padding:.6rem 1.25rem .7rem 1.25rem;position:fixed;width:100%;z-index:1000;}#blazor-error-ui .dismiss{cursor:pointer;position:absolute;right:.75rem;top:.5rem;}.blazor-error-boundary{background:url(data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNTYiIGhlaWdodD0iNDkiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIG92ZXJmbG93PSJoaWRkZW4iPjxkZWZzPjxjbGlwUGF0aCBpZD0iY2xpcDAiPjxyZWN0IHg9IjIzNSIgeT0iNTEiIHdpZHRoPSI1NiIgaGVpZ2h0PSI0OSIvPjwvY2xpcFBhdGg+PC9kZWZzPjxnIGNsaXAtcGF0aD0idXJsKCNjbGlwMCkiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0yMzUgLTUxKSI+PHBhdGggZD0iTTI2My41MDYgNTFDMjY0LjcxNyA1MSAyNjUuODEzIDUxLjQ4MzcgMjY2LjYwNiA1Mi4yNjU4TDI2Ny4wNTIgNTIuNzk4NyAyNjcuNTM5IDUzLjYyODMgMjkwLjE4NSA5Mi4xODMxIDI5MC41NDUgOTIuNzk1IDI5MC42NTYgOTIuOTk2QzI5MC44NzcgOTMuNTEzIDI5MSA5NC4wODE1IDI5MSA5NC42NzgyIDI5MSA5Ny4wNjUxIDI4OS4wMzggOTkgMjg2LjYxNyA5OUwyNDAuMzgzIDk5QzIzNy45NjMgOTkgMjM2IDk3LjA2NTEgMjM2IDk0LjY3ODIgMjM2IDk0LjM3OTkgMjM2LjAzMSA5NC4wODg2IDIzNi4wODkgOTMuODA3MkwyMzYuMzM4IDkzLjAxNjIgMjM2Ljg1OCA5Mi4xMzE0IDI1OS40NzMgNTMuNjI5NCAyNTkuOTYxIDUyLjc5ODUgMjYwLjQwNyA1Mi4yNjU4QzI2MS4yIDUxLjQ4MzcgMjYyLjI5NiA1MSAyNjMuNTA2IDUxWk0yNjMuNTg2IDY2LjAxODNDMjYwLjczNyA2Ni4wMTgzIDI1OS4zMTMgNjcuMTI0NSAyNTkuMzEzIDY5LjMzNyAyNTkuMzEzIDY5LjYxMDIgMjU5LjMzMiA2OS44NjA4IDI1OS4zNzEgNzAuMDg4N0wyNjEuNzk1IDg0LjAxNjEgMjY1LjM4IDg0LjAxNjEgMjY3LjgyMSA2OS43NDc1QzI2Ny44NiA2OS43MzA5IDI2Ny44NzkgNjkuNTg3NyAyNjcuODc5IDY5LjMxNzkgMjY3Ljg3OSA2Ny4xMTgyIDI2Ni40NDggNjYuMDE4MyAyNjMuNTg2IDY2LjAxODNaTTI2My41NzYgODYuMDU0N0MyNjEuMDQ5IDg2LjA1NDcgMjU5Ljc4NiA4Ny4zMDA1IDI1OS43ODYgODkuNzkyMSAyNTkuNzg2IDkyLjI4MzcgMjYxLjA0OSA5My41Mjk1IDI2My41NzYgOTMuNTI5NSAyNjYuMTE2IDkzLjUyOTUgMjY3LjM4NyA5Mi4yODM3IDI2Ny4zODcgODkuNzkyMSAyNjcuMzg3IDg3LjMwMDUgMjY2LjExNiA4Ni4wNTQ3IDI2My41NzYgODYuMDU0N1oiIGZpbGw9IiNGRkU1MDAiIGZpbGwtcnVsZT0iZXZlbm9kZCIvPjwvZz48L3N2Zz4=) no-repeat 1rem/1.8rem,#b32121;padding:1rem 1rem 1rem 3.7rem;color:#fff;}.blazor-error-boundary::after{content:"An error has occurred.";} \ No newline at end of file +@import url('open-iconic/font/css/open-iconic-bootstrap.min.css');html,body{font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;}h1:focus{outline:none;}a,.btn-link{color:#0071c1;}.btn-primary{color:#fff;background-color:#1b6ec2;border-color:#1861ac;}.content{padding-top:1.1rem;}.valid.modified:not([type=checkbox]){outline:1px solid #26b050;}.invalid{outline:1px solid #f00;}.validation-message{color:#f00;}.regionnotclicked{fill:white;}.regionclicked{fill:red;}.dropdown{position:relative;display:inline-block;}.dropdown-content{display:none;position:absolute;background-color:#f1f1f1;min-width:16em;box-shadow:0 8px 16px 0 rgba(0,0,0,.2);z-index:1;}.dropdown-content a{color:#000;padding:12px 16px;text-decoration:none;display:block;}.dropdown-content a:hover{background-color:#ddd;}.dropdown:hover .dropdown-content{display:block;}.dropdown:hover .dropbtn{background-color:#3e8e41;}.textTrim{white-space:nowrap;overflow:hidden;text-overflow:ellipsis;}.max5Char{white-space:nowrap;width:10rem;overflow:hidden;text-overflow:ellipsis;}.max10Char{white-space:nowrap;width:10rem;overflow:hidden;text-overflow:ellipsis;}.max20Char{white-space:nowrap;width:20rem;overflow:hidden;text-overflow:ellipsis;}#blazor-error-ui{background:#ffffe0;bottom:0;box-shadow:0 -1px 2px rgba(0,0,0,.2);display:none;left:0;padding:.6rem 1.25rem .7rem 1.25rem;position:fixed;width:100%;z-index:1000;}#blazor-error-ui .dismiss{cursor:pointer;position:absolute;right:.75rem;top:.5rem;}.blazor-error-boundary{background:url(data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNTYiIGhlaWdodD0iNDkiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIG92ZXJmbG93PSJoaWRkZW4iPjxkZWZzPjxjbGlwUGF0aCBpZD0iY2xpcDAiPjxyZWN0IHg9IjIzNSIgeT0iNTEiIHdpZHRoPSI1NiIgaGVpZ2h0PSI0OSIvPjwvY2xpcFBhdGg+PC9kZWZzPjxnIGNsaXAtcGF0aD0idXJsKCNjbGlwMCkiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0yMzUgLTUxKSI+PHBhdGggZD0iTTI2My41MDYgNTFDMjY0LjcxNyA1MSAyNjUuODEzIDUxLjQ4MzcgMjY2LjYwNiA1Mi4yNjU4TDI2Ny4wNTIgNTIuNzk4NyAyNjcuNTM5IDUzLjYyODMgMjkwLjE4NSA5Mi4xODMxIDI5MC41NDUgOTIuNzk1IDI5MC42NTYgOTIuOTk2QzI5MC44NzcgOTMuNTEzIDI5MSA5NC4wODE1IDI5MSA5NC42NzgyIDI5MSA5Ny4wNjUxIDI4OS4wMzggOTkgMjg2LjYxNyA5OUwyNDAuMzgzIDk5QzIzNy45NjMgOTkgMjM2IDk3LjA2NTEgMjM2IDk0LjY3ODIgMjM2IDk0LjM3OTkgMjM2LjAzMSA5NC4wODg2IDIzNi4wODkgOTMuODA3MkwyMzYuMzM4IDkzLjAxNjIgMjM2Ljg1OCA5Mi4xMzE0IDI1OS40NzMgNTMuNjI5NCAyNTkuOTYxIDUyLjc5ODUgMjYwLjQwNyA1Mi4yNjU4QzI2MS4yIDUxLjQ4MzcgMjYyLjI5NiA1MSAyNjMuNTA2IDUxWk0yNjMuNTg2IDY2LjAxODNDMjYwLjczNyA2Ni4wMTgzIDI1OS4zMTMgNjcuMTI0NSAyNTkuMzEzIDY5LjMzNyAyNTkuMzEzIDY5LjYxMDIgMjU5LjMzMiA2OS44NjA4IDI1OS4zNzEgNzAuMDg4N0wyNjEuNzk1IDg0LjAxNjEgMjY1LjM4IDg0LjAxNjEgMjY3LjgyMSA2OS43NDc1QzI2Ny44NiA2OS43MzA5IDI2Ny44NzkgNjkuNTg3NyAyNjcuODc5IDY5LjMxNzkgMjY3Ljg3OSA2Ny4xMTgyIDI2Ni40NDggNjYuMDE4MyAyNjMuNTg2IDY2LjAxODNaTTI2My41NzYgODYuMDU0N0MyNjEuMDQ5IDg2LjA1NDcgMjU5Ljc4NiA4Ny4zMDA1IDI1OS43ODYgODkuNzkyMSAyNTkuNzg2IDkyLjI4MzcgMjYxLjA0OSA5My41Mjk1IDI2My41NzYgOTMuNTI5NSAyNjYuMTE2IDkzLjUyOTUgMjY3LjM4NyA5Mi4yODM3IDI2Ny4zODcgODkuNzkyMSAyNjcuMzg3IDg3LjMwMDUgMjY2LjExNiA4Ni4wNTQ3IDI2My41NzYgODYuMDU0N1oiIGZpbGw9IiNGRkU1MDAiIGZpbGwtcnVsZT0iZXZlbm9kZCIvPjwvZz48L3N2Zz4=) no-repeat 1rem/1.8rem,#b32121;padding:1rem 1rem 1rem 3.7rem;color:#fff;}.blazor-error-boundary::after{content:"An error has occurred.";} \ No newline at end of file