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

Merge branch 'master' into feature_rene_18_ai

Browse Source 
# Conflicts:
#	BeWo/BeWo.csproj
#	BeWo/BeWoApp.xaml.cs
#	BeWo/View/Detail/EmployeeView.xaml
#	Report/app.config
#	ReportService/app.config
#	Service/ServiceImplementations/EmployeeServiceImp.cs
#	Service/app.config
#	Shared/BeWoEntityEnums.cs
#	Shared/Core/EnumTranslations.cs
This commit is contained in:
Rene Evertz
2025-09-18 14:26:33 +02:00
parent 81c04fbc0a 17ac34a242
commit 68866e8f28
978 changed files with 103693 additions and 57198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@@ -413,4 +413,5 @@ FodyWeavers.xsd
*.msp
# JetBrains Rider
*.sln.iml
*.sln.iml
/ReportImp/RatPlusTat/CustomBudgetnachweisAnhangRO.cs

13
BeWo/BeWo.csproj
View File

@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>BeWo</RootNamespace>
<AssemblyName>BeWoPlaner</AssemblyName>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<WarningLevel>4</WarningLevel>
@@ -19,8 +19,8 @@
<SignManifests>false</SignManifests>
<ManifestKeyFile>
</ManifestKeyFile>
<ManifestCertificateThumbprint>8CA4066C36C87B745E4016FDA715A6DB16FCFFA9</ManifestCertificateThumbprint>
<IsWebBootstrapper>false</IsWebBootstrapper>
<ManifestCertificateThumbprint>8E3A8E81F1C6F67A1C6D239593544EA33D8AC6A7</ManifestCertificateThumbprint>
<IsWebBootstrapper>true</IsWebBootstrapper>
<SignAssembly>false</SignAssembly>
<ExpressionBlendVersion>3.0.1927.0</ExpressionBlendVersion>
<TargetFrameworkProfile>
@@ -42,11 +42,12 @@
<TargetCulture>de-DE</TargetCulture>
<ProductName>BeWoPlaner</ProductName>
<PublisherName>ownSoft GmbH</PublisherName>
<MinimumRequiredVersion>2.0.1.268</MinimumRequiredVersion>
<MinimumRequiredVersion>2.0.1.277</MinimumRequiredVersion>
<CreateWebPageOnPublish>true</CreateWebPageOnPublish>
<WebPage>publish.htm</WebPage>
<OpenBrowserOnPublish>false</OpenBrowserOnPublish>
<TrustUrlParameters>true</TrustUrlParameters>
<ApplicationRevision>276</ApplicationRevision>
<ApplicationRevision>278</ApplicationRevision>
<ApplicationVersion>2.0.1.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<CreateDesktopShortcut>true</CreateDesktopShortcut>
@@ -61,7 +62,7 @@
<DefineConstants>TRACE;DEBUG</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<PlatformTarget>x86</PlatformTarget>
<PlatformTarget>AnyCPU</PlatformTarget>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<UseVSHostingProcess>true</UseVSHostingProcess>
<Prefer32Bit>false</Prefer32Bit>

15
BeWo/BeWoApp.xaml.cs
View File

@@ -56,9 +56,8 @@ namespace BeWo
public static LoginControl LoginControl;
public static MainControl MainControl;
public static string ShortVersion = "3.26";
public static string ShortVersion = "3.27.2";
public static string Version => BeWoAppInfo.BeWoAppVersion.ToString();
public static int RenderTier = 0;
internal static string IpAddress = string.Empty;
@@ -308,6 +307,12 @@ namespace BeWo
anzTageZeiterfassErfolgt = resultzeitplan;
}
val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, SettingsKeys.AnzTageUnterschriftErfolgt);
if (Int32.TryParse(val, out resultzeitplan))
{
AppSettings.AnzTageUnterschriftErfolgt = resultzeitplan;
}
val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, SettingsKeys.ZeiterfassungsSchwellwert);
int resultschwell;
if (Int32.TryParse(val, out resultschwell))
@@ -538,6 +543,12 @@ namespace BeWo
val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, SettingsKeys.ShowWohnhilfe);
AppSettings.ShowWohnhilfe = val != null && val.Equals("1");
val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, SettingsKeys.ShowVorlagen);
AppSettings.ShowVorlagen = val != null && val.Equals("1");
val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, SettingsKeys.ShowMitarbeiterSchwerbehindertenInfos);
AppSettings.ShowMitarbeiterSchwerbehindertenInfos = val != null && val.Equals("1");
val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, SettingsKeys.ShowImportAbschlagszahlungen);
AppSettings.ShowImportAbschlagszahlungen = val != null && val.Equals("1");

22
BeWo/Converter/TooltipTextConverter.cs
View File

@@ -1,4 +1,5 @@
using BeWo.ViewModel;
using BeWo.ViewModel.Light;
using System;
using System.Collections.Generic;
using System.Globalization;
@@ -18,7 +19,7 @@ namespace BeWo.Converter
return val_bool ? null : parameter;
}
if (value is GkvAbrechnungVM gkv)
if (value is GkvAbrechnungLightVM gkv)
{
if (parameter is string s)
{
@@ -29,17 +30,32 @@ namespace BeWo.Converter
}
}
if (value is InvoiceBaseVM invoice)
if (value is GkvAbrechnungVM gkv2)
{
if (parameter is string s)
{
if (s == "Send")
{
return gkv2.SendTooltip;
}
}
}
if (value is InvoiceBaseLightVM invoice)
{
return invoice.IsGkvValidError;
}
if (value is InvoiceBaseVM invoice2)
{
return invoice2.IsGkvValidError;
}
if (value is MandatorVM mandator)
{
return mandator.CanEditIKLeistungserbringerTooltip;
}
return "xxx";
}

7
BeWo/Core/BeWoUtils.cs
View File

@@ -121,7 +121,12 @@ namespace BeWo.Core
public static void NavigateToReportUriWithDocumentPreviewControl(string navigateUriString, string title, DocumentPreviewControl dp, Action callback)
{
var reportTemplates = ServiceFacade.DoOperationsServiceSync(x => x.GetReportTemplates(navigateUriString));
List<ReportTemplateDC> reportTemplates = null;
if (!navigateUriString.Contains("&template="))
{
reportTemplates = ServiceFacade.DoOperationsServiceSync(x => x.GetReportTemplates(navigateUriString));
}
if (reportTemplates?.Count > 1)
{

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

@@ -135,6 +135,7 @@ namespace BeWo.Core.Config
public int LastSelectedStundenkontoIntervall { get; set; }
public int AnzTageZeiterfassErfolgt { get; set; }
public int AnzTageUnterschriftErfolgt { get; set; }
public int ZeiterfassungsSchwellwert { get; set; }
@@ -490,6 +491,9 @@ namespace BeWo.Core.Config
public bool ModuleAiSettingsEnabled { get; set; }
public bool ShowWohnhilfe { get; set; }
public bool ShowVorlagen { get; set; }
public bool ShowMitarbeiterSchwerbehindertenInfos { get; set; }
public bool ShowImportAbschlagszahlungen { get; set; }
public bool ShowPersehImport { get; set; }

2
BeWo/DebugConfig.cs
View File

@@ -131,7 +131,7 @@ namespace BeWo
new DebugConfig()
{
DebugConfigMode = DebugConfigMode.FeatureDakota,
AutoLogin = true,
AutoLogin = false,
SelectView = UIContext.Organisation,
SelectIndex = 8,
DefaultLoginUsername = "m1",

8
BeWo/LoginControl.xaml.cs
View File

@@ -264,6 +264,10 @@ namespace BeWo
private static String PUB_KEY_R11 = "BA87BC5C1B0039CBCA0ACDD46710F9013CA54EA561CB26CA52FB1501B7B928F5281EED27B324183967090C08ECE03AB03B770EBDF3E53954410C4EAE41D69974DE51DBEF7BFF58BDA8B713F6DE31D5F272C9726A0B8374959C4600641499F3B1D922D9CDA892AA1C267A3FFEEF58057B089581DB710F8EFBE33109BB09BE504D5F8F91763D5A9D9E83F2E9C466B3E106664348188065A037189A9B843297B1B2BDC4F815009D2788FBE26317966C9B27674BC4DB285E69C279F0495CE02450E1C4BCA105AC7B406D00B4C2413FA758B82FC55C9BA5BB099EF1FEEBB08539FDA80AEF45C478EB652AC2CF5F3CDEE35C4D1BF70B272BAA0B4277534F796A1D87D90203010001";
private static String PUB_KEY_R12 = "da982874adbe94fe3be01ee2e54b75ab2c127feda703327e3697ece8318fa5138d0b992e1ecd01513d4ce5286e095531aaa5225d72f42d07c24d403cdf0123b97837f51a653234e686719d04ef84085bbd021a99eba601009a73906d8fa207a0d097d3da456181353d14f9c4c05f6adc0b961ab09fe32aeabd2ad698c79b71ab3b740f3cdbb260be5a4b4e18e9db2a735c8961659efeed3ca6cb4e6fe49ef90046b3ff194d2a63b38e66c6188570c750656f3b74e548830f08585d2d239d5ea3fee8db00a1d2f4e3194df2ee7af6279ee5cd9c2da2f27f9c17adef133739d1b4c82c41d686c0e9ec21f8591b7fb93a7c9f5c019d6204c228bd0aad3cca10ec1b0203010001";
private static String PUB_KEY_R13 = "a567708dd0568164151761cdb906d4ad19908c2650379816639254dbd9cc840593ecd3ec081ba0605143487d2bc748969eb42dda9dc8273b57a19fabf0d60ed40e30ca6f9bb1d1d6a49d323e584e356f4558687117fc3ed85d82a02fb2516cb01a5db859ce3565c88ba1af1037ffe39c5dc2491734ff8c2b8b8df0bc712c930c1d05c4bac7cdaac95e7cd1c901f79c03f6fc0a5df4da7be6db764270ebf44d22da00776fd6c95f17fdda752ea5570cf6ea5cb6e073a568cfa174e275827e109fc1f5a2eb01e938b10a44ccd3c289f54935820a34b31ce988c2474e820e0a36f0474f8af1290475dacde19a5cff5e9d9895ba9a43d04aa21705010430d332b38f0203010001";
private bool PinPublicKey(object sender, X509Certificate certificate, X509Chain chain, SslPolicyErrors sslpolicyerrors)
{
@@ -284,7 +288,9 @@ namespace BeWo
pk.Contains(PUB_KEY_E5.ToLower()) ||
pk.Contains(PUB_KEY_E6.ToLower()) ||
pk.Contains(PUB_KEY_R10.ToLower()) ||
pk.Contains(PUB_KEY_R11.ToLower()))
pk.Contains(PUB_KEY_R11.ToLower()) ||
pk.Contains(PUB_KEY_R12.ToLower()) ||
pk.Contains(PUB_KEY_R13.ToLower()))
{
chainContainsPk = true;
}

2
BeWo/MainControl.xaml.cs
View File

@@ -178,7 +178,7 @@ namespace BeWo
}
if (BeWoApp.LoggedOnUser != null && BeWoApp.LoggedOnUser.HasRight(UserRightType.DocumentsAllowViewAll) && BeWoApp.AppSettings.ShowWohnhilfe)
if (BeWoApp.LoggedOnUser != null && BeWoApp.LoggedOnUser.HasRight(UserRightType.DocumentsAllowViewAll) && BeWoApp.AppSettings.ShowVorlagen)
{
this.button_Dokumente.Visibility = Visibility.Visible;
}

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

@@ -1578,7 +1578,9 @@ namespace BeWo.Scheduler.View
var mitarbeiterliste = appointment.CF_EmployeeList();
var istErsteller = ersteller?.EmployeeOid.Equals(BeWoApp.LoggedOnEmployee.EmployeeOid) ?? false;
if(!istErsteller && appointment.CF_IsPrivate() && !mitarbeiterliste.Any(a => Equals(a.Employee, BeWoApp.CompactLoggedOnEmployee)) || !appointment.CF_CanBeEdited())
bool canBeEdited = appointment.CF_CanBeEdited();
if (!istErsteller && appointment.CF_IsPrivate() && !mitarbeiterliste.Any(a => Equals(a.Employee, BeWoApp.CompactLoggedOnEmployee)) || !canBeEdited)
{
darfTerminDetailsSehen = false;
}
@@ -1946,8 +1948,13 @@ namespace BeWo.Scheduler.View
var customerList = appointment.CF_CustomerList();
var employeeList = employee2SchedulerAppointmentList.Select(employee2SchedulerAppointment => employee2SchedulerAppointment.Employee).ToList();
String notice = appointment.Description;
if (String.IsNullOrEmpty(notice))
{
notice = appointment.Subject;
}
BeWoUtils.CreateZeiterfassung(appointment.Start, appointment.End, customerList, employeeList, appointment.Subject, appointment, serviceRecords =>
BeWoUtils.CreateZeiterfassung(appointment.Start, appointment.End, customerList, employeeList, notice, appointment, serviceRecords =>
{
try
{

1
BeWo/Scheduler/ViewModel/CustomFieldStorage.cs
View File

@@ -141,6 +141,7 @@ namespace BeWo.Scheduler.ViewModel
_AbsenceTimeEnd = pAppointment.AbsenceTimeEnd;
HasServiceRecordEntry = pAppointment.HasServiceRecordEntry;
CanBeEdited = pAppointment.CanBeEdited;
AbsenceTimeOid = pAppointment.AbsenceTimeOid;

235
BeWo/View/Controls/CustomerVermittlungArbeitControl.xaml
View File

@@ -1,6 +1,7 @@
<UserControl
x:Class="BeWo.View.Controls.CustomerVermittlungArbeitControl"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:core="clr-namespace:BS.Shared.Core;assembly=BS.Shared"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
@@ -8,6 +9,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:uc="clr-namespace:BeWo.Controls;assembly=BeWo.Controls"
xmlns:viewmodel="clr-namespace:BeWo.ViewModel"
xmlns:localSearchView="clr-namespace:BeWo.View.Search"
x:Name="root"
d:DataContext="{d:DesignInstance Type=viewmodel:CustomerVermittlungArbeitVM}"
d:DesignHeight="1450"
@@ -38,7 +40,7 @@
<Grid HorizontalAlignment="Stretch">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" MaxWidth="500" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
@@ -59,6 +61,12 @@
Width="*"
MinWidth="200"
MaxWidth="300" />
<ColumnDefinition x:Name="column3" Width="Auto" />
<ColumnDefinition
x:Name="column4"
Width="*"
MinWidth="200"
MaxWidth="300" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
@@ -80,44 +88,122 @@
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Label
Grid.Row="0"
Grid.Column="0"
Content="Art" />
<dxe:ComboBoxEdit Grid.Row="0" Grid.Column="1" Margin="3" ItemsSource="{x:Static core:EnumTranslations.VgaType2Translation}"
EditValue="{Binding Path=VgaType, UpdateSourceTrigger=PropertyChanged}"
DisplayMember="Value" ValueMember="Key" IsTextEditable="False" />
<Label
Grid.Row="1"
Grid.Column="0"
Content="AZ der Staatsanwaltschaft/des Gerichts" />
<TextBox
Grid.Row="0"
Grid.Row="1"
Grid.Column="1"
IsReadOnly="{Binding PermissionCustomerGemeinnutzigeArbeitManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root}"
Text="{Binding Path=AktenzeichenGericht, UpdateSourceTrigger=PropertyChanged}" />
<Label
Grid.Row="1"
Grid.Row="2"
Grid.Column="0"
Content="Eigenes Aktenzeichen" />
<TextBox
Grid.Row="1"
Grid.Row="2"
Grid.Column="1"
IsReadOnly="{Binding PermissionCustomerGemeinnutzigeArbeitManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root}"
Text="{Binding Path=EigenesAktenzeichen, UpdateSourceTrigger=PropertyChanged}" />
<Label
Grid.Row="2"
Grid.Row="3"
Grid.Column="0"
Content="Auftraggeber" />
<uc:PopUpEdit NewButtonVisibility="Collapsed"
Grid.Row="3"
Grid.Column="1"
Margin="3"
IsReadOnly="True"
x:Name="popupedit_Auftraggeber"
Height="23"
DeleteButtonVisibility="Visible"
DeleteClick="popupedit_Auftraggeber_DeleteClick"
PopUpClick="popupedit_Auftraggeber_PopUpClick"
Text="{Binding Path=Auftraggeber.Name, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
Cursor="Arrow" />
<Label
Grid.Row="4"
Grid.Column="0"
Content="Auftraggeber Kontaktperson" />
<uc:PopUpEdit NewButtonVisibility="Visible"
Grid.Row="4"
Grid.Column="1"
Margin="3"
NewClick="popupedit_AuftraggeberContactPersonSearch_NewClick"
IsReadOnly="True"
x:Name="popupedit_AuftraggeberContactPersonSearch"
Height="23"
DeleteButtonVisibility="Visible"
DeleteClick="popupedit_AuftraggeberContactPersonSearch_DeleteClick"
PopUpClick="popupedit_AuftraggeberContactPersonSearch_PopUpClick"
Text="{Binding Path=AuftraggeberAnsprechpartner.FullName, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
Cursor="Arrow" />
<Label
Grid.Row="5"
Grid.Column="0"
Content="Einsatzstelle" />
<uc:PopUpEdit NewButtonVisibility="Collapsed"
Grid.Row="5"
Grid.Column="1"
Margin="3"
IsReadOnly="True"
x:Name="popupedit_Einsatzstelle"
Height="23"
DeleteButtonVisibility="Visible"
DeleteClick="popupedit_Einsatzstelle_DeleteClick"
PopUpClick="popupedit_Einsatzstelle_PopUpClick"
Text="{Binding Path=Einsatzstelle.Name, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
Cursor="Arrow" />
<Label
Grid.Row="6"
Grid.Column="0"
Content="Einsatzstelle Kontaktperson" />
<uc:PopUpEdit NewButtonVisibility="Visible"
Grid.Row="6"
Grid.Column="1"
Margin="3"
NewClick="popupedit_EinsatzstelleContactPersonSearch_NewClick"
IsReadOnly="True"
x:Name="popupedit_EinsatzstelleContactPersonSearch"
Height="23"
DeleteButtonVisibility="Visible"
DeleteClick="popupedit_EinsatzstelleContactPersonSearch_DeleteClick"
PopUpClick="popupedit_EinsatzstelleContactPersonSearch_PopUpClick"
Text="{Binding Path=EinsatzstelleAnsprechpartner.FullName, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
Cursor="Arrow" />
<Label
Grid.Row="7"
Grid.Column="0"
Content="Auftragseingang" />
<dxe:DateEdit
Grid.Row="2"
Grid.Row="7"
Grid.Column="1"
EditValue="{Binding Path=Auftragseingang, UpdateSourceTrigger=PropertyChanged}"
IsReadOnly="{Binding PermissionCustomerGemeinnutzigeArbeitManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root}"
ShowClearButton="False" />
<Label
Grid.Row="3"
Grid.Row="8"
Grid.Column="0"
Content="Auftragsherkunft" />
<uc:NullItemComboBox
x:Name="comboBox_Auftragsherkunft"
Grid.Row="3"
Grid.Row="8"
Grid.Column="1"
DisplayMemberPath="TypeDescription"
IsEnabled="{Binding PermissionCustomerGemeinnutzigeArbeitManage, Mode=OneTime, ElementName=root}"
@@ -126,12 +212,12 @@
Style="{StaticResource PrimaryNullItemComboBox}" />
<Label
Grid.Row="4"
Grid.Row="9"
Grid.Column="0"
Content="Vermittlungsgrundlage" />
<uc:NullItemComboBox
x:Name="comboBox_Vermittlungsgrundlage"
Grid.Row="4"
Grid.Row="9"
Grid.Column="1"
DisplayMemberPath="TypeDescription"
IsEnabled="{Binding PermissionCustomerGemeinnutzigeArbeitManage, Mode=OneTime, ElementName=root}"
@@ -139,66 +225,66 @@
SelectedValue="{Binding Path=Vermittlungsgrundlage, Mode=TwoWay}" />
<Label
Grid.Row="5"
Grid.Row="10"
Grid.Column="0"
Content="Tagessätze" />
<dxe:TextEdit
Grid.Row="5"
Grid.Row="10"
Grid.Column="1"
EditValue="{Binding Path=Tagessatze, UpdateSourceTrigger=PropertyChanged}"
IsReadOnly="{Binding PermissionCustomerGemeinnutzigeArbeitManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root}"
Style="{StaticResource TextEditNumberDecimalNullable}" />
<Label
Grid.Row="6"
Grid.Row="11"
Grid.Column="0"
Content="Tagessatzhöhe" />
<dxe:TextEdit
Grid.Row="6"
Grid.Row="11"
Grid.Column="1"
EditValue="{Binding Path=Tagessatzhohe, UpdateSourceTrigger=PropertyChanged}"
IsReadOnly="{Binding PermissionCustomerGemeinnutzigeArbeitManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root}"
Style="{StaticResource TextEditCurrency}" />
<Label
Grid.Row="7"
Grid.Row="12"
Grid.Column="0"
Content="Höhe der Geldstrafe" />
<dxe:TextEdit
Grid.Row="7"
Grid.Row="12"
Grid.Column="1"
EditValue="{Binding Path=HoheDerGeldstrafe, UpdateSourceTrigger=PropertyChanged}"
IsReadOnly="True"
Style="{StaticResource TextEditCurrency}" />
<Label
Grid.Row="8"
Grid.Row="13"
Grid.Column="0"
Content="Zu leistende Arbeitsstunden" />
<dxe:TextEdit
Grid.Row="8"
Grid.Row="13"
Grid.Column="1"
EditValue="{Binding Path=ZuLeistendeArbeitsstunden, UpdateSourceTrigger=PropertyChanged}"
IsReadOnly="{Binding PermissionCustomerGemeinnutzigeArbeitManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root}"
Style="{StaticResource TextEditHours}" />
<Label
Grid.Row="9"
Grid.Row="14"
Grid.Column="0"
Content="Hinweis" />
<TextBox
Grid.Row="9"
Grid.Row="14"
Grid.Column="1"
IsReadOnly="{Binding PermissionCustomerGemeinnutzigeArbeitManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root}"
Text="{Binding Path=Hinweis, UpdateSourceTrigger=PropertyChanged}" />
<Label
Grid.Row="10"
Grid.Column="0"
Grid.Row="0"
Grid.Column="2"
Content="Termin" />
<dxe:DateEdit
Grid.Row="10"
Grid.Column="1"
Grid.Row="0"
Grid.Column="3"
EditValue="{Binding Path=Termin, UpdateSourceTrigger=PropertyChanged}"
IsReadOnly="{Binding PermissionCustomerGemeinnutzigeArbeitManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root}"
Mask="G"
@@ -210,13 +296,13 @@
</dxe:DateEdit>
<Label
Grid.Row="11"
Grid.Column="0"
Grid.Row="1"
Grid.Column="2"
Content="Bearbeitungsstatus" />
<uc:NullItemComboBox
x:Name="combobox_bearbeitungsstatus"
Grid.Row="11"
Grid.Column="1"
Grid.Row="1"
Grid.Column="3"
HorizontalAlignment="Stretch"
IsEnabled="{Binding PermissionCustomerGemeinnutzigeArbeitManage, Mode=OneTime, ElementName=root}"
ItemsSource="{Binding Path=CustomerVermittlungBearbeitungsstatusTypes}"
@@ -224,83 +310,102 @@
Style="{StaticResource EnumTranslationNullItemComboBox}" />
<Label
Grid.Row="12"
Grid.Column="0"
Grid.Row="2"
Grid.Column="2"
Content="Auftragsrückgabe" />
<TextBox
Grid.Row="12"
Grid.Column="1"
<dxe:DateEdit
Grid.Row="2"
Grid.Column="3"
EditValue="{Binding Path=Auftragsruckgabe, UpdateSourceTrigger=PropertyChanged}"
IsReadOnly="{Binding PermissionCustomerGemeinnutzigeArbeitManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root}"
Text="{Binding Path=Auftragsruckgabe, UpdateSourceTrigger=PropertyChanged}" />
ShowClearButton="False" />
<Label
Grid.Row="13"
Grid.Column="0"
Grid.Row="3"
Grid.Column="2"
Content="Verlauf" />
<TextBox
Grid.Row="13"
Grid.Column="1"
IsReadOnly="{Binding PermissionCustomerGemeinnutzigeArbeitManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root}"
Text="{Binding Path=Verlauf, UpdateSourceTrigger=PropertyChanged}" />
<uc:NullItemComboBox
x:Name="comboBox_Verlauf"
Grid.Row="3"
Grid.Column="3"
DisplayMemberPath="TypeDescription"
IsEnabled="{Binding PermissionCustomerGemeinnutzigeArbeitManage, Mode=OneTime, ElementName=root}"
ItemsSource="{Binding Path=DataContext.Verlaeufe, RelativeSource={RelativeSource AncestorType={x:Type GroupBox}, AncestorLevel=2, Mode=FindAncestor}}"
SelectedValue="{Binding Path=Verlauf, Mode=TwoWay}"
Style="{StaticResource PrimaryNullItemComboBox}" />
<Label
Grid.Row="14"
Grid.Column="0"
Grid.Row="4"
Grid.Column="2"
Content="Abgeleistete Stunden" />
<dxe:TextEdit
Grid.Row="14"
Grid.Column="1"
Grid.Row="4"
Grid.Column="3"
EditValue="{Binding Path=AbgeleisteteStunden, UpdateSourceTrigger=PropertyChanged}"
IsReadOnly="{Binding PermissionCustomerGemeinnutzigeArbeitManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root}"
Style="{StaticResource TextEditHours}" />
<Label
Grid.Row="15"
Grid.Column="0"
Grid.Row="5"
Grid.Column="2"
Content="Ersparte Hafttage" />
<dxe:TextEdit
Grid.Row="15"
Grid.Column="1"
Grid.Row="5"
Grid.Column="3"
EditValue="{Binding Path=ErsparteHafttage, UpdateSourceTrigger=PropertyChanged}"
IsReadOnly="{Binding PermissionCustomerGemeinnutzigeArbeitManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root}"
Style="{StaticResource TextEditDays}" />
<Label
Grid.Row="16"
Grid.Column="0"
Grid.Row="6"
Grid.Column="2"
Content="Geleistete Ratenzahlung" />
<dxe:TextEdit
Grid.Row="16"
Grid.Column="1"
Grid.Row="6"
Grid.Column="3"
EditValue="{Binding Path=GeleisteteRatenzahlung, UpdateSourceTrigger=PropertyChanged}"
IsReadOnly="{Binding PermissionCustomerGemeinnutzigeArbeitManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root}"
Style="{StaticResource TextEditCurrency}" />
<Label
Grid.Row="17"
Grid.Column="0"
Grid.Row="7"
Grid.Column="2"
Content="Geleistete Einmalzahlung" />
<dxe:TextEdit
Grid.Row="17"
Grid.Column="1"
Grid.Row="7"
Grid.Column="3"
EditValue="{Binding Path=GeleisteteEinmalzahlung, UpdateSourceTrigger=PropertyChanged}"
IsReadOnly="{Binding PermissionCustomerGemeinnutzigeArbeitManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root}"
Style="{StaticResource TextEditCurrency}" />
<Label
Grid.Row="18"
Grid.Column="0"
Grid.Row="8"
Grid.Column="2"
Content="Bemerkung" />
<TextBox
Grid.Row="18"
Grid.Column="1"
Height="92"
MaxHeight="184"
Grid.Row="8"
Grid.Column="3"
Grid.RowSpan="7"
Height="190"
VerticalAlignment="Top"
VerticalContentAlignment="Stretch"
AcceptsReturn="True"
IsReadOnly="{Binding PermissionCustomerGemeinnutzigeArbeitManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root}"
Text="{Binding Path=Bemerkung, UpdateSourceTrigger=PropertyChanged}"
TextWrapping="Wrap"
VerticalScrollBarVisibility="Auto" />
<Popup Margin="10" Name="popup_costbearer" StaysOpen="False"
Placement="MousePoint"
Width="370"
Height="250">
<localSearchView:OrganisationSearchView SearchMode="CostBearer" x:Name="costbearersearchview" />
</Popup>
<Popup Margin="10" x:Name="popup_person" StaysOpen="False"
Placement="MousePoint"
Width="370"
Height="250">
<localSearchView:PersonSearchView x:Name="personsearchview" />
</Popup>
</Grid>
</GroupBox>
<GroupBox

180
BeWo/View/Controls/CustomerVermittlungArbeitControl.xaml.cs
View File

@@ -1,4 +1,12 @@
using System;
using BeWo.Core;
using BeWo.ServiceProxy;
using BeWo.View.Detail;
using BeWo.ViewModel;
using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact;
using BS.Shared.Extensions;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
@@ -20,11 +28,181 @@ namespace BeWo.View.Controls
/// </summary>
public partial class CustomerVermittlungArbeitControl : UserControl
{
private long newPersonOid = 0;
public bool PermissionCustomerGemeinnutzigeArbeitManage { get; } = BeWoApp.HasLoggedOnUserRight(BS.Shared.UserRightType.Customer_GemeinnutzigeArbeit_Manage);
public CustomerVermittlungArbeitControl()
{
InitializeComponent();
}
public CustomerVermittlungArbeitVM ViewModel
{
get
{
return this.DataContext as CustomerVermittlungArbeitVM;
}
set
{
this.DataContext = value;
}
}
private void popupedit_AuftraggeberContactPersonSearch_NewClick(object sender, RoutedEventArgs e)
{
if (ViewModel.IsNew)
{
MessageBox.Show("Bevor Sie eine neue Person anlegen können, muss dieser Datensatz zuerst gespeichert werden.", "Erst speichern bitte", MessageBoxButton.OK, MessageBoxImage.Information);
return;
}
else
{
newPersonOid = 0L;
VMFactory.CreatePersonVMAsync(
cb => this.Dispatch(
() => BeWoUtils.OpenModalViewWindow<PersonVM, PersonDC, CustomerView>(cb, null, () => this.Dispatch(
delegate
{
if (newPersonOid > 0)
{
var newPerson = new CompactPersonDC();
ServiceFacade.DoCustomerServiceSync(s => newPerson = s.LoadPersonCompact(newPersonOid));
//ViewModel.AuftraggeberAnsprechpartner = null; //Sonst wird es nicht dirty:-(
ViewModel.AuftraggeberAnsprechpartner = newPerson;
personsearchview.ObjectList.Add(newPerson);
}
}
), personSavedOrUpdated: personModalPopUp_PersonSavedOrUpdated)));
}
}
private void popupedit_AuftraggeberContactPersonSearch_DeleteClick(object sender, RoutedEventArgs e)
{
ViewModel.AuftraggeberAnsprechpartner = null;
}
private void popupedit_AuftraggeberContactPersonSearch_PopUpClick(object sender, RoutedEventArgs e)
{
personsearchview.ItemSelected += personsearchview_AuftraggeberContactPersonSelected;
popup_person.IsOpen = true;
}
private void personsearchview_AuftraggeberContactPersonSelected(object sender, EventArgs<CompactPersonDC> e)
{
popup_person.IsOpen = false;
personsearchview.ItemSelected -= personsearchview_AuftraggeberContactPersonSelected;
ViewModel.AuftraggeberAnsprechpartner = e.Data;
}
private void popupedit_EinsatzstelleContactPersonSearch_NewClick(object sender, RoutedEventArgs e)
{
if (ViewModel.IsNew)
{
MessageBox.Show("Bevor Sie eine neue Person anlegen können, muss dieser Datensatz zuerst gespeichert werden.", "Erst speichern bitte", MessageBoxButton.OK, MessageBoxImage.Information);
return;
}
else
{
newPersonOid = 0L;
VMFactory.CreatePersonVMAsync(
cb => this.Dispatch(
() => BeWoUtils.OpenModalViewWindow<PersonVM, PersonDC, CustomerView>(cb, null, () => this.Dispatch(
delegate
{
if (newPersonOid > 0)
{
var newPerson = new CompactPersonDC();
ServiceFacade.DoCustomerServiceSync(s => newPerson = s.LoadPersonCompact(newPersonOid));
//ViewModel.AuftraggeberAnsprechpartner = null; //Sonst wird es nicht dirty:-(
ViewModel.EinsatzstelleAnsprechpartner = newPerson;
personsearchview.ObjectList.Add(newPerson);
}
}
), personSavedOrUpdated: personModalPopUp_PersonSavedOrUpdated)));
}
}
private void popupedit_EinsatzstelleContactPersonSearch_DeleteClick(object sender, RoutedEventArgs e)
{
ViewModel.EinsatzstelleAnsprechpartner = null;
}
private void popupedit_EinsatzstelleContactPersonSearch_PopUpClick(object sender, RoutedEventArgs e)
{
personsearchview.ItemSelected += personsearchview_EinsatzstelleContactPersonSelected;
popup_person.IsOpen = true;
}
private void personsearchview_EinsatzstelleContactPersonSelected(object sender, EventArgs<CompactPersonDC> e)
{
popup_person.IsOpen = false;
personsearchview.ItemSelected -= personsearchview_EinsatzstelleContactPersonSelected;
ViewModel.EinsatzstelleAnsprechpartner = e.Data;
}
private void personModalPopUp_PersonSavedOrUpdated(object sender, EventArgs<PersonVM> e)
{
if (e.Data != null && e.Data.DataContract.PersonOid.HasValue)
{
newPersonOid = e.Data.DataContract.PersonOid.Value;
}
}
private void popupedit_Einsatzstelle_DeleteClick(object sender, RoutedEventArgs e)
{
ViewModel.Einsatzstelle = null;
}
private void popupedit_Einsatzstelle_PopUpClick(object sender, RoutedEventArgs e)
{
costbearersearchview.ItemSelected += organisationsearchview_EinsatzstelleSelected;
popup_costbearer.IsOpen = true;
}
private void organisationsearchview_EinsatzstelleSelected(object sender, EventArgs<CompactOrganisationDC> e)
{
popup_costbearer.IsOpen = false;
costbearersearchview.ItemSelected -= organisationsearchview_EinsatzstelleSelected;
ViewModel.Einsatzstelle = e.Data;
}
private void popupedit_Auftraggeber_DeleteClick(object sender, RoutedEventArgs e)
{
ViewModel.Auftraggeber = null;
}
private void popupedit_Auftraggeber_PopUpClick(object sender, RoutedEventArgs e)
{
costbearersearchview.ItemSelected += organisationsearchview_AuftraggeberSelected;
popup_costbearer.IsOpen = true;
}
private void organisationsearchview_AuftraggeberSelected(object sender, EventArgs<CompactOrganisationDC> e)
{
popup_costbearer.IsOpen = false;
costbearersearchview.ItemSelected -= organisationsearchview_AuftraggeberSelected;
ViewModel.Auftraggeber = e.Data;
}
}
}

3
BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml
View File

@@ -39,7 +39,7 @@
Margin="3,0,0,3"
HorizontalAlignment="Left"
VerticalAlignment="Bottom"
FilterMonth="False"
FilterMonth="True"
FilterSpanChanged="YearMonthFilter_FilterSpanChanged" />
<StackPanel
Grid.Column="1"
@@ -165,6 +165,7 @@
Foreground="#ffffff"
IsEnabled="{Binding Row.IsReady2Send}"
ToolTip="{Binding Row, Converter={StaticResource TooltipTextConverter}, ConverterParameter=Send}"
ToolTipService.InitialShowDelay="0"
ToolTipService.ShowOnDisabled="True"
Visibility="{Binding Converter={StaticResource UserPermission2VisibleConverter}, ConverterParameter={x:Static shared:UserRightType.Finance_Gkv_Send}}" />
<Button

2
BeWo/View/Detail/Accounting/NewGkvAbrechnungPopUpView.xaml
View File

@@ -159,8 +159,8 @@
IsEnabledBinding="{Binding IsGkvValid}">
<dxg:GridColumn.CellStyle>
<Style TargetType="{x:Type dxg:LightweightCellEditor}">
<Setter Property="ToolTipService.ShowOnDisabled" Value="True" />
<Setter Property="ToolTipService.InitialShowDelay" Value="0" />
</Style>
</dxg:GridColumn.CellStyle>
</dxg:GridColumn>

5
BeWo/View/Detail/Administration/SoziotherapieSettingsView.xaml
View File

@@ -48,6 +48,7 @@
IsEnabled="{Binding Path=CanEditIKLeistungserbringer}"
Text="{Binding Path=IKLeistungserbringer, UpdateSourceTrigger=PropertyChanged}"
ToolTip="{Binding Path=CanEditIKLeistungserbringerTooltip}"
ToolTipService.InitialShowDelay="0"
ToolTipService.ShowOnDisabled="True" />
<Label
Grid.Row="1"
@@ -98,7 +99,7 @@
Grid.Row="0"
Grid.Column="1"
Margin="3"
SelectedColor="{Binding ColorWaitTooLong, Mode=TwoWay}" />
SelectedColor="{Binding ColorSendUrbelege, Mode=TwoWay}" />
<Label
Grid.Row="1"
Grid.Column="0"
@@ -115,7 +116,7 @@
Grid.Row="1"
Grid.Column="1"
Margin="3"
SelectedColor="{Binding ColorSendUrbelege, Mode=TwoWay}" />
SelectedColor="{Binding ColorWaitTooLong, Mode=TwoWay}" />
<Label
Grid.Row="2"
Grid.Column="0"

40
BeWo/View/Detail/CustomerVermittlungArbeitView.xaml
View File

@@ -3,10 +3,14 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:controls="clr-namespace:BeWo.View.Controls"
xmlns:controls1="clr-namespace:BeWo.Controls;assembly=BeWo.Controls"
xmlns:core="clr-namespace:BS.Shared.Core;assembly=BS.Shared"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
xmlns:local="clr-namespace:BeWo.View.Detail"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:viewmodel="clr-namespace:BeWo.ViewModel"
xmlns:detail="clr-namespace:BeWo.View.Detail"
x:Name="root"
d:DataContext="{d:DesignInstance Type=viewmodel:CustomerVM}"
d:DesignHeight="450"
@@ -32,7 +36,39 @@
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<StackPanel HorizontalAlignment="Stretch" Orientation="Horizontal">
<Button Command="{Binding AddVMCommand}" Content="Neuen Fall hinzufügen" />
<Button Content="Neuen Fall hinzufügen" Tag="{Binding}" Click="ButtonOpenAddNewVgaClick"/>
<controls:PopupNonTopmost x:Name="popup_newVga">
<Border Background="White" Padding="3" BorderThickness="1" BorderBrush="Gray">
<GroupBox x:Name="groupbox_newVga" Header="Neue Fall hinzufügen" Style="{DynamicResource ObjectEditGroupBox}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Label Grid.Column="0" Grid.Row="0" Content="Art" VerticalAlignment="Center" />
<dxe:ComboBoxEdit ItemsSource="{x:Static core:EnumTranslations.VgaType2Translation}" Grid.Row="0" Grid.Column="1" Margin="3"
EditValue="{Binding Path=NewVM.VgaType, UpdateSourceTrigger=PropertyChanged}"
DisplayMember="Value" ValueMember="Key" IsTextEditable="False" />
<StackPanel Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Right">
<Button Click="ButtonAddVgaClick" Content="Hinzufügen" Height="25"
FontWeight="Normal" Margin="3" VerticalAlignment="Center" HorizontalAlignment="Right" />
<Button HorizontalAlignment="Right" VerticalAlignment="Center" Height="25"
Margin="3" Content="Abbrechen" Click="ButtonCancelAddVgaClick" />
</StackPanel>
</Grid>
</GroupBox>
</Border>
</controls:PopupNonTopmost>
</StackPanel>
<TabControl
x:Name="tabcontrol_NotizenKategorien"
@@ -51,7 +87,7 @@
Command="{Binding Path=DataContext.DeleteSelectedVMCommand, RelativeSource={RelativeSource AncestorType=TabControl}}"
Style="{DynamicResource CloseButtonStyle}"
Tag="{Binding}"
ToolTip="Wohnhilfe entfernen">
ToolTip="Fall entfernen">
<Button.Visibility>
<MultiBinding Converter="{StaticResource BoolVisibilityMultiConverter}">
<Binding Path="IsSelected" RelativeSource="{RelativeSource AncestorType={x:Type TabItem}}" />

23
BeWo/View/Detail/CustomerVermittlungArbeitView.xaml.cs
View File

@@ -26,5 +26,28 @@ namespace BeWo.View.Detail
{
InitializeComponent();
}
private void ButtonOpenAddNewVgaClick(object sender, RoutedEventArgs e)
{
popup_newVga.IsOpen = true;
}
private void ButtonAddVgaClick(object sender, RoutedEventArgs e)
{
var vm = this.DataContext as BeWo.ViewModel.CustomerVM;
if (vm != null)
{
vm.CustomerVermittlungArbeitListVM.AddVMCommand.Execute(null);
}
popup_newVga.IsOpen = false;
}
private void ButtonCancelAddVgaClick(object sender, RoutedEventArgs e)
{
popup_newVga.IsOpen = false;
}
}
}

40
BeWo/View/Detail/CustomerView.xaml
View File

@@ -921,17 +921,33 @@
Grid.Row="3"
Grid.Column="0"
Content="Geburtstag" />
<dxe:DateEdit
Grid.Row="3"
Grid.Column="1"
Height="23"
MinWidth="90"
Margin="3"
HorizontalAlignment="Left"
AllowNullInput="True"
EditValue="{Binding Path=DateOfBirth, UpdateSourceTrigger=PropertyChanged}"
MaskType="DateTimeAdvancingCaret" />
<Grid Grid.Row="3" Grid.Column="1">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<dxe:DateEdit
Grid.Column="0"
Height="23"
MinWidth="90"
Margin="3"
HorizontalAlignment="Left"
AllowNullInput="True"
EditValue="{Binding Path=DateOfBirth, UpdateSourceTrigger=PropertyChanged}"
MaskType="DateTimeAdvancingCaret" />
<Label
Grid.Column="1"
Content="Geburtsort" />
<TextBox
Grid.Column="2"
Height="23"
Margin="3"
Text="{val:ValidationBinding Path=PlaceOfBirth,
UpdateSourceTrigger=PropertyChanged}"
HorizontalAlignment="Stretch"/>
</Grid>
<Label
Grid.Row="0"
Grid.Column="2"
@@ -964,6 +980,7 @@
Foreground="{Binding Path=InsuranceNumber, Converter={StaticResource Validation2BrushConverter}, ConverterParameter={x:Static shared:ValidationType.CustomerVersichertennummer}}"
Text="{Binding Path=InsuranceNumber, UpdateSourceTrigger=PropertyChanged}"
ToolTip="{Binding Path=InsuranceNumber, Converter={StaticResource Validation2TooltipConverter}, ConverterParameter={x:Static shared:ValidationType.CustomerVersichertennummer}}"
ToolTipService.InitialShowDelay="0"
ToolTipService.ShowOnDisabled="True" />
<Label
Grid.Row="6"
@@ -977,6 +994,7 @@
Foreground="{Binding Path=VersichertenStatus, Converter={StaticResource Validation2BrushConverter}, ConverterParameter={x:Static shared:ValidationType.CustomerVersichertenstatus}}"
Text="{Binding Path=VersichertenStatus, UpdateSourceTrigger=PropertyChanged}"
ToolTip="{Binding Path=VersichertenStatus, Converter={StaticResource Validation2TooltipConverter}, ConverterParameter={x:Static shared:ValidationType.CustomerVersichertenstatus}}"
ToolTipService.InitialShowDelay="0"
ToolTipService.ShowOnDisabled="True" />
<Label
x:Name="lblArchiviert"

260
BeWo/View/Detail/EmployeeView.xaml
View File

@@ -340,6 +340,8 @@
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
@@ -400,39 +402,53 @@
Grid.Column="0"
Margin="3"
VerticalAlignment="Center">
Staatsangehörigkeit
Anzahl Kinder
</Label>
<Label
Grid.Row="8"
Grid.Column="0"
Margin="3"
VerticalAlignment="Center">
Krankenkasse
Staatsangehörigkeit
</Label>
<Label
Grid.Row="9"
Grid.Column="0"
Margin="3"
VerticalAlignment="Center">
Steuernummer
Krankenkasse
</Label>
<Label
Grid.Row="10"
Grid.Column="0"
Margin="3"
VerticalAlignment="Center">
Steuernummer
</Label>
<Label
Grid.Row="11"
Grid.Column="0"
Margin="3"
VerticalAlignment="Center">
Steuerklasse
</Label>
<Label
Grid.Row="12"
Grid.Column="0"
Margin="3"
VerticalAlignment="Center">
Versicherungs Nr.
</Label>
<Label
x:Name="lblArchiviert"
Grid.Row="11"
Grid.Row="13"
Grid.Column="0"
Margin="3,0,3,3"
VerticalAlignment="Center">
Archiviert
</Label>
<Label
Grid.Row="12"
Grid.Row="14"
Grid.Column="0"
Margin="3"
VerticalAlignment="Center"
@@ -440,7 +456,7 @@
<ComboBox
Name="combobox_brush"
Grid.Row="12"
Grid.Row="14"
Grid.Column="1"
Height="23"
Margin="3"
@@ -542,9 +558,15 @@
SelectedValue="{Binding Path=FamilyStatus}"
SelectedValuePath="Key"
Style="{DynamicResource {x:Type uc:NullItemComboBox}}" />
<TextBox
Grid.Row="7"
Grid.Column="1"
Height="23"
Margin="3"
Text="{Binding Path=ChildCount, UpdateSourceTrigger=PropertyChanged}" />
<uc:NullItemComboBox
x:Name="comboBox_Nationalitaet"
Grid.Row="7"
Grid.Row="8"
Grid.Column="1"
Height="23"
MinWidth="189"
@@ -555,27 +577,32 @@
<TextBox
Grid.Row="8"
Grid.Row="9"
Grid.Column="1"
Height="23"
Margin="3"
Text="{Binding Path=HealthInsurance, UpdateSourceTrigger=PropertyChanged}" />
<TextBox
Grid.Row="9"
Grid.Row="10"
Grid.Column="1"
Height="23"
Margin="3"
Text="{Binding Path=TaxNumber, UpdateSourceTrigger=PropertyChanged}" />
<TextBox
Grid.Row="10"
Grid.Row="11"
Grid.Column="1"
Height="23"
Margin="3"
Text="{Binding Path=TaxClass, UpdateSourceTrigger=PropertyChanged}" />
<TextBox
Grid.Row="12"
Grid.Column="1"
Height="23"
Margin="3"
Text="{Binding Path=InsuranceNumber, UpdateSourceTrigger=PropertyChanged}" />
<CheckBox
x:Name="chkArchiviert"
Grid.Row="11"
Grid.Row="13"
Grid.Column="1"
Height="23"
Margin="3,6,3,3"
@@ -755,6 +782,90 @@
</Grid>
</GroupBox>
<GroupBox
Grid.Row="2"
Grid.Column="3"
Grid.ColumnSpan="6"
x:Name="GroupSchwerbehindertenausweis"
Margin="0,20,0,0"
Header="Schwerbehindertenausweis"
Style="{StaticResource ObjectEditGroupBox}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Label
Grid.Row="0"
Grid.Column="0"
HorizontalAlignment="Left"
VerticalAlignment="Center"
Content="Grad der Behinderung" />
<ComboBox
x:Name="GdBComboBox"
Grid.Row="0"
Grid.Column="1"
Width="150"
Height="23"
Margin="3"
SelectionChanged="GdBComboBox_OnSelectionChanged" />
<Label
Grid.Row="2"
Grid.Column="0"
VerticalAlignment="Center"
Content="Gültig von" />
<dxe:DateEdit
Grid.Row="2"
Grid.Column="1"
Width="150"
Height="23"
Margin="3"
HorizontalAlignment="Left"
AllowNullInput="True"
EditValue="{Binding Path=AusweisGueltigVon, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
MaskType="DateTimeAdvancingCaret" />
<Label
Grid.Row="3"
Grid.Column="0"
VerticalAlignment="Center"
Content="Gültig bis" />
<dxe:DateEdit
Grid.Row="3"
Grid.Column="1"
Width="150"
Height="23"
Margin="3"
HorizontalAlignment="Left"
AllowNullInput="True"
EditValue="{Binding Path=AusweisGueltigBis, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
MaskType="DateTimeAdvancingCaret" />
<Label
Grid.Row="4"
Grid.Column="0"
VerticalAlignment="Center"
Content="Bemerkung" />
<TextBox
Grid.Row="4"
Grid.Column="1"
Height="23"
Margin="3"
Text="{Binding Path=AusweisBemerkung, UpdateSourceTrigger=PropertyChanged}" />
</Grid>
</GroupBox>
<GroupBox
x:Name="noticeGroup"
Grid.Row="3"
@@ -990,6 +1101,7 @@
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Label
Grid.Row="0"
@@ -1082,6 +1194,12 @@
Margin="3"
VerticalAlignment="Center"
Content="{markup:Translate Künd.-frist (Tage)}" />
<Label
Grid.Row="14"
Grid.Column="0"
Margin="3"
VerticalAlignment="Center"
Content="{markup:Translate Bruttogehalt}" />
<Label
Grid.Row="0"
@@ -1148,115 +1266,29 @@
SelectedValue="{Binding Path=HourlyRateCostRatePeriod, Mode=TwoWay}"
Visibility="{Binding IsHourlyRateComboVisible, Converter={StaticResource BoolVisibilityConverter}}" />
<dxe:TextEdit MaskType="Numeric" Mask="########0.000" MaskUseAsDisplayFormat="True" Grid.Column="1" Grid.Row="5" Margin="3" Height="23" AllowNullInput="True" EditValue="{Binding Path=WeeklyFLS, UpdateSourceTrigger=PropertyChanged}" IsEnabled="{Binding WeeklyFlsEnabled}" Style="{StaticResource DisabledTextBoxStyle}"/>
<dxe:TextEdit MaskType="Numeric" Mask="########0.000" MaskUseAsDisplayFormat="True" Grid.Column="1" Grid.Row="6" Margin="3" Height="23" AllowNullInput="True" EditValue="{Binding Path=MonthlyFLS, UpdateSourceTrigger=PropertyChanged}" IsEnabled="{Binding MonthlyFlsEnabled}" Style="{StaticResource DisabledTextBoxStyle}"/>
<dxe:TextEdit MaskType="Numeric" Mask="########0.00#" MaskUseAsDisplayFormat="True" Grid.Column="1" Grid.Row="7" Margin="3" Height="23" AllowNullInput="True" EditValue="{Binding Path=WeeklyTotalHours, UpdateSourceTrigger=PropertyChanged}" IsEnabled="{Binding WeeklyHoursEnabled}" Style="{StaticResource DisabledTextBoxStyle}"/>
<dxe:TextEdit MaskType="Numeric" Mask="########0.00#" MaskUseAsDisplayFormat="True" Grid.Column="1" Grid.Row="8" Margin="3" Height="23" AllowNullInput="True" EditValue="{Binding Path=MonthlyTotalHours, UpdateSourceTrigger=PropertyChanged}" IsEnabled="{Binding MonthlyHoursEnabled}" Style="{StaticResource DisabledTextBoxStyle}"/>
<dxe:SpinEdit MinValue="0" MaxValue="7" IsFloatValue="False" Grid.Column="1" Grid.Row="9" Margin="3" Height="23" EditValue="{Binding Path=WeeklyDays, Converter={StaticResource Int2DecimalConverter}, UpdateSourceTrigger=PropertyChanged}"/>
<dxe:TextEdit MaskType="Numeric" Mask="########0.00" MaskUseAsDisplayFormat="True" Grid.Column="1" Grid.Row="10" Margin="3" Height="23" EditValue="{Binding Path=EmploymentType.LeaveDays, UpdateSourceTrigger=PropertyChanged}" Visibility="{Binding EmploymentTypeLeaveDaysVisibility, UpdateSourceTrigger=PropertyChanged}" IsEnabled="False" />
<dxe:TextEdit MaskType="Numeric" Mask="########0.00" MaskUseAsDisplayFormat="True" Grid.Column="1" Grid.Row="10" Margin="3" Height="23" EditValue="{Binding Path=LeaveDays, UpdateSourceTrigger=PropertyChanged}" Visibility="{Binding LeaveDaysVisibility, UpdateSourceTrigger=PropertyChanged}" IsEnabled="True" />
<dxe:SpinEdit MinValue="0" IsFloatValue="False" Grid.Column="1" Grid.Row="11" Margin="3" Height="23" EditValue="{Binding Path=ProbationPeriod, Converter={StaticResource Int2DecimalConverter}, UpdateSourceTrigger=PropertyChanged}" />
<dxe:SpinEdit MinValue="0" IsFloatValue="True" Mask="########0.00" MaskUseAsDisplayFormat="True" Grid.Column="1" Grid.Row="12" Margin="3" Height="23" EditValue="{Binding Path=ProbationPeriod2, UpdateSourceTrigger=PropertyChanged}" />
<dxe:SpinEdit MinValue="0" IsFloatValue="False" Grid.Column="1" Grid.Row="13" Margin="3" Height="23" EditValue="{Binding Path=CancellationPeriod, Converter={StaticResource Int2DecimalConverter}, UpdateSourceTrigger=PropertyChanged}" />
<dxe:TextEdit
Grid.Row="5"
Grid.Row="14"
Grid.Column="1"
Height="23"
Margin="3"
AllowNullInput="True"
EditValue="{Binding Path=WeeklyFLS, UpdateSourceTrigger=PropertyChanged}"
IsEnabled="{Binding WeeklyFlsEnabled}"
Mask="########0.000"
EditValue="{Binding Path=GrossSalary, UpdateSourceTrigger=PropertyChanged}"
Mask="c"
MaskType="Numeric"
MaskUseAsDisplayFormat="True"
Style="{StaticResource DisabledTextBoxStyle}" />
<dxe:TextEdit
Grid.Row="6"
Grid.Column="1"
Height="23"
Margin="3"
AllowNullInput="True"
EditValue="{Binding Path=MonthlyFLS, UpdateSourceTrigger=PropertyChanged}"
IsEnabled="{Binding MonthlyFlsEnabled}"
Mask="########0.000"
MaskType="Numeric"
MaskUseAsDisplayFormat="True"
Style="{StaticResource DisabledTextBoxStyle}" />
<dxe:TextEdit
Grid.Row="7"
Grid.Column="1"
Height="23"
Margin="3"
AllowNullInput="True"
EditValue="{Binding Path=WeeklyTotalHours, UpdateSourceTrigger=PropertyChanged}"
IsEnabled="{Binding WeeklyHoursEnabled}"
Mask="########0.00#"
MaskType="Numeric"
MaskUseAsDisplayFormat="True"
Style="{StaticResource DisabledTextBoxStyle}" />
<dxe:TextEdit
Grid.Row="8"
Grid.Column="1"
Height="23"
Margin="3"
AllowNullInput="True"
EditValue="{Binding Path=MonthlyTotalHours, UpdateSourceTrigger=PropertyChanged}"
IsEnabled="{Binding MonthlyHoursEnabled}"
Mask="########0.00#"
MaskType="Numeric"
MaskUseAsDisplayFormat="True"
Style="{StaticResource DisabledTextBoxStyle}" />
<dxe:SpinEdit
Grid.Row="9"
Grid.Column="1"
Height="23"
Margin="3"
EditValue="{Binding Path=WeeklyDays, Converter={StaticResource Int2DecimalConverter}, UpdateSourceTrigger=PropertyChanged}"
IsFloatValue="False"
MaxValue="7"
MinValue="0" />
<dxe:TextEdit
Grid.Row="10"
Grid.Column="1"
Height="23"
Margin="3"
EditValue="{Binding Path=EmploymentType.LeaveDays, UpdateSourceTrigger=PropertyChanged}"
IsEnabled="False"
Mask="########0.00"
MaskType="Numeric"
MaskUseAsDisplayFormat="True"
Visibility="{Binding EmploymentTypeLeaveDaysVisibility, UpdateSourceTrigger=PropertyChanged}" />
<dxe:TextEdit
Grid.Row="10"
Grid.Column="1"
Height="23"
Margin="3"
EditValue="{Binding Path=LeaveDays, UpdateSourceTrigger=PropertyChanged}"
IsEnabled="True"
Mask="########0.00"
MaskType="Numeric"
MaskUseAsDisplayFormat="True"
Visibility="{Binding LeaveDaysVisibility, UpdateSourceTrigger=PropertyChanged}" />
<dxe:SpinEdit
Grid.Row="11"
Grid.Column="1"
Height="23"
Margin="3"
EditValue="{Binding Path=ProbationPeriod, Converter={StaticResource Int2DecimalConverter}, UpdateSourceTrigger=PropertyChanged}"
IsFloatValue="False"
MinValue="0" />
<dxe:SpinEdit
Grid.Row="12"
Grid.Column="1"
Height="23"
Margin="3"
EditValue="{Binding Path=ProbationPeriod2, UpdateSourceTrigger=PropertyChanged}"
IsFloatValue="True"
Mask="########0.00"
MaskUseAsDisplayFormat="True"
MinValue="0" />
<dxe:SpinEdit
Grid.Row="13"
Grid.Column="1"
Height="23"
Margin="3"
EditValue="{Binding Path=CancellationPeriod, Converter={StaticResource Int2DecimalConverter}, UpdateSourceTrigger=PropertyChanged}"
IsFloatValue="False"
MinValue="0" />
MaskUseAsDisplayFormat="True" />
<TextBox
Grid.Row="1"
Grid.RowSpan="13"
Grid.RowSpan="14"
Grid.Column="3"
Margin="3"
HorizontalAlignment="Stretch"
@@ -1271,7 +1303,7 @@
TextWrapping="Wrap"
VerticalScrollBarVisibility="Auto" />
<TextBlock
Grid.Row="14"
Grid.Row="15"
Grid.Column="0"
Grid.ColumnSpan="2"
Margin="3,15,3,3"

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

@@ -53,6 +53,8 @@ namespace BeWo.View.Detail
combobox_brush.ItemTemplateSelector = new ComboBoxTemplateSelector(combobox_brush);
ViewModel = pEmployeeDC;
GdBComboBox.ItemsSource = GradDerBehinderungComboBoxQuelle;
GdBComboBox.SelectedIndex = GdBComboBox.Items.IndexOf(ViewModel.GradDerBehinderung);
var extendedPropsVisible = false;
@@ -170,8 +172,15 @@ namespace BeWo.View.Detail
Img.EditValueChanged += Image_EditValueChanged;
_EintragKategorien = pEmployeeDC.EintragKategorien;
if (!BeWoApp.AppSettings.ShowMitarbeiterSchwerbehindertenInfos)
{
GroupSchwerbehindertenausweis.Visibility = Visibility.Collapsed;
}
}
public static readonly string[] GradDerBehinderungComboBoxQuelle = { "", "20", "30", "40", "50", "60", "70", "80", "90", "100" };
public void Image_EditValueChanged(object sender, DevExpress.Xpf.Editors.EditValueChangedEventArgs e)
{
_ViewModel.EmployeeImage = Img.EditValue as byte[];
@@ -747,6 +756,11 @@ namespace BeWo.View.Detail
BeWoUtils.NavigateToReportUri((sender as System.Windows.Documents.Hyperlink).NavigateUri.ToString(), Translator.Translate("Zugeordnete Klient:innen"));
}
private void GdBComboBox_OnSelectionChanged(object sender, SelectionChangedEventArgs e)
{
ViewModel.GradDerBehinderung = GdBComboBox.SelectedValue.ToString();
}
#region Nur relevant, wenn Urlaubskonto keine eigene View mehr ist
/*
private void InitDateComboBox()

56
BeWo/View/Detail/MandatorView.xaml
View File

@@ -357,6 +357,7 @@
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="430" />
@@ -413,14 +414,6 @@
Foreground="Black"
Text="{markup:Translate Anzahl Tage\, in der die Zeiterfassung erfolgen muss (0 für unbegrenzt)}"
TextWrapping="Wrap" />
<TextBlock
Grid.Row="6"
Grid.Column="0"
Margin="3,5,3,5"
VerticalAlignment="Center"
Foreground="Black"
Text="{markup:Translate Schwellwert in %\, ab der das Restbudget in der Zeiterfassung rot markiert wird}"
TextWrapping="Wrap" />
<dxe:SpinEdit
x:Name="AnzTageZeiterfassErfolgt"
@@ -433,9 +426,38 @@
MaxValue="999"
MinValue="0" />
<TextBlock
Grid.Row="6"
Grid.Column="0"
Margin="3,5,3,5"
VerticalAlignment="Center"
Foreground="Black"
Text="{markup:Translate Anzahl Tage\, in der neue Einträge unterschrieben werden müssen (0 für unbegrenzt)}"
TextWrapping="Wrap" />
<dxe:SpinEdit
x:Name="AnzTageUnterschriftErfolgt"
Grid.Row="6"
Grid.Column="1"
Height="23"
Margin="3,5,3,5"
EditValue="{Binding Path=AnzTageUnterschriftErfolgt, Converter={StaticResource Int2DecimalConverter}}"
IsFloatValue="False"
MaxValue="999"
MinValue="0" />
<TextBlock
Grid.Row="7"
Grid.Column="0"
Margin="3,5,3,5"
VerticalAlignment="Center"
Foreground="Black"
Text="{markup:Translate Schwellwert in %\, ab der das Restbudget in der Zeiterfassung rot markiert wird}"
TextWrapping="Wrap" />
<dxe:SpinEdit
x:Name="ZeiterfassungsSchwellwert"
Grid.Row="6"
Grid.Row="7"
Grid.Column="1"
Height="23"
Margin="3,5,3,5"
@@ -447,7 +469,7 @@
<TextBlock
Grid.Row="7"
Grid.Row="8"
Grid.Column="0"
Margin="3,5,3,5"
VerticalAlignment="Center"
@@ -456,7 +478,7 @@
TextWrapping="Wrap" />
<ComboBox
x:Name="ComboZeiteinheit"
Grid.Row="7"
Grid.Row="8"
Grid.Column="0"
Grid.ColumnSpan="2"
Height="23"
@@ -466,7 +488,7 @@
<CheckBox
Grid.Row="8"
Grid.Row="9"
Grid.ColumnSpan="2"
Margin="3,5,3,5"
Content="{markup:Translate Enddatum anzeigen}"
@@ -474,7 +496,7 @@
<CheckBox
x:Name="EnableArbeitszeiterfassung"
Grid.Row="9"
Grid.Row="10"
Grid.ColumnSpan="2"
Margin="3,20,3,5"
Checked="EnableArbeitszeiterfassung_Checked"
@@ -483,14 +505,14 @@
Unchecked="EnableArbeitszeiterfassung_Checked" />
<CheckBox
x:Name="EnableAutomaticPauses"
Grid.Row="10"
Grid.Row="11"
Grid.ColumnSpan="2"
Margin="3,5,3,5"
Content="{markup:Translate Automatischer Pausenabzug}"
IsChecked="{Binding Path=EnableAutomaticPauses}" />
<CheckBox
x:Name="EnableRestTimeWarning"
Grid.Row="11"
Grid.Row="12"
Grid.ColumnSpan="2"
Margin="3,5,3,5"
Content="{markup:Translate Warnung bei nicht einhalten der Ruhezeit}"
@@ -498,7 +520,7 @@
<TextBlock
x:Name="TextBlockShowWarning"
Grid.Row="12"
Grid.Row="13"
Grid.Column="0"
Margin="3,5,3,5"
VerticalAlignment="Center"
@@ -507,7 +529,7 @@
TextWrapping="Wrap" />
<dxe:SpinEdit
x:Name="SpinEditShowWarning"
Grid.Row="12"
Grid.Row="13"
Grid.Column="1"
Height="23"
Margin="3,5,3,5"

13
BeWo/View/Detail/OrganisationView.xaml
View File

@@ -614,6 +614,7 @@
Foreground="{Binding Path=IKKrankenkasse, Converter={StaticResource Validation2BrushConverter}, ConverterParameter={x:Static shared:ValidationType.OrganisationIKNumber}}"
Text="{Binding Path=IKKrankenkasse, UpdateSourceTrigger=PropertyChanged}"
ToolTip="{Binding Path=IKKrankenkasse, Converter={StaticResource Validation2TooltipConverter}, ConverterParameter={x:Static shared:ValidationType.OrganisationIKNumber}}"
ToolTipService.InitialShowDelay="0"
ToolTipService.ShowOnDisabled="True" />
</DockPanel>
@@ -630,7 +631,8 @@
Foreground="{Binding Path=Leistungserbringergruppe, Converter={StaticResource Validation2BrushConverter}, ConverterParameter={x:Static shared:ValidationType.OrganisationLeistungserbringergruppe}}"
Text="{Binding Path=Leistungserbringergruppe, UpdateSourceTrigger=PropertyChanged}"
ToolTip="{Binding Path=Leistungserbringergruppe, Converter={StaticResource Validation2TooltipConverter}, ConverterParameter={x:Static shared:ValidationType.OrganisationLeistungserbringergruppe}}"
ToolTipService.ShowOnDisabled="True" />
ToolTipService.ShowOnDisabled="True"
ToolTipService.InitialShowDelay="0"/>
<Button
x:Name="btn_ik"
@@ -716,7 +718,8 @@
IsEnabled="False"
Text="{Binding Path=BezDatenannahmestelle, UpdateSourceTrigger=PropertyChanged}"
ToolTip="{Binding Path=BezDatenannahmestelle, Converter={StaticResource Validation2TooltipConverter}, ConverterParameter={x:Static shared:ValidationType.OrganisationBezDatenannahmestelle}}"
ToolTipService.ShowOnDisabled="True" />
ToolTipService.ShowOnDisabled="True"
ToolTipService.InitialShowDelay="0"/>
<Label
Grid.Row="1"
@@ -773,7 +776,8 @@
IsEnabled="False"
Text="{Binding Path=IKDatenannahmestelle, UpdateSourceTrigger=PropertyChanged}"
ToolTip="{Binding Path=IKDatenannahmestelle, Converter={StaticResource Validation2TooltipConverter}, ConverterParameter={x:Static shared:ValidationType.OrganisationIKNumber}}"
ToolTipService.ShowOnDisabled="True" />
ToolTipService.ShowOnDisabled="True"
ToolTipService.InitialShowDelay="0"/>
<Label
Grid.Row="5"
Grid.Column="3"
@@ -788,7 +792,8 @@
IsEnabled="False"
Text="{Binding Path=IKKostentrager, UpdateSourceTrigger=PropertyChanged}"
ToolTip="{Binding Path=IKKostentrager, Converter={StaticResource Validation2TooltipConverter}, ConverterParameter={x:Static shared:ValidationType.OrganisationIKNumber}}"
ToolTipService.ShowOnDisabled="True" />
ToolTipService.ShowOnDisabled="True"
ToolTipService.InitialShowDelay="0"/>
</Grid>
</GroupBox>
<GroupBox

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

@@ -1,19 +1,23 @@
<localView:BeWoView
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid"
xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
xmlns:localView="clr-namespace:BeWo.View"
xmlns:uc="clr-namespace:BeWo.Controls;assembly=BeWo.Controls"
xmlns:dxb="http://schemas.devexpress.com/winfx/2008/xaml/bars"
xmlns:dxpg="http://schemas.devexpress.com/winfx/2008/xaml/pivotgrid"
xmlns:dxc="http://schemas.devexpress.com/winfx/2008/xaml/charts"
xmlns:dxlc="http://schemas.devexpress.com/winfx/2008/xaml/layoutcontrol"
xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup" xmlns:controls="clr-namespace:BeWo.View.Controls"
x:Class="BeWo.View.Detail.Report.FlexibleReportView"
Height="Auto" Width="Auto" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch" Focusable="True">
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:controls="clr-namespace:BeWo.View.Controls"
xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
xmlns:dxb="http://schemas.devexpress.com/winfx/2008/xaml/bars"
xmlns:dxc="http://schemas.devexpress.com/winfx/2008/xaml/charts"
xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid"
xmlns:dxlc="http://schemas.devexpress.com/winfx/2008/xaml/layoutcontrol"
xmlns:dxpg="http://schemas.devexpress.com/winfx/2008/xaml/pivotgrid"
xmlns:localView="clr-namespace:BeWo.View"
xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup"
xmlns:uc="clr-namespace:BeWo.Controls;assembly=BeWo.Controls"
Width="Auto"
Height="Auto"
HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"
Focusable="True">
<Grid>
<GroupBox Header="Pivot Tabelle" Style="{StaticResource ObjectEditGroupBox}">
<Grid>
@@ -26,7 +30,7 @@
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<!-- ############################################### Obere Zeile ###############################################-->
<!-- ############################################### Obere Zeile ############################################### -->
<Grid Grid.Row="0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
@@ -47,16 +51,61 @@
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Label Content="Startdatum:" Grid.Column="0" VerticalAlignment="Center" />
<dxe:DateEdit MaskType="DateTimeAdvancingCaret" Grid.Column="1" x:Name="datePickerStartDate" Width="120" HorizontalAlignment="Left" Margin="3,0,0,0"/>
<Label Content="Enddatum:" Grid.Column="2" VerticalAlignment="Center" />
<dxe:DateEdit MaskType="DateTimeAdvancingCaret" Grid.Column="3" x:Name="datePickerEndDate" HorizontalAlignment="Left" Width="120" Margin="3,0,0,0" />
<Button Content="Aktualisieren" Grid.Column="5" Margin="5,0,0,0" Click="buttonRefresh_Click" />
<Button Content="{markup:Translate Feldauswahl anzeigen}" Grid.Column="9" Margin="5,0,0,0" x:Name="ButtonShowOptions" Click="ButtonShowOptions_Click" />
<Button Content="{markup:Translate Bericht speichern}" Grid.Column="10" Margin="5,0,0,0" x:Name="ButtonLayoutSave" Click="ButtonLayoutSave_Click" />
<controls:PopupNonTopmost Grid.Row="0" Topmost="False" x:Name="popup_save_layout" Width="350" StaysOpen="True" Placement="MousePoint">
<Border Background="White" Padding="3" BorderThickness="1" BorderBrush="Gray">
<GroupBox x:Name="groupbox_saveLayout" Header="Bericht speichern" Style="{StaticResource ObjectEditGroupBox}">
<Label
Grid.Column="0"
VerticalAlignment="Center"
Content="Startdatum:" />
<dxe:DateEdit
x:Name="datePickerStartDate"
Grid.Column="1"
Width="120"
Margin="3,0,0,0"
HorizontalAlignment="Left"
MaskType="DateTimeAdvancingCaret" />
<Label
Grid.Column="2"
VerticalAlignment="Center"
Content="Enddatum:" />
<dxe:DateEdit
x:Name="datePickerEndDate"
Grid.Column="3"
Width="120"
Margin="3,0,0,0"
HorizontalAlignment="Left"
MaskType="DateTimeAdvancingCaret" />
<Button
Grid.Column="5"
Margin="5,0,0,0"
Click="buttonRefresh_Click"
Content="Aktualisieren" />
<Button
x:Name="ButtonShowOptions"
Grid.Column="9"
Margin="5,0,0,0"
Click="ButtonShowOptions_Click"
Content="{markup:Translate Feldauswahl anzeigen}" />
<Button
x:Name="ButtonLayoutSave"
Grid.Column="10"
Margin="5,0,0,0"
Click="ButtonLayoutSave_Click"
Content="{markup:Translate Bericht speichern}" />
<controls:PopupNonTopmost
x:Name="popup_save_layout"
Grid.Row="0"
Width="350"
Placement="MousePoint"
StaysOpen="True"
Topmost="False">
<Border
Padding="3"
Background="White"
BorderBrush="Gray"
BorderThickness="1">
<GroupBox
x:Name="groupbox_saveLayout"
Header="Bericht speichern"
Style="{StaticResource ObjectEditGroupBox}">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
@@ -72,21 +121,63 @@
</Grid.ColumnDefinitions>
<Label VerticalAlignment="Center" Content="Layoutname" />
<TextBox x:Name="textbox_layoutname" Grid.Column="1" Grid.Row="0" Grid.ColumnSpan="2" Margin="3" Height="23"/>
<CheckBox x:Name="checkbox_VisibleForAllEmployee" Grid.Column="2" Grid.Row="1" Margin="0 0 0 20" Content="Für alle Sichtbar"/>
<Button Grid.Row="4" Grid.Column="1" HorizontalAlignment="Right" VerticalAlignment="Bottom" Height="25"
Margin="3" Content="Speichern" x:Name="popupbutton_layout_speichern" Click="popupbutton_layout_speichern_Click" />
<Button Grid.Row="4" Grid.Column="2" HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Height="25"
Margin="3" Content="Abbrechen" x:Name="button_speichern_abbrechen" Click="popupbutton_speichern_abbrechen_Click" />
<TextBox
x:Name="textbox_layoutname"
Grid.Row="0"
Grid.Column="1"
Grid.ColumnSpan="2"
Height="23"
Margin="3" />
<CheckBox
x:Name="checkbox_VisibleForAllEmployee"
Grid.Row="1"
Grid.Column="2"
Margin="0,0,0,20"
Content="Für alle Sichtbar" />
<Button
x:Name="popupbutton_layout_speichern"
Grid.Row="4"
Grid.Column="1"
Height="25"
Margin="3"
HorizontalAlignment="Right"
VerticalAlignment="Bottom"
Click="popupbutton_layout_speichern_Click"
Content="Speichern" />
<Button
x:Name="button_speichern_abbrechen"
Grid.Row="4"
Grid.Column="2"
Height="25"
Margin="3"
HorizontalAlignment="Stretch"
VerticalAlignment="Bottom"
Click="popupbutton_speichern_abbrechen_Click"
Content="Abbrechen" />
</Grid>
</GroupBox>
</Border>
</controls:PopupNonTopmost>
<Button Content="{markup:Translate Bericht bearbeiten}" Grid.Column="11" Margin="5,0,0,0" x:Name="ButtonLayoutEdit" Click="ButtonLayoutEdit_Click" />
<Button Content="{markup:Translate Bericht laden}" Grid.Column="12" Margin="5,0,0,0" x:Name="ButtonLayoutLoad" Click="ButtonLayoutLoad_Click" />
<Button Content="{markup:Translate Bericht drucken}" Grid.Column="13" Margin="5,0,0,0" x:Name="ButtonLayoutPrint" Click="ButtonLayoutPrint_Click" />
<Button
x:Name="ButtonLayoutEdit"
Grid.Column="11"
Margin="5,0,0,0"
Click="ButtonLayoutEdit_Click"
Content="{markup:Translate Bericht bearbeiten}" />
<Button
x:Name="ButtonLayoutLoad"
Grid.Column="12"
Margin="5,0,0,0"
Click="ButtonLayoutLoad_Click"
Content="{markup:Translate Bericht laden}" />
<Button
x:Name="ButtonLayoutPrint"
Grid.Column="13"
Margin="5,0,0,0"
Click="ButtonLayoutPrint_Click"
Content="{markup:Translate Bericht drucken}" />
</Grid>
<!-- ############################################### Mittlere Zeile ###############################################-->
<!-- ############################################### Mittlere Zeile ############################################### -->
<Grid Grid.Row="1">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
@@ -107,11 +198,31 @@
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<!--<CheckBox Content="Reduzierte Ansicht" Margin="5,5,0,0" Grid.Column="4" x:Name="checkReduzierteAnsicht"/>-->
<CheckBox Content="Differenz Balken einblenden" Grid.Column="7" Margin="5,5,0,0" x:Name="checkBoxDataPer" Checked="CheckDataBarPerChanged" Unchecked="CheckDataBarPerChanged" Visibility="Collapsed"/>
<CheckBox Content="Prozentuale Abweichung Balken einblenden" Grid.Column="8" Margin="5,5,0,0" x:Name="checkBoxData" Checked="CheckDataBarChanged" Unchecked="CheckDataBarChanged" Visibility="Collapsed"/>
<CheckBox Content="Diagramm einblenden" Grid.Column="9" Margin="5,5,0,0" x:Name="checkBoxChart" Checked="CheckChartChanged" Unchecked="CheckChartChanged"/>
<CheckBox
x:Name="checkBoxDataPer"
Grid.Column="7"
Margin="5,5,0,0"
Checked="CheckDataBarPerChanged"
Content="Differenz Balken einblenden"
Unchecked="CheckDataBarPerChanged"
Visibility="Collapsed" />
<CheckBox
x:Name="checkBoxData"
Grid.Column="8"
Margin="5,5,0,0"
Checked="CheckDataBarChanged"
Content="Prozentuale Abweichung Balken einblenden"
Unchecked="CheckDataBarChanged"
Visibility="Collapsed" />
<CheckBox
x:Name="checkBoxChart"
Grid.Column="9"
Margin="5,5,0,0"
Checked="CheckChartChanged"
Content="Diagramm einblenden"
Unchecked="CheckChartChanged" />
</Grid>
<!-- ############################################### Untere Zeile ###############################################-->
<!-- ############################################### Untere Zeile ############################################### -->
<Grid Grid.Row="2">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
@@ -131,53 +242,258 @@
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<!--<CheckBox Content="Hilfepläne" Grid.Column="0" Margin="5,5,0,0" x:Name="checkHilepläne"/>-->
<CheckBox Content="{markup:Translate Klienten ohne Daten anzeigen}" Grid.Column="1" Margin="5,5,0,0" x:Name="checkKlienten"/>
<CheckBox Content="{markup:Translate Mitarbeiter ohne Daten anzeigen}" Grid.Column="2" Margin="5,5,0,0" x:Name="checkMitarbeiter"/>
<CheckBox
x:Name="checkKlienten"
Grid.Column="1"
Margin="5,5,0,0"
Content="{markup:Translate Klienten ohne Daten anzeigen}" />
<CheckBox
x:Name="checkMitarbeiter"
Grid.Column="2"
Margin="5,5,0,0"
Content="{markup:Translate Mitarbeiter ohne Daten anzeigen}" />
<!--<CheckBox Content="Records" Grid.Column="3" Margin="5,5,0,0" x:Name="checkRecords"/>-->
<!--<CheckBox Content="Betrag" Grid.Column="4" Margin="5,5,0,0" x:Name="checkBetrag"/>-->
<!--<CheckBox Content="Kilometer" Grid.Column="5" Margin="5,5,0,0" x:Name="checkKilometer"/>-->
<!--<CheckBox Content="Ist" Grid.Column="6" Margin="5,5,0,0" x:Name="checkIst"/>-->
<!--<CheckBox Content="Soll" Grid.Column="7" Margin="5,5,0,0" x:Name="checkSoll"/>-->
</Grid>
<!-- ############################################### PivotGridControl ###############################################-->
<!-- ############################################### PivotGridControl ############################################### -->
<Grid Grid.Row="3">
<Grid.Resources>
</Grid.Resources>
<dxlc:LayoutControl x:Name="mainLayout" AllowItemSizing="True" Padding="12" Orientation="Vertical">
<dxlc:LayoutGroup x:Name="LayoutGroupPivotGrid" dxlc:LayoutControl.AllowVerticalSizing="True" Margin="0,0,0,4">
<dxpg:PivotGridControl x:Name="myPivotGridControl" RowTreeWidth="225" Visibility="Visible" DataProcessingEngine="LegacyOptimized" Margin="0,10,0,0" dx:ThemeManager.ThemeName="Office2010Black" CustomCellDisplayText="GridControl_CustomCellDisplayText" CustomFieldValueCells="GridControl_CustomFieldValueCells"
ChartProvideDataByColumns="False" ChartSelectionOnly="True" ChartProvideColumnGrandTotals="False" ChartProvideRowGrandTotals="True" ChartDataProvideMode="UseCustomSettings" CustomValueAppearance="MyPivotGridControl_CustomValueAppearance" CustomCellAppearance="MyPivotGridControl_CustomCellAppearance"
CustomGroupInterval="MyPivotGridControl_CustomGroupInterval" CustomFieldSort="MyPivotGridControl_CustomFieldSort" CellDoubleClick="MyPivotGridControl_CellDoubleClick">
<Grid.Resources />
<dxlc:LayoutControl
x:Name="mainLayout"
Padding="12"
AllowItemSizing="True"
Orientation="Vertical">
<dxlc:LayoutGroup
x:Name="LayoutGroupPivotGrid"
Margin="0,0,0,4"
dxlc:LayoutControl.AllowVerticalSizing="True">
<dxpg:PivotGridControl
x:Name="myPivotGridControl"
Margin="0,10,0,0"
dx:ThemeManager.ThemeName="Office2010Black"
CellDoubleClick="MyPivotGridControl_CellDoubleClick"
ChartDataProvideMode="UseCustomSettings"
ChartProvideColumnGrandTotals="False"
ChartProvideDataByColumns="False"
ChartProvideRowGrandTotals="True"
ChartSelectionOnly="True"
CustomCellAppearance="MyPivotGridControl_CustomCellAppearance"
CustomCellDisplayText="GridControl_CustomCellDisplayText"
CustomFieldSort="MyPivotGridControl_CustomFieldSort"
CustomFieldValueCells="GridControl_CustomFieldValueCells"
CustomGroupInterval="MyPivotGridControl_CustomGroupInterval"
CustomValueAppearance="MyPivotGridControl_CustomValueAppearance"
DataProcessingEngine="LegacyOptimized"
RowTreeWidth="225"
Visibility="Visible">
<dxpg:PivotGridControl.ExcelFieldListState>
<dx:DefaultColumnChooserState Size="400,550" />
</dxpg:PivotGridControl.ExcelFieldListState>
<dxpg:PivotGridControl.Fields>
<dxpg:PivotGridField x:Name="FlexibleJahr" FieldName="StartDatum" Area="FilterArea" Width="100" Caption="Jahr" AllowedAreas="All" DisplayFolder="Spalten" Visible="True" GroupInterval="DateYear" />
<dxpg:PivotGridField x:Name="FlexibleMonat" FieldName="StartDatum" Area="ColumnArea" Width="80" Caption="Monat" AllowedAreas="All" DisplayFolder="Spalten" GroupInterval="DateMonth" />
<dxpg:PivotGridField x:Name="FlexibleWeek" FieldName="StartDatum" Area="FilterArea" Width="80" Caption="Woche" AllowedAreas="All" DisplayFolder="Spalten" GroupInterval="DateWeekOfYear" ValueFormat="KW {0}" />
<dxpg:PivotGridField x:Name="FlexibleDatum" FieldName="StartDatum" Area="FilterArea" Width="100" Caption="Datum" AllowedAreas="All" DisplayFolder="Spalten" Visible="True" GroupInterval="Custom" />
<dxpg:PivotGridField x:Name="FlexibleQuarter" FieldName="StartDatum" Area="FilterArea" Width="100" Caption="Quartal" AllowedAreas="All" DisplayFolder="Spalten" Visible="True" GroupInterval="DateQuarter" />
<dxpg:PivotGridField x:Name="FlexibleTag" FieldName="StartDatum" Area="FilterArea" Width="40" Caption="Tag" AllowedAreas="All" DisplayFolder="Spalten" Visible="True" GroupInterval="DateDay" />
<dxpg:PivotGridField x:Name="FlexibleTagYear" FieldName="StartDatum" Area="FilterArea" Width="40" Caption="Tag Jahr" AllowedAreas="All" DisplayFolder="Spalten" Visible="True" GroupInterval="DateDayOfYear" />
<dxpg:PivotGridField x:Name="FlexibleKlient" FieldName="CustomerString" Area="RowArea" Width="200" Caption="{markup:Translate Klient/in}" AllowedAreas="All" DisplayFolder="Zeilen" AreaIndex="2" Height="21" SortOrder="Ascending" />
<dxpg:PivotGridField x:Name="FlexibleSupportConcept" FieldName="SupportConceptString" Area="FilterArea" Width="200" Caption="Hilfeplan" AllowedAreas="All" DisplayFolder="Zeilen" Visible="True" />
<dxpg:PivotGridField x:Name="FlexibleMitarbeiter" FieldName="EmployeeString" Area="RowArea" Width="200" Caption="{markup:Translate Mitarbeiter/in}" AllowedAreas="All" DisplayFolder="Zeilen" AreaIndex="1" />
<dxpg:PivotGridField x:Name="FlexibleTeam" FieldName="Team" Area="FilterArea" Width="200" Caption="Team" AllowedAreas="All" DisplayFolder="Zeilen" Visible="True" />
<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="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="FlexibleJahr"
Width="100"
AllowedAreas="All"
Area="FilterArea"
Caption="Jahr"
DisplayFolder="Spalten"
FieldName="StartDatum"
GroupInterval="DateYear"
Visible="True" />
<dxpg:PivotGridField
x:Name="FlexibleMonat"
Width="80"
AllowedAreas="All"
Area="ColumnArea"
Caption="Monat"
DisplayFolder="Spalten"
FieldName="StartDatum"
GroupInterval="DateMonth" />
<dxpg:PivotGridField
x:Name="FlexibleWeek"
Width="80"
AllowedAreas="All"
Area="FilterArea"
Caption="Woche"
DisplayFolder="Spalten"
FieldName="StartDatum"
GroupInterval="DateWeekOfYear"
ValueFormat="KW {0}" />
<dxpg:PivotGridField
x:Name="FlexibleDatum"
Width="100"
AllowedAreas="All"
Area="FilterArea"
Caption="Datum"
DisplayFolder="Spalten"
FieldName="StartDatum"
GroupInterval="Custom"
Visible="True" />
<dxpg:PivotGridField
x:Name="FlexibleQuarter"
Width="100"
AllowedAreas="All"
Area="FilterArea"
Caption="Quartal"
DisplayFolder="Spalten"
FieldName="StartDatum"
GroupInterval="DateQuarter"
Visible="True" />
<dxpg:PivotGridField
x:Name="FlexibleTag"
Width="40"
AllowedAreas="All"
Area="FilterArea"
Caption="Tag"
DisplayFolder="Spalten"
FieldName="StartDatum"
GroupInterval="DateDay"
Visible="True" />
<dxpg:PivotGridField
x:Name="FlexibleTagYear"
Width="40"
AllowedAreas="All"
Area="FilterArea"
Caption="Tag Jahr"
DisplayFolder="Spalten"
FieldName="StartDatum"
GroupInterval="DateDayOfYear"
Visible="True" />
<dxpg:PivotGridField
x:Name="FlexibleKlient"
Width="200"
Height="21"
AllowedAreas="All"
Area="RowArea"
AreaIndex="2"
Caption="{markup:Translate Klient/in}"
DisplayFolder="Zeilen"
FieldName="CustomerString"
SortOrder="Ascending" />
<dxpg:PivotGridField
x:Name="FlexibleSupportConcept"
Width="200"
AllowedAreas="All"
Area="FilterArea"
Caption="Hilfeplan"
DisplayFolder="Zeilen"
FieldName="SupportConceptString"
Visible="True" />
<dxpg:PivotGridField
x:Name="FlexibleMitarbeiter"
Width="200"
AllowedAreas="All"
Area="RowArea"
AreaIndex="1"
Caption="{markup:Translate Mitarbeiter/in}"
DisplayFolder="Zeilen"
FieldName="EmployeeString" />
<dxpg:PivotGridField
x:Name="FlexibleTeam"
Width="200"
AllowedAreas="All"
Area="FilterArea"
Caption="Team"
DisplayFolder="Zeilen"
FieldName="Team"
Visible="True" />
<dxpg:PivotGridField
x:Name="FlexibleLeistungskategorie"
Width="200"
AllowedAreas="All"
Area="FilterArea"
Caption="Leistungskategorie"
DisplayFolder="Zeilen"
FieldName="Leistungskategorie"
Visible="True" />
<dxpg:PivotGridField
x:Name="FlexibleLeistung"
Width="200"
AllowedAreas="All"
Area="FilterArea"
Caption="Leistung"
DisplayFolder="Zeilen"
FieldName="Leistung"
Visible="True" />
<dxpg:PivotGridField
x:Name="FlexibleOrganisation"
Width="200"
AllowedAreas="All"
Area="FilterArea"
Caption="Kostenträger"
DisplayFolder="Zeilen"
FieldName="Organisation"
Visible="True" />
<dxpg:PivotGridField
x:Name="FlexibleArbeitszeitMinIst"
Width="60"
AllowedAreas="All"
Area="FilterArea"
Caption="{markup:Translate Arbeitszeit Min.}"
DisplayFolder="Daten"
FieldName="IstArbeitszeitMinuten"
Visible="True" />
<dxpg:PivotGridField
x:Name="FlexibleArbeitszeitStdIst"
Width="80"
AllowedAreas="All"
Area="FilterArea"
Caption="{markup:Translate Arbeitszeit Std.}"
DisplayFolder="Daten"
FieldName="IstArbeitszeitStunden" />
<!--<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="FlexibleBetreuungszeitMinIst"
Width="60"
AllowedAreas="All"
Area="FilterArea"
Caption="{markup:Translate Betreuungszeit Min.}"
DisplayFolder="Daten"
FieldName="IstBetreuungszeitMinuten"
Visible="True" />
<dxpg:PivotGridField
x:Name="FlexibleBetreuungszeitStdIst"
Width="80"
AllowedAreas="All"
Area="DataArea"
Caption="{markup:Translate Betreuungszeit Std.}"
DisplayFolder="Daten"
FieldName="IstBetreuungszeitStunden" />
<!--<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="FlexibleGefahreneKilometer"
Width="200"
AllowedAreas="All"
Area="FilterArea"
Caption="Gefahrene Kilometer"
DisplayFolder="Daten"
FieldName="Kilometer"
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="FlexibleRundungspotenzial"
Width="80"
AllowedAreas="All"
Area="FilterArea"
Caption="Rundungspotenzial"
DisplayFolder="Daten"
FieldName="Rundungspotenzial"
Visible="False" />
<dxpg:PivotGridField
x:Name="FlexibleAnzahl"
Width="60"
AllowedAreas="All"
Area="FilterArea"
Caption="Anzahl"
DisplayFolder="Daten"
FieldName="Anzahl"
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" />-->
@@ -187,23 +503,30 @@
</dxpg:PivotGridControl.Fields>
</dxpg:PivotGridControl>
</dxlc:LayoutGroup>
<!-- ############################################### ChartControl ###############################################-->
<!-- ############################################### ChartControl ############################################### -->
<dxlc:LayoutGroup x:Name="LayoutGroupPivotChart">
<dxc:ChartControl Name="ChartControl" DataSource="{Binding ElementName=myPivotGridControl, Path=ChartDataSource}" Visibility="Collapsed" dx:ThemeManager.ThemeName="Office2010Black">
<dxc:ChartControl
Name="ChartControl"
dx:ThemeManager.ThemeName="Office2010Black"
DataSource="{Binding ElementName=myPivotGridControl, Path=ChartDataSource}"
Visibility="Collapsed">
<dxc:ChartControl.CrosshairOptions>
<dxc:CrosshairOptions ShowArgumentLine="False"
ShowValueLabels="False" ShowValueLine="False"
ShowCrosshairLabels="True" ShowArgumentLabels="False" />
<dxc:CrosshairOptions
ShowArgumentLabels="False"
ShowArgumentLine="False"
ShowCrosshairLabels="True"
ShowValueLabels="False"
ShowValueLine="False" />
</dxc:ChartControl.CrosshairOptions>
<dxc:ChartControl.Legend>
<dxc:Legend ReverseItems="True"/>
<dxc:Legend ReverseItems="True" />
</dxc:ChartControl.Legend>
<dxc:XYDiagram2D>
<dxc:XYDiagram2D.AxisY>
<dxc:AxisY2D Visible="True"/>
<dxc:AxisY2D Visible="True" />
</dxc:XYDiagram2D.AxisY>
<dxc:XYDiagram2D.AxisX>
<dxc:AxisX2D Visible="True"/>
<dxc:AxisX2D Visible="True" />
</dxc:XYDiagram2D.AxisX>
</dxc:XYDiagram2D>
</dxc:ChartControl>

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

@@ -750,6 +750,8 @@ namespace BeWo.View.Detail.Report
public decimal DifferenzBetreuungszeitIstSollStunden => DifferenzBetreuungszeitIstSollMinuten / 60;
public int Anzahl { get; set; }
public static FlexibleReportEntry InitByFlexibleReportEntryDC(FlexibleReportEntryDC entryDC)
{
var entry = new FlexibleReportEntry()
@@ -781,6 +783,7 @@ namespace BeWo.View.Detail.Report
Notice3 = entryDC.Notice3,
Notice4 = entryDC.Notice4,
Notice5 = entryDC.Notice5,
Anzahl = 1
};
return entry;
}

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

@@ -449,7 +449,8 @@
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<TextBlock VerticalAlignment="Center" Margin="3" Grid.Row="1"
Text="{markup:Translate Bezeichnung}" Visibility="{Binding Path=ShowHilfeplanBezeichnung, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type view:SupportConceptView}}, Converter={StaticResource BoolVisibilityConverter}}"/>
@@ -490,7 +491,7 @@
Text="{Binding Path=Notice, UpdateSourceTrigger=PropertyChanged}" Grid.Row="7" Margin="3"
Height="23"
Grid.Column="1" />
<TextBlock VerticalAlignment="Center" Margin="3" Grid.Row="8"
<TextBlock VerticalAlignment="Center" Margin="3" Grid.Row="8"
Text="{markup:Translate Kostenträger Kontakt}" />
<uc:PopUpEdit NewButtonVisibility="Visible"
NewClick="popupedit_costBearerContactPersonSearch_NewClick"
@@ -502,8 +503,17 @@
PopUpClick="popupedit_costBearerContactPersonSearch_PopUpClick"
Text="{Binding Path=CostBearerContactPerson.FullName, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
Cursor="Arrow" PreviewMouseDoubleClick="Popupedit_costBearerContactPersonSearch_OnPreviewMouseDoubleClick"/>
</Grid>
<TextBlock VerticalAlignment="Center" Margin="3" Grid.Row="9" Visibility="{Binding Path=ShowDatevFields, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type view:SupportConceptView}}, Converter={StaticResource BoolVisibilityConverter}}"
Text="{markup:Translate KontoHilfeplan}"/>
<TextBox Grid.Column="1" Grid.Row="9" Margin="3" Visibility="{Binding Path=ShowDatevFields, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type view:SupportConceptView}}, Converter={StaticResource BoolVisibilityConverter}}"
Height="23"
Text="{val:ValidationBinding Path=KontoHilfeplan, UpdateSourceTrigger=PropertyChanged}"/>
<TextBlock VerticalAlignment="Center" Margin="3" Grid.Row="10" Visibility="{Binding Path=ShowDatevFields, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type view:SupportConceptView}}, Converter={StaticResource BoolVisibilityConverter}}"
Text="{markup:Translate KostenstelleHilfeplan}" />
<TextBox Grid.Column="1" Grid.Row="10" Margin="3" Visibility="{Binding Path=ShowDatevFields, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type view:SupportConceptView}}, Converter={StaticResource BoolVisibilityConverter}}"
Height="23" Text="{val:ValidationBinding Path=KostenstelleHilfeplan, UpdateSourceTrigger=PropertyChanged}"/>
</Grid>
</GroupBox>
<GroupBox Grid.Column="1" Margin="5"
Style="{DynamicResource ObjectEditGroupBox}">
@@ -801,7 +811,7 @@
Grid.Column="1"
Grid.Row="8"
Margin="3"
Text="Max. Kontakte" x:Name="lblContactCountPerInterval" Tag="Direkt"/>
Text="Max. Kontakte" x:Name="lblContactCountPerInterval" Tag="Direkt" Visibility="Collapsed"/>
<dxe:TextEdit MaskType="Numeric" Mask="########0.00" MaskUseAsDisplayFormat="True"
Grid.Row="8"
AllowNullInput="True"
@@ -809,11 +819,11 @@
EditValue="{Binding Path=ContactCountPerInterval, UpdateSourceTrigger=PropertyChanged}"
Grid.Column="2"
Margin="3"
Height="23" Tag="Direkt"/>
Height="23" Tag="Direkt" Visibility="Collapsed"/>
<TextBlock VerticalAlignment="Center"
Margin="3"
Grid.Column="2" Text="pro"
Grid.Row="8" x:Name="lblContactCountInterval" Tag="Direkt"/>
Grid.Column="3" Text="pro"
Grid.Row="8" x:Name="lblContactCountInterval" Tag="Direkt" Visibility="Collapsed"/>
<ComboBox x:Name="cboContactCountInterval"
Margin="3" Grid.Row="8"
ItemsSource="{x:Static core:EnumTranslations.SupportConceptApprovalInterval2Translations}"
@@ -821,7 +831,8 @@
SelectedValuePath="Key"
DisplayMemberPath="Value"
Height="23"
Grid.Column="4" Tag="Direkt"/>
Grid.Column="4" Tag="Direkt" Visibility="Collapsed"
/>
<Button Grid.Row="9" Grid.Column="0" Height="25"
Grid.ColumnSpan="6"
Visibility="{Binding Path=SupportConceptApprovalEmployeeRelations.AddButtonVisibility}"

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

@@ -198,6 +198,8 @@ namespace BeWo.View.Detail
public bool ShowHilfeplanBezeichnung => BeWoApp.AppSettings.ShowHilfeplanBezeichnung;
public bool ShowDatevFields => BeWoApp.AppSettings.ShowDatevFields;
public override bool IsDirty => ViewModel != null && ViewModel.IsDirty;
public override string Title => Translator.Translate("Hilfepläne");
@@ -1244,13 +1246,13 @@ namespace BeWo.View.Detail
var vm = grid.DataContext as SupportConceptApprovalPeriodVM;
if (vm != null && !SupportConceptApprovalPeriodVM.ShowContactCountFields)
{
grid.Children[grid.Children.Count - 2].Visibility = Visibility.Collapsed;
grid.Children[grid.Children.Count - 3].Visibility = Visibility.Collapsed;
grid.Children[grid.Children.Count - 4].Visibility = Visibility.Collapsed;
grid.Children[grid.Children.Count - 5].Visibility = Visibility.Collapsed;
}
//if (vm != null && !SupportConceptApprovalPeriodVM.ShowContactCountFields)
//{
// grid.Children[grid.Children.Count - 2].Visibility = Visibility.Collapsed;
// grid.Children[grid.Children.Count - 3].Visibility = Visibility.Collapsed;
// grid.Children[grid.Children.Count - 4].Visibility = Visibility.Collapsed;
// grid.Children[grid.Children.Count - 5].Visibility = Visibility.Collapsed;
//}
var gridControl = new GridControl();
@@ -1972,6 +1974,13 @@ namespace BeWo.View.Detail
{
var rating = link.Tag as RatingVM;
e.Handled = true;
if (rating.IsNew)
{
MessageBox.Show("Dieser Datensatz muss zuerst gespeichert werden, bevor Sie ihn drucken können.", "Erst speichern bitte", MessageBoxButton.OK, MessageBoxImage.Information);
return;
}
if (rating != null && rating.DataContract.RatingOid.HasValue)
{
var url = BeWoApp.SiteOfOrigin + "/ReportView.aspx"

1
BeWo/View/Detail/WohnheimView.xaml
View File

@@ -747,6 +747,7 @@
Header="{t:Translate Wohneinheit}"
IsEnabled="{Binding Path=IsNew, Converter={StaticResource BoolReverseConverter}}"
ToolTip="{Binding Path=IsNew, Converter={StaticResource IsNewToTooltip}, ConverterParameter='Sie müssen zuerst das Wohnheim speichern'}"
ToolTipService.InitialShowDelay="0"
ToolTipService.ShowOnDisabled="True"
Visibility="{Binding Path=PermissionWohneinheitTabitemView, Converter={StaticResource BoolVisibilityConverter}}">
<TabControl

64
BeWo/View/Document/DokumentViewHelper.cs
View File

@@ -22,7 +22,7 @@ namespace BeWo.View.Document
public class DokumentViewHelper
{
public static void OpenTemplateSelectionDialog(List<DokumentvorlageDC> alleVorlagen, TableID objectTid, long objectOid)
public static void OpenTemplateSelectionDialog(List<DokumentvorlageDC> alleVorlagen, TableID objectTid, long objectOid, String originalReportUri)
{
var alleVorlagenTabellen = ServiceFacade.DoOperationsServiceSync(s => s.GetVorlagentabelleDCs());
@@ -31,14 +31,25 @@ namespace BeWo.View.Document
{
var view = new SingleTemplateSelectionView();
var defaultBerichte = ServiceFacade.DoOperationsServiceSync(x => x.GetReportTemplates(String.Format("TemplateSelection?Tid={0}&Oid={1}", objectTid, objectOid)));
var templateFolderList = VMFactory.CreateFolderList(TableID.Vorlagentabelle, tabelle.VorlagentabelleOid.Value);
view.InitView(tabelle, alleVorlagen, templateFolderList, null, true, false, "");
view.InitView(tabelle, alleVorlagen, templateFolderList, null, true, false, "", defaultBerichte);
//view.InitView(tabelle, alleVorlagen, templateFolderList, null, true, false, "");
var beWoWindow = BeWoWindowBuilder.GetBeWoWindow(Translator.Translate("Vorlage auswählen"), view, 500, 500);
view.ButtonCancelClicked += () => beWoWindow.Close();
view.ButtonCreateForSelectionClicked += () =>
{
PrintTemplate(view.SelectedTemplate, objectTid, objectOid);
if (view.SelectedReportTemplate != null)
{
BeWoUtils.NavigateToReportUri(originalReportUri + "&template=" + (view.SelectedReportTemplate.ObjectOid.HasValue ? view.SelectedReportTemplate.ObjectOid.Value.ToString() : "-1"), "Druckvorschau");
}
else
{
PrintTemplate(view.SelectedTemplate, objectTid, objectOid);
}
beWoWindow.Close();
};
@@ -59,7 +70,7 @@ namespace BeWo.View.Document
//var tabelle = alleVorlagenTabellen.FirstOrDefault(v => v.VorlagentabelleObjectTid.HasValue && v.VorlagentabelleObjectTid.Value == (int)objectTid);
//if (tabelle != null)
//{
view.InitView(null, null, null, customerFolderList, false, true, fileName);
view.InitView(null, null, null, customerFolderList, false, true, fileName, null);
var beWoWindow = BeWoWindowBuilder.GetBeWoWindow(Translator.Translate("Ordner auswählen"), view, 500, 500);
view.ButtonCancelClicked += () => beWoWindow.Close();
@@ -78,6 +89,51 @@ namespace BeWo.View.Document
}
public static void CreateDefaultReportsTreeViewItems(TreeListControl treeControl, IList<ReportTemplateDC> templates, bool expandItems)
{
if (templates != null && templates.Count > 0)
{
treeControl.BeginDataUpdate();
TreeListNode rootNode = new TreeListNode();
DocumentTreeItemDC dc = new DocumentTreeItemDC()
{
DocTreeItemOid = 9999991,
Name = "Berichte",
Table = BS.Shared.TableID.ReportTemplate,
Node = rootNode
};
DocumentTreeItemVM vm = new DocumentTreeItemVM(dc);
rootNode.Content = vm;
rootNode.IsExpandButtonVisible = DefaultBoolean.True;
rootNode.IsExpanded = expandItems;
treeControl.View.Nodes.Add(rootNode);
rootNode.Image = LoadFolderImage();
foreach (var template in templates)
{
var node = new TreeListNode();
dc = new DocumentTreeItemDC()
{
DocTreeItemOid = null,
ParentOid = 9999991,
Name = template.DisplayName,
Table = BS.Shared.TableID.ReportTemplate,
ObjectOid = template.Oid,
Node = node
};
vm = new DocumentTreeItemVM(dc);
node.Content = vm;
rootNode.Nodes.Add(node);
node.IsExpandButtonVisible = DefaultBoolean.False;
node.Image = LoadDocumentImage();
}
treeControl.EndDataUpdate();
}
}
public static void CreateTemplateTreeViewItems(TreeListControl treeControl, IList<VorlagentabelleDC> vorlagentabellen, List<BeWoFolderDC> allFolder, bool expandItems)
{
treeControl.BeginDataUpdate();

4
BeWo/View/Document/DokumenteView.xaml.cs
View File

@@ -1513,7 +1513,7 @@ namespace BeWo.View.Document
RefreshSelectedList();
}
beWoWindow.Close();
//beWoWindow.Close();
};
control.ButtonCancelClicked += () =>
@@ -1549,7 +1549,7 @@ namespace BeWo.View.Document
{
var dc = savedTemplate.CommitToDataContract();
var updatedDC = ServiceFacade.DoOperationsServiceSync(s => s.InsertTemplate(dc));
savedTemplate.SetDirty(false);
return updatedDC;
}

16
BeWo/View/Document/SingleTemplateSelectionView.xaml.cs
View File

@@ -48,7 +48,9 @@ namespace BeWo.View.Document
public DokumentvorlageDC SelectedTemplate { get; set; }
public void InitView(VorlagentabelleDC vt, List<DokumentvorlageDC> alleVorlagen, List<BeWoFolderDC> allTemplateFolder, List<BeWoFolderDC> allObjectFolder, bool showTemplateTree, bool showDocumentTree, String defaultFileName)
public DocumentTreeItemDC SelectedReportTemplate { get; set; }
public void InitView(VorlagentabelleDC vt, List<DokumentvorlageDC> alleVorlagen, List<BeWoFolderDC> allTemplateFolder, List<BeWoFolderDC> allObjectFolder, bool showTemplateTree, bool showDocumentTree, String defaultFileName, IList<ReportTemplateDC> defaultReports)
{
//tableId = tid;
@@ -61,6 +63,7 @@ namespace BeWo.View.Document
if (showTemplateTree)
{
DokumentViewHelper.CreateDefaultReportsTreeViewItems(treelistcontrol_template, defaultReports, true);
DokumentViewHelper.CreateTemplateTreeViewItems(treelistcontrol_template, new List<VorlagentabelleDC>() { vt }, allTemplateFolder, true);
DokumentViewHelper.AddTemplatesToTreeView(treelistcontrol_template, alleVorlagen, true);
@@ -110,7 +113,16 @@ namespace BeWo.View.Document
{
var selected = treelistcontrol_template.SelectedItem as DocumentTreeItemVM;
if (selected == null ||selected.DataContract.Dokumentvorlage == null)
if (selected != null && selected.DataContract.Table == TableID.ReportTemplate)
{
SelectedReportTemplate = selected.DataContract;
ButtonCreateForSelectionClicked?.Invoke();
e.Handled = true;
return;
}
if (selected == null || selected.DataContract.Dokumentvorlage == null)
{
MessageBox.Show("Bitte wählen Sie eine Vorlage aus.", "BeWoPlaner", MessageBoxButton.OK, MessageBoxImage.Information);
return;

4
BeWo/View/Document/VorlageEditView.xaml
View File

@@ -72,8 +72,8 @@
</Grid>
<StackPanel Grid.ColumnSpan="3" Grid.Row="2" Orientation="Horizontal" VerticalAlignment="Center" Height="Auto" Margin="5,10,0,10" HorizontalAlignment="Right">
<Button x:Name="btnSave" Content="Übernehmen und schließen" Margin="0,0,3,0" Height="25" Click="btnSave_Click"/>
<Button x:Name="btnClose" Content="Abbrechen" Margin="0,0,3,0" Height="25" Click="btnClose_Click"/>
<Button x:Name="btnSave" Content=" Speichern " Margin="0,0,3,0" Height="25" Click="btnSave_Click"/>
<Button x:Name="btnClose" Content=" Schließen " Margin="0,0,3,0" Height="25" Click="btnClose_Click"/>
</StackPanel>
</Grid>
</localView:BeWoView>

3
BeWo/View/Document/VorlageEditView.xaml.cs
View File

@@ -230,7 +230,8 @@ namespace BeWo.View.Document
//var test = doc.ActiveSubDocument.EndPosition;
var sd = doc.ActiveSubDocument;
sd.InsertText(EditorControl.Document.CaretPosition, "[" + selection.Platzhalter + "]");
EditorControl.Focus();
//do events?
//EditorControl.Document.InsertText(EditorControl.Document.CaretPosition, "[" + selection.Platzhalter + "]");
}
}

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

@@ -161,7 +161,7 @@
<dxa:AccordionItem
Name="TabitemFalldaten"
Foreground="Black"
Header="{t:Translate Falldaten}">
Header="{t:Translate Vermittlung gemeinnütziger Arbeit}">
<dxa:AccordionItem
Name="TabitemAuftragsherkunft"
Foreground="Black"
@@ -172,6 +172,11 @@
Foreground="Black"
Header="{markup:Translate Vermittlungsgrundlage}"
Selected="Tabitem_Selected" />
<dxa:AccordionItem
Name="TabitemVerlauf"
Foreground="Black"
Header="{markup:Translate Verlauf}"
Selected="Tabitem_Selected" />
</dxa:AccordionItem>
</dxa:AccordionItem>

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

@@ -559,6 +559,10 @@ namespace BeWo.View.Master
VMFactory.CreateValueListVMAsync(ValueListEntryType.Vermittlungsgrundlage,
r => this.Dispatch(() => AddView(TabitemVermittlungsgrundlage, new ValueListView(r))));
return;
case nameof(TabitemVerlauf):
VMFactory.CreateValueListVMAsync(ValueListEntryType.VgAVerlauf,
r => this.Dispatch(() => AddView(TabitemVerlauf, new ValueListView(r))));
return;
case nameof(TabitemSozioTherapie):
CheckMandatorVM(() => AddView(TabitemSozioTherapie, new SoziotherapieSettingsView(this)));
return;

22
BeWo/View/Navigation/CustomerNavigationView.xaml.cs
View File

@@ -413,20 +413,18 @@ namespace BeWo.View.Navigation
private void Hyperlink_OnRequestNavigate(object sender, RequestNavigateEventArgs e)
{
//var alleVorlagen = ServiceFacade.DoOperationsServiceSync(s => s.Getvor());
var alleVorlagen = ServiceFacade.DoOperationsServiceSync(s => s.GetDokumentvorlagenForType(TableID.Customer));
if (alleVorlagen.Count > 0)
{
var c = (CompactCustomerDC)((Hyperlink)sender).Tag;
var alleVorlagen = ServiceFacade.DoOperationsServiceSync(s => s.GetDokumentvorlagenForType(TableID.Customer));
if (alleVorlagen.Count > 0)
{
var c = (CompactCustomerDC)((Hyperlink)sender).Tag;
DokumentViewHelper.OpenTemplateSelectionDialog(alleVorlagen, TableID.Customer, c.CustomerOid);
DokumentViewHelper.OpenTemplateSelectionDialog(alleVorlagen, TableID.Customer, c.CustomerOid, ((Hyperlink)sender).NavigateUri.ToString());
}
else
{
BeWoUtils.NavigateToReportUri(((Hyperlink)sender).NavigateUri.ToString(), "Druckvorschau");
}
else
{
BeWoUtils.NavigateToReportUri(((Hyperlink)sender).NavigateUri.ToString(), "Druckvorschau");
}
//var folderDCs = VMFactory.CreateFolderList(TableID.Vorlagentabelle, (long)vm.DocTreeItemOid);

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

@@ -524,6 +524,8 @@ namespace BeWo.View.Navigation
CostBearerContactPerson = kt.CostBearerContactPerson,
CustomerReferenceNumber = kt.CustomerReferenceNumber,
Notice = kt.Notice,
KontoHilfeplan = kt.KontoHilfeplan,
KostenstelleHilfeplan = kt.KostenstelleHilfeplan,
Status = CostBearer2SupportConceptStatus.Created,
SupportConcept = kt.SupportConcept
};

20
BeWo/ViewModel/ContractVM.cs
View File

@@ -21,6 +21,7 @@ namespace BeWo.ViewModel
public static string PropertyName_CancellationPeriod = "CancellationPeriod";
public static string PropertyName_EntryDate = "EntryDate";
public static string PropertyName_ContractEndDate = "ContractEndDate";
public static string PropertyName_GrossSalary = "GrossSalary";
public static string PropertyName_HourlyRate = "HourlyRate";
public static string PropertyName_HourlyRateCostRatePeriod = "HourlyRateCostRatePeriod";
public static string PropertyName_WeeklyFLS = "WeeklyFLS";
@@ -40,6 +41,7 @@ namespace BeWo.ViewModel
private decimal? _WeeklyFLS;
private decimal? _MonthlyFLS;
private decimal? _HourlyRate;
private decimal? _GrossSalary;
private CostRatePeriodDC _HourlyRateCostRatePeriod;
private DateTime? _EntryDate;
private DateTime? _ContractEndDate;
@@ -330,6 +332,22 @@ namespace BeWo.ViewModel
{
get { return !IsHourlyRateTextfieldVisible; }
}
public decimal? GrossSalary
{
get { return this._GrossSalary; }
set
{
if (this.AreDifferent(this._GrossSalary, value))
{
this._GrossSalary = value;
this.StoreDirtyInformation(this.AreDifferent(this.DataContract.GrossSalary, value), PropertyName_GrossSalary);
this.FirePropertyChanged(PropertyName_GrossSalary);
}
}
}
public decimal? HourlyRate
{
get { return this._HourlyRate; }
@@ -485,6 +503,7 @@ namespace BeWo.ViewModel
this._CancellationPeriod = pDataContract.CancellationPeriod;
this._ContractEndDate = pDataContract.ContractEndDate;
this._EntryDate = pDataContract.EntryDate;
this._GrossSalary = pDataContract.GrossSalary;
this._HourlyRate = pDataContract.HourlyRate;
this._HourlyRateCostRatePeriod = pDataContract.HourlyRateCostRateValue;
this._LeaveDays = pDataContract.LeaveDays;
@@ -507,6 +526,7 @@ namespace BeWo.ViewModel
pDataContract.CancellationPeriod = this._CancellationPeriod;
pDataContract.ContractEndDate = this._ContractEndDate;
pDataContract.EntryDate = this._EntryDate;
pDataContract.GrossSalary = this._GrossSalary;
pDataContract.HourlyRate = this._HourlyRate;
pDataContract.HourlyRateCostRateValue = this._HourlyRateCostRatePeriod;
pDataContract.LeaveDays = this._LeaveDays;

28
BeWo/ViewModel/CustomerVM.cs
View File

@@ -31,6 +31,7 @@ namespace BeWo.ViewModel
public static string PropertyName_CostBearers = "CostBearers";
public static string PropertyName_CustomerCareTypes = "CustomerCareTypes";
public static string PropertyName_DateOfBirth = "DateOfBirth";
public static string PropertyName_PlaceOfBirth = "PlaceOfBirth";
public static string PropertyName_AufenthaltGueltigBis = "AufenthaltGueltigBis";
public static string PropertyName_DebitorNumber = "DebitorNumber";
public static string PropertyName_CostCenter = "CostCenter";
@@ -145,7 +146,8 @@ namespace BeWo.ViewModel
private string _CostCenter;
private ObservableSortCollection<ValueListEntryDC> _CustomerCareTypes;
private DateTime? _DateOfBirth;
private string _DebitorNumber;
private string _PlaceOfBirth;
private string _DebitorNumber;
private string _Diagnosis;
private ObservableSortCollection<ValueListEntryDC> _Disabilities;
private string _EMail;
@@ -283,6 +285,7 @@ namespace BeWo.ViewModel
var possibleEintragKategorien = pValueList.Where(vle => vle.Type == ValueListEntryType.NotizenKategorieCustomer);
var possibleauftragsherkunfte = pValueList.Where(vle => vle.Type == ValueListEntryType.Auftragsherkunft);
var possiblevermittlungsgrundlage = pValueList.Where(vle => vle.Type == ValueListEntryType.Vermittlungsgrundlage);
var possibleVgaVerlaeufe = pValueList.Where(vle => vle.Type == ValueListEntryType.VgAVerlauf);
var possibleEinkommenBeginnTypen = pValueList.Where(vle => vle.Type == ValueListEntryType.EinkommenBeginnType);
var possibleEinkommenEndeTypen = pValueList.Where(vle => vle.Type == ValueListEntryType.EinkommenEndeType);
var possibleFremdHilfeTypen = pValueList.Where(vle => vle.Type == ValueListEntryType.FremdHilfeType);
@@ -312,9 +315,10 @@ namespace BeWo.ViewModel
_RegionTypen = new ObservableSortCollection<ValueListEntryDC>(possibleRegionTypen, Comparer.ValueListEntryDCComparer);
var auftragsherkunfte = new ObservableSortCollection<ValueListEntryDC>(possibleauftragsherkunfte, Comparer.ValueListEntryDCComparer);
var vermittlungsgrundlage = new ObservableSortCollection<ValueListEntryDC>(possiblevermittlungsgrundlage, Comparer.ValueListEntryDCComparer);
var vgaVerlaeufe = new ObservableSortCollection<ValueListEntryDC>(possibleVgaVerlaeufe, Comparer.ValueListEntryDCComparer);
_CustomerGemeinnutzigeArbeitListVM.InitValueListEntrys(auftragsherkunfte, vermittlungsgrundlage);
_CustomerGemeinnutzigeArbeitListVM.InitValueListEntrys(auftragsherkunfte, vermittlungsgrundlage, vgaVerlaeufe);
_MedArten = new BindingList<MedArtDC>(pPossibleMedArten);
@@ -484,6 +488,24 @@ namespace BeWo.ViewModel
}
}
}
public String PlaceOfBirth
{
get { return _PlaceOfBirth; }
set
{
if (AreDifferent(_PlaceOfBirth, value))
{
_PlaceOfBirth = value;
StoreDirtyInformation(AreDifferent(DataContract.PlaceOfBirth, value), PropertyName_PlaceOfBirth);
FirePropertyChanged(PropertyName_PlaceOfBirth);
}
}
}
public DateTime? AufenthaltGueltigBis
{
get { return _AufenthaltGueltigBis; }
@@ -2011,6 +2033,7 @@ namespace BeWo.ViewModel
{
_SubstitutionNeed = pDataContract.SubstitutionNeed;
_DateOfBirth = pDataContract.DateOfBirth;
_PlaceOfBirth = pDataContract.PlaceOfBirth;
_FirstName = pDataContract.FirstName;
_FamilyStatus = pDataContract.FamilyStatus;
_LastName = pDataContract.LastName;
@@ -2194,6 +2217,7 @@ namespace BeWo.ViewModel
protected override CustomerDC MapToDataContract(CustomerDC pDataContract, bool doCommit)
{
pDataContract.DateOfBirth = _DateOfBirth;
pDataContract.PlaceOfBirth = _PlaceOfBirth;
pDataContract.FirstName = _FirstName;
pDataContract.FamilyStatus = _FamilyStatus;
pDataContract.LastName = _LastName;

120
BeWo/ViewModel/CustomerVermittlungArbeitVM.cs
View File

@@ -1,5 +1,7 @@
using BS.Shared.Core;
using BS.Shared;
using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -10,8 +12,13 @@ namespace BeWo.ViewModel
{
public class CustomerVermittlungArbeitVM : AbstractDCMapperVM<CustomerVermittlungArbeitDC>
{
private VgaTypeEnum _VgaType;
private string _AktenzeichenGericht;
private string _EigenesAktenzeichen;
private CompactOrganisationDC _Auftraggeber;
private CompactPersonDC _AuftraggeberAnsprechpartner;
private CompactOrganisationDC _Einsatzstelle;
private CompactPersonDC _EinsatzstelleAnsprechpartner;
private DateTime? _Auftragseingang;
private ValueListEntryDC _Auftragsherkunft;
private ObservableSortCollection<ValueListEntryDC> _Auftragsherkunfte;
@@ -24,8 +31,9 @@ namespace BeWo.ViewModel
private string _Hinweis;
private DateTime? _Termin;
private CustomerVermittlungBearbeitungsstatus? _CustomerVermittlungBearbeitungsstatus;
private string _Auftragsruckgabe;
private string _Verlauf;
private DateTime? _Auftragsruckgabe;
private ObservableSortCollection<ValueListEntryDC> _Verlaeufe;
private ValueListEntryDC _Verlauf;
private decimal? _AbgeleisteteStunden;
private decimal? _ErsparteHafttage;
private decimal? _GeleisteteRatenzahlung;
@@ -47,7 +55,7 @@ namespace BeWo.ViewModel
private bool _BesonderheitMehrfacheVermittlung;
private bool _BesonderheitVermittlungAusHaft;
private bool _BesonderheitDurchBGBWAufgesucht;
public CustomerVermittlungArbeitVM()
{
@@ -58,6 +66,20 @@ namespace BeWo.ViewModel
}
public VgaTypeEnum VgaType
{
get { return _VgaType; }
set
{
if (!AreDifferent(_VgaType, value))
return;
_VgaType = value;
StoreDirtyInformation(AreDifferent(DataContract.VgaType, value), nameof(VgaType));
FirePropertyChanged(nameof(VgaType));
}
}
public string Displayname => $"AZ: {AktenzeichenGericht}";
public string AktenzeichenGericht
{
@@ -86,6 +108,79 @@ namespace BeWo.ViewModel
FirePropertyChanged(nameof(EigenesAktenzeichen));
}
}
public CompactOrganisationDC Auftraggeber
{
get
{
return this._Auftraggeber;
}
set
{
if (this.AreDifferent(this._Auftraggeber, value))
{
this._Auftraggeber = value;
this.StoreDirtyInformation(this.AreDifferent(this.DataContract.Auftraggeber, value), nameof(Auftraggeber));
this.FirePropertyChanged(nameof(Auftraggeber));
}
}
}
public CompactPersonDC AuftraggeberAnsprechpartner
{
get
{
return this._AuftraggeberAnsprechpartner;
}
set
{
if (this.AreDifferent(this._AuftraggeberAnsprechpartner, value))
{
this._AuftraggeberAnsprechpartner = value;
this.StoreDirtyInformation(this.AreDifferent(this.DataContract.AuftraggeberAnsprechpartner, value), nameof(AuftraggeberAnsprechpartner));
this.FirePropertyChanged(nameof(AuftraggeberAnsprechpartner));
}
}
}
public CompactOrganisationDC Einsatzstelle
{
get
{
return this._Einsatzstelle;
}
set
{
if (this.AreDifferent(this._Einsatzstelle, value))
{
this._Einsatzstelle = value;
this.StoreDirtyInformation(this.AreDifferent(this.DataContract.Einsatzstelle, value), nameof(Einsatzstelle));
this.FirePropertyChanged(nameof(Einsatzstelle));
}
}
}
public CompactPersonDC EinsatzstelleAnsprechpartner
{
get
{
return this._EinsatzstelleAnsprechpartner;
}
set
{
if (this.AreDifferent(this._EinsatzstelleAnsprechpartner, value))
{
this._EinsatzstelleAnsprechpartner = value;
this.StoreDirtyInformation(this.AreDifferent(this.DataContract.EinsatzstelleAnsprechpartner, value), nameof(EinsatzstelleAnsprechpartner));
this.FirePropertyChanged(nameof(EinsatzstelleAnsprechpartner));
}
}
}
public DateTime? Auftragseingang
{
get { return _Auftragseingang; }
@@ -219,7 +314,7 @@ namespace BeWo.ViewModel
FirePropertyChanged(nameof(CustomerVermittlungBearbeitungsstatus));
}
}
public string Auftragsruckgabe
public DateTime? Auftragsruckgabe
{
get { return _Auftragsruckgabe; }
set
@@ -232,7 +327,7 @@ namespace BeWo.ViewModel
FirePropertyChanged(nameof(Auftragsruckgabe));
}
}
public string Verlauf
public ValueListEntryDC Verlauf
{
get { return _Verlauf; }
set
@@ -529,6 +624,7 @@ namespace BeWo.ViewModel
protected override void InitByDataContract(CustomerVermittlungArbeitDC pDataContract)
{
_VgaType = pDataContract.VgaType;
_AktenzeichenGericht = pDataContract.AktenzeichenGericht;
_EigenesAktenzeichen = pDataContract.EigenesAktenzeichen;
_Auftragseingang = pDataContract.Auftragseingang;
@@ -564,16 +660,22 @@ namespace BeWo.ViewModel
_BesonderheitMehrfacheVermittlung = pDataContract.BesonderheitMehrfacheVermittlung;
_BesonderheitVermittlungAusHaft = pDataContract.BesonderheitVermittlungAusHaft;
_BesonderheitDurchBGBWAufgesucht = pDataContract.BesonderheitDurchBGBWAufgesucht;
_Auftraggeber = pDataContract.Auftraggeber;
_AuftraggeberAnsprechpartner = pDataContract.AuftraggeberAnsprechpartner;
_Einsatzstelle = pDataContract.Einsatzstelle;
_EinsatzstelleAnsprechpartner = pDataContract.EinsatzstelleAnsprechpartner;
}
internal void InitValueListEntrys(ObservableSortCollection<ValueListEntryDC> auftragsherkunfte, ObservableSortCollection<ValueListEntryDC> vermittlungsgrundlage)
internal void InitValueListEntrys(ObservableSortCollection<ValueListEntryDC> auftragsherkunfte, ObservableSortCollection<ValueListEntryDC> vermittlungsgrundlage, ObservableSortCollection<ValueListEntryDC> verlaeufe)
{
_Auftragsherkunfte = auftragsherkunfte;
_Vermittlungsgrundlagen = vermittlungsgrundlage;
_Verlaeufe = verlaeufe;
}
protected override CustomerVermittlungArbeitDC MapToDataContract(CustomerVermittlungArbeitDC pDataContract, bool doCommit)
{
pDataContract.VgaType = _VgaType;
pDataContract.AktenzeichenGericht = _AktenzeichenGericht;
pDataContract.EigenesAktenzeichen = _EigenesAktenzeichen;
pDataContract.Auftragseingang = _Auftragseingang;
@@ -609,6 +711,10 @@ namespace BeWo.ViewModel
pDataContract.BesonderheitMehrfacheVermittlung = _BesonderheitMehrfacheVermittlung;
pDataContract.BesonderheitVermittlungAusHaft = _BesonderheitVermittlungAusHaft;
pDataContract.BesonderheitDurchBGBWAufgesucht = _BesonderheitDurchBGBWAufgesucht;
pDataContract.Auftraggeber = _Auftraggeber;
pDataContract.AuftraggeberAnsprechpartner = _AuftraggeberAnsprechpartner;
pDataContract.Einsatzstelle = _Einsatzstelle;
pDataContract.EinsatzstelleAnsprechpartner = _EinsatzstelleAnsprechpartner;
return pDataContract;
}

113
BeWo/ViewModel/EmployeeVM.cs
View File

@@ -27,6 +27,7 @@ namespace BeWo.ViewModel
public static string PropertyName_BankName = "BankName";
public static string PropertyName_Bic = "Bic";
public static string PropertyName_CancellationPeriod = "CancellationPeriod";
public static string PropertyName_ChildCount = "ChildCount";
public static string PropertyName_Contracts = "Contracts";
public static string PropertyName_CustomerRelations = "CustomerRelations";
public static string PropertyName_DateOfBirth = "DateOfBirth";
@@ -65,6 +66,7 @@ namespace BeWo.ViewModel
public static string PropertyName_Profession = "Profession";
public static string PropertyName_Qualifications = "Qualifications";
public static string PropertyName_Street = "Street";
public static string PropertyName_TaxClass = "TaxClass";
public static string PropertyName_TaxNumber = "TaxNumber";
public static string PropertyName_Text1 = "Text1";
public static string PropertyName_Text2 = "Text2";
@@ -97,6 +99,7 @@ namespace BeWo.ViewModel
private string _BankCode;
private string _BankName;
private string _Bic;
private string _ChildCount;
private ContractListVM _Contracts;
private CustomerEmployeeRelationListVM _CustomerRelations;
private DateTime? _DateOfBirth;
@@ -127,6 +130,7 @@ namespace BeWo.ViewModel
private ObservableSortCollection<ValueListEntryDC> _Qualifications;
private Sex? _Sex;
private string _Street;
private string _TaxClass;
private string _TaxNumber;
private string _Text1;
private string _Text2;
@@ -143,6 +147,10 @@ namespace BeWo.ViewModel
private bool _Hygienebelehrung;
private String _Schutzstufe;
private String _BemerkungenSbd;
private DateTime? _AusweisGueltigVon;
private DateTime? _AusweisGueltigBis;
private string _GradDerBehinderung;
private string _AusweisBemerkung;
private ArbeitszeitListVM _ArbeitszeitListe;
private VarFieldListVM _VarFields;
private IList<UrlaubskontoDarstellungDC> _UrlaubskontoDarstellungDCs;
@@ -425,6 +433,23 @@ namespace BeWo.ViewModel
// }
//}
public string ChildCount
{
get { return _ChildCount; }
set
{
if (AreDifferent(_ChildCount, value))
{
_ChildCount = value;
StoreDirtyInformation(AreDifferent(DataContract.ChildCount, value), PropertyName_ChildCount);
FirePropertyChanged(PropertyName_ChildCount);
}
}
}
public CustomerEmployeeRelationListVM CustomerRelations
{
get { return _CustomerRelations; }
@@ -436,6 +461,65 @@ namespace BeWo.ViewModel
}
}
public DateTime? AusweisGueltigVon
{
get { return _AusweisGueltigVon; }
set
{
if (AreDifferent(_AusweisGueltigVon, value))
{
_AusweisGueltigVon = value;
StoreDirtyInformation(AreDifferent(DataContract.AusweisGueltigVon, value), nameof(AusweisGueltigVon));
FirePropertyChanged(nameof(AusweisGueltigVon));
}
}
}
public DateTime? AusweisGueltigBis
{
get { return _AusweisGueltigBis; }
set
{
if (AreDifferent(_AusweisGueltigBis, value))
{
_AusweisGueltigBis = value;
StoreDirtyInformation(AreDifferent(DataContract.AusweisGueltigBis, value), nameof(AusweisGueltigBis));
FirePropertyChanged(nameof(AusweisGueltigBis));
}
}
}
public string GradDerBehinderung
{
get { return _GradDerBehinderung; }
set
{
if (AreDifferent(_GradDerBehinderung, value))
{
_GradDerBehinderung = value;
StoreDirtyInformation(AreDifferent(DataContract.GradDerBehinderung, value), nameof(GradDerBehinderung));
FirePropertyChanged(nameof(GradDerBehinderung));
}
}
}
public string AusweisBemerkung
{
get { return _AusweisBemerkung; }
set
{
if (AreDifferent(_AusweisBemerkung, value))
{
_AusweisBemerkung = value;
StoreDirtyInformation(AreDifferent(DataContract.AusweisBemerkung, value), nameof(AusweisBemerkung));
FirePropertyChanged(nameof(AusweisBemerkung));
}
}
}
[Validation(ValidationRule = ValidationRules.NotNullOrStringEmpty)]
public DateTime? DateOfBirth
{
@@ -980,6 +1064,23 @@ namespace BeWo.ViewModel
}
}
public string TaxClass
{
get { return _TaxClass; }
set
{
if (AreDifferent(_TaxClass, value))
{
_TaxClass = value;
StoreDirtyInformation(AreDifferent(DataContract.TaxClass, value), PropertyName_TaxClass);
FirePropertyChanged(PropertyName_TaxClass);
}
}
}
public string TaxNumber
{
get { return _TaxNumber; }
@@ -1288,6 +1389,8 @@ namespace BeWo.ViewModel
_Profession = pDataContract.Profession;
_Street = pDataContract.Street;
_TaxNumber = pDataContract.TaxNumber;
_TaxClass = pDataContract.TaxClass;
_ChildCount = pDataContract.ChildCount;
_Town = pDataContract.Town;
_BankName = pDataContract.BankName;
_AccountNumber = pDataContract.AccountNumber;
@@ -1313,6 +1416,10 @@ namespace BeWo.ViewModel
_BemerkungenSbd = pDataContract.BemerkungenSbd;
_Hygienebelehrung = pDataContract.Hygienebelehrung;
_Nationalitaet = pDataContract.Nationalitaet;
_AusweisGueltigVon = pDataContract.AusweisGueltigVon;
_AusweisGueltigBis = pDataContract.AusweisGueltigBis;
_GradDerBehinderung = pDataContract.GradDerBehinderung;
_AusweisBemerkung = pDataContract.AusweisBemerkung;
if (pDataContract.Images != null && pDataContract.Images.Count > 0)
{
@@ -1402,6 +1509,8 @@ namespace BeWo.ViewModel
pDataContract.Profession = _Profession;
pDataContract.Street = _Street;
pDataContract.TaxNumber = _TaxNumber;
pDataContract.TaxClass = _TaxClass;
pDataContract.ChildCount = _ChildCount;
pDataContract.Town = _Town;
pDataContract.BankName = _BankName;
pDataContract.AccountNumber = _AccountNumber;
@@ -1426,6 +1535,10 @@ namespace BeWo.ViewModel
pDataContract.BemerkungenSbd = _BemerkungenSbd;
pDataContract.ActivationType = _IsArchived ? ActivationTypeId.Archived : ActivationTypeId.Active;
pDataContract.Nationalitaet = _Nationalitaet;
pDataContract.AusweisGueltigVon = _AusweisGueltigVon;
pDataContract.AusweisGueltigBis = _AusweisGueltigBis;
pDataContract.GradDerBehinderung = _GradDerBehinderung;
pDataContract.AusweisBemerkung = _AusweisBemerkung;
if (pDataContract.Images != null)
{

17
BeWo/ViewModel/ListViewModel/CustomerVermittlungArbeitListVM.cs
View File

@@ -13,6 +13,7 @@ namespace BeWo.ViewModel.ListViewModel
{
private ObservableSortCollection<ValueListEntryDC> _Auftragsherkunfte;
private ObservableSortCollection<ValueListEntryDC> _Vermittlungsgrundlagen;
private ObservableSortCollection<ValueListEntryDC> _Verlaeufe;
public CustomerVermittlungArbeitListVM(IEnumerable<CustomerVermittlungArbeitDC> arbeiten) : base(arbeiten)
{
@@ -50,15 +51,29 @@ namespace BeWo.ViewModel.ListViewModel
}
}
public ObservableSortCollection<ValueListEntryDC> Verlaeufe
{
get { return _Verlaeufe; }
set
{
if (!AreDifferent(Verlaeufe, value))
return;
_Vermittlungsgrundlagen = value;
FirePropertyChanged(nameof(Verlaeufe));
}
}
public bool CanAddVM()
{
return BeWoApp.HasLoggedOnUserRight(BS.Shared.UserRightType.Customer_GemeinnutzigeArbeit_Manage); ;
}
internal void InitValueListEntrys(ObservableSortCollection<ValueListEntryDC> auftragsherkunfte, ObservableSortCollection<ValueListEntryDC> vermittlungsgrundlage)
internal void InitValueListEntrys(ObservableSortCollection<ValueListEntryDC> auftragsherkunfte, ObservableSortCollection<ValueListEntryDC> vermittlungsgrundlage, ObservableSortCollection<ValueListEntryDC> verlaeufe)
{
_Auftragsherkunfte = auftragsherkunfte;
_Vermittlungsgrundlagen = vermittlungsgrundlage;
_Verlaeufe = verlaeufe;
}
}
}

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

@@ -1768,6 +1768,8 @@ namespace BeWo.ViewModel.ListViewModel
{
foreach (var goal in info.SupportConceptGoals)
{
goal.Prefix = info.CustomerName;
if (goal.ParentOid != null && goalCategoryDict.ContainsKey(goal.ParentOid.Value))
{
var path = GetAllParentGoalCategoies(goalCategoryDict, goal);

16
BeWo/ViewModel/MandatorVM.cs
View File

@@ -408,6 +408,22 @@ namespace BeWo.ViewModel
}
}
}
public int AnzTageUnterschriftErfolgt
{
get { return BeWoApp.AppSettings.AnzTageUnterschriftErfolgt; }
set
{
if (this.AreDifferent(BeWoApp.AppSettings.AnzTageUnterschriftErfolgt, value))
{
BeWoApp.AppSettings.AnzTageUnterschriftErfolgt = value;
this.Settings = UserSettingsUtils.CreateNewSettingValue(this._Settings, "AnzTageUnterschriftErfolgt", value.ToString());
}
}
}
public int ZeiterfassungsSchwellwert
{
get { return BeWoApp.AppSettings.ZeiterfassungsSchwellwert; }

4
BeWo/ViewModel/OrganisationVM.cs
View File

@@ -1129,8 +1129,12 @@ namespace BeWo.ViewModel
HausanschriftDatenannahmestelle.UpdateByDataContract(response.Hausanschrift);
FirePropertyChanged(nameof(HausanschriftDatenannahmestelle));
PostfachanschriftDatenannahmestelle.UpdateByDataContract(response.Postfachanschrift);
FirePropertyChanged(nameof(PostfachanschriftDatenannahmestelle));
GrosskundenanschriftDatenannahmestelle.UpdateByDataContract(response.Grosskundenanschrift);
FirePropertyChanged(nameof(GrosskundenanschriftDatenannahmestelle));
}
}
}

4
BeWo/ViewModel/ServiceRecordVM.cs
View File

@@ -2259,8 +2259,8 @@ namespace BeWo.ViewModel
ServiceCategoryDC firstCat = null;
if (_ServiceAccountings != null && allDict != null)
{
var globalServices = _ServiceAccountings.FindAll(sa => sa.ServiceDescription.ScopeType == ScopeTypeId.Global);
var individualServices = _ServiceAccountings.FindAll(sa => sa.ServiceDescription.ScopeType == ScopeTypeId.Individual);
var globalServices = _ServiceAccountings.FindAll(sa => sa.ServiceDescription.ScopeType == ScopeTypeId.Global && (!sa.ServiceDescription.Category.OhneHilfeplan.HasValue || sa.ServiceDescription.Category.OhneHilfeplan.Value != AccountingvisibilityType.Never));
var individualServices = _ServiceAccountings.FindAll(sa => sa.ServiceDescription.ScopeType == ScopeTypeId.Individual && (!sa.ServiceDescription.Category.OhneHilfeplan.HasValue || sa.ServiceDescription.Category.OhneHilfeplan.Value != AccountingvisibilityType.Never));
if (globalServices.Count > 0)
{

8
BeWo/ViewModel/SupportConceptApprovalPeriodVM.cs
View File

@@ -353,14 +353,6 @@ namespace BeWo.ViewModel
}
}
public static bool ShowContactCountFields
{
get
{
return BeWoApp.Mandator.BeWoClientType == 11;
}
}
public SupportConceptApprovalPeriodEmployeeRelListVM SupportConceptApprovalEmployeeRelations
{
get { return _SupportConceptApprovalEmployeeRelations; }

48
BeWo/ViewModel/SupportConceptCostBearerRelVM.cs
View File

@@ -37,6 +37,10 @@ namespace BeWo.ViewModel
public static string PropertyName_AuswahlBezeichnung = "AuswahlBezeichnung";
public static string PropertyName_KontoHilfeplan = "KontoHilfeplan";
public static string PropertyName_KostenstelleHilfeplan = "KostenstelleHilfeplan";
public static string PropertyName_HourlyRate = "HourlyRate";
public static string PropertyName_MonthlyPayment = "MonthlyPayment";
@@ -67,6 +71,10 @@ namespace BeWo.ViewModel
private string _AuswahlBezeichnung;
private string _KontoHilfeplan;
private string _KostenstelleHilfeplan;
private decimal? _MonthlyPayment;
private string _Notice;
@@ -421,6 +429,41 @@ namespace BeWo.ViewModel
}
}
public string KontoHilfeplan
{
get
{
return this._KontoHilfeplan;
}
set
{
if (this.AreDifferent(this._KontoHilfeplan, value))
{
this._KontoHilfeplan = value;
this.StoreDirtyInformation(this.AreDifferent(this.DataContract.KontoHilfeplan, value), PropertyName_KontoHilfeplan);
this.FirePropertyChanged(PropertyName_KontoHilfeplan);
}
}
}
public string KostenstelleHilfeplan
{
get
{
return this._KostenstelleHilfeplan;
}
set
{
if (this.AreDifferent(this._KostenstelleHilfeplan, value))
{
this._KostenstelleHilfeplan = value;
this.StoreDirtyInformation(this.AreDifferent(this.DataContract.KostenstelleHilfeplan, value), PropertyName_KostenstelleHilfeplan);
this.FirePropertyChanged(PropertyName_KostenstelleHilfeplan);
}
}
}
public override bool IsDirty
@@ -666,7 +709,8 @@ namespace BeWo.ViewModel
this.CostBearer = pDataContract.CostBearer;
this._CustomerReferenceNumber = pDataContract.CustomerReferenceNumber;
this._AuswahlBezeichnung = pDataContract.AuswahlBezeichnung;
this.KontoHilfeplan = pDataContract.KontoHilfeplan;
this.KostenstelleHilfeplan = pDataContract.KostenstelleHilfeplan;
// _HourlyRate = pDataContract.HourlyRate;
this._Notice = pDataContract.Notice;
this._RequestedEndDate = pDataContract.RequestedEndDate;
@@ -692,6 +736,8 @@ namespace BeWo.ViewModel
// DataContract.HourlyRate = _HourlyRate;
pDataContract.Notice = this._Notice;
pDataContract.KontoHilfeplan = this.KontoHilfeplan;
pDataContract.KostenstelleHilfeplan = this.KostenstelleHilfeplan;
// DataContract.RateFactor = _RateFactor;
pDataContract.RequestedStartDate = this._RequestedStartDate;

3
BeWo/ViewModel/VMFactory.cs
View File

@@ -721,7 +721,8 @@ namespace BeWo.ViewModel
ValueListEntryType.SozSchwierigkeitenType,
ValueListEntryType.SozBeziehungenType,
ValueListEntryType.ErstaufnahmeType,
ValueListEntryType.RegionType
ValueListEntryType.RegionType,
ValueListEntryType.VgAVerlauf
};
ServiceFacade.DoValueListServiceAsync(

19
BeWo/ownChat/ChatDokumentationsView.xaml.cs
View File

@@ -192,8 +192,13 @@ namespace BeWo.ownChat
if(vm.PrototypeVM.SortedCategories != null && vm.PrototypeVM.SortedCategories.Count > 0)
{
var cat1 = vm.PrototypeVM.SortedCategories[0];
dc.ServiceDescription = vm.PrototypeVM.Category2Services[cat1][0];
if (vm.PrototypeVM.Category2Services.ContainsKey(cat1))
{
if (vm.PrototypeVM.Category2Services[cat1].Count > 0)
{
dc.ServiceDescription = vm.PrototypeVM.Category2Services[cat1][0];
}
}
}
_ServiceRecord = new ServiceRecordVM(dc, vm.PrototypeVM.Category2Services, vm.PrototypeVM.AllGoalCategories, vm.PrototypeVM.AllGoals)
@@ -354,9 +359,15 @@ namespace BeWo.ownChat
if(vm.PrototypeVM.SortedCategories?.Any() ?? false)
{
var cat1 = vm.PrototypeVM.SortedCategories[0];
foreach (var cat in vm.PrototypeVM.SortedCategories)
{
if (vm.PrototypeVM.Category2Services.ContainsKey(cat) && vm.PrototypeVM.Category2Services[cat].Count > 0)
{
serviceRecordList[0].ServiceDescription = vm.PrototypeVM.Category2Services[cat][0];
break;
}
}
serviceRecordList[0].ServiceDescription = vm.PrototypeVM.Category2Services[cat1][0];
}
_ServiceRecord = new ServiceRecordVM(serviceRecordList[0], vm.PrototypeVM.Category2Services, vm.PrototypeVM.AllGoalCategories, vm.PrototypeVM.AllGoals) {Notice = notice};

246
BeWoAllReports.sln
View File

@@ -8,6 +8,9 @@ EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Server", "Server", "{FEB0336B-F053-40B6-92DD-7DE56AB9408A}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ReportImp", "ReportImp", "{D8A691C5-146D-4613-86CC-438F02FE9106}"
ProjectSection(SolutionItems) = preProject
ReportImp\LebenszentrumKönigsborn\LebenszentrumKoenigsborn.csproj = ReportImp\LebenszentrumKönigsborn\LebenszentrumKoenigsborn.csproj
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BeWo", "BeWo\BeWo.csproj", "{3FEBB560-9275-413A-9767-BB68C44EEBC3}"
ProjectSection(ProjectDependencies) = postProject
@@ -389,8 +392,6 @@ 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}") = "AbwDziallasMuhrin", "ReportImp\AbwDziallasMuhrin\AbwDziallasMuhrin.csproj", "{4ACCB582-3B1C-42E8-B658-9D506B8620AD}"
@@ -791,8 +792,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Alloheim", "ReportImp\Alloh
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ZuhauseWohnenIrisThimm", "ReportImp\ZuhauseWohnenIrisThimm\ZuhauseWohnenIrisThimm.csproj", "{22E7F5F8-BB34-4243-896B-221F78837F83}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PetraWagnerMatthes", "ReportImp\PetraWagnerMatthes\PetraWagnerMatthes.csproj", "{644F73A6-7EA0-456D-B7BC-22F44B851812}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SKMAachen", "ReportImp\SKMAachen\SKMAachen.csproj", "{95342759-C161-4A44-8130-9740E57FE3A1}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DieLebenslotsen", "ReportImp\DieLebenslotsen\DieLebenslotsen.csproj", "{1D72670D-FC74-4806-B6B8-847BB01718B9}"
@@ -917,6 +916,20 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DiakoniewerkGelsenkirchenWa
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LoewenzahnBetreutesWohnen", "ReportImp\LoewenzahnBetreutesWohnen\LoewenzahnBetreutesWohnen.csproj", "{6FF7C735-AA4B-4ED9-937D-E573220C05E9}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AbwIlseFretz", "ReportImp\AbwIlseFretz\AbwIlseFretz.csproj", "{F835A0CD-B417-4988-9FA2-1CA54DABCFF3}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DrobDrogenhilfe", "ReportImp\DrobDrogenhilfe\DrobDrogenhilfe.csproj", "{2F0B2249-CF36-4BEF-9DC2-B4889EC86BCB}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PariSozialGzMigranten", "ReportImp\PariSozialGzMigranten\PariSozialGzMigranten.csproj", "{75A0A8F5-AE9A-48AF-8BE0-93713CFB89EB}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LebenszentrumKoenigsborn", "ReportImp\LebenszentrumKönigsborn\LebenszentrumKoenigsborn.csproj", "{56555705-2801-45DE-8979-93A403873D6D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StefanKnauerBeWoHeinsberg", "ReportImp\StefanKnauerBeWoHeinsberg\StefanKnauerBeWoHeinsberg.csproj", "{17D0F681-AA64-42A2-9FFA-0ABCBAEEB666}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PhoenixDuerenerVerein", "ReportImp\PhoenixDuerenerVerein\PhoenixDuerenerVerein.csproj", "{25577D25-B655-45FD-983D-189A52159CF6}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AwoIntegrationsGGmbH", "ReportImp\AwoIntegrationsGGmbH\AwoIntegrationsGGmbH.csproj", "{3D0ED6C8-21D3-46E3-B581-40EEDA98DE12}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|.NET = Debug|.NET
@@ -4960,30 +4973,6 @@ 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}.DebugRemote|.NET.ActiveCfg = Debug|Any CPU
{491FE69C-49BF-4003-85CE-755DE9C99E7C}.DebugRemote|.NET.Build.0 = Debug|Any CPU
{491FE69C-49BF-4003-85CE-755DE9C99E7C}.DebugRemote|Any CPU.ActiveCfg = Debug|Any CPU
{491FE69C-49BF-4003-85CE-755DE9C99E7C}.DebugRemote|Any CPU.Build.0 = Debug|Any CPU
{491FE69C-49BF-4003-85CE-755DE9C99E7C}.DebugRemote|Mixed Platforms.ActiveCfg = Debug|Any CPU
{491FE69C-49BF-4003-85CE-755DE9C99E7C}.DebugRemote|Mixed Platforms.Build.0 = Debug|Any CPU
{491FE69C-49BF-4003-85CE-755DE9C99E7C}.DebugRemote|x86.ActiveCfg = Debug|Any CPU
{491FE69C-49BF-4003-85CE-755DE9C99E7C}.DebugRemote|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
@@ -9784,30 +9773,6 @@ Global
{22E7F5F8-BB34-4243-896B-221F78837F83}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{22E7F5F8-BB34-4243-896B-221F78837F83}.Release|x86.ActiveCfg = Release|Any CPU
{22E7F5F8-BB34-4243-896B-221F78837F83}.Release|x86.Build.0 = Release|Any CPU
{644F73A6-7EA0-456D-B7BC-22F44B851812}.Debug|.NET.ActiveCfg = Debug|Any CPU
{644F73A6-7EA0-456D-B7BC-22F44B851812}.Debug|.NET.Build.0 = Debug|Any CPU
{644F73A6-7EA0-456D-B7BC-22F44B851812}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{644F73A6-7EA0-456D-B7BC-22F44B851812}.Debug|Any CPU.Build.0 = Debug|Any CPU
{644F73A6-7EA0-456D-B7BC-22F44B851812}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{644F73A6-7EA0-456D-B7BC-22F44B851812}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{644F73A6-7EA0-456D-B7BC-22F44B851812}.Debug|x86.ActiveCfg = Debug|Any CPU
{644F73A6-7EA0-456D-B7BC-22F44B851812}.Debug|x86.Build.0 = Debug|Any CPU
{644F73A6-7EA0-456D-B7BC-22F44B851812}.DebugRemote|.NET.ActiveCfg = Debug|Any CPU
{644F73A6-7EA0-456D-B7BC-22F44B851812}.DebugRemote|.NET.Build.0 = Debug|Any CPU
{644F73A6-7EA0-456D-B7BC-22F44B851812}.DebugRemote|Any CPU.ActiveCfg = Debug|Any CPU
{644F73A6-7EA0-456D-B7BC-22F44B851812}.DebugRemote|Any CPU.Build.0 = Debug|Any CPU
{644F73A6-7EA0-456D-B7BC-22F44B851812}.DebugRemote|Mixed Platforms.ActiveCfg = Debug|Any CPU
{644F73A6-7EA0-456D-B7BC-22F44B851812}.DebugRemote|Mixed Platforms.Build.0 = Debug|Any CPU
{644F73A6-7EA0-456D-B7BC-22F44B851812}.DebugRemote|x86.ActiveCfg = Debug|Any CPU
{644F73A6-7EA0-456D-B7BC-22F44B851812}.DebugRemote|x86.Build.0 = Debug|Any CPU
{644F73A6-7EA0-456D-B7BC-22F44B851812}.Release|.NET.ActiveCfg = Release|Any CPU
{644F73A6-7EA0-456D-B7BC-22F44B851812}.Release|.NET.Build.0 = Release|Any CPU
{644F73A6-7EA0-456D-B7BC-22F44B851812}.Release|Any CPU.ActiveCfg = Release|Any CPU
{644F73A6-7EA0-456D-B7BC-22F44B851812}.Release|Any CPU.Build.0 = Release|Any CPU
{644F73A6-7EA0-456D-B7BC-22F44B851812}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{644F73A6-7EA0-456D-B7BC-22F44B851812}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{644F73A6-7EA0-456D-B7BC-22F44B851812}.Release|x86.ActiveCfg = Release|Any CPU
{644F73A6-7EA0-456D-B7BC-22F44B851812}.Release|x86.Build.0 = Release|Any CPU
{95342759-C161-4A44-8130-9740E57FE3A1}.Debug|.NET.ActiveCfg = Debug|Any CPU
{95342759-C161-4A44-8130-9740E57FE3A1}.Debug|.NET.Build.0 = Debug|Any CPU
{95342759-C161-4A44-8130-9740E57FE3A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -11296,6 +11261,174 @@ Global
{6FF7C735-AA4B-4ED9-937D-E573220C05E9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{6FF7C735-AA4B-4ED9-937D-E573220C05E9}.Release|x86.ActiveCfg = Release|Any CPU
{6FF7C735-AA4B-4ED9-937D-E573220C05E9}.Release|x86.Build.0 = Release|Any CPU
{F835A0CD-B417-4988-9FA2-1CA54DABCFF3}.Debug|.NET.ActiveCfg = Debug|Any CPU
{F835A0CD-B417-4988-9FA2-1CA54DABCFF3}.Debug|.NET.Build.0 = Debug|Any CPU
{F835A0CD-B417-4988-9FA2-1CA54DABCFF3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F835A0CD-B417-4988-9FA2-1CA54DABCFF3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F835A0CD-B417-4988-9FA2-1CA54DABCFF3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{F835A0CD-B417-4988-9FA2-1CA54DABCFF3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{F835A0CD-B417-4988-9FA2-1CA54DABCFF3}.Debug|x86.ActiveCfg = Debug|Any CPU
{F835A0CD-B417-4988-9FA2-1CA54DABCFF3}.Debug|x86.Build.0 = Debug|Any CPU
{F835A0CD-B417-4988-9FA2-1CA54DABCFF3}.DebugRemote|.NET.ActiveCfg = Debug|Any CPU
{F835A0CD-B417-4988-9FA2-1CA54DABCFF3}.DebugRemote|.NET.Build.0 = Debug|Any CPU
{F835A0CD-B417-4988-9FA2-1CA54DABCFF3}.DebugRemote|Any CPU.ActiveCfg = Debug|Any CPU
{F835A0CD-B417-4988-9FA2-1CA54DABCFF3}.DebugRemote|Any CPU.Build.0 = Debug|Any CPU
{F835A0CD-B417-4988-9FA2-1CA54DABCFF3}.DebugRemote|Mixed Platforms.ActiveCfg = Debug|Any CPU
{F835A0CD-B417-4988-9FA2-1CA54DABCFF3}.DebugRemote|Mixed Platforms.Build.0 = Debug|Any CPU
{F835A0CD-B417-4988-9FA2-1CA54DABCFF3}.DebugRemote|x86.ActiveCfg = Debug|Any CPU
{F835A0CD-B417-4988-9FA2-1CA54DABCFF3}.DebugRemote|x86.Build.0 = Debug|Any CPU
{F835A0CD-B417-4988-9FA2-1CA54DABCFF3}.Release|.NET.ActiveCfg = Release|Any CPU
{F835A0CD-B417-4988-9FA2-1CA54DABCFF3}.Release|.NET.Build.0 = Release|Any CPU
{F835A0CD-B417-4988-9FA2-1CA54DABCFF3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F835A0CD-B417-4988-9FA2-1CA54DABCFF3}.Release|Any CPU.Build.0 = Release|Any CPU
{F835A0CD-B417-4988-9FA2-1CA54DABCFF3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{F835A0CD-B417-4988-9FA2-1CA54DABCFF3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{F835A0CD-B417-4988-9FA2-1CA54DABCFF3}.Release|x86.ActiveCfg = Release|Any CPU
{F835A0CD-B417-4988-9FA2-1CA54DABCFF3}.Release|x86.Build.0 = Release|Any CPU
{2F0B2249-CF36-4BEF-9DC2-B4889EC86BCB}.Debug|.NET.ActiveCfg = Debug|Any CPU
{2F0B2249-CF36-4BEF-9DC2-B4889EC86BCB}.Debug|.NET.Build.0 = Debug|Any CPU
{2F0B2249-CF36-4BEF-9DC2-B4889EC86BCB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2F0B2249-CF36-4BEF-9DC2-B4889EC86BCB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2F0B2249-CF36-4BEF-9DC2-B4889EC86BCB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{2F0B2249-CF36-4BEF-9DC2-B4889EC86BCB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{2F0B2249-CF36-4BEF-9DC2-B4889EC86BCB}.Debug|x86.ActiveCfg = Debug|Any CPU
{2F0B2249-CF36-4BEF-9DC2-B4889EC86BCB}.Debug|x86.Build.0 = Debug|Any CPU
{2F0B2249-CF36-4BEF-9DC2-B4889EC86BCB}.DebugRemote|.NET.ActiveCfg = Debug|Any CPU
{2F0B2249-CF36-4BEF-9DC2-B4889EC86BCB}.DebugRemote|.NET.Build.0 = Debug|Any CPU
{2F0B2249-CF36-4BEF-9DC2-B4889EC86BCB}.DebugRemote|Any CPU.ActiveCfg = Debug|Any CPU
{2F0B2249-CF36-4BEF-9DC2-B4889EC86BCB}.DebugRemote|Any CPU.Build.0 = Debug|Any CPU
{2F0B2249-CF36-4BEF-9DC2-B4889EC86BCB}.DebugRemote|Mixed Platforms.ActiveCfg = Debug|Any CPU
{2F0B2249-CF36-4BEF-9DC2-B4889EC86BCB}.DebugRemote|Mixed Platforms.Build.0 = Debug|Any CPU
{2F0B2249-CF36-4BEF-9DC2-B4889EC86BCB}.DebugRemote|x86.ActiveCfg = Debug|Any CPU
{2F0B2249-CF36-4BEF-9DC2-B4889EC86BCB}.DebugRemote|x86.Build.0 = Debug|Any CPU
{2F0B2249-CF36-4BEF-9DC2-B4889EC86BCB}.Release|.NET.ActiveCfg = Release|Any CPU
{2F0B2249-CF36-4BEF-9DC2-B4889EC86BCB}.Release|.NET.Build.0 = Release|Any CPU
{2F0B2249-CF36-4BEF-9DC2-B4889EC86BCB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2F0B2249-CF36-4BEF-9DC2-B4889EC86BCB}.Release|Any CPU.Build.0 = Release|Any CPU
{2F0B2249-CF36-4BEF-9DC2-B4889EC86BCB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{2F0B2249-CF36-4BEF-9DC2-B4889EC86BCB}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{2F0B2249-CF36-4BEF-9DC2-B4889EC86BCB}.Release|x86.ActiveCfg = Release|Any CPU
{2F0B2249-CF36-4BEF-9DC2-B4889EC86BCB}.Release|x86.Build.0 = Release|Any CPU
{75A0A8F5-AE9A-48AF-8BE0-93713CFB89EB}.Debug|.NET.ActiveCfg = Debug|Any CPU
{75A0A8F5-AE9A-48AF-8BE0-93713CFB89EB}.Debug|.NET.Build.0 = Debug|Any CPU
{75A0A8F5-AE9A-48AF-8BE0-93713CFB89EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{75A0A8F5-AE9A-48AF-8BE0-93713CFB89EB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{75A0A8F5-AE9A-48AF-8BE0-93713CFB89EB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{75A0A8F5-AE9A-48AF-8BE0-93713CFB89EB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{75A0A8F5-AE9A-48AF-8BE0-93713CFB89EB}.Debug|x86.ActiveCfg = Debug|Any CPU
{75A0A8F5-AE9A-48AF-8BE0-93713CFB89EB}.Debug|x86.Build.0 = Debug|Any CPU
{75A0A8F5-AE9A-48AF-8BE0-93713CFB89EB}.DebugRemote|.NET.ActiveCfg = Debug|Any CPU
{75A0A8F5-AE9A-48AF-8BE0-93713CFB89EB}.DebugRemote|.NET.Build.0 = Debug|Any CPU
{75A0A8F5-AE9A-48AF-8BE0-93713CFB89EB}.DebugRemote|Any CPU.ActiveCfg = Debug|Any CPU
{75A0A8F5-AE9A-48AF-8BE0-93713CFB89EB}.DebugRemote|Any CPU.Build.0 = Debug|Any CPU
{75A0A8F5-AE9A-48AF-8BE0-93713CFB89EB}.DebugRemote|Mixed Platforms.ActiveCfg = Debug|Any CPU
{75A0A8F5-AE9A-48AF-8BE0-93713CFB89EB}.DebugRemote|Mixed Platforms.Build.0 = Debug|Any CPU
{75A0A8F5-AE9A-48AF-8BE0-93713CFB89EB}.DebugRemote|x86.ActiveCfg = Debug|Any CPU
{75A0A8F5-AE9A-48AF-8BE0-93713CFB89EB}.DebugRemote|x86.Build.0 = Debug|Any CPU
{75A0A8F5-AE9A-48AF-8BE0-93713CFB89EB}.Release|.NET.ActiveCfg = Release|Any CPU
{75A0A8F5-AE9A-48AF-8BE0-93713CFB89EB}.Release|.NET.Build.0 = Release|Any CPU
{75A0A8F5-AE9A-48AF-8BE0-93713CFB89EB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{75A0A8F5-AE9A-48AF-8BE0-93713CFB89EB}.Release|Any CPU.Build.0 = Release|Any CPU
{75A0A8F5-AE9A-48AF-8BE0-93713CFB89EB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{75A0A8F5-AE9A-48AF-8BE0-93713CFB89EB}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{75A0A8F5-AE9A-48AF-8BE0-93713CFB89EB}.Release|x86.ActiveCfg = Release|Any CPU
{75A0A8F5-AE9A-48AF-8BE0-93713CFB89EB}.Release|x86.Build.0 = Release|Any CPU
{56555705-2801-45DE-8979-93A403873D6D}.Debug|.NET.ActiveCfg = Debug|Any CPU
{56555705-2801-45DE-8979-93A403873D6D}.Debug|.NET.Build.0 = Debug|Any CPU
{56555705-2801-45DE-8979-93A403873D6D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{56555705-2801-45DE-8979-93A403873D6D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{56555705-2801-45DE-8979-93A403873D6D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{56555705-2801-45DE-8979-93A403873D6D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{56555705-2801-45DE-8979-93A403873D6D}.Debug|x86.ActiveCfg = Debug|Any CPU
{56555705-2801-45DE-8979-93A403873D6D}.Debug|x86.Build.0 = Debug|Any CPU
{56555705-2801-45DE-8979-93A403873D6D}.DebugRemote|.NET.ActiveCfg = Debug|Any CPU
{56555705-2801-45DE-8979-93A403873D6D}.DebugRemote|.NET.Build.0 = Debug|Any CPU
{56555705-2801-45DE-8979-93A403873D6D}.DebugRemote|Any CPU.ActiveCfg = Debug|Any CPU
{56555705-2801-45DE-8979-93A403873D6D}.DebugRemote|Any CPU.Build.0 = Debug|Any CPU
{56555705-2801-45DE-8979-93A403873D6D}.DebugRemote|Mixed Platforms.ActiveCfg = Debug|Any CPU
{56555705-2801-45DE-8979-93A403873D6D}.DebugRemote|Mixed Platforms.Build.0 = Debug|Any CPU
{56555705-2801-45DE-8979-93A403873D6D}.DebugRemote|x86.ActiveCfg = Debug|Any CPU
{56555705-2801-45DE-8979-93A403873D6D}.DebugRemote|x86.Build.0 = Debug|Any CPU
{56555705-2801-45DE-8979-93A403873D6D}.Release|.NET.ActiveCfg = Release|Any CPU
{56555705-2801-45DE-8979-93A403873D6D}.Release|.NET.Build.0 = Release|Any CPU
{56555705-2801-45DE-8979-93A403873D6D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{56555705-2801-45DE-8979-93A403873D6D}.Release|Any CPU.Build.0 = Release|Any CPU
{56555705-2801-45DE-8979-93A403873D6D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{56555705-2801-45DE-8979-93A403873D6D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{56555705-2801-45DE-8979-93A403873D6D}.Release|x86.ActiveCfg = Release|Any CPU
{56555705-2801-45DE-8979-93A403873D6D}.Release|x86.Build.0 = Release|Any CPU
{17D0F681-AA64-42A2-9FFA-0ABCBAEEB666}.Debug|.NET.ActiveCfg = Debug|Any CPU
{17D0F681-AA64-42A2-9FFA-0ABCBAEEB666}.Debug|.NET.Build.0 = Debug|Any CPU
{17D0F681-AA64-42A2-9FFA-0ABCBAEEB666}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{17D0F681-AA64-42A2-9FFA-0ABCBAEEB666}.Debug|Any CPU.Build.0 = Debug|Any CPU
{17D0F681-AA64-42A2-9FFA-0ABCBAEEB666}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{17D0F681-AA64-42A2-9FFA-0ABCBAEEB666}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{17D0F681-AA64-42A2-9FFA-0ABCBAEEB666}.Debug|x86.ActiveCfg = Debug|Any CPU
{17D0F681-AA64-42A2-9FFA-0ABCBAEEB666}.Debug|x86.Build.0 = Debug|Any CPU
{17D0F681-AA64-42A2-9FFA-0ABCBAEEB666}.DebugRemote|.NET.ActiveCfg = Debug|Any CPU
{17D0F681-AA64-42A2-9FFA-0ABCBAEEB666}.DebugRemote|.NET.Build.0 = Debug|Any CPU
{17D0F681-AA64-42A2-9FFA-0ABCBAEEB666}.DebugRemote|Any CPU.ActiveCfg = Debug|Any CPU
{17D0F681-AA64-42A2-9FFA-0ABCBAEEB666}.DebugRemote|Any CPU.Build.0 = Debug|Any CPU
{17D0F681-AA64-42A2-9FFA-0ABCBAEEB666}.DebugRemote|Mixed Platforms.ActiveCfg = Debug|Any CPU
{17D0F681-AA64-42A2-9FFA-0ABCBAEEB666}.DebugRemote|Mixed Platforms.Build.0 = Debug|Any CPU
{17D0F681-AA64-42A2-9FFA-0ABCBAEEB666}.DebugRemote|x86.ActiveCfg = Debug|Any CPU
{17D0F681-AA64-42A2-9FFA-0ABCBAEEB666}.DebugRemote|x86.Build.0 = Debug|Any CPU
{17D0F681-AA64-42A2-9FFA-0ABCBAEEB666}.Release|.NET.ActiveCfg = Release|Any CPU
{17D0F681-AA64-42A2-9FFA-0ABCBAEEB666}.Release|.NET.Build.0 = Release|Any CPU
{17D0F681-AA64-42A2-9FFA-0ABCBAEEB666}.Release|Any CPU.ActiveCfg = Release|Any CPU
{17D0F681-AA64-42A2-9FFA-0ABCBAEEB666}.Release|Any CPU.Build.0 = Release|Any CPU
{17D0F681-AA64-42A2-9FFA-0ABCBAEEB666}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{17D0F681-AA64-42A2-9FFA-0ABCBAEEB666}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{17D0F681-AA64-42A2-9FFA-0ABCBAEEB666}.Release|x86.ActiveCfg = Release|Any CPU
{17D0F681-AA64-42A2-9FFA-0ABCBAEEB666}.Release|x86.Build.0 = Release|Any CPU
{25577D25-B655-45FD-983D-189A52159CF6}.Debug|.NET.ActiveCfg = Debug|Any CPU
{25577D25-B655-45FD-983D-189A52159CF6}.Debug|.NET.Build.0 = Debug|Any CPU
{25577D25-B655-45FD-983D-189A52159CF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{25577D25-B655-45FD-983D-189A52159CF6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{25577D25-B655-45FD-983D-189A52159CF6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{25577D25-B655-45FD-983D-189A52159CF6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{25577D25-B655-45FD-983D-189A52159CF6}.Debug|x86.ActiveCfg = Debug|Any CPU
{25577D25-B655-45FD-983D-189A52159CF6}.Debug|x86.Build.0 = Debug|Any CPU
{25577D25-B655-45FD-983D-189A52159CF6}.DebugRemote|.NET.ActiveCfg = Debug|Any CPU
{25577D25-B655-45FD-983D-189A52159CF6}.DebugRemote|.NET.Build.0 = Debug|Any CPU
{25577D25-B655-45FD-983D-189A52159CF6}.DebugRemote|Any CPU.ActiveCfg = Debug|Any CPU
{25577D25-B655-45FD-983D-189A52159CF6}.DebugRemote|Any CPU.Build.0 = Debug|Any CPU
{25577D25-B655-45FD-983D-189A52159CF6}.DebugRemote|Mixed Platforms.ActiveCfg = Debug|Any CPU
{25577D25-B655-45FD-983D-189A52159CF6}.DebugRemote|Mixed Platforms.Build.0 = Debug|Any CPU
{25577D25-B655-45FD-983D-189A52159CF6}.DebugRemote|x86.ActiveCfg = Debug|Any CPU
{25577D25-B655-45FD-983D-189A52159CF6}.DebugRemote|x86.Build.0 = Debug|Any CPU
{25577D25-B655-45FD-983D-189A52159CF6}.Release|.NET.ActiveCfg = Release|Any CPU
{25577D25-B655-45FD-983D-189A52159CF6}.Release|.NET.Build.0 = Release|Any CPU
{25577D25-B655-45FD-983D-189A52159CF6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{25577D25-B655-45FD-983D-189A52159CF6}.Release|Any CPU.Build.0 = Release|Any CPU
{25577D25-B655-45FD-983D-189A52159CF6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{25577D25-B655-45FD-983D-189A52159CF6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{25577D25-B655-45FD-983D-189A52159CF6}.Release|x86.ActiveCfg = Release|Any CPU
{25577D25-B655-45FD-983D-189A52159CF6}.Release|x86.Build.0 = Release|Any CPU
{3D0ED6C8-21D3-46E3-B581-40EEDA98DE12}.Debug|.NET.ActiveCfg = Debug|Any CPU
{3D0ED6C8-21D3-46E3-B581-40EEDA98DE12}.Debug|.NET.Build.0 = Debug|Any CPU
{3D0ED6C8-21D3-46E3-B581-40EEDA98DE12}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3D0ED6C8-21D3-46E3-B581-40EEDA98DE12}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3D0ED6C8-21D3-46E3-B581-40EEDA98DE12}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{3D0ED6C8-21D3-46E3-B581-40EEDA98DE12}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{3D0ED6C8-21D3-46E3-B581-40EEDA98DE12}.Debug|x86.ActiveCfg = Debug|Any CPU
{3D0ED6C8-21D3-46E3-B581-40EEDA98DE12}.Debug|x86.Build.0 = Debug|Any CPU
{3D0ED6C8-21D3-46E3-B581-40EEDA98DE12}.DebugRemote|.NET.ActiveCfg = Debug|Any CPU
{3D0ED6C8-21D3-46E3-B581-40EEDA98DE12}.DebugRemote|.NET.Build.0 = Debug|Any CPU
{3D0ED6C8-21D3-46E3-B581-40EEDA98DE12}.DebugRemote|Any CPU.ActiveCfg = Debug|Any CPU
{3D0ED6C8-21D3-46E3-B581-40EEDA98DE12}.DebugRemote|Any CPU.Build.0 = Debug|Any CPU
{3D0ED6C8-21D3-46E3-B581-40EEDA98DE12}.DebugRemote|Mixed Platforms.ActiveCfg = Debug|Any CPU
{3D0ED6C8-21D3-46E3-B581-40EEDA98DE12}.DebugRemote|Mixed Platforms.Build.0 = Debug|Any CPU
{3D0ED6C8-21D3-46E3-B581-40EEDA98DE12}.DebugRemote|x86.ActiveCfg = Debug|Any CPU
{3D0ED6C8-21D3-46E3-B581-40EEDA98DE12}.DebugRemote|x86.Build.0 = Debug|Any CPU
{3D0ED6C8-21D3-46E3-B581-40EEDA98DE12}.Release|.NET.ActiveCfg = Release|Any CPU
{3D0ED6C8-21D3-46E3-B581-40EEDA98DE12}.Release|.NET.Build.0 = Release|Any CPU
{3D0ED6C8-21D3-46E3-B581-40EEDA98DE12}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3D0ED6C8-21D3-46E3-B581-40EEDA98DE12}.Release|Any CPU.Build.0 = Release|Any CPU
{3D0ED6C8-21D3-46E3-B581-40EEDA98DE12}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{3D0ED6C8-21D3-46E3-B581-40EEDA98DE12}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{3D0ED6C8-21D3-46E3-B581-40EEDA98DE12}.Release|x86.ActiveCfg = Release|Any CPU
{3D0ED6C8-21D3-46E3-B581-40EEDA98DE12}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -11488,7 +11621,6 @@ 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}
{4ACCB582-3B1C-42E8-B658-9D506B8620AD} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{FE14BABA-B6FD-47C8-BB38-DD4479EADA39} = {D8A691C5-146D-4613-86CC-438F02FE9106}
@@ -11689,7 +11821,6 @@ Global
{8404C9FB-662A-4676-8454-64ED3CED2014} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{D2821E8E-76BE-4865-B5B3-381457BB5D71} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{22E7F5F8-BB34-4243-896B-221F78837F83} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{644F73A6-7EA0-456D-B7BC-22F44B851812} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{95342759-C161-4A44-8130-9740E57FE3A1} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{1D72670D-FC74-4806-B6B8-847BB01718B9} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{BEAE2DED-A98E-4EF9-8390-A2432CF88E8B} = {D8A691C5-146D-4613-86CC-438F02FE9106}
@@ -11752,6 +11883,13 @@ Global
{7398111F-8F04-438A-A2A5-AF046C39E3F7} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{8EE716B0-19BE-4AC0-BC5D-47504195AD30} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{6FF7C735-AA4B-4ED9-937D-E573220C05E9} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{F835A0CD-B417-4988-9FA2-1CA54DABCFF3} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{2F0B2249-CF36-4BEF-9DC2-B4889EC86BCB} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{75A0A8F5-AE9A-48AF-8BE0-93713CFB89EB} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{56555705-2801-45DE-8979-93A403873D6D} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{17D0F681-AA64-42A2-9FFA-0ABCBAEEB666} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{25577D25-B655-45FD-983D-189A52159CF6} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{3D0ED6C8-21D3-46E3-B581-40EEDA98DE12} = {D8A691C5-146D-4613-86CC-438F02FE9106}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {FBE985BB-9F0F-4DBB-8F94-ABC37A803FF9}

11
BeWoDatabaseTerminator/BeWoDatabaseTerminator/Program.cs
View File

@@ -57,13 +57,18 @@ namespace BeWoDatabaseTerminator
private const String PUB_KEY_R11 = "BA87BC5C1B0039CBCA0ACDD46710F9013CA54EA561CB26CA52FB1501B7B928F5281EED27B324183967090C08ECE03AB03B770EBDF3E53954410C4EAE41D69974DE51DBEF7BFF58BDA8B713F6DE31D5F272C9726A0B8374959C4600641499F3B1D922D9CDA892AA1C267A3FFEEF58057B089581DB710F8EFBE33109BB09BE504D5F8F91763D5A9D9E83F2E9C466B3E106664348188065A037189A9B843297B1B2BDC4F815009D2788FBE26317966C9B27674BC4DB285E69C279F0495CE02450E1C4BCA105AC7B406D00B4C2413FA758B82FC55C9BA5BB099EF1FEEBB08539FDA80AEF45C478EB652AC2CF5F3CDEE35C4D1BF70B272BAA0B4277534F796A1D87D90203010001";
private const String PUB_KEY_R12 = "da982874adbe94fe3be01ee2e54b75ab2c127feda703327e3697ece8318fa5138d0b992e1ecd01513d4ce5286e095531aaa5225d72f42d07c24d403cdf0123b97837f51a653234e686719d04ef84085bbd021a99eba601009a73906d8fa207a0d097d3da456181353d14f9c4c05f6adc0b961ab09fe32aeabd2ad698c79b71ab3b740f3cdbb260be5a4b4e18e9db2a735c8961659efeed3ca6cb4e6fe49ef90046b3ff194d2a63b38e66c6188570c750656f3b74e548830f08585d2d239d5ea3fee8db00a1d2f4e3194df2ee7af6279ee5cd9c2da2f27f9c17adef133739d1b4c82c41d686c0e9ec21f8591b7fb93a7c9f5c019d6204c228bd0aad3cca10ec1b0203010001";
private const String PUB_KEY_R13 = "a567708dd0568164151761cdb906d4ad19908c2650379816639254dbd9cc840593ecd3ec081ba0605143487d2bc748969eb42dda9dc8273b57a19fabf0d60ed40e30ca6f9bb1d1d6a49d323e584e356f4558687117fc3ed85d82a02fb2516cb01a5db859ce3565c88ba1af1037ffe39c5dc2491734ff8c2b8b8df0bc712c930c1d05c4bac7cdaac95e7cd1c901f79c03f6fc0a5df4da7be6db764270ebf44d22da00776fd6c95f17fdda752ea5570cf6ea5cb6e073a568cfa174e275827e109fc1f5a2eb01e938b10a44ccd3c289f54935820a34b31ce988c2474e820e0a36f0474f8af1290475dacde19a5cff5e9d9895ba9a43d04aa21705010430d332b38f0203010001";
private static bool PinPublicKey(object sender, X509Certificate certificate, X509Chain chain, SslPolicyErrors sslpolicyerrors)
{
try
{
if (certificate == null || chain == null)
return false;
return false;
bool chainContainsPk = false;
@@ -77,7 +82,9 @@ namespace BeWoDatabaseTerminator
pk.Contains(PUB_KEY_E5.ToLower()) ||
pk.Contains(PUB_KEY_E6.ToLower()) ||
pk.Contains(PUB_KEY_R10.ToLower()) ||
pk.Contains(PUB_KEY_R11.ToLower()))
pk.Contains(PUB_KEY_R11.ToLower()) ||
pk.Contains(PUB_KEY_R12.ToLower()) ||
pk.Contains(PUB_KEY_R13.ToLower()))
{
chainContainsPk = true;
}

9
BeWoPlanerMobil.sln
View File

@@ -23,6 +23,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SynpraxReports", "ReportImp
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HausDuelken", "ReportImp\HausDuelken\HausDuelken.csproj", "{ED3DBD24-B774-41E5-A856-99FF78D828A8}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FeidPartnerReports", "ReportImp\FeidPartnerReports\FeidPartnerReports.csproj", "{36E7D251-2F15-4589-81C2-6BDDC67F16AE}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -84,6 +86,12 @@ Global
{ED3DBD24-B774-41E5-A856-99FF78D828A8}.DebugRemote|Any CPU.Build.0 = Debug|Any CPU
{ED3DBD24-B774-41E5-A856-99FF78D828A8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{ED3DBD24-B774-41E5-A856-99FF78D828A8}.Release|Any CPU.Build.0 = Release|Any CPU
{36E7D251-2F15-4589-81C2-6BDDC67F16AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{36E7D251-2F15-4589-81C2-6BDDC67F16AE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{36E7D251-2F15-4589-81C2-6BDDC67F16AE}.DebugRemote|Any CPU.ActiveCfg = DebugRemote|Any CPU
{36E7D251-2F15-4589-81C2-6BDDC67F16AE}.DebugRemote|Any CPU.Build.0 = DebugRemote|Any CPU
{36E7D251-2F15-4589-81C2-6BDDC67F16AE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{36E7D251-2F15-4589-81C2-6BDDC67F16AE}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -91,6 +99,7 @@ Global
GlobalSection(NestedProjects) = preSolution
{FC9F4E38-977B-4877-9E05-D04068D3C807} = {30DD24EE-2ED9-4E31-BCB5-AD995E8541BD}
{ED3DBD24-B774-41E5-A856-99FF78D828A8} = {30DD24EE-2ED9-4E31-BCB5-AD995E8541BD}
{36E7D251-2F15-4589-81C2-6BDDC67F16AE} = {30DD24EE-2ED9-4E31-BCB5-AD995E8541BD}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {75267284-7070-4045-9FC8-0FC3C56C1AD3}

15
BeWoPlanerMobil/App_Start/FilterConfig.cs
View File

@@ -7,6 +7,21 @@ namespace BeWoPlanerMobil
public static void RegisterGlobalFilters(GlobalFilterCollection filters)
{
filters.Add(new HandleErrorAttribute());
filters.Add(new BeWoExceptionFilter());
}
}
public class BeWoExceptionFilter : IExceptionFilter
{
protected static readonly log4net.ILog Log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
public void OnException(ExceptionContext filterContext)
{
var exception = filterContext.Exception;
Log.Error($"{exception.Message}: {exception.StackTrace}");
filterContext.Result = new ViewResult { ViewName = "Error" };
}
}
}

42
BeWoPlanerMobil/BeWoPlanerMobil.csproj
View File

@@ -24,7 +24,7 @@
<IISExpressUseClassicPipelineMode />
<UseGlobalApplicationHostFile />
<TargetFrameworkProfile />
<Use64BitIISExpress>false</Use64BitIISExpress>
<Use64BitIISExpress>true</Use64BitIISExpress>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
<TypeScriptToolsVersion>4.3</TypeScriptToolsVersion>
@@ -74,6 +74,7 @@
<TypeScriptSourceMap>True</TypeScriptSourceMap>
<TypeScriptMapRoot />
<TypeScriptSourceRoot />
<PlatformTarget>x64</PlatformTarget>
</PropertyGroup>
<ItemGroup>
<Reference Include="Antlr3.Runtime, Version=3.5.0.2, Culture=neutral, PublicKeyToken=eb42632606e9261f, processorArchitecture=MSIL">
@@ -184,8 +185,8 @@
<Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<HintPath>..\packages\EntityFramework.6.5.1\lib\net45\EntityFramework.SqlServer.dll</HintPath>
</Reference>
<Reference Include="log4net, Version=3.0.4.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<HintPath>..\packages\log4net.3.0.4\lib\net462\log4net.dll</HintPath>
<Reference Include="log4net, Version=3.1.0.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<HintPath>..\packages\log4net.3.1.0\lib\net462\log4net.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=4.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.4.1.0\lib\net472\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
@@ -220,9 +221,6 @@
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Data.Entity" />
<Reference Include="System.Drawing" />
<Reference Include="System.Memory, Version=4.0.4.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Memory.4.6.2\lib\net462\System.Memory.dll</HintPath>
</Reference>
<Reference Include="System.Net.Http" />
<Reference Include="System.Net.Http.Extensions, Version=2.2.29.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Extensions.dll</HintPath>
@@ -237,12 +235,14 @@
<Reference Include="System.Numerics.Vectors, Version=4.1.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Numerics.Vectors.4.6.1\lib\net462\System.Numerics.Vectors.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.1.1\lib\net462\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\Lib\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
</Reference>
<Reference Include="System.ServiceModel" />
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.6.2\lib\net462\System.Threading.Tasks.Extensions.dll</HintPath>
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\Lib\System.Threading.Tasks.Extensions.dll</HintPath>
</Reference>
<Reference Include="System.Web.ApplicationServices" />
<Reference Include="System.ComponentModel.DataAnnotations" />
@@ -305,7 +305,7 @@
<Compile Include="Controllers\AbstractBaseController.cs" />
<Compile Include="Controllers\ChatController.cs" />
<Compile Include="Controllers\CustomerController.cs" />
<Compile Include="Controllers\DebuggingToolsController.cs" />
<Compile Include="Controllers\DevToolsController.cs" />
<Compile Include="Controllers\DevExpressSchedulerController.cs" />
<Compile Include="Controllers\ExternalSignatureController.cs" />
<Compile Include="Controllers\ReportBaseController.cs" />
@@ -313,22 +313,24 @@
<Compile Include="Controllers\ReportViewerController.cs" />
<Compile Include="Controllers\SchedulerController.cs" />
<Compile Include="Models\AbstractModel.cs" />
<Compile Include="Models\MokZiel.cs" />
<Compile Include="Models\MokSupportConceptListObject.cs" />
<Compile Include="Models\MokMandator.cs" />
<Compile Include="Models\MokServiceRecord.cs" />
<Compile Include="Models\BaseSessionModel.cs" />
<Compile Include="Models\SchedulerSessionModel.cs" />
<Compile Include="Models\MainSessionModel.cs" />
<Compile Include="Models\ReportSessionModel .cs" />
<Compile Include="Models\ReportViewerSessionModel.cs" />
<Compile Include="Models\CustomerSessionModel.cs" />
<Compile Include="Models\CustomerModel.cs" />
<Compile Include="Models\DebuggingToolsModel.cs" />
<Compile Include="Models\DevToolsModel.cs" />
<Compile Include="Models\DevExpressSchedulerModel.cs" />
<Compile Include="Models\ExternalSignatureModel.cs" />
<Compile Include="Models\ISessionModel.cs" />
<Compile Include="Models\ReportModel.cs" />
<Compile Include="Models\ReportViewerModel.cs" />
<Compile Include="Models\SchedulerModel.cs" />
<Compile Include="Util\DcToMokMapper.cs" />
<Compile Include="Util\MokServiceRecord.cs" />
<Compile Include="Util\MokMandator.cs" />
<Compile Include="Util\MokSettings.cs" />
<Compile Include="Util\AppointmentListItem.cs" />
<Compile Include="Util\BeWoLoginState.cs" />
@@ -408,7 +410,6 @@
<Content Include="Content\images\bars-black.svg" />
<Content Include="Content\images\BeWoPlaner.ico" />
<Content Include="Content\images\bewoplaner_by_ownsoft_logo_mok.png" />
<Content Include="Content\images\bewoplaner_logo_big.png" />
<Content Include="Content\images\calendar-bs-orange.svg" />
<Content Include="Content\images\interval-finder-icon-v2.svg" />
<Content Include="Content\images\interval-finder-icon.svg" />
@@ -671,10 +672,11 @@
<Content Include="Views\ReportViewer\BerichteFormPartialView.cshtml" />
<Content Include="Scripts\moment.min.js.map" />
<Content Include="Scripts\moment-with-locales.min.js.map" />
<Content Include="Views\DebuggingTools\DebuggingTools.cshtml" />
<Content Include="Views\DebuggingTools\DevToolsSettingsPartial.cshtml" />
<Content Include="Views\DebuggingTools\DevToolsUserRightsPartial.cshtml" />
<Content Include="Views\DebuggingTools\DevToolsDataGenerationPartial.cshtml" />
<Content Include="Views\DevTools\DevTools.cshtml" />
<Content Include="Views\DevTools\DevToolsSettingsPartial.cshtml" />
<Content Include="Views\DevTools\DevToolsUserRightsPartial.cshtml" />
<Content Include="Views\DevTools\DevToolsDataGenerationPartial.cshtml" />
<Content Include="Views\Main\RestoreServiceRecordInputsPartial.cshtml" />
</ItemGroup>
<ItemGroup>
<Content Include="packages.config" />

2
BeWoPlanerMobil/BeWoPlanerMobil.csproj.user
View File

@@ -2,7 +2,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<UseIISExpress>false</UseIISExpress>
<Use64BitIISExpress>false</Use64BitIISExpress>
<Use64BitIISExpress>true</Use64BitIISExpress>
<IISExpressSSLPort />
<IISExpressAnonymousAuthentication />
<IISExpressWindowsAuthentication />

BIN
BeWoPlanerMobil/Content/images/bewoplaner_logo_big.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 6.7 KiB

17
BeWoPlanerMobil/Controllers/AbstractBaseController.cs
View File

@@ -8,7 +8,6 @@ using BeWo.Service.DCEntityMapper;
using BeWo.Service.ServiceContracts;
using BeWoPlanerMobil.Models;
using BeWoPlanerMobil.Service;
using BeWoPlanerMobil.Util;
using BS.Shared;
using BS.Shared.Core;
using BS.Shared.DataContracts;
@@ -67,7 +66,7 @@ namespace BeWoPlanerMobil.Controllers
}
else
{
model.SessionModel = (ISessionModel)Session[sessionkey];
model.SessionModel = (BaseSessionModel)Session[sessionkey];
}
}
}
@@ -117,6 +116,11 @@ namespace BeWoPlanerMobil.Controllers
public static int TimeoutLimit => System.Web.HttpContext.Current.Session.Timeout;
public bool IsUserLoggedIn()
{
return MobileSessionFacade.IsUserLoggedIn();
}
[Authorize]
public ActionResult UpdateApplicationSettings(string pKey, string pValue)
{
@@ -149,5 +153,14 @@ namespace BeWoPlanerMobil.Controllers
}
public abstract string SaveCollapsibleStatus(bool isOpen, string identifier);
public ActionResult Error()
{
#if DEBUG
ViewBag.ErrorMessage = "[HIER KOMMT DIE FEHLERMELDUNG HIN]";
#endif
return View("Error");
}
}
}

7
BeWoPlanerMobil/Controllers/CustomerController.cs
View File

@@ -120,7 +120,7 @@ namespace BeWoPlanerMobil.Controllers
Model.ReportTypes = new List<CustomerReportType> { CustomerReportType.Medikamentenliste, CustomerReportType.Bedarfsmedikation, CustomerReportType.Historie };
}
Model.AllAbsenceReasons = Model.HasRightToViewCustomerAbsenceTimes ? CustomerService.GetAllAbsenceReasons() : new List<AbsenceReasonDC>();
Model.AllAbsenceReasons = Model.HasRightToViewCustomerAbsenceTimes ? CustomerService.GetAllAbsenceReasons().Where(a => !a.Sichtbarkeit.HasValue || a.Sichtbarkeit.Value == AbsenceReasonVisibilityType.All || a.Sichtbarkeit.Value == AbsenceReasonVisibilityType.Customer).ToList() : new List<AbsenceReasonDC>();
@@ -983,8 +983,9 @@ namespace BeWoPlanerMobil.Controllers
var zahlung = kassenbuch?.Bargeldtransaktionen.FirstOrDefault(bargeldtransaktion => bargeldtransaktion.BargeldtransaktionOid.Equals(transaktionsOid));
Model.SelectedBargeldtransaktion = zahlung;
Model.SelectedBargeldtransaktionOid = zahlung?.BargeldtransaktionOid;
if(zahlung != null)
if (zahlung != null)
{
Model.SelectedTransaktionsart = (int) zahlung.Zahlungstyp;
}
@@ -1018,6 +1019,7 @@ namespace BeWoPlanerMobil.Controllers
}
Model.SelectedBargeldtransaktion = null;
Model.SelectedBargeldtransaktionOid = null;
Model.SelectedTransaktionsart = 0;
Model.SelectedBargeldkasseOid = bargeldkassenOid;
@@ -1088,6 +1090,7 @@ namespace BeWoPlanerMobil.Controllers
OperationsService.UpdateBargeldkasse(bargeldkasse);
Model.SelectedBargeldkasseOid = null;
Model.SelectedBargeldtransaktionOid = null;
ReloadBargeldkassen();

26
BeWoPlanerMobil/Controllers/DevExpressSchedulerController.cs
View File

@@ -16,27 +16,19 @@ namespace BeWoPlanerMobil.Controllers
{
get
{
if (!MobileSessionFacade.IsUserLoggedIn())
if(false == MobileSessionFacade.IsUserLoggedIn())
{
Logout();
return null;
}
if (_Model == null)
if(_Model != null)
{
_Model = new DevExpressSchedulerModel();
InitModel(_Model);
return _Model;
}
//if (((DevExpressSchedulerModel)Session["DevExpressSchedulerModel"])?.LoggedInEmployee is null)
//{
// _Model = new DevExpressSchedulerModel();
// InitModel(_Model);
// Session["DevExpressSchedulerModel"] = _Model;
//}
//else
//{
// _Model = (DevExpressSchedulerModel)Session["DevExpressSchedulerModel"];
//}
_Model = new DevExpressSchedulerModel();
InitModel(_Model);
return _Model;
}
@@ -45,14 +37,14 @@ namespace BeWoPlanerMobil.Controllers
[Authorize]
public ActionResult DevExpressScheduler()
{
if (!MobileSessionFacade.IsUserLoggedIn() || Model == null)
if(!MobileSessionFacade.IsUserLoggedIn() || Model is null)
{
return RedirectToActionPermanent("Index", "Login");
}
var appointments = KalenderService.LoadFilteredAppointments(
true,
Model?.LoggedInEmployee?.EmployeeOid ?? 1,
Model.LoggedInEmployee?.EmployeeOid ?? 1,
DateTime.Today.AddDays(-60),
DateTime.Today.AddDays(60),
new List<long>(),
@@ -66,6 +58,8 @@ namespace BeWoPlanerMobil.Controllers
Model.Appointments = appointments;
Model.Resources = new List<object>();
return View(Model);
}

23
BeWoPlanerMobil/Controllers/DebuggingToolsController.cs → BeWoPlanerMobil/Controllers/DevToolsController.cs
View File

@@ -1,13 +1,15 @@
using System.Web.Mvc;
using BeWoPlanerMobil.Models;
using BeWoPlanerMobil.Service;
using Bogus;
using BS.Shared.DataContracts;
namespace BeWoPlanerMobil.Controllers
{
public class DebuggingToolsController : AbstractBaseController
public class DevToolsController : AbstractBaseController
{
private DebuggingToolsModel _Model;
public DebuggingToolsModel Model
private DevToolsModel _Model;
public DevToolsModel Model
{
get
{
@@ -19,7 +21,7 @@ namespace BeWoPlanerMobil.Controllers
if(_Model is null)
{
_Model = new DebuggingToolsModel();
_Model = new DevToolsModel();
InitModel(_Model);
}
@@ -28,7 +30,7 @@ namespace BeWoPlanerMobil.Controllers
}
[Authorize]
public ActionResult DebuggingTools()
public ActionResult DevTools()
{
if(!MobileSessionFacade.IsUserLoggedIn() || Model is null)
{
@@ -65,5 +67,16 @@ namespace BeWoPlanerMobil.Controllers
return LeerzeichenFuerGetMethoden;
}
private Faker<AddressDC> _AddressFaker = new Faker<AddressDC>("de");
[Authorize]
[HttpPost]
public ActionResult GenerateDemoData()
{
return PartialView("DevToolsDataGenerationPartial", Model);
}
}
}

1547
BeWoPlanerMobil/Controllers/MainController.cs
View File

File diff suppressed because it is too large Load Diff

25
BeWoPlanerMobil/Controllers/ReportViewerController.cs
View File

@@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Web.Mvc;
using BeWo.Data.Entities;
using BeWo.Report;
using BeWo.Service.Plugins;
using BeWo.View.Navigation.Filter;
@@ -173,10 +174,7 @@ namespace BeWoPlanerMobil.Controllers
Model.AllTeamsForQueries = EmployeeService.GetAllActiveCompactTeamsForEmployee(null);
Model.AllServiceCategoriesForQueries = OperationsService.GetAllServiceCategories();
}
#endif
if (Model.HasRightToViewMitarbeiterstundenkonto)
@@ -187,8 +185,6 @@ namespace BeWoPlanerMobil.Controllers
Value = "1"
});
}
#if !DEBUG
Model.SelectedReportType = ReportType.Mitarbeiterstundenkonto;
#endif
@@ -585,6 +581,11 @@ namespace BeWoPlanerMobil.Controllers
[Authorize]
public ActionResult SelectQueryParameter(long? objectOid, int parameterType, long? parameterOid, string textValue)
{
if(Model?.SelectedQueryOid.HasValue ?? false)
{
Model.SelectedQuery = Model.Queries.FirstOrDefault(q => q.Oid.Equals(Model.SelectedQueryOid.Value));
}
if(Model?.SelectedQuery is null)
{
TempData[TempDataConstants.DoLogoutKey] = true;
@@ -657,7 +658,7 @@ namespace BeWoPlanerMobil.Controllers
Model.SelectedValues.Remove(parameterOid.Value);
}
break;
break;
case QueryParameterType.DateRange:
if(textValue != null && textValue.Length == 21 &&textValue.Contains("_"))
{
@@ -672,7 +673,7 @@ namespace BeWoPlanerMobil.Controllers
{
Model.SelectedValues.Remove(parameterOid.Value);
}
break;
break;
case QueryParameterType.Month:
if(!textValue.Contains("_"))
{
@@ -688,7 +689,7 @@ namespace BeWoPlanerMobil.Controllers
Model.SelectedValues.AddOrUpdate(parameterOid.Value, new SelectedValue(queryParameterType, new DateTime(year, month, 1)));
}
break;
break;
case QueryParameterType.ServiceCategory:
if(objectOid is null || objectOid.Value.Equals(0))
{
@@ -702,7 +703,7 @@ namespace BeWoPlanerMobil.Controllers
{
Model.SelectedValues.AddOrUpdate(parameterOid.Value, new SelectedValue(queryParameterType, selectedServiceCategory));
}
break;
break;
case QueryParameterType.SupportConcept:
var costBearer2SupportConceptRelListObj = Model.CostBearer2SupportConceptRelListObjects.FirstOrDefault(costBearer2SupportConceptRelListObject => costBearer2SupportConceptRelListObject.CostBearer2SupportConceptOid.Equals(objectOid.ToString()));
@@ -718,7 +719,7 @@ namespace BeWoPlanerMobil.Controllers
{
Model.SelectedValues.AddOrUpdate(parameterOid.Value, new SelectedValue(queryParameterType, costBearer2SupportConceptRelListObj));
}
break;
break;
case QueryParameterType.Team:
if(objectOid is null || objectOid.Value.Equals(0))
{
@@ -732,7 +733,7 @@ namespace BeWoPlanerMobil.Controllers
{
Model.SelectedValues.AddOrUpdate(parameterOid.Value, new SelectedValue(queryParameterType, selectedTeam));
}
break;
break;
case QueryParameterType.ValueListEntryType:
if(objectOid is null || objectOid.Value.Equals(0))
{
@@ -746,7 +747,7 @@ namespace BeWoPlanerMobil.Controllers
{
Model.SelectedValues.AddOrUpdate(parameterOid.Value, new SelectedValue(queryParameterType, selectedValueListEntry));
}
break;
break;
case QueryParameterType.Year:
break;
}

6
BeWoPlanerMobil/Controllers/SchedulerController.cs
View File

@@ -527,7 +527,7 @@ namespace BeWoPlanerMobil.Controllers
var rawSchedulerDate = formCollection[FormCollectionConstants.AppointmentSchedulerDateKey];
var schedulerDate = DateTime.ParseExact(rawSchedulerDate, "dd.MM.yyyy", null);
var schedulerDate = DateTime.ParseExact(rawSchedulerDate, "yyyy-MM-dd", null);
Model.SelectedDate = schedulerDate;
@@ -731,9 +731,9 @@ namespace BeWoPlanerMobil.Controllers
var durationString = formCollection["Duration"];
var intervalStartDateString = formCollection["IntervalStart"].Substring(0, 10);
var intervalStartTimeString = formCollection["IntervalStartTime"];
var intervalStartTimeString = formCollection["IntervalStart"].Substring(11, 5);
var intervalEndDateString = formCollection["IntervalEnd"].Substring(0, 10);
var intervalEndTimeString = formCollection["IntervalEndTime"];
var intervalEndTimeString = formCollection["IntervalEnd"].Substring(11, 5);
if(int.TryParse(durationString, out var intervalDuration) && DateTime.TryParse($"{intervalStartDateString} {intervalStartTimeString}", out var intervalStart) && DateTime.TryParse($"{intervalEndDateString} {intervalEndTimeString}", out var intervalEnd) && Model.LoggedInEmployee.EmployeeOid.HasValue)
{

4
BeWoPlanerMobil/Models/AbstractModel.cs
View File

@@ -27,7 +27,7 @@ namespace BeWoPlanerMobil.Models
public bool HasRightToViewEmployeeAppointments => CheckRight(UserRightType.KalenderMitarbeitertermineAnsehen) || CheckRight(UserRightType.ViewAll);
public bool HasRightToViewAllResourceAppointments => CheckRight(UserRightType.KalenderRessourcentermineAnsehen) || CheckRight(UserRightType.ViewAll);
public ISessionModel SessionModel { get; internal set; }
public BaseSessionModel SessionModel { get; internal set; }
public UserDC LoggedInUser { get; set; }
@@ -252,7 +252,7 @@ namespace BeWoPlanerMobil.Models
public List<CompactCustomerDC> Customers { get; set; } = new List<CompactCustomerDC>();
public Dictionary<string, bool> Collapsibles2IsShown { get; set; } = new Dictionary<string, bool>();
public Dictionary<string, bool> Collapsibles2IsShown { get { return SessionModel.Collapsibles2IsShown; } set {SessionModel.Collapsibles2IsShown = value;} }
public bool ShowDifferentQBInterval
{

27
BeWoPlanerMobil/Models/BaseSessionModel.cs Normal file
View File

@@ -0,0 +1,27 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.Web.Mvc;
using BeWo.View.Navigation.Filter;
using BeWoPlanerMobil.Controllers;
using BeWoPlanerMobil.Service;
using BeWoPlanerMobil.Util;
using BS.Shared;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact;
using DevExpress.XtraReports.UI;
namespace BeWoPlanerMobil.Models
{
[Serializable]
public abstract class BaseSessionModel
{
public Dictionary<string, bool> Collapsibles2IsShown { get; set; } = new Dictionary<string, bool>();
public virtual void ResetValues()
{
Collapsibles2IsShown = new Dictionary<string, bool>();
}
}
}

6
BeWoPlanerMobil/Models/CustomerSessionModel.cs
View File

@@ -15,7 +15,7 @@ using DevExpress.XtraReports.UI;
namespace BeWoPlanerMobil.Models
{
[Serializable]
public class CustomerSessionModel : ISessionModel
public class CustomerSessionModel : BaseSessionModel
{
public long? SelectedCustomerOid { get; set; }
@@ -35,8 +35,10 @@ namespace BeWoPlanerMobil.Models
public int SelectedTransaktionsart { get; set; }
public void ResetValues()
public override void ResetValues()
{
base.ResetValues();
SelectedCustomerOid = null;
//SelectedCustomerFilter = CustomerFilterEnum.All;
//SelectedReportType = CustomerReportType.Medikamentenliste;

1
BeWoPlanerMobil/Models/DevExpressSchedulerModel.cs
View File

@@ -7,6 +7,7 @@ namespace BeWoPlanerMobil.Models
{
public IEnumerable Appointments { get; set; }
public IEnumerable Resources { get; set; }
public string Type { get; set; }
}
public class CustomAppointmentTemplateContainer : AppointmentFormTemplateContainer

2
BeWoPlanerMobil/Models/DebuggingToolsModel.cs → BeWoPlanerMobil/Models/DevToolsModel.cs
View File

@@ -6,7 +6,7 @@ using BS.Shared.Extensions;
namespace BeWoPlanerMobil.Models
{
public class DebuggingToolsModel : AbstractModel
public class DevToolsModel : AbstractModel
{
// Rechtegruppen
// Benutzer

9
BeWoPlanerMobil/Models/ISessionModel.cs
View File

@@ -1,9 +0,0 @@
using BeWoPlanerMobil.Service;
namespace BeWoPlanerMobil.Models
{
public interface ISessionModel
{
void ResetValues();
}
}

296
BeWoPlanerMobil/Models/MainModel.cs
View File

@@ -69,7 +69,11 @@ namespace BeWoPlanerMobil.Models
MainSessionModel.TransferringAppointmentOid = value;
}
}
public bool IsInTransferMode { get; set; }
public bool IsInTransferMode
{
get => MainSessionModel.IsInTransferMode;
set => MainSessionModel.IsInTransferMode = value;
}
public List<SelectListItem> SupportConceptFilter
{
@@ -247,9 +251,12 @@ namespace BeWoPlanerMobil.Models
set => MainSessionModel.SelectedSupportConceptOid = value;
}
public SupportConceptDC SelectedSupportConcept { get; set; }
public int Zeitraum { get; set; }
public CompactSupportConceptDC SelectedSupportConcept { get; set; }
public MokSupportConceptListObject SelectedSupportConceptListObject { get; set; }
public int Zeitraum { get; set; }
public int ErrorWert { get; set; }
@@ -261,7 +268,13 @@ namespace BeWoPlanerMobil.Models
set => MainSessionModel.LastCreatedServiceRecordOid = value;
}
public List<SupportConceptDC> SupportConcepts { get; set; }
public List<long> SupportConceptOids
{
get => MainSessionModel.SupportConceptOids;
set => MainSessionModel.SupportConceptOids = value;
}
public List<CompactSupportConceptDC> SupportConcepts { get; set; }
public List<TextModuleDC> Textbausteine { get; set; } = new List<TextModuleDC>();
@@ -290,13 +303,11 @@ namespace BeWoPlanerMobil.Models
set => MainSessionModel.SelectedGoalOids = value;
}
private List<ValueListEntryDC> _SelectedGoals;
public List<ValueListEntryDC> SelectedGoals
public IList<MokZiel> SelectedGoals
{
get => _SelectedGoals ?? new List<ValueListEntryDC>();
set => _SelectedGoals = value;
get => MainSessionModel.SelectedGoals;
set => MainSessionModel.SelectedGoals = value;
}
private string GetRatingName(ValueListEntryDC ratedValueListEntry)
@@ -310,60 +321,17 @@ namespace BeWoPlanerMobil.Models
public long? ServiceRecordOidToDelete { get; set; }
public IEnumerable<CostBearer2SupportConceptRelListObject> SupportConceptListObjects
public IList<MokSupportConceptListObject> SupportConceptListObjects
{
get
{
var allCostBearerRelations = new List<CostBearer2SupportConceptRelListObject> {new CostBearer2SupportConceptRelListObject("Hilfeplan auswählen", "", -1, false, false), new CostBearer2SupportConceptRelListObject("Ohne Hilfeplan", "", -2, false, false) };
BS.Shared.Settings.ApplicationSettings.SupportConceptExpirationLimitInMonths = MokSettings.SupportConceptExpirationLimitInMonths;
foreach (var sc in SupportConcepts.OrderBy(sc => sc.Customer.LastName))
{
allCostBearerRelations.AddRange(sc.CostBearerRelations.Where(w => ShowExpiredSupportConcepts || w.EndDate is null || w.EndDate.Value >= DateTime.Now.Date).Select(
cb => new CostBearer2SupportConceptRelListObject(
$"{sc.Customer.SimpleDescription} {(sc.Customer.DateOfBirth.HasValue ? "*" + sc.Customer.DateOfBirth.Value.ToString("dd.MM.yyyy") : string.Empty)}",
$"{cb.AuswahlBezeichnung} {cb.StartDate?.ToShortDateString().Remove(6, 2) ?? string.Empty}-{cb.EndDate?.ToShortDateString().Remove(6, 2) ?? string.Empty} {cb.CostBearer.Name}{GetIsNotApproved(cb)}",
cb.CostBearer2SupportConceptOid.Value,
cb.SupportConcept.IsAboutToExpire,
cb.SupportConcept.ExpiresIn3MonthOrLess))
);
}
return allCostBearerRelations;
}
get => MainSessionModel.SupportConceptListObjects;
set => MainSessionModel.SupportConceptListObjects = value;
}
public CostBearer2SupportConceptRelListObject SelectedCostBearer2SupportConceptRelListObject { get; set; }
public IList<MokSupportConceptListObject> SupportConceptListObjectsForGroupBooking { get; set; }
public List<long> SelectedConceptCostBearerRelationOids { get { return MainSessionModel.SelectedConceptCostBearerRelations; } set { MainSessionModel.SelectedConceptCostBearerRelations = value; } }
public List<SupportConceptCostBearerRelDC> SelectedConceptCostBearerRelations { get; set; } = new List<SupportConceptCostBearerRelDC>();
public GroupBookingSelectionObject GroupBookingSelectionObject => new GroupBookingSelectionObject(SelectedConceptCostBearerRelations, GroupBookingSelectedGroupOfPeopleOids);
public IEnumerable<CostBearer2SupportConceptRelListObject> SupportConceptListObjectsForGroupBooking
{
get
{
var allCostbearerRelations = new List<CostBearer2SupportConceptRelListObject>();
foreach(var sc in SupportConcepts.OrderBy(sc => sc.Customer.LastName))
{
allCostbearerRelations.AddRange(sc.CostBearerRelations.Where(w => ShowExpiredSupportConcepts || w.EndDate is null || w.EndDate.Value >= DateTime.Now).Select(
cb => new CostBearer2SupportConceptRelListObject(
$"{sc.Customer.SimpleDescription} {(sc.Customer.DateOfBirth.HasValue ? "*" + sc.Customer.DateOfBirth.Value.ToString("dd.MM.yyyy") : string.Empty)}",
$"{cb.AuswahlBezeichnung} {cb.StartDate?.ToShortDateString().Remove(6, 2) ?? string.Empty}-{cb.EndDate?.ToShortDateString().Remove(6, 2) ?? string.Empty} {cb.CostBearer.Name}",
cb.CostBearer2SupportConceptOid.Value,
cb.SupportConcept.IsAboutToExpire,
cb.SupportConcept.ExpiresIn3MonthOrLess))
);
}
return allCostbearerRelations;
}
}
public IEnumerable<SelectListItem> GroupOfPeopleListItems
public IEnumerable<SelectListItem> GroupOfPeopleListItems
{
get
{
@@ -386,9 +354,9 @@ namespace BeWoPlanerMobil.Models
public List<GroupOfPeopleDC> GroupsOfPeople { get; set; } = new List<GroupOfPeopleDC>();
public List<long> GroupBookingSelectedGroupOfPeopleOids { get; set; } = new List<long>();
public List<long> GroupBookingSelectedGroupOfPeopleOids { get { return MainSessionModel.GroupBookingSelectedGroupOfPeopleOids; } set { MainSessionModel.GroupBookingSelectedGroupOfPeopleOids = value; } }
public IEnumerable<SelectListItem> EmployeeListItems
public IEnumerable<SelectListItem> EmployeeListItems
{
get
{
@@ -403,27 +371,15 @@ namespace BeWoPlanerMobil.Models
public int NumberOfDokuTypes => Dokutypes?.Length ?? 0;
public static DateTime? GetEndDateOfSupportConcept(SupportConceptDC pSupportConcept)
{
DateTime? maxDate = null;
foreach(var relation in pSupportConcept.CostBearerRelations)
{
var end = relation.ApprovedEndDate ?? relation.RequestedEndDate;
if(maxDate is null || end != null && end.Value > maxDate.Value)
{
maxDate = end;
}
}
//public List<long> GroupBookingSelectedSupportConceptOids { get { return MainSessionModel.GroupBookingSelectedSupportConceptOids; } set { MainSessionModel.GroupBookingSelectedSupportConceptOids = value; } }
//public List<CompactSupportConceptDC> GroupBookingSelectedSupportConcepts { get; set; } = new List<CompactSupportConceptDC>();
return maxDate;
}
public List<long> GroupBookingSelectedCostBearerSupportConceptOids { get { return MainSessionModel.GroupBookingSelectedCostBearerSupportConceptOids; } set { MainSessionModel.GroupBookingSelectedCostBearerSupportConceptOids = value; } }
public List<long> GroupBookingSelectedSupportConceptOids { get { return MainSessionModel.GroupBookingSelectedSupportConceptOids; } set { MainSessionModel.GroupBookingSelectedSupportConceptOids = value; } }
public List<SupportConceptDC> GroupBookingSelectedSupportConcepts { get; set; } = new List<SupportConceptDC>();
public List<SupportConceptCostBearerRelDC> GroupBookingSelectedCostBearerSupportConcepts { get; set; } = new List<SupportConceptCostBearerRelDC>();
public List<long> GroupBookingSelectedCostbearerRelOids { get { return MainSessionModel.GroupBookingSelectedCostbearerRelOids; } set { MainSessionModel.GroupBookingSelectedCostbearerRelOids = value; } }
public GroupBookingSelectionObject GroupBookingSelectionObject => new GroupBookingSelectionObject(GroupBookingSelectedCostBearerSupportConcepts, GroupBookingSelectedGroupOfPeopleOids);
public List<long> GroupBookingSelectedEmployeeOids { get { return MainSessionModel.GroupBookingSelectedEmployeeOids; } set { MainSessionModel.GroupBookingSelectedEmployeeOids = value; } }
public List<CompactEmployeeDC> GroupBookingSelectedEmployees { get; set; } = new List<CompactEmployeeDC>();
@@ -439,10 +395,12 @@ namespace BeWoPlanerMobil.Models
if(!MainSessionModel.IsInGroupBookingMode)
{
GroupBookingSelectedSupportConcepts?.Clear();
GroupBookingSelectedCostBearerSupportConceptOids?.Clear();
GroupBookingSelectedCostBearerSupportConcepts.Clear();
GroupBookingSelectedEmployeeOids.Clear();
GroupBookingSelectedEmployees?.Clear();
GroupBookingSelectedSupportConceptOids?.Clear();
GroupBookingSelectedEmployeeOids?.Clear();
GroupBookingSelectedGroupOfPeopleOids.Clear();
//GroupBookingSelectedSupportConcept?.Clear();
}
}
}
@@ -519,14 +477,26 @@ namespace BeWoPlanerMobil.Models
var start = serviceRecord.Start.Value;
var end = serviceRecord.End.Value;
var gruppenInfo = string.Empty;
var dauerInfo = string.Empty;
var signatureToken = serviceRecord.SignatureOid.HasValue && isForServiceRecordsList ? "✔" : string.Empty;
var dauer = (end - start).TotalMinutes;
if (serviceRecord.DurationInStunden.HasValue && serviceRecord.DurationInStunden == ZeiterfassungsDauer.Stunden)
{
dauer /= 60;
dauerInfo = $" ({dauer:0.0#} h)";
}
else
{
dauerInfo = $" ({dauer:0.##} min.)";
}
if (serviceRecord.GroupOid.HasValue)
{
gruppenInfo = $"Gruppe ({serviceRecord.GroupPersonCount} Teilnehmer, {serviceRecord.GroupEmployeeCount} Betreuer) Dauer: {(end - start).TotalMinutes} {signatureToken}";
gruppenInfo = $" Gruppe ({serviceRecord.GroupPersonCount} Teilnehmer, {serviceRecord.GroupEmployeeCount} Betreuer)";
}
return $"{GetServiceRecordTimeString(serviceRecord)} {gruppenInfo} {signatureToken}";
return $"{GetServiceRecordTimeString(serviceRecord)}{gruppenInfo}{dauerInfo} {signatureToken}";
}
public static string GetServiceRecordTimeString(ServiceRecordDC serviceRecord)
@@ -690,16 +660,35 @@ namespace BeWoPlanerMobil.Models
{
get
{
if(SelectedDurationUnit == "Stunden")
if (SelectedServiceRecord != null)
{
return SelectedServiceRecord is null ? string.Empty : (SelectedServiceRecord.RoundedDuration / 60).ToString();
var duration = SelectedServiceRecord.RoundedDuration;
if (SelectedDurationUnit == "Stunden")
{
return Math.Round(duration / 60, 2, MidpointRounding.AwayFromZero).ToString();
}
return Math.Round(duration, 0, MidpointRounding.AwayFromZero).ToString();
}
return SelectedServiceRecord?.RoundedDuration.ToString() ?? string.Empty;
return string.Empty;
}
}
public string DistanceToEdit => SelectedServiceRecord?.DistanceInMeterDecimal.ToString() ?? string.Empty;
public string DistanceToEdit
{
get
{
if (SelectedServiceRecord != null && SelectedServiceRecord.DistanceInMeterDecimal.HasValue)
{
var dist = SelectedServiceRecord.DistanceInMeterDecimal.Value;
return Math.Round(dist, 0, MidpointRounding.AwayFromZero).ToString();
}
return string.Empty;
}
}
public string NoticeToEdit => SelectedServiceRecord?.NoticeList.FirstOrDefault() ?? string.Empty;
@@ -709,7 +698,7 @@ namespace BeWoPlanerMobil.Models
public long SelectedServiceRecordsServiceDescriptionOid => SelectedServiceRecord?.ServiceDescription?.ServiceDescriptionOid ?? 0L;
public ServiceRecordDC GetServiceRecord(long serviceRecordOid)
public ServiceRecordDC FindServiceRecord(long serviceRecordOid)
{
return ServiceRecords.FirstOrDefault(serviceRecord => serviceRecord.ServiceRecordOid.Equals(serviceRecordOid));
}
@@ -797,42 +786,7 @@ namespace BeWoPlanerMobil.Models
[Display(Name = "Mehrfachbuchung")]
public bool IsInMultiBookingMode { get { return MainSessionModel.IsInMultiBookingMode; } set { MainSessionModel.IsInMultiBookingMode = value; } }
public List<long> MultiBookingSelectedSupportConceptOids { get { return MainSessionModel.MultiBookingSelectedSupportConceptOids; } set { MainSessionModel.MultiBookingSelectedSupportConceptOids = value; } }
public List<SupportConceptDC> MultiBookingSelectedSupportConcepts { get; set; } = new List<SupportConceptDC>();
public List<long> MultiBookingSelectedGroupOfPeopleOids { get { return MainSessionModel.MultiBookingSelectedGroupOfPeopleOids; } set { MainSessionModel.MultiBookingSelectedGroupOfPeopleOids = value; } }
public List<SupportConceptCostBearerRelDC> MultiBookingSelectedConceptCostBearerRelations { get; set; } = new List<SupportConceptCostBearerRelDC>();
public GroupBookingSelectionObject MultiBookingSelectionObject => new GroupBookingSelectionObject(MultiBookingSelectedConceptCostBearerRelations, MultiBookingSelectedGroupOfPeopleOids);
public List<long> MultiBookingSelectedCostbearerRelOids { get { return MainSessionModel.MultiBookingSelectedCostbearerRelOids; } set { MainSessionModel.MultiBookingSelectedCostbearerRelOids = value; } }
public List<long> MultiBookingSelectedEmployeeOids { get { return MainSessionModel.MultiBookingSelectedEmployeeOids; } set { MainSessionModel.MultiBookingSelectedEmployeeOids = value; } }
public List<CompactEmployeeDC> MultiBookingSelectedEmployees { get; set; } = new List<CompactEmployeeDC>();
public List<CostBearer2SupportConceptRelListObject> MultiBookingSupportConceptListObjects
{
get
{
var allCostbearerRelations = new List<CostBearer2SupportConceptRelListObject>();
foreach(var sc in SupportConcepts.OrderBy(sc => sc.Customer.LastName))
{
allCostbearerRelations.AddRange(sc.CostBearerRelations.Where(w => ShowExpiredSupportConcepts || w.EndDate is null || w.EndDate.Value >= DateTime.Now).Select(
cb => new CostBearer2SupportConceptRelListObject(
$"{sc.Customer.SimpleDescription} {(sc.Customer.DateOfBirth.HasValue ? "*" + sc.Customer.DateOfBirth.Value.ToString("dd.MM.yyyy") : string.Empty)}",
$"{cb.AuswahlBezeichnung} {cb.StartDate?.ToShortDateString().Remove(6, 2) ?? string.Empty}-{cb.EndDate?.ToShortDateString().Remove(6, 2) ?? string.Empty} {cb.CostBearer.Name}",
cb.CostBearer2SupportConceptOid.Value,
cb.SupportConcept.IsAboutToExpire,
cb.SupportConcept.ExpiresIn3MonthOrLess))
);
}
return allCostbearerRelations;
}
}
#endregion
@@ -887,7 +841,41 @@ namespace BeWoPlanerMobil.Models
return SelectedServiceDescription;
}
public BookingMode CurrentBookingMode
{
get
{
if(IsInGroupBookingMode)
{
return BookingMode.GroupBookingMode;
}
return IsInMultiBookingMode ? BookingMode.MultiBookingMode : BookingMode.SingleBookingMode;
}
}
public string BookingModePrefix
{
get
{
var result = "sb";
switch(CurrentBookingMode)
{
case BookingMode.GroupBookingMode:
result = "gb";
break;
case BookingMode.MultiBookingMode:
result = "mb";
break;
default:
result = "sb";
break;
}
return result;
}
}
}
public class CustomSelectListItem
@@ -909,62 +897,4 @@ namespace BeWoPlanerMobil.Models
CostBearer2SupportConceptOid = costBearer2SupportConceptOid;
}
}
public class CostBearer2SupportConceptRelListObject
{
public string NameAndDateOfBirth { get; }
public string SupportConceptTimeSpan { get; }
public long CostBearer2SupportConceptOid { get; }
public string CostBearer2SupportConceptOidName { get; }
public bool IsAboutToExpire { get; }
public bool ExpiresInThreeMonthsOrLess { get; }
public CostBearer2SupportConceptRelListObject(string pNameAndDateOfBirth, string pSupportConceptTimeSpan, long pCostBearer2SupportConceptOid, bool isAboutToExpire, bool expiresIn3MonthOrLess)
{
NameAndDateOfBirth = pNameAndDateOfBirth;
SupportConceptTimeSpan = pSupportConceptTimeSpan;
CostBearer2SupportConceptOid = pCostBearer2SupportConceptOid;
CostBearer2SupportConceptOidName = String.Format("OidHolder_{0}", CostBearer2SupportConceptOid);
IsAboutToExpire = isAboutToExpire;
ExpiresInThreeMonthsOrLess = expiresIn3MonthOrLess;
}
public override bool Equals(object obj)
{
if (!(obj is CostBearer2SupportConceptRelListObject))
{
return false;
}
var obj2 = (CostBearer2SupportConceptRelListObject) obj;
return Equals(CostBearer2SupportConceptOid, obj2.CostBearer2SupportConceptOid);
}
public override int GetHashCode()
{
unchecked
{
const int hashingBase = (int)2166136261;
const int hashingMultiplier = 16777619;
var hash = hashingBase;
hash = (hash * hashingMultiplier) ^ (NameAndDateOfBirth?.GetHashCode() ?? 0);
hash = (hash * hashingMultiplier) ^ (SupportConceptTimeSpan?.GetHashCode() ?? 0);
hash = (hash * hashingMultiplier) ^ (CostBearer2SupportConceptOid.GetHashCode());
hash = (hash * hashingMultiplier) ^ IsAboutToExpire.GetHashCode();
hash = (hash * hashingMultiplier) ^ ExpiresInThreeMonthsOrLess.GetHashCode();
return hash;
}
}
}
}

41
BeWoPlanerMobil/Models/MainSessionModel.cs
View File

@@ -6,7 +6,7 @@ using BeWoPlanerMobil.Util;
namespace BeWoPlanerMobil.Models
{
[Serializable]
public class MainSessionModel : ISessionModel
public class MainSessionModel : BaseSessionModel
{
public bool SessionInitialized { get; internal set; }
public long? SelectedSupportConceptOid { get; internal set; }
@@ -20,27 +20,30 @@ namespace BeWoPlanerMobil.Models
public long? SelectedServiceRecordOid { get; internal set; }
public long? SelectedEmployeeOid { get; internal set; }
public NullableDateTimeSpan SelectedZeitraum { get; internal set; }
public List<long> SelectedConceptCostBearerRelations { get; internal set; }
public List<long> GroupBookingSelectedCostBearerSupportConceptOids { get; internal set; }
public List<long> GroupBookingSelectedSupportConceptOids { get; internal set; }
public List<long> GroupBookingSelectedEmployeeOids { get; internal set; }
public List<long> GroupBookingSelectedCostbearerRelOids { get; internal set; }
public List<long> GroupBookingSelectedGroupOfPeopleOids { get; internal set; }
public bool IsInGroupBookingMode { get; internal set; }
public bool IsInMultiBookingMode { get; internal set; }
public bool IsInEditingMode { get; internal set; }
public long? PreviouslySelectedEmployeeOid { get; internal set; }
public long? PreviouslySelectedSupportConceptOid { get; internal set; }
public long? PreviouslySelectedCostbearer2SupportConceptOid { get; internal set; }
public bool IsInMultiBookingMode { get; internal set; }
public List<long> MultiBookingSelectedSupportConceptOids { get; internal set; }
public List<long> MultiBookingSelectedGroupOfPeopleOids { get; internal set; }
public List<long> MultiBookingSelectedCostbearerRelOids { get; internal set; }
public List<long> MultiBookingSelectedEmployeeOids { get; internal set; }
public int CurrentPage { get; internal set; }
public List<long> SelectedGoalOids { get; internal set; }
public long LastCreatedServiceRecordOid { get; internal set; }
public long? TransferringAppointmentOid { get; internal set; }
public IList<MokSupportConceptListObject> SupportConceptListObjects { get; internal set; }
public bool IsInTransferMode { get; internal set; }
public IList<MokZiel> SelectedGoals { get; internal set; }
public List<long> SupportConceptOids { get; set; }
public MokServiceRecord SelectedServiceRecord { get; internal set; }
public void ResetValues()
public override void ResetValues()
{
base.ResetValues();
SessionInitialized = false;
SelectedSupportConceptOid = null;
SelectedCostBearerSupportConceptOid = null;
@@ -54,14 +57,16 @@ namespace BeWoPlanerMobil.Models
SelectedEmployeeOid = null;
SelectedZeitraum = null;
SelectedConceptCostBearerRelations = new List<long>();
GroupBookingSelectedCostBearerSupportConceptOids = new List<long>();
GroupBookingSelectedSupportConceptOids = new List<long>();
GroupBookingSelectedEmployeeOids = new List<long>();
GroupBookingSelectedCostbearerRelOids = new List<long>();
MultiBookingSelectedSupportConceptOids = new List<long>();
MultiBookingSelectedGroupOfPeopleOids = new List<long>();
MultiBookingSelectedCostbearerRelOids = new List<long>();
MultiBookingSelectedEmployeeOids = new List<long>();
GroupBookingSelectedGroupOfPeopleOids = new List<long>();
//GroupBookingSelectedCostbearerRelOids = new List<long>();
//MultiBookingSelectedSupportConceptOids = new List<long>();
//MultiBookingSelectedCostbearerRelOids = new List<long>();
//MultiBookingSelectedEmployeeOids = new List<long>();
SelectedGoalOids = new List<long>();
@@ -72,11 +77,17 @@ namespace BeWoPlanerMobil.Models
IsInGroupBookingMode = false;
IsInEditingMode = false;
IsInMultiBookingMode = false;
IsInTransferMode = false;
CurrentPage = 0;
LastCreatedServiceRecordOid = 0;
TransferringAppointmentOid = null;
SupportConceptListObjects = new List<MokSupportConceptListObject>();
SelectedGoals = new List<MokZiel>();
SupportConceptOids = new List<long>();
SelectedServiceRecord = null;
}
}
}

2
BeWoPlanerMobil/Util/MokMandator.cs → BeWoPlanerMobil/Models/MokMandator.cs
View File

@@ -4,7 +4,7 @@ using System;
using System.Runtime.Serialization;
using System.Windows.Media;
namespace BeWoPlanerMobil.Util
namespace BeWoPlanerMobil.Models
{
[Serializable]
public class MokMandator

9
BeWoPlanerMobil/Util/MokServiceRecord.cs → BeWoPlanerMobil/Models/MokServiceRecord.cs
View File

@@ -1,3 +1,4 @@
using BS.Shared;
using BS.Shared.DataContracts.Compact;
using BS.Shared.DataContracts.Invoicing;
using System;
@@ -5,12 +6,16 @@ using System.Collections.Generic;
using System.Runtime.Serialization;
using System.Windows.Media;
namespace BeWoPlanerMobil.Util
namespace BeWoPlanerMobil.Models
{
[Serializable]
public class MokServiceRecord
{
public long Oid { get; set; }
public long? Oid { get; set; }
public ServiceRecordTypeId ServiceRecordType { get; set; }
public int? DistanceInMeter { get; set; }
public DateTime? Start { get; set; }

67
BeWoPlanerMobil/Models/MokSupportConceptListObject.cs Normal file
View File

@@ -0,0 +1,67 @@
using BS.Shared.DataContracts.Compact;
using BS.Shared.DataContracts.Invoicing;
using System;
using System.Runtime.Serialization;
using System.Windows.Media;
namespace BeWoPlanerMobil.Models
{
[Serializable]
public class MokSupportConceptListObject
{
public string NameAndDateOfBirth { get; set; }
public string SupportConceptTimeSpan { get; set; }
public long SupportConceptOid { get; }
public long CostBearer2SupportConceptOid { get; }
public string CostBearer2SupportConceptOidName { get; }
public bool IsAboutToExpire { get; }
public bool ExpiresInThreeMonthsOrLess { get; }
public MokSupportConceptListObject(long supportConceptOid, long costBearer2SupportConceptOid, bool isAboutToExpire, bool expiresIn3MonthOrLess)
{
SupportConceptOid = supportConceptOid;
CostBearer2SupportConceptOid = costBearer2SupportConceptOid;
CostBearer2SupportConceptOidName = String.Format("OidHolder_{0}", CostBearer2SupportConceptOid);
IsAboutToExpire = isAboutToExpire;
ExpiresInThreeMonthsOrLess = expiresIn3MonthOrLess;
}
public override bool Equals(object obj)
{
if (!(obj is MokSupportConceptListObject))
{
return false;
}
var obj2 = (MokSupportConceptListObject)obj;
return Equals(CostBearer2SupportConceptOid, obj2.CostBearer2SupportConceptOid);
}
public override int GetHashCode()
{
unchecked
{
const int hashingBase = (int)2166136261;
const int hashingMultiplier = 16777619;
var hash = hashingBase;
hash = (hash * hashingMultiplier) ^ (NameAndDateOfBirth?.GetHashCode() ?? 0);
hash = (hash * hashingMultiplier) ^ (SupportConceptTimeSpan?.GetHashCode() ?? 0);
hash = (hash * hashingMultiplier) ^ (CostBearer2SupportConceptOid.GetHashCode());
hash = (hash * hashingMultiplier) ^ IsAboutToExpire.GetHashCode();
hash = (hash * hashingMultiplier) ^ ExpiresInThreeMonthsOrLess.GetHashCode();
return hash;
}
}
}
}

53
BeWoPlanerMobil/Models/MokZiel.cs Normal file
View File

@@ -0,0 +1,53 @@
using BS.Shared;
using BS.Shared.DataContracts.Compact;
using BS.Shared.DataContracts.Invoicing;
using System;
using System.Runtime.Serialization;
using System.Windows.Media;
namespace BeWoPlanerMobil.Models
{
[Serializable]
public class MokZiel
{
public long? ValueListEntryOid { get; set; }
public long? ParentOid { get; set; }
public long? RatingTypeOid { get; set; }
public ValueListEntryType Type { get; set; }
public string DisplayName { get; set; }
public override bool Equals(object obj)
{
if (obj is MokZiel)
{
var y = (MokZiel)obj;
if (this.ValueListEntryOid == null && y.ValueListEntryOid == null)
{
return this.GetHashCode() == y.GetHashCode();
}
if (this.ValueListEntryOid != null && y.ValueListEntryOid != null)
{
return this.ValueListEntryOid == y.ValueListEntryOid;
}
}
return false;
}
public override int GetHashCode()
{
return this.ValueListEntryOid.HasValue ? this.GetType().Name.GetHashCode() ^ this.ValueListEntryOid.GetHashCode() : base.GetHashCode();
}
public override string ToString()
{
return this.DisplayName;
}
}
}

2
BeWoPlanerMobil/Models/ReportModel.cs
View File

@@ -30,7 +30,7 @@ namespace BeWoPlanerMobil.Models
}
}
public QbSignatureIntervalSelection SelectedIntervalSelection { get; set; }
public QbSignatureIntervalSelection SelectedIntervalSelection { get { return ReportSessionModel.SelectedIntervalSelection; } set { ReportSessionModel.SelectedIntervalSelection = value; } }
public List<SelectListItem> IntervalSelections => new List<SelectListItem>
{

8
BeWoPlanerMobil/Models/ReportSessionModel .cs
View File

@@ -16,7 +16,7 @@ using DevExpress.XtraReports.UI;
namespace BeWoPlanerMobil.Models
{
[Serializable]
public class ReportSessionModel : ISessionModel
public class ReportSessionModel : BaseSessionModel
{
public long? SelectedCustomerOid { get; set; }
public long? SelectedEmployeeOid { get; set; }
@@ -35,9 +35,12 @@ namespace BeWoPlanerMobil.Models
public ConfirmationReceiptObject ConfirmationReceiptObject { get; internal set; }
public Quittierungsbelegsunterschriftenobjekt Quittierungsbelegsunterschriftenobjekt { get; internal set; }
public List<ConfirmationReceiptSignatureObject> SelectedConfirmationReceiptSignatures { get; internal set; }
public QbSignatureIntervalSelection SelectedIntervalSelection { get; internal set; }
public void ResetValues()
public override void ResetValues()
{
base.ResetValues();
SelectedCustomerOid = null;
SelectedEmployeeOid = null;
SelectedTeamOid = null;
@@ -55,6 +58,7 @@ namespace BeWoPlanerMobil.Models
ConfirmationReceiptObject = null;
Quittierungsbelegsunterschriftenobjekt = null;
SelectedConfirmationReceiptSignatures = null;
SelectedIntervalSelection = QbSignatureIntervalSelection.FirstHalf;
}
}
}

23
BeWoPlanerMobil/Models/ReportViewerModel.cs
View File

@@ -167,29 +167,36 @@ namespace BeWoPlanerMobil.Models
//public List<CompactEmployeeDC> SelectedEmployees { get; set; }
//public List<CompactTeamDC> SelectedTeams { get; set; }
public long? SelectedQueryOid { get { return ReportViewerSessionModel.SelectedQueryOid; } set { ReportViewerSessionModel.SelectedQueryOid = value; } }
public long? SelectedQueryOid
{
get => ReportViewerSessionModel.SelectedQueryOid;
set => ReportViewerSessionModel.SelectedQueryOid = value;
}
public QueryDC SelectedQuery { get; set; }
public List<SupportConceptDC> SupportConcepts { get; set; }
public CostBearer2SupportConceptRelListObject SelectedCostBearer2SupportConceptRelListObject { get; set; }
public MokSupportConceptListObject SelectedCostBearer2SupportConceptRelListObject { get; set; }
public IEnumerable<CostBearer2SupportConceptRelListObject> CostBearer2SupportConceptRelListObjects
public IEnumerable<MokSupportConceptListObject> CostBearer2SupportConceptRelListObjects
{
get
{
var allCostBearerRelations = new List<CostBearer2SupportConceptRelListObject> { new CostBearer2SupportConceptRelListObject("Hilfeplan auswählen", "", 0, false, false) };
var allCostBearerRelations = new List<MokSupportConceptListObject> { new MokSupportConceptListObject(0, 0, false, false) { NameAndDateOfBirth = "Hilfeplan auswählen" } };
foreach(var sc in SupportConcepts.OrderBy(sc => sc.Customer.LastName))
{
allCostBearerRelations.AddRange(sc.CostBearerRelations.Select(
cb => new CostBearer2SupportConceptRelListObject(
$"{sc.Customer.SimpleDescription} {(sc.Customer.DateOfBirth.HasValue ? "*" + sc.Customer.DateOfBirth.Value.ToString("dd.MM.yyyy") : string.Empty)}",
$"{cb.AuswahlBezeichnung} {cb.StartDate?.ToShortDateString().Remove(6, 2) ?? string.Empty}-{cb.EndDate?.ToShortDateString().Remove(6, 2) ?? string.Empty} {cb.CostBearer.Name}{GetIsNotApproved(cb)}",
cb => new MokSupportConceptListObject(
sc.SupportConceptOid.Value,
cb.CostBearer2SupportConceptOid.Value,
cb.SupportConcept.IsAboutToExpire,
cb.SupportConcept.ExpiresIn3MonthOrLess))
cb.SupportConcept.ExpiresIn3MonthOrLess)
{
NameAndDateOfBirth = $"{sc.Customer.SimpleDescription} {(sc.Customer.DateOfBirth.HasValue ? "*" + sc.Customer.DateOfBirth.Value.ToString("dd.MM.yyyy") : string.Empty)}",
SupportConceptTimeSpan = $"{cb.AuswahlBezeichnung} {cb.StartDate?.ToShortDateString().Remove(6, 2) ?? string.Empty}-{cb.EndDate?.ToShortDateString().Remove(6, 2) ?? string.Empty} {cb.CostBearer.Name}{GetIsNotApproved(cb)}"
})
);
}
return allCostBearerRelations;

6
BeWoPlanerMobil/Models/ReportViewerSessionModel.cs
View File

@@ -15,7 +15,7 @@ using DevExpress.XtraReports.UI;
namespace BeWoPlanerMobil.Models
{
[Serializable]
public class ReportViewerSessionModel : ISessionModel
public class ReportViewerSessionModel : BaseSessionModel
{
public long? SelectedEmployeeOid { get; set; }
public long? SelectedTeamOid { get; set; }
@@ -24,8 +24,10 @@ namespace BeWoPlanerMobil.Models
public ReportType SelectedReportType { get; internal set; }
public long? SelectedQueryOid { get; internal set; }
public void ResetValues()
public override void ResetValues()
{
base.ResetValues();
SelectedEmployeeOid = null;
SelectedTeamOid = null;
SelectedMonth = null;

6
BeWoPlanerMobil/Models/SchedulerSessionModel.cs
View File

@@ -15,7 +15,7 @@ using DevExpress.XtraReports.UI;
namespace BeWoPlanerMobil.Models
{
[Serializable]
public class SchedulerSessionModel : ISessionModel
public class SchedulerSessionModel : BaseSessionModel
{
public DateTime SelectedDate { get; set; }
public long? SelectedAppointmentOid { get; internal set; }
@@ -36,8 +36,10 @@ namespace BeWoPlanerMobil.Models
public DateTime? IntervalEndDate { get; internal set; }
public int? IntervalDuration { get; internal set; }
public void ResetValues()
public override void ResetValues()
{
base.ResetValues();
SelectedDate = DateTime.Today;
SelectedAppointmentOid = null;
SelectedResourceOids = new List<long>();

10
BeWoPlanerMobil/Scripts/ownSoft-Scripts/signature.js
View File

@@ -11,7 +11,7 @@ function updateCanvasSize(canvasJQueryElement) {
const rowWidth = canvasJQueryElement.parent().parent().innerWidth();
const sourceCanvas = document.getElementById(canvasJQueryElement.attr("id"));
const sourceCanvas = document.getElementById(canvasJQueryElement.prop("id"));
const canvasWidth = sourceCanvas.scrollWidth;
@@ -22,13 +22,13 @@ function updateCanvasSize(canvasJQueryElement) {
let isMinDifferenceMet = false;
if (parsedCanvasWidth > parsedNewWidth) {
if(parsedCanvasWidth > parsedNewWidth) {
isMinDifferenceMet = parsedCanvasWidth - parsedNewWidth > 4;
} else {
isMinDifferenceMet = parsedNewWidth - parsedCanvasWidth > 4;
}
if (isMinDifferenceMet) {
if(isMinDifferenceMet) {
var trimmedCanvas = trimCanvas(cloneCanvas(sourceCanvas));
var canvasContext = sourceCanvas.getContext("2d", { willReadFrequently: true });
@@ -39,10 +39,10 @@ function updateCanvasSize(canvasJQueryElement) {
return;
}
var img = new Image;
var img = new Image();
img.onload = function () {
if (trimmedCanvas.width > parsedNewWidth) {
if(trimmedCanvas.width > parsedNewWidth) {
const factor = trimmedCanvas.height / trimmedCanvas.width;
const newHeight = parsedNewWidth * factor;

23
BeWoPlanerMobil/Scripts/ownSoft-Scripts/support-concept-statistics.js
View File

@@ -1,20 +1,20 @@
function showPieChart() {
var cb2ScRelOid = parseInt($("#CostBearer2SupportConceptOid").val(), 10);
const cb2ScRelOid = parseInt($("#sb-cb2ScRelOid").val(), 10);
if (cb2ScRelOid === null || cb2ScRelOid === undefined) {
if(cb2ScRelOid === null || cb2ScRelOid === undefined) {
showMessagePopup("Hilfeplanstatistik", "Es wurde kein Hilfeplan ausgewählt");
return;
}
var customerInfo = $("#selectedSupportConceptCustomerInfo").html();
var selectedSupportConceptInfo = $("#selectedSupportConceptInfo").html();
const customerInfo = $("#selectedSupportConceptCustomerInfo").html();
const selectedSupportConceptInfo = $("#selectedSupportConceptInfo").html();
$("#statistics-header").html("Hilfeplanstatistik: " + customerInfo + " | " + selectedSupportConceptInfo);
$("#statistics-header").html(`Hilfeplanstatistik: ${customerInfo} | ${selectedSupportConceptInfo}`);
getSupportConceptStatistics(cb2ScRelOid);
}
function getSupportConceptStatistics(cb2ScRRelOid) {
var url = getLoadStatisticsUrl();
const url = getLoadStatisticsUrl();
$.get(url, { oid: cb2ScRRelOid }).done(function(jsonObject) {
try {
@@ -31,10 +31,7 @@ function getSupportConceptStatistics(cb2ScRRelOid) {
$.each(scStatistics.statisticPeriods, function(index, period) {
$.each(period.header2values, function(index, header2Values) {
$("#period-statistics-container").append(
'<div class="row">' +
'<div class="col text-secondary">' + header2Values.header + "</div>" +
'<div class="col-auto">' + header2Values.value + "</div>" +
"</div>");
`<div class="row"><div class="col text-secondary">${header2Values.header}</div><div class="col-auto">${header2Values.value}</div></div>`);
});
if(index < (scStatistics.statisticPeriods.length - 1)) {
@@ -58,7 +55,7 @@ function getSupportConceptStatistics(cb2ScRRelOid) {
}
function drawPieChart(v1, v2, free, used) {
var data = [
const data = [
{
value: v1,
color: "#00FF00",
@@ -73,7 +70,7 @@ function drawPieChart(v1, v2, free, used) {
}
];
var options = {
const options = {
scaleShowLabelBackdrop: true,
scaleBackdropColor: "rgba(255,255,255,0.75)",
scaleBeginAtZero: true,
@@ -97,7 +94,7 @@ function drawPieChart(v1, v2, free, used) {
"</ul>"
};
var context = $("#statistic-canvas").get(0).getContext("2d");
const context = $("#statistic-canvas").get(0).getContext("2d");
new Chart(context).Pie(data, options);
}

53
BeWoPlanerMobil/Scripts/ownSoft-Scripts/utils/dateUtils.js
View File

@@ -6,59 +6,6 @@
return [hours, minutes];
}
function getDateFromPicker(pickerId) {
try {
const picker = $(`#${pickerId}`);
if(picker.length > 0) {
picker.datetimepicker("show");
picker.datetimepicker("hide");
const unixTime = picker.datetimepicker("date");
const targetDate = new Date(unixTime);
if(isValidDate(targetDate)) {
return targetDate;
}
}
return new Date();
} catch(error) {
window.showErrorPopup(error);
} finally {
return new Date();
}
}
function getTimeFromPicker(pickerId) {
const result = new Date();
try {
const picker = $(`#${pickerId}`);
if (picker.length > 0) {
const timeString = picker.val();
if (timeString.length === 5) {
const hours = timeString.substring(0, 2);
const minutes = timeString.substring(3);
result.setHours(hours);
result.setMinutes(minutes);
const date = result.getDate();
const month = result.getMonth();
const year = result.getYear();
return new Date(year, month, date, hours, minutes, 0, 0);
}
}
} catch (error) {
window.showErrorPopup(error);
} finally {
return result;
}
}
function dateToShortDateString(date) {
try {
logInfo2(`Konvertiere Datum zu kurzem Datum: ${date}`);

4
BeWoPlanerMobil/Scripts/ownSoft-Scripts/utils/logging.js
View File

@@ -7,7 +7,7 @@ function logWarning(message) {
}
function logError(message) {
console.error("%c" + message, "font-size: 14px; font-family: monospace; color: red");
console.error(`%c${message}`, "font-size: 14px; font-family: monospace; color: red");
}
function logDebug(message) {
@@ -15,7 +15,7 @@ function logDebug(message) {
}
function logColorfulMessage(message, color) {
console.log("%c" + message, "font-size: 14px; font-family: monospace; color: " + color);
console.log(`%c${message}`, `font-size: 14px; font-family: monospace; color: ${color}`);
}
function logInfo2(message) {

289
BeWoPlanerMobil/Scripts/ownSoft-Scripts/utils/service-record-time-calc.js
View File

@@ -1,220 +1,11 @@
function calculateTimeWithDuration(timeInputValue, timeElement, startDate, duration, hoursMinutesDropdownBtnId) {
var isInMin = window.getIsZeiterfassungseinheitInMinutes();
const hoursToMinutes = parseTimeInputToIntegerArray(timeInputValue);
const hours = parseInt(hoursToMinutes[0]);
const minutes = parseInt(hoursToMinutes[1]);
const stdMinDropdown = $(`#${hoursMinutesDropdownBtnId}`);
startDate.hours(hours);
startDate.minutes(minutes);
if(stdMinDropdown.length) {
isInMin = stdMinDropdown.text().replaceAll(/\s/g, "") === "Minuten";
}
const durationFormat = isInMin ? "m" : "h";
startDate.add(duration, durationFormat);
timeInputValue = startDate.format("HH:mm");
timeElement.val(timeInputValue);
}
function onDurationChange(startTimeId, endTimeId, startDateId, endDateId, durationId, hoursMinutesDropdownBtnId, startDatePickerId, endDatePickerId) {
try {
var isInMin = getIsZeiterfassungseinheitInMinutes();
var startTime = $(`#${startTimeId}`).val();
var endTime = $(`#${endTimeId}`).val();
var duration = $(`#${durationId}`).val();
var hoursMinutesDropdownButton = $(`#${hoursMinutesDropdownBtnId}`);
var startTimeCondition = startTime !== undefined && startTime !== null && startTime.length > 0;
var endTimeCondition = endTime !== undefined && endTime !== null && endTime.length > 0;
var durationNumber = parseFloat(duration.replace(",", "."));
var durationCondition = !isNaN(durationNumber);
if((false === startTimeCondition && false === endTimeCondition) || durationCondition === false) {
return;
}
var startDateString = $(`#${startDatePickerId}`).datetimepicker("date");
var endDate = moment(new Date());
var startDate = moment(new Date());
if(startDateString.length !== 0) {
startDate = moment(startDateString);
endDate = startDate.clone();
}
if($(`#${endDatePickerId}`).length !== 0) {
var endDateString = $(`#${endDatePickerId}`).datetimepicker("date");
endDate = moment(endDateString);
}
var h2m = [0, 0];
if(hoursMinutesDropdownButton.length) {
isInMin = hoursMinutesDropdownButton.text().replaceAll(/\s/g, "") === "Minuten";
}
var durationFormat = isInMin ? "m" : "h";
if(startTimeCondition === true) {
h2m = parseTimeInputToIntegerArray(startTime);
startDate = startDate.hours(h2m[0]).minutes(h2m[1]);
endDate = startDate.clone().add(durationNumber, durationFormat);
$(`#${endTimeId}`).val(endDate.format("HH:mm"));
$(`#${endDateId}`).val(endDate.format("DD.MM.yyyy"));
} else {
h2m = parseTimeInputToIntegerArray(endTime);
endDate = endDate.hours(h2m[0]).minutes(h2m[1]);
startDate = endDate.clone().add(durationNumber * -1, durationFormat);
$(`#${startTimeId}`).val(startDate.format("HH:mm"));
$(`#${startDateId}`).val(startDate.format("DD.MM.yyyy"));
}
} catch(error) {
window.showErrorPopup(error);
}
}
// ToDo: VERALTET (14.05.2025); Erst Dauer, dann Start- oder Endzeit führt dazu, dass die Dauer in Stunden benutzt wird!
function calculateDuration(isInvocatedByHoursMinutesButton, startTimeId, endTimeId, durationId, hoursMinutesDropdownBtnId, startDatePickerId, endDatePickerId, isInvokedByStartElement, isInvokedByEndElement) {
var startTime = $(`#${startTimeId}`).val();
var endTime = $(`#${endTimeId}`).val();
var duration = $(`#${durationId}`).val();
var hoursMinutesDropdownButton = $(`#${hoursMinutesDropdownBtnId}`);
var isInMin = window.getIsZeiterfassungseinheitInMinutes();
if(hoursMinutesDropdownButton.length) {
isInMin = hoursMinutesDropdownButton.text().replaceAll(/\s/g, "") === "Minuten";
}
var durationFormat = isInMin ? "m" : "h";
if((startTime.length > 0 && startTime.length < 5) || (endTime.length > 0 && endTime.length < 5)) {
return;
}
var isStartTimeValid = startTime !== undefined && startTime !== null && startTime.length > 0;
var isEndTimeValid = endTime !== undefined && endTime !== null && endTime.length > 0;
var durationNumber = parseFloat(duration.replace(",", "."));
var isDurationValid = !isNaN(durationNumber);
var startDateString = $("#" + startDatePickerId).datetimepicker("date");
var endDate = moment(new Date());
var startDate = moment(new Date());
// Das Startdatum hat einen Wert
if(startDateString !== null && startDateString.length !== 0) {
startDate = moment(startDateString);
endDate = startDate.clone();
}
// Es gibt ein Enddatumsfeld
if($(`#${endDatePickerId}`).length !== 0) {
var endDateString = $(`#${endDatePickerId}`).datetimepicker("date");
// Das Enddatum hat einen Wert
if(endDateString !== null && endDateString.length !== 0) {
endDate = moment(endDateString);
}
}
var newDurationValue = 0;
// Start- und Enddatum sind vorhanden und das Event wurde nicht vom Stunden/Minuten-Dropdown aufgerufen
if(isStartTimeValid && isEndTimeValid && isInvocatedByHoursMinutesButton === false) {
var startHHmm = parseTimeInputToIntegerArray(startTime);
var endHHmm = parseTimeInputToIntegerArray(endTime);
startDate.hours(startHHmm[0]);
startDate.minutes(startHHmm[1]);
endDate.hours(endHHmm[0]);
endDate.minutes(endHHmm[1]);
var momentDuration = moment.duration(endDate.diff(startDate));
if(durationNumber > 0 && isInvokedByStartElement && startDate >= endDate) {
endDate = startDate.clone().add(durationNumber, durationFormat);
$(`#${endTimeId}`).val(endDate.format("HH:mm"));
$(`#${endDatePickerId}`).val(endDate.format("DD.MM.yyyy"));
momentDuration = moment.duration(endDate.diff(startDate));
}
if(durationNumber > 0 && isInvokedByEndElement && startDate >= endDate) {
startDate = endDate.clone().subtract(durationNumber, durationFormat);
$(`#${startTimeId}`).val(startDate.format("HH:mm"));
$(`#${startDatePickerId}`).val(startDate.format("DD.MM.yyyy"));
momentDuration = moment.duration(endDate.diff(startDate));
}
newDurationValue = isInMin ? momentDuration.asMinutes() : momentDuration.asHours();
$(`#${durationId}`).val(newDurationValue);
// Startdatum und Dauer sind vorhanden
} else if(isStartTimeValid && isDurationValid) {
if(isInvocatedByHoursMinutesButton) {
durationNumber = isInMin ? durationNumber *= 60 : durationNumber /= 60;
$(`#${durationId}`).val(durationNumber);
}
calculateTimeWithDuration(startTime, $(`#${endTimeId}`), startDate, durationNumber, hoursMinutesDropdownBtnId);
// Enddatum und Dauer sind vorhanden
} else if(isEndTimeValid && isDurationValid) {
if(isInvocatedByHoursMinutesButton) {
durationNumber = isInMin ? durationNumber *= 60 : durationNumber /= 60;
$(`#${durationId}`).val(durationNumber);
}
calculateTimeWithDuration(endTime, $(`#${startTimeId}`), startDate, durationNumber * -1, hoursMinutesDropdownBtnId);
} else if(isInvocatedByHoursMinutesButton) {
// Wurde von Min zu Std oder Std zu Min
if(isInvocatedByHoursMinutesButton && isDurationValid) {
durationNumber = isInMin ? durationNumber * 60 : durationNumber / 60;
$(`#${durationId}`).val(durationNumber);
}
}
}
function calcDuration(idPrefix, isFormatChange, isInvokedByStart, isInvokedByEnd) {
function calcDuration(idPrefix, isFormatChange, isInvokedByStart, isInvokedByEnd) {
const endDateInput = $(`#${idPrefix}-end-date-input`);
const startDateInput = $(`#${idPrefix}-start-date-input`);
const endTimeInput = $(`#${idPrefix}-end-time-input`);
const startTimeInput = $(`#${idPrefix}-start-time-input`);
const durationInput = $(`#${idPrefix}-duration-input`);
const hoursMinutesBtn = $(`#${idPrefix}-hours-minutes-dropdown-btn`);
const durationLabel = $(`#${idPrefix}-duration-label`);
const startDateValue = startDateInput.val();
const startTimeValue = startTimeInput.val();
@@ -222,12 +13,14 @@ function calcDuration(idPrefix, isFormatChange, isInvokedByStart, isInvokedByEnd
const endTimeValue = endTimeInput.val();
const durationValue = durationInput.val();
//alert(hoursMinutesBtn.text());
const isInMin = hoursMinutesBtn.length === 0 || hoursMinutesBtn.length > 0 && hoursMinutesBtn.text().replaceAll(/\s/g, "") === "Minuten";
//alert(isInMin);
const hasMinutesHoursDropdown = hoursMinutesBtn.length > 0;
const isInMin = (false === hasMinutesHoursDropdown && false === durationLabel.text().includes("(h)")) ||
hasMinutesHoursDropdown === true && hoursMinutesBtn.text().replaceAll(/\s/g, "") === "Minuten";
const hasEndDate = endDateInput.length;
if (startDateValue.length === 0) {
if(startDateValue.length === 0) {
return;
}
@@ -239,32 +32,37 @@ function calcDuration(idPrefix, isFormatChange, isInvokedByStart, isInvokedByEnd
let start = new Date(startDateValue);
let end = hasEndDate ? new Date(endDateValue) : start;
if (true === isStartTimeValid && true === isEndTimeValid && false === isFormatChange) {
if(true === isStartTimeValid && true === isEndTimeValid && false === isFormatChange) {
start = combineDateAndTime(start, startTimeValue);
end = combineDateAndTime(end, endTimeValue);
let dauer = (end.getTime() - start.getTime()) / 60000;
if (duration > 0 && true === isInvokedByStart && start >= end) {
end = new Date(start.getTime() + (false === isInMin ? duration * 60 : duration) / 60000);
if(duration > 0 && start >= end) {
dauer = (false === isInMin ? duration * 60 : duration);
endTimeInput.val(getTimeAsString(end));
endDateInput.val(getDateAsString(end));
if(true === isInvokedByStart) {
end = new Date(start.getTime() + dauer * 60000);
dauer = (end.getTime() - start.getTime()) * 60000;
endTimeInput.val(getTimeAsString(end));
endDateInput.val(getDateAsString(end));
}
else if(true === isInvokedByEnd) {
end.setDate(end.getDate() + 1);
endTimeInput.val(getTimeAsString(end));
endDateInput.val(getDateAsString(end));
}
dauer = (end.getTime() - start.getTime()) / 60000;
}
if (duration > 0 && true === isInvokedByEnd && start >= end) {
start = new Date(end.getTime() - (false === isInMin ? duration * 60 : duration) / 60000);
startTimeInput.val(getTimeAsString(start));
startDateInput.val(getDateAsString(start));
dauer = (end.getTime() - start.getTime()) * 60000;
if(false === isInMin) {
dauer /= 60.0;
}
durationInput.val(dauer);
} else if (true === isStartTimeValid && true === isDurationValid) {
} else if(true === isStartTimeValid && true === isDurationValid) {
var newDuration = duration;
if(true === isFormatChange) {
let newDurationValue = true === isInMin ? duration * 60.0 : duration / 60.0;
@@ -274,7 +72,11 @@ function calcDuration(idPrefix, isFormatChange, isInvokedByStart, isInvokedByEnd
} else {
durationInput.val(newDurationValue);
}
newDuration = newDurationValue;
if(true === isInMin)
{
newDuration = newDurationValue;
}
}
calcTimeWithDuration(startTimeValue, endTimeInput, start, newDuration, isFormatChange, isInMin);
@@ -318,7 +120,8 @@ function calcTimeWithDuration(timeAsString, timeElement, start, duration, isForm
start = combineDateAndTime(start, timeAsString);
const x = new Date(start.getTime() + duration * 60000);
timeElement.val(`${x.getMinutes().toString().padStart(2, "0")}:${x.getMinutes().toString().padStart(2, "0")}`);
const timeString = `${x.getHours().toString().padStart(2, "0")}:${x.getMinutes().toString().padStart(2, "0")}`;
timeElement.val(timeString);
}
function beiDaueraenderung(idPrefix) {
@@ -329,11 +132,21 @@ function beiDaueraenderung(idPrefix) {
const durationInput = $(`#${idPrefix}-duration-input`);
const startDateInput = $(`#${idPrefix}-start-date-input`);
const endDateInput = $(`#${idPrefix}-end-date-input`);
const isInMin = getIsZeiterfassungseinheitInMinutes();//hoursMinutesDropdown.length && hoursMinutesDropdown.text().replaceAll(/\s/g, "") === "Minuten" || 0 === hoursMinutesDropdown.length;
const hoursMinutesBtn = $(`#${idPrefix}-hours-minutes-dropdown-btn`);
const durationLabel = $(`#${idPrefix}-duration-label`);
const hasMinutesHoursDropdown = hoursMinutesDropdown.length > 0;
const isInMin = (false === hasMinutesHoursDropdown && false === durationLabel.text().includes("(h)")) ||
hasMinutesHoursDropdown === true && hoursMinutesBtn.text().replaceAll(/\s/g, "") === "Minuten";
const startTimeCondition = startTimeInput.val().length > 0;
const endTimeCondition = endTimeInput.val().length > 0;
let duration = parseFloat(durationInput.val().replace(",", "."));
var dauerString = durationInput.val();
if (dauerString.indexOf(".") >= 0) {
dauerString = dauerString.replace(".", ",");
durationInput.val(dauerString);
}
let duration = parseFloat(dauerString.replace(",", "."));
const durationCondition = false === isNaN(duration);
@@ -394,12 +207,4 @@ function getDateAsString(dateObject) {
const month = (dateObject.getMonth() + 1).toString().padStart(2, "0");
return `${year}-${month}-${date}`;
}
function dateToDateMonthFullYearStr(date) {
const dayOfMonth = date.getDate();
const month = date.getMonth() + 1;
const fullYear = date.getFullYear();
return `${dayOfMonth}.${month}.${fullYear}`;
}

125
BeWoPlanerMobil/Scripts/ownSoft-Scripts/view-scripts/main.js
View File

@@ -1,16 +1,22 @@
function selectSupportConcept(cb2ScOid) {
showSpinner();
$("#CostBearer2SupportConceptOid").val(cb2ScOid);
$("#sb-cb2ScRelOid").val(cb2ScOid);
window.saveItemValueLocally(document.getElementById("sb-cb2ScRelOid"));
$("#selectSupportConceptForm").submit();
}
function setSelectedEmployee() {
const employeeOid = parseInt($("#employeesDropDown").find(":selected").val());
if (isNaN(employeeOid)) {
if(isNaN(employeeOid)) {
return;
}
$("#sb-employee-input").val(employeeOid);
window.saveItemValueLocally($("#sb-employee-input").val());
$.get(window.getSetServiceRecordEmployeeUrl(), { employeeOid: employeeOid });
}
@@ -61,26 +67,74 @@ function submitGroupBookingForm() {
function toggleGroupBookingForm() {
const isEnabled = $("#selected-cb2sc-list").children().length > 0;
changeGroupBookingFormEnableState(!isEnabled);
}
function changeMultiBookingFormEnableState(enableState) {
$(
"#mb-employees-button, " +
"#mb-category-select, " +
"#mb-leistung-select, " +
"#mb-start-date-input, " +
"#mb-end-date-input, " +
"#mb-start-time-input, " +
"#mb-end-time-input, " +
"#mb-duration-input, " +
"#mb-distance-input, " +
"textarea, " +
"#mb-reset-btn, " +
"#mb-create-btn, " +
"#mb-betrag," +
"#mb-textbausteine-btn, " +
"#mb-hours-minutes-dropdown-btn, " +
"#mb-marker-cb"
).prop("disabled", enableState);
}
function changeGroupBookingFormEnableState(enableState) {
$(
"#betrag, " +
".gb-restore-btn," +
"#employees-button, " +
"#category-select, " +
"#leistung-select, " +
"#gb-category-select, " +
"#gb-leistung-select, " +
"#gb-start-date-input, " +
"#gb-end-date-input, " +
"#gb-start-time-input, " +
"#gb-end-time-input, " +
"#db-duration-input, " +
"#gb-duration-input, " +
"#gb-distance-input, " +
"textarea, " +
"#reset-button, " +
"#create-button, " +
"#textbausteine-button, " +
"#gb-textbausteine-btn, " +
"#gb-hours-minutes-dropdown-btn, " +
"#marker-cb"
).prop("disabled", isEnabled ? false : true);
"#gb-marker-cb, " +
"#gb-betrag"
).prop("disabled", enableState);
}
function changeSingleBookingFormEnableState(enableState) {
$(
"#employeesDropDown, " +
"#sb-category-select, " +
"#sb-leistung-select, " +
"#sb-start-date-input, " +
"#sb-end-date-input, " +
"#sb-start-time-input, " +
"#sb-end-time-input, " +
"#sb-duration-input, " +
"#sb-hours-minutes-dropdown-btn, " +
"#sb-distance-input, " +
"#sb-textbausteine-btn, " +
"#goals-button, " +
"textarea, " +
"#reset-button, " +
"#create-button, " +
"#statistics-button, " +
"#timeFrameSelect, " +
"#sb-marker-cb, " +
"#sb-betrag"
).prop("disabled", enableState);
}
function deleteServiceRecord(serviceRecordOid) {
@@ -163,7 +217,7 @@ function validateForm(form, prefix) {
if(isNoticeMandatory) {
if(numberOfNoticeTextareas === 0) {
var doku = $(`#${prefix}-dokufeld-textarea`).val();
var doku = $(`#${prefix}-doku-textarea`).val();
if(doku === undefined || doku === null) {
doku = "";
@@ -224,6 +278,11 @@ function validateForm(form, prefix) {
var startTimeInput = $(`#${prefix}-start-time-input`);
var endTimeInput = $(`#${prefix}-end-time-input`);
const distance = $(`#${prefix}-distance-input`).val();
const marker = $(`#${prefix}-marker-cb`).is(":checked");
const serviceDescriptionOid = $(`#${prefix}-leistung-select`).find(":selected").val();
const duration = $(`#${prefix}-duration-input`).val();
const betrag = $(`#${prefix}-betrag`).val();
$("#srv-date").val(`${getDateAsString(start)}`);
$("#srv-end-date").val(`${getDateAsString(end)}`);
@@ -235,13 +294,26 @@ function validateForm(form, prefix) {
$("#srv-doku3").val(doku3);
$("#srv-doku4").val(doku4);
$("#srv-doku5").val(doku5);
$("#srv-distance").val($(`#${prefix}-distance-input`).val());
$("#srv-distance").val(distance);
$("#srv-form-id").val(form.attr("id"));
$("#srv-marker").val($(`#${prefix}-marker-cb`).is(":checked") ? "on" : "off");
$("#srv-service-description").val($(`#${prefix}-leistung-select`).find(":selected").val());
$("#srv-duration").val($(`#${prefix}-duration-input`).val());
$("#srv-betrag").val($("#betrag").val());
$("#srv-marker").val(marker ? "on" : "off");
$("#srv-service-description").val(serviceDescriptionOid);
$("#srv-duration").val(duration);
$("#srv-betrag").val(betrag);
window.saveItemValueLocally(document.getElementById(`${prefix}-start-date-input`));
window.saveItemValueLocally(document.getElementById(`${prefix}-end-date-input`));
window.saveItemValueLocally(document.getElementById(`${prefix}-start-time-input`));
window.saveItemValueLocally(document.getElementById(`${prefix}-end-time-input`));
window.saveItemValueLocally(document.getElementById(`${prefix}-distance-input`));
window.saveItemValueLocally(document.getElementById(`${prefix}-marker-cb`));
window.saveItemValueLocally(document.getElementById(`${prefix}-service-description-${serviceDescriptionOid}`));
window.saveItemValueLocally(document.getElementById(`${prefix}-duration-input`));
window.saveItemValueLocally(document.getElementById(`${prefix}-betrag`));
showSpinner();
$("#service-record-validation-form").submit();
}
@@ -251,7 +323,7 @@ function getDokuTexte(prefix) {
const noticeList = [null, null, null, null, null];
try {
const hasMultipleDokufelder = $(`#${prefix}-dokufeld-textarea`).length === 0;
const hasMultipleDokufelder = $(`#${prefix}-doku-textarea`).length === 0;
let dokufeldCounter = 0;
@@ -265,7 +337,7 @@ function getDokuTexte(prefix) {
}
}
} else {
noticeList[0] = $(`#${prefix}-dokufeld-textarea`).val();
noticeList[0] = $(`#${prefix}-doku-textarea`).val();
dokufeldCounter = 1;
}
@@ -301,8 +373,6 @@ function hideGoalRatingPopup() {
}
}
function checkChildNodes(parentOid) {
const rootElement = $(`#c-${parentOid}`);
const checkboxes = rootElement.find("input");
@@ -319,10 +389,6 @@ function checkChildNodes(parentOid) {
});
}
function validateDistanceInput() {
checkNumberInput("distance");
}
@@ -384,7 +450,6 @@ function validateStartAndEndInputs(startDateInput, startTimeInput, endDateInput,
return [combineDateAndTime(startDate, startTime), combineDateAndTime(endDate, endTime)];
}
function supportConceptSearchOnChange() {
try {
var text = $("#support-concept-search-input").val().toLowerCase();
@@ -444,7 +509,11 @@ function setServiceDescription(id) {
try {
const url = window.getSetServiceDescriptionUrl();
const selectedServiceDescription = $(`#${id}`).find(":selected").val();
const selectedOption = $(`#${id}`).find(":selected");
const selectedServiceDescription = selectedOption.val();
window.saveServiceDescriptionLocally(selectedServiceDescription);
$.get(url, {pServiceDescriptionOid: selectedServiceDescription});
} catch(error) {

29
BeWoPlanerMobil/Service/ASPHibernateSessionManager.cs
View File

@@ -42,10 +42,10 @@ namespace BeWoPlanerMobil.Service
if(!SessionFactories.ContainsKey(MobileSessionFacade.Tenant))
{
#if DEBUG
//var hierarchy = (Hierarchy) LogManager.GetRepository();
//var logger = (Logger) hierarchy.GetLogger("NHibernate.SQL");
//logger.AddAppender(new TraceAppender { Layout = new SimpleLayout() });
//hierarchy.Configured = true;
var hierarchy = (Hierarchy)LogManager.GetRepository();
var logger = (Logger)hierarchy.GetLogger("NHibernate.SQL");
logger.AddAppender(new TraceAppender { Layout = new SimpleLayout() });
hierarchy.Configured = true;
#endif
var serverPath = HttpContext.Current.Server.MapPath(null);
@@ -110,7 +110,10 @@ namespace BeWoPlanerMobil.Service
}
var userLoaded = TryAuthenticateWithLoginForm(context);
//if (!userLoaded && MobileSessionFacade.IsUserLoggedIn())
//{
// MobileSessionFacade.LogUserOut();
//}
//if(!userLoaded && MobileSessionFacade.LoggedInUser != null && MobileSessionFacade.LoggedInUser.UserOid.HasValue)
//{
// MobileSessionFacade.LoggedInUser = MapperFactory.UserDC_User.MapToNewDC(DAOFactory.GenericDAO.LoadByID<ApplicationUser>(MobileSessionFacade.LoggedInUser.UserOid.Value));
@@ -146,16 +149,16 @@ namespace BeWoPlanerMobil.Service
private static bool ConfigureHibernateSession()
{
var tenant = MobileSessionFacade.Tenant;
if(string.IsNullOrEmpty(tenant))
var newTenant = HttpContext.Current.Request.Params["tb_tenant"];
if (!String.IsNullOrEmpty(newTenant))
{
newTenant = newTenant.Trim();
}
if (string.IsNullOrEmpty(tenant) || (!String.IsNullOrEmpty(newTenant) && !newTenant.Equals(tenant)))
{
//TODO: ist bei showPin=1 null!
tenant = HttpContext.Current.Request.Params["tb_tenant"];
if (!String.IsNullOrEmpty(tenant))
{
tenant = tenant.Trim();
}
MobileSessionFacade.Tenant = tenant;
tenant = newTenant;
MobileSessionFacade.Tenant = newTenant;
}
if(string.IsNullOrEmpty(tenant))

2
BeWoPlanerMobil/Service/MobileSessionFacade.cs
View File

@@ -6,7 +6,7 @@ using BeWo.Data.Entities;
using BeWo.Service.DCEntityMapper;
using BeWo.Service.ServiceContracts;
using BeWo.Service.ServiceImplementations;
using BeWoPlanerMobil.Util;
using BeWoPlanerMobil.Models;
using BS.Shared;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact;

24
BeWoPlanerMobil/Util/DcToMokMapper.cs
View File

@@ -23,11 +23,31 @@ namespace BeWoPlanerMobil.Util
}
public static MokZiel CreateZiel(ValueListEntryDC dc)
{
return new MokZiel
{
ValueListEntryOid = dc.ValueListEntryOid,
RatingTypeOid = dc.RatingTypeOid,
Type = dc.Type,
DisplayName = dc.DisplayName,
ParentOid = dc.ParentOid
};
}
public static IList<MokZiel> CreateZiele(IEnumerable<ValueListEntryDC> dclist)
{
return dclist?.Select(g => CreateZiel(g)).ToList();
}
public static MokServiceRecord CreateServiceRecord(ServiceRecordDC dc, ReportModel model)
{
var s = new MokServiceRecord
{
Oid = dc.ServiceRecordOid.Value,
ServiceRecordType = dc.ServiceRecordType,
DistanceInMeter = dc.DistanceInMeter,
Start = dc.Start,
End = dc.End,
EmployeeName = dc.Employee.FirstNameLastName,
@@ -88,7 +108,7 @@ namespace BeWoPlanerMobil.Util
}
#if DEBUG
if (goal.RatingTypeOid.HasValue)
if (model != null && goal.RatingTypeOid.HasValue)
{
var goalRating = model.GoalRatingTypes.FirstOrDefault(g => g.RatingTypeOid.HasValue && g.RatingTypeOid.Equals(goal.RatingTypeOid.Value));
@@ -105,7 +125,7 @@ namespace BeWoPlanerMobil.Util
}
}
if (model.ServiceRecordOids2GoalHeader.ContainsKey(s.Oid))
if (model != null && model.ServiceRecordOids2GoalHeader.ContainsKey(s.Oid.Value))
{
var ziele = dc.Goals.Where(g => g.Type == ValueListEntryType.SupportConceptIndividualGoalCategoryType || g.Type == ValueListEntryType.SupportConceptGoalCategoryType).ToList();

15
BeWoPlanerMobil/Util/FormCollectionConstants.cs
View File

@@ -32,6 +32,16 @@
public static string ServiceRecordSignatureBlobKey => "service-record-signature-blob";
public static string ServiceRecordSignatureDateKey => "service-record-signature-date";
public static string ServiceRecordSignatureRecordOidKey => "service-record-signature-record-oid";
public static string GroupBookingSelectedCb2ScOidsKey => "service-record-group-booking-cb2sc-oids";
public static string GroupBookingSelectedEmployeeOidsKey => "service-record-group-booking-employee-oids";
public static string MultiBookingSelectedCb2ScOidsKey => "service-record-multi-booking-cb2sc-oids";
public static string MultiBookingSelectedEmployeeOidsKey => "service-record-multi-booking-employee-oids";
public static string SingleBookingEmployeeOidKey => "service-record-single-booking-employee-oid";
public static string SelectedGoalOids => "service-record-selected-goal-oids";
public static string GroupBookingSelectedGroupOidsKey => "service-record-group-booking-employee-oids";
public static string MultiBookingSelectedGroupOidsKey => "service-record-multi-booking-employee-oids";
public static string BookingModeKey => "BookingMode";
// Kalender
public static string AppointmentStartDateKey => "StartDate";
@@ -65,7 +75,7 @@
// public static string DevelopmentModelKey => "DevelopmentModel";
// public static string DevExpressReportModelKey => "DevExpressReportModel";
// public static string ReportViewerModelKey => "ReportViewerModel";
// public static string DebuggingToolsModelKey => "DebuggingToolsModel";
// public static string DebuggingToolsModelKey => "DevToolsModel";
//}
public class TempDataConstants
@@ -84,5 +94,8 @@
public static string InfoMessageKey => "InfoMessage";
public static string ReportMessageKey => "ReportMessage";
public static string AppointmentOidKey => "AppointmentOid";
public static string AfterRestoreKey => "AfterRestore";
public static string SaveSupportConceptDependenciesKey => "SaveSupportConceptDependencies";
public static string DeleteLocalInputsKey => "DeleteLocalInputsKey";
}
}

1
BeWoPlanerMobil/Util/MokSettings.cs
View File

@@ -6,6 +6,7 @@ namespace BeWoPlanerMobil.Util
{
public int SupportConceptExpirationLimitInMonths { get; set; }
public int AnzTageZeiterfassErfolgt { get; set; }
public int AnzTageUnterschriftErfolgt { get; set; }
public int MaxDaysEditServiceRecordsAllowed { get; set; }
public int ServiceRecordAllowChangeHours { get; set; }
public int TimeUntilUILock { get; set; }

7
BeWoPlanerMobil/Views/Customer/Customer.cshtml
View File

@@ -18,13 +18,6 @@
});
});
$(function () {
$("#date-of-birth-picker").datetimepicker({
locale: "de",
format: "L"
});
});
function resizeCustomerPrependElements() {
try {
let width = window.getMaxWidth("customer-prepend-text-eigenschaften");

12
BeWoPlanerMobil/Views/Customer/CustomerAbsenceTimeFormPartial.cshtml
View File

@@ -4,18 +4,6 @@
@model CustomerModel
<script type="text/javascript">
$(function () {
$("#customer-absence-time-start-date-picker, #customer-absence-time-end-date-picker").datetimepicker({
locale: "de",
format: "L"
});
$("#customer-absence-time-start-time-picker, #customer-absence-time-end-time-picker").datetimepicker({
locale: "de",
format: "LT"
});
});
var initialDatePrependWidth = 0;
function calcAbsenceTimePrependWidth() {
try {

276
BeWoPlanerMobil/Views/Customer/CustomerBargeldkassen.cshtml
View File

@@ -5,104 +5,72 @@
@model BeWoPlanerMobil.Models.CustomerModel
<script type="text/javascript">
$(function () {
$(".ownSoft-date-picker").datetimepicker({
locale: "de",
format: "L"
});
});
function resizeButtons() {
try {
const btnGroupMaxWidth = getMaxWidth("bk-btn-group");
const btnGroupMaxWidth = getMaxWidth("bk-btn-group");
if(btnGroupMaxWidth > 0) {
$(".bk-btn-group").width(btnGroupMaxWidth);
}
if(btnGroupMaxWidth > 0) {
$(".bk-btn-group").width(btnGroupMaxWidth);
}
const dateInputMaxWidth = getMaxWidth("date-input-prepend-group");
const dateInputMaxWidth = getMaxWidth("date-input-prepend-group");
if(dateInputMaxWidth > 0) {
$(".date-input-prepend-group").width(dateInputMaxWidth);
}
} catch(error) {
window.showErrorPopup(error);
if(dateInputMaxWidth > 0) {
$(".date-input-prepend-group").width(dateInputMaxWidth);
}
}
function deselectBargeldkasse() {
try {
$.get("@Url.Action("DeselectBargeldkasse")");
} catch(error) {
window.showErrorPopup(error);
}
$.get("@Url.Action("DeselectBargeldkasse")");
}
function editBtnClickTest(bargeldkassenOid, bargeldkassenname) {
try {
showSpinner();
showSpinner();
$("#customer-bargeldkassen-modal-body").load("@Url.Action("LoadEditFormPartial")", {bargeldkassenOid: bargeldkassenOid}, function () {
hideSpinner();
$("#customer-bargeldkassen-form-popup-title").text(`${bargeldkassenname} bearbeiten`);
$("#customer-bargeldkassen-form-popup").modal("show");
window.calcBargeldkassenFormPrependWidth();
});
} catch(error) {
window.showErrorPopup(error);
}
$("#customer-bargeldkassen-modal-body").load("@Url.Action("LoadEditFormPartial")", {bargeldkassenOid: bargeldkassenOid}, function () {
hideSpinner();
$("#customer-bargeldkassen-form-popup-title").text(`${bargeldkassenname} bearbeiten`);
$("#customer-bargeldkassen-form-popup").modal("show");
window.calcBargeldkassenFormPrependWidth();
});
}
function deleteBtnClickTest(bargeldkassenOid, bargeldkassenname) {
try {
showMessagePopupWithHtmlAndCallback(`Bargeldkasse löschen`, `Möchten Sie die Bargeldkasse "${bargeldkassenname}" wirklich löschen?`, true, function () {
showSpinner();
$("#bk-to-delete-oid").val(bargeldkassenOid);
document.getElementById("bargeldkassendeleteform").submit();
}, false);
} catch(error) {
window.showErrorPopup(error);
}
showMessagePopupWithHtmlAndCallback(`Bargeldkasse löschen`, `Möchten Sie die Bargeldkasse "${bargeldkassenname}" wirklich löschen?`, true, function () {
showSpinner();
$("#bk-to-delete-oid").val(bargeldkassenOid);
document.getElementById("bargeldkassendeleteform").submit();
}, false);
}
function addNewBargeldkasse() {
try {
showSpinner();
$("#customer-bargeldkassen-modal-body").load("@Url.Action("LoadFormPartial")",
function () {
hideSpinner();
$("#customer-bargeldkassen-form-popup-title").text("Bargeldkasse hinzufügen");
$("#customer-bargeldkassen-form-popup").modal("show");
window.calcBargeldkassenFormPrependWidth();
});
} catch(error) {
window.showErrorPopup(error);
}
showSpinner();
$("#customer-bargeldkassen-modal-body").load("@Url.Action("LoadFormPartial")",
function () {
hideSpinner();
$("#customer-bargeldkassen-form-popup-title").text("Bargeldkasse hinzufügen");
$("#customer-bargeldkassen-form-popup").modal("show");
window.calcBargeldkassenFormPrependWidth();
});
}
function previewBargeldkassenReport(bargeldkassenOid) {
try {
showSpinner();
showSpinner();
const start = $(`#customer-bargeldkasse-start-date-${bargeldkassenOid}`).val();
const end = $(`#customer-bargeldkasse-end-date-${bargeldkassenOid}`).val();
const start = $(`#customer-bargeldkasse-start-date-${bargeldkassenOid}`).val();
const end = $(`#customer-bargeldkasse-end-date-${bargeldkassenOid}`).val();
$("#customer-report-popup-container").load("@Url.Action("PrintBargeldkasse")",
{
kassenbuchOid: bargeldkassenOid,
reportStartDate: start,
reportEndDate: end
},
function () {
hideSpinner();
$("#customer-report-popup-container").load("@Url.Action("PrintBargeldkasse")",
{
kassenbuchOid: bargeldkassenOid,
reportStartDate: start,
reportEndDate: end
},
function () {
hideSpinner();
$("#bewo-report-popup").modal("show");
}
);
} catch(error) {
window.showErrorPopup(error);
}
$("#bewo-report-popup").modal("show");
}
);
}
$(window).on("load", function () {
@@ -111,45 +79,37 @@
var initialDateInputWidth = 0;
function calculateDateInputWidth() {
try {
const bargeldkassenDateInputMaxWidth = getMaxWidth("customer-bargeldkassen-date-prepend");
const bargeldkassenDateInputMaxWidth = getMaxWidth("customer-bargeldkassen-date-prepend");
if(initialDateInputWidth <= 0 && $.isNumeric(bargeldkassenDateInputMaxWidth)) {
initialDateInputWidth = bargeldkassenDateInputMaxWidth;
}
if (initialDateInputWidth <= 0) {
return;
}
$(".customer-bargeldkassen-date-prepend").width(bargeldkassenDateInputMaxWidth);
} catch(error) {
window.showErrorPopup(error);
if(initialDateInputWidth <= 0 && $.isNumeric(bargeldkassenDateInputMaxWidth)) {
initialDateInputWidth = bargeldkassenDateInputMaxWidth;
}
if (initialDateInputWidth <= 0) {
return;
}
$(".customer-bargeldkassen-date-prepend").width(bargeldkassenDateInputMaxWidth);
}
function deleteBargeldransaktion(transaktionsOid) {
try {
if(false === $.isNumeric(transaktionsOid)) {
window.showErrorMessagePopup("Es ist ein Fehler beim Löschen einer Transaktion gekommen. Bitte wenden Sie sich an Ihren Administrator");
}
showMessagePopupWithCallback("Transaktion löschen",
"Möchten Sie den Eintrag wirklich löschen?",
function () {
showSpinner();
$("#bargeldkassen-container").load("@Url.Action("DeleteBargeldtransaktion")",
{
bargeldtransaktionsOid: transaktionsOid
},
function() {
hideSpinner();
});
},
false);
} catch(error) {
window.showErrorPopup(error);
if(false === $.isNumeric(transaktionsOid)) {
window.showErrorMessagePopup("Es ist ein Fehler beim Löschen einer Transaktion gekommen. Bitte wenden Sie sich an Ihren Administrator");
}
showMessagePopupWithCallback("Transaktion löschen",
"Möchten Sie den Eintrag wirklich löschen?",
function () {
showSpinner();
$("#bargeldkassen-container").load("@Url.Action("DeleteBargeldtransaktion")",
{
bargeldtransaktionsOid: transaktionsOid
},
function() {
hideSpinner();
});
},
false);
}
function signZahlungsbeleg(transaktionsOid, zahlungsdatum, zahlungsart, zahlungsbetrag, zahlungsbelegnummer) {
@@ -405,13 +365,13 @@
var kassenbestand = ((bargeldkasse.Anfangsbestand ?? 0m) + einzahlungen - auszahlungen).ToString("0.00 €");
var startDate = DateTime.Today.GetFirstOfMonth().ToString("dd.MM.yyyy");
var endDate = DateTime.Today.GetLastOfMonth().ToString("dd.MM.yyyy");
var startDate = DateTime.Today.GetFirstOfMonth().ToString("yyyy-MM-dd");
var endDate = DateTime.Today.GetLastOfMonth().ToString("yyyy-MM-dd");
}
<div class="row">
<div class="col">
<div class="btn-group w-100" role="gorup">
<div class="btn-group btn-group-sm w-100" role="gorup">
<button class="btn btn-outline-primary" title="Transaktion hinzufügen" type="button" modal="#customer-bargeldtransaktions-form-popup" onclick="addNewBargeldtransaktion(@bargeldkasse.BargeldkassenOid)">
<i class="fas fa-plus"></i>
Transaktion
@@ -430,73 +390,41 @@
</div>
@*----- Startdatum, Enddatum und Stichtag -----*@
<div class="form-row mt-2">
<div class="col">
<div class="form-group mb-0">
<div class="input-group date ownSoft-date-picker" id="customer-bargeldkasse-start-date-picker-@bargeldkasse.BargeldkassenOid" data-target-input="nearest">
<div class="input-group-prepend">
<div class="input-group-text customer-bargeldkassen-date-prepend">
Startdatum
</div>
</div>
<input type="text" value="@startDate"
autocomplete="on"
id="customer-bargeldkasse-start-date-@bargeldkasse.BargeldkassenOid"
name="customer-bargeldkasse-start-date"
class="form-control datetimepicker-input"
data-target="#customer-bargeldkasse-start-date-picker-@bargeldkasse.BargeldkassenOid" data-toggle="datetimepicker" />
<div class="input-group-append" data-target="#customer-bargeldkasse-start-date-picker-@bargeldkasse.BargeldkassenOid" data-toggle="datetimepicker">
<div class="input-group-text px-2">
<i class="fas fa-calendar-alt"></i>
</div>
</div>
</div>
</div>
</div>
<div class="form-row mt-1">
<div class="col">
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text customer-bargeldkassen-date-prepend">
Startdatum
</span>
</div>
<input class="form-control" type="date" value="@startDate" name="customer-bargeldkasse-start-date" id="customer-bargeldkasse-start-date-@bargeldkasse.BargeldkassenOid"/>
</div>
</div>
</div>
<div class="form-row mt-1">
<div class="col">
<div class="form-group mb-0">
<div class="input-group date ownSoft-date-picker" id="customer-bargeldkasse-end-date-picker-@bargeldkasse.BargeldkassenOid" data-target-input="nearest">
<div class="input-group-prepend">
<div class="input-group-text customer-bargeldkassen-date-prepend">
Enddatum
</div>
</div>
<input type="text" value="@endDate"
autocomplete="on"
id="customer-bargeldkasse-end-date-@bargeldkasse.BargeldkassenOid"
name="customer-bargeldkasse-end-date"
class="form-control datetimepicker-input"
data-target="#customer-bargeldkasse-end-date-picker-@bargeldkasse.BargeldkassenOid"
data-toggle="datetimepicker" />
<div class="input-group-append" data-target="#customer-bargeldkasse-end-date-picker-@bargeldkasse.BargeldkassenOid" data-toggle="datetimepicker">
<div class="input-group-text px-2">
<i class="fas fa-calendar-alt"></i>
</div>
</div>
</div>
</div>
</div>
<div class="col">
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text customer-bargeldkassen-date-prepend">
Enddatum
</span>
</div>
<input class="form-control" type="date" value="@endDate" name="customer-bargeldkasse-end-date" id="customer-bargeldkasse-end-date-@bargeldkasse.BargeldkassenOid"/>
</div>
</div>
</div>
<div class="form-row mt-1">
<div class="col">
<div class="form-group mb-1">
<div class="input-group date ownSoft-date-picker" id="customer-bargeldkasse-stichtag-date-picker-@bargeldkasse.BargeldkassenOid" data-target-input="nearest">
<div class="input-group-prepend">
<div class="input-group-text customer-bargeldkassen-date-prepend">
Stichtag
</div>
</div>
<input type="text" autocomplete="on" id="customer-bargeldkasse-stichtag-date-@bargeldkasse.BargeldkassenOid" name="customer-bargeldkasse-stichtag-date" class="form-control datetimepicker-input" data-target="#customer-bargeldkasse-stichtag-date-picker-@bargeldkasse.BargeldkassenOid" data-toggle="datetimepicker" />
<div class="input-group-append" data-target="#customer-bargeldkasse-stichtag-date-picker-@bargeldkasse.BargeldkassenOid" data-toggle="datetimepicker">
<div class="input-group-text px-2">
<i class="fas fa-calendar-alt"></i>
</div>
</div>
</div>
</div>
</div>
<div class="col">
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text customer-bargeldkassen-date-prepend">
Stichtag
</span>
</div>
<input class="form-control" type="date" name="customer-bargeldkasse-stichtag-date" id="customer-bargeldkasse-stichtag-date-@bargeldkasse.BargeldkassenOid"/>
</div>
</div>
</div>
<div class="w-100">
@*----- Kassenbestand und Anfangsbestand -----*@
@@ -551,7 +479,7 @@
<tr class="bg-white px-0">
<td class="mx-0 px-0" colspan="2">
<div class="btn-group w-100" role="gorup">
<div class="btn-group btn-group-sm w-100" role="group">
@if(transaktion.SignatureOid is null)
{
<button class="btn btn-outline-primary" title="Zahlungsbeleg unterschreiben" type="button" onclick="signZahlungsbeleg(@transaktion.BargeldtransaktionOid, '@zahlungsdatum', '@zahlungsart', '@betrag', '@transaktion.Belegnummer')">

8
BeWoPlanerMobil/Views/Customer/CustomerBargeldkassenFormPartial.cshtml
View File

@@ -56,9 +56,9 @@
function validateBargeldkassenformular() {
try {
var kassenname = $("#bargeldkassennamensinput").val();
const kassenname = $("#bargeldkassennamensinput").val();
if(kassenname === undefined || kassenname === null || kassenname.length === 0) {
if(kassenname === undefined || kassenname === null || kassenname.length === 0) {
$("#bargeldkassenform-validation-alert").html("Der Kassenname darf nicht leer sein.");
$("#bargeldkassenform-validation-alert").removeClass("d-none");
@@ -87,7 +87,7 @@
});
function setAnfangsbestandsinputFilter() {
$("#bargeldkassenanfangsbestand").inputFilter(function (value) {
$("#bargeldkassenanfangsbestandsinput").inputFilter(function (value) {
return /^-?\d*[.,]?\d*$/.test(value);
});
}
@@ -112,7 +112,7 @@
try {
showSpinner();
var selectedAuszahlungsintervall = $("#auszahlungsintervall-select-input :selected").val();
const selectedAuszahlungsintervall = $("#auszahlungsintervall-select-input :selected").val();
$.get("@Url.Action("SetSelectedAuszahlungsintervall")", {auszahlungsintervall: selectedAuszahlungsintervall}).done(function() {
hideSpinner();

70
BeWoPlanerMobil/Views/Customer/CustomerBargeldtransaktionenFormPartial.cshtml
View File

@@ -3,13 +3,6 @@
@model CustomerModel
<script type="text/javascript">
$(function () {
$(".ownSoft-date-picker").datetimepicker({
locale: "de",
format: "L"
});
});
(function ($) {
$.fn.inputFilter = function (inputFilter) {
return this.on("input keydown keyup mouseup select mousedown contextmenu drop", function () {
@@ -30,12 +23,12 @@
var initialBargeldtransaktionsFormPrependWidth = 0;
function calcBargeldtransaktionsFormPrependWidth() {
try {
var maxWidth = getMaxWidth("customer-bargeldtransaktion-prepend");
const maxWidth = getMaxWidth("customer-bargeldtransaktion-prepend");
if(initialBargeldtransaktionsFormPrependWidth <= 0 && $.isNumeric(maxWidth)) {
initialBargeldtransaktionsFormPrependWidth = maxWidth;
}
if (initialBargeldtransaktionsFormPrependWidth <= 0) {
if(initialBargeldtransaktionsFormPrependWidth <= 0) {
return;
}
@@ -81,11 +74,11 @@
try {
showSpinner();
var rawDate = $("#customer-bargeldtransaktionsdatum-input").val();
var rawArt = $("#bargeldtransaktionsarten-select-input").find(":selected").val();
var rawBetrag = $("#bargeldtransaktionsbetragsinput").val().replace(",", ".");
var belegnummer = $("#bargeldtransaktionsbelegnummerinput").val();
var notice = $("#bargeldtransaktionsnotizinput").val();
const rawDate = $("#customer-bargeldtransaktionsdatum-input").val();
const rawArt = $("#bargeldtransaktionsarten-select-input").find(":selected").val();
const rawBetrag = $("#bargeldtransaktionsbetragsinput").val().replace(",", ".");
const belegnummer = $("#bargeldtransaktionsbelegnummerinput").val();
const notice = $("#bargeldtransaktionsnotizinput").val();
$("#customer-bargeldtransaktions-form-popup").modal("hide");
@@ -106,23 +99,21 @@
function validateTransaktionsForm() {
try {
var formattedDate = ddMMyyyyToyyyyMMdd($("#customer-bargeldtransaktionsdatum-input").val());
const datum = moment($("#customer-bargeldtransaktionsdatum-input").val());
var datum = moment(formattedDate);
const betrag = $("#bargeldtransaktionsbetragsinput").val().replace(",", ".");
var betrag = $("#bargeldtransaktionsbetragsinput").val().replace(",", ".");
var validationMessage = "";
let validationMessage = "";
if(datum.isValid() === false) {
validationMessage += "Das gewählte Datum ist ungültig.<br />";
}
if ($.isNumeric(betrag) === false || betrag <= 0) {
if($.isNumeric(betrag) === false || betrag <= 0) {
validationMessage += "Der Betrag muss größer als 0,00 € sein.<br />";
}
if (validationMessage.length > 0) {
if(validationMessage.length > 0) {
$("#transaktionsform-validation-alert").html(validationMessage);
$("#transaktionsform-validation-alert").removeClass("d-none");
@@ -151,7 +142,7 @@
{
if(selectedBargeldtransaktion.Zahlungsdatum.HasValue)
{
transaktionsdatum = selectedBargeldtransaktion.Zahlungsdatum.Value.ToString("dd.MM.yyyy");
transaktionsdatum = selectedBargeldtransaktion.Zahlungsdatum.Value.ToString("yyyy-MM-dd");
}
transaktionsbelegnummer = selectedBargeldtransaktion.Belegnummer;
@@ -167,31 +158,16 @@
@* ----- Datum ----- *@
<div class="form-row mt-2">
<div class="col">
<div class="form-group mb-1">
<div class="input-group date ownSoft-date-picker" id="customer-bargeldtransaktionsdatum-picker" data-target-input="nearest">
<div class="input-group-prepend">
<div class="input-group-text customer-bargeldtransaktion-prepend">
Datum
</div>
</div>
<input type="text" value="@transaktionsdatum"
autocomplete="on"
id="customer-bargeldtransaktionsdatum-input"
name="customer-bargeldtransaktionsdatum"
class="form-control datetimepicker-input"
onchange="validateTransaktionsForm()"
data-target="#customer-bargeldtransaktionsdatum-picker"
data-toggle="datetimepicker" />
<div class="input-group-append" data-target="#customer-bargeldtransaktionsdatum-picker"
data-toggle="datetimepicker">
<div class="input-group-text px-2">
<i class="fas fa-calendar-alt"></i>
</div>
</div>
</div>
</div>
</div>
<div class="col-md">
<div class="input-group mb-1">
<div class="input-group-prepend">
<span class="input-group-text customer-bargeldtransaktion-prepend">
Datum
</span>
</div>
<input class="form-control" type="date" value="@transaktionsdatum" name="customer-bargeldtransaktionsdatum" id="customer-bargeldtransaktionsdatum-input" onchange="validateTransaktionsForm()"/>
</div>
</div>
</div>
@*----- Art -----*@

2
BeWoPlanerMobil/Views/Customer/CustomerBargeldtransaktionshistorienPartial.cshtml
View File

@@ -25,7 +25,7 @@
Geändert von
</td>
<td class="float-right">
@historyEntry.BargeldtransaktionUdpUser
@historyEntry.InsUser
</td>
</tr>
<tr>

12
BeWoPlanerMobil/Views/DevExpressScheduler/SchedulerHelper.cs
View File

@@ -96,15 +96,6 @@ namespace BeWoPlanerMobil.Views.DevExpressScheduler
settings.Views.MonthView.AppointmentDisplayOptions.ShowRecurrence = true;
settings.Views.MonthView.MonthViewStyles.DateCellBody.Height = Unit.Pixel(170);
settings.Views.FullWeekView.Enabled = true;
settings.Views.WeekView.Enabled = false;
settings.Views.MonthView.ResourcesPerPage = 1;
settings.Views.MonthView.AppointmentDisplayOptions.StartTimeVisibility = AppointmentTimeVisibility.Never;
settings.Views.MonthView.AppointmentDisplayOptions.EndTimeVisibility = AppointmentTimeVisibility.Never;
settings.Views.MonthView.AppointmentDisplayOptions.StatusDisplayType = AppointmentStatusDisplayType.Bounds;
settings.Views.MonthView.AppointmentDisplayOptions.ShowRecurrence = true;
settings.Views.MonthView.MonthViewStyles.DateCellBody.Height = Unit.Pixel(170);
TimeScale[] timeScales =
{
new TimeScaleYear { Enabled = false },
@@ -122,9 +113,6 @@ namespace BeWoPlanerMobil.Views.DevExpressScheduler
settings.Storage.Resources.Assign(DefaultResourceStorage);
settings.Storage.Appointments.Assign(DefaultAppointmentStorage);
settings.Storage.Appointments.Assign(DefaultAppointmentStorage);
settings.Storage.Resources.Assign(DefaultResourceStorage);
settings.Views.DayView.Styles.ScrollAreaHeight = new Unit(500);
return settings;

14
BeWoPlanerMobil/Views/DevExpressScheduler/SchedulerPagePartial.cshtml
View File

@@ -1,4 +1,6 @@
@using BeWoPlanerMobil.Views.DevExpressScheduler
@using BS.Shared.DataContracts
@using DevExpress.XtraScheduler
@model BeWoPlanerMobil.Models.DevExpressSchedulerModel
@{
@@ -49,8 +51,20 @@
settings.Storage.Resources.Assign(SchedulerHelper.DefaultResourceStorage);
settings.Storage.Appointments.Assign(SchedulerHelper.DefaultAppointmentStorage);
/*
*
*/
settings.Storage.Appointments.Assign(SchedulerHelper.DefaultAppointmentStorage);
settings.Storage.Resources.Assign(SchedulerHelper.DefaultResourceStorage);
settings.Storage.Appointments.Mappings.Start = nameof(SchedulerAppointmentDC.StartDate);
settings.Storage.Appointments.Mappings.End = nameof(SchedulerAppointmentDC.EndDate);
settings.Storage.Appointments.Mappings.Subject = nameof(SchedulerAppointmentDC.Subject);
settings.Storage.Appointments.Mappings.AllDay = nameof(SchedulerAppointmentDC.AllDay);
settings.Storage.Appointments.Mappings.Description = nameof(SchedulerAppointmentDC.Description);
settings.Storage.Appointments.Mappings.Status = nameof(SchedulerAppointmentDC.Status);
settings.Storage.Appointments.Mappings.Label = nameof(SchedulerAppointmentDC.LabelKey);
settings.Storage.Appointments.Mappings.Type = nameof(SchedulerAppointmentDC.Type);
settings.Views.DayView.Styles.ScrollAreaHeight = new Unit(500);

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