admin/ayanova7
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

case 3892

Browse Source
This commit is contained in:
John Cardinal
2021-06-22 19:13:05 +00:00
parent bc0e4dacc3
commit 86eea2e5fc
1 changed files with 146 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
source/WinFormApp/ScheduleFormEx.cs
View File

@@ -559,7 +559,7 @@ namespace AyaNova
//case 1219 - need user for more stuff below //case 1219 - need user for more stuff below
User currentUser=User.GetItem(User.CurrentThreadUserID); User currentUser = User.GetItem(User.CurrentThreadUserID);
mSelectedUserGroupID = currentUser.LastSchedGroupID; mSelectedUserGroupID = currentUser.LastSchedGroupID;
FillScheduleableUserGroupList(); FillScheduleableUserGroupList();
@@ -573,7 +573,11 @@ namespace AyaNova
//case 714 //case 714
sc.DayView.TopRowTime = TimeSpan.FromHours(8); sc.DayView.TopRowTime = TimeSpan.FromHours(8);
//NewDateRange();
//case 3892 restrict scrollable day view day to that day only as it's not working outside of the current day
sc.DayView.VisibleTime.Start = TimeSpan.FromHours(0);
sc.DayView.VisibleTime.End = TimeSpan.FromHours(24);
//************************************** //**************************************
@@ -661,7 +665,7 @@ namespace AyaNova
u.LastSchedStartDate = new CSLA.SmartDate(sc.ActiveView.GetVisibleIntervals().Start); u.LastSchedStartDate = new CSLA.SmartDate(sc.ActiveView.GetVisibleIntervals().Start);
u.LastSchedStopDate = new CSLA.SmartDate(sc.ActiveView.GetVisibleIntervals().End); u.LastSchedStopDate = new CSLA.SmartDate(sc.ActiveView.GetVisibleIntervals().End);
//case 1390 //case 1390
int nstartdays=(u.LastSchedStartDate.Date - DateTime.Today).Days; int nstartdays = (u.LastSchedStartDate.Date - DateTime.Today).Days;
int nstopdays = (u.LastSchedStopDate.Date - DateTime.Today).Days; int nstopdays = (u.LastSchedStopDate.Date - DateTime.Today).Days;
if (nstartdays == 0 && nstopdays == 1) if (nstartdays == 0 && nstopdays == 1)
{ {
@@ -672,9 +676,9 @@ namespace AyaNova
//case 1553 //case 1553
StateButtonTool sbt = (StateButtonTool)ToolBarManager.Tools["LT:UI.Toolbar.Schedule.ShowClosed"]; StateButtonTool sbt = (StateButtonTool)ToolBarManager.Tools["LT:UI.Toolbar.Schedule.ShowClosed"];
if (!sbt.Checked) if (!sbt.Checked)
u.ScheduleLastViewOpenOnly=true; u.ScheduleLastViewOpenOnly = true;
else else
u.ScheduleLastViewOpenOnly=false; u.ScheduleLastViewOpenOnly = false;
u.Save(); u.Save();
@@ -743,7 +747,7 @@ namespace AyaNova
Resource r = new Resource(Guid.Empty.ToString(), Util.LocaleText.GetLocalizedText("Dashboard.Label.NotAssigned"));//case 1821 Resource r = new Resource(Guid.Empty.ToString(), Util.LocaleText.GetLocalizedText("Dashboard.Label.NotAssigned"));//case 1821
//Lite version has no unscheduled user //Lite version has no unscheduled user
if(!AyaBizUtils.Lite) if (!AyaBizUtils.Lite)
ss.Resources.Add(r); ss.Resources.Add(r);
foreach (UserListScheduleable.UserListScheduleableInfo ui in uls) foreach (UserListScheduleable.UserListScheduleableInfo ui in uls)
@@ -1155,7 +1159,7 @@ namespace AyaNova
} }
} }
foreach(Control c in ctl.Controls) foreach (Control c in ctl.Controls)
HideDateRangeControlsInPreviewDialog(c); HideDateRangeControlsInPreviewDialog(c);
} }
@@ -1201,6 +1205,9 @@ namespace AyaNova
#region Events #region Events
#region Active view and date navigation events #region Active view and date navigation events
/// <summary> /// <summary>
/// Event fired when active view is about to change /// Event fired when active view is about to change
/// </summary> /// </summary>
@@ -1210,6 +1217,7 @@ namespace AyaNova
{ {
if (ignoreActiveViewChanging) if (ignoreActiveViewChanging)
return; return;
ShowView(e.NewView.Type); ShowView(e.NewView.Type);
e.Cancel = true; e.Cancel = true;
} }
@@ -1221,6 +1229,8 @@ namespace AyaNova
/// <param name="newView"></param> /// <param name="newView"></param>
private void ShowView(SchedulerViewType newView) private void ShowView(SchedulerViewType newView)
{ {
StateButtonTool sbt = (StateButtonTool)ToolBarManager.Tools["LT:UI.Toolbar.Schedule.TimeLineView"]; StateButtonTool sbt = (StateButtonTool)ToolBarManager.Tools["LT:UI.Toolbar.Schedule.TimeLineView"];
bool useTimeLineView = sbt.Checked; bool useTimeLineView = sbt.Checked;
ignoreActiveViewChanging = true; ignoreActiveViewChanging = true;
@@ -1230,9 +1240,12 @@ namespace AyaNova
if (useTimeLineView) if (useTimeLineView)
newView = SchedulerViewType.Timeline; newView = SchedulerViewType.Timeline;
else//case 714 else//case 714
{
sc.DayView.TopRowTime = TimeSpan.FromHours(8); sc.DayView.TopRowTime = TimeSpan.FromHours(8);
} }
}
sc.ActiveViewType = newView; sc.ActiveViewType = newView;
ignoreActiveViewChanging = false; ignoreActiveViewChanging = false;
@@ -1624,7 +1637,7 @@ namespace AyaNova
private void EditAppointment(Appointment apt) private void EditAppointment(Appointment apt)
{ {
if (apt.CustomFields==null || apt.CustomFields["AyaInfo"] == null) return; if (apt.CustomFields == null || apt.CustomFields["AyaInfo"] == null) return;
AppointmentList.AppointmentListInfo i = (AppointmentList.AppointmentListInfo)apt.CustomFields["AyaInfo"]; AppointmentList.AppointmentListInfo i = (AppointmentList.AppointmentListInfo)apt.CustomFields["AyaInfo"];
switch (i.SourceObjectType) switch (i.SourceObjectType)
@@ -1817,7 +1830,7 @@ namespace AyaNova
//case 1039 //log.Debug("FillScheduleableUserGroupList"); //case 1039 //log.Debug("FillScheduleableUserGroupList");
ComboBoxTool cbt = (ComboBoxTool)ToolBarManager.Tools["LT:UI.Toolbar.Schedule.SelectScheduleableUserGroup"]; ComboBoxTool cbt = (ComboBoxTool)ToolBarManager.Tools["LT:UI.Toolbar.Schedule.SelectScheduleableUserGroup"];
cbt.AutoComplete=true; cbt.AutoComplete = true;
cbt.ValueList.ValueListItems.Clear(); cbt.ValueList.ValueListItems.Clear();
cbt.ValueList.ValueListItems.Add(ScheduleableUserGroup.AllUsersGroupID, Util.LocaleText.GetLocalizedText("UI.Grid.RowFilterDropDownAllItem")); cbt.ValueList.ValueListItems.Add(ScheduleableUserGroup.AllUsersGroupID, Util.LocaleText.GetLocalizedText("UI.Grid.RowFilterDropDownAllItem"));
@@ -1831,7 +1844,7 @@ namespace AyaNova
//NVCHANGED //NVCHANGED
GenericNVList l = GenericNVList.GetList("aScheduleableUserGroup", "aID", "aName", true, true,false); GenericNVList l = GenericNVList.GetList("aScheduleableUserGroup", "aID", "aName", true, true, false);
//Loop through the items in the list and put them //Loop through the items in the list and put them
//into the combo box //into the combo box
@@ -1990,7 +2003,7 @@ namespace AyaNova
Rectangle ir = new Rectangle(e.Bounds.X, e.Bounds.Y, 16, 16); Rectangle ir = new Rectangle(e.Bounds.X, e.Bounds.Y, 16, 16);
Brush br = e.Cache.GetSolidBrush(Color.WhiteSmoke); Brush br = e.Cache.GetSolidBrush(Color.WhiteSmoke);
//case 739 //case 739
e.Cache.Paint.DrawImage(e.Graphics,Util.Flag(i.PriorityARGB), ir); e.Cache.Paint.DrawImage(e.Graphics, Util.Flag(i.PriorityARGB), ir);
} }
} }
@@ -2009,7 +2022,7 @@ namespace AyaNova
{ {
Rectangle ir = new Rectangle(e.Bounds.X, e.Bounds.Y, 16, 16); Rectangle ir = new Rectangle(e.Bounds.X, e.Bounds.Y, 16, 16);
Brush br = e.Cache.GetSolidBrush(Color.WhiteSmoke); Brush br = e.Cache.GetSolidBrush(Color.WhiteSmoke);
e.Cache.Paint.DrawImage(e.Graphics,Resource1.ScheduleMarker16, ir); e.Cache.Paint.DrawImage(e.Graphics, Resource1.ScheduleMarker16, ir);
} }
e.Handled = true; e.Handled = true;
@@ -2090,7 +2103,16 @@ namespace AyaNova
} }
#endregion date range change //case 3892
//void DayView_TopRowTimeChanged(object sender, DevExpress.XtraScheduler.Native.ChangeEventArgs e)
//{
// System.Diagnostics.Debug.WriteLine(DateTime.Now.ToString() + "DayView_TopRowTimeChanged fired");
// BindData();
//}
#endregion date range change
#region case 812 selected appointments #region case 812 selected appointments
@@ -2119,7 +2141,7 @@ namespace AyaNova
if (r.Id == null || string.IsNullOrEmpty(r.Id.ToString())) continue; if (r.Id == null || string.IsNullOrEmpty(r.Id.ToString())) continue;
Guid id = new Guid(r.Id.ToString()); Guid id = new Guid(r.Id.ToString());
if (id == Guid.Empty) continue; if (id == Guid.Empty) continue;
if(r.Visible) if (r.Visible)
usrs.Add(id); usrs.Add(id);
} }