CB: Translation eingebaut

This commit is contained in:
Christian
2017-11-06 10:30:25 +01:00
parent 169b0583e4
commit f7e7b69eab
85 changed files with 3022 additions and 616 deletions

2
.gitignore vendored
View File

@@ -257,3 +257,5 @@
/BeWoPlanerMobil/logs /BeWoPlanerMobil/logs
/Host/logs /Host/logs
/.vs/BeWoGit/v15 /.vs/BeWoGit/v15
/ReportImp/DerKarrenSbd/obj/Debug
/ReportImp/DerKarrenSbd/obj/Release

View File

@@ -29,7 +29,7 @@
</FileUpgradeFlags> </FileUpgradeFlags>
<OldToolsVersion>3.5</OldToolsVersion> <OldToolsVersion>3.5</OldToolsVersion>
<UpgradeBackupLocation /> <UpgradeBackupLocation />
<PublishUrl>D:\Projects\beyondsoft\BeWoPlaner\Publish45\</PublishUrl> <PublishUrl>D:\Projects\beyondsoft\BeWoPlaner\PublishDev\</PublishUrl>
<Install>true</Install> <Install>true</Install>
<InstallFrom>Web</InstallFrom> <InstallFrom>Web</InstallFrom>
<UpdateEnabled>true</UpdateEnabled> <UpdateEnabled>true</UpdateEnabled>
@@ -39,16 +39,16 @@
<UpdatePeriodically>false</UpdatePeriodically> <UpdatePeriodically>false</UpdatePeriodically>
<UpdateRequired>true</UpdateRequired> <UpdateRequired>true</UpdateRequired>
<MapFileExtensions>false</MapFileExtensions> <MapFileExtensions>false</MapFileExtensions>
<InstallUrl>http://app.beyondsoft.de/sbd/</InstallUrl> <InstallUrl>http://app.beyondsoft.de/dev/</InstallUrl>
<TargetCulture>de-DE</TargetCulture> <TargetCulture>de-DE</TargetCulture>
<ProductName>BeWoPlaner</ProductName> <ProductName>BeWoPlaner</ProductName>
<PublisherName>beyondSoft GmbH</PublisherName> <PublisherName>beyondSoft GmbH</PublisherName>
<MinimumRequiredVersion>2.0.1.135</MinimumRequiredVersion> <MinimumRequiredVersion>2.0.1.137</MinimumRequiredVersion>
<CreateWebPageOnPublish>true</CreateWebPageOnPublish> <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
<WebPage>publish.htm</WebPage> <WebPage>publish.htm</WebPage>
<OpenBrowserOnPublish>false</OpenBrowserOnPublish> <OpenBrowserOnPublish>false</OpenBrowserOnPublish>
<TrustUrlParameters>true</TrustUrlParameters> <TrustUrlParameters>true</TrustUrlParameters>
<ApplicationRevision>136</ApplicationRevision> <ApplicationRevision>138</ApplicationRevision>
<ApplicationVersion>2.0.1.%2a</ApplicationVersion> <ApplicationVersion>2.0.1.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust> <UseApplicationTrust>false</UseApplicationTrust>
<CreateDesktopShortcut>true</CreateDesktopShortcut> <CreateDesktopShortcut>true</CreateDesktopShortcut>
@@ -565,6 +565,8 @@
<Compile Include="ConfirmDemoDialog.xaml.cs"> <Compile Include="ConfirmDemoDialog.xaml.cs">
<DependentUpon>ConfirmDemoDialog.xaml</DependentUpon> <DependentUpon>ConfirmDemoDialog.xaml</DependentUpon>
</Compile> </Compile>
<Compile Include="MultiLanguage\Markup\TranslateExtension.cs" />
<Compile Include="MultiLanguage\ServiceTranslator.cs" />
<Compile Include="ProxyLoginView.xaml.cs"> <Compile Include="ProxyLoginView.xaml.cs">
<DependentUpon>ProxyLoginView.xaml</DependentUpon> <DependentUpon>ProxyLoginView.xaml</DependentUpon>
</Compile> </Compile>

View File

@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<PublishUrlHistory>D:\Projects\beyondsoft\BeWoPlaner\Publish45\|D:\Projects\beyondsoft\BeWoPlaner\Publish\|C:\Projects\beyondsoft\BeWoPlaner\Publish\|D:\Projects\BEYONDSOFT\BeWoPlaner\Publish\|C:\Projects\BEYONDSOFT\BeWoPlaner\Publish\</PublishUrlHistory> <PublishUrlHistory>D:\Projects\beyondsoft\BeWoPlaner\PublishDev\|D:\Projects\beyondsoft\BeWoPlaner\Publish45\|D:\Projects\beyondsoft\BeWoPlaner\Publish\|C:\Projects\beyondsoft\BeWoPlaner\Publish\|D:\Projects\BEYONDSOFT\BeWoPlaner\Publish\</PublishUrlHistory>
<InstallUrlHistory>http://app.beyondsoft.de/sbd/|http://app.beyondsoft.de/dev/|http://app.beyondsoft.de/deploy/|http://fortis-bewoplaner.fortis-ev.org.local/|http://FOBP01.fortis-ev.org.local/</InstallUrlHistory> <InstallUrlHistory>http://app.beyondsoft.de/dev/|http://app.beyondsoft.de/sbd/|http://app.beyondsoft.de/deploy/|http://fortis-bewoplaner.fortis-ev.org.local/|http://FOBP01.fortis-ev.org.local/</InstallUrlHistory>
<SupportUrlHistory /> <SupportUrlHistory />
<UpdateUrlHistory /> <UpdateUrlHistory />
<BootstrapperUrlHistory /> <BootstrapperUrlHistory />

View File

@@ -8,7 +8,9 @@
xmlns:microsoftWindowsThemes1="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Classic" xmlns:microsoftWindowsThemes1="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Classic"
StartupUri="MainWindow.xaml" StartupUri="MainWindow.xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d" ShutdownMode="OnExplicitShutdown"> xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup"
mc:Ignorable="d" ShutdownMode="OnExplicitShutdown">
<Application.Resources> <Application.Resources>
<ResourceDictionary> <ResourceDictionary>
<ResourceDictionary.MergedDictionaries> <ResourceDictionary.MergedDictionaries>
@@ -106,7 +108,7 @@
<TextBlock VerticalAlignment="Center" Grid.Column="3" Grid.Row="0" Grid.RowSpan="2" Margin="0,0,3,0" Visibility="{Binding Path=IsDeleted, Converter={StaticResource ReactivationRight2VisibilityConverter}, ConverterParameter=SupportConcept}"> <TextBlock VerticalAlignment="Center" Grid.Column="3" Grid.Row="0" Grid.RowSpan="2" Margin="0,0,3,0" Visibility="{Binding Path=IsDeleted, Converter={StaticResource ReactivationRight2VisibilityConverter}, ConverterParameter=SupportConcept}">
<Hyperlink TargetName="_NewWindow" Foreground="#FFFFFFFF" Click="Hyperlink_Hilfeplan_Reaktivieren_Click" Tag="{Binding}">Reaktivieren</Hyperlink> <Hyperlink TargetName="_NewWindow" Foreground="#FFFFFFFF" Click="Hyperlink_Hilfeplan_Reaktivieren_Click" Tag="{Binding}">Reaktivieren</Hyperlink>
</TextBlock> </TextBlock>
<Button x:Name="btnOpenServiceRecordView" Grid.Column="4" Grid.Row="0" Grid.RowSpan="2" Width="25" Height="25" Style="{DynamicResource TransparentButtonStyle}" ToolTip="In Zeiterfassung öffnen" Tag="{Binding}" Margin="0,0,2,0" Click="btnOpenServiceRecordView_Click"> <Button x:Name="btnOpenServiceRecordView" Grid.Column="4" Grid.Row="0" Grid.RowSpan="2" Width="25" Height="25" Style="{DynamicResource TransparentButtonStyle}" ToolTip="{markup:Translate In Zeiterfassung öffnen}" Tag="{Binding}" Margin="0,0,2,0" Click="btnOpenServiceRecordView_Click">
<Image Source="Ressources\Icons\HistoryDisabled.png" /> <Image Source="Ressources\Icons\HistoryDisabled.png" />
</Button> </Button>
</Grid> </Grid>

View File

@@ -207,7 +207,7 @@ namespace BeWo
AppSettings.ShowAdvisedAttendedFlag = false; AppSettings.ShowAdvisedAttendedFlag = false;
String timeRecordingMenuName = "Zeiterfassung"; String timeRecordingMenuName = "";
if (_Mandator != null) if (_Mandator != null)
{ {
@@ -493,9 +493,9 @@ namespace BeWo
url += ".bewoplaner.de"; url += ".bewoplaner.de";
} }
} }
if (url.IndexOf("/service") < 0) if (url.IndexOf("/servicedev") < 0)
{ {
url += "/service"; url += "/servicedev";
} }
if (ServerAddress == "10.0.116.4") //LH Würzburg if (ServerAddress == "10.0.116.4") //LH Würzburg

View File

@@ -6,6 +6,7 @@
xmlns:localView="clr-namespace:BeWo.View" xmlns:localView="clr-namespace:BeWo.View"
xmlns:r="clr-namespace:BeWo.Security" xmlns:r="clr-namespace:BeWo.Security"
xmlns:BeWo="clr-namespace:BeWo" xmlns:BeWo="clr-namespace:BeWo"
xmlns:t="clr-namespace:BeWo.MultiLanguage.Markup"
Background="{DynamicResource ApplicationBackground}" Background="{DynamicResource ApplicationBackground}"
SnapsToDevicePixels="True" SnapsToDevicePixels="True"
RenderTransformOrigin="0.5,0.5" RenderTransformOrigin="0.5,0.5"
@@ -202,7 +203,7 @@
<localView:ImageButton r:DemandUserRight.VisibleDemands="ViewAll, ServiceRecordView_View" <localView:ImageButton r:DemandUserRight.VisibleDemands="ViewAll, ServiceRecordView_View"
ImageSource="Ressources\Icons\HistoryDisabled.png" x:Name="button_serviceRecord" ImageSource="Ressources\Icons\HistoryDisabled.png" x:Name="button_serviceRecord"
Click="button_serviceRecord_Click" Style="{StaticResource NavBarButton}" Click="button_serviceRecord_Click" Style="{StaticResource NavBarButton}"
Content="Zeiterfassung" Background="{StaticResource ServiceRecordContentBrush}" Content="{t:Translate Zeiterfassung}" Background="{StaticResource ServiceRecordContentBrush}"
RenderTransformOrigin="0.5,0.5" RenderTransformOrigin="0.5,0.5"
Tag="" Width="90" Height="Auto"> Tag="" Width="90" Height="Auto">
<Button.RenderTransform> <Button.RenderTransform>
@@ -217,7 +218,7 @@
<localView:ImageButton r:DemandUserRight.VisibleDemands="AdditionalService_View" <localView:ImageButton r:DemandUserRight.VisibleDemands="AdditionalService_View"
ImageSource="Ressources\Icons\HistoryDisabled.png" x:Name="button_additionalService" ImageSource="Ressources\Icons\HistoryDisabled.png" x:Name="button_additionalService"
Click="button_additionalService_Click" Style="{StaticResource NavBarButton}" Click="button_additionalService_Click" Style="{StaticResource NavBarButton}"
Content="Ergänzende Dienste" Background="{StaticResource AdditionalServiceContentBrush}" Content="{t:Translate Ergänzende Dienste}" Background="{StaticResource AdditionalServiceContentBrush}"
RenderTransformOrigin="0.5,0.5" RenderTransformOrigin="0.5,0.5"
Tag="" Width="120" Height="Auto"> Tag="" Width="120" Height="Auto">
<Button.RenderTransform> <Button.RenderTransform>
@@ -232,7 +233,7 @@
<localView:ImageButton r:DemandUserRight.VisibleDemands="VertretungenView_View" <localView:ImageButton r:DemandUserRight.VisibleDemands="VertretungenView_View"
ImageSource="Ressources\Icons\CoinsDisabled.png" x:Name="button_SchulbegleitenderDienst" ImageSource="Ressources\Icons\CoinsDisabled.png" x:Name="button_SchulbegleitenderDienst"
Click="Button_SchulbegleitenderDienst_OnClick" Style="{StaticResource NavBarButton}" Click="Button_SchulbegleitenderDienst_OnClick" Style="{StaticResource NavBarButton}"
Content="Vertretungen" Background="{StaticResource SchulbegleitenderDienstContentBrush}" Content="{t:Translate Vertretungen}" Background="{StaticResource SchulbegleitenderDienstContentBrush}"
RenderTransformOrigin="0.5,0.5" RenderTransformOrigin="0.5,0.5"
Width="90" > Width="90" >
<Button.RenderTransform> <Button.RenderTransform>
@@ -248,7 +249,7 @@
<localView:ImageButton r:DemandUserRight.VisibleDemands="ViewAll, AccountingTransactionView_View" <localView:ImageButton r:DemandUserRight.VisibleDemands="ViewAll, AccountingTransactionView_View"
ImageSource="Ressources\Icons\CoinsDisabled.png" x:Name="button_AccountingTransacation" ImageSource="Ressources\Icons\CoinsDisabled.png" x:Name="button_AccountingTransacation"
Click="button_AccountingTransacation_Click" Style="{StaticResource NavBarButton}" Click="button_AccountingTransacation_Click" Style="{StaticResource NavBarButton}"
Content="Finanzen" Background="{StaticResource AccountingContentBrush}" Content="{t:Translate Finanzen}" Background="{StaticResource AccountingContentBrush}"
RenderTransformOrigin="0.5,0.5" RenderTransformOrigin="0.5,0.5"
Width="90"> Width="90">
<Button.RenderTransform> <Button.RenderTransform>
@@ -266,7 +267,7 @@
<localView:ImageButton r:DemandUserRight.VisibleDemands="KalenderAnsehen" <localView:ImageButton r:DemandUserRight.VisibleDemands="KalenderAnsehen"
ImageSource="Ressources\Icons\CalendarDisabled.png" x:Name="button_Scheduler" ImageSource="Ressources\Icons\CalendarDisabled.png" x:Name="button_Scheduler"
Click="button_Scheduler_Click" Style="{StaticResource NavBarButton}" Click="button_Scheduler_Click" Style="{StaticResource NavBarButton}"
Content="Kalender" Background="{StaticResource ResourceContentBrush}" Content="{t:Translate Kalender}" Background="{StaticResource ResourceContentBrush}"
RenderTransformOrigin="0.5,0.5" RenderTransformOrigin="0.5,0.5"
Width="90"> Width="90">
<Button.RenderTransform> <Button.RenderTransform>
@@ -296,7 +297,7 @@
<localView:ImageButton r:DemandUserRight.VisibleDemands="ViewAll, ResourceBookingView_View" <localView:ImageButton r:DemandUserRight.VisibleDemands="ViewAll, ResourceBookingView_View"
ImageSource="Ressources\Icons\CalendarDisabled.png" x:Name="button_ResourceBooking" ImageSource="Ressources\Icons\CalendarDisabled.png" x:Name="button_ResourceBooking"
Click="button_ResourceBooking_Click" Style="{StaticResource NavBarButton}" Click="button_ResourceBooking_Click" Style="{StaticResource NavBarButton}"
Content="Ressourcen" Background="{StaticResource ResourceContentBrush}" Content="{t:Translate Ressourcen}" Background="{StaticResource ResourceContentBrush}"
RenderTransformOrigin="0.5,0.5" RenderTransformOrigin="0.5,0.5"
Width="90"> Width="90">
<Button.RenderTransform> <Button.RenderTransform>
@@ -311,7 +312,7 @@
<localView:ImageButton r:DemandUserRight.VisibleDemands="ViewAll, QueryView_View" <localView:ImageButton r:DemandUserRight.VisibleDemands="ViewAll, QueryView_View"
x:Name="button_Reports" Click="button_Reports_Click" x:Name="button_Reports" Click="button_Reports_Click"
Style="{StaticResource NavBarButton}" Style="{StaticResource NavBarButton}"
Content="Auswertungen" Content="{t:Translate Auswertungen}"
Background="{StaticResource ReportContentBrush}" RenderTransformOrigin="0.5,0.5" Background="{StaticResource ReportContentBrush}" RenderTransformOrigin="0.5,0.5"
ImageSource="Ressources\Icons\ChartBarDisabled.png" Width="90"> ImageSource="Ressources\Icons\ChartBarDisabled.png" Width="90">
<Button.RenderTransform> <Button.RenderTransform>
@@ -326,7 +327,7 @@
<localView:ImageButton r:DemandUserRight.VisibleDemands="ViewAll, SupportConceptView_View, SupportConcept_ViewAllSupportConcepts" <localView:ImageButton r:DemandUserRight.VisibleDemands="ViewAll, SupportConceptView_View, SupportConcept_ViewAllSupportConcepts"
x:Name="button_SupportConcept" Click="button_SupportConcept_Click" x:Name="button_SupportConcept" Click="button_SupportConcept_Click"
Style="{StaticResource NavBarButton}" Style="{StaticResource NavBarButton}"
Content="Hilfepläne" Content="{t:Translate Hilfepläne}"
Background="{StaticResource SupportConceptContentBrush}" RenderTransformOrigin="0.5,0.5" Background="{StaticResource SupportConceptContentBrush}" RenderTransformOrigin="0.5,0.5"
ImageSource="Ressources\Icons\IDBadgeDisabled.png" Width="90"> ImageSource="Ressources\Icons\IDBadgeDisabled.png" Width="90">
<Button.RenderTransform> <Button.RenderTransform>
@@ -341,7 +342,7 @@
<localView:ImageButton r:DemandUserRight.VisibleDemands="ViewAll, CustomerView_View, Customer_ViewMyCustomers" <localView:ImageButton r:DemandUserRight.VisibleDemands="ViewAll, CustomerView_View, Customer_ViewMyCustomers"
x:Name="button_Customer" Click="button_Customer_Click" x:Name="button_Customer" Click="button_Customer_Click"
Style="{StaticResource NavBarButton}" Style="{StaticResource NavBarButton}"
Content="Klienten" Content="{t:Translate Klienten}"
Background="{StaticResource CustomerContentBrush}" RenderTransformOrigin="0.5,0.5" Background="{StaticResource CustomerContentBrush}" RenderTransformOrigin="0.5,0.5"
ImageSource="Ressources\Icons\UserHomeMaleDisabled.png" Width="90"> ImageSource="Ressources\Icons\UserHomeMaleDisabled.png" Width="90">
<Button.RenderTransform> <Button.RenderTransform>
@@ -359,7 +360,7 @@
Click="button_CustomerTeam_Click" Click="button_CustomerTeam_Click"
x:Name="button_CustomerTeam" x:Name="button_CustomerTeam"
Style="{StaticResource NavBarButton}" Style="{StaticResource NavBarButton}"
Content="Kliententeams" Content="{t:Translate Kliententeams}"
Background="{StaticResource CustomerTeamContentBrush}" RenderTransformOrigin="0.5, 0.5" Background="{StaticResource CustomerTeamContentBrush}" RenderTransformOrigin="0.5, 0.5"
ImageSource="Ressources/Icons/UserGroupBusinessDisabled.png" Width="90"> ImageSource="Ressources/Icons/UserGroupBusinessDisabled.png" Width="90">
<Button.RenderTransform> <Button.RenderTransform>
@@ -375,7 +376,7 @@
<!--<localView:ImageButton r:DemandUserRight.VisibleDemands="WohnheimView_View" <!--<localView:ImageButton r:DemandUserRight.VisibleDemands="WohnheimView_View"
x:Name="button_Wohnheim" Click="button_Wohnheim_Click" x:Name="button_Wohnheim" Click="button_Wohnheim_Click"
Style="{StaticResource NavBarButton}" Style="{StaticResource NavBarButton}"
Content="Wohnheime" Content="{t:Translate Wohnheime}"
Background="{StaticResource WohnheimContentBrush}" RenderTransformOrigin="0.5,0.5" Background="{StaticResource WohnheimContentBrush}" RenderTransformOrigin="0.5,0.5"
ImageSource="Ressources\Icons\OfficeBulidingBlackDisabled.png" Width="90"> ImageSource="Ressources\Icons\OfficeBulidingBlackDisabled.png" Width="90">
<Button.RenderTransform> <Button.RenderTransform>
@@ -391,7 +392,7 @@
<localView:ImageButton r:DemandUserRight.VisibleDemands="ViewAll, OrganisationView_View" <localView:ImageButton r:DemandUserRight.VisibleDemands="ViewAll, OrganisationView_View"
x:Name="button_Organisation" Click="button_Organisation_Click" x:Name="button_Organisation" Click="button_Organisation_Click"
Style="{StaticResource NavBarButton}" Style="{StaticResource NavBarButton}"
Content="Organisationen" Content="{t:Translate Organisationen}"
Background="{StaticResource OrganisationContentBrush}" RenderTransformOrigin="0.5,0.5" Background="{StaticResource OrganisationContentBrush}" RenderTransformOrigin="0.5,0.5"
ImageSource="Ressources\Icons\OfficeBulidingBlackDisabled.png" Width="90"> ImageSource="Ressources\Icons\OfficeBulidingBlackDisabled.png" Width="90">
<Button.RenderTransform> <Button.RenderTransform>
@@ -405,7 +406,7 @@
</localView:ImageButton> </localView:ImageButton>
<localView:ImageButton r:DemandUserRight.VisibleDemands="ViewAll, PersonView_View" <localView:ImageButton r:DemandUserRight.VisibleDemands="ViewAll, PersonView_View"
x:Name="button_Person" Click="button_Person_Click" Style="{StaticResource NavBarButton}" x:Name="button_Person" Click="button_Person_Click" Style="{StaticResource NavBarButton}"
Content="Personen" Background="{StaticResource PersonContentBrush}" Content="{t:Translate Personen}" Background="{StaticResource PersonContentBrush}"
RenderTransformOrigin="0.5,0.5" RenderTransformOrigin="0.5,0.5"
ImageSource="Ressources\Icons\AnonymousUserDisabled.png" ImageSource="Ressources\Icons\AnonymousUserDisabled.png"
Width="90"> Width="90">
@@ -421,7 +422,7 @@
<localView:ImageButton r:DemandUserRight.VisibleDemands="ViewAll, EmployeeView_View, Employee_AllowViewOwnEmployees, Employee_AllowViewOwnTeam" <localView:ImageButton r:DemandUserRight.VisibleDemands="ViewAll, EmployeeView_View, Employee_AllowViewOwnEmployees, Employee_AllowViewOwnTeam"
x:Name="button_Employee" Click="button_Employee_Click" x:Name="button_Employee" Click="button_Employee_Click"
Style="{StaticResource NavBarButton}" Style="{StaticResource NavBarButton}"
Content="Mitarbeiter" Content="{t:Translate Mitarbeiter}"
Background="{StaticResource EmployeeContentBrush}" RenderTransformOrigin="0.5,0.5" Background="{StaticResource EmployeeContentBrush}" RenderTransformOrigin="0.5,0.5"
ImageSource="Ressources\Icons\UserBusinessMaleDisabled.png" Width="90"> ImageSource="Ressources\Icons\UserBusinessMaleDisabled.png" Width="90">
<Button.RenderTransform> <Button.RenderTransform>
@@ -435,7 +436,7 @@
</localView:ImageButton> </localView:ImageButton>
<localView:ImageButton r:DemandUserRight.VisibleDemands="ViewAll, TeamView_ViewAll, TeamView_ViewMyTeams" <localView:ImageButton r:DemandUserRight.VisibleDemands="ViewAll, TeamView_ViewAll, TeamView_ViewMyTeams"
x:Name="button_Team" Click="button_Team_Click" Style="{StaticResource NavBarButton}" x:Name="button_Team" Click="button_Team_Click" Style="{StaticResource NavBarButton}"
Content="Teams" Background="{StaticResource TeamContentBrush}" Content="{t:Translate Teams}" Background="{StaticResource TeamContentBrush}"
RenderTransformOrigin="0.5,0.5" RenderTransformOrigin="0.5,0.5"
ImageSource="Ressources\Icons\UserGroupBusinessDisabled.png" Width="90"> ImageSource="Ressources\Icons\UserGroupBusinessDisabled.png" Width="90">
<Button.RenderTransform> <Button.RenderTransform>
@@ -449,7 +450,7 @@
</localView:ImageButton> </localView:ImageButton>
<localView:ImageButton r:DemandUserRight.VisibleDemands="ViewAll, UserView_View" <localView:ImageButton r:DemandUserRight.VisibleDemands="ViewAll, UserView_View"
x:Name="button_User" Click="button_User_Click" Style="{StaticResource NavBarButton}" x:Name="button_User" Click="button_User_Click" Style="{StaticResource NavBarButton}"
Content="Benutzer" Background="{StaticResource UserContentBrush}" Content="{t:Translate Benutzer}" Background="{StaticResource UserContentBrush}"
RenderTransformOrigin="0.5,0.5" RenderTransformOrigin="0.5,0.5"
ImageSource="Ressources\Icons\UserBusinessMaleDisabled.png" Width="90"> ImageSource="Ressources\Icons\UserBusinessMaleDisabled.png" Width="90">
<Button.RenderTransform> <Button.RenderTransform>
@@ -464,7 +465,7 @@
<localView:ImageButton r:DemandUserRight.VisibleDemands="ViewAll, UserGroupView_View" <localView:ImageButton r:DemandUserRight.VisibleDemands="ViewAll, UserGroupView_View"
x:Name="button_UserGroup" Click="button_UserGroup_Click" x:Name="button_UserGroup" Click="button_UserGroup_Click"
Style="{StaticResource NavBarButton}" Style="{StaticResource NavBarButton}"
Content="Benutzergruppen" Content="{t:Translate Benutzergruppen}"
Background="{StaticResource UserGroupContentBrush}" RenderTransformOrigin="0.5,0.5" Background="{StaticResource UserGroupContentBrush}" RenderTransformOrigin="0.5,0.5"
ImageSource="Ressources\Icons\UserGroupBusinessDisabled.png" Width="Auto"> ImageSource="Ressources\Icons\UserGroupBusinessDisabled.png" Width="Auto">
<Button.RenderTransform> <Button.RenderTransform>
@@ -479,7 +480,7 @@
<!--<localView:ImageButton r:DemandUserRight.VisibleDemands="ViewAll, AdministrationView_View" <!--<localView:ImageButton r:DemandUserRight.VisibleDemands="ViewAll, AdministrationView_View"
x:Name="button_Template" Click="button_Template_Click" x:Name="button_Template" Click="button_Template_Click"
HorizontalAlignment="Stretch" Style="{StaticResource NavBarButton}" HorizontalAlignment="Stretch" Style="{StaticResource NavBarButton}"
Content="Vorlagen" Content="{t:Translate Vorlagen}"
Background="#FF0045e0" RenderTransformOrigin="0.5,0.5" Background="#FF0045e0" RenderTransformOrigin="0.5,0.5"
ImageSource="Ressources\Icons\MenuDisabled.png" Width="90"> ImageSource="Ressources\Icons\MenuDisabled.png" Width="90">
<Button.RenderTransform> <Button.RenderTransform>
@@ -495,7 +496,7 @@
<localView:ImageButton r:DemandUserRight.VisibleDemands="ViewAll, AdministrationView_View" <localView:ImageButton r:DemandUserRight.VisibleDemands="ViewAll, AdministrationView_View"
x:Name="button_Administration" Click="button_Administration_Click" x:Name="button_Administration" Click="button_Administration_Click"
HorizontalAlignment="Stretch" Style="{StaticResource NavBarButton}" HorizontalAlignment="Stretch" Style="{StaticResource NavBarButton}"
Content="Verwaltung" Content="{t:Translate Verwaltung}"
Background="{StaticResource AdministrationContentBrush}" RenderTransformOrigin="0.5,0.5" Background="{StaticResource AdministrationContentBrush}" RenderTransformOrigin="0.5,0.5"
ImageSource="Ressources\Icons\ConfigurationDisabled.png" Width="90"> ImageSource="Ressources\Icons\ConfigurationDisabled.png" Width="90">
<Button.RenderTransform> <Button.RenderTransform>
@@ -510,7 +511,7 @@
<localView:ImageButton r:DemandUserRight.VisibleDemands="Support_View" <localView:ImageButton r:DemandUserRight.VisibleDemands="Support_View"
x:Name="button_Support" Click="button_Support_Click" x:Name="button_Support" Click="button_Support_Click"
HorizontalAlignment="Stretch" Style="{StaticResource NavBarButton}" HorizontalAlignment="Stretch" Style="{StaticResource NavBarButton}"
Content="Support" Content="{t:Translate Support}"
Background="#FFD4FFCF" RenderTransformOrigin="0.5,0.5" Background="#FFD4FFCF" RenderTransformOrigin="0.5,0.5"
ImageSource="Ressources\Icons\TechSupportWhiteDisabled.png" Width="90"> ImageSource="Ressources\Icons\TechSupportWhiteDisabled.png" Width="90">
<Button.RenderTransform> <Button.RenderTransform>

View File

@@ -87,9 +87,11 @@ namespace BeWo
OpenedModalViewWindows = new List<ModalViewWindow>(); OpenedModalViewWindows = new List<ModalViewWindow>();
button_serviceRecord.Content = BeWoApp.AppSettings.TimeRecordingMenuName; if (!String.IsNullOrWhiteSpace(BeWoApp.AppSettings.TimeRecordingMenuName))
{
BeWoApp.InitAutoUILocking(); button_serviceRecord.Content = BeWoApp.AppSettings.TimeRecordingMenuName;
}
BeWoApp.InitAutoUILocking();
if (this.button_Scheduler.Visibility == Visibility.Visible && !BeWoApp.AppSettings.IsSchedulerAllowed) if (this.button_Scheduler.Visibility == Visibility.Visible && !BeWoApp.AppSettings.IsSchedulerAllowed)
{ {

View File

@@ -5,8 +5,10 @@ using System.Net;
using System.Windows; using System.Windows;
using System.Windows.Controls; using System.Windows.Controls;
using BeWo.Core.Config; using BeWo.Core.Config;
using BeWo.MultiLanguage;
using BeWo.ServiceProxy; using BeWo.ServiceProxy;
using BeWo.View; using BeWo.View;
using BS.Shared.Translation;
namespace BeWo namespace BeWo
@@ -24,13 +26,10 @@ namespace BeWo
private void ShowLoginControl() private void ShowLoginControl()
{ {
//WebRequest.DefaultWebProxy
//System.Net.WebRequest.GetSystemWebProxy()
//WebRequest.DefaultWebProxy
//System.Net.WebRequest.GetSystemWebProxy()
var lc = new LoginControl(); var lc = new LoginControl();
rootGrid.Children.Add(lc); rootGrid.Children.Add(lc);
lc.LoginSuccessful += lc_LoginSuccessful; lc.LoginSuccessful += lc_LoginSuccessful;
@@ -38,12 +37,13 @@ namespace BeWo
void lc_LoginSuccessful(object sender, EventArgs e) void lc_LoginSuccessful(object sender, EventArgs e)
{ {
Translator t = new Translator(new ServiceTranslator());
#if DEBUG #if DEBUG
//if (BeWoApp.Tenant == "demo") //if (BeWoApp.Tenant == "demo")
//{ //{
// var dlg = new ConfirmDemoDialog(); // var dlg = new ConfirmDemoDialog();
// dlg.ShowDialog(); // dlg.ShowDialog();
//} //}
#else #else
if (BeWoApp.Tenant == "demo") if (BeWoApp.Tenant == "demo")
{ {
@@ -59,6 +59,8 @@ namespace BeWo
mc.LogoutClicked += new EventHandler(mc_LogoutClicked); mc.LogoutClicked += new EventHandler(mc_LogoutClicked);
rootGrid.Children.Add(mc); rootGrid.Children.Add(mc);
} }
void mc_LogoutClicked(object sender, EventArgs e) void mc_LogoutClicked(object sender, EventArgs e)

View File

@@ -0,0 +1,24 @@
using System;
using System.Windows.Markup;
using BS.Shared.Translation;
namespace BeWo.MultiLanguage.Markup
{
[MarkupExtensionReturnType]
public class TranslateExtension : MarkupExtension
{
private readonly String key;
public TranslateExtension() { }
public TranslateExtension(String key)
{
this.key = key;
}
public override Object ProvideValue(IServiceProvider serviceProvider)
{
return Translator.Translate(this.key);
}
}
}

View File

@@ -0,0 +1,58 @@
using System;
using System.Collections.Generic;
using System.Globalization;
using System.IO;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using BeWo.ServiceProxy;
using BS.Shared.Translation;
using DevExpress.Xpo.Logger;
namespace BeWo.MultiLanguage
{
public class ServiceTranslator : ITranslator
{
private IDictionary<String, String> dict;
private CultureInfo currentCulture;
public ServiceTranslator()
{
this.Refresh();
}
public void Refresh()
{
this.currentCulture = CultureInfo.CurrentUICulture;
dict = ServiceFacade.DoOperationsServiceSync(s => s.GetTranslationDictionary());
}
public String Translate(String input)
{
if (input == null)
{
return null;
}
if (this.dict != null && this.dict.TryGetValue(input, out var translation))
{
return translation;
}
return input;
}
public String Translate(String input, params Object[] args)
{
String translation;
if (this.dict.TryGetValue(input, out translation))
{
return String.Format(this.currentCulture, translation, args);
}
return String.Format(this.currentCulture, input, args);
}
}
}

View File

@@ -12,6 +12,7 @@
xmlns:view="clr-namespace:BeWo.Scheduler.View" xmlns:view="clr-namespace:BeWo.Scheduler.View"
xmlns:converter="clr-namespace:BeWo.Converter" xmlns:converter="clr-namespace:BeWo.Converter"
xmlns:dxb="http://schemas.devexpress.com/winfx/2008/xaml/bars" xmlns:dxb="http://schemas.devexpress.com/winfx/2008/xaml/bars"
xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup"
Height="Auto" Width="Auto" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Focusable="True"> Height="Auto" Width="Auto" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Focusable="True">
<localView:BeWoView.Resources> <localView:BeWoView.Resources>
<ResourceDictionary> <ResourceDictionary>
@@ -395,7 +396,7 @@
<TextBlock Grid.Row="2" Grid.Column="1" Text="{Binding Path=CustomViewInfo, Converter={StaticResource AppointmentToolTipConverter}, ConverterParameter=Ressourcen}" <TextBlock Grid.Row="2" Grid.Column="1" Text="{Binding Path=CustomViewInfo, Converter={StaticResource AppointmentToolTipConverter}, ConverterParameter=Ressourcen}"
Visibility="{Binding Path=CustomViewInfo, Converter={StaticResource CustomField2VisibilityConverter}, ConverterParameter=Ressourcen}" /> Visibility="{Binding Path=CustomViewInfo, Converter={StaticResource CustomField2VisibilityConverter}, ConverterParameter=Ressourcen}" />
<TextBlock Margin="0,0,3,0" Grid.Row="3" Grid.Column="0" Text="Mitarbeiter:" Visibility="{Binding Path=CustomViewInfo, Converter={StaticResource CustomField2VisibilityConverter}, ConverterParameter=Mitarbeiter}" /> <TextBlock Margin="0,0,3,0" Grid.Row="3" Grid.Column="0" Text="{markup:Translate Mitarbeiter:}" Visibility="{Binding Path=CustomViewInfo, Converter={StaticResource CustomField2VisibilityConverter}, ConverterParameter=Mitarbeiter}" />
<ListView Margin="-6,-3,0,0" Grid.Row="3" Background="Transparent" BorderThickness="0" ItemsSource="{Binding Path=CustomViewInfo, Converter={StaticResource NichtNochEinConverter}, ConverterParameter=ListenQuelle}" Grid.Column="1" Visibility="{Binding Path=CustomViewInfo, Converter={StaticResource CustomField2VisibilityConverter}, ConverterParameter=Mitarbeiter}"> <ListView Margin="-6,-3,0,0" Grid.Row="3" Background="Transparent" BorderThickness="0" ItemsSource="{Binding Path=CustomViewInfo, Converter={StaticResource NichtNochEinConverter}, ConverterParameter=ListenQuelle}" Grid.Column="1" Visibility="{Binding Path=CustomViewInfo, Converter={StaticResource CustomField2VisibilityConverter}, ConverterParameter=Mitarbeiter}">
<ListView.ItemsPanel> <ListView.ItemsPanel>
@@ -420,7 +421,7 @@
</ListView.ItemTemplate> </ListView.ItemTemplate>
</ListView> </ListView>
<TextBlock Margin="0,0,3,0" Grid.Row="4" Grid.Column="0" Text="Klienten:" Visibility="{Binding Path=CustomViewInfo, Converter={StaticResource CustomField2VisibilityConverter}, ConverterParameter=Klienten}" /> <TextBlock Margin="0,0,3,0" Grid.Row="4" Grid.Column="0" Text="{markup:Translate Klienten:}" Visibility="{Binding Path=CustomViewInfo, Converter={StaticResource CustomField2VisibilityConverter}, ConverterParameter=Klienten}" />
<TextBlock Grid.Row="4" Grid.Column="1" Text="{Binding Path=CustomViewInfo, Converter={StaticResource AppointmentToolTipConverter}, ConverterParameter=Klienten}" <TextBlock Grid.Row="4" Grid.Column="1" Text="{Binding Path=CustomViewInfo, Converter={StaticResource AppointmentToolTipConverter}, ConverterParameter=Klienten}"
Visibility="{Binding Path=CustomViewInfo, Converter={StaticResource CustomField2VisibilityConverter}, ConverterParameter=Klienten}" /> Visibility="{Binding Path=CustomViewInfo, Converter={StaticResource CustomField2VisibilityConverter}, ConverterParameter=Klienten}" />
</Grid> </Grid>
@@ -645,7 +646,7 @@
<ColumnDefinition Width="*" /> <ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" /> <ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<CheckBox Grid.Column="0" Content="Mitarbeiterfarben Ein/Aus" x:Name="MitarbeiterfarbenEinAusCheckBox" Checked="MitarbeiterfarbenEinAusCheckBox_OnChecked" <CheckBox Grid.Column="0" Content="{markup:Translate Mitarbeiterfarben Ein/Aus}" x:Name="MitarbeiterfarbenEinAusCheckBox" Checked="MitarbeiterfarbenEinAusCheckBox_OnChecked"
Unchecked="MitarbeiterfarbenEinAusCheckBox_OnChecked" Unchecked="MitarbeiterfarbenEinAusCheckBox_OnChecked"
IsChecked="{Binding Path=IsEmployeeBrushVisible, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type view:NewSchedulerView}}, Mode=TwoWay}" /> IsChecked="{Binding Path=IsEmployeeBrushVisible, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type view:NewSchedulerView}}, Mode=TwoWay}" />
<CheckBox Grid.Column="1" Content="Abwesenheiten Ein/Aus" Margin="17,0,0,0" x:Name="AbwesenheitenEinAusCheckBox" Checked="AbwesenheitenEinAusCheckBox_OnChecked" <CheckBox Grid.Column="1" Content="Abwesenheiten Ein/Aus" Margin="17,0,0,0" x:Name="AbwesenheitenEinAusCheckBox" Checked="AbwesenheitenEinAusCheckBox_OnChecked"
@@ -683,7 +684,7 @@
<CheckBox x:Name="ZeigeNurMeineTermineCheckBox" Grid.Row="0" Content="Nur meine Termine anzeigen" Margin="3, 3, 3, 3" IsChecked="{Binding Path=ZeigeNurMeineTermine, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" Checked="NurMeineTermineEinAusCheckBox_OnChecked" Unchecked="NurMeineTermineEinAusCheckBox_OnChecked" /> <CheckBox x:Name="ZeigeNurMeineTermineCheckBox" Grid.Row="0" Content="Nur meine Termine anzeigen" Margin="3, 3, 3, 3" IsChecked="{Binding Path=ZeigeNurMeineTermine, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" Checked="NurMeineTermineEinAusCheckBox_OnChecked" Unchecked="NurMeineTermineEinAusCheckBox_OnChecked" />
<UniformGrid Grid.Column="0" x:Name="AuswahlGrid" Rows="2" Columns="1" Width="270" Grid.Row="1"> <UniformGrid Grid.Column="0" x:Name="AuswahlGrid" Rows="2" Columns="1" Width="270" Grid.Row="1">
<TabControl SelectionChanged="Selector_OnSelectionChanged" x:Name="TabControl"> <TabControl SelectionChanged="Selector_OnSelectionChanged" x:Name="TabControl">
<TabItem Header="Mitarbeiter" Style="{StaticResource MitarbeiterTabItemStyle}" x:Name="MitarbieterTabItem"> <TabItem Header="{markup:Translate Mitarbeiter}" Style="{StaticResource MitarbeiterTabItemStyle}" x:Name="MitarbieterTabItem">
<Grid x:Name="MitarbeiterTabGrid"> <Grid x:Name="MitarbeiterTabGrid">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="*" /> <ColumnDefinition Width="*" />
@@ -785,7 +786,7 @@
</ListView> </ListView>
</Grid> </Grid>
</TabItem> </TabItem>
<TabItem x:Name="KlientenTabItem" Header="Klienten" Style="{StaticResource KlientenTabItemStyle}"> <TabItem x:Name="KlientenTabItem" Header="{markup:Translate Klienten}" Style="{StaticResource KlientenTabItemStyle}">
<Grid> <Grid>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
@@ -802,7 +803,7 @@
<RowDefinition Height="*" /> <RowDefinition Height="*" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<CheckBox Grid.Row="0" Grid.Column="0" Content="Alle auswählen" Margin="3" x:Name="AlleKlientenCB" Click="AlleKlientennCB_OnClick" HorizontalAlignment="Left" HorizontalContentAlignment="Center" /> <CheckBox Grid.Row="0" Grid.Column="0" Content="Alle auswählen" Margin="3" x:Name="AlleKlientenCB" Click="AlleKlientennCB_OnClick" HorizontalAlignment="Left" HorizontalContentAlignment="Center" />
<CheckBox Grid.Row="0" Grid.Column="1" Content="Nur meine Klienten" Margin="3" x:Name="NurMeineKlientenCB" HorizontalAlignment="Right" Click="NurEigeneKlientenAnzeigen" IsThreeState="False" HorizontalContentAlignment="Center" /> <CheckBox Grid.Row="0" Grid.Column="1" Content="{markup:Translate Nur meine Klienten}" Margin="3" x:Name="NurMeineKlientenCB" HorizontalAlignment="Right" Click="NurEigeneKlientenAnzeigen" IsThreeState="False" HorizontalContentAlignment="Center" />
<ToggleButton Margin="3" Grid.Row="0" Grid.Column="2" Height="17" Width="36" Style="{StaticResource LupenToggleButtonStyle}" x:Name="MeinTB2" Checked="MeinTB2_OnChecked" Unchecked="MeinTB2_OnChecked" /> <ToggleButton Margin="3" Grid.Row="0" Grid.Column="2" Height="17" Width="36" Style="{StaticResource LupenToggleButtonStyle}" x:Name="MeinTB2" Checked="MeinTB2_OnChecked" Unchecked="MeinTB2_OnChecked" />
<Grid x:Name="KlientenSuchGrid" Margin="0,1,0,3" Grid.Column="0" Grid.ColumnSpan="3" Background="Black" Grid.Row="1" Visibility="Collapsed"> <Grid x:Name="KlientenSuchGrid" Margin="0,1,0,3" Grid.Column="0" Grid.ColumnSpan="3" Background="Black" Grid.Row="1" Visibility="Collapsed">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
@@ -951,12 +952,12 @@
</UniformGrid> </UniformGrid>
</Grid> </Grid>
<StackPanel x:Name="FilterCheckBoxenStackPanel" Orientation="Vertical" Grid.Column="1" HorizontalAlignment="Center"> <StackPanel x:Name="FilterCheckBoxenStackPanel" Orientation="Vertical" Grid.Column="1" HorizontalAlignment="Center">
<CheckBox x:Name="MitarbeiterEbenenCheckBox" Content="Nur Mitarbeiter" SnapsToDevicePixels="True" Margin="0,3,0,3" Checked="ListItemCheckedEvent" Unchecked="ListItemCheckedEvent" IsThreeState="False"> <CheckBox x:Name="MitarbeiterEbenenCheckBox" Content="{markup:Translate Nur Mitarbeiter}" SnapsToDevicePixels="True" Margin="0,3,0,3" Checked="ListItemCheckedEvent" Unchecked="ListItemCheckedEvent" IsThreeState="False">
<CheckBox.LayoutTransform> <CheckBox.LayoutTransform>
<RotateTransform CenterX="0.5" CenterY="0.5" Angle="270" /> <RotateTransform CenterX="0.5" CenterY="0.5" Angle="270" />
</CheckBox.LayoutTransform> </CheckBox.LayoutTransform>
</CheckBox> </CheckBox>
<CheckBox x:Name="KlientenEbenenCheckBox" Content="Nur Klienten" SnapsToDevicePixels="True" Margin="0,0,0,3" Checked="ListItemCheckedEvent" Unchecked="ListItemCheckedEvent" IsThreeState="False"> <CheckBox x:Name="KlientenEbenenCheckBox" Content="{markup:Translate Nur Klienten}" SnapsToDevicePixels="True" Margin="0,0,0,3" Checked="ListItemCheckedEvent" Unchecked="ListItemCheckedEvent" IsThreeState="False">
<CheckBox.LayoutTransform> <CheckBox.LayoutTransform>
<RotateTransform CenterX="0.5" CenterY="0.5" Angle="270" /> <RotateTransform CenterX="0.5" CenterY="0.5" Angle="270" />
</CheckBox.LayoutTransform> </CheckBox.LayoutTransform>
@@ -1033,7 +1034,7 @@
<dxb:AddBarItemAction> <dxb:AddBarItemAction>
<dxb:BarButtonItem Name="MitarbeiterVerfuegbarkeitPruefenButtonItem" <dxb:BarButtonItem Name="MitarbeiterVerfuegbarkeitPruefenButtonItem"
Content="Verfügbare Mitarbeiter anzeigen" Content="{markup:Translate Verfügbare Mitarbeiter anzeigen}"
ItemClick="MitarbeiterVerfuegbarkeitPruefenButtonItem_OnItemClick" /> ItemClick="MitarbeiterVerfuegbarkeitPruefenButtonItem_OnItemClick" />
</dxb:AddBarItemAction> </dxb:AddBarItemAction>
@@ -1050,11 +1051,11 @@
<dxb:BarButtonItem Name="AbsagenButtonItem" Content="Absagen" ItemClick="AbsagenButtonItem_OnItemClick" /> <dxb:BarButtonItem Name="AbsagenButtonItem" Content="Absagen" ItemClick="AbsagenButtonItem_OnItemClick" />
</dxb:AddBarItemAction> </dxb:AddBarItemAction>
<dxb:AddBarItemAction> <dxb:AddBarItemAction>
<dxb:BarButtonItem Name="ZeiterfassungButtonItem" Content="In Zeiterfassung übertragen" ItemClick="ZeiterfassungButtonItem_OnItemClick" /> <dxb:BarButtonItem Name="ZeiterfassungButtonItem" Content="{markup:Translate In Zeiterfassung übertragen}" ItemClick="ZeiterfassungButtonItem_OnItemClick" />
</dxb:AddBarItemAction> </dxb:AddBarItemAction>
<dxb:AddBarItemAction> <dxb:AddBarItemAction>
<dxb:BarButtonItem Name="MitarbeiterVerfuegbarkeitPruefenButtonItem2" <dxb:BarButtonItem Name="MitarbeiterVerfuegbarkeitPruefenButtonItem2"
Content="Verfügbare Mitarbeiter anzeigen" Content="{markup:Translate Verfügbare Mitarbeiter anzeigen}"
ItemClick="MitarbeiterVerfuegbarkeitPruefenButtonItem_OnItemClick" /> ItemClick="MitarbeiterVerfuegbarkeitPruefenButtonItem_OnItemClick" />
</dxb:AddBarItemAction> </dxb:AddBarItemAction>
<dxb:RemoveBarItemAndLinkAction ItemName="{x:Static dxsch:SchedulerMenuItemName.StatusSubMenu}" /> <dxb:RemoveBarItemAndLinkAction ItemName="{x:Static dxsch:SchedulerMenuItemName.StatusSubMenu}" />

View File

@@ -24,7 +24,7 @@ using BS.Shared.Core;
using BS.Shared.DataContracts; using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact; using BS.Shared.DataContracts.Compact;
using BS.Shared.Extensions; using BS.Shared.Extensions;
using BS.Shared.Translation;
using DevExpress.Xpf.Bars; using DevExpress.Xpf.Bars;
using DevExpress.Xpf.Editors; using DevExpress.Xpf.Editors;
using DevExpress.Xpf.Scheduler; using DevExpress.Xpf.Scheduler;
@@ -934,11 +934,11 @@ namespace BeWo.Scheduler.View
if ((m.Any() || r.Any() || k.Any()) && ZeigeNurMeineTermineCheckBox.IsChecked == false) if ((m.Any() || r.Any() || k.Any()) && ZeigeNurMeineTermineCheckBox.IsChecked == false)
{ {
e.Cancel = ViewModel.ActiveAppointmentViewModel.HideAppointment("NachAuswahl", new Dictionary<string, object> { { "Mitarbeiter", m }, { "Ressourcen", r }, { "Klienten", k } }, (Appointment) e.Object, showOnlyPrivateApps, IsAbsenceTimeVisible); e.Cancel = ViewModel.ActiveAppointmentViewModel.HideAppointment("NachAuswahl", new Dictionary<string, object> { { Translator.Translate("Mitarbeiter"), m }, { "Ressourcen", r }, { Translator.Translate("Klienten"), k } }, (Appointment) e.Object, showOnlyPrivateApps, IsAbsenceTimeVisible);
return; return;
} }
e.Cancel = ViewModel.ActiveAppointmentViewModel.HideAppointment("NurEigene", new Dictionary<string, object> { { "Mitarbeiter", m }, { "Ressourcen", r }, { "Klienten", k }, {"Teams", EmployeesTeams} }, (Appointment) e.Object, showOnlyPrivateApps, IsAbsenceTimeVisible); e.Cancel = ViewModel.ActiveAppointmentViewModel.HideAppointment("NurEigene", new Dictionary<string, object> { { Translator.Translate("Mitarbeiter"), m }, { "Ressourcen", r }, { Translator.Translate("Klienten"), k }, {Translator.Translate("Teams"), EmployeesTeams} }, (Appointment) e.Object, showOnlyPrivateApps, IsAbsenceTimeVisible);
} }
private void NewSchedulerStorage_AppointmentDeleting(object sender, PersistentObjectCancelEventArgs e) private void NewSchedulerStorage_AppointmentDeleting(object sender, PersistentObjectCancelEventArgs e)
@@ -1288,22 +1288,25 @@ namespace BeWo.Scheduler.View
var klientenPinsel = new LinearGradientBrush(new GradientStopCollection { new GradientStop(Color.FromRgb(59, 119, 153), 0), new GradientStop(Color.FromRgb(25, 72, 92), 1) }, new Point(0.5, 0), new Point(0.5, 1)); var klientenPinsel = new LinearGradientBrush(new GradientStopCollection { new GradientStop(Color.FromRgb(59, 119, 153), 0), new GradientStop(Color.FromRgb(25, 72, 92), 1) }, new Point(0.5, 0), new Point(0.5, 1));
var ressourcenPinsel = new LinearGradientBrush(new GradientStopCollection { new GradientStop(Color.FromRgb(4, 180, 208), 0), new GradientStop(Color.FromRgb(3, 129, 149), 1) }, new Point(0.5, 0), new Point(0.5, 1)); var ressourcenPinsel = new LinearGradientBrush(new GradientStopCollection { new GradientStop(Color.FromRgb(4, 180, 208), 0), new GradientStop(Color.FromRgb(3, 129, 149), 1) }, new Point(0.5, 0), new Point(0.5, 1));
switch (selectedItem.Header.ToString()) var h = selectedItem.Header.ToString();
{
case "Mitarbeiter": if (h == Translator.Translate("Mitarbeiter"))
tabControl.Background = mitarbeiterPinsel; {
tabControl.BorderBrush = mitarbeiterPinsel; tabControl.Background = mitarbeiterPinsel;
break; tabControl.BorderBrush = mitarbeiterPinsel;
case "Klienten": }
tabControl.Background = klientenPinsel; else if (h == Translator.Translate("Klienten"))
tabControl.BorderBrush = klientenPinsel; {
break; tabControl.Background = klientenPinsel;
case "Ressourcen": tabControl.BorderBrush = klientenPinsel;
tabControl.Background = ressourcenPinsel; }
tabControl.BorderBrush = ressourcenPinsel; else
break; {
} tabControl.Background = ressourcenPinsel;
tabControl.BorderBrush = ressourcenPinsel;
}
} }
private void ReloadButton_OnClick(object sender, RoutedEventArgs e) private void ReloadButton_OnClick(object sender, RoutedEventArgs e)
{ {
@@ -1928,7 +1931,7 @@ namespace BeWo.Scheduler.View
{ {
return Visibility.Collapsed; return Visibility.Collapsed;
} }
switch (parameter.ToString()) switch (parameter.ToString())
{ {
case "Ressourcen": case "Ressourcen":

View File

@@ -4433,6 +4433,10 @@ namespace BeWo.ServiceProxy
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/DeletCustomerChatCodeBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/DeletCustomerChatCodeBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
bool DeletCustomerChatCode(string apikey, string kundennummer, long userOid); bool DeletCustomerChatCode(string apikey, string kundennummer, long userOid);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/GetTranslationDictionary", ReplyAction="http://tempuri.org/IOperationsService/GetTranslationDictionaryResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetTranslationDictionaryBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
System.Collections.Generic.Dictionary<string, string> GetTranslationDictionary();
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/DeactivateInvoices", ReplyAction="http://tempuri.org/IOperationsService/DeactivateInvoicesResponse")] [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/DeactivateInvoices", ReplyAction="http://tempuri.org/IOperationsService/DeactivateInvoicesResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/DeactivateInvoicesBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/DeactivateInvoicesBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
void DeactivateInvoices(System.Collections.Generic.List<BS.Shared.DataContracts.InvoiceDC> invoices); void DeactivateInvoices(System.Collections.Generic.List<BS.Shared.DataContracts.InvoiceDC> invoices);
@@ -5263,6 +5267,11 @@ namespace BeWo.ServiceProxy
return base.Channel.DeletCustomerChatCode(apikey, kundennummer, userOid); return base.Channel.DeletCustomerChatCode(apikey, kundennummer, userOid);
} }
public System.Collections.Generic.Dictionary<string, string> GetTranslationDictionary()
{
return base.Channel.GetTranslationDictionary();
}
public void DeactivateInvoices(System.Collections.Generic.List<BS.Shared.DataContracts.InvoiceDC> invoices) public void DeactivateInvoices(System.Collections.Generic.List<BS.Shared.DataContracts.InvoiceDC> invoices)
{ {
base.Channel.DeactivateInvoices(invoices); base.Channel.DeactivateInvoices(invoices);

View File

@@ -37,7 +37,7 @@
<RowDefinition Height="*" /> <RowDefinition Height="*" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Label Content="Chat-Code:" x:Name="lblGenerateCode" Grid.Column="0" Grid.Row="0" Margin="3" VerticalAlignment="Center" HorizontalAlignment="Left" Height="21" /> <Label Content="Chat-Code" x:Name="lblGenerateCode" Grid.Column="0" Grid.Row="0" Margin="3" VerticalAlignment="Center" HorizontalAlignment="Left" Height="21" />
<TextBox Grid.Column="1" Grid.Row="0" Margin="3" Height="23" MinWidth="120" x:Name="GeneratetTexfield" IsReadOnly="True"/> <TextBox Grid.Column="1" Grid.Row="0" Margin="3" Height="23" MinWidth="120" x:Name="GeneratetTexfield" IsReadOnly="True"/>
@@ -50,14 +50,23 @@
<Button Grid.Row="0" Grid.Column="3" Margin="3" Height="23" Click="RemoveCode_OnClick" ToolTip="Aktuellen Chat-Code löschen." x:Name="RemoveButton" Visibility="Collapsed"> <Button Grid.Row="0" Grid.Column="3" Margin="3" Height="23" Click="RemoveCode_OnClick" ToolTip="Aktuellen Chat-Code löschen." x:Name="RemoveButton" Visibility="Collapsed">
<Image Height="15" Width="15" Source='/Ressources/Icons/Symbol Delete.png' Margin="3" RenderOptions.BitmapScalingMode="HighQuality" HorizontalAlignment="Center" /> <Image Height="15" Width="15" Source='/Ressources/Icons/Symbol Delete.png' Margin="3" RenderOptions.BitmapScalingMode="HighQuality" HorizontalAlignment="Center" />
</Button> </Button>
<Label Grid.Row="1" Grid.Column="0" Content="Benutzername" Margin="3" />
<TextBox Grid.Row="1" Grid.Column="1" Margin="3" x:Name="TXTBenutzerName" />
<Label Grid.Row="2" Grid.Column="0" Content="Passwort" Margin="3" />
<TextBox Grid.Row="2" Grid.Column="1" Margin="3" x:Name="TXTPasswort" />
<Button Content="Speichern" Click="SpeicherButton_OnClick" Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2" Margin="3" HorizontalAlignment="Right" />
<!-- <Label x:Name="lblIsChatAktive" Grid.Column="0" Grid.Row="1" Margin="3" Content="Chat Aktivieren" />--> <!-- <Label x:Name="lblIsChatAktive" Grid.Column="0" Grid.Row="1" Margin="3" Content="Chat Aktivieren" />-->
<!--<CheckBox x:Name="ChatAktive" Grid.Column="1" Grid.Row="1" Margin="3" Height="23" Checked="CheckBox_Checked" Unchecked="CheckBox_Unchecked"/>--> <!--<CheckBox x:Name="ChatAktive" Grid.Column="1" Grid.Row="1" Margin="3" Height="23" Checked="CheckBox_Checked" Unchecked="CheckBox_Unchecked"/>-->
<GroupBox Margin="3" Grid.Row="2" Grid.RowSpan="2" Grid.Column="0" Grid.ColumnSpan="4" Header="ownChat Benutzer Konto" Style="{x:Null}" x:Name="CustomerBenutzerKontoGroupBox" Visibility="Collapsed"> <!--<GroupBox Margin="3" Grid.Row="2" Grid.RowSpan="2" Grid.Column="0" Grid.ColumnSpan="4" Header="ownChat Benutzerkonto" Style="{x:Null}" x:Name="CustomerBenutzerKontoGroupBox" Visibility="Visible">
<!-- ####################### Style Design gedönse ## --> --><!-- ####################### Style Design gedönse ## --><!--
<GroupBox.Template> <GroupBox.Template>
<ControlTemplate TargetType="{x:Type GroupBox}"> <ControlTemplate TargetType="{x:Type GroupBox}">
<Grid SnapsToDevicePixels="true"> <Grid SnapsToDevicePixels="true">
@@ -98,7 +107,7 @@
</Grid> </Grid>
</ControlTemplate> </ControlTemplate>
</GroupBox.Template> </GroupBox.Template>
<!-- ################################################ --> --><!-- ################################################ --><!--
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" /> <ColumnDefinition Width="Auto" />
@@ -111,15 +120,15 @@
<RowDefinition Height="*" /> <RowDefinition Height="*" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Label Grid.Row="0" Grid.Column="0" Content="Benutzer Name" Margin="3" /> <!-- row 2 | column 0 && 1--> <Label Grid.Row="0" Grid.Column="0" Content="Benutzername" Margin="3" /> --><!-- row 2 | column 0 && 1--><!--
<TextBox Grid.Row="0" Grid.Column="1" Margin="3" x:Name="TXTBenutzerName" /> <TextBox Grid.Row="0" Grid.Column="1" Margin="3" x:Name="TXTBenutzerName" />
<Label Grid.Row="1" Grid.Column="0" Content="Passwort" Margin="3" /> <!-- row 3 | column 0 && 1 --> <Label Grid.Row="1" Grid.Column="0" Content="Passwort" Margin="3" /> --><!-- row 3 | column 0 && 1 --><!--
<TextBox Grid.Row="1" Grid.Column="1" Margin="3" x:Name="TXTPasswort" /> <TextBox Grid.Row="1" Grid.Column="1" Margin="3" x:Name="TXTPasswort" />
<Button Content="Speichern" Click="SpeicherButton_OnClick" Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2" Margin="3" HorizontalAlignment="Right" /> <!-- row 4 | column 0--> <Button Content="Speichern" Click="SpeicherButton_OnClick" Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2" Margin="3" HorizontalAlignment="Right" /> --><!-- row 4 | column 0--><!--
</Grid> </Grid>
</GroupBox> </GroupBox>-->
<Button Grid.Column="4" Grid.Row="0" Click="ZeigeHandoutPDF_OnClick " Margin="3" VerticalAlignment="Center" HorizontalAlignment="Left" Height="23" ToolTip="ownChat Kurzanleitung für Klient herunterladen." x:Name="CustomerHandoutButton" Visibility="Collapsed"> <Button Grid.Column="4" Grid.Row="0" Click="ZeigeHandoutPDF_OnClick " Margin="3" VerticalAlignment="Center" HorizontalAlignment="Left" Height="23" ToolTip="ownChat Kurzanleitung für Klient herunterladen." x:Name="CustomerHandoutButton" Visibility="Collapsed">

View File

@@ -158,7 +158,7 @@ namespace BeWo.View
//Abfrage mit null catchen //Abfrage mit null catchen
if (!GeneratetTexfield.Text.Equals("") && BeWoApp.Tenant != null && BeWoApp.Mandator.Apikey != null) if (!GeneratetTexfield.Text.Equals("") && BeWoApp.Tenant != null && BeWoApp.Mandator.Apikey != null)
{ {
if (MessageBox.Show("Wollen Sie wirklich den Chat-Code ändern?\nAlle Daten auf Mobilgeräte werden gelöscht.", "Achtung", MessageBoxButton.YesNo, if (MessageBox.Show("Wollen Sie wirklich den Chat-Code ändern?\nAlle Daten auf Mobilgeräte werden gelöscht.", "Chat-Code ändern", MessageBoxButton.YesNo,
MessageBoxImage.Question) == MessageBoxResult.Yes) MessageBoxImage.Question) == MessageBoxResult.Yes)
{ {
StartWaiting(); StartWaiting();
@@ -169,7 +169,7 @@ namespace BeWo.View
if(result != null){ if(result != null){
GeneratetTexfield.Text = result.CustomerCode; GeneratetTexfield.Text = result.CustomerCode;
}else{ }else{
MessageBox.Show("Beim erstellen eines neuen Chat-Codes ist ein Fehler aufgetreten."); MessageBox.Show("Beim erstellen eines neuen Chat-Codes ist ein Fehler aufgetreten.", "Chat-Code erstellen", MessageBoxButton.OK, MessageBoxImage.Exclamation);
} }
//GeneratetTexfield.Text = result.CustomerCode; //GeneratetTexfield.Text = result.CustomerCode;
@@ -183,14 +183,17 @@ namespace BeWo.View
if(result != null){ if(result != null){
GeneratetTexfield.Text = result.CustomerCode; GeneratetTexfield.Text = result.CustomerCode;
}else{ }else
MessageBox.Show("Beim Erstellen eines neuen Chat-Codes ist ein Fehler aufgetreten."); {
MessageBox.Show("Beim Erstellen eines neuen Chat-Codes ist ein Fehler aufgetreten.",
"Chat-Code erstellen", MessageBoxButton.OK, MessageBoxImage.Exclamation);
} }
//GeneratetTexfield.Text = result.CustomerCode; //GeneratetTexfield.Text = result.CustomerCode;
} }
else else
{ {
MessageBox.Show("Sie besitzen derzeit keinen API-Key. Bitte wenden sie sich an den Support.","Info",MessageBoxButton.OK); MessageBox.Show("Sie besitzen derzeit keinen API-Key. Bitte wenden sie sich an den Support.", "Info",
MessageBoxButton.OK, MessageBoxImage.Exclamation);
} }
//#endif //#endif
} }
@@ -225,7 +228,7 @@ namespace BeWo.View
//lblGenerateCode.Content = "Chat-Code erneuern"; //lblGenerateCode.Content = "Chat-Code erneuern";
RemoveButton.Visibility = Visibility.Visible; RemoveButton.Visibility = Visibility.Visible;
CustomerHandoutButton.Visibility = Visibility.Visible; CustomerHandoutButton.Visibility = Visibility.Visible;
CustomerBenutzerKontoGroupBox.Visibility = Visibility.Visible; // CustomerBenutzerKontoGroupBox.Visibility = Visibility.Visible;
ButtonGenerateCode.ToolTip = "Chat-Code erneuern"; ButtonGenerateCode.ToolTip = "Chat-Code erneuern";
var image = new Image var image = new Image
@@ -311,19 +314,19 @@ namespace BeWo.View
s.SetBenutzerPasswortChatAppCode(customerOid.Value, TXTBenutzerName.Text, s.SetBenutzerPasswortChatAppCode(customerOid.Value, TXTBenutzerName.Text,
TXTPasswort.Text)); TXTPasswort.Text));
EndWaiting(); EndWaiting();
MessageBox.Show("Speichern Erfolgreich.", "Info"); MessageBox.Show("Benutzername und Passwort wurden erfolgreich gespeichert.", "Speichern", MessageBoxButton.OK, MessageBoxImage.Information);
} }
else else
{ {
EndWaiting(); EndWaiting();
MessageBox.Show("Dieser Benutzername ist bereits vergeben.\nBitte ändern sie den Benutzernamen.", "Achtung"); MessageBox.Show("Dieser Benutzername ist bereits vergeben.", "Speichern", MessageBoxButton.OK, MessageBoxImage.Exclamation);
} }
} }
else else
{ {
MessageBox.Show("Das Passwort ist zu schwach."); MessageBox.Show("Sie verwenden ein zu schwaches Passwort.", "Speichern", MessageBoxButton.OK, MessageBoxImage.Exclamation);
} }
} }
else else
@@ -336,13 +339,13 @@ namespace BeWo.View
ServiceFacade.DoCustomerServiceSync(s => s.SetBenutzerPasswortChatAppCode(customerOid.Value, TXTBenutzerName.Text, TXTPasswort.Text)); ServiceFacade.DoCustomerServiceSync(s => s.SetBenutzerPasswortChatAppCode(customerOid.Value, TXTBenutzerName.Text, TXTPasswort.Text));
EndWaiting(); EndWaiting();
MessageBox.Show("Speichern Erfolgreich.", "Info"); MessageBox.Show("Benutzername und Passwort wurden erfolgreich gespeichert.", "Speichern", MessageBoxButton.OK, MessageBoxImage.Information);
} }
else else
{ {
EndWaiting(); EndWaiting();
MessageBox.Show("Dieser Benutzername ist bereits vergeben.\nBitte ändern sie den Benutzernamen.", "Achtung"); MessageBox.Show("Dieser Benutzername ist bereits vergeben.", "Speichern", MessageBoxButton.OK, MessageBoxImage.Exclamation);
} }
} }
@@ -352,7 +355,7 @@ namespace BeWo.View
{ {
if (!GeneratetTexfield.Text.Equals("")) if (!GeneratetTexfield.Text.Equals(""))
{ {
if (MessageBox.Show("Wollen Sie den Chat-Code wirklich löschen?\nAlle Daten auf Mobilgeräte werden gelöscht.", "Achtung", MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.Yes) { if (MessageBox.Show("Wollen Sie den Chat-Code wirklich löschen?\nAlle Daten werden gelöscht.", "Achtung", MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.Yes) {
StartWaiting(); StartWaiting();
var isdeletet = ServiceFacade.DoOperationsServiceSync(r => r.DeletCustomerChatCode(BeWoApp.Mandator.Apikey, BeWoApp.Tenant, personOid.Value)); var isdeletet = ServiceFacade.DoOperationsServiceSync(r => r.DeletCustomerChatCode(BeWoApp.Mandator.Apikey, BeWoApp.Tenant, personOid.Value));
EndWaiting(); EndWaiting();
@@ -363,7 +366,7 @@ namespace BeWo.View
} }
else else
{ {
MessageBox.Show("Löschen des Chat-Codes Fehlgeschlagen.", "Fehler"); MessageBox.Show("Löschen des Chat-Codes fehlgeschlagen.", "Fehler", MessageBoxButton.OK, MessageBoxImage.Exclamation);
} }
} }
} }
@@ -377,9 +380,14 @@ namespace BeWo.View
private void ZeigeHandoutPDF_OnClick(object sender, RoutedEventArgs e) private void ZeigeHandoutPDF_OnClick(object sender, RoutedEventArgs e)
{ {
StartWaiting(); StartWaiting();
#if DEBUG
var handout = ServiceFacade.DoOperationsServiceSync(r => r.GetHandOutPdfForChat("5473568546", "0b50c09aff87f20d9ced75340e04e5ccaa11dd3e7bcf25e9c4f94dc20d3cbb97"));
#else
var handout = ServiceFacade.DoOperationsServiceSync(r => r.GetHandOutPdfForChat(BeWoApp.Tenant, BeWoApp.Mandator.Apikey)); var handout = ServiceFacade.DoOperationsServiceSync(r => r.GetHandOutPdfForChat(BeWoApp.Tenant, BeWoApp.Mandator.Apikey));
#endif
switch (handout.Result) switch (handout.Result)
{ {
case 0: case 0:
@@ -398,22 +406,22 @@ namespace BeWo.View
break; break;
case 11: case 11:
MessageBox.Show("Kundennummer unbekannt.", "Fehler", MessageBoxButton.OK); MessageBox.Show("Kundennummer unbekannt.", "Fehler", MessageBoxButton.OK, MessageBoxImage.Exclamation);
break; break;
case 12: case 12:
MessageBox.Show("Der API-Key ist falsch -> Auth-Error.", "Fehler", MessageBoxButton.OK); MessageBox.Show("Der API-Key ist falsch -> Auth-Error.", "Fehler", MessageBoxButton.OK, MessageBoxImage.Exclamation);
break; break;
case 13: case 13:
MessageBox.Show("Es existiert kein API-Key für die angegebene Kundennummer.", "Fehler", MessageBoxButton.OK); MessageBox.Show("Es existiert kein API-Key für die angegebene Kundennummer.", "Fehler", MessageBoxButton.OK, MessageBoxImage.Exclamation);
break; break;
case 40: case 40:
MessageBox.Show("Vorlage nicht gefunden.", "Fehler", MessageBoxButton.OK); MessageBox.Show("Vorlage nicht gefunden.", "Fehler", MessageBoxButton.OK, MessageBoxImage.Exclamation);
break; break;
case 41: case 41:
MessageBox.Show("Ungültige Custom-Logo-URL.", "Fehler", MessageBoxButton.OK); MessageBox.Show("Ungültige Custom-Logo-URL.", "Fehler", MessageBoxButton.OK, MessageBoxImage.Exclamation);
break; break;
case 60: case 60:
MessageBox.Show("Fehler: \n" + handout.File, "Fehler", MessageBoxButton.OK); MessageBox.Show("Fehler: \n" + handout.File, "Fehler", MessageBoxButton.OK, MessageBoxImage.Exclamation);
break; break;
} }

View File

@@ -1,7 +1,8 @@
<UserControl x:Class="BeWo.View.Controls.MultiSupportConceptSelectionControl" <UserControl x:Class="BeWo.View.Controls.MultiSupportConceptSelectionControl"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:localsearch="clr-namespace:BeWo.View.Search"> xmlns:localsearch="clr-namespace:BeWo.View.Search"
xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup">
<UserControl.Resources> <UserControl.Resources>
<Style x:Key="MultiSupportConceptSelectionControlStyle" TargetType="{x:Type ListBoxItem}"> <Style x:Key="MultiSupportConceptSelectionControlStyle" TargetType="{x:Type ListBoxItem}">
<Setter Property="HorizontalContentAlignment" Value="{Binding Path=HorizontalContentAlignment, RelativeSource={RelativeSource AncestorLevel=1, AncestorType={x:Type ItemsControl}, Mode=FindAncestor}}" /> <Setter Property="HorizontalContentAlignment" Value="{Binding Path=HorizontalContentAlignment, RelativeSource={RelativeSource AncestorLevel=1, AncestorType={x:Type ItemsControl}, Mode=FindAncestor}}" />
@@ -91,7 +92,7 @@
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
<RowDefinition Height="*" /> <RowDefinition Height="*" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Label x:Name="labelTitle" Content="Ausgewählte Hilfepläne" FontSize="12" FontWeight="Bold" /> <Label x:Name="labelTitle" Content="{markup:Translate Ausgewählte Hilfepläne}" FontSize="12" FontWeight="Bold" />
<Button x:Name="btnAddGroup" HorizontalAlignment="Right" Click="btnAddGroup_Click" Height="21" Width="45" Margin="0,0,48,3" ToolTip="Gruppe hinzufügen"> <Button x:Name="btnAddGroup" HorizontalAlignment="Right" Click="btnAddGroup_Click" Height="21" Width="45" Margin="0,0,48,3" ToolTip="Gruppe hinzufügen">
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<Grid Width="18" HorizontalAlignment="Center" VerticalAlignment="Center"> <Grid Width="18" HorizontalAlignment="Center" VerticalAlignment="Center">

View File

@@ -194,8 +194,8 @@
<dxg:GridColumn x:Name="colUnitCount" FieldName="UnitCount" Header="Anzahl" Width="80" /> <dxg:GridColumn x:Name="colUnitCount" FieldName="UnitCount" Header="Anzahl" Width="80" />
<dxg:GridColumn x:Name="colAmountTotal" FieldName="AmountTotal" Header="Betrag"> <dxg:GridColumn x:Name="colAmountTotal" FieldName="AmountTotal" Header="Betrag">
<dxg:GridColumn.CellStyle> <dxg:GridColumn.CellStyle>
<Style TargetType="dxg:CellContentPresenter"> <Style TargetType="dxg:LightweightCellEditor">
<Setter Property="FontWeight" Value="Bold" /> <Setter Property="TextBlock.FontWeight" Value="Bold" />
</Style> </Style>
</dxg:GridColumn.CellStyle> </dxg:GridColumn.CellStyle>
<dxg:GridColumn.EditSettings> <dxg:GridColumn.EditSettings>

View File

@@ -175,8 +175,8 @@
<dxg:GridColumn FieldName="UnitCount" Header="Anzahl" Width="80" /> <dxg:GridColumn FieldName="UnitCount" Header="Anzahl" Width="80" />
<dxg:GridColumn FieldName="AmountTotal" Header="Betrag"> <dxg:GridColumn FieldName="AmountTotal" Header="Betrag">
<dxg:GridColumn.CellStyle> <dxg:GridColumn.CellStyle>
<Style TargetType="dxg:CellContentPresenter"> <Style TargetType="dxg:LightweightCellEditor">
<Setter Property="FontWeight" Value="Bold" /> <Setter Property="TextBlock.FontWeight" Value="Bold" />
</Style> </Style>
</dxg:GridColumn.CellStyle> </dxg:GridColumn.CellStyle>
<dxg:GridColumn.EditSettings> <dxg:GridColumn.EditSettings>

View File

@@ -44,8 +44,8 @@
<!--<dxg:GridColumn FieldName="AccountingPeriodString" Header="Abrechnungszeitraum" />--> <!--<dxg:GridColumn FieldName="AccountingPeriodString" Header="Abrechnungszeitraum" />-->
<dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="TotalAmount" Header="Betrag" MinWidth="70"> <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="TotalAmount" Header="Betrag" MinWidth="70">
<!--<dxg:GridColumn.CellStyle> <!--<dxg:GridColumn.CellStyle>
<Style TargetType="dxg:CellContentPresenter"> <Style TargetType="dxg:LightweightCellEditor">
<Setter Property="FontWeight" Value="Bold"/> <Setter Property="TextBlock.FontWeight" Value="Bold"/>
</Style> </Style>
</dxg:GridColumn.CellStyle>--> </dxg:GridColumn.CellStyle>-->
<dxg:GridColumn.EditSettings> <dxg:GridColumn.EditSettings>

View File

@@ -494,8 +494,8 @@
</dxg:GridColumn> </dxg:GridColumn>
<dxg:GridColumn FieldName="GrossAmountTotal" Header="Gesamtbetrag" Width="100"> <dxg:GridColumn FieldName="GrossAmountTotal" Header="Gesamtbetrag" Width="100">
<dxg:GridColumn.CellStyle> <dxg:GridColumn.CellStyle>
<Style TargetType="dxg:CellContentPresenter"> <Style TargetType="dxg:LightweightCellEditor">
<Setter Property="FontWeight" Value="Bold" /> <Setter Property="TextBlock.FontWeight" Value="Bold" />
</Style> </Style>
</dxg:GridColumn.CellStyle> </dxg:GridColumn.CellStyle>
<dxg:GridColumn.EditSettings> <dxg:GridColumn.EditSettings>

View File

@@ -10,10 +10,11 @@
xmlns:Microsoft_Windows_Themes="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Classic" xmlns:Microsoft_Windows_Themes="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Classic"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup"
x:Class="BeWo.View.Detail.Accounting.ServiceInvoiceView" Height="Auto" Width="Auto" HorizontalAlignment="Stretch" x:Class="BeWo.View.Detail.Accounting.ServiceInvoiceView" Height="Auto" Width="Auto" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch" Focusable="True" mc:Ignorable="d"> VerticalAlignment="Stretch" Focusable="True" mc:Ignorable="d">
<Grid> <Grid>
<GroupBox Style="{StaticResource ObjectEditGroupBox}" Header="Sammelrechnung an Kostenträger"> <GroupBox Style="{StaticResource ObjectEditGroupBox}" Header="{markup:Translate Sammelrechnung an Kostenträger}">
<Grid> <Grid>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
@@ -33,7 +34,7 @@
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Label VerticalAlignment="Center" Content="Kostenträger:" /> <Label VerticalAlignment="Center" Content="{markup:Translate Kostenträger:}" />
<uc:PopUpEdit x:Name="popupedit_CostBeaerer" PopUpClick="popupedit_CostBeaerer_PopUpClick" Width="250" <uc:PopUpEdit x:Name="popupedit_CostBeaerer" PopUpClick="popupedit_CostBeaerer_PopUpClick" Width="250"
Height="23" Margin="3" Text="{Binding SelectedCostBearer.Name, Mode=OneWay}" Grid.Column="1" Height="23" Margin="3" Text="{Binding SelectedCostBearer.Name, Mode=OneWay}" Grid.Column="1"
IsReadOnly="True" DeleteButtonVisibility="Collapsed" MaxWidth="300" Cursor="Arrow" IsReadOnly="True" DeleteButtonVisibility="Collapsed" MaxWidth="300" Cursor="Arrow"
@@ -46,7 +47,7 @@
<StackPanel Grid.Column="2" <StackPanel Grid.Column="2"
Visibility="{Binding Text, Converter={StaticResource ObjectVisibilityConverter}, ElementName=popupedit_CostBeaerer}" Visibility="{Binding Text, Converter={StaticResource ObjectVisibilityConverter}, ElementName=popupedit_CostBeaerer}"
Orientation="Horizontal"> Orientation="Horizontal">
<dxe:CheckEdit Margin="3" Grid.Column="2" Content="Alle Hilfepläne" <dxe:CheckEdit Margin="3" Grid.Column="2" Content="{markup:Translate Alle Hilfepläne}"
IsChecked="{Binding IsAllSupportConcepts}" x:Name="ce_all_hp" /> IsChecked="{Binding IsAllSupportConcepts}" x:Name="ce_all_hp" />
<uc:PopUpEdit x:Name="popupedit_supportConcept" PopUpClick="popupedit_supportConcept_PopUpClick" <uc:PopUpEdit x:Name="popupedit_supportConcept" PopUpClick="popupedit_supportConcept_PopUpClick"
Width="250" Width="250"

View File

@@ -207,8 +207,8 @@
<dxg:GridColumn x:Name="colUnitDescription" FieldName="UnitDescription" Header="Einheit" Width="160" /> <dxg:GridColumn x:Name="colUnitDescription" FieldName="UnitDescription" Header="Einheit" Width="160" />
<dxg:GridColumn x:Name="colAmountTotal" FieldName="GrossAmountTotalUntilMax" Header="Betrag" Width="80" > <dxg:GridColumn x:Name="colAmountTotal" FieldName="GrossAmountTotalUntilMax" Header="Betrag" Width="80" >
<dxg:GridColumn.CellStyle> <dxg:GridColumn.CellStyle>
<Style TargetType="dxg:CellContentPresenter"> <Style TargetType="dxg:LightweightCellEditor">
<Setter Property="FontWeight" Value="Bold" /> <Setter Property="TextBlock.FontWeight" Value="Bold" />
</Style> </Style>
</dxg:GridColumn.CellStyle> </dxg:GridColumn.CellStyle>
<dxg:GridColumn.EditSettings> <dxg:GridColumn.EditSettings>

View File

@@ -21,7 +21,7 @@ using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact; using BS.Shared.DataContracts.Compact;
using BS.Shared.Services; using BS.Shared.Services;
using BS.Shared.Core; using BS.Shared.Core;
using BS.Shared.Translation;
using Microsoft.Win32; using Microsoft.Win32;
namespace BeWo.View.Detail namespace BeWo.View.Detail
@@ -525,9 +525,9 @@ namespace BeWo.View.Detail
lHeaderCaptions.Add("Gültigkeitsdatum"); lHeaderCaptions.Add("Gültigkeitsdatum");
lHeaderCaptions.Add("Betrag"); lHeaderCaptions.Add("Betrag");
lHeaderCaptions.Add("Kategorie"); lHeaderCaptions.Add("Kategorie");
lHeaderCaptions.Add("Klient"); lHeaderCaptions.Add(Translator.Translate("Klient"));
lHeaderCaptions.Add("Hilfeplan"); lHeaderCaptions.Add(Translator.Translate("Hilfeplan"));
lHeaderCaptions.Add("Kostenträger"); lHeaderCaptions.Add(Translator.Translate("Kostenträger"));
lHeaderCaptions.Add("Kommentar"); lHeaderCaptions.Add("Kommentar");
if (list != null) if (list != null)

View File

@@ -1,4 +1,6 @@
<localView:BeWoView x:Class="BeWo.View.Detail.AccountingTransactionView" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:localView="clr-namespace:BeWo.View" xmlns:localSearchView="clr-namespace:BeWo.View.Search" xmlns:uc="clr-namespace:BeWo.Controls;assembly=BeWo.Controls" 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:conv="clr-namespace:BeWo.Converter" xmlns:val="clr-namespace:BeWo.Validation" xmlns:s="clr-namespace:System;assembly=mscorlib" Height="Auto" Width="Auto" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Focusable="True"> <localView:BeWoView x:Class="BeWo.View.Detail.AccountingTransactionView" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:localView="clr-namespace:BeWo.View" xmlns:localSearchView="clr-namespace:BeWo.View.Search" xmlns:uc="clr-namespace:BeWo.Controls;assembly=BeWo.Controls" 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:conv="clr-namespace:BeWo.Converter" xmlns:val="clr-namespace:BeWo.Validation" xmlns:s="clr-namespace:System;assembly=mscorlib"
xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup"
Height="Auto" Width="Auto" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Focusable="True">
<Grid> <Grid>
<Grid.Resources> <Grid.Resources>
<conv:NumberSmaller0ColorConverter x:Key="NumberSmaller0ColorConverter" /> <conv:NumberSmaller0ColorConverter x:Key="NumberSmaller0ColorConverter" />
@@ -81,8 +83,8 @@
</dxg:GridColumn.DisplayTemplate>--> </dxg:GridColumn.DisplayTemplate>-->
</dxg:GridColumn> </dxg:GridColumn>
<dxg:GridColumn x:Name="column_category" FieldName="Category" Header="Kategorie" /> <dxg:GridColumn x:Name="column_category" FieldName="Category" Header="Kategorie" />
<dxg:GridColumn AllowEditing="False" FieldName="SupportConceptName" Header="Hilfeplan" /> <dxg:GridColumn AllowEditing="False" FieldName="SupportConceptName" Header="{markup:Translate Hilfeplan}" />
<dxg:GridColumn AllowEditing="False" FieldName="CostBearer" Header="Kostenträger" /> <dxg:GridColumn AllowEditing="False" FieldName="CostBearer" Header="{markup:Translate Kostenträger}" />
<dxg:GridColumn FieldName="Notice" Header="Bemerkung" /> <dxg:GridColumn FieldName="Notice" Header="Bemerkung" />
</dxg:GridControl.Columns> </dxg:GridControl.Columns>
<dxg:GridControl.View> <dxg:GridControl.View>

View File

@@ -28,7 +28,7 @@ using BS.Shared.Core;
using BS.Shared.DataContracts; using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact; using BS.Shared.DataContracts.Compact;
using BS.Shared.Extensions; using BS.Shared.Extensions;
using BS.Shared.Translation;
using DevExpress.Xpf.Docking; using DevExpress.Xpf.Docking;
using DevExpress.Xpf.Editors; using DevExpress.Xpf.Editors;
using DevExpress.Xpf.Grid; using DevExpress.Xpf.Grid;
@@ -1239,12 +1239,12 @@ namespace BeWo.View.Detail
var lContent = new List<List<string>>(); var lContent = new List<List<string>>();
lHeaderCaptions.Add("Datum"); lHeaderCaptions.Add("Datum");
lHeaderCaptions.Add("FLM"); lHeaderCaptions.Add(Translator.Translate("FLM"));
lHeaderCaptions.Add("FLM gerundet"); lHeaderCaptions.Add(Translator.Translate("FLM gerundet"));
lHeaderCaptions.Add("Mitarbeiter"); lHeaderCaptions.Add("Mitarbeiter");
lHeaderCaptions.Add("Klient"); lHeaderCaptions.Add(Translator.Translate("Klient"));
lHeaderCaptions.Add("Hilfeplan"); lHeaderCaptions.Add(Translator.Translate("Hilfeplan"));
lHeaderCaptions.Add("Kostenträger"); lHeaderCaptions.Add(Translator.Translate("Kostenträger"));
lHeaderCaptions.Add("Kategorie"); lHeaderCaptions.Add("Kategorie");
lHeaderCaptions.Add("Leistung"); lHeaderCaptions.Add("Leistung");
lHeaderCaptions.Add("Dokumentation"); lHeaderCaptions.Add("Dokumentation");

View File

@@ -10,7 +10,8 @@
xmlns:uc="clr-namespace:BeWo.Controls;assembly=BeWo.Controls" xmlns:uc="clr-namespace:BeWo.Controls;assembly=BeWo.Controls"
xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid" xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid"
xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors" xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
Height="Auto" Width="Auto" HorizontalAlignment="Stretch" xmlns:s="clr-namespace:System;assembly=mscorlib" VerticalAlignment="Stretch" Focusable="True" xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"> Height="Auto" Width="Auto" HorizontalAlignment="Stretch" xmlns:s="clr-namespace:System;assembly=mscorlib" VerticalAlignment="Stretch" Focusable="True" xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup">
<Grid Width="Auto" Height="Auto" x:Name="root"> <Grid Width="Auto" Height="Auto" x:Name="root">
<GroupBox Style="{StaticResource PopUpWindowStyle}"> <GroupBox Style="{StaticResource PopUpWindowStyle}">
@@ -26,7 +27,7 @@
</TransformGroup> </TransformGroup>
</Image.RenderTransform> </Image.RenderTransform>
</Image> </Image>
<TextBox Text="Versionsgeschichte dieser Zeiterfassung" Margin="10,4,0,0" Background="{x:Null}" Foreground="{DynamicResource MainGroupBoxForegroundBrush}" FontSize="20" BorderBrush="{x:Null}" VerticalAlignment="Stretch" BorderThickness="0,0,0,0" Padding="0,0,0,0" /> <TextBox Text="{markup:Translate Versionsgeschichte dieser Zeiterfassung}" Margin="10,4,0,0" Background="{x:Null}" Foreground="{DynamicResource MainGroupBoxForegroundBrush}" FontSize="20" BorderBrush="{x:Null}" VerticalAlignment="Stretch" BorderThickness="0,0,0,0" Padding="0,0,0,0" />
</StackPanel> </StackPanel>
</GroupBox.Header> </GroupBox.Header>
<Grid Margin="0,3,0,0" Background="{StaticResource ObjectEditBackgroundBrush}"> <Grid Margin="0,3,0,0" Background="{StaticResource ObjectEditBackgroundBrush}">
@@ -57,11 +58,11 @@
<dxg:GridControl VerticalAlignment="Stretch" HorizontalAlignment="Stretch" x:Name="datagrid_ServiceRecordHistory"> <dxg:GridControl VerticalAlignment="Stretch" HorizontalAlignment="Stretch" x:Name="datagrid_ServiceRecordHistory">
<dxg:GridControl.Columns> <dxg:GridControl.Columns>
<dxg:GridColumn AllowEditing="False" FieldName="TimeStamp" Header="Änderungsdatum" ReadOnly="True" EditSettings="{dxe:DateSettings DisplayFormat=dd.MM.yyyy HH:mm}" /> <dxg:GridColumn AllowEditing="False" FieldName="TimeStamp" Header="Änderungsdatum" ReadOnly="True" EditSettings="{dxe:DateSettings DisplayFormat=dd.MM.yyyy HH:mm}" />
<dxg:GridColumn AllowEditing="False" FieldName="InsUser" Header="Mitarbeiter" ReadOnly="True" /> <dxg:GridColumn AllowEditing="False" FieldName="InsUser" Header="{markup:Translate Mitarbeiter}" ReadOnly="True" />
<dxg:GridColumn AllowEditing="False" FieldName="HistoryTypeString" Header="Art der Änderung" ReadOnly="True" /> <dxg:GridColumn AllowEditing="False" FieldName="HistoryTypeString" Header="Art der Änderung" ReadOnly="True" />
<dxg:GridColumn AllowEditing="False" FieldName="Customer" Header="Klient/in" ReadOnly="True" /> <dxg:GridColumn AllowEditing="False" FieldName="Customer" Header="{markup:Translate Klient/in}" ReadOnly="True" />
<dxg:GridColumn AllowEditing="False" FieldName="SupportConcept" Header="Hilfeplan" ReadOnly="True" /> <dxg:GridColumn AllowEditing="False" FieldName="SupportConcept" Header="{markup:Translate Hilfeplan}" ReadOnly="True" />
<dxg:GridColumn AllowEditing="False" FieldName="Organisation.Name" Header="Kostenträger" ReadOnly="True" /> <dxg:GridColumn AllowEditing="False" FieldName="Organisation.Name" Header="{markup:Translate Kostenträger}" ReadOnly="True" />
<dxg:GridColumn AllowEditing="False" FieldName="ServiceDescription.Category" Header="Leistungskategorie" ReadOnly="True" /> <dxg:GridColumn AllowEditing="False" FieldName="ServiceDescription.Category" Header="Leistungskategorie" ReadOnly="True" />
<dxg:GridColumn AllowEditing="False" FieldName="ServiceDescription" Header="Leistung" ReadOnly="True" /> <dxg:GridColumn AllowEditing="False" FieldName="ServiceDescription" Header="Leistung" ReadOnly="True" />
<dxg:GridColumn AllowEditing="False" FieldName="Start" Header="Datum" ReadOnly="True" EditSettings="{dxe:DateSettings DisplayFormat=dd.MM.yyyy}"/> <dxg:GridColumn AllowEditing="False" FieldName="Start" Header="Datum" ReadOnly="True" EditSettings="{dxe:DateSettings DisplayFormat=dd.MM.yyyy}"/>

View File

@@ -12,6 +12,7 @@
xmlns:detail="clr-namespace:BeWo.View.Detail" xmlns:detail="clr-namespace:BeWo.View.Detail"
xmlns:core="clr-namespace:BS.Shared.Core;assembly=BS.Shared" xmlns:core="clr-namespace:BS.Shared.Core;assembly=BS.Shared"
xmlns:controls="clr-namespace:BeWo.View.Controls" xmlns:controls="clr-namespace:BeWo.View.Controls"
xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup"
Height="Auto" Width="Auto" HorizontalAlignment="Stretch" Height="Auto" Width="Auto" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch" Focusable="True" GotFocus="UserControl_GotFocus"> VerticalAlignment="Stretch" Focusable="True" GotFocus="UserControl_GotFocus">
<localView:BeWoView.Resources> <localView:BeWoView.Resources>
@@ -163,8 +164,8 @@
</DataTemplate> </DataTemplate>
</dxg:GridColumn.CellTemplate> </dxg:GridColumn.CellTemplate>
</dxg:GridColumn> </dxg:GridColumn>
<dxg:GridColumn x:Name="gridcolumn_costbearer" AllowEditing="False" FieldName="CostBearer" Header="Kostenträger" Width="150" /> <dxg:GridColumn x:Name="gridcolumn_costbearer" AllowEditing="False" FieldName="CostBearer" Header="{markup:Translate Kostenträger}" Width="150" />
<dxg:GridColumn FieldName="ReferenceNumber" Header="Aktenzeichen des Klienten" Width="200" /> <dxg:GridColumn FieldName="ReferenceNumber" Header="{markup:Translate Aktenzeichen des Klienten}" Width="200" />
<dxg:GridColumn FieldName="Notice" Header="Notiz" Width="250" /> <dxg:GridColumn FieldName="Notice" Header="Notiz" Width="250" />
</dxg:GridControl.Columns> </dxg:GridControl.Columns>
<dxg:GridControl.View> <dxg:GridControl.View>
@@ -212,7 +213,7 @@
</DataTemplate> </DataTemplate>
</dxg:GridColumn.CellTemplate> </dxg:GridColumn.CellTemplate>
</dxg:GridColumn> </dxg:GridColumn>
<dxg:GridColumn FieldName="Start" Header="von" Width="150" EditSettings="{dxe:DateSettings DisplayFormat=d}" /> <dxg:GridColumn FieldName="Start" Header="von" Width="150" EditSettings="{dxe:DateSettings DisplayFormat=d}" SortOrder="Ascending" />
<dxg:GridColumn FieldName="End" Header="bis" Width="150"> <dxg:GridColumn FieldName="End" Header="bis" Width="150">
<dxg:GridColumn.EditSettings> <dxg:GridColumn.EditSettings>
<dxe:DateSettings AllowNullInput="True" /> <dxe:DateSettings AllowNullInput="True" />
@@ -449,10 +450,10 @@
<ColumnDefinition Width="Auto" /> <ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" /> <ColumnDefinition Width="*" />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Label x:Name="lblDebitorNumber" Content="Debitor Nr." /> <Label x:Name="lblDebitorNumber" Content="{markup:Translate Debitor Nr.}" />
<TextBox x:Name="txtDebitorNumber" Grid.Column="1" Margin="3" Height="23" <TextBox x:Name="txtDebitorNumber" Grid.Column="1" Margin="3" Height="23"
Text="{val:ValidationBinding Path=DebitorNumber, UpdateSourceTrigger=PropertyChanged}" /> Text="{val:ValidationBinding Path=DebitorNumber, UpdateSourceTrigger=PropertyChanged}" />
<Label x:Name="lblCostCenter" Grid.Column="2" Content="Kostenstelle" /> <Label x:Name="lblCostCenter" Grid.Column="2" Content="{markup:Translate Kostenstelle}" />
<TextBox x:Name="txtCostCenter" Grid.Column="3" Margin="3" Height="23" <TextBox x:Name="txtCostCenter" Grid.Column="3" Margin="3" Height="23"
Text="{val:ValidationBinding Path=CostCenter, UpdateSourceTrigger=PropertyChanged}" /> Text="{val:ValidationBinding Path=CostCenter, UpdateSourceTrigger=PropertyChanged}" />
</Grid> </Grid>
@@ -625,7 +626,7 @@
<RowDefinition Height="*" /> <RowDefinition Height="*" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<GroupBox Style="{StaticResource ObjectEditGroupBox}" x:Name="groupBox_newCostBearer" <GroupBox Style="{StaticResource ObjectEditGroupBox}" x:Name="groupBox_newCostBearer"
Header="Neues Aktenzeichen für Kostenträger vergeben"> Header="{markup:Translate Neues Aktenzeichen für Kostenträger vergeben}">
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" /> <ColumnDefinition Width="Auto" />
@@ -639,7 +640,7 @@
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
<RowDefinition Height="0" /> <RowDefinition Height="0" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Label Content="Kostenträger" /> <Label Content="{markup:Translate Kostenträger}" />
<uc:PopUpEdit Margin="3" Height="23" <uc:PopUpEdit Margin="3" Height="23"
IsReadOnly="True" IsReadOnly="True"
DeleteButtonVisibility="Collapsed" DeleteButtonVisibility="Collapsed"
@@ -649,7 +650,7 @@
Grid.Row="0" Grid.Column="1" Grid.Row="0" Grid.Column="1"
PreviewMouseDoubleClick="Popupedit_costBearer_OnPreviewMouseDoubleClick" PreviewMouseDoubleClick="Popupedit_costBearer_OnPreviewMouseDoubleClick"
Cursor="Arrow" /> Cursor="Arrow" />
<Label Content="Aktenzeichen des Klienten" Grid.Row="0" Grid.Column="2" /> <Label Content="{markup:Translate Aktenzeichen des Klienten}" Grid.Row="0" Grid.Column="2" />
<TextBox Grid.Row="0" Grid.Column="3" Margin="3" Height="23" Text="{Binding Path=CostBearers.NewVM.ReferenceNumber}" /> <TextBox Grid.Row="0" Grid.Column="3" Margin="3" Height="23" Text="{Binding Path=CostBearers.NewVM.ReferenceNumber}" />
<Label Content="Notiz" Grid.Row="1" Grid.Column="0" /> <Label Content="Notiz" Grid.Row="1" Grid.Column="0" />
<TextBox Grid.Column="1" Grid.Row="1" Grid.ColumnSpan="3" Margin="3" Height="23" <TextBox Grid.Column="1" Grid.Row="1" Grid.ColumnSpan="3" Margin="3" Height="23"
@@ -659,7 +660,7 @@
</Grid> </Grid>
</GroupBox> </GroupBox>
<GroupBox x:Name="GroupBoxCostBearerGrid" Style="{StaticResource ObjectEditGroupBox}" Grid.Row="1" <GroupBox x:Name="GroupBoxCostBearerGrid" Style="{StaticResource ObjectEditGroupBox}" Grid.Row="1"
Margin=" 0 20 0 0" Header="Zugeordnete Aktenzeichen pro Kostenträger" /> Margin=" 0 20 0 0" Header="{markup:Translate Zugeordnete Aktenzeichen pro Kostenträger}" />
</Grid> </Grid>
</TabItem> </TabItem>
<TabItem Header="Diagnosen" x:Name="tabitem_diagnosis"> <TabItem Header="Diagnosen" x:Name="tabitem_diagnosis">
@@ -799,7 +800,7 @@
Grid.Row="2" VerticalAlignment="Top" Content="&gt;" FontWeight="Bold" Width="25" Grid.Row="2" VerticalAlignment="Top" Content="&gt;" FontWeight="Bold" Width="25"
IsEnabled="{Binding Path=SelectedIndex, Converter={StaticResource IndexBoolConverter}, ElementName=listbox_disabilities}" IsEnabled="{Binding Path=SelectedIndex, Converter={StaticResource IndexBoolConverter}, ElementName=listbox_disabilities}"
Height="25" /> Height="25" />
<Label Grid.Column="0" Grid.Row="0" Content="Diesem Klienten zugeordnete Behinderungen" <Label Grid.Column="0" Grid.Row="0" Content="{markup:Translate Diesem Klienten zugeordnete Behinderungen}"
HorizontalAlignment="Left" /> HorizontalAlignment="Left" />
<ListBox Grid.Column="0" Grid.Row="1" Grid.RowSpan="2" x:Name="listbox_disabilities" <ListBox Grid.Column="0" Grid.Row="1" Grid.RowSpan="2" x:Name="listbox_disabilities"
DisplayMemberPath="TypeDescription" ItemsSource="{Binding Path=Disabilities}" DisplayMemberPath="TypeDescription" ItemsSource="{Binding Path=Disabilities}"
@@ -1017,7 +1018,7 @@
<ColumnDefinition Width="Auto" /> <ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Label VerticalAlignment="Center" Content="Mitarbeiter" /> <Label VerticalAlignment="Center" Content="{markup:Translate Mitarbeiter}" />
<uc:PopUpEdit IsReadOnly="True" <uc:PopUpEdit IsReadOnly="True"
DeleteButtonVisibility="Collapsed" DeleteButtonVisibility="Collapsed"
Grid.Column="1" Grid.Row="0" Grid.ColumnSpan="2" Margin="3" Height="23" x:Name="popupedit_employeeRelations" Grid.Column="1" Grid.Row="0" Grid.ColumnSpan="2" Margin="3" Height="23" x:Name="popupedit_employeeRelations"
@@ -1044,7 +1045,7 @@
</GroupBox> </GroupBox>
</Border> </Border>
</controls:PopupNonTopmost> </controls:PopupNonTopmost>
<GroupBox x:Name="GroupBoxEmployeeGrid" Header="Diesem Klienten zugeordnete Betreuer" Grid.Row="2" <GroupBox x:Name="GroupBoxEmployeeGrid" Header="{markup:Translate Diesem Klienten zugeordnete Betreuer}" Grid.Row="2"
Style="{StaticResource ObjectEditGroupBox}" Margin="0 20 0 0" MinHeight="120"> Style="{StaticResource ObjectEditGroupBox}" Margin="0 20 0 0" MinHeight="120">
<Grid x:Name="employeeGrid"> <Grid x:Name="employeeGrid">
<Grid.RowDefinitions> <Grid.RowDefinitions>
@@ -1084,7 +1085,7 @@
</GroupBox> </GroupBox>
</Border> </Border>
</controls:PopupNonTopmost> </controls:PopupNonTopmost>
<GroupBox x:Name="GroupBoxTeamGrid" Header="Diesem Klienten zugeordnete Teams" Grid.Row="4" <GroupBox x:Name="GroupBoxTeamGrid" Header="{markup:Translate Diesem Klienten zugeordnete Teams}" Grid.Row="4"
Style="{StaticResource ObjectEditGroupBox}" Margin="0 20 0 0"> Style="{StaticResource ObjectEditGroupBox}" Margin="0 20 0 0">
<Grid x:Name="teamGrid"> <Grid x:Name="teamGrid">
<Grid.RowDefinitions> <Grid.RowDefinitions>
@@ -1193,7 +1194,7 @@
<TextBox Margin="3" Height="50" AcceptsReturn="True" VerticalScrollBarVisibility="Auto" Text="{Binding Path=Environment, UpdateSourceTrigger=PropertyChanged}" /> <TextBox Margin="3" Height="50" AcceptsReturn="True" VerticalScrollBarVisibility="Auto" Text="{Binding Path=Environment, UpdateSourceTrigger=PropertyChanged}" />
</Grid> </Grid>
</GroupBox> </GroupBox>
<GroupBox x:Name="GroupBoxPersons" Grid.Row="2" Margin="0,20,0,0" Header="Diesem Klienten zugeordnete Personen" Style="{DynamicResource ObjectEditGroupBox}" MinHeight="150" MaxHeight="350"> <GroupBox x:Name="GroupBoxPersons" Grid.Row="2" Margin="0,20,0,0" Header="{markup:Translate Diesem Klienten zugeordnete Personen}" Style="{DynamicResource ObjectEditGroupBox}" MinHeight="150" MaxHeight="350">
<Grid x:Name="environmentPersonGrid"> <Grid x:Name="environmentPersonGrid">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
@@ -1262,7 +1263,7 @@
</Grid> </Grid>
</GroupBox> </GroupBox>
<GroupBox x:Name="GroupBoxOrganisations" Grid.Row="3" Margin="0,20,0,0" <GroupBox x:Name="GroupBoxOrganisations" Grid.Row="3" Margin="0,20,0,0"
Header="Diesem Klienten zugeordnete Organisationen" Style="{DynamicResource ObjectEditGroupBox}" VerticalAlignment="Top" Header="{markup:Translate Diesem Klienten zugeordnete Organisationen}" Style="{DynamicResource ObjectEditGroupBox}" VerticalAlignment="Top"
MinHeight="150" MaxHeight="400"> MinHeight="150" MaxHeight="400">
<Grid x:Name="environmentOrganisationGrid"> <Grid x:Name="environmentOrganisationGrid">
<Grid.RowDefinitions> <Grid.RowDefinitions>
@@ -1346,7 +1347,7 @@
</Grid> </Grid>
</GroupBox> </GroupBox>
<GroupBox x:Name="GroupBoxFamily" Grid.Row="1" Margin="0,20,0,0" Header="Diesem Klienten zugeordnete Angehörige" Style="{DynamicResource ObjectEditGroupBox}" MinHeight="150" MaxHeight="350"> <GroupBox x:Name="GroupBoxFamily" Grid.Row="1" Margin="0,20,0,0" Header="{markup:Translate Diesem Klienten zugeordnete Angehörige}" Style="{DynamicResource ObjectEditGroupBox}" MinHeight="150" MaxHeight="350">
<Grid x:Name="environmentFamilyGrid"> <Grid x:Name="environmentFamilyGrid">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
@@ -1855,9 +1856,11 @@
</GroupBox> </GroupBox>
</Grid>--> </Grid>-->
</TabItem> </TabItem>
<TabItem Header="Schulbegleitender Dienst" Name="tabitem_schuldienst" Selector.Selected="tabitem_SchulDienst_Selected" />
<TabItem Header="Chat-Service" Name="tabitem_chatservice" Selector.Selected="tabitem_chatservice_Selected" />
<TabItem Header="Dokumente" Name="tabitem_documents" Selector.Selected="tabitem_documents_Selected" /> <TabItem Header="Dokumente" Name="tabitem_documents" Selector.Selected="tabitem_documents_Selected" />
<TabItem Header="Chat-Service" Name="tabitem_chatservice" Selector.Selected="tabitem_chatservice_Selected" />
<TabItem Header="Schulbegleitender Dienst" Name="tabitem_schuldienst" Selector.Selected="tabitem_SchulDienst_Selected" />
<TabItem Header="Log" Name="tabitem_log" Selector.Selected="tabitem_log_Selected" /> <TabItem Header="Log" Name="tabitem_log" Selector.Selected="tabitem_log_Selected" />
</TabControl> </TabControl>
<Border Grid.Row="2" Grid.ColumnSpan="3" Height="40" Margin="0,10,0,0" VerticalAlignment="Stretch" Background="#FF000000"> <Border Grid.Row="2" Grid.ColumnSpan="3" Height="40" Margin="0,10,0,0" VerticalAlignment="Stretch" Background="#FF000000">

View File

@@ -29,6 +29,7 @@ using DevExpress.Xpf.Editors.Settings;
using DevExpress.Xpf.Grid; using DevExpress.Xpf.Grid;
using System.Windows.Media.Imaging; using System.Windows.Media.Imaging;
using BS.Shared.Translation;
using DevExpress.XtraGrid; using DevExpress.XtraGrid;
using Binding = System.Windows.Data.Binding; using Binding = System.Windows.Data.Binding;
using Button = System.Windows.Controls.Button; using Button = System.Windows.Controls.Button;
@@ -273,7 +274,7 @@ namespace BeWo.View.Detail
public override string Title public override string Title
{ {
get { return "Klienten"; } get { return Translator.Translate("Klienten"); }
} }
internal override DependencyObject ValidationOnSaveRootElement internal override DependencyObject ValidationOnSaveRootElement
@@ -368,29 +369,39 @@ namespace BeWo.View.Detail
if (!_saveInProgress) if (!_saveInProgress)
{ {
_saveInProgress = true; _saveInProgress = true;
var lDataContract = ViewModel.CommitToDataContract(); CustomerDC cdc = ViewModel.CommitToDataContract();
//var lDataContract = ViewModel.CommitToDataContract();
try try
{ {
long oid = 0;
IsDoneWithInsertOrUpdate = false;
if (ViewModel.IsNew) if (ViewModel.IsNew)
{ {
IsDoneWithInsertOrUpdate = false; oid = ServiceFacade.DoCustomerServiceSync(s => s.InsertNewCustomer(cdc));
ServiceFacade.DoCustomerServiceAsync(s => s.InsertNewCustomer(lDataContract), ReloadViewModel);
} }
else else
{ {
IsDoneWithInsertOrUpdate = false; IsDoneWithInsertOrUpdate = false;
ServiceFacade.DoCustomerServiceAsync(s => s.UpdateCustomer(lDataContract), ReloadViewModel); oid = ServiceFacade.DoCustomerServiceSync(s => s.UpdateCustomer(cdc));
} }
Cache.GetInstance().ClearSupportConceptTree(); if (oid > 0)
Cache.GetInstance().ClearCustomers(); {
BeWoApp.MainControl.ResetView(UIContext.Customer); Cache.GetInstance().ClearSupportConceptTree();
Cache.GetInstance().ClearCustomers();
BeWoApp.MainControl.ResetView(UIContext.Customer);
ReloadViewModel(oid);
}
} }
catch (FaultException<BeWoFault>) catch (FaultException<BeWoFault>)
{ {
MessageBox.Show("Dieser Datensatz wurde in der Zwischenzeit von einem anderen Benutzer geändert. Klicken Sie Ok, um den Datansatz erneut zu laden. Ihre Änderungen gehen dabei leider verloren."); MessageBox.Show("Dieser Datensatz wurde in der Zwischenzeit von einem anderen Benutzer geändert. Klicken Sie Ok, um den Datansatz erneut zu laden. Ihre Änderungen gehen dabei leider verloren.");
ReloadViewModel(lDataContract.CustomerOid.Value); ReloadViewModel(cdc.CustomerOid.Value);
} }
_saveInProgress = false;
} }
} }

View File

@@ -8,7 +8,8 @@
xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid" xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid"
xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors" xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
xmlns:localSearchView="clr-namespace:BeWo.View.Search" xmlns:localSearchView="clr-namespace:BeWo.View.Search"
xmlns:r="clr-namespace:BeWo.Security" xmlns:r="clr-namespace:BeWo.Security"
xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup"
Height="Auto" Width="Auto" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Focusable="True" GotFocus="UserControl_GotFocus"> Height="Auto" Width="Auto" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Focusable="True" GotFocus="UserControl_GotFocus">
<localView:BeWoView.Triggers> <localView:BeWoView.Triggers>
<EventTrigger RoutedEvent="FrameworkElement.Loaded" /> <EventTrigger RoutedEvent="FrameworkElement.Loaded" />
@@ -24,7 +25,7 @@
</DataTemplate> </DataTemplate>
</dxg:GridColumn.CellTemplate> </dxg:GridColumn.CellTemplate>
</dxg:GridColumn> </dxg:GridColumn>
<dxg:GridColumn x:Name="gridcolumn_costbearer" AllowEditing="False" FieldName="CostBearer" Header="Kostenträger" Width="150" /> <dxg:GridColumn x:Name="gridcolumn_costbearer" AllowEditing="False" FieldName="CostBearer" Header="{markup:Translate Kostenträger}" Width="150" />
<dxg:GridColumn FieldName="ReferenceNumber" Header="Aktenzeichen des Klienten" Width="200" /> <dxg:GridColumn FieldName="ReferenceNumber" Header="Aktenzeichen des Klienten" Width="200" />
<dxg:GridColumn FieldName="Notice" Header="Notiz" Width="250" /> <dxg:GridColumn FieldName="Notice" Header="Notiz" Width="250" />
</dxg:GridControl.Columns> </dxg:GridControl.Columns>
@@ -365,7 +366,7 @@
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
<RowDefinition Height="*" /> <RowDefinition Height="*" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<GroupBox Style="{StaticResource ObjectEditGroupBox}" x:Name="groupBox_newCostBearer" Header="Neues Aktenzeichen für Kostenträger vergeben"> <GroupBox Style="{StaticResource ObjectEditGroupBox}" x:Name="groupBox_newCostBearer" Header="{markup:Translate Neues Aktenzeichen für Kostenträger vergeben}">
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" /> <ColumnDefinition Width="Auto" />
@@ -379,7 +380,7 @@
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
<RowDefinition Height="0" /> <RowDefinition Height="0" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Label Content="Kostenträger" /> <Label Content="{markup:Translate Kostenträger}" />
<uc:PopUpEdit Margin="3" Height="23" IsReadOnly="True" DeleteButtonVisibility="Collapsed" Name="popupedit_costBearer" PopUpClick="popupedit_costBearer_PopUpClick" Text="{val:ValidationBinding Path=CostBearers.NewVM.CostBearerString}" Grid.Column="1" /> <uc:PopUpEdit Margin="3" Height="23" IsReadOnly="True" DeleteButtonVisibility="Collapsed" Name="popupedit_costBearer" PopUpClick="popupedit_costBearer_PopUpClick" Text="{val:ValidationBinding Path=CostBearers.NewVM.CostBearerString}" Grid.Column="1" />
<Label Content="Aktenzeichen des Klienten" Grid.Column="2" /> <Label Content="Aktenzeichen des Klienten" Grid.Column="2" />
<TextBox Grid.Column="3" Margin="3" Height="23" Text="{Binding Path=CostBearers.NewVM.ReferenceNumber}" /> <TextBox Grid.Column="3" Margin="3" Height="23" Text="{Binding Path=CostBearers.NewVM.ReferenceNumber}" />
@@ -388,7 +389,7 @@
<Button Margin="3" Grid.Row="2" Height="25" Content="Hinzufügen" Grid.ColumnSpan="4" HorizontalAlignment="Right" x:Name="button_addCostBearer" Click="button_addCostBearer_Click" /> <Button Margin="3" Grid.Row="2" Height="25" Content="Hinzufügen" Grid.ColumnSpan="4" HorizontalAlignment="Right" x:Name="button_addCostBearer" Click="button_addCostBearer_Click" />
</Grid> </Grid>
</GroupBox> </GroupBox>
<GroupBox x:Name="GroupBoxCostBearerGrid" Style="{StaticResource ObjectEditGroupBox}" Grid.Row="1" Margin=" 0 20 0 0" Header="Zugeordnete Aktenzeichen pro Kostenträger"> <GroupBox x:Name="GroupBoxCostBearerGrid" Style="{StaticResource ObjectEditGroupBox}" Grid.Row="1" Margin=" 0 20 0 0" Header="{markup:Translate Zugeordnete Aktenzeichen pro Kostenträger}">
</GroupBox> </GroupBox>
</Grid> </Grid>
</TabItem> </TabItem>

View File

@@ -9,6 +9,7 @@
xmlns:val="clr-namespace:BeWo.Validation" xmlns:val="clr-namespace:BeWo.Validation"
xmlns:core="clr-namespace:BS.Shared.Core;assembly=BS.Shared" xmlns:core="clr-namespace:BS.Shared.Core;assembly=BS.Shared"
xmlns:detail="clr-namespace:BeWo.View.Detail" xmlns:detail="clr-namespace:BeWo.View.Detail"
xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup"
Height="Auto" Width="Auto" HorizontalAlignment="Stretch" Height="Auto" Width="Auto" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch" Focusable="True" GotFocus="UserControl_GotFocus"> VerticalAlignment="Stretch" Focusable="True" GotFocus="UserControl_GotFocus">
<Grid x:Name="rootGrid"> <Grid x:Name="rootGrid">
@@ -27,7 +28,7 @@
</ControlTemplate> </ControlTemplate>
</dxg:GridColumn.EditTemplate> </dxg:GridColumn.EditTemplate>
</dxg:GridColumn>--> </dxg:GridColumn>-->
<dxg:GridColumn FieldName="Customer.LastNameFirstName" AllowEditing="False" Header="Klient(in)" Width="180" AllowSorting="True"/> <dxg:GridColumn FieldName="Customer.LastNameFirstName" AllowEditing="False" Header="{markup:Translate Klient(in)}" Width="180" AllowSorting="True"/>
<dxg:GridColumn FieldName="Role" x:Name="column_role" Header="Rolle" Width="180" AllowSorting="True"/> <dxg:GridColumn FieldName="Role" x:Name="column_role" Header="Rolle" Width="180" AllowSorting="True"/>
<dxg:GridColumn FieldName="Notice" Header="Erläuterung" Width="180" AllowSorting="True"/> <dxg:GridColumn FieldName="Notice" Header="Erläuterung" Width="180" AllowSorting="True"/>
</dxg:GridControl.Columns> </dxg:GridControl.Columns>
@@ -44,7 +45,7 @@
</DataTemplate> </DataTemplate>
</dxg:GridColumn.CellTemplate> </dxg:GridColumn.CellTemplate>
</dxg:GridColumn> </dxg:GridColumn>
<dxg:GridColumn FieldName="Start" Header="von" Width="150" EditSettings="{dxe:DateSettings DisplayFormat=d}" /> <dxg:GridColumn FieldName="Start" Header="von" Width="150" EditSettings="{dxe:DateSettings DisplayFormat=d}" SortOrder="Ascending" />
<dxg:GridColumn FieldName="End" Header="bis" Width="150" EditSettings="{dxe:DateSettings DisplayFormat=d}" /> <dxg:GridColumn FieldName="End" Header="bis" Width="150" EditSettings="{dxe:DateSettings DisplayFormat=d}" />
<dxg:GridColumn x:Name="gridcolumn_absencereason" FieldName="Reason" Header="Kategorie" Width="150" /> <dxg:GridColumn x:Name="gridcolumn_absencereason" FieldName="Reason" Header="Kategorie" Width="150" />
<dxg:GridColumn FieldName="Notice" Header="Erläuterung" Width="250" /> <dxg:GridColumn FieldName="Notice" Header="Erläuterung" Width="250" />
@@ -536,7 +537,7 @@
<RowDefinition Height="*" /> <RowDefinition Height="*" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<GroupBox Visibility="Collapsed" x:Name="groupbox_newCustomerRel" Header="Klient zuordnen" Style="{StaticResource ObjectEditGroupBox}"> <GroupBox Visibility="Collapsed" x:Name="groupbox_newCustomerRel" Header="{markup:Translate Klient zuordnen}" Style="{StaticResource ObjectEditGroupBox}">
<Grid> <Grid>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
@@ -548,7 +549,7 @@
<ColumnDefinition Width="Auto" /> <ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" /> <ColumnDefinition Width="*" />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Label VerticalAlignment="Center" Content="Klient" /> <Label VerticalAlignment="Center" Content="{markup:Translate Klient}" />
<uc:PopUpEdit IsReadOnly="True" DeleteButtonVisibility="Collapsed" Grid.Column="1" Margin="3" Height="23" x:Name="popupedit_customerRelations" Text="{val:ValidationBinding Path=CustomerRelations.NewVM.CustomerString}" PopUpClick="popupedit_customerRelations_PopUpClick" /> <uc:PopUpEdit IsReadOnly="True" DeleteButtonVisibility="Collapsed" Grid.Column="1" Margin="3" Height="23" x:Name="popupedit_customerRelations" Text="{val:ValidationBinding Path=CustomerRelations.NewVM.CustomerString}" PopUpClick="popupedit_customerRelations_PopUpClick" />
<Label Content="Rolle" Grid.Column="2" VerticalAlignment="Center" /> <Label Content="Rolle" Grid.Column="2" VerticalAlignment="Center" />
<uc:NullItemComboBox Grid.Column="3" Margin="3" Height="23" ItemsSource="{Binding Path=CustomerRelations.PossibleRoles}" SelectedItem="{val:ValidationBinding Path=CustomerRelations.NewVM.Role}" /> <uc:NullItemComboBox Grid.Column="3" Margin="3" Height="23" ItemsSource="{Binding Path=CustomerRelations.PossibleRoles}" SelectedItem="{val:ValidationBinding Path=CustomerRelations.NewVM.Role}" />
@@ -557,7 +558,7 @@
<Button Grid.Row="1" Grid.ColumnSpan="4" HorizontalAlignment="Right" VerticalAlignment="Bottom" Height="25" Margin="3" Content="Hinzufügen" x:Name="button_addCustomerRelation" Click="button_addCustomerRelation_Click" /> <Button Grid.Row="1" Grid.ColumnSpan="4" HorizontalAlignment="Right" VerticalAlignment="Bottom" Height="25" Margin="3" Content="Hinzufügen" x:Name="button_addCustomerRelation" Click="button_addCustomerRelation_Click" />
</Grid> </Grid>
</GroupBox> </GroupBox>
<GroupBox x:Name="GroupBoxCustomers" Header="Diesem Mitarbeiter zugeordnete Klienten" Grid.Row="1" Style="{StaticResource ObjectEditGroupBox}" Margin="0 20 0 0"></GroupBox> <GroupBox x:Name="GroupBoxCustomers" Header="{markup:Translate Diesem Mitarbeiter zugeordnete Klienten}" Grid.Row="1" Style="{StaticResource ObjectEditGroupBox}" Margin="0 20 0 0"></GroupBox>
</Grid> </Grid>
</TabItem> </TabItem>
<TabItem Header="Abwesenheiten" Selector.Selected="TabItemAbsenceTimes_Selected"> <TabItem Header="Abwesenheiten" Selector.Selected="TabItemAbsenceTimes_Selected">

View File

@@ -4,7 +4,8 @@
xmlns:localView="clr-namespace:BeWo.View" xmlns:localView="clr-namespace:BeWo.View"
xmlns:localSearchView="clr-namespace:BeWo.View.Search" xmlns:localSearchView="clr-namespace:BeWo.View.Search"
xmlns:val="clr-namespace:BeWo.Validation" xmlns:val="clr-namespace:BeWo.Validation"
xmlns:uc="clr-namespace:BeWo.Controls;assembly=BeWo.Controls" xmlns:uc="clr-namespace:BeWo.Controls;assembly=BeWo.Controls"
xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup"
Height="Auto" Height="Auto"
Width="Auto" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Focusable="True"> Width="Auto" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Focusable="True">
<Grid> <Grid>
@@ -115,9 +116,7 @@
<RowDefinition Height="*" /> <RowDefinition Height="*" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Label VerticalAlignment="Bottom" IsEnabled="{Binding Converter={StaticResource ObjectBoolConverter}}" > <Label VerticalAlignment="Bottom" IsEnabled="{Binding Converter={StaticResource ObjectBoolConverter}}" Content="{markup:Translate Zugeordnete Hilfepläne}" />
Zugeordnete Hilfepläne
</Label>
<ListBox Name="listbox_teamMember" Grid.Row="1" ItemsSource="{Binding Path=SupportConceptList}" IsEnabled="{Binding Converter={StaticResource ObjectBoolConverter}}" > <ListBox Name="listbox_teamMember" Grid.Row="1" ItemsSource="{Binding Path=SupportConceptList}" IsEnabled="{Binding Converter={StaticResource ObjectBoolConverter}}" >
<ListBox.ItemTemplate> <ListBox.ItemTemplate>
@@ -141,9 +140,7 @@
<Button Name="button_add" Grid.Row="2" Content="&lt;" FontWeight="Bold" Width="25" Grid.Column="1" VerticalAlignment="Center" Height="25" MinWidth="30" Margin="3" ToolTip="Neues Gruppenmitglied hinzufügen" Click="button_add_Click" IsEnabled="{Binding Converter={StaticResource ObjectBoolConverter}}" /> <Button Name="button_add" Grid.Row="2" Content="&lt;" FontWeight="Bold" Width="25" Grid.Column="1" VerticalAlignment="Center" Height="25" MinWidth="30" Margin="3" ToolTip="Neues Gruppenmitglied hinzufügen" Click="button_add_Click" IsEnabled="{Binding Converter={StaticResource ObjectBoolConverter}}" />
<Label VerticalAlignment="Bottom" Grid.Column="2" IsEnabled="{Binding Converter={StaticResource ObjectBoolConverter}}" > <Label VerticalAlignment="Bottom" Grid.Column="2" IsEnabled="{Binding Converter={StaticResource ObjectBoolConverter}}" Content="{markup:Translate Verfügbare Hilfepläne}"/>
Verfügbare Hilfepläne
</Label>
<localSearchView:SupportConceptSearchView x:Name="SupportConceptSearchView" IsMultiSelect="True" Grid.Column="2" Grid.Row="1" SearchMode="ActiveCostbearer2SupportConcepts" ShowFilterPanel="True"/> <localSearchView:SupportConceptSearchView x:Name="SupportConceptSearchView" IsMultiSelect="True" Grid.Column="2" Grid.Row="1" SearchMode="ActiveCostbearer2SupportConcepts" ShowFilterPanel="True"/>
</Grid> </Grid>
</GroupBox> </GroupBox>

View File

@@ -3,6 +3,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:localView="clr-namespace:BeWo.View" xmlns:localView="clr-namespace:BeWo.View"
xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors" xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup"
Height="Auto" Width="Auto" HorizontalAlignment="Stretch" Height="Auto" Width="Auto" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch" Focusable="True"> VerticalAlignment="Stretch" Focusable="True">
<Grid x:Name="root"> <Grid x:Name="root">
@@ -68,9 +69,7 @@
Grid.Column="1" Grid.Row="3" Margin="3,5,3,5" Height="23" Grid.Column="1" Grid.Row="3" Margin="3,5,3,5" Height="23"
EditValue="{Binding Path=TimeUntilUILock, Converter={StaticResource Int2DecimalConverter}, Mode=TwoWay}" /> EditValue="{Binding Path=TimeUntilUILock, Converter={StaticResource Int2DecimalConverter}, Mode=TwoWay}" />
<TextBlock Foreground="Black" Grid.Column="0" Grid.Row="4" Margin="3,5,3,5" TextWrapping="Wrap" VerticalAlignment="Center"> <TextBlock Foreground="Black" Grid.Column="0" Grid.Row="4" Margin="3,5,3,5" TextWrapping="Wrap" VerticalAlignment="Center" Text="{markup:Translate Anzahl Monate\, ab der eine Warnung für auslaufende Hilfepläne angezeigt wird}"/>
Anzahl Monate, ab der eine Warnung für auslaufende Hilfepläne angezeigt wird
</TextBlock>
<dxe:SpinEdit x:Name="helpplan" IsFloatValue="False" MinValue="0" MaxValue="999" <dxe:SpinEdit x:Name="helpplan" IsFloatValue="False" MinValue="0" MaxValue="999"
Grid.Column="1" Grid.Row="4" Margin="3,5,3,5" Height="23" EditValue="{Binding Path=HilfeplanAuslaufAuswahl, Converter={StaticResource Int2DecimalConverter}}" /> Grid.Column="1" Grid.Row="4" Margin="3,5,3,5" Height="23" EditValue="{Binding Path=HilfeplanAuslaufAuswahl, Converter={StaticResource Int2DecimalConverter}}" />
@@ -80,7 +79,7 @@
</Grid> </Grid>
</GroupBox> </GroupBox>
<GroupBox Margin="3 20 3 3" Grid.Row="3" Grid.ColumnSpan="2" Header="Zeiterfassung" Style="{StaticResource ObjectEditGroupBox}"> <GroupBox Margin="3 20 3 3" Grid.Row="3" Grid.ColumnSpan="2" Header="{markup:Translate Zeiterfassung}" Style="{StaticResource ObjectEditGroupBox}">
<Grid> <Grid>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
@@ -99,20 +98,14 @@
<ColumnDefinition Width="50" /> <ColumnDefinition Width="50" />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<CheckBox Grid.Row="0" Margin="3,5,3,5" Content="Dokumentationstext in der Zeiterfassung Pflichtfeld" IsChecked="{Binding Path=IsServiceRecordNoticeMandatory}" Grid.ColumnSpan="2"></CheckBox> <CheckBox Grid.Row="0" Margin="3,5,3,5" Content="{markup:Translate Dokumentationstext in der Zeiterfassung Pflichtfeld}" IsChecked="{Binding Path=IsServiceRecordNoticeMandatory}" Grid.ColumnSpan="2"></CheckBox>
<TextBlock Foreground="Black" Grid.Column="0" Grid.Row="1" Margin="3,5,3,5" TextWrapping="Wrap" VerticalAlignment="Center"> <TextBlock Foreground="Black" Grid.Column="0" Grid.Row="1" Margin="3,5,3,5" TextWrapping="Wrap" VerticalAlignment="Center" Text="{markup:Translate Anz Tage des Folgemonats\, nach denen die Dokumentationen des vergangenen Monats nicht mehr verändert werden dürfen (0 für unbegrenzt)}"/>
Anz Tage des Folgemonats, nach denen die Dokumentationen des vergangenen Monats nicht mehr verändert werden dürfen (0 für unbegrenzt)
</TextBlock>
<dxe:SpinEdit IsFloatValue="False" MinValue="0" Grid.Column="1" Grid.Row="1" Margin="3,5,3,5" Height="23" EditValue="{Binding Path=MaxDaysEditServiceRecordsAllowed, Converter={StaticResource Int2DecimalConverter}}" /> <dxe:SpinEdit IsFloatValue="False" MinValue="0" Grid.Column="1" Grid.Row="1" Margin="3,5,3,5" Height="23" EditValue="{Binding Path=MaxDaysEditServiceRecordsAllowed, Converter={StaticResource Int2DecimalConverter}}" />
<TextBlock Foreground="Black" Grid.Column="0" Grid.Row="2" Margin="3,5,3,5" TextWrapping="Wrap" VerticalAlignment="Center"> <TextBlock Foreground="Black" Grid.Column="0" Grid.Row="2" Margin="3,5,3,5" TextWrapping="Wrap" VerticalAlignment="Center" Text="{markup:Translate Anzahl Tage\, in der die Zeiterfassung erfolgen muss (0 für unbegrenzt)}"/>
Anzahl Tage, in der die Zeiterfassung erfolgen muss (0 für unbegrenzt) <TextBlock Foreground="Black" Grid.Column="0" Grid.Row="3" Margin="3,5,3,5" TextWrapping="Wrap" VerticalAlignment="Center" Text="{markup:Translate Schwellwert in %\, ab der das Restbudget in der Zeiterfassung rot markiert wird}"/>
</TextBlock>
<TextBlock Foreground="Black" Grid.Column="0" Grid.Row="3" Margin="3,5,3,5" TextWrapping="Wrap" VerticalAlignment="Center">
Schwellwert in %, ab der das Restbudget in der Zeiterfassung rot markiert wird
</TextBlock>
<dxe:SpinEdit x:Name="AnzTageZeiterfassErfolgt" IsFloatValue="False" MinValue="0" MaxValue="999" <dxe:SpinEdit x:Name="AnzTageZeiterfassErfolgt" IsFloatValue="False" MinValue="0" MaxValue="999"
Grid.Column="1" Grid.Row="2" Margin="3,5,3,5" Height="23" EditValue="{Binding Path=AnzTageZeiterfassErfolgt, Converter={StaticResource Int2DecimalConverter}}" /> Grid.Column="1" Grid.Row="2" Margin="3,5,3,5" Height="23" EditValue="{Binding Path=AnzTageZeiterfassErfolgt, Converter={StaticResource Int2DecimalConverter}}" />
@@ -120,11 +113,11 @@
<dxe:SpinEdit x:Name="ZeiterfassungsSchwellwert" IsFloatValue="False" MinValue="0" MaxValue="100" Value="80" <dxe:SpinEdit x:Name="ZeiterfassungsSchwellwert" IsFloatValue="False" MinValue="0" MaxValue="100" Value="80"
Grid.Column="1" Grid.Row="3" Margin="3,5,3,5" Height="23" EditValue="{Binding Path=ZeiterfassungsSchwellwert, Converter={StaticResource Int2DecimalConverter}}" /> Grid.Column="1" Grid.Row="3" Margin="3,5,3,5" Height="23" EditValue="{Binding Path=ZeiterfassungsSchwellwert, Converter={StaticResource Int2DecimalConverter}}" />
<CheckBox Margin="3,5,3,5" Content="Stunden/Minuten Auswahl anzeigen" IsChecked="{Binding Path=IsZeiterfassungInStdMin}" Grid.ColumnSpan="2" Grid.Row="4" /> <CheckBox Margin="3,5,3,5" Content="{markup:Translate Stunden/Minuten Auswahl anzeigen}" IsChecked="{Binding Path=IsZeiterfassungInStdMin}" Grid.ColumnSpan="2" Grid.Row="4" />
<!--<CheckBox Margin="3,5,3,5" Content="Originale Zeiterfassung" IsChecked="{Binding Path=IsZeiterfassDateNormal}" Grid.ColumnSpan="2" Grid.Row="5" />--> <!--<CheckBox Margin="3,5,3,5" Content="Originale Zeiterfassung" IsChecked="{Binding Path=IsZeiterfassDateNormal}" Grid.ColumnSpan="2" Grid.Row="5" />-->
<CheckBox Margin="3,5,3,5" Content="Enddatum anzeigen" IsChecked="{Binding Path=IsEndDateVisible}" Grid.ColumnSpan="2" Grid.Row="6" /> <CheckBox Margin="3,5,3,5" Content="{markup:Translate Enddatum anzeigen}" IsChecked="{Binding Path=IsEndDateVisible}" Grid.ColumnSpan="2" Grid.Row="6" />
<!--<CheckBox Margin="3,5,3,5" Content="Nur Monat/Jahr in Zeiterfassung aktivieren" IsChecked="{Binding Path=IsOnlyYearMonthVisible}" Grid.ColumnSpan="2" Grid.Row="7" />--> <!--<CheckBox Margin="3,5,3,5" Content="Nur Monat/Jahr in Zeiterfassung aktivieren" IsChecked="{Binding Path=IsOnlyYearMonthVisible}" Grid.ColumnSpan="2" Grid.Row="7" />-->

View File

@@ -8,6 +8,7 @@
xmlns:shared="clr-namespace:BS.Shared;assembly=BS.Shared" xmlns:shared="clr-namespace:BS.Shared;assembly=BS.Shared"
xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid" xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid"
xmlns:search="clr-namespace:BeWo.View.Search" xmlns:search="clr-namespace:BeWo.View.Search"
xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup"
Height="Auto" Width="Auto" Height="Auto" Width="Auto"
HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Focusable="True"> HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Focusable="True">
<Grid x:Name="gridroot"> <Grid x:Name="gridroot">
@@ -226,7 +227,7 @@
</ScrollViewer> </ScrollViewer>
</TabItem> </TabItem>
<TabItem Header="Kostenträgerdetails" Name="tabitem_costbearer"> <TabItem Header="{markup:Translate Kostenträgerdetails}" Name="tabitem_costbearer">
<ScrollViewer> <ScrollViewer>
<Grid> <Grid>
<Grid.RowDefinitions> <Grid.RowDefinitions>
@@ -235,7 +236,7 @@
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
<RowDefinition Height="*" /> <RowDefinition Height="*" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<GroupBox Header="Kostenträgerdetails" Style="{StaticResource ObjectEditGroupBox}" <GroupBox Header="{markup:Translate Kostenträgerdetails}" Style="{StaticResource ObjectEditGroupBox}"
Margin="0,10,0,0"> Margin="0,10,0,0">
<Grid> <Grid>
<Grid.RowDefinitions> <Grid.RowDefinitions>

View File

@@ -8,6 +8,7 @@
xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid" xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid"
xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors" xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
xmlns:core="clr-namespace:BS.Shared.Core;assembly=BS.Shared" xmlns:core="clr-namespace:BS.Shared.Core;assembly=BS.Shared"
xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup"
Height="Auto" Width="Auto" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Focusable="True"> Height="Auto" Width="Auto" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Focusable="True">
<Grid x:Name="rootGrid"> <Grid x:Name="rootGrid">
<Grid.Resources> <Grid.Resources>
@@ -316,9 +317,7 @@
</Grid> </Grid>
</TabItem> </TabItem>
<TabItem Header="Dokumente" Name="tabitem_documents" Selector.Selected="tabitem_documents_Selected" /> <TabItem Header="Umfeld" Name="tabitem_umfeld" Selector.Selected="Tabitem_umfeld_OnSelected" >
<TabItem Header="Umfeld" Name="tabitem_umfeld" Selector.Selected="Tabitem_umfeld_OnSelected" >
<ScrollViewer VerticalScrollBarVisibility="Auto"> <ScrollViewer VerticalScrollBarVisibility="Auto">
<Grid x:Name="groupbox_Umfeld"> <Grid x:Name="groupbox_Umfeld">
<Grid.RowDefinitions> <Grid.RowDefinitions>
@@ -327,7 +326,7 @@
<RowDefinition Height="*" /> <RowDefinition Height="*" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<GroupBox x:Name="groupbox_KlientenListe" Grid.Row="0" Header="Zugehörige Klienten" Style="{DynamicResource ObjectEditGroupBox}" > <GroupBox x:Name="groupbox_KlientenListe" Grid.Row="0" Header="{markup:Translate Zugeordnete Klienten}" Style="{DynamicResource ObjectEditGroupBox}" >
<dxg:GridControl VerticalAlignment="Stretch" HorizontalAlignment="Stretch" x:Name="KlientGridControl"> <dxg:GridControl VerticalAlignment="Stretch" HorizontalAlignment="Stretch" x:Name="KlientGridControl">
<dxg:GridControl.Columns> <dxg:GridControl.Columns>
<dxg:GridColumn FieldName="Name" Header="Klient" Width="150" AllowEditing="False" /> <dxg:GridColumn FieldName="Name" Header="Klient" Width="150" AllowEditing="False" />
@@ -340,8 +339,8 @@
</GroupBox> </GroupBox>
</Grid> </Grid>
</ScrollViewer> </ScrollViewer>
</TabItem> </TabItem>
<TabItem Header="Dokumente" Name="tabitem_documents" Selector.Selected="tabitem_documents_Selected" />
</TabControl> </TabControl>
<Border Grid.Row="2" Grid.ColumnSpan="3" Height="40" Margin="0,10,0,0" VerticalAlignment="Stretch" Background="#FF000000"> <Border Grid.Row="2" Grid.ColumnSpan="3" Height="40" Margin="0,10,0,0" VerticalAlignment="Stretch" Background="#FF000000">
<Border.OpacityMask> <Border.OpacityMask>

View File

@@ -9,6 +9,7 @@
xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors" xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
xmlns:dxpbars="http://schemas.devexpress.com/winfx/2008/xaml/printing/bars" xmlns:dxpbars="http://schemas.devexpress.com/winfx/2008/xaml/printing/bars"
xmlns:dxb="http://schemas.devexpress.com/winfx/2008/xaml/bars" xmlns:dxb="http://schemas.devexpress.com/winfx/2008/xaml/bars"
xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup"
Height="Auto" Width="Auto" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Focusable="True"> Height="Auto" Width="Auto" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Focusable="True">
<GroupBox Header="Quittierungsbelege" Style="{StaticResource ObjectEditGroupBox}"> <GroupBox Header="Quittierungsbelege" Style="{StaticResource ObjectEditGroupBox}">
@@ -67,7 +68,7 @@
<Button Name="button_generate" Grid.Row="0" Grid.Column="11" VerticalAlignment="Top" FontWeight="Bold" Content="Erstellen" Click="button_generate_Click" Height="23" Margin="3" /> <Button Name="button_generate" Grid.Row="0" Grid.Column="11" VerticalAlignment="Top" FontWeight="Bold" Content="Erstellen" Click="button_generate_Click" Height="23" Margin="3" />
<StackPanel Grid.Row="1" Grid.ColumnSpan="12" Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Stretch"> <StackPanel Grid.Row="1" Grid.ColumnSpan="12" Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Stretch">
<CheckBox Margin="3 7" Grid.Row="1" Name="chkForAllCostbearer" Content="Nur für ausgewählten Kostenträger erstellen" IsChecked="False" /> <CheckBox Margin="3 7" Grid.Row="1" Name="chkForAllCostbearer" Content="{markup:Translate Nur für ausgewählten Kostenträger erstellen}" IsChecked="False" />
<uc:PopUpEdit PreviewMouseDoubleClick="Popupedit_costbearer_OnPreviewMouseDoubleClick" <uc:PopUpEdit PreviewMouseDoubleClick="Popupedit_costbearer_OnPreviewMouseDoubleClick"
IsReadOnly="True" Width="250" Height="23" IsReadOnly="True" Width="250" Height="23"
x:Name="popupedit_costbearer" x:Name="popupedit_costbearer"

View File

@@ -18,6 +18,7 @@ using BS.Shared.Core;
using BS.Shared.DataContracts; using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact; using BS.Shared.DataContracts.Compact;
using BS.Shared.Extensions; using BS.Shared.Extensions;
using BS.Shared.Translation;
using DevExpress.Xpf.Core; using DevExpress.Xpf.Core;
using DevExpress.Xpf.Editors; using DevExpress.Xpf.Editors;
using DevExpress.Xpf.Printing; using DevExpress.Xpf.Printing;
@@ -220,15 +221,15 @@ namespace BeWo.View.Detail.Report
if (!checkbox_all.IsChecked.Value && _Customer == null) if (!checkbox_all.IsChecked.Value && _Customer == null)
{ {
MessageBox.Show("Bitte wählen Sie einen Klienten aus.", "BeWoPlaner", MessageBoxButton.OK, MessageBoxImage.Information); MessageBox.Show(Translator.Translate("Bitte wählen Sie einen Klienten aus."), "BeWoPlaner", MessageBoxButton.OK, MessageBoxImage.Information);
} }
else if (chkForAllCostbearer.IsChecked.Value && _Organisation == null) else if (chkForAllCostbearer.IsChecked.Value && _Organisation == null)
{ {
MessageBox.Show("Bitte wählen Sie einen Kostenträger aus.", "BeWoPlaner", MessageBoxButton.OK, MessageBoxImage.Information); MessageBox.Show(Translator.Translate("Bitte wählen Sie einen Kostenträger aus."), "BeWoPlaner", MessageBoxButton.OK, MessageBoxImage.Information);
} }
else if (chkForAllEmployees.IsChecked.Value && _Employee == null) else if (chkForAllEmployees.IsChecked.Value && _Employee == null)
{ {
MessageBox.Show("Bitte wählen Sie eine/n Mitarbeiter/in aus.", "BeWoPlaner", MessageBoxButton.OK, MessageBoxImage.Information); MessageBox.Show(Translator.Translate("Bitte wählen Sie eine/n Mitarbeiter/in aus."), "BeWoPlaner", MessageBoxButton.OK, MessageBoxImage.Information);
} }
else if (ChkForAllServiceCategories.IsChecked.HasValue && ChkForAllServiceCategories.IsChecked.Value && ServiceCategoriesComboBox.SelectedItem == null) else if (ChkForAllServiceCategories.IsChecked.HasValue && ChkForAllServiceCategories.IsChecked.Value && ServiceCategoriesComboBox.SelectedItem == null)
{ {

View File

@@ -1,5 +1,7 @@
<UserControl x:Class="BeWo.View.Detail.Report.SupportConceptAnalysisListViewItem" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:localView="clr-namespace:BeWo.View" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:localCore="clr-namespace:BeWo.Core" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" <UserControl x:Class="BeWo.View.Detail.Report.SupportConceptAnalysisListViewItem" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:localView="clr-namespace:BeWo.View" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:localCore="clr-namespace:BeWo.Core" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:bewo="clr-namespace:BeWo" mc:Ignorable="d"> xmlns:bewo="clr-namespace:BeWo"
xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup"
mc:Ignorable="d">
<UserControl.Resources> <UserControl.Resources>
<DataTemplate x:Key="CostBearerAnalysisListItem"> <DataTemplate x:Key="CostBearerAnalysisListItem">
<Grid> <Grid>
@@ -18,7 +20,7 @@
<Label Foreground="White" Content="{Binding CostBearer}" /> <Label Foreground="White" Content="{Binding CostBearer}" />
<Label Foreground="White" Content="{Binding HeaderString}" /> <Label Foreground="White" Content="{Binding HeaderString}" />
</StackPanel> </StackPanel>
<Button Grid.Column="1" Width="23" Height="23" Style="{DynamicResource TransparentButtonStyle}" ToolTip="In Zeiterfassung öffnen" Tag="{Binding}" Click="ButtonOpenServiceRecordView_Click" Margin="0,0,0,0"> <Button Grid.Column="1" Width="23" Height="23" Style="{DynamicResource TransparentButtonStyle}" ToolTip="{markup:Translate In Zeiterfassung öffnen}" Tag="{Binding}" Click="ButtonOpenServiceRecordView_Click" Margin="0,0,0,0">
<Image Source="..\..\..\Ressources\Icons\HistoryDisabled.png" /> <Image Source="..\..\..\Ressources\Icons\HistoryDisabled.png" />
</Button> </Button>
</Grid> </Grid>

View File

@@ -6,6 +6,7 @@
xmlns:localSearchView="clr-namespace:BeWo.View.Search" xmlns:localSearchView="clr-namespace:BeWo.View.Search"
xmlns:uc="clr-namespace:BeWo.Controls;assembly=BeWo.Controls" xmlns:uc="clr-namespace:BeWo.Controls;assembly=BeWo.Controls"
xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors" xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup"
Height="Auto" Width="Auto" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Focusable="True"> Height="Auto" Width="Auto" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Focusable="True">
<Grid> <Grid>
<GroupBox Style="{StaticResource ObjectEditGroupBox}" Header="Hilfeplanübersicht"> <GroupBox Style="{StaticResource ObjectEditGroupBox}" Header="Hilfeplanübersicht">
@@ -49,8 +50,8 @@
<dxe:DateEdit Grid.Column="2" Grid.Row="2" Margin="3" MaskType="DateTimeAdvancingCaret" x:Name="datepicker_appointeddate" Height="22" HorizontalAlignment="Stretch"/> <dxe:DateEdit Grid.Column="2" Grid.Row="2" Margin="3" MaskType="DateTimeAdvancingCaret" x:Name="datepicker_appointeddate" Height="22" HorizontalAlignment="Stretch"/>
<CheckBox Grid.Column="4" Grid.Row="1" x:Name="ChkHpDieAuslaufen" Content="Nur Hilfepläne anzeigen, die innerhalb der nächsten drei Monate auslaufen" VerticalAlignment="Center" Margin="8,3,3,3"/> <CheckBox Grid.Column="4" Grid.Row="1" x:Name="ChkHpDieAuslaufen" Content="{markup:Translate Nur Hilfepläne anzeigen\, die innerhalb der nächsten drei Monate auslaufen}" VerticalAlignment="Center" Margin="8,3,3,3"/>
<CheckBox Grid.Column="4" Grid.Row="2" Content="Auch archivierte Hilfepläne anzeigen" VerticalAlignment="Center" x:Name="chkShowArchived" Margin="8,3,3,3" /> <CheckBox Grid.Column="4" Grid.Row="2" Content="{markup:Translate Auch archivierte Hilfepläne anzeigen}" VerticalAlignment="Center" x:Name="chkShowArchived" Margin="8,3,3,3" />

View File

@@ -6,6 +6,7 @@ using System.Windows;
using System.Windows.Controls; using System.Windows.Controls;
using System.Windows.Navigation; using System.Windows.Navigation;
using BeWo.Core; using BeWo.Core;
using BeWo.MultiLanguage;
using BeWo.ServiceProxy; using BeWo.ServiceProxy;
using BeWo.View.Search; using BeWo.View.Search;
using BS.Shared; using BS.Shared;
@@ -13,6 +14,7 @@ using BS.Shared.Core;
using BS.Shared.DataContracts; using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact; using BS.Shared.DataContracts.Compact;
using BS.Shared.Extensions; using BS.Shared.Extensions;
using BS.Shared.Translation;
namespace BeWo.View.Detail.Report namespace BeWo.View.Detail.Report
{ {
@@ -28,13 +30,13 @@ namespace BeWo.View.Detail.Report
this.datepicker_appointeddate.AllowNullInput = true; this.datepicker_appointeddate.AllowNullInput = true;
this.datepicker_appointeddate.EditValue = null; this.datepicker_appointeddate.EditValue = null;
_SelectedEmployee = BeWoApp.LoggedOnUser.Employee; _SelectedEmployee = BeWoApp.LoggedOnUser.Employee;
if (_SelectedEmployee != null) if (_SelectedEmployee != null)
{ {
popupedit_employee.Text = _SelectedEmployee.ToString(); popupedit_employee.Text = _SelectedEmployee.ToString();
} }
if (!DarfAlleMitarbeiterSehen) if (!DarfAlleMitarbeiterSehen)
{ {
if (DarfTeamsSehen) if (DarfTeamsSehen)
@@ -47,19 +49,17 @@ namespace BeWo.View.Detail.Report
checkbox_allEmployees.IsChecked = false; checkbox_allEmployees.IsChecked = false;
popupedit_employee.Text = String.Format("{0}, {1}", BeWoApp.LoggedOnEmployee.LastName, popupedit_employee.Text = String.Format("{0}, {1}", BeWoApp.LoggedOnEmployee.LastName,
BeWoApp.LoggedOnEmployee.FirstName); BeWoApp.LoggedOnEmployee.FirstName);
} }
} }
ChangeReportType(); ChangeReportType();
ChkHpDieAuslaufen.Content = ChkHpDieAuslaufen.Content = Translator.Translate("Nur Hilfepläne anzeigen, die innerhalb der nächsten {0} Monate auslaufen", BeWoApp.AppSettings.HilfeplanAuslaufAuswahl);
String.Format("Nur Hilfepläne anzeigen, die innerhalb der nächsten {0} Monate auslaufen",
BeWoApp.AppSettings.HilfeplanAuslaufAuswahl);
// if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.Analysis_SupportConceptOverview_View)) // if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.Analysis_SupportConceptOverview_View))
// { // {

View File

@@ -11,6 +11,7 @@
xmlns:dxb="http://schemas.devexpress.com/winfx/2008/xaml/bars" xmlns:dxb="http://schemas.devexpress.com/winfx/2008/xaml/bars"
xmlns:dxre="http://schemas.devexpress.com/winfx/2008/xaml/richedit" xmlns:dxre="http://schemas.devexpress.com/winfx/2008/xaml/richedit"
xmlns:dxr="http://schemas.devexpress.com/winfx/2008/xaml/ribbon" xmlns:dxr="http://schemas.devexpress.com/winfx/2008/xaml/ribbon"
xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup"
Height="Auto" Width="Auto" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Focusable="True"> Height="Auto" Width="Auto" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Focusable="True">
<Grid Width="Auto" Height="Auto"> <Grid Width="Auto" Height="Auto">
<!--uc:ShadowChrome--> <!--uc:ShadowChrome-->
@@ -27,7 +28,7 @@
</TransformGroup> </TransformGroup>
</Image.RenderTransform> </Image.RenderTransform>
</Image> </Image>
<TextBox Text="Dokumentation bearbeiten" Margin="10,4,0,0" Background="{x:Null}" <TextBox Text="{markup:Translate Dokumentation bearbeiten}" Margin="10,4,0,0" Background="{x:Null}"
Foreground="{DynamicResource MainGroupBoxForegroundBrush}" FontSize="20" Foreground="{DynamicResource MainGroupBoxForegroundBrush}" FontSize="20"
BorderBrush="{x:Null}" VerticalAlignment="Stretch" BorderThickness="0,0,0,0" Padding="0,0,0,0" /> BorderBrush="{x:Null}" VerticalAlignment="Stretch" BorderThickness="0,0,0,0" Padding="0,0,0,0" />
</StackPanel> </StackPanel>
@@ -82,7 +83,7 @@
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Label x:Name="lblEmployee" Grid.Column="0" Grid.Row="0" Content="Mitarbeiter" /> <Label x:Name="lblEmployee" Grid.Column="0" Grid.Row="0" Content="{markup:Translate Mitarbeiter}" />
<uc:PopUpEdit IsReadOnly="True" x:Name="popupedit_employee" <uc:PopUpEdit IsReadOnly="True" x:Name="popupedit_employee"
DeleteButtonVisibility="Collapsed" PopUpClick="popupedit_employee_PopUpClick" DeleteButtonVisibility="Collapsed" PopUpClick="popupedit_employee_PopUpClick"
HorizontalAlignment="Stretch" HorizontalContentAlignment="Stretch" Height="23" HorizontalAlignment="Stretch" HorizontalContentAlignment="Stretch" Height="23"

View File

@@ -19,6 +19,7 @@ using BS.Shared.Core;
using BS.Shared.DataContracts; using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact; using BS.Shared.DataContracts.Compact;
using BS.Shared.Services; using BS.Shared.Services;
using BS.Shared.Translation;
namespace BeWo.View.Detail namespace BeWo.View.Detail
{ {
@@ -66,7 +67,7 @@ namespace BeWo.View.Detail
{ {
get get
{ {
return "dieser Leistungsbuchung"; return Translator.Translate("dieser Leistungsbuchung");
} }
} }
@@ -74,7 +75,7 @@ namespace BeWo.View.Detail
{ {
get get
{ {
return "Leistungsbuchung bearbeiten"; return Translator.Translate("Leistungsbuchung bearbeiten");
} }
} }
@@ -271,17 +272,17 @@ namespace BeWo.View.Detail
{ {
if (_ServiceRecordVM.Customer != null && _OriginalNode.SupportConceptTreeNodeDC.Customer != null && _ServiceRecordVM.Customer.CustomerOid != _OriginalNode.SupportConceptTreeNodeDC.Customer.CustomerOid) if (_ServiceRecordVM.Customer != null && _OriginalNode.SupportConceptTreeNodeDC.Customer != null && _ServiceRecordVM.Customer.CustomerOid != _OriginalNode.SupportConceptTreeNodeDC.Customer.CustomerOid)
{ {
if (MessageBox.Show("Möchten Sie diese Leistung wirklich auf Klient " + _ServiceRecordVM.Customer.FirstName + " " + _ServiceRecordVM.Customer.LastName + " umbuchen?", "Speichern", MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.No) if (MessageBox.Show(Translator.Translate("Möchten Sie diese Leistung wirklich auf Klient {0} umbuchen?", _ServiceRecordVM.Customer.FirstName + " " + _ServiceRecordVM.Customer.LastName), "Speichern", MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.No)
lAllowed = false; lAllowed = false;
} }
else if (_ServiceRecordVM.SupportConcept != null && _OriginalNode.SupportConceptTreeNodeDC.SupportConcept != null && _ServiceRecordVM.SupportConcept.SupportConceptOid != _OriginalNode.SupportConceptTreeNodeDC.SupportConcept.SupportConceptOid) else if (_ServiceRecordVM.SupportConcept != null && _OriginalNode.SupportConceptTreeNodeDC.SupportConcept != null && _ServiceRecordVM.SupportConcept.SupportConceptOid != _OriginalNode.SupportConceptTreeNodeDC.SupportConcept.SupportConceptOid)
{ {
if (MessageBox.Show("Möchten Sie diese Leistung wirklich auf einen anderen Hilfeplan umbuchen?", "Speichern", MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.No) if (MessageBox.Show(Translator.Translate("Möchten Sie diese Leistung wirklich auf einen anderen Hilfeplan umbuchen?"), "Speichern", MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.No)
lAllowed = false; lAllowed = false;
} }
else if (_ServiceRecordVM.CostBearer != null && _OriginalNode.SupportConceptTreeNodeDC.CostBearer != null && _ServiceRecordVM.CostBearer.CostBearerOid != _OriginalNode.SupportConceptTreeNodeDC.CostBearer.CostBearerOid) else if (_ServiceRecordVM.CostBearer != null && _OriginalNode.SupportConceptTreeNodeDC.CostBearer != null && _ServiceRecordVM.CostBearer.CostBearerOid != _OriginalNode.SupportConceptTreeNodeDC.CostBearer.CostBearerOid)
{ {
if (MessageBox.Show("Möchten Sie diese Leistung wirklich auf den Kostenträger " + _ServiceRecordVM.CostBearer.Name + " umbuchen?", "Speichern", MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.No) if (MessageBox.Show(Translator.Translate("Möchten Sie diese Leistung wirklich auf den Kostenträger {0} umbuchen?", _ServiceRecordVM.CostBearer.Name), "Speichern", MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.No)
lAllowed = false; lAllowed = false;
} }
} }

View File

@@ -15,6 +15,7 @@ using BS.Shared;
using BS.Shared.Services; using BS.Shared.Services;
using BS.Shared.DataContracts; using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact; using BS.Shared.DataContracts.Compact;
using BS.Shared.Translation;
namespace BeWo.View.Detail namespace BeWo.View.Detail
{ {
@@ -215,13 +216,13 @@ namespace BeWo.View.Detail
if (this.multiSupportConceptControl.SelectedSupportConcepts.Count == 0) if (this.multiSupportConceptControl.SelectedSupportConcepts.Count == 0)
{ {
MessageBox.Show("Bitte wählen Sie mindestens einen Hilfeplan aus.", "Speichern", MessageBoxButton.OK, MessageBoxImage.Information); MessageBox.Show(Translator.Translate("Bitte wählen Sie mindestens einen Hilfeplan aus."), "Speichern", MessageBoxButton.OK, MessageBoxImage.Information);
return false; return false;
} }
if (this.multiEmployeeControl.SelectedEmployees.Count == 0) if (this.multiEmployeeControl.SelectedEmployees.Count == 0)
{ {
MessageBox.Show("Bitte wählen Sie mindestens einen Mitarbeiter aus.", "Speichern", MessageBoxButton.OK, MessageBoxImage.Information); MessageBox.Show(Translator.Translate("Bitte wählen Sie mindestens einen Mitarbeiter aus."), "Speichern", MessageBoxButton.OK, MessageBoxImage.Information);
return false; return false;
} }

View File

@@ -6,7 +6,8 @@
xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid" xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid"
xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors" xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
Height="Auto" Width="Auto" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Focusable="True" Height="Auto" Width="Auto" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Focusable="True"
xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"> xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup">
<localView:BeWoView.Resources> <localView:BeWoView.Resources>
<DataTemplate x:Key="DetailCoreTemplate"> <DataTemplate x:Key="DetailCoreTemplate">
<dx:MeasurePixelSnapper> <dx:MeasurePixelSnapper>
@@ -126,7 +127,7 @@
<dxg:GridControl.Columns> <dxg:GridControl.Columns>
<dxg:GridColumn AllowEditing="False" FieldName="TimeStamp" Header="Änderungsdatum" ReadOnly="True" EditSettings="{dxe:DateSettings DisplayFormat=dd.MM.yyyy HH:mm}" x:Name="AenderungsdatumColumn" /> <dxg:GridColumn AllowEditing="False" FieldName="TimeStamp" Header="Änderungsdatum" ReadOnly="True" EditSettings="{dxe:DateSettings DisplayFormat=dd.MM.yyyy HH:mm}" x:Name="AenderungsdatumColumn" />
<dxg:GridColumn AllowEditing="False" FieldName="InsUser" Header="Geändert von" ReadOnly="True" /> <dxg:GridColumn AllowEditing="False" FieldName="InsUser" Header="Geändert von" ReadOnly="True" />
<dxg:GridColumn AllowEditing="False" FieldName="Employee" Header="Mitarbeiter" ReadOnly="True" /> <dxg:GridColumn AllowEditing="False" FieldName="Employee" Header="{markup:Translate Mitarbeiter}" ReadOnly="True" />
<dxg:GridColumn AllowEditing="False" FieldName="HistoryTypeString" Header="Art der Änderung" ReadOnly="True" /> <dxg:GridColumn AllowEditing="False" FieldName="HistoryTypeString" Header="Art der Änderung" ReadOnly="True" />
<dxg:GridColumn AllowEditing="False" FieldName="Start" Header="Datum" ReadOnly="True" EditSettings="{dxe:DateSettings DisplayFormat=dd.MM.yyyy}"/> <dxg:GridColumn AllowEditing="False" FieldName="Start" Header="Datum" ReadOnly="True" EditSettings="{dxe:DateSettings DisplayFormat=dd.MM.yyyy}"/>
<dxg:GridColumn AllowEditing="False" FieldName="StartDate" Header="Start" ReadOnly="True" EditSettings="{dxe:DateSettings DisplayFormat=HH:mm}"/> <dxg:GridColumn AllowEditing="False" FieldName="StartDate" Header="Start" ReadOnly="True" EditSettings="{dxe:DateSettings DisplayFormat=HH:mm}"/>
@@ -135,9 +136,9 @@
<dxg:GridColumn AllowEditing="False" FieldName="DurationInStunden" Header="Art (Dauer)" ReadOnly="True" x:Name="DurationInSTDHeader" /> <dxg:GridColumn AllowEditing="False" FieldName="DurationInStunden" Header="Art (Dauer)" ReadOnly="True" x:Name="DurationInSTDHeader" />
<dxg:GridColumn AllowEditing="False" FieldName="Customer" Header="Klient/in" ReadOnly="True" /> <dxg:GridColumn AllowEditing="False" FieldName="Customer" Header="{markup:Translate Klient/in}" ReadOnly="True" />
<dxg:GridColumn AllowEditing="False" FieldName="SupportConcept" Header="Hilfeplan" ReadOnly="True" /> <dxg:GridColumn AllowEditing="False" FieldName="SupportConcept" Header="{markup:Translate Hilfeplan}" ReadOnly="True" />
<dxg:GridColumn AllowEditing="False" FieldName="Organisation.Name" Header="Kostenträger" ReadOnly="True" /> <dxg:GridColumn AllowEditing="False" FieldName="Organisation.Name" Header="{markup:Translate Kostenträger}" ReadOnly="True" />
<dxg:GridColumn AllowEditing="False" FieldName="ServiceDescription.Category" Header="Leistungskategorie" ReadOnly="True" /> <dxg:GridColumn AllowEditing="False" FieldName="ServiceDescription.Category" Header="Leistungskategorie" ReadOnly="True" />
<dxg:GridColumn AllowEditing="False" FieldName="ServiceDescription" Header="Leistung" ReadOnly="True" /> <dxg:GridColumn AllowEditing="False" FieldName="ServiceDescription" Header="Leistung" ReadOnly="True" />
</dxg:GridControl.Columns> </dxg:GridControl.Columns>

View File

@@ -16,6 +16,7 @@
xmlns:core="clr-namespace:BS.Shared.Core;assembly=BS.Shared" xmlns:core="clr-namespace:BS.Shared.Core;assembly=BS.Shared"
xmlns:security="clr-namespace:BeWo.Security" xmlns:security="clr-namespace:BeWo.Security"
xmlns:dxr="http://schemas.devexpress.com/winfx/2008/xaml/ribbon" xmlns:dxr="http://schemas.devexpress.com/winfx/2008/xaml/ribbon"
xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup"
Height="Auto" Width="Auto" VerticalAlignment="Stretch" Focusable="True" HorizontalAlignment="Stretch" KeyUp="ServiceRecordView2_OnKeyUp"> Height="Auto" Width="Auto" VerticalAlignment="Stretch" Focusable="True" HorizontalAlignment="Stretch" KeyUp="ServiceRecordView2_OnKeyUp">
<localView:BeWoView.Resources> <localView:BeWoView.Resources>
<dxre:RichEditUICommand x:Key="commands" /> <dxre:RichEditUICommand x:Key="commands" />
@@ -252,7 +253,7 @@
</TransformGroup> </TransformGroup>
</Image.RenderTransform> </Image.RenderTransform>
</Image> </Image>
<TextBox x:Name="txtTimeRecording" Text="Zeiterfassung" Margin="10,0,0,0" Background="{x:Null}" <TextBox x:Name="txtTimeRecording" Text="{markup:Translate Zeiterfassung}" Margin="10,0,0,0" Background="{x:Null}"
Foreground="{DynamicResource MainGroupBoxForegroundBrush}" FontSize="22" Foreground="{DynamicResource MainGroupBoxForegroundBrush}" FontSize="22"
BorderBrush="{x:Null}" VerticalAlignment="Stretch" BorderThickness="0,0,0,0" BorderBrush="{x:Null}" VerticalAlignment="Stretch" BorderThickness="0,0,0,0"
Padding="0,0,0,0" /> Padding="0,0,0,0" />
@@ -278,7 +279,7 @@
<RowDefinition Height="*" /> <RowDefinition Height="*" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<StackPanel Orientation="Horizontal" Margin="0,0,0,0" Grid.ColumnSpan="2"> <StackPanel Orientation="Horizontal" Margin="0,0,0,0" Grid.ColumnSpan="2">
<CheckBox Content="Zeiterfassung für ausgewählten Klienten" IsChecked="True" Margin="0,3,0,2" <CheckBox Content="{markup:Translate Zeiterfassung für ausgewählten Klienten}" IsChecked="True" Margin="0,3,0,2"
x:Name="chkWithClient" Checked="ChkWithClient_Checked" x:Name="chkWithClient" Checked="ChkWithClient_Checked"
Unchecked="ChkWithClient_Unchecked" /> Unchecked="ChkWithClient_Unchecked" />
<CheckBox Content="Gruppenbuchung erstellen" Margin="10,3,0,2" IsChecked="False" <CheckBox Content="Gruppenbuchung erstellen" Margin="10,3,0,2" IsChecked="False"
@@ -303,7 +304,7 @@
</Button.ToolTip> </Button.ToolTip>
</Button> </Button>
<TextBlock Margin="5 2 0 0" <TextBlock Margin="5 2 0 0"
Text="Klient/in ist abwesend" Text="{markup:Translate Klient/in ist abwesend}"
Foreground="#B80000" FontSize="14" > Foreground="#B80000" FontSize="14" >
<TextBlock.ToolTip> <TextBlock.ToolTip>
<TextBlock Text="{Binding Path=CustomerWarning}" /> <TextBlock Text="{Binding Path=CustomerWarning}" />
@@ -589,7 +590,7 @@
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
<RowDefinition Height="*" /> <RowDefinition Height="*" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Label x:Name="lblEmployee" Grid.Column="0" Grid.Row="0" Content="Mitarbeiter" /> <Label x:Name="lblEmployee" Grid.Column="0" Grid.Row="0" Content="{markup:Translate Mitarbeiter}" />
<uc:PopUpEdit IsReadOnly="True" x:Name="popupedit_employee" <uc:PopUpEdit IsReadOnly="True" x:Name="popupedit_employee"
DeleteButtonVisibility="Collapsed" DeleteButtonVisibility="Collapsed"
PopUpClick="PopupeditEmployeePopUpClick" PopUpClick="PopupeditEmployeePopUpClick"
@@ -1623,7 +1624,7 @@
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
<RowDefinition Height="*" /> <RowDefinition Height="*" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Label Grid.Row="0" Grid.Column="0" Content="Mitarbeiter" /> <Label Grid.Row="0" Grid.Column="0" Content="{markup:Translate Mitarbeiter}" />
<uc:PopUpEdit IsReadOnly="True" x:Name="popupedit_employee_bedarfsmed" <uc:PopUpEdit IsReadOnly="True" x:Name="popupedit_employee_bedarfsmed"
DeleteButtonVisibility="Collapsed" DeleteButtonVisibility="Collapsed"
PopUpClick="PopupeditEmployeeBedarfsMedPopUpClick" PopUpClick="PopupeditEmployeeBedarfsMedPopUpClick"
@@ -1685,7 +1686,7 @@
</DataTemplate> </DataTemplate>
</dxg:GridColumn.CellTemplate> </dxg:GridColumn.CellTemplate>
</dxg:GridColumn> </dxg:GridColumn>
<dxg:GridColumn FieldName="Employee" Header="Mitarbeiter" /> <dxg:GridColumn FieldName="Employee" Header="{markup:Translate Mitarbeiter}" />
<dxg:GridColumn FieldName="MedName" Header="Bezeichnung" /> <dxg:GridColumn FieldName="MedName" Header="Bezeichnung" />
<dxg:GridColumn FieldName="DosageForm" Header="Darreichungsform" /> <dxg:GridColumn FieldName="DosageForm" Header="Darreichungsform" />
<dxg:GridColumn FieldName="MedDate" Header="Datum"> <dxg:GridColumn FieldName="MedDate" Header="Datum">

View File

@@ -18,6 +18,7 @@ using System.Windows.Threading;
using BeWo.Controls; using BeWo.Controls;
using BeWo.Core; using BeWo.Core;
using BeWo.Core.Service; using BeWo.Core.Service;
using BeWo.MultiLanguage;
using BeWo.ServiceProxy; using BeWo.ServiceProxy;
using BeWo.Validation; using BeWo.Validation;
using BeWo.View.Controls; using BeWo.View.Controls;
@@ -31,7 +32,7 @@ using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact; using BS.Shared.DataContracts.Compact;
using BS.Shared.Extensions; using BS.Shared.Extensions;
using BS.Shared.Services; using BS.Shared.Services;
using BS.Shared.Translation;
using DevExpress.Xpf.Bars; using DevExpress.Xpf.Bars;
using DevExpress.Xpf.Core; using DevExpress.Xpf.Core;
using DevExpress.Xpf.Docking; using DevExpress.Xpf.Docking;
@@ -129,10 +130,17 @@ namespace BeWo.View.Detail
DownloadLinkEngine = new DownloadLinkEngine(); DownloadLinkEngine = new DownloadLinkEngine();
linkExcelExport.NavigateUri = DownloadLinkEngine.GenerateNewExcelLink(); linkExcelExport.NavigateUri = DownloadLinkEngine.GenerateNewExcelLink();
chkWithClient.Content = BeWoApp.AppSettings.TimeRecordingMenuName + " für ausgewählten Klienten"; if (!String.IsNullOrWhiteSpace(BeWoApp.AppSettings.TimeRecordingMenuName))
txtTimeRecording.Text = BeWoApp.AppSettings.TimeRecordingMenuName; {
chkWithClient.Content = BeWoApp.AppSettings.TimeRecordingMenuName + Translator.Translate(" für ausgewählten Klienten");
numerictb_distance.Visibility = BeWoApp.AppSettings.ShowDistanceFields ? Visibility.Visible : Visibility.Collapsed; txtTimeRecording.Text = BeWoApp.AppSettings.TimeRecordingMenuName;
}
else
{
chkWithClient.Content = Translator.Translate("Zeiterfassung für ausgewählten Klienten");
txtTimeRecording.Text = Translator.Translate("Zeiterfassung");
}
numerictb_distance.Visibility = BeWoApp.AppSettings.ShowDistanceFields ? Visibility.Visible : Visibility.Collapsed;
lblDistance.Visibility = BeWoApp.AppSettings.ShowDistanceFields ? Visibility.Visible : Visibility.Collapsed; lblDistance.Visibility = BeWoApp.AppSettings.ShowDistanceFields ? Visibility.Visible : Visibility.Collapsed;
DistanceGridColumn.Visible = BeWoApp.AppSettings.ShowDistanceFields; DistanceGridColumn.Visible = BeWoApp.AppSettings.ShowDistanceFields;
@@ -751,7 +759,7 @@ namespace BeWo.View.Detail
public override string Title public override string Title
{ {
get { return "Zeiterfassung"; } get { return Translator.Translate("Zeiterfassung"); }
} }
public bool WithoutClient public bool WithoutClient
@@ -1331,7 +1339,7 @@ namespace BeWo.View.Detail
if (multiSupportConceptControl.SelectedSupportConcepts.Count == 0) if (multiSupportConceptControl.SelectedSupportConcepts.Count == 0)
{ {
MessageBox.Show("Bitte wählen Sie mindestens einen Klienten aus, für den Sie eine Gruppenbuchung anlegen möchten.", "Speichern", MessageBoxButton.OK, MessageBoxImage.Information); MessageBox.Show(Translator.Translate("Bitte wählen Sie mindestens einen Klienten aus, für den Sie eine Gruppenbuchung anlegen möchten."), "Speichern", MessageBoxButton.OK, MessageBoxImage.Information);
lValid = false; lValid = false;
} }
@@ -1339,7 +1347,7 @@ namespace BeWo.View.Detail
{ {
if (multiEmployeeControl.SelectedEmployees.Count == 0) if (multiEmployeeControl.SelectedEmployees.Count == 0)
{ {
MessageBox.Show("Bitte wählen Sie mindestens einen Mitarbeiter aus, für den Sie eine Gruppenbuchung anlegen möchten.", "Speichern", MessageBoxButton.OK, MessageBoxImage.Information); MessageBox.Show(Translator.Translate("Bitte wählen Sie mindestens einen Mitarbeiter aus, für den Sie eine Gruppenbuchung anlegen möchten."), "Speichern", MessageBoxButton.OK, MessageBoxImage.Information);
lValid = false; lValid = false;
} }
} }
@@ -1547,7 +1555,7 @@ namespace BeWo.View.Detail
if (multiSupportConceptControl.SelectedSupportConcepts.Count == 0) if (multiSupportConceptControl.SelectedSupportConcepts.Count == 0)
{ {
MessageBox.Show("Bitte wählen Sie mindestens einen Hilfeplan aus, für den Sie eine Mehrfachbuchung anlegen möchten.", "Speichern", MessageBoxButton.OK, MessageBoxImage.Information); MessageBox.Show(Translator.Translate("Bitte wählen Sie mindestens einen Hilfeplan aus, für den Sie eine Mehrfachbuchung anlegen möchten."), "Speichern", MessageBoxButton.OK, MessageBoxImage.Information);
lValid = false; lValid = false;
} }
@@ -1555,7 +1563,7 @@ namespace BeWo.View.Detail
{ {
if (multiEmployeeControl.SelectedEmployees.Count == 0) if (multiEmployeeControl.SelectedEmployees.Count == 0)
{ {
MessageBox.Show("Bitte wählen Sie mindestens einen Mitarbeiter aus, für den Sie eine Mehrfachbuchung anlegen möchten.", "Speichern", MessageBoxButton.OK, MessageBoxImage.Information); MessageBox.Show(Translator.Translate("Bitte wählen Sie mindestens einen Mitarbeiter aus, für den Sie eine Mehrfachbuchung anlegen möchten."), "Speichern", MessageBoxButton.OK, MessageBoxImage.Information);
lValid = false; lValid = false;
} }
} }
@@ -1668,7 +1676,7 @@ namespace BeWo.View.Detail
if (!WithoutClient && (selectedNode == null || selectedNode.SupportConceptTreeNodeDC == null)) if (!WithoutClient && (selectedNode == null || selectedNode.SupportConceptTreeNodeDC == null))
{ {
MessageBox.Show("Bitte wählen Sie zuerst einen Hilfeplan, für den Sie Leistungen dokumentieren möchten.", "Speichern", MessageBoxButton.OK, MessageBoxImage.Information); MessageBox.Show(Translator.Translate("Bitte wählen Sie zuerst einen Hilfeplan, für den Sie Leistungen dokumentieren möchten."), "Speichern", MessageBoxButton.OK, MessageBoxImage.Information);
lValid = false; lValid = false;
} }
@@ -2314,12 +2322,12 @@ namespace BeWo.View.Detail
lHeaderCaptions.Add("Von"); lHeaderCaptions.Add("Von");
lHeaderCaptions.Add("Bis"); lHeaderCaptions.Add("Bis");
lHeaderCaptions.Add("FLM"); lHeaderCaptions.Add(Translator.Translate("FLM"));
lHeaderCaptions.Add("FLM gerundet"); lHeaderCaptions.Add(Translator.Translate("FLM gerundet"));
lHeaderCaptions.Add("Mitarbeiter"); lHeaderCaptions.Add(Translator.Translate("Mitarbeiter"));
lHeaderCaptions.Add("Klient"); lHeaderCaptions.Add(Translator.Translate("Klient"));
lHeaderCaptions.Add("Hilfeplan"); lHeaderCaptions.Add(Translator.Translate("Hilfeplan"));
lHeaderCaptions.Add("Kostenträger"); lHeaderCaptions.Add(Translator.Translate("Kostenträger"));
lHeaderCaptions.Add("Kategorie"); lHeaderCaptions.Add("Kategorie");
lHeaderCaptions.Add("Leistung"); lHeaderCaptions.Add("Leistung");
if (ViewModel.AllDocTypes != null && ViewModel.AllDocTypes.Count > 0) if (ViewModel.AllDocTypes != null && ViewModel.AllDocTypes.Count > 0)
@@ -3273,7 +3281,7 @@ namespace BeWo.View.Detail
var si = supportConceptSelectionControl.SelectedItem; var si = supportConceptSelectionControl.SelectedItem;
if (si.SupportConceptTreeNodeDC == null) if (si.SupportConceptTreeNodeDC == null)
{ {
MessageBox.Show("Bitte wählen Sie einen Hilfeplan zum Umbuchen von Einträgen aus.", "Kein Hilfeplan gewählt", MessageBoxButton.OK, MessageBoxImage.Exclamation); MessageBox.Show(Translator.Translate("Bitte wählen Sie einen Hilfeplan zum Umbuchen von Einträgen aus."), Translator.Translate("Kein Hilfeplan gewählt"), MessageBoxButton.OK, MessageBoxImage.Exclamation);
return; return;
} }
@@ -3317,7 +3325,7 @@ namespace BeWo.View.Detail
{ {
if (umbuchungsView.Zielhilfeplan == null) if (umbuchungsView.Zielhilfeplan == null)
{ {
MessageBox.Show("Bitte wählen Sie einen Hilfeplan auf den die Einträge umgebucht werden sollen aus.", "Kein Hilfeplan gewählt", MessageBoxButton.OK, MessageBoxImage.Exclamation); MessageBox.Show(Translator.Translate("Bitte wählen Sie einen Hilfeplan auf den die Einträge umgebucht werden sollen aus."), Translator.Translate("Kein Hilfeplan gewählt"), MessageBoxButton.OK, MessageBoxImage.Exclamation);
return; return;
} }
@@ -3889,7 +3897,7 @@ namespace BeWo.View.Detail
if(ViewModel.BedarfsMedViewModel.NewVM.Employee == null) if(ViewModel.BedarfsMedViewModel.NewVM.Employee == null)
{ {
MessageBox.Show("Bitte wählen Sie einen Mitarbeiter aus.", "Fehler beim Anlegen", MessageBoxButton.OK, MessageBoxImage.Error); MessageBox.Show(Translator.Translate("Bitte wählen Sie einen Mitarbeiter aus."), "Fehler beim Anlegen", MessageBoxButton.OK, MessageBoxImage.Error);
return; return;
} }
@@ -3993,7 +4001,7 @@ namespace BeWo.View.Detail
if (!medRecordEditView.ViewModel.Customer.Equals(currentCustomer)) if (!medRecordEditView.ViewModel.Customer.Equals(currentCustomer))
{ {
var messageBoxResult = MessageBox.Show("Möchten Sie diesen Eintrag wirklich auf Klient " + medRecordEditView.ViewModel.Customer.FullName + " umbuchen?", "Speichern", MessageBoxButton.YesNo, MessageBoxImage.Question); var messageBoxResult = MessageBox.Show(Translator.Translate("Möchten Sie diesen Eintrag wirklich auf Klient {0} umbuchen?", medRecordEditView.ViewModel.Customer.FullName), "Speichern", MessageBoxButton.YesNo, MessageBoxImage.Question);
if (messageBoxResult.Equals(MessageBoxResult.No)) if (messageBoxResult.Equals(MessageBoxResult.No))
{ {

View File

@@ -13,6 +13,7 @@
xmlns:security="clr-namespace:BeWo.Security" xmlns:security="clr-namespace:BeWo.Security"
xmlns:controls="clr-namespace:BeWo.View.Controls" xmlns:controls="clr-namespace:BeWo.View.Controls"
xmlns:converter="clr-namespace:BeWo.Converter" xmlns:converter="clr-namespace:BeWo.Converter"
xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup"
Height="Auto" Width="Auto" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Focusable="True"> Height="Auto" Width="Auto" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Focusable="True">
<localView:BeWoView.Resources> <localView:BeWoView.Resources>
<ResourceDictionary> <ResourceDictionary>
@@ -132,7 +133,7 @@
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Label Grid.Column="0" Grid.Row="0">Klient</Label> <Label Grid.Column="0" Grid.Row="0" Content="{markup:Translate Klient}"/>
<uc:PopUpEdit IsReadOnly="True" Margin="3" Grid.Column="1" <uc:PopUpEdit IsReadOnly="True" Margin="3" Grid.Column="1"
Text="{val:ValidationBinding Path=CustomerString}" Text="{val:ValidationBinding Path=CustomerString}"
DeleteButtonVisibility="Collapsed" DeleteButtonVisibility="Collapsed"
@@ -159,7 +160,7 @@
<ColumnDefinition Width="Auto" /> <ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" /> <ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Label>Teilnahme an Hilfeplankonferenz</Label> <Label Content="{markup:Translate Teilnahme an Hilfeplankonferenz}"/>
<RadioButton Grid.Column="1" Margin="5 0" HorizontalAlignment="Center" <RadioButton Grid.Column="1" Margin="5 0" HorizontalAlignment="Center"
VerticalAlignment="Center" IsChecked="{Binding Path=IsConferenceYes, UpdateSourceTrigger=PropertyChanged}">Ja</RadioButton> VerticalAlignment="Center" IsChecked="{Binding Path=IsConferenceYes, UpdateSourceTrigger=PropertyChanged}">Ja</RadioButton>
<RadioButton Grid.Column="2" Margin="5 0" HorizontalAlignment="Center" <RadioButton Grid.Column="2" Margin="5 0" HorizontalAlignment="Center"
@@ -167,42 +168,42 @@
<RadioButton Grid.Column="3" Margin="5 0" HorizontalAlignment="Center" <RadioButton Grid.Column="3" Margin="5 0" HorizontalAlignment="Center"
VerticalAlignment="Center" IsChecked="{Binding Path=IsConferenceOpen, UpdateSourceTrigger=PropertyChanged}">noch Offen</RadioButton> VerticalAlignment="Center" IsChecked="{Binding Path=IsConferenceOpen, UpdateSourceTrigger=PropertyChanged}">noch Offen</RadioButton>
</Grid> </Grid>
<Label Grid.Column="0" Grid.Row="3">Hilfeplan beantragt am</Label> <Label Grid.Column="0" Grid.Row="3" Content="{markup:Translate Hilfeplan beantragt am}" />
<dxe:DateEdit MaskType="DateTimeAdvancingCaret" AllowNullInput="True" Grid.Column="1" Grid.Row="3" <dxe:DateEdit MaskType="DateTimeAdvancingCaret" AllowNullInput="True" Grid.Column="1" Grid.Row="3"
EditValue="{Binding Mode=TwoWay, Path=RequisitionSendDate}" Height="23" EditValue="{Binding Mode=TwoWay, Path=RequisitionSendDate}" Height="23"
Margin="3,3,3,3" Margin="3,3,3,3"
Width="100" Width="100"
HorizontalAlignment="Left" /> HorizontalAlignment="Left" />
<Label Grid.Column="0" Grid.Row="4">Hilfeplan eingereicht am</Label> <Label Grid.Column="0" Grid.Row="4" Content="{markup:Translate Hilfeplan eingereicht am}"/>
<dxe:DateEdit MaskType="DateTimeAdvancingCaret" AllowNullInput="True" Grid.Column="1" Grid.Row="4" <dxe:DateEdit MaskType="DateTimeAdvancingCaret" AllowNullInput="True" Grid.Column="1" Grid.Row="4"
EditValue="{Binding Mode=TwoWay, Path=SupportConceptSendDate}" Height="23" EditValue="{Binding Mode=TwoWay, Path=SupportConceptSendDate}" Height="23"
Margin="3,3,3,3" Margin="3,3,3,3"
Width="100" Width="100"
HorizontalAlignment="Left" /> HorizontalAlignment="Left" />
<Label Grid.Column="0" Grid.Row="5">Hilfeplankonferenz</Label> <Label Grid.Column="0" Grid.Row="5" Content="{markup:Translate Hilfeplankonferenz}" />
<dxe:DateEdit MaskType="DateTimeAdvancingCaret" AllowNullInput="True" Grid.Column="1" Grid.Row="5" x:Name="datepicker_ConferenceDate" <dxe:DateEdit MaskType="DateTimeAdvancingCaret" AllowNullInput="True" Grid.Column="1" Grid.Row="5" x:Name="datepicker_ConferenceDate"
EditValue="{val:ValidationBinding Mode=TwoWay, Path=ConferenceDate}" EditValue="{val:ValidationBinding Mode=TwoWay, Path=ConferenceDate}"
Height="23" Height="23"
Margin="3,3,3,3" Margin="3,3,3,3"
Width="100" Width="100"
HorizontalAlignment="Left" /> HorizontalAlignment="Left" />
<Label Grid.Row="6" Content="Ort des Hilfeplangesprächs" /> <Label Grid.Row="6" Content="{markup:Translate Ort des Hilfeplangesprächs}" />
<TextBox Height="23" <TextBox Height="23"
Text="{Binding Path=ConferenceVenue, UpdateSourceTrigger=PropertyChanged}" Text="{Binding Path=ConferenceVenue, UpdateSourceTrigger=PropertyChanged}"
Margin="3" Margin="3"
HorizontalAlignment="Left" Grid.Row="6" Grid.Column="1" HorizontalAlignment="Left" Grid.Row="6" Grid.Column="1"
Width="200" /> Width="200" />
<Label Grid.Column="0" Grid.Row="7">Ohne Beratungsbedarf</Label> <Label Grid.Column="0" Grid.Row="7" Content="{markup:Translate Ohne Beratungsbedarf}" />
<CheckBox Grid.Column="1" Grid.Row="7" Margin="3,6,3,3" Height="23" <CheckBox Grid.Column="1" Grid.Row="7" Margin="3,6,3,3" Height="23"
IsChecked="{Binding Path=ConsultingNeeded, UpdateSourceTrigger=PropertyChanged}" /> IsChecked="{Binding Path=ConsultingNeeded, UpdateSourceTrigger=PropertyChanged}" />
<Label Grid.Column="0" Grid.Row="8">Bewilligung eingetroffen am</Label> <Label Grid.Column="0" Grid.Row="8" Content="{markup:Translate Bewilligung eingetroffen am}" />
<dxe:DateEdit MaskType="DateTimeAdvancingCaret" AllowNullInput="True" Grid.Column="1" Grid.Row="8" x:Name="datepicker_ApprovalDate" <dxe:DateEdit MaskType="DateTimeAdvancingCaret" AllowNullInput="True" Grid.Column="1" Grid.Row="8" x:Name="datepicker_ApprovalDate"
EditValue="{val:ValidationBinding Mode=TwoWay, Path=ApprovalDate}" EditValue="{val:ValidationBinding Mode=TwoWay, Path=ApprovalDate}"
Height="23" Height="23"
Margin="3,3,3,3" Margin="3,3,3,3"
Width="100" Width="100"
HorizontalAlignment="Left" /> HorizontalAlignment="Left" />
<Label Grid.Column="0" Grid.Row="9">Verlängerung beantragt am</Label> <Label Grid.Column="0" Grid.Row="9" Content="{markup:Translate Verlängerung beantragt am}"/>
<dxe:DateEdit MaskType="DateTimeAdvancingCaret" AllowNullInput="True" Grid.Column="1" Grid.Row="9" <dxe:DateEdit MaskType="DateTimeAdvancingCaret" AllowNullInput="True" Grid.Column="1" Grid.Row="9"
EditValue="{Binding Mode=TwoWay, Path=RenewalSendDate}" Height="23" EditValue="{Binding Mode=TwoWay, Path=RenewalSendDate}" Height="23"
Margin="3,3,3,3" Margin="3,3,3,3"
@@ -222,7 +223,7 @@
</Grid> </Grid>
</ScrollViewer> </ScrollViewer>
</TabItem> </TabItem>
<TabItem Header="Kostenträger" Name="tabitem_costbearer"> <TabItem Header="{markup:Translate Kostenträger}" Name="tabitem_costbearer">
<GroupBox x:Name="groupBox_newCostBearer" Grid.Row="0" Style="{DynamicResource ObjectEditGroupBox}"> <GroupBox x:Name="groupBox_newCostBearer" Grid.Row="0" Style="{DynamicResource ObjectEditGroupBox}">
<GroupBox.Header> <GroupBox.Header>
<Border Style="{StaticResource ObjectEditGroupBoxHeaderBorderStyle}"> <Border Style="{StaticResource ObjectEditGroupBoxHeaderBorderStyle}">
@@ -231,7 +232,7 @@
<ColumnDefinition Width="Auto" /> <ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" /> <ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBlock Text="Kostenträger" VerticalAlignment="Center" Margin="3" /> <TextBlock Text="{markup:Translate Kostenträger}" VerticalAlignment="Center" Margin="3" />
</Grid> </Grid>
</Border> </Border>
</GroupBox.Header> </GroupBox.Header>
@@ -241,9 +242,9 @@
<RowDefinition Height="*" /> <RowDefinition Height="*" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Button Margin="10 3 0 0" <Button Margin="10 3 0 0"
ToolTip="Klicken Sie hier um einen weiteren Kostenträger hinzuzufügen" ToolTip="{markup:Translate Klicken Sie hier um einen weiteren Kostenträger hinzuzufügen}"
Name="button_addCostBearer" Click="button_addCostBearer_Click" Name="button_addCostBearer" Click="button_addCostBearer_Click"
HorizontalAlignment="Left">Weiteren Kostenträger hinzufügen</Button> HorizontalAlignment="Left" Content="{markup:Translate Weiteren Kostenträger hinzufügen}" />
<TabControl x:Name="tabcontrol_costbearers" Grid.Row="1" Margin="5" ItemsSource="{Binding CostBearerRelations.VMList}"> <TabControl x:Name="tabcontrol_costbearers" Grid.Row="1" Margin="5" ItemsSource="{Binding CostBearerRelations.VMList}">
<TabControl.ItemTemplate> <TabControl.ItemTemplate>
<DataTemplate> <DataTemplate>
@@ -252,7 +253,7 @@
<Button VerticalAlignment="Center" Height="20" Width="20" Name="ChangeCostbearerBtn" <Button VerticalAlignment="Center" Height="20" Width="20" Name="ChangeCostbearerBtn"
Tag="{Binding}" Tag="{Binding}"
Click="ChangeCostbearerBtn_Click" Click="ChangeCostbearerBtn_Click"
ToolTip="Kostenträger tauschen" ToolTip="{markup:Translate Kostenträger tauschen}"
Margin="0"> Margin="0">
<Button.Visibility> <Button.Visibility>
<MultiBinding Converter="{StaticResource BoolVisibilityMultiConverter }"> <MultiBinding Converter="{StaticResource BoolVisibilityMultiConverter }">
@@ -274,7 +275,7 @@
<Button Visibility="{Binding IsSelected, RelativeSource={RelativeSource AncestorType={x:Type TabItem}}, Converter={StaticResource BoolVisibilityConverter}}" <Button Visibility="{Binding IsSelected, RelativeSource={RelativeSource AncestorType={x:Type TabItem}}, Converter={StaticResource BoolVisibilityConverter}}"
VerticalAlignment="Center" Height="20" Name="btn_deleteCBRel" VerticalAlignment="Center" Height="20" Name="btn_deleteCBRel"
Click="btn_deleteCBRel_Click" Click="btn_deleteCBRel_Click"
ToolTip="Kostenträger entfernen" ToolTip="{markup:Translate Kostenträger entfernen}"
Style="{DynamicResource CloseButtonStyle}" Margin="3,0,0,0" /> Style="{DynamicResource CloseButtonStyle}" Margin="3,0,0,0" />
</StackPanel> </StackPanel>
@@ -329,18 +330,18 @@
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<TextBlock VerticalAlignment="Center" Margin="3" Grid.Row="1" <TextBlock VerticalAlignment="Center" Margin="3" Grid.Row="1"
Text="Bezeichnung" Visibility="{Binding Path=ShowHilfeplanBezeichnung, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type view:SupportConceptView}}, Converter={StaticResource BoolVisibilityConverter}}"/> Text="{markup:Translate Bezeichnung}" Visibility="{Binding Path=ShowHilfeplanBezeichnung, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type view:SupportConceptView}}, Converter={StaticResource BoolVisibilityConverter}}"/>
<TextBox Grid.Column="1" Grid.Row="1" Margin="3" <TextBox Grid.Column="1" Grid.Row="1" Margin="3"
Height="23" Visibility="{Binding Path=ShowHilfeplanBezeichnung, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type view:SupportConceptView}}, Converter={StaticResource BoolVisibilityConverter}}" Height="23" Visibility="{Binding Path=ShowHilfeplanBezeichnung, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type view:SupportConceptView}}, Converter={StaticResource BoolVisibilityConverter}}"
Text="{val:ValidationBinding Path=AuswahlBezeichnung, UpdateSourceTrigger=PropertyChanged}"/> Text="{val:ValidationBinding Path=AuswahlBezeichnung, UpdateSourceTrigger=PropertyChanged}"/>
<TextBlock VerticalAlignment="Center" Margin="3" Grid.Row="2" <TextBlock VerticalAlignment="Center" Margin="3" Grid.Row="2"
Text="Aktenzeichen Klient" /> Text="{markup:Translate Aktenzeichen Klient}" />
<TextBox Grid.Column="1" Grid.Row="2" Margin="3" <TextBox Grid.Column="1" Grid.Row="2" Margin="3"
Height="23" Height="23"
Text="{val:ValidationBinding Path=CustomerReferenceNumber, UpdateSourceTrigger=PropertyChanged}" /> Text="{val:ValidationBinding Path=CustomerReferenceNumber, UpdateSourceTrigger=PropertyChanged}" />
<TextBlock VerticalAlignment="Center" Margin="3" Grid.Row="3" <TextBlock VerticalAlignment="Center" Margin="3" Grid.Row="3"
Text="Beantragt von" /> Text="{markup:Translate Beantragt von}" />
<dxe:DateEdit MaskType="DateTimeAdvancingCaret" x:Name="dtpRequestedStartDate" <dxe:DateEdit MaskType="DateTimeAdvancingCaret" x:Name="dtpRequestedStartDate"
AllowNullInput="True" AllowNullInput="True"
EditValue="{Binding Path=RequestedStartDate, Mode=TwoWay, UpdateSourceTrigger=LostFocus}" EditValue="{Binding Path=RequestedStartDate, Mode=TwoWay, UpdateSourceTrigger=LostFocus}"
@@ -348,27 +349,27 @@
Margin="3" Height="23" Margin="3" Height="23"
/> />
<TextBlock VerticalAlignment="Center" Margin="3" Grid.Row="4" <TextBlock VerticalAlignment="Center" Margin="3" Grid.Row="4"
Text="Beantragt bis" /> Text="{markup:Translate Beantragt bis}" />
<dxe:DateEdit MaskType="DateTimeAdvancingCaret" AllowNullInput="True" EditValue="{Binding Path=RequestedEndDate, Mode=TwoWay, UpdateSourceTrigger=LostFocus}" <dxe:DateEdit MaskType="DateTimeAdvancingCaret" AllowNullInput="True" EditValue="{Binding Path=RequestedEndDate, Mode=TwoWay, UpdateSourceTrigger=LostFocus}"
Grid.Column="1" Grid.Row="4" Grid.Column="1" Grid.Row="4"
Margin="3" Height="23"/> Margin="3" Height="23"/>
<TextBlock VerticalAlignment="Center" Margin="3" Grid.Row="5" <TextBlock VerticalAlignment="Center" Margin="3" Grid.Row="5"
Text="Bewilligt von" /> Text="{markup:Translate Bewilligt von}" />
<dxe:DateEdit MaskType="DateTimeAdvancingCaret" AllowNullInput="True" EditValue="{Binding Path=ApprovedStartDate, Mode=TwoWay, UpdateSourceTrigger=LostFocus}" <dxe:DateEdit MaskType="DateTimeAdvancingCaret" AllowNullInput="True" EditValue="{Binding Path=ApprovedStartDate, Mode=TwoWay, UpdateSourceTrigger=LostFocus}"
Grid.Column="1" Grid.Row="5" Grid.Column="1" Grid.Row="5"
Margin="3" Height="23"/> Margin="3" Height="23"/>
<TextBlock VerticalAlignment="Center" Margin="3" Grid.Row="6" <TextBlock VerticalAlignment="Center" Margin="3" Grid.Row="6"
Text="Bewilligt bis" /> Text="{markup:Translate Bewilligt bis}" />
<dxe:DateEdit MaskType="DateTimeAdvancingCaret" AllowNullInput="True" EditValue="{Binding Path=ApprovedEndDate, Mode=TwoWay, UpdateSourceTrigger=LostFocus}" <dxe:DateEdit MaskType="DateTimeAdvancingCaret" AllowNullInput="True" EditValue="{Binding Path=ApprovedEndDate, Mode=TwoWay, UpdateSourceTrigger=LostFocus}"
Grid.Column="1" Grid.Row="6" Margin="3" Height="23"/> Grid.Column="1" Grid.Row="6" Margin="3" Height="23"/>
<TextBlock VerticalAlignment="Center" Margin="3" Grid.Row="7" <TextBlock VerticalAlignment="Center" Margin="3" Grid.Row="7"
Text="Notiz" /> Text="{markup:Translate Notiz}" />
<TextBox Name="textbox_newCostBearerNotice" <TextBox Name="textbox_newCostBearerNotice"
Text="{Binding Path=Notice, UpdateSourceTrigger=PropertyChanged}" Grid.Row="7" Margin="3" Text="{Binding Path=Notice, UpdateSourceTrigger=PropertyChanged}" Grid.Row="7" Margin="3"
Height="23" Height="23"
Grid.Column="1" /> Grid.Column="1" />
<TextBlock VerticalAlignment="Center" Margin="3" Grid.Row="8" <TextBlock VerticalAlignment="Center" Margin="3" Grid.Row="8"
Text="Kostenträger Kontakt" /> Text="{markup:Translate Kostenträger Kontakt}" />
<uc:PopUpEdit NewButtonVisibility="Visible" <uc:PopUpEdit NewButtonVisibility="Visible"
NewClick="popupedit_costBearerContactPersonSearch_NewClick" NewClick="popupedit_costBearerContactPersonSearch_NewClick"
IsReadOnly="True" IsReadOnly="True"
@@ -402,7 +403,7 @@
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="23" /> <RowDefinition Height="23" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<TextBlock Text="Bewilligungen" TextElement.FontSize="16" <TextBlock Text="{markup:Translate Bewilligungen}" TextElement.FontSize="16"
VerticalAlignment="Bottom" VerticalAlignment="Bottom"
TextElement.Foreground="{StaticResource TabItemHotTextBrush}" TextElement.Foreground="{StaticResource TabItemHotTextBrush}"
TextElement.FontFamily="Microsoft Sans Serif" TextElement.FontFamily="Microsoft Sans Serif"
@@ -487,7 +488,7 @@
</Grid.RowDefinitions> </Grid.RowDefinitions>
<TextBlock Margin="3" VerticalAlignment="Center" <TextBlock Margin="3" VerticalAlignment="Center"
FontWeight="Bold" FontWeight="Bold"
Text="Gültig ab:" /> Text="{markup:Translate Gültig ab:}" />
<dxe:DateEdit MaskType="DateTimeAdvancingCaret" HorizontalAlignment="Stretch" <dxe:DateEdit MaskType="DateTimeAdvancingCaret" HorizontalAlignment="Stretch"
EditValue="{Binding Path=StartDate, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" EditValue="{Binding Path=StartDate, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
Grid.Column="1" Margin="3" Width="85" Grid.Column="1" Margin="3" Width="85"
@@ -495,12 +496,12 @@
<TextBlock Margin="3" VerticalAlignment="Center" <TextBlock Margin="3" VerticalAlignment="Center"
FontWeight="Bold" FontWeight="Bold"
Grid.Column="2" Grid.Column="2"
Text="Gültig bis:" /> Text="{markup:Translate Gültig bis:}" />
<dxe:DateEdit MaskType="DateTimeAdvancingCaret" HorizontalAlignment="Stretch" <dxe:DateEdit MaskType="DateTimeAdvancingCaret" HorizontalAlignment="Stretch"
EditValue="{Binding Path=EndDate, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" EditValue="{Binding Path=EndDate, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
Grid.Column="3" Margin="3" Width="85" Grid.Column="3" Margin="3" Width="85"
Height="23"/> Height="23"/>
<Label Grid.Column="4" VerticalAlignment="Center">Kategorie</Label> <Label Grid.Column="4" VerticalAlignment="Center" Content="{markup:Translate Kategorie}" />
<dxe:ComboBoxEdit x:Name="cboServiceCategory" <dxe:ComboBoxEdit x:Name="cboServiceCategory"
Grid.Column="5" Grid.Column="5"
Initialized="CboServiceCategory_OnInitialized" Initialized="CboServiceCategory_OnInitialized"
@@ -529,7 +530,7 @@
<TextBlock VerticalAlignment="Center" <TextBlock VerticalAlignment="Center"
Grid.Row="1" Grid.Column="0" Grid.Row="1" Grid.Column="0"
Margin="3" Margin="3"
Text="{Binding TranslatedServiceUnitName, Mode=OneWay, UpdateSourceTrigger=PropertyChanged, StringFormat=\{0\} genehmigt}" /> Text="{Binding TranslatedServiceUnitName, Mode=OneWay, UpdateSourceTrigger=PropertyChanged, StringFormat={markup:Translate \{0\} genehmigt}}" />
<dxe:TextEdit MaskType="Numeric" Mask="########0.00" MaskUseAsDisplayFormat="True" <dxe:TextEdit MaskType="Numeric" Mask="########0.00" MaskUseAsDisplayFormat="True"
Grid.Row="1" Grid.Row="1"
AllowNullInput="True" AllowNullInput="True"
@@ -553,17 +554,17 @@
<TextBlock VerticalAlignment="Center" <TextBlock VerticalAlignment="Center"
Margin="3" Margin="3"
Grid.Row="1" Grid.Row="1"
Grid.Column="4" Text="Übertragbar" /> Grid.Column="4" Text="{markup:Translate Übertragbar}" />
<CheckBox Height="23" Margin="3 8 0 0" <CheckBox Height="23" Margin="3 8 0 0"
Grid.Column="5" Grid.Column="5"
Grid.Row="1" Grid.Row="1"
IsChecked="{Binding IsApprovedBEShifting, UpdateSourceTrigger=PropertyChanged}" IsChecked="{Binding IsApprovedBEShifting, UpdateSourceTrigger=PropertyChanged}"
ToolTip="Übertragung von Reststunden in den nachfolgenden Bewilligungsabschnitt möglich?" /> ToolTip="{markup:Translate Übertragung von Reststunden in den nachfolgenden Bewilligungsabschnitt möglich}" />
<TextBlock VerticalAlignment="Center" <TextBlock VerticalAlignment="Center"
Margin="3" Margin="3"
Grid.Row="2" Grid.Row="2"
Grid.Column="0" Grid.Column="0"
Text="{Binding TranslatedServiceUnitName, Mode=OneWay, UpdateSourceTrigger=PropertyChanged, StringFormat=\{0\} Gesamt}" /> Text="{Binding TranslatedServiceUnitName, Mode=OneWay, UpdateSourceTrigger=PropertyChanged, StringFormat={markup:Translate \{0\} Gesamt}}" />
<dxe:TextEdit MaskType="Numeric" Mask="########0.00" MaskUseAsDisplayFormat="True" <dxe:TextEdit MaskType="Numeric" Mask="########0.00" MaskUseAsDisplayFormat="True"
AllowNullInput="True" AllowNullInput="True"
Grid.Row="2" Grid.Column="1" Grid.Row="2" Grid.Column="1"
@@ -574,7 +575,7 @@
<TextBlock VerticalAlignment="Center" <TextBlock VerticalAlignment="Center"
Grid.Row="3" Grid.Column="0" Grid.Row="3" Grid.Column="0"
Margin="3" Margin="3"
Text="Betrag pauschal" /> Text="{markup:Translate Betrag pauschal}" />
<dxe:TextEdit MaskType="Numeric" Mask="########0.00" MaskUseAsDisplayFormat="True" <dxe:TextEdit MaskType="Numeric" Mask="########0.00" MaskUseAsDisplayFormat="True"
AllowNullInput="True" AllowNullInput="True"
Name="textbox_newCostBearerApprovedAllowance" Name="textbox_newCostBearerApprovedAllowance"
@@ -598,16 +599,16 @@
<TextBlock VerticalAlignment="Center" <TextBlock VerticalAlignment="Center"
Margin="3" Margin="3"
Grid.Row="3" Grid.Row="3"
Grid.Column="4" Text="Übertragbar" /> Grid.Column="4" Text="{markup:Translate Übertragbar}" />
<CheckBox Height="23" Margin="3 8 0 0" <CheckBox Height="23" Margin="3 8 0 0"
Grid.Row="3" Grid.Column="5" Grid.Row="3" Grid.Column="5"
IsChecked="{Binding IsApprovedFixedAmountShifting, UpdateSourceTrigger=PropertyChanged}" IsChecked="{Binding IsApprovedFixedAmountShifting, UpdateSourceTrigger=PropertyChanged}"
ToolTip="Übertragung von Rest Budget in den nachfolgenden Bewilligungsabschnitt möglich?" /> ToolTip="{markup:Translate Übertragung von Rest Budget in den nachfolgenden Bewilligungsabschnitt möglich}" />
<TextBlock VerticalAlignment="Center" <TextBlock VerticalAlignment="Center"
Margin="3" Margin="3"
Grid.Row="4" Grid.Row="4"
Grid.Column="0" Grid.Column="0"
Text="Monatlicher Abschlag" /> Text="{markup:Translate Monatlicher Abschlag}" />
<dxe:TextEdit MaskType="Numeric" Mask="########0.00" MaskUseAsDisplayFormat="True" <dxe:TextEdit MaskType="Numeric" Mask="########0.00" MaskUseAsDisplayFormat="True"
AllowNullInput="True" AllowNullInput="True"
Grid.Row="4" Grid.Column="1" Grid.Row="4" Grid.Column="1"
@@ -645,7 +646,7 @@
Grid.ColumnSpan="6" Grid.ColumnSpan="6"
Visibility="{Binding Path=SupportConceptApprovalEmployeeRelations.AddButtonVisibility}" Visibility="{Binding Path=SupportConceptApprovalEmployeeRelations.AddButtonVisibility}"
HorizontalAlignment="Left" HorizontalAlignment="Left"
Margin="3" Content="Betreuer hinzufügen" x:Name="button_openAddBetreuungsschluessel" Margin="3" Content="{markup:Translate Betreuer hinzufügen}" x:Name="button_openAddBetreuungsschluessel"
Click="button_openAddBetreuungsschluessel_Click" Click="button_openAddBetreuungsschluessel_Click"
/> />
</Grid> </Grid>
@@ -864,10 +865,10 @@
Grid.Column="3" x:Name="endTime" /> Grid.Column="3" x:Name="endTime" />
</Grid> </Grid>
<StackPanel Grid.Column="2" Orientation="Horizontal"> <StackPanel Grid.Column="2" Orientation="Horizontal">
<Label Margin="3" Height="23" Content="für Mitarbeiter" /> <Label Margin="3" Height="23" Content="{markup:Translate für Mitarbeiter}" />
<Button x:Name="button_addemployee" HorizontalAlignment="Right" <Button x:Name="button_addemployee" HorizontalAlignment="Right"
VerticalAlignment="Top" Click="button_addemployee_Click" Height="21" VerticalAlignment="Top" Click="button_addemployee_Click" Height="21"
Width="21" Margin="3" ToolTip="Mitarbeiter hinzufügen"> Width="21" Margin="3" ToolTip="{markup:Translate Mitarbeiter hinzufügen}">
<Grid Width="18" HorizontalAlignment="Center" VerticalAlignment="Center"> <Grid Width="18" HorizontalAlignment="Center" VerticalAlignment="Center">
<Line X1="4" X2="12" Y1="8" Y2="8" Fill="{x:Null}" Stroke="#FFFFFFFF" <Line X1="4" X2="12" Y1="8" Y2="8" Fill="{x:Null}" Stroke="#FFFFFFFF"
StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeStartLineCap="Round" StrokeEndLineCap="Round"
@@ -951,7 +952,7 @@
<dxe:TextEditSettings AcceptsReturn="True"></dxe:TextEditSettings> <dxe:TextEditSettings AcceptsReturn="True"></dxe:TextEditSettings>
</dxg:GridColumn.EditSettings> </dxg:GridColumn.EditSettings>
</dxg:GridColumn> </dxg:GridColumn>
<dxg:GridColumn FieldName="Employees" Header="für Mitarbeiter" AllowEditing="True"> <dxg:GridColumn FieldName="Employees" Header="{markup:Translate für Mitarbeiter}" AllowEditing="True">
<dxg:GridColumn.DisplayTemplate> <dxg:GridColumn.DisplayTemplate>
<ControlTemplate> <ControlTemplate>
<ListView BorderThickness="0" ItemsSource="{Binding Value}"> <ListView BorderThickness="0" ItemsSource="{Binding Value}">
@@ -973,13 +974,13 @@
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Button Cursor="Hand" Foreground="Blue" <Button Cursor="Hand" Foreground="Blue"
HorizontalAlignment="Left" Margin="3 1 0 0" HorizontalAlignment="Left" Margin="3 1 0 0"
Loaded="Button_Loaded"> Loaded="Button_Loaded" Content="{markup:Translate Mitarbeiter hinzufügen}">
<Button.Template> <Button.Template>
<ControlTemplate TargetType="Button"> <ControlTemplate TargetType="Button">
<TextBlock> <TextBlock>
<ContentPresenter /></TextBlock> <ContentPresenter /></TextBlock>
</ControlTemplate> </ControlTemplate>
</Button.Template> Mitarbeiter hinzufügen </Button.Template>
</Button> </Button>
<ListView Name="PART_Editor" BorderThickness="0" Grid.Row="1" <ListView Name="PART_Editor" BorderThickness="0" Grid.Row="1"
MaxHeight="100" MaxHeight="100"
@@ -1107,7 +1108,7 @@
</Popup> </Popup>
<controls:PopupNonTopmost Topmost="False" x:Name="popup_newBetreuungsschluessel" Width="350" StaysOpen="True" Placement="MousePoint"> <controls:PopupNonTopmost Topmost="False" x:Name="popup_newBetreuungsschluessel" Width="350" StaysOpen="True" Placement="MousePoint">
<Border Background="White" Padding="3" BorderThickness="1" BorderBrush="Gray"> <Border Background="White" Padding="3" BorderThickness="1" BorderBrush="Gray">
<GroupBox x:Name="groupbox_newBetreuungsschluessel" Header="Neuen Betreuer hinzufügen" Style="{StaticResource ObjectEditGroupBox}"> <GroupBox x:Name="groupbox_newBetreuungsschluessel" Header="{markup:Translate Neuen Betreuer hinzufügen}" Style="{StaticResource ObjectEditGroupBox}">
<Grid> <Grid>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
@@ -1120,7 +1121,7 @@
<ColumnDefinition Width="*" /> <ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" /> <ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Label VerticalAlignment="Center" Content="Mitarbeiter" /> <Label VerticalAlignment="Center" Content="{markup:Translate Mitarbeiter}" />
<uc:PopUpEdit IsReadOnly="True" <uc:PopUpEdit IsReadOnly="True"
DeleteButtonVisibility="Collapsed" DeleteButtonVisibility="Collapsed"
Grid.Column="1" Grid.Row="0" Grid.ColumnSpan="2" Margin="3" Height="23" x:Name="popupedit_betreuungsschluessel" Grid.Column="1" Grid.Row="0" Grid.ColumnSpan="2" Margin="3" Height="23" x:Name="popupedit_betreuungsschluessel"

View File

@@ -15,6 +15,7 @@ using BeWo.Annotations;
using BeWo.Controls; using BeWo.Controls;
using BeWo.Core; using BeWo.Core;
using BeWo.Core.Service; using BeWo.Core.Service;
using BeWo.MultiLanguage;
using BeWo.ServiceProxy; using BeWo.ServiceProxy;
using BeWo.Validation; using BeWo.Validation;
using BeWo.ViewModel; using BeWo.ViewModel;
@@ -25,6 +26,7 @@ using BS.Shared.DataContracts;
using BS.Shared.DataContracts.ClientPartials; using BS.Shared.DataContracts.ClientPartials;
using BS.Shared.DataContracts.Compact; using BS.Shared.DataContracts.Compact;
using BS.Shared.Extensions; using BS.Shared.Extensions;
using BS.Shared.Translation;
using DevExpress.Utils; using DevExpress.Utils;
using DevExpress.Xpf.Editors.Settings; using DevExpress.Xpf.Editors.Settings;
using DevExpress.Xpf.Grid; using DevExpress.Xpf.Grid;
@@ -187,7 +189,7 @@ namespace BeWo.View.Detail
{ {
get get
{ {
return "Hilfepläne"; return Translator.Translate("Hilfepläne");
} }
} }
@@ -281,7 +283,7 @@ namespace BeWo.View.Detail
{ {
if (ViewModel.CostBearerRelations.VMList.Exists(vm => vm.CostBearer == null)) if (ViewModel.CostBearerRelations.VMList.Exists(vm => vm.CostBearer == null))
{ {
MessageBox.Show("Bitte wählen Sie einen Kostenträger aus", "Fehlende Eingabe", MessageBoxButton.OK); MessageBox.Show(Translator.Translate("Bitte wählen Sie einen Kostenträger aus"), "Fehlende Eingabe", MessageBoxButton.OK);
return; return;
} }
@@ -332,13 +334,13 @@ namespace BeWo.View.Detail
if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.BookServiceRecordOutOfSupportConcept)) if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.BookServiceRecordOutOfSupportConcept))
{ {
MessageBox.Show("Es existiert mindestens eine Buchung außerhalb des Hilfeplanzeitraums.", MessageBox.Show(Translator.Translate("Es existiert mindestens eine Buchung außerhalb des Hilfeplanzeitraums."),
"Speichern nicht möglich", MessageBoxButton.OK, MessageBoxImage.Warning); "Speichern nicht möglich", MessageBoxButton.OK, MessageBoxImage.Warning);
} }
else else
{ {
var mbResult = var mbResult =
MessageBox.Show("Es existiert mindestens eine Buchung außerhalb des Hilfeplanzeitraums.\nMöchten Sie trotzdem speichern?", MessageBox.Show(Translator.Translate("Es existiert mindestens eine Buchung außerhalb des Hilfeplanzeitraums.\nMöchten Sie trotzdem speichern?"),
"Speichern", MessageBoxButton.YesNo, MessageBoxImage.Warning); "Speichern", MessageBoxButton.YesNo, MessageBoxImage.Warning);
if(mbResult.Equals(MessageBoxResult.No)) if(mbResult.Equals(MessageBoxResult.No))
@@ -415,7 +417,7 @@ namespace BeWo.View.Detail
if (ViewModel.CostBearerRelations.VMList.Exists(vm => vm.CostBearer != null && vm.CostBearer.CostBearerOid.Equals(e.Data.CostBearerOid))) if (ViewModel.CostBearerRelations.VMList.Exists(vm => vm.CostBearer != null && vm.CostBearer.CostBearerOid.Equals(e.Data.CostBearerOid)))
{ {
MessageBox.Show("Dieser Kostenträger wurde bereits hinzugefügt.", "Zufügen nicht möglich", MessageBoxButton.OK, MessageBoxImage.Information); MessageBox.Show(Translator.Translate("Dieser Kostenträger wurde bereits hinzugefügt."), "Zufügen nicht möglich", MessageBoxButton.OK, MessageBoxImage.Information);
return; return;
} }
@@ -468,8 +470,8 @@ namespace BeWo.View.Detail
{ {
if (HasServiceRecords(ViewModel)) if (HasServiceRecords(ViewModel))
{ {
MessageBox.Show( MessageBox.Show(Translator.Translate(
"Für diesen Klienten wurden bereits Leistungen hinterlegt. Sie müssen diese Leistungen erst löschen bevor Sie den Klient wechseln können.", "Für diesen Klienten wurden bereits Leistungen hinterlegt. Sie müssen diese Leistungen erst löschen bevor Sie den Klient wechseln können."),
"Fehler", "Fehler",
MessageBoxButton.OK, MessageBoxButton.OK,
MessageBoxImage.Exclamation); MessageBoxImage.Exclamation);
@@ -598,8 +600,8 @@ namespace BeWo.View.Detail
if (HasServiceRecords(cbRelVM)) if (HasServiceRecords(cbRelVM))
{ {
MessageBox.Show( MessageBox.Show(Translator.Translate(
"Für diesen Kostenträger wurden bereits Leistungen hinterlegt. Sie müssen diese Leistungen erst löschen bevor Sie den Kostenträger entfernen können.", "Für diesen Kostenträger wurden bereits Leistungen hinterlegt. Sie müssen diese Leistungen erst löschen bevor Sie den Kostenträger entfernen können."),
"Löschen", "Löschen",
MessageBoxButton.OK, MessageBoxButton.OK,
MessageBoxImage.Exclamation); MessageBoxImage.Exclamation);
@@ -1185,7 +1187,7 @@ namespace BeWo.View.Detail
gridControl.Columns.Add(deleteColumn); gridControl.Columns.Add(deleteColumn);
var employeeColumn = new GridColumn {Header = "Mitarbeiter", FieldName = "EmployeeString", AllowEditing = DefaultBoolean.False, Width = 250}; var employeeColumn = new GridColumn {Header = Translator.Translate("Mitarbeiter"), FieldName = "EmployeeString", AllowEditing = DefaultBoolean.False, Width = 250};
var allowEditingBetreuungsschluesselColumn = BeWoApp.HasLoggedOnUserRight(new[] { UserRightType.EditAll, UserRightType.Betreuungsschluessel_Edit }) ? DefaultBoolean.True : DefaultBoolean.False; var allowEditingBetreuungsschluesselColumn = BeWoApp.HasLoggedOnUserRight(new[] { UserRightType.EditAll, UserRightType.Betreuungsschluessel_Edit }) ? DefaultBoolean.True : DefaultBoolean.False;
var betreuungsschluesselColumn = new GridColumn { Name = "ColumnBSProzent", Header = "Anteil an der Betreuung", FieldName = "Betreuungsschluessel", AllowEditing = allowEditingBetreuungsschluesselColumn, Width = 170, EditSettings = new TextEditSettings { MaskUseAsDisplayFormat = true, MaskType = MaskType.Numeric, Mask = "########0.00" } }; var betreuungsschluesselColumn = new GridColumn { Name = "ColumnBSProzent", Header = "Anteil an der Betreuung", FieldName = "Betreuungsschluessel", AllowEditing = allowEditingBetreuungsschluesselColumn, Width = 170, EditSettings = new TextEditSettings { MaskUseAsDisplayFormat = true, MaskType = MaskType.Numeric, Mask = "########0.00" } };

View File

@@ -2,7 +2,9 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:localView="clr-namespace:BeWo.View" xmlns:localViewModel="clr-namespace:BeWo.ViewModel" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:localView="clr-namespace:BeWo.View" xmlns:localViewModel="clr-namespace:BeWo.ViewModel"
xmlns:shared="clr-namespace:BS.Shared.DataContracts;assembly=BS.Shared" xmlns:sharedCompact="clr-namespace:BS.Shared.DataContracts.Compact;assembly=BS.Shared" xmlns:shared="clr-namespace:BS.Shared.DataContracts;assembly=BS.Shared" xmlns:sharedCompact="clr-namespace:BS.Shared.DataContracts.Compact;assembly=BS.Shared"
xmlns:uc="clr-namespace:BeWo.Controls;assembly=BeWo.Controls" xmlns:uc="clr-namespace:BeWo.Controls;assembly=BeWo.Controls"
xmlns:blc="clr-namespace:Blacklight.Wpf.Controls;assembly=Blacklight.Wpf.Controls" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Focusable="True"> xmlns:blc="clr-namespace:Blacklight.Wpf.Controls;assembly=Blacklight.Wpf.Controls"
xmlns:t="clr-namespace:BeWo.MultiLanguage.Markup"
HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Focusable="True">
<localView:BeWoView.Resources> <localView:BeWoView.Resources>
<localView:TaskDateDescriptionConverter x:Key="TaskDateDescriptionConverter" /> <localView:TaskDateDescriptionConverter x:Key="TaskDateDescriptionConverter" />
@@ -254,7 +256,7 @@
<blc:DragDockPanel.Header> <blc:DragDockPanel.Header>
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<Image Source="..\Ressources\Icons\AlertsDisabled.png" Stretch="Fill" StretchDirection="Both" /> <Image Source="..\Ressources\Icons\AlertsDisabled.png" Stretch="Fill" StretchDirection="Both" />
<TextBlock Text="Aufgaben" TextWrapping="Wrap" FontSize="16" Foreground="#E0E0E0" VerticalAlignment="Bottom" Margin="5,0,0,5" /> <TextBlock Text="{t:Translate Aufgaben}" TextWrapping="Wrap" FontSize="16" Foreground="#E0E0E0" VerticalAlignment="Bottom" Margin="5,0,0,5" />
</StackPanel> </StackPanel>
</blc:DragDockPanel.Header> </blc:DragDockPanel.Header>
<Grid Grid.IsSharedSizeScope="True"> <Grid Grid.IsSharedSizeScope="True">
@@ -342,7 +344,7 @@
<blc:DragDockPanel.Header> <blc:DragDockPanel.Header>
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<Image Source="..\Ressources\Icons\Light Bulb.png" Stretch="Fill" StretchDirection="Both" /> <Image Source="..\Ressources\Icons\Light Bulb.png" Stretch="Fill" StretchDirection="Both" />
<TextBlock Text="Hinweise" TextWrapping="Wrap" FontSize="16" Foreground="#E0E0E0" VerticalAlignment="Bottom" Margin="5,0,0,5" /> <TextBlock Text="{t:Translate Hinweise}" TextWrapping="Wrap" FontSize="16" Foreground="#E0E0E0" VerticalAlignment="Bottom" Margin="5,0,0,5" />
</StackPanel> </StackPanel>
</blc:DragDockPanel.Header> </blc:DragDockPanel.Header>
<Grid> <Grid>
@@ -354,7 +356,7 @@
<RowDefinition Height="*" /> <RowDefinition Height="*" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<TextBlock Grid.Row="0" Text="Folgende Hilfepläne laufen demnächst aus:" TextWrapping="Wrap" /> <TextBlock Grid.Row="0" Text="{t:Translate Folgende Hilfepläne laufen demnächst aus:}" TextWrapping="Wrap" />
<ListBox Grid.Row="1" ScrollViewer.CanContentScroll="True" IsSynchronizedWithCurrentItem="True" x:Name="listboxExpiringSupportConcepts" Margin="0,3,0,0" Padding="0,0,0,0" Width="Auto" HorizontalAlignment="Stretch" MinWidth="0" HorizontalContentAlignment="Stretch" Style="{DynamicResource HomeViewListStyle}" ItemContainerStyle="{DynamicResource HomeViewListBoxItemStyle}" ScrollViewer.IsDeferredScrollingEnabled="False" MouseDoubleClick="listboxSupportConcepts_MouseDoubleClick" Background="{x:Null}"> <ListBox Grid.Row="1" ScrollViewer.CanContentScroll="True" IsSynchronizedWithCurrentItem="True" x:Name="listboxExpiringSupportConcepts" Margin="0,3,0,0" Padding="0,0,0,0" Width="Auto" HorizontalAlignment="Stretch" MinWidth="0" HorizontalContentAlignment="Stretch" Style="{DynamicResource HomeViewListStyle}" ItemContainerStyle="{DynamicResource HomeViewListBoxItemStyle}" ScrollViewer.IsDeferredScrollingEnabled="False" MouseDoubleClick="listboxSupportConcepts_MouseDoubleClick" Background="{x:Null}">
<ListBox.ItemTemplate> <ListBox.ItemTemplate>
<DataTemplate DataType="{x:Type sharedCompact:CompactSupportConceptDC}"> <DataTemplate DataType="{x:Type sharedCompact:CompactSupportConceptDC}">
@@ -387,7 +389,7 @@
</MultiBinding> </MultiBinding>
</TextBlock.Text> </TextBlock.Text>
</TextBlock> </TextBlock>
<Button Grid.Column="1" Width="23" Height="23" Style="{DynamicResource TransparentButtonStyle}" ToolTip="In Zeiterfassung öffnen" Tag="{Binding}" Click="ButtonOpenServiceRecordView_Click" Margin="0,0,2,0"> <Button Grid.Column="1" Width="23" Height="23" Style="{DynamicResource TransparentButtonStyle}" ToolTip="{t:Translate In Zeiterfassung öffnen}" Tag="{Binding}" Click="ButtonOpenServiceRecordView_Click" Margin="0,0,2,0">
<Image Source="..\Ressources\Icons\HistoryDisabled.png" /> <Image Source="..\Ressources\Icons\HistoryDisabled.png" />
</Button> </Button>
</Grid> </Grid>
@@ -419,7 +421,7 @@
<blc:DragDockPanel.Header> <blc:DragDockPanel.Header>
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<Image Source="..\Ressources\Icons\Alarm.png" Stretch="Fill" StretchDirection="Both"></Image> <Image Source="..\Ressources\Icons\Alarm.png" Stretch="Fill" StretchDirection="Both"></Image>
<TextBlock Text="Hilfeplankonferenzen" TextWrapping="Wrap" FontSize="16" Foreground="#E0E0E0" VerticalAlignment="Bottom" Margin="5,0,0,5" /> <TextBlock Text="{t:Translate Hilfeplankonferenzen}" TextWrapping="Wrap" FontSize="16" Foreground="#E0E0E0" VerticalAlignment="Bottom" Margin="5,0,0,5" />
</StackPanel> </StackPanel>
</blc:DragDockPanel.Header> </blc:DragDockPanel.Header>
<Grid> <Grid>
@@ -430,7 +432,7 @@
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
<RowDefinition Height="*" /> <RowDefinition Height="*" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<TextBlock Grid.Row="0" Text="Hilfeplankonferenzen innerhalb der nächsten zwei Wochen:" TextWrapping="Wrap" /> <TextBlock Grid.Row="0" Text="{t:Translate Hilfeplankonferenzen innerhalb der nächsten zwei Wochen:}" TextWrapping="Wrap" />
<ListBox Grid.Row="1" ScrollViewer.CanContentScroll="True" IsSynchronizedWithCurrentItem="True" x:Name="listboxConferenceDates" Margin="0,3,0,0" Padding="0,0,0,0" Width="Auto" HorizontalAlignment="Stretch" MinWidth="0" HorizontalContentAlignment="Stretch" Style="{DynamicResource HomeViewListStyle}" ItemContainerStyle="{DynamicResource HomeViewListBoxItemStyle}" ScrollViewer.IsDeferredScrollingEnabled="False" MouseDoubleClick="listboxSupportConcepts_MouseDoubleClick" Background="{x:Null}"> <ListBox Grid.Row="1" ScrollViewer.CanContentScroll="True" IsSynchronizedWithCurrentItem="True" x:Name="listboxConferenceDates" Margin="0,3,0,0" Padding="0,0,0,0" Width="Auto" HorizontalAlignment="Stretch" MinWidth="0" HorizontalContentAlignment="Stretch" Style="{DynamicResource HomeViewListStyle}" ItemContainerStyle="{DynamicResource HomeViewListBoxItemStyle}" ScrollViewer.IsDeferredScrollingEnabled="False" MouseDoubleClick="listboxSupportConcepts_MouseDoubleClick" Background="{x:Null}">
<ListBox.ItemTemplate> <ListBox.ItemTemplate>
<DataTemplate DataType="{x:Type sharedCompact:CompactSupportConceptDC}"> <DataTemplate DataType="{x:Type sharedCompact:CompactSupportConceptDC}">
@@ -461,7 +463,7 @@
</MultiBinding> </MultiBinding>
</TextBlock.Text> </TextBlock.Text>
</TextBlock> </TextBlock>
<Button Grid.Column="1" Width="23" Height="23" Style="{DynamicResource TransparentButtonStyle}" ToolTip="In Zeiterfassung öffnen" Tag="{Binding}" Click="ButtonOpenServiceRecordView_Click" Margin="0,0,3,0"> <Button Grid.Column="1" Width="23" Height="23" Style="{DynamicResource TransparentButtonStyle}" ToolTip="{t:Translate In Zeiterfassung öffnen}" Tag="{Binding}" Click="ButtonOpenServiceRecordView_Click" Margin="0,0,3,0">
<Image Source="..\Ressources\Icons\HistoryDisabled.png" /> <Image Source="..\Ressources\Icons\HistoryDisabled.png" />
</Button> </Button>
</Grid> </Grid>
@@ -498,7 +500,7 @@
<blc:DragDockPanel.Header> <blc:DragDockPanel.Header>
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<Image Source="..\Ressources\Icons\Calendar 1.png" Stretch="Fill" StretchDirection="Both" /> <Image Source="..\Ressources\Icons\Calendar 1.png" Stretch="Fill" StretchDirection="Both" />
<TextBlock Text="Geburtstage" TextWrapping="Wrap" FontSize="16" Foreground="#E0E0E0" VerticalAlignment="Bottom" Margin="5,0,0,5" /> <TextBlock Text="{t:Translate Geburtstage}" TextWrapping="Wrap" FontSize="16" Foreground="#E0E0E0" VerticalAlignment="Bottom" Margin="5,0,0,5" />
</StackPanel> </StackPanel>
</blc:DragDockPanel.Header> </blc:DragDockPanel.Header>
<Grid> <Grid>
@@ -561,7 +563,7 @@
<blc:DragDockPanel.Header> <blc:DragDockPanel.Header>
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<Image Source="..\Ressources\Icons\AlertsDisabled.png" Stretch="Fill" StretchDirection="Both" /> <Image Source="..\Ressources\Icons\AlertsDisabled.png" Stretch="Fill" StretchDirection="Both" />
<TextBlock Text="Ankündigungen" TextWrapping="Wrap" FontSize="16" Foreground="#E0E0E0" VerticalAlignment="Bottom" Margin="5,0,0,5" /> <TextBlock Text="{t:Translate Ankündigungen}" TextWrapping="Wrap" FontSize="16" Foreground="#E0E0E0" VerticalAlignment="Bottom" Margin="5,0,0,5" />
</StackPanel> </StackPanel>
</blc:DragDockPanel.Header> </blc:DragDockPanel.Header>
<ScrollViewer VerticalScrollBarVisibility="Auto"> <ScrollViewer VerticalScrollBarVisibility="Auto">
@@ -684,7 +686,7 @@
<blc:DragDockPanel.Header> <blc:DragDockPanel.Header>
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<Image Source="..\Ressources\Icons\RSS Newsfeed.png" Stretch="Fill" StretchDirection="Both" /> <Image Source="..\Ressources\Icons\RSS Newsfeed.png" Stretch="Fill" StretchDirection="Both" />
<TextBlock Text="BeWoPlaner News" TextWrapping="Wrap" FontSize="16" Foreground="#E0E0E0" VerticalAlignment="Bottom" Margin="5,0,0,5" /> <TextBlock Text="{t:Translate BeWoPlaner News}" TextWrapping="Wrap" FontSize="16" Foreground="#E0E0E0" VerticalAlignment="Bottom" Margin="5,0,0,5" />
</StackPanel> </StackPanel>
</blc:DragDockPanel.Header> </blc:DragDockPanel.Header>
<Grid> <Grid>

View File

@@ -3,6 +3,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:uc="clr-namespace:BeWo.Controls;assembly=BeWo.Controls" xmlns:uc="clr-namespace:BeWo.Controls;assembly=BeWo.Controls"
xmlns:localView="clr-namespace:BeWo.View" xmlns:localView="clr-namespace:BeWo.View"
xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup"
Height="Auto" Width="Auto" Height="Auto" Width="Auto"
HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Focusable="True"> HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Focusable="True">
<Grid> <Grid>
@@ -38,7 +39,7 @@
<TabControl x:Name="root" Style="{StaticResource ObjectEditTabControl}" PreviewMouseLeftButtonDown="root_PreviewMouseLeftButtonDown" BorderThickness="0,0,0,0"> <TabControl x:Name="root" Style="{StaticResource ObjectEditTabControl}" PreviewMouseLeftButtonDown="root_PreviewMouseLeftButtonDown" BorderThickness="0,0,0,0">
<TabItem Header="Einstellungen" IsSelected="True" Name="tabitem_mandator" Selector.Selected="tabitem_mandator_Selected" /> <TabItem Header="Einstellungen" IsSelected="True" Name="tabitem_mandator" Selector.Selected="tabitem_mandator_Selected" />
<!--### CB<TabItem Header="Einstellungen für Kalender" Name="tabitem_schedulerSettings" Selector.Selected="tabitem_schedulerSettings_Selected" />--> <!--### CB<TabItem Header="Einstellungen für Kalender" Name="tabitem_schedulerSettings" Selector.Selected="tabitem_schedulerSettings_Selected" />-->
<TabItem Header="Abschlüsse der Mitarbeiter" Name="tabitem_qualificationTypes" Selector.Selected="tabitem_qualificationTypes_Selected" /> <TabItem Header="{markup:Translate Abschlüsse der Mitarbeiter}" Name="tabitem_qualificationTypes" Selector.Selected="tabitem_qualificationTypes_Selected" />
<TabItem Header="Abwesenheitskategorien" Name="tabitem_absenceCategories" Selector.Selected="tabitem_absenceCategories_Selected" /> <TabItem Header="Abwesenheitskategorien" Name="tabitem_absenceCategories" Selector.Selected="tabitem_absenceCategories_Selected" />
<TabItem Header="Behinderungskategorien" Name="tabitem_disablityTypes" Selector.Selected="tabitem_disablityTypes_Selected" /> <TabItem Header="Behinderungskategorien" Name="tabitem_disablityTypes" Selector.Selected="tabitem_disablityTypes_Selected" />
<TabItem Header="Beschäftigungsarten" Name="tabitem_employmentTypes" Selector.Selected="tabitem_employmentTypes_Selected" /> <TabItem Header="Beschäftigungsarten" Name="tabitem_employmentTypes" Selector.Selected="tabitem_employmentTypes_Selected" />

View File

@@ -2,7 +2,9 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:localView="clr-namespace:BeWo.View" xmlns:localView="clr-namespace:BeWo.View"
xmlns:localNavView="clr-namespace:BeWo.View.Navigation" Loaded="OnLoaded"> xmlns:localNavView="clr-namespace:BeWo.View.Navigation"
xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup"
Loaded="OnLoaded">
<Grid> <Grid>
<Grid.Resources> <Grid.Resources>
<Style x:Key="CustomerDetailStyle" TargetType="{x:Type ListBoxItem}"> <Style x:Key="CustomerDetailStyle" TargetType="{x:Type ListBoxItem}">
@@ -134,7 +136,7 @@
</Border.OpacityMask> </Border.OpacityMask>
</Border> </Border>
<StackPanel Margin="5"> <StackPanel Margin="5">
<TextBlock Text="{Binding CostBearer, Converter={StaticResource StringFormatConverter}, ConverterParameter=Kostenträger: \{0\}}" FontSize="14" Foreground="#FFD2D2D2" FontFamily="Microsoft Sans Serif" /> <TextBlock Text="{Binding CostBearer, Converter={StaticResource StringFormatConverter}, ConverterParameter={markup:Translate Kostenträger: \{0\}}}" FontSize="14" Foreground="#FFD2D2D2" FontFamily="Microsoft Sans Serif" />
<TextBlock FontSize="12" Foreground="#FFD2D2D2" FontFamily="Microsoft Sans Serif" Margin="5 5 0 0" Text="{Binding ApprovedHours, Converter={StaticResource StringFormatConverter}, ConverterParameter=Genehmigte FLS: \{0:0.##\}}" /> <TextBlock FontSize="12" Foreground="#FFD2D2D2" FontFamily="Microsoft Sans Serif" Margin="5 5 0 0" Text="{Binding ApprovedHours, Converter={StaticResource StringFormatConverter}, ConverterParameter=Genehmigte FLS: \{0:0.##\}}" />
<TextBlock FontSize="12" Foreground="#FFD2D2D2" FontFamily="Microsoft Sans Serif" Margin="5 2 0 0" Text="{Binding RecordedHours, Converter={StaticResource StringFormatConverter}, ConverterParameter=Geleistete FLS: \{0:0.##\}}" /> <TextBlock FontSize="12" Foreground="#FFD2D2D2" FontFamily="Microsoft Sans Serif" Margin="5 2 0 0" Text="{Binding RecordedHours, Converter={StaticResource StringFormatConverter}, ConverterParameter=Geleistete FLS: \{0:0.##\}}" />
</StackPanel> </StackPanel>
@@ -147,7 +149,7 @@
</Grid.Resources> </Grid.Resources>
<localNavView:MainNavigationView OpenMailMergeWindow="MainNavigationView_OnOpenMailMergeWindow" <localNavView:MainNavigationView OpenMailMergeWindow="MainNavigationView_OnOpenMailMergeWindow"
x:Name="mainNavigationView" x:Name="mainNavigationView"
MainGroupHeader="Klienten" MainGroupHeader="{markup:Translate Klienten}"
CreateNewObject="mainNavigationView_CreateNewObject" CreateNewObject="mainNavigationView_CreateNewObject"
OpenObject="mainNavigationView_OpenObject" OpenObject="mainNavigationView_OpenObject"
DeleteObject="mainNavigationView_DeleteObject" DeleteObject="mainNavigationView_DeleteObject"

View File

@@ -20,6 +20,7 @@ using BS.Shared.Core;
using BS.Shared.DataContracts; using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact; using BS.Shared.DataContracts.Compact;
using BS.Shared.Extensions; using BS.Shared.Extensions;
using BS.Shared.Translation;
using Microsoft.Win32; using Microsoft.Win32;
@@ -48,7 +49,7 @@ namespace BeWo.View.Navigation
{ {
FontSize = 12, FontSize = 12,
Margin = new Thickness(10, 0, 0, 0), Margin = new Thickness(10, 0, 0, 0),
Content = "Nur meine Klienten anzeigen", Content = Translator.Translate("Nur meine Klienten anzeigen"),
VerticalAlignment = VerticalAlignment.Center VerticalAlignment = VerticalAlignment.Center
}; };
@@ -106,7 +107,7 @@ namespace BeWo.View.Navigation
var cdc = obj as CompactCustomerDC; var cdc = obj as CompactCustomerDC;
if (cdc != null) if (cdc != null)
{ {
if (MessageBox.Show("Wollen Sie den Klient '" + cdc.FirstName + " " + cdc.LastName + "' wirklich archivieren?", "Archivieren", MessageBoxButton.YesNo, MessageBoxImage.Exclamation) == MessageBoxResult.Yes) if (MessageBox.Show(Translator.Translate("Wollen Sie den Klient '{0}' wirklich archivieren?", cdc.FirstName + " " + cdc.LastName), "Archivieren", MessageBoxButton.YesNo, MessageBoxImage.Exclamation) == MessageBoxResult.Yes)
{ {
ServiceFacade.DoCustomerServiceAsync( ServiceFacade.DoCustomerServiceAsync(
s => s =>
@@ -134,7 +135,7 @@ namespace BeWo.View.Navigation
var cdc = obj as CompactCustomerDC; var cdc = obj as CompactCustomerDC;
if (cdc != null) if (cdc != null)
{ {
if (MessageBox.Show("Wollen Sie den Klient '" + cdc.FirstName + " " + cdc.LastName + "' wirklich löschen?", "Löschen", MessageBoxButton.YesNo, MessageBoxImage.Exclamation) == MessageBoxResult.Yes) if (MessageBox.Show(Translator.Translate("Wollen Sie den Klient '{0}' wirklich löschen?", cdc.FirstName + " " + cdc.LastName), "Löschen", MessageBoxButton.YesNo, MessageBoxImage.Exclamation) == MessageBoxResult.Yes)
{ {
CustomerInfoDC details = ServiceFacade.DoOperationsServiceSync(s => s.GetCustomerInfosForCustomerOid(cdc.CustomerOid)); CustomerInfoDC details = ServiceFacade.DoOperationsServiceSync(s => s.GetCustomerInfosForCustomerOid(cdc.CustomerOid));
@@ -143,7 +144,7 @@ namespace BeWo.View.Navigation
{ {
if (!string.IsNullOrEmpty(details.CurrentSupportConcept) && details.CurrentSupportConcept.ToLower() != "kein aktueller hilfeplan") if (!string.IsNullOrEmpty(details.CurrentSupportConcept) && details.CurrentSupportConcept.ToLower() != "kein aktueller hilfeplan")
{ {
if (MessageBox.Show("Für Klient '" + cdc.FirstName + " " + cdc.LastName + "' wurde bereits ein Hilfeplan angelegt. Der Hilfeplan wird dadurch auch gelöscht!\n Möchten Sie wirklich fortfahren und den Klient löschen?", "Löschen", MessageBoxButton.YesNo, MessageBoxImage.Exclamation) == MessageBoxResult.No) if (MessageBox.Show(Translator.Translate("Für Klient '{0}' wurde bereits ein Hilfeplan angelegt. Der Hilfeplan wird dadurch auch gelöscht!\n Möchten Sie wirklich fortfahren und den Klient löschen?", cdc.FirstName + " " + cdc.LastName), "Löschen", MessageBoxButton.YesNo, MessageBoxImage.Exclamation) == MessageBoxResult.No)
{ {
delete = false; delete = false;
} }
@@ -172,7 +173,7 @@ namespace BeWo.View.Navigation
private void mainNavigationView_ExcelExport(object sender, EventArgs<IEnumerable<IFilterableDC>> e) private void mainNavigationView_ExcelExport(object sender, EventArgs<IEnumerable<IFilterableDC>> e)
{ {
var path = BeWoApp.GetAndCreateUserAppDataPath() + "\\Klienten.xls"; var path = BeWoApp.GetAndCreateUserAppDataPath() + Translator.Translate("\\Klienten.xls");
var sf = new SaveFileDialog { FileName = Path.GetFileName(path), Filter = "Microsoft Excel 97-2003-Arbeitsblatt|*.xls|Alle Dateien|*.*" }; var sf = new SaveFileDialog { FileName = Path.GetFileName(path), Filter = "Microsoft Excel 97-2003-Arbeitsblatt|*.xls|Alle Dateien|*.*" };
if (sf.ShowDialog() != true) if (sf.ShowDialog() != true)
@@ -246,7 +247,7 @@ namespace BeWo.View.Navigation
{ {
var cdc = (CompactCustomerDC) mainNavigationView.objectListBox.SelectedItem; var cdc = (CompactCustomerDC) mainNavigationView.objectListBox.SelectedItem;
if (MessageBox.Show("Wollen Sie den Klient '" + cdc.FirstName + " " + cdc.LastName + "' wirklich reaktivieren?", "Reaktivieren", MessageBoxButton.YesNo, MessageBoxImage.Exclamation) == MessageBoxResult.No) if (MessageBox.Show(Translator.Translate("Wollen Sie den Klient '{0}' wirklich reaktivieren?", cdc.FirstName + " " + cdc.LastName), "Reaktivieren", MessageBoxButton.YesNo, MessageBoxImage.Exclamation) == MessageBoxResult.No)
{ {
return; return;
} }

View File

@@ -1,8 +1,10 @@
<localView:BeWoView x:Class="BeWo.View.Navigation.EmployeeNavigationView" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:localView="clr-namespace:BeWo.View" xmlns:localNavView="clr-namespace:BeWo.View.Navigation" Loaded="OnLoaded"> <localView:BeWoView x:Class="BeWo.View.Navigation.EmployeeNavigationView" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:localView="clr-namespace:BeWo.View" xmlns:localNavView="clr-namespace:BeWo.View.Navigation"
xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup"
Loaded="OnLoaded">
<Grid> <Grid>
<localNavView:MainNavigationView <localNavView:MainNavigationView
x:Name="mainNavigationView" x:Name="mainNavigationView"
MainGroupHeader="Mitarbeiter" MainGroupHeader="{markup:Translate Mitarbeiter}"
CreateNewObject="mainNavigationView_CreateNewObject" CreateNewObject="mainNavigationView_CreateNewObject"
OpenObject="mainNavigationView_OpenObject" OpenObject="mainNavigationView_OpenObject"
DeleteObject="mainNavigationView_DeleteObject" DeleteObject="mainNavigationView_DeleteObject"

View File

@@ -14,6 +14,7 @@ using BS.Shared.Core;
using BS.Shared.DataContracts; using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact; using BS.Shared.DataContracts.Compact;
using BS.Shared.Extensions; using BS.Shared.Extensions;
using BS.Shared.Translation;
using Microsoft.Win32; using Microsoft.Win32;
namespace BeWo.View.Navigation namespace BeWo.View.Navigation
@@ -63,7 +64,7 @@ namespace BeWo.View.Navigation
CompactEmployeeDC dc = obj as CompactEmployeeDC; CompactEmployeeDC dc = obj as CompactEmployeeDC;
if (dc != null) if (dc != null)
{ {
if (MessageBox.Show("Wollen Sie den Mitarbeiter '" + dc.FirstName + " " + dc.LastName + "' wirklich archivieren?", "Archivieren", MessageBoxButton.YesNo, MessageBoxImage.Exclamation) == MessageBoxResult.Yes) if (MessageBox.Show(Translator.Translate("Wollen Sie den Mitarbeiter '{0}' wirklich archivieren?", dc.FirstName + " " + dc.LastName), "Archivieren", MessageBoxButton.YesNo, MessageBoxImage.Exclamation) == MessageBoxResult.Yes)
{ {
ServiceFacade.DoEmployeeServiceAsync( ServiceFacade.DoEmployeeServiceAsync(
s => s =>
@@ -103,7 +104,7 @@ namespace BeWo.View.Navigation
CompactEmployeeDC dc = obj as CompactEmployeeDC; CompactEmployeeDC dc = obj as CompactEmployeeDC;
if (dc != null) if (dc != null)
{ {
if (MessageBox.Show("Wollen Sie den Mitarbeiter '" + dc.FirstName + " " + dc.LastName + "' wirklich löschen?", "Löschen", MessageBoxButton.YesNo, MessageBoxImage.Exclamation) == MessageBoxResult.Yes) if (MessageBox.Show(Translator.Translate("Wollen Sie den Mitarbeiter '{0}' wirklich löschen?", dc.FirstName + " " + dc.LastName), "Löschen", MessageBoxButton.YesNo, MessageBoxImage.Exclamation) == MessageBoxResult.Yes)
{ {
ServiceFacade.DoEmployeeServiceAsync(s => s.DeactivateEmployee(dc.EmployeeOid, dc.EmployeeVersion)); ServiceFacade.DoEmployeeServiceAsync(s => s.DeactivateEmployee(dc.EmployeeOid, dc.EmployeeVersion));
return true; return true;
@@ -115,7 +116,7 @@ namespace BeWo.View.Navigation
private void mainNavigationView_ExcelExport(object sender, EventArgs<IEnumerable<IFilterableDC>> e) private void mainNavigationView_ExcelExport(object sender, EventArgs<IEnumerable<IFilterableDC>> e)
{ {
var path = BeWoApp.GetAndCreateUserAppDataPath() + "\\Mitarbeiter.xls"; var path = BeWoApp.GetAndCreateUserAppDataPath() + Translator.Translate("\\Mitarbeiter.xls");
var sf = new SaveFileDialog { FileName = Path.GetFileName(path), Filter = "Microsoft Excel 97-2003-Arbeitsblatt|*.xls|Alle Dateien|*.*" }; var sf = new SaveFileDialog { FileName = Path.GetFileName(path), Filter = "Microsoft Excel 97-2003-Arbeitsblatt|*.xls|Alle Dateien|*.*" };
if (sf.ShowDialog() != true) if (sf.ShowDialog() != true)

View File

@@ -20,6 +20,7 @@ using BS.Shared.Core;
using BS.Shared.DataContracts; using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact; using BS.Shared.DataContracts.Compact;
using BS.Shared.Extensions; using BS.Shared.Extensions;
using BS.Shared.Translation;
namespace BeWo.View.Navigation namespace BeWo.View.Navigation
{ {
@@ -264,8 +265,8 @@ namespace BeWo.View.Navigation
set set
{ {
mainGroup.Header = value; mainGroup.Header = value;
chkShowArchived.Content = " Archivierte " + value + " anzeigen"; chkShowArchived.Content = " " + Translator.Translate("Archivierte {0} anzeigen", value);
chkShowDeleted.Content = " Gelöschte " + value + " anzeigen"; chkShowDeleted.Content = " " + Translator.Translate("Gelöschte {0} anzeigen", value);
} }
} }

View File

@@ -1,6 +1,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using BeWo.Core; using BeWo.Core;
using BS.Shared.Translation;
namespace BeWo.View.Navigation.Sorter namespace BeWo.View.Navigation.Sorter
{ {
@@ -15,7 +16,7 @@ namespace BeWo.View.Navigation.Sorter
list.Add(new SortItem("Vorname", "FirstName")); list.Add(new SortItem("Vorname", "FirstName"));
list.Add(new SortItem("Startdatum", "StartDate")); list.Add(new SortItem("Startdatum", "StartDate"));
list.Add(new SortItem("Enddatum", "EndDate")); list.Add(new SortItem("Enddatum", "EndDate"));
list.Add(new SortItem("Kostenträger", "CostBearer")); list.Add(new SortItem(Translator.Translate("Kostenträger"), "CostBearer"));
return list; return list;
} }

View File

@@ -2,7 +2,8 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:localView="clr-namespace:BeWo.View" xmlns:localView="clr-namespace:BeWo.View"
xmlns:localNavView="clr-namespace:BeWo.View.Navigation" xmlns:localNavView="clr-namespace:BeWo.View.Navigation"
xmlns:t="clr-namespace:BeWo.MultiLanguage.Markup"
Loaded="OnLoaded"> Loaded="OnLoaded">
<Grid> <Grid>
<Grid.Resources> <Grid.Resources>
@@ -30,7 +31,7 @@
</Border> </Border>
<StackPanel Margin="5"> <StackPanel Margin="5">
<TextBlock Text="{Binding CostBearer, Converter={StaticResource StringFormatConverter}, ConverterParameter=Kostenträger: \{0\}}" FontSize="14" Foreground="#FFD2D2D2" FontFamily="Microsoft Sans Serif" /> <TextBlock Text="{Binding CostBearer, Converter={StaticResource StringFormatConverter}, ConverterParameter={t:Translate Kostenträger: \{0\}}}" FontSize="14" Foreground="#FFD2D2D2" FontFamily="Microsoft Sans Serif" />
<TextBlock FontSize="12" Foreground="#FFD2D2D2" FontFamily="Microsoft Sans Serif" Margin="5 5 0 0" <TextBlock FontSize="12" Foreground="#FFD2D2D2" FontFamily="Microsoft Sans Serif" Margin="5 5 0 0"
Text="{Binding ApprovedHours, Converter={StaticResource StringFormatConverter}, ConverterParameter=Genehmigte Stunden: \{0:0.##\}}" /> Text="{Binding ApprovedHours, Converter={StaticResource StringFormatConverter}, ConverterParameter=Genehmigte Stunden: \{0:0.##\}}" />
@@ -45,7 +46,7 @@
</DataTemplate> </DataTemplate>
</Grid.Resources> </Grid.Resources>
<localNavView:MainNavigationView x:Name="mainNavigationView" <localNavView:MainNavigationView x:Name="mainNavigationView"
MainGroupHeader="Hilfepläne" MainGroupHeader="{t:Translate Hilfepläne}"
CreateNewObject="mainNavigationView_CreateNewObject" CreateNewObject="mainNavigationView_CreateNewObject"
OpenObject="mainNavigationView_OpenObject" OpenObject="mainNavigationView_OpenObject"
DeleteObject="mainNavigationView_DeleteObject" DeleteObject="mainNavigationView_DeleteObject"

View File

@@ -17,6 +17,8 @@ using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact; using BS.Shared.DataContracts.Compact;
using BS.Shared.Extensions; using BS.Shared.Extensions;
using BeWo.Core.Service; using BeWo.Core.Service;
using BeWo.MultiLanguage;
using BS.Shared.Translation;
using Microsoft.Win32; using Microsoft.Win32;
namespace BeWo.View.Navigation namespace BeWo.View.Navigation
@@ -44,12 +46,12 @@ namespace BeWo.View.Navigation
this.chkShowOnlyMySCs = new CheckBox(); this.chkShowOnlyMySCs = new CheckBox();
this.chkShowOnlyMySCs.FontSize = 12; this.chkShowOnlyMySCs.FontSize = 12;
this.chkShowOnlyMySCs.Margin = new Thickness(10, 0, 0, 0); this.chkShowOnlyMySCs.Margin = new Thickness(10, 0, 0, 0);
this.chkShowOnlyMySCs.Content = "Nur meine Hilfepläne anzeigen"; this.chkShowOnlyMySCs.Content = Translator.Translate("Nur meine Hilfepläne anzeigen");
this.chkShowOnlyTeamSCs = new CheckBox(); this.chkShowOnlyTeamSCs = new CheckBox();
this.chkShowOnlyTeamSCs.FontSize = 12; this.chkShowOnlyTeamSCs.FontSize = 12;
this.chkShowOnlyTeamSCs.Margin = new Thickness(10, 0, 0, 0); this.chkShowOnlyTeamSCs.Margin = new Thickness(10, 0, 0, 0);
this.chkShowOnlyTeamSCs.Content = "Nur Hilfepläne meines Teams anzeigen"; this.chkShowOnlyTeamSCs.Content = Translator.Translate("Nur Hilfepläne meines Teams anzeigen");
this.chkShowOnlyMySCs.VerticalAlignment = VerticalAlignment.Center; this.chkShowOnlyMySCs.VerticalAlignment = VerticalAlignment.Center;
this.chkShowOnlyTeamSCs.VerticalAlignment = VerticalAlignment.Center; this.chkShowOnlyTeamSCs.VerticalAlignment = VerticalAlignment.Center;
@@ -130,7 +132,7 @@ namespace BeWo.View.Navigation
CompactSupportConceptDC dc = obj as CompactSupportConceptDC; CompactSupportConceptDC dc = obj as CompactSupportConceptDC;
if (dc != null) if (dc != null)
{ {
if (MessageBox.Show("Wollen Sie den Hilfeplan wirklich archivieren?", "Archivieren", MessageBoxButton.YesNo, MessageBoxImage.Exclamation) == MessageBoxResult.Yes) if (MessageBox.Show(Translator.Translate("Wollen Sie den Hilfeplan wirklich archivieren?"), "Archivieren", MessageBoxButton.YesNo, MessageBoxImage.Exclamation) == MessageBoxResult.Yes)
{ {
ServiceFacade.DoCustomerServiceAsync( ServiceFacade.DoCustomerServiceAsync(
s => s =>
@@ -159,7 +161,7 @@ namespace BeWo.View.Navigation
var dc = obj as CompactSupportConceptDC; var dc = obj as CompactSupportConceptDC;
if (dc != null) if (dc != null)
{ {
if (MessageBox.Show("Wollen Sie den Hilfeplan wirklich löschen?", "Löschen", MessageBoxButton.YesNo, MessageBoxImage.Exclamation) == MessageBoxResult.Yes) if (MessageBox.Show(Translator.Translate("Wollen Sie den Hilfeplan wirklich löschen?"), "Löschen", MessageBoxButton.YesNo, MessageBoxImage.Exclamation) == MessageBoxResult.Yes)
{ {
var list = ServiceFacade.DoOperationsServiceSync(s => s.GetSupportConceptInfosForSupportConceptOid(dc.SupportConceptOid)); var list = ServiceFacade.DoOperationsServiceSync(s => s.GetSupportConceptInfosForSupportConceptOid(dc.SupportConceptOid));
var delete = true; var delete = true;
@@ -174,7 +176,7 @@ namespace BeWo.View.Navigation
if (containsServiceRecords) if (containsServiceRecords)
{ {
if (MessageBox.Show("Für den gewählten Hilfeplan wurden bereits Leistungen hinterlegt.\n Möchten Sie wirklich fortfahren und den Hilfeplan löschen?", "Löschen", MessageBoxButton.YesNo, MessageBoxImage.Exclamation) == MessageBoxResult.No) if (MessageBox.Show(Translator.Translate("Für den gewählten Hilfeplan wurden bereits Leistungen hinterlegt.\n Möchten Sie wirklich fortfahren und den Hilfeplan löschen?"), "Löschen", MessageBoxButton.YesNo, MessageBoxImage.Exclamation) == MessageBoxResult.No)
{ {
delete = false; delete = false;
} }
@@ -202,7 +204,7 @@ namespace BeWo.View.Navigation
private void mainNavigationView_ExcelExport(object sender, EventArgs<IEnumerable<IFilterableDC>> e) private void mainNavigationView_ExcelExport(object sender, EventArgs<IEnumerable<IFilterableDC>> e)
{ {
var path = BeWoApp.GetAndCreateUserAppDataPath() + "\\Hilfepläne.xls"; var path = BeWoApp.GetAndCreateUserAppDataPath() + Translator.Translate("\\Hilfepläne.xls");
var sf = new SaveFileDialog { FileName = Path.GetFileName(path), Filter = "Microsoft Excel 97-2003-Arbeitsblatt|*.xls|Alle Dateien|*.*" }; var sf = new SaveFileDialog { FileName = Path.GetFileName(path), Filter = "Microsoft Excel 97-2003-Arbeitsblatt|*.xls|Alle Dateien|*.*" };
if (sf.ShowDialog() != true) if (sf.ShowDialog() != true)
@@ -268,7 +270,7 @@ namespace BeWo.View.Navigation
public void MainNavigationView_OnReactivateObject(CompactSupportConceptDC selectedSupportConcept) public void MainNavigationView_OnReactivateObject(CompactSupportConceptDC selectedSupportConcept)
{ {
if (MessageBox.Show("Wollen Sie den Hilfeplan wirklich reaktivieren?", "Reaktivieren", MessageBoxButton.YesNo, MessageBoxImage.Exclamation) == MessageBoxResult.No) if (MessageBox.Show(Translator.Translate("Wollen Sie den Hilfeplan wirklich reaktivieren?"), Translator.Translate("Reaktivieren"), MessageBoxButton.YesNo, MessageBoxImage.Exclamation) == MessageBoxResult.No)
{ {
return; return;
} }

View File

@@ -10,7 +10,9 @@
HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Focusable="True" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Focusable="True"
xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors" xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core" xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d"> xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup"
mc:Ignorable="d">
<GroupBox Style="{StaticResource ObjectEditGroupBox}" Header="Jahresbericht"> <GroupBox Style="{StaticResource ObjectEditGroupBox}" Header="Jahresbericht">
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
@@ -47,7 +49,7 @@
<Label Content="Jahr:" HorizontalAlignment="Left" Grid.Column="0" Grid.Row="0" VerticalAlignment="Center" /> <Label Content="Jahr:" HorizontalAlignment="Left" Grid.Column="0" Grid.Row="0" VerticalAlignment="Center" />
<ComboBox Grid.Column="1" Grid.Row="0" Margin="3" Height="23" Name="combobox_year" /> <ComboBox Grid.Column="1" Grid.Row="0" Margin="3" Height="23" Name="combobox_year" />
<Label x:Name="lblCostcenter" Content="Kostenträger:" HorizontalAlignment="Left" Grid.Column="0" Grid.Row="1" VerticalAlignment="Center" /> <Label x:Name="lblCostcenter" Content="{markup:Translate Kostenträger:}" HorizontalAlignment="Left" Grid.Column="0" Grid.Row="1" VerticalAlignment="Center" />
<uc:PopUpEdit Grid.Column="1" Grid.ColumnSpan="1" Grid.Row="1" <uc:PopUpEdit Grid.Column="1" Grid.ColumnSpan="1" Grid.Row="1"
IsReadOnly="True" x:Name="popupedit_costcenter" DeleteButtonVisibility="Collapsed" PopUpClick="popupedit_costcenter_PopUpClick" HorizontalAlignment="Left" Width="200" HorizontalContentAlignment="Left" Height="24" Margin="3" /> IsReadOnly="True" x:Name="popupedit_costcenter" DeleteButtonVisibility="Collapsed" PopUpClick="popupedit_costcenter_PopUpClick" HorizontalAlignment="Left" Width="200" HorizontalContentAlignment="Left" Height="24" Margin="3" />

View File

@@ -8,6 +8,7 @@ using BeWo.Core.Service;
using BS.Shared; using BS.Shared;
using BS.Shared.DataContracts; using BS.Shared.DataContracts;
using BS.Shared.Services; using BS.Shared.Services;
using BS.Shared.Translation;
namespace BeWo.View.Report.FLSReport namespace BeWo.View.Report.FLSReport
{ {
@@ -218,14 +219,14 @@ namespace BeWo.View.Report.FLSReport
headerRow.ShowServiceRecords = config.ShowServiceRecords; headerRow.ShowServiceRecords = config.ShowServiceRecords;
if (config.ReportType == FLSReportType.Employee) if (config.ReportType == FLSReportType.Employee)
{ {
headerRow.GroupName = "Klient/in"; headerRow.GroupName = Translator.Translate("Klient/in");
} }
else if (config.ReportType == FLSReportType.Customer) else if (config.ReportType == FLSReportType.Customer)
{ {
headerRow.GroupName = "Mitarbeiter/in"; headerRow.GroupName = Translator.Translate("Mitarbeiter/in");
} }
else if (config.ReportType == FLSReportType.Costbearer) else if (config.ReportType == FLSReportType.Costbearer)
headerRow.GroupName = "Kostenträger"; headerRow.GroupName = Translator.Translate("Kostenträger");
else else
headerRow.GroupName = "Team"; headerRow.GroupName = "Team";

View File

@@ -11,7 +11,9 @@
xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors" xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core" xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:localViewControls="clr-namespace:BeWo.View.Controls" mc:Ignorable="d"> xmlns:localViewControls="clr-namespace:BeWo.View.Controls"
xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup"
mc:Ignorable="d">
<GroupBox Style="{StaticResource ObjectEditGroupBox}" Header="Auswertung über erbrachte Stunden"> <GroupBox Style="{StaticResource ObjectEditGroupBox}" Header="Auswertung über erbrachte Stunden">
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
@@ -32,10 +34,10 @@
<ColumnDefinition Width="Auto"/> <ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Button x:Name="button_generate" Grid.Column="0" Content="Aktualisieren" Click="button_generate_Click" Height="24" HorizontalAlignment="Left" Width="80" /> <Button x:Name="button_generate" Grid.Column="0" Content="Aktualisieren" Click="button_generate_Click" Height="24" HorizontalAlignment="Left" Width="80" />
<RadioButton x:Name="radioEmployeeReport" Grid.Column="1" Content="Nach Mitarbeiter gruppieren" GroupName="radioReportType" IsChecked="True" Margin="4,4,0,0" Checked="RadioButton_Checked" /> <RadioButton x:Name="radioEmployeeReport" Grid.Column="1" Content="{markup:Translate Nach Mitarbeiter gruppieren}" GroupName="radioReportType" IsChecked="True" Margin="4,4,0,0" Checked="RadioButton_Checked" />
<RadioButton x:Name="radioClientReport" Grid.Column="2" GroupName="radioReportType" Content="Nach Klient gruppieren" Margin="4,4,0,0" Checked="RadioButton_Checked" /> <RadioButton x:Name="radioClientReport" Grid.Column="2" GroupName="radioReportType" Content="{markup:Translate Nach Klient gruppieren}" Margin="4,4,0,0" Checked="RadioButton_Checked" />
<RadioButton x:Name="radioCostbearerReport" Grid.Column="3" GroupName="radioReportType" Content="Nach Kostenträger gruppieren" Margin="4,4,0,0" Checked="RadioButton_Checked" /> <RadioButton x:Name="radioCostbearerReport" Grid.Column="3" GroupName="radioReportType" Content="{markup:Translate Nach Kostenträger gruppieren}" Margin="4,4,0,0" Checked="RadioButton_Checked" />
<RadioButton x:Name="radioTeamReport" Grid.Column="4" GroupName="radioReportType" Content="Nach Team gruppieren" Margin="4,4,0,0" Checked="RadioButton_Checked"/> <RadioButton x:Name="radioTeamReport" Grid.Column="4" GroupName="radioReportType" Content="{markup:Translate Nach Team gruppieren}" Margin="4,4,0,0" Checked="RadioButton_Checked"/>
</Grid> </Grid>
</uc:ExpanderPanel.Header> </uc:ExpanderPanel.Header>
<Grid> <Grid>

View File

@@ -22,7 +22,7 @@ using BS.Shared.DataContracts;
using BS.Shared.DataContracts.ClientPartials; using BS.Shared.DataContracts.ClientPartials;
using BS.Shared.DataContracts.Compact; using BS.Shared.DataContracts.Compact;
using BS.Shared.Extensions; using BS.Shared.Extensions;
using BS.Shared.Translation;
using Microsoft.Win32; using Microsoft.Win32;
namespace BeWo.View.Report.FLSReport namespace BeWo.View.Report.FLSReport
@@ -118,25 +118,25 @@ namespace BeWo.View.Report.FLSReport
{ {
key = "CustomerContentBrush"; key = "CustomerContentBrush";
checkbox_sortBySubGroup.Content = "Nach Mitarbeiter sortieren"; checkbox_sortBySubGroup.Content = Translator.Translate("Nach Mitarbeiter sortieren");
} }
else if (radioCostbearerReport.IsChecked != null && radioCostbearerReport.IsChecked.Value) else if (radioCostbearerReport.IsChecked != null && radioCostbearerReport.IsChecked.Value)
{ {
key = "OrganisationContentBrush"; key = "OrganisationContentBrush";
enabled = false; enabled = false;
checkbox_sortBySubGroup.Content = "Nach Kostenträger sortieren"; checkbox_sortBySubGroup.Content = Translator.Translate("Nach Kostenträger sortieren");
} }
else if (radioTeamReport.IsChecked != null && radioTeamReport.IsChecked.Value) else if (radioTeamReport.IsChecked != null && radioTeamReport.IsChecked.Value)
{ {
key = "TeamContentBrush"; key = "TeamContentBrush";
enabled = false; enabled = false;
checkbox_sortBySubGroup.Content = "Nach Team sortieren"; checkbox_sortBySubGroup.Content = Translator.Translate("Nach Team sortieren");
} }
else else
{ {
checkbox_sortBySubGroup.Content = "Nach Klienten sortieren"; checkbox_sortBySubGroup.Content = Translator.Translate("Nach Klienten sortieren");
} }
if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.Analysis_EmployeeOverviewAll_View)) if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.Analysis_EmployeeOverviewAll_View))
@@ -674,18 +674,18 @@ namespace BeWo.View.Report.FLSReport
if (this._FLSOverview.FLSOverviewConfig.ReportType == FLSReportType.Employee) if (this._FLSOverview.FLSOverviewConfig.ReportType == FLSReportType.Employee)
{ {
lHeaderCaptions.Add("Mitarbeiter/in"); lHeaderCaptions.Add(Translator.Translate("Mitarbeiter/in"));
if (!this._FLSOverview.FLSOverviewConfig.ShowOnlyTotalRows || !this._FLSOverview.FLSOverviewConfig.ShowServiceRecords) if (!this._FLSOverview.FLSOverviewConfig.ShowOnlyTotalRows || !this._FLSOverview.FLSOverviewConfig.ShowServiceRecords)
{ {
lHeaderCaptions.Add("Klient/in"); lHeaderCaptions.Add(Translator.Translate("Klient/in"));
} }
} }
else if (this._FLSOverview.FLSOverviewConfig.ReportType == FLSReportType.Customer) else if (this._FLSOverview.FLSOverviewConfig.ReportType == FLSReportType.Customer)
{ {
lHeaderCaptions.Add("Klient/in"); lHeaderCaptions.Add(Translator.Translate("Klient/in"));
if (!this._FLSOverview.FLSOverviewConfig.ShowOnlyTotalRows || !this._FLSOverview.FLSOverviewConfig.ShowServiceRecords) if (!this._FLSOverview.FLSOverviewConfig.ShowOnlyTotalRows || !this._FLSOverview.FLSOverviewConfig.ShowServiceRecords)
{ {
lHeaderCaptions.Add("Mitarbeiter/in"); lHeaderCaptions.Add(Translator.Translate("Mitarbeiter/in"));
} }
} }
else if (this._FLSOverview.FLSOverviewConfig.ReportType == FLSReportType.Costbearer) else if (this._FLSOverview.FLSOverviewConfig.ReportType == FLSReportType.Costbearer)
@@ -693,7 +693,7 @@ namespace BeWo.View.Report.FLSReport
// lHeaderCaptions.Add(""); // lHeaderCaptions.Add("");
if (!this._FLSOverview.FLSOverviewConfig.ShowOnlyTotalRows || !this._FLSOverview.FLSOverviewConfig.ShowServiceRecords) if (!this._FLSOverview.FLSOverviewConfig.ShowOnlyTotalRows || !this._FLSOverview.FLSOverviewConfig.ShowServiceRecords)
{ {
lHeaderCaptions.Add("Kostenträger"); lHeaderCaptions.Add(Translator.Translate("Kostenträger"));
} }
} }
else if (_FLSOverview.FLSOverviewConfig.ReportType == FLSReportType.Team) else if (_FLSOverview.FLSOverviewConfig.ReportType == FLSReportType.Team)
@@ -715,15 +715,15 @@ namespace BeWo.View.Report.FLSReport
{ {
if (this._FLSOverview.FLSOverviewConfig.ReportType == FLSReportType.Employee) if (this._FLSOverview.FLSOverviewConfig.ReportType == FLSReportType.Employee)
{ {
lHeaderCaptions.Add("Klient/in"); lHeaderCaptions.Add(Translator.Translate("Klient/in"));
} }
else if (this._FLSOverview.FLSOverviewConfig.ReportType == FLSReportType.Customer) else if (this._FLSOverview.FLSOverviewConfig.ReportType == FLSReportType.Customer)
{ {
lHeaderCaptions.Add("Mitarbeiter/in"); lHeaderCaptions.Add(Translator.Translate("Mitarbeiter/in"));
} }
else if (this._FLSOverview.FLSOverviewConfig.ReportType == FLSReportType.Costbearer) else if (this._FLSOverview.FLSOverviewConfig.ReportType == FLSReportType.Costbearer)
{ {
lHeaderCaptions.Add("Kostenträger"); lHeaderCaptions.Add(Translator.Translate("Kostenträger"));
} }
else if (_FLSOverview.FLSOverviewConfig.ReportType == FLSReportType.Team) else if (_FLSOverview.FLSOverviewConfig.ReportType == FLSReportType.Team)
lHeaderCaptions.Add("Team"); lHeaderCaptions.Add("Team");

View File

@@ -52,7 +52,7 @@
</Grid.RowDefinitions> </Grid.RowDefinitions>
<TextBlock TextTrimming="CharacterEllipsis" Text="{Binding CustomerName}" Foreground="White" FontFamily="Microsoft Sans Serif" FontWeight="Bold" FontSize="14" Margin="0,0,0,0" ToolTip="{Binding CustomerName}" /> <TextBlock TextTrimming="CharacterEllipsis" Text="{Binding CustomerName}" Foreground="White" FontFamily="Microsoft Sans Serif" FontWeight="Bold" FontSize="14" Margin="0,0,0,0" ToolTip="{Binding CustomerName}" />
<TextBlock Grid.Row="1" Text="{Binding SupportConceptTimeSpanString}" Foreground="#FFD2D2D2" FontFamily="Microsoft Sans Serif" FontSize="12" Margin="0,0,0,1" ToolTip="Hilfeplan Start- und Endzeit" /> <TextBlock Grid.Row="1" Text="{Binding SupportConceptTimeSpanString}" Foreground="#FFD2D2D2" FontFamily="Microsoft Sans Serif" FontSize="12" Margin="0,0,0,1" ToolTip="Hilfeplan Start- und Endzeit" />
<TextBlock Grid.Column="1" Text="{Binding CostBearerName}" Foreground="White" FontFamily="Microsoft Sans Serif" FontSize="14" Margin="5,0,0,0" ToolTip="{Binding CostBearerName, Converter={StaticResource StringFormatConverter}, ConverterParameter='{}Kostenträger {0}'}" /> <TextBlock Grid.Column="1" Text="{Binding CostBearerName}" Foreground="White" FontFamily="Microsoft Sans Serif" FontSize="14" Margin="5,0,0,0" ToolTip="{Binding CostBearerName, Converter={StaticResource StringFormatConverter}, ConverterParameter='{}Kostenxxxxxxträger {0}'}" />
<TextBlock Grid.Row="1" Grid.Column="1" Text="{Binding DaysOverrun}" Foreground="White" FontFamily="Microsoft Sans Serif" FontSize="12" Margin="5,0,0,0" ToolTip="anz Tage seit Ablauf des Hilfeplans" /> <TextBlock Grid.Row="1" Grid.Column="1" Text="{Binding DaysOverrun}" Foreground="White" FontFamily="Microsoft Sans Serif" FontSize="12" Margin="5,0,0,0" ToolTip="anz Tage seit Ablauf des Hilfeplans" />
<!--<TextBlock Grid.Column="1" Text="{Binding ReferenceNumber}" Foreground="White" FontFamily="Microsoft Sans Serif" FontSize="14" Margin="5,3,0,0" ToolTip="Aktenzeichen"/>--> <!--<TextBlock Grid.Column="1" Text="{Binding ReferenceNumber}" Foreground="White" FontFamily="Microsoft Sans Serif" FontSize="14" Margin="5,3,0,0" ToolTip="Aktenzeichen"/>-->

View File

@@ -1,4 +1,6 @@
<localView:BeWoView x:Class="BeWo.View.Report.Finance.OutstandingReceivablesView" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:localView="clr-namespace:BeWo.View" xmlns:localAnalysisView="clr-namespace:BeWo.View.Report.Finance" xmlns:conv="clr-namespace:BeWo.Converter" Height="Auto" Width="Auto" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Focusable="True"> <localView:BeWoView x:Class="BeWo.View.Report.Finance.OutstandingReceivablesView" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:localView="clr-namespace:BeWo.View" xmlns:localAnalysisView="clr-namespace:BeWo.View.Report.Finance" xmlns:conv="clr-namespace:BeWo.Converter"
xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup"
Height="Auto" Width="Auto" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Focusable="True">
<Grid> <Grid>
<GroupBox Style="{StaticResource ObjectEditGroupBox}" Header="Offene Forderungen"> <GroupBox Style="{StaticResource ObjectEditGroupBox}" Header="Offene Forderungen">
@@ -15,8 +17,8 @@
<TextBox Height="20" x:Name="textbox_search" MinWidth="90" Margin="3,0,0,0" Width="300" TabIndex="0" Template="{DynamicResource SearchTextBoxTemplate}" BorderThickness="0,0,0,0" /> <TextBox Height="20" x:Name="textbox_search" MinWidth="90" Margin="3,0,0,0" Width="300" TabIndex="0" Template="{DynamicResource SearchTextBoxTemplate}" BorderThickness="0,0,0,0" />
<Button Content="Aktualisieren" Margin="5,0,0,0" x:Name="buttonRefresh" Click="buttonRefresh_Click" /> <Button Content="Aktualisieren" Margin="5,0,0,0" x:Name="buttonRefresh" Click="buttonRefresh_Click" />
</StackPanel> </StackPanel>
<CheckBox FontFamily="Microsoft Sans Serif" FontSize="12" Margin="0,3,0,0" Content="Nur offene Forderungen anzeigen" VerticalAlignment="Center" x:Name="chkShowOnlyOutstandingReceivables" /> <CheckBox FontFamily="Microsoft Sans Serif" FontSize="12" Margin="0,3,0,0" Content="{markup:Translate Nur offene Forderungen anzeigen}" VerticalAlignment="Center" x:Name="chkShowOnlyOutstandingReceivables" />
<CheckBox FontFamily="Microsoft Sans Serif" FontSize="12" Margin="0,3,0,0" Content="Nur archivierte Hilfepläne anzeigen" VerticalAlignment="Center" x:Name="chkShowArchived" /> <CheckBox FontFamily="Microsoft Sans Serif" FontSize="12" Margin="0,3,0,0" Content="{markup:Translate Nur archivierte Hilfepläne anzeigen}" VerticalAlignment="Center" x:Name="chkShowArchived" />
</StackPanel> </StackPanel>

View File

@@ -8,6 +8,7 @@ using BeWo.Core.Service;
using BS.Shared.DataContracts; using BS.Shared.DataContracts;
using BS.Shared.Services; using BS.Shared.Services;
using BS.Shared.Translation;
namespace BeWo.View.Report.MitarbeiterKoelnRing namespace BeWo.View.Report.MitarbeiterKoelnRing
{ {
@@ -234,14 +235,14 @@ namespace BeWo.View.Report.MitarbeiterKoelnRing
headerRow.ShowServiceRecords = config.ShowServiceRecords; headerRow.ShowServiceRecords = config.ShowServiceRecords;
if (config.ReportType == FLSReportType.Employee) if (config.ReportType == FLSReportType.Employee)
{ {
headerRow.GroupName = "Klient/in"; headerRow.GroupName = Translator.Translate("Klient/in");
headerRow.Text1 = "Abteilung"; headerRow.Text1 = "Abteilung";
headerRow.Text2 = "Status"; headerRow.Text2 = "Status";
} }
else if (config.ReportType == FLSReportType.Customer) else if (config.ReportType == FLSReportType.Customer)
headerRow.GroupName = "Mitarbeiter/in"; headerRow.GroupName = Translator.Translate("Mitarbeiter/in");
else if (config.ReportType == FLSReportType.Costbearer) else if (config.ReportType == FLSReportType.Costbearer)
headerRow.GroupName = "Kostenträger"; headerRow.GroupName = Translator.Translate("Kostenträger");
else else
headerRow.GroupName = "Team"; headerRow.GroupName = "Team";

View File

@@ -5,8 +5,10 @@ using System.Windows;
using System.Windows.Controls; using System.Windows.Controls;
using System.Windows.Media; using System.Windows.Media;
using BeWo.Core.Service; using BeWo.Core.Service;
using BeWo.MultiLanguage;
using BS.Shared; using BS.Shared;
using BS.Shared.DataContracts.Compact; using BS.Shared.DataContracts.Compact;
using BS.Shared.Translation;
namespace BeWo.View.Search namespace BeWo.View.Search
{ {
@@ -101,7 +103,7 @@ namespace BeWo.View.Search
sp.Children.Add(mChkBoxShowOnlyMyClients); sp.Children.Add(mChkBoxShowOnlyMyClients);
mChkBoxShowExpiredSupportConcepts = new CheckBox {Content = "Abgelaufene Hilfepläne anzeigen", Margin = new Thickness(5, 0, 0, 0)}; mChkBoxShowExpiredSupportConcepts = new CheckBox {Content = Translator.Translate("Abgelaufene Hilfepläne anzeigen"), Margin = new Thickness(5, 0, 0, 0)};
mChkBoxShowExpiredSupportConcepts.Checked += FilterCheckBoxChanged; mChkBoxShowExpiredSupportConcepts.Checked += FilterCheckBoxChanged;
mChkBoxShowExpiredSupportConcepts.Unchecked += FilterCheckBoxChanged; mChkBoxShowExpiredSupportConcepts.Unchecked += FilterCheckBoxChanged;
mChkBoxShowExpiredSupportConcepts.FontSize = 12; mChkBoxShowExpiredSupportConcepts.FontSize = 12;

View File

@@ -79,6 +79,7 @@
<Compile Include="Teamstundenkonto.designer.cs"> <Compile Include="Teamstundenkonto.designer.cs">
<DependentUpon>Teamstundenkonto.cs</DependentUpon> <DependentUpon>Teamstundenkonto.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="Translation\TranslationDictionary.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<EmbeddedResource Include="Mitarbeiterstundenkonto.resx"> <EmbeddedResource Include="Mitarbeiterstundenkonto.resx">
@@ -108,6 +109,7 @@
<Name>Shared</Name> <Name>Shared</Name>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets. Other similar extension points exist, see Microsoft.Common.targets.

View File

@@ -0,0 +1,77 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using BeWo.Data.Access;
using BeWo.Data.Entities;
using BeWo.Service.DCEntityMapper;
using BeWo.Service.Plugins;
using BS.Shared.DataContracts.Compact;
namespace DerKarrenSbd
{
class CustomHomeContentGenerator : HomeContentGenerator
{
public override List<CompactSupportConceptDC> GetExpiringSupportConcepts(long? employeeOid, DateTime expiredUntil)
{
Employee emp = null;
if (employeeOid.HasValue)
{
emp = DAOFactory.GenericDAO.LoadByID<Employee>(employeeOid.Value);
}
IEnumerable<SupportConcept> result = DAOFactory.SearchDAO.FindExpiringSupportConcepts(null, DateTime.Now.AddYears(-1), expiredUntil);
if (emp.LeadingTeams.Count > 0)
{
Dictionary<long, long> teamEmployeeDict = new Dictionary<long, long>();
teamEmployeeDict.Add(employeeOid.Value, employeeOid.Value);
foreach (var team in emp.LeadingTeams)
{
foreach (var member in team.MemberList)
{
if (!teamEmployeeDict.ContainsKey(member.Oid.Value))
{
teamEmployeeDict.Add(member.Oid.Value, member.Oid.Value);
}
}
}
List<SupportConcept> listeTemp = new List<SupportConcept>();
foreach (var sc in result)
{
bool add = false;
foreach (var e2c in sc.Customer.Employee2CustomerList)
{
if (teamEmployeeDict.ContainsKey(e2c.EmployeeOid.Value))
{
add = true;
}
}
if (add)
{
listeTemp.Add(sc);
}
}
result = listeTemp;
}
List<SupportConcept> liste = new List<SupportConcept>();
foreach (var sc in result)
{
if (!sc.RenewalSendDate.HasValue)
{
liste.Add(sc);
}
}
return MapperFactory.CompactSupportConceptDC_SupportConcept.MapToNewDCs(liste);
}
}
}

View File

@@ -0,0 +1,95 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{7CB8B860-765E-4078-B2CD-C6D5FCCA937F}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>DerKarrenSbd</RootNamespace>
<AssemblyName>7709306800_Reports</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>..\..\Host\bin\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>..\..\Host\bin\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="DevExpress.Data.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Printing.v17.1.Core, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Utils.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraPrinting.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraReports.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Mitarbeiterstundenkonto.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Mitarbeiterstundenkonto.designer.cs">
<DependentUpon>Mitarbeiterstundenkonto.cs</DependentUpon>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="CustomHomeContentGenerator.cs" />
<Compile Include="Teamstundenkonto.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Teamstundenkonto.designer.cs">
<DependentUpon>Teamstundenkonto.cs</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Data\Data.csproj">
<Project>{B0D73E3D-4AE7-4024-93A6-DB1F46D7CCEE}</Project>
<Name>Data</Name>
</ProjectReference>
<ProjectReference Include="..\..\Report\Report.csproj">
<Project>{40D8B312-EA64-49E3-A31A-5E57ED4D5654}</Project>
<Name>Report</Name>
</ProjectReference>
<ProjectReference Include="..\..\Service\Service.csproj">
<Project>{094331C3-ECEE-4C89-BBFD-4C9DED89F0EF}</Project>
<Name>Service</Name>
</ProjectReference>
<ProjectReference Include="..\..\Shared\Shared.csproj">
<Project>{2F50B83D-A3F0-4EC4-979A-3F9B7E3D8ED4}</Project>
<Name>Shared</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Mitarbeiterstundenkonto.resx">
<DependentUpon>Mitarbeiterstundenkonto.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Properties\licenses.licx" />
<EmbeddedResource Include="Teamstundenkonto.resx">
<DependentUpon>Teamstundenkonto.cs</DependentUpon>
</EmbeddedResource>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

View File

@@ -0,0 +1,28 @@
using System;
using BeWo.Report;
using BeWo.Report.ReportObjects;
using BS.Shared.Core;
namespace DerKarrenSbd
{
[IDSpecificClass(Identifier = "Mitarbeiterstundenkonto")]
public partial class Mitarbeiterstundenkonto : DevExpress.XtraReports.UI.XtraReport, IBeWoReport<MitarbeiterstundenkontoRO>
{
public Mitarbeiterstundenkonto()
{
InitializeComponent();
}
public void SetReportDataSource(MitarbeiterstundenkontoRO pRO)
{
var msb = new MitarbeiterstundenkontoBerechnung();
msb.CreateReport(pRO);
this.bindingSource1.DataSource = pRO;
}
}
}

View File

@@ -0,0 +1,717 @@
using BeWo.Report.ReportObjects;
namespace DerKarrenSbd
{
partial class Mitarbeiterstundenkonto
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
this.xrTableDetail = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRowDetail = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell27 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell25 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell24 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell26 = new DevExpress.XtraReports.UI.XRTableCell();
this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.xrTableHeader = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRowHeader = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell();
this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell35 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell37 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell39 = new DevExpress.XtraReports.UI.XRTableCell();
this.cellSollGesamt = new DevExpress.XtraReports.UI.XRTableCell();
this.cellFLSSollGesamt = new DevExpress.XtraReports.UI.XRTableCell();
this.cellFLSIstGesamt = new DevExpress.XtraReports.UI.XRTableCell();
this.cellFLSPlusMinusGesamt = new DevExpress.XtraReports.UI.XRTableCell();
this.cellGesamtGesamt = new DevExpress.XtraReports.UI.XRTableCell();
this.cellRelationGesamt = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell48 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell51 = new DevExpress.XtraReports.UI.XRTableCell();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.lblMonat = new DevExpress.XtraReports.UI.XRLabel();
this.pageFooterBand1 = new DevExpress.XtraReports.UI.PageFooterBand();
this.xrPageInfo2 = new DevExpress.XtraReports.UI.XRPageInfo();
this.xrPageInfo1 = new DevExpress.XtraReports.UI.XRPageInfo();
this.Title = new DevExpress.XtraReports.UI.XRControlStyle();
this.FieldCaption = new DevExpress.XtraReports.UI.XRControlStyle();
this.PageInfo = new DevExpress.XtraReports.UI.XRControlStyle();
this.DataField = new DevExpress.XtraReports.UI.XRControlStyle();
this.fieldFLS = new DevExpress.XtraReports.UI.CalculatedField();
this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// Detail
//
this.Detail.HeightF = 0F;
this.Detail.Name = "Detail";
this.Detail.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.Detail.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// Detail1
//
this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTableDetail});
this.Detail1.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.Detail1.HeightF = 25F;
this.Detail1.Name = "Detail1";
this.Detail1.StylePriority.UseFont = false;
//
// xrTableDetail
//
this.xrTableDetail.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableDetail.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrTableDetail.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrTableDetail.Name = "xrTableDetail";
this.xrTableDetail.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableDetail.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRowDetail});
this.xrTableDetail.SizeF = new System.Drawing.SizeF(1005F, 25F);
this.xrTableDetail.StylePriority.UseBorders = false;
this.xrTableDetail.StylePriority.UseFont = false;
this.xrTableDetail.StylePriority.UsePadding = false;
this.xrTableDetail.StylePriority.UseTextAlignment = false;
this.xrTableDetail.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
//
// xrTableRowDetail
//
this.xrTableRowDetail.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell3,
this.xrTableCell19,
this.xrTableCell20,
this.xrTableCell28,
this.xrTableCell16,
this.xrTableCell27,
this.xrTableCell22,
this.xrTableCell23,
this.xrTableCell21,
this.xrTableCell25,
this.xrTableCell24,
this.xrTableCell26});
this.xrTableRowDetail.Name = "xrTableRowDetail";
this.xrTableRowDetail.Weight = 1D;
//
// xrTableCell3
//
this.xrTableCell3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.FullName")});
this.xrTableCell3.Name = "xrTableCell3";
this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
this.xrTableCell3.StylePriority.UseFont = false;
this.xrTableCell3.StylePriority.UsePadding = false;
this.xrTableCell3.StylePriority.UseTextAlignment = false;
this.xrTableCell3.Text = "xrTableCell3";
this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell3.Weight = 0.15329125338142471D;
//
// xrTableCell19
//
this.xrTableCell19.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.StundenSollMax", "{0:0.00}")});
this.xrTableCell19.Name = "xrTableCell19";
this.xrTableCell19.Text = "xrTableCell19";
this.xrTableCell19.Weight = 0.081154151689479551D;
//
// xrTableCell20
//
this.xrTableCell20.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.UrlaubUndKrankheit", "{0:0.00}")});
this.xrTableCell20.Name = "xrTableCell20";
this.xrTableCell20.Text = "xrTableCell20";
this.xrTableCell20.Weight = 0.094679933071566441D;
//
// xrTableCell28
//
this.xrTableCell28.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.StundenSollOhneUrlaubKrankheit", "{0:0.00}")});
this.xrTableCell28.Name = "xrTableCell28";
this.xrTableCell28.Text = "xrTableCell28";
this.xrTableCell28.Weight = 0.0721370604147881D;
//
// xrTableCell16
//
this.xrTableCell16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.FlsSoll", "{0:0.00}")});
this.xrTableCell16.Name = "xrTableCell16";
this.xrTableCell16.Text = "xrTableCell16";
this.xrTableCell16.Weight = 0.063119927862939587D;
//
// xrTableCell27
//
this.xrTableCell27.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.FlsIst", "{0:0.00}")});
this.xrTableCell27.Name = "xrTableCell27";
this.xrTableCell27.Text = "xrTableCell27";
this.xrTableCell27.Weight = 0.063119927862939615D;
//
// xrTableCell22
//
this.xrTableCell22.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.FlsDiff", "{0:0.00}")});
this.xrTableCell22.Name = "xrTableCell22";
this.xrTableCell22.Text = "xrTableCell22";
this.xrTableCell22.Weight = 0.063119927862939587D;
//
// xrTableCell23
//
this.xrTableCell23.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.StundenGesamtIst", "{0:0.00}")});
this.xrTableCell23.Name = "xrTableCell23";
this.xrTableCell23.Text = "xrTableCell23";
this.xrTableCell23.Weight = 0.063119927862939559D;
//
// xrTableCell21
//
this.xrTableCell21.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.RelationFlsZuMittelbar", "{0:0.00}")});
this.xrTableCell21.Name = "xrTableCell21";
this.xrTableCell21.Text = "xrTableCell21";
this.xrTableCell21.Weight = 0.063119927862939615D;
//
// xrTableCell25
//
this.xrTableCell25.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Ueberstunden", "{0:0.00}")});
this.xrTableCell25.Name = "xrTableCell25";
this.xrTableCell25.Text = "xrTableCell25";
this.xrTableCell25.Weight = 0.063119927862939587D;
//
// xrTableCell24
//
this.xrTableCell24.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.UeberstundenVormonat", "{0:0.00}")});
this.xrTableCell24.Name = "xrTableCell24";
this.xrTableCell24.Text = "xrTableCell24";
this.xrTableCell24.Weight = 0.0631199278629396D;
//
// xrTableCell26
//
this.xrTableCell26.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.UeberstundenGesamt", "{0:0.00}")});
this.xrTableCell26.Name = "xrTableCell26";
this.xrTableCell26.Text = "xrTableCell26";
this.xrTableCell26.Weight = 0.063119927862939573D;
//
// DetailReport
//
this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
this.Detail1,
this.GroupHeader1,
this.GroupFooter1});
this.DetailReport.DataMember = "EmployeeDetailList";
this.DetailReport.DataSource = this.bindingSource1;
this.DetailReport.Level = 0;
this.DetailReport.Name = "DetailReport";
//
// GroupHeader1
//
this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTableHeader});
this.GroupHeader1.HeightF = 70F;
this.GroupHeader1.Name = "GroupHeader1";
this.GroupHeader1.RepeatEveryPage = true;
//
// xrTableHeader
//
this.xrTableHeader.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableHeader.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold);
this.xrTableHeader.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrTableHeader.Name = "xrTableHeader";
this.xrTableHeader.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableHeader.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRowHeader});
this.xrTableHeader.SizeF = new System.Drawing.SizeF(1005F, 70F);
this.xrTableHeader.StylePriority.UseBorders = false;
this.xrTableHeader.StylePriority.UseFont = false;
this.xrTableHeader.StylePriority.UsePadding = false;
this.xrTableHeader.StylePriority.UseTextAlignment = false;
this.xrTableHeader.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
//
// xrTableRowHeader
//
this.xrTableRowHeader.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell5,
this.xrTableCell4,
this.xrTableCell2,
this.xrTableCell9,
this.xrTableCell8,
this.xrTableCell10,
this.xrTableCell7,
this.xrTableCell11,
this.xrTableCell12,
this.xrTableCell13,
this.xrTableCell14,
this.xrTableCell15});
this.xrTableRowHeader.Name = "xrTableRowHeader";
this.xrTableRowHeader.Weight = 2.8D;
//
// xrTableCell5
//
this.xrTableCell5.Name = "xrTableCell5";
this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
this.xrTableCell5.StylePriority.UsePadding = false;
this.xrTableCell5.StylePriority.UseTextAlignment = false;
this.xrTableCell5.Text = "Name";
this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell5.Weight = 0.15329125016467182D;
//
// xrTableCell4
//
this.xrTableCell4.Name = "xrTableCell4";
this.xrTableCell4.Text = "Reguläre SOLL Stunden";
this.xrTableCell4.Weight = 0.081154192324637608D;
//
// xrTableCell2
//
this.xrTableCell2.Name = "xrTableCell2";
this.xrTableCell2.Text = "Fehlzeiten Urlaub Krankheit(Tage)";
this.xrTableCell2.Weight = 0.094679896646570338D;
//
// xrTableCell9
//
this.xrTableCell9.Multiline = true;
this.xrTableCell9.Name = "xrTableCell9";
this.xrTableCell9.Text = "SOLL Vertraglich";
this.xrTableCell9.Weight = 0.072137063712635591D;
//
// xrTableCell8
//
this.xrTableCell8.Name = "xrTableCell8";
this.xrTableCell8.Text = "SOLL Tatsächlich";
this.xrTableCell8.Weight = 0.063119927721024038D;
//
// xrTableCell10
//
this.xrTableCell10.Name = "xrTableCell10";
this.xrTableCell10.StylePriority.UseBackColor = false;
this.xrTableCell10.Text = "geleistete AZ beim Klienten";
this.xrTableCell10.Weight = 0.063119927721024D;
//
// xrTableCell7
//
this.xrTableCell7.Name = "xrTableCell7";
this.xrTableCell7.Text = "FLS Plus/Minus lfd. Monat";
this.xrTableCell7.Weight = 0.06311992757910842D;
//
// xrTableCell11
//
this.xrTableCell11.Multiline = true;
this.xrTableCell11.Name = "xrTableCell11";
this.xrTableCell11.StylePriority.UseBackColor = false;
this.xrTableCell11.Text = "Gesamt nichtrefinanzierte Std +AZ beim Klienten";
this.xrTableCell11.Weight = 0.063119927721024011D;
//
// xrTableCell12
//
this.xrTableCell12.Name = "xrTableCell12";
this.xrTableCell12.Text = "Relation FLS IST zu Mittelbare IST";
this.xrTableCell12.Weight = 0.063119929511863376D;
//
// xrTableCell13
//
this.xrTableCell13.Name = "xrTableCell13";
this.xrTableCell13.Text = "Überstd. neu";
this.xrTableCell13.Weight = 0.063119928687401447D;
//
// xrTableCell14
//
this.xrTableCell14.Name = "xrTableCell14";
this.xrTableCell14.StylePriority.UseBackColor = false;
this.xrTableCell14.Text = "Überstd. Vormonat";
this.xrTableCell14.Weight = 0.063119928275170531D;
//
// xrTableCell15
//
this.xrTableCell15.Name = "xrTableCell15";
this.xrTableCell15.Text = "Überstd. Gesamt";
this.xrTableCell15.Weight = 0.0631199213956443D;
//
// GroupFooter1
//
this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTable1});
this.GroupFooter1.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
this.GroupFooter1.HeightF = 48.95833F;
this.GroupFooter1.Name = "GroupFooter1";
this.GroupFooter1.StylePriority.UseFont = false;
//
// xrTable1
//
this.xrTable1.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrTable1.Name = "xrTable1";
this.xrTable1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow1});
this.xrTable1.SizeF = new System.Drawing.SizeF(1005F, 25F);
this.xrTable1.StylePriority.UseBorders = false;
this.xrTable1.StylePriority.UseFont = false;
this.xrTable1.StylePriority.UsePadding = false;
this.xrTable1.StylePriority.UseTextAlignment = false;
this.xrTable1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
//
// xrTableRow1
//
this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell35,
this.xrTableCell37,
this.xrTableCell39,
this.cellSollGesamt,
this.cellFLSSollGesamt,
this.cellFLSIstGesamt,
this.cellFLSPlusMinusGesamt,
this.cellGesamtGesamt,
this.cellRelationGesamt,
this.xrTableCell47,
this.xrTableCell48,
this.xrTableCell51});
this.xrTableRow1.Name = "xrTableRow1";
this.xrTableRow1.Weight = 1D;
//
// xrTableCell35
//
this.xrTableCell35.Name = "xrTableCell35";
this.xrTableCell35.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
this.xrTableCell35.StylePriority.UseFont = false;
this.xrTableCell35.StylePriority.UsePadding = false;
this.xrTableCell35.StylePriority.UseTextAlignment = false;
this.xrTableCell35.Text = "Gesamt";
this.xrTableCell35.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell35.Weight = 0.15329126714047708D;
//
// xrTableCell37
//
this.xrTableCell37.Name = "xrTableCell37";
this.xrTableCell37.Weight = 0.081154151689479551D;
//
// xrTableCell39
//
this.xrTableCell39.Name = "xrTableCell39";
this.xrTableCell39.Weight = 0.094679919312514085D;
//
// cellSollGesamt
//
this.cellSollGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "SollGesamt", "{0:0.00}")});
this.cellSollGesamt.Name = "cellSollGesamt";
this.cellSollGesamt.Text = "cellSollGesamt";
this.cellSollGesamt.Weight = 0.0721370604147881D;
//
// cellFLSSollGesamt
//
this.cellFLSSollGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "FlsSollGesamt", "{0:0.00}")});
this.cellFLSSollGesamt.Name = "cellFLSSollGesamt";
this.cellFLSSollGesamt.Text = "cellFLSSollGesamt";
this.cellFLSSollGesamt.Weight = 0.063119927862939587D;
//
// cellFLSIstGesamt
//
this.cellFLSIstGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "FlsIstGesamt", "{0:0.00}")});
this.cellFLSIstGesamt.Name = "cellFLSIstGesamt";
this.cellFLSIstGesamt.Text = "cellFLSIstGesamt";
this.cellFLSIstGesamt.Weight = 0.063119927862939615D;
//
// cellFLSPlusMinusGesamt
//
this.cellFLSPlusMinusGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "FlsDiffGesamt", "{0:0.00}")});
this.cellFLSPlusMinusGesamt.Name = "cellFLSPlusMinusGesamt";
this.cellFLSPlusMinusGesamt.Text = "cellFLSPlusMinusGesamt";
this.cellFLSPlusMinusGesamt.Weight = 0.063119927862939587D;
//
// cellGesamtGesamt
//
this.cellGesamtGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "StundenGesamt", "{0:0.00}")});
this.cellGesamtGesamt.Name = "cellGesamtGesamt";
this.cellGesamtGesamt.Text = "cellGesamtGesamt";
this.cellGesamtGesamt.Weight = 0.063119927862939573D;
//
// cellRelationGesamt
//
this.cellRelationGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "RelationFlsZuMittelbar", "{0:0.00}")});
this.cellRelationGesamt.Name = "cellRelationGesamt";
this.cellRelationGesamt.Text = "cellRelationGesamt";
this.cellRelationGesamt.Weight = 0.0631199278629396D;
//
// xrTableCell47
//
this.xrTableCell47.Name = "xrTableCell47";
this.xrTableCell47.Weight = 0.063119927862939587D;
//
// xrTableCell48
//
this.xrTableCell48.Name = "xrTableCell48";
this.xrTableCell48.Weight = 0.063119927862939587D;
//
// xrTableCell51
//
this.xrTableCell51.Name = "xrTableCell51";
this.xrTableCell51.Weight = 0.063119927862939573D;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoRO);
//
// ReportHeader
//
this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.lblMonat});
this.ReportHeader.HeightF = 35F;
this.ReportHeader.Name = "ReportHeader";
//
// lblMonat
//
this.lblMonat.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ReportStartDate", "Stundenkonto {0:MMMM yy}")});
this.lblMonat.Font = new System.Drawing.Font("Arial", 14F, System.Drawing.FontStyle.Bold);
this.lblMonat.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.lblMonat.Multiline = true;
this.lblMonat.Name = "lblMonat";
this.lblMonat.SizeF = new System.Drawing.SizeF(1007F, 25F);
this.lblMonat.StyleName = "Title";
this.lblMonat.StylePriority.UseFont = false;
this.lblMonat.Text = "lblMonat";
//
// pageFooterBand1
//
this.pageFooterBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrPageInfo2,
this.xrPageInfo1});
this.pageFooterBand1.HeightF = 48F;
this.pageFooterBand1.Name = "pageFooterBand1";
//
// xrPageInfo2
//
this.xrPageInfo2.Font = new System.Drawing.Font("Arial", 8F);
this.xrPageInfo2.Format = "Seite {0} von {1}";
this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(522.0001F, 25F);
this.xrPageInfo2.Name = "xrPageInfo2";
this.xrPageInfo2.SizeF = new System.Drawing.SizeF(482.9998F, 23F);
this.xrPageInfo2.StyleName = "PageInfo";
this.xrPageInfo2.StylePriority.UseFont = false;
this.xrPageInfo2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
//
// xrPageInfo1
//
this.xrPageInfo1.Font = new System.Drawing.Font("Arial", 8F);
this.xrPageInfo1.LocationFloat = new DevExpress.Utils.PointFloat(8F, 25F);
this.xrPageInfo1.Name = "xrPageInfo1";
this.xrPageInfo1.PageInfo = DevExpress.XtraPrinting.PageInfo.DateTime;
this.xrPageInfo1.SizeF = new System.Drawing.SizeF(497F, 23F);
this.xrPageInfo1.StyleName = "PageInfo";
this.xrPageInfo1.StylePriority.UseFont = false;
//
// Title
//
this.Title.BackColor = System.Drawing.Color.White;
this.Title.BorderColor = System.Drawing.SystemColors.ControlText;
this.Title.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.Title.BorderWidth = 1F;
this.Title.Font = new System.Drawing.Font("Times New Roman", 24F);
this.Title.ForeColor = System.Drawing.Color.Black;
this.Title.Name = "Title";
//
// FieldCaption
//
this.FieldCaption.BackColor = System.Drawing.Color.White;
this.FieldCaption.BorderColor = System.Drawing.SystemColors.ControlText;
this.FieldCaption.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.FieldCaption.BorderWidth = 1F;
this.FieldCaption.Font = new System.Drawing.Font("Times New Roman", 10F, System.Drawing.FontStyle.Bold);
this.FieldCaption.ForeColor = System.Drawing.Color.Black;
this.FieldCaption.Name = "FieldCaption";
//
// PageInfo
//
this.PageInfo.BackColor = System.Drawing.Color.White;
this.PageInfo.BorderColor = System.Drawing.SystemColors.ControlText;
this.PageInfo.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.PageInfo.BorderWidth = 1F;
this.PageInfo.Font = new System.Drawing.Font("Times New Roman", 8F);
this.PageInfo.ForeColor = System.Drawing.Color.Black;
this.PageInfo.Name = "PageInfo";
//
// DataField
//
this.DataField.BackColor = System.Drawing.Color.White;
this.DataField.BorderColor = System.Drawing.SystemColors.ControlText;
this.DataField.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.DataField.BorderWidth = 1F;
this.DataField.Font = new System.Drawing.Font("Times New Roman", 8F);
this.DataField.ForeColor = System.Drawing.SystemColors.ControlText;
this.DataField.Name = "DataField";
//
// fieldFLS
//
this.fieldFLS.DataMember = "FLSReportGroups";
this.fieldFLS.Expression = "[TotalFLM] / 60";
this.fieldFLS.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
this.fieldFLS.Name = "fieldFLS";
//
// topMarginBand1
//
this.topMarginBand1.HeightF = 50F;
this.topMarginBand1.Name = "topMarginBand1";
//
// bottomMarginBand1
//
this.bottomMarginBand1.HeightF = 30.9583F;
this.bottomMarginBand1.Name = "bottomMarginBand1";
//
// Mitarbeiterstundenkonto
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
this.Detail,
this.DetailReport,
this.ReportHeader,
this.pageFooterBand1,
this.topMarginBand1,
this.bottomMarginBand1});
this.CalculatedFields.AddRange(new DevExpress.XtraReports.UI.CalculatedField[] {
this.fieldFLS});
this.DataSource = this.bindingSource1;
this.Landscape = true;
this.Margins = new System.Drawing.Printing.Margins(75, 75, 50, 31);
this.PageHeight = 827;
this.PageWidth = 1169;
this.PaperKind = System.Drawing.Printing.PaperKind.A4;
this.StyleSheet.AddRange(new DevExpress.XtraReports.UI.XRControlStyle[] {
this.Title,
this.FieldCaption,
this.PageInfo,
this.DataField});
this.Version = "17.1";
((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}
#endregion
private DevExpress.XtraReports.UI.DetailBand Detail;
private System.Windows.Forms.BindingSource bindingSource1;
private DevExpress.XtraReports.UI.DetailBand Detail1;
private DevExpress.XtraReports.UI.DetailReportBand DetailReport;
private DevExpress.XtraReports.UI.ReportHeaderBand ReportHeader;
private DevExpress.XtraReports.UI.XRLabel lblMonat;
private DevExpress.XtraReports.UI.PageFooterBand pageFooterBand1;
private DevExpress.XtraReports.UI.XRPageInfo xrPageInfo2;
private DevExpress.XtraReports.UI.XRPageInfo xrPageInfo1;
private DevExpress.XtraReports.UI.XRControlStyle Title;
private DevExpress.XtraReports.UI.XRControlStyle FieldCaption;
private DevExpress.XtraReports.UI.XRControlStyle PageInfo;
private DevExpress.XtraReports.UI.XRControlStyle DataField;
private DevExpress.XtraReports.UI.XRTable xrTableHeader;
private DevExpress.XtraReports.UI.XRTableRow xrTableRowHeader;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell5;
private DevExpress.XtraReports.UI.XRTable xrTableDetail;
private DevExpress.XtraReports.UI.XRTableRow xrTableRowDetail;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell3;
private DevExpress.XtraReports.UI.CalculatedField fieldFLS;
private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1;
private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1;
private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader1;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell4;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell2;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell9;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell8;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell10;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell7;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell11;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell12;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell19;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell20;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell28;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell16;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell27;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell22;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell23;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell21;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell25;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell24;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell26;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell13;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell14;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell15;
private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1;
private DevExpress.XtraReports.UI.XRTable xrTable1;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow1;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell35;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell37;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell39;
private DevExpress.XtraReports.UI.XRTableCell cellSollGesamt;
private DevExpress.XtraReports.UI.XRTableCell cellFLSSollGesamt;
private DevExpress.XtraReports.UI.XRTableCell cellFLSIstGesamt;
private DevExpress.XtraReports.UI.XRTableCell cellFLSPlusMinusGesamt;
private DevExpress.XtraReports.UI.XRTableCell cellGesamtGesamt;
private DevExpress.XtraReports.UI.XRTableCell cellRelationGesamt;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell47;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell48;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell51;
}
}

View File

@@ -0,0 +1,123 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="bindingSource1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
</root>

View File

@@ -0,0 +1,36 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
// Allgemeine Informationen über eine Assembly werden über die folgenden
// Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
// die einer Assembly zugeordnet sind.
[assembly: AssemblyTitle("DerKarrenSbd")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("DerKarrenSbd")]
[assembly: AssemblyCopyright("Copyright © 2017")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
// Durch Festlegen von ComVisible auf FALSE werden die Typen in dieser Assembly
// für COM-Komponenten unsichtbar. Wenn Sie auf einen Typ in dieser Assembly von
// COM aus zugreifen müssen, sollten Sie das ComVisible-Attribut für diesen Typ auf "True" festlegen.
[assembly: ComVisible(false)]
// Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird
[assembly: Guid("7cb8b860-765e-4078-b2cd-c6d5fcca937f")]
// Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten:
//
// Hauptversion
// Nebenversion
// Buildnummer
// Revision
//
// Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
// indem Sie "*" wie unten gezeigt eingeben:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]

View File

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

View File

@@ -0,0 +1,28 @@
using System;
using BeWo.Report;
using BeWo.Report.ReportObjects;
using BS.Shared.Core;
namespace DerKarrenSbd
{
[IDSpecificClass(Identifier = "Teamstundenkonto")]
public partial class Teamstundenkonto : DevExpress.XtraReports.UI.XtraReport, IBeWoReport<MitarbeiterstundenkontoRO>
{
public Teamstundenkonto()
{
InitializeComponent();
}
public void SetReportDataSource(MitarbeiterstundenkontoRO pRO)
{
var msb = new MitarbeiterstundenkontoBerechnung();
msb.CreateReport(pRO);
bindingSource1.DataSource = pRO;
}
}
}

View File

@@ -0,0 +1,897 @@
using BeWo.Report.ReportObjects;
namespace DerKarrenSbd
{
partial class Teamstundenkonto
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
this.xrTableDetail = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRowDetail = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell27 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell25 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell24 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell26 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell35 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell37 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell38 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell39 = new DevExpress.XtraReports.UI.XRTableCell();
this.cellSollGesamt = new DevExpress.XtraReports.UI.XRTableCell();
this.cellFLSSollGesamt = new DevExpress.XtraReports.UI.XRTableCell();
this.cellFLSIstGesamt = new DevExpress.XtraReports.UI.XRTableCell();
this.cellFLSPlusMinusGesamt = new DevExpress.XtraReports.UI.XRTableCell();
this.cellGesamtGesamt = new DevExpress.XtraReports.UI.XRTableCell();
this.cellRelationGesamt = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell48 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell51 = new DevExpress.XtraReports.UI.XRTableCell();
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.lblMonat = new DevExpress.XtraReports.UI.XRLabel();
this.pageFooterBand1 = new DevExpress.XtraReports.UI.PageFooterBand();
this.xrPageInfo2 = new DevExpress.XtraReports.UI.XRPageInfo();
this.xrPageInfo1 = new DevExpress.XtraReports.UI.XRPageInfo();
this.Title = new DevExpress.XtraReports.UI.XRControlStyle();
this.FieldCaption = new DevExpress.XtraReports.UI.XRControlStyle();
this.PageInfo = new DevExpress.XtraReports.UI.XRControlStyle();
this.DataField = new DevExpress.XtraReports.UI.XRControlStyle();
this.fieldFLS = new DevExpress.XtraReports.UI.CalculatedField();
this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
this.DetailReport1 = new DevExpress.XtraReports.UI.DetailReportBand();
this.Detail2 = new DevExpress.XtraReports.UI.DetailBand();
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
this.DetailReport2 = new DevExpress.XtraReports.UI.DetailReportBand();
this.Detail3 = new DevExpress.XtraReports.UI.DetailBand();
this.GroupHeader2 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.xrTable2 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell30 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell31 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell32 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell33 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell34 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell36 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell40 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell41 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell42 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell43 = new DevExpress.XtraReports.UI.XRTableCell();
this.GroupFooter2 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.xrTable3 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.ReportFooter1 = new DevExpress.XtraReports.UI.ReportFooterBand();
((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// Detail
//
this.Detail.HeightF = 0F;
this.Detail.Name = "Detail";
this.Detail.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.Detail.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// xrTableDetail
//
this.xrTableDetail.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableDetail.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrTableDetail.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrTableDetail.Name = "xrTableDetail";
this.xrTableDetail.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableDetail.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRowDetail});
this.xrTableDetail.SizeF = new System.Drawing.SizeF(1005F, 25F);
this.xrTableDetail.StylePriority.UseBorders = false;
this.xrTableDetail.StylePriority.UseFont = false;
this.xrTableDetail.StylePriority.UsePadding = false;
this.xrTableDetail.StylePriority.UseTextAlignment = false;
this.xrTableDetail.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
//
// xrTableRowDetail
//
this.xrTableRowDetail.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell3,
this.xrTableCell19,
this.xrTableCell20,
this.xrTableCell28,
this.xrTableCell16,
this.xrTableCell27,
this.xrTableCell22,
this.xrTableCell23,
this.xrTableCell21,
this.xrTableCell25,
this.xrTableCell24,
this.xrTableCell26});
this.xrTableRowDetail.Name = "xrTableRowDetail";
this.xrTableRowDetail.Weight = 1D;
//
// xrTableCell3
//
this.xrTableCell3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.EmployeeDetailList.FullName")});
this.xrTableCell3.Name = "xrTableCell3";
this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
this.xrTableCell3.StylePriority.UseFont = false;
this.xrTableCell3.StylePriority.UsePadding = false;
this.xrTableCell3.StylePriority.UseTextAlignment = false;
this.xrTableCell3.Text = "xrTableCell3";
this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell3.Weight = 0.15329125338142471D;
//
// xrTableCell19
//
this.xrTableCell19.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.EmployeeDetailList.StundenSollMax", "{0:0.00}")});
this.xrTableCell19.Name = "xrTableCell19";
this.xrTableCell19.Text = "xrTableCell19";
this.xrTableCell19.Weight = 0.081154179207584262D;
//
// xrTableCell20
//
this.xrTableCell20.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.EmployeeDetailList.UrlaubUndKrankheit", "{0:0.00}")});
this.xrTableCell20.Name = "xrTableCell20";
this.xrTableCell20.Text = "xrTableCell20";
this.xrTableCell20.Weight = 0.09467990555346173D;
//
// xrTableCell28
//
this.xrTableCell28.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.EmployeeDetailList.StundenSollOhneUrlaubKrankheit", "{0:0.00}")});
this.xrTableCell28.Name = "xrTableCell28";
this.xrTableCell28.Text = "xrTableCell28";
this.xrTableCell28.Weight = 0.0721370604147881D;
//
// xrTableCell16
//
this.xrTableCell16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.EmployeeDetailList.FlsSoll", "{0:0.00}")});
this.xrTableCell16.Name = "xrTableCell16";
this.xrTableCell16.Text = "xrTableCell16";
this.xrTableCell16.Weight = 0.063119927862939587D;
//
// xrTableCell27
//
this.xrTableCell27.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.EmployeeDetailList.FlsIst", "{0:0.00}")});
this.xrTableCell27.Name = "xrTableCell27";
this.xrTableCell27.Text = "xrTableCell27";
this.xrTableCell27.Weight = 0.063119927862939615D;
//
// xrTableCell22
//
this.xrTableCell22.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.EmployeeDetailList.FlsDiff", "{0:0.00}")});
this.xrTableCell22.Name = "xrTableCell22";
this.xrTableCell22.Text = "xrTableCell22";
this.xrTableCell22.Weight = 0.063119927862939587D;
//
// xrTableCell23
//
this.xrTableCell23.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.EmployeeDetailList.StundenGesamtIst", "{0:0.00}")});
this.xrTableCell23.Name = "xrTableCell23";
this.xrTableCell23.Text = "xrTableCell23";
this.xrTableCell23.Weight = 0.063119927862939559D;
//
// xrTableCell21
//
this.xrTableCell21.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.EmployeeDetailList.RelationFlsZuMittelbar", "{0:0.00}")});
this.xrTableCell21.Name = "xrTableCell21";
this.xrTableCell21.Text = "xrTableCell21";
this.xrTableCell21.Weight = 0.063119927862939615D;
//
// xrTableCell25
//
this.xrTableCell25.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.EmployeeDetailList.Ueberstunden", "{0:0.00}")});
this.xrTableCell25.Name = "xrTableCell25";
this.xrTableCell25.Text = "xrTableCell25";
this.xrTableCell25.Weight = 0.063119927862939587D;
//
// xrTableCell24
//
this.xrTableCell24.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.EmployeeDetailList.UeberstundenVormonat", "{0:0.00}")});
this.xrTableCell24.Name = "xrTableCell24";
this.xrTableCell24.Text = "xrTableCell24";
this.xrTableCell24.Weight = 0.0631199278629396D;
//
// xrTableCell26
//
this.xrTableCell26.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.EmployeeDetailList.UeberstundenGesamt", "{0:0.00}")});
this.xrTableCell26.Name = "xrTableCell26";
this.xrTableCell26.Text = "xrTableCell26";
this.xrTableCell26.Weight = 0.063119927862939573D;
//
// xrTable1
//
this.xrTable1.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrTable1.Name = "xrTable1";
this.xrTable1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow1});
this.xrTable1.SizeF = new System.Drawing.SizeF(1005F, 25F);
this.xrTable1.StylePriority.UseBorders = false;
this.xrTable1.StylePriority.UseFont = false;
this.xrTable1.StylePriority.UsePadding = false;
this.xrTable1.StylePriority.UseTextAlignment = false;
this.xrTable1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
//
// xrTableRow1
//
this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell35,
this.xrTableCell37,
this.xrTableCell38,
this.xrTableCell39,
this.cellSollGesamt,
this.cellFLSSollGesamt,
this.cellFLSIstGesamt,
this.cellFLSPlusMinusGesamt,
this.cellGesamtGesamt,
this.cellRelationGesamt,
this.xrTableCell47,
this.xrTableCell48,
this.xrTableCell51});
this.xrTableRow1.Name = "xrTableRow1";
this.xrTableRow1.Weight = 1D;
//
// xrTableCell35
//
this.xrTableCell35.Name = "xrTableCell35";
this.xrTableCell35.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
this.xrTableCell35.StylePriority.UseFont = false;
this.xrTableCell35.StylePriority.UsePadding = false;
this.xrTableCell35.StylePriority.UseTextAlignment = false;
this.xrTableCell35.Text = "Gesamt";
this.xrTableCell35.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell35.Weight = 0.1352569882777277D;
//
// xrTableCell37
//
this.xrTableCell37.Name = "xrTableCell37";
this.xrTableCell37.Weight = 0.067628494138863848D;
//
// xrTableCell38
//
this.xrTableCell38.Name = "xrTableCell38";
this.xrTableCell38.Weight = 0.0631199278629396D;
//
// xrTableCell39
//
this.xrTableCell39.Name = "xrTableCell39";
this.xrTableCell39.Weight = 0.063119927862939573D;
//
// cellSollGesamt
//
this.cellSollGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "SollGesamt", "{0:0.00}")});
this.cellSollGesamt.Name = "cellSollGesamt";
this.cellSollGesamt.Text = "cellSollGesamt";
this.cellSollGesamt.Weight = 0.0721370604147881D;
//
// cellFLSSollGesamt
//
this.cellFLSSollGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "FlsSollGesamt", "{0:0.00}")});
this.cellFLSSollGesamt.Name = "cellFLSSollGesamt";
this.cellFLSSollGesamt.Text = "cellFLSSollGesamt";
this.cellFLSSollGesamt.Weight = 0.063119927862939587D;
//
// cellFLSIstGesamt
//
this.cellFLSIstGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "FlsIstGesamt", "{0:0.00}")});
this.cellFLSIstGesamt.Name = "cellFLSIstGesamt";
this.cellFLSIstGesamt.Text = "cellFLSIstGesamt";
this.cellFLSIstGesamt.Weight = 0.063119927862939615D;
//
// cellFLSPlusMinusGesamt
//
this.cellFLSPlusMinusGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "FlsDiffGesamt", "{0:0.00}")});
this.cellFLSPlusMinusGesamt.Name = "cellFLSPlusMinusGesamt";
this.cellFLSPlusMinusGesamt.Text = "cellFLSPlusMinusGesamt";
this.cellFLSPlusMinusGesamt.Weight = 0.063119927862939587D;
//
// cellGesamtGesamt
//
this.cellGesamtGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "StundenGesamt", "{0:0.00}")});
this.cellGesamtGesamt.Name = "cellGesamtGesamt";
this.cellGesamtGesamt.Text = "cellGesamtGesamt";
this.cellGesamtGesamt.Weight = 0.063119927862939573D;
//
// cellRelationGesamt
//
this.cellRelationGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "RelationFlsZuMittelbar", "{0:0.00}")});
this.cellRelationGesamt.Name = "cellRelationGesamt";
this.cellRelationGesamt.Text = "cellRelationGesamt";
this.cellRelationGesamt.Weight = 0.0631199278629396D;
//
// xrTableCell47
//
this.xrTableCell47.Name = "xrTableCell47";
this.xrTableCell47.Weight = 0.063119927862939587D;
//
// xrTableCell48
//
this.xrTableCell48.Name = "xrTableCell48";
this.xrTableCell48.Weight = 0.063119927862939587D;
//
// xrTableCell51
//
this.xrTableCell51.Name = "xrTableCell51";
this.xrTableCell51.Weight = 0.063119927862939573D;
//
// ReportHeader
//
this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.lblMonat});
this.ReportHeader.HeightF = 61.04167F;
this.ReportHeader.Name = "ReportHeader";
//
// lblMonat
//
this.lblMonat.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ReportStartDate", "Stundenkonto {0:MMMM yy}")});
this.lblMonat.Font = new System.Drawing.Font("Arial", 14F, System.Drawing.FontStyle.Bold);
this.lblMonat.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.lblMonat.Multiline = true;
this.lblMonat.Name = "lblMonat";
this.lblMonat.SizeF = new System.Drawing.SizeF(1007F, 25F);
this.lblMonat.StyleName = "Title";
this.lblMonat.StylePriority.UseFont = false;
this.lblMonat.Text = "lblMonat";
//
// pageFooterBand1
//
this.pageFooterBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrPageInfo2,
this.xrPageInfo1});
this.pageFooterBand1.HeightF = 48F;
this.pageFooterBand1.Name = "pageFooterBand1";
//
// xrPageInfo2
//
this.xrPageInfo2.Font = new System.Drawing.Font("Arial", 8F);
this.xrPageInfo2.Format = "Seite {0} von {1}";
this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(522.0001F, 25F);
this.xrPageInfo2.Name = "xrPageInfo2";
this.xrPageInfo2.SizeF = new System.Drawing.SizeF(482.9998F, 23F);
this.xrPageInfo2.StyleName = "PageInfo";
this.xrPageInfo2.StylePriority.UseFont = false;
this.xrPageInfo2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
//
// xrPageInfo1
//
this.xrPageInfo1.Font = new System.Drawing.Font("Arial", 8F);
this.xrPageInfo1.LocationFloat = new DevExpress.Utils.PointFloat(8F, 25F);
this.xrPageInfo1.Name = "xrPageInfo1";
this.xrPageInfo1.PageInfo = DevExpress.XtraPrinting.PageInfo.DateTime;
this.xrPageInfo1.SizeF = new System.Drawing.SizeF(497F, 23F);
this.xrPageInfo1.StyleName = "PageInfo";
this.xrPageInfo1.StylePriority.UseFont = false;
//
// Title
//
this.Title.BackColor = System.Drawing.Color.White;
this.Title.BorderColor = System.Drawing.SystemColors.ControlText;
this.Title.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.Title.BorderWidth = 1F;
this.Title.Font = new System.Drawing.Font("Times New Roman", 24F);
this.Title.ForeColor = System.Drawing.Color.Black;
this.Title.Name = "Title";
//
// FieldCaption
//
this.FieldCaption.BackColor = System.Drawing.Color.White;
this.FieldCaption.BorderColor = System.Drawing.SystemColors.ControlText;
this.FieldCaption.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.FieldCaption.BorderWidth = 1F;
this.FieldCaption.Font = new System.Drawing.Font("Times New Roman", 10F, System.Drawing.FontStyle.Bold);
this.FieldCaption.ForeColor = System.Drawing.Color.Black;
this.FieldCaption.Name = "FieldCaption";
//
// PageInfo
//
this.PageInfo.BackColor = System.Drawing.Color.White;
this.PageInfo.BorderColor = System.Drawing.SystemColors.ControlText;
this.PageInfo.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.PageInfo.BorderWidth = 1F;
this.PageInfo.Font = new System.Drawing.Font("Times New Roman", 8F);
this.PageInfo.ForeColor = System.Drawing.Color.Black;
this.PageInfo.Name = "PageInfo";
//
// DataField
//
this.DataField.BackColor = System.Drawing.Color.White;
this.DataField.BorderColor = System.Drawing.SystemColors.ControlText;
this.DataField.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.DataField.BorderWidth = 1F;
this.DataField.Font = new System.Drawing.Font("Times New Roman", 8F);
this.DataField.ForeColor = System.Drawing.SystemColors.ControlText;
this.DataField.Name = "DataField";
//
// fieldFLS
//
this.fieldFLS.DataMember = "FLSReportGroups";
this.fieldFLS.Expression = "[TotalFLM] / 60";
this.fieldFLS.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
this.fieldFLS.Name = "fieldFLS";
//
// topMarginBand1
//
this.topMarginBand1.HeightF = 50F;
this.topMarginBand1.Name = "topMarginBand1";
//
// bottomMarginBand1
//
this.bottomMarginBand1.HeightF = 30F;
this.bottomMarginBand1.Name = "bottomMarginBand1";
//
// DetailReport1
//
this.DetailReport1.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
this.Detail2,
this.DetailReport2});
this.DetailReport1.DataMember = "TeamDetailList";
this.DetailReport1.DataSource = this.bindingSource1;
this.DetailReport1.Level = 0;
this.DetailReport1.Name = "DetailReport1";
//
// Detail2
//
this.Detail2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel1});
this.Detail2.HeightF = 46.875F;
this.Detail2.Name = "Detail2";
//
// xrLabel1
//
this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.TeamName")});
this.xrLabel1.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold);
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrLabel1.Multiline = true;
this.xrLabel1.Name = "xrLabel1";
this.xrLabel1.SizeF = new System.Drawing.SizeF(1007F, 25F);
this.xrLabel1.StyleName = "Title";
this.xrLabel1.StylePriority.UseFont = false;
this.xrLabel1.Text = "xrLabel1";
//
// DetailReport2
//
this.DetailReport2.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
this.Detail3,
this.GroupHeader2,
this.GroupFooter2});
this.DetailReport2.DataMember = "TeamDetailList.EmployeeDetailList";
this.DetailReport2.DataSource = this.bindingSource1;
this.DetailReport2.Level = 0;
this.DetailReport2.Name = "DetailReport2";
//
// Detail3
//
this.Detail3.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTableDetail});
this.Detail3.HeightF = 25F;
this.Detail3.Name = "Detail3";
//
// GroupHeader2
//
this.GroupHeader2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTable2});
this.GroupHeader2.HeightF = 70F;
this.GroupHeader2.Name = "GroupHeader2";
//
// xrTable2
//
this.xrTable2.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTable2.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold);
this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrTable2.Name = "xrTable2";
this.xrTable2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow2});
this.xrTable2.SizeF = new System.Drawing.SizeF(1005F, 70F);
this.xrTable2.StylePriority.UseBorders = false;
this.xrTable2.StylePriority.UseFont = false;
this.xrTable2.StylePriority.UsePadding = false;
this.xrTable2.StylePriority.UseTextAlignment = false;
this.xrTable2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
//
// xrTableRow2
//
this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell6,
this.xrTableCell18,
this.xrTableCell30,
this.xrTableCell31,
this.xrTableCell32,
this.xrTableCell33,
this.xrTableCell34,
this.xrTableCell36,
this.xrTableCell40,
this.xrTableCell41,
this.xrTableCell42,
this.xrTableCell43});
this.xrTableRow2.Name = "xrTableRow2";
this.xrTableRow2.Weight = 2.8D;
//
// xrTableCell6
//
this.xrTableCell6.Name = "xrTableCell6";
this.xrTableCell6.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
this.xrTableCell6.StylePriority.UsePadding = false;
this.xrTableCell6.StylePriority.UseTextAlignment = false;
this.xrTableCell6.Text = "Name";
this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell6.Weight = 0.15329125016467182D;
//
// xrTableCell18
//
this.xrTableCell18.Name = "xrTableCell18";
this.xrTableCell18.Text = "Reguläre SOLL Stunden";
this.xrTableCell18.Weight = 0.081154192324637608D;
//
// xrTableCell30
//
this.xrTableCell30.Name = "xrTableCell30";
this.xrTableCell30.Text = "Fehlzeiten Urlaub Krankheit(Tage)";
this.xrTableCell30.Weight = 0.094679896646570338D;
//
// xrTableCell31
//
this.xrTableCell31.Multiline = true;
this.xrTableCell31.Name = "xrTableCell31";
this.xrTableCell31.Text = "SOLL Vertraglich";
this.xrTableCell31.Weight = 0.072137063712635591D;
//
// xrTableCell32
//
this.xrTableCell32.Name = "xrTableCell32";
this.xrTableCell32.Text = "SOLL Tatsächlich";
this.xrTableCell32.Weight = 0.063119927721024038D;
//
// xrTableCell33
//
this.xrTableCell33.Name = "xrTableCell33";
this.xrTableCell33.StylePriority.UseBackColor = false;
this.xrTableCell33.Text = "geleistete AZ beim Klienten";
this.xrTableCell33.Weight = 0.063119927721024D;
//
// xrTableCell34
//
this.xrTableCell34.Name = "xrTableCell34";
this.xrTableCell34.Text = "FLS Plus/Minus lfd. Monat";
this.xrTableCell34.Weight = 0.06311992757910842D;
//
// xrTableCell36
//
this.xrTableCell36.Multiline = true;
this.xrTableCell36.Name = "xrTableCell36";
this.xrTableCell36.StylePriority.UseBackColor = false;
this.xrTableCell36.Text = "Gesamt nichtrefinanzierte Std +AZ beim Klienten";
this.xrTableCell36.Weight = 0.063119927721024011D;
//
// xrTableCell40
//
this.xrTableCell40.Name = "xrTableCell40";
this.xrTableCell40.Text = "Relation FLS IST zu Mittelbare IST";
this.xrTableCell40.Weight = 0.063119929511863376D;
//
// xrTableCell41
//
this.xrTableCell41.Name = "xrTableCell41";
this.xrTableCell41.Text = "Überstd. neu";
this.xrTableCell41.Weight = 0.063119928687401447D;
//
// xrTableCell42
//
this.xrTableCell42.Name = "xrTableCell42";
this.xrTableCell42.StylePriority.UseBackColor = false;
this.xrTableCell42.Text = "Überstd. Vormonat";
this.xrTableCell42.Weight = 0.063119928275170531D;
//
// xrTableCell43
//
this.xrTableCell43.Name = "xrTableCell43";
this.xrTableCell43.Text = "Überstd. Gesamt";
this.xrTableCell43.Weight = 0.0631199213956443D;
//
// GroupFooter2
//
this.GroupFooter2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTable3});
this.GroupFooter2.HeightF = 52.08333F;
this.GroupFooter2.Name = "GroupFooter2";
//
// xrTable3
//
this.xrTable3.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrTable3.Name = "xrTable3";
this.xrTable3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow3});
this.xrTable3.SizeF = new System.Drawing.SizeF(1005F, 25F);
this.xrTable3.StylePriority.UseBorders = false;
this.xrTable3.StylePriority.UseFont = false;
this.xrTable3.StylePriority.UsePadding = false;
this.xrTable3.StylePriority.UseTextAlignment = false;
this.xrTable3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
//
// xrTableRow3
//
this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell1,
this.xrTableCell7,
this.xrTableCell8,
this.xrTableCell9,
this.xrTableCell10,
this.xrTableCell11,
this.xrTableCell12,
this.xrTableCell13,
this.xrTableCell14,
this.xrTableCell15});
this.xrTableRow3.Name = "xrTableRow3";
this.xrTableRow3.Weight = 1D;
//
// xrTableCell1
//
this.xrTableCell1.Name = "xrTableCell1";
this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
this.xrTableCell1.StylePriority.UseFont = false;
this.xrTableCell1.StylePriority.UsePadding = false;
this.xrTableCell1.StylePriority.UseTextAlignment = false;
this.xrTableCell1.Text = "Gesamt [TeamDetailList.TeamName]";
this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell1.Weight = 0.32912533814247075D;
//
// xrTableCell7
//
this.xrTableCell7.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.SollGesamt", "{0:0.00}")});
this.xrTableCell7.Name = "xrTableCell7";
this.xrTableCell7.Text = "xrTableCell7";
this.xrTableCell7.Weight = 0.07213706041478804D;
//
// xrTableCell8
//
this.xrTableCell8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.FlsSollGesamt", "{0:0.00}")});
this.xrTableCell8.Name = "xrTableCell8";
this.xrTableCell8.Text = "xrTableCell8";
this.xrTableCell8.Weight = 0.063119927862939587D;
//
// xrTableCell9
//
this.xrTableCell9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.FlsIstGesamt", "{0:0.00}")});
this.xrTableCell9.Name = "xrTableCell9";
this.xrTableCell9.Text = "xrTableCell9";
this.xrTableCell9.Weight = 0.063119927862939615D;
//
// xrTableCell10
//
this.xrTableCell10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.FlsDiffGesamt", "{0:0.00}")});
this.xrTableCell10.Name = "xrTableCell10";
this.xrTableCell10.Text = "xrTableCell10";
this.xrTableCell10.Weight = 0.063119927862939587D;
//
// xrTableCell11
//
this.xrTableCell11.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.StundenGesamt", "{0:0.00}")});
this.xrTableCell11.Name = "xrTableCell11";
this.xrTableCell11.Text = "xrTableCell11";
this.xrTableCell11.Weight = 0.063119927862939573D;
//
// xrTableCell12
//
this.xrTableCell12.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.RelationFlsZuMittelbar", "{0:0.00}")});
this.xrTableCell12.Name = "xrTableCell12";
this.xrTableCell12.Text = "xrTableCell12";
this.xrTableCell12.Weight = 0.0631199278629396D;
//
// xrTableCell13
//
this.xrTableCell13.Name = "xrTableCell13";
this.xrTableCell13.Weight = 0.063119927862939587D;
//
// xrTableCell14
//
this.xrTableCell14.Name = "xrTableCell14";
this.xrTableCell14.Weight = 0.063119927862939587D;
//
// xrTableCell15
//
this.xrTableCell15.Name = "xrTableCell15";
this.xrTableCell15.Weight = 0.063119927862939573D;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoRO);
//
// ReportFooter1
//
this.ReportFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTable1});
this.ReportFooter1.HeightF = 60F;
this.ReportFooter1.Name = "ReportFooter1";
//
// Teamstundenkonto
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
this.Detail,
this.ReportHeader,
this.pageFooterBand1,
this.topMarginBand1,
this.bottomMarginBand1,
this.DetailReport1,
this.ReportFooter1});
this.CalculatedFields.AddRange(new DevExpress.XtraReports.UI.CalculatedField[] {
this.fieldFLS});
this.DataSource = this.bindingSource1;
this.Landscape = true;
this.Margins = new System.Drawing.Printing.Margins(75, 75, 50, 30);
this.PageHeight = 827;
this.PageWidth = 1169;
this.PaperKind = System.Drawing.Printing.PaperKind.A4;
this.StyleSheet.AddRange(new DevExpress.XtraReports.UI.XRControlStyle[] {
this.Title,
this.FieldCaption,
this.PageInfo,
this.DataField});
this.Version = "17.1";
((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}
#endregion
private DevExpress.XtraReports.UI.DetailBand Detail;
private System.Windows.Forms.BindingSource bindingSource1;
private DevExpress.XtraReports.UI.ReportHeaderBand ReportHeader;
private DevExpress.XtraReports.UI.XRLabel lblMonat;
private DevExpress.XtraReports.UI.PageFooterBand pageFooterBand1;
private DevExpress.XtraReports.UI.XRPageInfo xrPageInfo2;
private DevExpress.XtraReports.UI.XRPageInfo xrPageInfo1;
private DevExpress.XtraReports.UI.XRControlStyle Title;
private DevExpress.XtraReports.UI.XRControlStyle FieldCaption;
private DevExpress.XtraReports.UI.XRControlStyle PageInfo;
private DevExpress.XtraReports.UI.XRControlStyle DataField;
private DevExpress.XtraReports.UI.XRTable xrTableDetail;
private DevExpress.XtraReports.UI.XRTableRow xrTableRowDetail;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell3;
private DevExpress.XtraReports.UI.CalculatedField fieldFLS;
private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1;
private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell19;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell20;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell28;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell16;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell27;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell22;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell23;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell21;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell25;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell24;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell26;
private DevExpress.XtraReports.UI.XRTable xrTable1;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow1;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell35;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell37;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell38;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell39;
private DevExpress.XtraReports.UI.XRTableCell cellSollGesamt;
private DevExpress.XtraReports.UI.XRTableCell cellFLSSollGesamt;
private DevExpress.XtraReports.UI.XRTableCell cellFLSIstGesamt;
private DevExpress.XtraReports.UI.XRTableCell cellFLSPlusMinusGesamt;
private DevExpress.XtraReports.UI.XRTableCell cellGesamtGesamt;
private DevExpress.XtraReports.UI.XRTableCell cellRelationGesamt;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell47;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell48;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell51;
private DevExpress.XtraReports.UI.DetailReportBand DetailReport1;
private DevExpress.XtraReports.UI.DetailBand Detail2;
private DevExpress.XtraReports.UI.XRLabel xrLabel1;
private DevExpress.XtraReports.UI.DetailReportBand DetailReport2;
private DevExpress.XtraReports.UI.DetailBand Detail3;
private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader2;
private DevExpress.XtraReports.UI.XRTable xrTable2;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow2;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell6;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell18;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell30;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell31;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell32;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell33;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell34;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell36;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell40;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell41;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell42;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell43;
private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter2;
private DevExpress.XtraReports.UI.XRTable xrTable3;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow3;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell1;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell7;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell8;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell9;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell10;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell11;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell12;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell13;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell14;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell15;
private DevExpress.XtraReports.UI.ReportFooterBand ReportFooter1;
}
}

View File

@@ -0,0 +1,123 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="bindingSource1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 14</value>
</metadata>
</root>

View File

@@ -11,6 +11,7 @@ using BS.Shared.Core;
using BS.Shared.DataContracts; using BS.Shared.DataContracts;
using BS.Shared.Extensions; using BS.Shared.Extensions;
using BS.Shared.Services; using BS.Shared.Services;
using BS.Shared.Translation;
using Utils = BS.Shared.Core.Utils; using Utils = BS.Shared.Core.Utils;
namespace BeWo.Service.Plugins namespace BeWo.Service.Plugins
@@ -44,18 +45,18 @@ namespace BeWo.Service.Plugins
"Nachname", // 0 "Nachname", // 0
"Vorname", // 1 "Vorname", // 1
"Kommentar", // 2 "Kommentar", // 2
"Hilfeplankonferenz", // 3 Translator.Translate("Hilfeplankonferenz"), // 3
"Kostenträger", // 4 Translator.Translate("Kostenträger"), // 4
"Aktenzeichen", // 5 "Aktenzeichen", // 5
"beantragt von", // 6 "beantragt von", // 6
"beantragt bis", // 7 "beantragt bis", // 7
"bewilligt von", // 8 "bewilligt von", // 8
"bewilligt bis", // 9 "bewilligt bis", // 9
"Verlängerung beantragt am", // 10 "Verlängerung beantragt am", // 10
"gen. FLS/Woche", // 11 Translator.Translate("gen. FLS/Woche"), // 11
"gen. FLS Gesamt", // 12 Translator.Translate("gen. FLS Gesamt"), // 12
"Stundensatz", // 13 "Stundensatz", // 13
"Kostenträger Notiz", // 14 Translator.Translate("Kostenträger Notiz"), // 14
"BetreuerIn", // 15 "BetreuerIn", // 15
"Betreuung beendet am" // 16 "Betreuung beendet am" // 16
}; };

View File

@@ -13,6 +13,9 @@ namespace BeWo.Service.Plugins
//do nothing //do nothing
} }
public virtual bool AllowSaveCustomer(CustomerDC c)
} {
return true;
}
}
} }

View File

@@ -0,0 +1,39 @@
using System;
using System.Collections.Generic;
using System.Linq;
using BeWo.Data.Access;
using BeWo.Data.Entities;
using BeWo.Service.DCEntityMapper;
using BS.Shared;
using BS.Shared.Core;
using BS.Shared.DataContracts.Compact;
using BS.Shared.Extensions;
namespace BeWo.Service.Plugins
{
public class TranslationDictionary : AbstractIDSpecificDefaultClass<TranslationDictionary>
{
public virtual Dictionary<String, String> GetTranslationDictionary()
{
var dict = new Dictionary<String, String>();
AddOrReplaceTranslation(dict, "MitarbeiterSingular", "Mitarbeiter");
AddOrReplaceTranslation(dict, "MitarbeiterPlural", "Mitarbeiter");
return dict;
}
public virtual void AddOrReplaceTranslation(Dictionary<String, String> dict, String text, String translation)
{
if (dict.ContainsKey(text))
{
dict.Remove(text);
}
dict.Add(text, translation);
}
}
}

View File

@@ -327,6 +327,7 @@
<Compile Include="Plugins\SupportConceptAnalysisCreator.cs" /> <Compile Include="Plugins\SupportConceptAnalysisCreator.cs" />
<Compile Include="Plugins\UiElementFactory.cs" /> <Compile Include="Plugins\UiElementFactory.cs" />
<Compile Include="Plugins\PluginLoader.cs" /> <Compile Include="Plugins\PluginLoader.cs" />
<Compile Include="Plugins\TranslationDictionary.cs" />
<Compile Include="Plugins\VacationService.cs" /> <Compile Include="Plugins\VacationService.cs" />
<Compile Include="Reporting\AnnualReportFactory.cs" /> <Compile Include="Reporting\AnnualReportFactory.cs" />
<Compile Include="SBD\Vertretung\VertretungsAlgorithmus.cs" /> <Compile Include="SBD\Vertretung\VertretungsAlgorithmus.cs" />

View File

@@ -707,5 +707,9 @@ namespace BeWo.Service.ServiceContracts
[FaultContract(typeof(BeWoFault))] [FaultContract(typeof(BeWoFault))]
[OperationContract] [OperationContract]
bool DeletCustomerChatCode(string apikey, string kundennummer, long userOid); bool DeletCustomerChatCode(string apikey, string kundennummer, long userOid);
[FaultContract(typeof(BeWoFault))]
[OperationContract]
Dictionary<string, string> GetTranslationDictionary();
} }
} }

View File

@@ -861,9 +861,20 @@ namespace BeWo.Service.ServiceImplementations
public long InsertNewCustomer(CustomerDC pCustomerDC) public long InsertNewCustomer(CustomerDC pCustomerDC)
{ {
try var bsi = PluginLoader.FindClass<SaveInterceptor>();
if (bsi != null)
{
if (!bsi.AllowSaveCustomer(pCustomerDC))
{
throw new FaultException<BeWoFault>(new BeWoFault("Klient konnte nicht gespeichert werden.", BeWoFaultType.CustomWithoutDetails));
}
}
try
{ {
Customer lCustomer = MapperFactory.CustomerDC_Customer.MapToNewEntity(pCustomerDC);
Customer lCustomer = MapperFactory.CustomerDC_Customer.MapToNewEntity(pCustomerDC);
DAOFactory.GenericDAO.Insert(lCustomer); DAOFactory.GenericDAO.Insert(lCustomer);
var lOriginal = DAOFactory.GenericDAO.LoadByID<Customer>(lCustomer.Oid.Value); var lOriginal = DAOFactory.GenericDAO.LoadByID<Customer>(lCustomer.Oid.Value);
@@ -1075,9 +1086,20 @@ namespace BeWo.Service.ServiceImplementations
public long UpdateCustomer(CustomerDC pCustomerDC) public long UpdateCustomer(CustomerDC pCustomerDC)
{ {
try var bsi = PluginLoader.FindClass<SaveInterceptor>();
if (bsi != null)
{
if (!bsi.AllowSaveCustomer(pCustomerDC))
{
throw new FaultException<BeWoFault>(new BeWoFault("Klient konnte nicht gespeichert werden.", BeWoFaultType.CustomWithoutDetails));
}
}
try
{ {
var lOriginal = DAOFactory.GenericDAO.LoadByID<Customer>(pCustomerDC.CustomerOid.Value);
var lOriginal = DAOFactory.GenericDAO.LoadByID<Customer>(pCustomerDC.CustomerOid.Value);
object[] Lists = GetFromNHibernateDecoupledCustomerRelatedLists(lOriginal); object[] Lists = GetFromNHibernateDecoupledCustomerRelatedLists(lOriginal);
@@ -3692,24 +3714,24 @@ namespace BeWo.Service.ServiceImplementations
{ {
foreach (var appcode in cusappcode) foreach (var appcode in cusappcode)
{ {
if (!benutzerName.Equals("") && appcode.BenutzerName != null && //if (!benutzerName.Equals("") && appcode.BenutzerName != null &&
!appcode.BenutzerName.Equals(benutzerName)) // !appcode.BenutzerName.Equals(benutzerName))
{ //{
appcode.BenutzerName = benutzerName; appcode.BenutzerName = benutzerName;
} //}
if (!passwort.Equals("") && appcode.Passwort != null && !appcode.Passwort.Equals(passwort)) //if (!passwort.Equals("") && appcode.Passwort != null && !appcode.Passwort.Equals(passwort))
{ //{
appcode.Passwort = passwort; appcode.Passwort = passwort;
string salt = BCrypt.GenerateSalt(); string salt = BCrypt.GenerateSalt();
appcode.BCryptPassword = BCrypt.HashPassword(passwort, salt); appcode.BCryptPassword = BCrypt.HashPassword(passwort, salt);
} //}
} }
if (!benutzerName.Equals("") || !passwort.Equals("")) { //if (!benutzerName.Equals("") || !passwort.Equals("")) {
DAOFactory.GenericDAO.Update(cusappcode); DAOFactory.GenericDAO.Update(cusappcode);
} //}
} }
else else
{ {
@@ -3719,13 +3741,17 @@ namespace BeWo.Service.ServiceImplementations
cusApp.Benutzername = benutzerName; cusApp.Benutzername = benutzerName;
cusApp.Passwort = passwort; cusApp.Passwort = passwort;
cusApp.CustomerOid = pCustomerOid; cusApp.CustomerOid = pCustomerOid;
var yx = MapperFactory.CustomerAPPCodeDC_CustomerAPPCode.MapToNewEntity(cusApp); var yx = MapperFactory.CustomerAPPCodeDC_CustomerAPPCode.MapToNewEntity(cusApp);
//if (!benutzerName.Equals("") || !passwort.Equals(""))
//{
string salt = BCrypt.GenerateSalt();
yx.BCryptPassword = BCrypt.HashPassword(passwort, salt);
if (!benutzerName.Equals("") || !passwort.Equals(""))
{
DAOFactory.GenericDAO.Insert(yx); DAOFactory.GenericDAO.Insert(yx);
} //}
} }
} }

View File

@@ -3256,34 +3256,46 @@ namespace BeWo.Service.ServiceImplementations
{ {
try try
{ {
#if DEBUG
kundennummer = "5473568546";
apikey = "0b50c09aff87f20d9ced75340e04e5ccaa11dd3e7bcf25e9c4f94dc20d3cbb97";
#endif
//TODO Abfragen erweitern //TODO Abfragen erweitern
DeletZufallsCode(apikey, kundennummer, "C" + userOid); DeletZufallsCode(apikey, kundennummer, "C" + userOid);
CustomerAPPCode newCode = new CustomerAPPCode();
//abfangeritis starten //abfangeritis starten
string zufallscode = ErzeugeZufallsCode(apikey, kundennummer, "C" + userOid); string zufallscode = ErzeugeZufallsCode(apikey, kundennummer, "C" + userOid);
if (zufallscode != null) if (zufallscode != null)
{ {
newCode.CustomerCode = zufallscode; //bei C noch die UserID mitgeben var appcodes = DAOFactory.SearchDAO.FindAllCustomerAppCodes(customerOid).ToList();
newCode.CustomerOid = customerOid; CustomerAPPCode newCode = null;
newCode.CustomerCodeGenDate = DateTime.Now; if (appcodes.Count > 0)
var x = DAOFactory.SearchDAO.FindAllCustomerAppCodes(customerOid);
int ischatAktive = 0;
foreach (var item in x)
{ {
ischatAktive = item.IsChatAktiv; newCode = appcodes[0];
break;
} }
else
{
newCode = new CustomerAPPCode();
//var code = x.Last().CustomerCode; newCode.CustomerCode = zufallscode; //bei C noch die UserID mitgeben
newCode.CustomerOid = customerOid;
}
newCode.CustomerCodeGenDate = DateTime.Now;
newCode.IsChatAktiv = 1;
//int ischatAktive = 0;
newCode.IsChatAktiv = ischatAktive; //foreach (var item in x)
//{
// ischatAktive = item.IsChatAktiv;
// break;
//}
//newCode.IsChatAktiv = ischatAktive;
DAOFactory.GenericDAO.Insert(newCode); DAOFactory.GenericDAO.Insert(newCode);
@@ -4770,6 +4782,17 @@ namespace BeWo.Service.ServiceImplementations
} }
} }
public Dictionary<String, String> GetTranslationDictionary()
{
var td = PluginLoader.FindClass<TranslationDictionary>();
if (td != null)
{
return td.GetTranslationDictionary();
}
return null;
}
#endregion #endregion
} }
} }

View File

@@ -2,6 +2,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using BS.Shared.Extensions; using BS.Shared.Extensions;
using BS.Shared.Translation;
namespace BS.Shared.Core namespace BS.Shared.Core
{ {
@@ -56,544 +57,544 @@ namespace BS.Shared.Core
UserRightType2Translations = new Dictionary<UserRightType, String> UserRightType2Translations = new Dictionary<UserRightType, String>
{ {
{ {
UserRightType.AccountingTransactionView_Create, "Finanzen anlegen" UserRightType.AccountingTransactionView_Create, Translator.Translate("Finanzen anlegen")
}, },
{ {
UserRightType.AccountingTransactionView_Delete, "Finanzen löschen" UserRightType.AccountingTransactionView_Delete, Translator.Translate("Finanzen löschen")
}, },
{ {
UserRightType.AccountingTransactionView_Edit, "Finanzen ändern" UserRightType.AccountingTransactionView_Edit, Translator.Translate("Finanzen ändern")
}, },
{ {
UserRightType.AccountingTransactionView_View, "Finanzen ansehen" UserRightType.AccountingTransactionView_View, Translator.Translate("Finanzen ansehen")
}, },
{ {
UserRightType.AdministrationView_Create, "Verwaltung anlegen" UserRightType.AdministrationView_Create, Translator.Translate("Verwaltung anlegen")
}, },
{ {
UserRightType.AdministrationView_Delete, "Verwaltung löschen" UserRightType.AdministrationView_Delete, Translator.Translate("Verwaltung löschen")
}, },
{ {
UserRightType.AdministrationView_Edit, "Verwaltung ändern" UserRightType.AdministrationView_Edit, Translator.Translate("Verwaltung ändern")
}, },
{ {
UserRightType.AdministrationView_View, "Verwaltung ansehen" UserRightType.AdministrationView_View, Translator.Translate("Verwaltung ansehen")
}, },
{ {
UserRightType.CustomerView_Create, "Klienten anlegen" UserRightType.CustomerView_Create, Translator.Translate("Klienten anlegen")
}, },
{ {
UserRightType.CustomerView_Delete, "Klienten löschen" UserRightType.CustomerView_Delete, Translator.Translate("Klienten löschen")
}, },
{ {
UserRightType.Customer_AllowArchiving, "Klienten archivieren" UserRightType.Customer_AllowArchiving, Translator.Translate("Klienten archivieren")
}, },
{ {
UserRightType.CustomerView_Edit, "Klienten ändern" UserRightType.CustomerView_Edit, Translator.Translate("Klienten ändern")
}, },
{ {
UserRightType.CustomerView_View, "Klienten ansehen (alle)" UserRightType.CustomerView_View, Translator.Translate("Klienten ansehen (alle)")
}, },
{ {
UserRightType.Customer_ViewMyCustomers, "Klienten ansehen (Nur vom Mitarbeiter betreute)" UserRightType.Customer_ViewMyCustomers, Translator.Translate("Klienten ansehen (Nur vom Mitarbeiter betreute)")
}, },
{ {
UserRightType.DeleteAll, "Alles löschen" UserRightType.DeleteAll, Translator.Translate("Alles löschen")
}, },
{ {
UserRightType.EmployeeView_Create, "Mitarbeiter anlegen" UserRightType.EmployeeView_Create, Translator.Translate("Mitarbeiter anlegen")
}, },
{ {
UserRightType.EmployeeView_Delete, "Mitarbeiter löschen" UserRightType.EmployeeView_Delete, Translator.Translate("Mitarbeiter löschen")
}, },
{ {
UserRightType.WohnheimView_Create, "Wohnheime anlegen" UserRightType.WohnheimView_Create, Translator.Translate("Wohnheime anlegen")
}, },
{ {
UserRightType.WohnheimView_Delete, "Wohnheime löschen" UserRightType.WohnheimView_Delete, Translator.Translate("Wohnheime löschen")
}, },
{ {
UserRightType.WohnheimView_Edit, "Wohnheime bearbeiten" UserRightType.WohnheimView_Edit, Translator.Translate("Wohnheime bearbeiten")
}, },
{ {
UserRightType.WohnheimView_View, "Wohnheime ansehen" UserRightType.WohnheimView_View, Translator.Translate("Wohnheime ansehen")
}, },
{ {
UserRightType.Wohnheim_AllowArchiving, "Wohnheime archivieren" UserRightType.Wohnheim_AllowArchiving, Translator.Translate("Wohnheime archivieren")
}, },
{ {
UserRightType.EmployeeView_Edit, "Mitarbeiter ändern (alle)" UserRightType.EmployeeView_Edit, Translator.Translate("Mitarbeiter ändern (alle)")
}, },
{ {
UserRightType.EmployeeView_View, "Mitarbeiter ansehen (alle)" UserRightType.EmployeeView_View, Translator.Translate("Mitarbeiter ansehen (alle)")
}, },
{ {
UserRightType.Employee_ShowFinance, "Mitarbeiter alle Daten bearbeiten" UserRightType.Employee_ShowFinance, Translator.Translate("Mitarbeiter alle Daten bearbeiten")
}, },
{ {
UserRightType.Employee_AllowEditExtendedProperties, "Mitarbeiter erweiterte Felder bearbeiten" UserRightType.Employee_AllowEditExtendedProperties, Translator.Translate("Mitarbeiter erweiterte Felder bearbeiten")
}, },
{ {
UserRightType.Employee_AllowEditContracts, "Mitarbeiter Verträge bearbeiten" UserRightType.Employee_AllowEditContracts, Translator.Translate("Mitarbeiter Verträge bearbeiten")
}, },
{ {
UserRightType.Employee_AllowEditOwnEmployees, "Mitarbeiter ändern (Eigenen) " UserRightType.Employee_AllowEditOwnEmployees, Translator.Translate("Mitarbeiter ändern (Eigenen)")
}, },
{ {
UserRightType.Employee_AllowViewOwnEmployees, "Mitarbeiter ansehen (Eigenen) " UserRightType.Employee_AllowViewOwnEmployees, Translator.Translate("Mitarbeiter ansehen (Eigenen)")
}, },
{ {
UserRightType.Employee_AllowViewOwnTeam, "Mitarbeiter des Teams ansehen" UserRightType.Employee_AllowViewOwnTeam, Translator.Translate("Mitarbeiter des Teams ansehen")
}, },
{ {
UserRightType.OrganisationView_Create, "Organisationen anlegen" UserRightType.OrganisationView_Create, Translator.Translate("Organisationen anlegen")
}, },
{ {
UserRightType.OrganisationView_Delete, "Organisationen löschen" UserRightType.OrganisationView_Delete, Translator.Translate("Organisationen löschen")
}, },
{ {
UserRightType.OrganisationView_Edit, "Organisationen ändern" UserRightType.OrganisationView_Edit, Translator.Translate("Organisationen ändern")
}, },
{ {
UserRightType.OrganisationView_View, "Organisationen ansehen" UserRightType.OrganisationView_View, Translator.Translate("Organisationen ansehen")
}, },
{ {
UserRightType.Organisation_AllowArchiving, "Organisationen archivieren" UserRightType.Organisation_AllowArchiving, Translator.Translate("Organisationen archivieren")
}, },
{ {
UserRightType.OrganisationView_AllowEditCostBearer, "Organisationen Kostenträgerdetails bearbeiten" UserRightType.OrganisationView_AllowEditCostBearer, Translator.Translate("Organisationen Kostenträgerdetails bearbeiten")
}, },
{ {
UserRightType.PersonView_Create, "Personen anlegen" UserRightType.PersonView_Create, Translator.Translate("Personen anlegen")
}, },
{ {
UserRightType.PersonView_Delete, "Personen löschen" UserRightType.PersonView_Delete, Translator.Translate("Personen löschen")
}, },
{ {
UserRightType.Person_AllowArchiving, "Personen archivieren" UserRightType.Person_AllowArchiving, Translator.Translate("Personen archivieren")
}, },
{ {
UserRightType.PersonView_Edit, "Personen ändern" UserRightType.PersonView_Edit, Translator.Translate("Personen ändern")
}, },
{ {
UserRightType.PersonView_View, "Personen ansehen" UserRightType.PersonView_View, Translator.Translate("Personen ansehen")
}, },
{ {
UserRightType.GroupOfPeopleView_Edit, "Gruppen bearbeiten" UserRightType.GroupOfPeopleView_Edit, Translator.Translate("Gruppen bearbeiten")
}, },
{ {
UserRightType.GroupOfPeopleView_Create, "Gruppen anlegen" UserRightType.GroupOfPeopleView_Create, Translator.Translate("Gruppen anlegen")
}, },
{ {
UserRightType.GroupOfPeopleView_Delete, "Gruppen löschen" UserRightType.GroupOfPeopleView_Delete, Translator.Translate("Gruppen löschen")
}, },
{ {
UserRightType.AdditionalService_View, "Ergänzende Dienste" UserRightType.AdditionalService_View, Translator.Translate("Ergänzende Dienste")
}, },
{ {
UserRightType.OvertimeView, "Überstundenverwaltung" UserRightType.OvertimeView, Translator.Translate("Überstundenverwaltung")
}, },
{ {
UserRightType.QueryView_Create, "Auswertungen anlegen" UserRightType.QueryView_Create, Translator.Translate("Auswertungen anlegen")
}, },
{ {
UserRightType.QueryView_Delete, "Auswertungen löschen" UserRightType.QueryView_Delete, Translator.Translate("Auswertungen löschen")
}, },
{ {
UserRightType.QueryView_Edit, "Auswertungen ändern" UserRightType.QueryView_Edit, Translator.Translate("Auswertungen ändern")
}, },
{ {
UserRightType.QueryView_View, "Auswertungen ansehen" UserRightType.QueryView_View, Translator.Translate("Auswertungen ansehen")
}, },
{ {
UserRightType.Analysis_Settlement_View, "Auswertungen Spitzabrechnung erstellen" UserRightType.Analysis_Settlement_View, Translator.Translate("Auswertungen Spitzabrechnung erstellen")
}, },
{ {
UserRightType.Analysis_EmployeeOverviewAll_View, "Auswertungen für alle Mitarbeiter erstellen" UserRightType.Analysis_EmployeeOverviewAll_View, Translator.Translate("Auswertungen für alle Mitarbeiter erstellen")
}, },
{ {
UserRightType.Analysis_ServiceOverview_View, "Auswertungen Quittierungsbelege erstellen" UserRightType.Analysis_ServiceOverview_View, Translator.Translate("Auswertungen Quittierungsbelege erstellen")
}, },
{ {
UserRightType.Analysis_SupportConceptOverviewAll_View, "Auswertungen für alle Hilfepläne erstellen" UserRightType.Analysis_SupportConceptOverviewAll_View, Translator.Translate("Auswertungen für alle Hilfepläne erstellen")
}, },
{ {
UserRightType.Analysis_AllowFLSOverviewForCostbearer, "Auswertungen für Kostenträger erstellen" UserRightType.Analysis_AllowFLSOverviewForCostbearer, Translator.Translate("Auswertungen für Kostenträger erstellen")
}, },
{ {
UserRightType.Analysis_AllowFLSOverviewForTeam, "Auswertungen für eigenes Team erstellen" UserRightType.Analysis_AllowFLSOverviewForTeam, Translator.Translate("Auswertungen für eigenes Team erstellen")
}, },
{ {
UserRightType.Analysis_AllowFLSOverviewForAllTeams, "Auswertungen für alle Teams erstellen" UserRightType.Analysis_AllowFLSOverviewForAllTeams, Translator.Translate("Auswertungen für alle Teams erstellen")
}, },
{ {
UserRightType.Analysis_Auslastung_View, "Auswertung Mitarbeiterauslastung erstellen" UserRightType.Analysis_Auslastung_View, Translator.Translate("Auswertung Mitarbeiterauslastung erstellen")
}, },
{ {
UserRightType.Analysis_AuslastungAllEmployee_View, "Auswertung Mitarbeiterauslastung für alle Mitarbeiter erstellen" UserRightType.Analysis_AuslastungAllEmployee_View, Translator.Translate("Auswertung Mitarbeiterauslastung für alle Mitarbeiter erstellen")
}, },
{ {
UserRightType.Analysis_AuslastungTeam_View, "Auswertung Mitarbeiterauslastung für alle Teams erstellen" UserRightType.Analysis_AuslastungTeam_View, Translator.Translate("Auswertung Mitarbeiterauslastung für alle Teams erstellen")
}, },
{ {
UserRightType.ResourceBookingView_Create, "Ressourcen anlegen" UserRightType.ResourceBookingView_Create, Translator.Translate("Ressourcen anlegen")
}, },
{ {
UserRightType.ResourceBookingView_Delete, "Ressourcen löschen" UserRightType.ResourceBookingView_Delete, Translator.Translate("Ressourcen löschen")
}, },
{ {
UserRightType.ResourceBookingView_Edit, "Ressourcen ändern" UserRightType.ResourceBookingView_Edit, Translator.Translate("Ressourcen ändern")
}, },
{ {
UserRightType.ResourceBookingView_View, "Ressourcen ansehen" UserRightType.ResourceBookingView_View, Translator.Translate("Ressourcen ansehen")
}, },
{ {
UserRightType.ResourceBookingView_AllowEditResourcesFromOtherEmployees, "Ressourcen anderer Mitarbeiter ändern" UserRightType.ResourceBookingView_AllowEditResourcesFromOtherEmployees, Translator.Translate("Ressourcen anderer Mitarbeiter ändern")
}, },
{ {
UserRightType.CreateAll, "Alles anlegen" UserRightType.CreateAll, Translator.Translate("Alles anlegen")
}, },
{ {
UserRightType.ServiceRecordView_Create, "Zeiterfassung anlegen" UserRightType.ServiceRecordView_Create, Translator.Translate("Zeiterfassung anlegen")
}, },
{ {
UserRightType.ServiceRecordView_Delete, "Zeiterfassung löschen" UserRightType.ServiceRecordView_Delete, Translator.Translate("Zeiterfassung löschen")
}, },
{ {
UserRightType.ServiceRecordView_Edit, "Zeiterfassung ändern" UserRightType.ServiceRecordView_Edit, Translator.Translate("Zeiterfassung ändern")
}, },
{ {
UserRightType.ServiceRecordView_View, "Zeiterfassung ansehen" UserRightType.ServiceRecordView_View, Translator.Translate("Zeiterfassung ansehen")
}, },
{ {
UserRightType.AssessmentSheet_Create, "Punktebogen anlegen" UserRightType.AssessmentSheet_Create, Translator.Translate("Punktebogen anlegen")
}, },
{ {
UserRightType.AssessmentSheet_Delete, "Punktebogen löschen" UserRightType.AssessmentSheet_Delete, Translator.Translate("Punktebogen löschen")
}, },
{ {
UserRightType.AssessmentSheet_Edit, "Punktebogen ändern" UserRightType.AssessmentSheet_Edit, Translator.Translate("Punktebogen ändern")
}, },
{ {
UserRightType.AssessmentSheet_View, "Punktebogen ansehen" UserRightType.AssessmentSheet_View, Translator.Translate("Punktebogen ansehen")
}, },
{ {
UserRightType.ServiceRecord_AllowChangeWithin24Hours, "Zeiterfassung innerhalb von 24 Stunden ändern" UserRightType.ServiceRecord_AllowChangeWithin24Hours, Translator.Translate("Zeiterfassung innerhalb von 24 Stunden ändern")
}, },
{ {
UserRightType.ServiceRecord_AllowCreateServiceRecordsForAllClients, "Zeiterfassung für alle Klienten anlegen" UserRightType.ServiceRecord_AllowCreateServiceRecordsForAllClients, Translator.Translate("Zeiterfassung für alle Klienten anlegen")
}, },
{ {
UserRightType.ServiceRecord_AllowCreationForOtherEmployees, "Zeiterfassung für andere Mitarbeiter anlegen" UserRightType.ServiceRecord_AllowCreationForOtherEmployees, Translator.Translate("Zeiterfassung für andere Mitarbeiter anlegen")
}, },
{ {
UserRightType.ServiceRecord_AllowEditForOtherEmployees, "Zeiterfassung für andere Mitarbeiter ändern" UserRightType.ServiceRecord_AllowEditForOtherEmployees, Translator.Translate("Zeiterfassung für andere Mitarbeiter ändern")
}, },
{ {
UserRightType.ServiceRecord_AllowCreationForOtherTeamMember, "Zeiterfassung für andere Team-Mitglieder anlegen" UserRightType.ServiceRecord_AllowCreationForOtherTeamMember, Translator.Translate("Zeiterfassung für andere Team-Mitglieder anlegen")
}, },
{ {
UserRightType.ServiceRecord_AllowEditAfterMaxDaysInNextMonth, "Zeiterfassung nach Ablauf der Frist im Folgemonat ändern" UserRightType.ServiceRecord_AllowEditAfterMaxDaysInNextMonth, Translator.Translate("Zeiterfassung nach Ablauf der Frist im Folgemonat ändern")
}, },
{ {
UserRightType.ServiceRecord_AllowCreateMoreFLSThanApproved, "Zeiterfassung nach Erreichen der genehmigten FLS anlegen" UserRightType.ServiceRecord_AllowCreateMoreFLSThanApproved, Translator.Translate("Zeiterfassung nach Erreichen der genehmigten FLS anlegen")
}, },
{ {
UserRightType.ServiceRecord_ShowHistory, "Zeiterfassung Änderungshistorie anzeigen" UserRightType.ServiceRecord_ShowHistory, Translator.Translate("Zeiterfassung Änderungshistorie anzeigen")
}, },
{ {
UserRightType.ServiceRecord_AllowCreateOverlappingFLS, "Zeiterfassung bei Überschneidung mit anderen Einträgen eines Klienten anlegen" UserRightType.ServiceRecord_AllowCreateOverlappingFLS, Translator.Translate("Zeiterfassung bei Überschneidung mit anderen Einträgen eines Klienten anlegen")
}, },
{ {
UserRightType.ServiceRecord_AllowCreateOverlappingFLSForEmployee, "Zeiterfassung bei Überschneidung mit anderen Einträgen eines Mitarbeiters anlegen" UserRightType.ServiceRecord_AllowCreateOverlappingFLSForEmployee, Translator.Translate("Zeiterfassung bei Überschneidung mit anderen Einträgen eines Mitarbeiters anlegen")
}, },
{ {
UserRightType.ServiceRecord_AllowCreatingGroupBooking, "Zeiterfassung Gruppenbuchung anlegen" UserRightType.ServiceRecord_AllowCreatingGroupBooking, Translator.Translate("Zeiterfassung Gruppenbuchung anlegen")
}, },
{ {
UserRightType.ServiceRecord_AllowCreatingMultiBooking, "Zeiterfassung Mehrfachbuchung anlegen" UserRightType.ServiceRecord_AllowCreatingMultiBooking, Translator.Translate("Zeiterfassung Mehrfachbuchung anlegen")
}, },
{ {
UserRightType.SupportConceptView_Create, "Hilfepläne anlegen" UserRightType.SupportConceptView_Create, Translator.Translate("Hilfepläne anlegen")
}, },
{ {
UserRightType.SupportConceptView_Delete, "Hilfepläne löschen" UserRightType.SupportConceptView_Delete, Translator.Translate("Hilfepläne löschen")
}, },
{ {
UserRightType.SupportConceptView_AllowArchiving, "Hilfepläne archivieren" UserRightType.SupportConceptView_AllowArchiving, Translator.Translate("Hilfepläne archivieren")
}, },
{ {
UserRightType.SupportConceptView_Edit, "Hilfepläne ändern" UserRightType.SupportConceptView_Edit, Translator.Translate("Hilfepläne ändern")
}, },
{ {
UserRightType.SupportConceptView_View, "Hilfepläne von betreuten Klienten ansehen" UserRightType.SupportConceptView_View, Translator.Translate("Hilfepläne von betreuten Klienten ansehen")
}, },
{ {
UserRightType.SupportConcept_AllowEditGoals, "Hilfepläne Ziele bearbeiten" UserRightType.SupportConcept_AllowEditGoals, Translator.Translate("Hilfepläne Ziele bearbeiten")
}, },
{ {
UserRightType.SupportConcept_AllowEditTasks, "Hilfepläne Aufgaben bearbeiten" UserRightType.SupportConcept_AllowEditTasks, Translator.Translate("Hilfepläne Aufgaben bearbeiten")
}, },
{ {
UserRightType.SupportConcept_ViewAllSupportConcepts, "Hilfepläne ansehen (alle)" UserRightType.SupportConcept_ViewAllSupportConcepts, Translator.Translate("Hilfepläne ansehen (alle)")
}, },
{ {
UserRightType.SupportConcept_AllowGoalOrientedSupportConcepts, "Hilfepläne zielorientiert planen" UserRightType.SupportConcept_AllowGoalOrientedSupportConcepts, Translator.Translate("Hilfepläne zielorientiert planen")
}, },
{ {
UserRightType.TeamView_Create, "Teams anlegen" UserRightType.TeamView_Create, Translator.Translate("Teams anlegen")
}, },
{ {
UserRightType.TeamView_Delete, "Teams löschen" UserRightType.TeamView_Delete, Translator.Translate("Teams löschen")
}, },
{ {
UserRightType.TeamView_Edit, "Teams ändern" UserRightType.TeamView_Edit, Translator.Translate("Teams ändern")
}, },
{ {
UserRightType.TeamView_ViewAll, "Teams ansehen (alle)" UserRightType.TeamView_ViewAll, Translator.Translate("Teams ansehen (alle)")
}, },
{ {
UserRightType.TeamView_ViewMyTeams, "Teams ansehen (nur eigene)" UserRightType.TeamView_ViewMyTeams, Translator.Translate("Teams ansehen (nur eigene)")
}, },
{ {
UserRightType.EditAll, "Alles ändern" UserRightType.EditAll, Translator.Translate("Alles ändern")
}, },
{ {
UserRightType.UserGroupView_Create, "Benutzergruppen anlegen" UserRightType.UserGroupView_Create, Translator.Translate("Benutzergruppen anlegen")
}, },
{ {
UserRightType.UserGroupView_Delete, "Benutzergruppen löschen" UserRightType.UserGroupView_Delete, Translator.Translate("Benutzergruppen löschen")
}, },
{ {
UserRightType.UserGroupView_Edit, "Benutzergruppen ändern" UserRightType.UserGroupView_Edit, Translator.Translate("Benutzergruppen ändern")
}, },
{ {
UserRightType.UserGroupView_View, "Benutzergruppen ansehen" UserRightType.UserGroupView_View, Translator.Translate("Benutzergruppen ansehen")
}, },
{ {
UserRightType.UserView_Create, "Benutzer anlegen" UserRightType.UserView_Create, Translator.Translate("Benutzer anlegen")
}, },
{ {
UserRightType.UserView_Delete, "Benutzer löschen" UserRightType.UserView_Delete, Translator.Translate("Benutzer löschen")
}, },
{ {
UserRightType.UserView_Edit, "Benutzer ändern" UserRightType.UserView_Edit, Translator.Translate("Benutzer ändern")
}, },
{ {
UserRightType.UserView_View, "Benutzer ansehen" UserRightType.UserView_View, Translator.Translate("Benutzer ansehen")
}, },
{ {
UserRightType.UserView_AllowChangePassword, "Benutzerpasswort anderer Benutzer ändern" UserRightType.UserView_AllowChangePassword, Translator.Translate("Benutzerpasswort anderer Benutzer ändern")
}, },
{ {
UserRightType.AllowChangeOwnPassword, "Eigenes Passwort ändern" UserRightType.AllowChangeOwnPassword, Translator.Translate("Eigenes Passwort ändern")
}, },
{ {
UserRightType.ViewAll, "Alles ansehen" UserRightType.ViewAll, Translator.Translate("Alles ansehen")
}, },
{ {
UserRightType.BookServiceRecordAfterSettlementInvoice, "Zeiterfassung anlegen wenn bereits eine Spitzabrechnung erstellt wurde" UserRightType.BookServiceRecordAfterSettlementInvoice, Translator.Translate("Zeiterfassung anlegen wenn bereits eine Spitzabrechnung erstellt wurde")
}, },
{ {
UserRightType.BookServiceRecordOutOfSupportConcept, "Zeiterfassung außerhalb des Hilfeplanzeitraums anlegen" UserRightType.BookServiceRecordOutOfSupportConcept, Translator.Translate("Zeiterfassung außerhalb des Hilfeplanzeitraums anlegen")
}, },
{ {
UserRightType.Employee_AllowArchiving, "Mitarbeiter archivieren" UserRightType.Employee_AllowArchiving, Translator.Translate("Mitarbeiter archivieren")
}, },
{ {
UserRightType.User_AllowOrderLicense, "Neue Lizenzen bestellen" UserRightType.User_AllowOrderLicense, Translator.Translate("Neue Lizenzen bestellen")
}, },
{ {
UserRightType.Mitarbeiterstundenkonto_ViewAll, "Mitarbeiterstundenkonto (Gesamt)" UserRightType.Mitarbeiterstundenkonto_ViewAll, Translator.Translate("Mitarbeiterstundenkonto (Gesamt)")
}, },
{ {
UserRightType.Mitarbeiterstundenkonto_ViewSelf, "Mitarbeiterstundenkonto (nur eigenes Konto)" UserRightType.Mitarbeiterstundenkonto_ViewSelf, Translator.Translate("Mitarbeiterstundenkonto (nur eigenes Konto)")
}, },
{ {
UserRightType.Mitarbeiterstundenkonto_ViewTeams, "Mitarbeiterstundenkonto (nur Team)" UserRightType.Mitarbeiterstundenkonto_ViewTeams, Translator.Translate("Mitarbeiterstundenkonto (nur Team)")
}, },
{ {
UserRightType.Support_View, "Supportanfragen absenden" UserRightType.Support_View, Translator.Translate("Supportanfragen absenden")
}, },
{ {
UserRightType.KalenderAnsehen, "Kalender ansehen" UserRightType.KalenderAnsehen, Translator.Translate("Kalender ansehen")
}, },
{ {
UserRightType.KalenderMitarbeitertermineAnsehen, "Termine anderer Mitarbeiter ansehen" UserRightType.KalenderMitarbeitertermineAnsehen, Translator.Translate("Termine anderer Mitarbeiter ansehen")
}, },
{ {
UserRightType.KalenderMitarbeitertermineAnlegen, "Termine anderer Mitarbeiter anlegen" UserRightType.KalenderMitarbeitertermineAnlegen, Translator.Translate("Termine anderer Mitarbeiter anlegen")
}, },
{ {
UserRightType.KalenderMitarbeitertermineAendern, "Termine anderer Mitarbeiter ändern" UserRightType.KalenderMitarbeitertermineAendern, Translator.Translate("Termine anderer Mitarbeiter ändern")
}, },
{ {
UserRightType.KalenderKliententermineAlleAnsehen, "Termine aller Klienten ansehen" UserRightType.KalenderKliententermineAlleAnsehen, Translator.Translate("Termine aller Klienten ansehen")
}, },
{ {
UserRightType.KalenderKliententermineAnlegen, "Termine mit Klienten anlegen" UserRightType.KalenderKliententermineAnlegen, Translator.Translate("Termine mit Klienten anlegen")
}, },
{ {
UserRightType.KalenderKliententermineAendern, "Termine mit Klienten ändern" UserRightType.KalenderKliententermineAendern, Translator.Translate("Termine mit Klienten ändern")
}, },
{ {
UserRightType.KalenderRessourcentermineAnsehen, "Termine mit Ressourcen ansehen" UserRightType.KalenderRessourcentermineAnsehen, Translator.Translate("Termine mit Ressourcen ansehen")
}, },
{ {
UserRightType.KalenderRessourcentermineAnlegen, "Termine mit Ressourcen anlegen" UserRightType.KalenderRessourcentermineAnlegen, Translator.Translate("Termine mit Ressourcen anlegen")
}, },
{ {
UserRightType.KalenderRessourcentermineAendern, "Termine mit Ressourcen ändern" UserRightType.KalenderRessourcentermineAendern, Translator.Translate("Termine mit Ressourcen ändern")
}, },
{ {
UserRightType.KalenderRessourcentermineAndererAendern, "Termine mit Ressourcen anderer Mitarbeiter ändern" UserRightType.KalenderRessourcentermineAndererAendern, Translator.Translate("Termine mit Ressourcen anderer Mitarbeiter ändern")
}, },
{ {
UserRightType.KalenderInZeiterfassungUebernehmen, "Termine in Zeiterfassung übernehmen" UserRightType.KalenderInZeiterfassungUebernehmen, Translator.Translate("Termine in Zeiterfassung übernehmen")
}, },
{ {
UserRightType.TextbausteineAlleAnsehen, "Textbausteine ansehen (allgemeine)" UserRightType.TextbausteineAlleAnsehen, Translator.Translate("Textbausteine ansehen (allgemeine)")
}, },
{ {
UserRightType.TextbausteineNurEigeneAnsehen, "Textbausteine ansehen (eigene)" UserRightType.TextbausteineNurEigeneAnsehen, Translator.Translate("Textbausteine ansehen (eigene)")
}, },
{ {
UserRightType.TextbausteineAlleBearbeiten, "Textbausteine bearbeiten (allgemeine)" UserRightType.TextbausteineAlleBearbeiten, Translator.Translate("Textbausteine bearbeiten (allgemeine)")
}, },
{ {
UserRightType.TextbausteineNurEigeneBearbeiten, "Textbausteine bearbeiten (eigene)" UserRightType.TextbausteineNurEigeneBearbeiten, Translator.Translate("Textbausteine bearbeiten (eigene)")
}, },
//{ //{
// UserRightType.TextbausteineAlleAnlegen, "Textbausteine für alle Mitarbeiter anlegen" // UserRightType.TextbausteineAlleAnlegen, Translator.Translate("Textbausteine für alle Mitarbeiter anlegen")
// }, // },
//{ //{
// UserRightType.TextbausteineNurEigeneAnlegen, "Nur eigene Textbausteine anlegen" // UserRightType.TextbausteineNurEigeneAnlegen, Translator.Translate("Nur eigene Textbausteine anlegen")
// }, // },
{ {
UserRightType.BargeldverwaltungAnsehen, "Bargeldverwaltung aller Klienten ansehen" UserRightType.BargeldverwaltungAnsehen, Translator.Translate("Bargeldverwaltung aller Klienten ansehen")
}, },
{ {
UserRightType.BargeldverwaltungNurEigeneAnsehen, "Bargeldverwaltung der eigenen Klienten ansehen" UserRightType.BargeldverwaltungNurEigeneAnsehen, Translator.Translate("Bargeldverwaltung der eigenen Klienten ansehen")
}, },
{ {
UserRightType.BargeldverwaltungAnlegen, "Bargeldverwaltung anlegen" UserRightType.BargeldverwaltungAnlegen, Translator.Translate("Bargeldverwaltung anlegen")
}, },
{ {
UserRightType.BargeldverwaltungBearbeiten, "Bargeldverwaltung bearbeiten" UserRightType.BargeldverwaltungBearbeiten, Translator.Translate("Bargeldverwaltung bearbeiten")
}, },
{ {
UserRightType.BargeldverwaltungLoeschen, "Bargeldverwaltung löschen" UserRightType.BargeldverwaltungLoeschen, Translator.Translate("Bargeldverwaltung löschen")
}, },
{ {
UserRightType.SupportConceptAllowReactivation, "Hilfepläne reaktivieren" UserRightType.SupportConceptAllowReactivation, Translator.Translate("Hilfepläne reaktivieren")
}, },
{ {
UserRightType.CustomerAllowReactivation, "Klienten reaktivieren" UserRightType.CustomerAllowReactivation, Translator.Translate("Klienten reaktivieren")
}, },
{ {
UserRightType.OrganisationAllowReactivation, "Organisationen reaktivieren" UserRightType.OrganisationAllowReactivation, Translator.Translate("Organisationen reaktivieren")
}, },
{ {
UserRightType.PersonAllowReactivation, "Personen reaktivieren" UserRightType.PersonAllowReactivation, Translator.Translate("Personen reaktivieren")
}, },
{ {
UserRightType.ServiceRecordAllowRebooking, "Zeiterfassung umbuchen" UserRightType.ServiceRecordAllowRebooking, Translator.Translate("Zeiterfassung umbuchen")
}, },
{ {
UserRightType.CostbearerAllowChange, "Hilfepläne Kostenträger tauschen" UserRightType.CostbearerAllowChange, Translator.Translate("Hilfepläne Kostenträger tauschen")
}, },
{ {
UserRightType.DocumentsAllowViewAll, "Dokumente bearbeiten (alle)" UserRightType.DocumentsAllowViewAll, Translator.Translate("Dokumente bearbeiten (alle)")
}, },
{ {
UserRightType.DocumentsDownloadAll, "Dokumente herunterladen" UserRightType.DocumentsDownloadAll, Translator.Translate("Dokumente herunterladen")
}, },
{ {
UserRightType.ServiceRecordAllowEditAfterMindays, "Zeiterfassung Einträge nach Ablauf der Eingabefrist bearbeiten" UserRightType.ServiceRecordAllowEditAfterMindays, Translator.Translate("Zeiterfassung Einträge nach Ablauf der Eingabefrist bearbeiten")
}, },
{ {
UserRightType.Betreuungsschluessel_View, "Betreuer bei Hilfeplänen ansehen" UserRightType.Betreuungsschluessel_View, Translator.Translate("Betreuer bei Hilfeplänen ansehen")
}, },
{ {
UserRightType.Betreuungsschluessel_Create, "Betreuer bei Hilfeplänen anlegen" UserRightType.Betreuungsschluessel_Create, Translator.Translate("Betreuer bei Hilfeplänen anlegen")
}, },
{ {
UserRightType.Betreuungsschluessel_Edit, "Betreuer bei Hilfeplänen bearbeiten" UserRightType.Betreuungsschluessel_Edit, Translator.Translate("Betreuer bei Hilfeplänen bearbeiten")
}, },
{ {
UserRightType.Betreuungsschluessel_Delete, "Betreuer bei Hilfeplänen löschen" UserRightType.Betreuungsschluessel_Delete, Translator.Translate("Betreuer bei Hilfeplänen löschen")
}, },
{ {
UserRightType.Jahresbericht, "Jahresbericht" UserRightType.Jahresbericht, Translator.Translate("Jahresbericht")
}, },
{ {
UserRightType.DokumenteFinanzen, "Dokumente für Finanzen" UserRightType.DokumenteFinanzen, Translator.Translate("Dokumente für Finanzen")
}, },
{ {
UserRightType.DokumenteHilfeplaene, "Dokumente für Hilfepläne" UserRightType.DokumenteHilfeplaene, Translator.Translate("Dokumente für Hilfepläne")
}, },
{ {
UserRightType.DokumenteKlienten, "Dokumente für Klienten" UserRightType.DokumenteKlienten, Translator.Translate("Dokumente für Klienten")
}, },
{ {
UserRightType.DokumenteMitarbeiter, "Dokumente für Mitarbeiter" UserRightType.DokumenteMitarbeiter, Translator.Translate("Dokumente für Mitarbeiter")
}, },
{ {
UserRightType.DokumenteOrganisationen, "Dokumente für Organisationen" UserRightType.DokumenteOrganisationen, Translator.Translate("Dokumente für Organisationen")
}, },
{ {
UserRightType.DokumentePersonen, "Dokumente für Personen" UserRightType.DokumentePersonen, Translator.Translate("Dokumente für Personen")
}, },
{ {
UserRightType.DokumenteTeams, "Dokumente für Teams" UserRightType.DokumenteTeams, Translator.Translate("Dokumente für Teams")
}, },
{ {
UserRightType.BargeldverwaltungFinanzenAnsehen, "Bargeldverwaltung unter Finanzen ansehen" UserRightType.BargeldverwaltungFinanzenAnsehen, Translator.Translate("Bargeldverwaltung unter Finanzen ansehen")
}, },
{ {
UserRightType.BargeldverwaltungFinanzenAnlegen, "Bargeldverwaltung unter Finanzen anlegen" UserRightType.BargeldverwaltungFinanzenAnlegen, Translator.Translate("Bargeldverwaltung unter Finanzen anlegen")
}, },
{ {
UserRightType.BargeldverwaltungFinanzenBearbeiten, "Bargeldverwaltung unter Finanzen bearbeiten" UserRightType.BargeldverwaltungFinanzenBearbeiten, Translator.Translate("Bargeldverwaltung unter Finanzen bearbeiten")
}, },
{ {
UserRightType.BargeldverwaltungFinanzenLoeschen, "Bargeldverwaltung unter Finanzen löschen" UserRightType.BargeldverwaltungFinanzenLoeschen, Translator.Translate("Bargeldverwaltung unter Finanzen löschen")
}, },
{ {
UserRightType.VertretungenView_View, "Vertretungen verwalten" UserRightType.VertretungenView_View, Translator.Translate("Vertretungen verwalten")
}, },
//, //,
// { // {
// UserRightType.MedRecordsAnsehen, "Bedarfsmedikation ansehen" // UserRightType.MedRecordsAnsehen, Translator.Translate("Bedarfsmedikation ansehen")
// }, // },
// { // {
// UserRightType.MedRecordsAnlegen, "Bedarfsmedikation anlegen" // UserRightType.MedRecordsAnlegen, Translator.Translate("Bedarfsmedikation anlegen")
// }, // },
// { // {
// UserRightType.MedRecordsAendern, "Bedarfsmedikation bearbeiten" // UserRightType.MedRecordsAendern, Translator.Translate("Bedarfsmedikation bearbeiten")
// }, // },
// { // {
// UserRightType.MedRecordsLoeschen, "Bedarfsmedikation löschen" // UserRightType.MedRecordsLoeschen, Translator.Translate("Bedarfsmedikation löschen")
// }, // },
{ {
UserRightType.ChatSettings, "Chat Einstellungen" UserRightType.ChatSettings, Translator.Translate("Chat Einstellungen")
} }
, ,
{ {
UserRightType.CustomerTeam_View, "Kliententeams ansehen" UserRightType.CustomerTeam_View, Translator.Translate("Kliententeams ansehen")
} }
, ,
{ {
UserRightType.CustomerTeam_Create, "Kliententeams anlegen" UserRightType.CustomerTeam_Create, Translator.Translate("Kliententeams anlegen")
} }
, ,
{ {
UserRightType.CustomerTeam_Edit, "Kliententeams bearbeiten" UserRightType.CustomerTeam_Edit, Translator.Translate("Kliententeams bearbeiten")
} }
, ,
{ {
UserRightType.CustomerTeam_Delete, "Kliententeams löschen" UserRightType.CustomerTeam_Delete, Translator.Translate("Kliententeams löschen")
} }
}; };
#endregion #endregion
@@ -746,13 +747,13 @@ namespace BS.Shared.Core
PersonTypeTranslations = new Dictionary<object, String> PersonTypeTranslations = new Dictionary<object, String>
{ {
{ {
PersonType.Employee, "Mitarbeiter" PersonType.Employee, Translator.Translate("Mitarbeiter")
}, },
{ {
PersonType.Customer, "Klient" PersonType.Customer, Translator.Translate("Klient")
}, },
{ {
PersonType.Others, "Umfeld" PersonType.Others, Translator.Translate("Umfeld")
} }
}; };
#endregion #endregion
@@ -791,13 +792,13 @@ namespace BS.Shared.Core
ValueListEntryType.TerminationReasonType, "Gründe für Beendigung der Betreuung" ValueListEntryType.TerminationReasonType, "Gründe für Beendigung der Betreuung"
}, },
{ {
ValueListEntryType.PlacementObjectiveType, "Vermittlung" ValueListEntryType.PlacementObjectiveType, Translator.Translate("Vermittlung")
}, },
{ {
ValueListEntryType.StaffActivityFocusType, "Arbeitsschwerpunkte" ValueListEntryType.StaffActivityFocusType, "Arbeitsschwerpunkte"
}, },
{ {
ValueListEntryType.StaffQualificationsType, "Mitarbeiterabschlüsse" ValueListEntryType.StaffQualificationsType, Translator.Translate("Mitarbeiterabschlüsse")
}, },
{ {
ValueListEntryType.StaffRoleType, "Rollen" ValueListEntryType.StaffRoleType, "Rollen"
@@ -872,10 +873,10 @@ namespace BS.Shared.Core
ValueListEntryType.StaffActivityFocusType, "Arbeitsschwerpunkte des Personals" ValueListEntryType.StaffActivityFocusType, "Arbeitsschwerpunkte des Personals"
}, },
{ {
ValueListEntryType.StaffQualificationsType, "Mitarbeiterabschlüsse" ValueListEntryType.StaffQualificationsType, Translator.Translate("Mitarbeiterabschlüsse")
}, },
{ {
ValueListEntryType.StaffRoleType, "Rollen der Mitarbeiter" ValueListEntryType.StaffRoleType, Translator.Translate("Rollen der Mitarbeiter")
}, },
{ {
ValueListEntryType.ResourceCategory, "Kategorien von Ressourcen" ValueListEntryType.ResourceCategory, "Kategorien von Ressourcen"
@@ -992,10 +993,10 @@ namespace BS.Shared.Core
AccountingvisibilityType.Beides, "Immer" AccountingvisibilityType.Beides, "Immer"
}, },
{ {
AccountingvisibilityType.NurKlientenbezogen, "Nur klientenbezogen" AccountingvisibilityType.NurKlientenbezogen, Translator.Translate("Nur klientenbezogen")
}, },
{ {
AccountingvisibilityType.NichtKlientenbezogen, "Nicht klientenbezogen" AccountingvisibilityType.NichtKlientenbezogen, Translator.Translate("Nicht klientenbezogen")
}, },
}; };
#endregion #endregion
@@ -1004,22 +1005,22 @@ namespace BS.Shared.Core
FileAttachmentTypeTranslations = new Dictionary<FileAttachmentType, String> FileAttachmentTypeTranslations = new Dictionary<FileAttachmentType, String>
{ {
{ {
FileAttachmentType.CustomerTemplate, "Klientenvorlage" FileAttachmentType.CustomerTemplate, Translator.Translate("Klientenvorlage")
}, },
{ {
FileAttachmentType.NotSpecified, "Keine Angabe" FileAttachmentType.NotSpecified, "Keine Angabe"
}, },
{ {
FileAttachmentType.PersonTemplate, "Personenvorlage" FileAttachmentType.PersonTemplate, Translator.Translate("Personenvorlage")
}, },
{ {
FileAttachmentType.OrganisationTemplate, "Organisationsvorlage" FileAttachmentType.OrganisationTemplate, Translator.Translate("Organisationsvorlage")
}, },
{ {
FileAttachmentType.SupportConceptTemplate, "Hilfeplanvorlage" FileAttachmentType.SupportConceptTemplate, Translator.Translate("Hilfeplanvorlage")
}, },
{ {
FileAttachmentType.SupportConceptDocument, "Hilfeplandokument" FileAttachmentType.SupportConceptDocument, Translator.Translate("Hilfeplandokument")
} }
}; };
#endregion #endregion

View File

@@ -386,6 +386,8 @@
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Extensions\UIElementCollectionExtensions.cs" /> <Compile Include="Extensions\UIElementCollectionExtensions.cs" />
<Compile Include="Settings\ApplicationSettings.cs" /> <Compile Include="Settings\ApplicationSettings.cs" />
<Compile Include="Translation\ITranslator.cs" />
<Compile Include="Translation\Translator.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<BootstrapperPackage Include="Microsoft.Net.Client.3.5"> <BootstrapperPackage Include="Microsoft.Net.Client.3.5">