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

diff --git a/client/Maestro/ArchiveMetadataForm.Designer.cs b/client/Maestro/ArchiveMetadataForm.Designer.cs
index 2c644bc25954e12a976cff61a183c5e3ecb9c15d..ffd26be7d1ab5ec2b1973fc5ff95dc169d0041b2 100644 (file)
--- a/client/Maestro/ArchiveMetadataForm.Designer.cs
+++ b/client/Maestro/ArchiveMetadataForm.Designer.cs
@@ -47,7 +47,7 @@
             // label_stuffID\r
             // \r
             this.label_stuffID.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));\r
-            this.label_stuffID.Location = new System.Drawing.Point(8, 12);\r
+            this.label_stuffID.Location = new System.Drawing.Point(8, 5);\r
             this.label_stuffID.Name = "label_stuffID";\r
             this.label_stuffID.Size = new System.Drawing.Size(87, 13);\r
             this.label_stuffID.TabIndex = 0;\r
@@ -56,7 +56,7 @@
             // label_stuffDescription\r
             // \r
             this.label_stuffDescription.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));\r
-            this.label_stuffDescription.Location = new System.Drawing.Point(8, 92);\r
+            this.label_stuffDescription.Location = new System.Drawing.Point(8, 83);\r
             this.label_stuffDescription.Name = "label_stuffDescription";\r
             this.label_stuffDescription.Size = new System.Drawing.Size(66, 13);\r
             this.label_stuffDescription.TabIndex = 2;\r
@@ -65,7 +65,7 @@
             // label_mediaID\r
             // \r
             this.label_mediaID.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));\r
-            this.label_mediaID.Location = new System.Drawing.Point(8, 166);\r
+            this.label_mediaID.Location = new System.Drawing.Point(8, 205);\r
             this.label_mediaID.Name = "label_mediaID";\r
             this.label_mediaID.Size = new System.Drawing.Size(86, 13);\r
             this.label_mediaID.TabIndex = 3;\r
@@ -75,7 +75,7 @@
             // \r
             this.label_mediaTitle.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));\r
             this.label_mediaTitle.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
-            this.label_mediaTitle.Location = new System.Drawing.Point(8, 206);\r
+            this.label_mediaTitle.Location = new System.Drawing.Point(8, 244);\r
             this.label_mediaTitle.Name = "label_mediaTitle";\r
             this.label_mediaTitle.Size = new System.Drawing.Size(57, 13);\r
             this.label_mediaTitle.TabIndex = 4;\r
@@ -85,7 +85,7 @@
             // \r
             this.label_mediaDescription.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));\r
             this.label_mediaDescription.AutoSize = true;\r
-            this.label_mediaDescription.Location = new System.Drawing.Point(8, 246);\r
+            this.label_mediaDescription.Location = new System.Drawing.Point(8, 283);\r
             this.label_mediaDescription.Name = "label_mediaDescription";\r
             this.label_mediaDescription.Size = new System.Drawing.Size(65, 13);\r
             this.label_mediaDescription.TabIndex = 5;\r
@@ -94,62 +94,62 @@
             // textBox_itemID\r
             // \r
             this.textBox_itemID.Dock = System.Windows.Forms.DockStyle.Fill;\r
-            this.textBox_itemID.Location = new System.Drawing.Point(8, 28);\r
+            this.textBox_itemID.Location = new System.Drawing.Point(8, 21);\r
             this.textBox_itemID.Name = "textBox_itemID";\r
             this.textBox_itemID.ReadOnly = true;\r
-            this.textBox_itemID.Size = new System.Drawing.Size(549, 20);\r
+            this.textBox_itemID.Size = new System.Drawing.Size(532, 20);\r
             this.textBox_itemID.TabIndex = 6;\r
             // \r
             // textBox_itemTitle\r
             // \r
             this.textBox_itemTitle.Dock = System.Windows.Forms.DockStyle.Fill;\r
-            this.textBox_itemTitle.Location = new System.Drawing.Point(8, 68);\r
+            this.textBox_itemTitle.Location = new System.Drawing.Point(8, 60);\r
             this.textBox_itemTitle.Name = "textBox_itemTitle";\r
-            this.textBox_itemTitle.Size = new System.Drawing.Size(549, 20);\r
+            this.textBox_itemTitle.Size = new System.Drawing.Size(532, 20);\r
             this.textBox_itemTitle.TabIndex = 7;\r
             // \r
             // textBox_itemDescription\r
             // \r
             this.textBox_itemDescription.Dock = System.Windows.Forms.DockStyle.Fill;\r
-            this.textBox_itemDescription.Location = new System.Drawing.Point(8, 108);\r
+            this.textBox_itemDescription.Location = new System.Drawing.Point(8, 99);\r
             this.textBox_itemDescription.Multiline = true;\r
             this.textBox_itemDescription.Name = "textBox_itemDescription";\r
             this.textBox_itemDescription.ScrollBars = System.Windows.Forms.ScrollBars.Both;\r
-            this.textBox_itemDescription.Size = new System.Drawing.Size(549, 48);\r
+            this.textBox_itemDescription.Size = new System.Drawing.Size(532, 103);\r
             this.textBox_itemDescription.TabIndex = 8;\r
             // \r
             // textBox_mediaID\r
             // \r
             this.textBox_mediaID.Dock = System.Windows.Forms.DockStyle.Fill;\r
-            this.textBox_mediaID.Location = new System.Drawing.Point(8, 182);\r
+            this.textBox_mediaID.Location = new System.Drawing.Point(8, 221);\r
             this.textBox_mediaID.Name = "textBox_mediaID";\r
             this.textBox_mediaID.ReadOnly = true;\r
-            this.textBox_mediaID.Size = new System.Drawing.Size(549, 20);\r
+            this.textBox_mediaID.Size = new System.Drawing.Size(532, 20);\r
             this.textBox_mediaID.TabIndex = 9;\r
             // \r
             // textBox_mediaTitle\r
             // \r
             this.textBox_mediaTitle.Dock = System.Windows.Forms.DockStyle.Fill;\r
-            this.textBox_mediaTitle.Location = new System.Drawing.Point(8, 222);\r
+            this.textBox_mediaTitle.Location = new System.Drawing.Point(8, 260);\r
             this.textBox_mediaTitle.Name = "textBox_mediaTitle";\r
-            this.textBox_mediaTitle.Size = new System.Drawing.Size(549, 20);\r
+            this.textBox_mediaTitle.Size = new System.Drawing.Size(532, 20);\r
             this.textBox_mediaTitle.TabIndex = 10;\r
             // \r
             // textBox_mediaDescription\r
             // \r
             this.textBox_mediaDescription.Dock = System.Windows.Forms.DockStyle.Fill;\r
-            this.textBox_mediaDescription.Location = new System.Drawing.Point(8, 262);\r
+            this.textBox_mediaDescription.Location = new System.Drawing.Point(8, 299);\r
             this.textBox_mediaDescription.Multiline = true;\r
             this.textBox_mediaDescription.Name = "textBox_mediaDescription";\r
             this.textBox_mediaDescription.ScrollBars = System.Windows.Forms.ScrollBars.Both;\r
-            this.textBox_mediaDescription.Size = new System.Drawing.Size(549, 87);\r
+            this.textBox_mediaDescription.Size = new System.Drawing.Size(532, 216);\r
             this.textBox_mediaDescription.TabIndex = 11;\r
             // \r
             // label_stuffTitle\r
             // \r
             this.label_stuffTitle.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));\r
             this.label_stuffTitle.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
-            this.label_stuffTitle.Location = new System.Drawing.Point(8, 52);\r
+            this.label_stuffTitle.Location = new System.Drawing.Point(8, 44);\r
             this.label_stuffTitle.Name = "label_stuffTitle";\r
             this.label_stuffTitle.Size = new System.Drawing.Size(58, 13);\r
             this.label_stuffTitle.TabIndex = 1;\r
@@ -160,16 +160,16 @@
             this.groupBox1.Controls.Add(this.btnOk);\r
             this.groupBox1.Controls.Add(this.btnCancel);\r
             this.groupBox1.Dock = System.Windows.Forms.DockStyle.Bottom;\r
-            this.groupBox1.Location = new System.Drawing.Point(0, 357);\r
+            this.groupBox1.Location = new System.Drawing.Point(0, 523);\r
             this.groupBox1.Name = "groupBox1";\r
-            this.groupBox1.Size = new System.Drawing.Size(565, 48);\r
+            this.groupBox1.Size = new System.Drawing.Size(548, 48);\r
             this.groupBox1.TabIndex = 1;\r
             this.groupBox1.TabStop = false;\r
             // \r
             // btnOk\r
             // \r
             this.btnOk.Anchor = System.Windows.Forms.AnchorStyles.Right;\r
-            this.btnOk.Location = new System.Drawing.Point(484, 16);\r
+            this.btnOk.Location = new System.Drawing.Point(467, 16);\r
             this.btnOk.Name = "btnOk";\r
             this.btnOk.Size = new System.Drawing.Size(75, 23);\r
             this.btnOk.TabIndex = 1;\r
@@ -181,7 +181,7 @@
             // \r
             this.btnCancel.Anchor = System.Windows.Forms.AnchorStyles.Right;\r
             this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;\r
-            this.btnCancel.Location = new System.Drawing.Point(405, 16);\r
+            this.btnCancel.Location = new System.Drawing.Point(388, 16);\r
             this.btnCancel.Name = "btnCancel";\r
             this.btnCancel.Size = new System.Drawing.Size(75, 23);\r
             this.btnCancel.TabIndex = 0;\r
@@ -210,19 +210,19 @@
             this.tableLayoutPanel1.Name = "tableLayoutPanel1";\r
             this.tableLayoutPanel1.Padding = new System.Windows.Forms.Padding(5);\r
             this.tableLayoutPanel1.RowCount = 12;\r
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));\r
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));\r
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));\r
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));\r
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));\r
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 54F));\r
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));\r
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));\r
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));\r
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));\r
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));\r
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 54F));\r
-            this.tableLayoutPanel1.Size = new System.Drawing.Size(565, 357);\r
+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
+            this.tableLayoutPanel1.Size = new System.Drawing.Size(548, 523);\r
             this.tableLayoutPanel1.TabIndex = 3;\r
             // \r
             // ArchiveMetadataForm\r
@@ -231,7 +231,7 @@
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);\r
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;\r
             this.CancelButton = this.btnCancel;\r
-            this.ClientSize = new System.Drawing.Size(565, 405);\r
+            this.ClientSize = new System.Drawing.Size(548, 571);\r
             this.Controls.Add(this.tableLayoutPanel1);\r
             this.Controls.Add(this.groupBox1);\r
             this.Icon = global::Maestro.Properties.Resources.AppIcon;\r

diff --git a/client/Maestro/Configuration/configuration-editor.json b/client/Maestro/Configuration/configuration-editor.json
index e410558d999be79c61c52235eef769a9c1e07f62..67d782dbb696001eeafbcbcb7acc008606c27c90 100644 (file)
--- a/client/Maestro/Configuration/configuration-editor.json
+++ b/client/Maestro/Configuration/configuration-editor.json
@@ -1,8 +1,7 @@
-\r
-{\r
+{\r
   "title": "Szerkesztő",\r
   "active": false,\r
-  "startInTray": false,\r
+  "startInTray": true,\r
   "enableCustomMetadataId": true,\r
   "player": {\r
     "enabled": true,\r

diff --git a/client/Maestro/Configuration/configuration-nexio-ingest.json b/client/Maestro/Configuration/configuration-nexio-ingest.json
new file mode 100644 (file)
index 0000000..596cbe6
--- /dev/null
+++ b/client/Maestro/Configuration/configuration-nexio-ingest.json
@@ -0,0 +1,52 @@
+{\r
+  "title": "NEXIO betöltő",\r
+  "active": true,\r
+  "startInTray": false,\r
+  "enableCustomMetadataId": true,\r
+  "player": {\r
+    "enabled": true,\r
+    "autoStart": false,\r
+    "segmentEditor": true\r
+  },\r
+  "source": {\r
+    "$type": "UNCSource",\r
+    "filter": "avi,wav,mxf",\r
+    "local": {\r
+      "address": "file://c:/x"\r
+    }\r
+  },\r
+  "metadatas": [\r
+    {\r
+      "$type": "OctopusMetadata",\r
+      "server": {\r
+        "address": "http://10.10.1.27/services/rest/octopus/",\r
+        "timeout": 1000\r
+      }\r
+    },\r
+    {\r
+      "$type": "MediaCubeMetadata",\r
+      "server": {\r
+        "address": "http://10.10.1.27/services/rest/jobengine/",\r
+        "timeout": 1000\r
+      }\r
+    }\r
+  ],\r
+  "targets": [\r
+    {\r
+      "label": "Stúdióba küldés",\r
+      "processor": "FTPTargetProcessor",\r
+      "outputFormat": "%ID%",\r
+      "tag": "Betöltés",\r
+      "nexioServer": true,\r
+      "killDateDays": 7,\r
+      "disableFileVersioning": true,\r
+      "agency": "HÍRADÓ TEST",\r
+      "remote": {\r
+        "address": "ftp://10.10.1.55:2098",\r
+        "userName": "administrator",\r
+        "password": "+QtkeQdCTiOvZOgK/kUND4pO4/D+//r7ZIyluwMMdiqMEgO8iJErAG10ooWhPfiljQeXrdeyMzo7gWEZtcWpNSomGeDIbdMyQwtpqmMo1VEM3A27ZfzigY09YD46ECRh",\r
+        "timeout": 1000\r
+      }\r
+    }\r
+  ]\r
+}\r

diff --git a/client/Maestro/Configuration/configuration-playout-ingest.json b/client/Maestro/Configuration/configuration-playout-ingest.json
new file mode 100644 (file)
index 0000000..bb75520
--- /dev/null
+++ b/client/Maestro/Configuration/configuration-playout-ingest.json
@@ -0,0 +1,60 @@
+{\r
+  "title": "Lebony betöltő",\r
+  "active": true,\r
+  "startInTray": false,\r
+  "enableCustomMetadataId": true,\r
+  "player": {\r
+    "enabled": true,\r
+    "autoStart": false,\r
+    "segmentEditor": true\r
+  },\r
+  "source": {\r
+    "$type": "UNCSource",\r
+    "local": {\r
+      "address": "file://10.10.1.100/BRAAVOS/READY",\r
+      "userName": "mediacube",\r
+      "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy",\r
+      "timeout": 1000\r
+    },\r
+    "remote": {\r
+      "address": "ftp://10.10.1.100/READY",\r
+      "userName": "mediacube",\r
+      "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy",\r
+      "timeout": 1000\r
+    }\r
+  },\r
+  "metadatas": [\r
+    {\r
+      "$type": "TrafficMetadata",\r
+      "server": {\r
+        "address": "Data Source=10.10.1.45\\sql16;Initial Catalog=PA_Echo;Persist Security Info=True;",\r
+        "userName": "MAM",\r
+        "password": "7RKZYBzumKjL40SJwuwiFCvX57xuCN8zay6OttUm2wbrgImyYZBHyZTUUYrXX31Ge2Uwew07HYsqh2uzdJeDBDwcVntxaHg3nIpv9Dyq/odVoiC4tUF/K+lgvKWANcrZ",\r
+        "timeout": 1000\r
+      }\r
+    },\r
+    {\r
+      "$type": "MediaCubeMetadata",\r
+      "server": {\r
+        "address": "http://10.10.1.27/services/rest/jobengine/",\r
+        "timeout": 1000\r
+      }\r
+    }\r
+  ],\r
+  "targets": [\r
+    {\r
+      "label": "Adáskész",\r
+      "processor": "FXPTargetProcessor",\r
+      "outputFormat": "%ID%",\r
+      "saveSegments": true,\r
+      "tag": "Adáskész",\r
+      "disableFileVersioning": true,\r
+      "remote": {\r
+        "address": "ftp://10.10.1.100/PLAYOUT/IceGateway",\r
+        "userName": "mediacube",\r
+        "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy",\r
+        "timeout": 1000\r
+      }\r
+    }\r
+  ]\r
+}\r

diff --git a/client/Maestro/Configuration/configuration-playout.json b/client/Maestro/Configuration/configuration-playout.json
index abf37876fcd3288f9530bf2444a12837d958be55..9a542e4226cfe405cec24797c82d4692b077090f 100644 (file)
--- a/client/Maestro/Configuration/configuration-playout.json
+++ b/client/Maestro/Configuration/configuration-playout.json
@@ -1,6 +1,6 @@
 {\r
   "title": "Adáslebony",\r
-  "active": true,\r
+  "active": false,\r
   "startInTray": true,\r
   "enableCustomMetadataId": true,\r
   "player": {\r
@@ -43,7 +43,7 @@
     {\r
       "$type": "MediaCubeMetadata",\r
       "server": {\r
-        "address": "http://10.10.1.28/services/rest/jobengine/",\r
+        "address": "http://10.10.1.27/services/rest/jobengine/",\r
         "timeout": 1000\r
       }\r
     }\r

diff --git a/client/Maestro/Maestro.csproj b/client/Maestro/Maestro.csproj
index a956c42fd9bcf6afefa6df6d71d610948d58eaf4..5ff8fe44dbe592f429f2e1ec042a42c7b4af9724 100644 (file)
--- a/client/Maestro/Maestro.csproj
+++ b/client/Maestro/Maestro.csproj
@@ -248,12 +248,18 @@
     <Compile Include="MaestroForm.Source.cs">\r
       <SubType>Form</SubType>\r
     </Compile>\r
+    <None Include="Configuration\configuration-nexio-ingest.json">\r
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>\r
+    </None>\r
     <None Include="Configuration\configuration-editor.json">\r
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>\r
     </None>\r
     <None Include="Configuration\configuration-nle.json">\r
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>\r
     </None>\r
+    <None Include="Configuration\configuration-playout-ingest.json">\r
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>\r
+    </None>\r
     <None Include="Connected Services\packages.config" />\r
     <None Include="Maestro_TemporaryKey.pfx" />\r
     <None Include="nlog.config">\r

diff --git a/client/Maestro/MaestroForm.Designer.cs b/client/Maestro/MaestroForm.Designer.cs
index 0fc4654fa2ab3adc47fc6d193ee968ad3b2fa369..546aa09db607ee987950731d4f98a33d8cf336af 100644 (file)
--- a/client/Maestro/MaestroForm.Designer.cs
+++ b/client/Maestro/MaestroForm.Designer.cs
@@ -54,7 +54,7 @@ namespace Maestro {
             this.splitContainer1 = new System.Windows.Forms.SplitContainer();\r
             this.splitContainer3 = new System.Windows.Forms.SplitContainer();\r
             this.groupMetadata = new System.Windows.Forms.GroupBox();\r
-            this.tabControl1 = new System.Windows.Forms.TabControl();\r
+            this.tabMetadata = new System.Windows.Forms.TabControl();\r
             this.tpOctopus = new System.Windows.Forms.TabPage();\r
             this.octopusIDSelector = new OctopusClient.OctopusIDSelector();\r
             this.tpTraffic = new System.Windows.Forms.TabPage();\r
@@ -86,10 +86,10 @@ namespace Maestro {
             this.dataGridMessages = new System.Windows.Forms.DataGridView();\r
             this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
             this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
-            this.systemMessageBindingSource = new System.Windows.Forms.BindingSource(this.components);\r
-            this.metadataInfoBindingSource = new System.Windows.Forms.BindingSource(this.components);\r
             this.timeDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
             this.messageDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
+            this.systemMessageBindingSource = new System.Windows.Forms.BindingSource(this.components);\r
+            this.metadataInfoBindingSource = new System.Windows.Forms.BindingSource(this.components);\r
             this.groupSource.SuspendLayout();\r
             ((System.ComponentModel.ISupportInitialize)(this.dataGridSource)).BeginInit();\r
             ((System.ComponentModel.ISupportInitialize)(this.bindingSource)).BeginInit();\r
@@ -104,7 +104,7 @@ namespace Maestro {
             this.splitContainer3.Panel2.SuspendLayout();\r
             this.splitContainer3.SuspendLayout();\r
             this.groupMetadata.SuspendLayout();\r
-            this.tabControl1.SuspendLayout();\r
+            this.tabMetadata.SuspendLayout();\r
             this.tpOctopus.SuspendLayout();\r
             this.tpTraffic.SuspendLayout();\r
             this.tableLayoutPanel1.SuspendLayout();\r
@@ -318,7 +318,7 @@ namespace Maestro {
             // groupMetadata\r
             // \r
             this.groupMetadata.BackColor = System.Drawing.Color.Transparent;\r
-            this.groupMetadata.Controls.Add(this.tabControl1);\r
+            this.groupMetadata.Controls.Add(this.tabMetadata);\r
             this.groupMetadata.Controls.Add(this.tableLayoutPanel1);\r
             this.groupMetadata.Dock = System.Windows.Forms.DockStyle.Fill;\r
             this.groupMetadata.Location = new System.Drawing.Point(0, 0);\r
@@ -331,17 +331,17 @@ namespace Maestro {
             this.groupMetadata.Enter += new System.EventHandler(this.groupBox_Enter);\r
             this.groupMetadata.Leave += new System.EventHandler(this.groupBox_Leave);\r
             // \r
-            // tabControl1\r
+            // tabMetadata\r
             // \r
-            this.tabControl1.Controls.Add(this.tpOctopus);\r
-            this.tabControl1.Controls.Add(this.tpTraffic);\r
-            this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill;\r
-            this.tabControl1.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
-            this.tabControl1.Location = new System.Drawing.Point(10, 23);\r
-            this.tabControl1.Name = "tabControl1";\r
-            this.tabControl1.SelectedIndex = 0;\r
-            this.tabControl1.Size = new System.Drawing.Size(286, 376);\r
-            this.tabControl1.TabIndex = 1;\r
+            this.tabMetadata.Controls.Add(this.tpOctopus);\r
+            this.tabMetadata.Controls.Add(this.tpTraffic);\r
+            this.tabMetadata.Dock = System.Windows.Forms.DockStyle.Fill;\r
+            this.tabMetadata.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
+            this.tabMetadata.Location = new System.Drawing.Point(10, 23);\r
+            this.tabMetadata.Name = "tabMetadata";\r
+            this.tabMetadata.SelectedIndex = 0;\r
+            this.tabMetadata.Size = new System.Drawing.Size(286, 376);\r
+            this.tabMetadata.TabIndex = 1;\r
             // \r
             // tpOctopus\r
             // \r
@@ -787,14 +787,6 @@ namespace Maestro {
             this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";\r
             this.dataGridViewTextBoxColumn2.ReadOnly = true;\r
             // \r
-            // systemMessageBindingSource\r
-            // \r
-            this.systemMessageBindingSource.DataSource = typeof(Maestro.SystemMessage);\r
-            // \r
-            // metadataInfoBindingSource\r
-            // \r
-            this.metadataInfoBindingSource.DataSource = typeof(Maestro.Metadata.MetadataInfo);\r
-            // \r
             // timeDataGridViewTextBoxColumn\r
             // \r
             this.timeDataGridViewTextBoxColumn.DataPropertyName = "Time";\r
@@ -811,6 +803,14 @@ namespace Maestro {
             this.messageDataGridViewTextBoxColumn.ReadOnly = true;\r
             this.messageDataGridViewTextBoxColumn.Width = 83;\r
             // \r
+            // systemMessageBindingSource\r
+            // \r
+            this.systemMessageBindingSource.DataSource = typeof(Maestro.SystemMessage);\r
+            // \r
+            // metadataInfoBindingSource\r
+            // \r
+            this.metadataInfoBindingSource.DataSource = typeof(Maestro.Metadata.MetadataInfo);\r
+            // \r
             // MaestroForm\r
             // \r
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);\r
@@ -840,7 +840,7 @@ namespace Maestro {
             ((System.ComponentModel.ISupportInitialize)(this.splitContainer3)).EndInit();\r
             this.splitContainer3.ResumeLayout(false);\r
             this.groupMetadata.ResumeLayout(false);\r
-            this.tabControl1.ResumeLayout(false);\r
+            this.tabMetadata.ResumeLayout(false);\r
             this.tpOctopus.ResumeLayout(false);\r
             this.tpTraffic.ResumeLayout(false);\r
             this.tpTraffic.PerformLayout();\r
@@ -883,7 +883,7 @@ namespace Maestro {
         private System.Windows.Forms.GroupBox groupActions;\r
         private System.Windows.Forms.DataGridView dataGridJobs;\r
         private System.Windows.Forms.BindingSource bindingSourceJobs;\r
-        private System.Windows.Forms.TabControl tabControl1;\r
+        private System.Windows.Forms.TabControl tabMetadata;\r
         private System.Windows.Forms.TabPage tpOctopus;\r
         private OctopusClient.OctopusIDSelector octopusIDSelector;\r
         private System.Windows.Forms.TabPage tpTraffic;\r

diff --git a/client/Maestro/MaestroForm.Metadata.cs b/client/Maestro/MaestroForm.Metadata.cs
index 94de2c79d4b83d4c6edcd91b4e660a773d1ea26b..5e74d6efb0626aee08d0b675cfb4be11a5d21982 100644 (file)
--- a/client/Maestro/MaestroForm.Metadata.cs
+++ b/client/Maestro/MaestroForm.Metadata.cs
@@ -51,8 +51,10 @@ namespace Maestro {
 \r
         private void InitializeTrafficSelector() {\r
             TrafficMetadata metadata = Configuration.GetMetadataProvider<TrafficMetadata>();\r
-            if (metadata == null)\r
+            if (metadata == null) {\r
+                tabMetadata.TabPages.Remove(tpTraffic);\r
                 return;\r
+            }\r
             trafficIDSelector.Configuration = new TrafficConfiguration() {\r
                 Address = metadata.Server.Address,\r
                 UserName = metadata.Server.UserName,\r
@@ -65,8 +67,10 @@ namespace Maestro {
 \r
         private void InitializeOctopusSelector() {\r
             OctopusMetadata metadata = Configuration.GetMetadataProvider<OctopusMetadata>();\r
-            if (metadata == null)\r
+            if (metadata == null) {\r
+                tabMetadata.TabPages.Remove(tpOctopus);\r
                 return;\r
+            }\r
             octopusIDSelector.Configuration = new OctopusConfiguration() {\r
                 Address = metadata.Server.Address,\r
                 UserName = metadata.Server.UserName,\r
@@ -248,15 +252,10 @@ namespace Maestro {
             if (String.IsNullOrEmpty(id))\r
                 return null;\r
             OctopusAPI api = octopusIDSelector.GetClient();\r
-            IEnumerable<Story> storyEnum = api.GetStoriesById(id);\r
-            if (storyEnum != null)\r
-                FillModelFromStories(result, storyEnum.ToList(), api);\r
-            else {\r
-                IEnumerable<Story> storiesEnum = api.GetStoriesByPlaceHolderId(id);\r
-                if (storiesEnum != null) {\r
-                    List<Story> stories = storiesEnum.ToList();\r
-                    FillModelFromStories(result, stories, api);\r
-                }\r
+            IEnumerable<Story> storiesEnum = api.GetStoriesByPlaceHolderId(id);\r
+            if (storiesEnum != null) {\r
+                List<Story> stories = storiesEnum.ToList();\r
+                FillModelFromStories(result, stories, api);\r
             }\r
             return result;\r
         }\r
@@ -265,7 +264,7 @@ namespace Maestro {
             if (stories == null || stories.Count == 0)\r
                 return;\r
             Story story = stories[0];\r
-            if (story.StoryFolders != null) {\r
+            if (story.StoryFolders != null && story.StoryFolders.Length > 0) {\r
                 IEnumerable<StoryFolder> storyFoldersEnum = api.GetStoryFoldersByStoryID(story.ID);\r
                 if (storyFoldersEnum == null)\r
                     return;\r

diff --git a/client/Maestro/MaestroForm.Source.cs b/client/Maestro/MaestroForm.Source.cs
index 5c7ab37099e46537aa79333a14f12d0169323f61..8745a84b9c0f6f8077d40d84dfba59702dc422c2 100644 (file)
--- a/client/Maestro/MaestroForm.Source.cs
+++ b/client/Maestro/MaestroForm.Source.cs
@@ -158,6 +158,8 @@ namespace Maestro {
         }\r
 \r
         private string GetPrefix(string name) {\r
+            if (String.IsNullOrEmpty(name))\r
+                return null;\r
             string[] byHyphen = name.Replace('_', '-').Replace('.', '-').Split('-');\r
             return byHyphen.Length > 0 ? byHyphen[0] : null;\r
         }\r
@@ -172,7 +174,7 @@ namespace Maestro {
                 if (selectionPrefix == null)\r
                     selectionPrefix = currentPrefix;\r
                 else\r
-                    selectionPrefix = currentPrefix.Equals(selectionPrefix) ? selectionPrefix : null;\r
+                    selectionPrefix = selectionPrefix.Equals(currentPrefix) ? selectionPrefix : null;\r
             }\r
             SelectedSource = new SourceInfo() {\r
                 Name = selectedNames,\r

diff --git a/client/Maestro/MaestroForm.cs b/client/Maestro/MaestroForm.cs
index da25cc5efbe684b5bc1e301a97ae8c580deede3a..5845a393dc928418c65b3e9d176165721f627f85 100644 (file)
--- a/client/Maestro/MaestroForm.cs
+++ b/client/Maestro/MaestroForm.cs
@@ -80,7 +80,6 @@ namespace Maestro {
             InitializeMetadata();\r
             InitializeTarget();\r
             InitializeJobs();\r
-            //InitializeMessages();\r
             InitializeControlTexts();\r
         }\r
 \r
@@ -94,21 +93,6 @@ namespace Maestro {
 \r
         }\r
 \r
-        private void InitializeMessages() {\r
-            //dataGridMessages.Columns.AddRange(\r
-            //    new DataGridViewTextBoxColumn() {\r
-            //        AutoSizeMode = DataGridViewAutoSizeColumnMode.DisplayedCells,\r
-            //        DataPropertyName = "Time",\r
-            //        HeaderText = StringResources.IDO\r
-            //    },\r
-            //    new DataGridViewTextBoxColumn() {\r
-            //        AutoSizeMode = DataGridViewAutoSizeColumnMode.DisplayedCells,\r
-            //        DataPropertyName = "Message",\r
-            //        HeaderText = StringResources.UZENET\r
-            //    }\r
-            //);\r
-        }\r
-\r
         private void InitializeJobs() {\r
             bindingSourceJobs.DataSource = jobs;\r
             foreach (DataGridViewColumn column in dataGridJobs.Columns) {\r

diff --git a/client/Maestro/Properties/AssemblyInfo.cs b/client/Maestro/Properties/AssemblyInfo.cs
index f8ce90b32391e874711963db69aabdb9278bae57..08ceaa4d9e78d15020e7d97dc1f4fcc22000cb75 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("1.9.3.0")]\r
-[assembly: AssemblyFileVersion("1.9.3.0")]\r
+[assembly: AssemblyVersion("1.9.4.0")]\r
+[assembly: AssemblyFileVersion("1.9.4.0")]\r

diff --git a/client/Maestro/Resources/installforge-installer-project.ifp b/client/Maestro/Resources/installforge-installer-project.ifp
index ef230307baed3572002fb489d606a9ac057acb9d..9115e9bd1312bb5206178f96b77eb1069fbe3b14 100644 (file)
Binary files a/client/Maestro/Resources/installforge-installer-project.ifp and b/client/Maestro/Resources/installforge-installer-project.ifp differ

diff --git a/client/OctopusClient/OctopusAPI.cs b/client/OctopusClient/OctopusAPI.cs
index 1123ee7cc06236425305e69efecae455bc3425f0..7e4f8eaac670827d761a040d282fdf4d54c08e89 100644 (file)
--- a/client/OctopusClient/OctopusAPI.cs
+++ b/client/OctopusClient/OctopusAPI.cs
@@ -495,8 +495,8 @@ namespace OctopusClient {
                         Name = d["name"].ToString(),\r
                         MosObjects = objs.ToArray()\r
                     };\r
-                    if (d["script"] != null) {\r
-                        r.Script = d["script"].ToString();\r
+                    if (d["script_content"] != null) {\r
+                        r.Script = d["script_content"].ToString();\r
                     }\r
                     if (d["story_folder"] != null)\r
                         r.StoryFolders = GetStoryFolderFromStory(d).ToArray();\r

diff --git a/client/OctopusClient/OctopusIDSelector.Designer.cs b/client/OctopusClient/OctopusIDSelector.Designer.cs
index f5c9aa33d2b1fafb780b3d265df93697e73c361a..5da9be3bb7abe0c41ce5b76ff55ff1fa87830bd1 100644 (file)
--- a/client/OctopusClient/OctopusIDSelector.Designer.cs
+++ b/client/OctopusClient/OctopusIDSelector.Designer.cs
@@ -46,7 +46,6 @@
             this.dateScheduled.Format = System.Windows.Forms.DateTimePickerFormat.Short;\r
             this.dateScheduled.Location = new System.Drawing.Point(6, 6);\r
             this.dateScheduled.Name = "dateScheduled";\r
-            this.dateScheduled.ShowUpDown = true;\r
             this.dateScheduled.Size = new System.Drawing.Size(82, 20);\r
             this.dateScheduled.TabIndex = 0;\r
             this.dateScheduled.ValueChanged += new System.EventHandler(this.dateScheduled_ValueChanged);\r

diff --git a/client/OctopusClient/OctopusIDSelector.cs b/client/OctopusClient/OctopusIDSelector.cs
index 319fc497af2cbaf845ae921bfe7a3622f99c6ff4..abf2ab5fce3a48523cc2ce452e626593cda49d42 100644 (file)
--- a/client/OctopusClient/OctopusIDSelector.cs
+++ b/client/OctopusClient/OctopusIDSelector.cs
@@ -110,7 +110,7 @@ namespace OctopusClient {
         private void refreshRundowns() {\r
             ClearSelection();\r
             Cursor.Current = Cursors.WaitCursor;\r
-            IEnumerable<Rundown> rundowns = client.GetRundowns(dateScheduled.Value)?.ToArray();\r
+            IEnumerable<Rundown> rundowns = client.GetRundowns(dateScheduled.Value.Date)?.ToArray();\r
             if (rundowns == null) {\r
                 bindingRundown.DataSource = null;\r
                 Cursor.Current = Cursors.Default;\r
@@ -219,23 +219,11 @@ namespace OctopusClient {
             else\r
                 IDChangedEvent?.Invoke(null, null);\r
         }\r
-\r
-        public void IDSelectedFromOutside(string id) {\r
-            this.id = id;\r
-            if (tabControl1.SelectedIndex == 0) {\r
-                refreshStoryFolders();\r
-                refreshRundowns();\r
-            } else {\r
-                refreshRundowns();\r
-                refreshStoryFolders();\r
-            }\r
-        }\r
-\r
+        \r
         public OctopusAPI GetClient() {\r
             return client;\r
         }\r
 \r
-\r
         private const int TVIF_STATE = 0x8;\r
         private const int TVIS_STATEIMAGEMASK = 0xF000;\r
         private const int TV_FIRST = 0x1100;\r

diff --git a/client/OctopusClient/OctopusIDSelector.resx b/client/OctopusClient/OctopusIDSelector.resx
index 0518ece7c7011ea1c495e01f3dae6bd4751e82a5..f50ab11f77d20735a36085e64c7ebd2029d9be11 100644 (file)
--- a/client/OctopusClient/OctopusIDSelector.resx
+++ b/client/OctopusClient/OctopusIDSelector.resx
@@ -120,12 +120,6 @@
   <metadata name="bindingRundown.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
     <value>17, 17</value>\r
   </metadata>\r
-  <metadata name="bindingRundown.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
-    <value>17, 17</value>\r
-  </metadata>\r
-  <metadata name="bindingStoryFolder.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
-    <value>155, 17</value>\r
-  </metadata>\r
   <metadata name="bindingStoryFolder.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
     <value>155, 17</value>\r
   </metadata>\r

diff --git a/client/PlanAIRClient/TrafficAPI.cs b/client/PlanAIRClient/TrafficAPI.cs
index 31b752372ac419aad53cc418e0c32d84a35a17fc..7730eb747dec464535b1bfde7d767bfd54bf77c6 100644 (file)
--- a/client/PlanAIRClient/TrafficAPI.cs
+++ b/client/PlanAIRClient/TrafficAPI.cs
@@ -13,37 +13,37 @@ namespace TrafficClient {
         private CliFSPReader cliFSPReader;\r
         private SqlConnection connection;\r
         private static Logger logger = LogManager.GetCurrentClassLogger();\r
-        private MaterialWorker broadcastWorker;\r
+        private MaterialWorker materialWorker;\r
         private PromoWorker promoWorker;\r
         private ADWorker adWorker;\r
         private SegmentWorker segmentWorker;\r
 \r
         public TrafficAPI(string connString, string user, string password, int timeout, IMessageBus messageBus) {\r
-            connectionString = String.Format("{0};User ID={1};Password={2};Connection Timeout={3}", connString, user, password, timeout/1000);\r
+            connectionString = String.Format("{0};User ID={1};Password={2};Connection Timeout={3}", connString, user, password, timeout / 1000);\r
             connection = new SqlConnection(connectionString);\r
             cliFSPReader = new CliFSPReader();\r
-            broadcastWorker = new MaterialWorker(connection, cliFSPReader, messageBus);\r
+            materialWorker = new MaterialWorker(connection, cliFSPReader, messageBus);\r
             promoWorker = new PromoWorker(connection, cliFSPReader, messageBus);\r
             adWorker = new ADWorker(connection, cliFSPReader, messageBus);\r
             segmentWorker = new SegmentWorker(connection, cliFSPReader, messageBus);\r
         }\r
 \r
         public List<TrafficItem> GetMaterials(string strParam, bool problematic, DateTime? from = null, DateTime? to = null) {\r
-            return broadcastWorker.GetMaterials(strParam, problematic, from, to);\r
+            return materialWorker.GetMaterials(strParam, problematic, from, to);\r
         }\r
 \r
         public List<TrafficItemMetadata> GetMaterialMetadata(string strParam) {\r
-            return broadcastWorker.GetMaterialArchiveMetadata(strParam);\r
+            return materialWorker.GetMaterialArchiveMetadata(strParam);\r
         }\r
 \r
         public void UpdateTrafficInformation(int itemID, bool ready, TrafficMetadataType kind, List<Segment> segments) {\r
             switch (kind) {\r
                 case TrafficMetadataType.TrafficMaterial: {\r
-                        broadcastWorker.SetMaterialOK(itemID, false);\r
+                        materialWorker.SetMaterialOK(itemID, false);\r
                         segmentWorker.DeleteMaterialSegments(itemID);\r
                         foreach (Segment actualSegment in segments)\r
                             segmentWorker.AddMaterialSegment(itemID, actualSegment);\r
-                        broadcastWorker.SetMaterialOK(itemID, ready);\r
+                        materialWorker.SetMaterialOK(itemID, ready);\r
                         break;\r
                     }\r
                 case TrafficMetadataType.TrafficAD: {\r
@@ -89,16 +89,8 @@ namespace TrafficClient {
             return segmentWorker.GetADSegments(strParam);\r
         }\r
 \r
-        //public void DeleteMaterialSegments(int itemID) {\r
-        //    segmentWorker.DeleteMaterialSegments(itemID);\r
-        //}\r
-\r
-        //public void DeleteMaterialSegment(int itemID, int segmentID) {\r
-        //    segmentWorker.DeleteMaterialSegment(itemID, segmentID);\r
-        //}\r
-\r
-        //public void AddMaterialSegment(int itemID, Segment segment) {\r
-        //    segmentWorker.AddMaterialSegment(itemID, segment);\r
-        //}\r
+        public string CreateMaterialVersion(string episodeID) {\r
+            return materialWorker.CreateMaterialVersion(episodeID);\r
+        }\r
     }\r
 }\r

diff --git a/client/PlanAIRClient/TrafficIDSelector.Designer.cs b/client/PlanAIRClient/TrafficIDSelector.Designer.cs
index 726e25e5b7ca98c9801a3d178cf709c689df5551..c27e6369bfa3aa71914599ba5bd9b6b97d23c328 100644 (file)
--- a/client/PlanAIRClient/TrafficIDSelector.Designer.cs
+++ b/client/PlanAIRClient/TrafficIDSelector.Designer.cs
@@ -29,9 +29,9 @@
         private void InitializeComponent()\r
         {\r
             this.components = new System.ComponentModel.Container();\r
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();\r
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();\r
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();\r
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();\r
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();\r
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();\r
             this.trafficAPIBindingSource = new System.Windows.Forms.BindingSource(this.components);\r
             this.backgroundWorker1 = new System.ComponentModel.BackgroundWorker();\r
             this.backgroundWorker2 = new System.ComponentModel.BackgroundWorker();\r
@@ -76,22 +76,22 @@
             this.dgTraffic.BackgroundColor = System.Drawing.Color.White;\r
             this.dgTraffic.BorderStyle = System.Windows.Forms.BorderStyle.None;\r
             this.dgTraffic.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.Raised;\r
-            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
-            dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;\r
-            dataGridViewCellStyle1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
-            dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;\r
-            dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;\r
-            dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;\r
-            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False;\r
-            this.dgTraffic.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;\r
-            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
-            dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window;\r
-            dataGridViewCellStyle2.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F);\r
-            dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText;\r
-            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.Color.Gainsboro;\r
-            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.Color.Black;\r
-            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;\r
-            this.dgTraffic.DefaultCellStyle = dataGridViewCellStyle2;\r
+            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
+            dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control;\r
+            dataGridViewCellStyle4.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
+            dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText;\r
+            dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight;\r
+            dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText;\r
+            dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False;\r
+            this.dgTraffic.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4;\r
+            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
+            dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window;\r
+            dataGridViewCellStyle5.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F);\r
+            dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.ControlText;\r
+            dataGridViewCellStyle5.SelectionBackColor = System.Drawing.Color.Gainsboro;\r
+            dataGridViewCellStyle5.SelectionForeColor = System.Drawing.Color.Black;\r
+            dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.False;\r
+            this.dgTraffic.DefaultCellStyle = dataGridViewCellStyle5;\r
             this.dgTraffic.Dock = System.Windows.Forms.DockStyle.Fill;\r
             this.dgTraffic.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically;\r
             this.dgTraffic.EnableHeadersVisualStyles = false;\r
@@ -99,8 +99,8 @@
             this.dgTraffic.MultiSelect = false;\r
             this.dgTraffic.Name = "dgTraffic";\r
             this.dgTraffic.RowHeadersVisible = false;\r
-            dataGridViewCellStyle3.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F);\r
-            this.dgTraffic.RowsDefaultCellStyle = dataGridViewCellStyle3;\r
+            dataGridViewCellStyle6.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F);\r
+            this.dgTraffic.RowsDefaultCellStyle = dataGridViewCellStyle6;\r
             this.dgTraffic.RowTemplate.DefaultCellStyle.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F);\r
             this.dgTraffic.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;\r
             this.dgTraffic.Size = new System.Drawing.Size(263, 217);\r
@@ -116,8 +116,7 @@
             this.scheduledDate.Location = new System.Drawing.Point(3, 38);\r
             this.scheduledDate.Name = "scheduledDate";\r
             this.scheduledDate.ShowCheckBox = true;\r
-            this.scheduledDate.ShowUpDown = true;\r
-            this.scheduledDate.Size = new System.Drawing.Size(101, 20);\r
+            this.scheduledDate.Size = new System.Drawing.Size(103, 20);\r
             this.scheduledDate.TabIndex = 3;\r
             // \r
             // textBox1\r
@@ -225,7 +224,6 @@
             this.tableLayoutPanelSearch.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 42.1875F));\r
             this.tableLayoutPanelSearch.Size = new System.Drawing.Size(263, 62);\r
             this.tableLayoutPanelSearch.TabIndex = 10;\r
-            this.tableLayoutPanelSearch.Paint += new System.Windows.Forms.PaintEventHandler(this.tableLayoutPanelSearch_Paint);\r
             // \r
             // pSearch\r
             // \r

diff --git a/client/PlanAIRClient/TrafficIDSelector.cs b/client/PlanAIRClient/TrafficIDSelector.cs
index d7a8741f89e93804f994bfbbb6381a84b3223e30..8ff4e0e7ebbfae04ac35fadf152600628f6a11b6 100644 (file)
--- a/client/PlanAIRClient/TrafficIDSelector.cs
+++ b/client/PlanAIRClient/TrafficIDSelector.cs
@@ -3,6 +3,7 @@ using System;
 using System.Collections.Generic;\r
 using System.Diagnostics;\r
 using LinkDotNet.MessageHandling.Contracts;\r
+using System.ComponentModel;\r
 \r
 namespace TrafficClient {\r
     public delegate void OnSelectedIDChanged(string ID, int variantID);\r
@@ -49,27 +50,21 @@ namespace TrafficClient {
             DateTime? scheduledDate = null;\r
             if (this.scheduledDate.Checked)\r
                 scheduledDate = this.scheduledDate.Value.Date;\r
-            \r
-            List<TrafficItem> items = null;\r
+\r
+            BindingList<TrafficItem> items = null;\r
             dgTraffic.Columns.Clear();\r
             if (rbMaterial.Checked) {\r
                 dgTraffic.Columns.AddRange(GetMaterialColumns());\r
-                items = trafficAPI.GetMaterials(searchText, chkProblematic.Checked, scheduledDate, scheduledDate);\r
+                items = new BindingList<TrafficItem>(trafficAPI.GetMaterials(searchText, chkProblematic.Checked, scheduledDate, scheduledDate));\r
             } else if (rbAD.Checked) {\r
                 dgTraffic.Columns.AddRange(GetADColumns());\r
-                items = trafficAPI.GetADs(searchText, chkProblematic.Checked, scheduledDate, scheduledDate);\r
+                items = new BindingList<TrafficItem>(trafficAPI.GetADs(searchText, chkProblematic.Checked, scheduledDate, scheduledDate));\r
             } else if (rbPromo.Checked) {\r
                 dgTraffic.Columns.AddRange(GetPromoColumns());\r
-                items = trafficAPI.GetPromos(searchText, chkProblematic.Checked, scheduledDate, scheduledDate);\r
-            }\r
-            if (items == null) {\r
-                dgTraffic.DataSource = null;\r
-                Cursor.Current = Cursors.Default;\r
-                return;\r
+                items = new BindingList<TrafficItem>(trafficAPI.GetPromos(searchText, chkProblematic.Checked, scheduledDate, scheduledDate));\r
             }\r
-            //if (CanSort(list))\r
-            //    list.Sort((x, y) => DateTime.Compare(x.NextBroadcastDate.Value, y.NextBroadcastDate.Value));\r
-            dgTraffic.DataSource = items;\r
+            trafficAPIBindingSource.DataSource = items;\r
+            dgTraffic.DataSource = trafficAPIBindingSource;\r
             Cursor.Current = Cursors.Default;\r
         }\r
 \r
@@ -87,11 +82,6 @@ namespace TrafficClient {
             RefreshDataGridSource();\r
         }\r
 \r
-        private void tableLayoutPanelSearch_Paint(object sender, PaintEventArgs e) {\r
-            //var rectangle = e.ClipRectangle;\r
-            //ControlPaint.DrawBorder(e.Graphics, rectangle, Color.LightGray, ButtonBorderStyle.Dotted); // dotted border\r
-        }\r
-\r
         private void dataGridView1_CellContentClick(object sender, DataGridViewCellEventArgs e) {\r
             if (e.RowIndex < 0 || e.ColumnIndex != 0)\r
                 return;\r
@@ -103,8 +93,11 @@ namespace TrafficClient {
 \r
         private void OnSelectionChanged(DataGridViewRow actualRow) {\r
             TrafficItem res = actualRow.DataBoundItem as TrafficItem;\r
-            if (String.IsNullOrEmpty(res.MediaID))\r
-                return;\r
+            if (String.IsNullOrEmpty(res.MediaID)) {\r
+                res.MediaID = trafficAPI.CreateMaterialVersion(res.EpisodeID);\r
+                if (String.IsNullOrEmpty(res.MediaID))\r
+                    return;\r
+            }\r
             DataGridViewCheckBoxCell actualCell = actualRow.Cells[0] as DataGridViewCheckBoxCell;\r
             if (!actualCell.Equals(selectedCell)) {\r
                 ClearSelection();\r

diff --git a/client/PlanAIRClient/Workers/MaterialWorker.cs b/client/PlanAIRClient/Workers/MaterialWorker.cs
index 3dd7750374276cd459623430c2b3ccb27583560e..a27e55e7e586d3e0bcf874d36caebd7255f1555f 100644 (file)
--- a/client/PlanAIRClient/Workers/MaterialWorker.cs
+++ b/client/PlanAIRClient/Workers/MaterialWorker.cs
@@ -47,12 +47,7 @@ namespace TrafficClient.Workers {
                 TryConnect();\r
                 using (SqlCommand cmd = new SqlCommand("dbo.clIFsp_EC_MAM", connection)) {\r
                     cmd.CommandType = CommandType.StoredProcedure;\r
-//                    cmd.Parameters.AddWithValue("@Operation", 1001);\r
                     cmd.Parameters.AddWithValue("@Operation", 1002);\r
-                    //if (problematic)\r
-                    //    cmd.Parameters.AddWithValue("@@@Options", 8);\r
-                    //else\r
-                    //    cmd.Parameters.AddWithValue("@@@Options", 0);\r
                     if (problematic)\r
                         cmd.Parameters.AddWithValue("@@@Options", 1);\r
                     else\r
@@ -87,7 +82,6 @@ namespace TrafficClient.Workers {
 \r
 \r
         public List<TrafficItemMetadata> GetMaterialArchiveMetadata(string strParam) {\r
-            List<clIFsp_EC_MAMBradocastResult> sqlResult = null;\r
             List<TrafficItemMetadata> result = null;\r
             try {\r
                 TryConnect();\r
@@ -117,6 +111,36 @@ namespace TrafficClient.Workers {
             return result;\r
         }\r
 \r
+        public string CreateMaterialVersion(string episodeID) {\r
+            string result = null;\r
+            try {\r
+                TryConnect();\r
+                using (SqlCommand cmd = new SqlCommand("dbo.clIFsp_EC_MAM", connection)) {\r
+                    cmd.CommandType = CommandType.StoredProcedure;\r
+                    cmd.Parameters.AddWithValue("@Operation", 1105);\r
+                    cmd.Parameters.AddWithValue("@@@Options", DBNull.Value);\r
+                    cmd.Parameters.AddWithValue("@@IntParam1", 1);\r
+                    cmd.Parameters.AddWithValue("@@ItemID", DBNull.Value);\r
+                    cmd.Parameters.AddWithValue("@@StrParam1", episodeID);\r
+                    cmd.Parameters.AddWithValue("@@StrParam2", DBNull.Value);\r
+\r
+                    using (SqlDataReader reader = cmd.ExecuteReader()) {\r
+                        if (reader.Read()) {\r
+                            if (!reader.IsDBNull(1))\r
+                                result = reader.GetString(1);\r
+                        }\r
+                    }\r
+                }\r
+            }\r
+            catch (Exception e) {\r
+                OnError(logger, e);\r
+            }\r
+            finally {\r
+                connection.Close();\r
+            }\r
+            return result;\r
+        }\r
+\r
         public void SetMaterialOK(int itemID, bool ok) {\r
             try {\r
                 TryConnect();\r

diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/OutputPathAndNameSelectorStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/OutputPathAndNameSelectorStep.java
index a758ae77336ffcf8a1486bbdf47c3cba61bc564b..323c7e748623f4cd4d5e295e20eae565fd166260 100644 (file)
--- a/server/user.jobengine.executors/src/user/jobengine/server/steps/OutputPathAndNameSelectorStep.java
+++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/OutputPathAndNameSelectorStep.java
@@ -25,8 +25,7 @@ public class OutputPathAndNameSelectorStep extends JobStep {
 \r
        private static final Logger logger = LogManager.getLogger();\r
        private static final String REGEXP_TRAFFIC = "^[MRP]{1}[0-9]{6}[A-Z]{1}$";\r
-       private static final String REGEXP_OCTOPUSPLACEHOLDERID = "^[0-9]+_[0-9]+$";\r
-       private static final String REGEXP_OCTOPUSPLACEHOLDERVERSIONEDID = "^[0-9]+_[0-9]+-[0-9]{3}$";\r
+       private static final String REGEXP_OCTOPUSID = "^[0-9]+$";\r
 \r
        private void check(String trafficOutputPath, String octopusOutputPath, String genericOutputPath, String houseId) {\r
                if (StringUtils.isBlank(trafficOutputPath)) {\r
@@ -90,9 +89,7 @@ public class OutputPathAndNameSelectorStep extends JobStep {
        private MetadataType GuessMetadataType(String id) {\r
                if (id.matches(REGEXP_TRAFFIC))\r
                        return MetadataType.TRAFFIC;\r
-               if (id.matches(REGEXP_OCTOPUSPLACEHOLDERID))\r
-                       return MetadataType.OCTOPUS;\r
-               if (id.matches(REGEXP_OCTOPUSPLACEHOLDERVERSIONEDID))\r
+               if (id.matches(REGEXP_OCTOPUSID))\r
                        return MetadataType.OCTOPUS;\r
                return MetadataType.GENERIC;\r
        }\r

diff --git a/server/user.jobengine.osgi.server/.settings/org.eclipse.core.resources.prefs b/server/user.jobengine.osgi.server/.settings/org.eclipse.core.resources.prefs
index f05a37334baf3b4117d6065ee513226a0f5221ae..b482124ac306eb6943f1b00ea94efd826473b45c 100644 (file)
--- a/server/user.jobengine.osgi.server/.settings/org.eclipse.core.resources.prefs
+++ b/server/user.jobengine.osgi.server/.settings/org.eclipse.core.resources.prefs
@@ -1,3 +1,2 @@
 eclipse.preferences.version=1\r
-encoding//pages/menu.zul=ISO-8859-2\r
 encoding//src/user/jobengine/server/JobRuntime.java=UTF-8\r

diff --git a/server/user.jobengine.osgi.server/pages/index.zul b/server/user.jobengine.osgi.server/pages/index.zul
index 27399a55574941b89d7f8bbcd087d414de74d674..927d5442520788dc69768e6e829c7147b3c2785e 100644 (file)
--- a/server/user.jobengine.osgi.server/pages/index.zul
+++ b/server/user.jobengine.osgi.server/pages/index.zul
@@ -52,11 +52,12 @@
                        <north border="0">\r
                                <div id="divMenu" apply="org.zkoss.bind.BindComposer" viewModel="@id('mvm') @init('user.jobengine.zk.model.MenuModel')">\r
                                        <borderlayout height="50px">\r
-                                               <west width="250px" border="0">\r
+                                               <west width="400px" border="0">\r
                                                        <div width="100%" height="100%" style="background: #008AC8;" >\r
-                                                               <image src="/img/mediacube_logo_v2_50x50.png" tooltiptext="MediaCube Server v2.1.0">\r
+                                                               <image src="/img/mediacube_logo_v2_50x50.png">\r
 <!--                                                           <custom-attributes org.zkoss.zul.image.preload="true" /> -->\r
                                                                </image>\r
+                                                               <label style="color:#e3e3e3;font-size:20px;font-weight:bold">MediaCube v2.1.1</label>\r
                                                        </div>\r
                                                </west>\r
                                                <center border="0">\r

diff --git a/server/user.jobengine.osgi.server/pages/menu.zul b/server/user.jobengine.osgi.server/pages/menu.zul
index 8086e0f5db3f9eedad84144626e32235da921515..f97e93bc2472e06ffcbe892e5fd505319ae814ab 100644 (file)
--- a/server/user.jobengine.osgi.server/pages/menu.zul
+++ b/server/user.jobengine.osgi.server/pages/menu.zul
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-2"?>\r
+<?xml version="1.0" encoding="UTF-8"?>\r
 <?init class="user.jobengine.zk.util.AuthInitiator"?>\r
 <zk>\r
 <style>\r
@@ -54,34 +54,20 @@
        <menubar id="menubar" hflex="max" sclass="redmenubar">\r
                <menu sclass="whitemenu" label="Rendszer">\r
                        <menupopup>\r
-                               <menuitem sclass="rozsda" label="Kilépés" onClick="@command('doLogout',window=zkwindow)" disabled="false" />\r
+                               <menuitem sclass="rozsda" label="Kilépés" onClick="@command('doLogout',window=zkwindow)" disabled="false" />\r
                        </menupopup>\r
                </menu>\r
-               <menu sclass="whitemenu" label="Archívum" >\r
+               <menu sclass="whitemenu" label="Archívum" >\r
                        <menupopup>\r
-                               <menuitem sclass="rozsda" label="Keresés" onClick='includeContent.src="/pages/search_items.zul"' disabled="false" />\r
-                               <menuitem sclass="rozsda" label="Statisztikák" onClick='includeContent.src="/pages/statistics.zul"' disabled="false" />\r
+                               <menuitem sclass="rozsda" label="Keresés" onClick='includeContent.src="/pages/search_items.zul"' disabled="false" />\r
+                               <menuitem sclass="rozsda" label="Statisztikák" onClick='includeContent.src="/pages/statistics.zul"' disabled="false" />\r
                                <menuitem sclass="rozsda" label="Folyamatok" onClick='includeContent.src="/pages/joblist.zul"' disabled="false" />\r
                        </menupopup>\r
                </menu>\r
 \r
-               <!-- menu label="${labels.menu_admin}" image="/img/Centigrade-Widget-Icons/QuestionmarkButton-16x16.png" visible="true">\r
-                       <menupopup>\r
-                               <menu label="${labels.menu_admin_permissions}">\r
-                                       <menupopup>\r
-                                               <menuitem label="${labels.menu_admin_permissions_authorizations}" onClick='includeContent.src="/pages/perm_auth_list.zul"'/>\r
-                                               <menuitem label="${labels.menu_admin_permissions_groups}" onClick='includeContent.src="/pages/perm_group_list.zul"'/>\r
-                                               <menuitem label="${labels.menu_admin_permissions_users}" onClick='includeContent.src="/pages/perm_user_list.zul"' />\r
-                                       </menupopup>\r
-                               </menu>\r
-                               <menu label="${labels.menu_admin_datastructure}">\r
-                               </menu>\r
-                       </menupopup>\r
-               </menu -->\r
-\r
                <menu sclass="whitemenu" label="${labels.menu_help}" >\r
                        <menupopup>\r
-                               <menuitem sclass="rozsda" label="${labels.menu_content}" href="/resource/help.html" />\r
+                               <menuitem sclass="rozsda" label="${labels.menu_content}" href="http://10.10.1.27:90/docs" target="_blank" />\r
                                <menuitem sclass="rozsda" label="${labels.menu_version}" href="/resource/help.html" target="_blank" />\r
                        </menupopup>\r
                </menu>\r

diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/MenuModel.java b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/MenuModel.java
index 4ed997426a0dd5b04b59ca707336db1d69251837..df2aa82f53cc19391d970769419b86a6a5bbc7f3 100644 (file)
--- a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/MenuModel.java
+++ b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/MenuModel.java
@@ -2,6 +2,7 @@ package user.jobengine.zk.model;
 \r
 import org.zkoss.bind.annotation.BindingParam;\r
 import org.zkoss.bind.annotation.Command;\r
+import org.zkoss.zk.ui.Executions;\r
 import org.zkoss.zk.ui.select.annotation.Wire;\r
 import org.zkoss.zul.Include;\r
 import org.zkoss.zul.Window;\r
@@ -29,4 +30,11 @@ public class MenuModel extends BaseModel {
                return "Media archivum user"; //String.format(Labels.getLabel("header.userformat"), SessionUtil.getUserProfile().getDisplayName(), SessionUtil.getUserProfile().getUserName().toUpperCase());\r
        }\r
 \r
+       public void redirectToDocs() {\r
+               String serverName = Executions.getCurrent().getLocalAddr();\r
+               String serverName1 = Executions.getCurrent().getRemoteAddr();\r
+               String serverName2 = Executions.getCurrent().getBrowser();\r
+\r
+       }\r
+\r
 }
\ No newline at end of file