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

Merge

Browse Source
This commit is contained in:
Christian
2017-04-03 13:39:11 +02:00
parent 449e3676c2
commit e15b8cdcf7
24 changed files with 1256 additions and 989 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -207,3 +207,5 @@
/ReportImp/HphBersenbrueckAtz/bin
/ReportImp/BetreuungsBueroScholzReport/bin
/ReportImp/BetreuungsBueroScholzReport/obj
/ReportImp/BAPBielefelderAmbulantePflege/bin
/ReportImp/BAPBielefelderAmbulantePflege/obj

25
BeWo.sln
View File

@@ -1,8 +1,6 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26228.9
MinimumVisualStudioVersion = 10.0.40219.1
# Visual Studio 2012
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Client", "Client", "{E7543C39-A44C-40C9-82C9-E7FAA2D9A852}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Server", "Server", "{FEB0336B-F053-40B6-92DD-7DE56AB9408A}"
@@ -369,6 +367,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HphBersenbrueckAtz", "Repor
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BetreuungsBueroScholzReport", "ReportImp\BetreuungsBueroScholzReport\BetreuungsBueroScholzReport.csproj", "{606566D9-B8B5-4522-A2B4-175F4BCE98DD}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BAPBielefelderAmbulantePflege", "ReportImp\BAPBielefelderAmbulantePflege\BAPBielefelderAmbulantePflege.csproj", "{7A7E980E-447C-444C-B43B-A23A20F52C02}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|.NET = Debug|.NET
@@ -2716,17 +2716,31 @@ Global
{606566D9-B8B5-4522-A2B4-175F4BCE98DD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{606566D9-B8B5-4522-A2B4-175F4BCE98DD}.Release|x86.ActiveCfg = Release|Any CPU
{606566D9-B8B5-4522-A2B4-175F4BCE98DD}.Release|x86.Build.0 = Release|Any CPU
{7A7E980E-447C-444C-B43B-A23A20F52C02}.Debug|.NET.ActiveCfg = Debug|Any CPU
{7A7E980E-447C-444C-B43B-A23A20F52C02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7A7E980E-447C-444C-B43B-A23A20F52C02}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7A7E980E-447C-444C-B43B-A23A20F52C02}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{7A7E980E-447C-444C-B43B-A23A20F52C02}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{7A7E980E-447C-444C-B43B-A23A20F52C02}.Debug|x86.ActiveCfg = Debug|Any CPU
{7A7E980E-447C-444C-B43B-A23A20F52C02}.Release|.NET.ActiveCfg = Release|Any CPU
{7A7E980E-447C-444C-B43B-A23A20F52C02}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7A7E980E-447C-444C-B43B-A23A20F52C02}.Release|Any CPU.Build.0 = Release|Any CPU
{7A7E980E-447C-444C-B43B-A23A20F52C02}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{7A7E980E-447C-444C-B43B-A23A20F52C02}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{7A7E980E-447C-444C-B43B-A23A20F52C02}.Release|x86.ActiveCfg = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{3FEBB560-9275-413A-9767-BB68C44EEBC3} = {E7543C39-A44C-40C9-82C9-E7FAA2D9A852}
{D5E53B0F-BF5A-41E8-93E2-0F32845FC729} = {E7543C39-A44C-40C9-82C9-E7FAA2D9A852}
{094331C3-ECEE-4C89-BBFD-4C9DED89F0EF} = {FEB0336B-F053-40B6-92DD-7DE56AB9408A}
{B0D73E3D-4AE7-4024-93A6-DB1F46D7CCEE} = {FEB0336B-F053-40B6-92DD-7DE56AB9408A}
{D5E53B0F-BF5A-41E8-93E2-0F32845FC729} = {E7543C39-A44C-40C9-82C9-E7FAA2D9A852}
{40D8B312-EA64-49E3-A31A-5E57ED4D5654} = {FEB0336B-F053-40B6-92DD-7DE56AB9408A}
{E1154C7B-BB77-4155-9854-DAD8FC5A8BC3} = {FEB0336B-F053-40B6-92DD-7DE56AB9408A}
{663EFCB5-9E3E-4C76-97EE-3188E072634C} = {FEB0336B-F053-40B6-92DD-7DE56AB9408A}
{284B02ED-114A-426C-9162-31BB6CF05589} = {FEB0336B-F053-40B6-92DD-7DE56AB9408A}
{6556CD8E-1142-4B3C-A17E-082C44CAB0C1} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{4A7C1019-4AAC-48D3-B445-2AADF8B76303} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{36E7D251-2F15-4589-81C2-6BDDC67F16AE} = {D8A691C5-146D-4613-86CC-438F02FE9106}
@@ -2861,12 +2875,10 @@ Global
{EAD43B9B-A117-4ED1-993C-D969F70DC911} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{012458B9-D7EF-4A7F-841B-0DD5EE9DBA90} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{AC208F3D-2D64-49A8-A6EB-2EE49BABF3CA} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{663EFCB5-9E3E-4C76-97EE-3188E072634C} = {FEB0336B-F053-40B6-92DD-7DE56AB9408A}
{A10D7313-870C-4470-92EA-CD531D78C40B} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{A182A40F-16C4-4890-BD4C-336CB5B8F70D} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{2E4CFE97-3A0B-4170-95B1-D7EE0CA7DCAA} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{1F5D8784-4912-4D71-867F-ADE6D56C31BD} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{284B02ED-114A-426C-9162-31BB6CF05589} = {FEB0336B-F053-40B6-92DD-7DE56AB9408A}
{4E27E4D3-C184-4E10-AE73-7600D95FCE8E} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{B40CB768-8847-4D73-8AC6-EED34B6216CE} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{697CF63E-B065-491A-AEA7-909F01ECA6AB} = {D8A691C5-146D-4613-86CC-438F02FE9106}
@@ -2895,5 +2907,6 @@ Global
{120AC4B5-D4A2-4EBB-A17B-1A30623CF3ED} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{56D310FE-DB98-4EFE-8527-DF94628657F8} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{606566D9-B8B5-4522-A2B4-175F4BCE98DD} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{7A7E980E-447C-444C-B43B-A23A20F52C02} = {D8A691C5-146D-4613-86CC-438F02FE9106}
EndGlobalSection
EndGlobal

10
BeWo/BeWo.csproj
View File

@@ -182,6 +182,10 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="SchulbegleitenderDienst\SchulbegleitenderDienstBearbeitungsView.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="SchulbegleitenderDienst\NewSchulbegleitenderDienstView.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
@@ -526,6 +530,9 @@
<Compile Include="ProxyLoginView.xaml.cs">
<DependentUpon>ProxyLoginView.xaml</DependentUpon>
</Compile>
<Compile Include="SchulbegleitenderDienst\SchulbegleitenderDienstBearbeitungsView.xaml.cs">
<DependentUpon>SchulbegleitenderDienstBearbeitungsView.xaml</DependentUpon>
</Compile>
<Compile Include="SchulbegleitenderDienst\NewSchulbegleitenderDienstView.xaml.cs">
<DependentUpon>NewSchulbegleitenderDienstView.xaml</DependentUpon>
</Compile>
@@ -2463,6 +2470,9 @@
<ItemGroup>
<Resource Include="Ressources\Icons\WeitereNachrichtLaden.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Ressources\Icons\Haeckchen.png" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>

20
BeWo/BeWoApp.xaml.cs
View File

@@ -202,6 +202,7 @@ namespace BeWo
bool isZeiterfassungInStdMin = false;
int lastSelectedStundenkontoIntervall = 3;
bool showSignatures = false;
AppSettings.ShowAdvisedAttendedFlag = false;
String timeRecordingMenuName = "Zeiterfassung";
@@ -365,6 +366,7 @@ namespace BeWo
showSignatures = true;
}
switch (_Mandator.BeWoClientType)
{
case 1:
@@ -439,6 +441,7 @@ namespace BeWo
AppSettings.PrinterSettingsUseLandscape = printerSettingsUseLandscape;
AppSettings.PrinterSettingsUseMargins = printerSettingsUseMargins;
AppSettings.PrinterSettingsUsePaperKind = printerSettingsUsePaperKind;
BS.Shared.Settings.ApplicationSettings.SupportConceptExpirationLimitInMonths = AppSettings.HilfeplanAuslaufAuswahl;
}
@@ -664,6 +667,7 @@ namespace BeWo
SetSettingValue(SettingsType.ApplicationSettings, "DocumentationFontSize", _AppSettings.DocumentationFontSize.ToString());
SetSettingValue(SettingsType.ApplicationSettings, "ZeigeNurMeineTermine", _AppSettings.ZeigeNurMeineTermine ? "1" : "0");
SetSettingValue(SettingsType.ApplicationSettings, "LastSelectedServiceRecordTimeIntervalDays", ((int)_AppSettings.LastSelectedServiceRecordTimeIntervalDays).ToString());
SetSettingValue(SettingsType.ApplicationSettings, "LetzteZeiterfassungsDauer", ((int)_AppSettings.LetzteZeiterfassungsDauer).ToString());
string val = string.Empty;
if (_AppSettings.StartupPanelOrder != null)
@@ -809,6 +813,22 @@ namespace BeWo
"LastSelectedServiceRecordTimeIntervalDays"));
}
val = GetSettingValue(SettingsType.ApplicationSettings, "LetzteZeiterfassungsDauer");
if (val != null)
{
var x = Convert.ToInt32(GetSettingValue(SettingsType.ApplicationSettings,
"LetzteZeiterfassungsDauer"));
if (x == 0)
{
_AppSettings.LetzteZeiterfassungsDauer = ZeiterfassungsDauer.Minuten;
}
else
{
_AppSettings.LetzteZeiterfassungsDauer = ZeiterfassungsDauer.Stunden;
}
}
val = GetSettingValue(SettingsType.ApplicationSettings, "StartupPanelOrder");
if (val != null)
{

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

@@ -26,6 +26,8 @@ namespace BeWo.Core.Config
private int mLastSelectedServiceRecordTimeIntervalDays = 7;
private ZeiterfassungsDauer mLetzteZeiterfassungsDauer = ZeiterfassungsDauer.Minuten;
public enum WindowStateType
{
Default,
@@ -71,7 +73,19 @@ namespace BeWo.Core.Config
get { return misZeiterfassungInStdMin; }
set { misZeiterfassungInStdMin = value; }
}
public ZeiterfassungsDauer LetzteZeiterfassungsDauer
{
get { return mLetzteZeiterfassungsDauer; }
set
{
if (mLetzteZeiterfassungsDauer != value)
{
mLetzteZeiterfassungsDauer = value;
IsDirty = true;
}
}
}
public int MaxDaysEditServiceRecordsAllowed { get; set; }

4
BeWo/MainControl.xaml
View File

@@ -247,7 +247,7 @@
<!-- #Neuer Bereich Kinder Betreuungs gedoense Content=Schulbegleitender Dienst################ -->
<localView:ImageButton r:DemandUserRight.VisibleDemands="ViewAll, AccountingTransactionView_View"
<!--<localView:ImageButton r:DemandUserRight.VisibleDemands="ViewAll, AccountingTransactionView_View"
ImageSource="Ressources\Icons\CoinsDisabled.png" x:Name="button_SchulbegleitenderDienst"
Click="Button_SchulbegleitenderDienst_OnClick" Style="{StaticResource NavBarButton}"
Content="SBD" Background="{StaticResource SchulbegleitenderDienstContentBrush}"
@@ -261,7 +261,7 @@
<TranslateTransform X="0" Y="0" />
</TransformGroup>
</Button.RenderTransform>
</localView:ImageButton>
</localView:ImageButton>-->

1878
BeWo/ServiceProxy/Generated.cs
View File

File diff suppressed because it is too large Load Diff

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

@@ -396,18 +396,20 @@
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Label Grid.Column="0" Grid.Row="0" Margin="3" VerticalAlignment="Center">Vertragsbeginn</Label>
<Label Grid.Column="0" Grid.Row="1" Margin="3" VerticalAlignment="Center">Befristet bis</Label>
<Label Grid.Column="0" Grid.Row="2" Margin="3" VerticalAlignment="Center">beschäftigt als</Label>
<Label Grid.Column="0" Grid.Row="3" Margin="3" VerticalAlignment="Center">Stundensatz</Label>
<Label Grid.Column="0" Grid.Row="4" Margin="3" VerticalAlignment="Center">FLS/Woche</Label>
<Label Grid.Column="0" Grid.Row="5" Margin="3" VerticalAlignment="Center">Gesamtstunden/Woche</Label>
<Label Grid.Column="0" Grid.Row="6" Margin="3" VerticalAlignment="Center">Gesamtstunden/Monat</Label>
<Label Grid.Column="0" Grid.Row="7" Margin="3" VerticalAlignment="Center">Arbeitstage pro Woche</Label>
<Label Grid.Column="0" Grid.Row="8" Margin="3" VerticalAlignment="Center">Urlaubstage</Label>
<Label Grid.Column="0" Grid.Row="9" Margin="3" VerticalAlignment="Center">Probezeit (Tage)</Label>
<Label Grid.Column="0" Grid.Row="10" Margin="3" VerticalAlignment="Center">Künd.-frist (Tage)</Label>
<Label Grid.Column="0" Grid.Row="5" Margin="3" VerticalAlignment="Center">FLS/Monat</Label>
<Label Grid.Column="0" Grid.Row="6" Margin="3" VerticalAlignment="Center">Gesamtstunden/Woche</Label>
<Label Grid.Column="0" Grid.Row="7" Margin="3" VerticalAlignment="Center">Gesamtstunden/Monat</Label>
<Label Grid.Column="0" Grid.Row="8" Margin="3" VerticalAlignment="Center">Arbeitstage pro Woche</Label>
<Label Grid.Column="0" Grid.Row="9" Margin="3" VerticalAlignment="Center">Urlaubstage</Label>
<Label Grid.Column="0" Grid.Row="10" Margin="3" VerticalAlignment="Center">Probezeit (Tage)</Label>
<Label Grid.Column="0" Grid.Row="11" Margin="3" VerticalAlignment="Center">Künd.-frist (Tage)</Label>
<Label Grid.Column="3" Grid.Row="0" Margin="3" VerticalAlignment="Center">Bemerkungen</Label>
@@ -415,13 +417,14 @@
<dxe:DateEdit MaskType="DateTimeAdvancingCaret" AllowNullInput="True" Grid.Column="1" Grid.Row="1" Margin="3" Height="23" EditValue="{Binding Path=ContractEndDate, UpdateSourceTrigger=PropertyChanged}" />
<dxe:ComboBoxEdit Grid.Column="1" Grid.Row="2" Margin="3" Height="23" Name="combobox_employmenttype" ItemsSource="{Binding Path=PossibleEmploymentTypes, UpdateSourceTrigger=PropertyChanged}" SelectedItem="{Binding Path=EmploymentType}" AutoComplete="True" />
<dxe:TextEdit MaskType="Numeric" Mask="c" MaskUseAsDisplayFormat="True" Grid.Column="1" Grid.Row="3" Height="23" Margin="3" EditValue="{Binding Path=HourlyRate, UpdateSourceTrigger=PropertyChanged}"/>
<dxe:TextEdit MaskType="Numeric" Mask="########0.000" MaskUseAsDisplayFormat="True" Grid.Column="1" Grid.Row="4" Margin="3" Height="23" EditValue="{Binding Path=WeeklyFLS, UpdateSourceTrigger=PropertyChanged}" />
<dxe:TextEdit MaskType="Numeric" Mask="########0.00" MaskUseAsDisplayFormat="True" Grid.Column="1" Grid.Row="5" Margin="3" Height="23" EditValue="{Binding Path=WeeklyTotalHours, UpdateSourceTrigger=PropertyChanged}" />
<dxe:TextEdit MaskType="Numeric" Mask="########0.00" MaskUseAsDisplayFormat="True" Grid.Column="1" Grid.Row="6" Margin="3" Height="23" EditValue="{Binding Path=MonthlyTotalHours, UpdateSourceTrigger=PropertyChanged}" />
<dxe:SpinEdit MinValue="0" MaxValue="7" IsFloatValue="False" Grid.Column="1" Grid.Row="7" Margin="3" Height="23" EditValue="{Binding Path=WeeklyDays, Converter={StaticResource Int2DecimalConverter}, UpdateSourceTrigger=PropertyChanged}" />
<dxe:TextEdit MaskType="Numeric" Mask="########0.00" MaskUseAsDisplayFormat="True" Grid.Column="1" Grid.Row="8" Margin="3" Height="23" EditValue="{Binding Path=LeaveDays, UpdateSourceTrigger=PropertyChanged}" />
<dxe:SpinEdit MinValue="0" IsFloatValue="False" Grid.Column="1" Grid.Row="9" Margin="3" Height="23" EditValue="{Binding Path=ProbationPeriod, Converter={StaticResource Int2DecimalConverter}, UpdateSourceTrigger=PropertyChanged}" />
<dxe:SpinEdit MinValue="0" IsFloatValue="False" Grid.Column="1" Grid.Row="10" Margin="3" Height="23" EditValue="{Binding Path=CancellationPeriod, Converter={StaticResource Int2DecimalConverter}, UpdateSourceTrigger=PropertyChanged}" />
<dxe:TextEdit MaskType="Numeric" Mask="########0.000" MaskUseAsDisplayFormat="True" Grid.Column="1" Grid.Row="4" Margin="3" Height="23" EditValue="{Binding Path=WeeklyFLS, UpdateSourceTrigger=PropertyChanged}" />
<dxe:TextEdit MaskType="Numeric" Mask="########0.000" MaskUseAsDisplayFormat="True" Grid.Column="1" Grid.Row="5" Margin="3" Height="23" EditValue="{Binding Path=MonthlyFLS, UpdateSourceTrigger=PropertyChanged}" />
<dxe:TextEdit MaskType="Numeric" Mask="########0.00" MaskUseAsDisplayFormat="True" Grid.Column="1" Grid.Row="6" Margin="3" Height="23" EditValue="{Binding Path=WeeklyTotalHours, UpdateSourceTrigger=PropertyChanged}" />
<dxe:TextEdit MaskType="Numeric" Mask="########0.00" MaskUseAsDisplayFormat="True" Grid.Column="1" Grid.Row="7" Margin="3" Height="23" EditValue="{Binding Path=MonthlyTotalHours, UpdateSourceTrigger=PropertyChanged}" />
<dxe:SpinEdit MinValue="0" MaxValue="7" IsFloatValue="False" Grid.Column="1" Grid.Row="8" Margin="3" Height="23" EditValue="{Binding Path=WeeklyDays, Converter={StaticResource Int2DecimalConverter}, UpdateSourceTrigger=PropertyChanged}" />
<dxe:TextEdit MaskType="Numeric" Mask="########0.00" MaskUseAsDisplayFormat="True" Grid.Column="1" Grid.Row="9" Margin="3" Height="23" EditValue="{Binding Path=LeaveDays, UpdateSourceTrigger=PropertyChanged}" />
<dxe:SpinEdit MinValue="0" IsFloatValue="False" Grid.Column="1" Grid.Row="10" Margin="3" Height="23" EditValue="{Binding Path=ProbationPeriod, Converter={StaticResource Int2DecimalConverter}, UpdateSourceTrigger=PropertyChanged}" />
<dxe:SpinEdit MinValue="0" IsFloatValue="False" Grid.Column="1" Grid.Row="11" Margin="3" Height="23" EditValue="{Binding Path=CancellationPeriod, Converter={StaticResource Int2DecimalConverter}, UpdateSourceTrigger=PropertyChanged}" />
<TextBox Grid.Column="3" Grid.Row="1" Grid.RowSpan="8" Margin="3" Text="{Binding Path=Notice, UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" VerticalContentAlignment="Stretch"
HorizontalContentAlignment="Left" ScrollViewer.CanContentScroll="False" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Hidden" TextWrapping="Wrap" AcceptsReturn="True" AutoWordSelection="True" />

21
BeWo/View/Detail/ServiceRecordView2.xaml
View File

@@ -1093,11 +1093,11 @@
</dxg:GridColumn>
<!-- ###############################################################################################-->
<dxg:GridColumn x:Name="DistanceGridColumn" FieldName="DistanceInMeter" AllowEditing="False" Header="Gefahrene km" Width="80">
<dxg:GridColumn.EditSettings>
<dxe:TextEditSettings DisplayFormat="0.##"></dxe:TextEditSettings>
</dxg:GridColumn.EditSettings>
</dxg:GridColumn>
<dxg:GridColumn x:Name="DistanceGridColumn" FieldName="DistanceInMeter" AllowEditing="False" Header="Gefahrene km" Width="80">
<dxg:GridColumn.EditSettings>
<dxe:TextEditSettings DisplayFormat="0.##"></dxe:TextEditSettings>
</dxg:GridColumn.EditSettings>
</dxg:GridColumn>
<dxg:GridColumn FieldName="CategoryString" AllowEditing="False" Header="Leistungskategorie" />
<dxg:GridColumn FieldName="ServiceDescriptionString" AllowEditing="False" Header="Leistung" />
<dxg:GridColumn FieldName="Notice" AllowEditing="False" Header="Dokumentation1" Width="200" x:Name="head_Doku1"/>
@@ -1107,14 +1107,19 @@
<dxg:GridColumn FieldName="Notice4" AllowEditing="False" Header="Dokumentation4" Width="200" x:Name="head_Doku4"/>
<dxg:GridColumn FieldName="Notice5" AllowEditing="False" Header="Dokumentation5" Width="200" x:Name="head_Doku5"/>
<dxg:GridColumn FieldName="GoalString" AllowEditing="False" Header="Ziele" />
<dxg:GridColumn FieldName="GoalString" AllowEditing="False" Header="Ziele" />
<dxg:GridColumn FieldName="EmployeeName" AllowEditing="False" Header="Angelegt für" />
<dxg:GridColumn FieldName="InsUser" AllowEditing="False" Header="Angelegt von" x:Name="InsertedByColumn" />
<dxg:GridColumn FieldName="InsertedOn" AllowEditing="False" Header="Angelegt am" x:Name="InsertedOnColumn" />
<!-- ########################## gridcolumn with checkbox ##########################################-->
<dxg:GridColumn Header="Unterschrift" FieldName="IsUnterschrift" AllowEditing="False" Width="70" Visible="False" x:Name="UnterschriftenHeader" IsEnabled="False" />
<!-- ########################## gridcolumn with check Picture ###################### Width="70"################### -->
<dxg:GridColumn Header="Unterschrift" FieldName="IsUnterschrift" AllowEditing="False" IsEnabled="False" Visible="False" x:Name="UnterschriftenHeader" Width = "70">
<dxg:GridColumn.EditSettings>
<dxe:ImageEditSettings RenderOptions.BitmapScalingMode="NearestNeighbor" Stretch="None" />
</dxg:GridColumn.EditSettings>
</dxg:GridColumn>
<!-- ##############################################################################################-->

17
BeWo/View/Detail/ServiceRecordView2.xaml.cs
View File

@@ -88,6 +88,8 @@ namespace BeWo.View.Detail
public ServiceRecordView2(ServiceRecordListVM pViewModel, long? startSupportConceptOid)
{
InitializeComponent();
multiSupportConceptControl.AutoGetAllAfterLoaded = false;
@@ -96,11 +98,13 @@ namespace BeWo.View.Detail
InsertedByColumn.Visible = !BeWoApp.AppSettings.HideServiceRecordInsertedByAndInsertedOn;
InsertedOnColumn.Visible = !BeWoApp.AppSettings.HideServiceRecordInsertedByAndInsertedOn;
_StartSupportConceptOid = startSupportConceptOid;
ViewModel = pViewModel;
//serviceRecordListContent.
// CheckMinStdSwitch.SelectedIndex = 0;
@@ -263,7 +267,6 @@ namespace BeWo.View.Detail
UnterschriftenHeader.Visible = BeWoApp.AppSettings.ShowSignatures;
//richEdit.HorizontalRulerVisibility = Visibility.Collapsed;
//richEdit.VerticalRulerVisibility = Visibility.Collapsed;
@@ -4040,10 +4043,16 @@ namespace BeWo.View.Detail
if(MinSTDOhneEnd.Text == ZeiterfassungsDauer.Minuten.ToString()) {
numerictb_duration.IsFloatValue = false;
numerictb_duration.Mask = "########";
BeWoApp.AppSettings.LetzteZeiterfassungsDauer = ZeiterfassungsDauer.Minuten;
BeWoApp.SaveAppSettings();
}
else {
numerictb_duration.IsFloatValue = true;
numerictb_duration.Mask = "########0.00";
BeWoApp.AppSettings.LetzteZeiterfassungsDauer = ZeiterfassungsDauer.Stunden;
BeWoApp.SaveAppSettings();
}
}
@@ -4052,10 +4061,16 @@ namespace BeWo.View.Detail
if (MinSTDMitEnd.Text == ZeiterfassungsDauer.Minuten.ToString()) {
numeric_duration.IsFloatValue = false;
numeric_duration.Mask = "########";
BeWoApp.AppSettings.LetzteZeiterfassungsDauer = ZeiterfassungsDauer.Minuten;
BeWoApp.SaveAppSettings();
}
else {
numeric_duration.IsFloatValue = true;
numeric_duration.Mask = "########0.00";
BeWoApp.AppSettings.LetzteZeiterfassungsDauer = ZeiterfassungsDauer.Stunden;
BeWoApp.SaveAppSettings();
}
}
}

21
BeWo/ViewModel/ContractVM.cs
View File

@@ -19,6 +19,7 @@ namespace BeWo.ViewModel
public static string PropertyName_ContractEndDate = "ContractEndDate";
public static string PropertyName_HourlyRate = "HourlyRate";
public static string PropertyName_WeeklyFLS = "WeeklyFLS";
public static string PropertyName_MonthlyFLS = "MonthlyFLS";
public static string PropertyName_WeeklyTotalHours = "WeeklyTotalHours";
public static string PropertyName_MonthlyTotalHours = "MonthlyTotalHours";
public static string PropertyName_LeaveDays = "LeaveDays";
@@ -31,6 +32,7 @@ namespace BeWo.ViewModel
private decimal? _WeeklyTotalHours;
private decimal? _MonthlyTotalHours;
private decimal? _WeeklyFLS;
private decimal? _MonthlyFLS;
private decimal? _HourlyRate;
private DateTime? _EntryDate;
private DateTime? _ContractEndDate;
@@ -170,6 +172,23 @@ namespace BeWo.ViewModel
}
}
public decimal? MonthlyFLS
{
get { return this._MonthlyFLS; }
set
{
if (this.AreDifferent(this._MonthlyFLS, value))
{
this._MonthlyFLS = value;
this.StoreDirtyInformation(this.AreDifferent(this.DataContract.MonthlyFLS, value), PropertyName_MonthlyFLS);
this.FirePropertyChanged(PropertyName_MonthlyFLS);
}
}
}
public decimal? HourlyRate
{
get { return this._HourlyRate; }
@@ -291,6 +310,7 @@ namespace BeWo.ViewModel
this._ProbationPeriod = pDataContract.ProbationPeriod;
this._WeeklyDays = pDataContract.WeeklyDays;
this._WeeklyFLS = pDataContract.WeeklyFLS;
this._MonthlyFLS = pDataContract.MonthlyFLS;
this._WeeklyTotalHours = pDataContract.WeeklyTotalHours;
_MonthlyTotalHours = pDataContract.MonthlyTotalHours;
this._Notice = pDataContract.Notice;
@@ -308,6 +328,7 @@ namespace BeWo.ViewModel
pDataContract.ProbationPeriod = this._ProbationPeriod;
pDataContract.WeeklyDays = this._WeeklyDays;
pDataContract.WeeklyFLS = this._WeeklyFLS;
pDataContract.MonthlyFLS = this._MonthlyFLS;
pDataContract.WeeklyTotalHours = this._WeeklyTotalHours;
pDataContract.MonthlyTotalHours = _MonthlyTotalHours;
pDataContract.Notice = this._Notice;

32
BeWo/ViewModel/ServiceRecordVM.cs
View File

@@ -1,10 +1,11 @@
using System;
using System.Collections.Generic;
using System.Drawing;
using System.Globalization;
using System.Linq;
using System.Windows;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using BeWo.Core;
using BeWo.Core.Service;
using BeWo.Validation;
@@ -15,6 +16,9 @@ using BS.Shared.DataContracts;
using BS.Shared.DataContracts.ClientPartials;
using BS.Shared.DataContracts.Compact;
using BS.Shared.Extensions;
using Brush = System.Windows.Media.Brush;
using Brushes = System.Windows.Media.Brushes;
using Color = System.Windows.Media.Color;
namespace BeWo.ViewModel
{
@@ -104,6 +108,8 @@ namespace BeWo.ViewModel
private static readonly DateTime NULL_TIME = new DateTime(2000, 1, 1, 0, 0, 1);
private static BitmapImage unterschriftVorhanden = null;
private Dictionary<ServiceCategoryDC, List<ServiceDescriptionDC>> _Category2Services;
//private readonly List<SupportConceptTreeNodeDC> _Tree;
@@ -212,6 +218,7 @@ namespace BeWo.ViewModel
List<ValueListEntryDC> pAllGoals)
: base(pDC, pDC.ServiceRecordOid == null)
{
_DurationInStunden = BeWoApp.AppSettings.LetzteZeiterfassungsDauer;
_Category2Services = pCategory2Services;
ChangeGoalTree(pAllGoalCategories, pAllGoals);
@@ -1011,21 +1018,38 @@ namespace BeWo.ViewModel
set { _SignatureOid = value; }
}
public bool IsUnterschrift
public ImageSource IsUnterschrift
{
get
{
if(_SignatureOid != null) {
return true;
if (unterschriftVorhanden == null)
{
unterschriftVorhanden = CreateImage("../../Ressources/Icons/Haeckchen.png");
}
return unterschriftVorhanden;
}
else
{
return false;
return null;
}
}
//set { _isUnterschrift = value; }
}
private BitmapImage CreateImage(String path)
{
BitmapImage bix = new BitmapImage();
bix.BeginInit();
bix.CreateOptions = BitmapCreateOptions.PreservePixelFormat;
bix.CacheOption = BitmapCacheOption.OnLoad;
bix.UriSource = new Uri(path, UriKind.Relative);
bix.EndInit();
return bix;
}
public int? GroupPersonCount
{
get { return _GroupPersonCount; }

50
BeWo/ViewModel/VertretungVM.cs
View File

@@ -10,13 +10,15 @@ namespace BeWo.ViewModel
public static string PropertyName_VertretungsZeitraumBis = "VertretungsZeitraumBis";
public static string PropertyName_Notice = "Notice";
private DateTime _VertretungsZeitraumVon;
private DateTime _VertretungsZeitraumBis;
private long? _CustomerOid;
private long? _AbwesenheitsOid;
private long? _EmployeeOid;
private string _Notice;
public VertretungVM(VertretungDC pDC)
@@ -53,36 +55,36 @@ namespace BeWo.ViewModel
}
}
}
public virtual long? CustomerOid
public string Notice
{
get
{
return this._CustomerOid;
}
get { return _Notice; }
set
{
if (this.AreDifferent(this._CustomerOid, value))
if (AreDifferent(_Notice, value))
{
this._CustomerOid = value;
_Notice = value;
StoreDirtyInformation(AreDifferent(DataContract.Notice, value), PropertyName_Notice);
FirePropertyChanged(PropertyName_Notice);
}
}
}
public virtual long? EmployeeOid
public AbsenceReasonDC Abwesenheiten
{
get
{
return this._EmployeeOid;
}
get { return null; }
set
{
if (this.AreDifferent(this._EmployeeOid, value))
{
this._EmployeeOid = value;
}
//if (this.AreDifferent(this._VertretungsZeitraumBis, value))
//{
// this._VertretungsZeitraumBis = value;
// this.StoreDirtyInformation(this.AreDifferent(this.DataContract.VertretungsZeitraumBis, value), PropertyName_VertretungsZeitraumBis);
// this.FirePropertyChanged(PropertyName_VertretungsZeitraumBis);
//}
value = null;
}
}
@@ -91,18 +93,18 @@ namespace BeWo.ViewModel
{
this._VertretungsZeitraumVon = pDataContract.VertretungsZeitraumVon;
this._VertretungsZeitraumBis = pDataContract.VertretungsZeitraumBis;
this._Notice = pDataContract.Notice;
this._CustomerOid = pDataContract.CustomerOid;
this._EmployeeOid = pDataContract.EmployeeOid;
}
protected override VertretungDC MapToDataContract(VertretungDC pDataContract, bool doCommit)
{
pDataContract.VertretungsZeitraumVon = _VertretungsZeitraumVon;
pDataContract.VertretungsZeitraumBis = _VertretungsZeitraumBis;
pDataContract.VertretungsZeitraumBis = _VertretungsZeitraumBis;
pDataContract.Notice = _Notice;
pDataContract.CustomerOid = _CustomerOid;
pDataContract.EmployeeOid = _EmployeeOid;
return pDataContract;
}

14
Data/Entities/Contract.cs
View File

@@ -16,6 +16,7 @@ namespace BeWo.Data.Entities
public static string PropertyName_ContractEndDate = "ContractEndDate";
public static string PropertyName_HourlyRate = "HourlyRate";
public static string PropertyName_WeeklyFLS = "WeeklyFLS";
public static string PropertyName_MonthlyFLS = "MonthlyFLS";
public static string PropertyName_WeeklyTotalHours = "WeeklyTotalHours";
public static string PropertyName_MonthlyTotalHours = "MonthlyTotalHours";
public static string PropertyName_LeaveDays = "LeaveDays";
@@ -26,6 +27,7 @@ namespace BeWo.Data.Entities
private decimal? _WeeklyTotalHours;
private decimal? _MonthlyTotalHours;
private decimal? _WeeklyFLS;
private decimal? _MonthlyFLS;
private decimal? _HourlyRate;
private DateTime? _EntryDate;
private DateTime? _ContractEndDate;
@@ -94,6 +96,18 @@ namespace BeWo.Data.Entities
}
}
public virtual decimal? MonthlyFLS
{
get { return _MonthlyFLS; }
set
{
if (base.AreDifferent(_MonthlyFLS, value))
_MonthlyFLS = value;
}
}
public virtual int ProbationPeriod
{
get { return _ProbationPeriod; }

22
Data/Entities/Vertretung.cs
View File

@@ -13,6 +13,8 @@ namespace BeWo.Data.Entities
public static string PropertyName_EmployeeOid = "EmployeeOid";
public static string PropertyName_AbwesenheitsOid = "AbwesenheitsOid";
private DateTime _VertretungsZeitraumVon;
private DateTime _VertretungsZeitraumBis;
@@ -21,6 +23,8 @@ namespace BeWo.Data.Entities
private long? _EmployeeOid;
private long? _AbwesenheitsOid;
public virtual DateTime VertretungsZeitraumVon
{
@@ -86,5 +90,23 @@ namespace BeWo.Data.Entities
}
}
public virtual long? AbwesenheitsOid
{
get
{
return this._AbwesenheitsOid;
}
set
{
if (this.AreDifferent(this._AbwesenheitsOid, value))
{
this._AbwesenheitsOid = value;
}
}
}
}
}

1
Data/Mappings/Contract.hbm.xml
View File

@@ -15,6 +15,7 @@
<property column="EmployeeOid" type="Int64" name="EmployeeOid" update="false" insert="false"/>
<property column="HourlyRate" type="Decimal" name="HourlyRate" />
<property column="WeeklyFLS" type="Decimal" name="WeeklyFLS" />
<property column="MonthlyFLS" type="Decimal" name="MonthlyFLS" />
<property column="WeeklyTotalHours" type="Decimal" name="WeeklyTotalHours" />
<property column="MonthlyTotalHours" type="Decimal" name="MonthlyTotalHours" />
<property column="LeaveDays" type="Decimal" name="LeaveDays" />

3
Data/Mappings/Vertretung.hbm.xml
View File

@@ -8,13 +8,14 @@
<version type="Int64" column="Version" name="Version" />
<property name="CustomerOid" column="KlientOid" />
<property name="EmployeeOid" column="MitarbeiterOid" />
<property name="AbwesenheitsOid" column="AbsenceReasonOid" />
<property name="InsTs" />
<property name="InsUser" />
<property column="Tid" type="BS.Shared.TableID, BS.Shared" name="_Tid" access="field" />
<property name="UdpUser" />
<property name="IsActive" type="BS.Shared.ActivationTypeId, BS.Shared" />
<property name="SystemEntryID" type="BS.Shared.SystemEntryID, BS.Shared" />
<property name="Notice" />
<property name="Notice" column="Notice" length="1024" />
<property name="VertretungsZeitraumVon" column="VertretungsZeitraumVon" />
<property name="VertretungsZeitraumBis" column="VertretungsZeitraumBis" />

2
Service/DCEntityMapper/ContractDC_Contract.cs
View File

@@ -21,6 +21,7 @@ namespace BeWo.Service.DCEntityMapper
if (pDataContract.WeeklyDays == 0)
pDataContract.WeeklyDays = 5;
pDataContract.WeeklyFLS = pEntity.WeeklyFLS;
pDataContract.MonthlyFLS = pEntity.MonthlyFLS;
pDataContract.WeeklyTotalHours = pEntity.WeeklyTotalHours;
pDataContract.MonthlyTotalHours = pEntity.MonthlyTotalHours;
pDataContract.Notice = pEntity.Notice;
@@ -45,6 +46,7 @@ namespace BeWo.Service.DCEntityMapper
pEntity.ProbationPeriod = pDataContract.ProbationPeriod;
pEntity.WeeklyDays = pDataContract.WeeklyDays;
pEntity.WeeklyFLS = pDataContract.WeeklyFLS;
pEntity.MonthlyFLS = pDataContract.MonthlyFLS;
pEntity.WeeklyTotalHours = pDataContract.WeeklyTotalHours;
pEntity.MonthlyTotalHours = pDataContract.MonthlyTotalHours;
pEntity.Notice = pDataContract.Notice;

7
Service/DCEntityMapper/VertretungDC_Vertretung.cs
View File

@@ -12,8 +12,10 @@ namespace BeWo.Service.DCEntityMapper
pDataContract.CustomerOid = pEntity.CustomerOid;
pDataContract.EmployeeOid = pEntity.EmployeeOid;
pDataContract.AbwesenheitsOid = pEntity.AbwesenheitsOid;
pDataContract.VertretungsZeitraumVon = pEntity.VertretungsZeitraumVon;
pDataContract.VertretungsZeitraumBis = pEntity.VertretungsZeitraumBis;
pDataContract.Notice = pEntity.Notice;
return pDataContract;
}
@@ -22,9 +24,12 @@ namespace BeWo.Service.DCEntityMapper
{
pEntity.CustomerOid = pDataContract.CustomerOid;
pEntity.EmployeeOid = pDataContract.EmployeeOid;
pEntity.AbwesenheitsOid = pDataContract.AbwesenheitsOid;
pEntity.VertretungsZeitraumVon = pDataContract.VertretungsZeitraumVon;
pEntity.VertretungsZeitraumBis = pDataContract.VertretungsZeitraumBis;
pEntity.Notice = pDataContract.Notice;
return pEntity;
}

4
Service/Plugins/PluginLoader.cs
View File

@@ -146,9 +146,9 @@ namespace BeWo.Service.Plugins
// t = "7381352241"; // Ressource e.V.
//t = "7912635399"; //Prof Eggers Stiftung
//t = "5562845955";//Praunheimer WerkstaettenGmbh
//t = "1106039294";//HphBersenbrueckAtz
//t = "1106039294"; //HphBersenbrueckAtz
//t = "3607551608"; // BetreuungsBuero Scholz
t = "3104936392"; //B.A.P. Bielefelder Ambulante Pflege
return t;
#else
if (MultitenancyOperationContextExt.Current != null)

12
Service/ServiceContracts/IOperationsService.cs
View File

@@ -581,5 +581,17 @@ namespace BeWo.Service.ServiceContracts
[FaultContract(typeof(BeWoFault))]
[OperationContract]
List<ServiceRecordDC> GetCustomerServiceRecordsCompactWithStartEndDate(long pCustomerOid, long costbearer2SupportConceptOid, DateTime start, DateTime ende);
[FaultContract(typeof(BeWoFault))]
[OperationContract]
List<VertretungDC> GetAllVertretungen();
[FaultContract(typeof(BeWoFault))]
[OperationContract]
void InsertNewMitarbeiterVertretung(VertretungDC vertretungM);
[FaultContract(typeof(BeWoFault))]
[OperationContract]
void InsertNewKlientenVertretung(VertretungDC vertretungK);
}
}

44
Service/ServiceImplementations/OperationsServiceImp.cs
View File

@@ -3467,6 +3467,50 @@ namespace BeWo.Service.ServiceImplementations
}
}
//all new Audi ##############################################
public List<VertretungDC>GetAllVertretungen()
{
try
{
return MapperFactory.VertretungDC_Vertretung.MapToNewDCs(DAOFactory.GenericDAO.GetAllActive<Vertretung>());
}
catch (Exception e)
{
throw Utils.CreateBeWoFaultException(e);
}
}
public void InsertNewMitarbeiterVertretung(VertretungDC vertretungM)
{
try
{
var lVertretung = MapperFactory.VertretungDC_Vertretung.MapToNewEntity(vertretungM);
DAOFactory.GenericDAO.Insert(lVertretung);
}
catch (Exception e)
{
throw Utils.CreateBeWoFaultException(e);
}
}
public void InsertNewKlientenVertretung(VertretungDC vertretungK)
{
try
{
var lVertretung = MapperFactory.VertretungDC_Vertretung.MapToNewEntity(vertretungK);
DAOFactory.GenericDAO.Insert(lVertretung);
}
catch (Exception e)
{
throw Utils.CreateBeWoFaultException(e);
}
}
//#################################################################
#endregion
#endregion

3
Shared/DataContracts/ContractDC.cs
View File

@@ -24,6 +24,9 @@ namespace BS.Shared.DataContracts
[DataMember]
public decimal? WeeklyFLS { get; set; }
[DataMember]
public decimal? MonthlyFLS { get; set; }
[DataMember]
public decimal? HourlyRate { get; set; }

8
Shared/DataContracts/VertretungDC.cs
View File

@@ -15,12 +15,18 @@ namespace BS.Shared.DataContracts
[DataMember]
public long? EmployeeOid { get; set; }
[DataMember]
public long? AbwesenheitsOid { get; set; }
[DataMember]
public DateTime VertretungsZeitraumVon { get; set; }
[DataMember]
public DateTime VertretungsZeitraumBis { get; set; }
[DataMember]
public string Notice { get; set; }
}
}