git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube...
authorVásáry Dániel <daniel.vasary@userrendszerhaz.hu>
Sun, 12 Nov 2017 21:07:02 +0000 (21:07 +0000)
committerVásáry Dániel <daniel.vasary@userrendszerhaz.hu>
Sun, 12 Nov 2017 21:07:02 +0000 (21:07 +0000)
13 files changed:
client/Maestro/Configuration/configuration-editor.json
client/Maestro/Configuration/configuration-nexio-ingest.json
client/Maestro/Configuration/configuration-sxs.json
client/Maestro/MaestroForm.Designer.cs
client/Maestro/MaestroForm.Metadata.cs
client/Maestro/MaestroForm.Source.cs
client/Maestro/MaestroForm.cs
client/OctopusClient/OctopusAPI.cs
client/OctopusClient/OctopusIDSelector.Designer.cs
client/OctopusClient/OctopusIDSelector.cs
client/OctopusClient/OctopusIDSelector.resx
server/user.jobengine.executors/src/user/jobengine/server/steps/SyncOCTOPUSDataStep.java
server/user.jobengine.osgi.commons/src/user/commons/octopus/OctopusDataMiner.java

index 55e90f01fe48a89a7ec70ecafd7777e95596fc4e..72689711f9485311835fcacb6408b4a89e30f3f0 100644 (file)
@@ -1,6 +1,6 @@
 {\r
   "title": "Szerkesztő",\r
-  "active": true,\r
+  "active": false,\r
   "startInTray": false,\r
   "enableCustomMetadataId": true,\r
   "player": {\r
index d247d4f9f3c0e7be6a566f816a5354b11adb0cf0..17c6143e57829f9f4fea4ced95a300c95d593197 100644 (file)
@@ -1,6 +1,6 @@
 {\r
   "title": "NEXIO betöltő",\r
-  "active": true,\r
+  "active": false,\r
   "startInTray": false,\r
   "enableCustomMetadataId": true,\r
   "player": {\r
index a3a97954fbed4b9474ed8d02d1b5be3fb8624000..7032fa13c32a65ad91d3999d28a7394b63316fc1 100644 (file)
@@ -1,6 +1,6 @@
 {\r
   "title": "SxS",\r
-  "active": false,\r
+  "active": true,\r
   "startInTray": false,\r
   "enableCustomMetadataId": true,\r
   "player": {\r
index 5040ec997d3e1fe55b79e2fba196c70068124651..f921ac34ecb5402f2151ff6c32cf495a5aaaa464 100644 (file)
@@ -26,21 +26,21 @@ namespace Maestro {
         /// </summary>\r
         private void InitializeComponent() {\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 dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle();\r
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle();\r
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle();\r
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MaestroForm));\r
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();\r
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();\r
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();\r
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = 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
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();\r
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();\r
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();\r
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();\r
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();\r
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle();\r
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle();\r
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle22 = new System.Windows.Forms.DataGridViewCellStyle();\r
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle23 = new System.Windows.Forms.DataGridViewCellStyle();\r
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle();\r
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle();\r
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle24 = new System.Windows.Forms.DataGridViewCellStyle();\r
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle26 = new System.Windows.Forms.DataGridViewCellStyle();\r
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle27 = new System.Windows.Forms.DataGridViewCellStyle();\r
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle28 = new System.Windows.Forms.DataGridViewCellStyle();\r
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle25 = new System.Windows.Forms.DataGridViewCellStyle();\r
             this.groupSource = new System.Windows.Forms.GroupBox();\r
             this.dgSource = new System.Windows.Forms.DataGridView();\r
             this.bindingSource = new System.Windows.Forms.BindingSource(this.components);\r
@@ -158,32 +158,32 @@ namespace Maestro {
             this.dgSource.BackgroundColor = System.Drawing.Color.White;\r
             this.dgSource.BorderStyle = System.Windows.Forms.BorderStyle.None;\r
             this.dgSource.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", 9F, 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.True;\r
-            this.dgSource.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;\r
+            dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
+            dataGridViewCellStyle15.BackColor = System.Drawing.SystemColors.Control;\r
+            dataGridViewCellStyle15.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
+            dataGridViewCellStyle15.ForeColor = System.Drawing.SystemColors.WindowText;\r
+            dataGridViewCellStyle15.SelectionBackColor = System.Drawing.SystemColors.Highlight;\r
+            dataGridViewCellStyle15.SelectionForeColor = System.Drawing.SystemColors.HighlightText;\r
+            dataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.True;\r
+            this.dgSource.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle15;\r
             this.dgSource.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;\r
             this.dgSource.DataSource = this.bindingSource;\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, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\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.dgSource.DefaultCellStyle = dataGridViewCellStyle2;\r
+            dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
+            dataGridViewCellStyle16.BackColor = System.Drawing.SystemColors.Window;\r
+            dataGridViewCellStyle16.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
+            dataGridViewCellStyle16.ForeColor = System.Drawing.SystemColors.ControlText;\r
+            dataGridViewCellStyle16.SelectionBackColor = System.Drawing.Color.Gainsboro;\r
+            dataGridViewCellStyle16.SelectionForeColor = System.Drawing.Color.Black;\r
+            dataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.False;\r
+            this.dgSource.DefaultCellStyle = dataGridViewCellStyle16;\r
             this.dgSource.Dock = System.Windows.Forms.DockStyle.Fill;\r
             this.dgSource.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically;\r
             this.dgSource.EnableHeadersVisualStyles = false;\r
             this.dgSource.Location = new System.Drawing.Point(10, 47);\r
             this.dgSource.Name = "dgSource";\r
             this.dgSource.RowHeadersVisible = false;\r
-            dataGridViewCellStyle3.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
-            this.dgSource.RowsDefaultCellStyle = dataGridViewCellStyle3;\r
+            dataGridViewCellStyle17.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
+            this.dgSource.RowsDefaultCellStyle = dataGridViewCellStyle17;\r
             this.dgSource.RowTemplate.DefaultCellStyle.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
             this.dgSource.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;\r
             this.dgSource.Size = new System.Drawing.Size(347, 352);\r
@@ -468,6 +468,7 @@ namespace Maestro {
             this.btnLookupMetadata.Size = new System.Drawing.Size(30, 26);\r
             this.btnLookupMetadata.TabIndex = 16;\r
             this.btnLookupMetadata.UseVisualStyleBackColor = false;\r
+            this.btnLookupMetadata.Click += new System.EventHandler(this.OnLookupByMetadata);\r
             // \r
             // mbActions\r
             // \r
@@ -633,14 +634,14 @@ namespace Maestro {
             this.dgJobs.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.DisplayedCells;\r
             this.dgJobs.BackgroundColor = System.Drawing.Color.White;\r
             this.dgJobs.BorderStyle = System.Windows.Forms.BorderStyle.None;\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", 9F, 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.True;\r
-            this.dgJobs.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4;\r
+            dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
+            dataGridViewCellStyle18.BackColor = System.Drawing.SystemColors.Control;\r
+            dataGridViewCellStyle18.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
+            dataGridViewCellStyle18.ForeColor = System.Drawing.SystemColors.WindowText;\r
+            dataGridViewCellStyle18.SelectionBackColor = System.Drawing.SystemColors.Highlight;\r
+            dataGridViewCellStyle18.SelectionForeColor = System.Drawing.SystemColors.HighlightText;\r
+            dataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.True;\r
+            this.dgJobs.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle18;\r
             this.dgJobs.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;\r
             this.dgJobs.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {\r
             this.columnLabel,\r
@@ -653,32 +654,32 @@ namespace Maestro {
             this.columnOutput,\r
             this.columnKillDate});\r
             this.dgJobs.DataSource = this.bindingSourceJobs;\r
-            dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
-            dataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Window;\r
-            dataGridViewCellStyle7.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
-            dataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.ControlText;\r
-            dataGridViewCellStyle7.NullValue = null;\r
-            dataGridViewCellStyle7.SelectionBackColor = System.Drawing.Color.Gainsboro;\r
-            dataGridViewCellStyle7.SelectionForeColor = System.Drawing.Color.Black;\r
-            dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.False;\r
-            this.dgJobs.DefaultCellStyle = dataGridViewCellStyle7;\r
+            dataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
+            dataGridViewCellStyle21.BackColor = System.Drawing.SystemColors.Window;\r
+            dataGridViewCellStyle21.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
+            dataGridViewCellStyle21.ForeColor = System.Drawing.SystemColors.ControlText;\r
+            dataGridViewCellStyle21.NullValue = null;\r
+            dataGridViewCellStyle21.SelectionBackColor = System.Drawing.Color.Gainsboro;\r
+            dataGridViewCellStyle21.SelectionForeColor = System.Drawing.Color.Black;\r
+            dataGridViewCellStyle21.WrapMode = System.Windows.Forms.DataGridViewTriState.False;\r
+            this.dgJobs.DefaultCellStyle = dataGridViewCellStyle21;\r
             this.dgJobs.Dock = System.Windows.Forms.DockStyle.Fill;\r
             this.dgJobs.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically;\r
             this.dgJobs.EnableHeadersVisualStyles = false;\r
             this.dgJobs.GridColor = System.Drawing.Color.White;\r
             this.dgJobs.Location = new System.Drawing.Point(3, 3);\r
             this.dgJobs.Name = "dgJobs";\r
-            dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
-            dataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Control;\r
-            dataGridViewCellStyle8.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
-            dataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.WindowText;\r
-            dataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight;\r
-            dataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText;\r
-            dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True;\r
-            this.dgJobs.RowHeadersDefaultCellStyle = dataGridViewCellStyle8;\r
+            dataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
+            dataGridViewCellStyle22.BackColor = System.Drawing.SystemColors.Control;\r
+            dataGridViewCellStyle22.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
+            dataGridViewCellStyle22.ForeColor = System.Drawing.SystemColors.WindowText;\r
+            dataGridViewCellStyle22.SelectionBackColor = System.Drawing.SystemColors.Highlight;\r
+            dataGridViewCellStyle22.SelectionForeColor = System.Drawing.SystemColors.HighlightText;\r
+            dataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.True;\r
+            this.dgJobs.RowHeadersDefaultCellStyle = dataGridViewCellStyle22;\r
             this.dgJobs.RowHeadersVisible = false;\r
-            dataGridViewCellStyle9.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
-            this.dgJobs.RowsDefaultCellStyle = dataGridViewCellStyle9;\r
+            dataGridViewCellStyle23.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
+            this.dgJobs.RowsDefaultCellStyle = dataGridViewCellStyle23;\r
             this.dgJobs.RowTemplate.DefaultCellStyle.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
             this.dgJobs.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;\r
             this.dgJobs.Size = new System.Drawing.Size(988, 92);\r
@@ -698,8 +699,8 @@ namespace Maestro {
             // \r
             this.columnID.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells;\r
             this.columnID.DataPropertyName = "ID";\r
-            dataGridViewCellStyle5.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
-            this.columnID.DefaultCellStyle = dataGridViewCellStyle5;\r
+            dataGridViewCellStyle19.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
+            this.columnID.DefaultCellStyle = dataGridViewCellStyle19;\r
             this.columnID.HeaderText = "ID";\r
             this.columnID.Name = "columnID";\r
             this.columnID.Width = 44;\r
@@ -716,8 +717,8 @@ namespace Maestro {
             // \r
             this.columnStatus.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells;\r
             this.columnStatus.DataPropertyName = "Status";\r
-            dataGridViewCellStyle6.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
-            this.columnStatus.DefaultCellStyle = dataGridViewCellStyle6;\r
+            dataGridViewCellStyle20.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
+            this.columnStatus.DefaultCellStyle = dataGridViewCellStyle20;\r
             this.columnStatus.HeaderText = "Status";\r
             this.columnStatus.Name = "columnStatus";\r
             this.columnStatus.Width = 66;\r
@@ -781,27 +782,27 @@ namespace Maestro {
             this.dgMessages.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.DisplayedCells;\r
             this.dgMessages.BackgroundColor = System.Drawing.Color.White;\r
             this.dgMessages.BorderStyle = System.Windows.Forms.BorderStyle.None;\r
-            dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
-            dataGridViewCellStyle10.BackColor = System.Drawing.SystemColors.Control;\r
-            dataGridViewCellStyle10.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
-            dataGridViewCellStyle10.ForeColor = System.Drawing.SystemColors.WindowText;\r
-            dataGridViewCellStyle10.SelectionBackColor = System.Drawing.SystemColors.Highlight;\r
-            dataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText;\r
-            dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.True;\r
-            this.dgMessages.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle10;\r
+            dataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
+            dataGridViewCellStyle24.BackColor = System.Drawing.SystemColors.Control;\r
+            dataGridViewCellStyle24.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
+            dataGridViewCellStyle24.ForeColor = System.Drawing.SystemColors.WindowText;\r
+            dataGridViewCellStyle24.SelectionBackColor = System.Drawing.SystemColors.Highlight;\r
+            dataGridViewCellStyle24.SelectionForeColor = System.Drawing.SystemColors.HighlightText;\r
+            dataGridViewCellStyle24.WrapMode = System.Windows.Forms.DataGridViewTriState.True;\r
+            this.dgMessages.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle24;\r
             this.dgMessages.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;\r
             this.dgMessages.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {\r
             this.dataGridViewTextBoxColumn1,\r
             this.dataGridViewTextBoxColumn2});\r
-            dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
-            dataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Window;\r
-            dataGridViewCellStyle12.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
-            dataGridViewCellStyle12.ForeColor = System.Drawing.Color.Red;\r
-            dataGridViewCellStyle12.NullValue = null;\r
-            dataGridViewCellStyle12.SelectionBackColor = System.Drawing.Color.Gainsboro;\r
-            dataGridViewCellStyle12.SelectionForeColor = System.Drawing.Color.Red;\r
-            dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.False;\r
-            this.dgMessages.DefaultCellStyle = dataGridViewCellStyle12;\r
+            dataGridViewCellStyle26.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
+            dataGridViewCellStyle26.BackColor = System.Drawing.SystemColors.Window;\r
+            dataGridViewCellStyle26.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
+            dataGridViewCellStyle26.ForeColor = System.Drawing.Color.Red;\r
+            dataGridViewCellStyle26.NullValue = null;\r
+            dataGridViewCellStyle26.SelectionBackColor = System.Drawing.Color.Gainsboro;\r
+            dataGridViewCellStyle26.SelectionForeColor = System.Drawing.Color.Red;\r
+            dataGridViewCellStyle26.WrapMode = System.Windows.Forms.DataGridViewTriState.False;\r
+            this.dgMessages.DefaultCellStyle = dataGridViewCellStyle26;\r
             this.dgMessages.Dock = System.Windows.Forms.DockStyle.Fill;\r
             this.dgMessages.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically;\r
             this.dgMessages.EnableHeadersVisualStyles = false;\r
@@ -809,17 +810,17 @@ namespace Maestro {
             this.dgMessages.Location = new System.Drawing.Point(3, 3);\r
             this.dgMessages.Name = "dgMessages";\r
             this.dgMessages.ReadOnly = true;\r
-            dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
-            dataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Control;\r
-            dataGridViewCellStyle13.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
-            dataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.WindowText;\r
-            dataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight;\r
-            dataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText;\r
-            dataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.True;\r
-            this.dgMessages.RowHeadersDefaultCellStyle = dataGridViewCellStyle13;\r
+            dataGridViewCellStyle27.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
+            dataGridViewCellStyle27.BackColor = System.Drawing.SystemColors.Control;\r
+            dataGridViewCellStyle27.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
+            dataGridViewCellStyle27.ForeColor = System.Drawing.SystemColors.WindowText;\r
+            dataGridViewCellStyle27.SelectionBackColor = System.Drawing.SystemColors.Highlight;\r
+            dataGridViewCellStyle27.SelectionForeColor = System.Drawing.SystemColors.HighlightText;\r
+            dataGridViewCellStyle27.WrapMode = System.Windows.Forms.DataGridViewTriState.True;\r
+            this.dgMessages.RowHeadersDefaultCellStyle = dataGridViewCellStyle27;\r
             this.dgMessages.RowHeadersVisible = false;\r
-            dataGridViewCellStyle14.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
-            this.dgMessages.RowsDefaultCellStyle = dataGridViewCellStyle14;\r
+            dataGridViewCellStyle28.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
+            this.dgMessages.RowsDefaultCellStyle = dataGridViewCellStyle28;\r
             this.dgMessages.RowTemplate.DefaultCellStyle.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
             this.dgMessages.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;\r
             this.dgMessages.Size = new System.Drawing.Size(988, 92);\r
@@ -838,8 +839,8 @@ namespace Maestro {
             // \r
             this.dataGridViewTextBoxColumn2.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;\r
             this.dataGridViewTextBoxColumn2.DataPropertyName = "Message";\r
-            dataGridViewCellStyle11.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
-            this.dataGridViewTextBoxColumn2.DefaultCellStyle = dataGridViewCellStyle11;\r
+            dataGridViewCellStyle25.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
+            this.dataGridViewTextBoxColumn2.DefaultCellStyle = dataGridViewCellStyle25;\r
             this.dataGridViewTextBoxColumn2.HeaderText = "Üzenet";\r
             this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";\r
             this.dataGridViewTextBoxColumn2.ReadOnly = true;\r
index 992234aa31b7a941cdda967f1c5177a3620a32ab..56efa401a0f0beea02d797a03feb3d7973199c8d 100644 (file)
@@ -290,7 +290,7 @@ namespace Maestro {
                 Rundown rundown = rundowns[0];\r
                 model.itemHouseId = rundown.ID;\r
                 model.itemTitle = rundown.Name;\r
-                model.itemDescription = rundown.Start;\r
+                model.itemDescription = rundown.Start.ToString();\r
             }\r
             model.mediaHouseId = story.ID;\r
             model.mediaTitle = story.Name;\r
@@ -317,7 +317,7 @@ namespace Maestro {
             UpdateProcessorButtonsEnabled();\r
             UpdateDefineSegmentEnabled();\r
             UpdateEditArchiveMetadataEnabled();\r
-            UpdateLookupMetadataEnabled();\r
+            UpdateLookupByMetadataEnabled();\r
         }\r
 \r
         private void OnOctopusIDSelected(string id, string name) {\r
@@ -364,9 +364,12 @@ namespace Maestro {
                 case MetadataType.TrafficPromo:\r
                     tooltip = "Traffic promó azonosító";\r
                     break;\r
-                case MetadataType.OctopusPlaceHolder:\r
+                case MetadataType.OctopusStory:\r
                     tooltip = "Octopus azonosító";\r
                     break;\r
+                case MetadataType.OctopusPlaceHolder:\r
+                    tooltip = "Octopus bejátszó azonosító";\r
+                    break;\r
                 case MetadataType.MediaCube:\r
                     tooltip = "MediaCube azonosító";\r
                     break;\r
@@ -375,6 +378,33 @@ namespace Maestro {
             return tooltip;\r
         }\r
 \r
+        private void OnLookupByMetadata(object sender, EventArgs e) {\r
+            MetadataProvider config = null;\r
+            switch (SelectedMetadata?.Kind) {\r
+                case MetadataType.TrafficAD:\r
+                case MetadataType.TrafficMaterial:\r
+                case MetadataType.TrafficPromo:\r
+                    config = Configuration.GetMetadataProvider<TrafficMetadata>();\r
+                    if (config == null)\r
+                        return;\r
+                    break;\r
+                case MetadataType.OctopusPlaceHolder:\r
+                    config = Configuration.GetMetadataProvider<OctopusMetadata>();\r
+                    if (config == null)\r
+                        return;\r
+                    octopusIDSelector.LookupByPlaceHolder(SelectedMetadata.ID);\r
+                    break;\r
+                case MetadataType.OctopusStory:\r
+                    config = Configuration.GetMetadataProvider<OctopusMetadata>();\r
+                    if (config == null)\r
+                        return;\r
+                    octopusIDSelector.LookupByStory(SelectedMetadata.ID);\r
+                    break;\r
+            }\r
+        }\r
+\r
+\r
+\r
         private void UpdateEditArchiveMetadataEnabled() {\r
             ctxiModifyArchiveMetadata.Enabled = SelectedSource != null;\r
         }\r
@@ -389,5 +419,9 @@ namespace Maestro {
                                         validTypes.ToList().Contains(SelectedMetadata.Kind);\r
         }\r
 \r
+        private void UpdateLookupByMetadataEnabled() {\r
+            MetadataType metadataType = GuessMetadataType(SelectedMetadata?.ID);\r
+            btnLookupMetadata.Enabled = metadataType != MetadataType.None && metadataType != MetadataType.MediaCube;\r
+        }\r
     }\r
 }\r
index 7165c17e7ecc37f4a42dacfcde9130c078e942fd..7810788c379ad4cf8b67cceeef266a90f66fe956 100644 (file)
@@ -36,7 +36,7 @@ namespace Maestro {
                 UpdateProcessorButtonsEnabled();\r
                 UpdateDefineSegmentEnabled();\r
                 UpdateEditArchiveMetadataEnabled();\r
-                UpdateLookupMetadataEnabled();\r
+                UpdateLookupBySourceEnabled();\r
             }\r
         }\r
 \r
@@ -302,10 +302,6 @@ namespace Maestro {
             }\r
         }\r
 \r
-        private void UpdateLookupMetadataEnabled() {\r
-            MetadataType metadataType = GuessMetadataType(SelectedSource?.Prefix);\r
-            btnLookupBySource.Enabled = metadataType != MetadataType.MediaCube && metadataType != MetadataType.None;\r
-        }\r
 \r
         private void picClearFilter_Click(object sender, EventArgs e) {\r
             txtSourceFilter.Text = null;\r
@@ -320,6 +316,10 @@ namespace Maestro {
             SelectedSource = null;\r
         }\r
 \r
+        private void UpdateLookupBySourceEnabled() {\r
+            MetadataType metadataType = GuessMetadataType(SelectedSource?.Prefix);\r
+            btnLookupBySource.Enabled = metadataType != MetadataType.MediaCube && metadataType != MetadataType.None;\r
+        }\r
 \r
     }\r
 }\r
index fb17448d04a926deecfdd66c8dd7d919bc79cc7d..50081ba6b86101e32b0f5d597111918a04c0349e 100644 (file)
@@ -239,5 +239,6 @@ namespace Maestro {
             var actualRow = dgJobs.SelectedRows[0];\r
             dgJobs.Rows.Remove(actualRow);\r
         }\r
+\r
     }\r
 }\r
index d766c8176eb78f1c1123d3180c2bf2da79742123..7e5fee05812b7ae76de4b5830911577502b4eed0 100644 (file)
@@ -13,7 +13,7 @@ namespace OctopusClient {
     public class Rundown {\r
         public string ID { get; set; }\r
         public string Name { get; set; }\r
-        public string Start { get; set; }\r
+        public DateTime Start { get; set; }\r
         public override String ToString() {\r
             string displayName = string.IsNullOrEmpty(Name) ? OctopusAPI.UNNAMED : Name;\r
             string result = ID.Equals("0") ? displayName : String.Format($"{Start} | {displayName} ");\r
@@ -61,7 +61,7 @@ namespace OctopusClient {
 \r
     public class OctopusAPI {\r
         private static Logger logger = LogManager.GetCurrentClassLogger();\r
-        public const string UNNAMED = "<Unnamed>";\r
+        public const string UNNAMED = "<üres>";\r
         private RestClient client;\r
         private string user;\r
         private string pwd;\r
@@ -98,15 +98,7 @@ namespace OctopusClient {
                 }\r
                 JArray resultObject = JArray.Parse(response.Content);\r
 \r
-                result = resultObject.Children().Select(d => {\r
-                    Rundown r = new Rundown {\r
-                        ID = d["id"].ToString(),\r
-                        Name = d["name"].ToString(),\r
-                        Start = d["scheduledStart"].ToString()\r
-                    };\r
-                    //logger.Debug($"{r}");\r
-                    return r;\r
-                });\r
+                result = resultObject.Children().Select(d => ToRundown(d));\r
             }\r
             catch (Exception e) {\r
                 OnError(e);\r
@@ -342,16 +334,7 @@ namespace OctopusClient {
                 }\r
                 JArray resultObject = JArray.Parse(response.Content);\r
 \r
-                result = resultObject.Children().Select(d => {\r
-                    Rundown r = new Rundown {\r
-                        ID = d["id"].ToString(),\r
-                        Name = String.IsNullOrEmpty(d["name"].ToString()) ? OctopusAPI.UNNAMED : d["name"].ToString(),\r
-                        Start = d["scheduledStart"].ToString()\r
-                    };\r
-\r
-                    logger.Debug($"{r}");\r
-                    return r;\r
-                });\r
+                result = resultObject.Children().Select(d => ToRundown(d));\r
             }\r
             catch (Exception e) {\r
                 OnError(e);\r
@@ -404,15 +387,7 @@ namespace OctopusClient {
                 }\r
                 JArray resultObject = JArray.Parse(response.Content);\r
 \r
-                result = resultObject.Children().Select(d => {\r
-                    Rundown r = new Rundown {\r
-                        ID = d["id"].ToString(),\r
-                        Name = d["name"].ToString(),\r
-                        Start = d["scheduledStart"].ToString()\r
-                    };\r
-                    logger.Debug($"{r}");\r
-                    return r;\r
-                });\r
+                result = resultObject.Children().Select(d =>ToRundown(d));\r
             }\r
             catch (Exception e) {\r
                 OnError(e);\r
@@ -420,6 +395,14 @@ namespace OctopusClient {
             return result;\r
         }\r
 \r
+        private static Rundown ToRundown(JToken d) {\r
+            return new Rundown {\r
+                ID = d["id"].ToString(),\r
+                Name = d["name"]?.ToString() ?? UNNAMED,\r
+                Start = DateTime.Parse(d["scheduledStart"]?.ToString())\r
+            };\r
+        }\r
+\r
         public IEnumerable<StoryFolder> GetStoryFoldersByPlaceHolderId(string placeHolderID) {\r
             IEnumerable<StoryFolder> result = null;\r
             try {\r
index ec053bf4fa6166c52dc3ae623a36f8678b34661e..26faa3d0580ca1d91ca437d12923dfbd1be84a4d 100644 (file)
         /// the contents of this method with the code editor.\r
         /// </summary>\r
         private void InitializeComponent() {\r
-            this.components = new System.ComponentModel.Container();\r
             this.dateScheduled = new System.Windows.Forms.DateTimePicker();\r
-            this.comboRudowns = new System.Windows.Forms.ComboBox();\r
-            this.bindingRundown = new System.Windows.Forms.BindingSource(this.components);\r
+            this.cbRundowns = new System.Windows.Forms.ComboBox();\r
             this.treeOctopus = new OctopusClient.CheckableTreeView();\r
-            this.tabControl1 = new System.Windows.Forms.TabControl();\r
+            this.tabOctopusFilter = new System.Windows.Forms.TabControl();\r
             this.tpRundown = new System.Windows.Forms.TabPage();\r
             this.tpStoryFolder = new System.Windows.Forms.TabPage();\r
-            this.comboStoryFolder = new System.Windows.Forms.ComboBox();\r
-            this.bindingStoryFolder = new System.Windows.Forms.BindingSource(this.components);\r
-            this.linkID = new System.Windows.Forms.LinkLabel();\r
-            ((System.ComponentModel.ISupportInitialize)(this.bindingRundown)).BeginInit();\r
-            this.tabControl1.SuspendLayout();\r
+            this.cbStoryFolder = new System.Windows.Forms.ComboBox();\r
+            this.tabOctopusFilter.SuspendLayout();\r
             this.tpRundown.SuspendLayout();\r
             this.tpStoryFolder.SuspendLayout();\r
-            ((System.ComponentModel.ISupportInitialize)(this.bindingStoryFolder)).BeginInit();\r
             this.SuspendLayout();\r
             // \r
             // dateScheduled\r
             this.dateScheduled.TabIndex = 0;\r
             this.dateScheduled.ValueChanged += new System.EventHandler(this.dateScheduled_ValueChanged);\r
             // \r
-            // comboRudowns\r
+            // cbRundowns\r
             // \r
-            this.comboRudowns.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) \r
+            this.cbRundowns.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) \r
             | System.Windows.Forms.AnchorStyles.Right)));\r
-            this.comboRudowns.DataSource = this.bindingRundown;\r
-            this.comboRudowns.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
-            this.comboRudowns.FormattingEnabled = true;\r
-            this.comboRudowns.Location = new System.Drawing.Point(94, 6);\r
-            this.comboRudowns.Name = "comboRudowns";\r
-            this.comboRudowns.Size = new System.Drawing.Size(143, 21);\r
-            this.comboRudowns.TabIndex = 3;\r
-            this.comboRudowns.SelectedValueChanged += new System.EventHandler(this.comboRudowns_SelectedValueChanged);\r
+            this.cbRundowns.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
+            this.cbRundowns.FormattingEnabled = true;\r
+            this.cbRundowns.Location = new System.Drawing.Point(94, 6);\r
+            this.cbRundowns.Name = "cbRundowns";\r
+            this.cbRundowns.Size = new System.Drawing.Size(143, 21);\r
+            this.cbRundowns.TabIndex = 3;\r
+            this.cbRundowns.SelectedValueChanged += new System.EventHandler(this.comboRudowns_SelectedValueChanged);\r
             // \r
             // treeOctopus\r
             // \r
             this.treeOctopus.Dock = System.Windows.Forms.DockStyle.Fill;\r
             this.treeOctopus.Location = new System.Drawing.Point(10, 70);\r
             this.treeOctopus.Name = "treeOctopus";\r
-            this.treeOctopus.Size = new System.Drawing.Size(251, 273);\r
+            this.treeOctopus.Size = new System.Drawing.Size(251, 296);\r
             this.treeOctopus.TabIndex = 5;\r
             this.treeOctopus.KeyDown += new System.Windows.Forms.KeyEventHandler(this.treeContent_KeyDown);\r
             // \r
-            // tabControl1\r
+            // tabOctopusFilter\r
             // \r
-            this.tabControl1.Controls.Add(this.tpRundown);\r
-            this.tabControl1.Controls.Add(this.tpStoryFolder);\r
-            this.tabControl1.Dock = System.Windows.Forms.DockStyle.Top;\r
-            this.tabControl1.Location = new System.Drawing.Point(10, 10);\r
-            this.tabControl1.Name = "tabControl1";\r
-            this.tabControl1.SelectedIndex = 0;\r
-            this.tabControl1.Size = new System.Drawing.Size(251, 60);\r
-            this.tabControl1.TabIndex = 10;\r
-            this.tabControl1.Selected += new System.Windows.Forms.TabControlEventHandler(this.tabControl1_Selected);\r
-            this.tabControl1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tabControl1_KeyDown);\r
+            this.tabOctopusFilter.Controls.Add(this.tpRundown);\r
+            this.tabOctopusFilter.Controls.Add(this.tpStoryFolder);\r
+            this.tabOctopusFilter.Dock = System.Windows.Forms.DockStyle.Top;\r
+            this.tabOctopusFilter.Location = new System.Drawing.Point(10, 10);\r
+            this.tabOctopusFilter.Name = "tabOctopusFilter";\r
+            this.tabOctopusFilter.SelectedIndex = 0;\r
+            this.tabOctopusFilter.Size = new System.Drawing.Size(251, 60);\r
+            this.tabOctopusFilter.TabIndex = 10;\r
+            this.tabOctopusFilter.Selected += new System.Windows.Forms.TabControlEventHandler(this.tabControl1_Selected);\r
+            this.tabOctopusFilter.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tabControl1_KeyDown);\r
             // \r
             // tpRundown\r
             // \r
             this.tpRundown.Controls.Add(this.dateScheduled);\r
-            this.tpRundown.Controls.Add(this.comboRudowns);\r
+            this.tpRundown.Controls.Add(this.cbRundowns);\r
             this.tpRundown.Location = new System.Drawing.Point(4, 22);\r
             this.tpRundown.Name = "tpRundown";\r
             this.tpRundown.Padding = new System.Windows.Forms.Padding(3);\r
             // \r
             // tpStoryFolder\r
             // \r
-            this.tpStoryFolder.Controls.Add(this.comboStoryFolder);\r
+            this.tpStoryFolder.Controls.Add(this.cbStoryFolder);\r
             this.tpStoryFolder.Location = new System.Drawing.Point(4, 22);\r
             this.tpStoryFolder.Name = "tpStoryFolder";\r
             this.tpStoryFolder.Padding = new System.Windows.Forms.Padding(3);\r
             this.tpStoryFolder.Text = "Story Folder";\r
             this.tpStoryFolder.UseVisualStyleBackColor = true;\r
             // \r
-            // comboStoryFolder\r
+            // cbStoryFolder\r
             // \r
-            this.comboStoryFolder.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) \r
+            this.cbStoryFolder.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) \r
             | System.Windows.Forms.AnchorStyles.Right)));\r
-            this.comboStoryFolder.DataSource = this.bindingStoryFolder;\r
-            this.comboStoryFolder.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
-            this.comboStoryFolder.FormattingEnabled = true;\r
-            this.comboStoryFolder.Location = new System.Drawing.Point(6, 7);\r
-            this.comboStoryFolder.Margin = new System.Windows.Forms.Padding(3, 3, 3, 6);\r
-            this.comboStoryFolder.Name = "comboStoryFolder";\r
-            this.comboStoryFolder.Size = new System.Drawing.Size(231, 21);\r
-            this.comboStoryFolder.TabIndex = 1;\r
-            this.comboStoryFolder.SelectedValueChanged += new System.EventHandler(this.comboStoryFolder_SelectedValueChanged);\r
-            // \r
-            // linkID\r
-            // \r
-            this.linkID.Dock = System.Windows.Forms.DockStyle.Bottom;\r
-            this.linkID.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
-            this.linkID.LinkBehavior = System.Windows.Forms.LinkBehavior.HoverUnderline;\r
-            this.linkID.Location = new System.Drawing.Point(10, 343);\r
-            this.linkID.Name = "linkID";\r
-            this.linkID.Size = new System.Drawing.Size(251, 23);\r
-            this.linkID.TabIndex = 12;\r
-            this.linkID.TabStop = true;\r
-            this.linkID.Text = "Search";\r
-            this.linkID.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
-            this.linkID.Visible = false;\r
-            this.linkID.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkID_LinkClicked);\r
+            this.cbStoryFolder.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
+            this.cbStoryFolder.FormattingEnabled = true;\r
+            this.cbStoryFolder.Location = new System.Drawing.Point(6, 7);\r
+            this.cbStoryFolder.Margin = new System.Windows.Forms.Padding(3, 3, 3, 6);\r
+            this.cbStoryFolder.Name = "cbStoryFolder";\r
+            this.cbStoryFolder.Size = new System.Drawing.Size(231, 21);\r
+            this.cbStoryFolder.TabIndex = 1;\r
+            this.cbStoryFolder.SelectedValueChanged += new System.EventHandler(this.comboStoryFolder_SelectedValueChanged);\r
             // \r
             // OctopusIDSelector\r
             // \r
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;\r
             this.BackColor = System.Drawing.Color.White;\r
             this.Controls.Add(this.treeOctopus);\r
-            this.Controls.Add(this.tabControl1);\r
-            this.Controls.Add(this.linkID);\r
+            this.Controls.Add(this.tabOctopusFilter);\r
             this.Margin = new System.Windows.Forms.Padding(10);\r
             this.Name = "OctopusIDSelector";\r
             this.Padding = new System.Windows.Forms.Padding(10);\r
             this.Size = new System.Drawing.Size(271, 376);\r
-            this.Load += new System.EventHandler(this.OctopusIDSelector_Load);\r
-            ((System.ComponentModel.ISupportInitialize)(this.bindingRundown)).EndInit();\r
-            this.tabControl1.ResumeLayout(false);\r
+            this.tabOctopusFilter.ResumeLayout(false);\r
             this.tpRundown.ResumeLayout(false);\r
             this.tpStoryFolder.ResumeLayout(false);\r
-            ((System.ComponentModel.ISupportInitialize)(this.bindingStoryFolder)).EndInit();\r
             this.ResumeLayout(false);\r
 \r
         }\r
         #endregion\r
 \r
         private System.Windows.Forms.DateTimePicker dateScheduled;\r
-        private System.Windows.Forms.ComboBox comboRudowns;\r
-        private System.Windows.Forms.BindingSource bindingRundown;\r
-        private System.Windows.Forms.TabControl tabControl1;\r
+        private System.Windows.Forms.ComboBox cbRundowns;\r
+        private System.Windows.Forms.TabControl tabOctopusFilter;\r
         private System.Windows.Forms.TabPage tpRundown;\r
         private System.Windows.Forms.TabPage tpStoryFolder;\r
-        private System.Windows.Forms.LinkLabel linkID;\r
-        private System.Windows.Forms.ComboBox comboStoryFolder;\r
-        private System.Windows.Forms.BindingSource bindingStoryFolder;\r
+        private System.Windows.Forms.ComboBox cbStoryFolder;\r
         private CheckableTreeView treeOctopus;\r
     }\r
 }\r
index dd6a265fe1e5cf2e89cb525949cd10edef9ea2c2..3226f983e7403e7a98a82f818d8e5f6a0595417a 100644 (file)
@@ -3,7 +3,6 @@ using System;
 using System.Linq;\r
 using System.Windows.Forms;\r
 using System.Collections.Generic;\r
-using System.ComponentModel;\r
 using System.Runtime.InteropServices;\r
 using LinkDotNet.MessageHandling.Contracts;\r
 using System.Drawing;\r
@@ -13,9 +12,10 @@ namespace OctopusClient {
 \r
     public partial class OctopusIDSelector : UserControl {\r
         private static Logger logger = LogManager.GetCurrentClassLogger();\r
-        private string id;\r
-        private int selectedStoryFolderIndex = -1;\r
-        private int selectedRundownIndex = -1;\r
+        private string lookupStoryId;\r
+        private string lookupPlaceHolderId;\r
+        //private int selectedStoryFolderIndex = -1;\r
+        //private int selectedRundownIndex = -1;\r
         private TreeNode selectedNode;\r
         private OctopusAPI client;\r
         public OnSelectedIDChanged IDChangedEvent { get; set; }\r
@@ -25,18 +25,38 @@ namespace OctopusClient {
             set {\r
                 configuration = value;\r
                 client = new OctopusAPI(value.Address.OriginalString, value.UserName, value.Password, value.Timeout, value.MessageBus);\r
-                //refreshStoryFolders();\r
                 refreshRundowns();\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
+        private const int TVM_SETITEM = TV_FIRST + 63;\r
+\r
+        [StructLayout(LayoutKind.Sequential, Pack = 8, CharSet = CharSet.Auto)]\r
+        private struct TVITEM {\r
+            public int mask;\r
+            public IntPtr hItem;\r
+            public int state;\r
+            public int stateMask;\r
+            [MarshalAs(UnmanagedType.LPTStr)]\r
+            public string lpszText;\r
+            public int cchTextMax;\r
+            public int iImage;\r
+            public int iSelectedImage;\r
+            public int cChildren;\r
+            public IntPtr lParam;\r
+        }\r
+\r
+        [DllImport("user32.dll", CharSet = CharSet.Auto)]\r
+        private static extern IntPtr SendMessage(IntPtr hWnd, int Msg, IntPtr wParam, ref TVITEM lParam);\r
+\r
         public OctopusIDSelector() {\r
             InitializeComponent();\r
             InitializeControlTexts();\r
             treeOctopus.AfterCheck += OnTreeAfterCheck;\r
             treeOctopus.AfterSelect += OnAfterSelect;\r
-            //treeOctopus.DrawMode = TreeViewDrawMode.OwnerDrawText;\r
-            //treeOctopus.DrawNode += OnDrawNode;\r
         }\r
 \r
         public TreeNode previousSelectedNode = null;\r
@@ -65,12 +85,6 @@ namespace OctopusClient {
         private void InitializeControlTexts() {\r
             tpRundown.Text = Resources.ADASTUKOR;\r
             tpStoryFolder.Text = Resources.MAPPA;\r
-            linkID.Text = Resources.KERESES;\r
-            //bindingRundown.Add(Resources.VALASSZON_ELEMET);\r
-            //bindingStoryFolder.Add(Resources.VALASSZON_ELEMET);\r
-        }\r
-\r
-        private void OctopusIDSelector_Load(object sender, EventArgs e) {\r
         }\r
 \r
         private void dateScheduled_ValueChanged(object sender, EventArgs e) {\r
@@ -78,7 +92,7 @@ namespace OctopusClient {
         }\r
 \r
         private void comboRudowns_SelectedValueChanged(object sender, EventArgs e) {\r
-            Rundown rundown = comboRudowns.SelectedValue as Rundown;\r
+            Rundown rundown = cbRundowns.SelectedValue as Rundown;\r
             treeOctopus.Nodes.Clear();\r
             if (rundown == null)\r
                 return;\r
@@ -89,12 +103,12 @@ namespace OctopusClient {
             if (stories == null)\r
                 return;\r
             AddStories(stories);\r
-            selectedRundownIndex = comboRudowns.SelectedIndex;\r
+            //selectedRundownIndex = cbRundowns.SelectedIndex;\r
         }\r
 \r
         private void AddStories(IEnumerable<Story> stories) {\r
             foreach (var story in stories) {\r
-                string name = story.Name == null ? "<névtelen>" : story.Name;\r
+                string name = story.Name == null ? OctopusAPI.UNNAMED : story.Name;\r
                 string label = story.ID;\r
                 if (!String.IsNullOrEmpty(story.Format))\r
                     label += String.Format($" [{story.Format}] {story.Name}");\r
@@ -104,20 +118,30 @@ namespace OctopusClient {
                 storyNode.Tag = story.ID;\r
                 if (configuration.DisableStoryCheck)\r
                     HideCheckBox(treeOctopus, storyNode);\r
+                else {\r
+                    if (lookupStoryId != null && lookupStoryId.Equals(story.ID))\r
+                        storyNode.Checked = true;\r
+                }\r
+\r
                 MosObject[] mosObjects = story.MosObjects;\r
                 if (mosObjects == null)\r
                     continue;\r
                 foreach (MosObject mosObject in mosObjects) {\r
                     TreeNode placeHolderNode = storyNode.Nodes.Add(mosObject.ObjID, String.Format($"{mosObject.ObjID}"));\r
+                    // TODO wich?\r
                     placeHolderNode.Tag = mosObject.ID;\r
                     if (configuration.DisablePlaceHolderCheck)\r
                         HideCheckBox(treeOctopus, placeHolderNode);\r
+                    else {\r
+                        if (lookupPlaceHolderId != null && lookupPlaceHolderId.Equals(mosObject.ID))\r
+                           placeHolderNode.Checked = true;\r
+                    }\r
                 }\r
             }\r
         }\r
 \r
         private void comboStoryFolder_SelectedValueChanged(object sender, EventArgs e) {\r
-            StoryFolder storyFolder = comboStoryFolder.SelectedValue as StoryFolder;\r
+            StoryFolder storyFolder = cbStoryFolder.SelectedValue as StoryFolder;\r
             if (storyFolder == null)\r
                 return;\r
             treeOctopus.Nodes.Clear();\r
@@ -128,55 +152,46 @@ namespace OctopusClient {
             if (stories == null)\r
                 return;\r
             AddStories(stories);\r
-            selectedStoryFolderIndex = comboStoryFolder.SelectedIndex;\r
+            //selectedStoryFolderIndex = cbStoryFolder.SelectedIndex;\r
         }\r
 \r
         private void refreshRundowns() {\r
             ClearSelection();\r
             Cursor.Current = Cursors.WaitCursor;\r
-            IEnumerable<Rundown> rundowns = client.GetRundowns(dateScheduled.Value.Date)?.ToArray();\r
-            if (rundowns == null) {\r
-                //bindingRundown.DataSource = null;\r
+            List<Rundown> rundownsResult = client.GetRundowns(dateScheduled.Value.Date)?.ToList();\r
+            if (rundownsResult == null || rundownsResult.Count == 0) {\r
+                cbRundowns.DataSource = null;\r
                 Cursor.Current = Cursors.Default;\r
                 return;\r
             }\r
-            BindingList<Rundown> bindingRundowns = new BindingList<Rundown>();\r
-            bindingRundowns.Add(new Rundown() { ID = 0.ToString(), Name = Resources.VALASSZON_ELEMET });\r
-            foreach (Rundown actualRundown in rundowns) {\r
-                bindingRundowns.Add(actualRundown);\r
-            }\r
-            bindingRundown.DataSource = bindingRundowns;\r
-            comboRudowns.SelectedIndex = selectedRundownIndex == -1 ? 0 : selectedRundownIndex;\r
-            InitCheckID(treeOctopus.Nodes);\r
+            List<Rundown> rundowns = new List<Rundown>();\r
+            rundowns.Add(new Rundown() { ID = 0.ToString(), Name = Resources.VALASSZON_ELEMET });\r
+            rundowns.AddRange(rundownsResult);\r
+            cbRundowns.DataSource = rundowns;\r
             Cursor.Current = Cursors.Default;\r
         }\r
 \r
         private void refreshStoryFolders() {\r
             ClearSelection();\r
             Cursor.Current = Cursors.WaitCursor;\r
-            IEnumerable<StoryFolder> storyFolders = client.getStoryFolders()?.ToArray();\r
-            if (storyFolders == null) {\r
-                bindingStoryFolder.Remove(Resources.VALASSZON_ELEMET);\r
+            List<StoryFolder> storyFoldersResult = client.getStoryFolders()?.ToList();\r
+            if (storyFoldersResult == null || storyFoldersResult.Count == 0) {\r
+                Cursor.Current = Cursors.Default;\r
+                cbStoryFolder.DataSource = null;\r
                 return;\r
             }\r
-            BindingList<StoryFolder> bindingStoryFolders = new BindingList<StoryFolder>();\r
-            bindingStoryFolders.Add(new StoryFolder() { ID = 0.ToString(), Name = Resources.VALASSZON_ELEMET });\r
-            foreach (StoryFolder actualStoryFolder in storyFolders)\r
-                bindingStoryFolders.Add(actualStoryFolder);\r
-            bindingStoryFolder.DataSource = bindingStoryFolders;\r
-            comboStoryFolder.SelectedIndex = selectedStoryFolderIndex == -1 ? 0 : selectedStoryFolderIndex;\r
-            InitCheckID(treeOctopus.Nodes);\r
+            List<StoryFolder> storyFolders = new List<StoryFolder>();\r
+            storyFolders.Add(new StoryFolder() { ID = 0.ToString(), Name = Resources.VALASSZON_ELEMET });\r
+            storyFolders.AddRange(storyFoldersResult);\r
+            cbStoryFolder.DataSource = storyFolders;\r
+            Cursor.Current = Cursors.Default;\r
         }\r
 \r
-        private void InitCheckID(TreeNodeCollection collection) {\r
-            if (!String.IsNullOrEmpty(id)) {\r
-                foreach (TreeNode actual in collection) {\r
-                    if (actual.Text.StartsWith(id)) {\r
-                        actual.Checked = true;\r
-                        break;\r
-                    } else\r
-                        InitCheckID(actual.Nodes);\r
-\r
+        private void InitCheckID(string id, TreeNodeCollection collection) {\r
+            foreach (TreeNode actual in collection) {\r
+                if (id.Equals(actual.Tag)) {\r
+                    actual.Checked = true;\r
+                    break;\r
                 }\r
             }\r
         }\r
@@ -188,6 +203,7 @@ namespace OctopusClient {
             selectedNode.Checked = false;\r
             treeOctopus.AfterCheck += OnTreeAfterCheck;\r
             selectedNode = null;\r
+            IDChangedEvent?.Invoke(null, null);\r
         }\r
 \r
         private void tabControl1_Selected(object sender, TabControlEventArgs e) {\r
@@ -198,15 +214,6 @@ namespace OctopusClient {
                 refreshStoryFolders();\r
         }\r
 \r
-        private void linkID_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) {\r
-            OctopusLookupResultSelector searchMessageBox = new OctopusLookupResultSelector();\r
-            searchMessageBox.ShowDialog();\r
-        }\r
-\r
-        public void setLinkIDText(string value) {\r
-            linkID.Text = value;\r
-        }\r
-\r
         private void RefreshPlaceHolderIDS(String ID) {\r
             treeOctopus.Nodes.Clear();\r
 \r
@@ -260,29 +267,6 @@ namespace OctopusClient {
             return client;\r
         }\r
 \r
-        private const int TVIF_STATE = 0x8;\r
-        private const int TVIS_STATEIMAGEMASK = 0xF000;\r
-        private const int TV_FIRST = 0x1100;\r
-        private const int TVM_SETITEM = TV_FIRST + 63;\r
-\r
-        [StructLayout(LayoutKind.Sequential, Pack = 8, CharSet = CharSet.Auto)]\r
-        private struct TVITEM {\r
-            public int mask;\r
-            public IntPtr hItem;\r
-            public int state;\r
-            public int stateMask;\r
-            [MarshalAs(UnmanagedType.LPTStr)]\r
-            public string lpszText;\r
-            public int cchTextMax;\r
-            public int iImage;\r
-            public int iSelectedImage;\r
-            public int cChildren;\r
-            public IntPtr lParam;\r
-        }\r
-\r
-        [DllImport("user32.dll", CharSet = CharSet.Auto)]\r
-        private static extern IntPtr SendMessage(IntPtr hWnd, int Msg, IntPtr wParam,\r
-                                                 ref TVITEM lParam);\r
 \r
         /// <summary>\r
         /// Hides the checkbox for the specified node on a TreeView control.\r
@@ -295,6 +279,55 @@ namespace OctopusClient {
             tvi.state = 0;\r
             SendMessage(tvw.Handle, TVM_SETITEM, IntPtr.Zero, ref tvi);\r
         }\r
+\r
+        public bool LookupByStory(string storyId) {\r
+            if (String.IsNullOrEmpty(storyId))\r
+                return false;\r
+            var rundown = client.GetRundownsByStoryID(storyId)?.FirstOrDefault();\r
+            if (rundown == null)\r
+                return false;\r
+            tabOctopusFilter.SelectedIndex = 0;\r
+            dateScheduled.Value = rundown.Start;\r
+            refreshRundowns();\r
+            List<Rundown> rundowns = cbRundowns.DataSource as List<Rundown>;\r
+            if (rundowns == null)\r
+                return false;\r
+            var rundownToFelect = rundowns.Where(f => f.ID.Equals(rundown.ID)).FirstOrDefault();\r
+            if (rundownToFelect == null)\r
+                return false;\r
+            lookupStoryId = storyId;\r
+            cbRundowns.SelectedItem = rundownToFelect;\r
+            lookupStoryId = null;\r
+            return selectedNode != null;\r
+        }\r
+\r
+        public bool LookupByPlaceHolder(string placeHolderId) {\r
+            if (String.IsNullOrEmpty(placeHolderId))\r
+                return false;\r
+            var rundown = client.GetRundownsByPlaceHolderId(placeHolderId)?.FirstOrDefault();\r
+            if (rundown == null) {\r
+                var storyFolder = client.GetStoryFoldersByPlaceHolderId(placeHolderId)?.FirstOrDefault();\r
+                if (storyFolder == null)\r
+                    return false;\r
+                tabOctopusFilter.SelectedIndex = 1;\r
+                refreshStoryFolders();\r
+                List<StoryFolder> storyFolders = cbStoryFolder.DataSource as List<StoryFolder>;\r
+                if (storyFolders == null)\r
+                    return false;\r
+                var folderToFelect = storyFolders.Where(f => f.ID.Equals(storyFolder.ID)).FirstOrDefault();\r
+                if (folderToFelect == null)\r
+                    return false;\r
+                lookupPlaceHolderId = placeHolderId;\r
+                cbStoryFolder.SelectedItem = folderToFelect;\r
+            } else {\r
+                lookupPlaceHolderId = placeHolderId;\r
+                tabOctopusFilter.SelectedIndex = 0;\r
+                dateScheduled.Value = rundown.Start;\r
+                refreshRundowns();\r
+            }\r
+            lookupPlaceHolderId = null;\r
+            return selectedNode != null;\r
+        }\r
     }\r
 \r
     public class OctopusAPIMessage : IMessage {\r
index f50ab11f77d20735a36085e64c7ebd2029d9be11..29dcb1b3a353ba227f65e11fbe3d6f0766e84292 100644 (file)
   <resheader name="writer">\r
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
   </resheader>\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
 </root>
\ No newline at end of file
index f6e6fc21df09b4b7f3dd7d86c37211295aea55a8..75f3fe0936d88e0e695e78b183973b2a5ffd2ec9 100644 (file)
@@ -17,7 +17,7 @@ public class SyncOCTOPUSDataStep extends JobStep {
                return new IProgressEventListener() {\r
                        @Override\r
                        public void progressChanged(ProgressEvent evt) {\r
-                               logger.info("Progress changed to " + evt.getProgress() + "%");\r
+                               //logger.debug("Progress changed to " + evt.getProgress() + "%");\r
                                jobRuntime.incrementProgress(evt.getProgress());\r
                        }\r
                };\r
index 183fb31143ec76cdb2ed6d9a35bda5b0aab1dcc3..85478e7c7307876e21b44135bc48934b91dbb7f1 100644 (file)
@@ -440,7 +440,7 @@ public class OctopusDataMiner implements Runnable {
 \r
        @Override\r
        public void run() {\r
-               logger.info(STARTING);\r
+               logger.trace(STARTING);\r
                try {\r
                        ensureIndexes();\r
                        Date lastUpdateTime = getLastUpdateTime();\r