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

Neue Sortiermöglichkeit der Bewilligungen im Hilfeplan

Browse Source 
An Vorlagen weitergearbeitet
This commit is contained in:
Christian
2024-12-19 17:13:03 +01:00
parent 916eabf15f
commit 69357d7380
21 changed files with 476 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
BeWo/BeWo.csproj
View File

@@ -43,12 +43,12 @@
<TargetCulture>de-DE</TargetCulture>
<ProductName>BeWoPlaner</ProductName>
<PublisherName>ownSoft GmbH</PublisherName>
<MinimumRequiredVersion>2.0.1.255</MinimumRequiredVersion>
<MinimumRequiredVersion>2.0.1.256</MinimumRequiredVersion>
<CreateWebPageOnPublish>true</CreateWebPageOnPublish>
<WebPage>publish.htm</WebPage>
<OpenBrowserOnPublish>false</OpenBrowserOnPublish>
<TrustUrlParameters>true</TrustUrlParameters>
<ApplicationRevision>256</ApplicationRevision>
<ApplicationRevision>257</ApplicationRevision>
<ApplicationVersion>2.0.1.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<CreateDesktopShortcut>true</CreateDesktopShortcut>

8
BeWo/BeWoApp.xaml.cs
View File

@@ -51,7 +51,7 @@ namespace BeWo
public static MainControl MainControl;
public static string ShortVersion = "3.22";
public static string Version = "Version 3.23 TEST";
public static string Version = "Version 3.23.2 TEST";
public static int RenderTier = 0;
@@ -868,6 +868,7 @@ namespace BeWo
UserSettingsUtils.SetSettingValue(SettingsType.ApplicationSettings, SettingsKeys.LastSelectedServiceRecordTimeIntervalDays, _AppSettings.LastSelectedServiceRecordTimeIntervalDays.ToString(), _LoggedOnUser.Settings);
UserSettingsUtils.SetSettingValue(SettingsType.ApplicationSettings, SettingsKeys.LastSelectedServiceRecordMonth, _AppSettings.LastSelectedServiceRecordMonth.ToString(), _LoggedOnUser.Settings);
UserSettingsUtils.SetSettingValue(SettingsType.ApplicationSettings, SettingsKeys.LastKassenSortOrder, _AppSettings.LastKassenSortOrder.ToString(), _LoggedOnUser.Settings);
UserSettingsUtils.SetSettingValue(SettingsType.ApplicationSettings, SettingsKeys.LastBewilligungSortOrder, _AppSettings.LastBewilligungSortOrder.ToString(), _LoggedOnUser.Settings);
UserSettingsUtils.SetSettingValue(SettingsType.ApplicationSettings, SettingsKeys.LetzteZeiterfassungsDauer, ((int)_AppSettings.LetzteZeiterfassungsDauer).ToString(), _LoggedOnUser.Settings);
UserSettingsUtils.SetSettingValue(SettingsType.ApplicationSettings, SettingsKeys.SchedulerViewType, ((int) _AppSettings.SchedulerViewType).ToString(), _LoggedOnUser.Settings);
UserSettingsUtils.SetSettingValue(SettingsType.ApplicationSettings, SettingsKeys.SchedulerTimelineViewDayCount, _AppSettings.SchedulerTimelineViewDayCount.ToString(), _LoggedOnUser.Settings);
@@ -1181,6 +1182,11 @@ namespace BeWo
_AppSettings.LastKassenSortOrder = Convert.ToInt32(UserSettingsUtils.GetSettingValue(SettingsType.ApplicationSettings, SettingsKeys.LastKassenSortOrder, settings));
}
val = UserSettingsUtils.GetSettingValue(SettingsType.ApplicationSettings, SettingsKeys.LastBewilligungSortOrder, settings);
if (val != null)
{
_AppSettings.LastBewilligungSortOrder = Convert.ToInt32(UserSettingsUtils.GetSettingValue(SettingsType.ApplicationSettings, SettingsKeys.LastBewilligungSortOrder, settings));
}
val = UserSettingsUtils.GetSettingValue(SettingsType.ApplicationSettings, SettingsKeys.LetzteZeiterfassungsDauer, settings);
if (val != null)
{

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

@@ -42,6 +42,8 @@ namespace BeWo.Core.Config
private int mLastKassenSortOrder = 1;
private int mLastBewilligungSortOrder = 0;
private ZeiterfassungsDauer mLetzteZeiterfassungsDauer = ZeiterfassungsDauer.Minuten;
public enum WindowStateType
@@ -353,6 +355,20 @@ namespace BeWo.Core.Config
IsDirty = true;
}
}
}
public int LastBewilligungSortOrder
{
get { return mLastBewilligungSortOrder; }
set
{
if (mLastBewilligungSortOrder != value)
{
mLastBewilligungSortOrder = value;
IsDirty = true;
}
}
}

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

@@ -420,7 +420,7 @@
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="23" />
<RowDefinition Height="25" />
</Grid.RowDefinitions>
<TextBlock Text="Details" Margin="0 1"
VerticalAlignment="Bottom"
@@ -522,9 +522,10 @@
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="23" />
<RowDefinition Height="25" />
</Grid.RowDefinitions>
<TextBlock Text="{markup:Translate Bewilligungen}" TextElement.FontSize="16"
VerticalAlignment="Bottom"
@@ -532,9 +533,13 @@
TextElement.FontFamily="Microsoft Sans Serif"
Margin="0 1"
/>
<Button Margin="5,0,0,0" x:Name="button_addApprovalPeriod" Tag="{Binding}"
<StackPanel Grid.Column="1" Orientation="Horizontal" VerticalAlignment="Stretch" Margin="5,0,3,0">
<Label Content="Sortierung:" />
<ComboBox Height="23" Loaded="SortComboBox_Loaded" Tag="{Binding}" VerticalAlignment="Top" MinWidth="180" ItemsSource="{Binding SortItems}" SelectedIndex="{Binding SelectedSortIndex}" SelectionChanged="SortComboBox_SelectionChanged"/>
</StackPanel>
<Button Margin="5,0,0,0" x:Name="button_addApprovalPeriod" Tag="{Binding}"
Click="button_addApprovalPeriod_Click"
HorizontalAlignment="Center" Grid.Column="1"
HorizontalAlignment="Center" Grid.Column="2"
Width="21" Height="21" VerticalAlignment="Top">
<Grid Width="18" HorizontalAlignment="Center"
VerticalAlignment="Center">
@@ -560,7 +565,7 @@
</GroupBox.Header>
<ListView x:Name="listViewCostBearer" Grid.Row="1"
ScrollViewer.HorizontalScrollBarVisibility="Disabled"
ItemsSource="{Binding ApprovalPeriodList.VMList}"
ItemsSource="{Binding SortedVMList}"
Background="Transparent" BorderBrush="Transparent"
HorizontalAlignment="Left">
<ListView.ItemContainerStyle>

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

@@ -246,6 +246,20 @@ namespace BeWo.View.Detail
#region Public Methods
//private void InitSortCombo(ComboBox cb)
//{
// var list = new List<String>();
// list.Add("aufsteigend");
// list.Add("absteigend");
// cb.ItemsSource = list;
// cb.SelectedIndex = BeWoApp.AppSettings.LastBewilligungSortOrder;
//}
public override void ModalPopUpCloseInvoked()
{
this.MainControl.CloseCurrentPopUp();
@@ -2023,6 +2037,63 @@ namespace BeWo.View.Detail
}
return null;
}
private void SortComboBox_Loaded(object sender, RoutedEventArgs e)
{
var cb = sender as ComboBox;
if (cb != null)
{
//InitSortCombo(cb);
}
}
private void SortComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
{
var cb = sender as ComboBox;
//if (cb != null)
//{
var cb2 = e.OriginalSource as DependencyObject;
var sp2 = VisualTreeHelper.GetParent(cb2);
//Finde ListView
var sp = cb.Parent as StackPanel;
if (sp2 == sp)
{
int test = 0;
}
var g = sp.Parent as Grid;
var gb = g.Parent as GroupBox;
var lv = gb.Content as ListView;
//lv.ItemsSource = null;
var c2s = cb.Tag as SupportConceptCostBearerRelVM;
//var list = lv.ItemsSource as BindingList<SupportConceptApprovalPeriodVM>;
//lv.ItemsSource = null;
//if (cb.SelectedIndex == 0)
//{
// list.Sort((a, b) => a.StartDate.HasValue ? a.StartDate.Value.CompareTo(b.StartDate) : 0);
//}
//else
//{
// list.Sort((a, b) => b.StartDate.HasValue ? b.StartDate.Value.CompareTo(a.StartDate) : 0);
//}
//list.Sort((a, b) => b.StartDate.HasValue ? b.StartDate.Value.CompareTo(a.StartDate) : 0);
//lv.Items.SortDescriptions.Add(new SortDescription { PropertyName = "StartDate", Direction = ListSortDirection.Descending });
//lv.ItemsSource = c2s.ApprovalPeriodList.VMList;
//lv.ItemsSource.RaisePropertyChanged
//BeWoApp.AppSettings.LastBewilligungSortOrder = cb.SelectedIndex;
BeWoApp.SaveAppSettings();
//}
}
}
public class ValueListEntryTypeToColorConverter : IValueConverter
@@ -2044,4 +2115,6 @@ namespace BeWo.View.Detail
throw new NotImplementedException();
}
}
}

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

@@ -1,5 +1,8 @@
using BeWo.ViewModel;
using BeWo.ServiceProxy;
using BeWo.ViewModel;
using BS.Shared;
using BS.Shared.DataContracts;
using BS.Shared.Translation;
using DevExpress.Utils;
using DevExpress.Xpf.Grid;
using System;
@@ -13,7 +16,33 @@ namespace BeWo.View.Document
{
public class DokumentViewHelper
{
public static void CreateTemplateTreeViewItems(TreeListControl treeControl, IList<VorlagentabelleDC> vorlagentabellen)
public static void OpenTemplateSelectionDialog(List<DokumentvorlageDC> alleVorlagen, TableID objectTid, long objectOid)
{
var alleVorlagenTabellen = ServiceFacade.DoOperationsServiceSync(s => s.GetVorlagentabelleDCs());
var tabelle = alleVorlagenTabellen.FirstOrDefault(v => v.VorlagentabelleObjectTid.HasValue && v.VorlagentabelleObjectTid.Value == (int)objectTid);
if (tabelle != null)
{
var view = new SingleTemplateSelectionView();
var customerFolderList = VMFactory.CreateFolderList(objectTid, objectOid);
var templateFolderList = VMFactory.CreateFolderList(TableID.Vorlagentabelle, tabelle.VorlagentabelleOid.Value);
view.InitView(tabelle, alleVorlagen, templateFolderList, customerFolderList, true, false);
var beWoWindow = BeWoWindowBuilder.GetBeWoWindow(Translator.Translate("Vorlage auswählen"), view, 500, 500);
view.ButtonCancelClicked += () => beWoWindow.Close();
view.ButtonCreateForSelectionClicked += () =>
{
beWoWindow.Close();
};
beWoWindow.ShowDialog();
}
}
public static void CreateTemplateTreeViewItems(TreeListControl treeControl, IList<VorlagentabelleDC> vorlagentabellen, List<BeWoFolderDC> allFolder, bool expandItems)
{
treeControl.BeginDataUpdate();
@@ -34,67 +63,146 @@ namespace BeWo.View.Document
node.Content = vm;
treeControl.View.Nodes.Add(node);
node.IsExpandButtonVisible = DefaultBoolean.True;
node.IsExpanded = expandItems;
node.Image = LoadImage(table.ImageName);
}
if (allFolder != null && allFolder.Count > 0)
{
AddFolderToTreeView(treeControl, allFolder, expandItems);
}
treeControl.EndDataUpdate();
}
public static void AddFolderToTemplateTreeView(TreeListControl treeControl, List<BeWoFolderDC> folders)
public static void AddTemplatesToTreeView(TreeListControl treeControl, List<DokumentvorlageDC> allTemplates, bool expandItems)
{
treeControl.BeginDataUpdate();
foreach (var folder in folders)
foreach (var template in allTemplates)
{
TreeListNode parentNode = null;
DocumentTreeItemVM parentVm = null;
foreach (var node in treeControl.View.Nodes)
{
var item = node.Content as DocumentTreeItemVM;
if (item != null && item.DocTreeItemOid == folder.BeWoFolderOid)
{
parentNode = node;
parentVm = item;
}
}
if (parentVm != null)
TreeListNode parentNode = FindParentNodeForTemplate(treeControl.View.Nodes, template);
if (parentNode != null)
{
parentNode.IsExpandButtonVisible = DefaultBoolean.True;
var parentVm = parentNode.Content as DocumentTreeItemVM;
DocumentTreeItemDC dc = new DocumentTreeItemDC()
{
DocTreeItemOid = folder.BeWoFolderOid,
DocTreeItemOid = template.DokumentvorlageOid,
ParentOid = parentVm.DocTreeItemOid,
Name = folder.Name,
FilesInFolder = new List<FileAttachmentDC>(),
BeWoFolderDC = folder,
Table = parentVm.DataContract.Table,
ObjectOid = parentVm.DataContract.ObjectOid
Name = template.Name,
Dokumentvorlage = template,
Table = TableID.Dokumentvorlage
};
if (folder.Files.Count != 0)
{
foreach (var file in folder.Files)
{
dc.FilesInFolder.Add(file);
}
}
DocumentTreeItemVM folder_vm = new DocumentTreeItemVM(dc);
var newFolderNode = new TreeListNode()
{
Content = folder_vm,
IsExpandButtonVisible = DefaultBoolean.True,
Tag = false,
Image = LoadFolderImage()
IsExpandButtonVisible = DefaultBoolean.False,
Tag = template,
IsExpanded = expandItems,
Image = LoadDocumentImage()
};
dc.Node = newFolderNode;
parentNode.Nodes.Add(newFolderNode);
}
}
treeControl.EndDataUpdate();
}
private static TreeListNode FindParentNodeForTemplate(TreeListNodeCollection nodes, DokumentvorlageDC template)
{
foreach (TreeListNode node in nodes)
{
var docVm = node.Content as DocumentTreeItemVM;
if (docVm != null && docVm.DocTreeItemOid.HasValue && docVm.DocTreeItemOid == template.Parent)
{
return node;
}
var childNode = FindParentNodeForTemplate(node.Nodes, template);
if (childNode != null)
{
return childNode;
}
}
return null;
}
public static void AddFolderToTreeView(TreeListControl treeControl, List<BeWoFolderDC> folders, bool expandItems)
{
treeControl.BeginDataUpdate();
foreach (var node in treeControl.View.Nodes)
{
AddFolderToNode(node, folders, expandItems);
}
treeControl.EndDataUpdate();
}
private static void AddFolderToNode(TreeListNode parentNode, List<BeWoFolderDC> folders, bool expandItems)
{
if (parentNode != null && folders != null)
{
var parentVm = parentNode.Content as DocumentTreeItemVM;
foreach (var folder in folders)
{
if (folder.BeWoFolderOid.HasValue)
{
//if (parentVm != null && parentVm.DocTreeItemOid == folder.ObjectOid)
//{
DocumentTreeItemDC dc = new DocumentTreeItemDC()
{
DocTreeItemOid = folder.BeWoFolderOid,
ParentOid = parentVm.DocTreeItemOid,
Name = folder.Name,
FilesInFolder = new List<FileAttachmentDC>(),
BeWoFolderDC = folder,
Table = parentVm.DataContract.Table,
ObjectOid = parentVm.DataContract.ObjectOid
};
if (folder.Files.Count != 0)
{
foreach (var file in folder.Files)
{
dc.FilesInFolder.Add(file);
}
}
DocumentTreeItemVM folder_vm = new DocumentTreeItemVM(dc);
var newFolderNode = new TreeListNode()
{
Content = folder_vm,
IsExpandButtonVisible = folder.SubFolders != null && folder.SubFolders.Count > 0 ? DefaultBoolean.True : DefaultBoolean.False,
IsExpanded = expandItems,
Tag = false,
Image = LoadFolderImage()
};
dc.Node = newFolderNode;
parentNode.Nodes.Add(newFolderNode);
AddFolderToNode(newFolderNode, folder.SubFolders, expandItems);
//}
}
else
{
if (folder.ObjectOid.HasValue && folder.ObjectOid == parentVm.DocTreeItemOid)
{
AddFolderToNode(parentNode, folder.SubFolders, expandItems);
}
}
}
}
}
private static void GenerateFolderStructureForSelectedNode(TreeListNode node, List<BeWoFolderDC> folderDCs, bool hideAlleOrdner)
{
if (node.Nodes.Count == 0)
@@ -127,7 +235,7 @@ namespace BeWo.View.Document
newNode_folder = new TreeListNode()
{
Content = folder_vm,
IsExpandButtonVisible = DefaultBoolean.True,
IsExpandButtonVisible = folder.SubFolders != null && folder.SubFolders.Count > 0 ? DefaultBoolean.True : DefaultBoolean.False,
Tag = false,
Image = LoadFolderImage()
};
@@ -164,8 +272,12 @@ namespace BeWo.View.Document
private static BitmapImage LoadFolderImage()
{
return LoadImage("Folder.png");
return LoadImage("Folder");
}
private static BitmapImage LoadDocumentImage()
{
return LoadImage("Document48");
}
}
}

7
BeWo/View/Document/DokumenteView.xaml
View File

@@ -612,8 +612,7 @@
x:Name="datagrid_templates"
Grid.Row="0"
Grid.Column="1"
Margin="2,3,5,5"
DataSource="{Binding SelectedItem.Files, ElementName=treeview}">
Margin="2,3,5,5">
<dxg:GridControl.Columns>
<dxg:GridColumn
Width="24"
@@ -638,7 +637,7 @@
Width="*"
AllowEditing="False"
FieldName="Name"
Header="Dateiname" />
Header="Name" />
<dxg:GridColumn
Width="*"
AllowEditing="False"
@@ -683,7 +682,7 @@
<dxg:TableView
x:Name="TemplateTableView"
AutoWidth="false"
NavigationStyle="Cell"
NavigationStyle="Row"
ShowGroupPanel="False"
ShowGroupedColumns="false"
ShowTotalSummary="False" />

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

@@ -40,6 +40,7 @@ using System.Text;
using BS.Shared.Translation;
using System.Windows.Data;
using System.Globalization;
using System.ComponentModel;
namespace BeWo.View.Document
{
@@ -1270,7 +1271,7 @@ namespace BeWo.View.Document
{
alleVorlagenTabellen = ServiceFacade.DoOperationsServiceSync(s => s.GetVorlagentabelleDCs());
DokumentViewHelper.CreateTemplateTreeViewItems(template_treeview_control, alleVorlagenTabellen);
DokumentViewHelper.CreateTemplateTreeViewItems(template_treeview_control, alleVorlagenTabellen, null, false);
@@ -1307,13 +1308,12 @@ namespace BeWo.View.Document
//if (vm.Name.Equals("Hilfepläne") || vm.Name.Equals("Klienten") || vm.Name.Equals("Mitarbeiter"))
//{
List<BeWoFolderDC> folderDCs = new List<BeWoFolderDC>();
if (vm.DocTreeItemOid.HasValue)
//List<BeWoFolderDC> folderDCs = new List<BeWoFolderDC>();
if (node.Nodes.Count == 0 && vm.DocTreeItemOid.HasValue)
{
folderDCs = VMFactory.CreateFolderList(TableID.Vorlagentabelle, (long)vm.DocTreeItemOid);
GenerateFolderStructureForSelectedNode(node, folderDCs, true);
var folderDCs = VMFactory.CreateFolderList(TableID.Vorlagentabelle, (long)vm.DocTreeItemOid);
DokumentViewHelper.AddFolderToTreeView(template_treeview_control, folderDCs, false);
//GenerateFolderStructureForSelectedNode(node, folderDCs, true);
}
//}
@@ -1387,13 +1387,26 @@ namespace BeWo.View.Document
{
if (e.OriginalSource is MenuItem)
{
var row = TemplateTreeView.SelectedRows[0] as DocumentTreeItemVM;
var twi = e.OriginalSource as MenuItem;
DocumentTreeItemVM row = null;
TreeListNode selectedNode = null;
var selection = template_treeview_control.GetSelectedNodes();
if (selection != null && selection.Length > 0)
{
selectedNode = selection[0];
row = selectedNode.Content as DocumentTreeItemVM;
}
if (selectedNode == null || row == null)
{
return;
}
if (twi.Header.Equals("Neuer Ordner"))
{
TreeListNode node = new TreeListNode();
node.IsExpandButtonVisible = DefaultBoolean.True;
node.IsExpandButtonVisible = DefaultBoolean.False;
node.Image = LoadFolderImage();
BeWoFolderDC folderDC = new BeWoFolderDC()
@@ -1424,6 +1437,7 @@ namespace BeWo.View.Document
dc.Node.Content = vm;
row.DataContract.Node.Nodes.Add(dc.Node);
row.DataContract.Node.IsExpanded = true;
row.DataContract.Node.IsExpandButtonVisible = DefaultBoolean.True;
}
else if (twi.Header.Equals("Umbenennen"))
{
@@ -1436,20 +1450,20 @@ namespace BeWo.View.Document
else if (twi.Header.Equals("Neue Vorlage"))
{
var vm = new DokumentvorlageVM(new DokumentvorlageDC());
VorlagentabelleDC tabelle = ServiceFacade.DoOperationsServiceSync(s => s.GetVorlagentabelleById((long)row.DataContract.BeWoFolderDC.ObjectOid));
vm.Tabellenzugehoerigkeit = (long)tabelle.VorlagentabelleObjectTid;
vm.Parent = row.DataContract.BeWoFolderDC.BeWoFolderOid;
var savedTemplate = EditTemplate(vm);
if(savedTemplate != null)
if (savedTemplate != null)
{
if(savedTemplate.IsDirty)
if (savedTemplate.IsDirty)
{
var savedDC = SaveInDatabase(savedTemplate);
savedTemplate = new DokumentvorlageVM(savedDC);
var tableitems = datagrid_templates.ItemsSource as List<DokumentvorlageVM>;
datagrid_templates.ItemsSource = new List<DokumentvorlageVM>();
var tableitems = datagrid_templates.ItemsSource as BindingList<DokumentvorlageVM>;
datagrid_templates.ItemsSource = new BindingList<DokumentvorlageVM>();
tableitems.Add(savedTemplate);
datagrid_templates.ItemsSource = tableitems;
@@ -1464,7 +1478,7 @@ namespace BeWo.View.Document
private DokumentvorlageVM EditTemplate(DokumentvorlageVM vm)
{
var row = TemplateTreeView.SelectedRows[0] as DocumentTreeItemVM;
var folder = ServiceFacade.DoOperationsServiceSync(s => s.GetFolderById((long)row.DataContract.BeWoFolderDC.BeWoFolderOid));
//var folder = ServiceFacade.DoOperationsServiceSync(s => s.GetFolderById((long)row.DataContract.BeWoFolderDC.BeWoFolderOid));
var vt = GetVorlagenTabelleFromSelectedTreeItem(row);
if (vt == null)
{
@@ -1488,6 +1502,11 @@ namespace BeWo.View.Document
control.ButtonSavedClicked += () =>
{
saved = true;
if (control.ViewModel.IsDirty)
{
var dc = SaveInDatabase(control.ViewModel);
vm.DataContract = dc;
}
beWoWindow.Close();
};
@@ -1604,13 +1623,13 @@ namespace BeWo.View.Document
if (selected == null || selected.DataContract.BeWoFolderDC.Name == "RootFolder")
{
datagrid_templates.ItemsSource = new List<DokumentvorlageVM>();
datagrid_templates.ItemsSource = new BindingList<DokumentvorlageVM>();
return;
}
var vmList = new List<DokumentvorlageVM>();
var vmList = new BindingList<DokumentvorlageVM>();
//BeWoFolderDC folderDC = ServiceFacade.DoOperationsServiceSync(s => s.GetFolderById((long)selected.DocTreeItemOid));
//var folderDC_Oid = folderDC.BeWoFolderOid;
if (selected.DataContract.BeWoFolderDC == null)
@@ -1637,11 +1656,7 @@ namespace BeWo.View.Document
{
var templateVM = datagrid_templates.SelectedItem as DokumentvorlageVM;
EditTemplate(templateVM);
if(templateVM.IsDirty)
{
var dc = SaveInDatabase(templateVM);
templateVM.DataContract = dc;
}
}
private void PrintTemplate_Click(object sender, RoutedEventArgs e)
@@ -1820,8 +1835,8 @@ namespace BeWo.View.Document
{
ServiceFacade.DoOperationsServiceSync(s => s.DeleteTemplates(listeMitDemDC));
var gridItemsSource = this.datagrid_templates.ItemsSource as List<DokumentvorlageVM>;
datagrid_templates.ItemsSource = new List<DokumentvorlageVM>();
var gridItemsSource = this.datagrid_templates.ItemsSource as BindingList<DokumentvorlageVM>;
datagrid_templates.ItemsSource = new BindingList<DokumentvorlageVM>();
gridItemsSource.Remove(selectedTemplate);
this.datagrid_templates.ItemsSource = gridItemsSource;

12
BeWo/View/Document/SingleTemplateSelectionView.xaml
View File

@@ -18,20 +18,20 @@
<Grid Background="{StaticResource ObjectEditBackgroundBrush}">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
<RowDefinition x:Name="GridRowTemplate" Height="*" />
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
<RowDefinition x:Name="GridRowFolder" Height="*" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Label Margin="0,0,0,0" Content="Vorlage:"/>
<Label Margin="0,0,0,0" x:Name="lblTemplate" Content="Vorlage:"/>
<dxg:TreeListControl x:Name="treelistcontrol_template" Grid.Row="1" DefaultSorting="Name" Margin="5,0,5,0" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" >
<dxg:TreeListControl.Columns>
<dxg:TreeListColumn FieldName="Name" AllowSorting="True"/>
</dxg:TreeListControl.Columns>
<dxg:TreeListControl.View>
<dxg:TreeListView x:Name="TreeView_template" ShowColumnHeaders="False" ShowIndicator="False" ShowHorizontalLines="False" ShowVerticalLines="False"
<dxg:TreeListView x:Name="TreeView_template" ShowColumnHeaders="False" ShowIndicator="False" ShowHorizontalLines="False" ShowVerticalLines="False" AutoWidth="True"
FocusedRowChanged="DocumentsTreeView_FocusedRowChanged" PreviewMouseLeftButtonDown="DocumentsTreeView_folderStructureForSelection_PreviewMouseLeftButtonDown"
NodeExpanding="DocumentsTreeView_NodeExpanding" AllowEditing="False" ShowNodeImages="True" PrintNodeImages="True"
KeyFieldName="{Binding DocumentTreeItemVM.DocTreeItemOid}" ParentFieldName="Binding DocumentTreeItemVM.ParentOid">
@@ -39,14 +39,14 @@
</dxg:TreeListControl.View>
</dxg:TreeListControl>
<CheckBox Content="Dokument abspeichern" Grid.Row="2" Checked="CheckBox_Checked" Margin="5,8,0,0" Unchecked="CheckBox_Unchecked" />
<CheckBox x:Name="chkSaveDoc" Content="Dokument abspeichern" Grid.Row="2" Checked="CheckBox_Checked" Margin="5,8,0,0" Unchecked="CheckBox_Unchecked" />
<dxg:TreeListControl x:Name="treelistcontrol_folderStructureForSelection" Grid.Row="3" DefaultSorting="Name" Margin="5,5,5,0" VerticalAlignment="Stretch" Visibility="Visible">
<dxg:TreeListControl.Columns>
<dxg:TreeListColumn FieldName="Name" AllowSorting="True"/>
</dxg:TreeListControl.Columns>
<dxg:TreeListControl.View>
<dxg:TreeListView x:Name="TreeView_folderStructureForSelection" ShowColumnHeaders="False" ShowIndicator="False" ShowHorizontalLines="False" ShowVerticalLines="False"
<dxg:TreeListView x:Name="TreeView_folderStructureForSelection" ShowColumnHeaders="False" ShowIndicator="False" ShowHorizontalLines="False" ShowVerticalLines="False" AutoWidth="True"
FocusedRowChanged="DocumentsTreeView_FocusedRowChanged" PreviewMouseLeftButtonDown="DocumentsTreeView_folderStructureForSelection_PreviewMouseLeftButtonDown"
NodeExpanding="DocumentsTreeView_NodeExpanding" AllowEditing="False" ShowNodeImages="True" PrintNodeImages="True"
KeyFieldName="{Binding DocumentTreeItemVM.DocTreeItemOid}" ParentFieldName="Binding DocumentTreeItemVM.ParentOid">

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

@@ -36,32 +36,49 @@ namespace BeWo.View.Document
public event Action ButtonCreateForSelectionClicked;
public event Action ButtonCreateForAllClicked;
public event Action ButtonCancelClicked;
private TableID tableId;
private VorlagentabelleDC vorlagenTabelle;
private List<DokumentvorlageDC> alleVorlagen;
private List<BeWoFolderDC> alleOrdner;
public DocumentTreeItemVM selectedFolder = null;
private List<BeWoFolderDC> allTemplateFolder;
private List<BeWoFolderDC> allObjectFolder;
public SingleTemplateSelectionView()
{
InitializeComponent();
}
public void InitView(VorlagentabelleDC vt, List<DokumentvorlageDC> alleVorlagen, List<BeWoFolderDC> alleOrdner)
public DocumentTreeItemVM SelectedFolder { get; set; }
public DokumentvorlageDC SelectedTemplate { get; set; }
public void InitView(VorlagentabelleDC vt, List<DokumentvorlageDC> alleVorlagen, List<BeWoFolderDC> allTemplateFolder, List<BeWoFolderDC> allObjectFolder, bool showTemplateTree, bool showDocumentTree)
{
//tableId = tid;
this.vorlagenTabelle = vt;
this.alleVorlagen = alleVorlagen;
this.alleOrdner = alleOrdner;
this.allTemplateFolder = allTemplateFolder;
this.allObjectFolder = allObjectFolder;
DokumentViewHelper.CreateTemplateTreeViewItems(treelistcontrol_template, new List<VorlagentabelleDC>() { vt }, allTemplateFolder, true);
DokumentViewHelper.AddTemplatesToTreeView(treelistcontrol_template, alleVorlagen, true);
DokumentViewHelper.CreateTemplateTreeViewItems(treelistcontrol_template, new List<VorlagentabelleDC>() { vt } );
List<PrintSelectionVM> vms = new List<PrintSelectionVM>();
if (!showTemplateTree)
{
lblTemplate.Visibility = Visibility.Collapsed;
treelistcontrol_template.Visibility = Visibility.Collapsed;
GridRowTemplate.Height = GridLength.Auto;
}
if (!showDocumentTree)
{
chkSaveDoc.Visibility = Visibility.Collapsed;
treelistcontrol_folderStructureForSelection.Visibility = Visibility.Collapsed;
GridRowFolder.Height = GridLength.Auto;
}
Focus();
}
@@ -83,14 +100,14 @@ namespace BeWo.View.Document
private void Button_CreateTemplateForSelection_Click(object sender, RoutedEventArgs e)
{
//var selected = combobox_elementList.SelectedItem as PrintSelectionVM;
//if (selected == null)
//{
// MessageBox.Show("Es muss ein Datensatz ausgewählt werden.", "BeWoPlaner", MessageBoxButton.OK, MessageBoxImage.Information);
// return;
//}
var selected = treelistcontrol_template.SelectedItem as DocumentTreeItemVM;
if (selected == null ||selected.DataContract.Dokumentvorlage == null)
{
MessageBox.Show("Bitte wählen Sie eine Vorlage aus.", "BeWoPlaner", MessageBoxButton.OK, MessageBoxImage.Information);
return;
}
SelectedTemplate = selected.DataContract.Dokumentvorlage;
ButtonCreateForSelectionClicked?.Invoke();
}
@@ -114,7 +131,7 @@ namespace BeWo.View.Document
private void CheckBox_Unchecked(object sender, RoutedEventArgs e)
{
selectedFolder = null;
SelectedFolder = null;
treelistcontrol_folderStructureForSelection.Visibility = Visibility.Collapsed;
}
@@ -204,7 +221,7 @@ namespace BeWo.View.Document
private void DocumentsTreeView_folderStructureForSelection_PreviewMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
{
if (TreeView_template.SelectedRows.Count != 0)
selectedFolder = TreeView_template.SelectedRows[0] as DocumentTreeItemVM;
SelectedFolder = TreeView_template.SelectedRows[0] as DocumentTreeItemVM;
}

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

@@ -37,8 +37,8 @@
<Label Grid.Column="0" Grid.Row="0" Content="Name" />
<Label Grid.Column="0" Grid.Row="1" Content="Beschreibung" />
<dxe:TextEdit x:Name="TextEdit_Vorlagenname" Grid.Column="1" Grid.Row="0" Height="23" Margin="3,0,3,3" EditValueChanged="TextEdit_Vorlagenname_EditValueChanged"/>
<dxe:TextEdit x:Name="TextEdit_Beschreibung" Grid.Column="1" Grid.Row="1" Height="23" Margin="3,0,3,3" EditValueChanged="TextEdit_Beschreibung_EditValueChanged"/>
<TextBox x:Name="TextEdit_Vorlagenname" Grid.Column="1" Grid.Row="0" Height="23" Margin="3,0,3,3" Text="{Binding Name}"/>
<TextBox x:Name="TextEdit_Beschreibung" Grid.Column="1" Grid.Row="1" MinHeight="60" AcceptsReturn="True" AcceptsTab="True" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto" Height="23" Margin="3,0,3,3" Text="{Binding Beschreibung}"/>
</Grid>
<Grid Grid.Row="1" Margin="3 10 3 0">

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

@@ -64,22 +64,11 @@ namespace BeWo.View.Document
{
InitializeComponent();
VorlagenTabelle = vorlagenTabelle;
ViewModel = pVM;
var copy = new DokumentvorlageVM(pVM.DataContract);
ViewModel = copy;
DataContext = pVM;
if(pVM.Name != null)
{
TextEdit_Vorlagenname.EditValue = pVM.Name;
TextEdit_Vorlagenname.DataContext = pVM.Name;
TextEdit_Vorlagenname.Text = pVM.Name;
}
if (pVM.Beschreibung != null)
{
TextEdit_Beschreibung.EditValue = pVM.Beschreibung;
TextEdit_Beschreibung.DataContext = pVM.Beschreibung;
TextEdit_Beschreibung.Text = pVM.Beschreibung;
}
if (pVM.Text != null)
{
EditorControl.RtfText = pVM.RTFText;
@@ -212,16 +201,6 @@ namespace BeWo.View.Document
ButtonCancelClicked?.Invoke();
}
}
private void TextEdit_Vorlagenname_EditValueChanged(object sender, DevExpress.Xpf.Editors.EditValueChangedEventArgs e)
{
if (TextEdit_Vorlagenname.EditValue != null)
ViewModel.Name = TextEdit_Vorlagenname.EditValue.ToString();
}
private void TextEdit_Beschreibung_EditValueChanged(object sender, DevExpress.Xpf.Editors.EditValueChangedEventArgs e)
{
if (TextEdit_Beschreibung.EditValue != null)
ViewModel.Beschreibung = TextEdit_Beschreibung.EditValue.ToString();
}
// Mouseup, um die aktuelle Position des Cursors zu speichern, um dort den Platzhalter an der aktuellen Stelle einzusetzen
// Klappt nur, wenn in Text geklickt wird und nicht hinter ein Wort..

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

@@ -364,7 +364,8 @@ namespace BeWo.View.Navigation
if (alleVorlagen.Count > 0)
{
var c = (CompactCustomerDC)((Hyperlink)sender).Tag;
OpenTemplateSelectionDialog(alleVorlagen, c);
DokumentViewHelper.OpenTemplateSelectionDialog(alleVorlagen, TableID.Customer, c.CustomerOid);
}
else
{
@@ -376,22 +377,7 @@ namespace BeWo.View.Navigation
}
private void OpenTemplateSelectionDialog(List<DokumentvorlageDC> alleVorlagen, CompactCustomerDC c)
{
//Angebot Netzwerk 19 Einrichtungen a 6 User durchschnittlich
var view = new SingleTemplateSelectionView();
var folderList = VMFactory.CreateFolderList(TableID.Customer, c.Oid.Value);
var alleVorlagenTabellen = ServiceFacade.DoOperationsServiceSync(s => s.GetVorlagentabelleDCs());
view.InitView(alleVorlagenTabellen.FirstOrDefault(v => v.VorlagentabelleObjectTid.HasValue && v.VorlagentabelleObjectTid.Value == (int)TableID.Customer), alleVorlagen, folderList);
var beWoWindow = BeWoWindowBuilder.GetBeWoWindow(Translator.Translate("Vorlage auswählen"), view, 600, 600);
view.ButtonCancelClicked += () => beWoWindow.Close();
beWoWindow.ShowDialog();
}
private void MainNavigationView_OnOpenMailMergeWindow(List<IFilterableDC> allCustomers, IFilterableDC selectedCustomer)
{

90
BeWo/ViewModel/SupportConceptCostBearerRelVM.cs
View File

@@ -1,5 +1,7 @@
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.ComponentModel;
using BeWo.Core;
using BeWo.Validation;
using BeWo.ViewModel.ListViewModel;
@@ -108,6 +110,94 @@ namespace BeWo.ViewModel
}
}
public List<String> SortItems
{
get
{
var list = new List<String>();
list.Add("aufsteigend");
list.Add("absteigend");
return list;
}
}
public int SelectedSortIndex
{
get
{
return BeWoApp.AppSettings.LastBewilligungSortOrder;
}
set
{
BeWoApp.AppSettings.LastBewilligungSortOrder = value;
this.FirePropertyChanged("SelectedSortIndex");
this.FirePropertyChanged("SortedVMList");
}
}
public BindingList<SupportConceptApprovalPeriodVM> SortedVMList
{
get
{
var list = this.ApprovalPeriodList.VMList;
if (list.Count > 1)
{
//Entferne die Items aus der Originalliste und füge sie später wieder hinzu, sonst aktualisiert sich die View nicht:-(
var copyList = new BindingList<SupportConceptApprovalPeriodVM>();
foreach (var item in list)
{
copyList.Add(item);
}
list.Clear();
if (SelectedSortIndex == 0)
{
copyList.Sort((a, b) => a.StartDate.HasValue ? a.StartDate.Value.CompareTo(b.StartDate) : 0);
}
else
{
copyList.Sort((a, b) => b.StartDate.HasValue ? b.StartDate.Value.CompareTo(a.StartDate) : 0);
}
foreach (var item in copyList)
{
list.Add(item);
}
}
return list;
}
}
//public ObservableCollection<SupportConceptApprovalPeriodVM> SortedVMList
//{
// get
// {
// var list = this.ApprovalPeriodList.VMList;
// if (SelectedSortIndex == 0)
// {
// list.Sort((a, b) => a.StartDate.HasValue ? a.StartDate.Value.CompareTo(b.StartDate) : 0);
// }
// else
// {
// list.Sort((a, b) => b.StartDate.HasValue ? b.StartDate.Value.CompareTo(a.StartDate) : 0);
// }
// var sortedlist = new ObservableCollection<SupportConceptApprovalPeriodVM>();
// sortedlist.AddRange(list);
// return sortedlist;
// }
//}
// public decimal RateFactor
// {
// get { return _RateFactor; }

2
Host/Host.csproj.user
View File

@@ -3,7 +3,7 @@
<PropertyGroup>
<NameOfLastUsedPublishProfile>BeWo2.0</NameOfLastUsedPublishProfile>
<UseIISExpress>true</UseIISExpress>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<Use64BitIISExpress>false</Use64BitIISExpress>
<IISExpressSSLPort />
<IISExpressAnonymousAuthentication />

24
Model/Changes_alle_fuer_neue_db.txt
View File

@@ -1373,5 +1373,27 @@ ALTER TABLE `organisation`
ADD COLUMN `BezDatenannahmestelle` VARCHAR(4096) NULL DEFAULT NULL AFTER `IKDatenannahmestelle`;
ALTER TABLE `organisation`
ADD COLUMN `Verfahrensstufe` INT NULL DEFAULT 0 AFTER `BusinessPartnerId`;
ADD COLUMN `Verfahrensstufe` INT NULL DEFAULT '1' AFTER `BusinessPartnerId`;
ALTER TABLE `organisation`
ADD COLUMN `GkvAusblenden` TINYINT NULL DEFAULT NULL AFTER `BusinessPartnerId`;
ALTER TABLE `mandator`
ADD COLUMN `BankAccountOid` BIGINT NULL DEFAULT NULL AFTER `IKLeistungserbringer`;
ALTER TABLE `mandator`
ADD COLUMN `SoziotherapieAnsprechpartnerOid` BIGINT NULL DEFAULT NULL AFTER `BankAccountOid`;
ALTER TABLE `mandator`
ADD COLUMN `Website` VARCHAR(2048) NULL DEFAULT NULL AFTER `Name`;
ALTER TABLE `mandator`
ADD COLUMN `ImageOid` BIGINT NULL DEFAULT NULL AFTER `SoziotherapieAnsprechpartnerOid`;
ALTER TABLE `mandator`
ADD COLUMN `ColorWaitTooLong` VARCHAR(16) NULL DEFAULT NULL AFTER `ImageOid`,
ADD COLUMN `ColorSendUrbelege` VARCHAR(16) NULL DEFAULT NULL AFTER `ColorWaitTooLong`,
ADD COLUMN `ShowGkvBzEinzel` TINYINT NULL DEFAULT NULL AFTER `ColorSendUrbelege`,
ADD COLUMN `ShowGkvBzUrbelege` TINYINT NULL DEFAULT NULL AFTER `ShowGkvBzEinzel`;

2
ReportImp/BfpDus/Export/CustomCsvExporter.cs
View File

@@ -236,7 +236,7 @@ where sr.startdate >= ':Von' and sr.startdate < ':Bis'
/*
*
ZG_ID K_ID Kostenträger Bereits gezahlt Bis dato geleistete FLS Betrag Saldo
ZG_ID K_ID Kostenträger Bereits gezahlt Bis dato geleistete FLS Betrag Saldo
Startdatum Alle HPs die ab dem Datum starten
Enddatum Stichtag

6
Service/Plugins/PluginLoader.cs
View File

@@ -148,7 +148,7 @@ namespace BeWo.Service.Plugins
//t = "9975231461"; // Selwo
//t = "8181286349"; // BeWo am Rhein
//t = "4595275645"; // Eigenständig
//t = "7912635399"; // Prof. Dr. Eggers Stiftung
t = "7912635399"; // Prof. Dr. Eggers Stiftung
//t = "3549726254"; // Socia
//t = "1992495802"; // Monvita
//t = "7381352241"; // Ressource e.V.
@@ -167,7 +167,7 @@ namespace BeWo.Service.Plugins
//t = "6548202677"; // VKM Aachen SBD
//t = "7803602698"; // Taubblindendienst
//t = "5518600303"; // Wetterleuchten e.V.
t = "4096649015"; // AWO Dortmund
//t = "4096649015"; // AWO Dortmund
//t = "3614251071"; // Pusteblume
//t = "7755740484"; // Sawo
//t = "8275654834"; // Twg Jonathan
@@ -303,7 +303,7 @@ namespace BeWo.Service.Plugins
//t = "8251343124"; // Rat Plus Tat
//t = "6819347851"; // Awo Kreisverband Plön
//t = "2385915144"; // AKGG GmbH
t = "8002913382"; // AKGG GmbH (MID)
//t = "8002913382"; // AKGG GmbH (MID)
//t = "5155880294"; // BHV Bergische Hauspflege
//t = "8366649557"; // Münchner Aids-Hilfe e.V.
//t = "2976949196"; // WHB Refrath gGmbH

2
Service/Vorlagen/VorlagenManager.cs
View File

@@ -26,6 +26,8 @@ namespace BeWo.Service.Vorlagen
var list = new List<VorlagentabelleDC>();
list.Add(new VorlagentabelleDC() { VorlagentabelleOid = 1000, VorlagentabelleObjectTid = (int)TableID.Customer, Tabellenname = "Klienten", ImageName = "UserHomeBoyDisabled" });
list.Add(new VorlagentabelleDC() { VorlagentabelleOid = 1001, VorlagentabelleObjectTid = (int)TableID.SupportConcept, Tabellenname = "Hilfepläne", ImageName = "IDBadgeDisabled" });
return list;
}

3
Shared/Core/SettingsKeys.cs
View File

@@ -27,8 +27,9 @@
public static string ZeigeNurMeineTermine => "ZeigeNurMeineTermine";
public static string LastSelectedServiceRecordTimeIntervalDays => "LastSelectedServiceRecordTimeIntervalDays";
public static string LastSelectedServiceRecordMonth => "LastSelectedServiceRecordMonth";
public static string LastKassenSortOrder => "LastKassenSortOrder";
public static string LastBewilligungSortOrder => "LastBewilligungSortOrder";
public static string ServiceRecordAllowChangeHours => "ServiceRecordAllowChangeHours";

2
Shared/DataContracts/DocumentTreeItemDC.cs
View File

@@ -19,6 +19,8 @@ namespace BS.Shared.DataContracts
[DataMember]
public BeWoFolderDC BeWoFolderDC { get; set; }
[DataMember]
public DokumentvorlageDC Dokumentvorlage { get; set; }
[DataMember]
public TableID Table { get; set; }
[DataMember]
public long? ObjectOid { get; set; }