octopus metadata bovites, nagybetus kimeneti mappa

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

diff --git a/client/Maestro/Configuration/dev-local.json b/client/Maestro/Configuration/dev-local.json
index 21be6281268f709edc60eb188fa41a585dec99b2..bcc10ebff71a7bb8ce06b6c362ca77a8bf9d6f2a 100644 (file)
--- a/client/Maestro/Configuration/dev-local.json
+++ b/client/Maestro/Configuration/dev-local.json
@@ -28,11 +28,10 @@
   },\r
   "metadatas": [\r
     {\r
-      "$type": "TrafficMetadata",\r
+      "$type": "OctopusMetadata",\r
+      "disabled": false,\r
       "server": {\r
-        "address": "Data Source=10.10.1.45;Initial Catalog=PA_Echo;Persist Security Info=True;",\r
-        "userName": "MAM",\r
-        "password": "7RKZYBzumKjL40SJwuwiFCvX57xuCN8zay6OttUm2wbrgImyYZBHyZTUUYrXX31Ge2Uwew07HYsqh2uzdJeDBDwcVntxaHg3nIpv9Dyq/odVoiC4tUF/K+lgvKWANcrZ",\r
+        "address": "http://192.168.224.128:9090/services/rest/octopus/",\r
         "timeout": 1000\r
       }\r
     }\r

diff --git a/client/Maestro/MaestroForm.Metadata.cs b/client/Maestro/MaestroForm.Metadata.cs
index 3ee89135e58a602c68a269c24926a878c70ddcf4..f1daaaec1b8a0a2b5b2b837f3707d1f193e9f337 100644 (file)
--- a/client/Maestro/MaestroForm.Metadata.cs
+++ b/client/Maestro/MaestroForm.Metadata.cs
@@ -383,6 +383,22 @@ namespace Maestro {
             result.mediaHouseId = story.ParentStoryID;\r
             result.mediaTitle = story.Name;\r
             result.mediaDescription = story.ScriptContent;\r
+\r
+            if (result.mediaDescription == null)\r
+                result.mediaDescription = string.Empty;\r
+\r
+            if (!string.IsNullOrEmpty(story.Location)) {\r
+                if (!string.IsNullOrEmpty(result.mediaDescription))\r
+                    result.mediaDescription += Environment.NewLine;\r
+                result.mediaDescription += "Helyszín: " + story.Location;\r
+            }\r
+\r
+            if (!string.IsNullOrEmpty(story.Descriptions)) {\r
+                if (!string.IsNullOrEmpty(result.mediaDescription))\r
+                    result.mediaDescription += Environment.NewLine;\r
+                result.mediaDescription += "Megjegyzés: " + story.Descriptions;\r
+            }\r
+\r
             result.format = story.Format;\r
             return result;\r
         }\r

diff --git a/client/Maestro/Properties/AssemblyInfo.cs b/client/Maestro/Properties/AssemblyInfo.cs
index fc2f1797146a142b86f282e4e118d68b217ebe08..3b11b903bb38c122d4f86eb0052a21bc38aa2dea 100644 (file)
--- a/client/Maestro/Properties/AssemblyInfo.cs
+++ b/client/Maestro/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers\r
 // by using the '*' as shown below:\r
 // [assembly: AssemblyVersion("1.0.*")]\r
-[assembly: AssemblyVersion("2.1.1.5")]\r
-[assembly: AssemblyFileVersion("2.1.1.5")]\r
+[assembly: AssemblyVersion("2.1.1.6")]\r
+[assembly: AssemblyFileVersion("2.1.1.6")]\r

diff --git a/client/OctopusClient/OctopusAPI.cs b/client/OctopusClient/OctopusAPI.cs
index 7e850255c6fbba939d47fae5db5ca5f381f82d9b..08af8510514600670afd6af4f2cca0c008241e08 100644 (file)
--- a/client/OctopusClient/OctopusAPI.cs
+++ b/client/OctopusClient/OctopusAPI.cs
@@ -29,6 +29,8 @@ namespace OctopusClient {
         public string Script { get; set; }\r
         public string ScriptContent { get; set; }\r
         public string Format { get; set; }\r
+        public string Descriptions { get; set; }\r
+        public string Location { get; set; }\r
         public int? Position { get; set; }\r
         public MosObject[] MosObjects { get; set; }\r
         public StoryFolder[] StoryFolders { get; set; }\r
@@ -394,6 +396,8 @@ namespace OctopusClient {
             result.MosObjects = GetMosObjectsFromStory(d)?.ToArray();\r
             result.StoryFolders = GetStoryFolderFromStory(d)?.ToArray();\r
             result.Rundowns = GetRundownFromStory(d)?.ToArray();\r
+            result.Descriptions = d["descriptions"]?.ToString();\r
+            result.Location = d["location"]?.ToString();\r
             return result;\r
         }\r
 \r