From 40ebcc80fc9cae75e0a8e47cc13c47d17bfa8b7d Mon Sep 17 00:00:00 2001 From: Christian Date: Mon, 8 Oct 2018 11:57:16 +0200 Subject: [PATCH] cb --- .gitignore | 8 + BeWo/BeWo.csproj | 53 +- BeWo/BeWo.csproj.user | 2 +- BeWo/LoginControl.xaml.cs | 5 +- BeWo/MainControl.xaml.cs | 2 +- .../KrankheitsZeitraumView.xaml | 23 +- .../SchulbegleitenderDienstCustomerView.xaml | 137 + ...chulbegleitenderDienstCustomerView.xaml.cs | 201 + .../SchulbegleitenderDienstEmployeeView.xaml | 113 + ...hulbegleitenderDienstEmployeeView.xaml.cs} | 167 +- .../SchulbegleitenderDienstView.xaml | 131 - .../TagesVertretung.cs | 85 +- .../SchulbegleitenderDienst/TagesansichtVM.cs | 45 +- .../VertretenderKlientSearchView.xaml | 2 +- .../VertretenderKlientSearchView.xaml.cs | 2 +- .../VertretungsMainViewV2.xaml | 1156 ++++++ .../VertretungsMainViewV2.xaml.cs | 1365 +++++++ .../VertretungsSearchView.xaml | 15 +- .../VertretungsSearchView.xaml.cs | 36 +- .../View/SbdAdminView.xaml | 117 + .../View/SbdAdminView.xaml.cs | 90 + .../ViewModel/SbdConfigVM.cs | 69 + .../ViewModel/VertretungWochenansichtVM.cs | 12 + .../WochenVertretung.cs | 51 +- .../WochenansichtVM.cs | 40 + BeWo/ServiceProxy/Generated.cs | 154 +- BeWo/Styles/OrangeBlack.xaml | 6 + BeWo/Styles/OrangeBlack.xaml.cs | 14 + BeWo/View/Detail/CustomerView.xaml | 18 +- BeWo/View/Detail/CustomerView.xaml.cs | 41 +- BeWo/View/Detail/EmployeeView.xaml | 79 +- BeWo/View/Detail/EmployeeView.xaml.cs | 61 +- BeWo/View/Detail/OrganisationView.xaml | 2 + BeWo/View/Detail/OrganisationView.xaml.cs | 17 + BeWo/View/Detail/SupportConceptView.xaml | 5 + BeWo/View/Detail/SupportConceptView.xaml.cs | 7 +- BeWo/View/Master/AdministrationView.xaml | 5 +- BeWo/View/Master/AdministrationView.xaml.cs | 28 +- .../SchulbegleitenderDienstMasterView.xaml | 2 +- .../SchulbegleitenderDienstMasterView.xaml.cs | 4 +- .../Navigation/EmployeeNavigationView.xaml.cs | 7 + BeWo/View/NotizenView.xaml | 260 ++ BeWo/View/NotizenView.xaml.cs | 440 +++ BeWo/ViewModel/ArbeitszeitVM.cs | 14 +- BeWo/ViewModel/ContractVM.cs | 90 +- BeWo/ViewModel/CustomerVM.cs | 117 +- BeWo/ViewModel/EmployeeVM.cs | 116 +- BeWo/ViewModel/FeiertagVM.cs | 79 + BeWo/ViewModel/InvoiceBaseVM.cs | 21 + .../ViewModel/ListViewModel/ContractListVM.cs | 8 +- .../ViewModel/ListViewModel/FeiertagListVM.cs | 30 + .../ListViewModel/NotizenEintragListVM.cs | 14 + .../ListViewModel/NotizenKategorieListVM.cs | 14 + BeWo/ViewModel/NotizenEintragVM.cs | 85 + BeWo/ViewModel/NotizenKategorieVM.cs | 116 + BeWo/ViewModel/OrganisationVM.cs | 30 +- BeWo/ViewModel/SupportConceptVM.cs | 26 +- BeWo/ViewModel/VMFactory.cs | 23 +- BeWoPlanerMobil/Content/BeWoMobileStyle.css | 13 + BeWoPlanerMobil/Controllers/ChatController.cs | 17 +- BeWoPlanerMobil/Controllers/MainController.cs | 37 +- BeWoPlanerMobil/Models/MainModel.cs | 7 +- BeWoPlanerMobil/Scripts/mainView.js | 50 +- BeWoPlanerMobil/Views/Shared/Error.cshtml | 2 +- BeWoPlanerMobil/Views/Shared/_Layout.cshtml | 28 +- Data/Access/SearchDAO.cs | 45 +- Data/Data.csproj | 12 + Data/Entities/Contract.cs | 8 +- Data/Entities/Customer.cs | 20 +- Data/Entities/Employee.cs | 42 +- Data/Entities/Organisation.cs | 18 + Data/Entities/SupportConcept.cs | 23 +- Data/Entities/Vertretung.cs | 28 +- Data/Mappings/Contract.hbm.xml | 4 + Data/Mappings/Customer.hbm.xml | 8 +- Data/Mappings/Employee.hbm.xml | 10 +- Data/Mappings/Organisation.hbm.xml | 12 +- Data/Mappings/SupportConcept.hbm.xml | 4 + Data/Mappings/Vertretung.hbm.xml | 3 - Host/ReportView.aspx.cs | 18 +- Report/AbstractReportCreator.cs | 9 +- Report/DefaultReportCreator.cs | 92 +- Report/DefaultReports/LeistungsnachweisSbd.cs | 135 +- .../LeistungsnachweisSbd.designer.cs | 11 +- .../DefaultReports/ServicesOverviewReport.cs | 2 + Report/Report.csproj | 22 + Report/ReportObjects/FLSReportRO.cs | 28 +- Report/ReportObjects/InvoiceCustomerRO.cs | 7 + .../ReportObjects/MitarbeiterauslastungRO.cs | 25 +- .../MitarbeiterstundenkontoBerechnung.cs | 22 +- Report/ReportObjects/ServiceInvoiceRO.cs | 11 +- Report/ReportObjects/ServicesOverviewRO.cs | 97 +- Report/ReportObjects/Settlement2RO.cs | 2 +- Report/ReportObjects/SettlementRO.cs | 2 +- .../Mitarbeiterauswertung.cs | 11 +- .../InvoiceCustomerReport.Designer.cs | 3 +- .../ServiceInvoiceReport.Designer.cs | 33 +- .../ServicesOverviewReport.Designer.cs | 163 +- .../AdikKleve/SettlementReport.Designer.cs | 49 +- .../AdikKleve/SettlementReport2.Designer.cs | 49 +- .../Validation/ServiceRecordValidator.cs | 2 +- ReportImp/AlphaEv/Abwesenheitstage.cs | 2 + ReportImp/AlphaEv/AlphaEv.csproj | 10 + ReportImp/AlphaEv/CustomReportCreator.cs | 2 +- ReportImp/AlphaEv/Export/DiamantExporter.cs | 9 +- ReportImp/AlphaEv/Mitarbeiterstundenkonto.cs | 3 + .../AssistenzaReports.csproj | 8 + .../Properties/licenses.licx | 1 + .../ServicesOverviewReport.Designer.cs | 1244 +++---- .../ServicesOverviewReport.cs | 17 + .../SettlementReport.Designer.cs | 75 +- .../AssistenzaReports/SettlementReport.cs | 63 + .../AssistenzaReports/SettlementReport.resx | 2 - .../AssistenzaReports/SettlementReport2.cs | 77 +- .../SettlementReport2.designer.cs | 85 +- .../AssistenzaReports/SettlementReport2.resx | 2 - ReportImp/AwoDortmund/AwoDortmund.csproj | 1 + .../AwoDortmund/Export/DiamantExporter.cs | 47 +- ReportImp/BUGeVReports/BUGeVReports.csproj | 14 + ReportImp/BeWoDirekt/Properties/licenses.licx | 1 + ReportImp/BeWoFuerDich/BeWoFuerDich.csproj | 10 + .../ServicesOverviewReport.Designer.cs | 379 +- .../BeWoFuerDich/ServicesOverviewReport.cs | 66 + .../BeWoFuerDich/ServicesOverviewReport.resx | 6 + ReportImp/BeWoHeinsberg/BeWoHeinsberg.csproj | 5 + .../BeWoLeverkusen/Properties/licenses.licx | 1 + .../ServicesOverviewReport_FLS.Designer.cs | 384 +- .../ServicesOverviewReport_FLS.cs | 11 +- .../ServicesOverviewReport_FLS.resx | 6 + .../BeWoMobilReports/Properties/licenses.licx | 1 + .../ServicesOverviewReportNeu.designer.cs | 38 +- .../ServicesOverviewReportNeu.resx | 1816 +++++++++ .../BeWoSchillingReports.csproj | 4 + .../ServicesOverviewReport.Designer.cs | 239 +- .../ServicesOverviewReport.cs | 55 + ReportImp/BeWoViersen/BeWoViersen.csproj | 5 + ReportImp/BeWoWalzPaiva/BeWoWalzPaiva.csproj | 30 + .../BetreuWoReports/BetreuWoReports.csproj | 1 + .../Kostenstellenauswertung.cs | 8 +- .../Kostenstellenauswertung2.cs | 32 +- .../Kostenstellenauswertung3.cs | 35 +- .../ServicesOverviewReport.Designer.cs | 1248 +++---- .../ServicesOverviewReportALS.designer.cs | 1042 +++--- .../ServicesOverviewReportFLS.designer.cs | 1086 +++--- .../InvoiceCustomerReport.Designer.cs | 14 +- .../InvoiceCustomerReport.cs | 4 + .../QuittierungsbelegASL.designer.cs | 2 +- .../QuittierungsbelegFLS.designer.cs | 2 +- .../BetreuwoWesel/Kostenstellenauswertung.cs | 2 +- .../BetreuwoWesel/Kostenstellenauswertung2.cs | 2 +- .../BetreuwoWesel/Kostenstellenauswertung3.cs | 2 +- .../Validation/ServiceRecordValidator.cs | 42 +- .../Invoicing/AssistenzInvoiceCreation.cs | 2 +- .../Invoicing/CustomInvoiceFactory.cs | 2 +- .../ServicesOverviewReport.Designer.cs | 520 ++- .../ServicesOverviewReport.cs | 64 + .../ServicesOverviewReport.resx | 6 + ReportImp/CaritasAhlen/CaritasAhlen.csproj | 29 + ReportImp/CaritasAhlen/CustomReportCreator.cs | 2 + .../CaritasAhlen/Export/DiamantExporter.cs | 51 +- .../CaritasAhlen/ServicesOverviewReport67.cs | 1 - .../CaritasOsnabrueck.csproj | 38 + .../ServicesOverviewReport.Designer.cs | 2 +- .../ServicesOverviewReport.cs | 2 +- .../Calculations/ServiceRecordValidator.cs | 30 +- .../Properties/licenses.licx | 1 + .../ServicesOverviewReport.Designer.cs | 1273 +++---- .../ServicesOverviewReport.cs | 34 + ReportImp/Club74/Club74ReportCreator.cs | 117 + ReportImp/DerKarrenSbd/DerKarrenSbd.csproj | 18 + .../DerKarrenSbd/Mitarbeiterstundenkonto.cs | 10 +- ReportImp/DerKarrenSbd/Teamstundenkonto.cs | 17 +- .../InvoiceCustomerReport.Designer.cs | 1007 +++-- .../InvoiceCustomerReport.resx | 2 +- .../RechnungBeWo67.Designer.cs | 5 +- ReportImp/DiakonieKKKleve/RechnungBeWo67.cs | 7 +- ReportImp/DiakonieKKKleve/RechnungBeWo67.resx | 2 +- .../ServiceInvoiceReport.Designer.cs | 5 +- .../DiakonieKKKleve/ServiceInvoiceReport.cs | 6 +- .../DiakonieKKKleve/ServiceInvoiceReport.resx | 2 +- .../SettlementReport.Designer.cs | 1705 +++++---- ReportImp/DiakonieKKKleve/SettlementReport.cs | 9 +- .../DiakonieKKKleve/SettlementReport.resx | 2 +- .../SettlementReport2.Designer.cs | 55 +- .../DiakonieKKKleve/SettlementReport2.cs | 4 + .../DiakonieKKKleve/SettlementReport2.resx | 2 +- .../Calculations/GroupDurationCalculator.cs | 18 +- .../ServicesOverviewReport.Designer.cs | 411 ++- .../DieDueneReports/ServicesOverviewReport.cs | 67 +- .../ServicesOverviewReport.resx | 6 + .../Properties/licenses.licx | 1 + ReportImp/FibMarburg/Properties/licenses.licx | 1 + ReportImp/Findus/Properties/licenses.licx | 1 + .../Export/SageExporter.cs | 26 +- .../FreundeskreisSuchthilfe.csproj | 12 + .../InvoiceCustomerReport.Designer.cs | 128 +- .../Reporting/FfReportCreator.cs | 32 +- .../SettlementReport.Designer.cs | 105 +- .../SettlementReport.resx | 6 +- .../Invoicing/HibaDefaultInvoiceCreation.cs | 36 +- .../Hiba/ServiceInvoiceReport.Designer.cs | 13 +- ReportImp/HilfeDaheim2/HilfeDaheim2.csproj | 1 + .../HilfeDaheim2/Properties/licenses.licx | 1 + .../HolsingerReports/Properties/licenses.licx | 1 + .../ServicesOverviewReport.Designer.cs | 1216 +++--- .../HphServiceRecordStatisticFactory.cs | 328 +- ReportImp/Humanitas/Humanitas.csproj | 41 + .../IBPReports/SettlementReport.Designer.cs | 3249 +++++++++-------- ReportImp/IBPReports/SettlementReport.cs | 5 + .../IbpEingliederungshilfe.csproj | 1 + .../Properties/licenses.licx | 1 + .../Properties/licenses.licx | 1 + ReportImp/KomMitBewo/Properties/licenses.licx | 1 + .../ServicesOverviewReport.Designer.cs | 1228 +++---- .../ServicesOverviewReport.Designer.cs | 291 +- .../LebenshilfeAhrweiler.csproj | 1 + .../CollectiveBillingReport.Designer.cs | 9 +- .../CollectiveBillingReport.resx | 4 +- .../InvoiceCustomerReport.Designer.cs | 10 +- .../InvoiceCustomerReport.resx | 4 +- .../ServiceInvoiceReport.Designer.cs | 6 +- .../ServiceInvoiceReport.resx | 2 +- .../SettlementReport.Designer.cs | 5 +- .../SettlementReport.resx | 4 +- .../LeistungsnachweiseSpfh.Designer.cs | 16 +- .../LeistungsnachweiseSpfh.cs | 54 +- .../ServicesOverviewReport.Designer.cs | 14 +- .../ServicesOverviewReport.Designer.cs | 1653 +++++---- .../ServicesOverviewReport.cs | 34 +- .../LebenshilfeStade/LebenshilfeStade.csproj | 10 + .../MezMenzelReports/Properties/licenses.licx | 1 + .../MitMenschenWuppertal.csproj | 14 + ReportImp/Monvita/ServicesOverviewReport.cs | 13 + .../ServicesOverviewReport.Designer.cs | 163 +- .../ServicesOverviewReport.cs | 34 + ReportImp/PouginReports/PouginReports.csproj | 4 + .../PouginReports/Properties/licenses.licx | 1 + .../ServicesOverviewReport.Designer.cs | 1281 ++++--- .../PouginReports/ServicesOverviewReport.cs | 67 + .../PouginReports/ServicesOverviewReport.resx | 6 + .../Calculation/CustomCalculations.cs | 9 +- .../PraunheimerWerkstaettenGmbh.csproj | 2 + .../SupportConceptReport.Designer.cs | 173 +- .../SupportConceptReport.cs | 67 +- .../Behandlungsnachweis.Designer.cs | 21 +- .../PraxisPusteblume/Behandlungsnachweis.cs | 8 + .../PraxisPusteblume/Behandlungsnachweis.resx | 1343 ++----- .../Invoicing/DefaultInvoiceCreation.cs | 8 +- .../RechnungInternatNiedernfels.Designer.cs | 2 +- .../RechnungInternatNiedernfels.cs | 2 +- .../RechnungInternatNiedernfels.resx | 1343 ++----- .../RechnungReiten.Designer.cs | 3 +- .../PraxisPusteblume/RechnungReiten.resx | 1343 ++----- .../Sammelrechnung.Designer.cs | 3 +- .../PraxisPusteblume/Sammelrechnung.resx | 1343 ++----- .../ServicesOverviewReport.Designer.cs | 269 +- .../QuittierungsbelegJugendamt.cs | 39 +- .../QuittierungsbelegJugendamt.designer.cs | 71 +- .../InvoiceCustomerReport.Designer.cs | 1063 +++--- .../SPZRatingen/Properties/licenses.licx | 1 + .../ServiceInvoiceReport.Designer.cs | 1123 +++--- .../SPZRatingen/SettlementReport.Designer.cs | 1771 +++++---- .../SPZRatingen/SettlementReport2.Designer.cs | 1425 ++++---- .../InvoiceCustomerReport.resx | 2 +- .../ServiceInvoiceReport.resx | 2 +- .../SchoengeistReports.csproj | 4 + .../ServicesOverviewReport.Designer.cs | 254 +- .../ServicesOverviewReport.cs | 63 + ReportImp/SeWo/SeWo.csproj | 2 + .../ServicesOverviewReport.Designer.cs | 71 +- .../SkmLeverkusen/ServicesOverviewReport.cs | 18 + .../SettlementReport.Designer.cs | 136 +- ReportImp/SkmLeverkusen/SettlementReport.cs | 29 +- .../Properties/licenses.licx | 1 + .../SupportConceptReport.Designer.cs | 1528 ++++---- .../TagwerkReports/Properties/licenses.licx | 1 + .../ServiceInvoiceReport.Designer.cs | 9 +- .../ServicesOverviewReport.Designer.cs | 106 +- .../TeamGSReports/ServicesOverviewReport.cs | 11 + .../TeamGSReports/ServicesOverviewReport.resx | 3 + .../TrialogReports/Properties/licenses.licx | 1 + .../TrialogReports/SettlementReportAlt.cs | 4 + .../Invoicing/TwgDefaultInvoiceCreation.cs | 111 +- .../Properties/licenses.licx | 1 + .../Invoicing/CustomInvoiceCreation.cs | 320 +- .../LeistungsnachweisAbrechnung.cs | 65 +- .../LeistungsnachweisAbrechnung.designer.cs | 73 +- .../VkmAachenSbd/LeistungsnachweisSbd.cs | 194 +- .../LeistungsnachweisSbd.designer.cs | 344 +- .../ServiceInvoiceReport.Designer.cs | 397 +- .../VkmAachenSbd/ServiceInvoiceReport.cs | 238 +- .../Translation/TranslationDictionary.cs | 7 +- ReportImp/VkmAachenSbd/VkmAachenSbd.csproj | 12 + ReportImp/WMB/Properties/licenses.licx | 1 + .../WMB/ServicesOverviewReport.Designer.cs | 408 ++- ReportImp/WMB/ServicesOverviewReport.cs | 26 +- .../Wetterleuchten/Wetterleuchten.csproj | 10 + .../Properties/licenses.licx | 1 + .../ServicesOverviewReport.cs | 2 +- .../WohnhelferRemscheidReports.csproj | 10 + .../Properties/licenses.licx | 1 + ...ctVertreterEmployeeDC_VertreterEmployee.cs | 4 +- Service/DCEntityMapper/ContractDC_Contract.cs | 43 +- Service/DCEntityMapper/CustomerDC_Customer.cs | 26 +- Service/DCEntityMapper/EmployeeDC_Employee.cs | 22 +- .../InvoiceBaseDC_InvoiceBase.cs | 2 + Service/DCEntityMapper/MapperFactory.cs | 31 + .../OrganisationDC_Organisation.cs | 2 + .../SupportConceptDC_SupportConcept.cs | 5 + .../DCEntityMapper/VertretungDC_Vertretung.cs | 2 - .../Invoicing/SettlementInvoiceCreation.cs | 148 +- Service/Plugins/CustomerService.cs | 2 +- Service/Plugins/GroupDurationCalculator.cs | 19 +- Service/Plugins/PluginLoader.cs | 15 +- .../ServiceRecordDurationCalculator.cs | 2 +- .../Plugins/ServiceRecordStatisticFactory.cs | 27 +- Service/Plugins/ServiceRecordValidator.cs | 175 +- Service/Plugins/TranslationDictionary.cs | 14 +- Service/Plugins/VacationService.cs | 118 +- Service/SBD/VertretungsManager.cs | 226 +- Service/Service.csproj | 6 + .../ServiceContracts/IOperationsService.cs | 28 + .../AccountingServiceImp.cs | 2 +- .../AnalysisServiceImp.cs | 666 +--- .../EmployeeServiceImp.cs | 42 +- .../OperationsServiceImp.cs | 146 +- Shared/BeWoEntityEnums.cs | 17 +- Shared/Core/EnumTranslations.cs | 18 +- Shared/DataContracts/ContractDC.cs | 13 + Shared/DataContracts/CostRatePeriodDC.cs | 3 +- Shared/DataContracts/CustomerDC.cs | 13 +- Shared/DataContracts/EmployeeDC.cs | 12 + Shared/DataContracts/InvoiceBaseDC.cs | 3 + Shared/DataContracts/OrganisationDC.cs | 4 +- Shared/DataContracts/ReportTypes.cs | 5 +- Shared/DataContracts/SupportConceptDC.cs | 3 + Shared/DataContracts/VertretungDC.cs | 3 - Shared/DataContracts/VertretungsItemDC.cs | 26 +- Shared/Services/Calculations.cs | 1 + Shared/Shared.csproj | 6 + 340 files changed, 28339 insertions(+), 20414 deletions(-) create mode 100644 BeWo/SchulbegleitenderDienst/SchulbegleitenderDienstCustomerView.xaml create mode 100644 BeWo/SchulbegleitenderDienst/SchulbegleitenderDienstCustomerView.xaml.cs create mode 100644 BeWo/SchulbegleitenderDienst/SchulbegleitenderDienstEmployeeView.xaml rename BeWo/SchulbegleitenderDienst/{SchulbegleitenderDienstView.xaml.cs => SchulbegleitenderDienstEmployeeView.xaml.cs} (54%) delete mode 100644 BeWo/SchulbegleitenderDienst/SchulbegleitenderDienstView.xaml create mode 100644 BeWo/SchulbegleitenderDienst/VertretungsMainViewV2.xaml create mode 100644 BeWo/SchulbegleitenderDienst/VertretungsMainViewV2.xaml.cs create mode 100644 BeWo/SchulbegleitenderDienst/View/SbdAdminView.xaml create mode 100644 BeWo/SchulbegleitenderDienst/View/SbdAdminView.xaml.cs create mode 100644 BeWo/SchulbegleitenderDienst/ViewModel/SbdConfigVM.cs create mode 100644 BeWo/SchulbegleitenderDienst/ViewModel/VertretungWochenansichtVM.cs create mode 100644 BeWo/View/NotizenView.xaml create mode 100644 BeWo/View/NotizenView.xaml.cs create mode 100644 BeWo/ViewModel/FeiertagVM.cs create mode 100644 BeWo/ViewModel/ListViewModel/FeiertagListVM.cs create mode 100644 BeWo/ViewModel/ListViewModel/NotizenEintragListVM.cs create mode 100644 BeWo/ViewModel/ListViewModel/NotizenKategorieListVM.cs create mode 100644 BeWo/ViewModel/NotizenEintragVM.cs create mode 100644 BeWo/ViewModel/NotizenKategorieVM.cs diff --git a/.gitignore b/.gitignore index e91fd05c0..84db491b5 100644 --- a/.gitignore +++ b/.gitignore @@ -318,3 +318,11 @@ /ReportImp/MitMenschenWuppertal/obj/Release /ReportImp/Triathlon/obj/Debug /ReportImp/Triathlon/obj/Release +/ReportImp/AbwWeeger/obj/Debug +/ReportImp/BeWoImFlow/obj/Debug +/ReportImp/DiakonieLandshut/obj/Debug +/ReportImp/DiakonieLandshut/obj/Release +/ReportImp/BeWoImFlow/obj/Release +/ReportImp/AbwWeeger/obj/Release +/ReportImp/LebenshilfeMoenchengladbach/obj/Debug +/ReportImp/LebenshilfeMoenchengladbach/obj/Release diff --git a/BeWo/BeWo.csproj b/BeWo/BeWo.csproj index 54b636677..bbff2feac 100644 --- a/BeWo/BeWo.csproj +++ b/BeWo/BeWo.csproj @@ -43,12 +43,12 @@ de-DE BeWoPlaner beyondSoft GmbH - 2.0.1.157 + 2.0.1.162 true publish.htm false true - 158 + 163 2.0.1.%2a false true @@ -198,6 +198,10 @@ Designer MSBuild:Compile + + MSBuild:Compile + Designer + MSBuild:Compile Designer @@ -206,6 +210,10 @@ Designer MSBuild:Compile + + MSBuild:Compile + Designer + MSBuild:Compile Designer @@ -214,6 +222,10 @@ MSBuild:Compile Designer + + MSBuild:Compile + Designer + MSBuild:Compile Designer @@ -264,6 +276,14 @@ Designer MSBuild:Compile + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + Designer MSBuild:Compile @@ -585,12 +605,18 @@ ProxyLoginView.xaml + + SchulbegleitenderDienstEmployeeView.xaml + VertretenderKlientSearchView.xaml KrankheitsZeitraumView.xaml + + VertretungsMainViewV2.xaml + VertretungsSearchView.xaml @@ -599,6 +625,11 @@ + + + + SbdAdminView.xaml + @@ -675,6 +706,9 @@ + + + @@ -690,6 +724,9 @@ + + + @@ -749,6 +786,12 @@ + + StundenplanView.xaml + + + NotizenView.xaml + BargeldkassenView.xaml @@ -1381,7 +1424,7 @@ MSBuild:Compile Designer - + MSBuild:Compile Designer MSBuild:Compile @@ -1796,8 +1839,8 @@ PercentageDisplay.xaml - - SchulbegleitenderDienstView.xaml + + SchulbegleitenderDienstCustomerView.xaml AnnualReportChartControl.xaml diff --git a/BeWo/BeWo.csproj.user b/BeWo/BeWo.csproj.user index 1960680a1..b6d2b164e 100644 --- a/BeWo/BeWo.csproj.user +++ b/BeWo/BeWo.csproj.user @@ -2,7 +2,7 @@ D:\Projects\beyondsoft\BeWoPlaner\Publish\|D:\Projects\beyondsoft\BeWoPlaner\PublishTest\|D:\Projects\beyondsoft\BeWoPlaner\PublishDev\|D:\Projects\beyondsoft\BeWoPlaner\Publish45\|C:\Projects\beyondsoft\BeWoPlaner\Publish\ - http://app.beyondsoft.de/sbd/|http://app.beyondsoft.de/|http://app.beyondsoft.de/test/|http://app.beyondsoft.de/dev/|http://app.beyondsoft.de/deploy/ + http://app.beyondsoft.de/sbd/|http://fortis-bewoplaner.fortis-ev.org.local/|http://app.beyondsoft.de/|http://app.beyondsoft.de/test/|http://app.beyondsoft.de/dev/ diff --git a/BeWo/LoginControl.xaml.cs b/BeWo/LoginControl.xaml.cs index 8b2bbb5e5..7f4e0f7a7 100644 --- a/BeWo/LoginControl.xaml.cs +++ b/BeWo/LoginControl.xaml.cs @@ -74,12 +74,11 @@ namespace BeWo get { return _ProfileList; } set { _ProfileList = value; } } - + public LoginControl() { - InitializeComponent(); - + DateTime dt = new DateTime(2017, 1, 1); if (DateTime.Now > dt) dt = DateTime.Now; diff --git a/BeWo/MainControl.xaml.cs b/BeWo/MainControl.xaml.cs index 0dc3db0f0..c721d63d7 100644 --- a/BeWo/MainControl.xaml.cs +++ b/BeWo/MainControl.xaml.cs @@ -200,7 +200,7 @@ namespace BeWo view = new WohnheimNavigationView(); break; case UIContext.Vertretungen: - view = new VertretungsMainView(); + view = new VertretungsMainView2(); break; case UIContext.CustomerTeam: view = new CustomerTeamNavigationView(); diff --git a/BeWo/SchulbegleitenderDienst/KrankheitsZeitraumView.xaml b/BeWo/SchulbegleitenderDienst/KrankheitsZeitraumView.xaml index a4cfe275a..ff5d3e938 100644 --- a/BeWo/SchulbegleitenderDienst/KrankheitsZeitraumView.xaml +++ b/BeWo/SchulbegleitenderDienst/KrankheitsZeitraumView.xaml @@ -2,9 +2,9 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors" - Background="Transparent" Height="125" Width="400" WindowStartupLocation="CenterScreen" WindowStyle="None"> + Background="Transparent" Height="130" Width="350" WindowStartupLocation="CenterScreen" WindowStyle="None"> - + @@ -15,21 +15,20 @@ - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +