From 449e3676c252f2739c8b611211790925a477d837 Mon Sep 17 00:00:00 2001 From: Christian Date: Mon, 3 Apr 2017 13:07:06 +0200 Subject: [PATCH 1/5] devexpress 13.1->13.2 --- .../Serveranwendung/Properties/Licenses.licx | 1 - .../Serveranwendung/Serveranwendung.csproj | 7 +- BeWo/BeWo.csproj | 279 +++++++++--------- BeWo/BeWoApp.xaml.cs | 2 +- BeWo/Core/BeWoUtils.cs | 23 +- BeWo/Core/Service/SupportConceptService.cs | 1 + BeWo/Properties/licenses.licx | 1 - BeWo/Scheduler/View/NewSchedulerView.xaml | 76 ++--- .../ViewModel/NewSchedulerViewModel.cs | 6 +- .../NewSchulbegleitenderDienstView.xaml | 70 +++-- BeWo/View/BeWoFileView.xaml | 6 +- BeWo/View/BeWoFileView.xaml.cs | 22 +- .../Controls/ComboBoxTreeViewControlV2.xaml | 2 +- BeWo/View/Detail/AdditionalServiceView.xaml | 6 +- BeWo/View/Detail/Report/QueryView.xaml.cs | 14 +- BeWo/View/Detail/ServiceRecordView2.xaml | 8 + BeWo/View/Detail/ServiceRecordView2.xaml.cs | 12 +- BeWo/View/Detail/SupportConceptView.xaml | 11 +- BeWo/View/Detail/SupportConceptView.xaml.cs | 155 +++++++--- .../View/Detail/WordDocumentTemplateView.xaml | 2 +- .../ListViewModel/ServiceRecordListVM.cs | 2 +- BeWoPlanerMobil/BeWoPlanerMobil.csproj | 1 + BeWoPlanerMobil/BeWoPlanerMobil.csproj.user | 3 + Controls/Controls.csproj | 14 +- Host/DX.aspx | 10 +- Host/Host.csproj | 37 +-- Host/Host.csproj.user | 1 + Host/ReportView.aspx | 2 +- Host/Web.config | 40 +-- Report/Properties/licenses.licx | 2 +- Report/Report.csproj | 39 +-- .../ABCBetreuungenReports.csproj | 17 +- .../Properties/licenses.licx | 1 - ReportImp/ABWElsebrock/ABWElsebrock.csproj | 17 +- .../ABWElsebrock/Properties/licenses.licx | 1 - .../ASBBergischGladbachReports.csproj | 17 +- .../Properties/licenses.licx | 1 - .../ASBHammReports/ASBHammReports.csproj | 26 +- .../ASBHammReports/Properties/licenses.licx | 1 - .../AachenerVereinReports.csproj | 26 +- .../Properties/licenses.licx | 1 - ReportImp/AdikKleve/AdikKleve.csproj | 17 +- ReportImp/AdikKleve/Properties/licenses.licx | 1 - .../AidsHilfeGiessen/AidsHilfeGiessen.csproj | 17 +- .../AidsHilfeGiessen/Properties/licenses.licx | 1 - .../AidsInitiativeBonn.csproj | 17 +- .../Properties/licenses.licx | 1 - .../AidsUndDrogenberatung.csproj | 17 +- .../Properties/licenses.licx | 1 - .../AidshilfeDortmund.csproj | 17 +- .../Properties/licenses.licx | 1 - .../AidshilfeKassel/AidshilfeKassel.csproj | 17 +- .../AidshilfeKassel/Properties/licenses.licx | 1 - .../AssistenzaReports.csproj | 26 +- .../Properties/licenses.licx | 1 - ReportImp/BUGeVReports/BUGeVReports.csproj | 24 +- .../BUGeVReports/Properties/licenses.licx | 1 - ReportImp/BWKGbR/BWKGbR.csproj | 17 +- ReportImp/BWKGbR/Properties/licenses.licx | 1 - ReportImp/BeWoAlsdorf/BeWoAlsdorf.csproj | 17 +- .../BeWoAlsdorf/Properties/licenses.licx | 1 - ReportImp/BeWoAmrath/BeWoAmrath.csproj | 17 +- ReportImp/BeWoAmrath/Properties/licenses.licx | 1 - ReportImp/BeWoAuxilio/BeWoAuxilio.csproj | 17 +- .../BeWoAuxilio/Properties/licenses.licx | 1 - ReportImp/BeWoBiallas/BeWoBiallas.csproj | 17 +- .../BeWoBiallas/Properties/licenses.licx | 1 - .../BeWoColonia5Reports.csproj | 24 +- .../Properties/licenses.licx | 1 - .../BeWoColoniaKalayci.csproj | 24 +- .../BeWoColoniaMitarbeiter.csproj | 17 +- .../Properties/licenses.licx | 1 - .../BeWoDellbrueck/BeWoDellbrueck.csproj | 26 +- .../BeWoDellbrueck/Properties/licenses.licx | 1 - ReportImp/BeWoDirekt/BeWoDirekt.csproj | 17 +- ReportImp/BeWoDirekt/Properties/licenses.licx | 1 - ReportImp/BeWoHeinsberg/BeWoHeinsberg.csproj | 26 +- .../BeWoHeinsberg/Properties/licenses.licx | 1 - ReportImp/BeWoKerpen/BeWoKerpen.csproj | 17 +- ReportImp/BeWoKerpen/Properties/licenses.licx | 1 - .../BeWoMarinReports/BeWoMarinReports.csproj | 24 +- .../BeWoMobilReports/BeWoMobilReports.csproj | 26 +- .../BeWoMobilReports/Properties/licenses.licx | 1 - ReportImp/BeWoNeuss/BeWoNeuss.csproj | 26 +- ReportImp/BeWoNeuss/Properties/licenses.licx | 1 - .../BeWoPlusReports/BeWoPlusReports.csproj | 24 +- .../BeWoPlusReports/Properties/licenses.licx | 1 - ReportImp/BeWoRichartz/BeWoRichartz.csproj | 17 +- .../BeWoRichartz/Properties/licenses.licx | 1 - .../BeWoRueckenwind/BeWoRueckenwind.csproj | 17 +- .../BeWoRueckenwind/Properties/licenses.licx | 1 - .../BeWoSchillingReports.csproj | 24 +- .../Properties/licenses.licx | 1 - .../BetreuWoReports/BetreuWoReports.csproj | 26 +- .../BetreuWoReports/Properties/licenses.licx | 1 - .../BetreutesWohnenAmRheinReports.csproj | 26 +- .../Properties/licenses.licx | 1 - .../BetreutesWohnenStLudgerus.csproj | 17 +- .../Properties/licenses.licx | 1 - .../BetreutesWohnenStelzel.csproj | 26 +- .../Properties/licenses.licx | 1 - .../BetreutesWohnenWoellReports.csproj | 26 +- .../Properties/licenses.licx | 1 - .../BetreuungsBueroScholzReport.csproj | 17 +- .../Properties/licenses.licx | 1 - .../BetreuungsbueroBaak.csproj | 17 +- .../Properties/licenses.licx | 1 - ReportImp/BleibImLeben/BleibImLeben.csproj | 17 +- .../BleibImLeben/Properties/licenses.licx | 1 - .../BloemelingUndTeckhaus.csproj | 17 +- .../Properties/licenses.licx | 1 - ReportImp/BrueckeABW/BrueckeABW.csproj | 17 +- ReportImp/BrueckeABW/Properties/licenses.licx | 1 - ReportImp/CaritasAachen/CaritasAachen.csproj | 26 +- .../CaritasAachen/Properties/licenses.licx | 1 - .../CaritasBottrop/CaritasBottrop.csproj | 17 +- .../CaritasBottrop/Properties/licenses.licx | 1 - .../CaritasFrankfurt2Reports.csproj | 17 +- .../Properties/licenses.licx | 1 - .../CaritasFrankfurtReports.csproj | 26 +- .../Properties/licenses.licx | 1 - .../CaritasLeverkusen.csproj | 17 +- .../Properties/licenses.licx | 1 - ReportImp/CaritasUnna/CaritasUnna.csproj | 24 +- .../CaritasUnna/Properties/licenses.licx | 1 - .../CaritasUnnaWohnungslosenhilfe.csproj | 17 +- .../Properties/licenses.licx | 1 - .../CaritasWuppertalSolingen.csproj | 17 +- .../Properties/licenses.licx | 1 - .../ChristopherusHaus.csproj | 17 +- .../Properties/licenses.licx | 1 - ReportImp/Club74/Club74.csproj | 17 +- ReportImp/Club74/Properties/licenses.licx | 1 - ReportImp/Convoi/Convoi.csproj | 17 +- ReportImp/Convoi/Properties/licenses.licx | 1 - ReportImp/DerKarren/DerKarren.csproj | 17 +- ReportImp/DerKarren/Properties/licenses.licx | 1 - .../DiakonieKKKleve/DiakonieKKKleve.csproj | 17 +- .../DiakonieKKKleve/Properties/licenses.licx | 1 - .../DiakonieLennepReports.csproj | 24 +- .../Properties/licenses.licx | 1 - .../DieDueneReports/DieDueneReports.csproj | 17 +- .../DieDueneReports/Properties/licenses.licx | 1 - .../EigentstaendigHennef.csproj | 17 +- .../Properties/licenses.licx | 1 - .../FaerberReports/FaerberReports.csproj | 26 +- .../FaerberReports/Properties/licenses.licx | 1 - .../FeidPartnerReports.csproj | 26 +- .../Properties/licenses.licx | 1 - ReportImp/FibMarburg/FibMarburg.csproj | 17 +- ReportImp/FibMarburg/Properties/licenses.licx | 1 - .../FlingernMobilReports.csproj | 24 +- .../Properties/licenses.licx | 1 - ReportImp/Fortis/Fortis.csproj | 17 +- ReportImp/Fortis/Properties/licenses.licx | 1 - .../FortschritteEV/FortschritteEV.csproj | 17 +- .../FortschritteEV/Properties/licenses.licx | 1 - .../GenderBeWoReports.csproj | 26 +- .../Properties/licenses.licx | 1 - .../GerdasPflegedienst.csproj | 17 +- .../Properties/licenses.licx | 1 - .../GpzBiberachReports.csproj | 17 +- .../Properties/licenses.licx | 1 - .../HPHBersenbrueck/HPHBersenbrueck.csproj | 17 +- .../HPHBersenbrueck/Properties/licenses.licx | 1 - ReportImp/HausTheresia/HausTheresia.csproj | 17 +- .../HausTheresia/Properties/licenses.licx | 1 - .../HausschoppReports.csproj | 26 +- .../HolsingerReports/HolsingerReports.csproj | 26 +- .../HolsingerReports/Properties/licenses.licx | 1 - .../HphBersenbrueckAtz.csproj | 17 +- .../Properties/licenses.licx | 1 - ReportImp/IBPReports/IBPReports.csproj | 26 +- ReportImp/IBPReports/Properties/licenses.licx | 1 - ReportImp/IndroABW/IndroABW.csproj | 17 +- ReportImp/IndroABW/Properties/licenses.licx | 1 - .../IntegraHeinsbergReports.csproj | 26 +- .../Properties/licenses.licx | 1 - .../IntegraReports/IntegraReports.csproj | 26 +- .../IntegraReports/Properties/licenses.licx | 1 - .../IntegroReports/IntegroReports.csproj | 26 +- .../IntegroReports/Properties/licenses.licx | 1 - ReportImp/KOMO/KOMO.csproj | 17 +- ReportImp/KOMO/Properties/licenses.licx | 1 - ReportImp/KetteReports/KetteReports.csproj | 26 +- .../KetteReports/Properties/licenses.licx | 1 - ReportImp/KocksReports/KocksReports.csproj | 26 +- .../KocksReports/Properties/licenses.licx | 1 - .../KoelnRingReports/KoelnRingReports.csproj | 26 +- .../KoelnRingReports/Properties/licenses.licx | 1 - ReportImp/KomMitBewo/KomMitBewo.csproj | 17 +- ReportImp/KomMitBewo/Properties/licenses.licx | 1 - .../KontaktUndKrisenhilfeReports.csproj | 26 +- .../Properties/licenses.licx | 1 - .../LWVEingliederungshilfe.csproj | 14 +- .../Properties/licenses.licx | 1 - .../LebenshilfeAhrweiler.csproj | 17 +- .../Properties/licenses.licx | 1 - .../LebenshilfeBorkenReports.csproj | 24 +- .../Properties/licenses.licx | 1 - .../LebenshilfeCoburg.csproj | 17 +- .../Properties/licenses.licx | 1 - .../LebenshilfeDuisburgReports.csproj | 24 +- .../Properties/licenses.licx | 1 - .../LebenshilfeDuisburgServicePlus.csproj | 17 +- .../Properties/licenses.licx | 1 - .../LebenshilfeEssenReports.csproj | 26 +- .../Properties/licenses.licx | 1 - .../LebenshilfeHannoverReports.csproj | 24 +- .../Properties/licenses.licx | 1 - .../LebenshilfeRemscheid.csproj | 17 +- .../Properties/licenses.licx | 1 - .../LebenshilfeRheinSiegReports.csproj | 26 +- .../Properties/licenses.licx | 1 - .../LebenshilfeRodenkirchenReports.csproj | 24 +- .../Properties/licenses.licx | 1 - .../LebenshilfeStade/LebenshilfeStade.csproj | 17 +- .../LebenshilfeStade/Properties/licenses.licx | 1 - .../LebenshilfeWarendorf.csproj | 17 +- .../Properties/licenses.licx | 1 - .../LebenshilfeWetterau.csproj | 17 +- .../Properties/licenses.licx | 1 - .../LebenshilfeWuerzburgReports.csproj | 26 +- .../Properties/licenses.licx | 1 - .../LebensweltGabrielReports.csproj | 26 +- .../Properties/licenses.licx | 1 - .../LeiendeckerReports.csproj | 24 +- .../Properties/licenses.licx | 1 - .../LoslebenReports/LoslebenReports.csproj | 26 +- .../LoslebenReports/Properties/licenses.licx | 1 - .../Marienhospital/Marienhospital.csproj | 17 +- .../Marienhospital/Properties/licenses.licx | 1 - .../MeinBetreutesWohnen.csproj | 17 +- .../Properties/licenses.licx | 1 - .../MezMenzelReports/MezMenzelReports.csproj | 26 +- .../MezMenzelReports/Properties/licenses.licx | 1 - ReportImp/Mittendrin/Mittendrin.csproj | 17 +- ReportImp/Mittendrin/Properties/licenses.licx | 1 - .../MuellestumpeReports.csproj | 26 +- .../Properties/licenses.licx | 1 - ReportImp/PURReports/PURReports.csproj | 32 +- ReportImp/PouginReports/PouginReports.csproj | 26 +- .../PouginReports/Properties/licenses.licx | 1 - ReportImp/Praesentation/Praesentation.csproj | 17 +- .../Praesentation/Properties/licenses.licx | 1 - .../PraunheimerWerkstaettenGmbh.csproj | 17 +- .../Properties/licenses.licx | 1 - .../ProfEggersStiftung.csproj | 17 +- .../Properties/licenses.licx | 1 - .../Properties/licenses.licx | 1 - .../PsychosozialerTraegervereinReports.csproj | 17 +- .../RessourceEV/Properties/licenses.licx | 1 - ReportImp/RessourceEV/RessourceEV.csproj | 17 +- .../SBBMainzReports/Properties/licenses.licx | 1 - .../SBBMainzReports/SBBMainzReports.csproj | 24 +- .../SHGSchwerte/Properties/licenses.licx | 1 - ReportImp/SHGSchwerte/SHGSchwerte.csproj | 17 +- ReportImp/SKFAlsdorf/Properties/licenses.licx | 1 - ReportImp/SKFAlsdorf/SKFAlsdorf.csproj | 17 +- .../SPZLeverkusen/Properties/licenses.licx | 1 - ReportImp/SPZLeverkusen/SPZLeverkusen.csproj | 17 +- .../SPZRatingen/Properties/licenses.licx | 1 - ReportImp/SPZRatingen/SPZRatingen.csproj | 24 +- .../Properties/licenses.licx | 1 - .../SchillingerReports.csproj | 26 +- .../Properties/licenses.licx | 1 - .../SchoengeistReports.csproj | 26 +- ReportImp/SeWo/Properties/licenses.licx | 1 - ReportImp/SeWo/SeWo.csproj | 17 +- .../SelwoReports/Properties/licenses.licx | 1 - ReportImp/SelwoReports/SelwoReports.csproj | 26 +- .../SeverinReports/Properties/licenses.licx | 1 - .../SeverinReports/SeverinReports.csproj | 26 +- .../SigncomReports/Properties/licenses.licx | 1 - .../SigncomReports/SigncomReports.csproj | 26 +- ReportImp/SkmMenden/Properties/licenses.licx | 1 - ReportImp/SkmMenden/SkmMenden.csproj | 17 +- ReportImp/Socia/Properties/licenses.licx | 1 - ReportImp/Socia/SociaKoeln.csproj | 17 +- .../Properties/licenses.licx | 1 - .../SozialeDiensteKathrinSchmidt.csproj | 17 +- .../Properties/licenses.licx | 1 - .../SozialeDiensteNiederrhein.csproj | 17 +- .../Properties/licenses.licx | 1 - ...ozialeDienstleistungenBeckerReports.csproj | 26 +- .../Properties/licenses.licx | 1 - ...zialeDienstleistungenGessnerReports.csproj | 17 +- .../Properties/licenses.licx | 1 - .../SozialeDienstleistungenSchoenberg.csproj | 17 +- .../Properties/licenses.licx | 1 - .../SozialwirkstattSchmitz.csproj | 26 +- .../SpektrumGmbH/Properties/licenses.licx | 1 - ReportImp/SpektrumGmbH/SpektrumGmbH.csproj | 17 +- .../SpektrumReports/Properties/licenses.licx | 1 - .../SpektrumReports/SpektrumReports.csproj | 26 +- .../Properties/licenses.licx | 1 - .../SprungbrettReports.csproj | 26 +- .../Properties/licenses.licx | 1 - .../SprungbrettTheresia.csproj | 17 +- .../SynpraxReports/Properties/licenses.licx | 1 - .../SynpraxReports/SynpraxReports.csproj | 17 +- .../Properties/licenses.licx | 1 - .../TRIASAmbulanteSozialarbeit.csproj | 17 +- .../TagwerkReports/Properties/licenses.licx | 1 - .../TagwerkReports/TagwerkReports.csproj | 26 +- .../TeamGSReports/Properties/licenses.licx | 1 - ReportImp/TeamGSReports/TeamGSReports.csproj | 26 +- .../Properties/licenses.licx | 1 - .../TranskulturellesBBBasaran.csproj | 26 +- .../Properties/licenses.licx | 1 - .../TranskulturellesBBPastor.csproj | 26 +- .../Properties/licenses.licx | 1 - .../TranskulturellesBetreuungsbuero.csproj | 17 +- .../TrialogReports/Properties/licenses.licx | 1 - .../TrialogReports/TrialogReports.csproj | 17 +- ReportImp/VKMAachen/Properties/licenses.licx | 1 - ReportImp/VKMAachen/VKMAachen.csproj | 17 +- .../VSDHammReports/Properties/licenses.licx | 1 - .../VSDHammReports/VSDHammReports.csproj | 24 +- .../Properties/licenses.licx | 1 - .../VereinDuerenerChristenReports.csproj | 26 +- .../Properties/licenses.licx | 1 - .../VereinLebensgestaltung.csproj | 17 +- .../VibbEssenReports/Properties/licenses.licx | 1 - .../VibbEssenReports/VibbEssenReports.csproj | 26 +- .../VisionReports/Properties/licenses.licx | 1 - ReportImp/VisionReports/VisionReports.csproj | 26 +- .../VivaAVidaReports/Properties/licenses.licx | 1 - .../VivaAVidaReports/VivaAVidaReports.csproj | 26 +- .../Properties/licenses.licx | 1 - .../VivatgGmbHReports.csproj | 17 +- ReportImp/VkmHamm/Properties/licenses.licx | 1 - ReportImp/VkmHamm/VkmHamm.csproj | 17 +- ReportImp/WMB/Properties/licenses.licx | 1 - ReportImp/WMB/WMB.csproj | 17 +- .../WegeReports/Properties/licenses.licx | 1 - ReportImp/WegeReports/WegeReports.csproj | 26 +- .../Properties/licenses.licx | 1 - .../WegweiserBetreuungsdienstReports.csproj | 26 +- .../Properties/licenses.licx | 1 - .../Weitblick-ambulantBeWo.csproj | 17 +- .../WigonetzReports/Properties/licenses.licx | 1 - .../WigonetzReports/WigonetzReports.csproj | 26 +- .../Properties/licenses.licx | 1 - .../WohnhelferRemscheidReports.csproj | 26 +- .../Properties/licenses.licx | 1 - .../ZMDLengerichReports.csproj | 26 +- .../Properties/licenses.licx | 1 - .../ZukunftWohnenReports.csproj | 24 +- .../demo_reports/Properties/licenses.licx | 1 - ReportImp/demo_reports/demo_reports.csproj | 26 +- ReportImp/skmRheydt/Properties/licenses.licx | 1 - ReportImp/skmRheydt/skmRheydt.csproj | 17 +- ReportService/ReportingService.csproj | 14 +- ReportViewer/Properties/licenses.licx | 1 - ReportViewer/ReportViewer.csproj | 27 +- Service/Core/Utils.cs | 3 +- Service/Plugins/DataImporter.cs | 9 +- Service/Plugins/ServiceRecordValidator.cs | 20 +- Service/Service.csproj | 24 +- .../OperationsServiceImp.cs | 2 +- .../StreamingServiceImp.cs | 8 +- Shared/BeWoEntityEnums.cs | 1 + Shared/Core/EnumTranslations.cs | 5 +- .../FlatSupportConceptTreeNodeDC.cs | 13 +- .../ClientPartials/CompactSupportConceptDC.cs | 11 +- .../Compact/CompactCostBearerDC.cs | 3 + Shared/Shared.csproj | 16 +- ValidationLibrary/ValidationLibrary.csproj | 12 +- 369 files changed, 2633 insertions(+), 1972 deletions(-) diff --git a/AndroidChatServer/Serveranwendung/Serveranwendung/Properties/Licenses.licx b/AndroidChatServer/Serveranwendung/Serveranwendung/Properties/Licenses.licx index b6d8d37e5..e69de29bb 100644 --- a/AndroidChatServer/Serveranwendung/Serveranwendung/Properties/Licenses.licx +++ b/AndroidChatServer/Serveranwendung/Serveranwendung/Properties/Licenses.licx @@ -1 +0,0 @@ -DevExpress.Xpf.LayoutControl.ScrollBox, DevExpress.Xpf.LayoutControl.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/AndroidChatServer/Serveranwendung/Serveranwendung/Serveranwendung.csproj b/AndroidChatServer/Serveranwendung/Serveranwendung/Serveranwendung.csproj index 93f189324..7e6da169a 100644 --- a/AndroidChatServer/Serveranwendung/Serveranwendung/Serveranwendung.csproj +++ b/AndroidChatServer/Serveranwendung/Serveranwendung/Serveranwendung.csproj @@ -49,9 +49,10 @@ 4 - - - + + + + diff --git a/BeWo/BeWo.csproj b/BeWo/BeWo.csproj index ee6eb83aa..c572b591d 100644 --- a/BeWo/BeWo.csproj +++ b/BeWo/BeWo.csproj @@ -16,10 +16,10 @@ true Internet true - false + true - 64EE47D8851B4F38E5242B6A4D6FBA33D8B493BA + D9ACF3EBC5E47956B8D786361F7061E3F6D6F286 true false 3.0.1927.0 @@ -42,12 +42,12 @@ de-DE BeWoPlaner beyondSoft GmbH - 2.0.1.122 + 2.0.1.124 true publish.htm false true - 123 + 125 2.0.1.%2a false true @@ -91,32 +91,35 @@ False ..\Lib\Blacklight.Wpf.Controls.dll - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + True @@ -2017,352 +2020,352 @@ 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 @@ -2469,15 +2472,15 @@ - + + \ No newline at end of file diff --git a/BeWo/BeWoApp.xaml.cs b/BeWo/BeWoApp.xaml.cs index b6c054db0..3728b762e 100644 --- a/BeWo/BeWoApp.xaml.cs +++ b/BeWo/BeWoApp.xaml.cs @@ -451,7 +451,7 @@ namespace BeWo String url = ServerAddress.ToLower(); #if DEBUG - url = String.Format("http://localhost/Host"); + url = String.Format("http://localhost:3777/Host"); //url = String.Format("app1.bewoplaner.de/service"); #endif diff --git a/BeWo/Core/BeWoUtils.cs b/BeWo/Core/BeWoUtils.cs index 3ad61dfaf..803a25caf 100644 --- a/BeWo/Core/BeWoUtils.cs +++ b/BeWo/Core/BeWoUtils.cs @@ -1658,24 +1658,39 @@ namespace BeWo.Core } break; case ServiceRecordValidationResult.ApprovedFLSOverspending: + String klient = "diesen Hilfeplan"; + if (!String.IsNullOrEmpty(result.CustomerName)) + { + klient = "Klient/in " + result.CustomerName; + } + String msg = + String.Format( + "Die für {2} genehmigten FLS ({0:N}) werden mit diesem Eintrag überschritten. ({1:N}).", + result.ApprovedHours, result.HoursNew, klient); + if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.ServiceRecord_AllowCreateMoreFLSThanApproved)) { - MessageBox.Show("Die für diesen Hilfeplan genehmigten FLS (" + (result.ApprovedHours).ToString("N") + ") werden mit diesem Eintrag überschritten. (" + (result.HoursNew).ToString("N") + ").\nSpeichern nicht möglich.", "Speichern nicht möglich", MessageBoxButton.OK, MessageBoxImage.Information); + MessageBox.Show(msg + ").\nSpeichern nicht möglich.", "Speichern nicht möglich", MessageBoxButton.OK, MessageBoxImage.Information); lValid = false; } - else if (MessageBox.Show("Die für diesen Hilfeplan genehmigten FLS (" + (result.ApprovedHours).ToString("N") + ") werden mit diesem Eintrag überschritten. (" + (result.HoursNew).ToString("N") + ").\nMöchten Sie trotzdem speichern?", "Speichern", MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.No) + else if (MessageBox.Show(msg + ").\nMöchten Sie trotzdem speichern?", "Speichern", MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.No) { lValid = false; exitLoop = true; } break; case ServiceRecordValidationResult.SettlementInvoiceAlreadyExisting: + String klient2 = "diesen Hilfeplan"; + if (!String.IsNullOrEmpty(result.CustomerName)) + { + klient2 = "Klient/in " + result.CustomerName; + } if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.BookServiceRecordAfterSettlementInvoice)) { - MessageBox.Show("Sie können den Eintrag nicht bearbeiten, da bereits eine Spitzabrechnung für diesen Hilfeplan erstellt wurde.", "Speichern nicht möglich", MessageBoxButton.OK, MessageBoxImage.Warning); + MessageBox.Show(String.Format("Sie können den Eintrag nicht bearbeiten, da bereits eine Spitzabrechnung für {0} erstellt wurde.", klient2), "Speichern nicht möglich", MessageBoxButton.OK, MessageBoxImage.Warning); lValid = false; } - else if (MessageBox.Show("Es existiert bereits eine Spitzabrechnung. Um diesen Eintrag zu berücksichtigen, muss eventuell eine neue Spitzabrechnung erstellt werden.\nMöchten Sie trotzdem speichern?", "Speichern", MessageBoxButton.YesNo, MessageBoxImage.Warning).Equals(MessageBoxResult.No)) + else if (MessageBox.Show(String.Format("Es existiert bereits eine Spitzabrechnung für {0}. Um diesen Eintrag zu berücksichtigen, muss eventuell eine neue Spitzabrechnung erstellt werden.\nMöchten Sie trotzdem speichern?", klient2), "Speichern", MessageBoxButton.YesNo, MessageBoxImage.Warning).Equals(MessageBoxResult.No)) { lValid = false; exitLoop = true; diff --git a/BeWo/Core/Service/SupportConceptService.cs b/BeWo/Core/Service/SupportConceptService.cs index a2c434209..e3a5d25e4 100644 --- a/BeWo/Core/Service/SupportConceptService.cs +++ b/BeWo/Core/Service/SupportConceptService.cs @@ -315,6 +315,7 @@ namespace BeWo.Core.Service relDC.RequestedStartDate = cbDC.RequestedStartDate; relDC.Status = cbDC.SupportConceptStatus; relDC.SupportConcept = dc; + relDC.AuswahlBezeichnung = cbDC.Bezeichnung; treeNode.SupportConceptCostBearerRelDC = relDC; treeNode.CostBearer = orgDC; diff --git a/BeWo/Properties/licenses.licx b/BeWo/Properties/licenses.licx index 47c5ed583..e69de29bb 100644 --- a/BeWo/Properties/licenses.licx +++ b/BeWo/Properties/licenses.licx @@ -1 +0,0 @@ -DevExpress.Xpf.Editors.SpinEdit, DevExpress.Xpf.Core.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/BeWo/Scheduler/View/NewSchedulerView.xaml b/BeWo/Scheduler/View/NewSchedulerView.xaml index 9ee721a31..e5132c3a0 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.1" + xmlns:dxschui="clr-namespace:DevExpress.Xpf.Scheduler.Drawing;assembly=DevExpress.Xpf.Scheduler.v13.2" xmlns:dxscht="http://schemas.devexpress.com/winfx/2008/xaml/scheduler/themekeys" xmlns:view="clr-namespace:BeWo.Scheduler.View" xmlns:converter="clr-namespace:BeWo.Converter" @@ -80,7 +80,7 @@ - + @@ -133,7 +133,8 @@ - + @@ -146,17 +147,17 @@ - - + + - + - + @@ -168,7 +169,8 @@ - + @@ -214,7 +216,7 @@ - + @@ -250,7 +252,8 @@ Visibility="{Binding ViewInfo.View.AppointmentToolTipVisibility, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ToolTipVisibilityConverter}}"> - + @@ -263,17 +266,17 @@ - - + + - + - + @@ -285,18 +288,21 @@ + Visibility="{Binding ViewInfo.Selected, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource boolToVisibilityConverter}}" /> + IsHitTestVisible="True" + dxsch:SchedulerControl.HitTestType="AppointmentResizingLeftEdge" + dxsch:SchedulerControl.SelectableIntervalViewInfo="{TemplateBinding ViewInfo}" + Cursor="SizeWE"> + dxsch:SchedulerControl.SelectableIntervalViewInfo="{TemplateBinding ViewInfo}" + Cursor="SizeWE"> @@ -383,7 +389,7 @@ - + - - + +