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

MoK:

Browse Source 
"nicht bewilligt" und "Betreuung beendet am ..." hinzugefügt

NHibernateDLLCopier.bat hinzugefügt, um die NHibernate DLLs nach Host\bin und BeWoPlanerMobil\bin zu kopieren
This commit is contained in:
LynJet
2022-04-28 20:03:43 +02:00
parent 271a61b1e1
commit 8bb8f69ca1
3 changed files with 42 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
BeWoPlanerMobil/Models/MainModel.cs
View File

@@ -236,7 +236,7 @@ namespace BeWoPlanerMobil.Models
allCostBearerRelations.AddRange(sc.CostBearerRelations.Where(w => ShowExpiredSupportConcepts || w.EndDate == null || w.EndDate.Value >= DateTime.Now.Date).Select(
cb => new SupportConceptListObject(
$"{sc.Customer.LastNameFirstName} {(sc.Customer.DateOfBirth.HasValue ? "*" + sc.Customer.DateOfBirth.Value.ToString("dd.MM.yyyy") : string.Empty)}",
$"{cb.StartDate?.ToShortDateString().Remove(6, 2) ?? string.Empty}-{cb.EndDate?.ToShortDateString().Remove(6, 2) ?? string.Empty} {cb.CostBearer.Name}",
$"{cb.StartDate?.ToShortDateString().Remove(6, 2) ?? string.Empty}-{cb.EndDate?.ToShortDateString().Remove(6, 2) ?? string.Empty} {cb.CostBearer.Name}{GetIsNotApproved(cb)}",
cb.CostBearer2SupportConceptOid.ToString(),
cb.SupportConcept.IsAboutToExpire,
cb.SupportConcept.ExpiresIn3MonthOrLess))
@@ -246,6 +246,32 @@ namespace BeWoPlanerMobil.Models
}
}
private static string GetIsNotApproved(SupportConceptCostBearerRelDC rel)
{
var result = string.Empty;
var customer = rel.SupportConcept.Customer;
if(customer.TerminationDate.HasValue)
{
var terminationReason = string.Empty;
if(!string.IsNullOrEmpty(customer.TerminationReason))
{
terminationReason += $", Begründung: {customer.TerminationReason}";
}
result += $" (Betreuung beendet am: {customer.TerminationDate:dd.MM.yyyy}{terminationReason})";
}
if(rel.ApprovedStartDate is null || rel.ApprovedEndDate is null)
{
result += " nicht bewilligt!";
}
return result;
}
public SupportConceptListObject SelectedSupportConceptListObject { get; set; }
public List<SupportConceptCostBearerRelDC> SelectedConceptCostBearerRelations { get; set; }

6
Model/Changes_2022_03_18_Wohnheim.txt
View File

@@ -1,9 +1,9 @@
ALTER TABLE `bewodemo`.`wohnheim`
ALTER TABLE `wohnheim`
ADD COLUMN `PflichtbesetzungStart` VARCHAR(45) NULL DEFAULT NULL AFTER `Bemerkung`,
ADD COLUMN `PflichtbesetzungEnde` VARCHAR(45) NULL DEFAULT NULL AFTER `PflichtbesetzungStart`;
ALTER TABLE `bewodemo`.`wohnheim`
ALTER TABLE `wohnheim`
ADD COLUMN `PflichtbesetzungEinblenden` INT NULL DEFAULT NULL AFTER `PflichtbesetzungEnde`;
ALTER TABLE `bewodemo`.`wohnheim`
ALTER TABLE `wohnheim`
ADD COLUMN `StandardZeilenanzahl` INT NULL DEFAULT NULL AFTER `PflichtbesetzungEinblenden`;

12
NHibernateDLLCopier.bat Normal file
View File

@@ -0,0 +1,12 @@
@echo off
copy Lib\NHibernate.ByteCode.Castle.dll Host\bin\
copy Lib\NHibernate.dll Host\bin\
copy Lib\Castle.Core.dll Host\bin\
copy Lib\Castle.DynamicProxy.dll Host\bin\
copy Lib\Castle.DynamicProxy2.dll Host\bin\
copy Lib\NHibernate.ByteCode.Castle.dll BeWoPlanerMobil\bin\
copy Lib\NHibernate.dll BeWoPlanerMobil\bin\
copy Lib\Castle.Core.dll BeWoPlanerMobil\bin\
copy Lib\Castle.DynamicProxy.dll BeWoPlanerMobil\bin\
copy Lib\Castle.DynamicProxy2.dll BeWoPlanerMobil\bin\