ownSoft/BeWoPlaner
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cb

Browse Source
This commit is contained in:
Christian
2017-02-10 11:08:38 +01:00
parent 4435e8e6fa
commit 6fdeeff3d6
33 changed files with 1509 additions and 1302 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Shared/BeWoEntityEnums.cs
View File

@@ -454,12 +454,12 @@ namespace BS.Shared
BargeldverwaltungFinanzenBearbeiten = 26002,
BargeldverwaltungFinanzenLoeschen = 26003,
MedRecordsAnsehen = 27000,
MedRecordsAnlegen = 27001,
MedRecordsAendern = 27002,
MedRecordsLoeschen = 27003,
//MedRecordsAnsehen = 27000,
//MedRecordsAnlegen = 27001,
//MedRecordsAendern = 27002,
//MedRecordsLoeschen = 27003,
ChatSettings = 28000
//ChatSettings = 28000
}
public enum PersonType

31
Shared/Core/EnumTranslations.cs
View File

@@ -539,22 +539,23 @@ namespace BS.Shared.Core
},
{
UserRightType.BargeldverwaltungFinanzenLoeschen, "Bargeldverwaltung unter Finanzen löschen"
},
{
UserRightType.MedRecordsAnsehen, "Bedarfsmedikation ansehen"
},
{
UserRightType.MedRecordsAnlegen, "Bedarfsmedikation anlegen"
},
{
UserRightType.MedRecordsAendern, "Bedarfsmedikation bearbeiten"
},
{
UserRightType.MedRecordsLoeschen, "Bedarfsmedikation löschen"
},
{
UserRightType.ChatSettings, "Chat Einstellungen"
}
//,
// {
// UserRightType.MedRecordsAnsehen, "Bedarfsmedikation ansehen"
// },
// {
// UserRightType.MedRecordsAnlegen, "Bedarfsmedikation anlegen"
// },
// {
// UserRightType.MedRecordsAendern, "Bedarfsmedikation bearbeiten"
// },
// {
// UserRightType.MedRecordsLoeschen, "Bedarfsmedikation löschen"
// },
// {
// UserRightType.ChatSettings, "Chat Einstellungen"
// }
};
#endregion

28
Shared/Services/Calculations.cs
View File

@@ -587,7 +587,17 @@ namespace BS.Shared.Services
{
if (scap.ApprovedBEPerInterval.HasValue && scap.ApprovedBEInterval.HasValue && scap.ApprovedBEInterval.Value == SupportConceptApprovalInterval.Weekly)
{
var serviceUnit = costRatePeriods.GetCostRatePeriodForDate(CostRatePeriodType.MinutesPerServiceUnit, DateTime.Now);
DateTime dt = DateTime.Now;
if (scap.StartDate.HasValue && scap.StartDate.Value > dt)
{
dt = scap.StartDate.Value;
}
if (scap.EndDate.HasValue && scap.EndDate.Value < dt)
{
dt = scap.EndDate.Value;
}
var serviceUnit = costRatePeriods.GetCostRatePeriodForDate(CostRatePeriodType.MinutesPerServiceUnit, dt);
if (serviceUnit != null)
return serviceUnit.GetBEInHours(scap.ApprovedBEPerInterval);
}
@@ -611,7 +621,7 @@ namespace BS.Shared.Services
{
decimal? hoursPerWeek = GetApprovedHoursPerWeek(scap, costRatePeriods);
if (hoursPerWeek.HasValue && useIsCalculationWithFactor)
hoursPerWeek = ApplyIsCalculationWithFactor(relDC, hoursPerWeek);
hoursPerWeek = ApplyIsCalculationWithFactor(relDC, scap, hoursPerWeek);
return hoursPerWeek;
}
@@ -641,6 +651,20 @@ namespace BS.Shared.Services
return hoursPerWeek;
}
public virtual decimal? ApplyIsCalculationWithFactor(SupportConceptCostBearerRelDC relDC, SupportConceptApprovalPeriodDC scap, decimal? valueToApply)
{
DateTime dt = DateTime.Now;
if (scap.StartDate.HasValue && scap.StartDate.Value > dt)
{
dt = scap.StartDate.Value;
}
if (scap.EndDate.HasValue && scap.EndDate.Value < dt)
{
dt = scap.EndDate.Value;
}
return ApplyIsCalculationWithFactor(relDC, valueToApply, dt);
}
public virtual decimal? ApplyIsCalculationWithFactor(SupportConceptCostBearerRelDC relDC, decimal? valueToApply)
{
return ApplyIsCalculationWithFactor(relDC, valueToApply, DateTime.Now);