diff --git a/samples/DashboardDemo/src/DashboardDemo.Application.Contracts/CountersWidgetInputDto.cs b/samples/DashboardDemo/src/DashboardDemo.Application.Contracts/CountersWidgetInputDto.cs index d7c6dfc53c..8296a58556 100644 --- a/samples/DashboardDemo/src/DashboardDemo.Application.Contracts/CountersWidgetInputDto.cs +++ b/samples/DashboardDemo/src/DashboardDemo.Application.Contracts/CountersWidgetInputDto.cs @@ -2,7 +2,10 @@ namespace DashboardDemo { - public class CountersWidgetInputDto : WidgetFilter + public class CountersWidgetInputDto { + public DateTime StartDate { get; set; } + + public DateTime EndDate { get; set; } } } \ No newline at end of file diff --git a/samples/DashboardDemo/src/DashboardDemo.Application.Contracts/IDashboardAppService.cs b/samples/DashboardDemo/src/DashboardDemo.Application.Contracts/IDashboardAppService.cs index 4cbf32a1d4..c77bacfcfd 100644 --- a/samples/DashboardDemo/src/DashboardDemo.Application.Contracts/IDashboardAppService.cs +++ b/samples/DashboardDemo/src/DashboardDemo.Application.Contracts/IDashboardAppService.cs @@ -7,7 +7,7 @@ namespace DashboardDemo { Task GetCountersWidgetAsync(CountersWidgetInputDto input); - Task GetNewUserStatisticWidgetAsync(NewUserStatisticWidgetInputDto input); + Task GetNewUserStatisticWidgetAsync(NewUserStatisticWidgetInputDto input); Task GetLicenseStatisticWidgetAsync(LicenseStatisticWidgetInputDto input); } diff --git a/samples/DashboardDemo/src/DashboardDemo.Application.Contracts/LicenseStatisticWidgetInputDto.cs b/samples/DashboardDemo/src/DashboardDemo.Application.Contracts/LicenseStatisticWidgetInputDto.cs index 96903da718..036405d6b0 100644 --- a/samples/DashboardDemo/src/DashboardDemo.Application.Contracts/LicenseStatisticWidgetInputDto.cs +++ b/samples/DashboardDemo/src/DashboardDemo.Application.Contracts/LicenseStatisticWidgetInputDto.cs @@ -1,6 +1,11 @@ -namespace DashboardDemo +using System; + +namespace DashboardDemo { - public class LicenseStatisticWidgetInputDto : WidgetFilter + public class LicenseStatisticWidgetInputDto { + public DateTime StartDate { get; set; } + + public DateTime EndDate { get; set; } } } \ No newline at end of file diff --git a/samples/DashboardDemo/src/DashboardDemo.Application.Contracts/NewUserStatisticWidgetInputDto.cs b/samples/DashboardDemo/src/DashboardDemo.Application.Contracts/NewUserStatisticWidgetInputDto.cs index fda641cd11..3c17a4ece6 100644 --- a/samples/DashboardDemo/src/DashboardDemo.Application.Contracts/NewUserStatisticWidgetInputDto.cs +++ b/samples/DashboardDemo/src/DashboardDemo.Application.Contracts/NewUserStatisticWidgetInputDto.cs @@ -2,8 +2,12 @@ namespace DashboardDemo { - public class NewUserStatisticWidgetInputDto : WidgetFilter + public class NewUserStatisticWidgetInputDto { + public DateTime StartDate { get; set; } + + public DateTime EndDate { get; set; } + public NewUserStatisticFrequency Frequency { get; set; } = NewUserStatisticFrequency.Daily; } } \ No newline at end of file diff --git a/samples/DashboardDemo/src/DashboardDemo.Application.Contracts/NewUserStatistiWidgetResultDto.cs b/samples/DashboardDemo/src/DashboardDemo.Application.Contracts/NewUserStatisticWidgetResultDto.cs similarity index 72% rename from samples/DashboardDemo/src/DashboardDemo.Application.Contracts/NewUserStatistiWidgetResultDto.cs rename to samples/DashboardDemo/src/DashboardDemo.Application.Contracts/NewUserStatisticWidgetResultDto.cs index cb409a2be4..12510d2827 100644 --- a/samples/DashboardDemo/src/DashboardDemo.Application.Contracts/NewUserStatistiWidgetResultDto.cs +++ b/samples/DashboardDemo/src/DashboardDemo.Application.Contracts/NewUserStatisticWidgetResultDto.cs @@ -2,7 +2,7 @@ namespace DashboardDemo { - public class NewUserStatistiWidgetResultDto + public class NewUserStatisticWidgetResultDto { public Dictionary Data { get; set; } } diff --git a/samples/DashboardDemo/src/DashboardDemo.Application.Contracts/WidgetFilter.cs b/samples/DashboardDemo/src/DashboardDemo.Application.Contracts/WidgetFilter.cs deleted file mode 100644 index 203b100573..0000000000 --- a/samples/DashboardDemo/src/DashboardDemo.Application.Contracts/WidgetFilter.cs +++ /dev/null @@ -1,10 +0,0 @@ -using System; -namespace DashboardDemo -{ - public class WidgetFilter - { - public DateTime StartDate { get; set; } - - public DateTime EndDate { get; set; } - } -} diff --git a/samples/DashboardDemo/src/DashboardDemo.Application/DashboardAppService.cs b/samples/DashboardDemo/src/DashboardDemo.Application/DashboardAppService.cs index fa2c0202fa..d97bd55321 100644 --- a/samples/DashboardDemo/src/DashboardDemo.Application/DashboardAppService.cs +++ b/samples/DashboardDemo/src/DashboardDemo.Application/DashboardAppService.cs @@ -23,7 +23,7 @@ namespace DashboardDemo }; } - public async Task GetNewUserStatisticWidgetAsync(NewUserStatisticWidgetInputDto input) + public async Task GetNewUserStatisticWidgetAsync(NewUserStatisticWidgetInputDto input) { switch (input.Frequency) { @@ -50,7 +50,7 @@ namespace DashboardDemo return new LicenseStatistiWidgetResultDto(){Data = data}; } - private async Task GetMonthlyNewUserStatisticWidgetAsync(NewUserStatisticWidgetInputDto input) + private async Task GetMonthlyNewUserStatisticWidgetAsync(NewUserStatisticWidgetInputDto input) { DateTime endDate = input.EndDate; DateTime startDate = input.StartDate; @@ -74,13 +74,13 @@ namespace DashboardDemo data.Add(labels[i], new Random().Next(1500, 3000)); } - return new NewUserStatistiWidgetResultDto() + return new NewUserStatisticWidgetResultDto() { Data = data }; } - private async Task GetDailyNewUserStatisticWidgetAsync(NewUserStatisticWidgetInputDto input) + private async Task GetDailyNewUserStatisticWidgetAsync(NewUserStatisticWidgetInputDto input) { var dayCount = (input.EndDate - input.StartDate).Days + 1; @@ -98,7 +98,7 @@ namespace DashboardDemo data.Add(labels[i], new Random().Next(50, 100)); } - return new NewUserStatistiWidgetResultDto() + return new NewUserStatisticWidgetResultDto() { Data = data };