ownSoft/BeWoPlaner
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Mobilklient:

Browse Source 
Statistik bei Hilfeplänen mit Kostenträger ohne Bewilligung wird angezeigt. Hatte Exception beim Span-String erstellen ausgelöst.
This commit is contained in:
Lyndon Jetten
2021-04-29 15:11:56 +02:00
parent 6dee96419b
commit f7b67598aa
3 changed files with 31 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BeWoPlanerMobil/BeWoPlanerMobil.csproj.user
View File

@@ -8,7 +8,7 @@
<IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode />
<UseGlobalApplicationHostFile />
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<ProjectView>ShowAllFiles</ProjectView>
<WebStackScaffolding_ViewDialogWidth>600</WebStackScaffolding_ViewDialogWidth>
<Controller_SelectedScaffolderID>MvcControllerEmptyScaffolder</Controller_SelectedScaffolderID>

13
BeWoPlanerMobil/Controllers/MainController.cs
View File

@@ -514,7 +514,7 @@ namespace BeWoPlanerMobil.Controllers
var statisticPeriod = new StatisticPeriod();
if(supportConceptStatistics.PeriodStatistics.Count > 1)
if(supportConceptStatistics.PeriodStatistics.Count == 0)
{
statisticPeriod.Header2Values.AddIfNotIn(new Header2Values("Bewilligungszeitraum:", "Gesamt"));
statisticPeriod.Header2Values.AddIfNotIn(new Header2Values("Geleistet diese Woche/gesamt:", $"{provided:0.00}/{providedTotal:0.00}"));
@@ -534,7 +534,16 @@ namespace BeWoPlanerMobil.Controllers
approvedTotal = periodStatistics.MinutesApprovedTotal / 60;
freePerWeekTotal = (approvedTotal - providedTotal);
var span = periodStatistics.SupportConceptApprovalPeriod.Span.ToDateString();
var supportConceptApprovalPeriodSpan = periodStatistics.SupportConceptApprovalPeriod.Span;
var minVal = DateTime.Now.AddYears(-100);
var maxVal = DateTime.Now.AddYears(100);
var sd = supportConceptApprovalPeriodSpan.StartDate;
var ed = supportConceptApprovalPeriodSpan.EndDate;
var hasValidDates = sd > minVal && sd < maxVal;
var span = hasValidDates ? $"{sd:dd.MM.yy} - {ed:dd.MM.yy}" : "-";
var serviceCategoryName = periodStatistics.SupportConceptApprovalPeriod.ServiceCategory != null ? periodStatistics.SupportConceptApprovalPeriod.ServiceCategory.Name + ":" : "Bewilligungszeitraum:";
statisticPeriod = new StatisticPeriod();

19
Data/Access/SearchDAO.cs
View File

@@ -4405,5 +4405,24 @@ namespace BeWo.Data.Access
var q = Session.CreateSQLQuery("SELECT customeroid FROM customer2person where istfamilie = 1");
return q.List<long>();
}
public List<SchedulerAppointment> FindActiveAppointmentsForCustomers(List<long> customerOids, DateTime startDate, DateTime endDate)
{
var customerOidSqlString = string.Empty;
customerOids.DoForEach(oid => customerOidSqlString += $"{oid},");
customerOidSqlString = customerOidSqlString.Trim(',');
var sqlQuery = $" {nameof(BeWoEntityBase.Oid)} IN (SELECT newschappoid FROM customer2newschapp WHERE customeroid IN ({customerOidSqlString})) ";
var customerCriterion = Expression.Sql(sqlQuery);
var between = CreateBetweenDateTimesCriterion(startDate, endDate, nameof(SchedulerAppointment.StartDate), nameof(SchedulerAppointment.EndDate));
var criteria = CreateCriteriaIsActive<SchedulerAppointment>()
.Add(customerCriterion)
.Add(between)
.Add(Restrictions.Eq(nameof(SchedulerAppointment.IsTask), false));
return criteria.List<SchedulerAppointment>().ToList();
}
}
}