Browse Source

Remove WidgetFilter and duplicate StartDate and EndDate

https://github.com/abpframework/abp/pull/1523#discussion_r306741007
pull/1529/head
Yunus Emre Kalkan 7 years ago
parent
commit
0cd1f8aa6b
  1. 5
      samples/DashboardDemo/src/DashboardDemo.Application.Contracts/CountersWidgetInputDto.cs
  2. 2
      samples/DashboardDemo/src/DashboardDemo.Application.Contracts/IDashboardAppService.cs
  3. 9
      samples/DashboardDemo/src/DashboardDemo.Application.Contracts/LicenseStatisticWidgetInputDto.cs
  4. 6
      samples/DashboardDemo/src/DashboardDemo.Application.Contracts/NewUserStatisticWidgetInputDto.cs
  5. 2
      samples/DashboardDemo/src/DashboardDemo.Application.Contracts/NewUserStatisticWidgetResultDto.cs
  6. 10
      samples/DashboardDemo/src/DashboardDemo.Application.Contracts/WidgetFilter.cs
  7. 10
      samples/DashboardDemo/src/DashboardDemo.Application/DashboardAppService.cs

5
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; }
}
}

2
samples/DashboardDemo/src/DashboardDemo.Application.Contracts/IDashboardAppService.cs

@ -7,7 +7,7 @@ namespace DashboardDemo
{
Task<CountersWidgetResultDto> GetCountersWidgetAsync(CountersWidgetInputDto input);
Task<NewUserStatistiWidgetResultDto> GetNewUserStatisticWidgetAsync(NewUserStatisticWidgetInputDto input);
Task<NewUserStatisticWidgetResultDto> GetNewUserStatisticWidgetAsync(NewUserStatisticWidgetInputDto input);
Task<LicenseStatistiWidgetResultDto> GetLicenseStatisticWidgetAsync(LicenseStatisticWidgetInputDto input);
}

9
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; }
}
}

6
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;
}
}

2
samples/DashboardDemo/src/DashboardDemo.Application.Contracts/NewUserStatistiWidgetResultDto.cs → samples/DashboardDemo/src/DashboardDemo.Application.Contracts/NewUserStatisticWidgetResultDto.cs

@ -2,7 +2,7 @@
namespace DashboardDemo
{
public class NewUserStatistiWidgetResultDto
public class NewUserStatisticWidgetResultDto
{
public Dictionary<string, int> Data { get; set; }
}

10
samples/DashboardDemo/src/DashboardDemo.Application.Contracts/WidgetFilter.cs

@ -1,10 +0,0 @@
using System;
namespace DashboardDemo
{
public class WidgetFilter
{
public DateTime StartDate { get; set; }
public DateTime EndDate { get; set; }
}
}

10
samples/DashboardDemo/src/DashboardDemo.Application/DashboardAppService.cs

@ -23,7 +23,7 @@ namespace DashboardDemo
};
}
public async Task<NewUserStatistiWidgetResultDto> GetNewUserStatisticWidgetAsync(NewUserStatisticWidgetInputDto input)
public async Task<NewUserStatisticWidgetResultDto> GetNewUserStatisticWidgetAsync(NewUserStatisticWidgetInputDto input)
{
switch (input.Frequency)
{
@ -50,7 +50,7 @@ namespace DashboardDemo
return new LicenseStatistiWidgetResultDto(){Data = data};
}
private async Task<NewUserStatistiWidgetResultDto> GetMonthlyNewUserStatisticWidgetAsync(NewUserStatisticWidgetInputDto input)
private async Task<NewUserStatisticWidgetResultDto> 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<NewUserStatistiWidgetResultDto> GetDailyNewUserStatisticWidgetAsync(NewUserStatisticWidgetInputDto input)
private async Task<NewUserStatisticWidgetResultDto> 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
};

Loading…
Cancel
Save