From 928aa4a807cc33e36fcf53501f0ebecc3fcf5fb0 Mon Sep 17 00:00:00 2001 From: rene Date: Mon, 26 Aug 2019 16:11:00 +0200 Subject: [PATCH 1/5] =?UTF-8?q?Ma=C3=9Fnahme=20und=20Ziele=20Icf=20Import?= =?UTF-8?q?=20Ma=C3=9Fnahme=20und=20Ziele=20per=20Popup=20bearbeiten=20Ma?= =?UTF-8?q?=C3=9Fnahme=20und=20Ziele=20Notiz=20optional=20einblenden=20Das?= =?UTF-8?q?=20selbe=20auch=20bei=20Hilfeplan=20->=20Ziele=20(ohne=20Icf=20?= =?UTF-8?q?import)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ReportTemplate hinzugefügt (Tabelle, Hibernate, Enity, Mapper, DC) Listbox Select hinzugefügt, dient dem generischen Auswählen eines object aus einer list per control --- BeWo/BeWo.csproj | 165 ++- BeWo/Core/SupportConceptGoalTreeItem.cs | 85 +- BeWo/ServiceProxy/Generated.cs | 9 + .../Controls/ComboBoxTreeViewControl.xaml | 2 +- .../Controls/ComboBoxTreeViewControl.xaml.cs | 2 +- BeWo/View/Controls/ListboxSelectControl.xaml | 25 + .../Controls/ListboxSelectControl.xaml.cs | 45 + .../Controls/ValueListEntryEditControl.xaml | 31 + .../ValueListEntryEditControl.xaml.cs | 59 + BeWo/View/Detail/MassnahmenTreeViewView.xaml | 160 +- .../Detail/MassnahmenTreeViewView.xaml.cs | 629 +++++--- .../FlexibleReportLayoutSaveControl.xaml.cs | 1 - BeWo/View/Detail/Report/IcfImportControl.xaml | 56 + .../Detail/Report/IcfImportControl.xaml.cs | 134 ++ BeWo/View/Detail/SupportConceptView.xaml | 18 +- BeWo/View/Detail/SupportConceptView.xaml.cs | 116 +- BeWo/ViewModel/SupportConceptVM.cs | 132 +- BeWo/ViewModel/ValueListEntryVM.cs | 75 +- Data/Data.csproj | 10 +- Data/Entities/Icf.cs | 121 ++ Data/Entities/ReportTemplate.cs | 107 ++ Data/Mappings/Icf.hbm.xml | 13 + Data/Mappings/ReportTemplate.hbm.xml | 21 + ..._2019_08_26 ReportTemplate hinzugefügt.txt | 15 + Service/DCEntityMapper/MapperFactory.cs | 1313 +++++------------ .../ReportTemplateDC_ReportTemplate.cs | 54 + Service/Service.csproj | 1 + .../ServiceContracts/IOperationsService.cs | 10 +- .../OperationsServiceImp.cs | 166 ++- Shared/BeWoEntityEnums.cs | 7 + .../ClientPartials/SupportConceptGoalDC.cs | 45 +- Shared/DataContracts/ReportTemplateDC.cs | 64 + Shared/DataContracts/ValueListEntryDC.cs | 2 + Shared/Shared.csproj | 1 + 34 files changed, 2072 insertions(+), 1622 deletions(-) create mode 100644 BeWo/View/Controls/ListboxSelectControl.xaml create mode 100644 BeWo/View/Controls/ListboxSelectControl.xaml.cs create mode 100644 BeWo/View/Controls/ValueListEntryEditControl.xaml create mode 100644 BeWo/View/Controls/ValueListEntryEditControl.xaml.cs create mode 100644 BeWo/View/Detail/Report/IcfImportControl.xaml create mode 100644 BeWo/View/Detail/Report/IcfImportControl.xaml.cs create mode 100644 Data/Entities/Icf.cs create mode 100644 Data/Entities/ReportTemplate.cs create mode 100644 Data/Mappings/Icf.hbm.xml create mode 100644 Data/Mappings/ReportTemplate.hbm.xml create mode 100644 Model/Changes_2019_08_26 ReportTemplate hinzugefügt.txt create mode 100644 Service/DCEntityMapper/ReportTemplateDC_ReportTemplate.cs create mode 100644 Shared/DataContracts/ReportTemplateDC.cs diff --git a/BeWo/BeWo.csproj b/BeWo/BeWo.csproj index ca202f66f..91bdf6657 100644 --- a/BeWo/BeWo.csproj +++ b/BeWo/BeWo.csproj @@ -275,6 +275,14 @@ Designer MSBuild:Compile + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + MSBuild:Compile Designer @@ -287,6 +295,10 @@ MSBuild:Compile Designer + + MSBuild:Compile + Designer + MSBuild:Compile Designer @@ -831,12 +843,21 @@ + + ListboxSelectControl.xaml + + + ValueListEntryEditControl.xaml + NotizenKategorieView.xaml BudgetView.xaml + + IcfImportControl.xaml + FlexibleReportEntryDetail.xaml @@ -2227,362 +2248,362 @@ False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly diff --git a/BeWo/Core/SupportConceptGoalTreeItem.cs b/BeWo/Core/SupportConceptGoalTreeItem.cs index d1554c2ec..9bd2ddb80 100644 --- a/BeWo/Core/SupportConceptGoalTreeItem.cs +++ b/BeWo/Core/SupportConceptGoalTreeItem.cs @@ -4,89 +4,44 @@ using BS.Shared; using BeWo.ViewModel; using BS.Shared.DataContracts.ClientPartials; +using BS.Shared.Extensions; namespace BeWo.Core { public class SupportConceptGoalTreeItem : SupportConceptGoalDC { private ValueListEntryVM _GoalEntryVM; - private BindingList _Children; + private bool _ShowNotice; public ValueListEntryVM GoalEntryVM { - get - { - return _GoalEntryVM; - } + get => _GoalEntryVM; + set => _GoalEntryVM = value; + } + public bool IsGoal => GoalEntryVM != null ? + GoalEntryVM.Type.Equals(ValueListEntryType.SupportConceptGoalType) || GoalEntryVM.Type.Equals(ValueListEntryType.SupportConceptIndividualGoalType) : + GoalEntryDC.Type.Equals(ValueListEntryType.SupportConceptGoalType) || GoalEntryDC.Type.Equals(ValueListEntryType.SupportConceptIndividualGoalType); + + + + public bool ShowNotice + { + get => _ShowNotice; set { - _GoalEntryVM = value; + _ShowNotice = value; + RaisePropertyChanged(nameof(ShowNotice)); } } - public string ItemName + public BindingList Items { - get => _GoalEntryVM != null ? _GoalEntryVM.Description : GoalEntryDC?.TypeDescription; - set - { - if (_GoalEntryVM != null) - { - _GoalEntryVM.Description = value; - } - - if (GoalEntryDC != null) - { - GoalEntryDC.TypeDescription = value; - } - } + get => _Children ?? (_Children = new BindingList()); + set => _Children = value; } - public string Notice - { - get => _GoalEntryVM != null ? _GoalEntryVM.Notice : GoalEntryDC?.Notice; - - set - { - if(_GoalEntryVM != null) - { - _GoalEntryVM.Notice = value; - } - - if(GoalEntryDC != null) - { - GoalEntryDC.Notice = value; - } - } - } - - public bool IsGoal - { - get - { - return GoalEntryVM != null ? - GoalEntryVM.Type.Equals(ValueListEntryType.SupportConceptGoalType) || GoalEntryVM.Type.Equals(ValueListEntryType.SupportConceptIndividualGoalType) : - GoalEntryDC.Type.Equals(ValueListEntryType.SupportConceptGoalType) || GoalEntryDC.Type.Equals(ValueListEntryType.SupportConceptIndividualGoalType); - } - } - - public BindingList Items - { - get - { - return _Children ?? (_Children = new BindingList()); - } - - set - { - _Children = value; - } - } - - public ValueListEntryType GoalType - { - get { return GoalEntryDC == null ? GoalEntryVM.Type : GoalEntryDC.Type; } - } + public ValueListEntryType GoalType => GoalEntryDC?.Type ?? GoalEntryVM.Type; } } \ No newline at end of file diff --git a/BeWo/ServiceProxy/Generated.cs b/BeWo/ServiceProxy/Generated.cs index 36c789643..66671d2b5 100644 --- a/BeWo/ServiceProxy/Generated.cs +++ b/BeWo/ServiceProxy/Generated.cs @@ -4245,6 +4245,10 @@ namespace BeWo.ServiceProxy [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetHomeViewPanelsBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] System.Collections.Generic.List GetHomeViewPanels(); + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/GetIcf", ReplyAction="http://tempuri.org/IOperationsService/GetIcfResponse")] + [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetIcfBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] + System.Collections.Generic.List GetIcf(); + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/UpdateIsChatActiveCustomerAPPCodeDC", ReplyAction="http://tempuri.org/IOperationsService/UpdateIsChatActiveCustomerAPPCodeDCResponse" + "")] [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/UpdateIsChatActiveCustomerAPPCodeDCBeWoFaul" + @@ -5175,6 +5179,11 @@ namespace BeWo.ServiceProxy return base.Channel.GetHomeViewPanels(); } + public System.Collections.Generic.List GetIcf() + { + return base.Channel.GetIcf(); + } + public void UpdateIsChatActiveCustomerAPPCodeDC(long customerOid, int activeType) { base.Channel.UpdateIsChatActiveCustomerAPPCodeDC(customerOid, activeType); diff --git a/BeWo/View/Controls/ComboBoxTreeViewControl.xaml b/BeWo/View/Controls/ComboBoxTreeViewControl.xaml index 7cfe9d7ff..8c20e41db 100644 --- a/BeWo/View/Controls/ComboBoxTreeViewControl.xaml +++ b/BeWo/View/Controls/ComboBoxTreeViewControl.xaml @@ -67,7 +67,7 @@ Click="Bd_OnClick" /> diff --git a/BeWo/View/Controls/ComboBoxTreeViewControl.xaml.cs b/BeWo/View/Controls/ComboBoxTreeViewControl.xaml.cs index cc0b65c3c..0d40e81a1 100644 --- a/BeWo/View/Controls/ComboBoxTreeViewControl.xaml.cs +++ b/BeWo/View/Controls/ComboBoxTreeViewControl.xaml.cs @@ -47,7 +47,7 @@ namespace BeWo.View.Controls var allSelected = selectedGoals.Count == GoalCount && GoalCount > 0; - var ToolTipString = selectedGoals.Aggregate(string.Empty, (s, dc) => s + (dc.TypeDescription + "; ")); + var ToolTipString = selectedGoals.Aggregate(string.Empty, (s, dc) => s + (dc.DisplayName + "; ")); DeSelectAllCheckBox.IsChecked = allSelected; diff --git a/BeWo/View/Controls/ListboxSelectControl.xaml b/BeWo/View/Controls/ListboxSelectControl.xaml new file mode 100644 index 000000000..2290b72c1 --- /dev/null +++ b/BeWo/View/Controls/ListboxSelectControl.xaml @@ -0,0 +1,25 @@ + + + + + + + + + + + + +