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

CB: Translation eingebaut

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

23
BeWo/Scheduler/View/NewSchedulerView.xaml
View File

@@ -12,6 +12,7 @@
xmlns:view="clr-namespace:BeWo.Scheduler.View"
xmlns:converter="clr-namespace:BeWo.Converter"
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">
<localView:BeWoView.Resources>
<ResourceDictionary>
@@ -395,7 +396,7 @@
<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}" />
<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.ItemsPanel>
@@ -420,7 +421,7 @@
</ListView.ItemTemplate>
</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}"
Visibility="{Binding Path=CustomViewInfo, Converter={StaticResource CustomField2VisibilityConverter}, ConverterParameter=Klienten}" />
</Grid>
@@ -645,7 +646,7 @@
<ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" />
</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"
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"
@@ -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" />
<UniformGrid Grid.Column="0" x:Name="AuswahlGrid" Rows="2" Columns="1" Width="270" Grid.Row="1">
<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.ColumnDefinitions>
<ColumnDefinition Width="*" />
@@ -785,7 +786,7 @@
</ListView>
</Grid>
</TabItem>
<TabItem x:Name="KlientenTabItem" Header="Klienten" Style="{StaticResource KlientenTabItemStyle}">
<TabItem x:Name="KlientenTabItem" Header="{markup:Translate Klienten}" Style="{StaticResource KlientenTabItemStyle}">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
@@ -802,7 +803,7 @@
<RowDefinition Height="*" />
</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="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" />
<Grid x:Name="KlientenSuchGrid" Margin="0,1,0,3" Grid.Column="0" Grid.ColumnSpan="3" Background="Black" Grid.Row="1" Visibility="Collapsed">
<Grid.ColumnDefinitions>
@@ -951,12 +952,12 @@
</UniformGrid>
</Grid>
<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>
<RotateTransform CenterX="0.5" CenterY="0.5" Angle="270" />
</CheckBox.LayoutTransform>
</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>
<RotateTransform CenterX="0.5" CenterY="0.5" Angle="270" />
</CheckBox.LayoutTransform>
@@ -1033,7 +1034,7 @@
<dxb:AddBarItemAction>
<dxb:BarButtonItem Name="MitarbeiterVerfuegbarkeitPruefenButtonItem"
Content="Verfügbare Mitarbeiter anzeigen"
Content="{markup:Translate Verfügbare Mitarbeiter anzeigen}"
ItemClick="MitarbeiterVerfuegbarkeitPruefenButtonItem_OnItemClick" />
</dxb:AddBarItemAction>
@@ -1050,11 +1051,11 @@
<dxb:BarButtonItem Name="AbsagenButtonItem" Content="Absagen" ItemClick="AbsagenButtonItem_OnItemClick" />
</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:BarButtonItem Name="MitarbeiterVerfuegbarkeitPruefenButtonItem2"
Content="Verfügbare Mitarbeiter anzeigen"
Content="{markup:Translate Verfügbare Mitarbeiter anzeigen}"
ItemClick="MitarbeiterVerfuegbarkeitPruefenButtonItem_OnItemClick" />
</dxb:AddBarItemAction>
<dxb:RemoveBarItemAndLinkAction ItemName="{x:Static dxsch:SchedulerMenuItemName.StatusSubMenu}" />

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

@@ -24,7 +24,7 @@ using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact;
using BS.Shared.Extensions;
using BS.Shared.Translation;
using DevExpress.Xpf.Bars;
using DevExpress.Xpf.Editors;
using DevExpress.Xpf.Scheduler;
@@ -934,11 +934,11 @@ namespace BeWo.Scheduler.View
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;
}
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)
@@ -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 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())
{
case "Mitarbeiter":
tabControl.Background = mitarbeiterPinsel;
tabControl.BorderBrush = mitarbeiterPinsel;
break;
case "Klienten":
tabControl.Background = klientenPinsel;
tabControl.BorderBrush = klientenPinsel;
break;
case "Ressourcen":
tabControl.Background = ressourcenPinsel;
tabControl.BorderBrush = ressourcenPinsel;
break;
}
var h = selectedItem.Header.ToString();
if (h == Translator.Translate("Mitarbeiter"))
{
tabControl.Background = mitarbeiterPinsel;
tabControl.BorderBrush = mitarbeiterPinsel;
}
else if (h == Translator.Translate("Klienten"))
{
tabControl.Background = klientenPinsel;
tabControl.BorderBrush = klientenPinsel;
}
else
{
tabControl.Background = ressourcenPinsel;
tabControl.BorderBrush = ressourcenPinsel;
}
}
private void ReloadButton_OnClick(object sender, RoutedEventArgs e)
{
@@ -1928,7 +1931,7 @@ namespace BeWo.Scheduler.View
{
return Visibility.Collapsed;
}
switch (parameter.ToString())
{
case "Ressourcen":