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

cb

Browse Source
This commit is contained in:
Christian
2017-07-25 10:52:20 +02:00
parent 067b8fde4e
commit f4e8bd6a73
61 changed files with 6872 additions and 5667 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
BeWo/BeWo.csproj
View File

@@ -38,16 +38,16 @@
<UpdatePeriodically>false</UpdatePeriodically>
<UpdateRequired>true</UpdateRequired>
<MapFileExtensions>false</MapFileExtensions>
<InstallUrl>http://app.beyondsoft.de/</InstallUrl>
<InstallUrl>http://fortis-bewoplaner.fortis-ev.org.local/</InstallUrl>
<TargetCulture>de-DE</TargetCulture>
<ProductName>BeWoPlaner</ProductName>
<PublisherName>beyondSoft GmbH</PublisherName>
<MinimumRequiredVersion>2.0.1.127</MinimumRequiredVersion>
<MinimumRequiredVersion>2.0.1.129</MinimumRequiredVersion>
<CreateWebPageOnPublish>true</CreateWebPageOnPublish>
<WebPage>publish.htm</WebPage>
<OpenBrowserOnPublish>false</OpenBrowserOnPublish>
<TrustUrlParameters>true</TrustUrlParameters>
<ApplicationRevision>128</ApplicationRevision>
<ApplicationRevision>130</ApplicationRevision>
<ApplicationVersion>2.0.1.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<CreateDesktopShortcut>true</CreateDesktopShortcut>

2
BeWo/BeWo.csproj.user
View File

@@ -2,7 +2,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<PublishUrlHistory>D:\Projects\beyondsoft\BeWoPlaner\Publish\|C:\Projects\beyondsoft\BeWoPlaner\Publish\|D:\Projects\BEYONDSOFT\BeWoPlaner\Publish\|C:\Projects\BEYONDSOFT\BeWoPlaner\Publish\|C:\Projects\BEYONDSOFT\BeWoPlaner\Publish4\</PublishUrlHistory>
<InstallUrlHistory>http://app.beyondsoft.de/|http://app.beyondsoft.de/intern/|http://app.beyondsoft.de/deploy/|http://FOBP01.fortis-ev.org.local/|http://10.0.116.4/</InstallUrlHistory>
<InstallUrlHistory>http://fortis-bewoplaner.fortis-ev.org.local/|http://FOBP01.fortis-ev.org.local/|http://app.beyondsoft.de/|http://app.beyondsoft.de/intern/|http://app.beyondsoft.de/deploy/</InstallUrlHistory>
<SupportUrlHistory />
<UpdateUrlHistory />
<BootstrapperUrlHistory />

28
BeWo/BeWoApp.xaml.cs
View File

@@ -467,7 +467,7 @@ namespace BeWo
#if DEBUG
url = String.Format("http://localhost:3777/Host");
//return new Uri(String.Format("http://app1.bewoplaner.de/service"));
//return new Uri(String.Format("http://app4.bewoplaner.de/service"));
//url = String.Format("app1.bewoplaner.de/service");
#endif
@@ -932,10 +932,10 @@ namespace BeWo
}
WindowCollection fenster = CurrentBeWo.Windows;
OpenDevExpressEditForms = (from Window x in fenster where !x.Title.Equals("BeWoPlaner") || x.GetType() != typeof (MainWindow) select x).ToList();
//OpenDevExpressEditForms = (from Window x in fenster where !x.Title.Equals("BeWoPlaner") || x.GetType() != typeof (MainWindow) select x).ToList();
OpenDevExpressEditForms.ForEach(fe => fe.Close());
//OpenDevExpressEditForms.ForEach(fe => fe.Close());
var lockedPage = new LockedPage();
lockedPage.ButtonLogin.Click += UnlockBeWoPlaner;
@@ -975,17 +975,17 @@ namespace BeWo
Current.Dispatch(delegate
{
CurrentBeWo.MainWindow.Content = _lockedContent;
foreach(Window form in OpenDevExpressEditForms)
{
try
{
form.Show();
}
catch(Exception exception)
{
ShowError("Ein Fehler ist beim Entsperren aufgetreten", exception, true);
}
}
//foreach(Window form in OpenDevExpressEditForms)
//{
// try
// {
// //form.Show();
// }
// catch(Exception exception)
// {
// ShowError("Ein Fehler ist beim Entsperren aufgetreten", exception, true);
// }
//}
});
}, true);
}

4
BeWo/Scheduler/View/NewSchedulerView.xaml.cs
View File

@@ -1046,9 +1046,11 @@ namespace BeWo.Scheduler.View
private void AllowAppointmentAenderung(object sender, AppointmentOperationEventArgs e)
{
var darfTerminDetailsSehen = true;
var appointment = e.Appointment;
var ersteller = (CompactEmployeeDC) appointment.CustomFields["Originator"];
var ersteller = (CompactEmployeeDC) appointment.CustomFields["Originator"];
var mitarbeiterliste = (List<Employee2SchedulerAppointmentDC>)appointment.CustomFields["EmployeeList"];
var hatNurAndereMitarbeiter = mitarbeiterliste.Count > 0 && !(mitarbeiterliste.Count == 1 && mitarbeiterliste.ElementAt(0).Employee.EmployeeOid.Equals(BeWoApp.LoggedOnEmployee.EmployeeOid));

2
BeWo/View/BargeldkassenView.xaml
View File

@@ -252,7 +252,7 @@
</DataTemplate>
</dxg:GridColumn.CellTemplate>
</dxg:GridColumn>
<dxg:GridColumn Header="Datum" FixedWidth="True" FieldName="Zahlungsdatum" EditSettings="{dxe:DateSettings DisplayFormat=d}" AllowEditing="{Binding Path=BargeldtransaktionenBearbeitenAlsDefaultBooelan, RelativeSource={RelativeSource AncestorType={x:Type view:BargeldkassenView}}}" />
<dxg:GridColumn Header="Datum" FixedWidth="True" SortOrder="Ascending" FieldName="Zahlungsdatum" EditSettings="{dxe:DateSettings DisplayFormat=d}" AllowEditing="{Binding Path=BargeldtransaktionenBearbeitenAlsDefaultBooelan, RelativeSource={RelativeSource AncestorType={x:Type view:BargeldkassenView}}}" />
<dxg:GridColumn Header="Art" FixedWidth="True" FieldName="Zahlungstyp" AllowEditing="{Binding Path=BargeldtransaktionenBearbeitenAlsDefaultBooelan, RelativeSource={RelativeSource AncestorType={x:Type view:BargeldkassenView}}}">
<dxg:GridColumn.EditSettings>
<dxe:ComboBoxEditSettings ItemsSource="{Binding Path=Values, Source={x:Static core:DisplayEnum.Zahlungstyp}}" IsTextEditable="False" />

9
BeWo/View/Detail/Report/QueryView.xaml.cs
View File

@@ -232,8 +232,13 @@ namespace BeWo.View.Detail.Report
IsReadOnly = true,
Width = 250,
Margin = new Thickness(3),
DeleteButtonVisibility = Visibility.Collapsed
DeleteButtonVisibility = Visibility.Visible
};
peEmp.DeleteClick += (s, e) =>
{
peEmp.Text = "";
lastSelectedEmployee = null;
};
if (lastSelectedEmployee != null)
{
@@ -246,6 +251,7 @@ namespace BeWo.View.Detail.Report
popupEmployee.Height = 250;
popupEmployee.Placement = PlacementMode.MousePoint;
var esv = new EmployeeSearchView();
esv.ItemSelected += (s, e) =>
{
popupEmployee.IsOpen = false;
@@ -422,6 +428,7 @@ namespace BeWo.View.Detail.Report
}
return canExecute;
}
private List<QueryParamDC> CreateQueryParamValues(QueryDC query)
{

20
BeWo/ViewModel/ListViewModel/ServiceRecordListVM.cs
View File

@@ -536,7 +536,7 @@ namespace BeWo.ViewModel.ListViewModel
{
var lResult = new List<ServiceRecordVM>();
if (WithoutClient)
{
ServiceRecordVM lNewRecord = CreateNewVM();
@@ -553,8 +553,20 @@ namespace BeWo.ViewModel.ListViewModel
enddate = lNewRecord.EndTime;
lNewRecord.ChoosenNode = iCustomerNode;
lNewRecord.Duration = _PrototypeVM.Duration/_CustomerNodes.Count;
if (_PrototypeVM.Duration == 0)
{
if (_PrototypeVM.StartDate.HasValue && enddate.HasValue)
{
var minutes = enddate.Value.Subtract(_PrototypeVM.StartDate.Value).TotalMinutes;
_PrototypeVM.Duration = (decimal)minutes;
}
}
lNewRecord.Duration = _PrototypeVM.Duration / _CustomerNodes.Count;
if (lNewRecord.Duration.HasValue)
lNewRecord.RoundedDuration = lNewRecord.Duration.Value;
if (iCustomerNode.SupportConceptTreeNodeDC != null && lNewRecord.ServiceDescription != null && lNewRecord.ServiceDescription.Category != null &&
lNewRecord.ServiceDescription.Category.IsBillable && iCustomerNode.SupportConceptTreeNodeDC.CostBearer != null)
{
@@ -571,11 +583,11 @@ namespace BeWo.ViewModel.ListViewModel
}
lNewRecord.EndTime = enddate;
lResult.Add(lNewRecord);
}
}
// NewVM = null;
// _PrototypeVM = null;
FirePropertyChanged(PropertyName_PrototypeVM);

5
BeWo/ViewModel/ServiceRecordVM.cs
View File

@@ -2052,6 +2052,7 @@ namespace BeWo.ViewModel
_EditableEndDate = pDataContract.End.Value;
_DurationInStunden = pDataContract.DurationInStunden;
if (pDataContract.DurationInStunden == ZeiterfassungsDauer.Stunden )
{
_DurationSTD = (decimal)(pDataContract.End.Value - pDataContract.Start.Value).TotalHours;
@@ -2067,10 +2068,10 @@ namespace BeWo.ViewModel
_EndTime = pDataContract.Start.Value.AddMinutes((double)_Duration.Value);
}
_DurationMonthYearGes = 0;
}else
}
else
if (pDataContract.ServiceRecordFormat == ServiceRecordFormate.ZeiterfassungMitEndDatum)
{
_Date = pDataContract.Start.Value.Date;

5
BeWoOhneReports.sln
View File

@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
VisualStudioVersion = 14.0.25123.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Client", "Client", "{E7543C39-A44C-40C9-82C9-E7FAA2D9A852}"
EndProject
@@ -34,9 +34,6 @@ EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BeWoChatServer", "BeWoChatServer\BeWoChatServer.csproj", "{4E069DC0-8153-41E0-A89A-FC1916DF4A5F}"
EndProject
Global
GlobalSection(Performance) = preSolution
HasPerformanceSessions = true
EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|.NET = Debug|.NET
Debug|Any CPU = Debug|Any CPU

8
Controls/Controls/NullItemComboBox.cs
View File

@@ -43,8 +43,12 @@ namespace BeWo.Controls
protected override void OnItemsSourceChanged(IEnumerable oldValue, IEnumerable newValue)
{
this.l = this.NullText; // " ... " + NullText + " ...";
IEnumerator lEnum = newValue.GetEnumerator();
if (lEnum.MoveNext() && !lEnum.Current.Equals(this.l))
IEnumerator lEnum = null;
if (newValue != null)
{
lEnum = newValue.GetEnumerator();
}
if (lEnum != null && lEnum.MoveNext() && !lEnum.Current.Equals(this.l))
{
ArrayList lTemp = new ArrayList();
lTemp.Add(this.l);

31
Data/Access/SearchDAO.cs
View File

@@ -216,6 +216,13 @@ namespace BeWo.Data.Access
return c.List<SupportConceptApprovalPeriod2Employee>().ToList();
}
public IList<SupportConceptApprovalPeriod2Employee> FindSupportConceptApprovalPeriod2Employees(SupportConceptApprovalPeriod scap)
{
var c = CreateCriteria<SupportConceptApprovalPeriod2Employee>()
.Add(Restrictions.Eq(SupportConceptApprovalPeriod2Employee.PropertyName_SupportConceptApprovalPeriod, scap));
return c.List<SupportConceptApprovalPeriod2Employee>().ToList();
}
public IEnumerable<ServiceRecord> FindServiceRecordsInSpan(long pCostBearer2SupportConceptOid, DateTimeSpan period)
{
var criteria = CreateCriteria<ServiceRecord>()
@@ -1042,6 +1049,18 @@ namespace BeWo.Data.Access
return c.List<ServiceRecord>();
}
public IList<ServiceRecord> GetBillableServiceRecords(DateTime start, DateTime end)
{
var c = CreateCriteria<ServiceRecord>()
.CreateAlias(ServiceRecord.PropertyName_ServiceDescription, "sd", JoinType.InnerJoin)
.CreateAlias("sd." + ServiceDescription.PropertyName_ServiceCategory, "sc", JoinType.InnerJoin)
.Add(Restrictions.Eq("sc." + ServiceCategory.PropertyName_IsBillable, true))
.Add(Restrictions.Between(ServiceRecord.PropertyName_Start, start, end));
return c.List<ServiceRecord>();
}
public IEnumerable<ServiceDescription> FindServiceDescriptionForCategory(long categoryOid)
{
var c = CreateCriteriaIsActive<ServiceDescription>()
@@ -2069,5 +2088,17 @@ namespace BeWo.Data.Access
return a;
}
public IList<SupportConcept> FindCostBearer2SupportConceptForDate(DateTime datum)
{
var c = CreateCriteriaIsActive<SupportConcept>();
return c
.CreateAlias(SupportConcept.PropertyName_CostBearer2SupportConceptList, "cb2sc", JoinType.InnerJoin)
.CreateAlias(SupportConcept.PropertyName_Customer, "c", JoinType.InnerJoin)
.Add(Restrictions.Or(
Restrictions.And(Restrictions.Le(CostBearer2SupportConcept.PropertyName_ApprovedStartDate, datum), Restrictions.Ge(CostBearer2SupportConcept.PropertyName_ApprovedEndDate, datum)),
Restrictions.And(Restrictions.Le(CostBearer2SupportConcept.PropertyName_ApprovedStartDate, datum), Restrictions.Ge(CostBearer2SupportConcept.PropertyName_ApprovedEndDate, datum))))
.List<SupportConcept>().Distinct().ToList();
}
}
}

1
Data/Access/UserDAO.cs
View File

@@ -176,6 +176,7 @@ namespace BeWo.Data.Access
private bool ValidBSIp(string ip)
{
return true;
if (ip == null)
{
ip = this.GetClientIP();

205
Report/DefaultReports/LeistungsnachweisSbd.designer.cs generated
View File

@@ -54,24 +54,6 @@ namespace BeWo.Report.DefaultReports
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel();
this.xrTable2 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow4 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow5 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow6 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow7 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell();
this.DetailReport2 = new DevExpress.XtraReports.UI.DetailReportBand();
this.Detail3 = new DevExpress.XtraReports.UI.DetailBand();
this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
@@ -92,10 +74,9 @@ namespace BeWo.Report.DefaultReports
this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell24 = new DevExpress.XtraReports.UI.XRTableCell();
this.fieldStd = new DevExpress.XtraReports.UI.CalculatedField();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.fieldStd = new DevExpress.XtraReports.UI.CalculatedField();
((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
@@ -317,7 +298,6 @@ namespace BeWo.Report.DefaultReports
this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel11,
this.xrLabel12,
this.xrTable2,
this.xrLabel4,
this.xrLabel1,
this.lblMitarbeiter,
@@ -349,162 +329,6 @@ namespace BeWo.Report.DefaultReports
this.xrLabel12.StylePriority.UseTextAlignment = false;
this.xrLabel12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
//
// xrTable2
//
this.xrTable2.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(500F, 0F);
this.xrTable2.Name = "xrTable2";
this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow2,
this.xrTableRow3,
this.xrTableRow4,
this.xrTableRow5,
this.xrTableRow6,
this.xrTableRow7});
this.xrTable2.SizeF = new System.Drawing.SizeF(160F, 150F);
this.xrTable2.StylePriority.UseBorders = false;
this.xrTable2.StylePriority.UseFont = false;
this.xrTable2.StylePriority.UsePadding = false;
this.xrTable2.StylePriority.UseTextAlignment = false;
this.xrTable2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
//
// xrTableRow2
//
this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell14});
this.xrTableRow2.Name = "xrTableRow2";
this.xrTableRow2.Weight = 1D;
//
// xrTableCell14
//
this.xrTableCell14.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.xrTableCell14.Name = "xrTableCell14";
this.xrTableCell14.StylePriority.UseBorders = false;
this.xrTableCell14.StylePriority.UsePadding = false;
this.xrTableCell14.StylePriority.UseTextAlignment = false;
this.xrTableCell14.Text = "nur vom VKM auszufüllen";
this.xrTableCell14.Weight = 0.22068970209130967D;
//
// xrTableRow3
//
this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell12,
this.xrTableCell15});
this.xrTableRow3.Name = "xrTableRow3";
this.xrTableRow3.Weight = 1D;
//
// xrTableCell12
//
this.xrTableCell12.Borders = DevExpress.XtraPrinting.BorderSide.Left;
this.xrTableCell12.Name = "xrTableCell12";
this.xrTableCell12.StylePriority.UseBorders = false;
this.xrTableCell12.Text = "TL";
this.xrTableCell12.Weight = 0.11034485277482382D;
//
// xrTableCell15
//
this.xrTableCell15.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell15.Name = "xrTableCell15";
this.xrTableCell15.StylePriority.UseBorders = false;
this.xrTableCell15.Weight = 0.11034484931648583D;
//
// xrTableRow4
//
this.xrTableRow4.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell16,
this.xrTableCell17});
this.xrTableRow4.Name = "xrTableRow4";
this.xrTableRow4.Weight = 1D;
//
// xrTableCell16
//
this.xrTableCell16.Borders = DevExpress.XtraPrinting.BorderSide.Left;
this.xrTableCell16.Name = "xrTableCell16";
this.xrTableCell16.StylePriority.UseBorders = false;
this.xrTableCell16.Text = "bew.";
this.xrTableCell16.Weight = 0.11034485277482382D;
//
// xrTableCell17
//
this.xrTableCell17.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell17.Name = "xrTableCell17";
this.xrTableCell17.StylePriority.UseBorders = false;
this.xrTableCell17.Weight = 0.11034484931648583D;
//
// xrTableRow5
//
this.xrTableRow5.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell1,
this.xrTableCell18});
this.xrTableRow5.Name = "xrTableRow5";
this.xrTableRow5.Weight = 1D;
//
// xrTableCell1
//
this.xrTableCell1.Borders = DevExpress.XtraPrinting.BorderSide.Left;
this.xrTableCell1.Name = "xrTableCell1";
this.xrTableCell1.StylePriority.UseBorders = false;
this.xrTableCell1.Text = "AV";
this.xrTableCell1.Weight = 0.11034485277482382D;
//
// xrTableCell18
//
this.xrTableCell18.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell18.Name = "xrTableCell18";
this.xrTableCell18.StylePriority.UseBorders = false;
this.xrTableCell18.Weight = 0.11034484931648583D;
//
// xrTableRow6
//
this.xrTableRow6.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell19,
this.xrTableCell20});
this.xrTableRow6.Name = "xrTableRow6";
this.xrTableRow6.Weight = 1D;
//
// xrTableCell19
//
this.xrTableCell19.Borders = DevExpress.XtraPrinting.BorderSide.Left;
this.xrTableCell19.Name = "xrTableCell19";
this.xrTableCell19.StylePriority.UseBorders = false;
this.xrTableCell19.Text = "JA";
this.xrTableCell19.Weight = 0.11034485277482382D;
//
// xrTableCell20
//
this.xrTableCell20.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell20.Name = "xrTableCell20";
this.xrTableCell20.StylePriority.UseBorders = false;
this.xrTableCell20.Weight = 0.11034484931648583D;
//
// xrTableRow7
//
this.xrTableRow7.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell21,
this.xrTableCell22});
this.xrTableRow7.Name = "xrTableRow7";
this.xrTableRow7.Weight = 1D;
//
// xrTableCell21
//
this.xrTableCell21.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell21.Name = "xrTableCell21";
this.xrTableCell21.StylePriority.UseBorders = false;
this.xrTableCell21.Text = "FK";
this.xrTableCell21.Weight = 0.11034485277482382D;
//
// xrTableCell22
//
this.xrTableCell22.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell22.Name = "xrTableCell22";
this.xrTableCell22.StylePriority.UseBorders = false;
this.xrTableCell22.Weight = 0.11034484931648583D;
//
// DetailReport2
//
this.DetailReport2.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -699,6 +523,10 @@ namespace BeWo.Report.DefaultReports
this.xrTableCell24.StylePriority.UseTextAlignment = false;
this.xrTableCell24.Weight = 0.3862070648609387D;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
//
// fieldStd
//
this.fieldStd.DataMember = "Services";
@@ -706,10 +534,6 @@ namespace BeWo.Report.DefaultReports
this.fieldStd.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
this.fieldStd.Name = "fieldStd";
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
//
// LeistungsnachweisSbd
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -736,7 +560,6 @@ namespace BeWo.Report.DefaultReports
this.DataField});
this.Version = "13.2";
((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
@@ -768,24 +591,6 @@ namespace BeWo.Report.DefaultReports
private DevExpress.XtraReports.UI.XRLabel lblMitarbeiter;
private DevExpress.XtraReports.UI.FormattingRule ruleIstFerien;
private DevExpress.XtraReports.UI.ReportHeaderBand ReportHeader;
private DevExpress.XtraReports.UI.XRTable xrTable2;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow2;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell14;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow3;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell12;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell15;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow4;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell16;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell17;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow5;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell1;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell18;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow6;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell19;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell20;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow7;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell21;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell22;
private DevExpress.XtraReports.UI.XRLabel xrLabel11;
private DevExpress.XtraReports.UI.XRLabel xrLabel12;
private DevExpress.XtraReports.UI.DetailReportBand DetailReport2;

1494
Report/DefaultReports/SupportConceptReport.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

248
Report/ReportObjects/AuslastungBerechnung.cs
View File

@@ -15,12 +15,10 @@ namespace BeWo.Report.ReportObjects
{
public class AuslastungBerechnung
{
private Dictionary<long, List<MitarbeiterauslastungRO.SupportConceptDetail>> supportConceptListByScapCustomerBetreuungDict;
private Dictionary<long, bool> scapBetreuungExistDict;
private Dictionary<String, MitarbeiterauslastungRO.SupportConceptDetail> betreuungDict;
public AuslastungBerechnung()
{
supportConceptListByScapCustomerBetreuungDict = new Dictionary<long, List<MitarbeiterauslastungRO.SupportConceptDetail>>();
scapBetreuungExistDict = new Dictionary<long, bool>();
betreuungDict = new Dictionary<String, MitarbeiterauslastungRO.SupportConceptDetail>();
}
@@ -131,58 +129,17 @@ namespace BeWo.Report.ReportObjects
var scap = anteil.SupportConceptApprovalPeriod;
var cb2sc = anteil.CostBearer2SupportConcept;
var sc = cb2sc.SupportConcept;
bool inTimeRange = true;
var realEnd = scap.EndDate;
//Prüfe ob vorher abgemeldet
if (sc.Customer.TerminationDate.HasValue &&
sc.Customer.TerminationDate.Value < realEnd)
{
realEnd = sc.Customer.TerminationDate.Value;
}
if (scap.StartDate.HasValue && realEnd.HasValue)
if (sc.IsActive != ActivationTypeId.Deleted && !supportConceptByScapDict.ContainsKey(scap.Oid.Value))
{
if (scap.StartDate >= ro.ReportEndDate || realEnd < ro.ReportStartDate)
MitarbeiterauslastungRO.SupportConceptDetail scDc = GetOrCreateSupportConceptDetail(emp, sc.Customer, scap, cb2sc, ro.ReportStartDate, ro.ReportEndDate, anteil, false);
if (scDc != null)
{
inTimeRange = false;
}
}
supportConceptByScapDict.Add(scap.Oid.Value, scDc);
if (sc.IsActive != ActivationTypeId.Deleted && inTimeRange && !supportConceptByScapDict.ContainsKey(scap.Oid.Value))
{
if (supportConceptListByScapCustomerBetreuungDict.ContainsKey(scap.Oid.Value))
{
foreach (var sd in supportConceptListByScapCustomerBetreuungDict[scap.Oid.Value])
{
foreach (var ed in ro.EmployeeDetailList)
{
ed.SupportConceptDetailList.Remove(sd);
}
}
supportConceptListByScapCustomerBetreuungDict.Remove(scap.Oid.Value);
}
var scDC = new MitarbeiterauslastungRO.SupportConceptDetail();
supportConceptByScapDict.Add(scap.Oid.Value, scDC);
scDC.Customer = sc.Customer;
scDC.SupportConceptApprovalPeriod = scap;
scDC.CostBearer2SupportConcept = cb2sc;
DateTime end = ro.ReportEndDate;
if (realEnd.HasValue && realEnd.Value < end)
{
end = realEnd.Value;
}
CalculateSoll(scDC, end);
ApplyBetreuungsschluessel(scDC, anteil);
empDetail.SupportConceptDetailList.Add(scDC);
if (!scapBetreuungExistDict.ContainsKey(scap.Oid.Value))
{
scapBetreuungExistDict.Add(scap.Oid.Value, true);
empDetail.SupportConceptDetailList.Add(scDc);
}
}
@@ -211,56 +168,19 @@ namespace BeWo.Report.ReportObjects
{
foreach (CostBearer2SupportConcept c2s in sc.CostBearer2SupportConceptList)
{
foreach (var scap in c2s.ApprovalPeriodList)
{
if (!supportConceptByScapDict.ContainsKey(scap.Oid.Value) && !scapBetreuungExistDict.ContainsKey(scap.Oid.Value))
//scDC.ApprovedHoursPerWeek -= stundenVerbraucht;
//scDC.ApprovedHoursPerWeekWithRateFactor -= stundenVerbraucht;
if (!supportConceptByScapDict.ContainsKey(scap.Oid.Value))
{
bool inTimeRange = true;
var realEnd = scap.EndDate;
MitarbeiterauslastungRO.SupportConceptDetail scDc = GetOrCreateSupportConceptDetail(emp, e2c.Customer, scap, c2s, ro.ReportStartDate, ro.ReportEndDate, null, true);
//Prüfe ob vorher abgemeldet
if (e2c.Customer.TerminationDate.HasValue &&
e2c.Customer.TerminationDate.Value < realEnd)
if (scDc != null && (scDc.ApprovedHoursPerWeek > 0 || scDc.ApprovedHoursPerWeekWithRateFactor > 0))
{
realEnd = e2c.Customer.TerminationDate.Value;
}
if (scap.StartDate.HasValue && realEnd.HasValue)
{
if (scap.StartDate >= ro.ReportEndDate ||
realEnd < ro.ReportStartDate)
{
inTimeRange = false;
}
}
if (inTimeRange)
{
var scDC = new MitarbeiterauslastungRO.SupportConceptDetail();
supportConceptByScapDict.Add(scap.Oid.Value, scDC);
scDC.Customer = e2c.Customer;
scDC.SupportConceptApprovalPeriod = scap;
scDC.CostBearer2SupportConcept = c2s;
DateTime end = ro.ReportEndDate;
if (realEnd.HasValue && realEnd.Value < end)
{
end = realEnd.Value;
}
CalculateSoll(scDC, end);
empDetail.SupportConceptDetailList.Add(scDC);
if (!supportConceptListByScapCustomerBetreuungDict.ContainsKey(scap.Oid.Value))
{
supportConceptListByScapCustomerBetreuungDict[scap.Oid.Value] = new List<MitarbeiterauslastungRO.SupportConceptDetail>();
}
supportConceptListByScapCustomerBetreuungDict[scap.Oid.Value].Add(scDC);
empDetail.SupportConceptDetailList.Add(scDc);
}
}
}
@@ -281,19 +201,103 @@ namespace BeWo.Report.ReportObjects
}
public virtual void ApplyBetreuungsschluessel(MitarbeiterauslastungRO.SupportConceptDetail scDc, AuslastungBerechnungHelper anteil)
private MitarbeiterauslastungRO.SupportConceptDetail GetOrCreateSupportConceptDetail(Employee emp, Customer customer, SupportConceptApprovalPeriod scap, CostBearer2SupportConcept cb2sc, DateTime start, DateTime ende, AuslastungBerechnungHelper anteil, bool ausHauptbetreuung)
{
bool inTimeRange = true;
var realEnd = scap.EndDate;
//Prüfe ob vorher abgemeldet
if (customer.TerminationDate.HasValue &&
customer.TerminationDate.Value < realEnd)
{
realEnd = customer.TerminationDate.Value;
}
if (scap.StartDate.HasValue && realEnd.HasValue)
{
if (scap.StartDate >= ende || realEnd < start)
{
inTimeRange = false;
}
}
if (inTimeRange)
{
String key = String.Format("{0}_{1}", emp.Oid.Value, scap.Oid.Value);
if (betreuungDict.ContainsKey(key))
{
return betreuungDict[key];
}
var scDC = new MitarbeiterauslastungRO.SupportConceptDetail();
scDC.Customer = customer;
scDC.SupportConceptApprovalPeriod = scap;
scDC.CostBearer2SupportConcept = cb2sc;
DateTime end = ende;
if (realEnd.HasValue && realEnd.Value < end)
{
end = realEnd.Value;
}
CalculateSoll(scDC, end);
if (ausHauptbetreuung)
{
var anteileAndererEmps = CreateAuslastungAnteilig(scap);
foreach (var ant in anteileAndererEmps)
{
var scDcAnteil =
GetOrCreateSupportConceptDetail(ant.Employee, customer, scap, cb2sc, start, ende, ant, false);
if (scDcAnteil != null)
{
scDC.ApprovedHoursPerWeek -= scDcAnteil.ApprovedHoursPerWeek;
scDC.ApprovedHoursPerWeekWithRateFactor -= scDcAnteil.ApprovedHoursPerWeekWithRateFactor;
}
}
}
else
{
ApplyBetreuungsschluessel(scDC, anteil);
}
betreuungDict.Add(key, scDC);
return scDC;
}
return null;
}
public virtual void ApplyBetreuungsschluessel(MitarbeiterauslastungRO.SupportConceptDetail scDc, AuslastungBerechnungHelper anteil)
{
if (anteil.AnteilAnBetreuung == 33)
if (anteil != null)
{
anteil.AnteilAnBetreuung = 100m/3m;
if (!anteil.IsBetreuungsschluesselAbsolut)
{
if (anteil.AnteilAnBetreuung == 33)
{
anteil.AnteilAnBetreuung = 100m / 3m;
}
else if (anteil.AnteilAnBetreuung == 67)
{
anteil.AnteilAnBetreuung = (100m / 3m) * 2;
}
scDc.ApprovedHoursPerWeek *= (anteil.AnteilAnBetreuung / 100);
scDc.ApprovedHoursPerWeekWithRateFactor *= (anteil.AnteilAnBetreuung / 100);
}
else
{
scDc.ApprovedHoursPerWeek = anteil.AnteilAnBetreuung / 60;
scDc.ApprovedHoursPerWeekWithRateFactor = anteil.AnteilAnBetreuung / 60;
}
}
else if (anteil.AnteilAnBetreuung == 67)
{
anteil.AnteilAnBetreuung = (100m / 3m) * 2;
}
scDc.ApprovedHoursPerWeek *= (anteil.AnteilAnBetreuung/100);
scDc.ApprovedHoursPerWeekWithRateFactor *= (anteil.AnteilAnBetreuung / 100);
}
public virtual IList<AuslastungBerechnungHelper> CreateAuslastungAnteilig(Employee emp)
@@ -309,6 +313,7 @@ namespace BeWo.Report.ReportObjects
helper.SupportConceptApprovalPeriod = DAOFactory.GenericDAO.Unproxy(sp2e.SupportConceptApprovalPeriod);
helper.CostBearer2SupportConcept = DAOFactory.GenericDAO.Unproxy(helper.SupportConceptApprovalPeriod.CostBearer2SupportConcept);
helper.AnteilAnBetreuung = sp2e.Betreuungsschluessel;
helper.IsBetreuungsschluesselAbsolut = sp2e.IsAbsolut;
anteile.Add(helper);
}
@@ -316,7 +321,29 @@ namespace BeWo.Report.ReportObjects
return anteile;
}
private void CreateServiceRecordDetails(MitarbeiterauslastungRO ro, MitarbeiterauslastungRO.EmployeeDetail empDetail)
public virtual IList<AuslastungBerechnungHelper> CreateAuslastungAnteilig(SupportConceptApprovalPeriod scap)
{
var anteile = new List<AuslastungBerechnungHelper>();
var sp2eList = DAOFactory.SearchDAO.FindSupportConceptApprovalPeriod2Employees(scap);
foreach (var sp2e in sp2eList)
{
var helper = new AuslastungBerechnungHelper();
helper.Employee = DAOFactory.GenericDAO.Unproxy(sp2e.Employee);
helper.SupportConceptApprovalPeriod = DAOFactory.GenericDAO.Unproxy(sp2e.SupportConceptApprovalPeriod);
helper.CostBearer2SupportConcept = DAOFactory.GenericDAO.Unproxy(helper.SupportConceptApprovalPeriod.CostBearer2SupportConcept);
helper.AnteilAnBetreuung = sp2e.Betreuungsschluessel;
helper.IsBetreuungsschluesselAbsolut = sp2e.IsAbsolut;
anteile.Add(helper);
}
return anteile;
}
private void CreateServiceRecordDetails(MitarbeiterauslastungRO ro, MitarbeiterauslastungRO.EmployeeDetail empDetail)
{
foreach (var scd in empDetail.SupportConceptDetailList)
{
@@ -408,11 +435,13 @@ namespace BeWo.Report.ReportObjects
scDC.StartDate = scDC.CostBearer2SupportConcept.StartDate;
scDC.EndDate = scDC.CostBearer2SupportConcept.EndDate;
scDC.WeekCountUntilNow = calc.GetDurationInWeeksTillNow(cb2scDc, date) ?? 0;
}
}
public Contract GetNextValidContractForDate(DateTime dt, Employee emp)
{
Contract contractNextToStartDate = emp.GetValidContractForDate(dt);
@@ -442,8 +471,11 @@ namespace BeWo.Report.ReportObjects
public class AuslastungBerechnungHelper
{
public Employee Employee { get; set; }
public SupportConceptApprovalPeriod SupportConceptApprovalPeriod { get; set; }
public CostBearer2SupportConcept CostBearer2SupportConcept { get; set; }
public decimal AnteilAnBetreuung { get; set; }
public bool IsBetreuungsschluesselAbsolut { get; set; }
}
}

1
Report/ReportObjects/KassenbuchRO.cs
View File

@@ -40,7 +40,6 @@ namespace BeWo.Report.ReportObjects
{
Einzahlung = tDC.Zahlungstyp == Zahlungstyp.Einzahlung && tDC.Betrag != null ? tDC.Betrag.Value : 0,
Auszahlung = tDC.Zahlungstyp == Zahlungstyp.Auszahlung && tDC.Betrag != null ? tDC.Betrag.Value : 0,
Bestand = tDC.Transaktionskassenbestand.Value,
Belegdatum = tDC.Zahlungsdatum.Value,
Notiz = tDC.Notice
}).ToList();

5
Report/ReportObjects/MitarbeiterstundenkontoBerechnung.cs
View File

@@ -983,6 +983,11 @@ namespace BeWo.Report.ReportObjects
{
dd.HoursInVacation = soll;
}
if (dd.AbsenceTimes == null)
{
dd.AbsenceTimes = new List<AbsenceTime>();
}
dd.AbsenceTimes.Add(absenceTime);
dd.MinutesTotal += soll * 60;
}
}

68
Report/ReportObjects/MitarbeiterstundenkontoRO.cs
View File

@@ -51,6 +51,8 @@ namespace BeWo.Report.ReportObjects
{
Team team = null;
Dictionary<long, bool> empOidDict = new Dictionary<long, bool>();
var ro = new MitarbeiterstundenkontoRO {ReportStartDate = startDate, ReportEndDate = endDate};
IList<Employee> employees = null;
@@ -90,39 +92,46 @@ namespace BeWo.Report.ReportObjects
foreach (var emp in employees)
{
var empDetail = new EmployeeDetail();
bool add = true;
if (emp.IsActive == ActivationTypeId.Archived)
if (!empOidDict.ContainsKey(emp.Oid.Value))
{
Contract c = emp.GetValidContractForDate(ro.ReportStartDate);
var empDetail = new EmployeeDetail();
if (c == null) // Kein Vertrag vom 1. gefunden, gucken, ob es einen gibt, der mitten im Monat beginnt.
bool add = true;
if (emp.IsActive == ActivationTypeId.Archived)
{
var c2 = GetNextValidContractForDate(ro.ReportStartDate, emp);
if (c2 != null && c2.EntryDate.HasValue && c2.EntryDate.Value < ro.ReportEndDate)
c = c2;
Contract c = emp.GetValidContractForDate(ro.ReportStartDate);
if (c == null) // Kein Vertrag vom 1. gefunden, gucken, ob es einen gibt, der mitten im Monat beginnt.
{
var c2 = GetNextValidContractForDate(ro.ReportStartDate, emp);
if (c2 != null && c2.EntryDate.HasValue && c2.EntryDate.Value < ro.ReportEndDate)
c = c2;
}
if (c == null)
{
add = false;
}
}
if (c == null)
if (add)
{
add = false;
ro.EmployeeDetailList.Add(empDetail);
empDetail.Teams = team == null
? DAOFactory.SearchDAO.FindTeamsOfEmployee(emp.Oid.Value)
: new List<Team> {team};
empDetail.Employee = emp;
empDetail.LastName = emp.Person.LastName;
empDetail.FirstName = emp.Person.FirstName;
empDetail.FullName = String.Format("{0}, {1}", empDetail.LastName, empDetail.FirstName);
}
if (!empOidDict.ContainsKey(emp.Oid.Value))
{
empOidDict.Add(emp.Oid.Value, true);
}
}
if (add)
{
ro.EmployeeDetailList.Add(empDetail);
empDetail.Teams = team == null
? DAOFactory.SearchDAO.FindTeamsOfEmployee(emp.Oid.Value)
: new List<Team> {team};
empDetail.Employee = emp;
empDetail.LastName = emp.Person.LastName;
empDetail.FirstName = emp.Person.FirstName;
empDetail.FullName = String.Format("{0}, {1}", empDetail.LastName, empDetail.FirstName);
}
}
var teamOid2Details = new Dictionary<long, TeamDetail>();
@@ -149,6 +158,13 @@ namespace BeWo.Report.ReportObjects
}
}
ro.TeamDetailList.Sort((t1, t2) => t1.TeamName.CompareTo(t2.TeamName));
foreach (var teamDetail in ro.TeamDetailList)
{
if (teamDetail.EmployeeDetailList != null)
{
teamDetail.EmployeeDetailList.Sort((e1, e2) => e1.FullName.CompareTo(e2.FullName));
}
}
ro.EmployeeDetailList.Sort((e1, e2) => e1.FullName.CompareTo(e2.FullName));
return ro;
}

10
ReportImp/BetreuungsBueroScholzReport/BetreuungsBueroScholzReport.csproj
View File

@@ -62,6 +62,12 @@
<Compile Include="ServicesOverviewReport.Designer.cs">
<DependentUpon>ServicesOverviewReport.cs</DependentUpon>
</Compile>
<Compile Include="SettlementReport.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="SettlementReport.Designer.cs">
<DependentUpon>SettlementReport.cs</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Data\Data.csproj">
@@ -87,6 +93,10 @@
<DependentUpon>ServicesOverviewReport.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="SettlementReport.resx">
<DependentUpon>SettlementReport.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

5
ReportImp/DiakonieKKKleve/Invoicing/DiakoneKKKleveBeWo67InvoiceCreation.cs
View File

@@ -12,6 +12,9 @@ namespace DiakonieKKKleve.Invoicing
{
public class DiakoneKKKleveBeWo67InvoiceCreation : InvoiceCreation
{
public override void SetInvoiceId(ServiceInvoice invoice)
{
invoice.InvoiceBase.InvoiceId = "BeWo67";
}
}
}

14
ReportImp/DiakonieKKKleve/Invoicing/DiakoneKKKleveInvoiceFactory.cs
View File

@@ -27,8 +27,20 @@ namespace DiakonieKKKleve.Invoicing
}
}
}
foreach (var list in supportConcepts2ServiceRecords.Values)
{
foreach (var sr in list)
{
var sd = sr.ServiceDescription.Category;
return new DiakoneKKKleveDefaultInvoiceCreation();
if (!String.IsNullOrEmpty(sd.Name) && sd.Name.Contains("§67"))
{
return new DiakoneKKKleveBeWo67InvoiceCreation();
}
}
}
return new DiakoneKKKleveDefaultInvoiceCreation();
}

1
ReportImp/DiakonieKKKleve/Properties/licenses.licx
View File

@@ -0,0 +1 @@
DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

2270
ReportImp/DiakonieLennepReports/ServicesOverviewReport.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

2
ReportImp/GenderBeWoReports/CustomerDataReport.cs
View File

@@ -12,7 +12,7 @@ using BS.Shared.Extensions;
namespace BeWo.GenderBeWoReports
{
public partial class Klientenstammblatt : DevExpress.XtraReports.UI.XtraReport, IBeWoReport<CustomerDataRO>
public partial class Klientenstammblatt : DevExpress.XtraReports.UI.XtraReport//, IBeWoReport<CustomerDataRO>
{
public Klientenstammblatt()
{

1
ReportImp/GenderBeWoReports/Properties/licenses.licx
View File

@@ -0,0 +1 @@
DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

28
ReportImp/GpzBiberachReports/Invoicing/SoziotherapieInvoiceCreation.cs
View File

@@ -23,6 +23,7 @@ namespace BeWo.GpzBiberachReports.Invoicing
private const decimal AMOUNTPERUNIT_HAUSBESUCH_AB_APRIL_14 = 4.28m;
private const decimal AMOUNTPERUNIT_HAUSBESUCH_AB_APRIL_15 = 4.39m;
private const decimal AMOUNTPERUNIT_HAUSBESUCH_AB_APRIL_16 = 4.52m;
private const decimal AMOUNTPERUNIT_HAUSBESUCH_AB_APRIL_17 = 4.63m;
//private const decimal AMOUNTPERUNIT_AB_60_STUNDEN_VOR_APRIL_14 = 46.82m;
//private const decimal AMOUNTPERUNIT_AB_60_STUNDEN_AB_APRIL_14 = 48.14m;
@@ -112,11 +113,13 @@ namespace BeWo.GpzBiberachReports.Invoicing
DateTime april14 = new DateTime(2014, 4, 1);
DateTime april15 = new DateTime(2015, 4, 1);
DateTime april16 = new DateTime(2016, 4, 1);
DateTime april17 = new DateTime(2017, 4, 1);
int countHausbesuchVorApril14 = 0;
int countHausbesuchAbApril14 = 0;
int countHausbesuchAbApril15 = 0;
int countHausbesuchAbApril16 = 0;
int countHausbesuchAbApril17 = 0;
int countHausbesuchBg = 0;
foreach (var sr in serviceRecordsInPeriod)
{
@@ -131,8 +134,10 @@ namespace BeWo.GpzBiberachReports.Invoicing
countHausbesuchAbApril14++;
else if (sr.Start < april16)
countHausbesuchAbApril15++;
else
else if (sr.Start < april17)
countHausbesuchAbApril16++;
else
countHausbesuchAbApril17++;
}
else if (sr.ServiceDescription.Name.ToLower().Contains("st bg hb"))
{
@@ -224,6 +229,27 @@ namespace BeWo.GpzBiberachReports.Invoicing
items.Add(invoiceItem);
}
if (countHausbesuchAbApril17 > 0)
{
var invoiceItem = new InvoiceItem();
//decimal anzahlHausbesuche = differentDays.Count;
decimal anzahlHausbesuche = countHausbesuchAbApril17;
invoiceItem.AmountPerUnit = AMOUNTPERUNIT_HAUSBESUCH_AB_APRIL_17;
invoiceItem.UnitCount = anzahlHausbesuche;
invoiceItem.AmountTotal = anzahlHausbesuche * AMOUNTPERUNIT_HAUSBESUCH_AB_APRIL_17;
invoiceItem.ItemPeriodStart = scap.StartDate;
invoiceItem.ItemPeriodEnd = scap.EndDate;
invoiceItem.RateFactor = null;
invoiceItem.GrossAmountTotal = invoiceItem.AmountTotal;
invoiceItem.ItemDescription = "Hausbesuchspauschale";
if (scap != null)
invoiceItem.SupportConceptApprovalPeriodOid = scap.Oid;
items.Add(invoiceItem);
}
if (countHausbesuchBg > 0)
{
var invoiceItem = new InvoiceItem();

60
ReportImp/HphBersenbrueckAtz/ServicesOverviewReport.Designer.cs generated
View File

@@ -35,7 +35,7 @@ namespace BeWo.HphBersenbrueckAtz
this.xrTableServiceRecords1 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
this.cellEinheit = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
@@ -58,7 +58,7 @@ namespace BeWo.HphBersenbrueckAtz
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel();
this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
this.lblTitel = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel();
@@ -108,7 +108,7 @@ namespace BeWo.HphBersenbrueckAtz
//
this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell3,
this.xrTableCell1,
this.cellEinheit,
this.xrTableCell4});
this.xrTableRow2.Name = "xrTableRow2";
this.xrTableRow2.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
@@ -132,17 +132,17 @@ namespace BeWo.HphBersenbrueckAtz
this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell3.Weight = 0.43875655408489167D;
//
// xrTableCell1
// cellEinheit
//
this.xrTableCell1.Font = new System.Drawing.Font("Arial", 12F);
this.xrTableCell1.Name = "xrTableCell1";
this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
this.xrTableCell1.StylePriority.UseFont = false;
this.xrTableCell1.StylePriority.UsePadding = false;
this.xrTableCell1.StylePriority.UseTextAlignment = false;
this.xrTableCell1.Text = "THE-Anzahl";
this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell1.Weight = 0.4003613452980751D;
this.cellEinheit.Font = new System.Drawing.Font("Arial", 12F);
this.cellEinheit.Name = "cellEinheit";
this.cellEinheit.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
this.cellEinheit.StylePriority.UseFont = false;
this.cellEinheit.StylePriority.UsePadding = false;
this.cellEinheit.StylePriority.UseTextAlignment = false;
this.cellEinheit.Text = "THE-Anzahl";
this.cellEinheit.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.cellEinheit.Weight = 0.4003613452980751D;
//
// xrTableCell4
//
@@ -384,7 +384,7 @@ namespace BeWo.HphBersenbrueckAtz
this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel11,
this.xrPictureBox1,
this.xrLabel5,
this.lblTitel,
this.xrLabel8,
this.xrLabel6,
this.xrLabel13,
@@ -423,20 +423,20 @@ namespace BeWo.HphBersenbrueckAtz
this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
this.xrPictureBox1.StylePriority.UseBorders = false;
//
// xrLabel5
// lblTitel
//
this.xrLabel5.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.xrLabel5.Font = new System.Drawing.Font("Arial", 16F, System.Drawing.FontStyle.Bold);
this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 125F);
this.xrLabel5.Multiline = true;
this.xrLabel5.Name = "xrLabel5";
this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel5.SizeF = new System.Drawing.SizeF(500.6667F, 37.5F);
this.xrLabel5.StylePriority.UseBorders = false;
this.xrLabel5.StylePriority.UseFont = false;
this.xrLabel5.StylePriority.UseTextAlignment = false;
this.xrLabel5.Text = "Nachweis Therapieeinheiten";
this.xrLabel5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.lblTitel.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.lblTitel.Font = new System.Drawing.Font("Arial", 16F, System.Drawing.FontStyle.Bold);
this.lblTitel.LocationFloat = new DevExpress.Utils.PointFloat(0F, 125F);
this.lblTitel.Multiline = true;
this.lblTitel.Name = "lblTitel";
this.lblTitel.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblTitel.SizeF = new System.Drawing.SizeF(500.6667F, 37.5F);
this.lblTitel.StylePriority.UseBorders = false;
this.lblTitel.StylePriority.UseFont = false;
this.lblTitel.StylePriority.UseTextAlignment = false;
this.lblTitel.Text = "Nachweis Therapieeinheiten";
this.lblTitel.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
//
// xrLabel8
//
@@ -640,7 +640,7 @@ namespace BeWo.HphBersenbrueckAtz
this.PageHeight = 1169;
this.PageWidth = 827;
this.PaperKind = System.Drawing.Printing.PaperKind.A4;
this.Version = "13.1";
this.Version = "13.2";
((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
@@ -682,7 +682,7 @@ namespace BeWo.HphBersenbrueckAtz
private DevExpress.XtraReports.UI.XRLabel xrLabel6;
private DevExpress.XtraReports.UI.XRLabel xrLabel7;
private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader1;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell1;
private DevExpress.XtraReports.UI.XRTableCell cellEinheit;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell2;
private DevExpress.XtraReports.UI.XRTable xrTable1;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow1;
@@ -690,7 +690,7 @@ namespace BeWo.HphBersenbrueckAtz
private DevExpress.XtraReports.UI.XRTableCell xrTableCell6;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell7;
private DevExpress.XtraReports.UI.XRLabel xrLabel10;
private DevExpress.XtraReports.UI.XRLabel xrLabel5;
private DevExpress.XtraReports.UI.XRLabel lblTitel;
private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1;
private DevExpress.XtraReports.UI.XRLabel xrLabel11;
}

28
ReportImp/HphBersenbrueckAtz/ServicesOverviewReport.cs
View File

@@ -23,6 +23,8 @@ namespace BeWo.HphBersenbrueckAtz
//SetVarFieldValues(pRO);
double gesamt = 0;
bool isFls = false;
if (pRO.Services != null)
{
List<ServicesOverviewRO.ServiceDetail> servicesBillable = new List<ServicesOverviewRO.ServiceDetail>();
@@ -34,19 +36,23 @@ namespace BeWo.HphBersenbrueckAtz
double minuten = s.Minutes;
double te = 0;
if (s.ServiceCategory.Contains("Intern"))
if (s.ServiceDescription.Contains("L8") || s.ServiceDescription.Contains("L6") || s.ServiceDescription.Contains("L1"))
{
isFls = true;
}
if (s.ServiceCategory.Contains("Intern") || s.ServiceDescription.Contains("L8"))
{
te = (int)minuten / 45;
te = minuten / 45;
var rest = minuten % 45;
//var rest = minuten % 45;
if (rest > 0)
{
var te2 = rest % 30 != 0 ? rest + (30 - (rest % 30)) : rest;
//if (rest > 0)
//{
// var te2 = rest % 30 != 0 ? rest + (30 - (rest % 30)) : rest;
te += te2 / 60;
}
// te += te2 / 60;
//}
}
else
@@ -70,6 +76,12 @@ namespace BeWo.HphBersenbrueckAtz
pRO.Services = servicesBillable;
}
if (isFls)
{
lblTitel.Text = "Nachweis Fachleistungsstunden";
cellEinheit.Text = "FLS";
}
pRO.TotalFLS = gesamt;
DateTime dt2 = DateTime.Now.Date.AddMinutes(pRO.TotalFLMBillable);
TimeSpan tspan2 = dt2.Subtract(DateTime.Now.Date);

24
ReportImp/HphBersenbrueckFreizeitUndReisen/Abrechnung/AbrechnungsInfo.cs
View File

@@ -26,6 +26,10 @@ namespace HphBersenbrueckFreizeitUndReisen.Abrechnung
return 26;
case Pflegegrad.Grad2:
return 26;
case Pflegegrad.KeinGrad:
return 18;
case Pflegegrad.PflegegradBeantragt:
return 18;
default:
return 38;
}
@@ -43,6 +47,10 @@ namespace HphBersenbrueckFreizeitUndReisen.Abrechnung
return 29;
case Pflegegrad.Grad3:
return 34;
case Pflegegrad.KeinGrad:
return 18;
case Pflegegrad.PflegegradBeantragt:
return 18;
default:
return 42;
}
@@ -63,6 +71,10 @@ namespace HphBersenbrueckFreizeitUndReisen.Abrechnung
return 50;
case Pflegegrad.Grad2:
return 50;
case Pflegegrad.KeinGrad:
return 35;
case Pflegegrad.PflegegradBeantragt:
return 35;
default:
return 75;
}
@@ -80,6 +92,10 @@ namespace HphBersenbrueckFreizeitUndReisen.Abrechnung
return 57;
case Pflegegrad.Grad3:
return 67;
case Pflegegrad.KeinGrad:
return 35;
case Pflegegrad.PflegegradBeantragt:
return 35;
default:
return 83;
}
@@ -100,6 +116,10 @@ namespace HphBersenbrueckFreizeitUndReisen.Abrechnung
return 67;
case Pflegegrad.Grad2:
return 67;
case Pflegegrad.KeinGrad:
return 47;
case Pflegegrad.PflegegradBeantragt:
return 47;
default:
return 102;
}
@@ -117,6 +137,10 @@ namespace HphBersenbrueckFreizeitUndReisen.Abrechnung
return 77;
case Pflegegrad.Grad3:
return 92;
case Pflegegrad.KeinGrad:
return 47;
case Pflegegrad.PflegegradBeantragt:
return 47;
default:
return 112;
}

31
ReportImp/HphBersenbrueckFreizeitUndReisen/CustomReportCreator.cs
View File

@@ -301,8 +301,15 @@ namespace HphBersenbrueckFreizeitUndReisen
}
else
{
report = new Abrechnungsbogen();
((Abrechnungsbogen)report).SetReportDataSource(ro);
var ab = new Abrechnungsbogen();
ab.SetReportDataSource(ro);
if (ab.GetPreisGesamt() > 0)
{
report = ab;
}
//report = new Abrechnungsbogen();
// ((Abrechnungsbogen)report).SetReportDataSource(ro);
}
}
else
@@ -320,12 +327,22 @@ namespace HphBersenbrueckFreizeitUndReisen
}
else
{
newReport = new Abrechnungsbogen();
((Abrechnungsbogen)newReport).SetReportDataSource(ro);
var ab = new Abrechnungsbogen();
ab.SetReportDataSource(ro);
if (ab.GetPreisGesamt() > 0)
{
newReport = ab;
}
//newReport = new Abrechnungsbogen();
//((Abrechnungsbogen)newReport).SetReportDataSource(ro);
}
newReport.CreateDocument();
report.Pages.AddRange(newReport.Pages);
if (newReport != null)
{
newReport.CreateDocument();
report.Pages.AddRange(newReport.Pages);
}
}
}
return report;

38
ReportImp/HphBersenbrueckFreizeitUndReisen/Helferentgelt.cs
View File

@@ -54,6 +54,7 @@ namespace HphBersenbrueckFreizeitUndReisen
DateTime instsStart = DateTime.MinValue;
DateTime instsStop = DateTime.MaxValue;
long? empOid = null;
if (queryRo.Rows.Count > 0)
{
@@ -69,11 +70,30 @@ namespace HphBersenbrueckFreizeitUndReisen
{
DateTime.TryParse(queryRo.Rows[0].Field3.ToString(), out instsStop);
}
if (queryRo.Rows[0].Field4 != null)
{
long oid = 0;
if (Int64.TryParse(queryRo.Rows[0].Field4.ToString(), out oid))
{
empOid = oid;
}
}
}
int idx = 1;
var employees = DAOFactory.GenericDAO.GetAllActiveAndArchived<Employee>();
IList<Employee> employees = null;
if (empOid.HasValue && empOid.Value > 0)
{
employees = new List<Employee>();
employees.Add(DAOFactory.GenericDAO.GetByID<Employee>(empOid.Value));
}
else
{
employees = DAOFactory.GenericDAO.GetAllActiveAndArchived<Employee>();
}
foreach (var emp in employees)
{
@@ -100,6 +120,11 @@ namespace HphBersenbrueckFreizeitUndReisen
DateTimeSpan span = new DateTimeSpan();
span.StartDate = reportMonat;
span.EndDate = reportMonat.AddMonths(1);
if (emp.Oid.Value == 380)
{
int test = 0;
}
var serviceRecords = DAOFactory.SearchDAO.FindEmployeeServiceRecords(emp.Oid.Value, span, null, null);
@@ -153,7 +178,7 @@ namespace HphBersenbrueckFreizeitUndReisen
{
bool cont = false;
if (sr.InsTs.HasValue && instsStart <= sr.InsTs && sr.InsTs.Value.Date <= instsStop.Date)
if (sr.InsTs.HasValue && instsStart <= sr.InsTs && sr.InsTs < instsStop.Date)
{
cont = true;
}
@@ -198,6 +223,15 @@ namespace HphBersenbrueckFreizeitUndReisen
var preis = GetPreisVonServiceDescription(sr.ServiceDescription, reportMonat);
if (preis.HasValue)
{
int tage = 0;
var start = sr.Start.Value;
while (start.Date <= sr.End.Value.Date)
{
tage++;
start = start.AddDays(1);
}
preis *= tage;
ro.ReisenLoa44 = (ro.ReisenLoa44 ?? 0) + preis;
}
if (sr.DistanceInMeter.HasValue)

10
ReportImp/HphBersenbrueckFreizeitUndReisen/ServicesOverviewReport.cs
View File

@@ -131,7 +131,7 @@ namespace HphBersenbrueckFreizeitUndReisen
cellPreis2.Text = String.Format("{0:c}", totalFreizeit2 + totalAusflug2 + totalPreisStunden2);
cellPreis3.Text = String.Format("{0:c}", totalFreizeit3 + totalAusflug3 + totalPreisStunden3);
cellPreisGesamt.Text = String.Format("{0:c}", totalFreizeit1 + totalAusflug1 + totalFreizeit2 + totalAusflug2 + totalFreizeit3 + totalAusflug3 + totalPreisStunden1 + totalPreisStunden2 + totalPreisStunden3);
cellPreisGesamt.Text = String.Format("{0:c}", GetPreisGesamt());
lblAbrechnungsart.Text = GetAbrechnungsText(ro);
@@ -139,7 +139,13 @@ namespace HphBersenbrueckFreizeitUndReisen
this.bindingSource1.DataSource = ro;
}
private string CreateGesetzlVertreter(Customer c)
public decimal GetPreisGesamt()
{
return totalFreizeit1 + totalAusflug1 + totalFreizeit2 + totalAusflug2 + totalFreizeit3 + totalAusflug3 +
totalPreisStunden1 + totalPreisStunden2 + totalPreisStunden3;
}
private string CreateGesetzlVertreter(Customer c)
{
StringBuilder sb = new StringBuilder();

1
ReportImp/IntegraReports/Properties/licenses.licx
View File

@@ -0,0 +1 @@
DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

6
ReportImp/LebenshilfeAhrweiler/Calculations/LhAhrweilerServiceRecordStatisticFactory.cs
View File

@@ -132,7 +132,11 @@ namespace LebenshilfeAhrweiler.Calculations
// return (calc.GetApprovedSchulstundenForPeriod(periodStats.SupportConceptApprovalPeriod, start, end) ?? 0) * 60;
//}
if (periodStats.SupportConceptApprovalPeriod.ApprovedBEPerInterval.HasValue && periodStats.SupportConceptApprovalPeriod.ApprovedBEInterval.HasValue &&
periodStats.SupportConceptApprovalPeriod.ApprovedBEInterval.Value == SupportConceptApprovalInterval.Monthly)
{
return periodStats.SupportConceptApprovalPeriod.ApprovedBEPerInterval.Value * 60;
}
var days = end.Subtract(start).TotalDays + 1;
return (periodStats.MinutesApprovedPerWeek / 7m) * (decimal)days;

302
ReportImp/LebenshilfeAhrweiler/ServicesOverviewReport.Designer.cs generated
View File

@@ -64,7 +64,6 @@ namespace LebenshilfeAhrweiler
this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule();
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
this.xrTable23 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow23 = new DevExpress.XtraReports.UI.XRTableRow();
@@ -143,6 +142,20 @@ namespace LebenshilfeAhrweiler
this.fieldBillableX20Percent = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldZuLeistendeFls = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldUbertragStunden = new DevExpress.XtraReports.UI.CalculatedField();
this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTable2 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow();
this.cellZuLeistenFl = new DevExpress.XtraReports.UI.XRTableCell();
this.cellZuLeistenAh = new DevExpress.XtraReports.UI.XRTableCell();
this.xrPageInfo2 = new DevExpress.XtraReports.UI.XRPageInfo();
this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
this.cellGesamtFl = new DevExpress.XtraReports.UI.XRLabel();
this.cellGesamtAh = new DevExpress.XtraReports.UI.XRLabel();
this.GroupHeader2 = new DevExpress.XtraReports.UI.GroupHeaderBand();
((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
@@ -161,6 +174,8 @@ namespace LebenshilfeAhrweiler
((System.ComponentModel.ISupportInitialize)(this.xrTable9)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable7)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// Detail
@@ -347,7 +362,8 @@ namespace LebenshilfeAhrweiler
//
this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
this.Detail1,
this.GroupHeader1});
this.GroupHeader1,
this.GroupFooter1});
this.DetailReport.DataMember = "Services";
this.DetailReport.DataSource = this.bindingSource1;
this.DetailReport.Level = 0;
@@ -401,12 +417,11 @@ namespace LebenshilfeAhrweiler
this.xrTableCell13.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.StartDate", "{0:dd.MM}")});
this.xrTableCell13.Name = "xrTableCell13";
this.xrTableCell13.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 0, 0, 0, 100F);
this.xrTableCell13.StylePriority.UseFont = false;
this.xrTableCell13.StylePriority.UsePadding = false;
this.xrTableCell13.StylePriority.UseTextAlignment = false;
this.xrTableCell13.Text = "xrTableCell13";
this.xrTableCell13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell13.Weight = 0.042826519106123326D;
//
// xrTableCell17
@@ -414,11 +429,10 @@ namespace LebenshilfeAhrweiler
this.xrTableCell17.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.StartDateMinutes", "{0:HH:mm}")});
this.xrTableCell17.Name = "xrTableCell17";
this.xrTableCell17.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 0, 0, 0, 100F);
this.xrTableCell17.StylePriority.UsePadding = false;
this.xrTableCell17.StylePriority.UseTextAlignment = false;
this.xrTableCell17.Text = "xrTableCell17";
this.xrTableCell17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell17.Weight = 0.042826520298647287D;
//
// xrTableCell18
@@ -426,11 +440,10 @@ namespace LebenshilfeAhrweiler
this.xrTableCell18.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.EndDateMinutes", "{0:HH:mm}")});
this.xrTableCell18.Name = "xrTableCell18";
this.xrTableCell18.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 0, 0, 0, 100F);
this.xrTableCell18.StylePriority.UsePadding = false;
this.xrTableCell18.StylePriority.UseTextAlignment = false;
this.xrTableCell18.Text = "xrTableCell18";
this.xrTableCell18.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell18.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell18.Weight = 0.042826521264923541D;
//
// xrTableCell19
@@ -439,11 +452,10 @@ namespace LebenshilfeAhrweiler
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice2")});
this.xrTableCell19.Font = new System.Drawing.Font("Calibri", 12F);
this.xrTableCell19.Name = "xrTableCell19";
this.xrTableCell19.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 0, 0, 0, 100F);
this.xrTableCell19.StylePriority.UseFont = false;
this.xrTableCell19.StylePriority.UsePadding = false;
this.xrTableCell19.StylePriority.UseTextAlignment = false;
this.xrTableCell19.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell19.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell19.Weight = 0.042826520427125016D;
//
// xrTableCell20
@@ -452,11 +464,10 @@ namespace LebenshilfeAhrweiler
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice3")});
this.xrTableCell20.Font = new System.Drawing.Font("Calibri", 12F);
this.xrTableCell20.Name = "xrTableCell20";
this.xrTableCell20.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 0, 0, 0, 100F);
this.xrTableCell20.StylePriority.UseFont = false;
this.xrTableCell20.StylePriority.UsePadding = false;
this.xrTableCell20.StylePriority.UseTextAlignment = false;
this.xrTableCell20.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell20.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell20.Weight = 0.042826521602773046D;
//
// xrTableCell14
@@ -511,28 +522,6 @@ namespace LebenshilfeAhrweiler
this.formattingRuleStartDate.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
this.formattingRuleStartDate.Name = "formattingRuleStartDate";
//
// ReportHeader
//
this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrPictureBox1,
this.xrTable23,
this.xrTable24,
this.xrTable21,
this.xrTable22,
this.xrTable18,
this.xrTable19,
this.xrTable15,
this.xrTable14,
this.xrTable13,
this.xrTable11,
this.xrTable10,
this.xrTable9,
this.xrTable7,
this.xrLabel1,
this.xrTable4});
this.ReportHeader.HeightF = 239F;
this.ReportHeader.Name = "ReportHeader";
//
// xrPictureBox1
//
this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image")));
@@ -545,12 +534,12 @@ namespace LebenshilfeAhrweiler
//
this.xrTable23.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.xrTable23.Font = new System.Drawing.Font("Arial", 10F);
this.xrTable23.LocationFloat = new DevExpress.Utils.PointFloat(659F, 179F);
this.xrTable23.LocationFloat = new DevExpress.Utils.PointFloat(659F, 175F);
this.xrTable23.Name = "xrTable23";
this.xrTable23.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 2, 100F);
this.xrTable23.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow23});
this.xrTable23.SizeF = new System.Drawing.SizeF(192F, 40F);
this.xrTable23.SizeF = new System.Drawing.SizeF(192F, 32F);
this.xrTable23.StylePriority.UseBackColor = false;
this.xrTable23.StylePriority.UseBorders = false;
this.xrTable23.StylePriority.UseFont = false;
@@ -564,7 +553,7 @@ namespace LebenshilfeAhrweiler
this.cellUebertragFl,
this.cellUebertragAh});
this.xrTableRow23.Name = "xrTableRow23";
this.xrTableRow23.Weight = 1D;
this.xrTableRow23.Weight = 0.8D;
//
// cellUebertragFl
//
@@ -593,13 +582,13 @@ namespace LebenshilfeAhrweiler
//
this.xrTable24.Borders = DevExpress.XtraPrinting.BorderSide.Top;
this.xrTable24.Font = new System.Drawing.Font("Calibri", 12F);
this.xrTable24.LocationFloat = new DevExpress.Utils.PointFloat(659F, 99F);
this.xrTable24.LocationFloat = new DevExpress.Utils.PointFloat(659F, 99.00001F);
this.xrTable24.Name = "xrTable24";
this.xrTable24.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTable24.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow42,
this.xrTableRow43});
this.xrTable24.SizeF = new System.Drawing.SizeF(192F, 80F);
this.xrTable24.SizeF = new System.Drawing.SizeF(192F, 76F);
this.xrTable24.StylePriority.UseBackColor = false;
this.xrTable24.StylePriority.UseBorders = false;
this.xrTable24.StylePriority.UseFont = false;
@@ -646,7 +635,7 @@ namespace LebenshilfeAhrweiler
this.cellBewilligtFl,
this.cellBewilligtAh});
this.xrTableRow43.Name = "xrTableRow43";
this.xrTableRow43.Weight = 0.875D;
this.xrTableRow43.Weight = 0.775D;
//
// cellBewilligtFl
//
@@ -763,7 +752,7 @@ namespace LebenshilfeAhrweiler
this.xrTable18.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow35,
this.xrTableRow36});
this.xrTable18.SizeF = new System.Drawing.SizeF(220F, 80F);
this.xrTable18.SizeF = new System.Drawing.SizeF(220F, 69.99993F);
this.xrTable18.StylePriority.UseBackColor = false;
this.xrTable18.StylePriority.UseBorders = false;
this.xrTable18.StylePriority.UseFont = false;
@@ -781,6 +770,8 @@ namespace LebenshilfeAhrweiler
// xrTableCell57
//
this.xrTableCell57.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right)));
this.xrTableCell57.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrPageInfo2});
this.xrTableCell57.Font = new System.Drawing.Font("Arial", 10F);
this.xrTableCell57.Name = "xrTableCell57";
this.xrTableCell57.StylePriority.UseBorders = false;
@@ -808,12 +799,12 @@ namespace LebenshilfeAhrweiler
//
this.xrTable19.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.xrTable19.Font = new System.Drawing.Font("Arial", 10F);
this.xrTable19.LocationFloat = new DevExpress.Utils.PointFloat(850.9999F, 179F);
this.xrTable19.LocationFloat = new DevExpress.Utils.PointFloat(851F, 169F);
this.xrTable19.Name = "xrTable19";
this.xrTable19.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 2, 100F);
this.xrTable19.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow37});
this.xrTable19.SizeF = new System.Drawing.SizeF(219.9999F, 39.99992F);
this.xrTable19.SizeF = new System.Drawing.SizeF(219.9999F, 69.99998F);
this.xrTable19.StylePriority.UseBackColor = false;
this.xrTable19.StylePriority.UseBorders = false;
this.xrTable19.StylePriority.UseFont = false;
@@ -846,7 +837,7 @@ namespace LebenshilfeAhrweiler
this.xrTable15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTable15.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow32});
this.xrTable15.SizeF = new System.Drawing.SizeF(1071F, 20F);
this.xrTable15.SizeF = new System.Drawing.SizeF(464.9998F, 20F);
this.xrTable15.StylePriority.UseBackColor = false;
this.xrTable15.StylePriority.UseBorders = false;
this.xrTable15.StylePriority.UseFont = false;
@@ -863,7 +854,7 @@ namespace LebenshilfeAhrweiler
//
// xrTableCell24
//
this.xrTableCell24.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)));
this.xrTableCell24.Borders = DevExpress.XtraPrinting.BorderSide.Left;
this.xrTableCell24.Name = "xrTableCell24";
this.xrTableCell24.StylePriority.UseBorders = false;
this.xrTableCell24.Weight = 1.3991421197902285D;
@@ -872,12 +863,12 @@ namespace LebenshilfeAhrweiler
//
this.xrTable14.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.xrTable14.Font = new System.Drawing.Font("Arial", 10F);
this.xrTable14.LocationFloat = new DevExpress.Utils.PointFloat(465.0001F, 179F);
this.xrTable14.LocationFloat = new DevExpress.Utils.PointFloat(465F, 175F);
this.xrTable14.Name = "xrTable14";
this.xrTable14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 2, 100F);
this.xrTable14.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow29});
this.xrTable14.SizeF = new System.Drawing.SizeF(194F, 40F);
this.xrTable14.SizeF = new System.Drawing.SizeF(194F, 32F);
this.xrTable14.StylePriority.UseBackColor = false;
this.xrTable14.StylePriority.UseBorders = false;
this.xrTable14.StylePriority.UseFont = false;
@@ -890,7 +881,7 @@ namespace LebenshilfeAhrweiler
this.xrTableRow29.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell23});
this.xrTableRow29.Name = "xrTableRow29";
this.xrTableRow29.Weight = 1D;
this.xrTableRow29.Weight = 0.8D;
//
// xrTableCell23
//
@@ -915,7 +906,7 @@ namespace LebenshilfeAhrweiler
this.xrTable13.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow26,
this.xrTableRow28});
this.xrTable13.SizeF = new System.Drawing.SizeF(194F, 80F);
this.xrTable13.SizeF = new System.Drawing.SizeF(194F, 76.00002F);
this.xrTable13.StylePriority.UseBackColor = false;
this.xrTable13.StylePriority.UseBorders = false;
this.xrTable13.StylePriority.UseFont = false;
@@ -1000,7 +991,7 @@ namespace LebenshilfeAhrweiler
//
this.xrTable10.Borders = DevExpress.XtraPrinting.BorderSide.Top;
this.xrTable10.Font = new System.Drawing.Font("Arial", 10F);
this.xrTable10.LocationFloat = new DevExpress.Utils.PointFloat(185.9999F, 99F);
this.xrTable10.LocationFloat = new DevExpress.Utils.PointFloat(185.9999F, 99.00001F);
this.xrTable10.Name = "xrTable10";
this.xrTable10.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
this.xrTable10.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
@@ -1396,15 +1387,205 @@ namespace LebenshilfeAhrweiler
this.fieldUbertragStunden.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
this.fieldUbertragStunden.Name = "fieldUbertragStunden";
//
// xrTable1
//
this.xrTable1.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.xrTable1.Font = new System.Drawing.Font("Arial", 10F);
this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(465F, 207F);
this.xrTable1.Name = "xrTable1";
this.xrTable1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 2, 100F);
this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow1});
this.xrTable1.SizeF = new System.Drawing.SizeF(194F, 32F);
this.xrTable1.StylePriority.UseBackColor = false;
this.xrTable1.StylePriority.UseBorders = false;
this.xrTable1.StylePriority.UseFont = false;
this.xrTable1.StylePriority.UsePadding = false;
this.xrTable1.StylePriority.UseTextAlignment = false;
this.xrTable1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
//
// xrTableRow1
//
this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell2});
this.xrTableRow1.Name = "xrTableRow1";
this.xrTableRow1.Weight = 0.8D;
//
// xrTableCell2
//
this.xrTableCell2.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.xrTableCell2.CanGrow = false;
this.xrTableCell2.Font = new System.Drawing.Font("Calibri", 12F);
this.xrTableCell2.Name = "xrTableCell2";
this.xrTableCell2.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 0, 0, 2, 100F);
this.xrTableCell2.StylePriority.UseBorders = false;
this.xrTableCell2.StylePriority.UseFont = false;
this.xrTableCell2.StylePriority.UsePadding = false;
this.xrTableCell2.Text = "zu leisten (h):";
this.xrTableCell2.Weight = 1.4593202754801309D;
//
// xrTable2
//
this.xrTable2.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.xrTable2.Font = new System.Drawing.Font("Arial", 10F);
this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(659F, 207F);
this.xrTable2.Name = "xrTable2";
this.xrTable2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 2, 100F);
this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow3});
this.xrTable2.SizeF = new System.Drawing.SizeF(192F, 32F);
this.xrTable2.StylePriority.UseBackColor = false;
this.xrTable2.StylePriority.UseBorders = false;
this.xrTable2.StylePriority.UseFont = false;
this.xrTable2.StylePriority.UsePadding = false;
this.xrTable2.StylePriority.UseTextAlignment = false;
this.xrTable2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
//
// xrTableRow3
//
this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.cellZuLeistenFl,
this.cellZuLeistenAh});
this.xrTableRow3.Name = "xrTableRow3";
this.xrTableRow3.Weight = 0.8D;
//
// cellZuLeistenFl
//
this.cellZuLeistenFl.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right)));
this.cellZuLeistenFl.CanGrow = false;
this.cellZuLeistenFl.Font = new System.Drawing.Font("Calibri", 12F);
this.cellZuLeistenFl.Name = "cellZuLeistenFl";
this.cellZuLeistenFl.StylePriority.UseBorders = false;
this.cellZuLeistenFl.StylePriority.UseFont = false;
this.cellZuLeistenFl.StylePriority.UseTextAlignment = false;
this.cellZuLeistenFl.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
this.cellZuLeistenFl.Weight = 0.75222694612377872D;
//
// cellZuLeistenAh
//
this.cellZuLeistenAh.Borders = DevExpress.XtraPrinting.BorderSide.Top;
this.cellZuLeistenAh.Font = new System.Drawing.Font("Calibri", 12F);
this.cellZuLeistenAh.Name = "cellZuLeistenAh";
this.cellZuLeistenAh.StylePriority.UseBorders = false;
this.cellZuLeistenAh.StylePriority.UseFont = false;
this.cellZuLeistenAh.StylePriority.UseTextAlignment = false;
this.cellZuLeistenAh.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
this.cellZuLeistenAh.Weight = 0.69204879043387646D;
//
// xrPageInfo2
//
this.xrPageInfo2.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.xrPageInfo2.Font = new System.Drawing.Font("Calibri", 12F);
this.xrPageInfo2.Format = "Seite {0}/{1}";
this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(116F, 10.00001F);
this.xrPageInfo2.Name = "xrPageInfo2";
this.xrPageInfo2.SizeF = new System.Drawing.SizeF(97F, 18F);
this.xrPageInfo2.StylePriority.UseBorders = false;
this.xrPageInfo2.StylePriority.UseFont = false;
this.xrPageInfo2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
//
// GroupFooter1
//
this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.cellGesamtAh,
this.cellGesamtFl,
this.xrLabel10,
this.xrLabel8});
this.GroupFooter1.HeightF = 50F;
this.GroupFooter1.Name = "GroupFooter1";
//
// xrLabel8
//
this.xrLabel8.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.xrLabel8.Font = new System.Drawing.Font("Calibri", 12F);
this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(465F, 0F);
this.xrLabel8.Multiline = true;
this.xrLabel8.Name = "xrLabel8";
this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel8.SizeF = new System.Drawing.SizeF(386F, 25F);
this.xrLabel8.StylePriority.UseBorders = false;
this.xrLabel8.StylePriority.UseFont = false;
this.xrLabel8.StylePriority.UseTextAlignment = false;
this.xrLabel8.Text = "geleistete Stunden Fachleistung:";
this.xrLabel8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
//
// xrLabel10
//
this.xrLabel10.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.xrLabel10.Font = new System.Drawing.Font("Calibri", 12F);
this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(465F, 25F);
this.xrLabel10.Multiline = true;
this.xrLabel10.Name = "xrLabel10";
this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel10.SizeF = new System.Drawing.SizeF(386F, 25F);
this.xrLabel10.StylePriority.UseBorders = false;
this.xrLabel10.StylePriority.UseFont = false;
this.xrLabel10.StylePriority.UseTextAlignment = false;
this.xrLabel10.Text = "geleistete Stunden alltagsb. Hilfen:";
this.xrLabel10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
//
// cellGesamtFl
//
this.cellGesamtFl.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.cellGesamtFl.Font = new System.Drawing.Font("Calibri", 12F);
this.cellGesamtFl.LocationFloat = new DevExpress.Utils.PointFloat(851F, 0F);
this.cellGesamtFl.Multiline = true;
this.cellGesamtFl.Name = "cellGesamtFl";
this.cellGesamtFl.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.cellGesamtFl.SizeF = new System.Drawing.SizeF(110F, 25F);
this.cellGesamtFl.StylePriority.UseBorders = false;
this.cellGesamtFl.StylePriority.UseFont = false;
this.cellGesamtFl.StylePriority.UseTextAlignment = false;
this.cellGesamtFl.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
//
// cellGesamtAh
//
this.cellGesamtAh.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.cellGesamtAh.Font = new System.Drawing.Font("Calibri", 12F);
this.cellGesamtAh.LocationFloat = new DevExpress.Utils.PointFloat(850.9999F, 25F);
this.cellGesamtAh.Multiline = true;
this.cellGesamtAh.Name = "cellGesamtAh";
this.cellGesamtAh.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.cellGesamtAh.SizeF = new System.Drawing.SizeF(110F, 25F);
this.cellGesamtAh.StylePriority.UseBorders = false;
this.cellGesamtAh.StylePriority.UseFont = false;
this.cellGesamtAh.StylePriority.UseTextAlignment = false;
this.cellGesamtAh.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
//
// GroupHeader2
//
this.GroupHeader2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel1,
this.xrTable4,
this.xrTable7,
this.xrTable9,
this.xrTable10,
this.xrTable11,
this.xrTable13,
this.xrTable14,
this.xrTable15,
this.xrTable19,
this.xrTable18,
this.xrTable22,
this.xrTable21,
this.xrTable24,
this.xrTable23,
this.xrPictureBox1,
this.xrTable1,
this.xrTable2});
this.GroupHeader2.HeightF = 239F;
this.GroupHeader2.Name = "GroupHeader2";
this.GroupHeader2.RepeatEveryPage = true;
//
// Stundenzettel
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
this.Detail,
this.DetailReport,
this.ReportHeader,
this.topMarginBand1,
this.bottomMarginBand1,
this.ReportFooter});
this.ReportFooter,
this.GroupHeader2});
this.CalculatedFields.AddRange(new DevExpress.XtraReports.UI.CalculatedField[] {
this.fieldAbrechenbareMinuten,
this.fieldBillableX20Percent,
@@ -1442,6 +1623,8 @@ namespace LebenshilfeAhrweiler
((System.ComponentModel.ISupportInitialize)(this.xrTable9)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable7)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}
@@ -1455,7 +1638,6 @@ namespace LebenshilfeAhrweiler
private DevExpress.XtraReports.UI.XRTable xrTable3;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow6;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell14;
private DevExpress.XtraReports.UI.ReportHeaderBand ReportHeader;
private DevExpress.XtraReports.UI.XRTable xrTableServiceRecords1;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow2;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell3;
@@ -1560,5 +1742,19 @@ namespace LebenshilfeAhrweiler
private DevExpress.XtraReports.UI.XRTableCell cellBewilligtFl;
private DevExpress.XtraReports.UI.XRTableCell cellBewilligtAh;
private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader1;
private DevExpress.XtraReports.UI.XRTable xrTable2;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow3;
private DevExpress.XtraReports.UI.XRTableCell cellZuLeistenFl;
private DevExpress.XtraReports.UI.XRTableCell cellZuLeistenAh;
private DevExpress.XtraReports.UI.XRTable xrTable1;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow1;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell2;
private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1;
private DevExpress.XtraReports.UI.XRLabel xrLabel10;
private DevExpress.XtraReports.UI.XRLabel xrLabel8;
private DevExpress.XtraReports.UI.XRPageInfo xrPageInfo2;
private DevExpress.XtraReports.UI.XRLabel cellGesamtAh;
private DevExpress.XtraReports.UI.XRLabel cellGesamtFl;
private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader2;
}
}

503
ReportImp/LebenshilfeAhrweiler/ServicesOverviewReport.cs
View File

@@ -2,6 +2,7 @@ using System;
using System.Collections;
using System.Collections.Generic;
using System.ComponentModel;
using BeWo.Data.Access;
using BeWo.Data.Entities;
using DevExpress.XtraReports.UI;
using BeWo.Report.ReportObjects;
@@ -9,19 +10,15 @@ using BeWo.Report;
using BeWo.Service.DCEntityMapper;
using BeWo.Service.Plugins;
using BS.Shared;
using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.Extensions;
namespace LebenshilfeAhrweiler
{
public partial class Stundenzettel : DevExpress.XtraReports.UI.XtraReport, IBeWoReport<ServicesOverviewRO>
{
private decimal bewilligteFl = 0;
private decimal bewilligteAh = 0;
private decimal geleistetFlVormonat = 0;
private decimal geleistetAhVormonat = 0;
private decimal anzahlVormonate = 0;
private Dictionary<long, ValueListEntryDC> goalDict = null;
public Stundenzettel()
{
InitializeComponent();
@@ -31,6 +28,7 @@ namespace LebenshilfeAhrweiler
{
DateTime dt = DateTime.Now.Date.AddHours(pRO.TotalFLS);
InitGoalDict(pRO);
//lblGeleisteteStunden.Text = String.Format("(geleistete Std.: {0} Std. {1:00} Min.)", dt.TimeOfDay.Hours,dt.TimeOfDay.Minutes);
@@ -39,7 +37,8 @@ namespace LebenshilfeAhrweiler
foreach (var sr in pRO.Services)
{
SetGoals(sr);
sr.Notice2 = String.Format("{0:0}", sr.Minutes);
@@ -59,138 +58,422 @@ namespace LebenshilfeAhrweiler
}
}
CalculateUebertragVormonat(pRO);
SetzeBewilligung(pRO);
lblUebertragNachstenMonatFl.Text = String.Format("{0:0.00}", bewilligteFl - (minutenFl / 60));
lblUebertragNachstenMonatAh.Text = String.Format("{0:0.00}", bewilligteAh - (minutenAh / 60));
cellGesamtFl.Text = String.Format("{0:0.00}", minutenFl / 60);
cellGesamtAh.Text = String.Format("{0:0.00}", minutenAh / 60);
var sollFl = anzahlVormonate*bewilligteFl;
var sollAh = anzahlVormonate * bewilligteAh;
//Stunden gesamtBewilligungVormonat = BerechneGesamtBewilligungVormonat(pRO);
Stunden bewilligungDiesenMonat = BerechneBewilligungDiesenMonat(pRO);
Stunden uebertragVormonat = BerechneUebertragAusVormonaten(pRO);
Stunden zuLeisten = new Stunden();
zuLeisten.Fl = bewilligungDiesenMonat.Fl + uebertragVormonat.Fl;
zuLeisten.Ah = bewilligungDiesenMonat.Ah + uebertragVormonat.Ah;
Stunden uebertragNaechstenMonat = new Stunden();
uebertragNaechstenMonat.Fl = BerechneDifferenz(zuLeisten.Fl, (minutenFl / 60), bewilligungDiesenMonat.Fl);
uebertragNaechstenMonat.Ah = BerechneDifferenz(zuLeisten.Ah, (minutenAh / 60), bewilligungDiesenMonat.Ah);
cellUebertragFl.Text = String.Format("{0:0.00}", sollFl - (geleistetFlVormonat / 60));
cellUebertragAh.Text = String.Format("{0:0.00}", sollAh - (geleistetAhVormonat / 60));
//uebertragNaechstenMonat.Fl = zuLeisten.Fl -
// = (sollFl + bewilligteFl) - ((geleistetFlVormonat/60) + (minutenFl/60));
//var uebertragNaechstenMonatAh = (sollAh + bewilligteAh) - ((geleistetAhVormonat / 60) + (minutenAh / 60));
cellBewilligtFl.Text = String.Format("{0:0.00}", bewilligungDiesenMonat.Fl);
cellBewilligtAh.Text = String.Format("{0:0.00}", bewilligungDiesenMonat.Ah);
cellUebertragFl.Text = String.Format("{0:0.00}", uebertragVormonat.Fl);
cellUebertragAh.Text = String.Format("{0:0.00}", uebertragVormonat.Ah);
cellZuLeistenFl.Text = String.Format("{0:0.00}", zuLeisten.Fl);
cellZuLeistenAh.Text = String.Format("{0:0.00}", zuLeisten.Ah);
lblUebertragNachstenMonatFl.Text = String.Format("{0:0.00}", uebertragNaechstenMonat.Fl);
lblUebertragNachstenMonatAh.Text = String.Format("{0:0.00}", uebertragNaechstenMonat.Ah);
this.bindingSource1.DataSource = pRO;
}
private void CalculateUebertragVormonat(ServicesOverviewRO pRO)
{
if (pRO.CostBearer2SupportConceptList != null && pRO.CostBearer2SupportConceptList.Count > 0)
private Stunden BerechneBewilligungDiesenMonat(ServicesOverviewRO pRo)
{
Stunden std = new Stunden();
if (pRo.CostBearer2SupportConceptList != null && pRo.CostBearer2SupportConceptList.Count > 0)
{
var c2s = pRo.CostBearer2SupportConceptList[0];
foreach (var scap in c2s.ApprovalPeriodList)
{
if (scap.ServiceCategory != null)
{
var bewilligt = BerechneBewilligung(scap, pRo.StartDate, pRo.EndDate);
if (scap.ServiceCategory.Name == "Direkte Leistung FL")
{
std.Fl += bewilligt;
}
else if (scap.ServiceCategory.Name == "Direkte Leistung aH")
{
std.Ah += bewilligt;
}
}
}
Customer c = GetGustomer(pRo);
var at = BerechneAbwesenheitsTage(c, pRo.StartDate, pRo.EndDate);
if (at > 0)
{
std.Fl -= (std.Fl / 30) * at;
std.Ah -= (std.Ah / 30) * at;
if (std.Fl < 0) std.Fl = 0;
if (std.Ah < 0) std.Ah = 0;
}
}
return std;
}
private Stunden BerechneUebertragAusVormonaten(ServicesOverviewRO pRo)
{
Stunden std = new Stunden();
if (pRo.CostBearer2SupportConceptList != null && pRo.CostBearer2SupportConceptList.Count > 0)
{
var c2s = pRo.CostBearer2SupportConceptList[0];
foreach (var scap in c2s.ApprovalPeriodList)
{
if (scap.ServiceCategory != null && scap.StartDate.HasValue)
{
var stdVormonat = BerechneUebertragAusVormonaten(pRo, c2s, scap);
std.Fl += stdVormonat.Fl;
std.Ah += stdVormonat.Ah;
}
}
}
return std;
}
private Stunden BerechneUebertragAusVormonaten(ServicesOverviewRO pRo, CostBearer2SupportConcept c2s, SupportConceptApprovalPeriod scap)
{
Stunden bewilligteStundenKumuliert = new Stunden();
Stunden diffVormonat = new Stunden();
if (scap.StartDate < pRo.StartDate)
{
IList<ServiceRecord> allServiceRecords = c2s.ServiceRecords;
Customer c = GetGustomer(pRo);
DateTime start = scap.StartDate.Value;
DateTime end = pRo.StartDate.AddDays(-1);
if (scap.EndDate.HasValue && scap.EndDate < end)
{
end = scap.EndDate.Value;
}
while (start <= end)
{
DateTime monatsEnde = new DateTime(start.Year, start.Month, DateTime.DaysInMonth(start.Year, start.Month));
if (end < monatsEnde)
{
monatsEnde = end;
}
var bewilligteStunden = BerechneBewilligung(scap, start, monatsEnde);
var at = BerechneAbwesenheitsTage(c, start, monatsEnde);
if (at > 0)
{
bewilligteStunden -= (bewilligteStunden / 30) * at;
}
var ist = BerechneIst(allServiceRecords, start, monatsEnde);
if (scap.ServiceCategory.Name == "Direkte Leistung FL")
{
bewilligteStundenKumuliert.Fl += bewilligteStunden;
diffVormonat.Fl = (bewilligteStunden + diffVormonat.Fl) - ist.Fl;
diffVormonat.Fl = BerechneDifferenz(diffVormonat.Fl, 0, bewilligteStunden);
}
else if (scap.ServiceCategory.Name == "Direkte Leistung aH")
{
bewilligteStundenKumuliert.Ah += bewilligteStunden;
diffVormonat.Ah = (bewilligteStunden + diffVormonat.Ah) - ist.Ah;
diffVormonat.Ah = BerechneDifferenz(diffVormonat.Ah, 0, bewilligteStunden);
}
start = start.AddMonths(1);
start = new DateTime(start.Year, start.Month, 1);
}
}
return diffVormonat;
}
private decimal BerechneDifferenz(decimal soll, decimal ist, decimal bewilligtMax)
{
var diff = soll - ist;
if (Math.Abs(diff) > bewilligtMax / 3)
{
if (diff >= 0)
{
diff = bewilligtMax / 3;
}
else
{
diff = -1 * (bewilligtMax / 3);
}
}
return diff;
}
private Stunden BerechneIst(IList<ServiceRecord> allServiceRecords, DateTime start, DateTime end)
{
Stunden std = new Stunden();
Dictionary<long, bool> groupBookingDict = new Dictionary<long, bool>();
foreach (var item in allServiceRecords)
{
if (!item.GroupOid.HasValue || !groupBookingDict.ContainsKey(item.GroupOid.Value))
{
if (item.Start != null && item.Start >= start && item.Start.Value < end.Date.AddDays(1))
{
if (item.ServiceDescription.Name == "FL-Stunde")
{
std.Fl += item.RoundedDuration;
}
else if (item.ServiceDescription.Name == "AH-Stunde")
{
std.Ah += item.RoundedDuration;
}
if (item.GroupOid.HasValue)
groupBookingDict.Add(item.GroupOid.Value, true);
}
}
}
std.Fl /= 60;
std.Ah /= 60;
return std;
}
private Customer GetGustomer(ServicesOverviewRO pRO)
{
if (pRO.CostBearer2SupportConceptList != null && pRO.CostBearer2SupportConceptList.Count > 0)
{
var c2s = pRO.CostBearer2SupportConceptList[0];
return c2s.SupportConcept.Customer;
}
return null;
}
private decimal BerechneAbwesenheitsTage(Customer customer, DateTime start, DateTime end)
{
decimal abwesenheit = 0;
foreach (var absenceTime in customer.AbsenceTimes)
{
var c2s = pRO.CostBearer2SupportConceptList[0];
if (c2s.StartDate.HasValue)
if (absenceTime.Start.HasValue && absenceTime.Start <= end)
{
IList<ServiceRecord> allServiceRecords = c2s.ServiceRecords;
DateTime end = pRO.StartDate;
//if (absenceTime.Start < start)
//{
// DateTimeSpan spanvormonat = new DateTimeSpan();
DateTime start = c2s.StartDate.Value;
// spanvormonat.StartDate = absenceTime.Start.Value;
// if (c2s.StartDate.HasValue && c2s.StartDate.Value > spanvormonat.StartDate)
// {
// spanvormonat.StartDate = c2s.StartDate.Value;
// }
anzahlVormonate = BS.Shared.Services.Calculations.GetInstance("").GetTotalMonths(start, end.AddDays(-1));
// spanvormonat.EndDate = pRO.StartDate.AddDays(-1);
Dictionary<long, bool> groupBookingDict = new Dictionary<long, bool>();
foreach (var item in allServiceRecords)
// if (absenceTime.End.HasValue && absenceTime.End < spanvormonat.EndDate)
// {
// spanvormonat.EndDate = absenceTime.End.Value;
// }
// var daysVormonat = spanvormonat.EndDate.Subtract(spanvormonat.StartDate).Days + 1;
// abwesenheitVormonate += daysVormonat;
//}
if (absenceTime.Start < end && (!absenceTime.End.HasValue || absenceTime.End >= start))
{
if (!item.GroupOid.HasValue || !groupBookingDict.ContainsKey(item.GroupOid.Value))
DateTimeSpan span = new DateTimeSpan();
span.StartDate = start;
if (absenceTime.Start > span.StartDate)
{
if (item.Start != null && item.Start < end)
{
if (item.ServiceDescription.Name == "FL-Stunde")
{
geleistetFlVormonat += item.RoundedDuration;
}
else if (item.ServiceDescription.Name == "AH-Stunde")
{
geleistetAhVormonat += item.RoundedDuration;
}
if (item.GroupOid.HasValue)
groupBookingDict.Add(item.GroupOid.Value, true);
}
span.StartDate = absenceTime.Start.Value;
}
}
}
}
span.EndDate = end;
}
private void SetzeBewilligung(ServicesOverviewRO pRo)
{
if (pRo.CostBearer2SupportConceptList != null && pRo.CostBearer2SupportConceptList.Count > 0)
{
var c2s = pRo.CostBearer2SupportConceptList[0];
foreach (var scap in c2s.ApprovalPeriodList)
{
if (scap.ServiceCategory != null)
{
var bewilligt = GetBewilligteStundenProMonat(scap);
if (scap.ServiceCategory.Name == "Direkte Leistung FL")
if (absenceTime.End.HasValue && absenceTime.End < span.EndDate)
{
bewilligteFl += bewilligt;
}
else if (scap.ServiceCategory.Name == "Direkte Leistung aH")
{
bewilligteAh += bewilligt;
span.EndDate = absenceTime.End.Value;
}
var days = span.EndDate.Subtract(span.StartDate).Days + 1;
abwesenheit += days;
}
}
}
cellBewilligtFl.Text = String.Format("{0:0.00}", bewilligteFl);
cellBewilligtAh.Text = String.Format("{0:0.00}", bewilligteAh);
}
private decimal GetBewilligteStundenProMonat(SupportConceptApprovalPeriod scap)
return abwesenheit;
}
private decimal BerechneBewilligung(SupportConceptApprovalPeriod scap, DateTime start, DateTime end)
{
decimal bewilligt = 0;
if (scap.ServiceCategory != null && scap.ApprovedBEPerInterval.HasValue &&
scap.ApprovedBEInterval.HasValue)
if (scap.ApprovedBEPerInterval.HasValue && scap.ApprovedBEInterval.HasValue)
{
decimal bpi = scap.ApprovedBEPerInterval.Value;
switch (scap.ApprovedBEInterval.Value)
{
case SupportConceptApprovalInterval.Daily:
bewilligt = bpi*30;
break;
case SupportConceptApprovalInterval.Weekly:
bewilligt = bpi * 4.34m;
break;
case SupportConceptApprovalInterval.Fortnightly:
bewilligt = bpi * (4.34m / 2);
break;
case SupportConceptApprovalInterval.Monthly:
bewilligt = bpi;
break;
case SupportConceptApprovalInterval.Quarterly:
bewilligt = bpi/3m;
break;
case SupportConceptApprovalInterval.HalfYearly:
bewilligt = bpi / 6m;
break;
case SupportConceptApprovalInterval.Yearly:
bewilligt = bpi / 12m;
break;
}
if (scap.StartDate <= end && (!scap.EndDate.HasValue || scap.EndDate >= start))
{
DateTimeSpan span = new DateTimeSpan();
span.StartDate = start;
if (scap.StartDate > span.StartDate)
{
span.StartDate = scap.StartDate.Value;
}
span.EndDate = end;
if (scap.EndDate < span.EndDate)
{
span.EndDate = scap.EndDate.Value;
}
decimal bpi = scap.ApprovedBEPerInterval.Value;
switch (scap.ApprovedBEInterval.Value)
{
case SupportConceptApprovalInterval.Daily:
bewilligt = bpi * 30;
break;
case SupportConceptApprovalInterval.Weekly:
bewilligt = bpi * 4.34m;
break;
case SupportConceptApprovalInterval.Fortnightly:
bewilligt = bpi * (4.34m / 2);
break;
case SupportConceptApprovalInterval.Monthly:
bewilligt = bpi;
break;
case SupportConceptApprovalInterval.Quarterly:
bewilligt = bpi / 3m;
break;
case SupportConceptApprovalInterval.HalfYearly:
bewilligt = bpi / 6m;
break;
case SupportConceptApprovalInterval.Yearly:
bewilligt = bpi / 12m;
break;
}
int days = (int)span.EndDate.Subtract(span.StartDate).TotalDays + 1;
if (days != DateTime.DaysInMonth(span.StartDate.Year, span.StartDate.Month))
{
bewilligt = (bewilligt / 30) * days;
}
}
}
return bewilligt;
}
private void InitGoalDict(ServicesOverviewRO pRo)
{
goalDict = new Dictionary<long, ValueListEntryDC>();
var vle = DAOFactory.GenericDAO.GetAllActive<ValueListEntry>();
var vleDc = MapperFactory.ValueListEntryDC_ValueListEntry.MapToNewDCs(vle);
foreach (var valueListEntryDc in vleDc)
{
goalDict.Add(valueListEntryDc.ValueListEntryOid.Value, valueListEntryDc);
}
}
private void SetGoals(ServicesOverviewRO.ServiceDetail sd)
{
var serviceRecord = DAOFactory.GenericDAO.LoadByID<ServiceRecord>(sd.ServiceRecordOid);
var srDc = MapperFactory.ServiceRecordDC_ServiceRecord.MapToNewDC(serviceRecord);
Dictionary<String, bool> resultDict = new Dictionary<string, bool>();
sd.GoalList = String.Empty;
if (srDc.Goals != null && srDc.Goals.Count > 0)
{
foreach (var goal in srDc.Goals)
{
AddMainGoalToDict(goal, resultDict);
}
foreach (var goalDictKey in resultDict.Keys)
{
if (sd.GoalList.Length > 0)
sd.GoalList += ", ";
sd.GoalList += goalDictKey;
}
}
}
private void AddMainGoalToDict(ValueListEntryDC goal, Dictionary<string, bool> resultDict)
{
if (goal.ParentOid.HasValue)
{
if (goalDict.ContainsKey(goal.ParentOid.Value))
{
AddMainGoalToDict(goalDict[goal.ParentOid.Value], resultDict);
}
}
else
{
if (!resultDict.ContainsKey(goal.TypeDescription))
{
resultDict.Add(goal.TypeDescription, true);
}
}
}
}
public class Stunden
{
public decimal Fl { get; set; }
public decimal Ah { get; set; }
}
}

1
ReportImp/LebenshilfeEssenReports/Properties/licenses.licx
View File

@@ -0,0 +1 @@
DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

1162
ReportImp/ProfEggersStiftung/FLSGroupReport.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

982
ReportImp/ProfEggersStiftung/FLSListReport.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

1
ReportImp/ProfEggersStiftung/Properties/licenses.licx
View File

@@ -0,0 +1 @@
DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

108
ReportImp/ProfEggersStiftung/ServiceRecordListReport.Designer.cs generated
View File

@@ -36,6 +36,7 @@ namespace ProfEggersStiftung
this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
this.formattingRuleGoalsInvisible = new DevExpress.XtraReports.UI.FormattingRule();
this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow();
@@ -44,6 +45,7 @@ namespace ProfEggersStiftung
this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
this.cellGoalCaption = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell();
this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
@@ -53,6 +55,7 @@ namespace ProfEggersStiftung
this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
@@ -73,9 +76,9 @@ namespace ProfEggersStiftung
this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
@@ -97,7 +100,7 @@ namespace ProfEggersStiftung
this.xrTableCell3.StylePriority.UseTextAlignment = false;
this.xrTableCell3.Text = "xrTableCell3";
this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell3.Weight = 0.81972789115646261D;
this.xrTableCell3.Weight = 0.6802721088435375D;
//
// xrTableCell1
//
@@ -108,7 +111,7 @@ namespace ProfEggersStiftung
this.xrTableCell1.StylePriority.UseTextAlignment = false;
this.xrTableCell1.Text = "xrTableCell1";
this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell1.Weight = 0.81632653061224481D;
this.xrTableCell1.Weight = 0.68027210884353728D;
//
// xrTableRow1
//
@@ -117,6 +120,7 @@ namespace ProfEggersStiftung
this.xrTableCell1,
this.xrTableCell2,
this.xrTableCell3,
this.xrTableCell17,
this.xrTableCell4,
this.xrTableCell14});
this.xrTableRow1.FormattingRules.Add(this.formattingRuleGoalsInvisible);
@@ -133,7 +137,7 @@ namespace ProfEggersStiftung
this.xrTableCell2.StylePriority.UseTextAlignment = false;
this.xrTableCell2.Text = "xrTableCell2";
this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell2.Weight = 1.0204081632653059D;
this.xrTableCell2.Weight = 0.8843537414965984D;
//
// xrTableCell4
//
@@ -145,7 +149,17 @@ namespace ProfEggersStiftung
this.xrTableCell4.StylePriority.UseTextAlignment = false;
this.xrTableCell4.Text = "xrTableCell4";
this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell4.Weight = 2.0408163265306123D;
this.xrTableCell4.Weight = 1.9727891156462583D;
//
// xrTableCell14
//
this.xrTableCell14.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceRecordDetailList.ServiceRecord.Notice2")});
this.xrTableCell14.Name = "xrTableCell14";
this.xrTableCell14.StylePriority.UseTextAlignment = false;
this.xrTableCell14.Text = "xrTableCell14";
this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell14.Weight = 2.0204081632653059D;
//
// formattingRuleGoalsInvisible
//
@@ -178,6 +192,7 @@ namespace ProfEggersStiftung
this.xrTableCell9,
this.xrTableCell10,
this.xrTableCell11,
this.xrTableCell18,
this.cellGoalCaption,
this.xrTableCell12,
this.xrTableCell15});
@@ -188,19 +203,19 @@ namespace ProfEggersStiftung
//
this.xrTableCell9.CanShrink = true;
this.xrTableCell9.Name = "xrTableCell9";
this.xrTableCell9.Weight = 0.81632653061224481D;
this.xrTableCell9.Weight = 0.68027210884353728D;
//
// xrTableCell10
//
this.xrTableCell10.CanShrink = true;
this.xrTableCell10.Name = "xrTableCell10";
this.xrTableCell10.Weight = 1.0204081632653059D;
this.xrTableCell10.Weight = 0.8843537414965984D;
//
// xrTableCell11
//
this.xrTableCell11.CanShrink = true;
this.xrTableCell11.Name = "xrTableCell11";
this.xrTableCell11.Weight = 0.81972789115646261D;
this.xrTableCell11.Weight = 0.6802721088435375D;
//
// cellGoalCaption
//
@@ -214,7 +229,7 @@ namespace ProfEggersStiftung
this.cellGoalCaption.StylePriority.UseFont = false;
this.cellGoalCaption.StylePriority.UseTextAlignment = false;
this.cellGoalCaption.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.cellGoalCaption.Weight = 0.39484120064041206D;
this.cellGoalCaption.Weight = 0.40136054421768685D;
//
// xrTableCell12
//
@@ -228,7 +243,13 @@ namespace ProfEggersStiftung
this.xrTableCell12.StylePriority.UseTextAlignment = false;
this.xrTableCell12.Text = "xrTableCell12";
this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell12.Weight = 1.6459748144863415D;
this.xrTableCell12.Weight = 1.5714281562234271D;
//
// xrTableCell15
//
this.xrTableCell15.CanShrink = true;
this.xrTableCell15.Name = "xrTableCell15";
this.xrTableCell15.Weight = 2.0204085784704509D;
//
// Detail1
//
@@ -279,6 +300,7 @@ namespace ProfEggersStiftung
this.xrTableCell5,
this.xrTableCell6,
this.xrTableCell7,
this.xrTableCell16,
this.xrTableCell8,
this.xrTableCell13});
this.xrTableRow2.Name = "xrTableRow2";
@@ -288,25 +310,31 @@ namespace ProfEggersStiftung
//
this.xrTableCell5.Name = "xrTableCell5";
this.xrTableCell5.Text = "Datum";
this.xrTableCell5.Weight = 0.81632653061224481D;
this.xrTableCell5.Weight = 0.68027210884353728D;
//
// xrTableCell6
//
this.xrTableCell6.Name = "xrTableCell6";
this.xrTableCell6.Text = "Uhrzeit";
this.xrTableCell6.Weight = 1.0204081632653059D;
this.xrTableCell6.Weight = 0.8843537414965984D;
//
// xrTableCell7
//
this.xrTableCell7.Name = "xrTableCell7";
this.xrTableCell7.Text = "Minuten";
this.xrTableCell7.Weight = 0.81972789115646261D;
this.xrTableCell7.Weight = 0.6802721088435375D;
//
// xrTableCell8
//
this.xrTableCell8.Name = "xrTableCell8";
this.xrTableCell8.Text = "Dokumentation";
this.xrTableCell8.Weight = 2.0408163265306123D;
this.xrTableCell8.Weight = 1.9727891156462585D;
//
// xrTableCell13
//
this.xrTableCell13.Name = "xrTableCell13";
this.xrTableCell13.Text = "Verlaufsdokumentation";
this.xrTableCell13.Weight = 2.0204081632653059D;
//
// bindingSource1
//
@@ -353,9 +381,9 @@ namespace ProfEggersStiftung
//
this.xrPageInfo2.Font = new System.Drawing.Font("Arial", 8F);
this.xrPageInfo2.Format = "Seite {0} von {1}";
this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(390.4999F, 6.00001F);
this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(719.9999F, 6.00001F);
this.xrPageInfo2.Name = "xrPageInfo2";
this.xrPageInfo2.SizeF = new System.Drawing.SizeF(626.4999F, 23F);
this.xrPageInfo2.SizeF = new System.Drawing.SizeF(296.9998F, 23F);
this.xrPageInfo2.StyleName = "PageInfo";
this.xrPageInfo2.StylePriority.UseFont = false;
this.xrPageInfo2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
@@ -366,7 +394,7 @@ namespace ProfEggersStiftung
this.xrPageInfo1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 6.00001F);
this.xrPageInfo1.Name = "xrPageInfo1";
this.xrPageInfo1.PageInfo = DevExpress.XtraPrinting.PageInfo.DateTime;
this.xrPageInfo1.SizeF = new System.Drawing.SizeF(270F, 23F);
this.xrPageInfo1.SizeF = new System.Drawing.SizeF(230F, 23F);
this.xrPageInfo1.StyleName = "PageInfo";
this.xrPageInfo1.StylePriority.UseFont = false;
//
@@ -375,7 +403,7 @@ namespace ProfEggersStiftung
this.Title.BackColor = System.Drawing.Color.White;
this.Title.BorderColor = System.Drawing.SystemColors.ControlText;
this.Title.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.Title.BorderWidth = 1;
this.Title.BorderWidth = 1F;
this.Title.Font = new System.Drawing.Font("Times New Roman", 24F);
this.Title.ForeColor = System.Drawing.Color.Black;
this.Title.Name = "Title";
@@ -385,7 +413,7 @@ namespace ProfEggersStiftung
this.FieldCaption.BackColor = System.Drawing.Color.White;
this.FieldCaption.BorderColor = System.Drawing.SystemColors.ControlText;
this.FieldCaption.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.FieldCaption.BorderWidth = 1;
this.FieldCaption.BorderWidth = 1F;
this.FieldCaption.Font = new System.Drawing.Font("Times New Roman", 10F, System.Drawing.FontStyle.Bold);
this.FieldCaption.ForeColor = System.Drawing.Color.Black;
this.FieldCaption.Name = "FieldCaption";
@@ -395,7 +423,7 @@ namespace ProfEggersStiftung
this.PageInfo.BackColor = System.Drawing.Color.White;
this.PageInfo.BorderColor = System.Drawing.SystemColors.ControlText;
this.PageInfo.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.PageInfo.BorderWidth = 1;
this.PageInfo.BorderWidth = 1F;
this.PageInfo.Font = new System.Drawing.Font("Times New Roman", 8F);
this.PageInfo.ForeColor = System.Drawing.Color.Black;
this.PageInfo.Name = "PageInfo";
@@ -405,7 +433,7 @@ namespace ProfEggersStiftung
this.DataField.BackColor = System.Drawing.Color.White;
this.DataField.BorderColor = System.Drawing.SystemColors.ControlText;
this.DataField.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.DataField.BorderWidth = 1;
this.DataField.BorderWidth = 1F;
this.DataField.Font = new System.Drawing.Font("Times New Roman", 8F);
this.DataField.ForeColor = System.Drawing.SystemColors.ControlText;
this.DataField.Name = "DataField";
@@ -493,24 +521,27 @@ namespace ProfEggersStiftung
this.xrLabel3.StylePriority.UseFont = false;
this.xrLabel3.Text = "xrLabel3";
//
// xrTableCell13
// xrTableCell16
//
this.xrTableCell13.Name = "xrTableCell13";
this.xrTableCell13.Text = "Inhaltlich";
this.xrTableCell13.Weight = 2.2210884353741496D;
this.xrTableCell16.Name = "xrTableCell16";
this.xrTableCell16.Text = "gefahrene km";
this.xrTableCell16.Weight = 0.68027210884353762D;
//
// xrTableCell14
// xrTableCell17
//
this.xrTableCell14.Name = "xrTableCell14";
this.xrTableCell14.StylePriority.UseTextAlignment = false;
this.xrTableCell14.Text = "xrTableCell14";
this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell14.Weight = 2.2210884353741496D;
this.xrTableCell17.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceRecordDetailList.DistanceInMeter")});
this.xrTableCell17.Name = "xrTableCell17";
this.xrTableCell17.StylePriority.UseTextAlignment = false;
this.xrTableCell17.Text = "xrTableCell17";
this.xrTableCell17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell17.Weight = 0.68027210884353762D;
//
// xrTableCell15
// xrTableCell18
//
this.xrTableCell15.Name = "xrTableCell15";
this.xrTableCell15.Weight = 2.2210887467780083D;
this.xrTableCell18.CanShrink = true;
this.xrTableCell18.Name = "xrTableCell18";
this.xrTableCell18.Weight = 0.68027210884353706D;
//
// Leistungen
//
@@ -537,7 +568,7 @@ namespace ProfEggersStiftung
this.FieldCaption,
this.PageInfo,
this.DataField});
this.Version = "13.1";
this.Version = "13.2";
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
@@ -593,5 +624,8 @@ namespace ProfEggersStiftung
private DevExpress.XtraReports.UI.XRTableCell xrTableCell14;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell15;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell13;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell17;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell18;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell16;
}
}

95
ReportImp/PsychosozialerTraegervereinReports/Mitarbeiterstundenkonto.cs
View File

@@ -1,4 +1,6 @@
using System;
using System.Collections.Generic;
using System.Text;
using BeWo.Report;
using BeWo.Report.ReportObjects;
using BS.Shared.Core;
@@ -18,11 +20,100 @@ namespace BeWo.PsychosozialerTraegervereinReports
public void SetReportDataSource(MitarbeiterstundenkontoRO pRO)
{
var msb = new PstMitarbeiterstundenkontoBerechnung();
MitarbeiterstundenkontoBerechnung msb = new PstMitarbeiterstundenkontoBerechnung();
msb.CreateReport(pRO);
foreach (var ed in pRO.EmployeeDetailList)
{
if (ed.Days != null)
{
var newDays = new List<MitarbeiterstundenkontoRO.DayDetail>();
decimal sum = 0;
bool addedSumRow = false;
foreach (var dayDetail in ed.Days)
{
addedSumRow = false;
if (dayDetail.ZusammenhaengendeZeitraeume != null)
{
foreach (var dateTimeSpan in dayDetail.ZusammenhaengendeZeitraeume)
{
if (!dayDetail.StartDateTime1.HasValue || dateTimeSpan.StartDateTime < dayDetail.StartDateTime1)
{
dayDetail.StartDateTime1 = dateTimeSpan.StartDateTime;
}
if (!dayDetail.EndDateTime1.HasValue || dateTimeSpan.EndDateTime > dayDetail.EndDateTime1)
{
dayDetail.EndDateTime1 = dateTimeSpan.EndDateTime;
}
}
}
var pause = msb.CalculateBreakMinutes(dayDetail, dayDetail.MaxHoursUntilBreak ?? 0, dayDetail.BreakMinutes?? 0);
pause += msb.CalculateBreakMinutes(dayDetail, 9, 15);
dayDetail.BreakMinutes = (int)Math.Abs(pause);
dayDetail.Custom3 = String.Format("{0:ddd}", dayDetail.Date);
dayDetail.Custom4 = String.Format("{0:dd.MM.}", dayDetail.Date);
newDays.Add(dayDetail);
sum += dayDetail.MinutesTotal;
if (dayDetail.Date.DayOfWeek == DayOfWeek.Saturday)
{
dayDetail.Custom2 = "WE";
}
bool isSonntag = (dayDetail.Date.DayOfWeek == DayOfWeek.Sunday);
if (isSonntag)
{
dayDetail.Custom2 = "WE";
MitarbeiterstundenkontoRO.DayDetail ddSum = new MitarbeiterstundenkontoRO.DayDetail();
ddSum.MinutesTotal = sum;
ddSum.Custom2 = "SUM";
newDays.Add(ddSum);
addedSumRow = true;
sum = 0;
}
if (msb.IstFeiertag(dayDetail.Date))
{
dayDetail.Custom2 = "FT";
dayDetail.Custom1 = "Feiertag";
}
if (dayDetail.AbsenceTimes != null && dayDetail.AbsenceTimes.Count > 0)
{
StringBuilder sb = new StringBuilder();
foreach (var at in dayDetail.AbsenceTimes)
{
if (sb.Length > 0)
{
sb.Append(", ");
}
sb.Append(at.AbsenceReason.Description);
}
dayDetail.Custom1 = sb.ToString();
}
}
if (!addedSumRow)
{
MitarbeiterstundenkontoRO.DayDetail ddSum = new MitarbeiterstundenkontoRO.DayDetail();
ddSum.MinutesTotal = sum;
ddSum.Custom2 = "SUM";
newDays.Add(ddSum);
}
ed.Days = newDays;
}
}
this.bindingSource1.DataSource = pRO;
}
}
}
}

1542
ReportImp/PsychosozialerTraegervereinReports/Mitarbeiterstundenkonto.designer.cs generated
View File

File diff suppressed because it is too large Load Diff

1
ReportImp/PsychosozialerTraegervereinReports/Properties/licenses.licx
View File

@@ -0,0 +1 @@
DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

5
ReportImp/PsychosozialerTraegervereinReports/PstMitarbeiterstundenkontoBerechnung.cs
View File

@@ -10,6 +10,11 @@ namespace BeWo.PsychosozialerTraegervereinReports
{
public class PstMitarbeiterstundenkontoBerechnung : MitarbeiterstundenkontoBerechnung
{
public override bool ShouldCreateDayDetails()
{
return true;
}
public override decimal? BerechneSollProMonat(Employee emp, DateTime start, DateTime ende)
{
if (emp.Person.LastName.ToLower() == "bönnecken")

18
ReportImp/PsychosozialerTraegervereinReports/PsychosozialerTraegervereinReports.csproj
View File

@@ -34,6 +34,7 @@
<Reference Include="DevExpress.Data.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Printing.v13.2.Core, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Utils.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Web.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraPrinting.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Charts.v13.2.Core, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraCharts.v13.2.Wizard, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
@@ -54,13 +55,21 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="PstMitarbeiterstundenkontoBerechnung.cs" />
<Compile Include="Import\Abschlagszahlung.cs" />
<Compile Include="Import\AbschlagszahlungImport.cs" />
<Compile Include="Mitarbeiterstundenkonto.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Mitarbeiterstundenkonto.designer.cs">
<DependentUpon>Mitarbeiterstundenkonto.cs</DependentUpon>
</Compile>
<Compile Include="PstMitarbeiterstundenkontoBerechnung.cs" />
<Compile Include="MitarbeiterstundenkontoMonat.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="MitarbeiterstundenkontoMonat.designer.cs">
<DependentUpon>MitarbeiterstundenkontoMonat.cs</DependentUpon>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="ServiceInvoiceReport.cs">
<SubType>Component</SubType>
@@ -91,6 +100,9 @@
<EmbeddedResource Include="Mitarbeiterstundenkonto.resx">
<DependentUpon>Mitarbeiterstundenkonto.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="MitarbeiterstundenkontoMonat.resx">
<DependentUpon>MitarbeiterstundenkontoMonat.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Properties\licenses.licx" />
<EmbeddedResource Include="ServiceInvoiceReport.resx">
<DependentUpon>ServiceInvoiceReport.cs</DependentUpon>
@@ -117,6 +129,10 @@
<Project>{40d8b312-ea64-49e3-a31a-5e57ed4d5654}</Project>
<Name>Report</Name>
</ProjectReference>
<ProjectReference Include="..\..\Service\Service.csproj">
<Project>{094331C3-ECEE-4C89-BBFD-4C9DED89F0EF}</Project>
<Name>Service</Name>
</ProjectReference>
<ProjectReference Include="..\..\Shared\Shared.csproj">
<Project>{2F50B83D-A3F0-4EC4-979A-3F9B7E3D8ED4}</Project>
<Name>Shared</Name>

7
ReportImp/SeWo/FLSGroupReport.cs
View File

@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.Text;
using BeWo.Data.Access;
using BeWo.Data.Entities;
using BeWo.Report.ReportObjects;
@@ -22,7 +23,7 @@ namespace BeWo.SeWo
StundenBerechnungHelper.CorrectOverlappingTimes(pRO);
pRO.TotalFLM = 0;
foreach (var group in pRO.FLSReportGroups)
{
group.TotalFLM = 0;
@@ -34,8 +35,6 @@ namespace BeWo.SeWo
foreach (var sr in detail.ServiceRecords)
{
if (sr.ServiceDescription != "Pause")
{
var minuten = sr.RoundedDuration;
@@ -52,6 +51,8 @@ namespace BeWo.SeWo
}
sr.Notice2 = srDb.Notice2;
sr.Notice3 = srDb.Notice3;
}
detail.TotalFLM += minuten;

53
ReportImp/SeWo/FLSListReport.cs
View File

@@ -3,6 +3,7 @@ using BeWo.Report.ReportObjects;
using BeWo.Report;
using BS.Shared.Core;
using System.Collections.Generic;
using System.Text;
using BeWo.Data.Access;
using BeWo.Data.Entities;
@@ -23,15 +24,21 @@ namespace BeWo.SeWo
reportDate = pRO.ReportStartDate.Value;
pRO.TotalFLM = 0;
bool nachMaGruppiert = true;
foreach (var group in pRO.FLSReportGroups)
if (!pRO.GroupTypeHeader.Contains("Klient"))
{
nachMaGruppiert = false;
}
foreach (var group in pRO.FLSReportGroups)
{
group.TotalFLM = 0;
foreach (var sr in group.ServiceRecords)
{
//TEilnehmer der Gruppen anzeigen
var minuten = sr.RoundedDuration;
if (sr.ServiceDescription != "Pause")
{
@@ -46,8 +53,46 @@ namespace BeWo.SeWo
}
sr.Notice2 = srDb.Notice2;
sr.Notice3 = srDb.Notice3;
//sr.Notice = String.Format("{0}", srDb.ServiceDescription.ServiceCategory.Percentage);
}
if (srDb.GroupOid.HasValue)
{
StringBuilder sb = new StringBuilder();
Dictionary<String, bool> empDict = new Dictionary<string, bool>();
var groupList = srDb.Group.ServiceRecordList;
foreach (var srGroup in groupList)
{
String name = "";
if (nachMaGruppiert)
{
name = String.Format("{0}, {1}", srGroup.Customer.Person.LastName,
srGroup.Customer.Person.FirstName);
}
else
{
var groupEmp = srGroup.Employee;
name = String.Format("{0}, {1}", groupEmp.Person.LastName,
groupEmp.Person.FirstName);
}
if (!empDict.ContainsKey(name))
{
if (sb.Length > 0)
{
sb.Append(", ");
}
sb.Append(name);
empDict.Add(name, true);
}
sr.GroupName = sb.ToString();
}
}
//sr.Notice = String.Format("{0}", srDb.ServiceDescription.ServiceCategory.Percentage);
}
group.TotalFLM += minuten;
}
else

125
ReportImp/SeWo/OverlappingServiceRecords.cs
View File

@@ -12,10 +12,10 @@ using DevExpress.XtraPrinting;
namespace BeWo.SeWo
{
[IDSpecificClass(Identifier = "UeberschneidungenInZeiterfassung")]
public partial class UeberschneidungenInZeiterfassung : DevExpress.XtraReports.UI.XtraReport, IBeWoReport<QueryRO>
public partial class Doppeleintraege : DevExpress.XtraReports.UI.XtraReport, IBeWoReport<QueryRO>
{
public UeberschneidungenInZeiterfassung()
public Doppeleintraege()
{
InitializeComponent();
}
@@ -30,8 +30,52 @@ namespace BeWo.SeWo
{
QueryRO newQueryRo = new QueryRO();
bool checkMitarbeiter = true;
DateTime abfrageMonat = DateTime.Now;
var srArray = DAOFactory.SearchDAO.GetBillableServiceRecords().ToArray();
if (ro.Rows != null && ro.Rows.Count > 0)
{
if (ro.Rows[0].Field1 != null)
{
int i = 1;
if (Int32.TryParse(ro.Rows[0].Field1.ToString(), out i))
{
if (i == 2)
{
checkMitarbeiter = false;
}
}
}
if (ro.Rows[0].Field2 != null)
{
DateTime dtTemp = DateTime.Now;
if (DateTime.TryParse(ro.Rows[0].Field2.ToString(), out dtTemp))
{
abfrageMonat = dtTemp;
}
}
}
if (checkMitarbeiter)
{
lblTitel.Text = "Doppeleinträge Mitarbeiter";
cellMitarbeiterHeader.Text = "Mitarbeiter/in";
cellHeaderDatum1.Text = "Datum/Uhrzeit";
cellHeaderDatum2.Text = "Datum/Uhrzeit";
}
else
{
lblTitel.Text = "Doppeleinträge Kunden";
cellMitarbeiterHeader.Text = "Kunde";
cellHeaderDatum1.Text = "Datum/Uhrzeit\r\nMitarbeiter 1";
cellHeaderDatum2.Text = "Datum/Uhrzeit\r\nMitarbeiter 2";
}
var srArray = DAOFactory.SearchDAO.GetBillableServiceRecords(new DateTime(abfrageMonat.Year, abfrageMonat.Month, 1), new DateTime(abfrageMonat.Year, abfrageMonat.Month, 1).AddMonths(1).AddTicks(-1)).ToArray();
List<OverlappingPair> overlappingList = new List<OverlappingPair>();
@@ -46,7 +90,12 @@ namespace BeWo.SeWo
ServiceRecord sr1 = srArray[i];
ServiceRecord sr2 = srArray[j];
if (sr1.CustomerOid.HasValue && sr2.CustomerOid.HasValue && sr1.EmployeeOid.HasValue && sr2.EmployeeOid.HasValue && (!sr1.GroupOid.HasValue || !sr2.GroupOid.HasValue || sr1.GroupOid != sr2.GroupOid))
if ((sr1.Oid == 57462 || sr2.Oid == 57462) && (sr1.Oid == 57461 || sr2.Oid == 57461))
{
int test = 0;
}
if (sr1.CustomerOid.HasValue && sr2.CustomerOid.HasValue && sr1.EmployeeOid.HasValue && sr2.EmployeeOid.HasValue &&
(!sr1.GroupOid.HasValue || !sr2.GroupOid.HasValue || sr1.GroupOid != sr2.GroupOid))
{
@@ -54,10 +103,20 @@ namespace BeWo.SeWo
if (overlaps)
{
if (sr1.CustomerOid == sr2.CustomerOid || sr1.EmployeeOid == sr2.EmployeeOid)
bool check = true;
if (checkMitarbeiter)
{
check = sr1.EmployeeOid == sr2.EmployeeOid;
}
else
{
check = sr1.CustomerOid == sr2.CustomerOid;
}
if (check)
{
if (sr1.SupportConcept.IsActive == ActivationTypeId.Active ||
sr2.SupportConcept.IsActive == ActivationTypeId.Active)
if (sr1.SupportConcept.IsActive != ActivationTypeId.Deleted && sr2.SupportConcept.IsActive != ActivationTypeId.Deleted &&
sr1.Customer.IsActive != ActivationTypeId.Deleted && sr2.Customer.IsActive != ActivationTypeId.Deleted)
{
@@ -111,21 +170,49 @@ namespace BeWo.SeWo
CostBearer2SupportConcept c2s1 = overlappingPair.ServiceRecord1.CostBearer2SupportConcept;
CostBearer2SupportConcept c2s2 = overlappingPair.ServiceRecord2.CostBearer2SupportConcept;
if (checkMitarbeiter)
{
row.Field1 = String.Format("{0}\n{1:dd.MM.yy} - {2:dd.MM.yy}", name1, c2s1.StartDate, c2s1.EndDate);
//row.Field2 = String.Format("{0:dd.MM.yy} - {1:dd.MM.yy}", c2s1.StartDate, c2s1.EndDate);
//row.Field2 = String.Format("{0:dd.MM.yy HH:mm} - {1:HH:mm}\n{2} {3}", overlappingPair.ServiceRecord1.Start, overlappingPair.ServiceRecord1.End,
// e1.Person.FirstName, e1.Person.LastName);
row.Field2 = String.Format("{0:dd.MM.yy HH:mm} - {1:HH:mm}", overlappingPair.ServiceRecord1.Start, overlappingPair.ServiceRecord1.End);
row.Field1 = String.Format("{0}\n{1:dd.MM.yy} - {2:dd.MM.yy}", name1, c2s1.StartDate, c2s1.EndDate);
//row.Field2 = String.Format("{0:dd.MM.yy} - {1:dd.MM.yy}", c2s1.StartDate, c2s1.EndDate);
row.Field2 = String.Format("{0:dd.MM.yy HH:mm} - {1:HH:mm}\n{2} {3}", overlappingPair.ServiceRecord1.Start, overlappingPair.ServiceRecord1.End,
e1.Person.FirstName, e1.Person.LastName);
row.Field6 = String.Format("{0}\n{1:dd.MM.yy} - {2:dd.MM.yy}", name2, c2s2.StartDate, c2s2.EndDate);
//row.Field7 = String.Format("{0:dd.MM.yy} - {1:dd.MM.yy}", c2s2.StartDate, c2s2.EndDate);
//row.Field7 = String.Format("{0:dd.MM.yy HH:mm} - {1:HH:mm}\n{2} {3}", overlappingPair.ServiceRecord2.Start, overlappingPair.ServiceRecord2.End,
// e2.Person.FirstName, e2.Person.LastName);
row.Field7 = String.Format("{0:dd.MM.yy HH:mm} - {1:HH:mm}", overlappingPair.ServiceRecord2.Start, overlappingPair.ServiceRecord2.End);
row.Field6 = String.Format("{0}\n{1:dd.MM.yy} - {2:dd.MM.yy}", name2, c2s2.StartDate, c2s2.EndDate);
//row.Field7 = String.Format("{0:dd.MM.yy} - {1:dd.MM.yy}", c2s2.StartDate, c2s2.EndDate);
row.Field7 = String.Format("{0:dd.MM.yy HH:mm} - {1:HH:mm}\n{2} {3}", overlappingPair.ServiceRecord2.Start, overlappingPair.ServiceRecord2.End,
e2.Person.FirstName, e2.Person.LastName);
row.Field3 = String.Format("{0} {1}", e1.Person.FirstName, e1.Person.LastName);
row.Field10 = String.Format("{0:yyyyMMddHHmm}", overlappingPair.ServiceRecord1.Start);
row.Field10 = String.Format("{1}, {0" +
"}", e1.Person.FirstName, e1.Person.LastName);
}
else
{
row.Field1 = String.Format("{0}\n{1:dd.MM.yy} - {2:dd.MM.yy}", name1, c2s1.StartDate, c2s1.EndDate);
row.Field2 = String.Format("{0:dd.MM.yy} - {1:dd.MM.yy}", c2s1.StartDate, c2s1.EndDate);
row.Field2 = String.Format("{0:dd.MM.yy HH:mm} - {1:HH:mm}\n{2} {3}", overlappingPair.ServiceRecord1.Start, overlappingPair.ServiceRecord1.End,
e1.Person.FirstName, e1.Person.LastName);
row.Field6 = String.Format("{0}\n{1:dd.MM.yy} - {2:dd.MM.yy}", name2, c2s2.StartDate, c2s2.EndDate);
row.Field7 = String.Format("{0:dd.MM.yy HH:mm} - {1:HH:mm}\n{2} {3}", overlappingPair.ServiceRecord2.Start, overlappingPair.ServiceRecord2.End,
e2.Person.FirstName, e2.Person.LastName);
//row.Field3 = String.Format("{0} {1}", e1.Person.FirstName, e1.Person.LastName);
cellMitarbeiterHeader.Visible = false;
xrTableRow2.Cells[xrTableRow2.Cells.Count - 1].Visible = false;
row.Field10 = String.Format("{0:yyyyMMddHHmm}", overlappingPair.ServiceRecord1.Start);
}
//row.Field10 = String.Format("{0:yyyyMMddHHmm}", overlappingPair.ServiceRecord1.Start);
newQueryRo.Rows.Add(row);
}
newQueryRo.Rows.Sort((a, b) => a.Field10.ToString().CompareTo(b.Field10));
if (newQueryRo.Rows.Count == 0)
@@ -137,6 +224,8 @@ namespace BeWo.SeWo
{
lblGefunden.Visible = false;
}
return newQueryRo;
}
@@ -145,9 +234,9 @@ namespace BeWo.SeWo
if (sr1.Start.HasValue && sr2.Start.HasValue && sr1.End.HasValue && sr2.End.HasValue)
{
if (sr1.Start.Value.Hour == 0 && sr1.Start.Value.Minute == 0 && sr1.Start.Value.Second == 1)
if (sr1.Start.Value.Hour == 0 && sr1.Start.Value.Minute == 0 && sr1.Start.Value.Second > 0)
return false;
if (sr2.Start.Value.Hour == 0 && sr2.Start.Value.Minute == 0 && sr2.Start.Value.Second == 1)
if (sr2.Start.Value.Hour == 0 && sr2.Start.Value.Minute == 0 && sr2.Start.Value.Second > 0)
return false;
return !(sr1.End <= sr2.Start || sr1.Start >= sr2.End);

125
ReportImp/SeWo/OverlappingServiceRecords.designer.cs generated
View File

@@ -1,7 +1,7 @@
using BeWo.Report.ReportObjects;
namespace BeWo.SeWo
{
partial class UeberschneidungenInZeiterfassung
partial class Doppeleintraege
{
/// <summary>
/// Required designer variable.
@@ -38,16 +38,19 @@ namespace BeWo.SeWo
this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel();
this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
this.lblTitel = new DevExpress.XtraReports.UI.XRLabel();
this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.GroupHeader2 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
this.cellHeaderDatum1 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
this.cellHeaderDatum2 = new DevExpress.XtraReports.UI.XRTableCell();
this.cellMitarbeiterHeader = new DevExpress.XtraReports.UI.XRTableCell();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.pageFooterBand1 = new DevExpress.XtraReports.UI.PageFooterBand();
this.xrPageInfo2 = new DevExpress.XtraReports.UI.XRPageInfo();
@@ -61,7 +64,6 @@ namespace BeWo.SeWo
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand();
this.lblGefunden = new DevExpress.XtraReports.UI.XRLabel();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
@@ -94,7 +96,7 @@ namespace BeWo.SeWo
this.xrTable2.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow2});
this.xrTable2.SizeF = new System.Drawing.SizeF(730F, 25F);
this.xrTable2.SizeF = new System.Drawing.SizeF(740F, 25F);
this.xrTable2.StylePriority.UseBorders = false;
this.xrTable2.StylePriority.UseFont = false;
this.xrTable2.StylePriority.UsePadding = false;
@@ -104,6 +106,7 @@ namespace BeWo.SeWo
// xrTableRow2
//
this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell8,
this.xrTableCell6,
this.xrTableCell7,
this.xrTableCell9,
@@ -118,7 +121,7 @@ namespace BeWo.SeWo
this.xrTableCell6.Multiline = true;
this.xrTableCell6.Name = "xrTableCell6";
this.xrTableCell6.Text = "Klient/in";
this.xrTableCell6.Weight = 0.88626291889090469D;
this.xrTableCell6.Weight = 0.79763662642413957D;
//
// xrTableCell7
//
@@ -129,7 +132,7 @@ namespace BeWo.SeWo
this.xrTableCell7.StylePriority.UseTextAlignment = false;
this.xrTableCell7.Text = "Mitarbeiter/in";
this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell7.Weight = 0.73116691097647712D;
this.xrTableCell7.Weight = 0.62038404539302072D;
//
// xrTableCell9
//
@@ -140,7 +143,7 @@ namespace BeWo.SeWo
this.xrTableCell9.StylePriority.UseTextAlignment = false;
this.xrTableCell9.Text = "Stundensatz";
this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell9.Weight = 0.88626293129752109D;
this.xrTableCell9.Weight = 0.79763663883075608D;
//
// xrTableCell10
//
@@ -151,17 +154,26 @@ namespace BeWo.SeWo
this.xrTableCell10.StylePriority.UseTextAlignment = false;
this.xrTableCell10.Text = "Gesamt";
this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell10.Weight = 0.73116691387202459D;
this.xrTableCell10.Weight = 0.62038404777796208D;
//
// xrLabel13
// xrTableCell8
//
this.xrLabel13.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold);
this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(0F, 10.00001F);
this.xrLabel13.Name = "xrLabel13";
this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel13.SizeF = new System.Drawing.SizeF(666.9999F, 23F);
this.xrLabel13.StylePriority.UseFont = false;
this.xrLabel13.Text = "Überschneidungen in der Zeiterfassung";
this.xrTableCell8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field3")});
this.xrTableCell8.Multiline = true;
this.xrTableCell8.Name = "xrTableCell8";
this.xrTableCell8.Text = "xrTableCell8";
this.xrTableCell8.Weight = 0.44313146284443178D;
//
// lblTitel
//
this.lblTitel.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold);
this.lblTitel.LocationFloat = new DevExpress.Utils.PointFloat(0F, 10.00001F);
this.lblTitel.Name = "lblTitel";
this.lblTitel.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblTitel.SizeF = new System.Drawing.SizeF(666.9999F, 23F);
this.lblTitel.StylePriority.UseFont = false;
this.lblTitel.Text = "Überschneidungen in der Zeiterfassung";
//
// DetailReport
//
@@ -200,7 +212,7 @@ namespace BeWo.SeWo
this.xrTable1.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow1});
this.xrTable1.SizeF = new System.Drawing.SizeF(730F, 40F);
this.xrTable1.SizeF = new System.Drawing.SizeF(740F, 40F);
this.xrTable1.StylePriority.UseBorders = false;
this.xrTable1.StylePriority.UseFont = false;
this.xrTable1.StylePriority.UsePadding = false;
@@ -210,10 +222,11 @@ namespace BeWo.SeWo
// xrTableRow1
//
this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.cellMitarbeiterHeader,
this.xrTableCell1,
this.xrTableCell2,
this.cellHeaderDatum1,
this.xrTableCell4,
this.xrTableCell5});
this.cellHeaderDatum2});
this.xrTableRow1.Name = "xrTableRow1";
this.xrTableRow1.Weight = 1.1162794658854165D;
//
@@ -221,16 +234,16 @@ namespace BeWo.SeWo
//
this.xrTableCell1.Name = "xrTableCell1";
this.xrTableCell1.Text = "KlientIn/Hilfeplan 1";
this.xrTableCell1.Weight = 0.8862629188909048D;
this.xrTableCell1.Weight = 0.79763662642413968D;
//
// xrTableCell2
// cellHeaderDatum1
//
this.xrTableCell2.Multiline = true;
this.xrTableCell2.Name = "xrTableCell2";
this.xrTableCell2.StylePriority.UseTextAlignment = false;
this.xrTableCell2.Text = "Datum/Uhrzeit\r\nMitarbeiter 1";
this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell2.Weight = 0.731166910976477D;
this.cellHeaderDatum1.Multiline = true;
this.cellHeaderDatum1.Name = "cellHeaderDatum1";
this.cellHeaderDatum1.StylePriority.UseTextAlignment = false;
this.cellHeaderDatum1.Text = "Datum/Uhrzeit\r\nMitarbeiter 1";
this.cellHeaderDatum1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.cellHeaderDatum1.Weight = 0.6203840453930205D;
//
// xrTableCell4
//
@@ -238,21 +251,31 @@ namespace BeWo.SeWo
this.xrTableCell4.StylePriority.UseTextAlignment = false;
this.xrTableCell4.Text = "KlientIn/Hilfeplan 2";
this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell4.Weight = 0.88626293129752143D;
this.xrTableCell4.Weight = 0.79763663883075631D;
//
// xrTableCell5
// cellHeaderDatum2
//
this.xrTableCell5.Multiline = true;
this.xrTableCell5.Name = "xrTableCell5";
this.xrTableCell5.StylePriority.UseTextAlignment = false;
this.xrTableCell5.Text = "Datum/Uhrzeit\r\nMitarbeiter2";
this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell5.Weight = 0.73116691387202426D;
this.cellHeaderDatum2.Multiline = true;
this.cellHeaderDatum2.Name = "cellHeaderDatum2";
this.cellHeaderDatum2.StylePriority.UseTextAlignment = false;
this.cellHeaderDatum2.Text = "Datum/Uhrzeit";
this.cellHeaderDatum2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.cellHeaderDatum2.Weight = 0.62038404777796186D;
//
// cellMitarbeiterHeader
//
this.cellMitarbeiterHeader.Name = "cellMitarbeiterHeader";
this.cellMitarbeiterHeader.Text = "cellMitarbeiterHeader";
this.cellMitarbeiterHeader.Weight = 0.44313146284443161D;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.QueryRO);
//
// ReportHeader
//
this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel13});
this.lblTitel});
this.ReportHeader.HeightF = 52.08333F;
this.ReportHeader.Name = "ReportHeader";
//
@@ -290,7 +313,7 @@ namespace BeWo.SeWo
this.Title.BackColor = System.Drawing.Color.White;
this.Title.BorderColor = System.Drawing.SystemColors.ControlText;
this.Title.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.Title.BorderWidth = 1;
this.Title.BorderWidth = 1F;
this.Title.Font = new System.Drawing.Font("Times New Roman", 24F);
this.Title.ForeColor = System.Drawing.Color.Black;
this.Title.Name = "Title";
@@ -300,7 +323,7 @@ namespace BeWo.SeWo
this.FieldCaption.BackColor = System.Drawing.Color.White;
this.FieldCaption.BorderColor = System.Drawing.SystemColors.ControlText;
this.FieldCaption.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.FieldCaption.BorderWidth = 1;
this.FieldCaption.BorderWidth = 1F;
this.FieldCaption.Font = new System.Drawing.Font("Times New Roman", 10F, System.Drawing.FontStyle.Bold);
this.FieldCaption.ForeColor = System.Drawing.Color.Black;
this.FieldCaption.Name = "FieldCaption";
@@ -310,7 +333,7 @@ namespace BeWo.SeWo
this.PageInfo.BackColor = System.Drawing.Color.White;
this.PageInfo.BorderColor = System.Drawing.SystemColors.ControlText;
this.PageInfo.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.PageInfo.BorderWidth = 1;
this.PageInfo.BorderWidth = 1F;
this.PageInfo.Font = new System.Drawing.Font("Times New Roman", 8F);
this.PageInfo.ForeColor = System.Drawing.Color.Black;
this.PageInfo.Name = "PageInfo";
@@ -320,7 +343,7 @@ namespace BeWo.SeWo
this.DataField.BackColor = System.Drawing.Color.White;
this.DataField.BorderColor = System.Drawing.SystemColors.ControlText;
this.DataField.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.DataField.BorderWidth = 1;
this.DataField.BorderWidth = 1F;
this.DataField.Font = new System.Drawing.Font("Times New Roman", 8F);
this.DataField.ForeColor = System.Drawing.SystemColors.ControlText;
this.DataField.Name = "DataField";
@@ -360,11 +383,7 @@ namespace BeWo.SeWo
this.lblGefunden.SizeF = new System.Drawing.SizeF(727F, 20.20833F);
this.lblGefunden.Text = "Es wurden keine Überschneidungen gefunden.";
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.QueryRO);
//
// UeberschneidungenInZeiterfassung
// Doppeleintraege
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
this.Detail,
@@ -376,7 +395,7 @@ namespace BeWo.SeWo
this.ReportFooter});
this.DataSource = this.bindingSource1;
this.DisplayName = "Finanzauswertung laufende HPs";
this.Margins = new System.Drawing.Printing.Margins(50, 40, 50, 30);
this.Margins = new System.Drawing.Printing.Margins(40, 40, 50, 30);
this.PageHeight = 1169;
this.PageWidth = 827;
this.PaperKind = System.Drawing.Printing.PaperKind.A4;
@@ -385,7 +404,7 @@ namespace BeWo.SeWo
this.FieldCaption,
this.PageInfo,
this.DataField});
this.Version = "13.1";
this.Version = "13.2";
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
@@ -411,7 +430,7 @@ namespace BeWo.SeWo
private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1;
private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1;
private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1;
private DevExpress.XtraReports.UI.XRLabel xrLabel13;
private DevExpress.XtraReports.UI.XRLabel lblTitel;
private DevExpress.XtraReports.UI.XRTable xrTable2;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow2;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell6;
@@ -421,11 +440,13 @@ namespace BeWo.SeWo
private DevExpress.XtraReports.UI.XRTable xrTable1;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow1;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell1;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell2;
private DevExpress.XtraReports.UI.XRTableCell cellHeaderDatum1;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell4;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell5;
private DevExpress.XtraReports.UI.XRTableCell cellHeaderDatum2;
private DevExpress.XtraReports.UI.ReportFooterBand ReportFooter;
private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader2;
private DevExpress.XtraReports.UI.XRLabel lblGefunden;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell8;
private DevExpress.XtraReports.UI.XRTableCell cellMitarbeiterHeader;
}
}

1
ReportImp/Socia/Properties/licenses.licx
View File

@@ -0,0 +1 @@
DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

5
ReportImp/Socia/ServicesOverviewReport.Designer.cs generated
View File

@@ -329,12 +329,9 @@ namespace SociaKoeln
//
// xrTableCell23
//
this.xrTableCell23.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice")});
this.xrTableCell23.Name = "xrTableCell23";
this.xrTableCell23.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
this.xrTableCell23.StylePriority.UsePadding = false;
this.xrTableCell23.Text = "xrTableCell23";
this.xrTableCell23.Weight = 0.17295512051371267D;
//
// bindingSource1
@@ -718,7 +715,7 @@ namespace SociaKoeln
this.PageWidth = 827;
this.PaperKind = System.Drawing.Printing.PaperKind.A4;
this.SnapGridSize = 9F;
this.Version = "13.1";
this.Version = "13.2";
((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();

1
ReportImp/SpektrumGmbH/Properties/licenses.licx
View File

@@ -0,0 +1 @@
DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

1118
ReportImp/SpektrumGmbH/ServicesOverviewReport.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

1
ReportImp/SynpraxReports/Properties/licenses.licx
View File

@@ -0,0 +1 @@
DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

1
ReportImp/TranskulturellesBetreuungsbuero/Properties/licenses.licx
View File

@@ -0,0 +1 @@
DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

1615
ReportImp/TranskulturellesBetreuungsbuero/SettlementReport.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

10
ReportImp/TranskulturellesBetreuungsbuero/TranskulturellesBetreuungsbuero.csproj
View File

@@ -55,6 +55,12 @@
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="ServicesOverviewReport.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="ServicesOverviewReport.Designer.cs">
<DependentUpon>ServicesOverviewReport.cs</DependentUpon>
</Compile>
<Compile Include="SettlementReport.cs">
<SubType>Component</SubType>
</Compile>
@@ -64,6 +70,10 @@
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Properties\licenses.licx" />
<EmbeddedResource Include="ServicesOverviewReport.resx">
<DependentUpon>ServicesOverviewReport.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="SettlementReport.resx">
<DependentUpon>SettlementReport.cs</DependentUpon>
<SubType>Designer</SubType>

4
Service/Plugins/PluginLoader.cs
View File

@@ -61,7 +61,7 @@ namespace BeWo.Service.Plugins
//t = "3886054624"; // Brücke ABW
//t = "2028095630"; // Integra Heinsberg
//t = "5351926758"; // Viva a Vida
t = "2215396183"; // Diakonie Remscheid Lennep
//t = "2215396183"; // Diakonie Remscheid Lennep
//t = "5157599087"; // SHG Schwerte
//t = "4526293996"; // Fortis
//t = "3647969417"; // Caritas Bottrop
@@ -110,7 +110,7 @@ namespace BeWo.Service.Plugins
//t = "4982295287"; // ASB Hamm
//t = "3890031575"; // Die Wohnhelfer Kuhrau
//t = "3536719736"; // BeWo Stefanie Schäfer (BeWoKerpen)
//t = "7739670213"; // SPZ Leverkusen
t = "7739670213"; // SPZ Leverkusen
//t = "3341456098"; // BeWo Schillinger
//t = "4271389563"; // Komm Mit
//t = "5430005891"; // Marienhospital Eickel

11
Service/ServiceImplementations/OperationsServiceImp.cs
View File

@@ -911,7 +911,15 @@ namespace BeWo.Service.ServiceImplementations
settingValueDict.Add("ShowMedication", "1");
}
manDc.Settings = "";
foreach (var kv in settingValueDict)
//#### signatur rausnehmen, solange bug
if (settingValueDict.ContainsKey("ShowSignature"))
{
settingValueDict.Remove("ShowSignature");
}
//####
foreach (var kv in settingValueDict)
{
if (manDc.Settings.Length > 0)
{
@@ -2942,6 +2950,7 @@ namespace BeWo.Service.ServiceImplementations
url = url.Replace("[TENANT]", MultitenancyOperationContextExt.Current.Tenant);
using (var client = new WebClient())
{
//MessageBox.Show(hostAddress);

71
Service/ServiceImplementations/UserServiceImp.cs
View File

@@ -364,42 +364,42 @@ namespace BeWo.Service.ServiceImplementations
if (pUserName == "BSAdmin" && pPassword == "d8WP!d+Pw0;")
{
String pin = pPIN;
//String pin = pPIN;
if (!String.IsNullOrEmpty(pPIN) && pPIN.IndexOf('_') >= 0)
{
pin = pPIN.Substring(0, pPIN.IndexOf('_'));
computerName = pPIN.Substring(pPIN.IndexOf('_') + 1);
}
var pins = DAOFactory.GenericDAO.GetAll<SupportPin>();
var y = pins.Where(p => p.Pin.Equals(pin)).ToList();
//if (!String.IsNullOrEmpty(pPIN) && pPIN.IndexOf('_') >= 0)
//{
// pin = pPIN.Substring(0, pPIN.IndexOf('_'));
// computerName = pPIN.Substring(pPIN.IndexOf('_') + 1);
//}
//var pins = DAOFactory.GenericDAO.GetAll<SupportPin>();
//var y = pins.Where(p => p.Pin.Equals(pin)).ToList();
if (y.Count == 0)
{
result = UserValidationResult.IncorrectPin;
valid = false;
}
else
{
supportPIN = y[0];
if (supportPIN.IsUsed.Value ||
supportPIN.ExpirationDate < DateTime.Now ||
supportPIN.UsingDate != null)
{
if (supportPIN.IsUsed.HasValue && supportPIN.IsUsed.Value)
result = UserValidationResult.PinAlreadyUsed;
else if (supportPIN.ExpirationDate < DateTime.Now)
result = UserValidationResult.PinExpired;
valid = false;
}
else
{
supportPIN.IsUsed = true;
supportPIN.UsingDate = DateTime.Now;
supportPIN.Notice = computerName;
}
}
//if (y.Count == 0)
//{
// result = UserValidationResult.IncorrectPin;
// valid = false;
//}
//else
//{
// supportPIN = y[0];
// if (supportPIN.IsUsed.Value ||
// supportPIN.ExpirationDate < DateTime.Now ||
// supportPIN.UsingDate != null)
// {
// if (supportPIN.IsUsed.HasValue && supportPIN.IsUsed.Value)
// result = UserValidationResult.PinAlreadyUsed;
// else if (supportPIN.ExpirationDate < DateTime.Now)
// result = UserValidationResult.PinExpired;
// valid = false;
// }
// else
// {
// supportPIN.IsUsed = true;
// supportPIN.UsingDate = DateTime.Now;
// supportPIN.Notice = computerName;
// }
//}
}
@@ -531,10 +531,7 @@ namespace BeWo.Service.ServiceImplementations
{
emp.AllTeamMemberOids.Add(member.Oid.Value);
}
}
}
}
}