git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube...
authorVásáry Dániel <daniel.vasary@userrendszerhaz.hu>
Thu, 2 Nov 2017 17:02:38 +0000 (17:02 +0000)
committerVásáry Dániel <daniel.vasary@userrendszerhaz.hu>
Thu, 2 Nov 2017 17:02:38 +0000 (17:02 +0000)
12 files changed:
client/DxPlay/PlayerForm.cs
client/DxPlay/StringResource.Designer.cs
client/DxPlay/StringResource.resx
client/Maestro/Configuration/configuration-playout.json
client/PlanAIRClient/Resources.Designer.cs
client/PlanAIRClient/Resources.resx
client/PlanAIRClient/TrafficAPI.cs
client/PlanAIRClient/TrafficIDSelector.cs
client/PlanAIRClient/TrafficIDSelectorColumns.cs
client/PlanAIRClient/Workers/ADWorker.cs
client/PlanAIRClient/Workers/MaterialWorker.cs
client/PlanAIRClient/Workers/PromoWorker.cs

index b26d3bc006f035a607765817b33a669d20c79aaa..da203d150e8a50f8e9348459934163dccf94c9d9 100644 (file)
@@ -44,17 +44,17 @@ namespace DxPlay {
         private void InitializeTexts() {\r
             defineOneSegmentToolStripMenuItem.Text = StringResource.SZEGMENS_DEFINIALASA;\r
             splitSegmentAtCurrentPositionToolStripMenuItem.Text = StringResource.SZEGMENS_SZETVAGASA;\r
-            actualPositionToIntroToolStripMenuItem.Text = StringResource.AKTUALIS_POZICIO_BEMENOKENT;\r
-            actualPositionToOutroToolStripMenuItem.Text = StringResource.AKTUALIS_POZICIO_KIMENOKENT;\r
+            actualPositionToIntroToolStripMenuItem.Text = StringResource.AKTUALIS_POZICIO_BELEPO;\r
+            actualPositionToOutroToolStripMenuItem.Text = StringResource.AKTUALIS_POZICIO_KILEPO;\r
             deleteSegmentToolStripMenuItem.Text = StringResource.SZEGMENS_TORLESE;\r
-            menuButtonSegmentActions.Text = StringResource.SZEGMENS_AKCIÓK;\r
+            menuButtonSegmentActions.Text = StringResource.SZEGMENSEK;\r
 \r
             btnPause.Text = StringResource.SZUNET;\r
             btnPlay.Text = StringResource.LEJATSZAS;\r
             btnStop.Text = StringResource.LEALLITAS;\r
             labelStatus.Text = StringResource.NINCS_BEMENET;\r
             label1.Text = StringResource.INDULASI_PONT;\r
-            label2.Text = StringResource.IDOTARTAM;\r
+            label2.Text = StringResource.HOSSZ;\r
         }\r
 \r
         private void cueue() {\r
@@ -484,10 +484,10 @@ namespace DxPlay {
         private void dgSegments_ColumnAdded(object sender, DataGridViewColumnEventArgs e) {\r
             int index = e.Column.Index;\r
             switch (index) {\r
-                case 0: e.Column.HeaderText = StringResource.BEMENO; break;\r
-                case 1: e.Column.HeaderText = StringResource.KIMENÕ; break;\r
-                case 2: e.Column.HeaderText = StringResource.VALASZTHATO; break;\r
-                case 3: e.Column.HeaderText = StringResource.KOMMENT; break;\r
+                case 0: e.Column.HeaderText = StringResource.BELEPO; break;\r
+                case 1: e.Column.HeaderText = StringResource.KILEPO; break;\r
+                case 2: e.Column.HeaderText = StringResource.ELHAGYHATO; break;\r
+                case 3: e.Column.HeaderText = StringResource.MEGJEGYZES; break;\r
             }\r
         }\r
     }\r
index b7a9f3dd5d1f4c2d197dc9997b4885009aff6e19..c4c11017848d5aa71398120e76af2acabb49ff85 100644 (file)
@@ -61,38 +61,47 @@ namespace DxPlay {
         }\r
         \r
         /// <summary>\r
-        ///   Looks up a localized string similar to Aktuális pozíció bemenőként.\r
+        ///   Looks up a localized string similar to Aktuális pozíció belépőként.\r
         /// </summary>\r
-        internal static string AKTUALIS_POZICIO_BEMENOKENT {\r
+        internal static string AKTUALIS_POZICIO_BELEPO {\r
             get {\r
-                return ResourceManager.GetString("AKTUALIS_POZICIO_BEMENOKENT", resourceCulture);\r
+                return ResourceManager.GetString("AKTUALIS_POZICIO_BELEPO", resourceCulture);\r
             }\r
         }\r
         \r
         /// <summary>\r
-        ///   Looks up a localized string similar to Aktuális pozíció kimenőként.\r
+        ///   Looks up a localized string similar to Aktuális pozíció kilépőként.\r
         /// </summary>\r
-        internal static string AKTUALIS_POZICIO_KIMENOKENT {\r
+        internal static string AKTUALIS_POZICIO_KILEPO {\r
             get {\r
-                return ResourceManager.GetString("AKTUALIS_POZICIO_KIMENOKENT", resourceCulture);\r
+                return ResourceManager.GetString("AKTUALIS_POZICIO_KILEPO", resourceCulture);\r
             }\r
         }\r
         \r
         /// <summary>\r
-        ///   Looks up a localized string similar to Bemenő.\r
+        ///   Looks up a localized string similar to Belépő.\r
         /// </summary>\r
-        internal static string BEMENO {\r
+        internal static string BELEPO {\r
             get {\r
-                return ResourceManager.GetString("BEMENO", resourceCulture);\r
+                return ResourceManager.GetString("BELEPO", resourceCulture);\r
             }\r
         }\r
         \r
         /// <summary>\r
-        ///   Looks up a localized string similar to Időtartam.\r
+        ///   Looks up a localized string similar to Elhagyható.\r
         /// </summary>\r
-        internal static string IDOTARTAM {\r
+        internal static string ELHAGYHATO {\r
             get {\r
-                return ResourceManager.GetString("IDOTARTAM", resourceCulture);\r
+                return ResourceManager.GetString("ELHAGYHATO", resourceCulture);\r
+            }\r
+        }\r
+        \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to Hossz.\r
+        /// </summary>\r
+        internal static string HOSSZ {\r
+            get {\r
+                return ResourceManager.GetString("HOSSZ", resourceCulture);\r
             }\r
         }\r
         \r
@@ -124,20 +133,11 @@ namespace DxPlay {
         }\r
         \r
         /// <summary>\r
-        ///   Looks up a localized string similar to Kimenő.\r
-        /// </summary>\r
-        internal static string KIMENŐ {\r
-            get {\r
-                return ResourceManager.GetString("KIMENŐ", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to Komment.\r
+        ///   Looks up a localized string similar to Kilépő.\r
         /// </summary>\r
-        internal static string KOMMENT {\r
+        internal static string KILEPO {\r
             get {\r
-                return ResourceManager.GetString("KOMMENT", resourceCulture);\r
+                return ResourceManager.GetString("KILEPO", resourceCulture);\r
             }\r
         }\r
         \r
@@ -169,20 +169,20 @@ namespace DxPlay {
         }\r
         \r
         /// <summary>\r
-        ///   Looks up a localized string similar to NINCS BEMENET.\r
+        ///   Looks up a localized string similar to Megjegyzés.\r
         /// </summary>\r
-        internal static string NINCS_BEMENET {\r
+        internal static string MEGJEGYZES {\r
             get {\r
-                return ResourceManager.GetString("NINCS_BEMENET", resourceCulture);\r
+                return ResourceManager.GetString("MEGJEGYZES", resourceCulture);\r
             }\r
         }\r
         \r
         /// <summary>\r
-        ///   Looks up a localized string similar to Szegmens akciók.\r
+        ///   Looks up a localized string similar to NINCS BEMENET.\r
         /// </summary>\r
-        internal static string SZEGMENS_AKCIÓK {\r
+        internal static string NINCS_BEMENET {\r
             get {\r
-                return ResourceManager.GetString("SZEGMENS_AKCIÓK", resourceCulture);\r
+                return ResourceManager.GetString("NINCS_BEMENET", resourceCulture);\r
             }\r
         }\r
         \r
@@ -196,7 +196,7 @@ namespace DxPlay {
         }\r
         \r
         /// <summary>\r
-        ///   Looks up a localized string similar to Szegment szétvágása az aktuális pozíciónál.\r
+        ///   Looks up a localized string similar to Szegmens szétvágása.\r
         /// </summary>\r
         internal static string SZEGMENS_SZETVAGASA {\r
             get {\r
@@ -214,29 +214,29 @@ namespace DxPlay {
         }\r
         \r
         /// <summary>\r
-        ///   Looks up a localized string similar to Szunet.\r
+        ///   Looks up a localized string similar to Szegmensek.\r
         /// </summary>\r
-        internal static string SZUNET {\r
+        internal static string SZEGMENSEK {\r
             get {\r
-                return ResourceManager.GetString("SZUNET", resourceCulture);\r
+                return ResourceManager.GetString("SZEGMENSEK", resourceCulture);\r
             }\r
         }\r
         \r
         /// <summary>\r
-        ///   Looks up a localized string similar to Szüneteltetett.\r
+        ///   Looks up a localized string similar to Szünet.\r
         /// </summary>\r
-        internal static string SZUNETELTETETT {\r
+        internal static string SZUNET {\r
             get {\r
-                return ResourceManager.GetString("SZUNETELTETETT", resourceCulture);\r
+                return ResourceManager.GetString("SZUNET", resourceCulture);\r
             }\r
         }\r
         \r
         /// <summary>\r
-        ///   Looks up a localized string similar to Választható.\r
+        ///   Looks up a localized string similar to Szüneteltetett.\r
         /// </summary>\r
-        internal static string VALASZTHATO {\r
+        internal static string SZUNETELTETETT {\r
             get {\r
-                return ResourceManager.GetString("VALASZTHATO", resourceCulture);\r
+                return ResourceManager.GetString("SZUNETELTETETT", resourceCulture);\r
             }\r
         }\r
     }\r
index ff82ae3a841adaa189811a1e4fa954df205f2889..7c58c97dd2944ecb31f39cebeaa395042b78302f 100644 (file)
   <resheader name="writer">\r
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
   </resheader>\r
-  <data name="AKTUALIS_POZICIO_BEMENOKENT" xml:space="preserve">\r
-    <value>Aktuális pozíció bemenőként</value>\r
+  <data name="AKTUALIS_POZICIO_BELEPO" xml:space="preserve">\r
+    <value>Aktuális pozíció belépőként</value>\r
   </data>\r
-  <data name="AKTUALIS_POZICIO_KIMENOKENT" xml:space="preserve">\r
-    <value>Aktuális pozíció kimenőként</value>\r
+  <data name="AKTUALIS_POZICIO_KILEPO" xml:space="preserve">\r
+    <value>Aktuális pozíció kilépőként</value>\r
   </data>\r
-  <data name="BEMENO" xml:space="preserve">\r
-    <value>Bemenő</value>\r
+  <data name="BELEPO" xml:space="preserve">\r
+    <value>Belépő</value>\r
   </data>\r
-  <data name="IDOTARTAM" xml:space="preserve">\r
-    <value>Időtartam</value>\r
+  <data name="ELHAGYHATO" xml:space="preserve">\r
+    <value>Elhagyható</value>\r
+  </data>\r
+  <data name="HOSSZ" xml:space="preserve">\r
+    <value>Hossz</value>\r
   </data>\r
   <data name="INDITAS" xml:space="preserve">\r
     <value>Indítás</value>\r
   <data name="KILEPES" xml:space="preserve">\r
     <value>Kilépés</value>\r
   </data>\r
-  <data name="KIMENŐ" xml:space="preserve">\r
-    <value>Kimenő</value>\r
-  </data>\r
-  <data name="KOMMENT" xml:space="preserve">\r
-    <value>Komment</value>\r
+  <data name="KILEPO" xml:space="preserve">\r
+    <value>Kilépő</value>\r
   </data>\r
   <data name="LEALLITAS" xml:space="preserve">\r
     <value>Leállítás</value>\r
   <data name="MEGALLITVA" xml:space="preserve">\r
     <value>Megállítva</value>\r
   </data>\r
+  <data name="MEGJEGYZES" xml:space="preserve">\r
+    <value>Megjegyzés</value>\r
+  </data>\r
   <data name="NINCS_BEMENET" xml:space="preserve">\r
     <value>NINCS BEMENET</value>\r
   </data>\r
-  <data name="SZEGMENS_AKCIÓK" xml:space="preserve">\r
-    <value>Szegmens akciók</value>\r
+  <data name="SZEGMENSEK" xml:space="preserve">\r
+    <value>Szegmensek</value>\r
   </data>\r
   <data name="SZEGMENS_DEFINIALASA" xml:space="preserve">\r
     <value>Szegmens definiálása</value>\r
   </data>\r
   <data name="SZEGMENS_SZETVAGASA" xml:space="preserve">\r
-    <value>Szegment szétvágása az aktuális pozíciónál</value>\r
+    <value>Szegmens szétvágása</value>\r
   </data>\r
   <data name="SZEGMENS_TORLESE" xml:space="preserve">\r
     <value>Szegmens törlése</value>\r
   </data>\r
   <data name="SZUNET" xml:space="preserve">\r
-    <value>Szunet</value>\r
+    <value>Szünet</value>\r
   </data>\r
   <data name="SZUNETELTETETT" xml:space="preserve">\r
     <value>Szüneteltetett</value>\r
   </data>\r
-  <data name="VALASZTHATO" xml:space="preserve">\r
-    <value>Választható</value>\r
-  </data>\r
 </root>
\ No newline at end of file
index 27f522f044a3c6200212f3e96115f416ec439ec5..abf37876fcd3288f9530bf2444a12837d958be55 100644 (file)
@@ -1,6 +1,6 @@
 {\r
   "title": "Adáslebony",\r
-  "active": false,\r
+  "active": true,\r
   "startInTray": true,\r
   "enableCustomMetadataId": true,\r
   "player": {\r
index 19848c5c8c0ac501ba54d080d25794954ea6e4ce..118a153038c2b92f2ac5f5c66d6a000fcb01bcc7 100644 (file)
@@ -69,6 +69,15 @@ namespace TrafficClient {
             }\r
         }\r
         \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to Első adás.\r
+        /// </summary>\r
+        internal static string ELSO_ADASNAP {\r
+            get {\r
+                return ResourceManager.GetString("ELSO_ADASNAP", resourceCulture);\r
+            }\r
+        }\r
+        \r
         /// <summary>\r
         ///   Looks up a localized string similar to Epizódszám.\r
         /// </summary>\r
@@ -78,6 +87,15 @@ namespace TrafficClient {
             }\r
         }\r
         \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to Epizód azonosító.\r
+        /// </summary>\r
+        internal static string EPIZOD_AZONOSITO {\r
+            get {\r
+                return ResourceManager.GetString("EPIZOD_AZONOSITO", resourceCulture);\r
+            }\r
+        }\r
+        \r
         /// <summary>\r
         ///   Looks up a localized string similar to Epizodcím.\r
         /// </summary>\r
index 7aee329dd95247e5678395895927f7056bd9860a..446f7d395facfe64edfce3412f83ef914269751f 100644 (file)
   <data name="CIM" xml:space="preserve">\r
     <value>Cím</value>\r
   </data>\r
+  <data name="ELSO_ADASNAP" xml:space="preserve">\r
+    <value>Első adás</value>\r
+  </data>\r
   <data name="EPIZOD" xml:space="preserve">\r
     <value>Epizódszám</value>\r
   </data>\r
+  <data name="EPIZOD_AZONOSITO" xml:space="preserve">\r
+    <value>Epizód azonosító</value>\r
+  </data>\r
   <data name="EPIZOD_CIM" xml:space="preserve">\r
     <value>Epizodcím</value>\r
   </data>\r
index c327fce425547ce10dce59a9e688921b6bfd7d52..31b752372ac419aad53cc418e0c32d84a35a17fc 100644 (file)
@@ -61,16 +61,16 @@ namespace TrafficClient {
             }\r
         }\r
 \r
-        public List<TrafficItem> GetPromos(string search, bool problematic) {\r
-            return promoWorker.GetPromos(search, problematic);\r
+        public List<TrafficItem> GetPromos(string search, bool problematic, DateTime? from = null, DateTime? to = null) {\r
+            return promoWorker.GetPromos(search, problematic, from, to);\r
         }\r
 \r
         public List<TrafficItemMetadata> GetPromoArchiveMetadata(string strParam) {\r
             return promoWorker.GetPromoArchiveMetadata(strParam);\r
         }\r
 \r
-        public List<TrafficItem> GetADs(string search, bool problematic) {\r
-            return adWorker.GetADs(search, problematic);\r
+        public List<TrafficItem> GetADs(string search, bool problematic, DateTime? from = null, DateTime? to = null) {\r
+            return adWorker.GetADs(search, problematic, from, to);\r
         }\r
 \r
         public List<TrafficItemMetadata> GetADArchiveMetadata(string strParam) {\r
index 555549c4149a071eaf29471c0eba465ca6e9fb21..d7a8741f89e93804f994bfbbb6381a84b3223e30 100644 (file)
@@ -46,23 +46,21 @@ namespace TrafficClient {
             ClearSelection();\r
             Cursor.Current = Cursors.WaitCursor;\r
             string searchText = textBox1.Text;\r
-            DateTime? from = null;\r
-            DateTime? to = null;\r
-            if (scheduledDate.Checked) {\r
-                from = scheduledDate.Value;\r
-                to = scheduledDate.Value.AddDays(1);\r
-            }\r
+            DateTime? scheduledDate = null;\r
+            if (this.scheduledDate.Checked)\r
+                scheduledDate = this.scheduledDate.Value.Date;\r
+            \r
             List<TrafficItem> items = null;\r
             dgTraffic.Columns.Clear();\r
             if (rbMaterial.Checked) {\r
                 dgTraffic.Columns.AddRange(GetMaterialColumns());\r
-                items = trafficAPI.GetMaterials(searchText, chkProblematic.Checked, from, to);\r
+                items = trafficAPI.GetMaterials(searchText, chkProblematic.Checked, scheduledDate, scheduledDate);\r
             } else if (rbAD.Checked) {\r
                 dgTraffic.Columns.AddRange(GetADColumns());\r
-                items = trafficAPI.GetADs(searchText, chkProblematic.Checked);\r
+                items = trafficAPI.GetADs(searchText, chkProblematic.Checked, scheduledDate, scheduledDate);\r
             } else if (rbPromo.Checked) {\r
                 dgTraffic.Columns.AddRange(GetPromoColumns());\r
-                items = trafficAPI.GetPromos(searchText, chkProblematic.Checked);\r
+                items = trafficAPI.GetPromos(searchText, chkProblematic.Checked, scheduledDate, scheduledDate);\r
             }\r
             if (items == null) {\r
                 dgTraffic.DataSource = null;\r
@@ -140,10 +138,12 @@ namespace TrafficClient {
         public bool OK { get; set; }\r
         public string Title { get; set; }\r
         public DateTime? NextBroadcastDate { get; set; }\r
+        public DateTime? FirstBroadcastDate { get; set; }\r
         public short SegmentCount { get; set; }\r
         public short EpisodeNumber { get; set; }\r
         public string EpisodeTitle { get; set; }\r
         public int VariantID { get; set; }\r
+        public string EpisodeID { get; set; }\r
     }\r
 \r
     public class TrafficItemMetadata {\r
index 4b2d3220a3aa6f7656bd53416d4f7e3b154c229f..bf8d65be076a919bbd352b139fa2a1c1bb79b60f 100644 (file)
@@ -32,6 +32,18 @@ namespace TrafficClient {
                     HeaderText = Resources.EPIZOD,\r
                     Width = 100\r
                 },\r
+                new DataGridViewTextBoxColumn() {\r
+                    AutoSizeMode = DataGridViewAutoSizeColumnMode.None,\r
+                    DataPropertyName = "EpisodeID",\r
+                    HeaderText = Resources.EPIZOD_AZONOSITO,\r
+                    Width = 100\r
+                },\r
+                new DataGridViewTextBoxColumn() {\r
+                    AutoSizeMode = DataGridViewAutoSizeColumnMode.None,\r
+                    DataPropertyName = "FirsBroadcastDate",\r
+                    HeaderText = Resources.ELSO_ADASNAP,\r
+                    Width = 100\r
+                },\r
                 new DataGridViewTextBoxColumn() {\r
                     AutoSizeMode = DataGridViewAutoSizeColumnMode.None,\r
                     DataPropertyName = "NextBroadcastDate",\r
index 2e718cb2ab9e064bda3daf46cdd812e3378a7d92..7dd574aa6c931447f7196440d14f1628ea7fb22e 100644 (file)
@@ -32,19 +32,24 @@ namespace TrafficClient.Workers {
             };\r
         }\r
 \r
-        public List<TrafficItem> GetADs(string search, bool problematic) {\r
+        public List<TrafficItem> GetADs(string search, bool problematic, DateTime? from = null, DateTime? to = null) {\r
             List<TrafficItem> result = null;\r
             try {\r
                 TryConnect();\r
                 using (SqlCommand cmd = new SqlCommand("dbo.clIFsp_EC_MAM", connection)) {\r
                     cmd.CommandType = CommandType.StoredProcedure;\r
-                    cmd.Parameters.AddWithValue("@Operation", 3001);\r
+                    //cmd.Parameters.AddWithValue("@Operation", 3001);\r
+                    cmd.Parameters.AddWithValue("@Operation", 3002);\r
                     if (problematic)\r
                         cmd.Parameters.AddWithValue("@@@Options", 1);\r
                     else\r
                         cmd.Parameters.AddWithValue("@@@Options", 0);\r
                     cmd.Parameters.AddWithValue("@@ItemID", DBNull.Value);\r
                     cmd.Parameters.AddWithValue("@@StrParam1", search);\r
+                    if (from != null)\r
+                        cmd.Parameters.AddWithValue("@@DateParam1", from.Value.Date);\r
+                    if (to != null)\r
+                        cmd.Parameters.AddWithValue("@@DateParam2", to.Value.Date);\r
                     using (SqlDataReader reader = cmd.ExecuteReader()) {\r
                         while (reader.Read()) {\r
                             if (result == null)\r
index 093c6cc0caa83162ff444b8876bb5a2b47e4fe89..3dd7750374276cd459623430c2b3ccb27583560e 100644 (file)
@@ -26,6 +26,8 @@ namespace TrafficClient.Workers {
                 VariantID = data.v_VariantID.HasValue ? data.v_VariantID.Value : 0,\r
                 EpisodeNumber = data.v_Episode.HasValue ? data.v_Episode.Value : (short)0,\r
                 NextBroadcastDate = data.v_NextBroadcastDate,\r
+                FirstBroadcastDate = data.v_FirstBroadcastDate,\r
+                EpisodeID = data.v_EpisodeID,\r
                 OK = data.v_OkForAir != null && "OK".Equals(data.v_OkForAir)\r
             };\r
         }\r
@@ -45,13 +47,18 @@ namespace TrafficClient.Workers {
                 TryConnect();\r
                 using (SqlCommand cmd = new SqlCommand("dbo.clIFsp_EC_MAM", connection)) {\r
                     cmd.CommandType = CommandType.StoredProcedure;\r
-                    cmd.Parameters.AddWithValue("@Operation", 1001);\r
-                    cmd.Parameters.AddWithValue("@@ItemID", DBNull.Value);\r
+//                    cmd.Parameters.AddWithValue("@Operation", 1001);\r
+                    cmd.Parameters.AddWithValue("@Operation", 1002);\r
+                    //if (problematic)\r
+                    //    cmd.Parameters.AddWithValue("@@@Options", 8);\r
+                    //else\r
+                    //    cmd.Parameters.AddWithValue("@@@Options", 0);\r
                     if (problematic)\r
-                        cmd.Parameters.AddWithValue("@@@Options", 8);\r
-                    else \r
+                        cmd.Parameters.AddWithValue("@@@Options", 1);\r
+                    else\r
                         cmd.Parameters.AddWithValue("@@@Options", 0);\r
-                    \r
+\r
+                    cmd.Parameters.AddWithValue("@@ItemID", DBNull.Value);\r
                     if (!String.IsNullOrEmpty(search))\r
                         cmd.Parameters.AddWithValue("@@StrParam1", search);\r
                     if (from != null)\r
index 0a7414cef388c79081705e8ba503ae08c09c5c73..643dd952c6e13ae04be6686dd772982360079b9b 100644 (file)
@@ -38,19 +38,24 @@ namespace TrafficClient.Workers {
             };\r
         }\r
 \r
-        public List<TrafficItem> GetPromos(string search, bool problematic) {\r
+        public List<TrafficItem> GetPromos(string search, bool problematic, DateTime? from = null, DateTime? to = null) {\r
             List<TrafficItem> result = null;\r
             try {\r
                 TryConnect();\r
                 using (SqlCommand cmd = new SqlCommand("dbo.clIFsp_EC_MAM", connection)) {\r
                     cmd.CommandType = CommandType.StoredProcedure;\r
-                    cmd.Parameters.AddWithValue("@Operation", 2001);\r
+                    //cmd.Parameters.AddWithValue("@Operation", 2001);\r
+                    cmd.Parameters.AddWithValue("@Operation", 2002);\r
                     if (problematic)\r
                         cmd.Parameters.AddWithValue("@@@Options", 1);\r
                     else\r
                         cmd.Parameters.AddWithValue("@@@Options", 0);\r
                     cmd.Parameters.AddWithValue("@@ItemID", DBNull.Value);\r
                     cmd.Parameters.AddWithValue("@@StrParam1", search);\r
+                    if (from != null)\r
+                        cmd.Parameters.AddWithValue("@@DateParam1", from.Value.Date);\r
+                    if (to != null)\r
+                        cmd.Parameters.AddWithValue("@@DateParam2", to.Value.Date);\r
 \r
                     using (SqlDataReader reader = cmd.ExecuteReader()) {\r
                         while (reader.Read()) {\r