git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube...

diff --git a/client/PlanAIRClient/TrafficAPI.cs b/client/PlanAIRClient/TrafficAPI.cs
index 63940e5a6d129ff91f26a05fca22f21a75f596ac..14061b97fb4806abcd76c1e17e3e927101ad5a00 100644 (file)
--- a/client/PlanAIRClient/TrafficAPI.cs
+++ b/client/PlanAIRClient/TrafficAPI.cs
@@ -308,16 +308,14 @@ namespace TrafficClient {
                 return null;\r
             List<MamResultWrapper> result = new List<MamResultWrapper>();\r
             foreach (clIFsp_EC_MAMPromotionalResult actual in sqlResult) {\r
-                //MamResultWrapper actualObject = new MamResultWrapper() {\r
-                //    MediaID = actual.v_MediaID,\r
-                //    EpisodeTitle = actual.v_EpTitle,\r
-                //    Title = actual.v_ProgTitle,\r
-                //    EpisodeNumber = actual.v_EpisodeID,\r
-                //    VariantID = actual.v_VariantID.HasValue ? actual.v_VariantID.Value : -1,\r
-                //    Episode = actual.v_Episode.HasValue ? actual.v_Episode.Value : (short)-1,\r
-                //    NextBroadcastDate = actual.v_NextBroadcastDate\r
-                //};\r
-                //result.Add(actualObject);\r
+                MamResultWrapper actualObject = new MamResultWrapper() {\r
+                    MediaID = actual.t_MediaID,\r
+                    EpisodeTitle = actual.v_Title,\r
+                    Title = actual.v_ProgTitle,\r
+                    Episode = actual.v_Episode.HasValue ? actual.v_Episode.Value : (short)-1,\r
+                    NextBroadcastDate = actual.t_PSStart\r
+                };\r
+                result.Add(actualObject);\r
             }\r
             return result;\r
         }\r
@@ -365,16 +363,11 @@ namespace TrafficClient {
                 return null;\r
             List<MamResultWrapper> result = new List<MamResultWrapper>();\r
             foreach (clIFsp_EC_MAMAdvertismentResult actual in sqlResult) {\r
-                //MamResultWrapper actualObject = new MamResultWrapper() {\r
-                //    MediaID = actual.v_MediaID,\r
-                //    EpisodeTitle = actual.v_EpTitle,\r
-                //    Title = actual.v_ProgTitle,\r
-                //    EpisodeNumber = actual.v_EpisodeID,\r
-                //    VariantID = actual.v_VariantID.HasValue ? actual.v_VariantID.Value : -1,\r
-                //    Episode = actual.v_Episode.HasValue ? actual.v_Episode.Value : (short)-1,\r
-                //    NextBroadcastDate = actual.v_NextBroadcastDate\r
-                //};\r
-                //result.Add(actualObject);\r
+                MamResultWrapper actualObject = new MamResultWrapper() {\r
+                    MediaID = actual.t_MediaID,\r
+                    Title = actual.v_Title\r
+                };\r
+                result.Add(actualObject);\r
             }\r
             return result;\r
         }\r

diff --git a/client/PlanAIRClient/TrafficIDSelector.cs b/client/PlanAIRClient/TrafficIDSelector.cs
index 4d2937987c6d1b4941a9c4a67cc2e96ecce25135..7108731b2b46786f9f383932cb015ae3dfb8724d 100644 (file)
--- a/client/PlanAIRClient/TrafficIDSelector.cs
+++ b/client/PlanAIRClient/TrafficIDSelector.cs
@@ -88,22 +88,30 @@ namespace TrafficClient {
             MamResultWrapper[] result = null;\r
             if (radioButtonBroadCast.Checked)\r
                 result = trafficAPI.SearchBroadcast(searchText, from, to, copiaCheckBox.Checked)?.ToArray();\r
-            else if(radioButtonAD.Checked)\r
+            else if (radioButtonAD.Checked)\r
                 result = trafficAPI.SearchAdvertisement(searchText)?.ToArray();\r
-            else if(radioButtonPromo.Checked)\r
+            else if (radioButtonPromo.Checked)\r
                 result = trafficAPI.SearchPromotional(searchText)?.ToArray();\r
             if (result == null) {\r
                 dataGridView1.DataSource = null;\r
                 return;\r
             }\r
             List<MamResultWrapper> list = new List<MamResultWrapper>();\r
-            foreach (MamResultWrapper actual in result) {\r
+            foreach (MamResultWrapper actual in result) \r
                 list.Add(actual);\r
-            }\r
-            list.Sort((x, y) => DateTime.Compare(x.NextBroadcastDate.Value, y.NextBroadcastDate.Value));\r
+            if (CanSort(list))\r
+                list.Sort((x, y) => DateTime.Compare(x.NextBroadcastDate.Value, y.NextBroadcastDate.Value));\r
             dataGridView1.DataSource = list;\r
         }\r
 \r
+        private bool CanSort(List<MamResultWrapper> list) {\r
+            foreach (MamResultWrapper actual in list) {\r
+                if (!actual.NextBroadcastDate.HasValue)\r
+                    return false;\r
+            }\r
+            return true;\r
+        }\r
+\r
         private void textBox1_KeyDown(object sender, KeyEventArgs e) {\r
             if (e.KeyCode == Keys.Enter) {\r
                 RefreshDataGridSource();\r