diff --git a/Wonky.Client/Pages/ActivityCreate.razor b/Wonky.Client/Pages/ActivityCreate.razor index 68fc1c86..79e56f8e 100644 --- a/Wonky.Client/Pages/ActivityCreate.razor +++ b/Wonky.Client/Pages/ActivityCreate.razor @@ -47,8 +47,7 @@
- + @@ -57,8 +56,7 @@
- + @@ -324,36 +322,31 @@
- +
- +
- +
- +
- +
diff --git a/Wonky.Client/Pages/ActivityCreate.razor.cs b/Wonky.Client/Pages/ActivityCreate.razor.cs index c122440c..efd178ec 100644 --- a/Wonky.Client/Pages/ActivityCreate.razor.cs +++ b/Wonky.Client/Pages/ActivityCreate.razor.cs @@ -32,6 +32,7 @@ namespace Wonky.Client.Pages; public partial class ActivityCreate : IDisposable { + // todo: prevent creating activity for workDate with closed report [Inject] public ILogger _logger { get; set; } [Inject] public IToastService ToastService { get; set; } [Inject] public NavigationManager NavigationManager { get; set; } diff --git a/Wonky.Client/Pages/CompanyEdit.razor b/Wonky.Client/Pages/CompanyEdit.razor index bf2069e2..d742b5da 100644 --- a/Wonky.Client/Pages/CompanyEdit.razor +++ b/Wonky.Client/Pages/CompanyEdit.razor @@ -197,7 +197,7 @@
- Til Oversigt + Til Oversigt
Tilbage diff --git a/Wonky.Client/Pages/ReportCreate.razor b/Wonky.Client/Pages/ReportCreate.razor index 8988fc2c..dbaf318d 100644 --- a/Wonky.Client/Pages/ReportCreate.razor +++ b/Wonky.Client/Pages/ReportCreate.razor @@ -67,12 +67,10 @@ @if (_report.DayTypeEnum.ToLower().Contains("leave")) { - + - + } else diff --git a/Wonky.Client/Pages/ReportCreate.razor.cs b/Wonky.Client/Pages/ReportCreate.razor.cs index 285e228f..e2f9bbf4 100644 --- a/Wonky.Client/Pages/ReportCreate.razor.cs +++ b/Wonky.Client/Pages/ReportCreate.razor.cs @@ -47,8 +47,8 @@ public partial class ReportCreate private DateTime _workDate { get; set; } = DateTime.Now; private TimeOnly _timestampIn { get; set; } = new(12, 0); private TimeOnly _timestampOut { get; set; } = new(12, 0); - private DateOnly _leaveBegin { get; set; } = DateOnly.FromDateTime(DateTime.Now); - private DateOnly _leaveEnd { get; set; } = DateOnly.FromDateTime(DateTime.Now); + private DateTime _leaveBegin { get; set; } = DateTime.Now; + private DateTime _leaveEnd { get; set; } = DateTime.Now; protected override async Task OnInitializedAsync() { @@ -61,7 +61,8 @@ public partial class ReportCreate _prefs = await UserPrefs.GetPreferences(); if (!string.IsNullOrWhiteSpace(_prefs.WorkDate)) _workDate = DateTime.Parse(_prefs.WorkDate); - _leaveBegin = DateOnly.FromDateTime(_workDate); + _leaveBegin = _workDate; + _leaveEnd = _workDate; _report.FromDateTime = $"{_workDate:yyyy-MM-dd 12:00}"; _report.ToDateTime = $"{_workDate:yyyy-MM-dd 12:00}"; @@ -112,14 +113,13 @@ public partial class ReportCreate _fetching = true; var result = await ReportRepo.PostReport($"{_workDate:yyyy-MM-dd}", _report); + if (result.IsSuccess) + { + _toast.ShowInfo($"Rapport oprettet {_workDate}"); + } _fetching = false; Navigator.NavigateTo("/home"); } - - private void OnLeaveChanged() - { - - } private void OnTimeChanged() { diff --git a/Wonky.Client/wwwroot/appsettings.json b/Wonky.Client/wwwroot/appsettings.json index e967dc7b..5da38a46 100644 --- a/Wonky.Client/wwwroot/appsettings.json +++ b/Wonky.Client/wwwroot/appsettings.json @@ -18,12 +18,12 @@ }, "appInfo": { "name": "Wonky Client", - "version": "0.8.1", + "version": "0.8.4", "isBeta": true, "image": "grumpy-coder.png" }, "apiConfig": { - "baseAddress": "https://dev.innotec.dk", + "baseAddress": "https://staging.innotec.dk", "tokenPath": "token", "userInfo": "api/auth/userinfo", "customerEndpoint": "api/v2/crm/companies",