From: Bellai Ádám <USER\adam.bellai>
Date: Fri, 13 Oct 2017 09:55:45 +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=92f32aaf5bffc951b0d11cdaef0ae528c14c9b07;p=mediacube.git

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

diff --git a/client/IntegrationTests/PlanAIRTests.cs b/client/IntegrationTests/PlanAIRTests.cs
index c8a531b8..0972a51c 100644
--- a/client/IntegrationTests/PlanAIRTests.cs
+++ b/client/IntegrationTests/PlanAIRTests.cs
@@ -79,7 +79,7 @@ namespace IntegrationTests {
             const int ITEM_ID = 24;
 
             //Exercise
-            sut.BroadcastOKForAir(ITEM_ID);
+            sut.BroadcastOKForAir(ITEM_ID, true);
         }
     }
 }
diff --git a/client/Maestro/MaestroForm.Metadata.cs b/client/Maestro/MaestroForm.Metadata.cs
index c317cd85..5b39281d 100644
--- a/client/Maestro/MaestroForm.Metadata.cs
+++ b/client/Maestro/MaestroForm.Metadata.cs
@@ -17,6 +17,8 @@ namespace Maestro {
         private List<Segment> segments = new List<Segment>();
         private MediaCubeApi mediaCubeApi;
         private ArchiveMetadata archiveMetadatamodel;
+        private BindingList<MovieSegment> movieSegments;
+
         public MetadataInfo SelectedMetadata {
             get {
                 return selectedMetadata;
@@ -24,6 +26,7 @@ namespace Maestro {
             set {
                 selectedMetadata = value;
                 textSelectedMetadata.Text = selectedMetadata.ID;
+                movieSegments = null;
             }
         }
 
@@ -81,7 +84,7 @@ namespace Maestro {
             ArchiveMetadataForm form = new ArchiveMetadataForm(archiveMetadatamodel);
             form.ShowDialog();
         }
-        
+
         private IDTypes GetTypeOfSelectedMetadata() {
             IDTypes result = IDTypes.None;
             if (String.IsNullOrEmpty(selectedMetadata.ID))
@@ -102,7 +105,8 @@ namespace Maestro {
             if (SelectedSource?.FileInfo == null)
                 return;
             Cursor = Cursors.WaitCursor;
-            BindingList<MovieSegment> movieSegments = GetMovieSegmentsFromSegments();
+            if (movieSegments == null)
+                movieSegments = GetMovieSegmentsFromSegments();
             PlayerForm player = new PlayerForm(ref movieSegments);
             player.AutoStart = Configuration.Player.AutoStart;
             player.SegmentEditor = Configuration.Player.SegmentEditor;
@@ -139,7 +143,7 @@ namespace Maestro {
                 ID = selectedID,
                 VariantID = variantID
             };
-           // EnableArchiveMetadataButtonAndCreateMetadataModel();
+            // EnableArchiveMetadataButtonAndCreateMetadataModel();
         }
     }
 }
diff --git a/client/Maestro/Targets/UNCTargetProcessor.cs b/client/Maestro/Targets/UNCTargetProcessor.cs
index dd24ca2c..f24bac73 100644
--- a/client/Maestro/Targets/UNCTargetProcessor.cs
+++ b/client/Maestro/Targets/UNCTargetProcessor.cs
@@ -84,8 +84,9 @@ namespace Maestro.Targets {
             if (parameters.TargetConfig.CreateMetadata && parameters.ArchiveMetadata != null)
                 CreateMetadata();
             if (parameters.TargetConfig.SaveSegments && parameters.Segments != null) {
+                parameters.Client.BroadcastOKForAir(parameters.VariantID, false);
                 SaveSegments();
-                parameters.Client.BroadcastOKForAir(parameters.VariantID);
+                parameters.Client.BroadcastOKForAir(parameters.VariantID, true);
             }
             if (parameters.TargetConfig.SendEmailOnSuccess && !String.IsNullOrEmpty(parameters.TargetConfig.SuccessEmailRecipient) && !String.IsNullOrEmpty(parameters.TargetConfig.SuccessEmailPattern))
                 SendEmail(parameters.TargetConfig.SuccessEmailRecipient, parameters.TargetConfig.SuccessEmailPattern);
diff --git a/client/PlanAIRClient/TrafficAPI.cs b/client/PlanAIRClient/TrafficAPI.cs
index 7f0efbf0..1dfcb67a 100644
--- a/client/PlanAIRClient/TrafficAPI.cs
+++ b/client/PlanAIRClient/TrafficAPI.cs
@@ -35,8 +35,8 @@ namespace TrafficClient {
             return broadvastWorker.GetBroadcastArchiveMetadata(strParam);
         }
 
-        public void BroadcastOKForAir(int itemID) {
-            broadvastWorker.SetBroadcastOKForAir(itemID);
+        public void BroadcastOKForAir(int itemID, bool ok) {
+            broadvastWorker.SetBroadcastOKForAir(itemID, ok);
         }
 
         public List<MamResultWrapper> GetPromotionals(string strParam) {
diff --git a/client/PlanAIRClient/Workers/BroadcastWorker.cs b/client/PlanAIRClient/Workers/BroadcastWorker.cs
index 493583d3..09d97fde 100644
--- a/client/PlanAIRClient/Workers/BroadcastWorker.cs
+++ b/client/PlanAIRClient/Workers/BroadcastWorker.cs
@@ -124,14 +124,15 @@ namespace TrafficClient.Workers {
             return result;
         }
 
-        public void SetBroadcastOKForAir(int itemID) {
+        public void SetBroadcastOKForAir(int itemID, bool ok) {
             try {
                 TryConnect();
+                int options = ok ? 1 : 0;
                 using (SqlCommand cmd = new SqlCommand("dbo.clIFsp_EC_MAM", connection)) {
                     cmd.CommandType = CommandType.StoredProcedure;
                     cmd.Parameters.AddWithValue("@Operation", 1100);
                     cmd.Parameters.AddWithValue("@@ItemID", itemID);
-                    cmd.Parameters.AddWithValue("@@@Options", 1);
+                    cmd.Parameters.AddWithValue("@@@Options", options);
                     cmd.ExecuteNonQuery();
                 }
             }