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

cb, letzte Bugfixes vor Version

Browse Source
This commit is contained in:
Christian
2020-11-10 02:25:15 +01:00
parent 55afb28b52
commit 514c19ce3d
66 changed files with 815 additions and 830 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
BeWo.sln
View File

@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.30523.141
# Visual Studio 15
VisualStudioVersion = 15.0.28307.1209
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Client", "Client", "{E7543C39-A44C-40C9-82C9-E7FAA2D9A852}"
EndProject
@@ -403,6 +403,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Humanitas", "ReportImp\Huma
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DiakonischesWerkHerne", "ReportImp\DiakonischesWerkHerne\DiakonischesWerkHerne.csproj", "{25AE0253-30AC-4E85-9FA4-2F8FADA62787}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SabGmbH", "ReportImp\SabGmbH\SabGmbH.csproj", "{491FE69C-49BF-4003-85CE-755DE9C99E7C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BeWoWalzPaiva", "ReportImp\BeWoWalzPaiva\BeWoWalzPaiva.csproj", "{FE709CF1-6579-4A69-8E43-5C3BF7BD96D7}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LebenshilfeFrankfurtOder", "ReportImp\LebenshilfeFrankfurtOder\LebenshilfeFrankfurtOder.csproj", "{B9CBB680-9D7A-47C9-8FE5-C9D1DFDB6F99}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|.NET = Debug|.NET
@@ -3010,6 +3016,54 @@ Global
{25AE0253-30AC-4E85-9FA4-2F8FADA62787}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{25AE0253-30AC-4E85-9FA4-2F8FADA62787}.Release|x86.ActiveCfg = Release|Any CPU
{25AE0253-30AC-4E85-9FA4-2F8FADA62787}.Release|x86.Build.0 = Release|Any CPU
{491FE69C-49BF-4003-85CE-755DE9C99E7C}.Debug|.NET.ActiveCfg = Debug|Any CPU
{491FE69C-49BF-4003-85CE-755DE9C99E7C}.Debug|.NET.Build.0 = Debug|Any CPU
{491FE69C-49BF-4003-85CE-755DE9C99E7C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{491FE69C-49BF-4003-85CE-755DE9C99E7C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{491FE69C-49BF-4003-85CE-755DE9C99E7C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{491FE69C-49BF-4003-85CE-755DE9C99E7C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{491FE69C-49BF-4003-85CE-755DE9C99E7C}.Debug|x86.ActiveCfg = Debug|Any CPU
{491FE69C-49BF-4003-85CE-755DE9C99E7C}.Debug|x86.Build.0 = Debug|Any CPU
{491FE69C-49BF-4003-85CE-755DE9C99E7C}.Release|.NET.ActiveCfg = Release|Any CPU
{491FE69C-49BF-4003-85CE-755DE9C99E7C}.Release|.NET.Build.0 = Release|Any CPU
{491FE69C-49BF-4003-85CE-755DE9C99E7C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{491FE69C-49BF-4003-85CE-755DE9C99E7C}.Release|Any CPU.Build.0 = Release|Any CPU
{491FE69C-49BF-4003-85CE-755DE9C99E7C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{491FE69C-49BF-4003-85CE-755DE9C99E7C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{491FE69C-49BF-4003-85CE-755DE9C99E7C}.Release|x86.ActiveCfg = Release|Any CPU
{491FE69C-49BF-4003-85CE-755DE9C99E7C}.Release|x86.Build.0 = Release|Any CPU
{FE709CF1-6579-4A69-8E43-5C3BF7BD96D7}.Debug|.NET.ActiveCfg = Debug|Any CPU
{FE709CF1-6579-4A69-8E43-5C3BF7BD96D7}.Debug|.NET.Build.0 = Debug|Any CPU
{FE709CF1-6579-4A69-8E43-5C3BF7BD96D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FE709CF1-6579-4A69-8E43-5C3BF7BD96D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FE709CF1-6579-4A69-8E43-5C3BF7BD96D7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{FE709CF1-6579-4A69-8E43-5C3BF7BD96D7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{FE709CF1-6579-4A69-8E43-5C3BF7BD96D7}.Debug|x86.ActiveCfg = Debug|Any CPU
{FE709CF1-6579-4A69-8E43-5C3BF7BD96D7}.Debug|x86.Build.0 = Debug|Any CPU
{FE709CF1-6579-4A69-8E43-5C3BF7BD96D7}.Release|.NET.ActiveCfg = Release|Any CPU
{FE709CF1-6579-4A69-8E43-5C3BF7BD96D7}.Release|.NET.Build.0 = Release|Any CPU
{FE709CF1-6579-4A69-8E43-5C3BF7BD96D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FE709CF1-6579-4A69-8E43-5C3BF7BD96D7}.Release|Any CPU.Build.0 = Release|Any CPU
{FE709CF1-6579-4A69-8E43-5C3BF7BD96D7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{FE709CF1-6579-4A69-8E43-5C3BF7BD96D7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{FE709CF1-6579-4A69-8E43-5C3BF7BD96D7}.Release|x86.ActiveCfg = Release|Any CPU
{FE709CF1-6579-4A69-8E43-5C3BF7BD96D7}.Release|x86.Build.0 = Release|Any CPU
{B9CBB680-9D7A-47C9-8FE5-C9D1DFDB6F99}.Debug|.NET.ActiveCfg = Debug|Any CPU
{B9CBB680-9D7A-47C9-8FE5-C9D1DFDB6F99}.Debug|.NET.Build.0 = Debug|Any CPU
{B9CBB680-9D7A-47C9-8FE5-C9D1DFDB6F99}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B9CBB680-9D7A-47C9-8FE5-C9D1DFDB6F99}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B9CBB680-9D7A-47C9-8FE5-C9D1DFDB6F99}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{B9CBB680-9D7A-47C9-8FE5-C9D1DFDB6F99}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{B9CBB680-9D7A-47C9-8FE5-C9D1DFDB6F99}.Debug|x86.ActiveCfg = Debug|Any CPU
{B9CBB680-9D7A-47C9-8FE5-C9D1DFDB6F99}.Debug|x86.Build.0 = Debug|Any CPU
{B9CBB680-9D7A-47C9-8FE5-C9D1DFDB6F99}.Release|.NET.ActiveCfg = Release|Any CPU
{B9CBB680-9D7A-47C9-8FE5-C9D1DFDB6F99}.Release|.NET.Build.0 = Release|Any CPU
{B9CBB680-9D7A-47C9-8FE5-C9D1DFDB6F99}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B9CBB680-9D7A-47C9-8FE5-C9D1DFDB6F99}.Release|Any CPU.Build.0 = Release|Any CPU
{B9CBB680-9D7A-47C9-8FE5-C9D1DFDB6F99}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{B9CBB680-9D7A-47C9-8FE5-C9D1DFDB6F99}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{B9CBB680-9D7A-47C9-8FE5-C9D1DFDB6F99}.Release|x86.ActiveCfg = Release|Any CPU
{B9CBB680-9D7A-47C9-8FE5-C9D1DFDB6F99}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -3207,6 +3261,9 @@ Global
{062698EA-8477-4F07-BF2A-CE4FAE4DCFA3} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{DB03F765-7CE2-40A6-B469-BCEBE61ACF9E} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{25AE0253-30AC-4E85-9FA4-2F8FADA62787} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{491FE69C-49BF-4003-85CE-755DE9C99E7C} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{FE709CF1-6579-4A69-8E43-5C3BF7BD96D7} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{B9CBB680-9D7A-47C9-8FE5-C9D1DFDB6F99} = {D8A691C5-146D-4613-86CC-438F02FE9106}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {FBE985BB-9F0F-4DBB-8F94-ABC37A803FF9}

38
BeWo/BeWo.csproj
View File

@@ -39,16 +39,16 @@
<UpdatePeriodically>false</UpdatePeriodically>
<UpdateRequired>true</UpdateRequired>
<MapFileExtensions>false</MapFileExtensions>
<InstallUrl>http://app.beyondsoft.de/dev/</InstallUrl>
<InstallUrl>http://app.beyondsoft.de/</InstallUrl>
<TargetCulture>de-DE</TargetCulture>
<ProductName>BeWoPlaner</ProductName>
<PublisherName>beyondSoft GmbH</PublisherName>
<MinimumRequiredVersion>2.0.1.187</MinimumRequiredVersion>
<MinimumRequiredVersion>2.0.1.193</MinimumRequiredVersion>
<CreateWebPageOnPublish>true</CreateWebPageOnPublish>
<WebPage>publish.htm</WebPage>
<OpenBrowserOnPublish>false</OpenBrowserOnPublish>
<TrustUrlParameters>true</TrustUrlParameters>
<ApplicationRevision>188</ApplicationRevision>
<ApplicationRevision>194</ApplicationRevision>
<ApplicationVersion>2.0.1.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<CreateDesktopShortcut>true</CreateDesktopShortcut>
@@ -100,6 +100,7 @@
<Reference Include="DevExpress.Data.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.Utils.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Mvvm.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Xpf.Accordion.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
@@ -305,6 +306,10 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="View\Detail\OwnChatSettingsView.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="View\Detail\RatingTypeView.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
@@ -972,6 +977,9 @@
<Compile Include="View\Controls\ValueListEntryEditControl.xaml.cs">
<DependentUpon>ValueListEntryEditControl.xaml</DependentUpon>
</Compile>
<Compile Include="View\Detail\OwnChatSettingsView.xaml.cs">
<DependentUpon>OwnChatSettingsView.xaml</DependentUpon>
</Compile>
<Compile Include="View\Detail\RatingTypeView.xaml.cs">
<DependentUpon>RatingTypeView.xaml</DependentUpon>
</Compile>
@@ -2491,6 +2499,16 @@
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.RichEdit.v17.1.Export">
<Visible>False</Visible>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Sparkline.v17.1.Core">
<Visible>False</Visible>
<Group>
@@ -2511,6 +2529,16 @@
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Xpf.Accordion.v17.1">
<Visible>False</Visible>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Xpf.Charts.v17.1">
<Visible>False</Visible>
<Group>
@@ -2899,6 +2927,10 @@
<ItemGroup>
<Resource Include="Ressources\Icons\massnahme.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Ressources\Icons\imassnahme.png" />
<Resource Include="Ressources\Icons\iziel.png" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>

2
BeWo/BeWo.csproj.user
View File

@@ -2,7 +2,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<PublishUrlHistory>D:\Projects\beyondsoft\BeWoPlaner\Publish\|D:\Projects\beyondsoft\BeWoPlaner\PublishTest\|D:\Projects\beyondsoft\BeWoPlaner\PublishDev\|D:\Projects\beyondsoft\BeWoPlaner\Publish45\|C:\Projects\beyondsoft\BeWoPlaner\Publish\</PublishUrlHistory>
<InstallUrlHistory>http://app.beyondsoft.de/dev/|http://app.beyondsoft.de/sbdtest/|http://app.beyondsoft.de/sbd/|http://app.beyondsoft.de/lha/|http://fortis-bewoplaner.fortis-ev.org.local/</InstallUrlHistory>
<InstallUrlHistory>http://app.beyondsoft.de/|http://app.beyondsoft.de/dev/|http://app.beyondsoft.de/sbdtest/|http://app.beyondsoft.de/sbd/|http://app.beyondsoft.de/lha/</InstallUrlHistory>
<SupportUrlHistory />
<UpdateUrlHistory />
<BootstrapperUrlHistory />

7
BeWo/BeWoApp.xaml.cs
View File

@@ -44,7 +44,7 @@ namespace BeWo
public static MainControl MainControl;
public static string ShortVersion = "3";
public static string Version = "Version 3.0 TEST";
public static string Version = "Version 3.0";
public static int RenderTier = 0;
@@ -231,7 +231,10 @@ namespace BeWo
AppSettings.IsWohnheimAllowed = val != null && val.Equals("1");
val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, "ShowChat");
AppSettings.IsChatAllowed = val != null && val.Equals("1");
AppSettings.ShowOwnChat = val != null && val.Equals("1");
val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, "ShowOwnChatSettings");
AppSettings.ShowOwnChatSettings = val != null && val.Equals("1");
val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, "IsServiceRecordNoticeMandatory");
if (val != null && val.Equals("0"))

5
BeWo/ConfirmDemoDialog.xaml
View File

@@ -26,15 +26,16 @@
<RowDefinition Height="*" ></RowDefinition>
<RowDefinition Height="Auto" ></RowDefinition>
</Grid.RowDefinitions>
<TextBlock TextWrapping="Wrap" Margin="3" FontSize="14">WICHTIG! Bitte tragen Sie keine echten Daten bei Ihren Tests ein, da es sich um einen öffentlichen Testzugang handelt, auf den jeder Zugriff hat!</TextBlock>
<Button x:Name="CountButton" Grid.Row="2" Grid.Column ="1" Width="120" Margin="3,25,3,3" IsDefault="True" HorizontalAlignment="Right" Click="ButtonBase_OnClick">OK</Button>
<Button x:Name="CountButton" Grid.Row="2" Grid.Column="1" Width="120" Margin="3,25,3,3" IsDefault="True" HorizontalAlignment="Right" Click="ButtonBase_OnClick">OK</Button>
<!--<Button Grid.Row="2" Grid.Column ="2" Width="100" Margin="3" IsCancel="True" IsEnabled="False" HorizontalAlignment="Right">Abbrechen</Button>-->
</Grid>
</Grid>
</Border>
<Line Grid.ColumnSpan="4" Stroke="#FFADADAD" X1="14" Y1="70" X2="585" Y2="70" StrokeThickness="1"></Line>
<Line x:Name="linkLine" Stroke="#FFADADAD" X1="14" Y1="340" X2="585" Y2="340" StrokeThickness="1" Margin="0,30,0,-30"></Line>
</Grid>

4
BeWo/Core/Config/AppSettings.cs
View File

@@ -343,7 +343,9 @@ namespace BeWo.Core.Config
public bool IsWohnheimAllowed { get; set; }
public bool IsChatAllowed { get; set; }
public bool ShowOwnChat { get; set; }
public bool ShowOwnChatSettings { get; set; }
public bool IsMedicationAllowed { get; set; }

49
BeWo/Core/SupportConceptGoalTreeItem.cs
View File

@@ -25,24 +25,51 @@ namespace BeWo.Core
GoalEntryVM.Type.Equals(ValueListEntryType.SupportConceptGoalType) || GoalEntryVM.Type.Equals(ValueListEntryType.SupportConceptIndividualGoalType) :
GoalEntryDC.Type.Equals(ValueListEntryType.SupportConceptGoalType) || GoalEntryDC.Type.Equals(ValueListEntryType.SupportConceptIndividualGoalType);
public bool IsZiel
{
get
{
return IsOfType(ValueListEntryType.SupportConceptGoalCategoryType);
}
}
public bool IsIndZiel
{
get
{
return IsOfType(ValueListEntryType.SupportConceptIndividualGoalCategoryType);
}
}
public bool IsMassnahme
{
get
{
bool ism = false;
if (GoalEntryVM != null)
{
ism = GoalEntryVM.Type.Equals(ValueListEntryType.SupportConceptGoalType) || GoalEntryVM.Type.Equals(ValueListEntryType.SupportConceptIndividualGoalType);
}
else if (GoalEntryDC != null)
{
ism = GoalEntryDC.Type.Equals(ValueListEntryType.SupportConceptGoalType) || GoalEntryDC.Type.Equals(ValueListEntryType.SupportConceptIndividualGoalType);
}
return IsOfType(ValueListEntryType.SupportConceptGoalType);
}
}
return ism;
public bool IsIndMassnahme
{
get
{
return IsOfType(ValueListEntryType.SupportConceptIndividualGoalType);
}
}
public bool IsOfType(ValueListEntryType t)
{
if (GoalEntryVM != null)
{
return GoalEntryVM.Type == t;
}
else if (GoalEntryDC != null)
{
return GoalEntryDC.Type == t;
}
return false;
}
//public bool IsGoal => GoalEntryVM != null ?
// GoalEntryVM.Type.Equals(ValueListEntryType.SupportConceptGoalType) || GoalEntryVM.Type.Equals(ValueListEntryType.SupportConceptIndividualGoalType) :

24
BeWo/MainControl.xaml.cs
View File

@@ -28,6 +28,7 @@ using BeWo.ViewModel;
using BS.Shared;
using BS.Shared.DataContracts;
using BS.Shared.Extensions;
using BS.Shared.Translation;
using DevExpress.Xpf.Editors;
using DevExpress.Xpf.Grid;
using DevExpress.Xpf.Scheduler;
@@ -1198,6 +1199,20 @@ namespace BeWo
<Hyperlink x:Name="hyperlink" TargetName="newWindow" Foreground="#FF818181" NavigateUri="http://www.beyondsoft.de" RequestNavigate="Hyperlink_OnRequestNavigate">www.beyondsoft.de</Hyperlink>
</TextBlock>
*/
var tvLabel = new Label
{
Content = "Support per Fernwartung",
FontWeight = FontWeights.Bold,
Margin = new Thickness(40, 5, 5, 5)
};
var textBlockTeamViewer = new TextBlock
{
Foreground = Brushes.Black,
Margin = new Thickness(45, 5, 5, 5),
Text = Translator.Translate("Wenn Sie in einem Telefonat mit einem unserer Support-Mitarbeiter aufgefordert werden\nden Teamviewer zu installieren, so können Sie ihn hier herunterladen.")
};
var supportToolLink = new TextBlock
{
Foreground = Brushes.Black,
@@ -1278,21 +1293,24 @@ namespace BeWo
var centeredStackPanel = new StackPanel {Orientation = Orientation.Vertical, VerticalAlignment = VerticalAlignment.Center, HorizontalAlignment = HorizontalAlignment.Center};
var mailStackPanel = new StackPanel {Orientation = Orientation.Horizontal};
var phoneStackPanel = new StackPanel {Orientation = Orientation.Horizontal};
var tvStackPanel = new StackPanel { Orientation = Orientation.Horizontal };
mailStackPanel.Children.Add(mailButton);
mailStackPanel.Children.Add(mailButton);
mailStackPanel.Children.Add(mailLabel);
phoneStackPanel.Children.Add(phoneButton);
phoneStackPanel.Children.Add(phoneLabel);
centeredStackPanel.Children.Add(mailStackPanel);
centeredStackPanel.Children.Add(textBlockMail);
centeredStackPanel.Children.Add(phoneStackPanel);
centeredStackPanel.Children.Add(textBlockPhone);
centeredStackPanel.Children.Add(supportToolLink);
centeredStackPanel.Children.Add(tvLabel);
centeredStackPanel.Children.Add(textBlockTeamViewer);
centeredStackPanel.Children.Add(supportToolLink);
centeredStackPanel.Children.Add(cancelButton);

BIN
BeWo/Ressources/Icons/imassnahme.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 505 B

BIN
BeWo/Ressources/Icons/iziel.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 422 B

BIN
BeWo/Ressources/Icons/massnahme.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 497 B

BIN
BeWo/Ressources/Icons/ziel.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 295 B

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

@@ -332,7 +332,7 @@ namespace BeWo.Scheduler.View
}
public string CountSelectedEmployees => $"{SelectedEmployees.Count} Mitarbeiter ausgewählt";
public string CountSelectedResources => $"{SelectedResources.Count} Resourcen ausgewählt";
public string CountSelectedResources => $"{SelectedResources.Count} Ressourcen ausgewählt";
public string CountSelectedCustomers => $"{SelectedCustomers.Count} Klienten ausgewählt";
public string CountSelectedSupportConcepts => $"{SelectedSupportConcepts.Count} Hilfepläne ausgewählt";

9
BeWo/ServiceProxy/Generated.cs
View File

@@ -4997,6 +4997,10 @@ namespace BeWo.ServiceProxy
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetUrlaubskontoByEmployeeBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
BS.Shared.DataContracts.UrlaubskontoDC GetUrlaubskontoByEmployee(long empOid, int year);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/GetOwnChatSettingsUrl", ReplyAction="http://tempuri.org/IOperationsService/GetOwnChatSettingsUrlResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetOwnChatSettingsUrlBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
string GetOwnChatSettingsUrl();
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/InsertNewAdditionalServiceBookings", ReplyAction="http://tempuri.org/IOperationsService/InsertNewAdditionalServiceBookingsResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/InsertNewAdditionalServiceBookingsBeWoFault" +
"Fault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
@@ -6106,6 +6110,11 @@ namespace BeWo.ServiceProxy
return base.Channel.GetUrlaubskontoByEmployee(empOid, year);
}
public string GetOwnChatSettingsUrl()
{
return base.Channel.GetOwnChatSettingsUrl();
}
public System.Collections.Generic.List<long> InsertNewAdditionalServiceBookings(System.Collections.Generic.List<BS.Shared.DataContracts.AdditionalServiceBookingDC> pAdditionalServiceBookings)
{
return base.Channel.InsertNewAdditionalServiceBookings(pAdditionalServiceBookings);

3
BeWo/View/Controls/ComboBoxTreeViewControl.xaml.cs
View File

@@ -6,6 +6,7 @@ using System.Windows.Controls;
using System.Windows.Controls.Primitives;
using System.Windows.Input;
using BeWo.Core.Service;
using BS.Shared;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.ClientPartials;
@@ -219,7 +220,7 @@ namespace BeWo.View.Controls
private void SetPopUpVisible(bool visible)
{
if (!ShowRatingPanel)
if (!ShowRatingPanel || !BeWoApp.LoggedOnUser.HasRight(UserRightType.BewertenInZeiterfassung))
{
return;
}

21
BeWo/View/Detail/CustomerView.xaml.cs
View File

@@ -77,8 +77,7 @@ namespace BeWo.View.Detail
private GridControl grid_bedarfsmvl;
private GridControl grid_costBearers;
private GridControl grid_Familys;
private bool DoOwnChatSync = false;
private ObservableSortCollection<ValueListEntryDC> _AlleEintragKategorien;
public static bool DarfBargeldtransaktionenBearbeiten
@@ -151,7 +150,7 @@ namespace BeWo.View.Detail
tabitem_stundenplan.Visibility = Visibility.Collapsed;
}
if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.ChatSettings) || !BeWoApp.AppSettings.IsChatAllowed)
if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.ChatSettings) || !BeWoApp.AppSettings.ShowOwnChat)
{
tabitem_chatservice.Visibility = Visibility.Collapsed;
}
@@ -396,17 +395,6 @@ namespace BeWo.View.Detail
{
_saveInProgress = true;
if (BeWoApp.AppSettings.IsChatAllowed)
{
if (ViewModel.DataContract.FirstName != ViewModel.FirstName ||
ViewModel.DataContract.LastName != ViewModel.LastName ||
ViewModel.DataContract.CustomerAlias != ViewModel.CustomerAlias ||
ViewModel.EmployeeRelations.IsDirty
|| ViewModel.TerminationDate != ViewModel.DataContract.TerminationDate)
{
DoOwnChatSync = true;
}
}
var cdc = ViewModel.CommitToDataContract();
@@ -417,7 +405,6 @@ namespace BeWo.View.Detail
if (ViewModel.IsNew)
{
DoOwnChatSync = true;
ServiceFacade.DoCustomerServiceAsync(s => s.InsertNewCustomer(cdc), AfterSave);
}
else
@@ -516,10 +503,6 @@ namespace BeWo.View.Detail
ReloadViewModel(oid);
if (DoOwnChatSync && BeWoApp.AppSettings.IsChatAllowed)
{
//BeWoUtils.OwnChatSynchronisationVeranlassen();
}
}
});
}

54
BeWo/View/Detail/EmployeeView.xaml.cs
View File

@@ -37,9 +37,7 @@ namespace BeWo.View.Detail
private GridControl _GridAbsenceTimes;
private GridControl _GridOvertimes;
private GridControl _GridCustomers;
private bool _DoOwnChatSync;
private bool _InitTabIndex;
private readonly ObservableSortCollection<ValueListEntryDC> _EintragKategorien;
@@ -50,7 +48,7 @@ namespace BeWo.View.Detail
combobox_brush.ItemTemplateSelector = new ComboBoxTemplateSelector(combobox_brush);
ViewModel = pEmployeeDC;
var noticeVisible = false;
var extendedPropsVisible = false;
if (BeWoApp.Mandator.BeWoClientType == 3)
@@ -58,26 +56,14 @@ namespace BeWo.View.Detail
//Köln Ring
extendedPropsVisible = true;
}
else if (BeWoApp.Mandator.BeWoClientType == 4)
{
//Betreuwo
if (BeWoApp.LoggedOnUser.HasRight(UserRightType.Employee_AllowEditExtendedProperties))
{
noticeVisible = true;
}
}
if (!noticeVisible)
{
noticeGroup.Visibility = Visibility.Collapsed;
}
if (!extendedPropsVisible)
{
extendedPropertyGroup.Visibility = Visibility.Collapsed;
}
if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.ChatSettings) || !BeWoApp.AppSettings.IsChatAllowed)
if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.ChatSettings) || !BeWoApp.AppSettings.ShowOwnChat)
{
tabitem_chatservice.Visibility = Visibility.Collapsed;
}
@@ -90,15 +76,8 @@ namespace BeWo.View.Detail
OvertimeTabItem.Visibility = BeWoApp.LoggedOnUser.HasRight(UserRightType.OvertimeView) ? Visibility.Visible : Visibility.Collapsed;
if (BeWoApp.Mandator != null && BeWoApp.Mandator.AllowSbd || BeWoApp.AppSettings.ShowArbeitszeiten)
{
tabitem_arbeitszeit.Visibility = Visibility.Visible;
}
else
{
tabitem_arbeitszeit.Visibility = Visibility.Collapsed;
}
tabitem_arbeitszeit.Visibility = Visibility.Visible;
if (pEmployeeDC.VarFields == null || pEmployeeDC.VarFields.VMList.Count == 0)
{
tabitem_varFields.Visibility = Visibility.Collapsed;
@@ -113,10 +92,6 @@ namespace BeWo.View.Detail
tabitem_schuldienst.Visibility = Visibility.Collapsed;
}
#if DEBUG
tabitem_arbeitszeit.Visibility = Visibility.Visible;
#endif
// HACK: Force the devexpress grid to end editing when the mouse is over savebutton
// by setting the focus to another element.
MouseMove += (s, e) =>
@@ -251,15 +226,7 @@ namespace BeWo.View.Detail
return;
}
if(BeWoApp.AppSettings.IsChatAllowed)
{
if (ViewModel.DataContract.FirstName != ViewModel.FirstName || ViewModel.DataContract.LastName != ViewModel.LastName)
{
_DoOwnChatSync = true;
}
}
var lDataContract = ViewModel.CommitToDataContract();
try
@@ -267,8 +234,7 @@ namespace BeWo.View.Detail
if(ViewModel.IsNew)
{
IsDoneWithInsertOrUpdate = false;
_DoOwnChatSync = true;
ServiceFacade.DoEmployeeServiceAsync(s => s.InsertNewEmployee(lDataContract), ReloadViewModel);
}
else
@@ -344,10 +310,6 @@ namespace BeWo.View.Detail
PreselectEmployeeBrush();
if (_DoOwnChatSync && BeWoApp.AppSettings.IsChatAllowed)
{
//BeWoUtils.OwnChatSynchronisationVeranlassen();
}
}));
}

42
BeWo/View/Detail/OwnChatSettingsView.xaml Normal file
View File

@@ -0,0 +1,42 @@
<localView:BeWoView x:Class="BeWo.View.Detail.OwnChatSettingsView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:localView="clr-namespace:BeWo.View"
xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup"
xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid"
Height="Auto" Width="Auto" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch" Focusable="True">
<Grid x:Name="root">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<GroupBox Margin="3 10 3 3" Grid.Row="1" Grid.ColumnSpan="2" Header="{markup:Translate ownChat Einstellungen}" Style="{StaticResource ObjectEditGroupBox}">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" SharedSizeGroup="g1" />
<ColumnDefinition Width="150" />
</Grid.ColumnDefinitions>
<Button Name="button_showSettings" Click="button_showSettings_Click" Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="2" Height="25" Margin="3,10,3,3" Padding="5,0,5,1" HorizontalAlignment="Left" Content="{markup:Translate ownChat Einstellungen verwalten}"/>
</Grid>
</GroupBox>
</Grid>
</localView:BeWoView>

23
BeWo/View/Detail/OwnChatSettingsView.xaml.cs Normal file
View File

@@ -0,0 +1,23 @@
using System.Collections.Generic;
using System.Windows;
using BeWo.ServiceProxy;
using BeWo.ViewModel;
using BS.Shared.DataContracts;
using BS.Shared.Extensions;
namespace BeWo.View.Detail
{
public partial class OwnChatSettingsView : BeWoView
{
public OwnChatSettingsView()
{
this.InitializeComponent();
}
private void button_showSettings_Click(object sender, RoutedEventArgs e)
{
var url = ServiceFacade.DoOperationsServiceSync(s => s.GetOwnChatSettingsUrl());
System.Diagnostics.Process.Start(new System.Diagnostics.ProcessStartInfo(url));
}
}
}

8
BeWo/View/Detail/RatingEditView.xaml.cs
View File

@@ -90,6 +90,14 @@ namespace BeWo.View.Detail
ColumnRatingTypeComboBox.ItemsSource = rating.GoalRatingList.AllRatingTypes;
richEditControl1.RtfText = rating.RTFNotice;
richEditControl1.BarManager = barManager;
FontSizeComboBox.OfficeFontSizeProvider = richEditControl1;
RichEditStyleComboBox.RichEditControl = richEditControl1;
biPageLayoutSizeList.RichEditControl = richEditControl1;
biMailMergeInsertFieldPlaceholder.RichEditControl = richEditControl1;
biReviewReviewers.RichEditControl = richEditControl1;
Focus();

2
BeWo/View/Detail/Report/FlexibleReportLayoutSaveControl.xaml
View File

@@ -18,7 +18,7 @@
<RowDefinition Height="*"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<Label x:Name="Label1" Grid.Row="0" Grid.Column="0" Content="Layout Name:" Margin="3"/>
<Label x:Name="Label1" Grid.Row="0" Grid.Column="0" Content="Name:" Margin="3"/>
<TextBox x:Name="TextLayoutNameNew" Grid.Row="0" Grid.Column="1" Grid.ColumnSpan="4" Margin="3"/>
<Button x:Name="SaveButton" Grid.Row="2" Grid.Column="2" Content="Speichern" Margin="3" Click="SaveButton_OnClick" HorizontalAlignment="Right" Width="80"/>
<Button x:Name="CancelButton" Grid.Row="2" Grid.Column="3" Content="Abbrechen" Margin="3" Click="CancelButton_OnClick" Width="80"/>

36
BeWo/View/Detail/Report/FlexibleReportView.xaml
View File

@@ -138,24 +138,24 @@
<dxpg:PivotGridField x:Name="FlexibleLeistungskategorie" FieldName="Leistungskategorie" Area="FilterArea" Width="200" Caption="Leistungskategorie" AllowedAreas="All" DisplayFolder="Zeilen" Visible="True" />
<dxpg:PivotGridField x:Name="FlexibleLeistung" FieldName="Leistung" Area="FilterArea" Width="200" Caption="Leistung" AllowedAreas="All" DisplayFolder="Zeilen" Visible="True" />
<dxpg:PivotGridField x:Name="FlexibleOrganisation" FieldName="Organisation" Area="FilterArea" Width="200" Caption="Kostenträger" AllowedAreas="All" DisplayFolder="Zeilen" Visible="True" />
<dxpg:PivotGridField x:Name="FlexibleArbeitszeitMinIst" FieldName="IstArbeitszeitMinuten" Area="FilterArea" Width="60" Caption="{markup:Translate Arbeitszeit Min.}" AllowedAreas="All" DisplayFolder="Data" Visible="True" />
<dxpg:PivotGridField x:Name="FlexibleArbeitszeitStdIst" FieldName="IstArbeitszeitStunden" Area="FilterArea" Width="80" Caption="{markup:Translate Arbeitszeit Std.}" AllowedAreas="All" DisplayFolder="Data" />
<dxpg:PivotGridField x:Name="FlexibleArbeitszeitMinSoll" FieldName="SollArbeitszeitMinuten" Area="FilterArea" Width="60" Caption="{markup:Translate Soll Arbeitszeit Min.}" AllowedAreas="All" DisplayFolder="Data" Visible="True" />
<dxpg:PivotGridField x:Name="FlexibleArbeitszeitStdSoll" FieldName="SollArbeitszeitStunden" Area="FilterArea" Width="80" Caption="{markup:Translate Soll Arbeitszeit Std.}" AllowedAreas="All" DisplayFolder="Data" />
<dxpg:PivotGridField x:Name="FlexibleBetreuungszeitMinIst" FieldName="IstBetreuungszeitMinuten" Area="FilterArea" Width="60" Caption="{markup:Translate Betreuungszeit Min.}" AllowedAreas="All" DisplayFolder="Data" Visible="True" />
<dxpg:PivotGridField x:Name="FlexibleBetreuungszeitStdIst" FieldName="IstBetreuungszeitStunden" Area="DataArea" Width="80" Caption="{markup:Translate Betreuungszeit Std.}" AllowedAreas="All" DisplayFolder="Data" />
<dxpg:PivotGridField x:Name="FlexibleBetreuungszeitMinSoll" FieldName="SollBetreuungszeitMinuten" Area="FilterArea" Width="60" Caption="{markup:Translate Soll Betreuungszeit Min.}" AllowedAreas="All" DisplayFolder="Data" Visible="True" />
<dxpg:PivotGridField x:Name="FlexibleBetreuungszeitStdSoll" FieldName="SollBetreuungszeitStunden" Area="FilterArea" Width="80" Caption="{markup:Translate Soll Betreuungszeit Std.}" AllowedAreas="All" DisplayFolder="Data" />
<dxpg:PivotGridField x:Name="FlexibleGefahreneKilometer" FieldName="Kilometer" Area="FilterArea" Width="200" Caption="Gefahrene Kilometer" AllowedAreas="All" DisplayFolder="Data" Visible="True" />
<dxpg:PivotGridField x:Name="FlexibleBetrag" FieldName="Betrag" Area="FilterArea" Width="80" Caption="Betrag" AllowedAreas="All" DisplayFolder="Data" Visible="True" />
<dxpg:PivotGridField x:Name="FlexibleStundensatz" FieldName="Stundensatz" Area="FilterArea" Width="80" Caption="Stundensatz" AllowedAreas="All" DisplayFolder="Data" Visible="True" />
<dxpg:PivotGridField x:Name="FlexibleRundungspotenzial" FieldName="Rundungspotenzial" Area="FilterArea" Width="80" Caption="Rundungspotenzial" AllowedAreas="All" DisplayFolder="Data" Visible="False" />
<dxpg:PivotGridField x:Name="FlexibleDifferenzArbeitszeitIstSollMin" FieldName="DifferenzArbeitszeitIstSollMinuten" Area="FilterArea" Width="80" Caption="{markup:Translate Differenz Arbeitszeit Min.}" AllowedAreas="All" DisplayFolder="Data" Visible="True" HideEmptyVariationItems="True" />
<dxpg:PivotGridField x:Name="FlexibleDifferenzArbeitszeitIstSollStd" FieldName="DifferenzArbeitszeitIstSollStunden" Area="FilterArea" Width="80" Caption="{markup:Translate Differenz Arbeitszeit Std.}" AllowedAreas="All" DisplayFolder="Data" Visible="True" HideEmptyVariationItems="True" />
<dxpg:PivotGridField x:Name="FlexibleDifferenzBetreuungszeitIstSollMin" FieldName="DifferenzBetreuungszeitIstSollMinuten" Area="FilterArea" Width="80" Caption="{markup:Translate Differenz Betreuungszeit Min.}" AllowedAreas="All" DisplayFolder="Data" Visible="True" HideEmptyVariationItems="True" />
<dxpg:PivotGridField x:Name="FlexibleDifferenzBetreuungszeitIstSollStd" FieldName="DifferenzBetreuungszeitIstSollStunden" Area="FilterArea" Width="80" Caption="{markup:Translate Differenz Betreuungszeit Std.}" AllowedAreas="All" DisplayFolder="Data" Visible="True" HideEmptyVariationItems="True" />
<dxpg:PivotGridField x:Name="UFlexibleProzentualeAbweichungArbeitszeit" UnboundFieldName="ProzAbweichungArbeitszeit" Area="FilterArea" Width="80" Caption="{markup:Translate Prozentual Abweichung Arbeitszeit}" AllowedAreas="All" DisplayFolder="Data"/>
<dxpg:PivotGridField x:Name="UFlexibleProzentualeAbweichungBetreuungszeit" UnboundFieldName="ProzAbweichungBetreuungszeit" Area="FilterArea" Width="80" Caption="{markup:Translate Prozentual Abweichung Betreuungszeit}" AllowedAreas="All" DisplayFolder="Data"/>
<dxpg:PivotGridField x:Name="FlexibleArbeitszeitMinIst" FieldName="IstArbeitszeitMinuten" Area="FilterArea" Width="60" Caption="{markup:Translate Arbeitszeit Min.}" AllowedAreas="All" DisplayFolder="Daten" Visible="True" />
<dxpg:PivotGridField x:Name="FlexibleArbeitszeitStdIst" FieldName="IstArbeitszeitStunden" Area="FilterArea" Width="80" Caption="{markup:Translate Arbeitszeit Std.}" AllowedAreas="All" DisplayFolder="Daten" />
<dxpg:PivotGridField x:Name="FlexibleArbeitszeitMinSoll" FieldName="SollArbeitszeitMinuten" Area="FilterArea" Width="60" Caption="{markup:Translate Soll Arbeitszeit Min.}" AllowedAreas="All" DisplayFolder="Daten" Visible="True" />
<dxpg:PivotGridField x:Name="FlexibleArbeitszeitStdSoll" FieldName="SollArbeitszeitStunden" Area="FilterArea" Width="80" Caption="{markup:Translate Soll Arbeitszeit Std.}" AllowedAreas="All" DisplayFolder="Daten" />
<dxpg:PivotGridField x:Name="FlexibleBetreuungszeitMinIst" FieldName="IstBetreuungszeitMinuten" Area="FilterArea" Width="60" Caption="{markup:Translate Betreuungszeit Min.}" AllowedAreas="All" DisplayFolder="Daten" Visible="True" />
<dxpg:PivotGridField x:Name="FlexibleBetreuungszeitStdIst" FieldName="IstBetreuungszeitStunden" Area="DataArea" Width="80" Caption="{markup:Translate Betreuungszeit Std.}" AllowedAreas="All" DisplayFolder="Daten" />
<dxpg:PivotGridField x:Name="FlexibleBetreuungszeitMinSoll" FieldName="SollBetreuungszeitMinuten" Area="FilterArea" Width="60" Caption="{markup:Translate Soll Betreuungszeit Min.}" AllowedAreas="All" DisplayFolder="Daten" Visible="True" />
<dxpg:PivotGridField x:Name="FlexibleBetreuungszeitStdSoll" FieldName="SollBetreuungszeitStunden" Area="FilterArea" Width="80" Caption="{markup:Translate Soll Betreuungszeit Std.}" AllowedAreas="All" DisplayFolder="Daten" />
<dxpg:PivotGridField x:Name="FlexibleGefahreneKilometer" FieldName="Kilometer" Area="FilterArea" Width="200" Caption="Gefahrene Kilometer" AllowedAreas="All" DisplayFolder="Daten" Visible="True" />
<dxpg:PivotGridField x:Name="FlexibleBetrag" FieldName="Betrag" Area="FilterArea" Width="80" Caption="Betrag" AllowedAreas="All" DisplayFolder="Daten" Visible="True" />
<dxpg:PivotGridField x:Name="FlexibleStundensatz" FieldName="Stundensatz" Area="FilterArea" Width="80" Caption="Stundensatz" AllowedAreas="All" DisplayFolder="Daten" Visible="True" />
<dxpg:PivotGridField x:Name="FlexibleRundungspotenzial" FieldName="Rundungspotenzial" Area="FilterArea" Width="80" Caption="Rundungspotenzial" AllowedAreas="All" DisplayFolder="Daten" Visible="False" />
<dxpg:PivotGridField x:Name="FlexibleDifferenzArbeitszeitIstSollMin" FieldName="DifferenzArbeitszeitIstSollMinuten" Area="FilterArea" Width="80" Caption="{markup:Translate Differenz Arbeitszeit Min.}" AllowedAreas="All" DisplayFolder="Daten" Visible="True" HideEmptyVariationItems="True" />
<dxpg:PivotGridField x:Name="FlexibleDifferenzArbeitszeitIstSollStd" FieldName="DifferenzArbeitszeitIstSollStunden" Area="FilterArea" Width="80" Caption="{markup:Translate Differenz Arbeitszeit Std.}" AllowedAreas="All" DisplayFolder="Daten" Visible="True" HideEmptyVariationItems="True" />
<dxpg:PivotGridField x:Name="FlexibleDifferenzBetreuungszeitIstSollMin" FieldName="DifferenzBetreuungszeitIstSollMinuten" Area="FilterArea" Width="80" Caption="{markup:Translate Differenz Betreuungszeit Min.}" AllowedAreas="All" DisplayFolder="Daten" Visible="True" HideEmptyVariationItems="True" />
<dxpg:PivotGridField x:Name="FlexibleDifferenzBetreuungszeitIstSollStd" FieldName="DifferenzBetreuungszeitIstSollStunden" Area="FilterArea" Width="80" Caption="{markup:Translate Differenz Betreuungszeit Std.}" AllowedAreas="All" DisplayFolder="Daten" Visible="True" HideEmptyVariationItems="True" />
<dxpg:PivotGridField x:Name="UFlexibleProzentualeAbweichungArbeitszeit" UnboundFieldName="ProzAbweichungArbeitszeit" Area="FilterArea" Width="80" Caption="{markup:Translate Prozentual Abweichung Arbeitszeit}" AllowedAreas="All" DisplayFolder="Daten"/>
<dxpg:PivotGridField x:Name="UFlexibleProzentualeAbweichungBetreuungszeit" UnboundFieldName="ProzAbweichungBetreuungszeit" Area="FilterArea" Width="80" Caption="{markup:Translate Prozentual Abweichung Betreuungszeit}" AllowedAreas="All" DisplayFolder="Daten"/>
</dxpg:PivotGridControl.Fields>
</dxpg:PivotGridControl>
</dxlc:LayoutGroup>

22
BeWo/View/Detail/Report/FlexibleReportView.xaml.cs
View File

@@ -451,7 +451,29 @@ namespace BeWo.View.Detail.Report
private void MyPivotGridControl_CustomFieldSort(object sender, PivotCustomFieldSortEventArgs e)
{
if (e.Value1 != null && e.Value2 != null)
{
var str1 = e.Value1.ToString();
var str2 = e.Value2.ToString();
if (str1.Contains(","))
{
str1 = str1.Substring(str1.IndexOf(",") + 1);
}
if (str2.Contains(","))
{
str2 = str2.Substring(str2.IndexOf(",") + 1);
}
DateTime dt1;
DateTime dt2;
if (DateTime.TryParse(str1, out dt1) && DateTime.TryParse(str2, out dt2))
{
e.Result = dt1.CompareTo(dt2);
e.Handled = true;
}
}
}

6
BeWo/View/Detail/SupportConceptView.xaml
View File

@@ -958,8 +958,10 @@
IsChecked="{Binding Path=IsChecked, UpdateSourceTrigger=PropertyChanged}"
Grid.Column="0" Margin="3,0,3,0" VerticalAlignment="Center"
Visibility="{Binding Path=GoalType, Converter={StaticResource IndividualGoalMassnahmeUncheckPreventConverter}}"/>
<Image Grid.Column="1" Source="..\..\Ressources\Icons\ziel.png" Stretch="Uniform" Margin="3,1,1,1" Width="18" Height="18" Visibility="{Binding Path=IsMassnahme, Converter={StaticResource BoolReverseConverter}}"/>
<Image Grid.Column="1" Source="..\..\Ressources\Icons\massnahme.png" Stretch="Uniform" Margin="3,1,1,1" Width="20" Height="20" Visibility="{Binding Path=IsMassnahme, Converter={StaticResource BoolVisibilityConverter}}"/>
<Image Grid.Column="1" Source="..\..\Ressources\Icons\ziel.png" Stretch="Uniform" Margin="3,1,1,1" Width="16" Height="16" Visibility="{Binding Path=IsZiel, Converter={StaticResource BoolVisibilityConverter}}"/>
<Image Grid.Column="1" Source="..\..\Ressources\Icons\massnahme.png" Stretch="Uniform" Margin="3,1,1,1" Width="16" Height="16" Visibility="{Binding Path=IsMassnahme, Converter={StaticResource BoolVisibilityConverter}}"/>
<Image Grid.Column="1" Source="..\..\Ressources\Icons\iziel.png" Stretch="Uniform" Margin="3,1,1,1" Width="16" Height="16" Visibility="{Binding Path=IsIndZiel, Converter={StaticResource BoolVisibilityConverter}}"/>
<Image Grid.Column="1" Source="..\..\Ressources\Icons\imassnahme.png" Stretch="Uniform" Margin="3,1,1,1" Width="16" Height="16" Visibility="{Binding Path=IsIndMassnahme, Converter={StaticResource BoolVisibilityConverter}}"/>
<TextBox x:Name="BdText" Tag="{Binding}" Grid.Row="0" Grid.Column="2" Margin="3, 5, 0, 0"
Text="{Binding Path=GoalEntryVM.DisplayName, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" IsReadOnly="True" Cursor="Arrow" Background="Transparent" Height="21" VerticalAlignment="Center"
LostFocus="TextBox_LostFocus" KeyDown="TextBox_KeyDown" BorderThickness="0"

7
BeWo/View/Detail/SupportConceptView.xaml.cs
View File

@@ -1588,6 +1588,7 @@ namespace BeWo.View.Detail
rating.GoalRatingList.VMList.Add(goalRatingVm);
}
}
}
}
@@ -1597,10 +1598,10 @@ namespace BeWo.View.Detail
{
RatingDC dc = rating.DataContract;
if (rating.IsNew)
{
//if (rating.IsNew)
//{
dc = rating.CommitToDataContract();
}
//}
var newVm = new RatingVM(dc);
return newVm;
}

6
BeWo/View/Detail/TeamView.xaml.cs
View File

@@ -83,12 +83,6 @@ namespace BeWo.View.Detail
IsDoneWithInsertOrUpdate = false;
ServiceFacade.DoEmployeeServiceAsync(s => s.UpdateTeam(lDC), ReloadViewModel);
}
if (BeWoApp.AppSettings.IsChatAllowed)
{
//BeWoUtils.OwnChatSynchronisationVeranlassen();
}
Cache.GetInstance().ClearEmployees();
BeWoApp.MainControl.ResetView(UIContext.Team);
}

4
BeWo/View/Detail/UserView.xaml.cs
View File

@@ -255,10 +255,6 @@ namespace BeWo.View.Detail
popup_changePassword.IsOpen = false;
ClearEditPasswordPopUp();
if (BeWoApp.AppSettings.IsChatAllowed)
{
//BeWoUtils.OwnChatSynchronisationVeranlassen();
}
}),
true);
},

7
BeWo/View/HomeView.xaml
View File

@@ -370,11 +370,8 @@
</Border>
<TextBlock Margin="5 5" FontSize="12" Foreground="#FFD2D2D2" Grid.Column="0" Grid.Row="0">
<TextBlock.Text>
<MultiBinding StringFormat="{}{0} endet am {1:dd.MM.yyyy} {3} {2:dd.MM.yyyy} ">
<Binding Path="CustomerName" />
<Binding Path="EndDate" />
<Binding Path="Customer.TerminationDate" />
<Binding Path="Customer.TerminationReason" />
<MultiBinding StringFormat="{}{0}">
<Binding Path="CustomerAndFirstDetailString" />
</MultiBinding>
</TextBlock.Text>
</TextBlock>

13
BeWo/View/HomeView.xaml.cs
View File

@@ -87,7 +87,7 @@ namespace BeWo.View
private bool _IsAllowedToSeeMitarbeitertermine;
private bool _IsShowingAppointments;
private bool _HasRightsToSeeAppointments;
private bool _LoadContentinLoadedEvent = false;
#endregion
#region Constructors
@@ -121,6 +121,7 @@ namespace BeWo.View
#endif
// FillInbox();
// FillOutbox();
_LoadContentinLoadedEvent = false; // Nicht beim ersten Initialiseren ausführen, da der COntent sonst doppelt geladen wird
Loaded += HomeDragPanelViewLoaded;
/*this.Dispatcher.BeginInvoke(
@@ -132,7 +133,7 @@ namespace BeWo.View
MessageBox.Show("Verbindung geglückt.", "Info", MessageBoxButton.OK,MessageBoxImage.Information);
});*/
if (BeWoApp.AppSettings.IsChatAllowed)
if (BeWoApp.AppSettings.ShowOwnChat)
{
var berechtigung = ServiceFacade.DoEmployeeServiceSync(s => s.GetAllChatActiveEmployeesCompact());
if (berechtigung != null)
@@ -180,7 +181,15 @@ namespace BeWo.View
private void HomeDragPanelViewLoaded(object o, RoutedEventArgs e)
{
SetMaximizedPanel();
if (_LoadContentinLoadedEvent)
{
LoadContent();
}
_LoadContentinLoadedEvent = true;
//Warum klappt das bei Köln Ring nicht?=
if (BeWoApp.LoggedOnUser == null || BeWoApp.LoggedOnUser.ResetPasswordInfos == null)
{

2
BeWo/View/Master/AdministrationView.xaml
View File

@@ -103,7 +103,7 @@
<dxa:AccordionItem Header="{markup:Translate Finanzkategorien}" Name="TabitemFinazCategories" Selected="Tabitem_Selected" Foreground="Black"/>
<dxa:AccordionItem Header="{markup:Translate Notizenkategorie}" Name="TabitemNotizenkategorie" Selected="Tabitem_Selected" Foreground="Black"/>
<dxa:AccordionItem Header="{markup:Translate Schulbegleitender Dienst}" Name="TabitemSbd" Selected="Tabitem_Selected" Foreground="Black"/>
<dxa:AccordionItem Header="{markup:Translate ownChat Einstellungen}" Name="TabitemOwnChatSettings" Selected="Tabitem_Selected" Foreground="Black"/>
</dxa:AccordionItem>
</dxa:AccordionControl>
</Border>

7
BeWo/View/Master/AdministrationView.xaml.cs
View File

@@ -94,6 +94,10 @@ namespace BeWo.View.Master
{
TabitemDienste.Visibility = Visibility.Collapsed;
}
if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.ChatAdminSettings) || !BeWoApp.AppSettings.ShowOwnChatSettings)
{
TabitemOwnChatSettings.Visibility = Visibility.Collapsed;
}
#endregion
}
@@ -402,6 +406,9 @@ namespace BeWo.View.Master
VMFactory.CreateRatingTypeListVMAsync(r =>
this.Dispatch(() => AddView(TabitemRatingTypes, new RatingTypeView(r))));
return;
case nameof(TabitemOwnChatSettings):
AddView(TabitemOwnChatSettings, new OwnChatSettingsView());
return;
}
throw new ArgumentOutOfRangeException(nameof(accordionItem));

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

@@ -127,7 +127,14 @@ namespace BeWo.View.Master
tabitem_abwesenheitsTabelle.Visibility = Visibility.Collapsed;
}
tabitem_RatingAnalysis.Visibility = Visibility.Visible;
if (BeWoApp.LoggedOnUser.HasRight(UserRightType.BewertungAuswertung_View))
{
tabitem_RatingAnalysis.Visibility = Visibility.Visible;
}
else
{
tabitem_RatingAnalysis.Visibility = Visibility.Collapsed;
}
if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.Analysis_ServiceOverview_View))
@@ -135,7 +142,7 @@ namespace BeWo.View.Master
this.tabitem_serviceOverview.Visibility = Visibility.Collapsed;
}
if(!BeWoApp.AppSettings.ShowDistanceFields || !(BeWoApp.LoggedOnUser.HasRight(UserRightType.ViewAll) || BeWoApp.LoggedOnUser.HasRight(UserRightType.CustomerView_View) || BeWoApp.LoggedOnUser.HasRight(UserRightType.Customer_ViewMyCustomers) || BeWoApp.LoggedOnUser.HasRight(UserRightType.Customer_ViewMyTeams)))
if(!BeWoApp.AppSettings.ShowDistanceFields || !BeWoApp.LoggedOnUser.HasRight(UserRightType.Kilometerauswertung_View))
{
TabItemKilometerauswertung.Visibility = Visibility.Collapsed;
}
@@ -147,7 +154,6 @@ namespace BeWo.View.Master
tabitem_flexibleReport.Visibility = Visibility.Visible;
tabitem_serviceOverview.Visibility = Visibility.Visible;
tabitem_abwesenheitsTabelle.Visibility = Visibility.Visible;
tabitem_dienstPlaner.Visibility = Visibility.Visible;
#endif
}

4
BeWo/View/PasswortAenderungsView.xaml.cs
View File

@@ -94,10 +94,6 @@ namespace BeWo.View
}, true);
}
if (BeWoApp.AppSettings.IsChatAllowed)
{
//BeWoUtils.OwnChatSynchronisationVeranlassen();
}
this.Dispatch(Close);
},
true);

8
BeWo/View/Report/Rating/RatingReportView.xaml
View File

@@ -14,7 +14,7 @@
xmlns:detail="clr-namespace:BeWo.View.Detail"
mc:Ignorable="d">
<GroupBox Style="{StaticResource ObjectEditGroupBox}" Header="Mitarbeiterauslastung" >
<GroupBox Style="{StaticResource ObjectEditGroupBox}" Header="{markup:Translate Bewertungen}" >
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
@@ -66,7 +66,11 @@
</Grid>
<Button Name="button_generate" Grid.Row="3" Grid.Column="0" HorizontalAlignment="Stretch" VerticalAlignment="Top" Content="Aktualisieren" Click="button_generate_Click" Height="23" Margin="3" />
<Button Name="button_print" Grid.Row="3" Grid.Column="4" Content="Drucken" Height="23" Margin="3" HorizontalAlignment="Right" Click="button_print_Click" Visibility="Collapsed"/>
<TextBlock x:Name="textblock_link_pdfexport" Margin="3,10,3,3" FontSize="14" Grid.Row="3" Grid.Column="4" HorizontalAlignment="Right">
<Hyperlink x:Name="linkPdfExport" TargetName="_NewWindow" Foreground="#FF2B508B" RequestNavigate="LinkPdfExport_OnRequestNavigate">
<Run Text="Drucken" />
</Hyperlink>
</TextBlock>
<Border x:Name="BorderRatingView" Grid.Row="4" Grid.ColumnSpan="5" Background="White" BorderBrush="LightGray" BorderThickness="1" Padding="3" Margin="0,5,0,0" Visibility="Collapsed">
<detail:SupportConceptGoalRatingView x:Name="SupportConceptRatingView" Grid.Row="4" Grid.ColumnSpan="5"/>

24
BeWo/View/Report/Rating/RatingReportView.xaml.cs
View File

@@ -30,6 +30,7 @@ using Microsoft.Win32;
using BS.Shared.Translation;
using System.Web.ModelBinding;
using System.ComponentModel;
using System.Windows.Navigation;
using DevExpress.XtraScheduler.Internal;
namespace BeWo.View.Report.Rating
@@ -72,13 +73,15 @@ namespace BeWo.View.Report.Rating
SupportConceptRatingView.EndDate = null;
}
UpdateRatingView();
button_print.Visibility = Visibility.Visible;
GenerateURL();
}
}
private void button_print_Click(object sender, RoutedEventArgs e)
private void LinkPdfExport_OnRequestNavigate(object sender, RequestNavigateEventArgs e)
{
string url = GenerateURL();
BeWoUtils.NavigateToReportUri(url, Translator.Translate("Bewertungsstatistik"));
//System.Diagnostics.Process.Start(new System.Diagnostics.ProcessStartInfo((sender as System.Windows.Documents.Hyperlink).NavigateUri.ToString()));
}
private string GenerateURL()
@@ -118,18 +121,23 @@ namespace BeWo.View.Report.Rating
url += ",";
}
var scgoals = SupportConceptRatingView.RatingList.DCBackup;
url += "&scgoals=";
foreach(var goal in scgoals)
if (SupportConceptRatingView.RatingList != null)
{
url += goal.RatingOid;
if (scgoals[scgoals.Count - 1] != goal)
url += ",";
var scgoals = SupportConceptRatingView.RatingList.DCBackup;
url += "&scgoals=";
foreach (var goal in scgoals)
{
url += goal.RatingOid;
if (scgoals[scgoals.Count - 1] != goal)
url += ",";
}
}
url += "&type=" + Utils.EnumName(ReportTypes.BewertungsstatistikReport);
url = BeWoWpfUtils.GetHTMLEncodedURL(url);
this.linkPdfExport.NavigateUri = new Uri(url);
return url;
}

6
BeWo/ViewModel/SupportConceptVM.cs
View File

@@ -869,7 +869,11 @@ namespace BeWo.ViewModel
beWoWindow.Close();
};
control.SaveButtonClicked += () => beWoWindow.Close();
control.SaveButtonClicked += () =>
{
control.ValueListEntry.CommitToDataContract();
beWoWindow.Close();
};
beWoWindow.Height = 200;
beWoWindow.Width = 500;

18
BeWo/ViewModel/UserGroupVM.cs
View File

@@ -81,13 +81,16 @@ namespace BeWo.ViewModel
{
if (!IsResourceRight(r) || BeWoApp.AppSettings.ShowRessources)
{
if (!IsChatRight(r) || BeWoApp.AppSettings.IsChatAllowed)
if (!IsChatRight(r) || BeWoApp.AppSettings.ShowOwnChat)
{
if (!IsHiddenRight(r))
if (!IsChatSettingsRight(r) || BeWoApp.AppSettings.ShowOwnChatSettings)
{
if (!IsMedicationRight(r) || BeWoApp.AppSettings.IsMedicationAllowed)
if (!IsHiddenRight(r))
{
possibleRights.Add(r);
if (!IsMedicationRight(r) || BeWoApp.AppSettings.IsMedicationAllowed)
{
possibleRights.Add(r);
}
}
}
}
@@ -117,6 +120,13 @@ namespace BeWo.ViewModel
return false;
}
private static bool IsChatSettingsRight(UserRightType userRightType)
{
if (userRightType == UserRightType.ChatAdminSettings)
return true;
return false;
}
private static bool IsWohnheimRight(UserRightType userRightType)
{
if (userRightType == UserRightType.WohnheimView_Create

41
BeWo/ownChat/ownChatHelper.cs
View File

@@ -197,42 +197,37 @@ namespace BeWo.ownChat
private static string ErmittleServerURL(string tenant)
{
try
{
string url = "https://dict.ownchat.de/api/server/resolve/1/" + tenant;//customerId; //customerid == kundennummer
string url = "https://dict.ownchat.de/api/server/resolve/1/" + tenant;//customerId; //customerid == kundennummer
WebRequest request = WebRequest.Create(url);
WebRequest request = WebRequest.Create(url);
request.Credentials = CredentialCache.DefaultCredentials;
request.Credentials = CredentialCache.DefaultCredentials;
WebResponse response = request.GetResponse();
WebResponse response = request.GetResponse();
Stream dataStream = response.GetResponseStream();
Stream dataStream = response.GetResponseStream();
StreamReader reader = new StreamReader(dataStream);
StreamReader reader = new StreamReader(dataStream);
string responseFromServer = reader.ReadToEnd();
string responseFromServer = reader.ReadToEnd();
dataStream.Dispose();
reader.Dispose();
dataStream.Dispose();
reader.Dispose();
dataStream.Close();
reader.Close();
dataStream.Close();
reader.Close();
var definition = new { status = "", URL = "", SYNCTYPE = "" };
var definition = new { status = "", URL = "", SYNCTYPE = "" };
var jsondaten = JsonConvert.DeserializeAnonymousType(responseFromServer, definition);
var jsondaten = JsonConvert.DeserializeAnonymousType(responseFromServer, definition);
string serverUrl = jsondaten.URL;
response.Close();
string serverUrl = jsondaten.URL;
response.Close();
return serverUrl;
}
catch (Exception e)
{
return null;
}
return serverUrl;
}
}
}

2
BeWoPlanerMobil/BeWoPlanerMobil.csproj.user
View File

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

50
Report/DefaultReportCreator.cs
View File

@@ -396,6 +396,10 @@ namespace BeWo.Report
switch (filterType)
{
case QBFilterEnum.AlleKlienten:
if (!nurFehlende)
{
return CreateServiceOverviewAllCustomersReport(month, year, orgaOid ?? 0, empOid ?? 0, serviceCategoryOid, startDay, endDay);
}
return CreateServiceOverviewAllCustomersReport(month, year, orgaOid ?? 0, empOid ?? 0, serviceCategoryOid, startDay, endDay, nurFehlende);
break;
case QBFilterEnum.NurKlientenMeinesTeams:
@@ -486,28 +490,46 @@ namespace BeWo.Report
teams.AddRange(DAOFactory.SearchDAO.FindTeamsOfEmployee(loggedInUser.Employee.Oid.Value));
}
//1. Mitarbeiter der Teams durchlaufen oder
//foreach (var team in teams)
//{
// foreach (var employee in team.MemberList)
// {
// foreach (var e2c in employee.Employee2CustomerList)
// {
// if (e2c.Customer.IsActive == ActivationTypeId.Active)
// {
// foreach (var v2o in e2c.ValueList)
// {
// if (v2o.Entry.Type == ValueListEntryType.StaffRoleType && v2o.Entry.SystemEntryID.HasValue && v2o.Entry.SystemEntryID.Value == SystemEntryID.EmployeeRoleMainAttendant)
// {
// if (!customerOids.Contains(e2c.Customer.Oid.Value))
// {
// customerOids.Add(e2c.Customer.Oid.Value);
// }
// }
// }
// }
// }
// }
//}
//2. Klienten der Teams durchlaufen oder
foreach (var team in teams)
{
foreach (var employee in team.MemberList)
var customers = DAOFactory.SearchDAO.FindCustomerOfTeam(team.Oid.Value);
foreach (var c in customers)
{
foreach (var e2c in employee.Employee2CustomerList)
if (c.IsActive == ActivationTypeId.Active)
{
if (e2c.Customer.IsActive == ActivationTypeId.Active)
if (!customerOids.Contains(c.Oid.Value))
{
foreach (var v2o in e2c.ValueList)
{
if (v2o.Entry.Type == ValueListEntryType.StaffRoleType && v2o.Entry.SystemEntryID.HasValue && v2o.Entry.SystemEntryID.Value == SystemEntryID.EmployeeRoleMainAttendant)
{
if (!customerOids.Contains(e2c.Customer.Oid.Value))
{
customerOids.Add(e2c.Customer.Oid.Value);
}
}
}
customerOids.Add(c.Oid.Value);
}
}
}
}

6
Report/DefaultReports/BewertungsstatistikReport.designer.cs generated
View File

@@ -157,7 +157,7 @@ namespace BeWo.Report.DefaultReports
//
// bottomMarginBand1
//
this.bottomMarginBand1.HeightF = 200F;
this.bottomMarginBand1.HeightF = 80F;
this.bottomMarginBand1.Name = "bottomMarginBand1";
//
// fieldTotalSC
@@ -297,7 +297,7 @@ namespace BeWo.Report.DefaultReports
this.xrLabel1.SizeF = new System.Drawing.SizeF(446.8751F, 23F);
this.xrLabel1.StylePriority.UseFont = false;
this.xrLabel1.StylePriority.UseForeColor = false;
this.xrLabel1.Text = "Ziel [BewertungsstatistikReportTabelleList.Zielname]";
this.xrLabel1.Text = "[BewertungsstatistikReportTabelleList.Zielname]";
//
// BewertungsstatistikReport
//
@@ -311,7 +311,7 @@ namespace BeWo.Report.DefaultReports
this.fieldTotalSC,
this.fieldTotalEmp});
this.DataSource = this.bindingSource1;
this.Margins = new System.Drawing.Printing.Margins(48, 20, 52, 200);
this.Margins = new System.Drawing.Printing.Margins(48, 20, 52, 80);
this.PageHeight = 1169;
this.PageWidth = 827;
this.PaperKind = System.Drawing.Printing.PaperKind.A4;

2
Report/ReportObjects/BewertungsstatistikRO.cs
View File

@@ -141,6 +141,8 @@ namespace BeWo.Report.ReportObjects
}
}
result.BewertungsstatistikReportTabelleList = result.BewertungsstatistikReportTabelleList.OrderBy(b => b.Zielname).ToList();
return result;
}
}

1
Report/ReportObjects/ServicesOverviewRO.cs
View File

@@ -313,6 +313,7 @@ namespace BeWo.Report.ReportObjects
{
return Create(pCustomerOid, pMonth, pYear, disableEmptySupportConcepts, orgaOid, empOid, start, end, false, serviceCategoryOid, checkQbStatus);
}
public static ServicesOverviewRO Create(long pCustomerOid, int pMonth, int pYear, bool disableEmptySupportConcepts, long orgaOid, long empOid, int start, int end, bool searchServiceRecordsByEndDate, long? serviceCategoryOid = null, bool checkQbStatus = false)
{
var pSpan = new DateTimeSpan();

6
ReportImp/AidsInitiativeBonn/AidsInitiativeBonn.csproj
View File

@@ -8,7 +8,7 @@
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>AidsInitiativeBonn</RootNamespace>
<AssemblyName>AidsInitiativeBonn</AssemblyName>
<AssemblyName>8420530142_Reports</AssemblyName>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
@@ -17,7 +17,7 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<OutputPath>..\..\Host\bin\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@@ -26,7 +26,7 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<OutputPath>..\..\Host\bin\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>

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

@@ -0,0 +1 @@
DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

2
ReportImp/LebenshilfeFrankfurtOder/CustomReportCreator.cs
View File

@@ -75,7 +75,7 @@ namespace LebenshilfeFrankfurtOder
{
foreach (ServicesOverviewRO.ServiceDetail s in ro.Services)
{
if (s.IsBillable)
if (s.IsBillable && !s.ServiceDescription.Contains("Kurskosten"))
{
ServicesOverviewRO.CreateSignatureString(s);

36
ReportImp/LebenshilfeFrankfurtOder/LeistungsnachweisEntlastungsleistungen.cs
View File

@@ -12,6 +12,7 @@ using BS.Shared.Extensions;
using DevExpress.Entity.Model.Metadata;
using DevExpress.XtraPrinting;
using DevExpress.XtraReports.UI;
using LebenshilfeFrankfurtOder.Utils;
namespace LebenshilfeFrankfurtOder
{
@@ -70,11 +71,11 @@ namespace LebenshilfeFrankfurtOder
if (s.ServiceRecordOid > 0)
{
decimal? preis = GetPreisUndSetzeDauer(s);
if (preis.HasValue)
var preis = FrankfurtOderHelper.GetFudPreisUndSetzeDauer(s);
if (preis != null)
{
s.Notice5 = String.Format("{0:0.00}", preis);
gesamtPreis = (gesamtPreis ?? 0) + preis.Value;
s.Notice5 = String.Format("{0:0.00}", preis.Einzelpreis);
gesamtPreis = (gesamtPreis ?? 0) + preis.Gesamtpreis;
}
gesamtDauer = (gesamtDauer ?? 0) + (decimal)s.Minutes;
@@ -120,33 +121,6 @@ namespace LebenshilfeFrankfurtOder
return sorted;
}
private decimal? GetPreisUndSetzeDauer(ServicesOverviewRO.ServiceDetail sd)
{
decimal? preis = null;
if (sd.ServiceRecordOid > 0)
{
var sr = DAOFactory.GenericDAO.LoadByID<ServiceRecord>(sd.ServiceRecordOid);
var crList = sr.ServiceDescription.CostRatePeriods;
if (crList != null && crList.Count > 0)
{
var dcList = MapperFactory.CostRatePeriodDC_CostRatePeriod.MapToNewDCs(crList);
var crp = dcList.GetCostRatePeriodForDate(CostRatePeriodType.AmountOfMoney, sd.StartDate);
if (crp != null)
{
preis = crp.CostRateValue;
}
}
if (sr.ServiceDescription.AccountingInterval.HasValue && (sr.ServiceDescription.AccountingInterval.Value == AccountingIntervalType.Daily || sr.ServiceDescription.AccountingInterval.Value == AccountingIntervalType.FlatRate))
{
sd.Notice3 = "1";
}
}
return preis;
}
public void SetzeDaten(ServicesOverviewRO pRO)
{

36
ReportImp/LebenshilfeFrankfurtOder/LeistungsnachweisKurzzeitpflege.cs
View File

@@ -8,6 +8,7 @@ using BeWo.Service.DCEntityMapper;
using BS.Shared;
using BS.Shared.Core;
using BS.Shared.Extensions;
using LebenshilfeFrankfurtOder.Utils;
namespace LebenshilfeFrankfurtOder
{
@@ -66,11 +67,11 @@ namespace LebenshilfeFrankfurtOder
if (s.ServiceRecordOid > 0)
{
decimal? preis = GetPreisUndSetzeDauer(s);
if (preis.HasValue)
var preis = FrankfurtOderHelper.GetFudPreisUndSetzeDauer(s);
if (preis != null)
{
s.Notice5 = String.Format("{0:0.00}", preis);
gesamtPreis = (gesamtPreis ?? 0) + preis.Value;
s.Notice5 = String.Format("{0:0.00}", preis.Einzelpreis);
gesamtPreis = (gesamtPreis ?? 0) + preis.Gesamtpreis;
}
gesamtDauer = (gesamtDauer ?? 0) + (decimal)s.Minutes;
@@ -116,33 +117,6 @@ namespace LebenshilfeFrankfurtOder
return sorted;
}
private decimal? GetPreisUndSetzeDauer(ServicesOverviewRO.ServiceDetail sd)
{
decimal? preis = null;
if (sd.ServiceRecordOid > 0)
{
var sr = DAOFactory.GenericDAO.LoadByID<ServiceRecord>(sd.ServiceRecordOid);
var crList = sr.ServiceDescription.CostRatePeriods;
if (crList != null && crList.Count > 0)
{
var dcList = MapperFactory.CostRatePeriodDC_CostRatePeriod.MapToNewDCs(crList);
var crp = dcList.GetCostRatePeriodForDate(CostRatePeriodType.AmountOfMoney, sd.StartDate);
if (crp != null)
{
preis = crp.CostRateValue;
}
}
if (sr.ServiceDescription.AccountingInterval.HasValue && (sr.ServiceDescription.AccountingInterval.Value == AccountingIntervalType.Daily || sr.ServiceDescription.AccountingInterval.Value == AccountingIntervalType.FlatRate))
{
sd.Notice3 = "1";
}
}
return preis;
}
public void SetzeDaten(ServicesOverviewRO pRO)
{

39
ReportImp/LebenshilfeFrankfurtOder/LeistungsnachweisVerhinderungspflege.cs
View File

@@ -8,6 +8,7 @@ using BeWo.Service.DCEntityMapper;
using BS.Shared;
using BS.Shared.Core;
using BS.Shared.Extensions;
using LebenshilfeFrankfurtOder.Utils;
namespace LebenshilfeFrankfurtOder
{
@@ -66,11 +67,11 @@ namespace LebenshilfeFrankfurtOder
if (s.ServiceRecordOid > 0)
{
decimal? preis = GetPreisUndSetzeDauer(s);
if (preis.HasValue)
var preis = FrankfurtOderHelper.GetFudPreisUndSetzeDauer(s);
if (preis != null)
{
s.Notice5 = String.Format("{0:0.00}", preis);
gesamtPreis = (gesamtPreis ?? 0) + preis.Value;
s.Notice5 = String.Format("{0:0.00}", preis.Einzelpreis);
gesamtPreis = (gesamtPreis ?? 0) + preis.Gesamtpreis;
}
gesamtDauer = (gesamtDauer ?? 0) + (decimal)s.Minutes;
@@ -116,33 +117,7 @@ namespace LebenshilfeFrankfurtOder
return sorted;
}
private decimal? GetPreisUndSetzeDauer(ServicesOverviewRO.ServiceDetail sd)
{
decimal? preis = null;
if (sd.ServiceRecordOid > 0)
{
var sr = DAOFactory.GenericDAO.LoadByID<ServiceRecord>(sd.ServiceRecordOid);
var crList = sr.ServiceDescription.CostRatePeriods;
if (crList != null && crList.Count > 0)
{
var dcList = MapperFactory.CostRatePeriodDC_CostRatePeriod.MapToNewDCs(crList);
var crp = dcList.GetCostRatePeriodForDate(CostRatePeriodType.AmountOfMoney, sd.StartDate);
if (crp != null)
{
preis = crp.CostRateValue;
}
}
if (sr.ServiceDescription.AccountingInterval.HasValue && (sr.ServiceDescription.AccountingInterval.Value == AccountingIntervalType.Daily || sr.ServiceDescription.AccountingInterval.Value == AccountingIntervalType.FlatRate))
{
sd.Notice3 = "1";
}
}
return preis;
}
public void SetzeDaten(ServicesOverviewRO pRO)
{
@@ -185,4 +160,6 @@ namespace LebenshilfeFrankfurtOder
}
}
}
}

54
ReportImp/LebenshilfeFrankfurtOder/Utils/FrankfurtOderHelper.cs
View File

@@ -4,6 +4,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
using BeWo.Data.Access;
using BeWo.Data.Entities;
using BeWo.Report.ReportObjects;
using BeWo.Service.DCEntityMapper;
using BS.Shared;
@@ -218,6 +219,47 @@ namespace LebenshilfeFrankfurtOder.Utils
}
}
public static Preis GetFudPreisUndSetzeDauer(ServicesOverviewRO.ServiceDetail sd)
{
Preis preis = null;
if (sd.ServiceRecordOid > 0)
{
preis = new Preis();
var sr = DAOFactory.GenericDAO.LoadByID<ServiceRecord>(sd.ServiceRecordOid);
var crList = sr.ServiceDescription.CostRatePeriods;
if (crList != null && crList.Count > 0)
{
var dcList = MapperFactory.CostRatePeriodDC_CostRatePeriod.MapToNewDCs(crList);
var crp = dcList.GetCostRatePeriodForDate(CostRatePeriodType.AmountOfMoney, sd.StartDate);
if (crp != null && crp.CostRateValue.HasValue)
{
preis.Einzelpreis = crp.CostRateValue;
}
}
double anzahl = 0;
if (sr.ServiceDescription.AccountingInterval.HasValue && (sr.ServiceDescription.AccountingInterval.Value == AccountingIntervalType.Daily || sr.ServiceDescription.AccountingInterval.Value == AccountingIntervalType.FlatRate))
{
preis.Anzahl = sd.EndDate.Subtract(sd.StartDate).Days + 1;
sd.Notice3 = String.Format("{0:0}", preis.Anzahl);
}
else
{
preis.Anzahl = (decimal)sd.Minutes / 60;
}
}
return preis;
}
}
@@ -259,4 +301,16 @@ namespace LebenshilfeFrankfurtOder.Utils
public decimal SatzHbg4Abw { get; set; }
public decimal SatzHbg5Abw { get; set; }
}
public class Preis
{
public decimal Anzahl { get; set; }
public decimal? Einzelpreis { get; set; }
public decimal Gesamtpreis
{
get { return (Einzelpreis ?? 0) * Anzahl; }
}
}
}

17
ReportImp/SabGmbH/Export/EGeckoExporter.cs
View File

@@ -23,23 +23,6 @@ namespace SabGmbH.Export
return query;
}
public static string CreateExportString(string[] pHeaderCaption, string[][] pContent)
{
if (pHeaderCaption != null && pHeaderCaption.Length > 1 && pHeaderCaption[0].Contains("EGecko"))
{
DateTime dt = DateTime.Now;
DateTime.TryParse(pHeaderCaption[1], out dt);
return GetAbrechnungenString(dt);
}
return null;
}
public static String GetAbrechnungenString(DateTime date)
{

81
ReportImp/SabGmbH/Export/LohnExporter.cs
View File

@@ -21,7 +21,7 @@ namespace SabGmbH.Export
DateTime dt = DateTime.Now;
DateTime.TryParse(query.Parameter[0].Value.ToString(), out dt);
query.FileName = String.Format("Zulagen{0:yyyy-MM}-ABW.txt", dt);
query.FileName = String.Format("BDE_{0:yyyyMM}.txt", dt);
query.QueryResult = GetSchnittstellenString(dt);
@@ -42,49 +42,66 @@ namespace SabGmbH.Export
var sro = Lohnschnittstellenhelper.CreateSchnittstellendruckRo(monat, ro);
//Beispiele:
//^200^31.08.2009^0200^^^^^4100^^BH^AT-1002^170,00^^^^^^
/*
0^81041^31.01.2019^0345^22.02.2019^^^^^^^^72,00^^^^^^
0^81041^31.01.2019^0331^22.02.2019^^^^^^^^14,00^^^^^^
0^81041^31.01.2019^0347^22.02.2019^^^^^^^^9,00^^^^^^
0^81041^31.01.2019^0343c^22.02.2019^^^^^^^^40,00^^^^^^
*/
foreach (var ed in sro.EmployeeDaten)
{
foreach (var sd in ed.Daten)
{
sb.AppendLine(CreateString(ed, sd, monat));
}
sb.AppendLine(CreateString(ed, monat));
}
return sb.ToString();
}
private static string CreateString(EmployeeDaten ed, SchnittstellenDaten sd, DateTime monat)
private static string CreateString(EmployeeDaten ed, DateTime monat)
{
StringBuilder sb = new StringBuilder();
sb.Append("06");
String pnrString = ed.Personalnr;
while (pnrString.Length < 10)
{
pnrString = "0" + pnrString;
}
sb.Append(pnrString);
sb.Append("0000000");
DateTime dt = new DateTime(monat.Year, monat.Month, 1).AddMonths(1);
sb.Append(String.Format("{0:yyyyMMdd}", dt));
sb.Append("10");
sb.Append(sd.Code);
sb.Append(" ");
sb.Append(String.Format("+{0:000.00}", sd.Wert));
sb.Append("+000.00");
sb.Append("+000.00");
sb.Append("+000.00");
sb.Append("+000.00");
sb.Append("+000.00");
sb.Append("0"); // Firmanr
sb.Append("^");
sb.Append(ed.Personalnr); // Personalnr
sb.Append("^");
sb.Append(String.Format("{0:dd.MM.yyyy}", monat)); // Abrechnungsperiode
sb.Append("^");
sb.Append(ed.Lohnart);
sb.Append("^");
sb.Append(""); // Datum (nicht verwendet
sb.Append("^");
sb.Append(String.Format("{0:dd.MM.yyyy}", monat)); // Von Datum
sb.Append("^");
sb.Append(String.Format("{0:dd.MM.yyyy}", monat.AddMonths(1).AddDays(-1))); // Bis Datum
sb.Append("^");
sb.Append(""); // Platzhalter
sb.Append("^");
sb.Append(ed.Kostenart);
sb.Append("^");
sb.Append(""); // Platzhalter
sb.Append("^");
sb.Append(ed.Kostenstelle); //
sb.Append("^");
sb.Append(ed.Kostentraeger); //
sb.Append("^");
sb.Append(""); // Parameter 1
sb.Append("^");
sb.Append(""); // Parameter 2
sb.Append("^");
sb.Append(""); // Parameter 3
sb.Append("^");
sb.Append(""); // Parameter 4
sb.Append("^");
sb.Append(""); // Parameter 5
sb.Append("^");
sb.Append(""); // HKZ
sb.Append("^");
return sb.ToString();
}
}

82
ReportImp/SabGmbH/Export/Lohnschnittstellenhelper.cs
View File

@@ -8,65 +8,40 @@ namespace SabGmbH.Export
{
public static SchnittstellendruckRo CreateSchnittstellendruckRo(DateTime monat, MitarbeiterstundenkontoRO mro)
{
var sro = new SchnittstellendruckRo();
sro.Monat = monat;
sro.EmployeeDaten = new List<EmployeeDaten>();
//Beispiele:
//^200^31.08.2009^0200^^^^^4100^^BH^AT-1002^170,00^^^^^^
/*
0^81041^31.01.2019^0345^22.02.2019^^^^^^^^72,00^^^^^^
0^81041^31.01.2019^0331^22.02.2019^^^^^^^^14,00^^^^^^
0^81041^31.01.2019^0347^22.02.2019^^^^^^^^9,00^^^^^^
0^81041^31.01.2019^0343c^22.02.2019^^^^^^^^40,00^^^^^^
*/
foreach (var ed in mro.EmployeeDetailList)
{
EmployeeDaten edat = new EmployeeDaten();
edat.Daten = new List<SchnittstellenDaten>();
edat.Personalnr = ed.Employee.PersonnelNumber;
edat.Vorname = ed.FirstName;
edat.Nachname = ed.LastName;
edat.Lohnart = "0345";
//edat.Von = "";
//edat.Bis = "";
edat.Kostenart = "";
edat.Kostenstelle = "";
edat.Kostentraeger = "";
AddSchnittstellenDaten(edat, ed.TageKrankheit ?? 0, "Tage", "181", "Krank", 0, 1);
sro.EmployeeDaten.Add(edat);
decimal nachtarbeit = 0;
decimal sonntag = 0;
if (ed.Days != null)
{
foreach (var dd in ed.Days)
{
nachtarbeit += dd.SpecialHours;
sonntag += dd.HoursSunday;
}
}
AddSchnittstellenDaten(edat, nachtarbeit, "Stunden", "162", "Nacht", 0, 0);
AddSchnittstellenDaten(edat, sonntag, "Stunden", "166", "Sonntag", 0, 0);
AddSchnittstellenDaten(edat, ed.Ueberstunden ?? 0, "Stunden", "141", "Überstd", 0, 0);
AddSchnittstellenDaten(edat, ed.TageUrlaub ?? 0, "Tage", "181", "Urlaub", 0, 1);
if (edat.Daten.Count > 0)
{
sro.EmployeeDaten.Add(edat);
}
}
return sro;
}
private static void AddSchnittstellenDaten(EmployeeDaten edat, decimal wert, string einheit, string code, string art, decimal punkte, decimal pauschal)
{
if (wert > 0)
{
var sd = new SchnittstellenDaten()
{
Wert = wert,
Einheit = einheit,
Code = code,
Art = art,
Punkte = punkte,
Pauschal = pauschal
};
edat.Daten.Add(sd);
}
}
}
public class SchnittstellendruckRo
@@ -79,26 +54,19 @@ namespace SabGmbH.Export
{
public String Personalnr { get; set; }
public String Vorname { get; set; }
public String Lohnart { get; set; }
public String Nachname { get; set; }
public DateTime Von { get; set; }
public IList<SchnittstellenDaten> Daten { get; set; }
}
public DateTime Bis { get; set; }
public class SchnittstellenDaten
{
public decimal Wert { get; set; }
public String Kostenart { get; set; }
public String Einheit { get; set; }
public String Kostenstelle { get; set; }
public String Code { get; set; }
public String Kostentraeger { get; set; }
public String Art { get; set; }
public decimal Punkte { get; set; }
public decimal Pauschal { get; set; }
}
}

10
ReportImp/SozialeDienstleistungenBeckerReports/MitarbeiterVertraege.cs
View File

@@ -80,9 +80,11 @@ namespace SozialeDienstleistungenBeckerReports
foreach (var e in employees)
{
var contract = GetLastContractUntilDatum(e, stichtag);
if (contract != null)
{
var firstContract = e.FirstContract;
QueryRO.Row row = new QueryRO.Row();
row.Field1 = e.PersonnelNumber;
row.Field2 = e.Person.LastName;
@@ -102,6 +104,12 @@ namespace SozialeDienstleistungenBeckerReports
row.Field12 = e.Person.Contacts.FirstOrDefault(c => c.Type == ContactType.business_Mail)?.Value;
row.Field13 = string.Format("{0:dd.MM.yyyy}", contract.EntryDate);
if (firstContract != null)
{
row.Field13 = string.Format("{0:dd.MM.yyyy}", firstContract.EntryDate);
}
row.Field14 = string.Format("{0:dd.MM.yyyy}", contract.ContractEndDate);
row.Field15 = string.Format("{0:0.00}", contract.WeeklyFLS);
row.Field16 = string.Format("{0:0.00}", contract.WeeklyTotalHours);

405
ReportImp/SozialeDienstleistungenBeckerReports/MitarbeiterVertraege.designer.cs generated
View File

@@ -37,24 +37,18 @@ namespace SozialeDienstleistungenBeckerReports
this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell30 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell31 = new DevExpress.XtraReports.UI.XRTableCell();
this.lblTitel = new DevExpress.XtraReports.UI.XRLabel();
this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
this.GroupHeader2 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
this.cellBewilligtImZeitraumHeader = new DevExpress.XtraReports.UI.XRTableCell();
this.cellGeleistetImZeitraumHeader = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.Title = new DevExpress.XtraReports.UI.XRControlStyle();
@@ -64,28 +58,6 @@ namespace SozialeDienstleistungenBeckerReports
this.fieldFLS = new DevExpress.XtraReports.UI.CalculatedField();
this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell24 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell25 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell26 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell27 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell29 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell30 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell31 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell32 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell33 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell34 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell35 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell36 = new DevExpress.XtraReports.UI.XRTableCell();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
@@ -118,7 +90,7 @@ namespace SozialeDienstleistungenBeckerReports
this.xrTable2.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow2});
this.xrTable2.SizeF = new System.Drawing.SizeF(2050F, 25F);
this.xrTable2.SizeF = new System.Drawing.SizeF(630F, 25F);
this.xrTable2.StylePriority.UseBorders = false;
this.xrTable2.StylePriority.UseFont = false;
this.xrTable2.StylePriority.UsePadding = false;
@@ -131,22 +103,8 @@ namespace SozialeDienstleistungenBeckerReports
this.xrTableCell6,
this.xrTableCell7,
this.xrTableCell8,
this.xrTableCell9,
this.xrTableCell10,
this.xrTableCell14,
this.xrTableCell12,
this.xrTableCell16,
this.xrTableCell13,
this.xrTableCell27,
this.xrTableCell28,
this.xrTableCell29,
this.xrTableCell30,
this.xrTableCell31,
this.xrTableCell32,
this.xrTableCell33,
this.xrTableCell34,
this.xrTableCell35,
this.xrTableCell36});
this.xrTableCell31});
this.xrTableRow2.Name = "xrTableRow2";
this.xrTableRow2.Weight = 1D;
//
@@ -157,7 +115,7 @@ namespace SozialeDienstleistungenBeckerReports
this.xrTableCell6.Multiline = true;
this.xrTableCell6.Name = "xrTableCell6";
this.xrTableCell6.Text = "Klient/in";
this.xrTableCell6.Weight = 0.17725264677327868D;
this.xrTableCell6.Weight = 0.22156574331653273D;
//
// xrTableCell7
//
@@ -167,7 +125,7 @@ namespace SozialeDienstleistungenBeckerReports
this.xrTableCell7.StylePriority.UseTextAlignment = false;
this.xrTableCell7.Text = "Mitarbeiter/in";
this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell7.Weight = 0.5317577529262556D;
this.xrTableCell7.Weight = 0.75332350610851262D;
//
// xrTableCell8
//
@@ -176,53 +134,23 @@ namespace SozialeDienstleistungenBeckerReports
this.xrTableCell8.Name = "xrTableCell8";
this.xrTableCell8.StylePriority.UseTextAlignment = false;
this.xrTableCell8.Text = "FLS";
this.xrTableCell8.Weight = 0.53175776040924894D;
this.xrTableCell8.Weight = 0.75332352383736034D;
//
// xrTableCell9
// xrTableCell30
//
this.xrTableCell9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field4")});
this.xrTableCell9.Name = "xrTableCell9";
this.xrTableCell9.StylePriority.UseTextAlignment = false;
this.xrTableCell9.Text = "Stundensatz";
this.xrTableCell9.Weight = 0.53175768820530789D;
this.xrTableCell30.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field13")});
this.xrTableCell30.Name = "xrTableCell30";
this.xrTableCell30.Text = "xrTableCell30";
this.xrTableCell30.Weight = 0.53175774687220523D;
//
// xrTableCell10
// xrTableCell31
//
this.xrTableCell10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field5")});
this.xrTableCell10.Name = "xrTableCell10";
this.xrTableCell10.StylePriority.UseTextAlignment = false;
this.xrTableCell10.Text = "Gesamt";
this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell10.Weight = 0.35450517037766649D;
//
// xrTableCell14
//
this.xrTableCell14.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field6")});
this.xrTableCell14.Name = "xrTableCell14";
this.xrTableCell14.StylePriority.UseTextAlignment = false;
this.xrTableCell14.Text = "xrTableCell14";
this.xrTableCell14.Weight = 0.53175775505589384D;
//
// xrTableCell12
//
this.xrTableCell12.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field7")});
this.xrTableCell12.Name = "xrTableCell12";
this.xrTableCell12.StylePriority.UseTextAlignment = false;
this.xrTableCell12.Text = "xrTableCell12";
this.xrTableCell12.Weight = 0.22156573129456469D;
//
// xrTableCell16
//
this.xrTableCell16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field8")});
this.xrTableCell16.Name = "xrTableCell16";
this.xrTableCell16.StylePriority.UseTextAlignment = false;
this.xrTableCell16.Text = "xrTableCell16";
this.xrTableCell16.Weight = 0.53175775492824262D;
this.xrTableCell31.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field14")});
this.xrTableCell31.Name = "xrTableCell31";
this.xrTableCell31.Text = "xrTableCell31";
this.xrTableCell31.Weight = 0.53175775696986194D;
//
// lblTitel
//
@@ -231,7 +159,7 @@ namespace SozialeDienstleistungenBeckerReports
this.lblTitel.Multiline = true;
this.lblTitel.Name = "lblTitel";
this.lblTitel.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblTitel.SizeF = new System.Drawing.SizeF(400F, 23F);
this.lblTitel.SizeF = new System.Drawing.SizeF(630.0001F, 23F);
this.lblTitel.StylePriority.UseFont = false;
this.lblTitel.Text = "Stammdaten Mitarbeiter/Verträge";
//
@@ -263,7 +191,7 @@ namespace SozialeDienstleistungenBeckerReports
this.xrTable1.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow1});
this.xrTable1.SizeF = new System.Drawing.SizeF(2050F, 50F);
this.xrTable1.SizeF = new System.Drawing.SizeF(630F, 50F);
this.xrTable1.StylePriority.UseBorders = false;
this.xrTable1.StylePriority.UseFont = false;
this.xrTable1.StylePriority.UsePadding = false;
@@ -276,30 +204,22 @@ namespace SozialeDienstleistungenBeckerReports
this.xrTableCell17,
this.xrTableCell1,
this.xrTableCell2,
this.xrTableCell3,
this.xrTableCell4,
this.xrTableCell5,
this.cellBewilligtImZeitraumHeader,
this.cellGeleistetImZeitraumHeader,
this.xrTableCell15,
this.xrTableCell11,
this.xrTableCell18,
this.xrTableCell19,
this.xrTableCell20,
this.xrTableCell21,
this.xrTableCell22,
this.xrTableCell23,
this.xrTableCell24,
this.xrTableCell25,
this.xrTableCell26});
this.xrTableCell21});
this.xrTableRow1.Name = "xrTableRow1";
this.xrTableRow1.Weight = 1.3953493323567705D;
//
// xrTableCell17
//
this.xrTableCell17.Name = "xrTableCell17";
this.xrTableCell17.Text = "Nr.";
this.xrTableCell17.Weight = 0.22156572961119789D;
//
// xrTableCell1
//
this.xrTableCell1.Name = "xrTableCell1";
this.xrTableCell1.Text = "Nachname";
this.xrTableCell1.Weight = 0.53175775186563068D;
this.xrTableCell1.Weight = 0.75332348247490222D;
//
// xrTableCell2
//
@@ -307,52 +227,19 @@ namespace SozialeDienstleistungenBeckerReports
this.xrTableCell2.StylePriority.UseTextAlignment = false;
this.xrTableCell2.Text = "Vorname";
this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell2.Weight = 0.53175775289519767D;
this.xrTableCell2.Weight = 0.75332348293741536D;
//
// xrTableCell3
// xrTableCell20
//
this.xrTableCell3.Name = "xrTableCell3";
this.xrTableCell3.StylePriority.UseTextAlignment = false;
this.xrTableCell3.Text = "Kürzel";
this.xrTableCell3.Weight = 0.53175776044030676D;
this.xrTableCell20.Name = "xrTableCell20";
this.xrTableCell20.Text = "Vertragsbeginn";
this.xrTableCell20.Weight = 0.53175775594811969D;
//
// xrTableCell4
// xrTableCell21
//
this.xrTableCell4.Name = "xrTableCell4";
this.xrTableCell4.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.xrTableCell4.StylePriority.UsePadding = false;
this.xrTableCell4.StylePriority.UseTextAlignment = false;
this.xrTableCell4.Text = "Geb.-Datum";
this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell4.Weight = 0.35450517085721478D;
//
// xrTableCell5
//
this.xrTableCell5.Name = "xrTableCell5";
this.xrTableCell5.StylePriority.UseTextAlignment = false;
this.xrTableCell5.Text = "Straße";
this.xrTableCell5.Weight = 0.53175775534225456D;
//
// cellBewilligtImZeitraumHeader
//
this.cellBewilligtImZeitraumHeader.Name = "cellBewilligtImZeitraumHeader";
this.cellBewilligtImZeitraumHeader.StylePriority.UseTextAlignment = false;
this.cellBewilligtImZeitraumHeader.Text = "PLZ";
this.cellBewilligtImZeitraumHeader.Weight = 0.22156573134457125D;
//
// cellGeleistetImZeitraumHeader
//
this.cellGeleistetImZeitraumHeader.Name = "cellGeleistetImZeitraumHeader";
this.cellGeleistetImZeitraumHeader.StylePriority.UseTextAlignment = false;
this.cellGeleistetImZeitraumHeader.Text = "Ort";
this.cellGeleistetImZeitraumHeader.Weight = 0.53175775495930022D;
//
// xrTableCell15
//
this.xrTableCell15.Name = "xrTableCell15";
this.xrTableCell15.StylePriority.UseTextAlignment = false;
this.xrTableCell15.Text = "Telefon";
this.xrTableCell15.Weight = 0.44313146246147717D;
this.xrTableCell21.Name = "xrTableCell21";
this.xrTableCell21.Text = "Befristet bis";
this.xrTableCell21.Weight = 0.53175775470518583D;
//
// bindingSource1
//
@@ -423,179 +310,6 @@ namespace SozialeDienstleistungenBeckerReports
this.bottomMarginBand1.HeightF = 30F;
this.bottomMarginBand1.Name = "bottomMarginBand1";
//
// xrTableCell17
//
this.xrTableCell17.Name = "xrTableCell17";
this.xrTableCell17.Text = "Nr.";
this.xrTableCell17.Weight = 0.17725258348934359D;
//
// xrTableCell11
//
this.xrTableCell11.Name = "xrTableCell11";
this.xrTableCell11.Text = "Handy";
this.xrTableCell11.Weight = 0.44313146246147717D;
//
// xrTableCell18
//
this.xrTableCell18.Name = "xrTableCell18";
this.xrTableCell18.Text = "Fax";
this.xrTableCell18.Weight = 0.44313146246147717D;
//
// xrTableCell19
//
this.xrTableCell19.Name = "xrTableCell19";
this.xrTableCell19.Text = "Mail";
this.xrTableCell19.Weight = 0.44313146246147717D;
//
// xrTableCell20
//
this.xrTableCell20.Name = "xrTableCell20";
this.xrTableCell20.Text = "Vertragsbeginn";
this.xrTableCell20.Weight = 0.44313146246147717D;
//
// xrTableCell21
//
this.xrTableCell21.Name = "xrTableCell21";
this.xrTableCell21.Text = "Befristet bis";
this.xrTableCell21.Weight = 0.44313146246147717D;
//
// xrTableCell22
//
this.xrTableCell22.Name = "xrTableCell22";
this.xrTableCell22.StylePriority.UseTextAlignment = false;
this.xrTableCell22.Text = "FLS/Woche";
this.xrTableCell22.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell22.Weight = 0.44313146246147717D;
//
// xrTableCell23
//
this.xrTableCell23.Multiline = true;
this.xrTableCell23.Name = "xrTableCell23";
this.xrTableCell23.StylePriority.UseTextAlignment = false;
this.xrTableCell23.Text = "Gesamtstd.\r\n/Woche";
this.xrTableCell23.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell23.Weight = 0.44313146246147717D;
//
// xrTableCell24
//
this.xrTableCell24.Multiline = true;
this.xrTableCell24.Name = "xrTableCell24";
this.xrTableCell24.StylePriority.UseTextAlignment = false;
this.xrTableCell24.Text = "Arbeitstage\r\n/Woche";
this.xrTableCell24.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell24.Weight = 0.44313146246147717D;
//
// xrTableCell25
//
this.xrTableCell25.Name = "xrTableCell25";
this.xrTableCell25.StylePriority.UseTextAlignment = false;
this.xrTableCell25.Text = "Urlaubstage";
this.xrTableCell25.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell25.Weight = 0.44313146246147717D;
//
// xrTableCell26
//
this.xrTableCell26.Name = "xrTableCell26";
this.xrTableCell26.StylePriority.UseTextAlignment = false;
this.xrTableCell26.Text = "Bemerkungen";
this.xrTableCell26.Weight = 1.2407680949152804D;
//
// xrTableCell13
//
this.xrTableCell13.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field9")});
this.xrTableCell13.Name = "xrTableCell13";
this.xrTableCell13.Text = "xrTableCell13";
this.xrTableCell13.Weight = 0.4431314624586089D;
//
// xrTableCell27
//
this.xrTableCell27.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field10")});
this.xrTableCell27.Name = "xrTableCell27";
this.xrTableCell27.Text = "xrTableCell27";
this.xrTableCell27.Weight = 0.4431314624586089D;
//
// xrTableCell28
//
this.xrTableCell28.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field11")});
this.xrTableCell28.Name = "xrTableCell28";
this.xrTableCell28.Text = "xrTableCell28";
this.xrTableCell28.Weight = 0.4431314624586089D;
//
// xrTableCell29
//
this.xrTableCell29.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field12")});
this.xrTableCell29.Name = "xrTableCell29";
this.xrTableCell29.Text = "xrTableCell29";
this.xrTableCell29.Weight = 0.4431314624586089D;
//
// xrTableCell30
//
this.xrTableCell30.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field13")});
this.xrTableCell30.Name = "xrTableCell30";
this.xrTableCell30.Text = "xrTableCell30";
this.xrTableCell30.Weight = 0.4431314624586089D;
//
// xrTableCell31
//
this.xrTableCell31.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field14")});
this.xrTableCell31.Name = "xrTableCell31";
this.xrTableCell31.Text = "xrTableCell31";
this.xrTableCell31.Weight = 0.4431314624586089D;
//
// xrTableCell32
//
this.xrTableCell32.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field15")});
this.xrTableCell32.Name = "xrTableCell32";
this.xrTableCell32.StylePriority.UseTextAlignment = false;
this.xrTableCell32.Text = "xrTableCell32";
this.xrTableCell32.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell32.Weight = 0.4431314624586089D;
//
// xrTableCell33
//
this.xrTableCell33.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field16")});
this.xrTableCell33.Name = "xrTableCell33";
this.xrTableCell33.StylePriority.UseTextAlignment = false;
this.xrTableCell33.Text = "xrTableCell33";
this.xrTableCell33.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell33.Weight = 0.4431314624586089D;
//
// xrTableCell34
//
this.xrTableCell34.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field17")});
this.xrTableCell34.Name = "xrTableCell34";
this.xrTableCell34.StylePriority.UseTextAlignment = false;
this.xrTableCell34.Text = "xrTableCell34";
this.xrTableCell34.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell34.Weight = 0.4431314624586089D;
//
// xrTableCell35
//
this.xrTableCell35.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field18")});
this.xrTableCell35.Name = "xrTableCell35";
this.xrTableCell35.StylePriority.UseTextAlignment = false;
this.xrTableCell35.Text = "xrTableCell35";
this.xrTableCell35.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell35.Weight = 0.4431314624586089D;
//
// xrTableCell36
//
this.xrTableCell36.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field19")});
this.xrTableCell36.Name = "xrTableCell36";
this.xrTableCell36.Text = "xrTableCell36";
this.xrTableCell36.Weight = 1.2407680947916189D;
//
// MitarbeiterVertraege
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -605,11 +319,10 @@ namespace SozialeDienstleistungenBeckerReports
this.topMarginBand1,
this.bottomMarginBand1});
this.DataSource = this.bindingSource1;
this.Landscape = true;
this.Margins = new System.Drawing.Printing.Margins(50, 50, 50, 30);
this.PageHeight = 827;
this.PageWidth = 2150;
this.PaperKind = System.Drawing.Printing.PaperKind.Custom;
this.Margins = new System.Drawing.Printing.Margins(80, 80, 50, 30);
this.PageHeight = 1169;
this.PageWidth = 827;
this.PaperKind = System.Drawing.Printing.PaperKind.A4;
this.StyleSheet.AddRange(new DevExpress.XtraReports.UI.XRControlStyle[] {
this.Title,
this.FieldCaption,
@@ -643,43 +356,15 @@ namespace SozialeDienstleistungenBeckerReports
private DevExpress.XtraReports.UI.XRTableCell xrTableCell6;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell7;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell8;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell9;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell10;
private DevExpress.XtraReports.UI.XRTable xrTable1;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow1;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell1;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell2;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell3;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell4;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell5;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell12;
private DevExpress.XtraReports.UI.XRTableCell cellGeleistetImZeitraumHeader;
private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader2;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell14;
private DevExpress.XtraReports.UI.XRTableCell cellBewilligtImZeitraumHeader;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell16;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell15;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell17;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell11;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell18;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell19;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell20;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell21;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell22;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell23;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell24;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell25;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell26;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell13;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell27;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell28;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell29;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell30;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell31;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell32;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell33;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell34;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell35;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell36;
}
}

8
Service/DCEntityMapper/CompactCustomerDC_Customer.cs
View File

@@ -30,10 +30,10 @@ namespace BeWo.Service.DCEntityMapper
{
pDataContract.TerminationReason = pEntity.TerminationReason.Value;
}
else if (pEntity.TerminationDate.HasValue)
{
pDataContract.TerminationReason = $"Betreuung vorzeitig beendet am {pEntity.TerminationDate:dd.MM.yyyy}";
}
//else if (pEntity.TerminationDate.HasValue)
//{
// pDataContract.TerminationReason = $"Betreuung vorzeitig beendet am {pEntity.TerminationDate:dd.MM.yyyy}";
//}
pDataContract.AssistanceBegin = pEntity.AssistanceBegin;
pDataContract.EquityContribution = pEntity.EquityContribution;

24
Service/DCEntityMapper/UserGroupDC_UserGroup.cs
View File

@@ -1,7 +1,9 @@
using System.Linq;
using System;
using System.Collections.Generic;
using System.Linq;
using BeWo.Data.Entities;
using BS.Shared;
using BS.Shared.DataContracts;
using BS.Shared.Extensions;
@@ -15,7 +17,23 @@ namespace BeWo.Service.DCEntityMapper
pDataContract.UserGroupVersion = pEntity.Version;
pDataContract.Name = pEntity.Name;
pDataContract.Description = pEntity.Description;
pDataContract.Rights = pEntity.Rights.Select(rr => rr.RightType).ToList();
pDataContract.Rights = new List<UserRightType>();
var allrights = pEntity.Rights.Select(rr => rr.RightType).ToList();
foreach (var r in allrights)
{
var str = r.ToString();
long l = 0;
if (!Int64.TryParse(str, out l))
{
pDataContract.Rights.Add(r);
}
else
{
int test = 0;
}
//if ()
}
return pDataContract;
}

15
Service/Plugins/CustomerService.cs
View File

@@ -242,10 +242,11 @@ namespace BeWo.Service.Plugins
if (cust.TerminationReason != null)
{
customerDC.TerminationReason = cust.TerminationReason.Value;
} else if (cust.TerminationDate.HasValue)
{
customerDC.TerminationReason = String.Format("Betreuung vorzeitig beendet am {0:dd.MM.yyyy}", cust.TerminationDate);
}
//else if (cust.TerminationDate.HasValue)
//{
// customerDC.TerminationReason = String.Format("Betreuung vorzeitig beendet am {0:dd.MM.yyyy}", cust.TerminationDate);
//}
if (cust.Person.Address != null)
{
customerDC.Street = cust.Person.Address.Street;
@@ -532,10 +533,10 @@ namespace BeWo.Service.Plugins
{
dc.TerminationReason = pEntity.TerminationReason.Value;
}
else
{
dc.TerminationReason = String.Format("Betreuung vorzeitig beendet am {0:dd.MM.yyyy}", pEntity.TerminationDate);
}
//else
//{
// dc.TerminationReason = String.Format("Betreuung vorzeitig beendet am {0:dd.MM.yyyy}", pEntity.TerminationDate);
//}
}
dc.Sex = pEntity.Person.Sex;

118
Service/Plugins/DataExporter.cs
View File

@@ -38,30 +38,32 @@ namespace BeWo.Service.Plugins
public virtual string PrepareExcelFileSupportConceptExport(string pFileId, long[] pSortedOids)
{
string lPath = BS.Shared.Core.Utils.CreateSavePath(AppDomain.CurrentDomain.BaseDirectory, pFileId + ".tmp");
var lSupportConcepts = DAOFactory.GenericDAO.LoadByIDs<SupportConcept>(pSortedOids);
string[] lHeaderCaption = {
"Nachname", // 0
"Vorname", // 1
"Kommentar", // 2
Translator.Translate("Hilfeplankonferenz"), // 3
Translator.Translate("Kostenträger"), // 4
"Aktenzeichen", // 5
"beantragt von", // 6
"beantragt bis", // 7
"bewilligt von", // 8
"bewilligt bis", // 9
"Verlängerung beantragt am", // 10
Translator.Translate("gen. FLS/Woche"), // 11
Translator.Translate("gen. FLS Gesamt"), // 12
"Stundensatz", // 13
Translator.Translate("Kostenträger Notiz"), // 14
"BetreuerIn", // 15
"Betreuung beendet am" // 16
};
"Nachname", // 0
"Vorname", // 1
"Aktenzeichen", // 5 = 2
Translator.Translate("Kostenträger"), // 4 = 3
Translator.Translate("Hilfeplan beantragt am"), // = 4
Translator.Translate("Hilfeplan eingereicht am"), // = 5
Translator.Translate("Hilfeplankonferenz"), // 3 = 6
Translator.Translate("Bewilligung eingetroffen am"), // = 7
"Verlängerung beantragt am", // 10 = 8
"beantragt von", // 6 = 9
"beantragt bis", // 7 = 10
"bewilligt von", // 8 = 11
"bewilligt bis", // 9 = 12
Translator.Translate("gen. FLS/Woche"), // 11 = 13
Translator.Translate("gen. FLS Gesamt"), // 12 = 14
"Stundensatz", // 13 = 15
Translator.Translate("Kostenträger Notiz"), // 14 = 16
"BetreuerIn", // 15 = 17
"Betreuung beendet am", // 16 = 18
"Kommentar", // 2 = 19
};
List<string[]> lContent = new List<string[]>();
@@ -70,17 +72,10 @@ namespace BeWo.Service.Plugins
for (int iRowCount = 0; iRowCount < lSupportConcepts.Count; iRowCount++)
{
lContent.Add(new string[lHeaderCaption.Count()]);
lContent[lContentIndex][0] = lSupportConcepts[iRowCount].Customer.Person.LastName;
lContent[lContentIndex][1] = lSupportConcepts[iRowCount].Customer.Person.FirstName;
lContent[lContentIndex][2] = lSupportConcepts[iRowCount].Notice;
AddSupportConceptData(lContent[lContentIndex], lSupportConcepts[iRowCount]);
lContent[lContentIndex][3] = lSupportConcepts[iRowCount].ConferenceDate != null
? lSupportConcepts[iRowCount].ConferenceDate.Value.ToShortDateString()
: string.Empty;
lContent[lContentIndex][10] = lSupportConcepts[iRowCount].RenewalSendDate != null
? lSupportConcepts[iRowCount].RenewalSendDate.Value.ToShortDateString()
: string.Empty;
int cbCount = 0;
foreach (var iCostBearer in lSupportConcepts[iRowCount].CostBearer2SupportConceptList)
@@ -90,9 +85,14 @@ namespace BeWo.Service.Plugins
lContent.Add(new string[lHeaderCaption.Count()]);
lContentIndex++;
}
AddSupportConceptData(lContent[lContentIndex], lSupportConcepts[iRowCount]);
lContent[lContentIndex][2] = iCostBearer.CustomerReferenceNumber;
if (iCostBearer.CostBearer != null && iCostBearer.CostBearer.Organisation != null)
{
lContent[lContentIndex][4] = iCostBearer.CostBearer.Organisation.Name;
lContent[lContentIndex][3] = iCostBearer.CostBearer.Organisation.Name;
var calc = PluginLoader.FindClass<Calculations>(iCostBearer.CostBearer.ID) ?? Calculations.GetInstance(iCostBearer.CostBearer.ID);
SupportConceptCostBearerRelDC relDC = MapperFactory.SupportConceptCostBearerRelDC_CostBearer2SupportConcept.MapToNewDC(iCostBearer);
@@ -112,34 +112,36 @@ namespace BeWo.Service.Plugins
{
var serviceUnit = relDC.CostBearer.CostRatePeriods.GetCostRatePeriodForDate(CostRatePeriodType.MinutesPerServiceUnit, DateTime.Now);
if (serviceUnit != null)
lContent[lContentIndex][11] = String.Format("{0:0.##}", serviceUnit.GetBEInHours(ap.ApprovedBEPerInterval));
lContent[lContentIndex][13] = String.Format("{0:0.##}", serviceUnit.GetBEInHours(ap.ApprovedBEPerInterval));
}
}
else
{
lContent[lContentIndex][11] = String.Format("{0:0.##}", calc.GetApprovedHoursPerWeek(relDC, dt, false)); // iCostBearer.ApprovedFLS.ToStringNullCheck();
lContent[lContentIndex][13] = String.Format("{0:0.##}", calc.GetApprovedHoursPerWeek(relDC, dt, false)); // iCostBearer.ApprovedFLS.ToStringNullCheck();
}
lContent[lContentIndex][12] = String.Format("{0:0.##}", calc.GetApprovedHoursTotal(relDC, false)); //iCostBearer.ApprovedFLSTotal.ToStringNullCheck();
lContent[lContentIndex][14] = String.Format("{0:0.##}", calc.GetApprovedHoursTotal(relDC, false)); //iCostBearer.ApprovedFLSTotal.ToStringNullCheck();
}
else
{
lContent[lContentIndex][4] = string.Empty;
lContent[lContentIndex][3] = string.Empty;
}
lContent[lContentIndex][5] = iCostBearer.CustomerReferenceNumber;
lContent[lContentIndex][6] = iCostBearer.RequestedStartDate.DoIfNotNull(d => d.ToShortDateString());
lContent[lContentIndex][7] = iCostBearer.RequestedEndDate.DoIfNotNull(d => d.ToShortDateString());
lContent[lContentIndex][8] = iCostBearer.ApprovedStartDate.DoIfNotNull(d => d.ToShortDateString());
lContent[lContentIndex][9] = iCostBearer.ApprovedEndDate.DoIfNotNull(d => d.ToShortDateString());
lContent[lContentIndex][9] = iCostBearer.RequestedStartDate.DoIfNotNull(d => d.ToShortDateString());
lContent[lContentIndex][10] = iCostBearer.RequestedEndDate.DoIfNotNull(d => d.ToShortDateString());
lContent[lContentIndex][11] = iCostBearer.ApprovedStartDate.DoIfNotNull(d => d.ToShortDateString());
lContent[lContentIndex][12] = iCostBearer.ApprovedEndDate.DoIfNotNull(d => d.ToShortDateString());
if (iCostBearer.CostBearer != null)
{
lContent[lContentIndex][13] = iCostBearer.CostBearer.CostRatePeriods.MapToNewDCs()
lContent[lContentIndex][15] = iCostBearer.CostBearer.CostRatePeriods.MapToNewDCs()
.GetCurrentlyValidRateValue(CostRatePeriodType.HourlyRate).ToStringNullCheck();
}
lContent[lContentIndex][14] = iCostBearer.Notice;
lContent[lContentIndex][16] = iCostBearer.Notice;
String mainAttendant = "";
foreach (Employee2Customer e2c in lSupportConcepts[iRowCount].Customer.Employee2CustomerList)
@@ -165,16 +167,9 @@ namespace BeWo.Service.Plugins
lContent[lContentIndex][15] = mainAttendant;
lContent[lContentIndex][17] = mainAttendant;
if (lSupportConcepts[iRowCount].Customer.TerminationDate.HasValue)
{
lContent[lContentIndex][16] = String.Format("{0:dd.MM.yyyy}", lSupportConcepts[iRowCount].Customer.TerminationDate);
}
else
{
lContent[lContentIndex][16] = "";
}
}
// if (iRowCount < lSupportConcepts.Count - 1)
@@ -189,6 +184,29 @@ namespace BeWo.Service.Plugins
return WriteHTMLFile(lHeaderCaption, lContent.ToArray());
}
private void AddSupportConceptData(string[] content, SupportConcept sc)
{
content[0] = sc.Customer.Person.LastName;
content[1] = sc.Customer.Person.FirstName;
content[4] = sc.RequisitionSendDate != null ? sc.RequisitionSendDate.Value.ToShortDateString() : string.Empty;
content[5] = sc.SupportConceptSendDate != null ? sc.SupportConceptSendDate.Value.ToShortDateString() : string.Empty;
content[6] = sc.ConferenceDate != null ? sc.ConferenceDate.Value.ToShortDateString() : string.Empty;
content[7] = sc.ApprovalDate != null ? sc.ApprovalDate.Value.ToShortDateString() : string.Empty;
content[8] = sc.RenewalSendDate != null ? sc.RenewalSendDate.Value.ToShortDateString() : string.Empty;
if (sc.Customer.TerminationDate.HasValue)
{
content[18] = String.Format("{0:dd.MM.yyyy}", sc.Customer.TerminationDate);
}
else
{
content[18] = "";
}
content[19] = sc.Notice;
}
public string WriteHTMLFile(string[] pHeaderCaption, string[][] pContent)
{
return new ExcelDownload(pHeaderCaption, pContent).CreateExcelOutputString();

4
Service/ServiceContracts/IOperationsService.cs
View File

@@ -962,5 +962,9 @@ namespace BeWo.Service.ServiceContracts
[FaultContract(typeof(BeWoFault))]
[OperationContract]
UrlaubskontoDC GetUrlaubskontoByEmployee(long empOid, int year);
[FaultContract(typeof(BeWoFault))]
[OperationContract]
String GetOwnChatSettingsUrl();
}
}

2
Service/ServiceImplementations/CustomerServiceImp.cs
View File

@@ -2057,7 +2057,7 @@ namespace BeWo.Service.ServiceImplementations
}
else if (cust.TerminationDate.HasValue)
{
customerDC.TerminationReason = String.Format("Betreuung vorzeitig beendet am {0:dd.MM.yyyy}", cust.TerminationDate);
//customerDC.TerminationReason = String.Format("Betreuung vorzeitig beendet am {0:dd.MM.yyyy}", cust.TerminationDate);
}
if (cust.Person.Address != null)

34
Service/ServiceImplementations/OperationsServiceImp.cs
View File

@@ -449,7 +449,29 @@ namespace BeWo.Service.ServiceImplementations
try
{
IList<ServiceCategory> list = DAOFactory.GenericDAO.GetAllActive<ServiceCategory>();
return MapperFactory.ServiceCategoryDC_ServiceCategory.MapToNewDCs(list);
var dcList = MapperFactory.ServiceCategoryDC_ServiceCategory.MapToNewDCs(list);
//AppSettings settings = AppSettings.CreateSettings();
//if (settings.SortServiceDescriptionAlphabetically)
//{
// dcList = dcList.OrderBy(c => c.Name).ToList();
//}
//else
//{
dcList.Sort((a, b) =>
{
if (a.Position == b.Position)
{
return a.ServiceCategoryOid.Value.CompareTo(b.ServiceCategoryOid.Value);
}
else
{
return a.Position.CompareTo(b.Position);
}
});
//}
return dcList;
}
catch (Exception e)
{
@@ -6446,5 +6468,15 @@ namespace BeWo.Service.ServiceImplementations
throw Utils.CreateBeWoFaultException(exception);
}
}
public String GetOwnChatSettingsUrl()
{
//var url = ConfigurationManager.AppSettings.Get("OwnChatSettingsUrl");
//url = url.Replace("[TENANT]", MultitenancyOperationContextExt.Current.Tenant);
//return url;
return "http://www.bewoplaner.de";
}
}
}

5
Service/ServiceImplementations/ResourceServiceImp.cs
View File

@@ -1095,7 +1095,7 @@ namespace BeWo.Service.ServiceImplementations
ownerOid = pEmployeeOid;
}
//Man hat nur Customer und/oder Resourcen ausgewählt, dann dürfen die eigenen nicht angezeigt werden
//Man hat nur Customer und/oder Ressourcen ausgewählt, dann dürfen die eigenen nicht angezeigt werden
if((pSelectedEmployees == null || pSelectedEmployees.Count == 0) &&
(pSelectedCustomer != null && pSelectedCustomer.Count > 0 ||
pSelectedResources != null && pSelectedResources.Count > 0))
@@ -1261,7 +1261,7 @@ namespace BeWo.Service.ServiceImplementations
ownerOid = pEmployeeOid;
}
//Man hat nur Customer und/oder Resourcen ausgewählt, dann dürfen die eigenen nicht angezeigt werden
//Man hat nur Customer und/oder Ressourcen ausgewählt, dann dürfen die eigenen nicht angezeigt werden
if ((pSelectedEmployees == null || pSelectedEmployees.Count == 0) &&
(pSelectedCustomer != null && pSelectedCustomer.Count > 0 ||
pSelectedResources != null && pSelectedResources.Count > 0))
@@ -1523,6 +1523,7 @@ namespace BeWo.Service.ServiceImplementations
IsActive = task.IsActive,
IsTask = true,
DueDate = task.DueDate,
CompletedDate = task.CompletedDate,
StartDate = task.CompletedDate.HasValue ? task.DueDate?.GetShortDateTime() : task.InsTs?.GetShortDateTime(),
EndDate = task.DueDate?.GetShortDateTime().AddDays(1) ?? DateTime.MaxValue.Date
};

6
Service/ServiceImplementations/UserServiceImp.cs
View File

@@ -314,6 +314,9 @@ namespace BeWo.Service.ServiceImplementations
lEntity.InitSalt();
lEntity.ChangePassword(pUser.NewPassword);
DAOFactory.GenericDAO.Insert(lEntity);
OwnChatHelper.StartOwnChatSync();
return lEntity.Oid.Value;
}
catch (FaultException<BeWoFault> e)
@@ -562,6 +565,9 @@ namespace BeWo.Service.ServiceImplementations
ApplicationUser lOriginal = DAOFactory.GenericDAO.LoadByID<ApplicationUser>(pUser.UserOid.Value);
DAOFactory.GenericDAO.Update(MapperFactory.UserDC_User.MergeWithEntity(pUser, lOriginal));
OwnChatHelper.StartOwnChatSync();
return lOriginal.Oid.Value;
}
catch (FaultException<BeWoFault> e)

5
Shared/BeWoEntityEnums.cs
View File

@@ -506,6 +506,11 @@ namespace BS.Shared
//MedRecordsLoeschen = 27003,
ChatSettings = 28000,
ChatAdminSettings = 28001,
Kilometerauswertung_View = 29000,
BewertungAuswertung_View = 29001,
BewertenInZeiterfassung = 29002,
VertretungenView_View = 30000,

17
Shared/Core/EnumTranslations.cs
View File

@@ -247,6 +247,13 @@ namespace BS.Shared.Core
{
UserRightType.Analysis_AuslastungTeam_View, Translator.Translate("Auswertung Mitarbeiterauslastung für alle Teams erstellen")
},
{
UserRightType.Kilometerauswertung_View, Translator.Translate("Auswertung über Kilometer erstellen")
}
,
{
UserRightType.BewertungAuswertung_View, Translator.Translate("Auswertung über Bewertung erstellen")
},
{
UserRightType.ResourceBookingView_Create, Translator.Translate("Ressourcen anlegen")
},
@@ -325,6 +332,9 @@ namespace BS.Shared.Core
{
UserRightType.ServiceRecord_AllowCreatingMultiBooking, Translator.Translate("Zeiterfassung Mehrfachbuchung anlegen")
},
{
UserRightType.BewertenInZeiterfassung, Translator.Translate("Zeiterfassung Bewertung anlegen")
},
{
UserRightType.SupportConceptView_Create, Translator.Translate("Hilfepläne anlegen")
},
@@ -595,9 +605,13 @@ namespace BS.Shared.Core
// UserRightType.MedRecordsLoeschen, Translator.Translate("Bedarfsmedikation löschen")
// },
{
UserRightType.ChatSettings, Translator.Translate("Chat Einstellungen")
UserRightType.ChatSettings, Translator.Translate("ownChat Einstellungen")
}
,
{
UserRightType.ChatAdminSettings, Translator.Translate("ownChat Einstellungen verwalten")
}
,
{
UserRightType.CustomerTeam_View, Translator.Translate("Kliententeams ansehen")
}
@@ -632,6 +646,7 @@ namespace BS.Shared.Core
{
UserRightType.Termine_IntervalDelete, Translator.Translate("Termine bis zum angegebenen Zeitpunkt löschen")
}
};
#endregion