From e8da1fdff78c41303897ae0c7439791ef3fd208a Mon Sep 17 00:00:00 2001 From: Waldi Date: Thu, 27 Jul 2017 09:58:04 +0200 Subject: [PATCH] =?UTF-8?q?BewoPlaner=20.Net=20Version=204.5=20und=20Devex?= =?UTF-8?q?press=20version=2017....=20plus=20RTF=20Dokumentation=20f=C3=BC?= =?UTF-8?q?r=20HPH=20bersenbrueck=20unter=20ServiceRecord=20und=20paar=20k?= =?UTF-8?q?leinigkeiten?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Serveranwendung/Serveranwendung.csproj | 10 +- BeWo/BeWo.csproj | 184 +++--- BeWo/BeWoApp.xaml.cs | 8 + BeWo/Converter/EnumToDescriptionConverter.cs | 9 +- BeWo/Core/Config/AppSettings.cs | 2 + BeWo/Properties/Resources.Designer.cs | 2 +- BeWo/Properties/Settings.Designer.cs | 4 +- BeWo/Properties/licenses.licx | 1 - BeWo/Scheduler/View/NewSchedulerView.xaml | 2 +- .../View/SchedulerAppointmentEditForm.xaml.cs | 8 +- BeWo/Scheduler/View/SchedulerView.xaml | 37 +- .../View/ServiceRecordScheduler.xaml | 2 +- .../ViewModel/NewSchedulerViewModel.cs | 4 +- .../ViewModel/SchedulerAppointmentListVM.cs | 26 +- .../ViewModel/SchedulerAppointmentVM.cs | 1 + .../NewSchulbegleitenderDienstView.xaml | 26 +- .../QueryService/QueryService1.disco | 2 +- .../QueryService/QueryService6.xsd | 91 +-- .../QueryService/QueryService61.xsd | 10 - .../QueryService/QueryService62.xsd | 16 - .../QueryService/QueryService63.xsd | 26 - .../QueryService/QueryService64.xsd | 42 -- .../QueryService/QueryService65.xsd | 48 -- .../QueryService/QueryService7.xsd | 1 + .../QueryService/QueryServiceImp1.wsdl | 18 +- .../QueryService/Reference.cs | 5 +- .../QueryService/Reference.svcmap | 18 +- .../QueryService/configuration.svcinfo | 4 +- .../QueryService/configuration91.svcinfo | 86 +-- .../Controls/ComboBoxTreeViewControlV2.xaml | 2 +- .../Controls/EnumComboBoxStyleSettings.cs | 29 +- BeWo/View/Detail/AdditionalServiceView.xaml | 4 +- .../View/Detail/AssessmentSheetEntryView.xaml | 3 +- BeWo/View/Detail/CustomerView.xaml.cs | 3 +- BeWo/View/Detail/ServiceRecordEditView.xaml | 148 +++++ .../View/Detail/ServiceRecordEditView.xaml.cs | 139 ++++- .../Detail/ServiceRecordGroupEditView.xaml | 148 +++++ .../Detail/ServiceRecordGroupEditView.xaml.cs | 143 ++++- .../Detail/ServiceRecordRTFWindowView.xaml | 66 +++ .../Detail/ServiceRecordRTFWindowView.xaml.cs | 208 +++++++ BeWo/View/Detail/ServiceRecordView2.xaml | 299 +++++++++- BeWo/View/Detail/ServiceRecordView2.xaml.cs | 546 ++++++++++++++++-- .../View/Detail/WordDocumentTemplateView.xaml | 2 +- .../Detail/backup/AdditionalServiceView.xaml | 198 +++---- .../Report/FLSReport/FLSOverviewChart.xaml | 6 +- BeWo/ViewModel/BargeldkassenVM.cs | 6 +- BeWo/ViewModel/ServiceRecordVM.cs | 112 ++++ BeWo/app.config | 101 ++-- BeWoChatServer/App.config | 8 +- BeWoChatServer/BeWoChatServer.csproj | 4 +- BeWoChatServer/packages.config | 2 +- BeWoPlanerAndroid/BeWoPlanerAndroid.csproj | 4 +- BeWoPlanerAndroid/Web.config | 126 ++-- BeWoPlanerAndroid/packages.config | 2 +- BeWoPlanerMobil/BeWoPlanerMobil.csproj | 12 +- BeWoPlanerMobil/Web.config | 367 ++++++------ BeWoPlanerMobil/packages.config | 6 +- Controls/Controls.csproj | 23 +- Controls/Properties/Resources.Designer.cs | 2 +- Controls/Properties/Settings.Designer.cs | 4 +- Data/Data.csproj | 5 +- Data/Entities/BeWoEntityBase.cs | 82 +-- Data/Entities/SchedulerAppointment.cs | 79 ++- Data/Entities/ServiceRecord.cs | 183 +++++- Data/Entities/ServiceRecordGroup.cs | 82 +++ Data/Entities/ServiceRecordHistory.cs | 83 ++- Data/Mappings/ServiceRecord.hbm.xml | 6 +- Host/DX.aspx | 16 +- Host/DX.aspx.cs | 2 +- Host/DX.aspx.designer.cs | 10 +- Host/Host.csproj | 42 +- Host/ReportView.aspx | 2 +- Host/Web.config | 87 +-- Model/Changes_2017_07_26.txt | 11 + Report/Properties/licenses.licx | 2 +- Report/Report.csproj | 50 +- Report/app.config | 8 +- .../ABCBetreuungenReports.csproj | 29 +- ReportImp/ABWElsebrock/ABWElsebrock.csproj | 29 +- .../ASBBergischGladbachReports.csproj | 29 +- .../ASBHammReports/ASBHammReports.csproj | 31 +- .../AachenerVereinReports.csproj | 31 +- ReportImp/AdikKleve/AdikKleve.csproj | 29 +- .../AidsHilfeGiessen/AidsHilfeGiessen.csproj | 29 +- .../AidsInitiativeBonn.csproj | 29 +- .../AidsUndDrogenberatung.csproj | 29 +- .../AidshilfeDortmund.csproj | 29 +- .../AidshilfeKassel/AidshilfeKassel.csproj | 29 +- ReportImp/ApiBerlin/ApiBerlin.csproj | 29 +- .../AssistenzaReports.csproj | 31 +- .../BAPBielefelderAmbulantePflege.csproj | 29 +- .../Properties/licenses.licx | 1 - ReportImp/BUGeVReports/BUGeVReports.csproj | 29 +- .../BUGeVReports/Properties/licenses.licx | 1 - ReportImp/BWKGbR/BWKGbR.csproj | 29 +- ReportImp/BeWoAlsdorf/BeWoAlsdorf.csproj | 29 +- .../BeWoAlsdorf/Properties/licenses.licx | 1 - ReportImp/BeWoAmrath/BeWoAmrath.csproj | 29 +- ReportImp/BeWoAuxilio/BeWoAuxilio.csproj | 29 +- ReportImp/BeWoBiallas/BeWoBiallas.csproj | 29 +- .../BeWoColonia5Reports.csproj | 29 +- .../BeWoColoniaKalayci.csproj | 29 +- .../BeWoColoniaMitarbeiter.csproj | 29 +- .../BeWoDellbrueck/BeWoDellbrueck.csproj | 31 +- ReportImp/BeWoDirekt/BeWoDirekt.csproj | 29 +- ReportImp/BeWoHeinsberg/BeWoHeinsberg.csproj | 31 +- ReportImp/BeWoKerpen/BeWoKerpen.csproj | 29 +- .../BeWoLeverkusen/BeWoLeverkusen.csproj | 29 +- .../BeWoMarinReports/BeWoMarinReports.csproj | 29 +- .../BeWoMobilReports/BeWoMobilReports.csproj | 31 +- ReportImp/BeWoNeuss/BeWoNeuss.csproj | 31 +- .../BeWoPlusReports/BeWoPlusReports.csproj | 29 +- ReportImp/BeWoRichartz/BeWoRichartz.csproj | 29 +- .../BeWoRueckenwind/BeWoRueckenwind.csproj | 29 +- .../BeWoSchillingReports.csproj | 29 +- ReportImp/BeWoViersen/BeWoViersen.csproj | 29 +- .../BetreuWoReports/BetreuWoReports.csproj | 31 +- .../BetreutesWohnenAmRheinReports.csproj | 31 +- .../BetreutesWohnenStLudgerus.csproj | 29 +- .../BetreutesWohnenStelzel.csproj | 31 +- .../BetreutesWohnenWoellReports.csproj | 31 +- .../BetreuungsBueroScholzReport.csproj | 29 +- .../Properties/licenses.licx | 1 - .../BetreuungsbueroBaak.csproj | 29 +- ReportImp/BetreuwoWesel/BetreuwoWesel.csproj | 29 +- ReportImp/BleibImLeben/BleibImLeben.csproj | 29 +- .../BloemelingUndTeckhaus.csproj | 29 +- ReportImp/BrueckeABW/BrueckeABW.csproj | 29 +- .../BundBBetreutesWohnen.csproj | 29 +- ReportImp/CaritasAachen/CaritasAachen.csproj | 31 +- .../CaritasBottrop/CaritasBottrop.csproj | 29 +- .../CaritasFrankfurt2Reports.csproj | 29 +- .../CaritasFrankfurtReports.csproj | 31 +- .../CaritasLeverkusen.csproj | 29 +- .../Properties/licenses.licx | 1 - ReportImp/CaritasUnna/CaritasUnna.csproj | 29 +- .../CaritasUnnaWohnungslosenhilfe.csproj | 29 +- .../CaritasWuppertalSolingen.csproj | 29 +- .../ChristopherusHaus.csproj | 29 +- ReportImp/Club74/Club74.csproj | 29 +- ReportImp/Convoi/Convoi.csproj | 29 +- ReportImp/DerKarren/DerKarren.csproj | 29 +- .../DiakonieKKKleve/DiakonieKKKleve.csproj | 29 +- .../DiakonieLennepReports.csproj | 29 +- .../Properties/licenses.licx | 1 - .../DieDueneReports/DieDueneReports.csproj | 29 +- .../DieWohnhelferReports.csproj | 29 +- .../Properties/licenses.licx | 1 - .../EigentstaendigHennef.csproj | 29 +- .../FaerberReports/FaerberReports.csproj | 31 +- .../FeidPartnerReports.csproj | 31 +- ReportImp/FibMarburg/FibMarburg.csproj | 29 +- ReportImp/Findus/Findus.csproj | 29 +- .../FlingernMobilReports.csproj | 29 +- ReportImp/Fortis/Fortis.csproj | 29 +- .../FortschritteEV/FortschritteEV.csproj | 29 +- .../FortschritteEV/FortschritteEV.csproj.bak | 17 +- .../GenderBeWoReports.csproj | 31 +- .../GerdasPflegedienst.csproj | 29 +- .../GpzBiberachReports.csproj | 29 +- .../HPHBersenbrueck/HPHBersenbrueck.csproj | 29 +- ReportImp/HausTheresia/HausTheresia.csproj | 29 +- .../HausschoppReports.csproj | 31 +- .../HolsingerReports/HolsingerReports.csproj | 31 +- .../HphBersenbrueckAph.csproj | 29 +- .../HphBersenbrueckAtz.csproj | 29 +- .../Properties/licenses.licx | 1 - .../HphBersenbrueckFreizeitUndReisen.csproj | 29 +- .../Properties/licenses.licx | 1 - ReportImp/IBPReports/IBPReports.csproj | 31 +- .../IbpEingliederungshilfe.csproj | 29 +- ReportImp/IndroABW/IndroABW.csproj | 29 +- .../IntegraHeinsbergReports.csproj | 31 +- .../IntegraReports/IntegraReports.csproj | 31 +- .../IntegroReports/IntegroReports.csproj | 31 +- ReportImp/KOMO/KOMO.csproj | 29 +- ReportImp/KetteReports/KetteReports.csproj | 31 +- .../KetteReports/Properties/licenses.licx | 1 - ReportImp/KocksReports/KocksReports.csproj | 31 +- .../KoelnRingReports/KoelnRingReports.csproj | 31 +- ReportImp/KomMitBewo/KomMitBewo.csproj | 29 +- .../KontaktUndKrisenhilfeReports.csproj | 31 +- .../LWVEingliederungshilfe.csproj | 27 +- .../LebenshilfeAhrweiler.csproj | 29 +- .../Properties/licenses.licx | 1 - .../LebenshilfeBorkenReports.csproj | 29 +- .../LebenshilfeCoburg.csproj | 29 +- .../LebenshilfeDuisburgReports.csproj | 29 +- .../LebenshilfeDuisburgServicePlus.csproj | 29 +- .../LebenshilfeEssenReports.csproj | 31 +- .../LebenshilfeHannoverReports.csproj | 29 +- .../LebenshilfeKoblenz.csproj | 29 +- .../LebenshilfeMannheimEV.csproj | 29 +- .../Properties/licenses.licx | 1 - .../LebenshilfeRemscheid.csproj | 29 +- .../LebenshilfeRheinSiegReports.csproj | 31 +- .../LebenshilfeRodenkirchenReports.csproj | 29 +- .../LebenshilfeStade/LebenshilfeStade.csproj | 29 +- .../LebenshilfeWarendorf.csproj | 29 +- .../LebenshilfeWetterau.csproj | 29 +- .../LebenshilfeWuerzburgReports.csproj | 31 +- .../LebensweltGabrielReports.csproj | 31 +- .../LeiendeckerReports.csproj | 29 +- .../LoslebenReports/LoslebenReports.csproj | 31 +- .../Marienhospital/Marienhospital.csproj | 29 +- .../MeinBetreutesWohnen.csproj | 29 +- .../MezMenzelReports/MezMenzelReports.csproj | 31 +- ReportImp/Mittendrin/Mittendrin.csproj | 29 +- ReportImp/Monvita/Monvita.csproj | 29 +- .../MuellestumpeReports.csproj | 31 +- ReportImp/PURReports/PURReports.csproj | 35 +- ReportImp/PouginReports/PouginReports.csproj | 31 +- ReportImp/Praesentation/Praesentation.csproj | 29 +- .../Praesentation/Properties/licenses.licx | 1 - .../PraunheimerWerkstaettenGmbh.csproj | 29 +- .../ProfEggersStiftung.csproj | 29 +- .../PsychosozialerTraegervereinReports.csproj | 29 +- ReportImp/RessourceEV/RessourceEV.csproj | 29 +- .../SBBMainzReports/SBBMainzReports.csproj | 29 +- .../SHGSchwerte/Properties/licenses.licx | 1 - ReportImp/SHGSchwerte/SHGSchwerte.csproj | 29 +- ReportImp/SKFAlsdorf/Properties/licenses.licx | 1 - ReportImp/SKFAlsdorf/SKFAlsdorf.csproj | 29 +- ReportImp/SPZLeverkusen/SPZLeverkusen.csproj | 29 +- ReportImp/SPZRatingen/SPZRatingen.csproj | 29 +- ReportImp/Salem/Salem.csproj | 29 +- .../SchillingerReports.csproj | 31 +- .../SchoengeistReports.csproj | 31 +- ReportImp/SeWo/Properties/licenses.licx | 1 - ReportImp/SeWo/SeWo.csproj | 29 +- ReportImp/SelwoReports/SelwoReports.csproj | 31 +- .../SeverinReports/SeverinReports.csproj | 31 +- .../SigncomReports/SigncomReports.csproj | 31 +- ReportImp/SkmMenden/SkmMenden.csproj | 29 +- ReportImp/Socia/SociaKoeln.csproj | 29 +- .../SozialeDiensteKathrinSchmidt.csproj | 29 +- .../SozialeDiensteNiederrhein.csproj | 29 +- ...ozialeDienstleistungenBeckerReports.csproj | 31 +- ...zialeDienstleistungenGessnerReports.csproj | 29 +- .../SozialeDienstleistungenSchoenberg.csproj | 29 +- .../SozialwirkstattSchmitz.csproj | 31 +- ReportImp/SpektrumGmbH/SpektrumGmbH.csproj | 29 +- .../SpektrumReports/SpektrumReports.csproj | 31 +- .../SprungbrettReports.csproj | 31 +- .../SprungbrettTheresia.csproj | 29 +- .../SultanSahinReports.csproj | 29 +- .../SynpraxReports/SynpraxReports.csproj | 29 +- .../TRIASAmbulanteSozialarbeit.csproj | 29 +- .../TagwerkReports/Properties/licenses.licx | 1 - .../TagwerkReports/TagwerkReports.csproj | 31 +- ReportImp/TeamGSReports/TeamGSReports.csproj | 31 +- .../TranskulturellesBBBasaran.csproj | 31 +- .../TranskulturellesBBPastor.csproj | 31 +- .../TranskulturellesBetreuungsbuero.csproj | 29 +- .../TrialogReports/TrialogReports.csproj | 29 +- ReportImp/VKMAachen/VKMAachen.csproj | 29 +- .../VSDHammReports/VSDHammReports.csproj | 29 +- .../VereinDuerenerChristenReports.csproj | 31 +- .../Properties/licenses.licx | 1 - .../VereinLebensgestaltung.csproj | 29 +- .../VibbEssenReports/VibbEssenReports.csproj | 31 +- ReportImp/VisionReports/VisionReports.csproj | 31 +- .../VivaAVidaReports/VivaAVidaReports.csproj | 31 +- .../VivatgGmbHReports.csproj | 29 +- ReportImp/VkmHamm/VkmHamm.csproj | 29 +- ReportImp/WMB/WMB.csproj | 29 +- ReportImp/WegeReports/WegeReports.csproj | 31 +- .../WegweiserBetreuungsdienstReports.csproj | 31 +- .../Weitblick-ambulantBeWo.csproj | 29 +- .../WigonetzReports/WigonetzReports.csproj | 31 +- .../WohnassistenzMuensterReports.csproj | 29 +- .../WohnhelferRemscheidReports.csproj | 31 +- .../ZMDLengerichReports.csproj | 31 +- .../ZukunftWohnenReports.csproj | 29 +- ReportImp/demo_reports/demo_reports.csproj | 31 +- ReportImp/skmRheydt/skmRheydt.csproj | 29 +- ReportService/ReportingService.csproj | 31 +- ReportService/app.config | 8 +- ReportViewer/ReportViewer.csproj | 32 +- Service/Configuration/AppSettings.cs | 10 + .../ServiceRecordDC_ServiceRecord.cs | 12 + Service/Service.csproj | 34 +- Service/app.config | 8 +- Service/packages.config | 2 +- Shared/DataContracts/ServiceRecordDC.cs | 15 + Shared/Extensions/ICollectionExtensions.cs | 8 +- Shared/Shared.csproj | 25 +- Shared/packages.config | 2 +- ValidationLibrary/ValidationLibrary.csproj | 14 +- 289 files changed, 6351 insertions(+), 3389 deletions(-) delete mode 100644 BeWo/Service References/QueryService/QueryService61.xsd delete mode 100644 BeWo/Service References/QueryService/QueryService62.xsd delete mode 100644 BeWo/Service References/QueryService/QueryService63.xsd delete mode 100644 BeWo/Service References/QueryService/QueryService64.xsd delete mode 100644 BeWo/Service References/QueryService/QueryService65.xsd create mode 100644 BeWo/View/Detail/ServiceRecordRTFWindowView.xaml create mode 100644 BeWo/View/Detail/ServiceRecordRTFWindowView.xaml.cs create mode 100644 Model/Changes_2017_07_26.txt diff --git a/AndroidChatServer/Serveranwendung/Serveranwendung/Serveranwendung.csproj b/AndroidChatServer/Serveranwendung/Serveranwendung/Serveranwendung.csproj index 7e6da169a..0f7a84105 100644 --- a/AndroidChatServer/Serveranwendung/Serveranwendung/Serveranwendung.csproj +++ b/AndroidChatServer/Serveranwendung/Serveranwendung/Serveranwendung.csproj @@ -49,10 +49,12 @@ 4 - - - - + + + + + + diff --git a/BeWo/BeWo.csproj b/BeWo/BeWo.csproj index a8881026e..221194b51 100644 --- a/BeWo/BeWo.csproj +++ b/BeWo/BeWo.csproj @@ -9,7 +9,7 @@ Properties BeWo BeWoPlaner - v4.0 + v4.5 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 @@ -23,7 +23,8 @@ true false 3.0.1927.0 - Client + + 3.5 @@ -65,6 +66,7 @@ x86 AllRules.ruleset true + false pdbonly @@ -74,6 +76,7 @@ prompt 4 AllRules.ruleset + false BeWoPlaner.ico @@ -91,37 +94,43 @@ False ..\Lib\Blacklight.Wpf.Controls.dll - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + True @@ -262,6 +271,10 @@ MSBuild:Compile Designer + + Designer + MSBuild:Compile + MSBuild:Compile Designer @@ -718,6 +731,9 @@ ChatProgressBarView.xaml + + ServiceRecordRTFWindowView.xaml + MessageDialog.xaml @@ -1965,10 +1981,32 @@ + + Designer + + + Designer + + + Designer + + + Designer + + + Designer + + + Designer + + + Designer + + @@ -2011,7 +2049,6 @@ - WCF Proxy Generator Reference.cs @@ -2079,7 +2116,7 @@ True Assembly - + False @@ -2089,7 +2126,7 @@ True Assembly - + False @@ -2099,7 +2136,7 @@ True Assembly - + False @@ -2109,7 +2146,7 @@ True Assembly - + False @@ -2119,7 +2156,7 @@ True Assembly - + False @@ -2129,7 +2166,7 @@ True Assembly - + False @@ -2139,7 +2176,7 @@ True Assembly - + False @@ -2149,7 +2186,7 @@ True Assembly - + False @@ -2159,7 +2196,7 @@ True Assembly - + False @@ -2169,7 +2206,7 @@ True Assembly - + False @@ -2179,7 +2216,7 @@ True Assembly - + False @@ -2189,7 +2226,7 @@ True Assembly - + False @@ -2199,7 +2236,7 @@ True Assembly - + False @@ -2209,7 +2246,7 @@ True Assembly - + False @@ -2219,7 +2256,7 @@ True Assembly - + False @@ -2229,7 +2266,7 @@ True Assembly - + False @@ -2239,7 +2276,7 @@ True Assembly - + False @@ -2249,7 +2286,7 @@ True Assembly - + False @@ -2259,7 +2296,7 @@ True Assembly - + False @@ -2269,7 +2306,7 @@ True Assembly - + False @@ -2279,7 +2316,7 @@ True Assembly - + False @@ -2289,7 +2326,7 @@ True Assembly - + False @@ -2299,7 +2336,7 @@ True Assembly - + False @@ -2309,7 +2346,7 @@ True Assembly - + False @@ -2319,7 +2356,7 @@ True Assembly - + False @@ -2329,7 +2366,7 @@ True Assembly - + False @@ -2339,7 +2376,7 @@ True Assembly - + False @@ -2349,7 +2386,7 @@ True Assembly - + False @@ -2359,7 +2396,7 @@ True Assembly - + False @@ -2369,7 +2406,7 @@ True Assembly - + False @@ -2379,7 +2416,7 @@ True Assembly - + False @@ -2389,7 +2426,7 @@ True Assembly - + False @@ -2399,7 +2436,7 @@ True Assembly - + False @@ -2409,7 +2446,7 @@ True Assembly - + False @@ -2437,14 +2474,6 @@ - - - - - - - - @@ -2520,6 +2549,9 @@ + + + diff --git a/BeWo/BeWoApp.xaml.cs b/BeWo/BeWoApp.xaml.cs index cb5132a8e..2496ee890 100644 --- a/BeWo/BeWoApp.xaml.cs +++ b/BeWo/BeWoApp.xaml.cs @@ -203,6 +203,7 @@ namespace BeWo bool isZeiterfassungInStdMin = false; int lastSelectedStundenkontoIntervall = 3; bool showSignatures = false; + bool showRtfTextfeld = false; AppSettings.ShowAdvisedAttendedFlag = false; @@ -377,6 +378,12 @@ namespace BeWo showSignatures = true; } + val = GetSettingValue(_Mandator.Settings, "ShowRtfTextfeld"); + if (val != null && val.Equals("1")) + { + showRtfTextfeld = true; + } + switch (_Mandator.BeWoClientType) { @@ -443,6 +450,7 @@ namespace BeWo AppSettings.ShowHilfeplanBezeichnung = showHilfeplanBezeichnung; AppSettings.ShowArbeitszeiten = showArbeitszeiten; AppSettings.ShowSignatures = showSignatures; + AppSettings.ShowRtfTextfeld = showRtfTextfeld; AppSettings.ShowCustomerDistanceFields = showCustomerDistanceFields; AppSettings.ShowAdditionalService = showAdditionalService; AppSettings.ShowRoundedDurationInEmployeeAnalysis = showRoundedDurationInEmployeeAnalysis; diff --git a/BeWo/Converter/EnumToDescriptionConverter.cs b/BeWo/Converter/EnumToDescriptionConverter.cs index a39a17b46..1e0abb874 100644 --- a/BeWo/Converter/EnumToDescriptionConverter.cs +++ b/BeWo/Converter/EnumToDescriptionConverter.cs @@ -13,11 +13,12 @@ namespace BeWo.Converter if (value == null) return null; - var EnVal = value as DevExpress.Xpf.Core.EnumHelper.EnumItem; - var fi2 = EnVal.Id.GetType().GetField(EnVal.Id.ToString()); - var attrs = (DescriptionAttribute[])fi2.GetCustomAttributes(typeof(DescriptionAttribute), true); + throw new Exception("Hier muss noch was getestet werden"); + //var EnVal = value as DevExpress.Xpf.Core.EnumHelper. EnumItem; + //var fi2 = EnVal.Id.GetType().GetField(EnVal.Id.ToString()); + //var attrs = (DescriptionAttribute[])fi2.GetCustomAttributes(typeof(DescriptionAttribute), true); - return !attrs.Any() ? value : attrs[0].Description; + //return !attrs.Any() ? value : attrs[0].Description; } public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) diff --git a/BeWo/Core/Config/AppSettings.cs b/BeWo/Core/Config/AppSettings.cs index 58c62218e..a67d40407 100644 --- a/BeWo/Core/Config/AppSettings.cs +++ b/BeWo/Core/Config/AppSettings.cs @@ -318,6 +318,8 @@ namespace BeWo.Core.Config public bool ShowSignatures { get; set; } + public bool ShowRtfTextfeld { get; set; } + public bool ShowTeamNews { get; set; } public bool ShowMarker { get; set; } diff --git a/BeWo/Properties/Resources.Designer.cs b/BeWo/Properties/Resources.Designer.cs index 53733be57..16aed7ba5 100644 --- a/BeWo/Properties/Resources.Designer.cs +++ b/BeWo/Properties/Resources.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // Dieser Code wurde von einem Tool generiert. -// Laufzeitversion:4.0.30319.17929 +// Laufzeitversion:4.0.30319.42000 // // Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn // der Code erneut generiert wird. diff --git a/BeWo/Properties/Settings.Designer.cs b/BeWo/Properties/Settings.Designer.cs index c52edb2e0..9d1e82165 100644 --- a/BeWo/Properties/Settings.Designer.cs +++ b/BeWo/Properties/Settings.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // Dieser Code wurde von einem Tool generiert. -// Laufzeitversion:4.0.30319.17929 +// Laufzeitversion:4.0.30319.42000 // // Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn // der Code erneut generiert wird. @@ -12,7 +12,7 @@ namespace BeWo.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.0.1.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/BeWo/Properties/licenses.licx b/BeWo/Properties/licenses.licx index 27ee5eef5..e69de29bb 100644 --- a/BeWo/Properties/licenses.licx +++ b/BeWo/Properties/licenses.licx @@ -1 +0,0 @@ -DevExpress.Xpf.RichEdit.RichEditControl, DevExpress.Xpf.RichEdit.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/BeWo/Scheduler/View/NewSchedulerView.xaml b/BeWo/Scheduler/View/NewSchedulerView.xaml index 0cdc38787..14ca74e82 100644 --- a/BeWo/Scheduler/View/NewSchedulerView.xaml +++ b/BeWo/Scheduler/View/NewSchedulerView.xaml @@ -7,7 +7,7 @@ xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors" xmlns:dxsch="http://schemas.devexpress.com/winfx/2008/xaml/scheduler" xmlns:dxschint="http://schemas.devexpress.com/winfx/2008/xaml/scheduler/internal" - xmlns:dxschui="clr-namespace:DevExpress.Xpf.Scheduler.Drawing;assembly=DevExpress.Xpf.Scheduler.v13.2" + xmlns:dxschui="clr-namespace:DevExpress.Xpf.Scheduler.Drawing;assembly=DevExpress.Xpf.Scheduler.v17.1" xmlns:dxscht="http://schemas.devexpress.com/winfx/2008/xaml/scheduler/themekeys" xmlns:view="clr-namespace:BeWo.Scheduler.View" xmlns:converter="clr-namespace:BeWo.Converter" diff --git a/BeWo/Scheduler/View/SchedulerAppointmentEditForm.xaml.cs b/BeWo/Scheduler/View/SchedulerAppointmentEditForm.xaml.cs index 487506e97..0c24ae278 100644 --- a/BeWo/Scheduler/View/SchedulerAppointmentEditForm.xaml.cs +++ b/BeWo/Scheduler/View/SchedulerAppointmentEditForm.xaml.cs @@ -305,10 +305,12 @@ namespace BeWo.Scheduler.View if (Appointment.RecurrenceInfo != null) { - ViewModel.ApplyChangesToChangedOccurencyCustomFields(employees, customers, resources, originator, isPrivate, Appointment.RecurrenceIndex.ToString(), Appointment.RecurrenceInfo.Id); - } + //###Lyndon testen!!! + ViewModel.ApplyChangesToChangedOccurencyCustomFields(employees, customers, resources, originator, isPrivate, Appointment.RecurrenceIndex.ToString(), new Guid(Appointment.RecurrenceInfo.Id.ToString())); + //ViewModel.ApplyChangesToChangedOccurencyCustomFields(employees, customers, resources, originator, isPrivate, Appointment.RecurrenceIndex.ToString(), Appointment.RecurrenceInfo.Id); + } - if (Appointment.IsOccurrence && item == null) + if (Appointment.IsOccurrence && item == null) { ((List)Appointment.CustomFields["EmployeeList"]).ForEach(each => { diff --git a/BeWo/Scheduler/View/SchedulerView.xaml b/BeWo/Scheduler/View/SchedulerView.xaml index 344c6b887..1ab97d2d2 100644 --- a/BeWo/Scheduler/View/SchedulerView.xaml +++ b/BeWo/Scheduler/View/SchedulerView.xaml @@ -7,8 +7,8 @@ xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors" xmlns:dxsch="http://schemas.devexpress.com/winfx/2008/xaml/scheduler" xmlns:dxschint="http://schemas.devexpress.com/winfx/2008/xaml/scheduler/internal" - xmlns:dxschcore="clr-namespace:DevExpress.XtraScheduler;assembly=DevExpress.XtraScheduler.v13.1.Core" - xmlns:dxschui="clr-namespace:DevExpress.Xpf.Scheduler.Drawing;assembly=DevExpress.Xpf.Scheduler.v13.1" + xmlns:dxschcore="clr-namespace:DevExpress.XtraScheduler;assembly=DevExpress.XtraScheduler.v17.1.Core" + xmlns:dxschui="clr-namespace:DevExpress.Xpf.Scheduler.Drawing;assembly=DevExpress.Xpf.Scheduler.v17.1" xmlns:dxscht="http://schemas.devexpress.com/winfx/2008/xaml/scheduler/themekeys" xmlns:controls="clr-namespace:BeWo.Controls;assembly=BeWo.Controls" xmlns:search="clr-namespace:BeWo.View.Search" @@ -119,11 +119,13 @@ dxsch:SchedulerControl.SelectableIntervalViewInfo="{TemplateBinding ViewInfo}"> - - + @@ -132,7 +134,7 @@ - + @@ -149,7 +151,8 @@ + Visibility="{Binding ViewInfo.View.AppointmentToolTipVisibility, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ToolTipVisibilityConverter}}"> - + @@ -238,7 +242,7 @@ - + @@ -261,9 +265,9 @@ + DefaultBorderThickness="2" ViewInfo="{TemplateBinding ViewInfo}" + BorderBrush="Black" + Visibility="{Binding ViewInfo.Selected, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource boolToVisibilityConverter}}" /> - @@ -404,7 +409,8 @@