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

Merge branch 'master' of ssh://float.ownsoft.de/git/beyondSoft/BeWo

Browse Source
This commit is contained in:
Alexandra
2024-09-24 13:36:56 +02:00
parent 590bd4b971 896761ac1b
commit dd68827f71
22 changed files with 356 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BeWo/BeWo.csproj.user
View File

@@ -9,7 +9,7 @@
<ErrorReportUrlHistory />
<FallbackCulture>de-DE</FallbackCulture>
<VerifyUploadedFiles>false</VerifyUploadedFiles>
<ProjectView>ProjectFiles</ProjectView>
<ProjectView>ShowAllFiles</ProjectView>
</PropertyGroup>
<PropertyGroup>
<EnableSecurityDebugging>false</EnableSecurityDebugging>

7
BeWo/BeWoApp.xaml.cs
View File

@@ -1021,7 +1021,12 @@ namespace BeWo
showStackTrace = true;
showSupportForm = false;
}
//else if (stacktrace.IndexOf("GenericADOException") >= 0 && stacktrace.IndexOf("could not insert") >= 0 && stacktrace.IndexOf("Data too long for column") >= 0)
//{
// displayMessage = "Eine Eingabe enthält zu viele Zeichen.";
// showStackTrace = true;
// showSupportForm = false;
//}
BeWoApp.ShowError(displayMessage, e, showSupportForm, showStackTrace);
}

12
BeWo/DebugConfig.cs
View File

@@ -10,7 +10,8 @@ namespace BeWo
{
SimpleAutoLogin,
FeatureCustomerWohnhilfe,
FeatureWohnheimWohneinheit
FeatureWohnheimWohneinheit,
FeatureAuswertungenQuittierungsbelege
}
public class DebugConfig
@@ -22,7 +23,7 @@ namespace BeWo
{
#if DEBUG
return _CurrentConfig ?? (_CurrentConfig = FeatureWohnheimWohneinheit);
return _CurrentConfig ?? (_CurrentConfig = SimpleAutoLogin);
#endif
@@ -55,5 +56,12 @@ namespace BeWo
AutoLogin = true,
SelectView = UIContext.Wohnheim
};
public static DebugConfig FeatureAuswertungenQuittierungsbelege => new DebugConfig()
{
DebugConfigMode = DebugConfigMode.FeatureAuswertungenQuittierungsbelege,
AutoLogin = true,
SelectView = UIContext.Report
};
}
}

14
BeWo/View/Master/ReportView.xaml.cs
View File

@@ -27,7 +27,7 @@ namespace BeWo.View.Master
{
InitializeComponent();
initRights = true;
//InitRights();
}
public override bool IsDirty => OpenViews.ContainsKey(root.SelectedItem as TabItem) && OpenViews[root.SelectedItem as TabItem].IsDirty;
@@ -753,7 +753,19 @@ namespace BeWo.View.Master
private void ReportView_OnLoaded(object sender, RoutedEventArgs e)
{
#if DEBUG
if (DebugConfig.CurrentConfig is object && DebugConfig.CurrentConfig.DebugConfigMode == DebugConfigMode.FeatureAuswertungenQuittierungsbelege)
{
SelectServiceOverviewTabItem();
}
else
{
InitRights();
}
#else
InitRights();
#endif
}
}
}

2
BeWo/View/Navigation/WohnheimNavigationView.xaml.cs
View File

@@ -165,7 +165,7 @@ namespace BeWo.View.Navigation
#if DEBUG
if (DebugConfig.CurrentConfig is object && DebugConfig.CurrentConfig.DebugConfigMode == DebugConfigMode.FeatureWohnheimWohneinheit)
{
wohnheimNavigationView_OpenObject(recentList?.FirstOrDefault() ?? objectList.FirstOrDefault());
wohnheimNavigationView_OpenObject(recentList?.FirstOrDefault() ?? objectList?.FirstOrDefault());
}
#endif
}));

2
Data/Access/SearchDAO.cs
View File

@@ -4382,7 +4382,7 @@ namespace BeWo.Data.Access
return lCriteria.List<SupportConcept>().ToList();
}
var customerOids = user.Employee.Employee2CustomerList.Where(employee2Customer => employee2Customer.Customer.Oid.HasValue).Select(employee2Customer => employee2Customer.Customer.Oid.Value).Distinct().ToList();
var customerOids = user.Employee.Employee2CustomerList.Where(employee2Customer => employee2Customer.Customer.Oid.HasValue && (!employee2Customer.StartDate.HasValue || employee2Customer.StartDate <= DateTime.Now.Date) && (!employee2Customer.EndDate.HasValue || employee2Customer.EndDate >= DateTime.Now.Date)).Select(employee2Customer => employee2Customer.Customer.Oid.Value).Distinct().ToList();
// Wählt man "Nur Klienten meiner Teams anzeigen", sollen nicht die Hilfepläne der eigenen Klienten angezeigt werden.
if (supportConceptFilter == CustomerFilterEnum.TeamCustomer)

2
Host/Host.csproj.user
View File

@@ -3,7 +3,7 @@
<PropertyGroup>
<NameOfLastUsedPublishProfile>BeWo2.0</NameOfLastUsedPublishProfile>
<UseIISExpress>true</UseIISExpress>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<Use64BitIISExpress>false</Use64BitIISExpress>
<IISExpressSSLPort />
<IISExpressAnonymousAuthentication />

5
Model/Changes_alle_fuer_neue_db.txt
View File

@@ -1227,4 +1227,7 @@ ADD CONSTRAINT `FK_IMAGE_WOHNEINHEIT`
ALTER TABLE `image`
ADD COLUMN `Filename` VARCHAR(1024) NULL DEFAULT NULL AFTER `SystemEntryID`,
ADD COLUMN `Fullname` VARCHAR(1024) NULL DEFAULT NULL AFTER `Filename`;
ADD COLUMN `Fullname` VARCHAR(1024) NULL DEFAULT NULL AFTER `Filename`;
ALTER TABLE `organisation`
ADD COLUMN `BusinessPartnerId` VARCHAR(256) NULL DEFAULT NULL AFTER `Leistungserbringergruppe`;

108
ReportImp/AkggMid/LeistungsnachweisHelper.cs
View File

@@ -51,6 +51,59 @@ namespace AkggMid
}
internal DateTimeSpan BerechneSchuljahr(ServicesOverviewRO ro)
{
var span = new DateTimeSpan();
span.StartDate = DateTime.MinValue;
span.EndDate = DateTime.MinValue;
//Berechne Schuljahrstart
var vs = new CustomVacationService();
var ferien = vs.GetFerien(vs.Bundesland);
FerienDC sommerFerienVorjahr = null;
FerienDC sommerFerienAktuellesJahr = null;
FerienDC sommerFerienNaechstesJahr = null;
foreach (var f in ferien)
{
if (f.Name.Contains(String.Format("Sommerferien {0}", ro.StartDate.Year - 1)))
{
sommerFerienVorjahr = f;
}
else if (f.Name.Contains(String.Format("Sommerferien {0}", ro.StartDate.Year)))
{
sommerFerienAktuellesJahr = f;
}
else if (f.Name.Contains(String.Format("Sommerferien {0}", ro.StartDate.Year + 1)))
{
sommerFerienNaechstesJahr = f;
}
}
if (sommerFerienAktuellesJahr != null)
{
if (ro.EndDate <= sommerFerienAktuellesJahr.Ende)
{
span.EndDate = sommerFerienAktuellesJahr.Start.AddDays(-1);
if (sommerFerienVorjahr != null)
{
span.StartDate = sommerFerienVorjahr.Ende.AddDays(1);
}
}
else
{
span.StartDate = sommerFerienAktuellesJahr.Ende.AddDays(1);
if (sommerFerienNaechstesJahr != null)
{
span.EndDate = sommerFerienNaechstesJahr.Start.AddDays(-1);
}
}
}
return span;
}
public List<ServicesOverviewRO.ServiceDetail> ErstelleDummyRecords(ServicesOverviewRO pRO)
{
Dictionary<int, ServicesOverviewRO.ServiceDetail> day2Detail = new Dictionary<int, ServicesOverviewRO.ServiceDetail>();
@@ -504,51 +557,6 @@ where scap2e.EmployeeOid = {0} and scap.Start <= '{1:yyyy-MM-dd}' and scap.EndDa
}
DateTime startSchuljahr = DateTime.MinValue;
DateTime endeSchuljahr = DateTime.MinValue;
//Berechne Schuljahrstart
var vs = new CustomVacationService();
var ferien = vs.GetFerien(vs.Bundesland);
FerienDC sommerFerienVorjahr = null;
FerienDC sommerFerienAktuellesJahr = null;
FerienDC sommerFerienNaechstesJahr = null;
foreach (var f in ferien)
{
if (f.Name.Contains(String.Format("Sommerferien {0}", ro.StartDate.Year - 1)))
{
sommerFerienVorjahr = f;
}
else if (f.Name.Contains(String.Format("Sommerferien {0}", ro.StartDate.Year)))
{
sommerFerienAktuellesJahr = f;
}
else if (f.Name.Contains(String.Format("Sommerferien {0}", ro.StartDate.Year + 1)))
{
sommerFerienNaechstesJahr = f;
}
}
if (sommerFerienAktuellesJahr != null)
{
if (ro.EndDate <= sommerFerienAktuellesJahr.Ende)
{
endeSchuljahr = sommerFerienAktuellesJahr.Start.AddDays(-1);
if (sommerFerienVorjahr != null)
{
startSchuljahr = sommerFerienVorjahr.Ende.AddDays(1);
}
}
else
{
startSchuljahr = sommerFerienAktuellesJahr.Ende.AddDays(1);
if (sommerFerienNaechstesJahr != null)
{
endeSchuljahr = sommerFerienNaechstesJahr.Start.AddDays(-1);
}
}
}
int maxAnzahl = 6;
//Sonderregelung
@@ -575,13 +583,17 @@ where scap2e.EmployeeOid = {0} and scap.Start <= '{1:yyyy-MM-dd}' and scap.EndDa
tandemAbsenceTimes = tc.AbsenceTimes.OrderBy(a => a.Start).ToList();
}
var vs = new CustomVacationService();
var schuljahr = BerechneSchuljahr(ro);
foreach (AbsenceTime at in c.AbsenceTimes.OrderBy(a => a.Start))
{
if (at.AbsenceReason.Description.Contains("<24h") || at.AbsenceReason.Description.Contains(">24h") || at.AbsenceReason.Description.Contains("Abwesenheit nicht abrechenbar") || at.AbsenceReason.Description.StartsWith("S_JA") ||
at.AbsenceReason.Description.StartsWith("SozA") || at.AbsenceReason.Description.StartsWith("S_Abwesenheit nicht abrechenbar") || at.AbsenceReason.Description.StartsWith("JugA"))
{
if (at.Start >= startSchuljahr && at.Start <= endeSchuljahr && (at.End == null || at.End >= startSchuljahr))
if (at.Start >= schuljahr.StartDate && at.Start <= schuljahr.EndDate && (at.End == null || at.End >= schuljahr.StartDate))
{
var maxAnzahlIntern = maxAnzahl;
@@ -595,7 +607,7 @@ where scap2e.EmployeeOid = {0} and scap.Start <= '{1:yyyy-MM-dd}' and scap.EndDa
}
DateTime dtIterator = at.Start.Value;
DateTime end = endeSchuljahr;
DateTime end = schuljahr.EndDate;
if (at.End.HasValue)
{
end = at.End.Value;

13
ReportImp/AkggMid/LeistungsnachweisSozialamt.cs
View File

@@ -25,18 +25,9 @@ namespace AkggMid
{
var helper = new LeistungsnachweisHelper(pRO, true);
String schuljahr = "";
if (pRO.StartDate < new DateTime(2023, 8, 1))
{
schuljahr = String.Format("{0}-{1}", pRO.StartDate.Year - 1, pRO.StartDate.Year);
}
else
{
schuljahr = String.Format("{0}-{1}", pRO.StartDate.Year, pRO.StartDate.Year + 1);
}
lblMonat.Text = String.Format("Monat {0:MMMM} Schuljahr {1}", pRO.StartDate, schuljahr);
var schuljahr = helper.BerechneSchuljahr(pRO);
lblMonat.Text = String.Format("Monat {0:MMMM} - Schuljahr {1:yyyy}-{2:yyyy}", pRO.StartDate, schuljahr.StartDate, schuljahr.EndDate);
pRO.Services = helper.ErstelleDummyRecords(pRO);

49
ReportImp/AkggMid/LeistungsnachweisSozialamt.designer.cs generated
View File

@@ -76,6 +76,8 @@ namespace AkggMid
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.fieldStd = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldTotalStd = new DevExpress.XtraReports.UI.CalculatedField();
this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
@@ -255,7 +257,8 @@ namespace AkggMid
this.xrLabel4.StylePriority.UseBorders = false;
this.xrLabel4.StylePriority.UseFont = false;
this.xrLabel4.StylePriority.UseTextAlignment = false;
this.xrLabel4.Text = "Leistungsnachweis Schulassistenz [CustomerFirstName] [CustomerLastName]";
this.xrLabel4.Text = "Leistungsnachweis Schulassistenz / Teilhabeassistenz für [CustomerFirstName] [Cus" +
"tomerLastName]";
this.xrLabel4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
//
// bottomMarginBand1
@@ -266,11 +269,13 @@ namespace AkggMid
// ReportHeader
//
this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel3,
this.xrLabel2,
this.xrLabel9,
this.lblWegbegleitung,
this.lblMonat,
this.xrLabel4});
this.ReportHeader.HeightF = 108.3333F;
this.ReportHeader.HeightF = 162.5F;
this.ReportHeader.Name = "ReportHeader";
//
// xrLabel9
@@ -278,14 +283,14 @@ namespace AkggMid
this.xrLabel9.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)));
this.xrLabel9.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(0F, 81.25F);
this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(0F, 108.3333F);
this.xrLabel9.Name = "xrLabel9";
this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel9.SizeF = new System.Drawing.SizeF(737F, 27.08334F);
this.xrLabel9.StylePriority.UseBorders = false;
this.xrLabel9.StylePriority.UseFont = false;
this.xrLabel9.StylePriority.UseTextAlignment = false;
this.xrLabel9.Text = "[Costbearer] / Bewilligungszeitraum [ApprovedStartDate]-[ApprovedEndDate]";
this.xrLabel9.Text = "[Costbearer] // Az.: [ReferenceNumber]";
this.xrLabel9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
//
// lblWegbegleitung
@@ -293,7 +298,7 @@ namespace AkggMid
this.lblWegbegleitung.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)));
this.lblWegbegleitung.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.lblWegbegleitung.LocationFloat = new DevExpress.Utils.PointFloat(0F, 54.16667F);
this.lblWegbegleitung.LocationFloat = new DevExpress.Utils.PointFloat(0F, 81.25F);
this.lblWegbegleitung.Name = "lblWegbegleitung";
this.lblWegbegleitung.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblWegbegleitung.SizeF = new System.Drawing.SizeF(737F, 27.08334F);
@@ -315,7 +320,7 @@ namespace AkggMid
this.lblMonat.StylePriority.UseBorders = false;
this.lblMonat.StylePriority.UseFont = false;
this.lblMonat.StylePriority.UseTextAlignment = false;
this.lblMonat.Text = "Monat [StartDate!MMMM] Schuljahr [StartDate!yyyy]";
this.lblMonat.Text = "Monat [StartDate!MMMM] - Schuljahr [StartDate!yyyy]";
this.lblMonat.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
//
// DetailReport2
@@ -591,6 +596,36 @@ namespace AkggMid
this.fieldTotalStd.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
this.fieldTotalStd.Name = "fieldTotalStd";
//
// xrLabel2
//
this.xrLabel2.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)));
this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 54.16667F);
this.xrLabel2.Name = "xrLabel2";
this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel2.SizeF = new System.Drawing.SizeF(737F, 27.08334F);
this.xrLabel2.StylePriority.UseBorders = false;
this.xrLabel2.StylePriority.UseFont = false;
this.xrLabel2.StylePriority.UseTextAlignment = false;
this.xrLabel2.Text = "Bewilligungszeitraum: [ApprovedStartDate]-[ApprovedEndDate]";
this.xrLabel2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
//
// xrLabel3
//
this.xrLabel3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)));
this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 135.4167F);
this.xrLabel3.Name = "xrLabel3";
this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel3.SizeF = new System.Drawing.SizeF(737F, 27.08334F);
this.xrLabel3.StylePriority.UseBorders = false;
this.xrLabel3.StylePriority.UseFont = false;
this.xrLabel3.StylePriority.UseTextAlignment = false;
this.xrLabel3.Text = "Teilhabeassistenz: [MainAttendant]";
this.xrLabel3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
//
// LeistungsnachweisSozialamt
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -676,5 +711,7 @@ namespace AkggMid
private DevExpress.XtraReports.UI.FormattingRule ruleIstWochensumme;
private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1;
private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox2;
private DevExpress.XtraReports.UI.XRLabel xrLabel2;
private DevExpress.XtraReports.UI.XRLabel xrLabel3;
}
}

14
ReportImp/AkggMid/LeistungsnachweisSozialamtMitBlutzucker.cs
View File

@@ -25,19 +25,9 @@ namespace AkggMid
{
var helper = new LeistungsnachweisHelper(pRO, true);
String schuljahr = "";
if (pRO.StartDate < new DateTime(2023, 8, 1))
{
schuljahr = String.Format("{0}-{1}", pRO.StartDate.Year - 1, pRO.StartDate.Year);
}
else
{
schuljahr = String.Format("{0}-{1}", pRO.StartDate.Year, pRO.StartDate.Year + 1);
}
lblMonat.Text = String.Format("Monat {0:MMMM} Schuljahr {1}", pRO.StartDate, schuljahr);
var schuljahr = helper.BerechneSchuljahr(pRO);
lblMonat.Text = String.Format("Monat {0:MMMM} - Schuljahr {1:yyyy}-{2:yyyy}", pRO.StartDate, schuljahr.StartDate, schuljahr.EndDate);
pRO.Services = helper.ErstelleDummyRecords(pRO);

79
ReportImp/AkggMid/LeistungsnachweisSozialamtMitBlutzucker.designer.cs generated
View File

@@ -49,7 +49,6 @@ namespace AkggMid
this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
this.lblWegbegleitung = new DevExpress.XtraReports.UI.XRLabel();
this.lblMonat = new DevExpress.XtraReports.UI.XRLabel();
this.DetailReport2 = new DevExpress.XtraReports.UI.DetailReportBand();
@@ -78,6 +77,9 @@ namespace AkggMid
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.fieldStd = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldTotalStd = new DevExpress.XtraReports.UI.CalculatedField();
this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
@@ -273,7 +275,8 @@ namespace AkggMid
this.xrLabel4.StylePriority.UseBorders = false;
this.xrLabel4.StylePriority.UseFont = false;
this.xrLabel4.StylePriority.UseTextAlignment = false;
this.xrLabel4.Text = "Leistungsnachweis Schulassistenz [CustomerFirstName] [CustomerLastName]";
this.xrLabel4.Text = "Leistungsnachweis Schulassistenz / Teilhabeassistenz für [CustomerFirstName] [Cus" +
"tomerLastName]";
this.xrLabel4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
//
// bottomMarginBand1
@@ -285,33 +288,20 @@ namespace AkggMid
//
this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel9,
this.xrLabel3,
this.xrLabel2,
this.lblWegbegleitung,
this.lblMonat,
this.xrLabel4});
this.ReportHeader.HeightF = 108.3333F;
this.ReportHeader.HeightF = 162.5F;
this.ReportHeader.Name = "ReportHeader";
//
// xrLabel9
//
this.xrLabel9.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)));
this.xrLabel9.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(0F, 81.25F);
this.xrLabel9.Name = "xrLabel9";
this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel9.SizeF = new System.Drawing.SizeF(737F, 27.08334F);
this.xrLabel9.StylePriority.UseBorders = false;
this.xrLabel9.StylePriority.UseFont = false;
this.xrLabel9.StylePriority.UseTextAlignment = false;
this.xrLabel9.Text = "[Costbearer] / Bewilligungszeitraum [ApprovedStartDate]-[ApprovedEndDate]";
this.xrLabel9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
//
// lblWegbegleitung
//
this.lblWegbegleitung.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)));
this.lblWegbegleitung.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.lblWegbegleitung.LocationFloat = new DevExpress.Utils.PointFloat(0F, 54.16667F);
this.lblWegbegleitung.LocationFloat = new DevExpress.Utils.PointFloat(0F, 81.25F);
this.lblWegbegleitung.Name = "lblWegbegleitung";
this.lblWegbegleitung.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblWegbegleitung.SizeF = new System.Drawing.SizeF(737F, 27.08334F);
@@ -333,7 +323,7 @@ namespace AkggMid
this.lblMonat.StylePriority.UseBorders = false;
this.lblMonat.StylePriority.UseFont = false;
this.lblMonat.StylePriority.UseTextAlignment = false;
this.lblMonat.Text = "Monat [StartDate!MMMM] Schuljahr [StartDate!yyyy]";
this.lblMonat.Text = "Monat [StartDate!MMMM] - Schuljahr [StartDate!yyyy]";
this.lblMonat.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
//
// DetailReport2
@@ -618,6 +608,51 @@ namespace AkggMid
this.fieldTotalStd.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
this.fieldTotalStd.Name = "fieldTotalStd";
//
// xrLabel2
//
this.xrLabel2.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)));
this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 54.16667F);
this.xrLabel2.Name = "xrLabel2";
this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel2.SizeF = new System.Drawing.SizeF(737F, 27.08334F);
this.xrLabel2.StylePriority.UseBorders = false;
this.xrLabel2.StylePriority.UseFont = false;
this.xrLabel2.StylePriority.UseTextAlignment = false;
this.xrLabel2.Text = "Bewilligungszeitraum: [ApprovedStartDate]-[ApprovedEndDate]";
this.xrLabel2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
//
// xrLabel9
//
this.xrLabel9.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)));
this.xrLabel9.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(0F, 108.3333F);
this.xrLabel9.Name = "xrLabel9";
this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel9.SizeF = new System.Drawing.SizeF(737F, 27.08334F);
this.xrLabel9.StylePriority.UseBorders = false;
this.xrLabel9.StylePriority.UseFont = false;
this.xrLabel9.StylePriority.UseTextAlignment = false;
this.xrLabel9.Text = "[Costbearer] // Az.: [ReferenceNumber]";
this.xrLabel9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
//
// xrLabel3
//
this.xrLabel3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)));
this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 135.4167F);
this.xrLabel3.Name = "xrLabel3";
this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel3.SizeF = new System.Drawing.SizeF(737F, 27.08334F);
this.xrLabel3.StylePriority.UseBorders = false;
this.xrLabel3.StylePriority.UseFont = false;
this.xrLabel3.StylePriority.UseTextAlignment = false;
this.xrLabel3.Text = "Teilhabeassistenz: [MainAttendant]";
this.xrLabel3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
//
// LeistungsnachweisSozialamtMitBlutzucker
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -691,7 +726,6 @@ namespace AkggMid
private DevExpress.XtraReports.UI.XRTableCell xrTableCell11;
private DevExpress.XtraReports.UI.XRLabel lblMonat;
private DevExpress.XtraReports.UI.XRLabel lblWegbegleitung;
private DevExpress.XtraReports.UI.XRLabel xrLabel9;
private DevExpress.XtraReports.UI.XRTable xrTable2;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow2;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell1;
@@ -705,5 +739,8 @@ namespace AkggMid
private DevExpress.XtraReports.UI.FormattingRule ruleIstWochensumme;
private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1;
private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox2;
private DevExpress.XtraReports.UI.XRLabel xrLabel2;
private DevExpress.XtraReports.UI.XRLabel xrLabel9;
private DevExpress.XtraReports.UI.XRLabel xrLabel3;
}
}

22
ReportImp/AkggMid/LeistungsnachweisSozialamtMitBlutzuckerPumpe.cs
View File

@@ -24,18 +24,10 @@ namespace AkggMid
public void SetReportDataSource(ServicesOverviewRO pRO)
{
var helper = new LeistungsnachweisHelper(pRO, true);
String schuljahr = "";
if (pRO.StartDate < new DateTime(2023, 8, 1))
{
schuljahr = String.Format("{0}-{1}", pRO.StartDate.Year - 1, pRO.StartDate.Year);
}
else
{
schuljahr = String.Format("{0}-{1}", pRO.StartDate.Year, pRO.StartDate.Year + 1);
}
var schuljahr = helper.BerechneSchuljahr(pRO);
lblMonat.Text = String.Format("Monat {0:MMMM} Schuljahr {1}", pRO.StartDate, schuljahr);
lblMonat.Text = String.Format("Monat {0:MMMM} - Schuljahr {1:yyyy}-{2:yyyy}", pRO.StartDate, schuljahr.StartDate, schuljahr.EndDate);
@@ -44,6 +36,14 @@ namespace AkggMid
foreach (var record in pRO.Services)
{
ServicesOverviewRO.CreateSignatureString(record);
if (record.ServiceRecordOid > 0)
{
ServicesOverviewRO.CreateGoalList(record);
if (!String.IsNullOrEmpty(record.GoalList))
{
}
}
}
//helper.PruefeWochenBudget(pRO);

79
ReportImp/AkggMid/LeistungsnachweisSozialamtMitBlutzuckerPumpe.designer.cs generated
View File

@@ -50,7 +50,6 @@ namespace AkggMid
this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
this.lblWegbegleitung = new DevExpress.XtraReports.UI.XRLabel();
this.lblMonat = new DevExpress.XtraReports.UI.XRLabel();
this.DetailReport2 = new DevExpress.XtraReports.UI.DetailReportBand();
@@ -80,6 +79,9 @@ namespace AkggMid
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.fieldStd = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldTotalStd = new DevExpress.XtraReports.UI.CalculatedField();
this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
@@ -289,7 +291,8 @@ namespace AkggMid
this.xrLabel4.StylePriority.UseBorders = false;
this.xrLabel4.StylePriority.UseFont = false;
this.xrLabel4.StylePriority.UseTextAlignment = false;
this.xrLabel4.Text = "Leistungsnachweis Schulassistenz [CustomerFirstName] [CustomerLastName]";
this.xrLabel4.Text = "Leistungsnachweis Schulassistenz / Teilhabeassistenz für [CustomerFirstName] [Cus" +
"tomerLastName]";
this.xrLabel4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
//
// bottomMarginBand1
@@ -301,33 +304,20 @@ namespace AkggMid
//
this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel9,
this.xrLabel3,
this.xrLabel2,
this.lblWegbegleitung,
this.lblMonat,
this.xrLabel4});
this.ReportHeader.HeightF = 108.3333F;
this.ReportHeader.HeightF = 162.5F;
this.ReportHeader.Name = "ReportHeader";
//
// xrLabel9
//
this.xrLabel9.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)));
this.xrLabel9.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(0F, 81.25F);
this.xrLabel9.Name = "xrLabel9";
this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel9.SizeF = new System.Drawing.SizeF(737F, 27.08334F);
this.xrLabel9.StylePriority.UseBorders = false;
this.xrLabel9.StylePriority.UseFont = false;
this.xrLabel9.StylePriority.UseTextAlignment = false;
this.xrLabel9.Text = "[Costbearer] / Bewilligungszeitraum [ApprovedStartDate]-[ApprovedEndDate]";
this.xrLabel9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
//
// lblWegbegleitung
//
this.lblWegbegleitung.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)));
this.lblWegbegleitung.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.lblWegbegleitung.LocationFloat = new DevExpress.Utils.PointFloat(0F, 54.16667F);
this.lblWegbegleitung.LocationFloat = new DevExpress.Utils.PointFloat(0F, 81.25F);
this.lblWegbegleitung.Name = "lblWegbegleitung";
this.lblWegbegleitung.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblWegbegleitung.SizeF = new System.Drawing.SizeF(737F, 27.08334F);
@@ -349,7 +339,7 @@ namespace AkggMid
this.lblMonat.StylePriority.UseBorders = false;
this.lblMonat.StylePriority.UseFont = false;
this.lblMonat.StylePriority.UseTextAlignment = false;
this.lblMonat.Text = "Monat [StartDate!MMMM] Schuljahr [StartDate!yyyy]";
this.lblMonat.Text = "Monat [StartDate!MMMM] - Schuljahr [StartDate!yyyy]";
this.lblMonat.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
//
// DetailReport2
@@ -643,6 +633,51 @@ namespace AkggMid
this.fieldTotalStd.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
this.fieldTotalStd.Name = "fieldTotalStd";
//
// xrLabel2
//
this.xrLabel2.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)));
this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 54.16667F);
this.xrLabel2.Name = "xrLabel2";
this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel2.SizeF = new System.Drawing.SizeF(737F, 27.08334F);
this.xrLabel2.StylePriority.UseBorders = false;
this.xrLabel2.StylePriority.UseFont = false;
this.xrLabel2.StylePriority.UseTextAlignment = false;
this.xrLabel2.Text = "Bewilligungszeitraum: [ApprovedStartDate]-[ApprovedEndDate]";
this.xrLabel2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
//
// xrLabel9
//
this.xrLabel9.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)));
this.xrLabel9.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(0F, 108.3333F);
this.xrLabel9.Name = "xrLabel9";
this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel9.SizeF = new System.Drawing.SizeF(737F, 27.08334F);
this.xrLabel9.StylePriority.UseBorders = false;
this.xrLabel9.StylePriority.UseFont = false;
this.xrLabel9.StylePriority.UseTextAlignment = false;
this.xrLabel9.Text = "[Costbearer] // Az.: [ReferenceNumber]";
this.xrLabel9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
//
// xrLabel3
//
this.xrLabel3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)));
this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 135.4167F);
this.xrLabel3.Name = "xrLabel3";
this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel3.SizeF = new System.Drawing.SizeF(737F, 27.08334F);
this.xrLabel3.StylePriority.UseBorders = false;
this.xrLabel3.StylePriority.UseFont = false;
this.xrLabel3.StylePriority.UseTextAlignment = false;
this.xrLabel3.Text = "Teilhabeassistenz: [MainAttendant]";
this.xrLabel3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
//
// LeistungsnachweisSozialamtMitBlutzuckerPumpe
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -718,7 +753,6 @@ namespace AkggMid
private DevExpress.XtraReports.UI.XRTableCell xrTableCell11;
private DevExpress.XtraReports.UI.XRLabel lblMonat;
private DevExpress.XtraReports.UI.XRLabel lblWegbegleitung;
private DevExpress.XtraReports.UI.XRLabel xrLabel9;
private DevExpress.XtraReports.UI.XRTable xrTable2;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow2;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell1;
@@ -732,5 +766,8 @@ namespace AkggMid
private DevExpress.XtraReports.UI.FormattingRule ruleIstWochensumme;
private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1;
private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox2;
private DevExpress.XtraReports.UI.XRLabel xrLabel2;
private DevExpress.XtraReports.UI.XRLabel xrLabel9;
private DevExpress.XtraReports.UI.XRLabel xrLabel3;
}
}

2
ReportImp/BeWoAuxilio/CustomVacationService.cs
View File

@@ -17,7 +17,7 @@ namespace BeWoAuxilio.Service
return list;
}
public override decimal GetFeiertagsFaktor(DateTime start)
{
if (start.Date.Month == 12 && (start.Date.Day == 24 || start.Date.Day == 31))

17
ReportImp/BeWoAuxilio/Mitarbeiterstundenkonto.cs
View File

@@ -23,19 +23,16 @@ namespace BeWo.BeWoAuxilio
foreach (var emp in pRO.EmployeeDetailList)
{
if (emp.SollProTag != 0)
{
var urlaubKrankheit = 0m;
if (emp.TageUrlaub.HasValue)
urlaubKrankheit += emp.TageUrlaub.Value * emp.SollProTag;
if (emp.TageKrankheit.HasValue)
urlaubKrankheit += emp.TageKrankheit.Value * emp.SollProTag;
var urlaubKrankheit = 0m;
if (emp.TageUrlaub.HasValue)
urlaubKrankheit += emp.TageUrlaub.Value;
if (emp.TageKrankheit.HasValue)
urlaubKrankheit += emp.TageKrankheit.Value;
emp.UrlaubUndKrankheit = urlaubKrankheit;
}
emp.UrlaubUndKrankheit = urlaubKrankheit;
}
this.bindingSource1.DataSource = pRO;
this.bindingSource1.DataSource = pRO;
}
}

8
ReportImp/BeWoAuxilio/MitarbeiterstundenkontoJahr.cs
View File

@@ -24,6 +24,14 @@ namespace BeWo.BeWoAuxilio
{
foreach (var detail in info.EmployeeDetails)
{
var urlaubKrankheit = 0m;
if (detail.EmployeeDetail.TageUrlaub.HasValue)
urlaubKrankheit += detail.EmployeeDetail.TageUrlaub.Value;
if (detail.EmployeeDetail.TageKrankheit.HasValue)
urlaubKrankheit += detail.EmployeeDetail.TageKrankheit.Value;
detail.EmployeeDetail.UrlaubUndKrankheit = urlaubKrankheit;
if (detail.EmployeeDetail.StundenGesamtIst != 0)
detail.EmployeeDetail.RelationFlsZuMittelbar = (detail.EmployeeDetail.Custom1 / (detail.EmployeeDetail.StundenGesamtIst)) * 100;
else if (detail.EmployeeDetail.StundenGesamtIst == 0 && detail.EmployeeDetail.Custom1 != 0)

105
Service/Plugins/CustomerService.cs
View File

@@ -526,6 +526,10 @@ namespace BeWo.Service.Plugins
}
foreach (var person in persons)
{
if (!String.IsNullOrEmpty(person.FirstName) && person.FirstName.Contains("Test"))
{
}
List<CustomerPersonRelationDC> list = null;
if (person2CustomerOidDict.ContainsKey(person.Oid.Value))
{
@@ -558,9 +562,12 @@ namespace BeWo.Service.Plugins
dc.Organisation = o2p.Organisation.Name;
if (o2p.Organisation.Address != null)
{
dc.Street = o2p.Organisation.Address.Street;
dc.PostalCode = o2p.Organisation.Address.PostalCode;
dc.Town = o2p.Organisation.Address.Town;
if (String.IsNullOrEmpty(dc.Street) && String.IsNullOrEmpty(dc.PostalCode) && String.IsNullOrEmpty(dc.Town))
{
dc.Street = o2p.Organisation.Address.Street;
dc.PostalCode = o2p.Organisation.Address.PostalCode;
dc.Town = o2p.Organisation.Address.Town;
}
}
}
}
@@ -620,20 +627,52 @@ namespace BeWo.Service.Plugins
public static void AddContacts(CompactPersonDC dc, Person person, Organisation2Person o2p)
{
if (person.Contacts != null)
{
foreach (Contact contact in person.Contacts)
{
if (contact.Type == ContactType.private_Phone)
{
dc.Communication1 = contact.Value;
}
if (contact.Type == ContactType.private_MobilePhone)
{
dc.Communication2 = contact.Value;
}
if (contact.Type == ContactType.private_Mail)
{
dc.Communication3 = contact.Value;
}
}
}
if (o2p != null)
{
if (o2p.Contacts != null)
{
foreach (Contact contact in o2p.Contacts)
{
if (contact.Type == ContactType.business_Phone)
if (String.IsNullOrEmpty(dc.Communication1))
{
dc.Communication1 = contact.Value;
if (contact.Type == ContactType.business_Phone)
{
dc.Communication1 = contact.Value;
}
}
if (contact.Type == ContactType.business_Mail)
if (String.IsNullOrEmpty(dc.Communication2))
{
dc.Communication3 = contact.Value;
if (contact.Type == ContactType.business_MobilePhone)
{
dc.Communication2 = contact.Value;
}
}
if (String.IsNullOrEmpty(dc.Communication3))
{
if (contact.Type == ContactType.business_Mail)
{
dc.Communication3 = contact.Value;
}
}
}
}
@@ -674,45 +713,7 @@ namespace BeWo.Service.Plugins
}
if (String.IsNullOrEmpty(dc.Communication1))
{
if (person.Contacts != null)
{
foreach (Contact contact in person.Contacts)
{
if (contact.Type == ContactType.private_Phone)
{
dc.Communication1 = contact.Value;
}
}
}
}
if (String.IsNullOrEmpty(dc.Communication2))
{
if (person.Contacts != null)
{
foreach (Contact contact in person.Contacts)
{
if (contact.Type == ContactType.private_MobilePhone)
{
dc.Communication2 = contact.Value;
}
}
}
}
if (String.IsNullOrEmpty(dc.Communication3))
{
if (person.Contacts != null)
{
foreach (Contact contact in person.Contacts)
{
if (contact.Type == ContactType.private_Mail)
{
dc.Communication3 = contact.Value;
}
}
}
}
}
private ApplicationUser GetLoggedInUser()
@@ -888,7 +889,7 @@ namespace BeWo.Service.Plugins
{
foreach (Employee2Customer e2c in customer.Employee2CustomerList)
{
if (employeeOid == e2c.EmployeeOid.Value)
if (employeeOid == e2c.EmployeeOid.Value && (!e2c.StartDate.HasValue || e2c.StartDate <= DateTime.Now.Date) && (!e2c.EndDate.HasValue || e2c.EndDate >= DateTime.Now.Date))
{
customerDc.IsRelatedToEmployee = true;
}
@@ -931,10 +932,14 @@ namespace BeWo.Service.Plugins
foreach (Employee2Customer item in e2cList)
{
if (!customerOIDs.ContainsKey(item.Customer.Oid.Value))
if ((!item.StartDate.HasValue || item.StartDate <= DateTime.Now.Date) && (!item.EndDate.HasValue || item.EndDate >= DateTime.Now.Date))
{
customerOIDs.Add(item.Customer.Oid.Value, item.Customer.Oid.Value);
if (!customerOIDs.ContainsKey(item.Customer.Oid.Value))
{
customerOIDs.Add(item.Customer.Oid.Value, item.Customer.Oid.Value);
}
}
}
//if (FetchTeamsForSupportConcepts())

11
Service/Plugins/PluginLoader.cs
View File

@@ -51,7 +51,7 @@ namespace BeWo.Service.Plugins
//t = "4950382346"; // Holsinger
//t = "5973016645"; // Verein Lebensgestaltung Hanau
//t = "7375324044"; // Diakonie KK Kleve
t = "1441747891"; // BeWo Mobil Köln
//t = "1441747891"; // BeWo Mobil Köln
//t = "5120047701"; // Trialog
//t = "3629696651"; // Soziale Dienste Niederrhein (SDN)
//t = "9893557471"; // Caritas Frankfurt
@@ -99,7 +99,7 @@ namespace BeWo.Service.Plugins
//t = "5653806613"; // Feid und Kollegen
//t = "3830114427"; // FiZ Familie im Zentrum Hof
//t = "7138297573"; // Tagwerk betreutes wohnen
//t = "1008896531"; // BeWo Auxilio
t = "1008896531"; // BeWo Auxilio
//t = "9383760246"; // Die Kette
//t = "5915565037"; // Lebenshilfe Remscheid
//t = "3350425974"; // BeWo Rückenwind
@@ -302,7 +302,7 @@ namespace BeWo.Service.Plugins
//t = "8251343124"; // Rat Plus Tat
//t = "6819347851"; // Awo Kreisverband Plön
//t = "2385915144"; // AKGG GmbHd
//t = "8002913382"; // AKGG GmbH (MID)
t = "8002913382"; // AKGG GmbH (MID)
//t = "5155880294"; // BHV Bergische Hauspflege
//t = "8366649557"; // Münchner Aids-Hilfe e.V.
//t = "2976949196"; // WHB Refrath gGmbH
@@ -393,7 +393,8 @@ namespace BeWo.Service.Plugins
//t = "5000000000";
//t = "3788859817"; // Zukunft Leben (Stephan Hekermann)
//t = "2663321234"; // Aachener Laienhelfer Initiative e.V.
//t = "6290975576"; // Caritasverband Kelheim
//t = "5564670353"; // Mittelpunkt
return t;
#else
if (MultitenancyOperationContextExt.Current != null)
@@ -403,7 +404,7 @@ namespace BeWo.Service.Plugins
#endif
}
}
public static String CustomerPluginPath()
{

5
Service/Plugins/SupportConceptAnalysisCreator.cs
View File

@@ -485,7 +485,10 @@ namespace BeWo.Service.Plugins
{
if (employeeOid.Value == e2c.EmployeeOid.Value)
{
isRelatedToEmployee = true;
if ((!e2c.StartDate.HasValue || e2c.StartDate <= DateTime.Now.Date) && (!e2c.EndDate.HasValue || e2c.EndDate >= DateTime.Now.Date))
{
isRelatedToEmployee = true;
}
}
}
}

5
Service/ServiceImplementations/CustomerServiceImp.cs
View File

@@ -716,7 +716,10 @@ namespace BeWo.Service.ServiceImplementations
{
if(rel.Employee.Equals(user.Employee) && rel.CustomerOid.HasValue)
{
relatedCustomerOids.AddIfNotIn(rel.CustomerOid.Value);
if ((!rel.StartDate.HasValue || rel.StartDate <= DateTime.Now.Date) && (!rel.EndDate.HasValue || rel.EndDate >= DateTime.Now.Date))
{
relatedCustomerOids.AddIfNotIn(rel.CustomerOid.Value);
}
}
}
}