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

MH: Neue Setting; Ornderstruktur für Klienten Autismus Köln; Feature Rechnungsübersicht

Browse Source
This commit is contained in:
Marcel Hirschle
2022-02-09 14:44:33 +01:00
parent 03adea044d
commit 67acb563c1
17 changed files with 481 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
BeWo.sln
View File

@@ -503,6 +503,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UebergangshilfeUnnaEV", "Re
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AidshilfeEssen", "ReportImp\AidshilfeEssen\AidshilfeEssen.csproj", "{C52AC467-D452-4396-8DB3-D04AC1045CFB}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AutismusKoelnBonn", "ReportImp\AutismusKoelnBonn\AutismusKoelnBonn.csproj", "{43024B23-C380-4DCE-8DC0-930292417A25}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|.NET = Debug|.NET
@@ -3914,6 +3916,22 @@ Global
{C52AC467-D452-4396-8DB3-D04AC1045CFB}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{C52AC467-D452-4396-8DB3-D04AC1045CFB}.Release|x86.ActiveCfg = Release|Any CPU
{C52AC467-D452-4396-8DB3-D04AC1045CFB}.Release|x86.Build.0 = Release|Any CPU
{43024B23-C380-4DCE-8DC0-930292417A25}.Debug|.NET.ActiveCfg = Debug|Any CPU
{43024B23-C380-4DCE-8DC0-930292417A25}.Debug|.NET.Build.0 = Debug|Any CPU
{43024B23-C380-4DCE-8DC0-930292417A25}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{43024B23-C380-4DCE-8DC0-930292417A25}.Debug|Any CPU.Build.0 = Debug|Any CPU
{43024B23-C380-4DCE-8DC0-930292417A25}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{43024B23-C380-4DCE-8DC0-930292417A25}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{43024B23-C380-4DCE-8DC0-930292417A25}.Debug|x86.ActiveCfg = Debug|Any CPU
{43024B23-C380-4DCE-8DC0-930292417A25}.Debug|x86.Build.0 = Debug|Any CPU
{43024B23-C380-4DCE-8DC0-930292417A25}.Release|.NET.ActiveCfg = Release|Any CPU
{43024B23-C380-4DCE-8DC0-930292417A25}.Release|.NET.Build.0 = Release|Any CPU
{43024B23-C380-4DCE-8DC0-930292417A25}.Release|Any CPU.ActiveCfg = Release|Any CPU
{43024B23-C380-4DCE-8DC0-930292417A25}.Release|Any CPU.Build.0 = Release|Any CPU
{43024B23-C380-4DCE-8DC0-930292417A25}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{43024B23-C380-4DCE-8DC0-930292417A25}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{43024B23-C380-4DCE-8DC0-930292417A25}.Release|x86.ActiveCfg = Release|Any CPU
{43024B23-C380-4DCE-8DC0-930292417A25}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -4161,6 +4179,7 @@ Global
{AA0D5E5F-9690-4EDA-B1D8-7C883CC63DE4} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{A9B88C6C-8965-4F08-B647-42CF0D8058A5} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{C52AC467-D452-4396-8DB3-D04AC1045CFB} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{43024B23-C380-4DCE-8DC0-930292417A25} = {D8A691C5-146D-4613-86CC-438F02FE9106}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {FBE985BB-9F0F-4DBB-8F94-ABC37A803FF9}

10
BeWo/BeWoApp.xaml.cs
View File

@@ -360,6 +360,16 @@ namespace BeWo
showDienstplanung = true;
}
var anzahl = UserSettingsUtils.GetSettingValue(_Mandator.Settings, SettingsKeys.DienstplanungStandardZeilenAnzahl);
if (anzahl != null)
{
int anzahlInt;
if (Int32.TryParse(anzahl, out anzahlInt))
{
AppSettings.DienstplanungStandardZeilenAnzahl = anzahlInt;
}
}
val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, SettingsKeys.ShowMarker);
if(val != null && val.Equals("1"))
{

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

@@ -43,7 +43,11 @@ namespace BeWo.Core.Config
Default,
Maximised
}
public AppSettings()
{
DienstplanungStandardZeilenAnzahl = 1;
}
public bool IsServiceRecordNoticeMandatory
{
@@ -383,6 +387,8 @@ namespace BeWo.Core.Config
public bool DontShowSpitzabrechnung { get; set; }
public bool ShowDienstplanung { get; set; }
public int DienstplanungStandardZeilenAnzahl { get; set; }
public bool AllowStorno { get; set; }
public bool ShowEmployeeSignature { get; set; }

10
BeWo/View/Detail/Accounting/InvoiceOverview.xaml
View File

@@ -60,10 +60,10 @@
</dxg:GridColumn.EditSettings>
</dxg:GridColumn>
<dxg:GridColumn x:Name="PaidColumn" FieldName="IsPaid" Header="Bezahlt"></dxg:GridColumn>
<dxg:GridColumn x:Name="PaidColumn" FieldName="IsPaid" Header="Bezahlt"></dxg:GridColumn>
</dxg:GridControl.Columns>
<dxg:GridControl.View>
<dxg:TableView NavigationStyle="Cell" Loaded="gridView_Loaded" x:Name="gridView" BestFitMode="Smart" AllowBestFit="True" ShowGroupPanel="False" ScrollingMode="Smart" SnapsToDevicePixels="True" Margin="3,22,3,3" />
<dxg:TableView NavigationStyle="Cell" Loaded="gridView_Loaded" x:Name="gridView" BestFitMode="Smart" AllowBestFit="True" ShowGroupPanel="False" ScrollingMode="Smart" SnapsToDevicePixels="True" CellValueChanging="gridView_CellValueChanged" Margin="3,22,3,3" />
</dxg:GridControl.View>
</dxg:GridControl>
@@ -72,7 +72,11 @@
<ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<Label FontSize="14" Foreground="{StaticResource GridPrintMenuLightBrush}" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="10 0 0 0" Content="{Binding FilterResultAmountSum, Converter={StaticResource StringFormatConverter}, ConverterParameter='{}Summe der angezeigten Rechnungen: {0:c}'}" />
<WrapPanel>
<Label FontSize="14" Foreground="{StaticResource GridPrintMenuLightBrush}" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="10 0 0 0" Content="{Binding FilterResultAmountSum, Converter={StaticResource StringFormatConverter}, ConverterParameter='{}Summe aller Rechnungen: {0:c}'}" />
<Label FontSize="14" Foreground="{StaticResource GridPrintMenuLightBrush}" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="0 0 0 0" Content=" | " />
<Label FontSize="14" x:Name="lblAmoutNotPaid" Foreground="{StaticResource GridPrintMenuLightBrush}" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="0 0 0 0" Content="{Binding FilterResultAmountNotPaidSum, Converter={StaticResource StringFormatConverter}, ConverterParameter='{}Summe der noch offenen Rechnungen: {0:c}'}" />
</WrapPanel>
<TextBlock Grid.Column="1" x:Name="textblock_link" VerticalAlignment="Bottom" Margin="5,0,5,3" HorizontalAlignment="Right" FontSize="14">
<Hyperlink x:Name="linkExcelExport" TargetName="newWindow" Foreground="{StaticResource GridPrintMenuLightBrush}" RequestNavigate="linkExcelExport_RequestNavigate">
<Run Text="Excel Export" />

58
BeWo/View/Detail/Accounting/InvoiceOverview.xaml.cs
View File

@@ -48,7 +48,7 @@ namespace BeWo.View.Detail.Accounting
this.linkExcelExport.NavigateUri = this.DownloadLinkEngine.GenerateNewExcelLink();
this.gridView.ShownEditor += this.gridView_ShownEditor;
this.gridView.HiddenEditor += new EditorEventHandler(gridView_HiddenEditor);
//this.gridView.HiddenEditor += new EditorEventHandler(gridView_HiddenEditor);
this._EquityInvoiceItemEditView = new EquityInvoiceItemEditView();
this._GeneralInvoiceItemEditView = new GeneralInvoiceItemEditView();
this._SettlementInvoiceItemEditView = new SettlementInvoiceItemEditView();
@@ -110,19 +110,18 @@ namespace BeWo.View.Detail.Accounting
end = ViewModel.DateTimeSpanFilter.EndDate;
}
ServiceFacade.DoAccountingServiceAsync(s => s.GetInvoiceBases(start, end), UpdateInvoiceList);
}
}
private void UpdateInvoiceList(IList<InvoiceBaseDC> dcList)
{
this.Dispatcher.BeginInvoke(
DispatcherPriority.Normal,
(Action)delegate
{
ViewModel.UpdateList(dcList);
this.gridView.BestFitColumns();
});
}
private void UpdateInvoiceList(IList<InvoiceBaseDC> dcList)
{
this.Dispatcher.BeginInvoke(
DispatcherPriority.Normal,
(Action)delegate
{
ViewModel.UpdateList(dcList);
this.gridView.BestFitColumns();
});
}
public DownloadLinkEngine DownloadLinkEngine { get; set; }
@@ -275,16 +274,16 @@ namespace BeWo.View.Detail.Accounting
}
}
void gridView_HiddenEditor(object sender, EditorEventArgs e)
{
if (e.Column != null && e.Column.FieldName == "IsPaid")
{
if (e.Value is bool b && e.Row is InvoiceBaseVM vm)
{
SaveIsPaidChange(vm, b);
}
}
}
//void gridView_HiddenEditor(object sender, EditorEventArgs e)
//{
// //if (e.Column != null && e.Column.FieldName == "IsPaid")
// //{
// // if (e.Value is bool b && e.Row is InvoiceBaseVM vm)
// // {
// // SaveIsPaidChange(vm, b);
// // }
// //}
//}
private void linkExcelExport_RequestNavigate(object sender, RequestNavigateEventArgs e)
@@ -327,7 +326,7 @@ namespace BeWo.View.Detail.Accounting
private void ReloadButton_OnClick(object sender, RoutedEventArgs e)
{
RefreshInvoiceList();
}
}
private void btn_storno_Initialized(object sender, EventArgs e)
{
@@ -337,6 +336,17 @@ namespace BeWo.View.Detail.Accounting
btn.Visibility = Visibility.Collapsed;
}
}
private void gridView_CellValueChanged(object sender, CellValueChangedEventArgs e)
{
if (e.Column != null && e.Column.FieldName == "IsPaid")
{
if (e.Value is bool b && e.Row is InvoiceBaseVM vm)
{
SaveIsPaidChange(vm, b);
}
}
}
}
}

3
BeWo/View/Detail/DienstView.xaml
View File

@@ -7,6 +7,7 @@
xmlns:val="clr-namespace:BeWo.Validation"
xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid"
xmlns:validation="clr-namespace:BeWo.Validation"
xmlns:t="clr-namespace:BeWo.MultiLanguage.Markup"
xmlns:diagnostics="clr-namespace:System.Diagnostics;assembly=WindowsBase"
Height="Auto" Width="Auto" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch" Focusable="True">
@@ -151,7 +152,7 @@
</ControlTemplate>
</dxg:GridColumn.EditTemplate>
</dxg:GridColumn>
<dxg:GridColumn x:Name="_ColumnWohnheim" FieldName="Wohnheim" Header="Wohnheim" Width="100">
<dxg:GridColumn x:Name="_ColumnWohnheim" FieldName="Wohnheim" Header="{t:Translate Wohnprojekt}" Width="100">
<dxg:GridColumn.DisplayTemplate>
<ControlTemplate>
<Label Content="{Binding Value}" />

7
BeWo/View/Detail/Report/DienstplanerView.xaml.cs
View File

@@ -1928,7 +1928,12 @@ namespace BeWo.View.Detail.Report
}
private void Button_SchichtenEntfernenBestaetigen_Click(object sender, RoutedEventArgs e)
{
RemoveDiensteForMonthOrYear(_AuswahlMonat, Checkbox_RegelmaessigeSchichtenEntfernen.IsChecked.Value, Combobox_SchichtenEntfernen.SelectedIndex);
var res = MessageBox.Show("Achtung: Das Entfernen der ausgewählten Dienste kann nicht rückgängig gemacht werden. Wollen Sie trotzdem fortfahren?", "BeWoPlaner",
MessageBoxButton.YesNo, MessageBoxImage.Warning, MessageBoxResult.Yes, MessageBoxOptions.DefaultDesktopOnly);
if (res == MessageBoxResult.Yes)
RemoveDiensteForMonthOrYear(_AuswahlMonat, Checkbox_RegelmaessigeSchichtenEntfernen.IsChecked.Value, Combobox_SchichtenEntfernen.SelectedIndex);
else
return;
}
// Dienste eines Monats löschen

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

@@ -15,7 +15,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.Grid;
@@ -76,7 +76,7 @@ namespace BeWo.View.Detail
public override string Title
{
get { return "Wohnheim"; }
get { return Translator.Translate("Wohnprojekt"); }
}
internal override DependencyObject ValidationOnSaveRootElement
@@ -108,7 +108,7 @@ namespace BeWo.View.Detail
//Abfrage if Name is null or empty -> Message Bitte den Namen eingeben
if(textbox_first.Text.Equals("")){
textbox_first.Focus();
MessageBox.Show("Bitte dem Wohnheim einen Namen geben.");
MessageBox.Show("Bitte dem Wohnprojekt einen Namen geben.");
}
else{
//sonst

14
BeWo/ViewModel/ListViewModel/InvoiceBaseListVM.cs
View File

@@ -16,6 +16,7 @@ namespace BeWo.ViewModel.ListViewModel
public static string PropertyName_DateTimeSpanFilter = "DateTimeSpanFilter";
public static string PropertyName_FilterResultAmountSum = "FilterResultAmountSum";
public static string PropertyName_FilterResultAmountNotPaidSum = "FilterResultAmountNotPaidSum";
private DateTimeSpan _DateTimeSpanFilter;
@@ -28,6 +29,7 @@ namespace BeWo.ViewModel.ListViewModel
public InvoiceBaseListVM(List<InvoiceBaseDC> pDCs) : base(pDCs)
{
this.VMList.ListChanged += (s, e) => this.FirePropertyChanged(PropertyName_FilterResultAmountSum);
this.VMList.ListChanged += (s, e) => this.FirePropertyChanged(PropertyName_FilterResultAmountNotPaidSum);
}
#endregion
@@ -60,6 +62,17 @@ namespace BeWo.ViewModel.ListViewModel
return this.VMList.Sum(e => e.TotalAmount);
}
}
public decimal? FilterResultAmountNotPaidSum
{
get
{
decimal? sum = 0.0m;
foreach (var item in this.VMList)
sum += item.IsPaid ? item.TotalAmount : 0;
return FilterResultAmountSum - sum;
}
}
#endregion
@@ -70,6 +83,7 @@ namespace BeWo.ViewModel.ListViewModel
this.VMList.AddRange(dcList.Select(CreateVM));
this.FirePropertyChanged(PropertyName_FilterResultAmountSum);
this.FirePropertyChanged(PropertyName_FilterResultAmountNotPaidSum);
}
}
}

73
ReportImp/AutismusKoelnBonn/AutismusKoelnBonn.csproj Normal file
View File

@@ -0,0 +1,73 @@
<?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>{43024B23-C380-4DCE-8DC0-930292417A25}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>KundeXyz</RootNamespace>
<AssemblyName>1011478760_Reports</AssemblyName>
<TargetFrameworkVersion>v4.7.2</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="Properties\AssemblyInfo.cs" />
<Compile Include="Service\CustomCustomerService.cs" />
</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>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

36
ReportImp/AutismusKoelnBonn/Properties/AssemblyInfo.cs Normal file
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("KundeXyz")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("KundeXyz")]
[assembly: AssemblyCopyright("Copyright © 2020")]
[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("c1fed668-adb9-47e0-b589-1389618e1b6e")]
// 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")]

246
ReportImp/AutismusKoelnBonn/Service/CustomCustomerService.cs Normal file
View File

@@ -0,0 +1,246 @@
using BeWo.Data.Access;
using BeWo.Data.Entities;
using BeWo.Service.Plugins;
using BS.Shared;
using BS.Shared.DataContracts;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Net;
using System.Text;
using System.Threading.Tasks;
namespace AutismusKoelnBonn
{
public class CustomCustomerService : CustomerService
{
public override long InsertNewCustomer(CustomerDC pCustomerDc)
{
var cOid = base.InsertNewCustomer(pCustomerDc);
// Ordner 1
var folder_01 = CreateBeWoFolder("LE Stammdaten - moveAUT", cOid, null);
var folder_01_01 = CreateBeWoFolder("Stammdatenbogen", cOid, folder_01.Oid);
var folder_01_02 = CreateBeWoFolder("Notfalldaten", cOid, folder_01.Oid);
var folder_01_03 = CreateBeWoFolder("Anamnese", cOid, folder_01.Oid);
var folder_01_04 = CreateBeWoFolder("Biografie", cOid, folder_01.Oid);
var folder_01_05 = CreateBeWoFolder("Ausweise/Dokumente", cOid, folder_01.Oid);
var folder_01_06 = CreateBeWoFolder("Vollmachten", cOid, folder_01.Oid);
//Ordner 2
var folder_02 = CreateBeWoFolder("Verwaltungsdaten", cOid, null);
var folder_02_01 = CreateBeWoFolder("Erstkontakt bis Betreuungsbeginn", cOid, folder_02.Oid);
var folder_02_02 = CreateBeWoFolder("Verträge mit Leistungsanbieter", cOid, folder_02.Oid);
var folder_02_02_01 = CreateBeWoFolder("Betreuung", cOid, folder_02_02.Oid);
var folder_02_02_02 = CreateBeWoFolder("Therapie", cOid, folder_02_02.Oid);
var folder_02_02_03 = CreateBeWoFolder("Wohnen", cOid, folder_02_02.Oid);
var folder_02_02_04 = CreateBeWoFolder("Einverständiserklärung", cOid, folder_02_02.Oid);
var folder_02_03 = CreateBeWoFolder("Leistungsträger (LT) - chron. Aufzählung (Ablage nach Datum)", cOid, folder_02.Oid);
var folder_02_03_01 = CreateBeWoFolder("Selbstzahler", cOid, folder_02_03.Oid);
var folder_02_03_01_01 = CreateBeWoFolder("Hilfeplangespräche", cOid, folder_02_03_01.Oid);
var folder_02_03_01_02 = CreateBeWoFolder("Sachstandsbericht", cOid, folder_02_03_01.Oid);
var folder_02_03_01_03 = CreateBeWoFolder("Kostenübernehme / Bewilligungen", cOid, folder_02_03_01.Oid);
var folder_02_03_01_04 = CreateBeWoFolder("Rechnungswesen", cOid, folder_02_03_01.Oid);
var folder_02_03_01_04_01 = CreateBeWoFolder("Leistungsnachweise", cOid, folder_02_03_01_04.Oid);
var folder_02_03_01_04_02 = CreateBeWoFolder("Rechnungen", cOid, folder_02_03_01_04.Oid);
var folder_02_03_01_04_03 = CreateBeWoFolder("Monatsabrechnungen", cOid, folder_02_03_01_04.Oid);
var folder_02_03_01_04_04 = CreateBeWoFolder("Eigenanteil", cOid, folder_02_03_01_04.Oid);
var folder_02_03_01_05 = CreateBeWoFolder("Kommunikation/Schriftverkehr mit LT", cOid, folder_02_03_01.Oid);
var folder_02_03_01_06 = CreateBeWoFolder("Abschlussbericht", cOid, folder_02_03_01.Oid);
var folder_02_03_02 = CreateBeWoFolder("Persönliches Budget (Case Management)", cOid, folder_02_03.Oid);
var folder_02_03_02_01 = CreateBeWoFolder("Hilfeplangespräche", cOid, folder_02_03_02.Oid);
var folder_02_03_02_02 = CreateBeWoFolder("Sachstandsbericht", cOid, folder_02_03_02.Oid);
var folder_02_03_02_03 = CreateBeWoFolder("Kostenübernahme / Bewilligungen", cOid, folder_02_03_02.Oid);
var folder_02_03_02_04 = CreateBeWoFolder("Rechnungswesen", cOid, folder_02_03_02.Oid);
var folder_02_03_02_04_01 = CreateBeWoFolder("Leistungsnachweise", cOid, folder_02_03_02_04.Oid);
var folder_02_03_02_04_02 = CreateBeWoFolder("Rechnungen", cOid, folder_02_03_02_04.Oid);
var folder_02_03_02_04_03 = CreateBeWoFolder("Monatsabrechnungen", cOid, folder_02_03_02_04.Oid);
var folder_02_03_02_04_04 = CreateBeWoFolder("Eigenanteil", cOid, folder_02_03_02_04.Oid);
var folder_02_03_02_05 = CreateBeWoFolder("Kommunikation/Schriftverkehr mit LT", cOid, folder_02_03_02.Oid);
var folder_02_03_02_06 = CreateBeWoFolder("Abschlussbericht", cOid, folder_02_03_02.Oid);
var folder_02_03_03 = CreateBeWoFolder("LVR / LWL", cOid, folder_02_03.Oid);
var folder_02_03_03_01 = CreateBeWoFolder("Bedarfsanzeigen", cOid, folder_02_03_03.Oid);
var folder_02_03_03_02 = CreateBeWoFolder("Antrag BEI_NRW / IHP", cOid, folder_02_03_03.Oid);
var folder_02_03_03_03 = CreateBeWoFolder("Antrag BEI_NRW", cOid, folder_02_03_03.Oid);
var folder_02_03_03_03_01 = CreateBeWoFolder("Vorlage Checkliste Blanko", cOid, folder_02_03_03_03.Oid);
var folder_02_03_03_03_02 = CreateBeWoFolder("Fachärztliche Stellungsnahme", cOid, folder_02_03_03_03.Oid);
var folder_02_03_03_03_03 = CreateBeWoFolder("Grundsicherung", cOid, folder_02_03_03_03.Oid);
var folder_02_03_03_03_04 = CreateBeWoFolder("Kontoauszüge", cOid, folder_02_03_03_03.Oid);
var folder_02_03_03_03_05 = CreateBeWoFolder("Vermögenserklärung / Vermögensnegativerklärung", cOid, folder_02_03_03_03.Oid);
var folder_02_03_03_04 = CreateBeWoFolder("Kostenübernahme / Bewilligungen", cOid, folder_02_03_03.Oid);
var folder_02_03_03_05 = CreateBeWoFolder("Rechnungswesen", cOid, folder_02_03_03.Oid);
var folder_02_03_03_05_01 = CreateBeWoFolder("Quittierungsbelege (LVR)", cOid, folder_02_03_03_05.Oid);
var folder_02_03_03_05_02 = CreateBeWoFolder("Budgetnachweis (LWL)", cOid, folder_02_03_03_05.Oid);
var folder_02_03_03_05_03 = CreateBeWoFolder("Leistungsnachweise", cOid, folder_02_03_03_05.Oid);
var folder_02_03_03_05_04 = CreateBeWoFolder("Rechnungen", cOid, folder_02_03_03_05.Oid);
var folder_02_03_03_05_05 = CreateBeWoFolder("Spitzabrechnung (LVR)", cOid, folder_02_03_03_05.Oid);
var folder_02_03_03_05_06 = CreateBeWoFolder("Monatsabrechnung", cOid, folder_02_03_03_05.Oid);
var folder_02_03_03_05_07 = CreateBeWoFolder("Eigenanteil", cOid, folder_02_03_03_05.Oid);
var folder_02_03_03_05_08 = CreateBeWoFolder("Fachabrechnungen (LVR)", cOid, folder_02_03_03_05.Oid);
var folder_02_03_03_06 = CreateBeWoFolder("Kommunikation / Schriftverkehr mit LT", cOid, folder_02_03_03.Oid);
var folder_02_03_03_07 = CreateBeWoFolder("Abschlussbericht", cOid, folder_02_03_03.Oid);
var folder_02_03_04 = CreateBeWoFolder("Jugendamt", cOid, folder_02_03.Oid);
var folder_02_03_04_01 = CreateBeWoFolder("Hilfeplangespräche", cOid, folder_02_03_04.Oid);
var folder_02_03_04_02 = CreateBeWoFolder("Sachstandsbericht", cOid, folder_02_03_04.Oid);
var folder_02_03_04_03 = CreateBeWoFolder("Kostenübernahme / Bewilligungen", cOid, folder_02_03_04.Oid);
var folder_02_03_04_04 = CreateBeWoFolder("Rechnungswesen", cOid, folder_02_03_04.Oid);
var folder_02_03_04_04_01 = CreateBeWoFolder("Leistungsnachweise", cOid, folder_02_03_04_04.Oid);
var folder_02_03_04_04_02 = CreateBeWoFolder("Rechnungen", cOid, folder_02_03_04_04.Oid);
var folder_02_03_04_04_03 = CreateBeWoFolder("Monatsabrechnung", cOid, folder_02_03_04_04.Oid);
var folder_02_03_04_04_04 = CreateBeWoFolder("Eigenanteil", cOid, folder_02_03_04_04.Oid);
var folder_02_03_04_05 = CreateBeWoFolder("Kommunikation / Schriftverkehr mit LT", cOid, folder_02_03_04.Oid);
var folder_02_03_04_06 = CreateBeWoFolder("Abschlussbericht", cOid, folder_02_03_04.Oid);
var folder_02_03_05 = CreateBeWoFolder("Sozialamt", cOid, folder_02_03.Oid);
var folder_02_03_05_01 = CreateBeWoFolder("Hilfeplangespräche", cOid, folder_02_03_05.Oid);
var folder_02_03_05_02 = CreateBeWoFolder("Sachstandsbericht", cOid, folder_02_03_05.Oid);
var folder_02_03_05_03 = CreateBeWoFolder("Kostenübernahme", cOid, folder_02_03_05.Oid);
var folder_02_03_05_04 = CreateBeWoFolder("Rechnungswesen", cOid, folder_02_03_05.Oid);
var folder_02_03_05_05_01 = CreateBeWoFolder("Leistungsnachweise", cOid, folder_02_03_05_04.Oid);
var folder_02_03_05_05_02 = CreateBeWoFolder("Rechnungen", cOid, folder_02_03_05_04.Oid);
var folder_02_03_05_05_03 = CreateBeWoFolder("Monatsabrechnungen", cOid, folder_02_03_05_04.Oid);
var folder_02_03_05_05_04 = CreateBeWoFolder("Eigenanteil", cOid, folder_02_03_05_04.Oid);
var folder_02_03_05_05 = CreateBeWoFolder("Kommunikation / Schriftverkehr mit LT", cOid, folder_02_03_05.Oid);
var folder_02_03_05_06 = CreateBeWoFolder("Abschlussbericht", cOid, folder_02_03_05.Oid);
var folder_02_03_06 = CreateBeWoFolder("Krankenkasse", cOid, folder_02_03.Oid);
var folder_02_03_06_01 = CreateBeWoFolder("Hilfeplangespräche", cOid, folder_02_03_06.Oid);
var folder_02_03_06_02 = CreateBeWoFolder("Sachstandsbericht", cOid, folder_02_03_06.Oid);
var folder_02_03_06_03 = CreateBeWoFolder("Kostenübernahme / Bewilligungen", cOid, folder_02_03_06.Oid);
var folder_02_03_06_04 = CreateBeWoFolder("Rechnungswesen", cOid, folder_02_03_06.Oid);
var folder_02_03_06_04_01 = CreateBeWoFolder("Leistungsnachweise", cOid, folder_02_03_06_04.Oid);
var folder_02_03_06_04_02 = CreateBeWoFolder("Rechnungen", cOid, folder_02_03_06_04.Oid);
var folder_02_03_06_04_03 = CreateBeWoFolder("Monatsabrechnung", cOid, folder_02_03_06_04.Oid);
var folder_02_03_06_04_04 = CreateBeWoFolder("Eigenanteil", cOid, folder_02_03_06_04.Oid);
var folder_02_03_06_05 = CreateBeWoFolder("Kommunikation / Schriftverkehr mit LT", cOid, folder_02_03_06.Oid);
var folder_02_03_06_06 = CreateBeWoFolder("Abschlussbericht", cOid, folder_02_03_06.Oid);
var folder_02_04 = CreateBeWoFolder("Ämter und Behörden (intern)", cOid, folder_02.Oid);
var folder_02_05 = CreateBeWoFolder("Bescheinigungen", cOid, folder_02.Oid);
var folder_02_06 = CreateBeWoFolder("Kommunikation / Schriftverkehr", cOid, folder_02.Oid);
var folder_03 = CreateBeWoFolder("Assistenzleistungen - moveAUT", cOid, null);
var folder_03_01 = CreateBeWoFolder("Notfalldaten", cOid, folder_03.Oid);
var folder_03_02 = CreateBeWoFolder("ICF - Assessment", cOid, folder_03.Oid);
var folder_03_03 = CreateBeWoFolder("Psychiatrisches Assessment", cOid, folder_03.Oid);
var folder_03_04 = CreateBeWoFolder("Verlaufsdokumentationen", cOid, folder_03.Oid);
var folder_03_04_01 = CreateBeWoFolder("Jahr 2022", cOid, folder_03_04.Oid);
var folder_03_04_01_01 = CreateBeWoFolder("Monat Januar", cOid, folder_03_04_01.Oid);
var folder_03_04_01_02 = CreateBeWoFolder("Monat Februar", cOid, folder_03_04_01.Oid);
var folder_03_04_01_03 = CreateBeWoFolder("Monat März", cOid, folder_03_04_01.Oid);
var folder_03_04_01_04 = CreateBeWoFolder("Monat April", cOid, folder_03_04_01.Oid);
var folder_03_04_01_05 = CreateBeWoFolder("Monat Mai", cOid, folder_03_04_01.Oid);
var folder_03_04_01_06 = CreateBeWoFolder("Monat Juni", cOid, folder_03_04_01.Oid);
var folder_03_04_01_07 = CreateBeWoFolder("Monat Juli", cOid, folder_03_04_01.Oid);
var folder_03_04_01_08 = CreateBeWoFolder("Monat August", cOid, folder_03_04_01.Oid);
var folder_03_04_01_09 = CreateBeWoFolder("Monat September", cOid, folder_03_04_01.Oid);
var folder_03_04_01_010 = CreateBeWoFolder("Monat Oktober", cOid, folder_03_04_01.Oid);
var folder_03_04_01_011 = CreateBeWoFolder("Monat November", cOid, folder_03_04_01.Oid);
var folder_03_04_01_012 = CreateBeWoFolder("Monat Dezember", cOid, folder_03_04_01.Oid);
var folder_03_05 = CreateBeWoFolder("Handlungsleitende Angebote", cOid, folder_03.Oid);
var folder_03_05_01 = CreateBeWoFolder("Tagesstruktur", cOid, folder_03_05.Oid);
var folder_03_05_02 = CreateBeWoFolder("Wochenstruktur", cOid, folder_03_05.Oid);
var folder_03_05_03 = CreateBeWoFolder("Gruppenangbote", cOid, folder_03_05.Oid);
var folder_03_05_04 = CreateBeWoFolder("Andere", cOid, folder_03_05.Oid);
var folder_03_06 = CreateBeWoFolder("Rechtliche Betreuung", cOid, folder_03.Oid);
var folder_03_06_01 = CreateBeWoFolder("Bestellungsurkunde", cOid, folder_03_06.Oid);
var folder_03_06_02 = CreateBeWoFolder("Kommunikation / Schriftverkehr", cOid, folder_03_06.Oid);
var folder_03_06_03 = CreateBeWoFolder("Protokolle", cOid, folder_03_06.Oid);
var folder_03_06_04 = CreateBeWoFolder("Absprachen", cOid, folder_03_06.Oid);
var folder_04 = CreateBeWoFolder("Therapeutische Daten", cOid, null);
var folder_04_01 = CreateBeWoFolder("Anamnese, Assessments", cOid, folder_04.Oid);
var folder_04_02 = CreateBeWoFolder("Leistungsträger", cOid, folder_04.Oid);
var folder_04_02_01 = CreateBeWoFolder("Kassen", cOid, folder_04_02.Oid);
var folder_04_02_02 = CreateBeWoFolder("Anträge", cOid, folder_04_02.Oid);
var folder_04_02_03 = CreateBeWoFolder("Bewilligungen", cOid, folder_04_02.Oid);
var folder_04_03 = CreateBeWoFolder("Entwicklungsberichte", cOid, folder_04.Oid);
var folder_04_04 = CreateBeWoFolder("Stellungnahmen", cOid, folder_04.Oid);
var folder_04_05 = CreateBeWoFolder("Protokolle", cOid, folder_04.Oid);
var folder_04_06 = CreateBeWoFolder("Therapiematerialien", cOid, folder_04.Oid);
var folder_04_07 = CreateBeWoFolder("Kommunikation / Schriftverkehr", cOid, folder_04.Oid);
var folder_04_08 = CreateBeWoFolder("Sonstiges", cOid, folder_04.Oid);
var folder_05 = CreateBeWoFolder("Sozialarbeiterische Daten", cOid, null);
var folder_05_01 = CreateBeWoFolder("Berufliche Rehabilitation", cOid, folder_05.Oid);
var folder_05_02 = CreateBeWoFolder("Berichte", cOid, folder_05.Oid);
var folder_05_03 = CreateBeWoFolder("Urkunden", cOid, folder_05.Oid);
var folder_05_04 = CreateBeWoFolder("Gerichtsbeschlüsse", cOid, folder_05.Oid);
var folder_05_05 = CreateBeWoFolder("Urteile", cOid, folder_05.Oid);
var folder_05_06 = CreateBeWoFolder("Gutachten", cOid, folder_05.Oid);
var folder_05_07 = CreateBeWoFolder("Kommunikation / Schriftverkehr", cOid, folder_05.Oid);
var folder_05_08 = CreateBeWoFolder("Sonstiges", cOid, folder_05.Oid);
var folder_06 = CreateBeWoFolder("Medizinische Daten (SGB)", cOid, null);
var folder_06_01 = CreateBeWoFolder("Symptome", cOid, folder_06.Oid);
var folder_06_02 = CreateBeWoFolder("Diagnosen", cOid, folder_06.Oid);
var folder_06_03 = CreateBeWoFolder("Kopien von Verordnungen", cOid, folder_06.Oid);
var folder_06_04 = CreateBeWoFolder("Arztberichte", cOid, folder_06.Oid);
var folder_06_05 = CreateBeWoFolder("Klinikaufenthalte", cOid, folder_06.Oid);
var folder_06_06 = CreateBeWoFolder("Laborwerte", cOid, folder_06.Oid);
var folder_06_07 = CreateBeWoFolder("Behandlungspläne", cOid, folder_06.Oid);
var folder_06_08 = CreateBeWoFolder("Kommunikation / Schriftverkehr", cOid, folder_06.Oid);
var folder_06_09 = CreateBeWoFolder("Sonstiges", cOid, folder_06.Oid);
var folder_07 = CreateBeWoFolder("Pfleg. Daten (SGB)", cOid, null);
var folder_07_01 = CreateBeWoFolder("Informationssammlung", cOid, folder_07.Oid);
var folder_07_02 = CreateBeWoFolder("Pflegeberichte", cOid, folder_07.Oid);
var folder_07_03 = CreateBeWoFolder("Pflegeplanung", cOid, folder_07.Oid);
var folder_07_04 = CreateBeWoFolder("Medikamentenplan", cOid, folder_07.Oid);
var folder_07_05 = CreateBeWoFolder("Kommunikation / Schriftverkehr", cOid, folder_07.Oid);
var folder_07_06 = CreateBeWoFolder("Sonstiges", cOid, folder_07.Oid);
return cOid;
}
private BeWoFolder CreateBeWoFolder(string name, long? cOid, long? parentOid)
{
BeWoFolder f = new BeWoFolder();
f.Name = name;
f.ObjectOid = cOid;
f.ObjectTid = TableID.Customer;
f.ParentBeWoFolderOid = parentOid;
DAOFactory.GenericDAO.Insert(f);
return f;
}
private void CreateSubFolder(string[] vs, BeWoFolder folder)
{
foreach (var foldername in vs)
{
CreateBeWoFolder(foldername, folder.ObjectOid, folder.ParentBeWoFolderOid);
}
}
private void SaveHierarchie(List<Folder> folderList, long cOid, long? parentOid)
{
foreach (var item in folderList)
{
var f = CreateBeWoFolder(item.Name, cOid, parentOid);
SaveHierarchie(item.Subfolder, cOid, f.Oid);
}
}
}
public class Folder
{
public Folder(String name)
{
Name = name;
Subfolder = new List<Folder>();
}
public String Name { get; set; }
public List<Folder> Subfolder { get; set; }
}
}

3
ReportImp/WegweiserBetreuungsdienstReports/WegweiserBetreuungsdienstReports.csproj
View File

@@ -49,6 +49,9 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="DevExpress.Mvvm.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
<Private>False</Private>
</Reference>
<Reference Include="DevExpress.Pdf.v17.1.Core, 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.Data.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />

11
Service/Configuration/AppSettings.cs
View File

@@ -61,8 +61,10 @@ namespace BeWo.Service.Configuration
public bool ShowChat { get; set; }
public int DienstplanungStandardZeilenAnzahl { get; set; }
public static AppSettings CreateSettings()
public static AppSettings CreateSettings()
{
AppSettings settings = new AppSettings();
@@ -86,6 +88,7 @@ namespace BeWo.Service.Configuration
int zeiterfassungsSchwellwert = 80;
bool sortServiceDescriptionAlphabetically = false;
settings.ShowAdvisedAttendedFlag = false;
settings.DienstplanungStandardZeilenAnzahl = 1;
bool printerSettingsUseLandscape = false;
@@ -163,6 +166,12 @@ namespace BeWo.Service.Configuration
{
zeiterfassungsSchwellwert = resultschwell;
}
val = GetSettingValue(mandator.Settings, "DienstplanungStandardZeilenAnzahl");
if (int.TryParse(val, out var zeilenanzahl))
{
settings.DienstplanungStandardZeilenAnzahl = zeilenanzahl;
}
val = GetSettingValue(mandator.Settings, "ShowDistanceFields");
if (val != null && val.Equals("1"))

4
Service/Dienstplanung/DienstplanungsManager.cs
View File

@@ -1,5 +1,6 @@
using BeWo.Data.Access;
using BeWo.Data.Entities;
using BeWo.Service.Configuration;
using BeWo.Service.Core;
using BeWo.Service.DCEntityMapper;
using BeWo.Service.Plugins;
@@ -27,6 +28,9 @@ namespace BeWo.Service.Dienstplanung
public static DienstplanerRootDC BuildDienstplanerRootObject(DateTime date, long wohnheimOid)
{
var anzahlZeilen = AppSettings.CreateSettings().DienstplanungStandardZeilenAnzahl;
DienstplanerRootDC root = new DienstplanerRootDC();
OperationsServiceImp os = new OperationsServiceImp();

10
Shared/Core/EnumTranslations.cs
View File

@@ -128,19 +128,19 @@ namespace BS.Shared.Core
UserRightType.EmployeeView_Delete, Translator.Translate("Mitarbeiter löschen")
},
{
UserRightType.WohnheimView_Create, Translator.Translate("Wohnheime anlegen")
UserRightType.WohnheimView_Create, Translator.Translate("Wohnprojekte anlegen")
},
{
UserRightType.WohnheimView_Delete, Translator.Translate("Wohnheime löschen")
UserRightType.WohnheimView_Delete, Translator.Translate("Wohnprojekte löschen")
},
{
UserRightType.WohnheimView_Edit, Translator.Translate("Wohnheime bearbeiten")
UserRightType.WohnheimView_Edit, Translator.Translate("Wohnprojekte bearbeiten")
},
{
UserRightType.WohnheimView_View, Translator.Translate("Wohnheime ansehen")
UserRightType.WohnheimView_View, Translator.Translate("Wohnprojekte ansehen")
},
{
UserRightType.Wohnheim_AllowArchiving, Translator.Translate("Wohnheime archivieren")
UserRightType.Wohnheim_AllowArchiving, Translator.Translate("Wohnprojekte archivieren")
},
{
UserRightType.EmployeeView_Edit, Translator.Translate("Mitarbeiter ändern (alle)")

2
Shared/Core/SettingsKeys.cs
View File

@@ -46,6 +46,8 @@
public static string ShowUrlaubsplanung => "ShowUrlaubsplanung";
public static string DontShowSpitzabrechnung => "DontShowSpitzabrechnung";
public static string ShowDienstplanung => "ShowDienstplanung";
public static string DienstplanungStandardZeilenAnzahl => "DienstplanungStandardZeilenAnzahl";
public static string ShowMarker => "ShowMarker";
public static string ShowAnnualReport => "ShowAnnualReport";
public static string ShowCustomerDistanceFields => "ShowCustomerDistanceFields";