From: Vásáry Dániel Date: Fri, 3 Nov 2017 23:59:27 +0000 (+0000) Subject: git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube... X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=27514319e042e4b5c8c7a5ebb9381ae8dfe3e94f;p=mediacube.git git-tfs-id: [tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C30687 --- diff --git a/client/PlanAIRClient/TrafficAPI.cs b/client/PlanAIRClient/TrafficAPI.cs index 7730eb74..12da38af 100644 --- a/client/PlanAIRClient/TrafficAPI.cs +++ b/client/PlanAIRClient/TrafficAPI.cs @@ -89,7 +89,7 @@ namespace TrafficClient { return segmentWorker.GetADSegments(strParam); } - public string CreateMaterialVersion(string episodeID) { + public TrafficVersion CreateMaterialVersion(string episodeID) { return materialWorker.CreateMaterialVersion(episodeID); } } diff --git a/client/PlanAIRClient/TrafficIDSelector.cs b/client/PlanAIRClient/TrafficIDSelector.cs index 8ff4e0e7..921d8aa5 100644 --- a/client/PlanAIRClient/TrafficIDSelector.cs +++ b/client/PlanAIRClient/TrafficIDSelector.cs @@ -94,8 +94,10 @@ namespace TrafficClient { private void OnSelectionChanged(DataGridViewRow actualRow) { TrafficItem res = actualRow.DataBoundItem as TrafficItem; if (String.IsNullOrEmpty(res.MediaID)) { - res.MediaID = trafficAPI.CreateMaterialVersion(res.EpisodeID); - if (String.IsNullOrEmpty(res.MediaID)) + TrafficVersion v = trafficAPI.CreateMaterialVersion(res.EpisodeID); + res.MediaID = v.MediaID; + res.VariantID = v.VariantID; + if (res.VariantID == 0 || String.IsNullOrEmpty(res.MediaID)) return; } DataGridViewCheckBoxCell actualCell = actualRow.Cells[0] as DataGridViewCheckBoxCell; @@ -139,6 +141,11 @@ namespace TrafficClient { public string EpisodeID { get; set; } } + public class TrafficVersion { + public string MediaID { get; set; } + public int VariantID { get; set; } + } + public class TrafficItemMetadata { public string ProgTitle { get; set; } public string ProgDescription { get; set; } diff --git a/client/PlanAIRClient/Workers/MaterialWorker.cs b/client/PlanAIRClient/Workers/MaterialWorker.cs index a27e55e7..01732efc 100644 --- a/client/PlanAIRClient/Workers/MaterialWorker.cs +++ b/client/PlanAIRClient/Workers/MaterialWorker.cs @@ -111,8 +111,8 @@ namespace TrafficClient.Workers { return result; } - public string CreateMaterialVersion(string episodeID) { - string result = null; + public TrafficVersion CreateMaterialVersion(string episodeID) { + TrafficVersion result = null; try { TryConnect(); using (SqlCommand cmd = new SqlCommand("dbo.clIFsp_EC_MAM", connection)) { @@ -126,8 +126,12 @@ namespace TrafficClient.Workers { using (SqlDataReader reader = cmd.ExecuteReader()) { if (reader.Read()) { + result = new TrafficVersion(); + if (!reader.IsDBNull(0)) + result.VariantID = reader.GetInt32(0); + if (!reader.IsDBNull(1)) - result = reader.GetString(1); + result.MediaID = reader.GetString(1); } } }