diff --git a/src/TaxBaik.Application/Seasonal/BusinessDayCalculator.cs b/src/TaxBaik.Application/Seasonal/BusinessDayCalculator.cs index b5b47d3..f48fdf6 100644 --- a/src/TaxBaik.Application/Seasonal/BusinessDayCalculator.cs +++ b/src/TaxBaik.Application/Seasonal/BusinessDayCalculator.cs @@ -68,6 +68,14 @@ public static class BusinessDayCalculator return effectiveDate.DayNumber - referenceDate.DayNumber; } + public static DateOnly GetEffectiveDueDate(DateOnly date) => GetEffectiveBusinessDate(date); + + public static int GetDday(DateOnly dueDate) + { + var today = DateOnly.FromDateTime(DateTime.Now); + return dueDate.DayNumber - today.DayNumber; + } + private static bool IsBusinessDay(DateOnly date) => date.DayOfWeek is not DayOfWeek.Saturday and not DayOfWeek.Sunday && !HolidayDates.Contains(date); diff --git a/src/TaxBaik.Web/Components/Admin/ConfirmDialog.razor b/src/TaxBaik.Web/Components/Admin/ConfirmDialog.razor deleted file mode 100644 index 876557d..0000000 --- a/src/TaxBaik.Web/Components/Admin/ConfirmDialog.razor +++ /dev/null @@ -1,18 +0,0 @@ -@using MudBlazor - - - - 정말로 삭제하시겠습니까? - - - 취소 - 삭제 - - - -@code { - [CascadingParameter] MudDialogInstance? MudDialog { get; set; } - - void Cancel() => MudDialog?.Cancel(); - void Confirm() => MudDialog?.Close(DialogResult.Ok(true)); -} diff --git a/src/TaxBaik.Web/Components/Admin/Forms/CompanyForm.razor b/src/TaxBaik.Web/Components/Admin/Forms/CompanyForm.razor index 54d653d..45b962d 100644 --- a/src/TaxBaik.Web/Components/Admin/Forms/CompanyForm.razor +++ b/src/TaxBaik.Web/Components/Admin/Forms/CompanyForm.razor @@ -1,23 +1,23 @@ @using TaxBaik.Application.Services - - - - - - diff --git a/src/TaxBaik.Web/Components/Admin/Forms/InquiryForm.razor b/src/TaxBaik.Web/Components/Admin/Forms/InquiryForm.razor index 593c4c3..0c51395 100644 --- a/src/TaxBaik.Web/Components/Admin/Forms/InquiryForm.razor +++ b/src/TaxBaik.Web/Components/Admin/Forms/InquiryForm.razor @@ -4,25 +4,25 @@ - - - - + - - + - diff --git a/src/TaxBaik.Web/Components/Admin/Pages/Announcements/AnnouncementEdit.razor b/src/TaxBaik.Web/Components/Admin/Pages/Announcements/AnnouncementEdit.razor index 4b03b2e..c257e17 100644 --- a/src/TaxBaik.Web/Components/Admin/Pages/Announcements/AnnouncementEdit.razor +++ b/src/TaxBaik.Web/Components/Admin/Pages/Announcements/AnnouncementEdit.razor @@ -22,7 +22,7 @@ - - - - diff --git a/src/TaxBaik.Web/Components/Admin/Pages/Announcements/AnnouncementList.razor b/src/TaxBaik.Web/Components/Admin/Pages/Announcements/AnnouncementList.razor index b68a24d..fbc2a32 100644 --- a/src/TaxBaik.Web/Components/Admin/Pages/Announcements/AnnouncementList.razor +++ b/src/TaxBaik.Web/Components/Admin/Pages/Announcements/AnnouncementList.razor @@ -24,7 +24,7 @@
-
diff --git a/src/TaxBaik.Web/Components/Admin/Pages/Blog/BlogForm.razor b/src/TaxBaik.Web/Components/Admin/Pages/Blog/BlogForm.razor index 920cfd2..339c303 100644 --- a/src/TaxBaik.Web/Components/Admin/Pages/Blog/BlogForm.razor +++ b/src/TaxBaik.Web/Components/Admin/Pages/Blog/BlogForm.razor @@ -3,10 +3,10 @@ - - 분류 없음 @foreach (var category in Categories) @@ -19,17 +19,17 @@ - - - - diff --git a/src/TaxBaik.Web/Components/Admin/Pages/Blog/BlogList.razor b/src/TaxBaik.Web/Components/Admin/Pages/Blog/BlogList.razor index 2a00925..60b3d6a 100644 --- a/src/TaxBaik.Web/Components/Admin/Pages/Blog/BlogList.razor +++ b/src/TaxBaik.Web/Components/Admin/Pages/Blog/BlogList.razor @@ -22,7 +22,7 @@
-
diff --git a/src/TaxBaik.Web/Components/Admin/Pages/Clients/ClientDetail.razor b/src/TaxBaik.Web/Components/Admin/Pages/Clients/ClientDetail.razor index 9b60205..efa26ad 100644 --- a/src/TaxBaik.Web/Components/Admin/Pages/Clients/ClientDetail.razor +++ b/src/TaxBaik.Web/Components/Admin/Pages/Clients/ClientDetail.razor @@ -105,14 +105,14 @@
- + - - + - @foreach (var r in results) { @@ -121,7 +121,7 @@ -
diff --git a/src/TaxBaik.Web/Components/Admin/Pages/Clients/ClientEdit.razor b/src/TaxBaik.Web/Components/Admin/Pages/Clients/ClientEdit.razor index 373992d..7f9d026 100644 --- a/src/TaxBaik.Web/Components/Admin/Pages/Clients/ClientEdit.razor +++ b/src/TaxBaik.Web/Components/Admin/Pages/Clients/ClientEdit.razor @@ -35,18 +35,18 @@ - - + - - + @* 세무 정보 *@ @@ -55,10 +55,10 @@ - + - + @* 관리 정보 *@ @@ -67,13 +67,13 @@ - + - + - diff --git a/src/TaxBaik.Web/Components/Admin/Pages/Clients/ClientList.razor b/src/TaxBaik.Web/Components/Admin/Pages/Clients/ClientList.razor index 039554d..0d2065b 100644 --- a/src/TaxBaik.Web/Components/Admin/Pages/Clients/ClientList.razor +++ b/src/TaxBaik.Web/Components/Admin/Pages/Clients/ClientList.razor @@ -24,12 +24,12 @@ - - + 검색 diff --git a/src/TaxBaik.Web/Components/Admin/Pages/ConsultingActivities.razor b/src/TaxBaik.Web/Components/Admin/Pages/ConsultingActivities.razor index 8931246..30be7b4 100644 --- a/src/TaxBaik.Web/Components/Admin/Pages/ConsultingActivities.razor +++ b/src/TaxBaik.Web/Components/Admin/Pages/ConsultingActivities.razor @@ -98,15 +98,15 @@ - + @foreach (var client in clients) { @GetClientDisplayName(client) } - + - + diff --git a/src/TaxBaik.Web/Components/Admin/Pages/Contracts.razor b/src/TaxBaik.Web/Components/Admin/Pages/Contracts.razor index 1c2a6bc..0f74494 100644 --- a/src/TaxBaik.Web/Components/Admin/Pages/Contracts.razor +++ b/src/TaxBaik.Web/Components/Admin/Pages/Contracts.razor @@ -117,16 +117,16 @@ else } - + @foreach (var client in clients) { @GetClientDisplayName(client) } - - + + - +
@if (isEditMode) diff --git a/src/TaxBaik.Web/Components/Admin/Pages/Faqs/FaqEdit.razor b/src/TaxBaik.Web/Components/Admin/Pages/Faqs/FaqEdit.razor index fbf8a92..9979a08 100644 --- a/src/TaxBaik.Web/Components/Admin/Pages/Faqs/FaqEdit.razor +++ b/src/TaxBaik.Web/Components/Admin/Pages/Faqs/FaqEdit.razor @@ -24,7 +24,7 @@ - - - + - - diff --git a/src/TaxBaik.Web/Components/Admin/Pages/Faqs/FaqList.razor b/src/TaxBaik.Web/Components/Admin/Pages/Faqs/FaqList.razor index 103ca97..45cb08f 100644 --- a/src/TaxBaik.Web/Components/Admin/Pages/Faqs/FaqList.razor +++ b/src/TaxBaik.Web/Components/Admin/Pages/Faqs/FaqList.razor @@ -24,7 +24,7 @@
-
diff --git a/src/TaxBaik.Web/Components/Admin/Pages/Inquiries/InquiryDetail.razor b/src/TaxBaik.Web/Components/Admin/Pages/Inquiries/InquiryDetail.razor index ffdc1f7..62e7611 100644 --- a/src/TaxBaik.Web/Components/Admin/Pages/Inquiries/InquiryDetail.razor +++ b/src/TaxBaik.Web/Components/Admin/Pages/Inquiries/InquiryDetail.razor @@ -60,7 +60,7 @@ - 메모 저장 diff --git a/src/TaxBaik.Web/Components/Admin/Pages/RevenueTrackings.razor b/src/TaxBaik.Web/Components/Admin/Pages/RevenueTrackings.razor index 776588f..cfd33f1 100644 --- a/src/TaxBaik.Web/Components/Admin/Pages/RevenueTrackings.razor +++ b/src/TaxBaik.Web/Components/Admin/Pages/RevenueTrackings.razor @@ -94,16 +94,16 @@ - + @foreach (var client in clients) { @GetClientDisplayName(client) } - + - - + + diff --git a/src/TaxBaik.Web/Components/Admin/Pages/Settings/SiteSettings.razor b/src/TaxBaik.Web/Components/Admin/Pages/Settings/SiteSettings.razor index e443d7e..cb35ea2 100644 --- a/src/TaxBaik.Web/Components/Admin/Pages/Settings/SiteSettings.razor +++ b/src/TaxBaik.Web/Components/Admin/Pages/Settings/SiteSettings.razor @@ -30,16 +30,16 @@
- - - - - - - @GetClientDisplayName(client) } - + - +
@if (isEditMode && selectedSchedule?.Status != "completed") diff --git a/src/TaxBaik.Web/Components/Admin/Pages/TaxFilings/TaxFilingList.razor b/src/TaxBaik.Web/Components/Admin/Pages/TaxFilings/TaxFilingList.razor index 3ed1039..a0b8be8 100644 --- a/src/TaxBaik.Web/Components/Admin/Pages/TaxFilings/TaxFilingList.razor +++ b/src/TaxBaik.Web/Components/Admin/Pages/TaxFilings/TaxFilingList.razor @@ -29,20 +29,20 @@ 새 신고 일정 - - + - + diff --git a/src/TaxBaik.Web/Components/Admin/Pages/TaxProfiles.razor b/src/TaxBaik.Web/Components/Admin/Pages/TaxProfiles.razor index 0595325..8874286 100644 --- a/src/TaxBaik.Web/Components/Admin/Pages/TaxProfiles.razor +++ b/src/TaxBaik.Web/Components/Admin/Pages/TaxProfiles.razor @@ -95,16 +95,16 @@ else }
- + @foreach (var client in clients) { @GetClientDisplayName(client) } - - + + - +
@if (isEditMode) diff --git a/src/TaxBaik.Web/Components/Admin/Shared/CommonCodeListPanel.razor b/src/TaxBaik.Web/Components/Admin/Shared/CommonCodeListPanel.razor index ca302c7..83c75e9 100644 --- a/src/TaxBaik.Web/Components/Admin/Shared/CommonCodeListPanel.razor +++ b/src/TaxBaik.Web/Components/Admin/Shared/CommonCodeListPanel.razor @@ -27,10 +27,10 @@ - - - - + + + + 활성
저장 diff --git a/src/TaxBaik.Web/Components/Admin/_Imports.razor b/src/TaxBaik.Web/Components/Admin/_Imports.razor index c43ac24..38fe72a 100644 --- a/src/TaxBaik.Web/Components/Admin/_Imports.razor +++ b/src/TaxBaik.Web/Components/Admin/_Imports.razor @@ -9,9 +9,12 @@ @using Microsoft.AspNetCore.Components.WebAssembly.Http @using Microsoft.JSInterop @using MudBlazor +@using TaxBaik.Application.Services +@using TaxBaik.Application.Seasonal @using TaxBaik.Web.Components.Admin @using TaxBaik.Web.Components.Admin.Services @using TaxBaik.Web.Components.Admin.Services.AdminClients +@using TaxBaik.Web.Components.Admin.Shared @using TaxBaik.Application.DTOs @using TaxBaik.Domain.Entities @using static Microsoft.AspNetCore.Components.Web.RenderMode