From d089f9f77668d95d54b9d50bda712345f8cb6a7c Mon Sep 17 00:00:00 2001
From: =?utf8?q?Bellai=20=C3=81d=C3=A1m?= <USER\adam.bellai>
Date: Tue, 3 Oct 2017 13:29:01 +0000
Subject: [PATCH] git-tfs-id:
 [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C30516

---
 client/PlanAIRClient/TrafficAPI.cs        | 33 +++++++++--------------
 client/PlanAIRClient/TrafficIDSelector.cs | 18 +++++++++----
 2 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/client/PlanAIRClient/TrafficAPI.cs b/client/PlanAIRClient/TrafficAPI.cs
index 63940e5a..14061b97 100644
--- a/client/PlanAIRClient/TrafficAPI.cs
+++ b/client/PlanAIRClient/TrafficAPI.cs
@@ -308,16 +308,14 @@ namespace TrafficClient {
                 return null;
             List<MamResultWrapper> result = new List<MamResultWrapper>();
             foreach (clIFsp_EC_MAMPromotionalResult actual in sqlResult) {
-                //MamResultWrapper actualObject = new MamResultWrapper() {
-                //    MediaID = actual.v_MediaID,
-                //    EpisodeTitle = actual.v_EpTitle,
-                //    Title = actual.v_ProgTitle,
-                //    EpisodeNumber = actual.v_EpisodeID,
-                //    VariantID = actual.v_VariantID.HasValue ? actual.v_VariantID.Value : -1,
-                //    Episode = actual.v_Episode.HasValue ? actual.v_Episode.Value : (short)-1,
-                //    NextBroadcastDate = actual.v_NextBroadcastDate
-                //};
-                //result.Add(actualObject);
+                MamResultWrapper actualObject = new MamResultWrapper() {
+                    MediaID = actual.t_MediaID,
+                    EpisodeTitle = actual.v_Title,
+                    Title = actual.v_ProgTitle,
+                    Episode = actual.v_Episode.HasValue ? actual.v_Episode.Value : (short)-1,
+                    NextBroadcastDate = actual.t_PSStart
+                };
+                result.Add(actualObject);
             }
             return result;
         }
@@ -365,16 +363,11 @@ namespace TrafficClient {
                 return null;
             List<MamResultWrapper> result = new List<MamResultWrapper>();
             foreach (clIFsp_EC_MAMAdvertismentResult actual in sqlResult) {
-                //MamResultWrapper actualObject = new MamResultWrapper() {
-                //    MediaID = actual.v_MediaID,
-                //    EpisodeTitle = actual.v_EpTitle,
-                //    Title = actual.v_ProgTitle,
-                //    EpisodeNumber = actual.v_EpisodeID,
-                //    VariantID = actual.v_VariantID.HasValue ? actual.v_VariantID.Value : -1,
-                //    Episode = actual.v_Episode.HasValue ? actual.v_Episode.Value : (short)-1,
-                //    NextBroadcastDate = actual.v_NextBroadcastDate
-                //};
-                //result.Add(actualObject);
+                MamResultWrapper actualObject = new MamResultWrapper() {
+                    MediaID = actual.t_MediaID,
+                    Title = actual.v_Title
+                };
+                result.Add(actualObject);
             }
             return result;
         }
diff --git a/client/PlanAIRClient/TrafficIDSelector.cs b/client/PlanAIRClient/TrafficIDSelector.cs
index 4d293798..7108731b 100644
--- a/client/PlanAIRClient/TrafficIDSelector.cs
+++ b/client/PlanAIRClient/TrafficIDSelector.cs
@@ -88,22 +88,30 @@ namespace TrafficClient {
             MamResultWrapper[] result = null;
             if (radioButtonBroadCast.Checked)
                 result = trafficAPI.SearchBroadcast(searchText, from, to, copiaCheckBox.Checked)?.ToArray();
-            else if(radioButtonAD.Checked)
+            else if (radioButtonAD.Checked)
                 result = trafficAPI.SearchAdvertisement(searchText)?.ToArray();
-            else if(radioButtonPromo.Checked)
+            else if (radioButtonPromo.Checked)
                 result = trafficAPI.SearchPromotional(searchText)?.ToArray();
             if (result == null) {
                 dataGridView1.DataSource = null;
                 return;
             }
             List<MamResultWrapper> list = new List<MamResultWrapper>();
-            foreach (MamResultWrapper actual in result) {
+            foreach (MamResultWrapper actual in result) 
                 list.Add(actual);
-            }
-            list.Sort((x, y) => DateTime.Compare(x.NextBroadcastDate.Value, y.NextBroadcastDate.Value));
+            if (CanSort(list))
+                list.Sort((x, y) => DateTime.Compare(x.NextBroadcastDate.Value, y.NextBroadcastDate.Value));
             dataGridView1.DataSource = list;
         }
 
+        private bool CanSort(List<MamResultWrapper> list) {
+            foreach (MamResultWrapper actual in list) {
+                if (!actual.NextBroadcastDate.HasValue)
+                    return false;
+            }
+            return true;
+        }
+
         private void textBox1_KeyDown(object sender, KeyEventArgs e) {
             if (e.KeyCode == Keys.Enter) {
                 RefreshDataGridSource();
-- 
2.54.0