From cf9077466707de38f9711d6b2536b023283b7cbc Mon Sep 17 00:00:00 2001 From: Christian Date: Sun, 11 Jun 2017 15:50:31 +0200 Subject: [PATCH] bugfixing --- BeWo/BeWo.csproj | 15 +- BeWo/BeWo.csproj.user | 2 +- BeWo/BeWoApp.xaml.cs | 32 +- BeWo/Core/BeWoUtils.cs | 6 +- BeWo/Core/Config/AppSettings.cs | 12 +- BeWo/LoginControl.xaml.cs | 128 +- BeWo/MainControl.xaml.cs | 2 +- BeWo/Scheduler/View/NewSchedulerView.xaml.cs | 12 + BeWo/View/ChatDokumentationsView.xaml.cs | 16 +- BeWo/View/Detail/CustomerView.xaml.cs | 14 +- BeWo/View/Detail/EmployeeView.xaml.cs | 15 +- BeWo/View/Detail/MandatorView.xaml | 6 +- BeWo/View/Detail/ServiceRecordEditView.xaml | 8 +- .../View/Detail/ServiceRecordEditView.xaml.cs | 2 +- .../Detail/ServiceRecordGroupEditView.xaml | 46 +- .../Detail/ServiceRecordGroupEditView.xaml.cs | 66 +- BeWo/View/Detail/ServiceRecordView2.xaml.cs | 53 +- BeWo/View/Detail/SupportConceptView.xaml | 4 +- BeWo/View/Detail/SupportConceptView.xaml.cs | 7 +- BeWo/View/PasswortAenderungsView.xaml | 14 +- .../ListViewModel/ServiceRecordListVM.cs | 1 + BeWo/ViewModel/ServiceRecordVM.cs | 45 +- BeWo/ViewModel/UserGroupVM.cs | 19 +- Host/Web.config | 8 +- .../ABCBetreuungenReports.csproj | 17 +- .../Properties/licenses.licx | 1 + ReportImp/ABWElsebrock/ABWElsebrock.csproj | 24 +- .../ABWElsebrock/Properties/licenses.licx | 1 + .../ServicesOverviewReport.Designer.cs | 329 +- .../ABWElsebrock/ServicesOverviewReport.cs | 48 +- .../ABWElsebrock/ServicesOverviewReport.resx | 564 + .../ABWElsebrock/SettlementReport.Designer.cs | 627 +- ReportImp/ABWElsebrock/SettlementReport.cs | 175 +- ReportImp/ABWElsebrock/SettlementReport.resx | 13 +- .../ASBBergischGladbachReports.csproj | 36 +- .../Properties/licenses.licx | 1 + .../ServicesOverviewReport.Designer.cs | 1986 +-- .../ServicesOverviewReport.cs | 179 +- .../ServicesOverviewReport.resx | 8876 ------------ .../ASBHammReports/ASBHammReports.csproj | 26 +- .../ASBHammReports/Properties/licenses.licx | 1 + .../AachenerVereinReports.csproj | 26 +- .../Mitarbeiterauswertung.cs | 9 +- .../Properties/licenses.licx | 1 + ReportImp/AdikKleve/AdikKleve.csproj | 52 +- 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 + .../ServicesOverviewReport.Designer.cs | 1397 +- .../ServicesOverviewReport.resx | 3807 +++--- .../SettlementReport.Designer.cs | 1832 +-- .../SettlementReport.resx | 3807 +++--- .../AidshilfeDortmund.csproj | 17 +- .../Properties/licenses.licx | 1 + .../SettlementReport.Designer.cs | 1522 +-- .../AidshilfeDortmund/SettlementReport.cs | 5 + .../AidshilfeKassel/AidshilfeKassel.csproj | 17 +- .../AidshilfeKassel/Properties/licenses.licx | 1 + .../AssistenzaReports.csproj | 26 +- .../InvoiceCustomerReport.Designer.cs | 277 +- .../InvoiceCustomerReport.resx | 4872 +------ .../Properties/licenses.licx | 1 + .../SettlementReport.Designer.cs | 1979 ++- .../AssistenzaReports/SettlementReport.cs | 25 + .../AssistenzaReports/SettlementReport.resx | 3 +- .../AssistenzaReports/SettlementReport2.cs | 44 +- .../SettlementReport2.designer.cs | 1368 +- .../AssistenzaReports/SettlementReport2.resx | 13 +- .../BAPBielefelderAmbulantePflege.csproj | 35 +- .../ServicesOverviewReport.Designer.cs | 1196 +- .../ServicesOverviewReport.cs | 47 + ReportImp/BUGeVReports/BUGeVReports.csproj | 24 +- .../BUGeVReports/Properties/licenses.licx | 1 + ReportImp/BWKGbR/BWKGbR.csproj | 27 +- ReportImp/BWKGbR/FLSListReport.Designer.cs | 1006 +- ReportImp/BWKGbR/FLSListReport.cs | 39 +- ReportImp/BWKGbR/Properties/licenses.licx | 1 + .../BWKGbR/ServicesOverviewReport.Designer.cs | 1478 +- ReportImp/BWKGbR/ServicesOverviewReport.cs | 25 + ReportImp/BeWoAlsdorf/BeWoAlsdorf.csproj | 26 +- .../BeWoAlsdorf/Properties/licenses.licx | 1 + ReportImp/BeWoAmrath/BeWoAmrath.csproj | 17 +- ...CustomMitarbeiterstundenkontoBerechnung.cs | 514 +- .../BeWoAmrath/Mitarbeiterstundenkonto.cs | 6 +- .../Mitarbeiterstundenkonto.designer.cs | 1060 +- ReportImp/BeWoAmrath/Properties/licenses.licx | 1 + ReportImp/BeWoAuxilio/BeWoAuxilio.csproj | 17 +- ...CustomMitarbeiterstundenkontoBerechnung.cs | 34 +- .../Mitarbeiterstundenkonto.designer.cs | 1092 +- .../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/Forderungen.cs | 4 +- ReportImp/BeWoDirekt/Properties/licenses.licx | 1 + ReportImp/BeWoHeinsberg/BeWoHeinsberg.csproj | 49 +- .../BeWoHeinsberg/Properties/licenses.licx | 2 +- ReportImp/BeWoHeinsberg/Qualitaetsbogen.cs | 125 +- .../BeWoHeinsberg/Qualitaetsbogen.designer.cs | 1041 +- ReportImp/BeWoHeinsberg/Qualitaetsbogen.resx | 15 - ReportImp/BeWoKerpen/BeWoKerpen.csproj | 17 +- ReportImp/BeWoKerpen/Properties/licenses.licx | 1 + .../BeWoLeverkusen/BeWoLeverkusen.csproj | 15 +- .../BeWoLeverkusen/Properties/licenses.licx | 1 + .../ServicesOverviewReport_ASS.cs | 2 +- .../ServicesOverviewReport_FLS.Designer.cs | 1438 +- .../ServicesOverviewReport_FLS.cs | 38 +- .../BeWoMarinReports/BeWoMarinReports.csproj | 24 +- .../BeWoMobilReports/BeWoMobilReports.csproj | 38 +- .../BeWoMobilReports/Properties/licenses.licx | 1 + ReportImp/BeWoNeuss/BeWoNeuss.csproj | 26 +- ReportImp/BeWoNeuss/Properties/licenses.licx | 1 + .../BeWoNeuss/SettlementReport.Designer.cs | 138 +- ReportImp/BeWoNeuss/SettlementReport.cs | 11 +- ReportImp/BeWoNeuss/SettlementReport.resx | 655 +- .../BeWoPlusReports/BeWoPlusReports.csproj | 24 +- .../BeWoPlusReports/Properties/licenses.licx | 1 + ReportImp/BeWoRichartz/BeWoRichartz.csproj | 17 +- .../BeWoRichartz/Properties/licenses.licx | 1 + .../ServicesOverviewReport.Designer.cs | 82 +- .../BeWoRichartz/ServicesOverviewReport.cs | 6 +- .../BeWoRueckenwind/BeWoRueckenwind.csproj | 17 +- .../BeWoRueckenwind/Properties/licenses.licx | 1 + .../BeWoSchillingReports.csproj | 24 +- .../Properties/licenses.licx | 1 + .../BetreuWoReports/BetreuWoReports.csproj | 26 +- ReportImp/BetreuWoReports/Forderungen.cs | 4 +- .../Kostenstellenauswertung2.cs | 1 + .../Kostenstellenauswertung3.cs | 13 +- .../BetreuWoReports/Properties/licenses.licx | 1 + .../BetreutesWohnenAmRheinReports.csproj | 26 +- .../InvoiceCustomerReport.Designer.cs | 954 +- .../InvoiceCustomerReport.resx | 2 +- .../Properties/licenses.licx | 1 + .../ServicesOverviewReport.Designer.cs | 308 +- .../ServicesOverviewReport.resx | 3012 ++--- .../SettlementReport.Designer.cs | 1412 +- .../SettlementReport.resx | 2 +- .../BetreutesWohnenStLudgerus.csproj | 17 +- .../Properties/licenses.licx | 1 + .../BetreutesWohnenStelzel.csproj | 26 +- .../Properties/licenses.licx | 1 + .../BetreutesWohnenWoellReports.csproj | 36 +- .../Properties/licenses.licx | 1 + .../ServicesOverviewReport.Designer.cs | 94 +- .../ServicesOverviewReport.resx | 582 +- .../BetreuungsBueroScholzReport.csproj | 17 +- .../Properties/licenses.licx | 1 + .../ServicesOverviewReport.Designer.cs | 41 +- .../BetreuungsbueroBaak.csproj | 32 +- .../Properties/licenses.licx | 1 + .../ServicesOverviewReport.Designer.cs | 2 +- .../ServicesOverviewReport.cs | 2 +- .../SettlementReport.Designer.cs | 2 +- .../BetreuungsbueroBaak/SettlementReport.cs | 3 +- ReportImp/BleibImLeben/BleibImLeben.csproj | 17 +- .../BleibImLeben/Properties/licenses.licx | 1 + .../BloemelingUndTeckhaus.csproj | 17 +- .../Properties/licenses.licx | 1 + .../ServicesOverviewReport.Designer.cs | 69 +- .../ServicesOverviewReportALS.Designer.cs | 64 +- .../ServicesOverviewReportALS.cs | 22 +- ReportImp/BrueckeABW/BrueckeABW.csproj | 17 +- ReportImp/BrueckeABW/Properties/licenses.licx | 1 + ReportImp/CaritasAachen/CaritasAachen.csproj | 26 +- .../InvoiceCustomerReport.Designer.cs | 42 +- .../CaritasAachen/Properties/licenses.licx | 1 + .../CaritasBottrop/CaritasBottrop.csproj | 27 +- .../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 | 19 +- .../Properties/licenses.licx | 1 + .../ServicesOverviewReport.cs | 36 + .../ChristopherusHaus.csproj | 17 +- .../Properties/licenses.licx | 1 + .../Calculations/DefaultCalculations.cs | 2 +- .../Calculations/DefaultSaveInterceptor.cs | 2 +- ReportImp/Club74/Club74.csproj | 47 +- ...Club74MitarbeiterstundenkontoBerechnung.cs | 38 +- ReportImp/Club74/GeneralReport.Designer.cs | 922 +- ReportImp/Club74/GeneralReport.cs | 38 +- .../Club74/InvoiceCustomerReport.Designer.cs | 956 +- ReportImp/Club74/InvoiceCustomerReport.cs | 20 +- .../Club74/Invoicing/Club74InvoiceCreation.cs | 6 +- .../Club74/Invoicing/Club74InvoiceFactory.cs | 9 + ReportImp/Club74/Mitarbeiterstundenkonto.cs | 17 +- .../Mitarbeiterstundenkonto.designer.cs | 1112 +- ReportImp/Club74/Properties/licenses.licx | 1 + .../Club74/ServiceInvoiceReport.Designer.cs | 1136 +- .../Club74/ServicesOverviewReport.Designer.cs | 1334 +- ReportImp/Club74/ServicesOverviewReport.cs | 9 + ReportImp/Club74/SettlementReport.Designer.cs | 1461 +- ReportImp/Club74/SettlementReport.cs | 15 + .../Club74/SupportConceptReport.Designer.cs | 1422 +- ReportImp/Club74/SupportConceptReport.cs | 1 + ReportImp/Club74/Teamstundenkonto.cs | 28 +- ReportImp/Club74/Teamstundenkonto.designer.cs | 1394 +- ReportImp/Convoi/Convoi.csproj | 17 +- ReportImp/Convoi/Properties/licenses.licx | 1 + ReportImp/DerKarren/DerKarren.csproj | 22 +- ReportImp/DerKarren/Properties/licenses.licx | 1 + .../AssistenzstundenReport.Designer.cs | 168 +- .../DiakonieKKKleve/AssistenzstundenReport.cs | 21 +- .../DiakonieKKKleve/DiakonieKKKleve.csproj | 17 +- .../DiakonieKKKleve/Properties/licenses.licx | 1 + .../ServiceInvoiceReport.Designer.cs | 918 +- .../DiakonieKKKleve/ServiceInvoiceReport.cs | 58 +- .../DiakonieKKKleve/ServiceInvoiceReport.resx | 2 +- .../DiakonieKKKleve/ServicesOverviewReport.cs | 2 +- .../DiakonieLennepReports.csproj | 24 +- .../DiakonieLennepReports/Forderungen.cs | 4 +- .../Properties/licenses.licx | 1 + .../SettlementReport.Designer.cs | 1075 +- .../SettlementReport2.designer.cs | 1031 +- .../DieDueneReports/DieDueneReports.csproj | 22 +- .../DieDueneReports/Properties/licenses.licx | 1 + .../ServicesOverviewReport.Designer.cs | 1002 +- .../DieWohnhelferReports.csproj | 44 + .../EigentstaendigHennef.csproj | 22 +- .../Properties/licenses.licx | 1 + .../ServicesOverviewReport.Designer.cs | 455 +- .../ServicesOverviewReport.cs | 6 +- .../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 + .../CustomGroupDurationCalculator.cs | 11 +- .../FizHofServiceRecordStatisticFactory.cs | 18 +- .../FlingernMobilReports.csproj | 62 +- .../Properties/licenses.licx | 1 + .../Fortis/CustomerDataReport.Designer.cs | 5020 ++++--- ReportImp/Fortis/CustomerDataReport.cs | 116 +- ReportImp/Fortis/Fortis.csproj | 17 +- ReportImp/Fortis/Properties/licenses.licx | 1 + .../FortschritteEV/FortschritteEV.csproj | 42 +- .../FortschritteEV/Properties/licenses.licx | 1 + .../RechnungPrivatReport.Designer.cs | 18 +- .../FortschritteEV/RechnungPrivatReport.cs | 2 +- .../FortschritteEV/RechnungPrivatReport.resx | 2033 --- .../VerhinderungspflegeReport.Designer.cs | 2 +- .../VerhinderungspflegeReport.cs | 4 +- .../GenderBeWoReports.csproj | 26 +- .../Properties/licenses.licx | 1 + .../GerdasPflegedienst.csproj | 17 +- .../Properties/licenses.licx | 1 + .../CollectiveBillingReportWfB.cs | 6 + .../CollectiveBillingReportWfB.designer.cs | 779 +- .../CollectiveBillingReportWfB.resx | 1092 ++ .../GpzBiberachReports.csproj | 18 +- .../InvoiceCustomerReport.Designer.cs | 901 +- .../InvoiceCustomerReport.cs | 8 +- .../InvoiceCustomerReport.resx | 1092 ++ .../GpzBiberachAbwInvoiceCreation.cs | 232 +- .../Invoicing/GpzBiberachInvoiceFactory.cs | 6 +- .../Invoicing/PflegeInvoiceCreation.cs | 118 +- .../Jahresauswertung.Designer.cs | 11241 +++++++--------- .../GpzBiberachReports/Jahresauswertung.cs | 489 +- .../JahresauswertungMissinglist.Designer.cs | 11187 +++++++-------- .../JahresauswertungMissinglist.cs | 945 +- ReportImp/GpzBiberachReports/KlientenListe.cs | 27 +- .../Properties/licenses.licx | 1 + .../ServiceInvoiceReport.Designer.cs | 948 +- .../ServiceInvoiceReport.cs | 8 +- .../ServiceInvoiceReport.resx | 1092 ++ .../ServiceInvoiceReportMiete.Designer.cs | 737 +- .../ServiceInvoiceReportMiete.cs | 7 +- .../ServiceInvoiceReportMiete.resx | 1092 ++ .../ServiceInvoiceReportPB.Designer.cs | 869 +- .../ServiceInvoiceReportPB.cs | 18 +- .../ServiceInvoiceReportPB.resx | 1092 ++ .../ServiceInvoiceReportPflege.Designer.cs | 941 +- .../ServiceInvoiceReportPflege.cs | 70 +- .../ServiceInvoiceReportPflege.resx | 1092 ++ ...viceInvoiceReportSoziotherapie.Designer.cs | 1131 +- .../ServiceInvoiceReportSoziotherapie.cs | 7 +- .../ServiceInvoiceReportSoziotherapie.resx | 1092 ++ .../CustomerDataReport.Designer.cs | 5824 ++++---- .../HPHBersenbrueck/HPHBersenbrueck.csproj | 17 +- .../HPHBersenbrueck/Properties/licenses.licx | 1 + ReportImp/HausTheresia/HausTheresia.csproj | 35 +- .../HausTheresia/Properties/licenses.licx | 1 + .../HausschoppReports.csproj | 26 +- .../HolsingerReports/HolsingerReports.csproj | 26 +- .../HolsingerReports/Properties/licenses.licx | 1 + .../HphBersenbrueckAtz.csproj | 38 +- .../Properties/licenses.licx | 1 + .../ServicesOverviewReport.Designer.cs | 87 +- .../ServicesOverviewReport.cs | 18 +- ReportImp/IBPReports/IBPReports.csproj | 27 +- ReportImp/IBPReports/Properties/licenses.licx | 1 + ReportImp/IndroABW/IndroABW.csproj | 17 +- ReportImp/IndroABW/Properties/licenses.licx | 1 + .../IntegraHeinsbergReports.csproj | 36 +- .../InvoiceCustomerReport.Designer.cs | 78 +- .../InvoiceCustomerReport.cs | 43 + .../Properties/licenses.licx | 1 + .../ServicesOverviewReport.Designer.cs | 36 +- .../ServicesOverviewReportJugendamt.cs | 14 +- ...ervicesOverviewReportJugendamt.designer.cs | 418 +- .../SettlementReport.Designer.cs | 101 +- .../SettlementReport.resx | 1 - .../SettlementReport2.designer.cs | 715 +- .../SettlementReport2.resx | 20 +- ReportImp/IntegraReports/Forderungen.cs | 4 +- .../IntegraReports/IntegraReports.csproj | 35 +- .../IntegraReports/Properties/licenses.licx | 1 + .../SettlementReport.Designer.cs | 2 +- ReportImp/IntegraReports/SettlementReport.cs | 2 +- .../IntegroReports/IntegroReports.csproj | 26 +- .../IntegroReports/Properties/licenses.licx | 1 + ReportImp/KOMO/KOMO.csproj | 17 +- ReportImp/KOMO/Properties/licenses.licx | 1 + ReportImp/KetteReports/KetteReports.csproj | 32 +- .../KetteReports/Properties/licenses.licx | 1 + .../KetteReports/QueryListReport.Designer.cs | 3854 ++++-- ReportImp/KetteReports/QueryListReport.cs | 739 +- .../ServicesOverviewReport.Designer.cs | 2550 ++-- .../KetteReports/ServicesOverviewReport.cs | 12 + 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 + .../KomMitBewo/SettlementReport.Designer.cs | 4 +- .../CustomerDataReport.Designer.cs | 2 +- .../KontaktUndKrisenhilfeReports.csproj | 26 +- .../Properties/licenses.licx | 1 + .../ServicesOverviewReport.Designer.cs | 5 +- .../ServicesOverviewReport.cs | 20 +- .../LWVEingliederungshilfe.csproj | 14 +- .../Properties/licenses.licx | 1 + .../LebenshilfeAhrweiler.csproj | 21 +- .../Properties/licenses.licx | 1 + .../ServicesOverviewReport.Designer.cs | 1925 +-- .../ServicesOverviewReport.cs | 169 +- .../LebenshilfeBorkenReports.csproj | 24 +- .../Properties/licenses.licx | 1 + .../AusbildungsassistenzRechnung.Designer.cs | 1760 +-- .../CollectiveBillingReport.Designer.cs | 2068 +-- .../FreizeitassistenzRechnung.Designer.cs | 1577 ++- ...burgAusbildungsassistenzInvoiceCreation.cs | 4 +- .../Invoicing/LhCoburgPBInvoiceCreation.cs | 4 +- .../LebenshilfeCoburg.csproj | 28 +- .../PersoenlichesBudgetRechnung.Designer.cs | 1537 +-- .../PersoenlichesBudgetRechnung.cs | 16 +- .../Properties/licenses.licx | 1 + .../ServicesOverviewReport.Designer.cs | 1407 +- .../LebenshilfeDuisburgReports.csproj | 24 +- .../Properties/licenses.licx | 1 + .../Schulbetreuung.cs | 6 +- .../ServiceInvoiceReportHPFH.Designer.cs | 1194 +- .../ServiceInvoiceReportHPFH.resx | 4 +- .../LebenshilfeDuisburgServicePlus.csproj | 39 +- .../Properties/licenses.licx | 1 + .../ServiceInvoiceReport.Designer.cs | 28 +- .../ServiceInvoiceReport.cs | 10 +- .../ServiceInvoiceReport.resx | 2 +- .../CollectiveBillingReport.Designer.cs | 1117 +- .../CollectiveBillingReport.resx | 2 +- .../InvoiceCustomerReport.Designer.cs | 936 +- .../InvoiceCustomerReport.resx | 2 +- .../LebenshilfeEssenReports.csproj | 26 +- .../Properties/licenses.licx | 1 + .../ServiceInvoiceReport.Designer.cs | 684 +- .../ServiceInvoiceReport.resx | 4 +- .../ServicesOverviewReport.Designer.cs | 153 +- .../ServicesOverviewReport.cs | 19 + .../SettlementReport.Designer.cs | 1223 +- .../SettlementReport.resx | 1399 +- .../LebenshilfeHannoverReports.csproj | 24 +- .../Properties/licenses.licx | 1 + .../Bilder/LebenshilfeMannheimEV.png | Bin 4557 -> 4921 bytes .../LebenshilfeMannheimEV.csproj | 15 +- .../Properties/licenses.licx | 1 + .../ServicesOverviewReport.Designer.cs | 641 +- .../ServicesOverviewReport.cs | 33 + .../ServicesOverviewReport.resx | 150 +- .../LebenshilfeRemscheid.csproj | 17 +- .../Properties/licenses.licx | 1 + .../LebenshilfeRheinSiegReports.csproj | 28 +- .../Properties/licenses.licx | 1 + .../ServicesOverviewReport.Designer.cs | 1463 +- .../SettlementReport.Designer.cs | 1550 +-- .../SettlementReport.resx | 4 +- .../LebenshilfeRodenkirchenReports.csproj | 24 +- .../Properties/licenses.licx | 1 + .../LebenshilfeStade/LebenshilfeStade.csproj | 17 +- .../LebenshilfeStade/Properties/licenses.licx | 1 + .../LebenshilfeWarendorf.csproj | 17 +- .../Properties/licenses.licx | 1 + .../CollectiveBillingReport.Designer.cs | 89 +- .../Fahrtkostenauswertung.designer.cs | 339 +- .../Fahrtkostenauswertung.resx | 574 + .../LebenshilfeWetterau.csproj | 24 +- .../Properties/licenses.licx | 1 + .../ServicesOverviewReport.Designer.cs | 97 +- .../ServicesOverviewReport.resx | 4 - .../LebenshilfeWuerzburgReports.csproj | 37 +- .../Properties/licenses.licx | 1 + .../ServicesOverviewReport.Designer.cs | 528 +- .../ServicesOverviewReport.cs | 51 +- .../ServicesOverviewReport.resx | 116 + .../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 | 34 +- ReportImp/PouginReports/PouginReports.csproj | 26 +- .../PouginReports/Properties/licenses.licx | 1 + ReportImp/Praesentation/Praesentation.csproj | 17 +- .../Praesentation/Properties/licenses.licx | 1 + .../PraunheimerWerkstaettenGmbh.csproj | 20 +- .../Properties/licenses.licx | 2 + .../ServicesOverviewReport.Designer.cs | 513 +- .../ServicesOverviewReport.cs | 109 +- .../ServicesOverviewReport.resx | 50 + .../ProfEggersStiftung.csproj | 52 +- .../Properties/licenses.licx | 1 + .../ServicesOverviewReport.Designer.cs | 307 +- .../ServicesOverviewReport.cs | 32 +- .../Properties/licenses.licx | 1 + .../PstMitarbeiterstundenkontoBerechnung.cs | 42 +- .../PsychosozialerTraegervereinReports.csproj | 19 +- .../RessourceEV/Properties/licenses.licx | 1 + ReportImp/RessourceEV/RessourceEV.csproj | 24 +- .../ServicesOverviewReport.Designer.cs | 1194 +- .../RessourceEV/ServicesOverviewReport.cs | 22 - .../Calculations/GroupDurationCalculator.cs | 7 +- .../Calculations/SBBMainzCalculations.cs | 515 +- .../SBBMainzServiceRecordStatisticFactory.cs | 272 +- .../CustomerDataReport.Designer.cs | 1855 ++- .../SBBMainzReports/CustomerDataReport.cs | 29 +- .../SBBMainzReports/Properties/licenses.licx | 1 + .../QuittierungsbelegJugendamt.cs | 88 +- .../QuittierungsbelegJugendamt.designer.cs | 84 +- .../SBBMainzReports/SBBMainzReportCreator.cs | 2 +- .../SBBMainzReports/SBBMainzReports.csproj | 24 +- .../SHGSchwerte/Properties/licenses.licx | 1 + ReportImp/SHGSchwerte/SHGSchwerte.csproj | 32 +- ReportImp/SKFAlsdorf/Properties/licenses.licx | 1 + ReportImp/SKFAlsdorf/SKFAlsdorf.csproj | 27 +- .../SKFAlsdorf/SettlementReport.Designer.cs | 2 +- ReportImp/SKFAlsdorf/SettlementReport.cs | 2 +- .../SPZLeverkusen/Properties/licenses.licx | 1 + ReportImp/SPZLeverkusen/SPZLeverkusen.csproj | 27 +- .../ServicesOverviewReport.Designer.cs | 1254 +- .../SPZRatingen/Properties/licenses.licx | 1 + ReportImp/SPZRatingen/SPZRatingen.csproj | 29 +- .../ServicesOverviewReport.Designer.cs | 2878 +--- .../SPZRatingen/ServicesOverviewReport.cs | 142 +- .../InvoiceCustomerReport.Designer.cs | 137 +- .../InvoiceCustomerReport.cs | 30 + .../InvoiceCustomerReport.resx | 1046 +- .../Properties/licenses.licx | 1 + .../SchillingerReports.csproj | 37 +- .../ServiceInvoiceReport.Designer.cs | 543 +- .../ServiceInvoiceReport.cs | 33 +- .../ServiceInvoiceReport.resx | 1812 +-- .../SettlementReport.Designer.cs | 3156 +++-- .../SchillingerReports/SettlementReport.cs | 38 +- .../Properties/licenses.licx | 1 + .../SchoengeistReports.csproj | 26 +- ReportImp/SeWo/FLSGroupReport.Designer.cs | 1131 +- ReportImp/SeWo/FLSGroupReport.cs | 55 +- ReportImp/SeWo/FLSListReport.Designer.cs | 975 +- ReportImp/SeWo/FLSListReport.cs | 97 +- ReportImp/SeWo/Forderungen.cs | 2 + .../SeWo/MitarbeiterstundenkontoBerechnung.cs | 65 +- ReportImp/SeWo/Properties/licenses.licx | 1 + ReportImp/SeWo/SeWo.csproj | 59 +- .../SeWo/ServicesOverviewReport.Designer.cs | 1268 +- ReportImp/SeWo/ServicesOverviewReport.cs | 4 +- ReportImp/SeWo/ServicesOverviewReport.resx | 439 +- ReportImp/SeWo/SettlementReport.Designer.cs | 347 +- ReportImp/SeWo/SettlementReport.cs | 27 +- ReportImp/SeWo/SettlementReport.resx | 381 + ReportImp/SeWo/SettlementReport2.Designer.cs | 263 +- ReportImp/SeWo/SettlementReport2.cs | 27 +- ReportImp/SeWo/SettlementReport2.resx | 381 + .../SelwoReports/Properties/licenses.licx | 1 + ReportImp/SelwoReports/SelwoReports.csproj | 36 +- .../SelwoReports/SettlementReport.Designer.cs | 1882 +-- ReportImp/SelwoReports/SettlementReport.cs | 12 + ReportImp/SelwoReports/SettlementReport.resx | 12 +- .../SettlementReport2.Designer.cs | 1220 +- ReportImp/SelwoReports/SettlementReport2.resx | 2 +- .../SeverinReports/Properties/licenses.licx | 1 + .../ServicesOverviewReport.Designer.cs | 1117 +- .../ServicesOverviewReport.resx | 6 +- .../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 + .../Socia/ServicesOverviewReport.Designer.cs | 211 +- ReportImp/Socia/ServicesOverviewReport.cs | 13 +- ReportImp/Socia/SettlementReport.Designer.cs | 1102 +- ReportImp/Socia/SettlementReport.cs | 104 +- ReportImp/Socia/SettlementReport.resx | 176 +- ReportImp/Socia/Socia.png | Bin 2714 -> 7436 bytes ReportImp/Socia/SociaKoeln.csproj | 17 +- .../FLSBesPsychHilfen.Designer.cs | 940 +- .../FLSBesPsychHilfen.cs | 4 + .../FLSBesPsychHilfen.resx | 6 + .../InvoiceCustomerReport.Designer.cs | 866 +- .../InvoiceCustomerReport.cs | 2 +- .../InvoiceCustomerReport.resx | 6 + .../Invoicing/SDSDefaultInvoiceCreation.cs | 20 +- .../PersoenlichesBudget.Designer.cs | 863 +- .../PersoenlichesBudget.cs | 7 +- .../PersoenlichesBudget.resx | 6 + .../Properties/licenses.licx | 1 + .../RechnungPflegegeld.Designer.cs | 858 +- .../RechnungPflegegeld.cs | 7 +- .../RechnungPflegegeld.resx | 6 + .../RechnungSelbstzahler.Designer.cs | 855 +- .../RechnungSelbstzahler.cs | 7 +- .../RechnungSelbstzahler.resx | 6 + .../SozialeDiensteKathrinSchmidt.csproj | 17 +- .../Mitarbeiterstundenkonto.designer.cs | 1166 +- .../MitarbeiterstundenkontoBerechnung.cs | 116 +- .../Properties/licenses.licx | 1 + .../ServicesOverviewReport.Designer.cs | 1552 +-- ...ervicesOverviewReportAssistenz.Designer.cs | 1404 +- .../SozialeDiensteNiederrhein.csproj | 25 +- .../Teamstundenkonto.designer.cs | 1713 +-- .../Properties/licenses.licx | 1 + .../SettlementReport.Designer.cs | 1860 ++- ...ozialeDienstleistungenBeckerReports.csproj | 57 +- .../FLSBesPsychHilfen.Designer.cs | 976 +- .../FLSBesPsychHilfen.cs | 4 + .../Invoicing/SDGDefaultInvoiceCreation.cs | 18 +- .../PersoenlichesBudget.Designer.cs | 912 +- .../PersoenlichesBudget.cs | 7 +- .../Properties/licenses.licx | 1 + .../RechnungPflegegeld.Designer.cs | 904 +- .../RechnungPflegegeld.cs | 7 +- .../RechnungSelbstzahler.Designer.cs | 904 +- .../RechnungSelbstzahler.cs | 7 +- ...zialeDienstleistungenGessnerReports.csproj | 17 +- .../FLSBesPsychHilfen.Designer.cs | 1020 +- .../FLSBesPsychHilfen.cs | 7 +- .../Invoicing/SDGDefaultInvoiceCreation.cs | 20 +- .../PersoenlichesBudget.Designer.cs | 912 +- .../PersoenlichesBudget.cs | 7 +- .../Properties/licenses.licx | 1 + .../RechnungPflegegeld.Designer.cs | 904 +- .../RechnungPflegegeld.cs | 7 +- .../RechnungSelbstzahler.Designer.cs | 904 +- .../RechnungSelbstzahler.cs | 7 +- .../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 | 35 +- .../Properties/licenses.licx | 2 +- .../SprungbrettReports.csproj | 26 +- .../Properties/licenses.licx | 1 + .../SprungbrettTheresia.csproj | 35 +- .../Properties/licenses.licx | 1 + .../ServicesOverviewReport.Designer.cs | 381 +- .../ServicesOverviewReport.cs | 13 + .../SettlementReport.Designer.cs | 1090 +- .../SultanSahinReports/SettlementReport.resx | 6 + .../SultanSahinReports.csproj | 15 +- .../SynpraxReports/Properties/licenses.licx | 1 + .../SynpraxReports/SynpraxReports.csproj | 17 +- .../Properties/licenses.licx | 1 + .../TRIASAmbulanteSozialarbeit.csproj | 17 +- .../InvoiceCustomerReport.Designer.cs | 970 +- .../TagwerkReports/Properties/licenses.licx | 1 + .../SettlementReport.Designer.cs | 1562 ++- .../TagwerkReports/TagwerkReports.csproj | 42 +- .../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 +- .../Betreuungsvertrag.Designer.cs | 247 +- .../TrialogReports/Properties/licenses.licx | 1 + .../TrialogReports/TrialogReports.csproj | 28 +- ReportImp/VKMAachen/Properties/licenses.licx | 1 + ReportImp/VKMAachen/VKMAachen.csproj | 17 +- .../VSDHammReports/KlientenJeMitarbeiter.cs | 7 +- .../VSDHammReports/Mitarbeiterauslastung.cs | 6 +- .../VSDHammReports/Properties/licenses.licx | 1 + .../VSDHammReports/QuittierungsbelegJAHamm.cs | 13 +- .../QuittierungsbelegJAHamm.designer.cs | 1222 +- .../ServicesOverviewReport.Designer.cs | 1515 ++- .../VSDHammReports/ServicesOverviewReport.cs | 8 +- .../VSDHammReports/VSDHammReports.csproj | 34 +- .../VSDHammReports/VsdHammReportCreator.cs | 23 +- .../CollectiveBillingReport.Designer.cs | 1012 +- .../CollectiveBillingReport.resx | 5074 ++++--- ...CustomMitarbeiterstundenkontoBerechnung.cs | 27 +- .../InvoiceCustomerReport.Designer.cs | 1109 +- .../InvoiceCustomerReport.resx | 5076 ++++--- .../Properties/licenses.licx | 1 + .../ServiceInvoiceReport.Designer.cs | 1715 +-- .../ServiceInvoiceReport.cs | 53 + .../ServiceInvoiceReport.resx | 5070 ++++--- .../SettlementReport.Designer.cs | 1602 +-- .../SettlementReport.resx | 5080 ++++--- .../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 + .../ServicesOverviewReport.Designer.cs | 1070 +- .../ServicesOverviewReport.cs | 46 +- .../VivaAVidaReports/VivaAVidaReports.csproj | 38 +- .../Properties/licenses.licx | 1 + .../VivatgGmbHReports.csproj | 17 +- ReportImp/VkmHamm/Properties/licenses.licx | 1 + .../ServiceRecordListReport.Designer.cs | 990 +- ReportImp/VkmHamm/ServiceRecordListReport.cs | 28 + .../ServicesOverviewReport.Designer.cs | 1067 +- ReportImp/VkmHamm/ServicesOverviewReport.cs | 20 +- ReportImp/VkmHamm/VkmHamm.csproj | 17 +- ReportImp/WMB/Properties/licenses.licx | 1 + .../WMB/ServicesOverviewReport.Designer.cs | 422 +- ReportImp/WMB/ServicesOverviewReport.cs | 18 +- ReportImp/WMB/ServicesOverviewReport.resx | 896 +- ReportImp/WMB/SettlementReport.Designer.cs | 601 +- ReportImp/WMB/SettlementReport.cs | 71 +- ReportImp/WMB/SettlementReport.resx | 2241 +-- ReportImp/WMB/Tätigkeitsnachweis.Designer.cs | 516 +- ReportImp/WMB/Tätigkeitsnachweis.cs | 12 +- ReportImp/WMB/WMB.csproj | 24 +- .../WegeReports/Properties/licenses.licx | 1 + ReportImp/WegeReports/WegeReports.csproj | 26 +- .../Properties/licenses.licx | 1 + .../WegweiserAuslastungBerechnung.cs | 4 +- .../WegweiserBetreuungsdienstReports.csproj | 26 +- .../Properties/licenses.licx | 1 + .../SettlementReport.Designer.cs | 164 +- .../SettlementReport.resx | 4 +- .../Weitblick-ambulantBeWo.csproj | 17 +- .../WigonetzReports/Properties/licenses.licx | 1 + .../WigonetzReports/ServiceInvoiceReport.cs | 6 +- .../WigonetzReports/WigonetzReports.csproj | 26 +- .../WohnassistenzMuensterReports.csproj | 26 + .../Mitarbeiterauswertung.cs | 6 + .../Mitarbeiterstundenkonto.cs | 6 + .../MitarbeiterstundenkontoDetails.cs | 7 + .../Properties/licenses.licx | 1 + .../SettlementReport.Designer.cs | 2159 +-- .../SettlementReport.cs | 5 + .../SettlementReport.resx | 3 +- .../WohnhelferRemscheidReports.csproj | 37 +- .../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 | 36 +- ReportImp/skmRheydt/Export/SkmDataExporter.cs | 4 + .../skmRheydt/Export/SkmDiamantExporter.cs | 124 +- ReportImp/skmRheydt/Properties/licenses.licx | 1 + .../skmRheydt/SettlementReport.Designer.cs | 247 +- ReportImp/skmRheydt/SettlementReport.cs | 16 +- ReportImp/skmRheydt/SettlementReport.resx | 2 +- ReportImp/skmRheydt/skmRheydt.csproj | 45 +- Service/Plugins/PluginLoader.cs | 2 +- Shared/BeWoEntityEnums.cs | 5 +- Shared/Core/EnumTranslations.cs | 5 +- Shared/Shared.csproj | 1 + 711 files changed, 117180 insertions(+), 126876 deletions(-) diff --git a/BeWo/BeWo.csproj b/BeWo/BeWo.csproj index a36d349ec..ec9d90480 100644 --- a/BeWo/BeWo.csproj +++ b/BeWo/BeWo.csproj @@ -16,7 +16,7 @@ true Internet true - true + false D9ACF3EBC5E47956B8D786361F7061E3F6D6F286 @@ -38,16 +38,16 @@ false true false - http://app.beyondsoft.de/intern/ + http://app.beyondsoft.de/ de-DE BeWoPlaner beyondSoft GmbH - 2.0.1.124 + 2.0.1.127 true publish.htm false true - 125 + 128 2.0.1.%2a false true @@ -256,6 +256,10 @@ MSBuild:Compile Designer + + MSBuild:Compile + Designer + Designer MSBuild:Compile @@ -703,6 +707,9 @@ ChatProgressBarView.xaml + + MessageDialog.xaml + AdditionalServiceGroupOfPeopleSelectionControl.xaml diff --git a/BeWo/BeWo.csproj.user b/BeWo/BeWo.csproj.user index 5c3337d7a..20e526c65 100644 --- a/BeWo/BeWo.csproj.user +++ b/BeWo/BeWo.csproj.user @@ -2,7 +2,7 @@ D:\Projects\beyondsoft\BeWoPlaner\Publish\|C:\Projects\beyondsoft\BeWoPlaner\Publish\|D:\Projects\BEYONDSOFT\BeWoPlaner\Publish\|C:\Projects\BEYONDSOFT\BeWoPlaner\Publish\|C:\Projects\BEYONDSOFT\BeWoPlaner\Publish4\ - http://app.beyondsoft.de/intern/|http://app.beyondsoft.de/|http://app.beyondsoft.de/deploy/|http://FOBP01.fortis-ev.org.local/|http://10.0.116.4/ + http://app.beyondsoft.de/|http://app.beyondsoft.de/intern/|http://app.beyondsoft.de/deploy/|http://FOBP01.fortis-ev.org.local/|http://10.0.116.4/ diff --git a/BeWo/BeWoApp.xaml.cs b/BeWo/BeWoApp.xaml.cs index 23c1942cf..cb5132a8e 100644 --- a/BeWo/BeWoApp.xaml.cs +++ b/BeWo/BeWoApp.xaml.cs @@ -181,13 +181,14 @@ namespace BeWo bool isServiceRecordNoticeMandatory = true; bool isPasswordSecurityActiv = false; bool showServiceRecordsDistanceFields = false; - bool showCustomerDistanceFields = false; + bool showHilfeplanBezeichnung = false; + bool showArbeitszeiten = false; + bool showCustomerDistanceFields = false; bool showAdditionalService = false; bool showRoundedDurationInEmployeeAnalysis = true; bool showTeamNews = false; bool showMarker = false; bool showAnnualReport = false; - bool showResources = true; int maxDaysEditServiceRecordsAllowed = 0; int hilfeplanAuslaufAuswahl = 3; int anzTageZeiterfassErfolgt = 0; @@ -296,12 +297,22 @@ namespace BeWo showServiceRecordsDistanceFields = true; } - val = GetSettingValue(_Mandator.Settings, "ShowResources"); - if (val != null && val.Equals("0")) - { - showResources = false; - } + val = GetSettingValue(_Mandator.Settings, "ShowHilfeplanBezeichnung"); + if (val != null && val.Equals("1")) + { + showHilfeplanBezeichnung = true; + } + val = GetSettingValue(_Mandator.Settings, "ShowArbeitszeiten"); + if (val != null && val.Equals("1")) + { + showArbeitszeiten = true; + } + + val = GetSettingValue(_Mandator.Settings, "ShowRessources"); + AppSettings.ShowRessources = val != null && val.Equals("1"); + + val = GetSettingValue(_Mandator.Settings, "ShowTeamNews"); if (val != null && val.Equals("1")) { @@ -429,12 +440,13 @@ namespace BeWo AppSettings.ZeiterfassungsSchwellwert = zeiterfassungsSchwellwert; AppSettings.TimeRecordingMenuName = timeRecordingMenuName; AppSettings.ShowDistanceFields = showServiceRecordsDistanceFields; - AppSettings.ShowSignatures = showSignatures; + AppSettings.ShowHilfeplanBezeichnung = showHilfeplanBezeichnung; + AppSettings.ShowArbeitszeiten = showArbeitszeiten; + AppSettings.ShowSignatures = showSignatures; AppSettings.ShowCustomerDistanceFields = showCustomerDistanceFields; AppSettings.ShowAdditionalService = showAdditionalService; AppSettings.ShowRoundedDurationInEmployeeAnalysis = showRoundedDurationInEmployeeAnalysis; - AppSettings.ShowResources = showResources; - AppSettings.HideServiceRecordInsertedByAndInsertedOn = hideServiceRecordInsertedByAndInsertedOn; + AppSettings.HideServiceRecordInsertedByAndInsertedOn = hideServiceRecordInsertedByAndInsertedOn; AppSettings.ShowTeamNews = showTeamNews; AppSettings.ShowMarker = showMarker; AppSettings.ShowAnnualReport = showAnnualReport; diff --git a/BeWo/Core/BeWoUtils.cs b/BeWo/Core/BeWoUtils.cs index 803a25caf..c6e7b6479 100644 --- a/BeWo/Core/BeWoUtils.cs +++ b/BeWo/Core/BeWoUtils.cs @@ -2036,7 +2036,11 @@ namespace BeWo.Core } else { - + + if (employees.Count == 0) + { + employees.Add(BeWoApp.CompactLoggedOnEmployee); + } //gruppenbuchungen ChatDokumentationsView newView = new ChatDokumentationsView(notice, start, end, customer, employees); diff --git a/BeWo/Core/Config/AppSettings.cs b/BeWo/Core/Config/AppSettings.cs index e88499c6c..58c62218e 100644 --- a/BeWo/Core/Config/AppSettings.cs +++ b/BeWo/Core/Config/AppSettings.cs @@ -312,14 +312,16 @@ namespace BeWo.Core.Config public bool ShowDistanceFields { get; set; } + public bool ShowHilfeplanBezeichnung { get; set; } + + public bool ShowArbeitszeiten { get; set; } + public bool ShowSignatures { get; set; } public bool ShowTeamNews { get; set; } public bool ShowMarker { get; set; } - - public bool ShowResources { get; set; } - + public bool ShowAdditionalService { get; set; } public bool ShowCustomerDistanceFields { get; set; } @@ -328,7 +330,9 @@ namespace BeWo.Core.Config public bool ShowAnnualReport { get; set; } - public bool IsSchedulerAllowed { get; set; } + public bool ShowRessources { get; set; } + + public bool IsSchedulerAllowed { get; set; } public bool IsWohnheimAllowed { get; set; } diff --git a/BeWo/LoginControl.xaml.cs b/BeWo/LoginControl.xaml.cs index 66c9ca130..22fb6f035 100644 --- a/BeWo/LoginControl.xaml.cs +++ b/BeWo/LoginControl.xaml.cs @@ -36,6 +36,10 @@ namespace BeWo { private readonly Stack _ModalPopUpControls = new Stack(); + private String GETSERVER_URL = "https://support.bewoplaner.de/api/getserver.php?k={0}"; + + private String GETSTATUSMESSAGE_URL = "https://support.bewoplaner.de/api/getstate.php?k={0}"; + private bool _IsTechSupport; public bool IsTechSupport { @@ -95,6 +99,7 @@ namespace BeWo DataContext = this; + ReadProxyName(); try @@ -267,7 +272,49 @@ namespace BeWo gridLogin.Height += 25; } - private void ReadProfileList() + private bool CheckStatusMessage(BeWoProfile profile) + { + + try + { + + String url = String.Format(GETSTATUSMESSAGE_URL, profile.Tenant); + using (WebClient client = new WebClient()) + { + //MessageBox.Show(hostAddress); + byte[] response = client.UploadValues(url, "POST", new NameValueCollection()); + + String message = System.Text.Encoding.UTF8.GetString(response); + + if (!String.IsNullOrWhiteSpace(message) && message.Trim().Length > 2) + { + message = message.Replace("\\n", "\n"); + + MessageDialog dlg = new MessageDialog(); + + dlg.Message = message.Substring(0, message.Length - 2); + dlg.ShowDialog(); + if (message.EndsWith(";0")) + { + return false; + } + + } + + } + } + catch (Exception ex) + { + //MessageBox.Show(String.Format("Fehler beim Prüfen der Kundennummer: {0}\n\n{1}", ex.Message, ex.StackTrace)); + + } + + return true; + } + + + + private void ReadProfileList() { if (File.Exists(_ProfilesFilePath)) { @@ -317,6 +364,10 @@ namespace BeWo if (result.HasValue && result.Value) { tenant = dlg.Tenant; + if (!String.IsNullOrWhiteSpace(tenant)) + { + tenant = tenant.Trim(); + } var server = GetServerFromTenant(tenant); if (!String.IsNullOrEmpty(server)) { @@ -564,8 +615,23 @@ namespace BeWo } else { + var profile = profileSelectionComboBox.SelectedItem as BeWoProfile; - ChangeServerAndTenant(profileSelectionComboBox.SelectedItem as BeWoProfile); +#if DEBUG + //if (!CheckStatusMessage(profile)) + //{ + // return; + //} +#else + if (!CheckStatusMessage(profile)) + { + return; + } +#endif + + + + ChangeServerAndTenant(profile); var lWaitLayer = new WaitLayer2(); grid_root.Children.Add(lWaitLayer); @@ -573,10 +639,7 @@ namespace BeWo string lPassword = PasswordBox_Password.Password; string lPIN = PINTextBox.Text; string lTenant = BeWoApp.Tenant; - - - - + if (!String.IsNullOrEmpty(lPIN)) { @@ -926,33 +989,46 @@ namespace BeWo } - + private void SaveProfileListToFile() { - var sw = new StreamWriter(new FileStream(_ProfilesFilePath, FileMode.Create), Encoding.UTF8); + try + { + var sw = new StreamWriter(new FileStream(_ProfilesFilePath, FileMode.Create), Encoding.UTF8); - foreach (var profile in ProfileList) - { - if (profile.Tenant != "demo") - sw.WriteLine("{0}|{1}|{2}", profile.Name, profile.Server, profile.Tenant); - } - sw.Flush(); - sw.Close(); + foreach (var profile in ProfileList) + { + if (profile.Tenant != "demo") + { + if (!String.IsNullOrWhiteSpace(profile.Tenant)) + { + profile.Tenant = profile.Tenant.Trim(); + } + sw.WriteLine("{0}|{1}|{2}", profile.Name, profile.Server, profile.Tenant); + } + } + sw.Flush(); + sw.Close(); - profileSelectionComboBox.ItemsSource = ProfileList; - profileSelectionComboBox.Items.Refresh(); + profileSelectionComboBox.ItemsSource = ProfileList; + profileSelectionComboBox.Items.Refresh(); - // Workaround, um profileSelectionComboBox.SelectedItem zu aktualisieren - if (profileSelectionComboBox.ItemsSource == null) - return; + // Workaround, um profileSelectionComboBox.SelectedItem zu aktualisieren + if (profileSelectionComboBox.ItemsSource == null) + return; - //ChangeServerAndTenant(profileSelectionComboBox.SelectedItem as BeWoProfile); - //int itemssourcecount = ((List) profileSelectionComboBox.ItemsSource).Count; - //int si = profileSelectionComboBox.SelectedIndex; + //ChangeServerAndTenant(profileSelectionComboBox.SelectedItem as BeWoProfile); + //int itemssourcecount = ((List) profileSelectionComboBox.ItemsSource).Count; + //int si = profileSelectionComboBox.SelectedIndex; - //profileSelectionComboBox.SelectedIndex = (si + 1) % itemssourcecount; - //profileSelectionComboBox.SelectedIndex = itemssourcecount == 1 || si == -1 ? 0 : si; + //profileSelectionComboBox.SelectedIndex = (si + 1) % itemssourcecount; + //profileSelectionComboBox.SelectedIndex = itemssourcecount == 1 || si == -1 ? 0 : si; + } + catch (Exception ex) + { + //ignore read/write errors + } } private void ChangeServerAndTenant(BeWoProfile profile) @@ -979,7 +1055,7 @@ namespace BeWo return; } - + profile.Tenant = profile.Tenant.Trim(); //if (BeWoApp.Tenant == "7635986435") //{ diff --git a/BeWo/MainControl.xaml.cs b/BeWo/MainControl.xaml.cs index b7eb12db5..beb8bd0d1 100644 --- a/BeWo/MainControl.xaml.cs +++ b/BeWo/MainControl.xaml.cs @@ -100,7 +100,7 @@ namespace BeWo // this.button_Wohnheim.Visibility = Visibility.Collapsed; //} - if (this.button_ResourceBooking.Visibility == Visibility.Visible && !BeWoApp.AppSettings.ShowResources) + if (this.button_ResourceBooking.Visibility == Visibility.Visible && !BeWoApp.AppSettings.ShowRessources) { this.button_ResourceBooking.Visibility = Visibility.Collapsed; } diff --git a/BeWo/Scheduler/View/NewSchedulerView.xaml.cs b/BeWo/Scheduler/View/NewSchedulerView.xaml.cs index 19af5f7ff..ebb8bd3f2 100644 --- a/BeWo/Scheduler/View/NewSchedulerView.xaml.cs +++ b/BeWo/Scheduler/View/NewSchedulerView.xaml.cs @@ -1010,6 +1010,17 @@ namespace BeWo.Scheduler.View } + if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.KalenderInZeiterfassungUebernehmen)) + { + var menuitem = e.Menu.ItemLinks.FirstOrDefault(f => f.GetType() == typeof(BarButtonItemLink) && ((BarButtonItemLink)f).Item.Name.Contains("ZeiterfassungButtonItem")); + + if (menuitem != null) + { + e.Menu.ItemLinks.Remove(menuitem); + } + + } + var ZusageUntermenue = e.Menu.ItemLinks.FirstOrDefault(f=>f.GetType() == typeof(BarSubItemLink) && ((BarSubItemLink) f).Item.Name.Equals("TeilnahmeMenue")); if (ZusageUntermenue == null || ((List)Scheduler.SelectedAppointments[0].CustomFields["EmployeeList"]).Any(a => a.Employee.EmployeeOid.Equals(BeWoApp.LoggedOnEmployee.EmployeeOid))) @@ -1338,6 +1349,7 @@ namespace BeWo.Scheduler.View { empList.Add(e2a.Employee); } + BeWoUtils.CreateZeiterfassung(app.Start, app.End, customerList, empList, app.Subject); //var employ = SelectedMitarbeiter.Items; diff --git a/BeWo/View/ChatDokumentationsView.xaml.cs b/BeWo/View/ChatDokumentationsView.xaml.cs index 4fadcf293..3f2127b67 100644 --- a/BeWo/View/ChatDokumentationsView.xaml.cs +++ b/BeWo/View/ChatDokumentationsView.xaml.cs @@ -133,7 +133,9 @@ namespace BeWo.View vm.DispatcherObject = this; var dc = ErstelleServiceRecordDC(firstTime, lastTime, customerCompact, scList); - + + vm.PrototypeVM.UpdateServiceAccountings(null, vm.PrototypeVM.Category2Services, customerCompact != null); + if (vm.PrototypeVM.SortedCategories != null && vm.PrototypeVM.SortedCategories.Count > 0) { var cat1 = vm.PrototypeVM.SortedCategories[0]; @@ -142,6 +144,7 @@ namespace BeWo.View } serviceRecord = new ServiceRecordVM(dc, vm.PrototypeVM.Category2Services, vm.PrototypeVM.AllGoalCategories, vm.PrototypeVM.AllGoals); serviceRecord.Notice = notice; + bool hideCustomerCombo = serviceRecord.SupportConcept == null; newView.InitView(vm, serviceRecord, hideCustomerCombo); if (customerCompact != null) @@ -201,8 +204,8 @@ namespace BeWo.View dcs.Customer = cus; dcs.SupportConcept = HoleHilfeplanAusListe(scList, cus, firstTime, lastTime); dcs.GroupEmployeeCount = _compactEmployee.Count; - dcs.GroupPersonCount = _compactCustomer.Count; - + dcs.GroupPersonCount = _compactCustomer.Count; + if (BeWoApp.AppSettings.IsEndDateVisible) { dcs.ServiceRecordFormat = ServiceRecordFormate.ZeiterfassungMitEndDatum; @@ -215,16 +218,16 @@ namespace BeWo.View { dcs.ServiceRecordFormat = ServiceRecordFormate.OriginaleZeiterfassung; } - + dcs.DurationInStunden = ZeiterfassungsDauer.Minuten; - + if (dcs.SupportConcept.CostBearerList != null && dcs.SupportConcept.CostBearerList.Count > 0) { dcs.CostBearer = dcs.SupportConcept.CostBearerList[0].Organisation; } - + ServiceListRecordDC.Add(dcs); } } @@ -328,6 +331,7 @@ namespace BeWo.View var dc = new ServiceRecordDC(); dc.Start = firstTime; dc.End = lastTime; + dc.RoundedDuration = (decimal)lastTime.Subtract(firstTime).TotalMinutes; dc.Employee = BeWoApp.LoggedOnUser.Employee; dc.Customer = customerCompact; if (customerCompact != null) diff --git a/BeWo/View/Detail/CustomerView.xaml.cs b/BeWo/View/Detail/CustomerView.xaml.cs index 255a5591d..593c78b77 100644 --- a/BeWo/View/Detail/CustomerView.xaml.cs +++ b/BeWo/View/Detail/CustomerView.xaml.cs @@ -125,10 +125,20 @@ namespace BeWo.View.Detail { tabitem_documents.Visibility = Visibility.Collapsed; } - //CB EINKOMMENTIEREN + + if (BeWoApp.Mandator != null && BeWoApp.Mandator.AllowSbd) + { + tabitem_schuldienst.Visibility = Visibility.Visible; + } + else + { + tabitem_schuldienst.Visibility = Visibility.Collapsed; + } + + //CB EINKOMMENTIEREN //if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.ChatSettings)) //{ - tabitem_chatservice.Visibility = Visibility.Collapsed; + tabitem_chatservice.Visibility = Visibility.Collapsed; //} comboBox_Nationalitaet.ItemsSource = pCustomerVM.Nationalitaeten; diff --git a/BeWo/View/Detail/EmployeeView.xaml.cs b/BeWo/View/Detail/EmployeeView.xaml.cs index 2f355c6fc..926ea593c 100644 --- a/BeWo/View/Detail/EmployeeView.xaml.cs +++ b/BeWo/View/Detail/EmployeeView.xaml.cs @@ -86,10 +86,17 @@ namespace BeWo.View.Detail else OvertimeTabItem.Visibility = Visibility.Collapsed; - - // HACK: Force the devexpress grid to end editing when the mouse is over savebutton - // by setting the focus to another element. - MouseMove += (s, e) => + if ((BeWoApp.Mandator != null && BeWoApp.Mandator.AllowSbd) || BeWoApp.AppSettings.ShowArbeitszeiten) + { + tabitem_arbeitszeit.Visibility = Visibility.Visible; + } + else + { + tabitem_arbeitszeit.Visibility = Visibility.Collapsed; + } + // HACK: Force the devexpress grid to end editing when the mouse is over savebutton + // by setting the focus to another element. + MouseMove += (s, e) => { if ((grid_AbsenceTimes == null || !grid_AbsenceTimes.IsVisible) && (grid_Customers == null || !grid_Customers.IsVisible) && (grid_Overtimes == null || !grid_Overtimes.IsVisible)) diff --git a/BeWo/View/Detail/MandatorView.xaml b/BeWo/View/Detail/MandatorView.xaml index 4a144330f..9190f058f 100644 --- a/BeWo/View/Detail/MandatorView.xaml +++ b/BeWo/View/Detail/MandatorView.xaml @@ -122,11 +122,11 @@ - + - + - + diff --git a/BeWo/View/Detail/ServiceRecordEditView.xaml b/BeWo/View/Detail/ServiceRecordEditView.xaml index 6834d4dc7..a5da6fb06 100644 --- a/BeWo/View/Detail/ServiceRecordEditView.xaml +++ b/BeWo/View/Detail/ServiceRecordEditView.xaml @@ -65,9 +65,9 @@ - + - + @@ -106,7 +106,7 @@ - + @@ -283,7 +283,7 @@ diff --git a/BeWo/View/Detail/ServiceRecordEditView.xaml.cs b/BeWo/View/Detail/ServiceRecordEditView.xaml.cs index 39c410160..a38d91da9 100644 --- a/BeWo/View/Detail/ServiceRecordEditView.xaml.cs +++ b/BeWo/View/Detail/ServiceRecordEditView.xaml.cs @@ -257,7 +257,7 @@ namespace BeWo.View.Detail numerictb_duration.SetValue(Grid.ColumnProperty, 1); MinStdDauerLabel.Content = "Dauer"; - if (MinSTDOhneEnd.Text == ZeiterfassungsDauer.Stunden.ToString()) + if (zsd == ZeiterfassungsDauer.Stunden) { numerictb_duration.IsFloatValue = true; numerictb_duration.Mask = "########0.00"; diff --git a/BeWo/View/Detail/ServiceRecordGroupEditView.xaml b/BeWo/View/Detail/ServiceRecordGroupEditView.xaml index a24b8d00e..c20f56dc1 100644 --- a/BeWo/View/Detail/ServiceRecordGroupEditView.xaml +++ b/BeWo/View/Detail/ServiceRecordGroupEditView.xaml @@ -52,6 +52,7 @@ + @@ -62,11 +63,11 @@ - + - - - + + + @@ -97,21 +98,18 @@ -->