adds sort by date and include only notifications that pass checks

Author: cjakeman

Source/Documentation/Notifications.docx

@@ -136,7 +136,6 @@ void MainForm_Shown(object sender, EventArgs e)
         {
             var options = Environment.GetCommandLineArgs().Where(a => (a.StartsWith("-") || a.StartsWith("/"))).Select(a => a.Substring(1));
             Settings = new UserSettings(options);
-            NotificationManager = new NotificationManager(this, UpdateManager, Settings);
 
             LoadOptions();
             LoadLanguage();
@@ -245,6 +244,13 @@ orderby tool.Text
                 }
                 else
                     buttonDocuments.Enabled = false;
+
+                NotificationManager = new NotificationManager(this, UpdateManager, Settings, panelDetails
+                    , (Image)Resources.GetObject("Notification_previous")
+                    , (Image)Resources.GetObject("Notification_next")
+                    , (Image)Resources.GetObject("Notification_first")
+                    , (Image)Resources.GetObject("Notification_last")
+                    );
             }
 
             ShowEnvironment();
@@ -1443,13 +1449,6 @@ void comboBoxTimetable_EnabledChanged(object sender, EventArgs e)
         }
 
         #region NotificationPages
-        public int CurrentNotificationNo = 0;
-        private bool firstVisible = true;
-        private bool previousVisible = false;
-        private bool lastVisible = false;
-        private bool nextVisible = true;
-
-
         private void pbNotificationsNone_Click(object sender, EventArgs e)
         {
             ToggleNotificationPages();
@@ -1480,111 +1479,51 @@ private void ToggleNotificationPages()
 
         private void FiddleNewNotificationPageCount()
         {
-            //NotificationManager.LastPageViewed = 1;
+            //NotificationManager.LastPageViewed = 1; //TODO
             UpdateNotificationPageAlert();
         }
 
-        public void UpdateNotificationPageAlert()
-        {
-            if (NotificationManager.LastPageViewed >= NotificationManager.NewPageCount)
-            {
-                pbNotificationsSome.Visible = false;
-                lblNotificationCount.Visible = false;
-            }
-        }
-
-        void ShowNotificationPages()
+        public void ShowNotificationPages()
         {
             Win32.LockWindowUpdate(Handle);
             ClearPanel();
             NotificationManager.PopulatePage();
-            var notificationPage = GetCurrentNotificationPage();
-            notificationPage.FlowNDetails();
+            UpdateNotificationPageAlert();
+            NotificationManager.Page.FlowNDetails();
             Win32.LockWindowUpdate(IntPtr.Zero);
         }
 
-        /// <summary>
-        ///  INCOMPLETE
-        /// </summary>
-        /// <returns></returns>
-        NotificationPage GetCurrentNotificationPage()
-        {
-            return NotificationManager.Page;
-        }
-
-        /// <summary>
-        /// Returns a new notificationPage with default images and label
-        /// </summary>
-        /// <returns></returns>
-        public NotificationPage CreateNotificationPage()
-        // Located in MainForm to get access to MainForm.Resources
+        public void UpdateNotificationPageAlert()
         {
-            var previousImage = (Image)Resources.GetObject("Notification_previous");
-            var nextImage = (Image)Resources.GetObject("Notification_next");
-            var firstImage = (Image)Resources.GetObject("Notification_first");
-            var lastImage = (Image)Resources.GetObject("Notification_last");
-            var pageCount = $"{CurrentNotificationNo + 1}/{NotificationManager.Notifications.NotificationList.Count}";
-            return new NotificationPage(this, panelDetails, nextImage, previousImage, firstImage, lastImage, pageCount,
-                previousVisible, firstVisible, nextVisible, lastVisible);
+            if (NotificationManager.LastPageViewed >= NotificationManager.NewPageCount)
+            {
+                pbNotificationsSome.Visible = false;
+                lblNotificationCount.Visible = false;
+            }
         }
 
         // 3 should be enough, but is there a way to get unlimited buttons?
         public void Button0_Click(object sender, EventArgs e)
         {
-            GetCurrentNotificationPage().DoButton(UpdateManager, 0);
+            NotificationManager.Page.DoButton(UpdateManager, 0);
         }
         public void Button1_Click(object sender, EventArgs e)
         {
-            GetCurrentNotificationPage().DoButton(UpdateManager, 1);
+            NotificationManager.Page.DoButton(UpdateManager, 1);
         }
         public void Button2_Click(object sender, EventArgs e)
         {
-            GetCurrentNotificationPage().DoButton(UpdateManager, 2);
+            NotificationManager.Page.DoButton(UpdateManager, 2);
         }
 
         public void Next_Click(object sender, EventArgs e)
         {
-            ChangePage(1);
-            // GetCurrentNotificationPage().DoNext(1);
+            NotificationManager.ChangePage(1);
         }
 
         public void Previous_Click(object sender, EventArgs e)
         {
-            ChangePage(-1);
-            //GetCurrentNotificationPage().DoNext(-1);
-        }
-
-        private void ChangePage(int step)
-        {
-            SetVisibility(step);
-            CurrentNotificationNo += step;
-            ShowNotificationPages();
-        }
-
-        private void SetVisibility(int step)
-        {
-            if (step < 0)
-            {
-                if (CurrentNotificationNo + step <= 0)
-                {
-                    previousVisible = false;
-                    firstVisible = true;
-                    return;
-                }
-            }
-            else
-            {
-                if (CurrentNotificationNo + step >= NotificationManager.Notifications.NotificationList.Count - 1)
-                {
-                    nextVisible = false;
-                    lastVisible = true;
-                    return;
-                }
-            }
-            nextVisible = true;
-            lastVisible = false;
-            previousVisible = true;
-            firstVisible = false;
+            NotificationManager.ChangePage(-1);
         }
 
         #endregion NotificationPages