From cfde03700a6dead744682eb6f6b8bcffc21b2055 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1s=C3=A1ry=20D=C3=A1niel?= Date: Thu, 2 Nov 2017 17:02:38 +0000 Subject: [PATCH] git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C30685 --- client/DxPlay/PlayerForm.cs | 16 ++-- client/DxPlay/StringResource.Designer.cs | 80 +++++++++---------- client/DxPlay/StringResource.resx | 40 +++++----- .../Configuration/configuration-playout.json | 2 +- client/PlanAIRClient/Resources.Designer.cs | 18 +++++ client/PlanAIRClient/Resources.resx | 6 ++ client/PlanAIRClient/TrafficAPI.cs | 8 +- client/PlanAIRClient/TrafficIDSelector.cs | 18 ++--- .../PlanAIRClient/TrafficIDSelectorColumns.cs | 12 +++ client/PlanAIRClient/Workers/ADWorker.cs | 9 ++- .../PlanAIRClient/Workers/MaterialWorker.cs | 17 ++-- client/PlanAIRClient/Workers/PromoWorker.cs | 9 ++- 12 files changed, 144 insertions(+), 91 deletions(-) diff --git a/client/DxPlay/PlayerForm.cs b/client/DxPlay/PlayerForm.cs index b26d3bc0..da203d15 100644 --- a/client/DxPlay/PlayerForm.cs +++ b/client/DxPlay/PlayerForm.cs @@ -44,17 +44,17 @@ namespace DxPlay { private void InitializeTexts() { defineOneSegmentToolStripMenuItem.Text = StringResource.SZEGMENS_DEFINIALASA; splitSegmentAtCurrentPositionToolStripMenuItem.Text = StringResource.SZEGMENS_SZETVAGASA; - actualPositionToIntroToolStripMenuItem.Text = StringResource.AKTUALIS_POZICIO_BEMENOKENT; - actualPositionToOutroToolStripMenuItem.Text = StringResource.AKTUALIS_POZICIO_KIMENOKENT; + actualPositionToIntroToolStripMenuItem.Text = StringResource.AKTUALIS_POZICIO_BELEPO; + actualPositionToOutroToolStripMenuItem.Text = StringResource.AKTUALIS_POZICIO_KILEPO; deleteSegmentToolStripMenuItem.Text = StringResource.SZEGMENS_TORLESE; - menuButtonSegmentActions.Text = StringResource.SZEGMENS_AKCIÓK; + menuButtonSegmentActions.Text = StringResource.SZEGMENSEK; btnPause.Text = StringResource.SZUNET; btnPlay.Text = StringResource.LEJATSZAS; btnStop.Text = StringResource.LEALLITAS; labelStatus.Text = StringResource.NINCS_BEMENET; label1.Text = StringResource.INDULASI_PONT; - label2.Text = StringResource.IDOTARTAM; + label2.Text = StringResource.HOSSZ; } private void cueue() { @@ -484,10 +484,10 @@ namespace DxPlay { private void dgSegments_ColumnAdded(object sender, DataGridViewColumnEventArgs e) { int index = e.Column.Index; switch (index) { - case 0: e.Column.HeaderText = StringResource.BEMENO; break; - case 1: e.Column.HeaderText = StringResource.KIMENÕ; break; - case 2: e.Column.HeaderText = StringResource.VALASZTHATO; break; - case 3: e.Column.HeaderText = StringResource.KOMMENT; break; + case 0: e.Column.HeaderText = StringResource.BELEPO; break; + case 1: e.Column.HeaderText = StringResource.KILEPO; break; + case 2: e.Column.HeaderText = StringResource.ELHAGYHATO; break; + case 3: e.Column.HeaderText = StringResource.MEGJEGYZES; break; } } } diff --git a/client/DxPlay/StringResource.Designer.cs b/client/DxPlay/StringResource.Designer.cs index b7a9f3dd..c4c11017 100644 --- a/client/DxPlay/StringResource.Designer.cs +++ b/client/DxPlay/StringResource.Designer.cs @@ -61,38 +61,47 @@ namespace DxPlay { } /// - /// Looks up a localized string similar to Aktuális pozíció bemenőként. + /// Looks up a localized string similar to Aktuális pozíció belépőként. /// - internal static string AKTUALIS_POZICIO_BEMENOKENT { + internal static string AKTUALIS_POZICIO_BELEPO { get { - return ResourceManager.GetString("AKTUALIS_POZICIO_BEMENOKENT", resourceCulture); + return ResourceManager.GetString("AKTUALIS_POZICIO_BELEPO", resourceCulture); } } /// - /// Looks up a localized string similar to Aktuális pozíció kimenőként. + /// Looks up a localized string similar to Aktuális pozíció kilépőként. /// - internal static string AKTUALIS_POZICIO_KIMENOKENT { + internal static string AKTUALIS_POZICIO_KILEPO { get { - return ResourceManager.GetString("AKTUALIS_POZICIO_KIMENOKENT", resourceCulture); + return ResourceManager.GetString("AKTUALIS_POZICIO_KILEPO", resourceCulture); } } /// - /// Looks up a localized string similar to Bemenő. + /// Looks up a localized string similar to Belépő. /// - internal static string BEMENO { + internal static string BELEPO { get { - return ResourceManager.GetString("BEMENO", resourceCulture); + return ResourceManager.GetString("BELEPO", resourceCulture); } } /// - /// Looks up a localized string similar to Időtartam. + /// Looks up a localized string similar to Elhagyható. /// - internal static string IDOTARTAM { + internal static string ELHAGYHATO { get { - return ResourceManager.GetString("IDOTARTAM", resourceCulture); + return ResourceManager.GetString("ELHAGYHATO", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Hossz. + /// + internal static string HOSSZ { + get { + return ResourceManager.GetString("HOSSZ", resourceCulture); } } @@ -124,20 +133,11 @@ namespace DxPlay { } /// - /// Looks up a localized string similar to Kimenő. - /// - internal static string KIMENŐ { - get { - return ResourceManager.GetString("KIMENŐ", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Komment. + /// Looks up a localized string similar to Kilépő. /// - internal static string KOMMENT { + internal static string KILEPO { get { - return ResourceManager.GetString("KOMMENT", resourceCulture); + return ResourceManager.GetString("KILEPO", resourceCulture); } } @@ -169,20 +169,20 @@ namespace DxPlay { } /// - /// Looks up a localized string similar to NINCS BEMENET. + /// Looks up a localized string similar to Megjegyzés. /// - internal static string NINCS_BEMENET { + internal static string MEGJEGYZES { get { - return ResourceManager.GetString("NINCS_BEMENET", resourceCulture); + return ResourceManager.GetString("MEGJEGYZES", resourceCulture); } } /// - /// Looks up a localized string similar to Szegmens akciók. + /// Looks up a localized string similar to NINCS BEMENET. /// - internal static string SZEGMENS_AKCIÓK { + internal static string NINCS_BEMENET { get { - return ResourceManager.GetString("SZEGMENS_AKCIÓK", resourceCulture); + return ResourceManager.GetString("NINCS_BEMENET", resourceCulture); } } @@ -196,7 +196,7 @@ namespace DxPlay { } /// - /// Looks up a localized string similar to Szegment szétvágása az aktuális pozíciónál. + /// Looks up a localized string similar to Szegmens szétvágása. /// internal static string SZEGMENS_SZETVAGASA { get { @@ -214,29 +214,29 @@ namespace DxPlay { } /// - /// Looks up a localized string similar to Szunet. + /// Looks up a localized string similar to Szegmensek. /// - internal static string SZUNET { + internal static string SZEGMENSEK { get { - return ResourceManager.GetString("SZUNET", resourceCulture); + return ResourceManager.GetString("SZEGMENSEK", resourceCulture); } } /// - /// Looks up a localized string similar to Szüneteltetett. + /// Looks up a localized string similar to Szünet. /// - internal static string SZUNETELTETETT { + internal static string SZUNET { get { - return ResourceManager.GetString("SZUNETELTETETT", resourceCulture); + return ResourceManager.GetString("SZUNET", resourceCulture); } } /// - /// Looks up a localized string similar to Választható. + /// Looks up a localized string similar to Szüneteltetett. /// - internal static string VALASZTHATO { + internal static string SZUNETELTETETT { get { - return ResourceManager.GetString("VALASZTHATO", resourceCulture); + return ResourceManager.GetString("SZUNETELTETETT", resourceCulture); } } } diff --git a/client/DxPlay/StringResource.resx b/client/DxPlay/StringResource.resx index ff82ae3a..7c58c97d 100644 --- a/client/DxPlay/StringResource.resx +++ b/client/DxPlay/StringResource.resx @@ -117,17 +117,20 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Aktuális pozíció bemenőként + + Aktuális pozíció belépőként - - Aktuális pozíció kimenőként + + Aktuális pozíció kilépőként - - Bemenő + + Belépő - - Időtartam + + Elhagyható + + + Hossz Indítás @@ -138,11 +141,8 @@ Kilépés - - Kimenő - - - Komment + + Kilépő Leállítás @@ -153,28 +153,28 @@ Megállítva + + Megjegyzés + NINCS BEMENET - - Szegmens akciók + + Szegmensek Szegmens definiálása - Szegment szétvágása az aktuális pozíciónál + Szegmens szétvágása Szegmens törlése - Szunet + Szünet Szüneteltetett - - Választható - \ No newline at end of file diff --git a/client/Maestro/Configuration/configuration-playout.json b/client/Maestro/Configuration/configuration-playout.json index 27f522f0..abf37876 100644 --- a/client/Maestro/Configuration/configuration-playout.json +++ b/client/Maestro/Configuration/configuration-playout.json @@ -1,6 +1,6 @@ { "title": "Adáslebony", - "active": false, + "active": true, "startInTray": true, "enableCustomMetadataId": true, "player": { diff --git a/client/PlanAIRClient/Resources.Designer.cs b/client/PlanAIRClient/Resources.Designer.cs index 19848c5c..118a1530 100644 --- a/client/PlanAIRClient/Resources.Designer.cs +++ b/client/PlanAIRClient/Resources.Designer.cs @@ -69,6 +69,15 @@ namespace TrafficClient { } } + /// + /// Looks up a localized string similar to Első adás. + /// + internal static string ELSO_ADASNAP { + get { + return ResourceManager.GetString("ELSO_ADASNAP", resourceCulture); + } + } + /// /// Looks up a localized string similar to Epizódszám. /// @@ -78,6 +87,15 @@ namespace TrafficClient { } } + /// + /// Looks up a localized string similar to Epizód azonosító. + /// + internal static string EPIZOD_AZONOSITO { + get { + return ResourceManager.GetString("EPIZOD_AZONOSITO", resourceCulture); + } + } + /// /// Looks up a localized string similar to Epizodcím. /// diff --git a/client/PlanAIRClient/Resources.resx b/client/PlanAIRClient/Resources.resx index 7aee329d..446f7d39 100644 --- a/client/PlanAIRClient/Resources.resx +++ b/client/PlanAIRClient/Resources.resx @@ -120,9 +120,15 @@ Cím + + Első adás + Epizódszám + + Epizód azonosító + Epizodcím diff --git a/client/PlanAIRClient/TrafficAPI.cs b/client/PlanAIRClient/TrafficAPI.cs index c327fce4..31b75237 100644 --- a/client/PlanAIRClient/TrafficAPI.cs +++ b/client/PlanAIRClient/TrafficAPI.cs @@ -61,16 +61,16 @@ namespace TrafficClient { } } - public List GetPromos(string search, bool problematic) { - return promoWorker.GetPromos(search, problematic); + public List GetPromos(string search, bool problematic, DateTime? from = null, DateTime? to = null) { + return promoWorker.GetPromos(search, problematic, from, to); } public List GetPromoArchiveMetadata(string strParam) { return promoWorker.GetPromoArchiveMetadata(strParam); } - public List GetADs(string search, bool problematic) { - return adWorker.GetADs(search, problematic); + public List GetADs(string search, bool problematic, DateTime? from = null, DateTime? to = null) { + return adWorker.GetADs(search, problematic, from, to); } public List GetADArchiveMetadata(string strParam) { diff --git a/client/PlanAIRClient/TrafficIDSelector.cs b/client/PlanAIRClient/TrafficIDSelector.cs index 555549c4..d7a8741f 100644 --- a/client/PlanAIRClient/TrafficIDSelector.cs +++ b/client/PlanAIRClient/TrafficIDSelector.cs @@ -46,23 +46,21 @@ namespace TrafficClient { ClearSelection(); Cursor.Current = Cursors.WaitCursor; string searchText = textBox1.Text; - DateTime? from = null; - DateTime? to = null; - if (scheduledDate.Checked) { - from = scheduledDate.Value; - to = scheduledDate.Value.AddDays(1); - } + DateTime? scheduledDate = null; + if (this.scheduledDate.Checked) + scheduledDate = this.scheduledDate.Value.Date; + List items = null; dgTraffic.Columns.Clear(); if (rbMaterial.Checked) { dgTraffic.Columns.AddRange(GetMaterialColumns()); - items = trafficAPI.GetMaterials(searchText, chkProblematic.Checked, from, to); + items = trafficAPI.GetMaterials(searchText, chkProblematic.Checked, scheduledDate, scheduledDate); } else if (rbAD.Checked) { dgTraffic.Columns.AddRange(GetADColumns()); - items = trafficAPI.GetADs(searchText, chkProblematic.Checked); + items = trafficAPI.GetADs(searchText, chkProblematic.Checked, scheduledDate, scheduledDate); } else if (rbPromo.Checked) { dgTraffic.Columns.AddRange(GetPromoColumns()); - items = trafficAPI.GetPromos(searchText, chkProblematic.Checked); + items = trafficAPI.GetPromos(searchText, chkProblematic.Checked, scheduledDate, scheduledDate); } if (items == null) { dgTraffic.DataSource = null; @@ -140,10 +138,12 @@ namespace TrafficClient { public bool OK { get; set; } public string Title { get; set; } public DateTime? NextBroadcastDate { get; set; } + public DateTime? FirstBroadcastDate { get; set; } public short SegmentCount { get; set; } public short EpisodeNumber { get; set; } public string EpisodeTitle { get; set; } public int VariantID { get; set; } + public string EpisodeID { get; set; } } public class TrafficItemMetadata { diff --git a/client/PlanAIRClient/TrafficIDSelectorColumns.cs b/client/PlanAIRClient/TrafficIDSelectorColumns.cs index 4b2d3220..bf8d65be 100644 --- a/client/PlanAIRClient/TrafficIDSelectorColumns.cs +++ b/client/PlanAIRClient/TrafficIDSelectorColumns.cs @@ -32,6 +32,18 @@ namespace TrafficClient { HeaderText = Resources.EPIZOD, Width = 100 }, + new DataGridViewTextBoxColumn() { + AutoSizeMode = DataGridViewAutoSizeColumnMode.None, + DataPropertyName = "EpisodeID", + HeaderText = Resources.EPIZOD_AZONOSITO, + Width = 100 + }, + new DataGridViewTextBoxColumn() { + AutoSizeMode = DataGridViewAutoSizeColumnMode.None, + DataPropertyName = "FirsBroadcastDate", + HeaderText = Resources.ELSO_ADASNAP, + Width = 100 + }, new DataGridViewTextBoxColumn() { AutoSizeMode = DataGridViewAutoSizeColumnMode.None, DataPropertyName = "NextBroadcastDate", diff --git a/client/PlanAIRClient/Workers/ADWorker.cs b/client/PlanAIRClient/Workers/ADWorker.cs index 2e718cb2..7dd574aa 100644 --- a/client/PlanAIRClient/Workers/ADWorker.cs +++ b/client/PlanAIRClient/Workers/ADWorker.cs @@ -32,19 +32,24 @@ namespace TrafficClient.Workers { }; } - public List GetADs(string search, bool problematic) { + public List GetADs(string search, bool problematic, DateTime? from = null, DateTime? to = null) { List result = null; try { TryConnect(); using (SqlCommand cmd = new SqlCommand("dbo.clIFsp_EC_MAM", connection)) { cmd.CommandType = CommandType.StoredProcedure; - cmd.Parameters.AddWithValue("@Operation", 3001); + //cmd.Parameters.AddWithValue("@Operation", 3001); + cmd.Parameters.AddWithValue("@Operation", 3002); if (problematic) cmd.Parameters.AddWithValue("@@@Options", 1); else cmd.Parameters.AddWithValue("@@@Options", 0); cmd.Parameters.AddWithValue("@@ItemID", DBNull.Value); cmd.Parameters.AddWithValue("@@StrParam1", search); + if (from != null) + cmd.Parameters.AddWithValue("@@DateParam1", from.Value.Date); + if (to != null) + cmd.Parameters.AddWithValue("@@DateParam2", to.Value.Date); using (SqlDataReader reader = cmd.ExecuteReader()) { while (reader.Read()) { if (result == null) diff --git a/client/PlanAIRClient/Workers/MaterialWorker.cs b/client/PlanAIRClient/Workers/MaterialWorker.cs index 093c6cc0..3dd77503 100644 --- a/client/PlanAIRClient/Workers/MaterialWorker.cs +++ b/client/PlanAIRClient/Workers/MaterialWorker.cs @@ -26,6 +26,8 @@ namespace TrafficClient.Workers { VariantID = data.v_VariantID.HasValue ? data.v_VariantID.Value : 0, EpisodeNumber = data.v_Episode.HasValue ? data.v_Episode.Value : (short)0, NextBroadcastDate = data.v_NextBroadcastDate, + FirstBroadcastDate = data.v_FirstBroadcastDate, + EpisodeID = data.v_EpisodeID, OK = data.v_OkForAir != null && "OK".Equals(data.v_OkForAir) }; } @@ -45,13 +47,18 @@ namespace TrafficClient.Workers { TryConnect(); using (SqlCommand cmd = new SqlCommand("dbo.clIFsp_EC_MAM", connection)) { cmd.CommandType = CommandType.StoredProcedure; - cmd.Parameters.AddWithValue("@Operation", 1001); - cmd.Parameters.AddWithValue("@@ItemID", DBNull.Value); +// cmd.Parameters.AddWithValue("@Operation", 1001); + cmd.Parameters.AddWithValue("@Operation", 1002); + //if (problematic) + // cmd.Parameters.AddWithValue("@@@Options", 8); + //else + // cmd.Parameters.AddWithValue("@@@Options", 0); if (problematic) - cmd.Parameters.AddWithValue("@@@Options", 8); - else + cmd.Parameters.AddWithValue("@@@Options", 1); + else cmd.Parameters.AddWithValue("@@@Options", 0); - + + cmd.Parameters.AddWithValue("@@ItemID", DBNull.Value); if (!String.IsNullOrEmpty(search)) cmd.Parameters.AddWithValue("@@StrParam1", search); if (from != null) diff --git a/client/PlanAIRClient/Workers/PromoWorker.cs b/client/PlanAIRClient/Workers/PromoWorker.cs index 0a7414ce..643dd952 100644 --- a/client/PlanAIRClient/Workers/PromoWorker.cs +++ b/client/PlanAIRClient/Workers/PromoWorker.cs @@ -38,19 +38,24 @@ namespace TrafficClient.Workers { }; } - public List GetPromos(string search, bool problematic) { + public List GetPromos(string search, bool problematic, DateTime? from = null, DateTime? to = null) { List result = null; try { TryConnect(); using (SqlCommand cmd = new SqlCommand("dbo.clIFsp_EC_MAM", connection)) { cmd.CommandType = CommandType.StoredProcedure; - cmd.Parameters.AddWithValue("@Operation", 2001); + //cmd.Parameters.AddWithValue("@Operation", 2001); + cmd.Parameters.AddWithValue("@Operation", 2002); if (problematic) cmd.Parameters.AddWithValue("@@@Options", 1); else cmd.Parameters.AddWithValue("@@@Options", 0); cmd.Parameters.AddWithValue("@@ItemID", DBNull.Value); cmd.Parameters.AddWithValue("@@StrParam1", search); + if (from != null) + cmd.Parameters.AddWithValue("@@DateParam1", from.Value.Date); + if (to != null) + cmd.Parameters.AddWithValue("@@DateParam2", to.Value.Date); using (SqlDataReader reader = cmd.ExecuteReader()) { while (reader.Read()) { -- 2.54.0