|
@@ -333,6 +333,7 @@ namespace PRSDesktop
|
|
finally
|
|
finally
|
|
{
|
|
{
|
|
Calendar.EnableUpdate();
|
|
Calendar.EnableUpdate();
|
|
|
|
+ Calendar.Refresh();
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -870,6 +871,7 @@ namespace PRSDesktop
|
|
: PRSDesktop.Resources.last.Fade(0.2F).AsBitmapImage(32, 32)
|
|
: PRSDesktop.Resources.last.Fade(0.2F).AsBitmapImage(32, 32)
|
|
};
|
|
};
|
|
|
|
|
|
|
|
+ Calendar.DisableUpdate();
|
|
Calendar.SelectedDate = DatePicker.SelectedDate.Value.Date; // RequiredReports[RequiredReportIndex].Item2.Date;
|
|
Calendar.SelectedDate = DatePicker.SelectedDate.Value.Date; // RequiredReports[RequiredReportIndex].Item2.Date;
|
|
|
|
|
|
//Assignments.Refresh();
|
|
//Assignments.Refresh();
|
|
@@ -908,7 +910,7 @@ namespace PRSDesktop
|
|
).Rows.FirstOrDefault();
|
|
).Rows.FirstOrDefault();
|
|
if (row != null)
|
|
if (row != null)
|
|
{
|
|
{
|
|
- notes = requiredreport.Notes;
|
|
|
|
|
|
+ notes = row.Get<TimeSheet, string>(x => x.Notes);
|
|
var tstart = row.Get<TimeSheet, TimeSpan>(x => x.Start);
|
|
var tstart = row.Get<TimeSheet, TimeSpan>(x => x.Start);
|
|
start = start > tstart ? tstart : start;
|
|
start = start > tstart ? tstart : start;
|
|
var tfinish = row.Get<TimeSheet, TimeSpan>(x => x.Finish);
|
|
var tfinish = row.Get<TimeSheet, TimeSpan>(x => x.Finish);
|
|
@@ -918,11 +920,18 @@ namespace PRSDesktop
|
|
}
|
|
}
|
|
|
|
|
|
if (IsReady)
|
|
if (IsReady)
|
|
|
|
+ {
|
|
|
|
+ Calendar.EnableUpdate();
|
|
Calendar.Refresh();
|
|
Calendar.Refresh();
|
|
|
|
+ Calendar.DisableUpdate();
|
|
|
|
+ }
|
|
Calendar.GetActiveWindow(Employee.ID, DatePicker.SelectedDate.Value, ref start, ref finish);
|
|
Calendar.GetActiveWindow(Employee.ID, DatePicker.SelectedDate.Value, ref start, ref finish);
|
|
|
|
|
|
Calendar.StartHour = start.Floor(TimeSpan.FromHours(1)).Hours;
|
|
Calendar.StartHour = start.Floor(TimeSpan.FromHours(1)).Hours;
|
|
Calendar.EndHour = finish.Ceiling(TimeSpan.FromHours(1)).Hours;
|
|
Calendar.EndHour = finish.Ceiling(TimeSpan.FromHours(1)).Hours;
|
|
|
|
+
|
|
|
|
+ Calendar.EnableUpdate();
|
|
|
|
+
|
|
Notes.Value = notes;
|
|
Notes.Value = notes;
|
|
|
|
|
|
SelectAssignment(null);
|
|
SelectAssignment(null);
|