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

FLS-Auswertung

Browse Source
This commit is contained in:
Lyndon Jetten
2021-06-02 20:01:13 +02:00
parent 9c2208609d
commit e01123928d
320 changed files with 6191 additions and 1692 deletions
Download Patch File Download Diff File Expand all files Collapse all files

157
BeWo/BeWo.csproj
View File

@@ -2346,6 +2346,7 @@
<None Include="app.config">
<SubType>Designer</SubType>
</None>
<None Include="packages.config" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -2481,392 +2482,392 @@
<ItemGroup>
<PublishFile Include="Blacklight.Wpf.Controls">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Charts.v17.1.Core">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Data.v17.1">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Data.v17.1.Linq">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Office.v17.1.Core">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.PivotGrid.v17.1.Core">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Printing.v17.1.Core">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.RichEdit.v17.1.Core">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.RichEdit.v17.1.Export">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Sparkline.v17.1.Core">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Utils.v17.1">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Xpf.Accordion.v17.1">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Xpf.Charts.v17.1">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Xpf.Core.v17.1">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Xpf.Docking.v17.1">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Xpf.Grid.v17.1">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Xpf.Grid.v17.1.Core">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Xpf.Layout.v17.1.Core">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Xpf.Mvvm.v17.1">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Xpf.Printing.v17.1">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Xpf.Printing.v17.1.Core">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Xpf.Ribbon.v17.1">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Xpf.Scheduler.v17.1">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Xpf.Themes.LightGray.v17.1">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Xpf.Themes.Office2007Black.v17.1">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Xpf.Themes.Office2010Black.v17.1">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Xpf.Themes.Office2013.v17.1">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Xpf.Themes.Office2016White.v17.1">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.XtraBars.v17.1">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.XtraCharts.v17.1">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.XtraEditors.v17.1">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.XtraNavBar.v17.1">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.XtraPivotGrid.v17.1">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.XtraPrinting.v17.1">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.XtraReports.v17.1">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.XtraScheduler.v17.1">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.XtraScheduler.v17.1.Core">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.XtraScheduler.v17.1.Reporting">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.XtraTreeList.v17.1">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
</ItemGroup>

6
BeWo/Scheduler/View/SchedulerAppointmentEditForm.xaml
View File

@@ -291,7 +291,8 @@
<!-- Region Start -->
<Label x:Name="StartLabel" Grid.Column="0" Grid.Row="2" VerticalAlignment="Center" Content="Start" />
<dxe:DateEdit Grid.Column="1" Grid.Row="2" MaskType="DateTimeAdvancingCaret" Background="White"
Height="23" MinWidth="80" Margin="3" EditValue="{Binding Controller.DisplayStartDate}" x:Name="StartDateDateEdit" />
Height="23" MinWidth="80" Margin="3" EditValue="{Binding Controller.DisplayStartDate}" x:Name="StartDateDateEdit"
EditValueChanged="StartDate_OnChange" />
<dxe:TextEdit Grid.Column="2" Grid.Row="2" IsEnabled="{Binding Path=Controller.AllDay, Converter={StaticResource BoolReverseConverter}}"
MaskType="DateTime" Mask="t" MaskUseAsDisplayFormat="True" Margin="3" Height="23"
EditValue ="{Binding Controller.DisplayStartTime, Converter={StaticResource TimeSpanToDateTimeConverter}}" x:Name="StartTimeTextEdit"/>
@@ -301,7 +302,8 @@
<!-- Region Ende -->
<Label x:Name="EndLabel" Grid.Column="0" Grid.Row="3" VerticalAlignment="Center" Content="Ende"/>
<dxe:DateEdit Grid.Column="1" Grid.Row="3" MaskType="DateTimeAdvancingCaret" Background="White" Height="23" MinWidth="80"
Margin="3" EditValue="{Binding Controller.DisplayEndDate}" x:Name="EndDate" />
Margin="3" EditValue="{Binding Controller.DisplayEndDate}" x:Name="EndDate"
EditValueChanged="EndDate_OnChange" />
<dxe:TextEdit Grid.Column="2" Grid.Row="3" IsEnabled="{Binding Path=Controller.AllDay, Converter={StaticResource BoolReverseConverter}}" MaskType="DateTime" Mask="t" MaskUseAsDisplayFormat="True" Margin="3" Height="23" EditValue ="{Binding Controller.DisplayEndTime, Converter={StaticResource TimeSpanToDateTimeConverter}}" x:Name="EndTime"/>
<!-- Endregion -->

109
BeWo/Scheduler/View/SchedulerAppointmentEditForm.xaml.cs
View File

@@ -3,7 +3,6 @@ using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Collections.Specialized;
using System.ComponentModel;
using System.Diagnostics;
using System.Globalization;
using System.Linq;
using System.Windows;
@@ -23,7 +22,6 @@ using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact;
using BS.Shared.Extensions;
using DevExpress.Mvvm.Native;
using DevExpress.Xpf.Editors;
using DevExpress.Xpf.Scheduler.UI;
using DevExpress.XtraScheduler;
@@ -474,7 +472,6 @@ namespace BeWo.Scheduler.View
var employeeOids = new List<long>();
var customerOids = new List<long>();
var overlaps = false;
foreach (var emp in employees)
{
@@ -488,22 +485,23 @@ namespace BeWo.Scheduler.View
var item = (SchedulerAppointmentVM) Appointment.GetSourceObject(Control.GetCoreStorage());
//if(!IsInTaskViewMode){
// ServiceFacade.DoResourceServiceSync(definedBelow => overlaps = definedBelow.OverlappingAppointmentsExist(Appointment.Start, Appointment.End, employeeOids, customerOids, resources.Select(res => res.ResourceOid.Value).ToList(), ViewModel.NewVM.Originator.EmployeeOid, item?.CommitToDataContract().SchedulerAppointmentOid, string.Empty, Appointment.RecurrenceIndex));
//var overlaps = false;
//if(!IsInTaskViewMode){
// ServiceFacade.DoResourceServiceSync(definedBelow => overlaps = definedBelow.OverlappingAppointmentsExist(Appointment.Start, Appointment.End, employeeOids, customerOids, resources.Select(res => res.ResourceOid.Value).ToList(), ViewModel.NewVM.Originator.EmployeeOid, item?.CommitToDataContract().SchedulerAppointmentOid, string.Empty, Appointment.RecurrenceIndex));
// if (overlaps)
// {
// var erg = MessageBox.Show("Dieser Termin überschneidet sich mit einem anderen bereits existierenden Termin.\n Möchten Sie ihn wirklich speichern?", "Überschneidung", MessageBoxButton.YesNo, MessageBoxImage.Exclamation);
// if (overlaps)
// {
// var erg = MessageBox.Show("Dieser Termin überschneidet sich mit einem anderen bereits existierenden Termin.\n Möchten Sie ihn wirklich speichern?", "Überschneidung", MessageBoxButton.YesNo, MessageBoxImage.Exclamation);
// if (erg.Equals(MessageBoxResult.No))
// {
// Controller.Storage.EndUpdate();
// return;
// }
// }
//}
// if (erg.Equals(MessageBoxResult.No))
// {
// Controller.Storage.EndUpdate();
// return;
// }
// }
//}
ViewModel.ShouldLockOverlappingAppointmentCheck = Appointment.Type == AppointmentType.ChangedOccurrence;
ViewModel.ShouldLockOverlappingAppointmentCheck = Appointment.Type == AppointmentType.ChangedOccurrence;
if (Appointment.RecurrenceInfo != null)
{
@@ -680,39 +678,40 @@ namespace BeWo.Scheduler.View
private void AllDay_OnCheckedChange(object sender, RoutedEventArgs e)
{
var source = (CheckEdit) e.Source;
var value = source.IsChecked ?? false;
//var source = (CheckEdit)e.Source;
//var value = source.IsChecked ?? false;
if(value == false && _HasBeenUnchecked == false)
{
var displayStart = NewSchedulerAppointmentFormController.DisplayStart;
var start = NewSchedulerAppointmentFormController.Start;
var end = NewSchedulerAppointmentFormController.End;
//if(value == false && _HasBeenUnchecked == false)
//{
// var displayStart = NewSchedulerAppointmentFormController.DisplayStart;
// var start = NewSchedulerAppointmentFormController.Start;
// var end = NewSchedulerAppointmentFormController.End;
if(!end.Equals(start))
{
_HasBeenUnchecked = true;
// if(!end.Equals(start))
// {
// _HasBeenUnchecked = true;
var day = displayStart.Day;
var month = displayStart.Month;
var year = displayStart.Year;
// var day = displayStart.Day;
// var month = displayStart.Month;
// var year = displayStart.Year;
var newEndDay = (end.AddDays(-1) >= start ? end.AddDays(-1) : start).Day;
// var newEndDay = (end.AddDays(-1) >= start ? end.AddDays(-1) : start).Day;
var newStart = new DateTime(year, month, day, 0, 0, 0);
var newEnd = new DateTime(year, month, newEndDay, 1, 0, 0);
// var newStart = new DateTime(year, month, day, 0, 0, 0);
// var newEnd = new DateTime(year, month, newEndDay, 1, 0, 0);
NewSchedulerAppointmentFormController.Start = newStart;
NewSchedulerAppointmentFormController.End = newEnd;
// NewSchedulerAppointmentFormController.Start = newStart;
// NewSchedulerAppointmentFormController.End = newEnd;
NewSchedulerAppointmentFormController.DisplayStart = newStart;
NewSchedulerAppointmentFormController.DisplayEnd = newEnd;
// NewSchedulerAppointmentFormController.DisplayStart = newStart;
// NewSchedulerAppointmentFormController.DisplayEnd = newEnd;
NewSchedulerAppointmentFormController.DisplayStartTime = new TimeSpan(0, 0, 0, 0);
NewSchedulerAppointmentFormController.DisplayEndTime = new TimeSpan(0, 1, 0, 0);
_HasBeenUnchecked = true;
}
}
// NewSchedulerAppointmentFormController.DisplayStartTime = new TimeSpan(0, 0, 0, 0);
// NewSchedulerAppointmentFormController.DisplayEndTime = new TimeSpan(0, 1, 0, 0);
// _HasBeenUnchecked = true;
// }
//}
}
private void DueDate_OnEditValueChanged(object sender, EditValueChangedEventArgs e)
@@ -726,6 +725,34 @@ namespace BeWo.Scheduler.View
NewSchedulerAppointmentFormController.DisplayEndDate = newEnd;
}
}
/*
* Appointment.End:
* ======================================================================================================
* The End property is usually specified by the Appointment.Start and Appointment.
* Duration properties, and is always calculated as End = Start + Duration.
* When setting the End property, the Appointment. Start property retains its value, and the Appointment.
* Duration is changed according to the new value of the End property.
* If the new Appointment. End property's value is less than the Appointment.
* Start property's value, an exception is raised.
*
*/
private void StartDate_OnChange(object sender, EditValueChangedEventArgs e)
{
var newStartDate = (DateTime?) e.NewValue;
var oldStartDate = (DateTime?) e.OldValue;
//BeWoApp.LogMessage($"EndDates: {newStartDate:dd.MM.yyyy HH:mm} vs. {oldStartDate:dd.MM.yyyy HH:mm}", DebugWindowMessageColor.Red);
}
private void EndDate_OnChange(object sender, EditValueChangedEventArgs e)
{
var newEndDate = (DateTime?) e.NewValue;
var oldEndDate = (DateTime?) e.OldValue;
//BeWoApp.LogMessage($"EndDates: {newEndDate:dd.MM.yyyy HH:mm} vs. {oldEndDate:dd.MM.yyyy HH:mm}", DebugWindowMessageColor.Red);
}
}
public class NewSchedulerAppointmentFormController : AppointmentFormController

22
BeWo/Scheduler/ViewModel/SchedulerAppointmentListVM.cs
View File

@@ -331,17 +331,17 @@ namespace BeWo.Scheduler.ViewModel
private void UpdateSchedulerAppointment(Appointment app, SchedulerAppointmentVM vm)
{
vm.EmployeeList = app.CF_EmployeeList();
vm.CustomerList = app.CF_CustomerList();
vm.ResourceList = app.CF_ResourceList();
vm.Originator = app.CF_Originator();
vm.IsPrivate = app.CF_IsPrivate();
vm.IsTask = app.CF_IsTask();
vm.DueDate = app.CF_DueDate();
vm.CompletedDate = app.CF_CompletedDate();
vm.CompletedNotice = app.CF_CompletedNotice();
vm.TaskDescription = app.CF_TaskDescription();
vm.SupportConceptList = app.CF_SupportConceptList();
vm.EmployeeList = app.CF_EmployeeList();
vm.CustomerList = app.CF_CustomerList();
vm.ResourceList = app.CF_ResourceList();
vm.Originator = app.CF_Originator();
vm.IsPrivate = app.CF_IsPrivate();
vm.IsTask = app.CF_IsTask();
vm.DueDate = app.CF_DueDate();
vm.CompletedDate = app.CF_CompletedDate();
vm.CompletedNotice = app.CF_CompletedNotice();
vm.TaskDescription = app.CF_TaskDescription();
vm.SupportConceptList = app.CF_SupportConceptList();
vm.HasServiceRecordEntry = app.CF_HasServiceRecordEntry();
if(vm.IsTask)

1
Controls/Controls.csproj
View File

@@ -143,6 +143,7 @@
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
<SubType>Designer</SubType>
</EmbeddedResource>
<None Include="packages.config" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>

73
Data/Data.csproj
View File

@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\Microsoft.CodeAnalysis.Analyzers.2.9.6\build\Microsoft.CodeAnalysis.Analyzers.props" Condition="Exists('..\packages\Microsoft.CodeAnalysis.Analyzers.2.9.6\build\Microsoft.CodeAnalysis.Analyzers.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -32,6 +33,8 @@
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
<TargetFrameworkProfile />
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -83,6 +86,24 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\Lib\log4net.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CodeAnalysis, Version=3.4.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.CodeAnalysis.Common.3.4.0\lib\netstandard2.0\Microsoft.CodeAnalysis.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CodeAnalysis.CSharp, Version=3.4.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.3.4.0\lib\netstandard2.0\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CodeAnalysis.CSharp.Workspaces, Version=3.4.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.Workspaces.3.4.0\lib\netstandard2.0\Microsoft.CodeAnalysis.CSharp.Workspaces.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CodeAnalysis.VisualBasic, Version=3.4.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.CodeAnalysis.VisualBasic.3.4.0\lib\netstandard2.0\Microsoft.CodeAnalysis.VisualBasic.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces, Version=3.4.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.CodeAnalysis.VisualBasic.Workspaces.3.4.0\lib\netstandard2.0\Microsoft.CodeAnalysis.VisualBasic.Workspaces.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CodeAnalysis.Workspaces, Version=3.4.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.CodeAnalysis.Workspaces.Common.3.4.0\lib\netstandard2.0\Microsoft.CodeAnalysis.Workspaces.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="MySql.Data, Version=8.0.21.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
@@ -96,8 +117,29 @@
<HintPath>..\Lib\NHibernate.ByteCode.Castle.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Buffers, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Buffers.4.4.0\lib\netstandard2.0\System.Buffers.dll</HintPath>
</Reference>
<Reference Include="System.Collections.Immutable, Version=1.2.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Collections.Immutable.1.5.0\lib\netstandard2.0\System.Collections.Immutable.dll</HintPath>
</Reference>
<Reference Include="System.ComponentModel" />
<Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Composition.AttributedModel, Version=1.0.31.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Composition.AttributedModel.1.0.31\lib\portable-net45+win8+wp8+wpa81\System.Composition.AttributedModel.dll</HintPath>
</Reference>
<Reference Include="System.Composition.Convention, Version=1.0.31.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Composition.Convention.1.0.31\lib\portable-net45+win8+wp8+wpa81\System.Composition.Convention.dll</HintPath>
</Reference>
<Reference Include="System.Composition.Hosting, Version=1.0.31.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Composition.Hosting.1.0.31\lib\portable-net45+win8+wp8+wpa81\System.Composition.Hosting.dll</HintPath>
</Reference>
<Reference Include="System.Composition.Runtime, Version=1.0.31.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Composition.Runtime.1.0.31\lib\portable-net45+win8+wp8+wpa81\System.Composition.Runtime.dll</HintPath>
</Reference>
<Reference Include="System.Composition.TypedParts, Version=1.0.31.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Composition.TypedParts.1.0.31\lib\portable-net45+win8+wp8+wpa81\System.Composition.TypedParts.dll</HintPath>
</Reference>
<Reference Include="System.Configuration" />
<Reference Include="System.Configuration.Install" />
<Reference Include="System.Core">
@@ -106,13 +148,31 @@
<Reference Include="System.Drawing" />
<Reference Include="System.Drawing.Design" />
<Reference Include="System.Management" />
<Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Memory.4.5.3\lib\netstandard2.0\System.Memory.dll</HintPath>
</Reference>
<Reference Include="System.Numerics" />
<Reference Include="System.Numerics.Vectors, Version=4.1.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Numerics.Vectors.4.4.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
</Reference>
<Reference Include="System.Reflection.Metadata, Version=1.4.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Reflection.Metadata.1.6.0\lib\netstandard2.0\System.Reflection.Metadata.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.Serialization">
<RequiredTargetFramework>3.0</RequiredTargetFramework>
</Reference>
<Reference Include="System.ServiceModel">
<RequiredTargetFramework>3.0</RequiredTargetFramework>
</Reference>
<Reference Include="System.Text.Encoding.CodePages, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Text.Encoding.CodePages.4.5.1\lib\net461\System.Text.Encoding.CodePages.dll</HintPath>
</Reference>
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.3\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
</Reference>
<Reference Include="System.Transactions" />
<Reference Include="System.Web" />
<Reference Include="System.Windows.Forms" />
@@ -800,7 +860,20 @@
<Name>Shared</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<Analyzer Include="..\packages\Microsoft.CodeAnalysis.Analyzers.2.9.6\analyzers\dotnet\cs\Microsoft.CodeAnalysis.Analyzers.dll" />
<Analyzer Include="..\packages\Microsoft.CodeAnalysis.Analyzers.2.9.6\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.Analyzers.dll" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\Microsoft.CodeAnalysis.Analyzers.2.9.6\build\Microsoft.CodeAnalysis.Analyzers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeAnalysis.Analyzers.2.9.6\build\Microsoft.CodeAnalysis.Analyzers.props'))" />
</Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">

71
Host/Host.csproj
View File

@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\Microsoft.CodeAnalysis.Analyzers.2.9.6\build\Microsoft.CodeAnalysis.Analyzers.props" Condition="Exists('..\packages\Microsoft.CodeAnalysis.Analyzers.2.9.6\build\Microsoft.CodeAnalysis.Analyzers.props')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -26,6 +27,8 @@
<IISExpressUseClassicPipelineMode />
<UseGlobalApplicationHostFile />
<Use64BitIISExpress />
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -72,15 +75,73 @@
<Reference Include="DevExpress.XtraReports.v17.1.Web, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraScheduler.v17.1.Core, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraScheduler.v17.1.Reporting, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="Microsoft.CodeAnalysis, Version=3.4.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.CodeAnalysis.Common.3.4.0\lib\netstandard2.0\Microsoft.CodeAnalysis.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CodeAnalysis.CSharp, Version=3.4.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.3.4.0\lib\netstandard2.0\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CodeAnalysis.CSharp.Workspaces, Version=3.4.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.Workspaces.3.4.0\lib\netstandard2.0\Microsoft.CodeAnalysis.CSharp.Workspaces.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CodeAnalysis.VisualBasic, Version=3.4.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.CodeAnalysis.VisualBasic.3.4.0\lib\netstandard2.0\Microsoft.CodeAnalysis.VisualBasic.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces, Version=3.4.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.CodeAnalysis.VisualBasic.Workspaces.3.4.0\lib\netstandard2.0\Microsoft.CodeAnalysis.VisualBasic.Workspaces.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CodeAnalysis.Workspaces, Version=3.4.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.CodeAnalysis.Workspaces.Common.3.4.0\lib\netstandard2.0\Microsoft.CodeAnalysis.Workspaces.dll</HintPath>
</Reference>
<Reference Include="NHibernate, Version=3.1.0.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\Lib\NHibernate.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Buffers, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Buffers.4.4.0\lib\netstandard2.0\System.Buffers.dll</HintPath>
</Reference>
<Reference Include="System.Collections.Immutable, Version=1.2.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Collections.Immutable.1.5.0\lib\netstandard2.0\System.Collections.Immutable.dll</HintPath>
</Reference>
<Reference Include="System.Composition.AttributedModel, Version=1.0.31.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Composition.AttributedModel.1.0.31\lib\portable-net45+win8+wp8+wpa81\System.Composition.AttributedModel.dll</HintPath>
</Reference>
<Reference Include="System.Composition.Convention, Version=1.0.31.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Composition.Convention.1.0.31\lib\portable-net45+win8+wp8+wpa81\System.Composition.Convention.dll</HintPath>
</Reference>
<Reference Include="System.Composition.Hosting, Version=1.0.31.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Composition.Hosting.1.0.31\lib\portable-net45+win8+wp8+wpa81\System.Composition.Hosting.dll</HintPath>
</Reference>
<Reference Include="System.Composition.Runtime, Version=1.0.31.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Composition.Runtime.1.0.31\lib\portable-net45+win8+wp8+wpa81\System.Composition.Runtime.dll</HintPath>
</Reference>
<Reference Include="System.Composition.TypedParts, Version=1.0.31.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Composition.TypedParts.1.0.31\lib\portable-net45+win8+wp8+wpa81\System.Composition.TypedParts.dll</HintPath>
</Reference>
<Reference Include="System.Data" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Memory.4.5.3\lib\netstandard2.0\System.Memory.dll</HintPath>
</Reference>
<Reference Include="System.Numerics" />
<Reference Include="System.Numerics.Vectors, Version=4.1.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Numerics.Vectors.4.4.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
</Reference>
<Reference Include="System.Reflection.Metadata, Version=1.4.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Reflection.Metadata.1.6.0\lib\netstandard2.0\System.Reflection.Metadata.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.ServiceModel" />
<Reference Include="System.Text.Encoding.CodePages, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Text.Encoding.CodePages.4.5.1\lib\net461\System.Text.Encoding.CodePages.dll</HintPath>
</Reference>
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.3\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
</Reference>
<Reference Include="System.Web.ApplicationServices" />
<Reference Include="System.Web.DynamicData" />
<Reference Include="System.Web.Entity" />
@@ -272,6 +333,10 @@
<ItemGroup>
<WCFMetadata Include="Service References\" />
</ItemGroup>
<ItemGroup>
<Analyzer Include="..\packages\Microsoft.CodeAnalysis.Analyzers.2.9.6\analyzers\dotnet\cs\Microsoft.CodeAnalysis.Analyzers.dll" />
<Analyzer Include="..\packages\Microsoft.CodeAnalysis.Analyzers.2.9.6\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.Analyzers.dll" />
</ItemGroup>
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
@@ -304,4 +369,10 @@
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\Microsoft.CodeAnalysis.Analyzers.2.9.6\build\Microsoft.CodeAnalysis.Analyzers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeAnalysis.Analyzers.2.9.6\build\Microsoft.CodeAnalysis.Analyzers.props'))" />
</Target>
</Project>

23
Host/packages.config
View File

@@ -1,5 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="ClrHeapAllocationAnalyzer" version="3.0.0" targetFramework="net472" />
<package id="jQuery" version="1.6.4" targetFramework="net40" />
<package id="jquery.mobile" version="1.3.0" targetFramework="net40" />
<package id="Microsoft.CodeAnalysis" version="3.4.0" targetFramework="net472" />
<package id="Microsoft.CodeAnalysis.Analyzers" version="2.9.6" targetFramework="net472" developmentDependency="true" />
<package id="Microsoft.CodeAnalysis.Common" version="3.4.0" targetFramework="net472" />
<package id="Microsoft.CodeAnalysis.CSharp" version="3.4.0" targetFramework="net472" />
<package id="Microsoft.CodeAnalysis.CSharp.Workspaces" version="3.4.0" targetFramework="net472" />
<package id="Microsoft.CodeAnalysis.VisualBasic" version="3.4.0" targetFramework="net472" />
<package id="Microsoft.CodeAnalysis.VisualBasic.Workspaces" version="3.4.0" targetFramework="net472" />
<package id="Microsoft.CodeAnalysis.Workspaces.Common" version="3.4.0" targetFramework="net472" />
<package id="System.Buffers" version="4.4.0" targetFramework="net472" />
<package id="System.Collections.Immutable" version="1.5.0" targetFramework="net472" />
<package id="System.Composition" version="1.0.31" targetFramework="net472" />
<package id="System.Composition.AttributedModel" version="1.0.31" targetFramework="net472" />
<package id="System.Composition.Convention" version="1.0.31" targetFramework="net472" />
<package id="System.Composition.Hosting" version="1.0.31" targetFramework="net472" />
<package id="System.Composition.Runtime" version="1.0.31" targetFramework="net472" />
<package id="System.Composition.TypedParts" version="1.0.31" targetFramework="net472" />
<package id="System.Memory" version="4.5.3" targetFramework="net472" />
<package id="System.Numerics.Vectors" version="4.4.0" targetFramework="net472" />
<package id="System.Reflection.Metadata" version="1.6.0" targetFramework="net472" />
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.2" targetFramework="net472" />
<package id="System.Text.Encoding.CodePages" version="4.5.1" targetFramework="net472" />
<package id="System.Threading.Tasks.Extensions" version="4.5.3" targetFramework="net472" />
</packages>

72
Report/Report.csproj
View File

@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\Microsoft.CodeAnalysis.Analyzers.2.9.6\build\Microsoft.CodeAnalysis.Analyzers.props" Condition="Exists('..\packages\Microsoft.CodeAnalysis.Analyzers.2.9.6\build\Microsoft.CodeAnalysis.Analyzers.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -32,6 +33,8 @@
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
<TargetFrameworkProfile />
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -106,6 +109,24 @@
<Reference Include="DevExpress.XtraScheduler.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraScheduler.v17.1.Core, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraScheduler.v17.1.Reporting, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="Microsoft.CodeAnalysis, Version=3.4.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.CodeAnalysis.Common.3.4.0\lib\netstandard2.0\Microsoft.CodeAnalysis.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CodeAnalysis.CSharp, Version=3.4.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.3.4.0\lib\netstandard2.0\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CodeAnalysis.CSharp.Workspaces, Version=3.4.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.Workspaces.3.4.0\lib\netstandard2.0\Microsoft.CodeAnalysis.CSharp.Workspaces.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CodeAnalysis.VisualBasic, Version=3.4.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.CodeAnalysis.VisualBasic.3.4.0\lib\netstandard2.0\Microsoft.CodeAnalysis.VisualBasic.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces, Version=3.4.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.CodeAnalysis.VisualBasic.Workspaces.3.4.0\lib\netstandard2.0\Microsoft.CodeAnalysis.VisualBasic.Workspaces.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CodeAnalysis.Workspaces, Version=3.4.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.CodeAnalysis.Workspaces.Common.3.4.0\lib\netstandard2.0\Microsoft.CodeAnalysis.Workspaces.dll</HintPath>
</Reference>
<Reference Include="Microsoft.VisualBasic" />
<Reference Include="Microsoft.VisualBasic.Compatibility" />
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -122,6 +143,27 @@
<EmbedInteropTypes>True</EmbedInteropTypes>
</Reference>
<Reference Include="System" />
<Reference Include="System.Buffers, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Buffers.4.4.0\lib\netstandard2.0\System.Buffers.dll</HintPath>
</Reference>
<Reference Include="System.Collections.Immutable, Version=1.2.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Collections.Immutable.1.5.0\lib\netstandard2.0\System.Collections.Immutable.dll</HintPath>
</Reference>
<Reference Include="System.Composition.AttributedModel, Version=1.0.31.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Composition.AttributedModel.1.0.31\lib\portable-net45+win8+wp8+wpa81\System.Composition.AttributedModel.dll</HintPath>
</Reference>
<Reference Include="System.Composition.Convention, Version=1.0.31.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Composition.Convention.1.0.31\lib\portable-net45+win8+wp8+wpa81\System.Composition.Convention.dll</HintPath>
</Reference>
<Reference Include="System.Composition.Hosting, Version=1.0.31.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Composition.Hosting.1.0.31\lib\portable-net45+win8+wp8+wpa81\System.Composition.Hosting.dll</HintPath>
</Reference>
<Reference Include="System.Composition.Runtime, Version=1.0.31.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Composition.Runtime.1.0.31\lib\portable-net45+win8+wp8+wpa81\System.Composition.Runtime.dll</HintPath>
</Reference>
<Reference Include="System.Composition.TypedParts, Version=1.0.31.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Composition.TypedParts.1.0.31\lib\portable-net45+win8+wp8+wpa81\System.Composition.TypedParts.dll</HintPath>
</Reference>
<Reference Include="System.Core">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
@@ -130,9 +172,28 @@
<Reference Include="System.Design" />
<Reference Include="System.Drawing" />
<Reference Include="System.Drawing.Design" />
<Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Memory.4.5.3\lib\netstandard2.0\System.Memory.dll</HintPath>
</Reference>
<Reference Include="System.Numerics" />
<Reference Include="System.Numerics.Vectors, Version=4.1.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Numerics.Vectors.4.4.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
</Reference>
<Reference Include="System.Reflection.Metadata, Version=1.4.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Reflection.Metadata.1.6.0\lib\netstandard2.0\System.Reflection.Metadata.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.Serialization.Formatters.Soap" />
<Reference Include="System.ServiceModel" />
<Reference Include="System.ServiceProcess" />
<Reference Include="System.Text.Encoding.CodePages, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Text.Encoding.CodePages.4.5.1\lib\net461\System.Text.Encoding.CodePages.dll</HintPath>
</Reference>
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.3\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
</Reference>
<Reference Include="System.Web" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml.Linq">
@@ -655,6 +716,7 @@
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<None Include="packages.config" />
<None Include="Properties\DataSources\BeWo.Report.DefaultReports.KalenderMonatsformatReport.datasource" />
<None Include="Properties\DataSources\BeWo.Report.ReportObjects.AdditionalServiceBookingRO.datasource" />
<None Include="Properties\DataSources\BeWo.Report.ReportObjects.AssessmentSheetRO.datasource" />
@@ -686,7 +748,17 @@
<Install>true</Install>
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
<Analyzer Include="..\packages\Microsoft.CodeAnalysis.Analyzers.2.9.6\analyzers\dotnet\cs\Microsoft.CodeAnalysis.Analyzers.dll" />
<Analyzer Include="..\packages\Microsoft.CodeAnalysis.Analyzers.2.9.6\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.Analyzers.dll" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\Microsoft.CodeAnalysis.Analyzers.2.9.6\build\Microsoft.CodeAnalysis.Analyzers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeAnalysis.Analyzers.2.9.6\build\Microsoft.CodeAnalysis.Analyzers.props'))" />
</Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">

239
Report/ReportObjects/FlsAuslastungsauswertungRO.cs
View File

@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Globalization;
using System.Linq;
using BeWo.Data.Entities;
using BS.Shared;
@@ -10,11 +11,23 @@ namespace BeWo.Report.ReportObjects
{
public class FlsAuslastungsauswertungRO : AbstractBeWoReportObject<FlsAuslastungsauswertungRO>
{
public string Auswertungszeitraum { get; set; } = string.Empty;
public FLSAuswertungstyp FlsAuswertungstyp { get; }
public string Auswertungszeitraum => $"{StartDate:dd.MM.yyyy} - {EndDate:dd.MM.yyyy}";
public Employee Employee { get; set; }
public string EmployeeName => Employee?.Person?.LastNameFirstName ?? string.Empty;
public string EmployeeName
{
get
{
var name = Employee?.Person?.LastNameFirstName ?? string.Empty;
var weeklyFls = Employee?.LastContract?.WeeklyFLS == null ? string.Empty : $"({Employee.LastContract.WeeklyFLS.Value})";
return $"{name} {weeklyFls}";
}
}
public Team Team { get; set; }
@@ -22,7 +35,7 @@ namespace BeWo.Report.ReportObjects
public string TargetObjectDescription { get; }
public string TargetObjectName { get; }
public string TargetObjectName { get; set; }
public List<Customer2Values> Customer2Values { get; set; } = new List<Customer2Values>();
@@ -30,28 +43,41 @@ namespace BeWo.Report.ReportObjects
public DateTime EndDate { get; set; }
public FlsAuslastungsauswertungRO(DateTime startDate, DateTime endDate)
public FlsAuslastungsauswertungRO(DateTime startDate, DateTime endDate, FLSAuswertungstyp flsAuswertungstyp)
{
StartDate = startDate;
EndDate = endDate;
StartDate = startDate;
EndDate = endDate;
FlsAuswertungstyp = flsAuswertungstyp;
}
public FlsAuslastungsauswertungRO(Employee employee, DateTime startDate, DateTime endDate)
public FlsAuslastungsauswertungRO(Employee employee, DateTime startDate, DateTime endDate, FLSAuswertungstyp flsAuswertungstyp)
{
Employee = employee;
TargetObjectDescription = "Mitarbeiter";
TargetObjectName = employee.Person.LastNameFirstName;
StartDate = startDate;
EndDate = endDate;
FlsAuswertungstyp = flsAuswertungstyp;
}
public FlsAuslastungsauswertungRO(Team team, DateTime startDate, DateTime endDate)
public FlsAuslastungsauswertungRO(Team team, DateTime startDate, DateTime endDate, FLSAuswertungstyp flsAuswertungstyp)
{
Team = team;
TargetObjectDescription = "Team";
TargetObjectName = team.Name;
StartDate = startDate;
EndDate = endDate;
FlsAuswertungstyp = flsAuswertungstyp;
}
public void UpdateTargetObjectName()
{
if(Employee != null)
{
TargetObjectName = $"{Employee.Person.LastNameFirstName}({GetVertraglicheArbeitszeit():0.00}) Mehr/Minderarbeit: {GetMehrMinderauslastung():0.00}";
}
else if(Team != null)
{
TargetObjectName = $"{Team.Name} Mehr/Minderarbeit: {GetMehrMinderauslastung():0.00}";
}
}
public Customer2Values GetCustomer2ValuesByCustomer(Customer customer)
@@ -61,19 +87,94 @@ namespace BeWo.Report.ReportObjects
public int GetMonthCount()
{
return StartDate.GetMonthCount(EndDate); ;
return StartDate.GetMonthCount(EndDate);
}
public int GetWeekCount()
{
return StartDate.GetWeekOfYearCount(EndDate);
}
public int GetStartWeekOfYear()
{
return StartDate.GetIso8601WeekOfYear();
}
public decimal GetMehrMinderauslastung()
{
decimal mehrMinderauslastung = 0;
foreach(var customer2Value in Customer2Values)
{
mehrMinderauslastung += customer2Value.DifferenzGanzerAbrechnungszeitraum;
}
return mehrMinderauslastung;
}
public decimal GetVertraglicheArbeitszeit()
{
if(Employee != null)
{
var lastContract = Employee.LastContract;
if(lastContract?.WeeklyFLS != null)
{
return lastContract.WeeklyFLS.Value;
}
}
return 0M;
}
public Customer2Values this[long index]
{
get
{
if(Customer2Values == null)
{
Customer2Values = new List<Customer2Values>();
}
return Customer2Values.FirstOrDefault(f => { return f.Customer?.Oid == index; });
}
}
public decimal DiffSum
{
get
{
return Customer2Values.Sum(c2V => { return c2V.DiffSum; });
}
}
public decimal SollSum
{
get
{
return Customer2Values.Sum(c2V => { return c2V.SollSum; });
}
}
public string DiffSumInPercent
{
get
{
var dsip = DiffSum == 0 ? 0M : DiffSum / SollSum * 100;
return string.Format(new CultureInfo("de-DE"), "{0:0.00}%", dsip);
}
}
}
public class Customer2Values
{
private readonly FLSAuswertungstyp _FlsAuswertungstyp;
public readonly Guid Id;
public string CustomerName => Customer?.Person?.LastNameFirstName;
public Customer Customer { get; set; }
public FlsValueObject Day1 { get; set; }
@@ -113,6 +214,7 @@ namespace BeWo.Report.ReportObjects
public FlsValueObject Week3 { get; set; }
public FlsValueObject Week4 { get; set; }
public FlsValueObject Week5 { get; set; }
public FlsValueObject Week6 { get; set; }
public FlsValueObject Month1 { get; set; }
@@ -130,58 +232,82 @@ namespace BeWo.Report.ReportObjects
_FlsAuswertungstyp = flsAuswertungstyp;
StartDate = startDate;
EndDate = endDate;
Id = Guid.NewGuid();
}
public decimal DifferenzGanzerAbrechnungszeitraum
public Customer2Values()
{
get
Id = Guid.NewGuid();
}
public void CalcDifferences()
{
int count;
string prefix;
var sollSum = 0M;
var istSum = 0M;
switch(_FlsAuswertungstyp)
{
int count;
string prefix;
decimal soll = 0;
decimal ist = 0;
case FLSAuswertungstyp.Daily:
count = 30;
prefix = "Day";
break;
case FLSAuswertungstyp.Weekly:
count = GetWeekCount();
prefix = "Week";
break;
case FLSAuswertungstyp.Monthly:
count = GetMonthCount();
prefix = "Month";
break;
default:
count = 30;
prefix = "Day";
break;
}
switch(_FlsAuswertungstyp)
for(var i = 1; i <= count; i++)
{
var propertyName = $"{prefix}{i}";
var propertyInfo = GetType().GetProperty(propertyName);
if(propertyInfo != null)
{
case FLSAuswertungstyp.Daily:
count = 30;
prefix = "Day";
break;
case FLSAuswertungstyp.Weekly:
count = GetWeekCount();
prefix = "Week";
break;
case FLSAuswertungstyp.Monthly:
count = GetMonthCount();
prefix = "Month";
break;
default:
count = 30;
prefix = "Day";
break;
}
var propertyValue = (FlsValueObject)propertyInfo.GetValue(this, null);
for(var i = 1; i <= count; i++)
{
var propertyName = $"{prefix}{i}";
var propertyInfo = GetType().GetProperty(propertyName);
if(propertyInfo != null)
if(propertyValue != null)
{
var propertyValue = (FlsValueObject)propertyInfo.GetValue(this, null);
if(propertyValue != null)
{
soll += propertyValue.Soll;
ist += propertyValue.Ist;
}
sollSum += propertyValue.Soll;
istSum += propertyValue.Ist;
}
}
return soll - ist;
}
var diffSum = sollSum - istSum;
SollSum = sollSum;
IstSum = istSum;
DiffSum = diffSum;
DifferenzGanzerAbrechnungszeitraum = diffSum;
AuslastungNachEnddatumKunde = sollSum > 0 ? diffSum / sollSum * 100 : 0M;
DiffSumInPercent = AuslastungNachEnddatumKunde;
}
public decimal SollSum { get; set; }
public decimal IstSum { get; set; }
public decimal DiffSum { get; set; }
public decimal DiffSumInPercent { get; set; }
public decimal DifferenzGanzerAbrechnungszeitraum { get; set; }
public decimal AuslastungNachEnddatumKunde { get; set; }
public decimal RestlicheFlsProWoche { get; set; }
public void AddOrUpdateDay(string propertyName, decimal soll, decimal ist, string timeUnitString)
{
try
@@ -226,7 +352,7 @@ namespace BeWo.Report.ReportObjects
public int GetMonthCount()
{
return StartDate.GetMonthCount(EndDate); ;
return StartDate.GetMonthCount(EndDate);
}
public int GetWeekCount()
@@ -243,6 +369,11 @@ namespace BeWo.Report.ReportObjects
return false;
}
public override int GetHashCode()
{
return Id.GetHashCode();
}
}
public class FlsValueObject
@@ -257,9 +388,9 @@ namespace BeWo.Report.ReportObjects
public FlsValueObject(decimal soll, decimal ist, string timeUnit)
{
Soll = soll;
Ist = ist;
TimeUnit = timeUnit;
Soll = soll;
Ist = ist;
TimeUnit = timeUnit;
}
}
}

8
Report/app.config
View File

@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Castle.Core" publicKeyToken="407dd0808d44fbdc" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-2.5.1.0" newVersion="2.5.1.0"/>
<assemblyIdentity name="Castle.Core" publicKeyToken="407dd0808d44fbdc" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.5.1.0" newVersion="2.5.1.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/></startup></configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" /></startup></configuration>

3
ReportImp/ABCBetreuungenReports/ABCBetreuungenReports.csproj
View File

@@ -120,6 +120,9 @@
<SubType>Designer</SubType>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.

3
ReportImp/ABWElsebrock/ABWElsebrock.csproj
View File

@@ -104,6 +104,9 @@
<SubType>Designer</SubType>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.

3
ReportImp/ASBBergischGladbachReports/ASBBergischGladbachReports.csproj
View File

@@ -107,6 +107,9 @@
<SubType>Designer</SubType>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.

4
ReportImp/ASBHammReports/ASBHammReports.csproj
View File

@@ -197,7 +197,9 @@
<Name>Shared</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup />
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.

3
ReportImp/AachenerVereinReports/AachenerVereinReports.csproj
View File

@@ -141,6 +141,9 @@
<DependentUpon>SettlementReport.cs</DependentUpon>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.

3
ReportImp/AbwDziallasMuhrin/AbwDziallasMuhrin.csproj
View File

@@ -77,5 +77,8 @@
<Name>Shared</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

3
ReportImp/AbwKlassen/AbwKlassen.csproj
View File

@@ -114,5 +114,8 @@
<Name>Shared</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

4
ReportImp/AbwWeeger/AbwWeeger.csproj
View File

@@ -55,6 +55,8 @@
<Name>Shared</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup />
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

3
ReportImp/AdikKleve/AdikKleve.csproj
View File

@@ -166,6 +166,9 @@
<Name>Shared</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.

3
ReportImp/AidsHilfeDuisburg/AidsHilfeDuisburg.csproj
View File

@@ -97,5 +97,8 @@
<Name>Shared</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

3
ReportImp/AidsHilfeGiessen/AidsHilfeGiessen.csproj
View File

@@ -100,6 +100,9 @@
<Name>Shared</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.

3
ReportImp/AidsInitiativeBonn/AidsInitiativeBonn.csproj
View File

@@ -98,6 +98,9 @@
<Name>Shared</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.

3
ReportImp/AidsUndDrogenberatung/AidsUndDrogenberatung.csproj
View File

@@ -126,6 +126,9 @@
<Name>Shared</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.

3
ReportImp/AidshilfeDortmund/AidshilfeDortmund.csproj
View File

@@ -110,6 +110,9 @@
<Name>Shared</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.

3
ReportImp/AidshilfeKassel/AidshilfeKassel.csproj
View File

@@ -82,6 +82,9 @@
<Name>Report</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.

3
ReportImp/AlphaEv/AlphaEv.csproj
View File

@@ -205,5 +205,8 @@
<Name>Shared</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

3
ReportImp/ApiBerlin/ApiBerlin.csproj
View File

@@ -133,6 +133,9 @@
<Name>Shared</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.

3
ReportImp/AsbFassbacherHof/AsbFassbacherHof.csproj
View File

@@ -81,5 +81,8 @@
<SubType>Designer</SubType>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

3
ReportImp/AsbMoenchengladbach/AsbMoenchengladbach.csproj
View File

@@ -97,5 +97,8 @@
<Name>Shared</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

3
ReportImp/AsbRheinErftDueren/AsbRheinErftDueren.csproj
View File

@@ -113,5 +113,8 @@
<Name>Shared</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

3
ReportImp/AsbRuhr/AsbRuhr.csproj
View File

@@ -146,5 +146,8 @@
<SubType>Designer</SubType>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

3
ReportImp/AssistenzaReports/AssistenzaReports.csproj
View File

@@ -197,6 +197,9 @@
<Name>Shared</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.

3
ReportImp/AufEigenenFuessenStehen/AufEigenenFuessenStehen.csproj
View File

@@ -69,5 +69,8 @@
<Name>Report</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

3
ReportImp/AwoDortmund/AwoDortmund.csproj
View File

@@ -116,5 +116,8 @@
<DependentUpon>Teamstundenkonto.cs</DependentUpon>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

3
ReportImp/AwoWesel/AwoWesel.csproj
View File

@@ -105,5 +105,8 @@
<SubType>Designer</SubType>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

3
ReportImp/BAPBielefelderAmbulantePflege/BAPBielefelderAmbulantePflege.csproj
View File

@@ -133,6 +133,9 @@
<DependentUpon>Teamstundenkonto.cs</DependentUpon>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.

3
ReportImp/BUGeVReports/BUGeVReports.csproj
View File

@@ -117,6 +117,9 @@
<Name>Report</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.

3
ReportImp/BWKGbR/BWKGbR.csproj
View File

@@ -139,6 +139,9 @@
<Name>Shared</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.

3
ReportImp/BeWoAlsdorf/BeWoAlsdorf.csproj
View File

@@ -117,6 +117,9 @@
<Name>Shared</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.

3
ReportImp/BeWoAmrath/BeWoAmrath.csproj
View File

@@ -115,6 +115,9 @@
<Name>Shared</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.

3
ReportImp/BeWoAuxilio/BeWoAuxilio.csproj
View File

@@ -130,6 +130,9 @@
<Name>Shared</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.

3
ReportImp/BeWoBiallas/BeWoBiallas.csproj
View File

@@ -99,6 +99,9 @@
<Name>Shared</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.

3
ReportImp/BeWoColonia5Reports/BeWoColonia5Reports.csproj
View File

@@ -82,6 +82,9 @@
<DependentUpon>ServicesOverviewReport.cs</DependentUpon>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.

3
ReportImp/BeWoColoniaKalayci/BeWoColoniaKalayci.csproj
View File

@@ -97,6 +97,9 @@
<Name>Report</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.

3
ReportImp/BeWoColoniaMitarbeiter/BeWoColoniaMitarbeiter.csproj
View File

@@ -96,6 +96,9 @@
<Name>Report</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.

3
ReportImp/BeWoColoniaMitarbeiter2/BeWoColoniaMitarbeiter2.csproj
View File

@@ -68,5 +68,8 @@
<Name>Report</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

3
ReportImp/BeWoDellbrueck/BeWoDellbrueck.csproj
View File

@@ -168,6 +168,9 @@
<Install>true</Install>
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.

3
ReportImp/BeWoDirekt/BeWoDirekt.csproj
View File

@@ -163,6 +163,9 @@
<Name>Shared</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.

3
ReportImp/BeWoFlex/BeWoFlex.csproj
View File

@@ -91,5 +91,8 @@
<SubType>Designer</SubType>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

3
ReportImp/BeWoFuerDich/BeWoFuerDich.csproj
View File

@@ -126,5 +126,8 @@
<Name>Shared</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

3
ReportImp/BeWoGuen/BeWoGuen.csproj
View File

@@ -111,6 +111,9 @@
<Name>Shared</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.

3
ReportImp/BeWoHeinsberg/BeWoHeinsberg.csproj
View File

@@ -288,6 +288,9 @@
<Install>true</Install>
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.

3
ReportImp/BeWoImFlow/BeWoImFlow.csproj
View File

@@ -122,5 +122,8 @@
<Name>Shared</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

3
ReportImp/BeWoKerpen/BeWoKerpen.csproj
View File

@@ -124,6 +124,9 @@
<Name>Shared</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.

3
ReportImp/BeWoKleefeld/BeWoKleefeld.csproj
View File

@@ -77,5 +77,8 @@
<Name>Shared</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

3
ReportImp/BeWoKoelnSued/BeWoKoelnSued.csproj
View File

@@ -73,5 +73,8 @@
<Name>Report</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

3
ReportImp/BeWoLeverkusen/BeWoLeverkusen.csproj
View File

@@ -102,6 +102,9 @@
<Name>Shared</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.

3
ReportImp/BeWoMarinReports/BeWoMarinReports.csproj
View File

@@ -75,6 +75,9 @@
<Name>Shared</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.

3
ReportImp/BeWoMobilReports/BeWoMobilReports.csproj
View File

@@ -245,6 +245,9 @@
<Install>true</Install>
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.

3
ReportImp/BeWoMundo/BeWoMundo.csproj
View File

@@ -98,6 +98,9 @@
<DependentUpon>ServicesOverviewReport.cs</DependentUpon>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.

1
ReportImp/BeWoNeuss/BeWoNeuss.csproj
View File

@@ -237,6 +237,7 @@
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<None Include="Properties\DataSources\BeWo.Report.ReportObjects.Settlement2RO.datasource" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

3
ReportImp/BeWoNordeifel/BeWoNordeifel.csproj
View File

@@ -128,5 +128,8 @@
<Name>Shared</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

3
ReportImp/BeWoPlusReports/BeWoPlusReports.csproj
View File

@@ -118,6 +118,9 @@
<Name>Report</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.

3
ReportImp/BeWoRichartz/BeWoRichartz.csproj
View File

@@ -115,6 +115,9 @@
<SubType>Designer</SubType>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.

3
ReportImp/BeWoRueckenwind/BeWoRueckenwind.csproj
View File

@@ -167,6 +167,9 @@
<Name>Shared</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.

3
ReportImp/BeWoSchillingReports/BeWoSchillingReports.csproj
View File

@@ -155,6 +155,9 @@
<DependentUpon>Teamauslastung.cs</DependentUpon>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.

3
ReportImp/BeWoTrio/BeWoTrio.csproj
View File

@@ -97,5 +97,8 @@
<Name>Shared</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

3
ReportImp/BeWoViersen/BeWoViersen.csproj
View File

@@ -170,6 +170,9 @@
<Name>Shared</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.

3
ReportImp/BeWoWalzPaiva/BeWoWalzPaiva.csproj
View File

@@ -136,5 +136,8 @@
<Name>Shared</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

3
ReportImp/BellaDonna/BellaDonna.csproj
View File

@@ -125,5 +125,8 @@
<SubType>Designer</SubType>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

30
ReportImp/BetreuWoReports/BetreuWoReports.csproj
View File

@@ -73,26 +73,10 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="DevExpress.DataAccess.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DevExpress.Pdf.v17.1.Core, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Printing.v17.1.Core, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Data.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Utils.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Xpo.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DevExpress.XtraPrinting.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Charts.v17.1.Core, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraCharts.v17.1.Wizard, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraCharts.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.PivotGrid.v17.1.Core, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraPivotGrid.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraReports.v17.1.Extensions, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Sparkline.v17.1.Core, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Utils.v17.1.UI, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.CodeParser.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Office.v17.1.Core, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.RichEdit.v17.1.Core, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.RichEdit.v17.1.Export, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraReports.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraScheduler.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraScheduler.v17.1.Core, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="PresentationCore" />
<Reference Include="System" />
@@ -101,14 +85,6 @@
</Reference>
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml.Linq">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
<Reference Include="System.Data.DataSetExtensions">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="WindowsBase" />
</ItemGroup>
<ItemGroup>
@@ -217,6 +193,9 @@
<Compile Include="Validation\ServiceRecordValidator.cs" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="FlsAuslastungsauswertung.de.resx">
<DependentUpon>FlsAuslastungsauswertung.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="FLSGroupReport.resx">
<DependentUpon>FLSGroupReport.cs</DependentUpon>
</EmbeddedResource>
@@ -305,6 +284,9 @@
<Install>true</Install>
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.

734
ReportImp/BetreuWoReports/FlsAuslastungsauswertung.cs
View File

@@ -2,6 +2,7 @@ using System;
using BeWo.Report;
using BeWo.Report.ReportObjects;
using System.Collections.Generic;
using System.Diagnostics;
using System.Drawing;
using System.Drawing.Printing;
using System.Globalization;
@@ -9,22 +10,154 @@ using System.Linq;
using BeWo.Data;
using BeWo.Data.Access;
using BeWo.Data.Entities;
using BeWo.Service.Plugins;
using BS.Shared;
using BS.Shared.Core;
using BS.Shared.Extensions;
using DevExpress.XtraPrinting;
using DevExpress.XtraReports.UI;
using DevExpress.XtraScheduler;
using DevExpress.XtraScheduler.Compatibility;
using DevExpress.XtraScheduler.Drawing;
using FlsAuslastungsauswertungRO = BeWo.Report.ReportObjects.FlsAuslastungsauswertungRO;
namespace BeWo.BetreuWoReports.Alt
{
public partial class FlsAuslastungsauswertung : XtraReport, IBeWoReport<QueryRO>
{
public FlsAuslastungsauswertungRO _FlsAuslastungsauswertung => (FlsAuslastungsauswertungRO) objectDataSource1.DataSource;
private FLSAuswertungstyp _FlsAuswertungstyp;
private static readonly CultureInfo _CultureInfoDe = new CultureInfo("de-DE");
public FlsAuslastungsauswertung()
{
InitializeComponent();
MonthlyHeaderTable.BeforePrint += MonthlyHeaderTableOnBeforePrint;
MonthlyValueTable.BeforePrint += MonthlyValueTableBeforePrint;
WeeklyHeaderTable.BeforePrint += WeeklyHeaderTableOnBeforePrint;
WeeklyValueTable.BeforePrint += WeeklyValueTableOnBeforePrint;
DailySumTable.BeforePrint += DailySumTableBeforePrint;
}
public void DailySumTableBeforePrint(object sender, PrintEventArgs e)
{
var dayIndex = 0;
var sumList = new List<DaySumObject>
{
new DaySumObject(),
new DaySumObject(),
new DaySumObject(),
new DaySumObject(),
new DaySumObject(), //5
new DaySumObject(),
new DaySumObject(),
new DaySumObject(),
new DaySumObject(),
new DaySumObject(), //10
new DaySumObject(),
new DaySumObject(),
new DaySumObject(),
new DaySumObject(),
new DaySumObject(), //15
new DaySumObject(),
new DaySumObject(),
new DaySumObject(),
new DaySumObject(),
new DaySumObject(), //20
new DaySumObject(),
new DaySumObject(),
new DaySumObject(),
new DaySumObject(),
new DaySumObject(), //25
new DaySumObject(),
new DaySumObject(),
new DaySumObject(),
new DaySumObject(),
new DaySumObject() //30
};
var auslastungNachEnddatumKunde = 0M;
var diffSollIstAuswertungszeitraum = 0M;
var restlicheFlsProWoche = 0M;
foreach (var customer2Value in _FlsAuslastungsauswertung.Customer2Values)
{
auslastungNachEnddatumKunde += customer2Value.AuslastungNachEnddatumKunde;
diffSollIstAuswertungszeitraum += customer2Value.DifferenzGanzerAbrechnungszeitraum;
restlicheFlsProWoche += customer2Value.RestlicheFlsProWoche;
for (var i = 1; i < 31; i++)
{
var fvo = customer2Value.GetFlsValueObject("Day", i) ?? new FlsValueObject(0, 0, string.Empty);
sumList[i - 1].AddValues(fvo.Soll, fvo.Ist, fvo.DiffSollIst);
}
}
var sollSums = 0M;
var diffSums = 0M;
foreach(var dso in sumList)
{
sollSums += dso.SollSum;
diffSums += dso.DiffSum;
}
auslastungNachEnddatumKunde = sollSums > 0 ? diffSums / sollSums * 100 : 0M;
ReportUtils.InvokeActionOnEveryCellOfRow(DailySumTable.Rows.FirstRow, (cell, cellIndex) =>
{
if (cellIndex % 3 == 2)
{
dayIndex++;
}
cell.TextAlignment = TextAlignment.MiddleRight;
cell.DataBindings.Clear();
if (dayIndex > 0 && dayIndex < 31)
{
var test = cellIndex % 3;
var val = 0M;
switch(test)
{
case 0:
val = sumList[dayIndex - 1].IstSum;
break;
case 1:
val = sumList[dayIndex - 1].DiffSum;
break;
default:
val = sumList[dayIndex - 1].SollSum;
break;
}
cell.Text = string.Format(_CultureInfoDe, "{0:0.00}", val);
}
else if(cellIndex == 0)
{
cell.Text = "Summe";
}
else if(cellIndex == 1) // restliche FLS pro Woche
{
cell.Text = string.Format(_CultureInfoDe, "{0:0.00}", restlicheFlsProWoche);
}
else if(cellIndex == 92) // Differenz Soll/Ist Auswertungszeitraum
{
cell.Text = string.Format(_CultureInfoDe, "{0:0.00}", diffSollIstAuswertungszeitraum);
}
else if (cellIndex == 93) // Auslastung nach Enddatum Kunde auslastungNachEnddatumKunde
{
cell.Text = string.Format(_CultureInfoDe, "{0:0.00}%", auslastungNachEnddatumKunde);
}
});
}
public void SetReportDataSource(QueryRO pRO)
@@ -37,6 +170,14 @@ namespace BeWo.BetreuWoReports.Alt
if(ro.Rows.Count == 1)
{
var firstRow = ro.Rows.First();
#if DEBUG
//firstRow.Field1 = "1";
//firstRow.Field2 = "2021-04-01";
//firstRow.Field3 = "Monat";
//firstRow.Field4 = "1";
#endif
var objectOidUnparsed = firstRow.Field1;
var startDateUnparsed = firstRow.Field2;
var intervalUnitUnparsed = firstRow.Field3;
@@ -47,11 +188,7 @@ namespace BeWo.BetreuWoReports.Alt
var startDate = DateTime.Parse(startDateUnparsed.ToString());
var endDate = startDate.AddDays(30);
var flsAuslastungsauswertungRo = new FlsAuslastungsauswertungRO(startDate, endDate)
{
Auswertungszeitraum = $"{startDate:dd.MM.yyyy} - {endDate:dd.MM.yyyy}"
};
var flsAuslastungsauswertungRo = new FlsAuslastungsauswertungRO(startDate, endDate, _FlsAuswertungstyp);
string flsValueObjectNamePrefix;
@@ -90,7 +227,7 @@ namespace BeWo.BetreuWoReports.Alt
MonthlyDetailReport.Visible = false;
}
var customers = new List<Customer>();
var customers = new List<Customer>();
var employeeOids = new List<long>();
if(analysisType == 1)
@@ -98,7 +235,7 @@ namespace BeWo.BetreuWoReports.Alt
var employee = DAOFactory.GenericDAO.LoadByID<Employee>(objectOid);
employeeOids.AddIfNotIn(employee.Oid.Value);
customers = employee.Employee2CustomerList.Select(s => s.Customer).ToList();
flsAuslastungsauswertungRo = new FlsAuslastungsauswertungRO(employee, startDate, endDate);
flsAuslastungsauswertungRo = new FlsAuslastungsauswertungRO(employee, startDate, endDate, _FlsAuswertungstyp);
}
else if(analysisType == 2)
{
@@ -107,7 +244,7 @@ namespace BeWo.BetreuWoReports.Alt
customers.Clear();
team.MemberList.DoForEach(member => customers.AddRangeIfElementsNotIn(member.Employee2CustomerList.Select(e2c => e2c.Customer)));
employeeOids.AddRangeIfElementsNotIn(team.MemberList.Where(member => member.Oid.HasValue).Select(member => member.Oid.Value));
flsAuslastungsauswertungRo = new FlsAuslastungsauswertungRO(team, startDate, endDate);
flsAuslastungsauswertungRo = new FlsAuslastungsauswertungRO(team, startDate, endDate, _FlsAuswertungstyp);
}
ApplicationUser user;
@@ -132,6 +269,23 @@ namespace BeWo.BetreuWoReports.Alt
var rootAppointments = customerAppointments.Where(w => w.RecurrenceInfo != null && w.Type == 1).ToList();
var list = new List<SchedulerAppointment>();
customerAppointments.DoForEach(app =>
{
if(app.StartDate.HasValue && app.EndDate.HasValue)
{
var start = app.StartDate.Value;
var end = app.EndDate.Value;
if(start.GetShortDateTime().AreInBetweenDates(end, startDate, endDate))
{
list.AddIfNotIn(app);
}
}
});
customerAppointments = list;
// Recurring Instances berechnen
foreach(var appointment in rootAppointments)
{
@@ -154,11 +308,16 @@ namespace BeWo.BetreuWoReports.Alt
foreach(var termin in occurrences.GetAppointments(interval))
{
var index = termin.RecurrenceIndex;
var duration = (appointment.EndDate.Value - appointment.StartDate.Value).TotalMinutes;
var appointmentStart = termin.Start;
var appointmentEnd = termin.Start.AddMinutes(duration);
if(termin.RecurrenceInfo?.Id?.ToString().Equals("85d6cb05-d035-47c2-ac9e-42f10733a721") ?? false)
{
}
var areInBetween = appointmentStart.GetShortDateTime().AreInBetweenDates(appointmentEnd.GetShortDateTime(), startDate, endDate);
if(!areInBetween || changedOrDeletedAppointments.Any(a => a.GetRecurrenceId().ToString().Equals(patternId) && a.GetRecurrenceIndex() == index))
@@ -168,28 +327,27 @@ namespace BeWo.BetreuWoReports.Alt
var recurringAppointment = new SchedulerAppointment
{
AllDay = appointment.AllDay,
CustomerList = appointment.CustomerList,
Notice = appointment.Notice,
EmployeeList = appointment.EmployeeList,
EndDate = termin.Start.AddMinutes(duration),
AllDay = appointment.AllDay,
CustomerList = appointment.CustomerList,
Notice = appointment.Notice,
EmployeeList = appointment.EmployeeList,
EndDate = termin.Start.AddMinutes(duration),
FormerBookingSequenceOid = appointment.FormerBookingSequenceOid,
IsPrivate = appointment.IsPrivate,
Location = appointment.Location,
Originator = appointment.Originator,
RecurrenceInfo = termin.RecurrenceInfo.ToXml(),
ReminderInfo = appointment.ReminderInfo,
ResourceList = appointment.ResourceList,
StartDate = termin.Start,
Subject = appointment.Subject ?? string.Empty,
Type = appointment.Type
IsPrivate = appointment.IsPrivate,
Location = appointment.Location,
Originator = appointment.Originator,
RecurrenceInfo = termin.RecurrenceInfo.ToXml(),
ReminderInfo = appointment.ReminderInfo,
ResourceList = appointment.ResourceList,
StartDate = termin.Start,
Subject = appointment.Subject ?? string.Empty,
Type = appointment.Type
};
customerAppointments.AddIfNotIn(recurringAppointment);
}
}
}
// /Recurring Instances berechnen
// SOLL-Stunden
foreach(var customerAppointment in customerAppointments.Where(ca => ca.StartDate.HasValue && ca.EndDate.HasValue))
@@ -201,7 +359,7 @@ namespace BeWo.BetreuWoReports.Alt
var customerCount = customerAppointment.CustomerList.Count;
foreach(var customer in customerAppointment.CustomerList)
foreach(var customer in customerAppointment.CustomerList.OrderBy(c => c.Oid))
{
for(var i = 0; i <= dayCount; i++)
{
@@ -215,28 +373,57 @@ namespace BeWo.BetreuWoReports.Alt
var timeUnit = _FlsAuswertungstyp == FLSAuswertungstyp.Daily ? day : _FlsAuswertungstyp == FLSAuswertungstyp.Weekly ? weekOfYear : month;
var duration = (decimal) ((currentEnd - currentDate).TotalMinutes / customerCount / 60);
var totalMinutes = Convert.ToDecimal((currentEnd - currentDate).TotalMinutes);
var personCount = Convert.ToDecimal(customerCount);
var duration = totalMinutes / personCount / 60M;
flsAuslastungsauswertungRo.Customer2Values.AddIfNotIn(new Customer2Values(customer, _FlsAuswertungstyp, startDate, endDate));
var customer2Values = flsAuslastungsauswertungRo.GetCustomer2ValuesByCustomer(customer);
var index = GetDayIndex(currentDate, startDate);
var index = GetTimeIndex(currentDate, startDate, _FlsAuswertungstyp);
Debug.WriteLine($"{customer.Person.LastNameFirstName}, {flsValueObjectNamePrefix}{index} ({currentDate:dd.MM.yyyy HH:mm}-{currentEnd:dd.MM.yyyy HH:mm} [{customerCount}]): {duration}h");
customer2Values.AddOrUpdateDay($"{flsValueObjectNamePrefix}{index}", duration, 0, timeUnit);
}
}
}
var elmo = customerAppointments.Where(customerAppointment =>
{
return customerAppointment.CustomerList.Any(a => a.Oid == 20);
}).ToList().OrderBy(x => x.StartDate).ThenBy(x => x.EndDate).ToList();
foreach(var kek in elmo)
{
var totalMinutes = Convert.ToDecimal((kek.EndDate.Value - kek.StartDate.Value).TotalMinutes);
var personCount = Convert.ToDecimal(kek.CustomerList.Count);
var duration = totalMinutes / personCount / 60M;
Debug.WriteLine($"({kek.Oid}): {kek.StartDate.Value:dd.MM. HH:mm}-{kek.EndDate.Value:dd.MM. HH:mm}={duration:0.00} ({personCount} Klienten)");
}
var customerOid2CostBearer2SupportConceptOids = new Dictionary<long, List<long>>();
// IST-Stunden
foreach(var customer in customers.Where(c => c.Oid.HasValue))
{
var serviceRecords = DAOFactory.SearchDAO.FindServiceRecordsForFlsAuslastungsauswertungByCustomerAndEmployees(customer.Oid.Value, employeeOids, startDate, endDate, true);
foreach(var serviceRecord in serviceRecords.Where(sr => sr.Start.HasValue && sr.End.HasValue))
{
flsAuslastungsauswertungRo.Customer2Values.AddIfNotIn(new Customer2Values(customer, _FlsAuswertungstyp, startDate, endDate));
if(serviceRecord.CostBearer2SupportConceptOid.HasValue)
{
customerOid2CostBearer2SupportConceptOids.AddOrUpdateValueInDictionary(customer.Oid.Value, serviceRecord.CostBearer2SupportConceptOid.Value);
}
var customer2Values = flsAuslastungsauswertungRo.GetCustomer2ValuesByCustomer(customer);
var start = serviceRecord.Start.Value;
@@ -250,21 +437,46 @@ namespace BeWo.BetreuWoReports.Alt
var currentEnd = currentDate.Date.AddHours(23).AddMinutes(59).AddSeconds(59);
currentEnd = currentEnd > end ? end : currentEnd;
var duration = (decimal) (((currentEnd - currentDate).TotalMinutes / serviceRecord.GroupPersonCount ?? 1) / 60);
var totalMinutes = Convert.ToDecimal((currentEnd - currentDate).TotalMinutes);
var personCount = Convert.ToDecimal(serviceRecord.GroupPersonCount ?? 1);
var index = GetDayIndex(currentDate, startDate);
var duration = totalMinutes / personCount / 60M;
var index = GetTimeIndex(currentDate, startDate, _FlsAuswertungstyp);
var weekOfYear = currentDate.GetIso8601WeekOfYear().ToString();
var month = currentDate.ToString("MMMM");
var day = currentDate.ToString("dd");
var timeUnit = _FlsAuswertungstyp == FLSAuswertungstyp.Daily ? day : _FlsAuswertungstyp == FLSAuswertungstyp.Weekly ? weekOfYear : month;
var timeUnit = _FlsAuswertungstyp == FLSAuswertungstyp.Daily ? day : _FlsAuswertungstyp == FLSAuswertungstyp.Weekly ? weekOfYear.ToString() : month;
customer2Values.AddOrUpdateDay($"{flsValueObjectNamePrefix}{index}", 0, duration, timeUnit);
}
}
}
var serviceRecordStatisticFactory = PluginLoader.FindClass<ServiceRecordStatisticFactory>();
if(serviceRecordStatisticFactory != null)
{
foreach(var cOid2Cb2ScOids in customerOid2CostBearer2SupportConceptOids)
{
foreach(var costBearer2SupportConceptOid in cOid2Cb2ScOids.Value)
{
var statistics = serviceRecordStatisticFactory.CreateSupportConceptStatistics(costBearer2SupportConceptOid, DateTime.Now);
var restlicheFlsProWoche = statistics.MinutesApprovedPerWeek / 60;
var customer2Values = flsAuslastungsauswertungRo[cOid2Cb2ScOids.Key];
customer2Values.RestlicheFlsProWoche += restlicheFlsProWoche;
}
}
}
flsAuslastungsauswertungRo.Customer2Values.DoForEach(customer2Values => { customer2Values.CalcDifferences(); });
flsAuslastungsauswertungRo.UpdateTargetObjectName();
return flsAuslastungsauswertungRo;
}
@@ -278,185 +490,423 @@ namespace BeWo.BetreuWoReports.Alt
return dayIndex.Days + 1;
}
private static void AddCell(XRTableRow row, string text, string cellName, int colorInt)
private static int GetTimeIndex(DateTime date, DateTime startDate, FLSAuswertungstyp flsAuswertungstyp)
{
var cell = new XRTableCell {Width = 160};
row.Cells.AddRange(new[] { cell });
switch(flsAuswertungstyp)
{
case FLSAuswertungstyp.Daily:
return GetDayIndex(date, startDate);
case FLSAuswertungstyp.Weekly:
var weekOfYear = date.GetIso8601WeekOfYear() - startDate.GetIso8601WeekOfYear();
cell.Text = text;
return weekOfYear == 0 ? 1 : weekOfYear;
case FLSAuswertungstyp.Monthly:
var month = date.Month - startDate.Month;
DyeCell(colorInt, cell);
return month < 1 ? 1 : month;
default:
return 1;
}
}
private void MonthlyHeaderTableOnBeforePrint(object sender, PrintEventArgs e)
{
var flsAuslastungsauswertungRO = (FlsAuslastungsauswertungRO) objectDataSource1.DataSource;
var flsAuslastungsauswertungRO = (FlsAuslastungsauswertungRO)objectDataSource1.DataSource;
var monthCount = flsAuslastungsauswertungRO.GetMonthCount();
MonthlyHeaderTable.Width = 710 + monthCount * 3 * 160;// + 320;
MonthlyHeaderTable.BeginInit();
if(monthCount > 1)
MonthlyTargetObjectDescriptionCell.Text = flsAuslastungsauswertungRO.TargetObjectName;
if(monthCount > 0)
{
for(var currentMonth = 2; currentMonth <= monthCount; currentMonth++)
for(var currentMonth = 1; currentMonth <= monthCount; currentMonth++)
{
var monthInt = flsAuslastungsauswertungRO.StartDate.Month + currentMonth - 1;
var monthName = CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(monthInt);
var colorInt = currentMonth == 5 ? currentMonth : currentMonth % 5;
AddCell(xrTableRow12, $"Soll\r\n{monthName}", $"SollMonth{currentMonth}Cell", colorInt);
ReportUtils.AddCellToRow(xrTableRow12, $"Soll {monthName}", $"MonthlyHeaderCell{xrTableRow12.Cells.Count - 1}Soll", 160, TextAlignment.MiddleCenter, GetColor(colorInt));
ReportUtils.AddCellToRow(xrTableRow12, $"Ist {monthName}", $"MonthlyHeaderCell{xrTableRow12.Cells.Count - 1}Ist", 160, TextAlignment.MiddleCenter, GetColor(colorInt));
ReportUtils.AddCellToRow(xrTableRow12, $"Diff Soll/Ist {monthName}", $"MonthlyHeaderCell{xrTableRow12.Cells.Count - 1}Diff", 160, TextAlignment.MiddleCenter, GetColor(colorInt));
}
}
var newCellIndex = xrTableRow10.Cells.Count - 1;
var newSollell = xrTableRow10.Cells[newCellIndex];
newSollell.Width = 160;
newSollell.Name = $"MonthlyValueCell{newCellIndex}Soll";
ReportUtils.AddCellToRow(xrTableRow12, "Differenz Soll/Ist Auswertungszeitraum", "MonthlyDiffSollIstAuswertungszeitraumCellLabel", 160, TextAlignment.MiddleCenter, Color.White);
ReportUtils.AddCellToRow(xrTableRow12, "Auslastung nach Enddatum Kunde", "MonthlyAuslastungNachEnddatumCellLabel", 160, TextAlignment.MiddleCenter, Color.White);
MonthlyValueTable.InsertColumnToRight(newSollell);
MonthlyHeaderTable.AdjustSize();
MonthlyHeaderTable.EndInit();
}
AddCell(xrTableRow12, $"Ist\r\n{monthName}", $"IstMonth{currentMonth}Cell", colorInt);
public void MonthlyValueTableBeforePrint(object sender, PrintEventArgs e)
{
MonthlyValueTable.BeginInit();
newCellIndex = xrTableRow10.Cells.Count - 1;
var newIstCell = xrTableRow10.Cells[newCellIndex];
newIstCell.Width = 160;
newIstCell.Name = $"MonthlyValueCell{newCellIndex}Ist";
var flsAuslastungsauswertungRO = (FlsAuslastungsauswertungRO) objectDataSource1.DataSource;
MonthlyValueTable.InsertColumnToRight(newIstCell);
var monthCount = flsAuslastungsauswertungRO.GetMonthCount();
for(var i = 0; i < flsAuslastungsauswertungRO.Customer2Values.Count; i++)
{
MonthlyValueTable.InsertRowBelow(MonthlyValueTable.Rows.LastRow);
}
AddCell(xrTableRow12, $"Diff Soll/Ist\r\n{monthName}", $"DiffSollIstMonth{currentMonth}Cell", colorInt);
newCellIndex = xrTableRow10.Cells.Count - 1;
var newDiffCell = xrTableRow10.Cells[newCellIndex];
newDiffCell.Width = 160;
newDiffCell.Name = $"MonthlyValueCell{newCellIndex}Diff";
MonthlyValueTable.InsertColumnToRight(newDiffCell);
if(monthCount > 0)
{
for(var currentMonth = 1; currentMonth <= monthCount; currentMonth++)
{
ReportUtils.InvokeActionOnEveryRow(MonthlyValueTable, (row, rowIndex) =>
{
ReportUtils.AddCellToRow(row, string.Empty, $"MonthlyValueCell{row.Cells.Count - 1}Soll", 160, TextAlignment.MiddleRight, Color.White);
ReportUtils.AddCellToRow(row, string.Empty, $"MonthlyValueCell{row.Cells.Count - 1}Ist", 160, TextAlignment.MiddleRight, Color.White);
ReportUtils.AddCellToRow(row, string.Empty, $"MonthlyValueCell{row.Cells.Count - 1}Diff", 160, TextAlignment.MiddleRight, Color.White);
});
for(var i = 0; i < MonthlyValueTable.Rows.Count; i++)
{
var currentRow = MonthlyValueTable.Rows[i];
for(var j = 5; j < currentRow.Cells.Count; j++)
for(var j = 0; j < currentRow.Cells.Count; j++)
{
var currentCell = currentRow.Cells[j];
var cellName = currentCell.Name;
var cellName = currentCell.Name;
// TODO: Farbe hinzufügen, Größe anpassen
// Klient: 160
// restliche FLS pro Woche: 70
// Soll 1: 160
// Ist 1: 160
// Diff: 160
// ----------------------------
// 710
currentCell.Width = 160;
var bindingParameter = string.Empty;
if(cellName?.EndsWith("Soll") ?? false)
if(flsAuslastungsauswertungRO.Customer2Values.Count > i)
{
bindingParameter = "Soll";
}
else if(cellName?.EndsWith("Ist") ?? false)
{
bindingParameter = "Ist";
}
else if(cellName?.EndsWith("Diff") ?? false)
{
bindingParameter = "DiffSollIst";
}
var customer2Values = flsAuslastungsauswertungRO.Customer2Values[i];
var month = (FlsValueObject) customer2Values.GetPropertyValue($"Month{currentMonth}");
currentCell.DataBindings.AddRange(
new[]
if(cellName?.EndsWith("Soll") ?? false)
{
new XRBinding("Text", null, $"Customer2Values.Month{currentMonth}.{bindingParameter}")
currentCell.Text = string.Format(_CultureInfoDe, "{0:0.00}", month?.Soll ?? 0);
}
);
else if(cellName?.EndsWith("Ist") ?? false)
{
currentCell.Text = string.Format(_CultureInfoDe, "{0:0.00}", month?.Ist ?? 0);
}
else if(cellName?.EndsWith("Diff") ?? false)
{
currentCell.Text = string.Format(_CultureInfoDe, "{0:0.00}", month?.DiffSollIst ?? 0);
}
else if(j == 0) // Klientenname
{
currentCell.Text = customer2Values.CustomerName;
}
else if(j == 1) // Restliche FLS
{
currentCell.Text = string.Format(_CultureInfoDe, "{0:0.00}", customer2Values.RestlicheFlsProWoche);
}
}
}
}
}
}
// TODO: "Differenz Soll/Ist Auswertungszeitraum" und "Auslastung nach Enddatum Kunde" hinzufügen.
AddCell(xrTableRow12, "Differenz Soll/Ist Auswertungszeitraum", "MonthlyDiffSollIstAuswertungszeitraumCellLabel", 6);
MonthlyValueTable.InsertColumnToRight(xrTableRow10.Cells[xrTableRow10.Cells.Count - 1]);
// Diff. Auswertungszeitraum und Auslastung nach Enddatum
ReportUtils.InvokeActionOnEveryRow(MonthlyValueTable, (row, rowIndex) =>
{
var index = rowIndex;
var differenzGanzerAbrechnungszeitraum = 0M;
var auslastungNachEnddatumKunde = 0M;
//foreach(var customer2Values in flsAuslastungsauswertungRO.Customer2Values)
//{
// // TODO: Werte hinzufügen
//}
if(index > -1 && index < flsAuslastungsauswertungRO.Customer2Values.Count)
{
var customer2Value = flsAuslastungsauswertungRO.Customer2Values[rowIndex];
/*
* foreach (var key in reasonGesamtDict.Keys)
{
AddCell(xrTableRowHeader, key);
xrTableDetail.InsertColumnToRight(xrTableRowDetail.Cells[xrTableRowDetail.Cells.Count - 1]);
xrTableSumme.InsertColumnToRight(xrTableRowSumme.Cells[xrTableRowSumme.Cells.Count - 1]);
}
foreach (XRTableCell cell in xrTableRowHeader.Cells)
{
cell.Width = xrTableHeader.Width / xrTableRowHeader.Cells.Count;
}
foreach (XRTableCell cell in xrTableRowDetail.Cells)
{
cell.Width = xrTableDetail.Width / xrTableRowDetail.Cells.Count;
}
foreach (XRTableCell cell in xrTableRowSumme.Cells)
{
cell.Width = xrTableSumme.Width / xrTableRowSumme.Cells.Count;
}
for (int i = 1; i < xrTableRowDetail.Cells.Count; i++)
{
var cell = xrTableRowDetail.Cells[i];
cell.DataBindings.AddRange(
new DevExpress.XtraReports.UI.XRBinding[]
{
new DevExpress.XtraReports.UI.XRBinding("Text", null, String.Format("Rows.Field{0}", i + 1))
differenzGanzerAbrechnungszeitraum = customer2Value.DifferenzGanzerAbrechnungszeitraum;
auslastungNachEnddatumKunde = customer2Value.AuslastungNachEnddatumKunde;
}
);
ReportUtils.AddCellToRow(row, string.Format(_CultureInfoDe, "{0:0.00}", differenzGanzerAbrechnungszeitraum), $"MonthlyValueDiffAuswertungszeitraum{rowIndex}Cell", 160F, TextAlignment.MiddleCenter, Color.White);
ReportUtils.AddCellToRow(row, string.Format(_CultureInfoDe, "{0:0.00}%", auslastungNachEnddatumKunde), $"MonthlyAuslastungNachEnddatum{rowIndex}Cell", 160F, TextAlignment.MiddleCenter, Color.White);
});
var sumRow = MonthlyValueTable.Rows.LastRow;
ReportUtils.InvokeActionOnEveryCellOfRow(sumRow, (cell, cellIndex) => { cell.WidthF = 160F; });
var limit = sumRow.Cells.Count;
// Bei Index 0 steht nichts bzw. 0 drin. Nicht verwenden
var sums = ReportUtils.GetColumnSumsOfTable(MonthlyValueTable, limit, 1);
var maxIndex = sums.Length;
ReportUtils.InvokeActionOnEveryCellOfRow(sumRow, (cell, cellIndex) =>
{
if(cellIndex == maxIndex - 1)
{
cell.Text = _FlsAuslastungsauswertung.DiffSumInPercent;
}
else
{
cell.Text = cellIndex == 0 ? "Summe" : string.Format(_CultureInfoDe, "{0:0.00}", sums[cellIndex]);
}
});
}
*/
MonthlyValueTable.AdjustSize();
MonthlyValueTable.EndInit();
}
private static void DyeCell(int colorInt, XRTableCell cell)
public void WeeklyHeaderTableOnBeforePrint(object sender, PrintEventArgs e)
{
if(cell == null)
var flsAuslastungsauswertungRO = (FlsAuslastungsauswertungRO) objectDataSource1.DataSource;
WeeklyTargetObjectDescriptionCell.Text = flsAuslastungsauswertungRO.TargetObjectName;
var weekCount = flsAuslastungsauswertungRO.GetWeekCount();
var start = flsAuslastungsauswertungRO.StartDate;
var end = flsAuslastungsauswertungRO.EndDate;
WeeklyHeaderTable.BeginInit();
var date = start;
if(weekCount > 0)
{
return;
var currentWeekOfYear = 0;
var weekInt = 0;
while(date <= end)
{
if(currentWeekOfYear != date.GetIso8601WeekOfYear())
{
weekInt++;
var colorInt = weekInt == 5 ? weekInt : weekInt % 5;
ReportUtils.AddCellToRow(xrTableRow7, $"Soll KW {date.GetIso8601WeekOfYear()}", $"WeeklyHeaderCell{xrTableRow7.Cells.Count - 1}Soll", 80, TextAlignment.MiddleCenter, GetColor(colorInt));
ReportUtils.AddCellToRow(xrTableRow7, $"Ist KW {date.GetIso8601WeekOfYear()}", $"WeeklyHeaderCell{xrTableRow7.Cells.Count - 1}Ist", 80, TextAlignment.MiddleCenter, GetColor(colorInt));
ReportUtils.AddCellToRow(xrTableRow7, $"Diff KW Soll/Ist {date.GetIso8601WeekOfYear()}", $"WeeklyHeaderCell{xrTableRow7.Cells.Count - 1}Diff", 80, TextAlignment.MiddleCenter, GetColor(colorInt));
}
currentWeekOfYear = date.GetIso8601WeekOfYear();
date = date.AddDays(1);
}
}
ReportUtils.AddCellToRow(xrTableRow7, "Differenz Soll/Ist Auswertungszeitraum", "WeeklyDiffSollIstAuswertungszeitraumCellLabel", 100, TextAlignment.MiddleCenter, Color.White);
ReportUtils.AddCellToRow(xrTableRow7, "Auslastung nach Enddatum Kunde", "WeeklyAuslastungNachEnddatumCellLabel", 100, TextAlignment.MiddleCenter, Color.White);
WeeklyHeaderTable.AdjustSize();
WeeklyHeaderTable.EndInit();
}
public void WeeklyValueTableOnBeforePrint(object sender, PrintEventArgs e)
{
var flsAuslastungsauswertungRO = (FlsAuslastungsauswertungRO) objectDataSource1.DataSource;
var weekCount = flsAuslastungsauswertungRO.GetWeekCount();
var start = flsAuslastungsauswertungRO.StartDate;
var end = flsAuslastungsauswertungRO.EndDate;
WeeklyValueTable.BeginInit();
if(weekCount > 0)
{
for(var i = 0; i < flsAuslastungsauswertungRO.Customer2Values.Count; i++)
{
WeeklyValueTable.InsertRowBelow(WeeklyValueTable.Rows.LastRow);
}
var date = start;
var currentWeekOfYear = 0;
while(date <= end)
{
var weekOfYear = date.GetIso8601WeekOfYear();
if(currentWeekOfYear != weekOfYear)
{
ReportUtils.InvokeActionOnEveryRow(WeeklyValueTable, (row, rowIndex) =>
{
ReportUtils.AddCellToRow(row, string.Empty, $"WeeklyValueCell{row.Cells.Count - 1}Soll", 80, TextAlignment.MiddleRight);
ReportUtils.AddCellToRow(row, string.Empty, $"WeeklyValueCell{row.Cells.Count - 1}Ist", 80, TextAlignment.MiddleRight);
ReportUtils.AddCellToRow(row, string.Empty, $"WeeklyValueCell{row.Cells.Count - 1}Diff", 80, TextAlignment.MiddleRight);
});
ReportUtils.InvokeActionOnEveryRow(WeeklyValueTable, (row, rowIndex) =>
{
var weekIndex = 0;
ReportUtils.InvokeActionOnEveryCellOfRow(row, (cell, cellIndex) =>
{
var cellName = cell.Name;
if(cellIndex % 3 == 2)
{
weekIndex++;
}
if(flsAuslastungsauswertungRO.Customer2Values.Count > rowIndex)
{
var customer2Values = flsAuslastungsauswertungRO.Customer2Values[rowIndex];
var kw = (FlsValueObject)customer2Values.GetPropertyValue($"Week{weekIndex}");
if((cellName?.EndsWith("Soll") ?? false) && weekIndex > 0)
{
cell.Text = string.Format(_CultureInfoDe, "{0:0.00}", kw?.Soll ?? 0);
}
else if((cellName?.EndsWith("Ist") ?? false) && weekIndex > 0)
{
cell.Text = string.Format(_CultureInfoDe, "{0:0.00}", kw?.Ist ?? 0);
}
else if((cellName?.EndsWith("Diff") ?? false) && weekIndex > 0)
{
cell.Text = string.Format(_CultureInfoDe, "{0:0.00}", kw?.DiffSollIst ?? 0);
}
else if(cellIndex == 0) // Klientenname
{
cell.Text = customer2Values.CustomerName;
}
else if(cellIndex == 1) // Restliche FLS
{
cell.Text = string.Format(_CultureInfoDe, "{0:0.00}", customer2Values.RestlicheFlsProWoche);
}
}
});
});
}
currentWeekOfYear = weekOfYear;
date = date.AddDays(1);
}
// Diff. Auswertungszeitraum und Auslastung nach Enddatum
ReportUtils.InvokeActionOnEveryRow(WeeklyValueTable, (row, rowIndex) =>
{
var index = rowIndex;
var differenzGanzerAbrechnungszeitraum = 0M;
var auslastungNachEnddatumKunde = 0M;
if(index > -1 && index < flsAuslastungsauswertungRO.Customer2Values.Count)
{
var customer2Value = flsAuslastungsauswertungRO.Customer2Values[rowIndex];
differenzGanzerAbrechnungszeitraum = customer2Value.DifferenzGanzerAbrechnungszeitraum;
auslastungNachEnddatumKunde = customer2Value.AuslastungNachEnddatumKunde;
}
ReportUtils.AddCellToRow(row, string.Format(_CultureInfoDe, "{0:0.00}", differenzGanzerAbrechnungszeitraum), $"WeeklyValueDiffAuswertungszeitraum{rowIndex}Cell", 100, TextAlignment.MiddleRight, Color.White);
ReportUtils.AddCellToRow(row, string.Format(_CultureInfoDe, "{0:0.00}%", auslastungNachEnddatumKunde), $"WeeklyAuslastungNachEnddatum{rowIndex}Cell", 100, TextAlignment.MiddleRight, Color.White);
});
var sumRow = WeeklyValueTable.Rows.LastRow;
ReportUtils.InvokeActionOnEveryCellOfRow(sumRow, (cell, cellIndex) => { cell.WidthF = 100F; });
var limit = sumRow.Cells.Count;
var sums = ReportUtils.GetColumnSumsOfTable(WeeklyValueTable, limit, 1);
ReportUtils.InvokeActionOnEveryCellOfRow(sumRow, (cell, cellIndex) =>
{
if(cellIndex == 0)
{
cell.Text = "Summe";
}
else
{
cell.Text = cellIndex == sumRow.Cells.Count - 1 ?
_FlsAuslastungsauswertung.DiffSumInPercent :
string.Format(_CultureInfoDe, "{0:0.00}", sums[cellIndex]);
}
});
ReportUtils.InvokeActionOnEveryCell(WeeklyValueTable, (currentCell, cellIndex) =>
{
var cellCount = currentCell.Row.Cells.Count;
var lastIndex = cellCount - 1;
var vorletzterIndex = lastIndex - 1;
var newWidthF = 80F;
switch(cellIndex)
{
case 0:
newWidthF = 160F;
break;
case 1:
newWidthF = 70;
break;
default:
{
if(cellIndex == vorletzterIndex || cellIndex == lastIndex)
{
newWidthF = 100F;
}
break;
}
}
currentCell.WidthF = newWidthF;
});
}
WeeklyValueTable.AdjustSize();
WeeklyValueTable.EndInit();
}
private static Color GetColor(int colorInt)
{
Color color;
switch(colorInt)
{
case 1:
cell.BackColor = Color.LightBlue;
color = Color.LightBlue;
break;
case 2:
cell.BackColor = Color.SandyBrown;
color = Color.SandyBrown;
break;
case 3:
cell.BackColor = Color.Gold;
color = Color.Gold;
break;
case 4:
cell.BackColor = Color.DarkSeaGreen;
color = Color.DarkSeaGreen;
break;
case 5:
cell.BackColor = Color.Purple;
color = Color.Purple;
break;
case 6:
cell.BackColor = Color.White;
color = Color.White;
break;
default:
cell.BackColor = Color.White;
color = Color.White;
break;
}
return color;
}
}
public class DaySumObject
{
public decimal SollSum { get; set; }
public decimal IstSum { get; set; }
public decimal DiffSum { get; set; }
public DaySumObject()
{
SollSum = 0M;
IstSum = 0M;
DiffSum = 0M;
}
public void AddValues(decimal soll, decimal ist, decimal diff)
{
SollSum += soll;
IstSum += ist;
DiffSum += diff;
}
}
}

2646
ReportImp/BetreuWoReports/FlsAuslastungsauswertung.designer.cs generated
View File

File diff suppressed because it is too large Load Diff

2463
ReportImp/BetreuWoReports/FlsAuslastungsauswertung.resx
View File

File diff suppressed because it is too large Load Diff

3
ReportImp/BetreutesWohnenAmRheinReports/BetreutesWohnenAmRheinReports.csproj
View File

@@ -209,6 +209,9 @@
<Install>true</Install>
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.

3
ReportImp/BetreutesWohnenStLudgerus/BetreutesWohnenStLudgerus.csproj
View File

@@ -141,6 +141,9 @@
<Name>Shared</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.

3
ReportImp/BetreutesWohnenStelzel/BetreutesWohnenStelzel.csproj
View File

@@ -170,6 +170,9 @@
<Install>true</Install>
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.

3
ReportImp/BetreutesWohnenWoellReports/BetreutesWohnenWoellReports.csproj
View File

@@ -138,6 +138,9 @@
<DependentUpon>SettlementReport2.cs</DependentUpon>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.

3
ReportImp/BetreuungsBueroScholzReport/BetreuungsBueroScholzReport.csproj
View File

@@ -105,5 +105,8 @@
<SubType>Designer</SubType>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

3
ReportImp/BetreuungsbueroBaak/BetreuungsbueroBaak.csproj
View File

@@ -116,6 +116,9 @@
<Name>Shared</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.

3
ReportImp/BetreuungsbueroFrankRoehrig/BetreuungsbueroFrankRoehrig.csproj
View File

@@ -101,5 +101,8 @@
<SubType>Designer</SubType>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

3
ReportImp/BetreuwoWesel/BetreuwoWesel.csproj
View File

@@ -277,6 +277,9 @@
<Name>Shared</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.

4
ReportImp/BewegtSystemischeBeratung/BewegtSystemischeBeratung.csproj
View File

@@ -124,6 +124,8 @@
<SubType>Designer</SubType>
</EmbeddedResource>
</ItemGroup>
<ItemGroup />
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

3
ReportImp/BfpDus/BfpDus.csproj
View File

@@ -124,5 +124,8 @@
<SubType>Designer</SubType>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

3
ReportImp/BhsSolingen/BhsSolingen.csproj
View File

@@ -134,5 +134,8 @@
<Name>Shared</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

3
ReportImp/BleibImLeben/BleibImLeben.csproj
View File

@@ -112,6 +112,9 @@
<Name>Shared</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.

1
ReportImp/BloemelingUndTeckhaus/BloemelingUndTeckhaus.csproj
View File

@@ -148,6 +148,7 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<None Include="Properties\DataSources\BeWo.BloemelingUndTeckhaus.ServiceInvoiceReport.datasource" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

1
ReportImp/BrueckeABW/BrueckeABW.csproj
View File

@@ -146,6 +146,7 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<None Include="Properties\DataSources\BeWo.Report.ReportObjects.Settlement2RO.datasource" />
</ItemGroup>
<ItemGroup />

3
ReportImp/BundBBetreutesWohnen/BundBBetreutesWohnen.csproj
View File

@@ -140,6 +140,9 @@
<Name>Report</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.

3
ReportImp/Bussmannshof/Bussmannshof.csproj
View File

@@ -95,5 +95,8 @@
<ItemGroup>
<Folder Include="Invoiceing\" />
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

3
ReportImp/CaritasAachen/CaritasAachen.csproj
View File

@@ -214,6 +214,9 @@
<Install>true</Install>
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.

3
ReportImp/CaritasAhlen/CaritasAhlen.csproj
View File

@@ -216,5 +216,8 @@
<Name>Shared</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

3
ReportImp/CaritasBottrop/CaritasBottrop.csproj
View File

@@ -92,6 +92,9 @@
<Name>Report</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.

3
ReportImp/CaritasFrankfurt2Reports/CaritasFrankfurt2Reports.csproj
View File

@@ -148,6 +148,9 @@
<Name>Shared</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.

3
ReportImp/CaritasFrankfurtReports/CaritasFrankfurtReports.csproj
View File

@@ -141,6 +141,9 @@
<Name>Shared</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.

3
ReportImp/CaritasGuenzburgNeuUlm/CaritasGuenzburgNeuUlm.csproj
View File

@@ -91,5 +91,8 @@
<Name>Shared</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

3
ReportImp/CaritasKleve/CaritasKleve.csproj
View File

@@ -59,5 +59,8 @@
<Name>Shared</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

3
ReportImp/CaritasLeverkusen/CaritasLeverkusen.csproj
View File

@@ -115,6 +115,9 @@
<Name>Shared</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.

3
ReportImp/CaritasOsnabrueck/CaritasOsnabrueck.csproj
View File

@@ -126,5 +126,8 @@
<Name>Shared</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

Some files were not shown because too many files have changed in this diff Show More