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

Kalenderupdate funktioniert jetzt

Browse Source
This commit is contained in:
staccatomamba
2017-04-18 15:11:45 +02:00
parent f63017e69a
commit ffaf04e558
3 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1460,10 +1460,15 @@ namespace BeWo.Scheduler.View
var items = SelectedItems;
var testtesttest = ViewModel.ActiveAppointmentViewModel;
OnPropertyChanged("AllResources");
OnPropertyChanged("SelectedEmployees");
OnPropertyChanged("SelectedItems");
}
OnPropertyChanged("ViewModel");
Scheduler.ActiveView.LayoutChanged();
}
//private void ExportAsiCal(object sender, RoutedEventArgs e)
//{

7
BeWo/Scheduler/ViewModel/NewSchedulerViewModel.cs
View File

@@ -29,7 +29,7 @@ namespace BeWo.Scheduler.ViewModel
set
{
if (mActiveAppointmentViewModel == null && value != null || mActiveAppointmentViewModel != null && !mActiveAppointmentViewModel.Equals(value))
if(value != null)
{
mActiveAppointmentViewModel = value;
@@ -40,8 +40,6 @@ namespace BeWo.Scheduler.ViewModel
public void UpdateAppointmentViewModel(DateTime intervalStart, DateTime intervalEnd)
{
BeWoApp.MainControl.StartWaiting();
if (!BeWoApp.LoggedOnEmployee.EmployeeOid.HasValue)
{
return;
@@ -84,10 +82,9 @@ namespace BeWo.Scheduler.ViewModel
var vm = new SchedulerAppointmentListVM(prefilteredAppointments.ToList(), allCust, allEmps, mAllCats2ResInDic);
ActiveAppointmentViewModel = vm;
SchedulerSettings = GetActiveSettings();
SchedulerSettings.StartDate = intervalStart;
BeWoApp.MainControl.EndWaiting();
}
public AbstractAppointmentEditForm GetEditAppointmentForm(DevExpress.Xpf.Scheduler.SchedulerControl control, Appointment appointment)

11
BeWo/Scheduler/ViewModel/SchedulerAppointmentListVM.cs
View File

@@ -15,7 +15,6 @@ using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact;
using BS.Shared.Extensions;
using DevExpress.Data.Linq;
using DevExpress.Xpf.Scheduler;
using DevExpress.XtraScheduler;
using DevExpress.XtraScheduler.Native;
@@ -126,7 +125,7 @@ namespace BeWo.Scheduler.ViewModel
}
item.Description = "Privater Termin";
item.Subject = string.Format("Privat ({0})", item.Originator);
item.Subject = $"Privat ({item.Originator})";
}
}
@@ -462,11 +461,9 @@ namespace BeWo.Scheduler.ViewModel
switch (filterCategory)
{
case "NurEigene":
var istEigenerTermin = (ersteller != null && ersteller.EmployeeOid.Equals(BeWoApp.LoggedOnEmployee.EmployeeOid) && employeeList != null && employeeList.Count == 0) ||
(employeeList != null && employeeList.Any(a => a.Employee.EmployeeOid.Equals(BeWoApp.LoggedOnEmployee.EmployeeOid)));
var istEigenerTermin = ersteller != null && ersteller.EmployeeOid.Equals(BeWoApp.LoggedOnEmployee.EmployeeOid) && employeeList != null && employeeList.Count == 0 ||
employeeList != null && employeeList.Any(a => a.Employee.EmployeeOid.Equals(BeWoApp.LoggedOnEmployee.EmployeeOid));
wirdAngezeigt = istEigenerTermin;
@@ -479,7 +476,7 @@ namespace BeWo.Scheduler.ViewModel
var cfe = (employeeList == null ? new List<CompactEmployeeDC>() : employeeList.Select(s => s.Employee).ToList());
var cfe = employeeList?.Select(s => s.Employee).ToList() ?? new List<CompactEmployeeDC>();
var cfr = resourceList ?? new List<ResourceDC>();
var cfc = customerList ?? new List<CompactCustomerDC>();