diff --git a/.gitignore b/.gitignore index fb6e42509..111c3f7b3 100644 --- a/.gitignore +++ b/.gitignore @@ -505,3 +505,4 @@ /ReportImp/BewegtSystemischeBeratung/obj/Release /ReportImp/Bewolonia/obj/Debug /ReportImp/VaroSozialagentur/obj/Debug +/ReportImp/AmbulantBetreutesWohnenAstridPulm/obj/Debug diff --git a/BeWo.sln b/BeWo.sln index 63a07f702..1f7be1212 100644 --- a/BeWo.sln +++ b/BeWo.sln @@ -461,6 +461,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bewolonia", "ReportImp\Bewo EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VaroSozialagentur", "ReportImp\VaroSozialagentur\VaroSozialagentur.csproj", "{5C99CC38-15A8-4485-8D59-997EEEA9D6C1}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AmbulantBetreutesWohnenAstridPulm", "ReportImp\AmbulantBetreutesWohnenAstridPulm\AmbulantBetreutesWohnenAstridPulm.csproj", "{6AB16005-E552-4619-9E55-D752FCCAC3B0}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|.NET = Debug|.NET @@ -3536,6 +3538,22 @@ Global {5C99CC38-15A8-4485-8D59-997EEEA9D6C1}.Release|Mixed Platforms.Build.0 = Release|Any CPU {5C99CC38-15A8-4485-8D59-997EEEA9D6C1}.Release|x86.ActiveCfg = Release|Any CPU {5C99CC38-15A8-4485-8D59-997EEEA9D6C1}.Release|x86.Build.0 = Release|Any CPU + {6AB16005-E552-4619-9E55-D752FCCAC3B0}.Debug|.NET.ActiveCfg = Debug|Any CPU + {6AB16005-E552-4619-9E55-D752FCCAC3B0}.Debug|.NET.Build.0 = Debug|Any CPU + {6AB16005-E552-4619-9E55-D752FCCAC3B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6AB16005-E552-4619-9E55-D752FCCAC3B0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6AB16005-E552-4619-9E55-D752FCCAC3B0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {6AB16005-E552-4619-9E55-D752FCCAC3B0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {6AB16005-E552-4619-9E55-D752FCCAC3B0}.Debug|x86.ActiveCfg = Debug|Any CPU + {6AB16005-E552-4619-9E55-D752FCCAC3B0}.Debug|x86.Build.0 = Debug|Any CPU + {6AB16005-E552-4619-9E55-D752FCCAC3B0}.Release|.NET.ActiveCfg = Release|Any CPU + {6AB16005-E552-4619-9E55-D752FCCAC3B0}.Release|.NET.Build.0 = Release|Any CPU + {6AB16005-E552-4619-9E55-D752FCCAC3B0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6AB16005-E552-4619-9E55-D752FCCAC3B0}.Release|Any CPU.Build.0 = Release|Any CPU + {6AB16005-E552-4619-9E55-D752FCCAC3B0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {6AB16005-E552-4619-9E55-D752FCCAC3B0}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {6AB16005-E552-4619-9E55-D752FCCAC3B0}.Release|x86.ActiveCfg = Release|Any CPU + {6AB16005-E552-4619-9E55-D752FCCAC3B0}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -3762,6 +3780,7 @@ Global {B0C86A71-94ED-4F0D-98B3-49DB04056882} = {D8A691C5-146D-4613-86CC-438F02FE9106} {B289C237-C966-41A0-8968-C04D0004F30B} = {D8A691C5-146D-4613-86CC-438F02FE9106} {5C99CC38-15A8-4485-8D59-997EEEA9D6C1} = {D8A691C5-146D-4613-86CC-438F02FE9106} + {6AB16005-E552-4619-9E55-D752FCCAC3B0} = {D8A691C5-146D-4613-86CC-438F02FE9106} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {FBE985BB-9F0F-4DBB-8F94-ABC37A803FF9} diff --git a/BeWo/BeWo.csproj b/BeWo/BeWo.csproj index 3f072212f..26346aa3e 100644 --- a/BeWo/BeWo.csproj +++ b/BeWo/BeWo.csproj @@ -319,6 +319,10 @@ MSBuild:Compile Designer + + MSBuild:Compile + Designer + MSBuild:Compile Designer @@ -890,6 +894,7 @@ + @@ -991,9 +996,10 @@ DPCtrlDienstTooltip.xaml + - + @@ -1024,6 +1030,9 @@ InformationView.xaml + + UrlaubstagSchenkenView.xaml + Suchergebnis.xaml @@ -2481,392 +2490,392 @@ False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly diff --git a/BeWo/ServiceProxy/Generated.cs b/BeWo/ServiceProxy/Generated.cs index b4064f2af..613778ceb 100644 --- a/BeWo/ServiceProxy/Generated.cs +++ b/BeWo/ServiceProxy/Generated.cs @@ -166,6 +166,12 @@ namespace BeWo.ServiceProxy public interface IEmployeeService { + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IEmployeeService/IsAssessmentSheetCategoryBelongingToAS", ReplyAction="http://tempuri.org/IEmployeeService/IsAssessmentSheetCategoryBelongingToASRespons" + + "e")] + [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IEmployeeService/IsAssessmentSheetCategoryBelongingToASBeWoFau" + + "ltFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] + bool IsAssessmentSheetCategoryBelongingToAS(long assessmentSheetCategoryOid); + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IEmployeeService/GetAllOvertimesFromEmployee", ReplyAction="http://tempuri.org/IEmployeeService/GetAllOvertimesFromEmployeeResponse")] [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IEmployeeService/GetAllOvertimesFromEmployeeBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] System.Collections.Generic.List GetAllOvertimesFromEmployee(long employeeOid); @@ -326,6 +332,33 @@ namespace BeWo.ServiceProxy [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IEmployeeService/GetActiveCustomersForEmployeeBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] System.Collections.Generic.List GetActiveCustomersForEmployee(System.Nullable employeeOid, BeWo.View.Navigation.Filter.CustomerFilterEnum customerFilter); + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IEmployeeService/CalculateUrlaubstage", ReplyAction="http://tempuri.org/IEmployeeService/CalculateUrlaubstageResponse")] + [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IEmployeeService/CalculateUrlaubstageBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] + decimal CalculateUrlaubstage(System.DateTime entryDate, int anzahlArbeitstage, int restlicheTageImJahr, System.Nullable urlaubstageProJahr); + + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IEmployeeService/GetGeschenkteUrlaubstageForEmployee", ReplyAction="http://tempuri.org/IEmployeeService/GetGeschenkteUrlaubstageForEmployeeResponse")] + [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IEmployeeService/GetGeschenkteUrlaubstageForEmployeeBeWoFaultF" + + "ault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] + System.Collections.Generic.List GetGeschenkteUrlaubstageForEmployee(long empOid); + + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IEmployeeService/GetGeschenkteUrlaubstageForYear", ReplyAction="http://tempuri.org/IEmployeeService/GetGeschenkteUrlaubstageForYearResponse")] + [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IEmployeeService/GetGeschenkteUrlaubstageForYearBeWoFaultFault" + + "", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] + System.Collections.Generic.List GetGeschenkteUrlaubstageForYear(int year); + + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IEmployeeService/InsertGeschenkterUrlaubstag", ReplyAction="http://tempuri.org/IEmployeeService/InsertGeschenkterUrlaubstagResponse")] + [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IEmployeeService/InsertGeschenkterUrlaubstagBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] + void InsertGeschenkterUrlaubstag(BS.Shared.DataContracts.GeschenkterUrlaubstagDC dc); + + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IEmployeeService/InsertMultipleGeschenkteUrlaubstage", ReplyAction="http://tempuri.org/IEmployeeService/InsertMultipleGeschenkteUrlaubstageResponse")] + [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IEmployeeService/InsertMultipleGeschenkteUrlaubstageBeWoFaultF" + + "ault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] + void InsertMultipleGeschenkteUrlaubstage(System.Collections.Generic.List dcs); + + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IEmployeeService/DeleteGeschenkterUrlaubstag", ReplyAction="http://tempuri.org/IEmployeeService/DeleteGeschenkterUrlaubstagResponse")] + [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IEmployeeService/DeleteGeschenkterUrlaubstagBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] + void DeleteGeschenkterUrlaubstag(BS.Shared.DataContracts.GeschenkterUrlaubstagDC dc); + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IEmployeeService/ArchiveEmployee", ReplyAction="http://tempuri.org/IEmployeeService/ArchiveEmployeeResponse")] [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IEmployeeService/ArchiveEmployeeBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] void ArchiveEmployee(long pOid, long pVersion); @@ -408,6 +441,10 @@ namespace BeWo.ServiceProxy [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IEmployeeService/GetAllEmploymentTypesBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] System.Collections.Generic.List GetAllEmploymentTypes(); + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IEmployeeService/GetEmploymentType", ReplyAction="http://tempuri.org/IEmployeeService/GetEmploymentTypeResponse")] + [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IEmployeeService/GetEmploymentTypeBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] + BS.Shared.DataContracts.EmploymentTypeDC GetEmploymentType(long oid); + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IEmployeeService/InsertNewEmploymentTypes", ReplyAction="http://tempuri.org/IEmployeeService/InsertNewEmploymentTypesResponse")] [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IEmployeeService/InsertNewEmploymentTypesBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] System.Collections.Generic.List InsertNewEmploymentTypes(System.Collections.Generic.List pEntries); @@ -591,12 +628,6 @@ namespace BeWo.ServiceProxy [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IEmployeeService/IsAssessmentSheetEntryBelongingToASBeWoFaultF" + "ault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] bool IsAssessmentSheetEntryBelongingToAS(long assessmentSheetCategoryOid); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IEmployeeService/IsAssessmentSheetCategoryBelongingToAS", ReplyAction="http://tempuri.org/IEmployeeService/IsAssessmentSheetCategoryBelongingToASRespons" + - "e")] - [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IEmployeeService/IsAssessmentSheetCategoryBelongingToASBeWoFau" + - "ltFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] - bool IsAssessmentSheetCategoryBelongingToAS(long assessmentSheetCategoryOid); } [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")] @@ -633,6 +664,11 @@ namespace BeWo.ServiceProxy { } + public bool IsAssessmentSheetCategoryBelongingToAS(long assessmentSheetCategoryOid) + { + return base.Channel.IsAssessmentSheetCategoryBelongingToAS(assessmentSheetCategoryOid); + } + public System.Collections.Generic.List GetAllOvertimesFromEmployee(long employeeOid) { return base.Channel.GetAllOvertimesFromEmployee(employeeOid); @@ -818,6 +854,36 @@ namespace BeWo.ServiceProxy return base.Channel.GetActiveCustomersForEmployee(employeeOid, customerFilter); } + public decimal CalculateUrlaubstage(System.DateTime entryDate, int anzahlArbeitstage, int restlicheTageImJahr, System.Nullable urlaubstageProJahr) + { + return base.Channel.CalculateUrlaubstage(entryDate, anzahlArbeitstage, restlicheTageImJahr, urlaubstageProJahr); + } + + public System.Collections.Generic.List GetGeschenkteUrlaubstageForEmployee(long empOid) + { + return base.Channel.GetGeschenkteUrlaubstageForEmployee(empOid); + } + + public System.Collections.Generic.List GetGeschenkteUrlaubstageForYear(int year) + { + return base.Channel.GetGeschenkteUrlaubstageForYear(year); + } + + public void InsertGeschenkterUrlaubstag(BS.Shared.DataContracts.GeschenkterUrlaubstagDC dc) + { + base.Channel.InsertGeschenkterUrlaubstag(dc); + } + + public void InsertMultipleGeschenkteUrlaubstage(System.Collections.Generic.List dcs) + { + base.Channel.InsertMultipleGeschenkteUrlaubstage(dcs); + } + + public void DeleteGeschenkterUrlaubstag(BS.Shared.DataContracts.GeschenkterUrlaubstagDC dc) + { + base.Channel.DeleteGeschenkterUrlaubstag(dc); + } + public void ArchiveEmployee(long pOid, long pVersion) { base.Channel.ArchiveEmployee(pOid, pVersion); @@ -913,6 +979,11 @@ namespace BeWo.ServiceProxy return base.Channel.GetAllEmploymentTypes(); } + public BS.Shared.DataContracts.EmploymentTypeDC GetEmploymentType(long oid) + { + return base.Channel.GetEmploymentType(oid); + } + public System.Collections.Generic.List InsertNewEmploymentTypes(System.Collections.Generic.List pEntries) { return base.Channel.InsertNewEmploymentTypes(pEntries); @@ -1132,11 +1203,6 @@ namespace BeWo.ServiceProxy { return base.Channel.IsAssessmentSheetEntryBelongingToAS(assessmentSheetCategoryOid); } - - public bool IsAssessmentSheetCategoryBelongingToAS(long assessmentSheetCategoryOid) - { - return base.Channel.IsAssessmentSheetCategoryBelongingToAS(assessmentSheetCategoryOid); - } } [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")] @@ -1411,8 +1477,6 @@ namespace BeWo.ServiceProxy [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BeWo.ServiceProxy.BeWoFault))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BeWo.ServiceProxy.BeWoFaultType))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.OvertimeDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.AuszahlungsartDC))] @@ -1476,6 +1540,8 @@ namespace BeWo.ServiceProxy [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.ServiceDescriptionDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.ServiceAccountingDC))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.GeschenkterUrlaubstagDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.AssessmentSheetCategoryDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] @@ -1487,6 +1553,8 @@ namespace BeWo.ServiceProxy [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.GroupOfPeopleDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BeWo.ServiceProxy.BeWoFault))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BeWo.ServiceProxy.BeWoFaultType))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.Behinderungsart))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] @@ -1603,6 +1671,8 @@ namespace BeWo.ServiceProxy [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.DokumentvorlageDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.ConfirmationReceiptSignatureDC))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.RegelmaessigerDienstDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.DienstplanerRootDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.DienstEintragDC))] @@ -1620,8 +1690,7 @@ namespace BeWo.ServiceProxy [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.FeiertagDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.DienstplanerMonthlySummaryDC))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.RegelmaessigerDienstDC))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.UrlaubsplanerRootDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.FlexibleReportFilterDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.FlexibleReportResultDC))] @@ -4952,7 +5021,7 @@ namespace BeWo.ServiceProxy [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/RemoveAllDiensteForOneMonth", ReplyAction="http://tempuri.org/IOperationsService/RemoveAllDiensteForOneMonthResponse")] [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/RemoveAllDiensteForOneMonthBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] - void RemoveAllDiensteForOneMonth(System.DateTime month); + void RemoveAllDiensteForOneMonth(System.DateTime month, System.Collections.Generic.List rd); [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/GetColorForStatus", ReplyAction="http://tempuri.org/IOperationsService/GetColorForStatusResponse")] [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetColorForStatusBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] @@ -4994,6 +5063,10 @@ namespace BeWo.ServiceProxy [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetDefaultFeiertageForYearBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] System.Collections.Generic.List GetDefaultFeiertageForYear(int year); + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/BuildUrlaubsplanerRootObject", ReplyAction="http://tempuri.org/IOperationsService/BuildUrlaubsplanerRootObjectResponse")] + [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/BuildUrlaubsplanerRootObjectBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] + BS.Shared.DataContracts.UrlaubsplanerRootDC BuildUrlaubsplanerRootObject(int year, int month); + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/GetFlexibleReportResult", ReplyAction="http://tempuri.org/IOperationsService/GetFlexibleReportResultResponse")] [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetFlexibleReportResultBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] BS.Shared.DataContracts.FlexibleReportResultDC GetFlexibleReportResult(BS.Shared.DataContracts.FlexibleReportFilterDC filter); @@ -6258,9 +6331,9 @@ namespace BeWo.ServiceProxy return base.Channel.GetServiceRecordsWithoutConfirmationReceiptSignature(serviceRecordOids, signatureType); } - public void RemoveAllDiensteForOneMonth(System.DateTime month) + public void RemoveAllDiensteForOneMonth(System.DateTime month, System.Collections.Generic.List rd) { - base.Channel.RemoveAllDiensteForOneMonth(month); + base.Channel.RemoveAllDiensteForOneMonth(month, rd); } public string GetColorForStatus(bool status) @@ -6303,6 +6376,11 @@ namespace BeWo.ServiceProxy return base.Channel.GetDefaultFeiertageForYear(year); } + public BS.Shared.DataContracts.UrlaubsplanerRootDC BuildUrlaubsplanerRootObject(int year, int month) + { + return base.Channel.BuildUrlaubsplanerRootObject(year, month); + } + public BS.Shared.DataContracts.FlexibleReportResultDC GetFlexibleReportResult(BS.Shared.DataContracts.FlexibleReportFilterDC filter) { return base.Channel.GetFlexibleReportResult(filter); diff --git a/BeWo/View/Controls/DPCtrlDay.cs b/BeWo/View/Controls/DPCtrlDay.cs index 3ea187f2f..1875c0141 100644 --- a/BeWo/View/Controls/DPCtrlDay.cs +++ b/BeWo/View/Controls/DPCtrlDay.cs @@ -48,12 +48,17 @@ namespace BeWo.View.Controls c.Text = string.Empty; c.ToolTip = "Kein gültiger Arbeitsvertrag"; } - else if (info.Reason != null) + else if (info.Reason != null && !info.IsFeiertag && info.DayOfWeek != DayOfWeek.Saturday && info.DayOfWeek != DayOfWeek.Sunday) { - c.Background = Brushes.White; c.Foreground = Brushes.Red; c.Text = $"{info.Reason.Description[0]}"; c.ToolTip = $"{info.Reason.Description}"; + + if (info.DayOfWeek == DayOfWeek.Saturday || info.DayOfWeek == DayOfWeek.Sunday) + c.Background = new SolidColorBrush(ColorExtensions.FromHexString("EFEFEF")); + else + c.Background = Brushes.White; + } else if (dc != null) { diff --git a/BeWo/View/Controls/DPCtrlEmployee.cs b/BeWo/View/Controls/DPCtrlEmployee.cs index c05a54d42..46220129a 100644 --- a/BeWo/View/Controls/DPCtrlEmployee.cs +++ b/BeWo/View/Controls/DPCtrlEmployee.cs @@ -30,20 +30,15 @@ namespace BeWo.View.Controls { if(information.Employee != null) { - switch (information.Row) + if (information.IsLastRow) { - case 0: - ctrl.BorderBlack.BorderThickness = new Thickness(0, 0, 1, 0); - ctrl.BorderLight.BorderThickness = new Thickness(0, 0, 0, 1); - break; - case 1: - ctrl.BorderBlack.BorderThickness = new Thickness(0, 0, 1, 0); - ctrl.BorderLight.BorderThickness = new Thickness(0, 0, 0, 1); - break; - case 2: - ctrl.BorderBlack.BorderThickness = new Thickness(0, 0, 1, 1); - ctrl.BorderLight.BorderThickness = new Thickness(0, 0, 0, 1); - break; + ctrl.BorderBlack.BorderThickness = new Thickness(0, 0, 1, 1); + ctrl.BorderLight.BorderThickness = new Thickness(0, 0, 0, 1); + } + else + { + ctrl.BorderBlack.BorderThickness = new Thickness(0, 0, 1, 0); + ctrl.BorderLight.BorderThickness = new Thickness(0, 0, 0, 1); } } else @@ -113,44 +108,44 @@ namespace BeWo.View.Controls case 0: return EmployeeInformation.Employee.LastNameFirstName; - case 1: + //case 1: - foreach (var contract in EmployeeInformation.Contracts) - { - sb.Append(contract.EmploymentType?.Name); - sb.Append('/'); - } + // foreach (var contract in EmployeeInformation.Contracts) + // { + // sb.Append(contract.EmploymentType?.Name); + // sb.Append('/'); + // } - sb.Remove(sb.Length - 1, 1); + // sb.Remove(sb.Length - 1, 1); - return sb.ToString(); + // return sb.ToString(); - case 2: + //case 2: - foreach (var contract in EmployeeInformation.Contracts) - { - sb.Append('('); + // foreach (var contract in EmployeeInformation.Contracts) + // { + // sb.Append('('); - if (contract.EntryDate.HasValue) - sb.Append(contract.EntryDate.Value.ToString("dd.MM.yy")); - else - sb.Append("k.A."); + // if (contract.EntryDate.HasValue) + // sb.Append(contract.EntryDate.Value.ToString("dd.MM.yy")); + // else + // sb.Append("k.A."); - sb.Append(" - "); + // sb.Append(" - "); - if (contract.ContractEndDate.HasValue) - sb.Append(contract.ContractEndDate.Value.ToString("dd.MM.yy")); - else - sb.Append("unbefr."); + // if (contract.ContractEndDate.HasValue) + // sb.Append(contract.ContractEndDate.Value.ToString("dd.MM.yy")); + // else + // sb.Append("unbefr."); - sb.Append(')'); + // sb.Append(')'); - sb.Append('/'); - } + // sb.Append('/'); + // } - sb.Remove(sb.Length - 1, 1); + // sb.Remove(sb.Length - 1, 1); - return sb.ToString(); + // return sb.ToString(); } } @@ -169,5 +164,6 @@ namespace BeWo.View.Controls public EmployeeDC Employee { get; set; } public List Contracts { get; set; } public int Row { get; set; } + public bool IsLastRow { get; set; } } } diff --git a/BeWo/View/Controls/DPCtrlIst.cs b/BeWo/View/Controls/DPCtrlIst.cs new file mode 100644 index 000000000..30ff84c5c --- /dev/null +++ b/BeWo/View/Controls/DPCtrlIst.cs @@ -0,0 +1,65 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; + +namespace BeWo.View.Controls +{ + public class DPCtrlIst : DienstplanerControl + { + public static readonly DependencyProperty IstInformationProperty = DependencyProperty.Register( + "IstInformation", + typeof(DPCtrlIstInformation), + typeof(DPCtrlIst), + new UIPropertyMetadata( + (s, e) => + { + var information = (DPCtrlIstInformation)e.NewValue; + var ctrl = (DPCtrlIst)s; + + if (ctrl != null) + { + if (information != null) + { + if (information.Row == 0 && !information.Statuszeile) + { + ctrl.Text = string.Format("{0:0.00}", information.IstWert); + ctrl.ToolTip = "Ist-Wert"; + } + + if (information.Statuszeile) + ctrl.BorderBlack.BorderThickness = new Thickness(0, 0, 0, 2); + else + { + if (information.IsLastRow) + ctrl.BorderBlack.BorderThickness = new Thickness(0, 0, 0, 1); + else + ctrl.BorderBlack.BorderThickness = new Thickness(0, 0, 0, 0); + } + } + } + })); + + public DPCtrlIst() + { + InitializeComponent(); + //BorderBlack.BorderThickness = new Thickness(0, 0, 1, 1); + txt.HorizontalAlignment = HorizontalAlignment.Right; + } + public DPCtrlIstInformation IstInformation + { + get { return (DPCtrlIstInformation)GetValue(IstInformationProperty); } + + set { SetValue(IstInformationProperty, value); } + } + } + public class DPCtrlIstInformation + { + public int Row { get; set; } + public bool Statuszeile { get; set; } + public decimal IstWert { get; set; } + public bool IsLastRow { get; set; } + } +} diff --git a/BeWo/View/Controls/DPCtrlSaldo.cs b/BeWo/View/Controls/DPCtrlSaldo.cs index 949c2f2b2..66b866cc1 100644 --- a/BeWo/View/Controls/DPCtrlSaldo.cs +++ b/BeWo/View/Controls/DPCtrlSaldo.cs @@ -23,19 +23,20 @@ namespace BeWo.View.Controls { if (information != null) { - if (information.Row == 2) - ctrl.BorderBlack.BorderThickness = new Thickness(0, 0, 1, 1); + if (information.Row == 0 && !information.Statuszeile) + { + ctrl.Text = string.Format("{0:0.00}", information.SaldoWert); + ctrl.ToolTip = "Saldo-Wert"; + } + + if (information.Statuszeile) + ctrl.BorderBlack.BorderThickness = new Thickness(0, 0, 0, 2); else { - if (information.Statuszeile) - ctrl.BorderBlack.BorderThickness = new Thickness(0, 0, 1, 2); + if (information.IsLastRow) + ctrl.BorderBlack.BorderThickness = new Thickness(0, 0, 0, 1); else - { - ctrl.BorderBlack.BorderThickness = new Thickness(0, 0, 1, 0); - if (information.Row == 0) - ctrl.Text = string.Format("{0:0.00}", information.SaldoWert); - } - + ctrl.BorderBlack.BorderThickness = new Thickness(0, 0, 0, 0); } } } @@ -58,5 +59,6 @@ namespace BeWo.View.Controls public int Row { get; set; } public bool Statuszeile { get; set; } public decimal SaldoWert { get; set; } + public bool IsLastRow { get; set; } } } diff --git a/BeWo/View/Controls/DPCtrlSoll.cs b/BeWo/View/Controls/DPCtrlSoll.cs new file mode 100644 index 000000000..bdcd7532a --- /dev/null +++ b/BeWo/View/Controls/DPCtrlSoll.cs @@ -0,0 +1,67 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; + + +namespace BeWo.View.Controls +{ + public class DPCtrlSoll : DienstplanerControl + { + public static readonly DependencyProperty SollInformationProperty = DependencyProperty.Register( + "SollInformation", + typeof(DPCtrlSollInformation), + typeof(DPCtrlSoll), + new UIPropertyMetadata( + (s, e) => + { + var information = (DPCtrlSollInformation)e.NewValue; + var ctrl = (DPCtrlSoll)s; + + if(ctrl != null) + { + if(information != null) + { + if (information.Row == 0 && !information.Statuszeile) + { + ctrl.Text = string.Format("{0:0.00}", information.SollWert); + ctrl.ToolTip = "Soll-Wert"; + } + + if (information.Statuszeile) + ctrl.BorderBlack.BorderThickness = new Thickness(0, 0, 0, 2); + else + { + if (information.IsLastRow) + ctrl.BorderBlack.BorderThickness = new Thickness(0, 0, 0, 1); + else + ctrl.BorderBlack.BorderThickness = new Thickness(0, 0, 0, 0); + } + } + } + })); + + public DPCtrlSoll() + { + InitializeComponent(); + //BorderBlack.BorderThickness = new Thickness(0, 0, 1, 1); + txt.HorizontalAlignment = HorizontalAlignment.Right; + } + public DPCtrlSollInformation SollInformation + { + get { return (DPCtrlSollInformation)GetValue(SollInformationProperty); } + + set { SetValue(SollInformationProperty, value); } + } + } + public class DPCtrlSollInformation + { + public int Row { get; set; } + public bool Statuszeile { get; set; } + public decimal SollWert { get; set; } + public bool IsLastRow { get; set; } + } + +} diff --git a/BeWo/View/Controls/DPCtrlSollIst.cs b/BeWo/View/Controls/DPCtrlSollIst.cs deleted file mode 100644 index 877d5f933..000000000 --- a/BeWo/View/Controls/DPCtrlSollIst.cs +++ /dev/null @@ -1,74 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows; - - -namespace BeWo.View.Controls -{ - public class DPCtrlSollIst : DienstplanerControl - { - public static readonly DependencyProperty SollIstInformationProperty = DependencyProperty.Register( - "SollIstInformation", - typeof(DPCtrlSollIstInformation), - typeof(DPCtrlSollIst), - new UIPropertyMetadata( - (s, e) => - { - var information = (DPCtrlSollIstInformation)e.NewValue; - var ctrl = (DPCtrlSollIst)s; - - if(ctrl != null) - { - if(information != null) - { - if (information.Row == 2) - ctrl.BorderBlack.BorderThickness = new Thickness(0, 0, 1, 1); - else - { - if (information.Statuszeile) - ctrl.BorderBlack.BorderThickness = new Thickness(0, 0, 0, 2); - else - { - ctrl.BorderBlack.BorderThickness = new Thickness(0, 0, 1, 0); - if (information.Row == 0) - { - ctrl.Text = string.Format("{0:0.00}", information.SollWert); - ctrl.ToolTip = "Soll-Wert"; - } - else if (information.Row == 1) - { - ctrl.Text = string.Format("{0:0.00}", information.IstWert); - ctrl.ToolTip = "Ist-Wert"; - } - } - - } - } - } - })); - - public DPCtrlSollIst() - { - InitializeComponent(); - //BorderBlack.BorderThickness = new Thickness(0, 0, 1, 1); - txt.HorizontalAlignment = HorizontalAlignment.Right; - } - public DPCtrlSollIstInformation SollIstInformation - { - get { return (DPCtrlSollIstInformation)GetValue(SollIstInformationProperty); } - - set { SetValue(SollIstInformationProperty, value); } - } - } - public class DPCtrlSollIstInformation - { - public int Row { get; set; } - public bool Statuszeile { get; set; } - public decimal SollWert { get; set; } - public decimal IstWert { get; set; } - } - -} diff --git a/BeWo/View/Controls/DPCtrlUrlaubKrankheit.cs b/BeWo/View/Controls/DPCtrlUrlaubKrankheit.cs index a9eaaed79..b7b30fea2 100644 --- a/BeWo/View/Controls/DPCtrlUrlaubKrankheit.cs +++ b/BeWo/View/Controls/DPCtrlUrlaubKrankheit.cs @@ -25,8 +25,10 @@ namespace BeWo.View.Controls { if (information.SpalteFuerUrlaub) { - if (information.Row == 2) + if (information.IsLastRow) + { ctrl.BorderBlack.BorderThickness = new Thickness(0, 0, 0, 1); + } else { if (information.Statuszeile) @@ -37,8 +39,10 @@ namespace BeWo.View.Controls } else { - if (information.Row == 2) + if (information.IsLastRow) + { ctrl.BorderBlack.BorderThickness = new Thickness(0, 0, 1, 1); + } else { if (information.Statuszeile) @@ -48,8 +52,11 @@ namespace BeWo.View.Controls } } - ctrl.Text = string.Format("{0:0}", information.SummeTage); - + if(information.Row == 0 && !information.Statuszeile) + { + ctrl.Text = string.Format("{0:0}", information.SummeTage); + ctrl.ToolTip = "Abwesenheiten an Wochenend- und Feiertagen werden nicht mitgezählt."; + } } } })); @@ -73,5 +80,6 @@ namespace BeWo.View.Controls public int Row { get; set; } public bool SpalteFuerUrlaub { get; set; } public decimal SummeTage { get; set; } + public bool IsLastRow { get; set; } } } diff --git a/BeWo/View/Controls/DPCtrlWeek.cs b/BeWo/View/Controls/DPCtrlWeek.cs index 657b40261..6c3230340 100644 --- a/BeWo/View/Controls/DPCtrlWeek.cs +++ b/BeWo/View/Controls/DPCtrlWeek.cs @@ -25,20 +25,24 @@ namespace BeWo.View.Controls if (dc != null) { //dc.RemoveAll(x => x == null); - - c.BorderBlack.BorderThickness = new Thickness(0, 0, 1, 1); + if (!dc.IsLastRow) + c.BorderBlack.BorderThickness = new Thickness(0, 0, 1, 0); + else + c.BorderBlack.BorderThickness = new Thickness(0, 0, 1, 1); double res = 0.0; - if (dc.Hours.Count != 0 || dc.Row == 2) + if(!dc.Statuszeile) { - foreach (var dauer in dc.Hours) + if (dc.Hours.Count != 0 || dc.Row == 0) { - res += dauer; + foreach (var dauer in dc.Hours) + { + res += dauer; + } + c.Text = res.ToString("0.##"); } - c.Text = res.ToString("0.##"); } - else { if(dc.Statuszeile) @@ -81,5 +85,6 @@ namespace BeWo.View.Controls public List Hours { get; set; } public bool Statuszeile { get; set; } public int Row { get; set; } + public bool IsLastRow { get; set; } } } diff --git a/BeWo/View/Controls/DPCtrlZeitkonto.cs b/BeWo/View/Controls/DPCtrlZeitkonto.cs index 6a1eeb4b0..8c80e1996 100644 --- a/BeWo/View/Controls/DPCtrlZeitkonto.cs +++ b/BeWo/View/Controls/DPCtrlZeitkonto.cs @@ -24,7 +24,7 @@ namespace BeWo.View.Controls { if (information != null) { - if (information.Row == 2) + if (information.IsLastRow) ctrl.BorderBlack.BorderThickness = new Thickness(0, 0, 1, 1); else { @@ -68,5 +68,6 @@ namespace BeWo.View.Controls public int Row { get; set; } public bool Statuszeile { get; set; } public DienstplanerMonthlySummaryDC Monatszusammenfassung { get; set;} + public bool IsLastRow { get; set; } } } diff --git a/BeWo/View/Detail/EmployeeView.xaml b/BeWo/View/Detail/EmployeeView.xaml index c4fbf68fc..eb1aae9bb 100644 --- a/BeWo/View/Detail/EmployeeView.xaml +++ b/BeWo/View/Detail/EmployeeView.xaml @@ -11,14 +11,15 @@ xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup" xmlns:security="clr-namespace:BeWo.Security" xmlns:detail="clr-namespace:BeWo.View.Detail" + xmlns:sys="clr-namespace:System;assembly=mscorlib" Height="Auto" Width="Auto" HorizontalAlignment="Stretch" x:Name="EmployeeBeWoView" VerticalAlignment="Stretch" Focusable="True" GotFocus="UserControl_GotFocus"> - - - - - - - - - - - - - - - + - - - - - - - - - - -