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

CB Bugfix: UpdateVM für zwei Spezialfälle im SchedulerView hinzugefügt.

Browse Source
This commit is contained in:
Christian
2017-12-20 00:19:09 +01:00
parent 32c5f53845
commit 82056f3112
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BeWo/Scheduler/View/NewSchedulerView.xaml.cs
View File

@@ -727,6 +727,7 @@ namespace BeWo.Scheduler.View
if (CheckBoxConverter != null && SelectedResources != null)
{
CheckBoxConverter.SelektierteRessourcen = SelectedResources;
UpdateVM(true);
}
}
@@ -785,6 +786,7 @@ namespace BeWo.Scheduler.View
if (employee != null && employee.Equals(BeWoApp.CompactLoggedOnEmployee))
{
ZeigeNurMeineTermine = false;
UpdateVM(true);
}
else if (SelectedEmployees.Count == 1 && SelectedEmployees.First().Equals(BeWoApp.CompactLoggedOnEmployee))
{

3
Data/Access/SearchDAO.cs
View File

@@ -2342,7 +2342,8 @@ namespace BeWo.Data.Access
var detachedCriteria2 = DetachedCriteria.For<Employee2SchedulerAppointment>()
.SetProjection(
Projections.Property(Employee2SchedulerAppointment.PropertyName_SchedulerAppointment));
Projections.Property(Employee2SchedulerAppointment.PropertyName_SchedulerAppointment))
.Add(Restrictions.IsNotNull(Employee2SchedulerAppointment.PropertyName_SchedulerAppointment));
ownAppointmentCriterion = Restrictions.Or(
Restrictions.And(Restrictions.Eq(SchedulerAppointment.PropertyName_Originator + ".Oid", pEmployeeOid), Subqueries.PropertyNotIn(BeWoEntityBase.PropertyName_Oid, detachedCriteria2)),