MH: Tolle neue Sachen im Dienstplaner

This commit is contained in:
Marcel Hirschle
2021-09-22 15:34:38 +02:00
parent 6dd2110d88
commit 0ac5d426d7
28 changed files with 1651 additions and 148 deletions

View File

@@ -166,6 +166,10 @@ namespace BeWo.ServiceProxy
public interface IEmployeeService public interface IEmployeeService
{ {
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IEmployeeService/LoadCompactEmployee", ReplyAction="http://tempuri.org/IEmployeeService/LoadCompactEmployeeResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IEmployeeService/LoadCompactEmployeeBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
BS.Shared.DataContracts.Compact.CompactEmployeeDC LoadCompactEmployee(long pEmployeeOid);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IEmployeeService/IsAssessmentSheetEntryBelongingToAS", ReplyAction="http://tempuri.org/IEmployeeService/IsAssessmentSheetEntryBelongingToASResponse")] [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IEmployeeService/IsAssessmentSheetEntryBelongingToAS", ReplyAction="http://tempuri.org/IEmployeeService/IsAssessmentSheetEntryBelongingToASResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IEmployeeService/IsAssessmentSheetEntryBelongingToASBeWoFaultF" + [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")] "ault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
@@ -634,6 +638,12 @@ namespace BeWo.ServiceProxy
"lt", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] "lt", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
System.Collections.Generic.List<BS.Shared.DataContracts.AbsenceTimeDC> GetAllEmployeeAbsenceTimesForYear(int year); System.Collections.Generic.List<BS.Shared.DataContracts.AbsenceTimeDC> GetAllEmployeeAbsenceTimesForYear(int year);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IEmployeeService/GetMultipleEmployeeAbsenceTimesForMonth", ReplyAction="http://tempuri.org/IEmployeeService/GetMultipleEmployeeAbsenceTimesForMonthRespon" +
"se")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IEmployeeService/GetMultipleEmployeeAbsenceTimesForMonthBeWoFa" +
"ultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
System.Collections.Generic.List<BS.Shared.DataContracts.AbsenceTimeDC> GetMultipleEmployeeAbsenceTimesForMonth(int year, int month, System.Collections.Generic.List<long> empOids);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IEmployeeService/DeactivateGroupOfPeople", ReplyAction="http://tempuri.org/IEmployeeService/DeactivateGroupOfPeopleResponse")] [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IEmployeeService/DeactivateGroupOfPeople", ReplyAction="http://tempuri.org/IEmployeeService/DeactivateGroupOfPeopleResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IEmployeeService/DeactivateGroupOfPeopleBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IEmployeeService/DeactivateGroupOfPeopleBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
void DeactivateGroupOfPeople(long pOid, long pVersion); void DeactivateGroupOfPeople(long pOid, long pVersion);
@@ -661,10 +671,6 @@ namespace BeWo.ServiceProxy
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IEmployeeService/LoadCompactTeam", ReplyAction="http://tempuri.org/IEmployeeService/LoadCompactTeamResponse")] [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IEmployeeService/LoadCompactTeam", ReplyAction="http://tempuri.org/IEmployeeService/LoadCompactTeamResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IEmployeeService/LoadCompactTeamBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IEmployeeService/LoadCompactTeamBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
BS.Shared.DataContracts.Compact.CompactTeamDC LoadCompactTeam(long pTeamOid); BS.Shared.DataContracts.Compact.CompactTeamDC LoadCompactTeam(long pTeamOid);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IEmployeeService/LoadCompactEmployee", ReplyAction="http://tempuri.org/IEmployeeService/LoadCompactEmployeeResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IEmployeeService/LoadCompactEmployeeBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
BS.Shared.DataContracts.Compact.CompactEmployeeDC LoadCompactEmployee(long pEmployeeOid);
} }
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")] [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
@@ -701,6 +707,11 @@ namespace BeWo.ServiceProxy
{ {
} }
public BS.Shared.DataContracts.Compact.CompactEmployeeDC LoadCompactEmployee(long pEmployeeOid)
{
return base.Channel.LoadCompactEmployee(pEmployeeOid);
}
public bool IsAssessmentSheetEntryBelongingToAS(long assessmentSheetCategoryOid) public bool IsAssessmentSheetEntryBelongingToAS(long assessmentSheetCategoryOid)
{ {
return base.Channel.IsAssessmentSheetEntryBelongingToAS(assessmentSheetCategoryOid); return base.Channel.IsAssessmentSheetEntryBelongingToAS(assessmentSheetCategoryOid);
@@ -1236,6 +1247,11 @@ namespace BeWo.ServiceProxy
return base.Channel.GetAllEmployeeAbsenceTimesForYear(year); return base.Channel.GetAllEmployeeAbsenceTimesForYear(year);
} }
public System.Collections.Generic.List<BS.Shared.DataContracts.AbsenceTimeDC> GetMultipleEmployeeAbsenceTimesForMonth(int year, int month, System.Collections.Generic.List<long> empOids)
{
return base.Channel.GetMultipleEmployeeAbsenceTimesForMonth(year, month, empOids);
}
public void DeactivateGroupOfPeople(long pOid, long pVersion) public void DeactivateGroupOfPeople(long pOid, long pVersion)
{ {
base.Channel.DeactivateGroupOfPeople(pOid, pVersion); base.Channel.DeactivateGroupOfPeople(pOid, pVersion);
@@ -1270,11 +1286,6 @@ namespace BeWo.ServiceProxy
{ {
return base.Channel.LoadCompactTeam(pTeamOid); return base.Channel.LoadCompactTeam(pTeamOid);
} }
public BS.Shared.DataContracts.Compact.CompactEmployeeDC LoadCompactEmployee(long pEmployeeOid)
{
return base.Channel.LoadCompactEmployee(pEmployeeOid);
}
} }
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")] [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
@@ -1501,56 +1512,6 @@ namespace BeWo.ServiceProxy
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/ConvertToNewSubstitutionTypeBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/ConvertToNewSubstitutionTypeBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<System.Nullable<long>>))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<System.Nullable<long>>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BeWo.View.Navigation.Filter.CustomerFilterEnum))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BeWo.View.Navigation.Filter.CustomerFilterEnum))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ActivationTypeId))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ValueListEntryType))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ContactType))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.FamilyStatus))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.CostRatePeriodType))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.Sex))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.PersonType))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ControlType))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.SubstitutionNeed))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.AppointmentDayOfWeek))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.TokenTyp))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.SupportConceptApprovalInterval))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.Bewilligungsart))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.SystemEntryID))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.AccountingIntervalType))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.AccountingvisibilityType))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ScopeTypeId))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.CostBearer2SupportConceptStatus))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.SettingsType))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.UserRightType>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.UserRightType))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ZeiterfassungsDauer))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ServiceUnit))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ServiceRecordFormate))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ServiceRecordTypeId))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.GroupTypeId))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactTeamDC>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Compact.CompactTeamDC))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Compact.CompactOrganisationDC))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Compact.CompactCustomerDC))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Compact.CompactEmployeeDC))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactEmployeeDC>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactVertreterEmployeeDC>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Compact.CompactVertreterEmployeeDC))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Compact.CompactTokenDC))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactCustomerDC>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Compact.CompactPersonDC))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Compact.CompactSupportConceptDC))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactCostBearerDC>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Compact.CompactCostBearerDC))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactSupportConceptDC>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactGroupOfPeopleDC>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Compact.CompactGroupOfPeopleDC))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<long, long>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<long>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<byte[]>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<string>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<long, string>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<long, BS.Shared.ValueListEntryType>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<System.Nullable<long>, decimal>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.OvertimeDC>))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.OvertimeDC>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.OvertimeDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.OvertimeDC))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.AuszahlungsartDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.AuszahlungsartDC))]
@@ -1633,6 +1594,56 @@ namespace BeWo.ServiceProxy
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.GroupOfPeopleDC>))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.GroupOfPeopleDC>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BeWo.ServiceProxy.BeWoFault))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BeWo.ServiceProxy.BeWoFault))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BeWo.ServiceProxy.BeWoFaultType))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BeWo.ServiceProxy.BeWoFaultType))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<long>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<long, BS.Shared.ValueListEntryType>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<long, long>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<byte[]>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<string>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<long, string>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<System.Nullable<long>, decimal>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ActivationTypeId))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ValueListEntryType))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ContactType))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.FamilyStatus))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.CostRatePeriodType))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.Sex))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.PersonType))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ControlType))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.SubstitutionNeed))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.AppointmentDayOfWeek))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.TokenTyp))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.SupportConceptApprovalInterval))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.Bewilligungsart))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.SystemEntryID))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.AccountingIntervalType))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.AccountingvisibilityType))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ScopeTypeId))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.CostBearer2SupportConceptStatus))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.SettingsType))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.UserRightType>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.UserRightType))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ZeiterfassungsDauer))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ServiceUnit))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ServiceRecordFormate))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ServiceRecordTypeId))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.GroupTypeId))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Compact.CompactEmployeeDC))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactTeamDC>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Compact.CompactTeamDC))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Compact.CompactOrganisationDC))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Compact.CompactCustomerDC))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactEmployeeDC>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactVertreterEmployeeDC>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Compact.CompactVertreterEmployeeDC))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Compact.CompactTokenDC))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactCustomerDC>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Compact.CompactPersonDC))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Compact.CompactSupportConceptDC))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactCostBearerDC>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Compact.CompactCostBearerDC))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactSupportConceptDC>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactGroupOfPeopleDC>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Compact.CompactGroupOfPeopleDC))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.Behinderungsart>))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.Behinderungsart>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.Behinderungsart))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.Behinderungsart))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.Merkzeichen>))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.Merkzeichen>))]
@@ -5023,6 +5034,11 @@ namespace BeWo.ServiceProxy
public interface IOperationsService public interface IOperationsService
{ {
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/GetPlatzhalterForSupportConcept", ReplyAction="http://tempuri.org/IOperationsService/GetPlatzhalterForSupportConceptResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetPlatzhalterForSupportConceptBeWoFaultFau" +
"lt", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
System.Collections.Generic.List<BS.Shared.DataContracts.PlatzhalterDC> GetPlatzhalterForSupportConcept();
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/GetPlatzhalterForCustomer", ReplyAction="http://tempuri.org/IOperationsService/GetPlatzhalterForCustomerResponse")] [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/GetPlatzhalterForCustomer", ReplyAction="http://tempuri.org/IOperationsService/GetPlatzhalterForCustomerResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetPlatzhalterForCustomerBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetPlatzhalterForCustomerBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
System.Collections.Generic.List<BS.Shared.DataContracts.PlatzhalterDC> GetPlatzhalterForCustomer(); System.Collections.Generic.List<BS.Shared.DataContracts.PlatzhalterDC> GetPlatzhalterForCustomer();
@@ -5384,6 +5400,10 @@ namespace BeWo.ServiceProxy
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/InsertNewDienstEintragBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/InsertNewDienstEintragBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
void InsertNewDienstEintrag(BS.Shared.DataContracts.DienstEintragDC dienstEintrag); void InsertNewDienstEintrag(BS.Shared.DataContracts.DienstEintragDC dienstEintrag);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/InsertNewDienstEintraege", ReplyAction="http://tempuri.org/IOperationsService/InsertNewDienstEintraegeResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/InsertNewDienstEintraegeBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
void InsertNewDienstEintraege(System.Collections.Generic.List<BS.Shared.DataContracts.DienstEintragDC> dienstEintraege);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/InsertRegelmaessigerDienst", ReplyAction="http://tempuri.org/IOperationsService/InsertRegelmaessigerDienstResponse")] [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/InsertRegelmaessigerDienst", ReplyAction="http://tempuri.org/IOperationsService/InsertRegelmaessigerDienstResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/InsertRegelmaessigerDienstBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/InsertRegelmaessigerDienstBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
void InsertRegelmaessigerDienst(BS.Shared.DataContracts.RegelmaessigerDienstDC dienst); void InsertRegelmaessigerDienst(BS.Shared.DataContracts.RegelmaessigerDienstDC dienst);
@@ -5468,11 +5488,6 @@ namespace BeWo.ServiceProxy
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/InsertTemplateBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/InsertTemplateBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
BS.Shared.DataContracts.DokumentvorlageDC InsertTemplate(BS.Shared.DataContracts.DokumentvorlageDC dc); BS.Shared.DataContracts.DokumentvorlageDC InsertTemplate(BS.Shared.DataContracts.DokumentvorlageDC dc);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/GetPlatzhalterForSupportConcept", ReplyAction="http://tempuri.org/IOperationsService/GetPlatzhalterForSupportConceptResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetPlatzhalterForSupportConceptBeWoFaultFau" +
"lt", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
System.Collections.Generic.List<BS.Shared.DataContracts.PlatzhalterDC> GetPlatzhalterForSupportConcept();
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/CreateNewChatMessagesDC", ReplyAction="http://tempuri.org/IOperationsService/CreateNewChatMessagesDCResponse")] [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/CreateNewChatMessagesDC", ReplyAction="http://tempuri.org/IOperationsService/CreateNewChatMessagesDCResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/CreateNewChatMessagesDCBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/CreateNewChatMessagesDCBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
BS.Shared.DataContracts.ChatMessageDC CreateNewChatMessagesDC(long senderOid, long empfängerOid, string message, bool isDeliverd, long teamid, string messageid); BS.Shared.DataContracts.ChatMessageDC CreateNewChatMessagesDC(long senderOid, long empfängerOid, string message, bool isDeliverd, long teamid, string messageid);
@@ -6373,6 +6388,11 @@ namespace BeWo.ServiceProxy
{ {
} }
public System.Collections.Generic.List<BS.Shared.DataContracts.PlatzhalterDC> GetPlatzhalterForSupportConcept()
{
return base.Channel.GetPlatzhalterForSupportConcept();
}
public System.Collections.Generic.List<BS.Shared.DataContracts.PlatzhalterDC> GetPlatzhalterForCustomer() public System.Collections.Generic.List<BS.Shared.DataContracts.PlatzhalterDC> GetPlatzhalterForCustomer()
{ {
return base.Channel.GetPlatzhalterForCustomer(); return base.Channel.GetPlatzhalterForCustomer();
@@ -6758,6 +6778,11 @@ namespace BeWo.ServiceProxy
base.Channel.InsertNewDienstEintrag(dienstEintrag); base.Channel.InsertNewDienstEintrag(dienstEintrag);
} }
public void InsertNewDienstEintraege(System.Collections.Generic.List<BS.Shared.DataContracts.DienstEintragDC> dienstEintraege)
{
base.Channel.InsertNewDienstEintraege(dienstEintraege);
}
public void InsertRegelmaessigerDienst(BS.Shared.DataContracts.RegelmaessigerDienstDC dienst) public void InsertRegelmaessigerDienst(BS.Shared.DataContracts.RegelmaessigerDienstDC dienst)
{ {
base.Channel.InsertRegelmaessigerDienst(dienst); base.Channel.InsertRegelmaessigerDienst(dienst);
@@ -6848,11 +6873,6 @@ namespace BeWo.ServiceProxy
return base.Channel.InsertTemplate(dc); return base.Channel.InsertTemplate(dc);
} }
public System.Collections.Generic.List<BS.Shared.DataContracts.PlatzhalterDC> GetPlatzhalterForSupportConcept()
{
return base.Channel.GetPlatzhalterForSupportConcept();
}
public BS.Shared.DataContracts.ChatMessageDC CreateNewChatMessagesDC(long senderOid, long empfängerOid, string message, bool isDeliverd, long teamid, string messageid) public BS.Shared.DataContracts.ChatMessageDC CreateNewChatMessagesDC(long senderOid, long empfängerOid, string message, bool isDeliverd, long teamid, string messageid)
{ {
return base.Channel.CreateNewChatMessagesDC(senderOid, empfängerOid, message, isDeliverd, teamid, messageid); return base.Channel.CreateNewChatMessagesDC(senderOid, empfängerOid, message, isDeliverd, teamid, messageid);

View File

@@ -4,6 +4,7 @@ using BS.Shared.DataContracts;
using BS.Shared.Extensions; using BS.Shared.Extensions;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
@@ -39,6 +40,8 @@ namespace BeWo.View.Controls
var right = info.DayOfWeek == DayOfWeek.Sunday || info.IsLastColumn; var right = info.DayOfWeek == DayOfWeek.Sunday || info.IsLastColumn;
var bottom = info.IsLastRow; var bottom = info.IsLastRow;
c.Path_Notice.Visibility = info.MarkierungBenoetigt ? Visibility.Visible : Visibility.Collapsed;
c.Border = new Thickness(0, 0, Convert.ToDouble(right), Convert.ToDouble(bottom)); c.Border = new Thickness(0, 0, Convert.ToDouble(right), Convert.ToDouble(bottom));
if (!info.IsInContractRange) if (!info.IsInContractRange)
@@ -79,20 +82,16 @@ namespace BeWo.View.Controls
if (dc != null) if (dc != null)
{ {
c.Text = $"{dc.Kurz}"; c.Text = $"{dc.Kurz}";
if (!info.Bemerkung.IsNullOrEmpty()) if (c.Path_Notice.Visibility == Visibility.Collapsed)
{
bemerkungVorhanden = true;
c.Path_Notice.Visibility = Visibility.Visible;
}
else
{ {
c.BorderThickness = new Thickness(0, 0, 0, 0); c.BorderThickness = new Thickness(0, 0, 0, 0);
c.BorderBrush = Brushes.Transparent; c.BorderBrush = Brushes.Transparent;
c.Path_Notice.Visibility = Visibility.Collapsed;
} }
} }
else else
{ {
if (info.MarkierungBenoetigt)
Debug.WriteLine("Funktioniert falsch");
c.Path_Notice.Visibility = Visibility.Collapsed; c.Path_Notice.Visibility = Visibility.Collapsed;
c.BorderThickness = new Thickness(0, 0, 0, 0); c.BorderThickness = new Thickness(0, 0, 0, 0);
c.BorderBrush = Brushes.Transparent; c.BorderBrush = Brushes.Transparent;
@@ -195,7 +194,7 @@ namespace BeWo.View.Controls
public string Bemerkung { get; set; } public string Bemerkung { get; set; }
public string[] Zeiten { get; set; } public string[] Zeiten { get; set; }
public bool IsFeiertag { get; set; } public bool IsFeiertag { get; set; }
public bool MarkierungBenoetigt { get; set; }
} }
public class StatusInformation public class StatusInformation

View File

@@ -1836,6 +1836,6 @@
<Popup Margin="10" x:Name="popup_personOrganisation" StaysOpen="False" Placement="MousePoint" Width="370" Height="250" Closed="popup_Closed" Opened="popup_Opened"> <Popup Margin="10" x:Name="popup_personOrganisation" StaysOpen="False" Placement="MousePoint" Width="370" Height="250" Closed="popup_Closed" Opened="popup_Opened">
<localSearchView:OrganisationSearchView x:Name="personOrganisationsearchview" /> <localSearchView:OrganisationSearchView x:Name="personOrganisationsearchview" />
</Popup> </Popup>
<Border x:Name="popup_content" /> <Border x:Name="popup_content" Margin="0,10,0,-10" />
</Grid> </Grid>
</localView:BeWoView> </localView:BeWoView>

View File

@@ -681,15 +681,17 @@ namespace BeWo.View.Detail
{ {
var gb = tabitem_diagnosis.Resources["gb_possible"] as GroupBox; var gb = tabitem_diagnosis.Resources["gb_possible"] as GroupBox;
var c = (gb.Content as Grid).FindFirstVisualChild<GridControl>(); var c = (gb.Content as Grid).FindFirstVisualChild<GridControl>();
var temp = c.ItemsSource;
c.Width = grid_choosenDiagnosis.ActualWidth; c.Width = grid_choosenDiagnosis.ActualWidth;
c.FilterString = string.Empty; c.FilterString = string.Empty;
c.View.FocusedRowHandle = DataControlBase.AutoFilterRowHandle; c.View.FocusedRowHandle = DataControlBase.AutoFilterRowHandle;
(c.View as TableView).FocusedColumn = c.Columns[1]; (c.View as TableView).FocusedColumn = c.Columns[1];
temp = c.ItemsSource;
// var t = c.View.GetCellElementByRowHandleAndColumn(GridControl.AutoFilterRowHandle, c.Columns[1]); // var t = c.View.GetCellElementByRowHandleAndColumn(GridControl.AutoFilterRowHandle, c.Columns[1]);
MainControl.ShowControlAsModalPopup(gb, HorizontalAlignment.Center, VerticalAlignment.Top); MainControl.ShowControlAsModalPopup(gb, HorizontalAlignment.Center, VerticalAlignment.Top);
temp = c.ItemsSource;
} }
private void button_addDisability_Click(object sender, RoutedEventArgs e) private void button_addDisability_Click(object sender, RoutedEventArgs e)

View File

@@ -25,18 +25,21 @@
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="*" MinHeight="100"/> <RowDefinition Height="*" MinHeight="100"/>
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Label Grid.Column="0" Grid.Row="0" Content="Start:" HorizontalAlignment="Left" VerticalAlignment="Center"/> <Label Grid.Column="0" Grid.Row="0" Content="Start:" HorizontalAlignment="Left" VerticalAlignment="Center"/>
<dxe:DateEdit x:Name="_DatePickerStartDate" Grid.Column="2" Grid.Row="0" Grid.ColumnSpan="2" MaskType="DateTimeAdvancingCaret" HorizontalAlignment="Stretch" Margin="3" AllowNullInput="False" /> <dxe:DateEdit x:Name="_DatePickerStartDate" Grid.Column="2" Grid.Row="0" Grid.ColumnSpan="2" MaskType="DateTimeAdvancingCaret" HorizontalAlignment="Stretch" Margin="3" AllowNullInput="False" EditValueChanged="_DatePickerStartDate_EditValueChanged"/>
<Label Grid.Column="0" Grid.Row="1" Content="Ende:" HorizontalAlignment="Left" VerticalAlignment="Center"/> <Label Grid.Column="0" Grid.Row="1" Content="Ende:" HorizontalAlignment="Left" VerticalAlignment="Center"/>
<dxe:DateEdit x:Name="_DatePickerEndDate" Grid.Column="2" Grid.Row="1" Grid.ColumnSpan="2" MaskType="DateTimeAdvancingCaret" HorizontalAlignment="Stretch" Margin="3" /> <dxe:DateEdit x:Name="_DatePickerEndDate" Grid.Column="2" Grid.Row="1" Grid.ColumnSpan="2" MaskType="DateTimeAdvancingCaret" HorizontalAlignment="Stretch" Margin="3" EditValueChanged="_DatePickerEndDate_EditValueChanged"/>
<Label Grid.Column="0" Grid.Row="2" Content="Kategorie:" HorizontalAlignment="Left" VerticalAlignment="Center"/> <Label Grid.Column="0" Grid.Row="2" Content="Halber Tag:" HorizontalAlignment="Left" VerticalAlignment="Center"/>
<dxe:ComboBoxEdit x:Name="_ReasonPicker" Grid.Column="2" Grid.Row="2" Grid.ColumnSpan="2" Margin="3" DisplayMember="Description"/> <CheckBox x:Name="_HalberTag" Grid.Column="2" Grid.Row="2" Margin="3 6 3 3" Checked="_HalberTag_Checked" Unchecked="_HalberTag_Unchecked"></CheckBox>
<Label Grid.Column="0" Grid.Row="3" Content="Bemerkung:" HorizontalAlignment="Left" VerticalAlignment="Center"/> <Label Grid.Column="0" Grid.Row="3" Content="Kategorie:" HorizontalAlignment="Left" VerticalAlignment="Center"/>
<TextBox x:Name="_NoticeTxt" Grid.Column="2" Grid.Row="3" Grid.ColumnSpan="2" Margin="3"/> <dxe:ComboBoxEdit x:Name="_ReasonPicker" Grid.Column="2" Grid.Row="3" Grid.ColumnSpan="2" Margin="3" DisplayMember="Description"/>
<Label Grid.Column="0" Grid.Row="4" Content="Bemerkung:" HorizontalAlignment="Left" VerticalAlignment="Center"/>
<TextBox x:Name="_NoticeTxt" Grid.Column="2" Grid.Row="4" Grid.ColumnSpan="2" Margin="3"/>
<Button x:Name="_DeleteBtn" Visibility="Collapsed" Grid.Column="0" Grid.Row="5" Content="Löschen" Margin="3" Click="DeleteBtn_Click" HorizontalAlignment="Left" /> <Button x:Name="_DeleteBtn" Visibility="Collapsed" Grid.Column="0" Grid.Row="5" Content="Löschen" Margin="3" Click="DeleteBtn_Click" HorizontalAlignment="Left" />
<Button x:Name="_SaveBtn" Grid.Column="2" Grid.Row="5" Content="Speichern" Margin="3, 3, 4, 3" HorizontalAlignment="Right" Click="SaveBtn_Click" MinWidth="80"/> <Button x:Name="_SaveBtn" Grid.Column="2" Grid.Row="5" Content="Speichern" Margin="3, 3, 4, 3" HorizontalAlignment="Right" Click="SaveBtn_Click" MinWidth="80"/>
<Button x:Name="_CancelBtn" Grid.Column="3" Grid.Row="5" Content="Abbrechen" Margin="3" Click="CancelBtn_Click"/> <Button x:Name="_CancelBtn" Grid.Column="3" Grid.Row="5" Content="Abbrechen" Margin="3" Click="CancelBtn_Click"/>

View File

@@ -44,6 +44,7 @@ namespace BeWo.View.Detail.Report
_DeleteBtn.Visibility = Visibility.Visible; _DeleteBtn.Visibility = Visibility.Visible;
AbsenceTime = (AbsenceTimeDC)appointment.CustomFields[nameof(AbsenceTimeDC)]; AbsenceTime = (AbsenceTimeDC)appointment.CustomFields[nameof(AbsenceTimeDC)];
_ReasonPicker.SelectedItem = AbsenceTime.Reason; _ReasonPicker.SelectedItem = AbsenceTime.Reason;
_NoticeTxt.Text = AbsenceTime.Notice; _NoticeTxt.Text = AbsenceTime.Notice;
@@ -57,8 +58,16 @@ namespace BeWo.View.Detail.Report
_ReasonPicker.SelectedItem = reasons[0]; _ReasonPicker.SelectedItem = reasons[0];
} }
_DatePickerStartDate.EditValue = AbsenceTime.Start.Value;
_DatePickerStartDate.DateTime = AbsenceTime.Start.Value; _DatePickerStartDate.DateTime = AbsenceTime.Start.Value;
if (AbsenceTime.End.HasValue) _DatePickerEndDate.DateTime = AbsenceTime.End.Value; if (AbsenceTime.End.HasValue)
{
_DatePickerEndDate.EditValue = AbsenceTime.End.Value;
_DatePickerEndDate.DateTime = AbsenceTime.End.Value;
if (_DatePickerStartDate.DateTime.Date == _DatePickerEndDate.DateTime.Date && _DatePickerStartDate.DateTime.TimeOfDay != _DatePickerEndDate.DateTime.TimeOfDay)
_HalberTag.IsChecked = true;
}
} }
private void CancelBtn_Click(object sender, RoutedEventArgs e) private void CancelBtn_Click(object sender, RoutedEventArgs e)
@@ -130,5 +139,35 @@ namespace BeWo.View.Detail.Report
Parent.UpdateUrlaubkonto(AbsenceTime.EmployeeOid.Value); Parent.UpdateUrlaubkonto(AbsenceTime.EmployeeOid.Value);
Parent.UpdateScheduler(); Parent.UpdateScheduler();
} }
private void _DatePickerStartDate_EditValueChanged(object sender, DevExpress.Xpf.Editors.EditValueChangedEventArgs e)
{
_HalberTag.Visibility = _DatePickerStartDate.DateTime.Date == _DatePickerEndDate.DateTime.Date ? Visibility.Visible : Visibility.Collapsed;
if (_HalberTag.Visibility == Visibility.Collapsed)
_HalberTag.IsChecked = false;
}
private void _DatePickerEndDate_EditValueChanged(object sender, DevExpress.Xpf.Editors.EditValueChangedEventArgs e)
{
_HalberTag.Visibility = _DatePickerStartDate.DateTime.Date == _DatePickerEndDate.DateTime.Date ? Visibility.Visible : Visibility.Collapsed;
if (_HalberTag.Visibility == Visibility.Collapsed)
_HalberTag.IsChecked = false;
}
private void _HalberTag_Checked(object sender, RoutedEventArgs e)
{
_DatePickerStartDate.DateTime = new DateTime(_DatePickerStartDate.DateTime.Year, _DatePickerStartDate.DateTime.Month, _DatePickerStartDate.DateTime.Day,
12, 0, 0);
_DatePickerEndDate.DateTime = new DateTime(_DatePickerEndDate.DateTime.Year, _DatePickerEndDate.DateTime.Month, _DatePickerEndDate.DateTime.Day,
16, 30, 0);
}
private void _HalberTag_Unchecked(object sender, RoutedEventArgs e)
{
_DatePickerStartDate.DateTime = new DateTime(_DatePickerStartDate.DateTime.Year, _DatePickerStartDate.DateTime.Month, _DatePickerStartDate.DateTime.Day,
0, 0, 0);
_DatePickerEndDate.DateTime = new DateTime(_DatePickerEndDate.DateTime.Year, _DatePickerEndDate.DateTime.Month, _DatePickerEndDate.DateTime.Day,
0, 0, 0);
}
} }
} }

View File

@@ -61,9 +61,9 @@ namespace BeWo.View.Detail.Report
krankheitstage.Add(tag); krankheitstage.Add(tag);
} }
c._EmployeeUrlaubDieserMonat.Text = "Urlaub/Monat: " + dc.TageUrlaub+ " Tage"; c._EmployeeUrlaubDieserMonat.Text = "Urlaub/Monat: " + string.Format("{0:0.00}", dc.TageUrlaub) + " Tage";
c._EmployeeKrankheitDieserMonat.Text = "Krankheit/Monat: " + dc.TageKrankheit + " Tage"; c._EmployeeKrankheitDieserMonat.Text = "Krankheit/Monat: " + string.Format("{0:0.00}", dc.TageKrankheit) + " Tage";
((AbwesenheitsEmployeeHeaderTooltip)c.ToolTip).Set(dc.Employee, Convert.ToInt32(dc.TageUrlaub), Convert.ToInt32(dc.TageKrankheit), dc.Month); ((AbwesenheitsEmployeeHeaderTooltip)c.ToolTip).Set(dc.Employee, dc.TageUrlaub, dc.TageKrankheit, dc.Month);
} }
} }

View File

@@ -24,7 +24,7 @@ namespace BeWo.View.Detail.Report
InitializeComponent(); InitializeComponent();
} }
public void Set(EmployeeDC emp, int tageUrlaub, int tageKrankheit, int month) public void Set(EmployeeDC emp, decimal tageUrlaub, decimal tageKrankheit, int month)
{ {
var konto = emp.Urlaubskonto; var konto = emp.Urlaubskonto;

View File

@@ -311,6 +311,8 @@ namespace BeWo.View.Detail.Report
var appointment = _SchedulerStorage.CreateAppointment(AppointmentType.Normal); var appointment = _SchedulerStorage.CreateAppointment(AppointmentType.Normal);
SchedulerHelper.OverrideAppointmentWithAbsenceTime(appointment, absence); //Auskommentieren entfernt Einträge aus Planer SchedulerHelper.OverrideAppointmentWithAbsenceTime(appointment, absence); //Auskommentieren entfernt Einträge aus Planer
appointment.Start = absence.Start.Value;
appointment.End = absence.End.Value.Date == absence.Start.Value.Date ? absence.End.Value : absence.End.Value.AddDays(1);
_AppointmentStorage.Add(appointment); _AppointmentStorage.Add(appointment);
} }
@@ -411,8 +413,14 @@ namespace BeWo.View.Detail.Report
if (spanne.End == null) if (spanne.End == null)
spanne.End = new DateTime(info.Year, info.Month, DateTime.DaysInMonth(info.Year, info.Month)); spanne.End = new DateTime(info.Year, info.Month, DateTime.DaysInMonth(info.Year, info.Month));
// Nur ein Tag // Nur ein Tag
if (spanne.Start == spanne.End) if (spanne.Start.Value.Date == spanne.End.Value.Date)
tageUrlaub++; {
if (spanne.Start.Value.TimeOfDay != spanne.End.Value.TimeOfDay)
tageUrlaub += 0.5m;
else
tageUrlaub++;
}
// Mehrere Tage // Mehrere Tage
else else
{ {

View File

@@ -88,6 +88,7 @@
<Button x:Name="_BtnAnzeigen" Grid.Column="5" Content="Anzeigen" MinWidth="100" Margin="10,3,3,3" Click="BtnAnzeigen_Click"/> <Button x:Name="_BtnAnzeigen" Grid.Column="5" Content="Anzeigen" MinWidth="100" Margin="10,3,3,3" Click="BtnAnzeigen_Click"/>
<WrapPanel Grid.Column="7" HorizontalAlignment="Right" Margin="10,3,3,3"> <WrapPanel Grid.Column="7" HorizontalAlignment="Right" Margin="10,3,3,3">
<Button x:Name="button_mehrereDienste" Content="Mehrere Dienste anlegen" Margin=" 0 0 5 0" Click="button_mehrereDienste_Click" Visibility="Collapsed"/>
<Button x:Name="button_neuerMitarbeiter" Content="Neuen Mitarbeiter einfügen" Margin=" 0 0 5 0" Click="button_neuerMitarbeiter_Click" Visibility="Collapsed"/> <Button x:Name="button_neuerMitarbeiter" Content="Neuen Mitarbeiter einfügen" Margin=" 0 0 5 0" Click="button_neuerMitarbeiter_Click" Visibility="Collapsed"/>
<Button x:Name="_BtnRemoveAllDiensteForMonth" Content="Alle Schichten entfernen" Click="_BtnRemoveAllDiensteForMonth_Click" Visibility="Collapsed"/> <Button x:Name="_BtnRemoveAllDiensteForMonth" Content="Alle Schichten entfernen" Click="_BtnRemoveAllDiensteForMonth_Click" Visibility="Collapsed"/>
</WrapPanel> </WrapPanel>
@@ -112,6 +113,58 @@
</GroupBox> </GroupBox>
</Border> </Border>
</controls:PopupNonTopmost> </controls:PopupNonTopmost>
<controls:PopupNonTopmost Topmost="False" x:Name="popUp_mehrereDienste" Width="350" StaysOpen="False" Placement="MousePoint">
<Border Background="White" Padding="3" BorderThickness="1" BorderBrush="Gray">
<GroupBox x:Name="groupbox_popUp_mehereDienste" Header="Mehrere Dienste hinzufügen" Style="{StaticResource ObjectEditGroupBox}">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="70" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="auto" />
</Grid.ColumnDefinitions>
<Label Grid.Column="0" Grid.Row="0" Margin="0 5 0 0" Content="Mitarbeiter" />
<ComboBox x:Name="combobox_mehrereDienste_mitarbeiter" Grid.Column="1" Grid.Row="0" Grid.ColumnSpan="2" Margin="0 5 0 0" />
<ListBox x:Name="mehrereDienste_listbox_dienste" Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="3" MaxHeight="250" Margin="5 10 0 10"
SelectionChanged="mehrereDienste_listbox_dienste_SelectionChanged">
<ListBox.ItemTemplate>
<DataTemplate>
<Grid Tag="{Binding}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<controls:DPCtrlIcon IsHitTestVisible="False" Margin="3" Width="25" Height="25" Cursor="Hand" DienstValue="{Binding}" />
<TextBlock Margin="3 3 6 3" Cursor="Hand" Grid.Column="1" VerticalAlignment="Center" Text="{Binding DarstellungInPopUp}" />
</Grid>
</DataTemplate>
</ListBox.ItemTemplate>
</ListBox>
<WrapPanel FlowDirection="LeftToRight" Grid.Column="0" Grid.Row="2" Grid.ColumnSpan="3">
<Label Content="Startzeit:"/>
<dxe:TextEdit x:Name="mehrereDienste_textbox_startzeit" Width="75" Margin="10 0 10 0" MaskType="RegEx" Mask="(0?\d|1\d|2[0-3]):[0-5]\d"/>
<Label Content="Endzeit:" />
<dxe:TextEdit x:Name="mehrereDienste_textbox_endzeit" Width="75" Margin="10 0 0 0" MaskType="RegEx" Mask="(0?\d|1\d|2[0-3]):[0-5]\d"/>
</WrapPanel>
<Calendar x:Name="_CalenderControl" Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="3" SelectionMode="MultipleRange"
HorizontalAlignment="Left" Margin="5 10 0 10" IsTodayHighlighted="False" />
<Button x:Name="mehrereDienste_button_speichern" Content="Dienste erstellen" Grid.Column="2" Grid.Row="4" Click="mehrereDienste_button_speichern_Click"/>
</Grid>
</GroupBox>
</Border>
</controls:PopupNonTopmost>

View File

@@ -481,15 +481,13 @@ namespace BeWo.View.Detail.Report
if (_WohnheimPicker.SelectedItem == null) if (_WohnheimPicker.SelectedItem == null)
return; return;
AuswahlMonat = new DateTime((int)_YearPicker.SelectedItem, _MonthPicker.SelectedMonth, 1); AuswahlMonat = new DateTime((int)_YearPicker.SelectedItem, _MonthPicker.SelectedMonth, 1);
//_Feiertage = ServiceFacade.DoOperationsServiceSync(s => s.GetDefaultFeiertageForYear(_AuswahlMonat.Year));
//_DienstplanerRootObj.Feiertage = ServiceFacade.DoOperationsServiceSync(s => s.GetDefaultFeiertageForYear(_AuswahlMonat.Year)); //Root
AuswahlWohnheim = _WohnheimPicker.SelectedItem as CompactWohnheimDC; AuswahlWohnheim = _WohnheimPicker.SelectedItem as CompactWohnheimDC;
//FillDienstLists(); //FillDienstLists();
InitGridControl(true); InitGridControl(true);
button_mehrereDienste.Visibility = Visibility.Visible;
button_neuerMitarbeiter.Visibility = Visibility.Visible; button_neuerMitarbeiter.Visibility = Visibility.Visible;
_BtnRemoveAllDiensteForMonth.Visibility = Visibility.Visible; _BtnRemoveAllDiensteForMonth.Visibility = Visibility.Visible;
textblock_link_pdfexport.Visibility = Visibility.Visible; textblock_link_pdfexport.Visibility = Visibility.Visible;
@@ -503,18 +501,11 @@ namespace BeWo.View.Detail.Report
combobox_mitarbeiter.ItemsSource = mitarbeiterMitVertrag.OrderBy(m => m.LastName); combobox_mitarbeiter.ItemsSource = mitarbeiterMitVertrag.OrderBy(m => m.LastName);
} }
private List<EmployeeDC> GetEmployeeForCombobox() private List<EmployeeDC> GetEmployeeForCombobox()
{ {
List<EmployeeDC> mitarbeiterMitVertrag = new List<EmployeeDC>(); List<EmployeeDC> mitarbeiterMitVertrag = new List<EmployeeDC>();
//foreach (var emp in alleMitarbeiter) if (_AlleMitarbeiter == null || _AlleMitarbeiter.Count == 0)
//{
// if (CheckForContracts(emp))
// mitarbeiterMitVertrag.Add(emp);
//}
if(_AlleMitarbeiter == null || _AlleMitarbeiter.Count == 0)
_AlleMitarbeiter = ServiceFacade.DoEmployeeServiceSync(s => s.GetAllActiveEmployees()); _AlleMitarbeiter = ServiceFacade.DoEmployeeServiceSync(s => s.GetAllActiveEmployees());
foreach (var emp in _AlleMitarbeiter) foreach (var emp in _AlleMitarbeiter)
{ {
@@ -549,7 +540,6 @@ namespace BeWo.View.Detail.Report
return contracts.Any() ? true : false; return contracts.Any() ? true : false;
} }
private void button_add_employee_Click(object sender, RoutedEventArgs e) private void button_add_employee_Click(object sender, RoutedEventArgs e)
{ {
if (combobox_mitarbeiter.SelectedItem == null) if (combobox_mitarbeiter.SelectedItem == null)
@@ -571,6 +561,176 @@ namespace BeWo.View.Detail.Report
popUp_neuerMitarbeiterFuerWohnheim.IsOpen = false; popUp_neuerMitarbeiterFuerWohnheim.IsOpen = false;
} }
private void button_mehrereDienste_Click(object sender, RoutedEventArgs e)
{
popUp_mehrereDienste.IsOpen = true;
// Mitarbeiterliste setzen
List<EmployeeDC> emps = new List<EmployeeDC>();
foreach (var zeile in _DienstplanerRootObj.DienstZeilenListe)
if (zeile.Employee != null && !emps.Contains(zeile.Employee))
emps.Add(zeile.Employee);
combobox_mehrereDienste_mitarbeiter.ItemsSource = emps;
// Dienstliste setzen
//var t = _DienstplanerRootObj.AlleDienste;
//if (t[0].Oid == -1)
// t.RemoveAt(0);
mehrereDienste_listbox_dienste.ItemsSource = _DienstplanerRootObj.AlleDienste;
// Feiertage und andere Monate im Kalender disablen
foreach (var tag in _DienstplanerRootObj.Feiertage)
_CalenderControl.BlackoutDates.Add(new CalendarDateRange(tag.Datum));
_CalenderControl.SelectedDate = new DateTime((int)_YearPicker.SelectedItem, _AuswahlMonat.Month, 1);
_CalenderControl.DisplayDateStart = new DateTime((int)_YearPicker.SelectedItem, _AuswahlMonat.Month, 1);
_CalenderControl.DisplayDateEnd = new DateTime((int)_YearPicker.SelectedItem, _AuswahlMonat.Month, DateTime.DaysInMonth((int)_YearPicker.SelectedItem, _AuswahlMonat.Month));
}
private void mehrereDienste_listbox_dienste_SelectionChanged(object sender, SelectionChangedEventArgs e)
{
var selectedDienst = mehrereDienste_listbox_dienste.SelectedItem as DienstInfoDC;
var startzeit = selectedDienst.Start.TimeOfDay.ToString().Split(':');
var endzeit = selectedDienst.Ende.TimeOfDay.ToString().Split(':');
mehrereDienste_textbox_startzeit.Text = startzeit[0] + ":" + startzeit[1];
mehrereDienste_textbox_endzeit.Text = endzeit[0] + ":" + endzeit[1];
}
private void mehrereDienste_button_speichern_Click(object sender, RoutedEventArgs e)
{
var dienst = mehrereDienste_listbox_dienste.SelectedItem as DienstInfoDC;
string[] startString = mehrereDienste_textbox_startzeit.Text.Split(':');
string[] endeString = mehrereDienste_textbox_endzeit.Text.Split(':'); ;
var mitarbeiter = combobox_mehrereDienste_mitarbeiter.SelectedItem as EmployeeDC;
var auswahlKalender = _CalenderControl.SelectedDates;
foreach (var datum in auswahlKalender)
{
var start = new DateTime(2000, 1, 1, Convert.ToInt32(startString[0]), Convert.ToInt32(startString[1]), 0);
var ende = new DateTime(2000, 1, 1, Convert.ToInt32(endeString[0]), Convert.ToInt32(endeString[1]), 0);
double dauerInStunden = start < ende ? (ende - start).TotalHours : (ende.AddDays(1) - start).TotalHours;
InsertEintragOderVertretung(mehrereDienste_textbox_startzeit.Text, mehrereDienste_textbox_endzeit.Text, dauerInStunden, mitarbeiter,
datum, dienst, 0, null);
}
}
private void InsertEintragOderVertretung(string start, string ende, double dauerInStunden, EmployeeDC mitarbeiter, DateTime datum, DienstInfoDC dienst, int zeile, string notice)
{
_AuswahlDienstZeileDC = _DienstplanerRootObj.DienstZeilenListe.First(z => z.Employee == mitarbeiter && z.Zeile == zeile);
if (_AuswahlWohnheim.EmployeeOids.Contains(mitarbeiter.EmployeeOid.Value))
{
decimal stundenFuerSaldo = 0.0m;
var eintrag = GetDienstEintrag(mitarbeiter.EmployeeOid.Value, _AuswahlWohnheim.WohnheimOid, 0, datum);
if (eintrag != null)
{
stundenFuerSaldo += Convert.ToDecimal(eintrag.DauerInStunden);
var oldDienst = TryGetDienst(_AuswahlDienstZeileDC, datum.Day); //abc
ServiceFacade.DoOperationsServiceSync(x => x.DeleteDienstEintrag(mitarbeiter.EmployeeOid.Value, AuswahlWohnheim.WohnheimOid, zeile, datum));
if (datum.Month == _AuswahlMonat.Month)
{
_AuswahlDienstZeileDC.RemoveDienst(datum.Day);
DeleteFromList(eintrag, null);
}
}
if (dienst.Oid == -1)
{
textbox_bemerkung.Text = "";
popUp_RightClick.IsOpen = false;
RefreshStatusForDay(datum.Day);
return;
}
var newEintrag = new DienstEintragDC
{
Datum = datum,
DienstOid = (long)dienst.Oid,
EmployeeOid = (long)mitarbeiter.EmployeeOid,
Oid = null,
WohnheimOid = AuswahlWohnheim.WohnheimOid,
Zeile = zeile,
Notice = notice,
Startzeit = start,
Endzeit = ende,
DauerInStunden = dauerInStunden
};
ServiceFacade.DoOperationsServiceSync(x => x.InsertNewDienstEintrag(newEintrag));
if (datum.Month == _AuswahlMonat.Month)
{
_DienstplanerRootObj.AlleDienstEintraege.Add(newEintrag);
foreach (var item in _DienstplanerRootObj.MonatsZusammenfassung)
{
if (item.Employee.EmployeeOid == mitarbeiter.EmployeeOid)
{
item.Ist += Convert.ToDecimal(newEintrag.DauerInStunden);
item.Saldo += (stundenFuerSaldo == 0.0m) ? Convert.ToDecimal(newEintrag.DauerInStunden) : Convert.ToDecimal(newEintrag.DauerInStunden) - stundenFuerSaldo;
}
}
}
}
else
{
var vertretung = GetDienstvertretung(mitarbeiter.EmployeeOid.Value, _AuswahlWohnheim.WohnheimOid, zeile, datum);
decimal stundenFuerSaldo = 0.0m;
if (vertretung != null)
{
stundenFuerSaldo += Convert.ToDecimal(vertretung.DauerInStunden);
var oldDienst = TryGetDienst(_AuswahlDienstZeileDC, datum.Day); //abc
ServiceFacade.DoOperationsServiceSync(x => x.DeleteDienstvertretung(mitarbeiter.EmployeeOid.Value, AuswahlWohnheim.WohnheimOid, zeile, datum));
if (datum.Month == _AuswahlMonat.Month)
{
_AuswahlDienstZeileDC.RemoveDienst(datum.Day);
DeleteFromList(null, vertretung);
}
}
if (dienst.Oid == -1)
{
textbox_bemerkung.Text = "";
popUp_RightClick.IsOpen = false;
RefreshStatusForDay(datum.Day);
return;
}
var newVertretung = new DienstvertretungDC
{
Datum = datum,
DienstOid = (long)dienst.Oid,
EmployeeOid = mitarbeiter.EmployeeOid.Value,
Oid = null,
WohnheimOid = AuswahlWohnheim.WohnheimOid,
Zeile = zeile,
Notice = notice,
Startzeit = start,
Endzeit = ende,
DauerInStunden = dauerInStunden
};
ServiceFacade.DoOperationsServiceSync(x => x.InsertNewDienstvertretung(newVertretung));
if (datum.Month == _AuswahlMonat.Month)
{
_DienstplanerRootObj.AlleDienstvertretungen.Add(newVertretung);
foreach (var item in _DienstplanerRootObj.MonatsZusammenfassung)
{
if (item.Employee.EmployeeOid == mitarbeiter.EmployeeOid)
{
item.Ist += Convert.ToDecimal(newVertretung.DauerInStunden);
item.Saldo += (stundenFuerSaldo == 0.0m) ? Convert.ToDecimal(newVertretung.DauerInStunden) : Convert.ToDecimal(newVertretung.DauerInStunden) - stundenFuerSaldo;
}
}
}
}
if (datum.Month == _AuswahlMonat.Month)
_AuswahlDienstZeileDC.AddDienst(datum.Day, dienst);
RefreshStatusForDay(datum.Day);
RefreshGrid();
}
public void DienstplanerControl_MouseDown(object sender, MouseEventArgs e) public void DienstplanerControl_MouseDown(object sender, MouseEventArgs e)
{ {
@@ -631,17 +791,20 @@ namespace BeWo.View.Detail.Report
// if (tag.Datum.Date == date) // if (tag.Datum.Date == date)
// return; // return;
//} //}
//Dienste an Abwesenheitstagen setzen können deaktivieren
var date = new DateTime(_AuswahlMonat.Year, _AuswahlMonat.Month, _AuswahlTag); //Dienste an Abwesenheitstagen setzen können deaktivieren
foreach (var at in _DienstplanerRootObj.AbsenceTimes) //var date = new DateTime(_AuswahlMonat.Year, _AuswahlMonat.Month, _AuswahlTag);
{ //foreach (var at in _DienstplanerRootObj.AbsenceTimes)
if (at.EmployeeOid == _AuswahlDienstZeileDC.Employee.EmployeeOid && at.AbsenceSpan.ContainsDate(date)) //{
return; // if (at.EmployeeOid == _AuswahlDienstZeileDC.Employee.EmployeeOid && at.AbsenceSpan.ContainsDate(date))
} // return;
//}
popUp_RightClick.IsOpen = true; popUp_RightClick.IsOpen = true;
if (!_DienstplanerRootObj.AlleDienste.Contains(DienstInfoDC.Platzhalter))
_DienstplanerRootObj.AlleDienste.Insert(0, DienstInfoDC.Platzhalter);
combobox_dienste.ItemsSource = _DienstplanerRootObj.AlleDienste; combobox_dienste.ItemsSource = _DienstplanerRootObj.AlleDienste;
if (_AuswahlWohnheim.EmployeeOids.Contains(_AuswahlDienstZeileDC.Employee.EmployeeOid.Value)) if (_AuswahlWohnheim.EmployeeOids.Contains(_AuswahlDienstZeileDC.Employee.EmployeeOid.Value))
@@ -963,12 +1126,14 @@ namespace BeWo.View.Detail.Report
string[] zeiten = new string[2]; string[] zeiten = new string[2];
string bemerkung = ""; string bemerkung = "";
bool feldMarkieren = false;
if (_AuswahlWohnheim.EmployeeOids.Contains(selZeile.Employee.EmployeeOid.Value)) if (_AuswahlWohnheim.EmployeeOids.Contains(selZeile.Employee.EmployeeOid.Value))
{ {
foreach (var eintrag in _DienstplanerRootObj.AlleDienstEintraege) foreach (var eintrag in _DienstplanerRootObj.AlleDienstEintraege)
{ {
if (eintrag.Datum == date && eintrag.Zeile == selZeile.Zeile && eintrag.EmployeeOid == selZeile.Employee.EmployeeOid) if (eintrag.Datum == date && eintrag.Zeile == selZeile.Zeile && eintrag.EmployeeOid == selZeile.Employee.EmployeeOid)
{ {
feldMarkieren = BenoetigeMarkierung(eintrag, null);
bemerkung = eintrag.Notice; bemerkung = eintrag.Notice;
zeiten[0] = eintrag.Startzeit; zeiten[0] = eintrag.Startzeit;
zeiten[1] = eintrag.Endzeit; zeiten[1] = eintrag.Endzeit;
@@ -982,6 +1147,7 @@ namespace BeWo.View.Detail.Report
{ {
if (vertretung.Datum == date && vertretung.Zeile == selZeile.Zeile && vertretung.EmployeeOid == selZeile.Employee.EmployeeOid) if (vertretung.Datum == date && vertretung.Zeile == selZeile.Zeile && vertretung.EmployeeOid == selZeile.Employee.EmployeeOid)
{ {
feldMarkieren = BenoetigeMarkierung(null, vertretung);
bemerkung = vertretung.Notice; bemerkung = vertretung.Notice;
zeiten[0] = vertretung.Startzeit; zeiten[0] = vertretung.Startzeit;
zeiten[1] = vertretung.Endzeit; zeiten[1] = vertretung.Endzeit;
@@ -990,6 +1156,8 @@ namespace BeWo.View.Detail.Report
} }
} }
feldMarkieren = bemerkung.IsNullOrEmpty() && !feldMarkieren ? false : true;
e.Value = new DPCtrlDayInformation e.Value = new DPCtrlDayInformation
{ {
DienstInfoDC = TryGetDienst(selZeile, pos), //abc DienstInfoDC = TryGetDienst(selZeile, pos), //abc
@@ -1001,7 +1169,8 @@ namespace BeWo.View.Detail.Report
StatusInformation = null, StatusInformation = null,
Bemerkung = bemerkung, Bemerkung = bemerkung,
Zeiten = zeiten, Zeiten = zeiten,
IsFeiertag = isFeiertag IsFeiertag = isFeiertag,
MarkierungBenoetigt = feldMarkieren
}; };
} }
else else
@@ -1259,6 +1428,28 @@ namespace BeWo.View.Detail.Report
} }
} }
} }
private bool BenoetigeMarkierung(DienstEintragDC eintrag, DienstvertretungDC vertretung)
{
bool markierungBenoetigt = false;
if (eintrag != null)
{
var origDienst = _DienstplanerRootObj.AlleDienste.First(d => d.Oid == eintrag.DienstOid);
var origStart = origDienst.Start.ToString().Split(' ');
var origEnde = origDienst.Ende.ToString().Split(' ');
if (origStart[1] != eintrag.Startzeit + ":00" || origEnde[1] != eintrag.Endzeit + ":00")
markierungBenoetigt = true;
}
else if (vertretung != null)
{
var origDienst = _DienstplanerRootObj.AlleDienste.First(d => d.Oid == vertretung.DienstOid);
var origStart = origDienst.Start.ToString().Split(' ');
var origEnde = origDienst.Ende.ToString().Split(' ');
if (origStart[1] != vertretung.Startzeit + ":00" || origEnde[1] != vertretung.Endzeit + ":00")
markierungBenoetigt = true;
}
return markierungBenoetigt;
}
private bool CheckForDoppelbelegung(DateTime date) private bool CheckForDoppelbelegung(DateTime date)
{ {
bool doppelbelegung = false; bool doppelbelegung = false;
@@ -1322,12 +1513,23 @@ namespace BeWo.View.Detail.Report
private void LinkPdfExport_OnRequestNavigate(object sender, RequestNavigateEventArgs e) private void LinkPdfExport_OnRequestNavigate(object sender, RequestNavigateEventArgs e)
{ {
UpdateReportUrl(_AuswahlWohnheim.WohnheimOid, _AuswahlMonat); var result = System.Windows.MessageBox.Show("Soll-Plan statt Ist-Plan drucken?", "Druckversion auswählen", MessageBoxButton.YesNoCancel, MessageBoxImage.Question);
BeWoUtils.NavigateToReportUri((sender as System.Windows.Documents.Hyperlink).NavigateUri.ToString(), Translator.Translate("Dienstplan")); if (result == MessageBoxResult.Yes)
{
UpdateReportUrl(_AuswahlWohnheim.WohnheimOid, _AuswahlMonat, "soll");
BeWoUtils.NavigateToReportUri((sender as System.Windows.Documents.Hyperlink).NavigateUri.ToString(), Translator.Translate("Dienstplan (Soll-Version)"));
}
else if (result == MessageBoxResult.No)
{
UpdateReportUrl(_AuswahlWohnheim.WohnheimOid, _AuswahlMonat, "ist");
BeWoUtils.NavigateToReportUri((sender as System.Windows.Documents.Hyperlink).NavigateUri.ToString(), Translator.Translate("Dienstplan (Ist-Version)"));
}
} }
private void RefreshDienste() private void RefreshDienste()
{ {
//_DienstplanerRootObj.DienstZeilenListe = new List<DienstZeileDC>(); //ABC123 TESTEN
_DienstplanerRootObj.DienstZeilenListe.AddRange(_DienstplanerRootObj.DienstDCListe _DienstplanerRootObj.DienstZeilenListe.AddRange(_DienstplanerRootObj.DienstDCListe
.SelectMany(x => Init(x, _DienstplanerRootObj.AlleDienste, RefreshGrid, AuswahlMonat)) .SelectMany(x => Init(x, _DienstplanerRootObj.AlleDienste, RefreshGrid, AuswahlMonat))
.ToList()); .ToList());
@@ -1345,27 +1547,29 @@ namespace BeWo.View.Detail.Report
_AbsenceTimesDict = temp; _AbsenceTimesDict = temp;
} }
private void UpdateReportUrl(long wOid, DateTime date) private void UpdateReportUrl(long wOid, DateTime date, string sollOderIst)
{ {
var version = sollOderIst == "soll" ? Utils.EnumName(ReportTypes.RosterReport) : Utils.EnumName(ReportTypes.RosterReportIst);
var url = BeWoApp.SiteOfOrigin var url = BeWoApp.SiteOfOrigin
+ "/ReportView.aspx" + "/ReportView.aspx"
+ "?type=" + Utils.EnumName(ReportTypes.RosterReport) + "?type=" + version
+ "&wid=" + wOid + "&wid=" + wOid
+ "&dt=" + date.ToString("dd.MM.yyyy"); + "&dt=" + date.ToString("dd.MM.yyyy");
if (sollOderIst == "soll")
List<int> tage = new List<int>();
foreach (var feiertag in _DienstplanerRootObj.Feiertage)
{ {
if (feiertag.Datum.Month == date.Month) List<int> tage = new List<int>();
tage.Add(feiertag.Datum.Day);
}
if (tage.Count > 0)
{
url += "&ft=";
url += string.Join(";", tage);
foreach (var feiertag in _DienstplanerRootObj.Feiertage)
{
if (feiertag.Datum.Month == date.Month)
tage.Add(feiertag.Datum.Day);
}
if (tage.Count > 0)
{
url += "&ft=";
url += string.Join(";", tage);
}
} }
linkPdfExport.NavigateUri = new Uri(url); linkPdfExport.NavigateUri = new Uri(url);
@@ -1625,17 +1829,6 @@ namespace BeWo.View.Detail.Report
item.DienstDictArray[eintrag.Zeile].Add(i, eintrag.DienstOid); item.DienstDictArray[eintrag.Zeile].Add(i, eintrag.DienstOid);
} }
} }
//for (int z = 0; z < _DienstplanerRootObj.DienstZeilenListe.Count; z++)
//{
// var zeile = _DienstplanerRootObj.DienstZeilenListe[z];
// if (zeile == _AuswahlDienstZeileDC)
// {
// _GridControl.ItemsSource = null;
// _DienstplanerRootObj.DienstZeilenListe[z] = _AuswahlDienstZeileDC;
// _GridControl.ItemsSource = _DienstplanerRootObj.DienstZeilenListe;
// break;
// }
//}
} }
else else
{ {
@@ -1793,6 +1986,12 @@ namespace BeWo.View.Detail.Report
return res; return res;
} }
#endregion #endregion
/// <summary> /// <summary>

View File

@@ -1114,8 +1114,8 @@ namespace BeWo.Data.Access
{ {
var criteria = CreateCriteriaIsActive<AbsenceTime>() var criteria = CreateCriteriaIsActive<AbsenceTime>()
.Add(Restrictions.Eq("EmployeeOid", empOid)) .Add(Restrictions.Eq("EmployeeOid", empOid))
.Add(Restrictions.Gt("Start", startDate)) .Add(Restrictions.Gt(AbsenceTime.PropertyName_Start, startDate))
.Add(Restrictions.Lt("EndTime", endDate)); .Add(Restrictions.Lt(AbsenceTime.PropertyName_End, endDate));
return criteria.List<AbsenceTime>().ToList(); return criteria.List<AbsenceTime>().ToList();
} }

View File

@@ -156,6 +156,9 @@ namespace Host
case ReportTypes.RosterReport: case ReportTypes.RosterReport:
report = CreateRosterReport(); report = CreateRosterReport();
break; break;
case ReportTypes.RosterReportIst:
report = CreateRosterReportIst();
break;
case ReportTypes.VorlagenReport: case ReportTypes.VorlagenReport:
report = CreateVorlagenReport(); report = CreateVorlagenReport();
break; break;
@@ -727,6 +730,15 @@ namespace Host
feiertage = Request.Params["ft"].Split(';').Select(int.Parse).ToList(); feiertage = Request.Params["ft"].Split(';').Select(int.Parse).ToList();
return reportCreator.CreateRosterReport(wOid, dt, feiertage); return reportCreator.CreateRosterReport(wOid, dt, feiertage);
} }
private XtraReport CreateRosterReportIst()
{
DateTime dt = DateTime.ParseExact(Request.Params["dt"], "dd.MM.yyyy", CultureInfo.InvariantCulture);
long wOid = int.Parse(Request.Params["wid"]);
List<int> feiertage = new List<int>();
return reportCreator.CreateRosterReportIst(wOid, dt);
}
private XtraReport CreateVorlagenReport() private XtraReport CreateVorlagenReport()
{ {

View File

@@ -82,6 +82,7 @@ namespace BeWo.Report
public abstract XtraReport CreateAbsenceReport(DateTime dt, List<long> abs, List<long> empTypes, List<long> teams, List<int> feiertage); public abstract XtraReport CreateAbsenceReport(DateTime dt, List<long> abs, List<long> empTypes, List<long> teams, List<int> feiertage);
public abstract XtraReport CreateRosterReport(long wOid, DateTime dt, List<int> feiertage); public abstract XtraReport CreateRosterReport(long wOid, DateTime dt, List<int> feiertage);
public abstract XtraReport CreateRosterReportIst(long wOid, DateTime dt);
public abstract XtraReport CreateKilometerauswertung(long customerOid, DateTime rangeDate); public abstract XtraReport CreateKilometerauswertung(long customerOid, DateTime rangeDate);

View File

@@ -1025,6 +1025,40 @@ namespace BeWo.Report
return report as XtraReport; return report as XtraReport;
} }
public override XtraReport CreateRosterReportIst(long wOid, DateTime dt)
{
var opertionsService = new OperationsServiceImp();
var customerService = new CustomerServiceImp();
var employeeService = new EmployeeServiceImp();
var report = FindReportImp<RosterIstRO>();
var dienstEintraege = opertionsService.GetAllDienstEintraegeAsList(wOid, dt.Year, dt.Month);
var vertretungen = opertionsService.GetAllDienstvertretungenAsList(wOid, dt.Year, dt.Month);
List<long> employeeOids = new List<long>();
foreach (var eintrag in dienstEintraege)
{
if (!employeeOids.Contains(eintrag.EmployeeOid))
employeeOids.Add(eintrag.EmployeeOid);
}
foreach (var vertretung in vertretungen)
{
if (!employeeOids.Contains(vertretung.EmployeeOid))
employeeOids.Add(vertretung.EmployeeOid);
}
var employee = MapperFactory.EmployeeDC_Employee.MapToNewDCs(DAOFactory.GenericDAO.GetActiveByIDs<Employee>(employeeOids));
List<AbsenceTimeDC> absences = employeeService.GetMultipleEmployeeAbsenceTimesForMonth(dt.Year, dt.Month, employeeOids);
List<FeiertagDC> feiertageDCs = opertionsService.ErstelleDefaultFeiertage(dt.Year).Where(f => f.Datum.Month == dt.Month).ToList();
report.SetReportDataSource(RosterIstRO.Create(dienstEintraege, vertretungen, employee, opertionsService.GetAllDienste(),
customerService.GetAllActiveWohnheimeCompact().First(x => x.WohnheimOid == wOid), dt.Year, dt.Month, feiertageDCs, absences));
return report as XtraReport;
}
public override XtraReport CreateVorlagenReport(long template, List<long> objectOids, long table) public override XtraReport CreateVorlagenReport(long template, List<long> objectOids, long table)
{ {

View File

@@ -0,0 +1,29 @@
using System;
using System.Collections.Generic;
using System.Linq;
using BeWo.Report;
using BeWo.Report.ReportObjects;
using BS.Shared.Core;
using DevExpress.XtraReports.UI;
namespace BeWo.Report.DefaultReports
{
[IDSpecificClass(Identifier = "RosterIstReport")]
public partial class RosterIstReport : XtraReport, IBeWoReport<RosterIstRO>
{
public RosterIstReport()
{
InitializeComponent();
}
public void SetReportDataSource(RosterIstRO pRO)
{
this.RosterIstRO.DataSource = pRO;
}
}
}

View File

@@ -0,0 +1,739 @@
using BeWo.Report.ReportObjects;
namespace BeWo.Report.DefaultReports
{
partial class RosterIstReport
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
this.xrTable2 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell25 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
this.lblMonat = new DevExpress.XtraReports.UI.XRLabel();
this.xrTableHeader = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRowHeader = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
this.DetailReport1 = new DevExpress.XtraReports.UI.DetailReportBand();
this.Detail2 = new DevExpress.XtraReports.UI.DetailBand();
this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow4 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
this.Title = new DevExpress.XtraReports.UI.XRControlStyle();
this.FieldCaption = new DevExpress.XtraReports.UI.XRControlStyle();
this.PageInfo = new DevExpress.XtraReports.UI.XRControlStyle();
this.DataField = new DevExpress.XtraReports.UI.XRControlStyle();
this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
this.fieldSumSpecial = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldSumSonntag = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldSumFeiertag = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldHours = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldSick = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldVacation = new DevExpress.XtraReports.UI.CalculatedField();
this.calculatedField1 = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldSumHours = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldSumHoliday2 = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldIstArbeitszeit = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldUeberstundenGesamt = new DevExpress.XtraReports.UI.CalculatedField();
this.PageFooter = new DevExpress.XtraReports.UI.PageFooterBand();
this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell();
this.RosterIstRO = new DevExpress.DataAccess.ObjectBinding.ObjectDataSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.RosterIstRO)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// Detail
//
this.Detail.HeightF = 0F;
this.Detail.Name = "Detail";
this.Detail.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.Detail.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// Detail1
//
this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTable2,
this.lblMonat,
this.xrTableHeader});
this.Detail1.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.Detail1.HeightF = 159.0834F;
this.Detail1.Name = "Detail1";
this.Detail1.StylePriority.UseFont = false;
//
// xrTable2
//
this.xrTable2.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.xrTable2.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 50.08332F);
this.xrTable2.Name = "xrTable2";
this.xrTable2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow1,
this.xrTableRow3,
this.xrTableRow2});
this.xrTable2.SizeF = new System.Drawing.SizeF(764.9999F, 54F);
this.xrTable2.StylePriority.UseBorders = false;
this.xrTable2.StylePriority.UseFont = false;
this.xrTable2.StylePriority.UsePadding = false;
this.xrTable2.StylePriority.UseTextAlignment = false;
this.xrTable2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
//
// xrTableRow1
//
this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell1,
this.xrTableCell25});
this.xrTableRow1.Name = "xrTableRow1";
this.xrTableRow1.Weight = 0.75540991165010141D;
//
// xrTableCell1
//
this.xrTableCell1.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrTableCell1.Name = "xrTableCell1";
this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell1.StylePriority.UseFont = false;
this.xrTableCell1.StylePriority.UsePadding = false;
this.xrTableCell1.StylePriority.UseTextAlignment = false;
this.xrTableCell1.Text = "Mitarbeiter/in:";
this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell1.Weight = 0.138246012405208D;
//
// xrTableCell25
//
this.xrTableCell25.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
this.xrTableCell25.Multiline = true;
this.xrTableCell25.Name = "xrTableCell25";
this.xrTableCell25.StylePriority.UseFont = false;
this.xrTableCell25.StylePriority.UseTextAlignment = false;
this.xrTableCell25.Text = "[Mitarbeiter.FirstName] [Mitarbeiter.LastName]";
this.xrTableCell25.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell25.Weight = 0.74307226093795853D;
//
// xrTableRow3
//
this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell9,
this.xrTableCell16});
this.xrTableRow3.Name = "xrTableRow3";
this.xrTableRow3.Weight = 0.75540991165010141D;
//
// xrTableCell9
//
this.xrTableCell9.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
this.xrTableCell9.Name = "xrTableCell9";
this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell9.StylePriority.UseFont = false;
this.xrTableCell9.StylePriority.UsePadding = false;
this.xrTableCell9.StylePriority.UseTextAlignment = false;
this.xrTableCell9.Text = "Monat";
this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell9.Weight = 0.138246012405208D;
//
// xrTableCell16
//
this.xrTableCell16.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
this.xrTableCell16.Name = "xrTableCell16";
this.xrTableCell16.StylePriority.UseFont = false;
this.xrTableCell16.StylePriority.UseTextAlignment = false;
this.xrTableCell16.Text = "[Monat]";
this.xrTableCell16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell16.Weight = 0.74307226093795853D;
//
// xrTableRow2
//
this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell4,
this.xrTableCell6});
this.xrTableRow2.Name = "xrTableRow2";
this.xrTableRow2.Weight = 0.75540991165010141D;
//
// xrTableCell4
//
this.xrTableCell4.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
this.xrTableCell4.Name = "xrTableCell4";
this.xrTableCell4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell4.StylePriority.UseFont = false;
this.xrTableCell4.StylePriority.UsePadding = false;
this.xrTableCell4.StylePriority.UseTextAlignment = false;
this.xrTableCell4.Text = "Jahr";
this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell4.Weight = 0.138246012405208D;
//
// xrTableCell6
//
this.xrTableCell6.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
this.xrTableCell6.Name = "xrTableCell6";
this.xrTableCell6.StylePriority.UseFont = false;
this.xrTableCell6.StylePriority.UseTextAlignment = false;
this.xrTableCell6.Text = "[Jahr]";
this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell6.Weight = 0.74307226093795853D;
//
// lblMonat
//
this.lblMonat.Font = new System.Drawing.Font("Arial", 14F, System.Drawing.FontStyle.Bold);
this.lblMonat.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.lblMonat.Multiline = true;
this.lblMonat.Name = "lblMonat";
this.lblMonat.SizeF = new System.Drawing.SizeF(764.9999F, 25F);
this.lblMonat.StyleName = "Title";
this.lblMonat.StylePriority.UseFont = false;
this.lblMonat.Text = "Ist-Dienstplan für [Mitarbeiter.LastNameFirstName]";
//
// xrTableHeader
//
this.xrTableHeader.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableHeader.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrTableHeader.LocationFloat = new DevExpress.Utils.PointFloat(0F, 129.0834F);
this.xrTableHeader.Name = "xrTableHeader";
this.xrTableHeader.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableHeader.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRowHeader});
this.xrTableHeader.SizeF = new System.Drawing.SizeF(784.0001F, 30F);
this.xrTableHeader.StylePriority.UseBackColor = false;
this.xrTableHeader.StylePriority.UseBorders = false;
this.xrTableHeader.StylePriority.UseFont = false;
this.xrTableHeader.StylePriority.UsePadding = false;
this.xrTableHeader.StylePriority.UseTextAlignment = false;
this.xrTableHeader.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
//
// xrTableRowHeader
//
this.xrTableRowHeader.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell5,
this.xrTableCell3,
this.xrTableCell2,
this.xrTableCell17,
this.xrTableCell7,
this.xrTableCell10,
this.xrTableCell14,
this.xrTableCell20});
this.xrTableRowHeader.Name = "xrTableRowHeader";
this.xrTableRowHeader.Weight = 0.79999999999999982D;
//
// xrTableCell5
//
this.xrTableCell5.Name = "xrTableCell5";
this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
this.xrTableCell5.StylePriority.UsePadding = false;
this.xrTableCell5.StylePriority.UseTextAlignment = false;
this.xrTableCell5.Text = "Datum";
this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell5.Weight = 0.090819619300785318D;
//
// xrTableCell3
//
this.xrTableCell3.Name = "xrTableCell3";
this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
this.xrTableCell3.StylePriority.UsePadding = false;
this.xrTableCell3.StylePriority.UseTextAlignment = false;
this.xrTableCell3.Text = "Dienst / Schicht";
this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell3.Weight = 0.12339622204960969D;
//
// xrTableCell2
//
this.xrTableCell2.Name = "xrTableCell2";
this.xrTableCell2.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
this.xrTableCell2.StylePriority.UsePadding = false;
this.xrTableCell2.StylePriority.UseTextAlignment = false;
this.xrTableCell2.Text = "von";
this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell2.Weight = 0.055281508180805843D;
//
// xrTableCell17
//
this.xrTableCell17.Name = "xrTableCell17";
this.xrTableCell17.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
this.xrTableCell17.StylePriority.UsePadding = false;
this.xrTableCell17.StylePriority.UseTextAlignment = false;
this.xrTableCell17.Text = "bis";
this.xrTableCell17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell17.Weight = 0.055281508180805843D;
//
// xrTableCell7
//
this.xrTableCell7.Name = "xrTableCell7";
this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
this.xrTableCell7.StylePriority.UsePadding = false;
this.xrTableCell7.StylePriority.UseTextAlignment = false;
this.xrTableCell7.Text = "Dauer";
this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell7.Weight = 0.040276527440411478D;
//
// xrTableCell10
//
this.xrTableCell10.Multiline = true;
this.xrTableCell10.Name = "xrTableCell10";
this.xrTableCell10.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
this.xrTableCell10.StylePriority.UseBackColor = false;
this.xrTableCell10.StylePriority.UsePadding = false;
this.xrTableCell10.StylePriority.UseTextAlignment = false;
this.xrTableCell10.Text = "Urlaub";
this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell10.Weight = 0.059230186611278594D;
//
// xrTableCell14
//
this.xrTableCell14.Name = "xrTableCell14";
this.xrTableCell14.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
this.xrTableCell14.StylePriority.UsePadding = false;
this.xrTableCell14.StylePriority.UseTextAlignment = false;
this.xrTableCell14.Text = "Krankheit";
this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell14.Weight = 0.059230186613465526D;
//
// DetailReport
//
this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
this.Detail1,
this.DetailReport1});
this.DetailReport.DataMember = "PageObjects";
this.DetailReport.DataSource = this.RosterIstRO;
this.DetailReport.Level = 0;
this.DetailReport.Name = "DetailReport";
//
// DetailReport1
//
this.DetailReport1.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
this.Detail2});
this.DetailReport1.DataMember = "PageObjects.EintraegeProMitarbeiter";
this.DetailReport1.DataSource = this.RosterIstRO;
this.DetailReport1.Level = 0;
this.DetailReport1.Name = "DetailReport1";
this.DetailReport1.PageBreak = DevExpress.XtraReports.UI.PageBreak.AfterBandExceptLastEntry;
//
// Detail2
//
this.Detail2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTable1});
this.Detail2.Font = new System.Drawing.Font("Arial", 8F);
this.Detail2.HeightF = 22F;
this.Detail2.Name = "Detail2";
this.Detail2.StylePriority.UseFont = false;
//
// xrTable1
//
this.xrTable1.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTable1.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrTable1.Name = "xrTable1";
this.xrTable1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow4});
this.xrTable1.SizeF = new System.Drawing.SizeF(784.0001F, 22F);
this.xrTable1.StylePriority.UseBorders = false;
this.xrTable1.StylePriority.UseFont = false;
this.xrTable1.StylePriority.UsePadding = false;
this.xrTable1.StylePriority.UseTextAlignment = false;
this.xrTable1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
//
// xrTableRow4
//
this.xrTableRow4.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell11,
this.xrTableCell15,
this.xrTableCell12,
this.xrTableCell18,
this.xrTableCell19,
this.xrTableCell8,
this.xrTableCell13,
this.xrTableCell21});
this.xrTableRow4.Name = "xrTableRow4";
this.xrTableRow4.Weight = 0.88D;
//
// xrTableCell11
//
this.xrTableCell11.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "PageObjects.EintraegeProMitarbeiter.Datum", "{0:dddd, dd.}")});
this.xrTableCell11.Name = "xrTableCell11";
this.xrTableCell11.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
this.xrTableCell11.StylePriority.UseFont = false;
this.xrTableCell11.StylePriority.UsePadding = false;
this.xrTableCell11.StylePriority.UseTextAlignment = false;
this.xrTableCell11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell11.Weight = 0.10369703848137056D;
this.xrTableCell11.XlsxFormatString = "ddd. dd.MM.yyyy";
//
// xrTableCell15
//
this.xrTableCell15.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "PageObjects.EintraegeProMitarbeiter.Dienst.DienstName")});
this.xrTableCell15.Name = "xrTableCell15";
this.xrTableCell15.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
this.xrTableCell15.StylePriority.UsePadding = false;
this.xrTableCell15.StylePriority.UseTextAlignment = false;
this.xrTableCell15.Text = "xrTableCell15";
this.xrTableCell15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell15.Weight = 0.1408927193730917D;
//
// xrTableCell12
//
this.xrTableCell12.Name = "xrTableCell12";
this.xrTableCell12.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
this.xrTableCell12.StylePriority.UsePadding = false;
this.xrTableCell12.StylePriority.UseTextAlignment = false;
this.xrTableCell12.Text = "[Startzeit]";
this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell12.Weight = 0.0631199375083197D;
//
// xrTableCell18
//
this.xrTableCell18.Name = "xrTableCell18";
this.xrTableCell18.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
this.xrTableCell18.StylePriority.UsePadding = false;
this.xrTableCell18.StylePriority.UseTextAlignment = false;
this.xrTableCell18.Text = "[Endzeit]";
this.xrTableCell18.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell18.Weight = 0.063119937508325091D;
//
// xrTableCell19
//
this.xrTableCell19.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "PageObjects.EintraegeProMitarbeiter.DauerInStunden")});
this.xrTableCell19.Name = "xrTableCell19";
this.xrTableCell19.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
this.xrTableCell19.StylePriority.UsePadding = false;
this.xrTableCell19.StylePriority.UseTextAlignment = false;
this.xrTableCell19.Text = "xrTableCell19";
this.xrTableCell19.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell19.Weight = 0.045987386683637457D;
//
// xrTableCell8
//
this.xrTableCell8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "PageObjects.EintraegeProMitarbeiter.Urlaub")});
this.xrTableCell8.Name = "xrTableCell8";
this.xrTableCell8.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
this.xrTableCell8.StylePriority.UsePadding = false;
this.xrTableCell8.StylePriority.UseTextAlignment = false;
this.xrTableCell8.Text = "xrTableCell8";
this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell8.Weight = 0.067628507251571782D;
//
// xrTableCell13
//
this.xrTableCell13.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "PageObjects.EintraegeProMitarbeiter.Krankheit")});
this.xrTableCell13.Name = "xrTableCell13";
this.xrTableCell13.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
this.xrTableCell13.StylePriority.UsePadding = false;
this.xrTableCell13.StylePriority.UseTextAlignment = false;
this.xrTableCell13.Text = "xrTableCell13";
this.xrTableCell13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell13.Weight = 0.0676285623346416D;
//
// Title
//
this.Title.BackColor = System.Drawing.Color.White;
this.Title.BorderColor = System.Drawing.SystemColors.ControlText;
this.Title.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.Title.BorderWidth = 1F;
this.Title.Font = new System.Drawing.Font("Times New Roman", 24F);
this.Title.ForeColor = System.Drawing.Color.Black;
this.Title.Name = "Title";
//
// FieldCaption
//
this.FieldCaption.BackColor = System.Drawing.Color.White;
this.FieldCaption.BorderColor = System.Drawing.SystemColors.ControlText;
this.FieldCaption.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.FieldCaption.BorderWidth = 1F;
this.FieldCaption.Font = new System.Drawing.Font("Times New Roman", 10F, System.Drawing.FontStyle.Bold);
this.FieldCaption.ForeColor = System.Drawing.Color.Black;
this.FieldCaption.Name = "FieldCaption";
//
// PageInfo
//
this.PageInfo.BackColor = System.Drawing.Color.White;
this.PageInfo.BorderColor = System.Drawing.SystemColors.ControlText;
this.PageInfo.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.PageInfo.BorderWidth = 1F;
this.PageInfo.Font = new System.Drawing.Font("Times New Roman", 8F);
this.PageInfo.ForeColor = System.Drawing.Color.Black;
this.PageInfo.Name = "PageInfo";
//
// DataField
//
this.DataField.BackColor = System.Drawing.Color.White;
this.DataField.BorderColor = System.Drawing.SystemColors.ControlText;
this.DataField.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.DataField.BorderWidth = 1F;
this.DataField.Font = new System.Drawing.Font("Times New Roman", 8F);
this.DataField.ForeColor = System.Drawing.SystemColors.ControlText;
this.DataField.Name = "DataField";
//
// topMarginBand1
//
this.topMarginBand1.HeightF = 50F;
this.topMarginBand1.Name = "topMarginBand1";
//
// bottomMarginBand1
//
this.bottomMarginBand1.HeightF = 50F;
this.bottomMarginBand1.Name = "bottomMarginBand1";
//
// fieldSumSpecial
//
this.fieldSumSpecial.DataMember = "EmployeeDetailList.Days";
this.fieldSumSpecial.Expression = "Sum([SpecialHours])";
this.fieldSumSpecial.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
this.fieldSumSpecial.Name = "fieldSumSpecial";
//
// fieldSumSonntag
//
this.fieldSumSonntag.DataMember = "EmployeeDetailList.Days";
this.fieldSumSonntag.Expression = "Sum([HoursSunday])";
this.fieldSumSonntag.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
this.fieldSumSonntag.Name = "fieldSumSonntag";
//
// fieldSumFeiertag
//
this.fieldSumFeiertag.DataMember = "EmployeeDetailList.Days";
this.fieldSumFeiertag.Expression = "Sum([HoursHoliday])";
this.fieldSumFeiertag.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
this.fieldSumFeiertag.Name = "fieldSumFeiertag";
//
// fieldHours
//
this.fieldHours.DataMember = "EmployeeDetailList.Days";
this.fieldHours.Expression = "[MinutesTotal]/60";
this.fieldHours.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
this.fieldHours.Name = "fieldHours";
//
// fieldSick
//
this.fieldSick.DataMember = "EmployeeDetailList.Days";
this.fieldSick.Expression = "Iif([HoursSick] > 0, \'x\', \'\')";
this.fieldSick.FieldType = DevExpress.XtraReports.UI.FieldType.String;
this.fieldSick.Name = "fieldSick";
//
// fieldVacation
//
this.fieldVacation.DataMember = "EmployeeDetailList.Days";
this.fieldVacation.Expression = "Iif([HoursInVacation] > 0, \'x\', \'\')";
this.fieldVacation.FieldType = DevExpress.XtraReports.UI.FieldType.String;
this.fieldVacation.Name = "fieldVacation";
//
// calculatedField1
//
this.calculatedField1.DataMember = "EmployeeDetailList.Days";
this.calculatedField1.DisplayName = "fieldSumSamstag";
this.calculatedField1.Expression = "Sum([HoursSaturday])";
this.calculatedField1.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
this.calculatedField1.Name = "calculatedField1";
//
// fieldSumHours
//
this.fieldSumHours.DataMember = "EmployeeDetailList.Days";
this.fieldSumHours.Expression = "Sum([MinutesTotal]/60)";
this.fieldSumHours.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
this.fieldSumHours.Name = "fieldSumHours";
//
// fieldSumHoliday2
//
this.fieldSumHoliday2.DataMember = "EmployeeDetailList.Days";
this.fieldSumHoliday2.Expression = "Sum([HoursHoliday2])";
this.fieldSumHoliday2.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
this.fieldSumHoliday2.Name = "fieldSumHoliday2";
//
// fieldIstArbeitszeit
//
this.fieldIstArbeitszeit.DataMember = "EmployeeDetailList";
this.fieldIstArbeitszeit.Expression = "[StundenGesamtIst]+[UeberstundenVormonat]";
this.fieldIstArbeitszeit.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
this.fieldIstArbeitszeit.Name = "fieldIstArbeitszeit";
//
// fieldUeberstundenGesamt
//
this.fieldUeberstundenGesamt.DataMember = "EmployeeDetailList";
this.fieldUeberstundenGesamt.Expression = "Iif([Ueberstunden] == ?, 0, [Ueberstunden])+Iif([UeberstundenVormonat] == ?, 0," +
" [UeberstundenVormonat])";
this.fieldUeberstundenGesamt.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
this.fieldUeberstundenGesamt.Name = "fieldUeberstundenGesamt";
//
// PageFooter
//
this.PageFooter.HeightF = 100F;
this.PageFooter.Name = "PageFooter";
//
// xrTableCell20
//
this.xrTableCell20.Name = "xrTableCell20";
this.xrTableCell20.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
this.xrTableCell20.StylePriority.UsePadding = false;
this.xrTableCell20.StylePriority.UseTextAlignment = false;
this.xrTableCell20.Text = "Bemerkung";
this.xrTableCell20.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell20.Weight = 0.1356371757796013D;
//
// xrTableCell21
//
this.xrTableCell21.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "PageObjects.EintraegeProMitarbeiter.Notice")});
this.xrTableCell21.Name = "xrTableCell21";
this.xrTableCell21.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
this.xrTableCell21.StylePriority.UsePadding = false;
this.xrTableCell21.StylePriority.UseTextAlignment = false;
this.xrTableCell21.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell21.Weight = 0.1548692640734802D;
//
// RosterIstRO
//
this.RosterIstRO.DataSource = typeof(BeWo.Report.ReportObjects.RosterIstRO);
this.RosterIstRO.Name = "RosterIstRO";
//
// RosterIstReport
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
this.Detail,
this.DetailReport,
this.topMarginBand1,
this.bottomMarginBand1,
this.PageFooter});
this.CalculatedFields.AddRange(new DevExpress.XtraReports.UI.CalculatedField[] {
this.fieldSumSpecial,
this.fieldSumSonntag,
this.fieldSumFeiertag,
this.fieldHours,
this.fieldSick,
this.fieldVacation,
this.calculatedField1,
this.fieldSumHours,
this.fieldSumHoliday2,
this.fieldIstArbeitszeit,
this.fieldUeberstundenGesamt});
this.ComponentStorage.AddRange(new System.ComponentModel.IComponent[] {
this.RosterIstRO});
this.DataSource = this.RosterIstRO;
this.DisplayName = "Mitarbeiterstundenkonto";
this.Font = new System.Drawing.Font("Arial", 8F);
this.Margins = new System.Drawing.Printing.Margins(21, 22, 50, 50);
this.PageHeight = 1169;
this.PageWidth = 827;
this.PaperKind = System.Drawing.Printing.PaperKind.A4;
this.StyleSheet.AddRange(new DevExpress.XtraReports.UI.XRControlStyle[] {
this.Title,
this.FieldCaption,
this.PageInfo,
this.DataField});
this.Version = "17.1";
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.RosterIstRO)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}
#endregion
private DevExpress.XtraReports.UI.DetailBand Detail;
private DevExpress.XtraReports.UI.DetailBand Detail1;
private DevExpress.XtraReports.UI.DetailReportBand DetailReport;
private DevExpress.XtraReports.UI.XRControlStyle Title;
private DevExpress.XtraReports.UI.XRControlStyle FieldCaption;
private DevExpress.XtraReports.UI.XRControlStyle PageInfo;
private DevExpress.XtraReports.UI.XRControlStyle DataField;
private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1;
private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1;
private DevExpress.XtraReports.UI.DetailReportBand DetailReport1;
private DevExpress.XtraReports.UI.DetailBand Detail2;
private DevExpress.XtraReports.UI.CalculatedField fieldSumSpecial;
private DevExpress.XtraReports.UI.CalculatedField fieldSumSonntag;
private DevExpress.XtraReports.UI.CalculatedField fieldSumFeiertag;
private DevExpress.XtraReports.UI.CalculatedField fieldHours;
private DevExpress.XtraReports.UI.CalculatedField fieldSick;
private DevExpress.XtraReports.UI.CalculatedField fieldVacation;
private DevExpress.XtraReports.UI.CalculatedField calculatedField1;
private DevExpress.XtraReports.UI.CalculatedField fieldSumHours;
private DevExpress.XtraReports.UI.CalculatedField fieldSumHoliday2;
private DevExpress.XtraReports.UI.CalculatedField fieldIstArbeitszeit;
private DevExpress.XtraReports.UI.CalculatedField fieldUeberstundenGesamt;
private DevExpress.DataAccess.ObjectBinding.ObjectDataSource RosterIstRO;
private DevExpress.XtraReports.UI.XRTable xrTable2;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow1;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell1;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell25;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow3;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell9;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell16;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow2;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell4;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell6;
private DevExpress.XtraReports.UI.XRLabel lblMonat;
private DevExpress.XtraReports.UI.XRTable xrTableHeader;
private DevExpress.XtraReports.UI.XRTableRow xrTableRowHeader;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell5;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell2;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell7;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell10;
private DevExpress.XtraReports.UI.PageFooterBand PageFooter;
private DevExpress.XtraReports.UI.XRTable xrTable1;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow4;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell11;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell12;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell17;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell14;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell18;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell19;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell8;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell13;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell3;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell15;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell20;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell21;
}
}

View File

@@ -0,0 +1,123 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="RosterIstRO.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 56</value>
</metadata>
</root>

View File

@@ -235,6 +235,12 @@
<Compile Include="DefaultReports\AbwesenheitsPrintReport.Designer.cs"> <Compile Include="DefaultReports\AbwesenheitsPrintReport.Designer.cs">
<DependentUpon>AbwesenheitsPrintReport.cs</DependentUpon> <DependentUpon>AbwesenheitsPrintReport.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="DefaultReports\RosterIstReport.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="DefaultReports\RosterIstReport.designer.cs">
<DependentUpon>RosterIstReport.cs</DependentUpon>
</Compile>
<Compile Include="DefaultReports\VorlageReport.cs"> <Compile Include="DefaultReports\VorlageReport.cs">
<SubType>Component</SubType> <SubType>Component</SubType>
</Compile> </Compile>
@@ -507,6 +513,7 @@
<Compile Include="ReportObjects\AbwesenheitsPrintRO.cs" /> <Compile Include="ReportObjects\AbwesenheitsPrintRO.cs" />
<Compile Include="ReportObjects\BudgetnachweisAnhangRO.cs" /> <Compile Include="ReportObjects\BudgetnachweisAnhangRO.cs" />
<Compile Include="ReportObjects\FlsAuslastungsauswertungRO.cs" /> <Compile Include="ReportObjects\FlsAuslastungsauswertungRO.cs" />
<Compile Include="ReportObjects\RosterIstRO.cs" />
<Compile Include="ReportObjects\RosterRO.cs" /> <Compile Include="ReportObjects\RosterRO.cs" />
<Compile Include="ReportObjects\AdditionalServiceBookingRO.cs" /> <Compile Include="ReportObjects\AdditionalServiceBookingRO.cs" />
<Compile Include="ReportObjects\AbsenceRO.cs" /> <Compile Include="ReportObjects\AbsenceRO.cs" />
@@ -560,6 +567,9 @@
<DependentUpon>AbwesenheitsPrintReport.cs</DependentUpon> <DependentUpon>AbwesenheitsPrintReport.cs</DependentUpon>
<SubType>Designer</SubType> <SubType>Designer</SubType>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="DefaultReports\RosterIstReport.resx">
<DependentUpon>RosterIstReport.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DefaultReports\VorlageReport.resx"> <EmbeddedResource Include="DefaultReports\VorlageReport.resx">
<DependentUpon>VorlageReport.cs</DependentUpon> <DependentUpon>VorlageReport.cs</DependentUpon>
<SubType>Designer</SubType> <SubType>Designer</SubType>

View File

@@ -0,0 +1,174 @@
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact;
using System;
using System.Collections.Generic;
using System.Globalization;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace BeWo.Report.ReportObjects
{
public class RosterIstRO : AbstractBeWoReportObject<RosterIstRO>
{
public List<PageObject> PageObjects { get; set; }
public static RosterIstRO Create(List<DienstEintragDC> dienstEintragDCs, List<DienstvertretungDC> dienstvertretungDCs, List<EmployeeDC> employee,
List<DienstInfoDC> dienstInfoDCs, CompactWohnheimDC compactWohnheimDC, int year, int month, List<FeiertagDC> feiertage, List<AbsenceTimeDC> absences)
{
RosterIstRO ro = new RosterIstRO();
ro.PageObjects = new List<PageObject>();
// (Vorerst) leere Einträge erstellen
List<Listeneintrag> eintraege = new List<Listeneintrag>();
int pos = 0;
foreach (var emp in employee)
{
for (int i = 1; i <= DateTime.DaysInMonth(year, month); i++)
{
string kr = null;
string ur = null;
var datum = new DateTime(year, month, i);
if (absences.Any(a => datum >= a.Start && datum <= a.End && a.EmployeeOid == emp.EmployeeOid && a.Reason.Description.ToLower().Contains("urlaub")))
{
ur = "X";
}
else if (absences.Any(a => datum >= a.Start && datum <= a.End && a.EmployeeOid == emp.EmployeeOid && a.Reason.Description.ToLower().Contains("krank")))
{
kr = "X";
}
eintraege.Add(new Listeneintrag()
{
Position = pos,
Datum = datum,
EmployeeOid = (long)emp.EmployeeOid,
DauerInStunden = null,
Dienst = null,
Endzeit = null,
Startzeit = null,
Notice = feiertage.Any(f => f.Datum == datum) ? feiertage.First(f => f.Datum == datum).Name : null,
Krankheit = kr,
Urlaub = ur,
});
pos++;
}
}
foreach (var item in dienstEintragDCs)
{
string[] urlaubKrankheit = UrlaubUndKrankheitUeberpruefen(item, null, absences);
var temp = eintraege.First(e => e.Datum == item.Datum && e.EmployeeOid == item.EmployeeOid && e.Dienst == null);
if (temp != null)
{
eintraege[temp.Position] = new Listeneintrag()
{
Datum = item.Datum,
DauerInStunden = string.Format("{0:0.00h}", item.DauerInStunden),
Dienst = dienstInfoDCs.First(i => i.Oid == item.DienstOid),
EmployeeOid = item.EmployeeOid,
Endzeit = item.Endzeit + " Uhr",
Notice = item.Notice,
Startzeit = item.Startzeit + " Uhr",
Urlaub = urlaubKrankheit[0],
Krankheit = urlaubKrankheit[1]
};
}
}
foreach (var item in dienstvertretungDCs)
{
string[] urlaubKrankheit = UrlaubUndKrankheitUeberpruefen(null, item, absences);
var temp = eintraege.First(e => e.Datum == item.Datum && e.EmployeeOid == item.EmployeeOid && e.Dienst == null);
if (temp != null)
{
eintraege[temp.Position] = new Listeneintrag()
{
Datum = item.Datum,
DauerInStunden = string.Format("{0:0.00h}", item.DauerInStunden),
Dienst = dienstInfoDCs.First(i => i.Oid == item.DienstOid),
EmployeeOid = item.EmployeeOid,
Endzeit = item.Endzeit + " Uhr",
Notice = item.Notice,
Startzeit = item.Startzeit + " Uhr",
Urlaub = urlaubKrankheit[0],
Krankheit = urlaubKrankheit[1]
};
}
}
foreach (EmployeeDC emp in employee)
{
ro.PageObjects.Add(new PageObject()
{
Jahr = year,
Monat = new DateTime(year, month, 1).ToString("MMMM", CultureInfo.CreateSpecificCulture("de")),
Mitarbeiter = emp,
EintraegeProMitarbeiter = eintraege.Where(e => e.EmployeeOid == emp.EmployeeOid).OrderBy(e => e.Datum).ToList()
});
}
return ro;
}
private static string[] UrlaubUndKrankheitUeberpruefen(DienstEintragDC eintrag, DienstvertretungDC vertretung, List<AbsenceTimeDC> abwesenheiten)
{
string[] urlaubKrankheit = new string[] { " ", " " };
if (eintrag != null)
{
foreach (var absence in abwesenheiten)
{
if (eintrag.Datum >= absence.Start && eintrag.Datum <= absence.End.Value && eintrag.EmployeeOid == absence.EmployeeOid)
{
if (absence.Reason.Description.ToLower().Contains("urlaub"))
urlaubKrankheit[0] = "X";
else if (absence.Reason.Description.ToLower().Contains("krank"))
urlaubKrankheit[1] = "X";
}
}
}
else if (vertretung != null)
{
foreach (var absence in abwesenheiten)
{
if (vertretung.Datum >= absence.Start && vertretung.Datum <= absence.End.Value && eintrag.EmployeeOid == absence.EmployeeOid)
{
if (absence.Reason.Description.ToLower().Contains("urlaub"))
urlaubKrankheit[0] = "X";
else if (absence.Reason.Description.ToLower().Contains("krank"))
urlaubKrankheit[1] = "X";
}
}
}
return urlaubKrankheit;
}
}
public class Listeneintrag
{
public int Position { get; set; }
public long EmployeeOid { get; set; }
public string Notice { get; set; }
public DienstInfoDC Dienst { get; set; }
public DateTime Datum { get; set; }
public string Startzeit { get; set; }
public string Endzeit { get; set; }
public string DauerInStunden { get; set; }
public string Urlaub { get; set; }
public string Krankheit { get; set; }
}
public class PageObject
{
public EmployeeDC Mitarbeiter { get; set; }
public string Monat { get; set; }
public int Jahr { get; set; }
public List<Listeneintrag> EintraegeProMitarbeiter { get; set; }
}
}

View File

@@ -284,6 +284,11 @@ namespace BeWo.Service.Dienstplanung
{ {
DAOFactory.GenericDAO.Insert(MapperFactory.DienstEintragDC_DienstEintrag.MapToNewEntity(dienstEintrag)); DAOFactory.GenericDAO.Insert(MapperFactory.DienstEintragDC_DienstEintrag.MapToNewEntity(dienstEintrag));
} }
public static void InsertNewDienstEintraege(List<DienstEintragDC> dienstEintraege)
{
DAOFactory.GenericDAO.Insert(MapperFactory.DienstEintragDC_DienstEintrag.MapToNewEntities(dienstEintraege));
}
public static void InsertNewDienstvertretung(DienstvertretungDC dienstvertretung) public static void InsertNewDienstvertretung(DienstvertretungDC dienstvertretung)
{ {
DAOFactory.GenericDAO.Insert(MapperFactory.DienstvertretungDC_Dienstvertretung.MapToNewEntity(dienstvertretung)); DAOFactory.GenericDAO.Insert(MapperFactory.DienstvertretungDC_Dienstvertretung.MapToNewEntity(dienstvertretung));

View File

@@ -118,7 +118,7 @@ namespace BeWo.Service.Plugins
//t = "7739670213"; // SPZ Leverkusen //t = "7739670213"; // SPZ Leverkusen
//t = "3341456098"; // Hilfe Daheim (früher BeWo Schillinger) //t = "3341456098"; // Hilfe Daheim (früher BeWo Schillinger)
//t = "4271389563"; // Komm Mit //t = "4271389563"; // Komm Mit
//t = "5430005891"; // Marienhospital Eickel t = "5430005891"; // Marienhospital Eickel
//t = "3265049248"; // Gerdas Pflegedienst //t = "3265049248"; // Gerdas Pflegedienst
//t = "1549622397"; // Kontakt und Krisenhilfe //t = "1549622397"; // Kontakt und Krisenhilfe
//t = "4782194565"; // Skm Rheydt //t = "4782194565"; // Skm Rheydt
@@ -147,7 +147,7 @@ namespace BeWo.Service.Plugins
//t = "9975231461"; // Selwo //t = "9975231461"; // Selwo
//t = "8181286349"; // BeWo am Rhein //t = "8181286349"; // BeWo am Rhein
//t = "4595275645"; // Eigenständig //t = "4595275645"; // Eigenständig
t = "7912635399"; // Prof. Dr. Eggers Stiftung //t = "7912635399"; // Prof. Dr. Eggers Stiftung
//t = "3549726254"; // Socia //t = "3549726254"; // Socia
//t = "1992495802"; // Monvita //t = "1992495802"; // Monvita
//t = "7381352241"; // Ressource e.V. //t = "7381352241"; // Ressource e.V.
@@ -289,7 +289,7 @@ namespace BeWo.Service.Plugins
//t = "4947061147"; // Diakonisches Werk Passau //t = "4947061147"; // Diakonisches Werk Passau
//t = "9064234785"; // BeWo Rimbach //t = "9064234785"; // BeWo Rimbach
//t = "9433783300"; // Wichernhaus gGmbH //t = "9433783300"; // Wichernhaus gGmbH
t = "6282665941"; // Diakonisches Werk Regensburg //t = "6282665941"; // Diakonisches Werk Regensburg
return t; return t;
#else #else

View File

@@ -391,14 +391,16 @@ namespace BeWo.Service.Plugins
if (spanne.End == null) // Wenn es kein Ende gibt, Ende auf letzten Tag im Jahr setzen if (spanne.End == null) // Wenn es kein Ende gibt, Ende auf letzten Tag im Jahr setzen
spanne.End = new DateTime(year, 12, 31); spanne.End = new DateTime(year, 12, 31);
if (spanne.Start == spanne.End) // Nur ein Tag Urlaub if (spanne.Start.Value.Date == spanne.End.Value.Date && spanne.Start.Value.TimeOfDay == spanne.End.Value.TimeOfDay) // ein ganzer Tag Urlaub
summeTage++; summeTage++;
else if (spanne.Start.Value.Date == spanne.End.Value.Date && spanne.Start.Value.TimeOfDay != spanne.End.Value.TimeOfDay)
summeTage += 0.5m;
else // Mehr als ein Tag Urlaub else // Mehr als ein Tag Urlaub
{ {
DateTime startForLoop = (spanne.Start.Value.Year == year) ? spanne.Start.Value : new DateTime(year, 1, 1); DateTime startForLoop = (spanne.Start.Value.Year == year) ? spanne.Start.Value : new DateTime(year, 1, 1);
// Tage auf den Zähler addieren, solange das sich erhöhende Datum vor dem Enddatum ist und wenn das Datum kein Wochenend- oder Feiertag ist // Tage auf den Zähler addieren, solange das sich erhöhende Datum vor dem Enddatum ist und wenn das Datum kein Wochenend- oder Feiertag ist
while (startForLoop <= spanne.End.Value) while (startForLoop <= spanne.End.Value)
{ {
if (startForLoop.DayOfWeek != DayOfWeek.Saturday && startForLoop.DayOfWeek != DayOfWeek.Sunday && !_Feiertage.Contains(startForLoop)) if (startForLoop.DayOfWeek != DayOfWeek.Saturday && startForLoop.DayOfWeek != DayOfWeek.Sunday && !_Feiertage.Contains(startForLoop))
summeTage++; summeTage++;
@@ -713,7 +715,8 @@ namespace BeWo.Service.Plugins
{ {
if (absence.Start.HasValue) if (absence.Start.HasValue)
{ {
int days = 0; decimal days = 0;
//int days = 0;
//DateTime start = absence.Start.Value; //DateTime start = absence.Start.Value;
DateTime start = (absence.Start.Value.Year == year) ? absence.Start.Value : new DateTime(year, 1, 1); DateTime start = (absence.Start.Value.Year == year) ? absence.Start.Value : new DateTime(year, 1, 1);
@@ -734,7 +737,10 @@ namespace BeWo.Service.Plugins
{ {
if (start.DayOfWeek != DayOfWeek.Saturday && start.DayOfWeek != DayOfWeek.Sunday && !IstFeiertag(start)) if (start.DayOfWeek != DayOfWeek.Saturday && start.DayOfWeek != DayOfWeek.Sunday && !IstFeiertag(start))
{ {
days++; if (start.Date == end.Date && start.TimeOfDay != end.TimeOfDay)
days += 0.5m;
else
days++;
} }
start = start.AddDays(1); start = start.AddDays(1);
@@ -766,7 +772,13 @@ namespace BeWo.Service.Plugins
while (start <= end) while (start <= end)
{ {
if (start.DayOfWeek != DayOfWeek.Saturday && start.DayOfWeek != DayOfWeek.Sunday && !_Feiertage.Contains(start)) if (start.DayOfWeek != DayOfWeek.Saturday && start.DayOfWeek != DayOfWeek.Sunday && !_Feiertage.Contains(start))
tage++; {
if (start.Date == end.Date && start.TimeOfDay != end.TimeOfDay)
tage += 0.5m;
else
tage++;
}
start = start.AddDays(1); start = start.AddDays(1);
} }

View File

@@ -236,6 +236,10 @@ namespace BeWo.Service.ServiceContracts
[OperationContract] [OperationContract]
List<AbsenceTimeDC> GetAllEmployeeAbsenceTimesForYear(int year); List<AbsenceTimeDC> GetAllEmployeeAbsenceTimesForYear(int year);
[FaultContract(typeof(BeWoFault))]
[OperationContract]
List<AbsenceTimeDC> GetMultipleEmployeeAbsenceTimesForMonth(int year, int month, List<long> empOids);
[FaultContract(typeof(BeWoFault))] [FaultContract(typeof(BeWoFault))]
[OperationContract] [OperationContract]
void DeactivateGroupOfPeople(long pOid, long pVersion); void DeactivateGroupOfPeople(long pOid, long pVersion);

View File

@@ -991,6 +991,10 @@ namespace BeWo.Service.ServiceContracts
[OperationContract] [OperationContract]
void InsertNewDienstEintrag(DienstEintragDC dienstEintrag); void InsertNewDienstEintrag(DienstEintragDC dienstEintrag);
[FaultContract(typeof(BeWoFault))]
[OperationContract]
void InsertNewDienstEintraege(List<DienstEintragDC> dienstEintraege);
[FaultContract(typeof(BeWoFault))] [FaultContract(typeof(BeWoFault))]
[OperationContract] [OperationContract]
void InsertRegelmaessigerDienst(RegelmaessigerDienstDC dienst); void InsertRegelmaessigerDienst(RegelmaessigerDienstDC dienst);

View File

@@ -947,6 +947,27 @@ namespace BeWo.Service.ServiceImplementations
throw Utils.CreateBeWoFaultException(e); throw Utils.CreateBeWoFaultException(e);
} }
} }
public List<AbsenceTimeDC> GetMultipleEmployeeAbsenceTimesForMonth(int year, int month, List<long> empOids)
{
try
{
var startdate = new DateTime(year, month, 1);
var enddate = startdate.AddMonths(1).AddTicks(-1);
List<AbsenceTime> absenceTimes = new List<AbsenceTime>();
foreach (var oid in empOids)
{
absenceTimes.AddRange(DAOFactory.SearchDAO.FindAbsenceTimesForEmployee(startdate, enddate, oid));
}
return MapperFactory.AbsenceTimeDC_AbsenceTime.MapToNewDCs(absenceTimes);
}
catch (Exception e)
{
throw Utils.CreateBeWoFaultException(e);
}
}
public List<AbsenceTimeDC> GetAllEmployeeAbsenceTimesForYear(int year) public List<AbsenceTimeDC> GetAllEmployeeAbsenceTimesForYear(int year)
{ {
try try

View File

@@ -6199,6 +6199,17 @@ namespace BeWo.Service.ServiceImplementations
throw Utils.CreateBeWoFaultException(e); throw Utils.CreateBeWoFaultException(e);
} }
} }
public void InsertNewDienstEintraege(List<DienstEintragDC> dienstEintraege)
{
try
{
DienstplanungsManager.InsertNewDienstEintraege(dienstEintraege);
}
catch (Exception e)
{
throw Utils.CreateBeWoFaultException(e);
}
}
public void InsertNewDienstvertretung(DienstvertretungDC dienstvertretung) public void InsertNewDienstvertretung(DienstvertretungDC dienstvertretung)
{ {

View File

@@ -29,6 +29,7 @@
SBDCharacteristics, SBDCharacteristics,
AbsenceReport, AbsenceReport,
RosterReport, RosterReport,
RosterReportIst,
ServicesOverviewNew, ServicesOverviewNew,
Stundenzettel, Stundenzettel,
VorlagenReport, VorlagenReport,