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

diff --git a/client/IntegrationTests/PlanAIRTests.cs b/client/IntegrationTests/PlanAIRTests.cs
index c8a531b8101c8cf6aa1c386ca4f45b349d62e811..0972a51cd3cba00ddb9efb19e905ec3aac8526b4 100644 (file)
--- a/client/IntegrationTests/PlanAIRTests.cs
+++ b/client/IntegrationTests/PlanAIRTests.cs
@@ -79,7 +79,7 @@ namespace IntegrationTests {
             const int ITEM_ID = 24;\r
 \r
             //Exercise\r
-            sut.BroadcastOKForAir(ITEM_ID);\r
+            sut.BroadcastOKForAir(ITEM_ID, true);\r
         }\r
     }\r
 }\r

diff --git a/client/Maestro/MaestroForm.Metadata.cs b/client/Maestro/MaestroForm.Metadata.cs
index c317cd85e1bc2be4ee0b36ec40c0ae2988d35062..5b39281d13cc0d1a83954d087447b5469c175baf 100644 (file)
--- 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>();\r
         private MediaCubeApi mediaCubeApi;\r
         private ArchiveMetadata archiveMetadatamodel;\r
+        private BindingList<MovieSegment> movieSegments;\r
+\r
         public MetadataInfo SelectedMetadata {\r
             get {\r
                 return selectedMetadata;\r
@@ -24,6 +26,7 @@ namespace Maestro {
             set {\r
                 selectedMetadata = value;\r
                 textSelectedMetadata.Text = selectedMetadata.ID;\r
+                movieSegments = null;\r
             }\r
         }\r
 \r
@@ -81,7 +84,7 @@ namespace Maestro {
             ArchiveMetadataForm form = new ArchiveMetadataForm(archiveMetadatamodel);\r
             form.ShowDialog();\r
         }\r
-        \r
+\r
         private IDTypes GetTypeOfSelectedMetadata() {\r
             IDTypes result = IDTypes.None;\r
             if (String.IsNullOrEmpty(selectedMetadata.ID))\r
@@ -102,7 +105,8 @@ namespace Maestro {
             if (SelectedSource?.FileInfo == null)\r
                 return;\r
             Cursor = Cursors.WaitCursor;\r
-            BindingList<MovieSegment> movieSegments = GetMovieSegmentsFromSegments();\r
+            if (movieSegments == null)\r
+                movieSegments = GetMovieSegmentsFromSegments();\r
             PlayerForm player = new PlayerForm(ref movieSegments);\r
             player.AutoStart = Configuration.Player.AutoStart;\r
             player.SegmentEditor = Configuration.Player.SegmentEditor;\r
@@ -139,7 +143,7 @@ namespace Maestro {
                 ID = selectedID,\r
                 VariantID = variantID\r
             };\r
-           // EnableArchiveMetadataButtonAndCreateMetadataModel();\r
+            // EnableArchiveMetadataButtonAndCreateMetadataModel();\r
         }\r
     }\r
 }\r

diff --git a/client/Maestro/Targets/UNCTargetProcessor.cs b/client/Maestro/Targets/UNCTargetProcessor.cs
index dd24ca2c56bc8aa9a915ea9f206951583b66c388..f24bac73a401e3125115a4ef18809efcf71e29a1 100644 (file)
--- 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)\r
                 CreateMetadata();\r
             if (parameters.TargetConfig.SaveSegments && parameters.Segments != null) {\r
+                parameters.Client.BroadcastOKForAir(parameters.VariantID, false);\r
                 SaveSegments();\r
-                parameters.Client.BroadcastOKForAir(parameters.VariantID);\r
+                parameters.Client.BroadcastOKForAir(parameters.VariantID, true);\r
             }\r
             if (parameters.TargetConfig.SendEmailOnSuccess && !String.IsNullOrEmpty(parameters.TargetConfig.SuccessEmailRecipient) && !String.IsNullOrEmpty(parameters.TargetConfig.SuccessEmailPattern))\r
                 SendEmail(parameters.TargetConfig.SuccessEmailRecipient, parameters.TargetConfig.SuccessEmailPattern);\r

diff --git a/client/PlanAIRClient/TrafficAPI.cs b/client/PlanAIRClient/TrafficAPI.cs
index 7f0efbf097829a8c1c96ee9123d1dc867fbab5e2..1dfcb67ac5ce242eb12e0e10c956b3bd79e428bf 100644 (file)
--- a/client/PlanAIRClient/TrafficAPI.cs
+++ b/client/PlanAIRClient/TrafficAPI.cs
@@ -35,8 +35,8 @@ namespace TrafficClient {
             return broadvastWorker.GetBroadcastArchiveMetadata(strParam);\r
         }\r
 \r
-        public void BroadcastOKForAir(int itemID) {\r
-            broadvastWorker.SetBroadcastOKForAir(itemID);\r
+        public void BroadcastOKForAir(int itemID, bool ok) {\r
+            broadvastWorker.SetBroadcastOKForAir(itemID, ok);\r
         }\r
 \r
         public List<MamResultWrapper> GetPromotionals(string strParam) {\r

diff --git a/client/PlanAIRClient/Workers/BroadcastWorker.cs b/client/PlanAIRClient/Workers/BroadcastWorker.cs
index 493583d322c68a8ac5f0440582661535322ed42e..09d97fdee1a19110cee3301b3a64590bcea29f7b 100644 (file)
--- a/client/PlanAIRClient/Workers/BroadcastWorker.cs
+++ b/client/PlanAIRClient/Workers/BroadcastWorker.cs
@@ -124,14 +124,15 @@ namespace TrafficClient.Workers {
             return result;\r
         }\r
 \r
-        public void SetBroadcastOKForAir(int itemID) {\r
+        public void SetBroadcastOKForAir(int itemID, bool ok) {\r
             try {\r
                 TryConnect();\r
+                int options = ok ? 1 : 0;\r
                 using (SqlCommand cmd = new SqlCommand("dbo.clIFsp_EC_MAM", connection)) {\r
                     cmd.CommandType = CommandType.StoredProcedure;\r
                     cmd.Parameters.AddWithValue("@Operation", 1100);\r
                     cmd.Parameters.AddWithValue("@@ItemID", itemID);\r
-                    cmd.Parameters.AddWithValue("@@@Options", 1);\r
+                    cmd.Parameters.AddWithValue("@@@Options", options);\r
                     cmd.ExecuteNonQuery();\r
                 }\r
             }\r