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

diff --git a/client/AudioRecorder/AudioRecorderSettings.cs b/client/AudioRecorder/AudioRecorderSettings.cs
index 344638c0414c63148d3fe0b73c7ec3bf32034481..c3966a50b5262181d709f4e0537d5e7c76117c86 100644 (file)
--- a/client/AudioRecorder/AudioRecorderSettings.cs
+++ b/client/AudioRecorder/AudioRecorderSettings.cs
@@ -11,6 +11,8 @@ namespace AudioRecorder {
         public MetadataProvider[] Metadatas { get; set; }\r
         public Target OctopusTarget { get; set; }\r
         public Target TrafficTarget { get; set; }\r
+        public Target TrafficADTarget { get; set; }\r
+        public Target TrafficPromoTarget { get; set; }\r
         public Target FreeTarget { get; set; }\r
     }\r
 }\r

diff --git a/client/AudioRecorder/MainForm.cs b/client/AudioRecorder/MainForm.cs
index 1c9190eb4e987c2615209bb983273d3a6fbf3a64..69c3c75173f2a6450bbc5fa5a49b1a04b8a09436 100644 (file)
--- a/client/AudioRecorder/MainForm.cs
+++ b/client/AudioRecorder/MainForm.cs
@@ -347,7 +347,11 @@ namespace AudioRecorder {
                     target = parameters.OctopusTarget;\r
                     break;\r
                 case TargetType.TrafficAD:\r
+                    target = parameters.TrafficADTarget;\r
+                    break;\r
                 case TargetType.TrafficPromo:\r
+                    target = parameters.TrafficPromoTarget;\r
+                    break;\r
                 case TargetType.TrafficMaterial:\r
                     target = parameters.TrafficTarget;\r
                     break;\r

diff --git a/client/Maestro/ArchiveMetadataForm.Designer.cs b/client/Maestro/ArchiveMetadataForm.Designer.cs
index abc40b0207dae8cd51bf93f8a40c88ad4d54b664..b844726ce8e1b11eba427180df8befa225e20521 100644 (file)
--- a/client/Maestro/ArchiveMetadataForm.Designer.cs
+++ b/client/Maestro/ArchiveMetadataForm.Designer.cs
@@ -29,19 +29,24 @@
             this.label_mediaID = new System.Windows.Forms.Label();\r
             this.label_mediaTitle = new System.Windows.Forms.Label();\r
             this.label_mediaDescription = new System.Windows.Forms.Label();\r
-            this.textBox_itemID = new System.Windows.Forms.TextBox();\r
-            this.textBox_itemTitle = new System.Windows.Forms.TextBox();\r
-            this.textBox_itemDescription = new System.Windows.Forms.TextBox();\r
+            this.txtItemID = new System.Windows.Forms.TextBox();\r
+            this.txtItemTitle = new System.Windows.Forms.TextBox();\r
+            this.txtItemDescription = new System.Windows.Forms.TextBox();\r
             this.textBox_mediaID = new System.Windows.Forms.TextBox();\r
-            this.textBox_mediaTitle = new System.Windows.Forms.TextBox();\r
-            this.textBox_mediaDescription = new System.Windows.Forms.TextBox();\r
+            this.txtMediaTitle = new System.Windows.Forms.TextBox();\r
+            this.txtMediaDescription = new System.Windows.Forms.TextBox();\r
             this.label_stuffTitle = new System.Windows.Forms.Label();\r
             this.groupBox1 = new System.Windows.Forms.GroupBox();\r
             this.btnOk = new System.Windows.Forms.Button();\r
             this.btnCancel = new System.Windows.Forms.Button();\r
             this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();\r
+            this.cbFolders = new System.Windows.Forms.ComboBox();\r
+            this.dtScheduled = new System.Windows.Forms.DateTimePicker();\r
+            this.btnImportOctopus = new System.Windows.Forms.Button();\r
+            this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();\r
             this.groupBox1.SuspendLayout();\r
             this.tableLayoutPanel1.SuspendLayout();\r
+            this.tableLayoutPanel2.SuspendLayout();\r
             this.SuspendLayout();\r
             // \r
             // label_stuffID\r
@@ -70,7 +75,7 @@
             // \r
             this.label_mediaID.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));\r
             this.label_mediaID.AutoSize = true;\r
-            this.label_mediaID.Location = new System.Drawing.Point(11, 253);\r
+            this.label_mediaID.Location = new System.Drawing.Point(11, 192);\r
             this.label_mediaID.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);\r
             this.label_mediaID.Name = "label_mediaID";\r
             this.label_mediaID.Size = new System.Drawing.Size(111, 17);\r
@@ -82,7 +87,7 @@
             this.label_mediaTitle.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));\r
             this.label_mediaTitle.AutoSize = true;\r
             this.label_mediaTitle.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
-            this.label_mediaTitle.Location = new System.Drawing.Point(11, 301);\r
+            this.label_mediaTitle.Location = new System.Drawing.Point(11, 240);\r
             this.label_mediaTitle.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);\r
             this.label_mediaTitle.Name = "label_mediaTitle";\r
             this.label_mediaTitle.Size = new System.Drawing.Size(80, 17);\r
@@ -93,74 +98,74 @@
             // \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(11, 349);\r
+            this.label_mediaDescription.Location = new System.Drawing.Point(11, 288);\r
             this.label_mediaDescription.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);\r
             this.label_mediaDescription.Name = "label_mediaDescription";\r
             this.label_mediaDescription.Size = new System.Drawing.Size(84, 17);\r
             this.label_mediaDescription.TabIndex = 5;\r
             this.label_mediaDescription.Text = "Média leírás";\r
             // \r
-            // textBox_itemID\r
-            // \r
-            this.textBox_itemID.Dock = System.Windows.Forms.DockStyle.Fill;\r
-            this.textBox_itemID.Location = new System.Drawing.Point(11, 27);\r
-            this.textBox_itemID.Margin = new System.Windows.Forms.Padding(4);\r
-            this.textBox_itemID.Name = "textBox_itemID";\r
-            this.textBox_itemID.ReadOnly = true;\r
-            this.textBox_itemID.Size = new System.Drawing.Size(660, 23);\r
-            this.textBox_itemID.TabIndex = 6;\r
-            this.textBox_itemID.TabStop = false;\r
-            // \r
-            // textBox_itemTitle\r
-            // \r
-            this.textBox_itemTitle.Dock = System.Windows.Forms.DockStyle.Fill;\r
-            this.textBox_itemTitle.Location = new System.Drawing.Point(11, 75);\r
-            this.textBox_itemTitle.Margin = new System.Windows.Forms.Padding(4);\r
-            this.textBox_itemTitle.Name = "textBox_itemTitle";\r
-            this.textBox_itemTitle.Size = new System.Drawing.Size(660, 23);\r
-            this.textBox_itemTitle.TabIndex = 1;\r
-            // \r
-            // textBox_itemDescription\r
-            // \r
-            this.textBox_itemDescription.Dock = System.Windows.Forms.DockStyle.Fill;\r
-            this.textBox_itemDescription.Location = new System.Drawing.Point(11, 123);\r
-            this.textBox_itemDescription.Margin = new System.Windows.Forms.Padding(4);\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(660, 126);\r
-            this.textBox_itemDescription.TabIndex = 2;\r
+            // txtItemID\r
+            // \r
+            this.txtItemID.Dock = System.Windows.Forms.DockStyle.Fill;\r
+            this.txtItemID.Location = new System.Drawing.Point(11, 27);\r
+            this.txtItemID.Margin = new System.Windows.Forms.Padding(4);\r
+            this.txtItemID.Name = "txtItemID";\r
+            this.txtItemID.ReadOnly = true;\r
+            this.txtItemID.Size = new System.Drawing.Size(749, 23);\r
+            this.txtItemID.TabIndex = 6;\r
+            this.txtItemID.TabStop = false;\r
+            // \r
+            // txtItemTitle\r
+            // \r
+            this.txtItemTitle.Dock = System.Windows.Forms.DockStyle.Fill;\r
+            this.txtItemTitle.Location = new System.Drawing.Point(11, 75);\r
+            this.txtItemTitle.Margin = new System.Windows.Forms.Padding(4);\r
+            this.txtItemTitle.Name = "txtItemTitle";\r
+            this.txtItemTitle.Size = new System.Drawing.Size(749, 23);\r
+            this.txtItemTitle.TabIndex = 1;\r
+            // \r
+            // txtItemDescription\r
+            // \r
+            this.txtItemDescription.Dock = System.Windows.Forms.DockStyle.Fill;\r
+            this.txtItemDescription.Location = new System.Drawing.Point(11, 123);\r
+            this.txtItemDescription.Margin = new System.Windows.Forms.Padding(4);\r
+            this.txtItemDescription.Multiline = true;\r
+            this.txtItemDescription.Name = "txtItemDescription";\r
+            this.txtItemDescription.ScrollBars = System.Windows.Forms.ScrollBars.Both;\r
+            this.txtItemDescription.Size = new System.Drawing.Size(749, 65);\r
+            this.txtItemDescription.TabIndex = 2;\r
             // \r
             // textBox_mediaID\r
             // \r
             this.textBox_mediaID.Dock = System.Windows.Forms.DockStyle.Fill;\r
-            this.textBox_mediaID.Location = new System.Drawing.Point(11, 274);\r
+            this.textBox_mediaID.Location = new System.Drawing.Point(11, 213);\r
             this.textBox_mediaID.Margin = new System.Windows.Forms.Padding(4);\r
             this.textBox_mediaID.Name = "textBox_mediaID";\r
             this.textBox_mediaID.ReadOnly = true;\r
-            this.textBox_mediaID.Size = new System.Drawing.Size(660, 23);\r
+            this.textBox_mediaID.Size = new System.Drawing.Size(749, 23);\r
             this.textBox_mediaID.TabIndex = 9;\r
             this.textBox_mediaID.TabStop = false;\r
             // \r
-            // textBox_mediaTitle\r
+            // txtMediaTitle\r
             // \r
-            this.textBox_mediaTitle.Dock = System.Windows.Forms.DockStyle.Fill;\r
-            this.textBox_mediaTitle.Location = new System.Drawing.Point(11, 322);\r
-            this.textBox_mediaTitle.Margin = new System.Windows.Forms.Padding(4);\r
-            this.textBox_mediaTitle.Name = "textBox_mediaTitle";\r
-            this.textBox_mediaTitle.Size = new System.Drawing.Size(660, 23);\r
-            this.textBox_mediaTitle.TabIndex = 3;\r
+            this.txtMediaTitle.Dock = System.Windows.Forms.DockStyle.Fill;\r
+            this.txtMediaTitle.Location = new System.Drawing.Point(11, 261);\r
+            this.txtMediaTitle.Margin = new System.Windows.Forms.Padding(4);\r
+            this.txtMediaTitle.Name = "txtMediaTitle";\r
+            this.txtMediaTitle.Size = new System.Drawing.Size(749, 23);\r
+            this.txtMediaTitle.TabIndex = 3;\r
             // \r
-            // textBox_mediaDescription\r
+            // txtMediaDescription\r
             // \r
-            this.textBox_mediaDescription.Dock = System.Windows.Forms.DockStyle.Fill;\r
-            this.textBox_mediaDescription.Location = new System.Drawing.Point(11, 370);\r
-            this.textBox_mediaDescription.Margin = new System.Windows.Forms.Padding(4);\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(660, 113);\r
-            this.textBox_mediaDescription.TabIndex = 4;\r
+            this.txtMediaDescription.Dock = System.Windows.Forms.DockStyle.Fill;\r
+            this.txtMediaDescription.Location = new System.Drawing.Point(11, 351);\r
+            this.txtMediaDescription.Margin = new System.Windows.Forms.Padding(4);\r
+            this.txtMediaDescription.Multiline = true;\r
+            this.txtMediaDescription.Name = "txtMediaDescription";\r
+            this.txtMediaDescription.ScrollBars = System.Windows.Forms.ScrollBars.Both;\r
+            this.txtMediaDescription.Size = new System.Drawing.Size(749, 136);\r
+            this.txtMediaDescription.TabIndex = 4;\r
             // \r
             // label_stuffTitle\r
             // \r
@@ -179,18 +184,18 @@
             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, 486);\r
+            this.groupBox1.Location = new System.Drawing.Point(0, 497);\r
             this.groupBox1.Margin = new System.Windows.Forms.Padding(4);\r
             this.groupBox1.Name = "groupBox1";\r
             this.groupBox1.Padding = new System.Windows.Forms.Padding(4);\r
-            this.groupBox1.Size = new System.Drawing.Size(682, 59);\r
+            this.groupBox1.Size = new System.Drawing.Size(771, 51);\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(574, 20);\r
+            this.btnOk.Location = new System.Drawing.Point(663, 16);\r
             this.btnOk.Margin = new System.Windows.Forms.Padding(4);\r
             this.btnOk.Name = "btnOk";\r
             this.btnOk.Size = new System.Drawing.Size(100, 28);\r
@@ -203,7 +208,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(468, 20);\r
+            this.btnCancel.Location = new System.Drawing.Point(557, 16);\r
             this.btnCancel.Margin = new System.Windows.Forms.Padding(4);\r
             this.btnCancel.Name = "btnCancel";\r
             this.btnCancel.Size = new System.Drawing.Size(100, 28);\r
@@ -216,24 +221,25 @@
             // \r
             this.tableLayoutPanel1.ColumnCount = 1;\r
             this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));\r
-            this.tableLayoutPanel1.Controls.Add(this.textBox_mediaDescription, 0, 11);\r
-            this.tableLayoutPanel1.Controls.Add(this.textBox_mediaTitle, 0, 9);\r
+            this.tableLayoutPanel1.Controls.Add(this.txtMediaDescription, 0, 12);\r
+            this.tableLayoutPanel1.Controls.Add(this.txtMediaTitle, 0, 9);\r
             this.tableLayoutPanel1.Controls.Add(this.label_mediaTitle, 0, 8);\r
             this.tableLayoutPanel1.Controls.Add(this.textBox_mediaID, 0, 7);\r
             this.tableLayoutPanel1.Controls.Add(this.label_mediaID, 0, 6);\r
-            this.tableLayoutPanel1.Controls.Add(this.textBox_itemDescription, 0, 5);\r
-            this.tableLayoutPanel1.Controls.Add(this.textBox_itemTitle, 0, 3);\r
-            this.tableLayoutPanel1.Controls.Add(this.textBox_itemID, 0, 1);\r
+            this.tableLayoutPanel1.Controls.Add(this.txtItemDescription, 0, 5);\r
+            this.tableLayoutPanel1.Controls.Add(this.txtItemTitle, 0, 3);\r
+            this.tableLayoutPanel1.Controls.Add(this.txtItemID, 0, 1);\r
             this.tableLayoutPanel1.Controls.Add(this.label_stuffID, 0, 0);\r
             this.tableLayoutPanel1.Controls.Add(this.label_mediaDescription, 0, 10);\r
             this.tableLayoutPanel1.Controls.Add(this.label_stuffDescription, 0, 4);\r
             this.tableLayoutPanel1.Controls.Add(this.label_stuffTitle, 0, 2);\r
+            this.tableLayoutPanel1.Controls.Add(this.tableLayoutPanel2, 0, 11);\r
             this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;\r
             this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0);\r
             this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(4);\r
             this.tableLayoutPanel1.Name = "tableLayoutPanel1";\r
             this.tableLayoutPanel1.Padding = new System.Windows.Forms.Padding(7, 6, 7, 6);\r
-            this.tableLayoutPanel1.RowCount = 12;\r
+            this.tableLayoutPanel1.RowCount = 13;\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
@@ -246,15 +252,71 @@
             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(682, 486);\r
+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
+            this.tableLayoutPanel1.Size = new System.Drawing.Size(771, 497);\r
             this.tableLayoutPanel1.TabIndex = 3;\r
             // \r
+            // cbFolders\r
+            // \r
+            this.cbFolders.Dock = System.Windows.Forms.DockStyle.Fill;\r
+            this.cbFolders.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
+            this.cbFolders.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
+            this.cbFolders.FormattingEnabled = true;\r
+            this.cbFolders.Location = new System.Drawing.Point(99, 6);\r
+            this.cbFolders.Margin = new System.Windows.Forms.Padding(4, 6, 4, 4);\r
+            this.cbFolders.Name = "cbFolders";\r
+            this.cbFolders.Size = new System.Drawing.Size(540, 24);\r
+            this.cbFolders.TabIndex = 8;\r
+            // \r
+            // dtScheduled\r
+            // \r
+            this.dtScheduled.Anchor = System.Windows.Forms.AnchorStyles.None;\r
+            this.dtScheduled.CustomFormat = " ";\r
+            this.dtScheduled.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
+            this.dtScheduled.Format = System.Windows.Forms.DateTimePickerFormat.Short;\r
+            this.dtScheduled.Location = new System.Drawing.Point(4, 6);\r
+            this.dtScheduled.Margin = new System.Windows.Forms.Padding(4);\r
+            this.dtScheduled.Name = "dtScheduled";\r
+            this.dtScheduled.Size = new System.Drawing.Size(87, 23);\r
+            this.dtScheduled.TabIndex = 7;\r
+            this.dtScheduled.ValueChanged += new System.EventHandler(this.OnDateChanged);\r
+            // \r
+            // btnImportOctopus\r
+            // \r
+            this.btnImportOctopus.Anchor = System.Windows.Forms.AnchorStyles.None;\r
+            this.btnImportOctopus.Location = new System.Drawing.Point(647, 4);\r
+            this.btnImportOctopus.Margin = new System.Windows.Forms.Padding(4);\r
+            this.btnImportOctopus.Name = "btnImportOctopus";\r
+            this.btnImportOctopus.Size = new System.Drawing.Size(100, 28);\r
+            this.btnImportOctopus.TabIndex = 9;\r
+            this.btnImportOctopus.Text = "Import";\r
+            this.btnImportOctopus.UseVisualStyleBackColor = true;\r
+            this.btnImportOctopus.Click += new System.EventHandler(this.OnImportOctopusData);\r
+            // \r
+            // tableLayoutPanel2\r
+            // \r
+            this.tableLayoutPanel2.AutoSize = true;\r
+            this.tableLayoutPanel2.ColumnCount = 3;\r
+            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());\r
+            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));\r
+            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());\r
+            this.tableLayoutPanel2.Controls.Add(this.btnImportOctopus, 2, 0);\r
+            this.tableLayoutPanel2.Controls.Add(this.cbFolders, 1, 0);\r
+            this.tableLayoutPanel2.Controls.Add(this.dtScheduled, 0, 0);\r
+            this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill;\r
+            this.tableLayoutPanel2.Location = new System.Drawing.Point(10, 308);\r
+            this.tableLayoutPanel2.Name = "tableLayoutPanel2";\r
+            this.tableLayoutPanel2.RowCount = 1;\r
+            this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));\r
+            this.tableLayoutPanel2.Size = new System.Drawing.Size(751, 36);\r
+            this.tableLayoutPanel2.TabIndex = 10;\r
+            // \r
             // ArchiveMetadataForm\r
             // \r
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);\r
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;\r
             this.CancelButton = this.btnCancel;\r
-            this.ClientSize = new System.Drawing.Size(682, 545);\r
+            this.ClientSize = new System.Drawing.Size(771, 548);\r
             this.Controls.Add(this.tableLayoutPanel1);\r
             this.Controls.Add(this.groupBox1);\r
             this.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
@@ -266,6 +328,7 @@
             this.groupBox1.ResumeLayout(false);\r
             this.tableLayoutPanel1.ResumeLayout(false);\r
             this.tableLayoutPanel1.PerformLayout();\r
+            this.tableLayoutPanel2.ResumeLayout(false);\r
             this.ResumeLayout(false);\r
 \r
         }\r
@@ -278,15 +341,19 @@
         private System.Windows.Forms.Label label_mediaID;\r
         private System.Windows.Forms.Label label_mediaTitle;\r
         private System.Windows.Forms.Label label_mediaDescription;\r
-        private System.Windows.Forms.TextBox textBox_itemID;\r
-        private System.Windows.Forms.TextBox textBox_itemTitle;\r
-        private System.Windows.Forms.TextBox textBox_itemDescription;\r
+        private System.Windows.Forms.TextBox txtItemID;\r
+        private System.Windows.Forms.TextBox txtItemTitle;\r
+        private System.Windows.Forms.TextBox txtItemDescription;\r
         private System.Windows.Forms.TextBox textBox_mediaID;\r
-        private System.Windows.Forms.TextBox textBox_mediaTitle;\r
-        private System.Windows.Forms.TextBox textBox_mediaDescription;\r
+        private System.Windows.Forms.TextBox txtMediaTitle;\r
+        private System.Windows.Forms.TextBox txtMediaDescription;\r
         private System.Windows.Forms.GroupBox groupBox1;\r
         private System.Windows.Forms.Button btnOk;\r
         private System.Windows.Forms.Button btnCancel;\r
         private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;\r
+        private System.Windows.Forms.ComboBox cbFolders;\r
+        private System.Windows.Forms.DateTimePicker dtScheduled;\r
+        private System.Windows.Forms.Button btnImportOctopus;\r
+        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2;\r
     }\r
 }
\ No newline at end of file

diff --git a/client/Maestro/ArchiveMetadataForm.cs b/client/Maestro/ArchiveMetadataForm.cs
index e93d662248b180dc227f43fb1e1ef66499f73fef..f1aa3a5443939c926e6ded4bf3135eb6cbb4d4a0 100644 (file)
--- a/client/Maestro/ArchiveMetadataForm.cs
+++ b/client/Maestro/ArchiveMetadataForm.cs
@@ -1,39 +1,83 @@
 using System.Windows.Forms;\r
 using MaestroShared.Metadata;\r
+using LinkDotNet.MessageHandling.Contracts;\r
+using OctopusClient;\r
+using MaestroShared.Configuration;\r
+using System.Collections.Generic;\r
+using System.Linq;\r
+using System;\r
+using MaestroShared.Commons;\r
 \r
 namespace Maestro {\r
     public partial class ArchiveMetadataForm : Form {\r
 \r
         private ArchiveMetadata model;\r
+        private OctopusAPI client;\r
 \r
-        public ArchiveMetadataForm(ref ArchiveMetadata model) : this() {\r
+        public ArchiveMetadataForm(ref ArchiveMetadata model, OctopusMetadata metadata, IMessageBus errorMessageBus) : this() {\r
             this.model = model;\r
-            textBox_itemID.Text = model.itemHouseId;\r
-            textBox_itemTitle.Text = model.itemTitle;\r
-            textBox_itemDescription.Text = model.itemDescription;\r
+            txtItemID.Text = model.itemHouseId;\r
+            txtItemTitle.Text = model.itemTitle;\r
+            txtItemDescription.Text = model.itemDescription;\r
             textBox_mediaID.Text = model.mediaHouseId;\r
-            textBox_mediaTitle.Text = model.mediaTitle;\r
-            textBox_mediaDescription.Text = model.mediaDescription;\r
+            txtMediaTitle.Text = model.mediaTitle;\r
+            txtMediaDescription.Text = model.mediaDescription;\r
+            if (metadata == null) {\r
+                dtScheduled.Visible = false;\r
+                cbFolders.Visible = false;\r
+                btnImportOctopus.Visible = false;\r
+\r
+            } else {\r
+                client = new OctopusAPI(metadata.Server?.Address?.OriginalString, metadata.Server?.UserName, metadata.Server?.Password, metadata.Server?.Timeout ?? 0, errorMessageBus);\r
+                RefreshFolders();\r
+            }\r
+        }\r
+\r
+        private void RefreshFolders() {\r
+            Cursor.Current = Cursors.WaitCursor;\r
+            List<Rundown> rundownsResult = client.GetRundowns(dtScheduled.Value.Date)?.ToList();\r
+            cbFolders.DataSource = rundownsResult;\r
+            Cursor.Current = Cursors.Default;\r
+        }\r
+\r
+        private void OnDateChanged(object sender, EventArgs e) {\r
+            RefreshFolders();\r
         }\r
 \r
         public ArchiveMetadataForm() {\r
             InitializeComponent();\r
         }\r
 \r
-        private void OnOkClick(object sender, System.EventArgs e) {\r
-            model.itemHouseId = textBox_itemID.Text;\r
-            model.itemTitle = textBox_itemTitle.Text;\r
-            model.itemDescription = textBox_itemDescription.Text;\r
+        private void OnOkClick(object sender, EventArgs e) {\r
+            model.itemHouseId = txtItemID.Text;\r
+            model.itemTitle = txtItemTitle.Text;\r
+            model.itemDescription = txtItemDescription.Text;\r
             model.mediaHouseId = textBox_mediaID.Text;\r
-            model.mediaTitle = textBox_mediaTitle.Text;\r
-            model.mediaDescription = textBox_mediaDescription.Text;\r
+            model.mediaTitle = txtMediaTitle.Text;\r
+            model.mediaDescription = txtMediaDescription.Text;\r
             DialogResult = DialogResult.OK;\r
             Close();\r
         }\r
 \r
-        private void OnCancelClick(object sender, System.EventArgs e) {\r
+        private void OnCancelClick(object sender, EventArgs e) {\r
             DialogResult = DialogResult.Cancel;\r
             Close();\r
         }\r
+\r
+        private void OnImportOctopusData(object sender, EventArgs e) {\r
+            if (!String.IsNullOrEmpty(txtMediaDescription.Text)) {\r
+                if (!MsgBox.YesNoQuestion("A média leírása nem üres és törlődni fog. Folytatja?"))\r
+                    return;\r
+            }\r
+\r
+            Rundown rundown = cbFolders.SelectedItem as Rundown;\r
+            if (rundown == null)\r
+                return;\r
+            string text = client.GetRundownContent(rundown.ID);\r
+            if (String.IsNullOrEmpty(text))\r
+                MsgBox.Info("A tükör üres vagy nem található.");\r
+            else\r
+                txtMediaDescription.Text = text;\r
+        }\r
     }\r
 }\r

diff --git a/client/Maestro/Configuration/configuration-nle.json b/client/Maestro/Configuration/configuration-nle.json
index 8baca8e5c4f7462e6e1a95c04acd6a8847686cd3..f13a4c19b872a1ebff8ec989b63293303a9b062f 100644 (file)
--- a/client/Maestro/Configuration/configuration-nle.json
+++ b/client/Maestro/Configuration/configuration-nle.json
@@ -129,8 +129,8 @@
       "outputFormat": "%ID%",\r
       "tag": "Archiválás",\r
       "saveArchiveMetadata": true,\r
-      "deleteAfterCopy": true,\r
       "temporaryCopy": true,\r
+      "killDateDays": 5,\r
       "remote": {\r
         "address": "ftp://10.10.1.100/ARCHIVE/TESZT",\r
         "userName": "mediacube",\r

diff --git a/client/Maestro/Configuration/configuration-studio.json b/client/Maestro/Configuration/configuration-studio.json
index c33de9403f96d494394413f284f1b5bdb43c69e1..56f2a609c2fb56800d5f566feff2d5ec1654697a 100644 (file)
--- a/client/Maestro/Configuration/configuration-studio.json
+++ b/client/Maestro/Configuration/configuration-studio.json
@@ -21,7 +21,7 @@
     {\r
       "$type": "OctopusMetadata",\r
       "server": {\r
-        "address": "http://10.10.1.27/services/rest/octopus",\r
+        "address": "http://localhost:8888/services/rest/octopus",\r
         "timeout": 1000\r
       }\r
     },\r
@@ -51,7 +51,8 @@
       "outputFormat": "%ID%",\r
       "tag": "Archiválás",\r
       "saveArchiveMetadata": true,\r
-      "deleteAfterCopy":  false,\r
+      "deleteAfterCopy": false,\r
+      "killDateDays": 5,\r
       "remote": {\r
         "address": "ftp://10.10.1.100:21/ARCHIVE/TESZT",\r
         "userName": "mediacube",\r

diff --git a/client/Maestro/MaestroForm.Designer.cs b/client/Maestro/MaestroForm.Designer.cs
index ac61f89210e64591bf18cabba624f6c5ba3fc18c..b620c7a358562294b4f0f074d846df4cae071cc3 100644 (file)
--- a/client/Maestro/MaestroForm.Designer.cs
+++ b/client/Maestro/MaestroForm.Designer.cs
@@ -85,16 +85,16 @@ namespace Maestro {
             this.dataGridViewProgressColumn1 = new Maestro.Commons.DataGridViewProgressColumn();\r
             this.systemMessageBindingSource = new System.Windows.Forms.BindingSource(this.components);\r
             this.metadataInfoBindingSource = new System.Windows.Forms.BindingSource(this.components);\r
+            this.columnInputName = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
             this.columnLabel = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
             this.columnID = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
-            this.Progress = new Maestro.Commons.DataGridViewProgressColumn();\r
             this.columnStatus = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
             this.columnStarted = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
             this.columnFinished = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
             this.columnInput = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
             this.columnOutput = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
             this.columnKillDate = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
-            this.Message = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
+            this.columnMessage = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
             this.groupSource.SuspendLayout();\r
             ((System.ComponentModel.ISupportInitialize)(this.dgSource)).BeginInit();\r
             ((System.ComponentModel.ISupportInitialize)(this.bindingSource)).BeginInit();\r
@@ -732,16 +732,16 @@ namespace Maestro {
             this.dgJobs.BorderStyle = System.Windows.Forms.BorderStyle.None;\r
             this.dgJobs.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;\r
             this.dgJobs.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {\r
+            this.columnInputName,\r
             this.columnLabel,\r
             this.columnID,\r
-            this.Progress,\r
             this.columnStatus,\r
             this.columnStarted,\r
             this.columnFinished,\r
             this.columnInput,\r
             this.columnOutput,\r
             this.columnKillDate,\r
-            this.Message});\r
+            this.columnMessage});\r
             this.dgJobs.DataSource = this.bindingSourceJobs;\r
             dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
             dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Window;\r
@@ -765,8 +765,8 @@ namespace Maestro {
             this.dgJobs.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;\r
             this.dgJobs.Size = new System.Drawing.Size(988, 90);\r
             this.dgJobs.TabIndex = 0;\r
-            this.dgJobs.CellEnter += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridJobs_CellEnter);\r
             this.dgJobs.CellPainting += new System.Windows.Forms.DataGridViewCellPaintingEventHandler(this.OnJobsCellPainting);\r
+            this.dgJobs.CellToolTipTextNeeded += new System.Windows.Forms.DataGridViewCellToolTipTextNeededEventHandler(this.dgJobs_CellToolTipTextNeeded);\r
             this.dgJobs.MouseClick += new System.Windows.Forms.MouseEventHandler(this.dataGridJobs_MouseClick);\r
             // \r
             // tabPage2\r
@@ -851,9 +851,18 @@ namespace Maestro {
             // \r
             this.metadataInfoBindingSource.DataSource = typeof(Maestro.Metadata.MetadataInfo);\r
             // \r
+            // columnInputName\r
+            // \r
+            this.columnInputName.DataPropertyName = "InputName";\r
+            this.columnInputName.Frozen = true;\r
+            this.columnInputName.HeaderText = "InputName";\r
+            this.columnInputName.Name = "columnInputName";\r
+            this.columnInputName.Width = 93;\r
+            // \r
             // columnLabel\r
             // \r
             this.columnLabel.DataPropertyName = "Label";\r
+            this.columnLabel.Frozen = true;\r
             this.columnLabel.HeaderText = "Label";\r
             this.columnLabel.Name = "columnLabel";\r
             this.columnLabel.Width = 63;\r
@@ -867,13 +876,6 @@ namespace Maestro {
             this.columnID.Name = "columnID";\r
             this.columnID.Width = 44;\r
             // \r
-            // Progress\r
-            // \r
-            this.Progress.DataPropertyName = "Progress";\r
-            this.Progress.HeaderText = "";\r
-            this.Progress.MinimumWidth = 100;\r
-            this.Progress.Name = "Progress";\r
-            // \r
             // columnStatus\r
             // \r
             this.columnStatus.DataPropertyName = "Status";\r
@@ -918,12 +920,12 @@ namespace Maestro {
             this.columnKillDate.Name = "columnKillDate";\r
             this.columnKillDate.Width = 75;\r
             // \r
-            // Message\r
+            // columnMessage\r
             // \r
-            this.Message.DataPropertyName = "Message";\r
-            this.Message.HeaderText = "Üzenet";\r
-            this.Message.Name = "Message";\r
-            this.Message.Width = 71;\r
+            this.columnMessage.DataPropertyName = "Message";\r
+            this.columnMessage.HeaderText = "Message";\r
+            this.columnMessage.Name = "columnMessage";\r
+            this.columnMessage.Width = 83;\r
             // \r
             // MaestroForm\r
             // \r
@@ -1038,16 +1040,17 @@ namespace Maestro {
         private System.Windows.Forms.CheckBox chkAutoScroll;\r
         private Commons.DataGridViewProgressColumn dataGridViewProgressColumn1;\r
         private PictureBox picResetSearch;\r
+        private Commons.DataGridViewProgressColumn columnProgress;\r
+        private DataGridViewTextBoxColumn columnInputName;\r
         private DataGridViewTextBoxColumn columnLabel;\r
         private DataGridViewTextBoxColumn columnID;\r
-        private Commons.DataGridViewProgressColumn Progress;\r
         private DataGridViewTextBoxColumn columnStatus;\r
         private DataGridViewTextBoxColumn columnStarted;\r
         private DataGridViewTextBoxColumn columnFinished;\r
         private DataGridViewTextBoxColumn columnInput;\r
         private DataGridViewTextBoxColumn columnOutput;\r
         private DataGridViewTextBoxColumn columnKillDate;\r
-        private DataGridViewTextBoxColumn Message;\r
+        private DataGridViewTextBoxColumn columnMessage;\r
     }\r
 }\r
 \r

diff --git a/client/Maestro/MaestroForm.Metadata.cs b/client/Maestro/MaestroForm.Metadata.cs
index d6f7b9f507475387183876b683be4a8011fbdb8f..e2b5613737ff863c86662da5c162c3c13c420efd 100644 (file)
--- a/client/Maestro/MaestroForm.Metadata.cs
+++ b/client/Maestro/MaestroForm.Metadata.cs
@@ -61,7 +61,7 @@ namespace Maestro {
 \r
         private void InitializeTrafficSelector() {\r
             TrafficMetadata metadata = MetadataProvider.Get<TrafficMetadata>(Configuration.Metadatas);\r
-            if (metadata == null) {\r
+            if (metadata == null || metadata.Disabled) {\r
                 tabMetadata.TabPages.Remove(tpTraffic);\r
                 return;\r
             }\r
@@ -74,13 +74,13 @@ namespace Maestro {
         }\r
 \r
         private void InitializeOctopusSelector() {\r
-            OctopusMetadata octopusConfiguration = MetadataProvider.Get<OctopusMetadata>(Configuration.Metadatas);\r
-            if (octopusConfiguration == null) {\r
+            OctopusMetadata metadata = MetadataProvider.Get<OctopusMetadata>(Configuration.Metadatas);\r
+            if (metadata == null || metadata.Disabled) {\r
                 tabMetadata.TabPages.Remove(tpOctopus);\r
                 return;\r
             }\r
             octopusIDSelector.Parameters = new OctopusParameters() {\r
-                Configuration = octopusConfiguration,\r
+                Configuration = metadata,\r
                 UserName = TrayApplicationContext.UserName,\r
                 MessageBus = errorMessageBus,\r
             };\r
@@ -89,7 +89,7 @@ namespace Maestro {
 \r
         private void InitializeMediaCubeApi() {\r
             MediaCubeMetadata metadata = MetadataProvider.Get<MediaCubeMetadata>(Configuration.Metadatas);\r
-            if (metadata == null)\r
+            if (metadata == null || metadata.Disabled)\r
                 return;\r
             mediaCubeApi = new MediaCubeApi(metadata.Server.Address.ToString(), metadata.Server.UserName, metadata.Server.Password, metadata.Server.Timeout, errorMessageBus);\r
         }\r
@@ -105,7 +105,8 @@ namespace Maestro {
                 return;\r
             }\r
 \r
-            ArchiveMetadataForm form = new ArchiveMetadataForm(ref archiveMetadata);\r
+            OctopusMetadata metadata = MetadataProvider.Get<OctopusMetadata>(Configuration.Metadatas);\r
+            ArchiveMetadataForm form = new ArchiveMetadataForm(ref archiveMetadata, metadata, errorMessageBus);\r
             form.BackColor = partialColor;\r
             DialogResult result = form.ShowDialog();\r
 \r

diff --git a/client/Maestro/MaestroForm.cs b/client/Maestro/MaestroForm.cs
index 1356429face53226d7b9890c1dcd13b44a284bed..7dc9eef3e1a0dbec6f9301e9a21e6ad4aecfdc8c 100644 (file)
--- a/client/Maestro/MaestroForm.cs
+++ b/client/Maestro/MaestroForm.cs
@@ -70,11 +70,10 @@ namespace Maestro {
             columnFinished.HeaderText = StringResources.BEFEJEZES;\r
             columnInput.HeaderText = StringResources.FORRAS;\r
             columnOutput.HeaderText = StringResources.CEL;\r
-            //columnProgress.HeaderText = StringResources.ALLAPOT;\r
             columnStatus.HeaderText = StringResources.STATUSZ;\r
-            columnLabel.HeaderText = StringResources.CIM;\r
-            //ctxiDefineSegments.Text = StringResources.SZEGMENS_LETREHOZASA;\r
-            //ctxiModifyArchiveMetadata.Text = StringResources.ARCHIV_METAADATOK;\r
+            columnLabel.HeaderText = StringResources.ACTION;\r
+            columnMessage.HeaderText = StringResources.MESSAGE;\r
+            columnInputName.HeaderText = StringResources.INPUTNAME;\r
         }\r
 \r
         private void InitializeComponents() {\r
@@ -210,14 +209,6 @@ namespace Maestro {
             processorWorkers.ToList().ForEach(w => w.CancelAsync());\r
         }\r
 \r
-        private void dataGridJobs_CellEnter(object sender, DataGridViewCellEventArgs e) {\r
-            ITargetProcessor item = bindingSourceJobs.Current as ITargetProcessor;\r
-            if (item == null || e.RowIndex < 0 || e.ColumnIndex < 0)\r
-                return;\r
-            DataGridViewCell cell = dgJobs.Rows[e.RowIndex].Cells[e.ColumnIndex];\r
-            cell.ToolTipText = item.Message;\r
-        }\r
-\r
         private void MaestroForm_Shown(object sender, EventArgs e) {\r
             Text = Configuration.Title;\r
             InitializeComponents();\r
@@ -289,32 +280,10 @@ namespace Maestro {
                 e.Node.Expand();\r
         }\r
 \r
-        //private void OnEditMetadata(object sender, EventArgs e) {\r
-\r
-        //}\r
-\r
-        //private void OnDefineSegments(object sender, EventArgs e) {\r
-\r
-        //}\r
-\r
-        //private void OnLookupByMetadata(object sender, EventArgs e) {\r
-\r
-        //}\r
-\r
-        //private void OnMetadataIDChanged(object sender, EventArgs e) {\r
-\r
-        //}\r
-\r
-        //private void OnSelectedMetadataKeyDown(object sender, KeyEventArgs e) {\r
-\r
-        //}\r
-\r
-        //private void OnTargetPanelsMouseClick(object sender, MouseEventArgs e) {\r
-\r
-        //}\r
-\r
-        //private void OnExecuteClick(object sender, EventArgs e) {\r
-\r
-        //}\r
+        private void dgJobs_CellToolTipTextNeeded(object sender, DataGridViewCellToolTipTextNeededEventArgs e) {\r
+            if (e.ColumnIndex < 0 || e.RowIndex < 0)\r
+                return;\r
+            e.ToolTipText = dgJobs.Rows[e.RowIndex].Cells[e.ColumnIndex].FormattedValue as string;\r
+        }\r
     }\r
 }\r

diff --git a/client/Maestro/MaestroForm.resx b/client/Maestro/MaestroForm.resx
index abe965452bb444d0680a5c45f851a16f0ea27b74..6d44e5c3b491406c02fdafa969e39dd2c046b8f7 100644 (file)
--- a/client/Maestro/MaestroForm.resx
+++ b/client/Maestro/MaestroForm.resx
@@ -128,7 +128,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w\r
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0\r
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAS\r
-        CAAAAk1TRnQBSQFMAgEBAgEAAYABAQGAAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo\r
+        CAAAAk1TRnQBSQFMAgEBAgEAAbgBAQG4AQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo\r
         AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA\r
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5\r
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA\r
@@ -180,13 +180,13 @@
   <metadata name="tsMetadata.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
     <value>846, 17</value>\r
   </metadata>\r
-  <metadata name="columnLabel.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r
+  <metadata name="columnInputName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r
     <value>True</value>\r
   </metadata>\r
-  <metadata name="columnID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r
+  <metadata name="columnLabel.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r
     <value>True</value>\r
   </metadata>\r
-  <metadata name="Progress.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r
+  <metadata name="columnID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r
     <value>True</value>\r
   </metadata>\r
   <metadata name="columnStatus.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r
@@ -207,7 +207,7 @@
   <metadata name="columnKillDate.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r
     <value>True</value>\r
   </metadata>\r
-  <metadata name="Message.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r
+  <metadata name="columnMessage.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r
     <value>True</value>\r
   </metadata>\r
   <metadata name="bindingSourceJobs.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r

diff --git a/client/Maestro/Sources/NexioRESTSource.cs b/client/Maestro/Sources/NexioRESTSource.cs
index c3b463efff04d47b0224fc5463d700783ca38d8b..7b4f840091b059f4a74d979f1a46952832e29329 100644 (file)
--- a/client/Maestro/Sources/NexioRESTSource.cs
+++ b/client/Maestro/Sources/NexioRESTSource.cs
@@ -47,13 +47,13 @@ namespace Maestro.Sources {
                         Width = 200\r
                     },\r
                     new DataGridViewTextBoxColumn(){\r
-                        DataPropertyName = "Agency",\r
-                        HeaderText = StringResources.UGYNOKSEG,\r
+                        DataPropertyName = "Duration",\r
+                        HeaderText = StringResources.HOSSZ,\r
                         AutoSizeMode = DataGridViewAutoSizeColumnMode.None\r
                     },\r
                     new DataGridViewTextBoxColumn(){\r
-                        DataPropertyName = "Duration",\r
-                        HeaderText = StringResources.HOSSZ,\r
+                        DataPropertyName = "Agency",\r
+                        HeaderText = StringResources.UGYNOKSEG,\r
                         AutoSizeMode = DataGridViewAutoSizeColumnMode.None\r
                     },\r
                     new DataGridViewTextBoxColumn() {\r

diff --git a/client/Maestro/StringResources.Designer.cs b/client/Maestro/StringResources.Designer.cs
index 5185848e851db9c4c618c798496c704d3550b2b5..c4b441695db5dda6e5353885f3b158f0c1e83771 100644 (file)
--- a/client/Maestro/StringResources.Designer.cs
+++ b/client/Maestro/StringResources.Designer.cs
@@ -19,7 +19,7 @@ namespace Maestro {
     // class via a tool like ResGen or Visual Studio.\r
     // To add or remove a member, edit your .ResX file then rerun ResGen\r
     // with the /str option, or rebuild your VS project.\r
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]\r
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]\r
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]\r
     internal class StringResources {\r
@@ -60,6 +60,15 @@ namespace Maestro {
             }\r
         }\r
         \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to Akció.\r
+        /// </summary>\r
+        internal static string ACTION {\r
+            get {\r
+                return ResourceManager.GetString("ACTION", resourceCulture);\r
+            }\r
+        }\r
+        \r
         /// <summary>\r
         ///   Looks up a localized string similar to Akciók.\r
         /// </summary>\r
@@ -132,15 +141,6 @@ namespace Maestro {
             }\r
         }\r
         \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to Cím.\r
-        /// </summary>\r
-        internal static string CIM {\r
-            get {\r
-                return ResourceManager.GetString("CIM", resourceCulture);\r
-            }\r
-        }\r
-        \r
         /// <summary>\r
         ///   Looks up a localized string similar to Felvétel dátuma.\r
         /// </summary>\r
@@ -204,6 +204,15 @@ namespace Maestro {
             }\r
         }\r
         \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to Forrásnév.\r
+        /// </summary>\r
+        internal static string INPUTNAME {\r
+            get {\r
+                return ResourceManager.GetString("INPUTNAME", resourceCulture);\r
+            }\r
+        }\r
+        \r
         /// <summary>\r
         ///   Looks up a localized string similar to Kezdés.\r
         /// </summary>\r
@@ -258,6 +267,15 @@ namespace Maestro {
             }\r
         }\r
         \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to Üzenet.\r
+        /// </summary>\r
+        internal static string MESSAGE {\r
+            get {\r
+                return ResourceManager.GetString("MESSAGE", resourceCulture);\r
+            }\r
+        }\r
+        \r
         /// <summary>\r
         ///   Looks up a localized string similar to Metaadat.\r
         /// </summary>\r
@@ -330,15 +348,6 @@ namespace Maestro {
             }\r
         }\r
         \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to Üzenet.\r
-        /// </summary>\r
-        internal static string UZENET {\r
-            get {\r
-                return ResourceManager.GetString("UZENET", resourceCulture);\r
-            }\r
-        }\r
-        \r
         /// <summary>\r
         ///   Looks up a localized string similar to Üzenetek.\r
         /// </summary>\r

diff --git a/client/Maestro/StringResources.resx b/client/Maestro/StringResources.resx
index 9d5c831c91e0f3967ed444b9fe7536a33e1a26fe..cea79ac48b1302d3da0215bd4e2e1cdc9d1555aa 100644 (file)
--- a/client/Maestro/StringResources.resx
+++ b/client/Maestro/StringResources.resx
@@ -117,6 +117,9 @@
   <resheader name="writer">\r
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
   </resheader>\r
+  <data name="ACTION" xml:space="preserve">\r
+    <value>Akció</value>\r
+  </data>\r
   <data name="AKCIOK" xml:space="preserve">\r
     <value>Akciók</value>\r
   </data>\r
@@ -141,9 +144,6 @@
   <data name="CEL_AKCIO" xml:space="preserve">\r
     <value>Cél akció</value>\r
   </data>\r
-  <data name="CIM" xml:space="preserve">\r
-    <value>Cím</value>\r
-  </data>\r
   <data name="FELVETEL_DATUMA" xml:space="preserve">\r
     <value>Felvétel dátuma</value>\r
   </data>\r
@@ -165,6 +165,9 @@
   <data name="IDO" xml:space="preserve">\r
     <value>Idő</value>\r
   </data>\r
+  <data name="INPUTNAME" xml:space="preserve">\r
+    <value>Forrásnév</value>\r
+  </data>\r
   <data name="KEZDES" xml:space="preserve">\r
     <value>Kezdés</value>\r
   </data>\r
@@ -183,6 +186,9 @@
   <data name="MERET" xml:space="preserve">\r
     <value>Méret</value>\r
   </data>\r
+  <data name="MESSAGE" xml:space="preserve">\r
+    <value>Üzenet</value>\r
+  </data>\r
   <data name="METAADAT" xml:space="preserve">\r
     <value>Metaadat</value>\r
   </data>\r
@@ -207,9 +213,6 @@
   <data name="UGYNOKSEG" xml:space="preserve">\r
     <value>Ügynökség</value>\r
   </data>\r
-  <data name="UZENET" xml:space="preserve">\r
-    <value>Üzenet</value>\r
-  </data>\r
   <data name="UZENETEK" xml:space="preserve">\r
     <value>Üzenetek</value>\r
   </data>\r

diff --git a/client/MaestroShared/Configuration/ConfigurationInfo.cs b/client/MaestroShared/Configuration/ConfigurationInfo.cs
index 9d0ebeba5dffc29513ef398e920662109aff1d67..c65e215d6ff4881cb01eaac2ea04ab20537a4495 100644 (file)
--- a/client/MaestroShared/Configuration/ConfigurationInfo.cs
+++ b/client/MaestroShared/Configuration/ConfigurationInfo.cs
@@ -149,6 +149,7 @@ namespace MaestroShared.Configuration {
 \r
     public class MetadataProvider : UISettings {\r
         public Connection Server { get; set; }\r
+        public bool Disabled { get; set; }\r
         public static T Get<T>(MetadataProvider[] providers) {\r
             MetadataProvider provider = providers?.Where(m => { return m is T; }).FirstOrDefault();\r
             T result = default(T);\r

diff --git a/client/MaestroShared/Targets/FTPTargetProcessor.cs b/client/MaestroShared/Targets/FTPTargetProcessor.cs
index a3d909ffef780f5fa1738ce7b7643bfd509a9b7e..4d73b0558e057e242362e90c94cb9bdb44be6a3b 100644 (file)
--- a/client/MaestroShared/Targets/FTPTargetProcessor.cs
+++ b/client/MaestroShared/Targets/FTPTargetProcessor.cs
@@ -14,9 +14,6 @@ namespace MaestroShared.Targets {
         private const string PATTERN_CONCAT = "{0}{1}";\r
         protected const string _226 = "226";\r
         protected const string UPLOAD_ERROR = "Feltöltési hiba.";\r
-        protected const string _200 = "200";\r
-        private const string SITE0011 = "SITE 0011";\r
-        private const string _1211 = "1211";\r
         private readonly Logger logger = LogManager.GetCurrentClassLogger();\r
         protected FtpClient targetFTP;\r
 \r
@@ -47,15 +44,6 @@ namespace MaestroShared.Targets {
         }\r
 \r
 \r
-        protected bool IsNexioServer(FtpClient ftpClient) {\r
-            bool result = false;\r
-            //Device Type Request\r
-            FtpReply reply = ftpClient.Execute(SITE0011);\r
-            if (_200.Equals(reply.Code))\r
-                result = reply.Message != null && reply.Message.Contains(_1211);\r
-            return result;\r
-        }\r
-\r
         protected override void BeforeExecute() {\r
             base.BeforeExecute();\r
             targetFTP = CreateClient(Parameters.TargetConfig.Remote);\r
@@ -63,7 +51,7 @@ namespace MaestroShared.Targets {
 \r
 \r
         protected override void ValidateTransfer() {\r
-            if (!IsNexioServer(targetFTP)) {\r
+            if (!targetFTP.IsNexio()) {\r
                 long sourceSize = inputFile.Length;\r
                 long uploadedSize = targetFTP.GetFileSize(OutputName);\r
                 if (sourceSize != uploadedSize)\r
@@ -94,7 +82,8 @@ namespace MaestroShared.Targets {
 \r
         protected override void UploadFile() {\r
             string targetFilePath = OutputName;\r
-            if (Parameters.TargetConfig.TemporaryCopy)\r
+            bool temporaryCopy = !targetFTP.IsNexio() && Parameters.TargetConfig.TemporaryCopy;\r
+            if (temporaryCopy)\r
                 targetFilePath = OutputName + ".tmp";\r
 \r
             using (FileStream istream = File.OpenRead(Input)) {\r
@@ -113,7 +102,7 @@ namespace MaestroShared.Targets {
             if (!reply.Success || !_226.Equals(reply.Code))\r
                 throw new Exception(UPLOAD_ERROR);\r
 \r
-            if (Parameters.TargetConfig.TemporaryCopy) {\r
+            if (temporaryCopy) {\r
                 if (!targetFTP.MoveFile(targetFilePath, OutputName))\r
                     throw new Exception(UPLOAD_ERROR);\r
             }\r

diff --git a/client/MaestroShared/Targets/FXPTargetProcessor.cs b/client/MaestroShared/Targets/FXPTargetProcessor.cs
index 8882da739f0749e634c9763c82fe09c2de030b04..853abded486ef296e1668f4a3774c8c970e18f13 100644 (file)
--- a/client/MaestroShared/Targets/FXPTargetProcessor.cs
+++ b/client/MaestroShared/Targets/FXPTargetProcessor.cs
@@ -127,17 +127,6 @@ namespace MaestroShared.Targets {
             //logger.Debug("Done");\r
         }\r
 \r
-        public static String ReadFully(Stream input) {\r
-            byte[] buffer = new byte[1024];\r
-            using (MemoryStream ms = new MemoryStream()) {\r
-                int read;\r
-                while ((read = input.Read(buffer, 0, buffer.Length)) > 0) {\r
-                    ms.Write(buffer, 0, read);\r
-                }\r
-                return ms.ToString();\r
-            }\r
-        }\r
-\r
         private long GetNexioLength() {\r
             long result = 0;\r
             string xml = Input.Replace(".MXF", ".XML");\r

diff --git a/client/MaestroShared/Targets/ITargetProcessor.cs b/client/MaestroShared/Targets/ITargetProcessor.cs
index da99cf593561d3ef74a80537f1bac458b172bd43..04b3b4e18248fcb070066a96e5f86cb437788737 100644 (file)
--- a/client/MaestroShared/Targets/ITargetProcessor.cs
+++ b/client/MaestroShared/Targets/ITargetProcessor.cs
@@ -9,6 +9,7 @@ namespace MaestroShared.Targets {
         TargetProcessorParameter Parameters { get; }\r
         DateTime Started { get; set; }\r
         DateTime Finished { get; set; }\r
+        string InputName { get; set; }\r
         string Input { get; set; }\r
         string Output { get; set; }\r
         string Status { get; set; }\r

diff --git a/client/MaestroShared/Targets/UNCTargetProcessor.cs b/client/MaestroShared/Targets/UNCTargetProcessor.cs
index 3a111c55416ea3d8ed7caab2366e897f88136053..d82893d566943635e18d2b711d9aecd29a8d4305 100644 (file)
--- a/client/MaestroShared/Targets/UNCTargetProcessor.cs
+++ b/client/MaestroShared/Targets/UNCTargetProcessor.cs
@@ -91,7 +91,7 @@ namespace MaestroShared.Targets {
                     ValidateTransfer();\r
                     //logger.Info("Spend (s):" + (DateTime.Now - started).TotalSeconds);\r
                     Status = READY;\r
-                    Message = SUCCESS;\r
+                    Message = SUCCESS + " " + SUCCESS + " " + SUCCESS + " " + SUCCESS + " " + SUCCESS;\r
                 }\r
                 if (Parameters.TargetConfig.DeleteAfterCopy)\r
                     DeleteAfterCopy();\r
@@ -179,8 +179,8 @@ namespace MaestroShared.Targets {
 \r
         protected override void ExecuteCompleted() {\r
             logger.Trace(Strings.ENTRY);\r
-            base.ExecuteCompleted();\r
             workFlowAction.description = SUCCESS;\r
+            base.ExecuteCompleted();\r
             workFlowAction.successful = true;\r
             if (Parameters.TargetConfig.NexioServer)\r
                 UploadNexioMetadata();\r
@@ -358,6 +358,9 @@ namespace MaestroShared.Targets {
             KillDatePath = GetOutputFilePath(statusWorkDir, fileName);\r
             UploadContent(KillDatePath, new byte[] { });\r
             KillDate = date.ToString(DATE_FORMAT);\r
+            if (!FileExists(fileName)) {\r
+                workFlowAction.description += " A KILLDATE állomány nem jött létre!";\r
+            }\r
             logger.Trace(Strings.EXIT);\r
         }\r
 \r

diff --git a/client/OctopusClient/OctopusAPI.cs b/client/OctopusClient/OctopusAPI.cs
index aaff347a7da8dcac5ea89e749d75516eae7cec61..65c242e5fccdeb2e1619826079a3623183546665 100644 (file)
--- a/client/OctopusClient/OctopusAPI.cs
+++ b/client/OctopusClient/OctopusAPI.cs
@@ -77,6 +77,23 @@ namespace OctopusClient {
             this.messageBus = messageBus;\r
         }\r
 \r
+        public String GetRundownContent(string id) {\r
+            String result = null;\r
+            try {\r
+                var request = new RestRequest("rundownContent/{id}", Method.GET);\r
+                request.AddParameter(ID, id, ParameterType.UrlSegment);\r
+                var response = client.Execute(request);\r
+                if (String.IsNullOrEmpty(response.Content))\r
+                    return null;\r
+                if (response.ErrorException != null)\r
+                    throw new Exception(response.ErrorMessage);\r
+                result = response.Content;\r
+            } catch (Exception e) {\r
+                OnError(e);\r
+            }\r
+            return result;\r
+        }\r
+\r
         public IEnumerable<Rundown> GetRundowns(DateTime scheduledDate) {\r
             IEnumerable<Rundown> result = null;\r
             try {\r

diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/CopyForArchiveNEXIORecordingsStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/CopyForArchiveNEXIORecordingsStep.java
index 6021bec1c3139b678269d70ef3e1b185b6908adb..6bd369184d17cfe049e039757fda5ed6838a3338 100644 (file)
--- a/server/user.jobengine.executors/src/user/jobengine/server/steps/CopyForArchiveNEXIORecordingsStep.java
+++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/CopyForArchiveNEXIORecordingsStep.java
@@ -289,39 +289,10 @@ public class CopyForArchiveNEXIORecordingsStep extends JobStep {
                result.setItemHouseId(String.valueOf(rundownID));\r
                result.setItemTitle(String.format("%s %s %s", start, name, channel));\r
 \r
-               //              StringBuilder sb = new StringBuilder();\r
-               //              for (DBObject s : stories) {\r
-               //                      BasicDBObject story = (BasicDBObject) s;\r
-               //                      sb.append(story.getString(IOctopusAPI.PARENT_STORY_ID));\r
-               //                      sb.append(" [" + story.getString(IOctopusAPI.FORMAT) + "] ");\r
-               //                      sb.append(story.getString(IOctopusAPI.NAME));\r
-               //                      sb.append("\r\n");\r
-               //              }\r
-\r
-               StringBuilder sb = new StringBuilder();\r
-               for (DBObject s : stories) {\r
-                       BasicDBObject story = (BasicDBObject) s;\r
-\r
-                       sb.append("*** ");\r
-                       sb.append(story.getString(IOctopusAPI.PARENT_STORY_ID));\r
-                       sb.append(" [" + story.getString(IOctopusAPI.FORMAT) + "] ");\r
-                       sb.append(story.getString(IOctopusAPI.NAME));\r
-                       sb.append(" ***");\r
-                       sb.append("\r\n");\r
-                       String content = story.getString(IOctopusAPI.SCRIPT_CONTENT);\r
-                       if (content != null) {\r
-                               content = content.replace("\r\n\r\n\r\n\r\n", "\r\n");\r
-                               content = content.replace("\r\n\r\n\r\n", "\r\n");\r
-                               content = content.replace("\r\n\r\n", "\r\n");\r
-                               sb.append(content);\r
-                               sb.append("\r\n");\r
-                       }\r
-               }\r
-\r
                StoryArchive storyArchive = new StoryArchive();\r
                storyArchive.setMediaHouseId(result.getItemHouseId());\r
                storyArchive.setMediaTitle(clipName);\r
-               storyArchive.setMediaDesc(sb.toString());\r
+               storyArchive.setMediaDesc(octopusAPI.getRundownContent(stories));\r
                result.addStoryArchive(storyArchive);\r
                storyArchive.addFileArchive(new FileArchive(clipName, duration));\r
                return result;\r

diff --git a/server/user.jobengine.osgi.commons/src/user/commons/octopus/IOctopusAPI.java b/server/user.jobengine.osgi.commons/src/user/commons/octopus/IOctopusAPI.java
index 86360d46d9cb83881a0cd4c59f27d45da0a508e4..83ae787624e69f1835c0a8479aef51f9b73f1f80 100644 (file)
--- a/server/user.jobengine.osgi.commons/src/user/commons/octopus/IOctopusAPI.java
+++ b/server/user.jobengine.osgi.commons/src/user/commons/octopus/IOctopusAPI.java
@@ -55,6 +55,10 @@ public interface IOctopusAPI {
 \r
        DBObject getRundownByID(long rundownID);\r
 \r
+       String getRundownContent(List<DBObject> stories);\r
+\r
+       String getRundownContent(long id);\r
+\r
        List<DBObject> getRundownFullStories(long id);\r
 \r
        List<DBObject> getRundowns(Date scheduledDate);\r

diff --git a/server/user.jobengine.osgi.commons/src/user/commons/octopus/OctopusAPI.java b/server/user.jobengine.osgi.commons/src/user/commons/octopus/OctopusAPI.java
index 4244dd5dd83b31ce315a5c0ab7816a63e5e795c5..d77ef2085280310992d95ece2b64f3e33904ce8d 100644 (file)
--- a/server/user.jobengine.osgi.commons/src/user/commons/octopus/OctopusAPI.java
+++ b/server/user.jobengine.osgi.commons/src/user/commons/octopus/OctopusAPI.java
@@ -91,6 +91,47 @@ public class OctopusAPI implements IOctopusAPI {
                return result;\r
        }\r
 \r
+       @Override\r
+       public String getRundownContent(List<DBObject> stories) {\r
+               if (stories == null || stories.size() == 0)\r
+                       return null;\r
+\r
+               StringBuilder sb = new StringBuilder();\r
+               for (DBObject s : stories) {\r
+                       BasicDBObject story = (BasicDBObject) s;\r
+\r
+                       sb.append("*** ");\r
+                       sb.append(story.getString(IOctopusAPI.PARENT_STORY_ID));\r
+                       String format = story.getString(IOctopusAPI.FORMAT);\r
+                       if (format != null)\r
+                               sb.append(" [" + story.getString(IOctopusAPI.FORMAT) + "] ");\r
+                       else\r
+                               sb.append(" ");\r
+                       String name = story.getString(IOctopusAPI.NAME);\r
+                       if (name != null)\r
+                               sb.append(name);\r
+                       sb.append(" ***");\r
+                       sb.append("\r\n");\r
+                       String content = story.getString(IOctopusAPI.SCRIPT_CONTENT);\r
+                       if (content != null) {\r
+                               content = content.replace("\r\n\r\n\r\n\r\n", "\r\n");\r
+                               content = content.replace("\r\n\r\n\r\n", "\r\n");\r
+                               content = content.replace("\r\n\r\n", "\r\n");\r
+                               sb.append(content);\r
+                               sb.append("\r\n");\r
+                       }\r
+               }\r
+               return sb.toString();\r
+       }\r
+\r
+       @Override\r
+       public String getRundownContent(long id) {\r
+               BasicDBObject fields = new BasicDBObject(ID, 1).append(PARENT_STORY_ID, 1).append(NAME, 1).append(MODIFIED, 1).append(REF_RUNDOWN, 1).append(FORMAT, 1)\r
+                               .append(MOS_OBJECTS, 1).append(SCRIPT_CONTENT, 1);\r
+               List<DBObject> stories = getRundownStories(id, fields);\r
+               return getRundownContent(stories);\r
+       }\r
+\r
        @Override\r
        public List<DBObject> getRundownFullStories(long id) {\r
                List<DBObject> result = null;\r

diff --git a/server/user.jobengine.osgi.services/src/user/jobengine/osgi/rest/octopus/OctopusRESTService.java b/server/user.jobengine.osgi.services/src/user/jobengine/osgi/rest/octopus/OctopusRESTService.java
index 5e986db03d786aff1107a518f108bee094cb9d30..d8e19993c25026bb5c227ac4b63a276e51b91b2f 100644 (file)
--- a/server/user.jobengine.osgi.services/src/user/jobengine/osgi/rest/octopus/OctopusRESTService.java
+++ b/server/user.jobengine.osgi.services/src/user/jobengine/osgi/rest/octopus/OctopusRESTService.java
@@ -1,5 +1,6 @@
 package user.jobengine.osgi.rest.octopus;
 
+import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 
@@ -15,8 +16,10 @@ import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.joda.time.DateTime;
 
+import com.ibm.nosql.json.api.BasicDBObject;
 import com.ibm.nosql.json.api.DBObject;
 
+import user.commons.ListUtils;
 import user.commons.octopus.IOctopusAPI;
 import user.jobengine.osgi.rest.ComponentBinder;
 
@@ -34,6 +37,55 @@ public class OctopusRESTService {
                return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(e.getMessage()).build();
        }
 
+       @GET
+       @Path("/rundownContent/{id}")
+       @Produces({ MediaType.APPLICATION_JSON + ";charset=utf-8" })
+       public Response getRundownContent(@PathParam(ID) long id) {
+               logger.trace("Entry");
+               Response result = null;
+               try {
+                       result = Response.ok(octopusService.getRundownContent(id)).build();
+               } catch (Exception e) {
+                       result = createErrorResponse(e);
+               }
+               logger.trace("Exit");
+               return result;
+       }
+
+       @GET
+       @Path("/rundownList")
+       @Produces({ MediaType.TEXT_HTML + ";charset=utf-8" })
+       public Response getRundownList() {
+               logger.trace("Entry");
+               Response result = null;
+               try {
+                       StringBuilder sb = new StringBuilder();
+
+                       List<BasicDBObject> rundowns = ListUtils.cast(octopusService.getRundowns(null));
+                       SimpleDateFormat sdt = new SimpleDateFormat("yyyy.MM.dd hh:mm");
+                       for (BasicDBObject rundown : rundowns) {
+                               String name = rundown.getString(IOctopusAPI.NAME);
+
+                               if (name != null) {
+                                       int pos = name.lastIndexOf(" ");
+                                       pos = name.lastIndexOf(" ", pos - 1);
+                                       if (pos > 0)
+                                               name = name.substring(0, pos);
+                               }
+
+                               String date = sdt.format(rundown.getDate(IOctopusAPI.SCHEDULED_START));
+                               long id = rundown.getLong(IOctopusAPI.ID);
+                               sb.append(String.format("<a href='/services/rest/octopus/rundownContent/%d' target ='_blank'>[%s] %s</a></br>", id, date, name));
+                       }
+
+                       result = Response.ok(sb.toString()).build();
+               } catch (Exception e) {
+                       result = createErrorResponse(e);
+               }
+               logger.trace("Exit");
+               return result;
+       }
+
        @GET
        @Path("/rundowns")
        @Consumes({ MediaType.APPLICATION_JSON })