git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube...
authorVásáry Dániel <daniel.vasary@userrendszerhaz.hu>
Fri, 20 Oct 2017 11:28:54 +0000 (11:28 +0000)
committerVásáry Dániel <daniel.vasary@userrendszerhaz.hu>
Fri, 20 Oct 2017 11:28:54 +0000 (11:28 +0000)
30 files changed:
client/AudioRecorder/AudioRecorder.csproj
client/AudioRecorder/MainForm.Designer.cs
client/AudioRecorder/Resources/configuration.json
client/IntegrationTests/IntegrationTests.csproj
client/IntegrationTests/PlanAIRTests.cs
client/Maestro/ArchiveMetadataForm.Designer.cs
client/Maestro/ArchiveMetadataForm.cs
client/Maestro/Maestro.csproj
client/Maestro/MaestroForm.Designer.cs
client/Maestro/MaestroForm.Metadata.cs
client/Maestro/MaestroForm.Target.cs
client/Maestro/MaestroForm.cs
client/Maestro/Properties/DataSources/ArchiveMetadataForm.datasource [new file with mode: 0644]
client/Maestro/StringResources.Designer.cs
client/Maestro/StringResources.resx
client/Maestro/Targets/UNCTargetProcessor.cs
client/MediaCube.sln
client/MediaCubeClient/MediaCubeClient.csproj
client/OctopusClient/OctopusClient.csproj
client/OctopusClient/OctopusIDSelector.Designer.cs
client/OctopusClient/OctopusIDSelector.cs
client/PasswordEncrypter/PasswordEncrypter.csproj
client/PlanAIRClient/SearchResult.cs
client/PlanAIRClient/TrafficAPI.cs
client/PlanAIRClient/TrafficClient.csproj
client/PlanAIRClient/TrafficIDSelector.Designer.cs
client/PlanAIRClient/TrafficIDSelector.cs
client/PlanAIRClient/Workers/AdvertisementWorker.cs
client/PlanAIRClient/Workers/BroadcastWorker.cs
client/PlanAIRClient/Workers/PromotionalWorker.cs

index 145dd2e16a7b07aeb6e87e3ff1a154fa8239822c..db864e294bbdb08302ccb2f9bb4bdf4eeb635faa 100644 (file)
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>\r
     <Prefer32Bit>false</Prefer32Bit>\r
   </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">\r
+    <DebugSymbols>true</DebugSymbols>\r
+    <OutputPath>bin\x64\Debug\</OutputPath>\r
+    <DefineConstants>DEBUG;TRACE</DefineConstants>\r
+    <DebugType>full</DebugType>\r
+    <PlatformTarget>x64</PlatformTarget>\r
+    <ErrorReport>prompt</ErrorReport>\r
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">\r
+    <OutputPath>bin\x64\Release\</OutputPath>\r
+    <DefineConstants>TRACE</DefineConstants>\r
+    <Optimize>true</Optimize>\r
+    <DebugType>pdbonly</DebugType>\r
+    <PlatformTarget>x64</PlatformTarget>\r
+    <ErrorReport>prompt</ErrorReport>\r
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>\r
+  </PropertyGroup>\r
   <ItemGroup>\r
     <Reference Include="Microsoft.CSharp" />\r
     <Reference Include="NAudio, Version=1.8.3.0, Culture=neutral, processorArchitecture=MSIL">\r
index b3ee30fc398369d72054c467ba82ed81626f808a..49a537498c90f2c39f4332f99a9d9142ff5487d2 100644 (file)
@@ -208,9 +208,12 @@ namespace AudioRecorder {
             this.Controls.Add(this.groupBox3);\r
             this.Controls.Add(this.groupBox2);\r
             this.Controls.Add(this.groupBox1);\r
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;\r
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;\r
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));\r
+            this.MaximizeBox = false;\r
+            this.MinimizeBox = false;\r
             this.Name = "MainForm";\r
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;\r
             this.Text = "AudioRecorder";\r
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainForm_FormClosing);\r
             this.Load += new System.EventHandler(this.Form1_Load);\r
index e3f8f050b48caa5f1397950c665402014a400be2..d34157038c11dec635eafbb72eef8d11ebd59f78 100644 (file)
@@ -3,7 +3,7 @@
   "unc_path": "\\\\store.in.user.hu\\upload",\r
   "working_dir": "C:\\temp",\r
   "loud_percent": 30,\r
-  "address": "http://localhost:8080/services/rest/octopus/",\r
+  "address": "http://10.10.1.28/services/rest/octopus/",\r
   "userName": "dani",\r
   "password": "dani",\r
   "timeout": 1000\r
index d507334acdc8d8aca998d6acbfe57f5d881ee060..11bd4bf88868f56df4379b633462ebd814fffec1 100644 (file)
     <ErrorReport>prompt</ErrorReport>\r
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>\r
   </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">\r
+    <DebugSymbols>true</DebugSymbols>\r
+    <OutputPath>bin\x64\Debug\</OutputPath>\r
+    <DefineConstants>DEBUG;TRACE</DefineConstants>\r
+    <DebugType>full</DebugType>\r
+    <PlatformTarget>x64</PlatformTarget>\r
+    <ErrorReport>prompt</ErrorReport>\r
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">\r
+    <OutputPath>bin\x64\Release\</OutputPath>\r
+    <DefineConstants>TRACE</DefineConstants>\r
+    <Optimize>true</Optimize>\r
+    <DebugType>pdbonly</DebugType>\r
+    <PlatformTarget>x64</PlatformTarget>\r
+    <ErrorReport>prompt</ErrorReport>\r
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>\r
+  </PropertyGroup>\r
   <ItemGroup>\r
     <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">\r
       <HintPath>..\packages\MSTest.TestFramework.1.1.11\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>\r
index dec97aff7c2c821cd8d87ae8c9b6364f266516ae..d162cb622f412303012aa54fdcd4e521bd13f052 100644 (file)
@@ -61,7 +61,7 @@ namespace IntegrationTests {
             const string STR_PARAM = "";\r
 \r
             //Exercise\r
-            List<MamResultWrapper> actual = sut.GetPromotionals(STR_PARAM);\r
+            List<TrafficItem> actual = sut.GetPromotionals(STR_PARAM);\r
         }\r
 \r
         [TestMethod]\r
@@ -70,7 +70,7 @@ namespace IntegrationTests {
             const string STR_PARAM = "";\r
 \r
             //Exercise\r
-            List<MamResultWrapper> actual = sut.GetAdvertisements(STR_PARAM);\r
+            List<TrafficItem> actual = sut.GetAdvertisements(STR_PARAM);\r
         }\r
 \r
         [TestMethod]\r
index e316a623a64dd1cc81b8cc73770b1818306462cb..99f8a5d91d5eaf98254b54607c72fc912fec534a 100644 (file)
             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_stuffID = new System.Windows.Forms.TextBox();\r
-            this.textBox_stuffTitle = new System.Windows.Forms.TextBox();\r
-            this.textBox_stuffDescription = new System.Windows.Forms.TextBox();\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.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.label_stuffTitle = new System.Windows.Forms.Label();\r
             this.groupBox1 = new System.Windows.Forms.GroupBox();\r
-            this.button_Ok = new System.Windows.Forms.Button();\r
-            this.buttonCancel = new System.Windows.Forms.Button();\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.groupBox1.SuspendLayout();\r
             this.tableLayoutPanel1.SuspendLayout();\r
@@ -74,6 +74,7 @@
             // label_mediaTitle\r
             // \r
             this.label_mediaTitle.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));\r
+            this.label_mediaTitle.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
             this.label_mediaTitle.Location = new System.Drawing.Point(8, 206);\r
             this.label_mediaTitle.Name = "label_mediaTitle";\r
             this.label_mediaTitle.Size = new System.Drawing.Size(57, 13);\r
             this.label_mediaDescription.TabIndex = 5;\r
             this.label_mediaDescription.Text = "Média leírás";\r
             // \r
-            // textBox_stuffID\r
+            // textBox_itemID\r
             // \r
-            this.textBox_stuffID.Dock = System.Windows.Forms.DockStyle.Fill;\r
-            this.textBox_stuffID.Location = new System.Drawing.Point(8, 28);\r
-            this.textBox_stuffID.Name = "textBox_stuffID";\r
-            this.textBox_stuffID.Size = new System.Drawing.Size(549, 20);\r
-            this.textBox_stuffID.TabIndex = 6;\r
+            this.textBox_itemID.Dock = System.Windows.Forms.DockStyle.Fill;\r
+            this.textBox_itemID.Location = new System.Drawing.Point(8, 28);\r
+            this.textBox_itemID.Name = "textBox_itemID";\r
+            this.textBox_itemID.ReadOnly = true;\r
+            this.textBox_itemID.Size = new System.Drawing.Size(549, 20);\r
+            this.textBox_itemID.TabIndex = 6;\r
             // \r
-            // textBox_stuffTitle\r
+            // textBox_itemTitle\r
             // \r
-            this.textBox_stuffTitle.Dock = System.Windows.Forms.DockStyle.Fill;\r
-            this.textBox_stuffTitle.Location = new System.Drawing.Point(8, 68);\r
-            this.textBox_stuffTitle.Name = "textBox_stuffTitle";\r
-            this.textBox_stuffTitle.Size = new System.Drawing.Size(549, 20);\r
-            this.textBox_stuffTitle.TabIndex = 7;\r
+            this.textBox_itemTitle.Dock = System.Windows.Forms.DockStyle.Fill;\r
+            this.textBox_itemTitle.Location = new System.Drawing.Point(8, 68);\r
+            this.textBox_itemTitle.Name = "textBox_itemTitle";\r
+            this.textBox_itemTitle.Size = new System.Drawing.Size(549, 20);\r
+            this.textBox_itemTitle.TabIndex = 7;\r
             // \r
-            // textBox_stuffDescription\r
+            // textBox_itemDescription\r
             // \r
-            this.textBox_stuffDescription.Dock = System.Windows.Forms.DockStyle.Fill;\r
-            this.textBox_stuffDescription.Location = new System.Drawing.Point(8, 108);\r
-            this.textBox_stuffDescription.Multiline = true;\r
-            this.textBox_stuffDescription.Name = "textBox_stuffDescription";\r
-            this.textBox_stuffDescription.ScrollBars = System.Windows.Forms.ScrollBars.Both;\r
-            this.textBox_stuffDescription.Size = new System.Drawing.Size(549, 48);\r
-            this.textBox_stuffDescription.TabIndex = 8;\r
+            this.textBox_itemDescription.Dock = System.Windows.Forms.DockStyle.Fill;\r
+            this.textBox_itemDescription.Location = new System.Drawing.Point(8, 108);\r
+            this.textBox_itemDescription.Multiline = true;\r
+            this.textBox_itemDescription.Name = "textBox_itemDescription";\r
+            this.textBox_itemDescription.ScrollBars = System.Windows.Forms.ScrollBars.Both;\r
+            this.textBox_itemDescription.Size = new System.Drawing.Size(549, 48);\r
+            this.textBox_itemDescription.TabIndex = 8;\r
             // \r
             // textBox_mediaID\r
             // \r
             this.textBox_mediaID.Dock = System.Windows.Forms.DockStyle.Fill;\r
             this.textBox_mediaID.Location = new System.Drawing.Point(8, 182);\r
             this.textBox_mediaID.Name = "textBox_mediaID";\r
+            this.textBox_mediaID.ReadOnly = true;\r
             this.textBox_mediaID.Size = new System.Drawing.Size(549, 20);\r
             this.textBox_mediaID.TabIndex = 9;\r
             // \r
             // label_stuffTitle\r
             // \r
             this.label_stuffTitle.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));\r
+            this.label_stuffTitle.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
             this.label_stuffTitle.Location = new System.Drawing.Point(8, 52);\r
             this.label_stuffTitle.Name = "label_stuffTitle";\r
             this.label_stuffTitle.Size = new System.Drawing.Size(58, 13);\r
             // \r
             // groupBox1\r
             // \r
-            this.groupBox1.Controls.Add(this.button_Ok);\r
-            this.groupBox1.Controls.Add(this.buttonCancel);\r
+            this.groupBox1.Controls.Add(this.btnOk);\r
+            this.groupBox1.Controls.Add(this.btnCancel);\r
             this.groupBox1.Dock = System.Windows.Forms.DockStyle.Bottom;\r
             this.groupBox1.Location = new System.Drawing.Point(0, 357);\r
             this.groupBox1.Name = "groupBox1";\r
             this.groupBox1.TabIndex = 1;\r
             this.groupBox1.TabStop = false;\r
             // \r
-            // button_Ok\r
+            // btnOk\r
             // \r
-            this.button_Ok.Anchor = System.Windows.Forms.AnchorStyles.Right;\r
-            this.button_Ok.Location = new System.Drawing.Point(488, 19);\r
-            this.button_Ok.Name = "button_Ok";\r
-            this.button_Ok.Size = new System.Drawing.Size(75, 23);\r
-            this.button_Ok.TabIndex = 1;\r
-            this.button_Ok.Text = "Rendben";\r
-            this.button_Ok.UseVisualStyleBackColor = true;\r
-            this.button_Ok.Click += new System.EventHandler(this.button_Ok_Click_1);\r
+            this.btnOk.Anchor = System.Windows.Forms.AnchorStyles.Right;\r
+            this.btnOk.Location = new System.Drawing.Point(488, 19);\r
+            this.btnOk.Name = "btnOk";\r
+            this.btnOk.Size = new System.Drawing.Size(75, 23);\r
+            this.btnOk.TabIndex = 1;\r
+            this.btnOk.Text = "Rendben";\r
+            this.btnOk.UseVisualStyleBackColor = true;\r
+            this.btnOk.Click += new System.EventHandler(this.OnOkClick);\r
             // \r
-            // buttonCancel\r
+            // btnCancel\r
             // \r
-            this.buttonCancel.Anchor = System.Windows.Forms.AnchorStyles.Right;\r
-            this.buttonCancel.Location = new System.Drawing.Point(409, 19);\r
-            this.buttonCancel.Name = "buttonCancel";\r
-            this.buttonCancel.Size = new System.Drawing.Size(75, 23);\r
-            this.buttonCancel.TabIndex = 0;\r
-            this.buttonCancel.Text = "Mégse";\r
-            this.buttonCancel.UseVisualStyleBackColor = true;\r
-            this.buttonCancel.Click += new System.EventHandler(this.buttonCancel_Click);\r
+            this.btnCancel.Anchor = System.Windows.Forms.AnchorStyles.Right;\r
+            this.btnCancel.Location = new System.Drawing.Point(409, 19);\r
+            this.btnCancel.Name = "btnCancel";\r
+            this.btnCancel.Size = new System.Drawing.Size(75, 23);\r
+            this.btnCancel.TabIndex = 0;\r
+            this.btnCancel.Text = "Mégsem";\r
+            this.btnCancel.UseVisualStyleBackColor = true;\r
+            this.btnCancel.Click += new System.EventHandler(this.OnCancelClick);\r
             // \r
             // tableLayoutPanel1\r
             // \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_stuffDescription, 0, 5);\r
-            this.tableLayoutPanel1.Controls.Add(this.textBox_stuffTitle, 0, 3);\r
-            this.tableLayoutPanel1.Controls.Add(this.textBox_stuffID, 0, 1);\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.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
             // \r
             // ArchiveMetadataForm\r
             // \r
+            this.AcceptButton = this.btnOk;\r
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);\r
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;\r
+            this.CancelButton = this.btnCancel;\r
             this.ClientSize = new System.Drawing.Size(565, 405);\r
             this.Controls.Add(this.tableLayoutPanel1);\r
             this.Controls.Add(this.groupBox1);\r
             this.Icon = global::Maestro.Properties.Resources.AppIcon;\r
             this.Name = "ArchiveMetadataForm";\r
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;\r
-            this.Text = "Archive metaadatok módosítása";\r
+            this.Text = "Archiv adatok";\r
             this.groupBox1.ResumeLayout(false);\r
             this.tableLayoutPanel1.ResumeLayout(false);\r
             this.tableLayoutPanel1.PerformLayout();\r
         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_stuffID;\r
-        private System.Windows.Forms.TextBox textBox_stuffTitle;\r
-        private System.Windows.Forms.TextBox textBox_stuffDescription;\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 textBox_mediaID;\r
         private System.Windows.Forms.TextBox textBox_mediaTitle;\r
         private System.Windows.Forms.TextBox textBox_mediaDescription;\r
         private System.Windows.Forms.GroupBox groupBox1;\r
-        private System.Windows.Forms.Button button_Ok;\r
-        private System.Windows.Forms.Button buttonCancel;\r
+        private System.Windows.Forms.Button btnOk;\r
+        private System.Windows.Forms.Button btnCancel;\r
         private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;\r
     }\r
 }
\ No newline at end of file
index be7ce9da4060e99ca3f5747ceb84f32285bfec80..4a174c135ba0ebb814b5a2be7e3a8f0aec0907dc 100644 (file)
@@ -8,34 +8,30 @@ namespace Maestro {
 \r
         public ArchiveMetadataForm(ArchiveMetadata model) : this() {\r
             this.model = model;\r
-            FillTheTextBoxes();\r
+            textBox_itemID.Text = model.itemHouseId;\r
+            textBox_itemTitle.Text = model.itemTitle;\r
+            textBox_itemDescription.Text = model.itemDescription;\r
+            textBox_mediaID.Text = model.mediaHouseId;\r
+            textBox_mediaTitle.Text = model.mediaTitle;\r
+            textBox_mediaDescription.Text = model.mediaDescription;\r
         }\r
 \r
         public ArchiveMetadataForm() {\r
             InitializeComponent();\r
         }\r
 \r
-        private void FillTheTextBoxes() {\r
-            textBox_stuffID.Text = model.itemHouseId;\r
-            textBox_stuffTitle.Text = model.itemTitle;\r
-            textBox_stuffDescription.Text = model.itemDescription;\r
-            textBox_mediaID.Text = model.mediaHouseId;\r
-            textBox_mediaTitle.Text = model.mediaTitle;\r
-            textBox_mediaDescription.Text = model.mediaDescription;\r
-        }\r
-\r
-        private void button_Ok_Click_1(object sender, System.EventArgs e) {\r
-            model.itemHouseId = textBox_stuffID.Text;\r
-            model.itemTitle = textBox_stuffTitle.Text;\r
-            model.itemDescription = textBox_stuffDescription.Text;\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
             model.mediaHouseId = textBox_mediaID.Text;\r
             model.mediaTitle = textBox_mediaTitle.Text;\r
             model.mediaDescription = textBox_mediaDescription.Text;\r
-            Dispose();\r
+            Close();\r
         }\r
 \r
-        private void buttonCancel_Click(object sender, System.EventArgs e) {\r
-            Dispose();\r
+        private void OnCancelClick(object sender, System.EventArgs e) {\r
+            Close();\r
         }\r
     }\r
 }\r
index bd8ea185f74119dcf6498a2c505015df413f395f..ec0469feebcf7023d0ea6c065e76beb4de8923f3 100644 (file)
   <PropertyGroup>\r
     <ApplicationManifest>Properties\app.manifest</ApplicationManifest>\r
   </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">\r
+    <DebugSymbols>true</DebugSymbols>\r
+    <OutputPath>bin\x64\Debug\</OutputPath>\r
+    <DefineConstants>DEBUG;TRACE</DefineConstants>\r
+    <DebugType>full</DebugType>\r
+    <PlatformTarget>x64</PlatformTarget>\r
+    <ErrorReport>prompt</ErrorReport>\r
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">\r
+    <OutputPath>bin\x64\Release\</OutputPath>\r
+    <DefineConstants>TRACE</DefineConstants>\r
+    <Optimize>true</Optimize>\r
+    <DebugType>pdbonly</DebugType>\r
+    <PlatformTarget>x64</PlatformTarget>\r
+    <ErrorReport>prompt</ErrorReport>\r
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>\r
+  </PropertyGroup>\r
   <ItemGroup>\r
     <Reference Include="FluentFTP, Version=19.1.1.0, Culture=neutral, PublicKeyToken=f4af092b1d8df44f, processorArchitecture=MSIL">\r
       <HintPath>..\packages\FluentFTP.19.1.1\lib\net45\FluentFTP.dll</HintPath>\r
     </None>\r
     <None Include="packages.config" />\r
     <None Include="Properties\app.manifest" />\r
+    <None Include="Properties\DataSources\ArchiveMetadataForm.datasource" />\r
     <None Include="Properties\DataSources\Maestro.Metadata.MetadataInfo.datasource" />\r
     <None Include="Properties\DataSources\SystemMessage.datasource" />\r
     <None Include="Properties\Settings.settings">\r
index 6315d1643064daa129ed7322e0757ac8f4708ed1..e24f81d7a22df61bed54a2c151343cd88c51d669 100644 (file)
@@ -393,7 +393,6 @@ namespace Maestro {
             // octopusIDSelector\r
             // \r
             this.octopusIDSelector.BackColor = System.Drawing.Color.White;\r
-            this.octopusIDSelector.ClearCheckBox = null;\r
             this.octopusIDSelector.Disposeabel = false;\r
             this.octopusIDSelector.Dock = System.Windows.Forms.DockStyle.Fill;\r
             this.octopusIDSelector.ErrorReporter = null;\r
@@ -422,7 +421,6 @@ namespace Maestro {
             // \r
             this.trafficIDSelector.AutoSize = true;\r
             this.trafficIDSelector.BackColor = System.Drawing.Color.White;\r
-            this.trafficIDSelector.clearCheckBox = null;\r
             this.trafficIDSelector.Dock = System.Windows.Forms.DockStyle.Fill;\r
             this.trafficIDSelector.ErrorReporter = null;\r
             this.trafficIDSelector.IDChangedEvent = null;\r
index 4ca59e987768597cbcdab9572c4cf091b66e8420..14177048d51b73ee2e7c6be28123775565076efc 100644 (file)
@@ -147,7 +147,9 @@ namespace Maestro {
             if (String.IsNullOrEmpty(id))\r
                 return null;\r
             TrafficAPI api = trafficIDSelector.trafficAPI;\r
-            List<ArchiveMatadataWrapper> trafficResult = null;\r
+            List<TrafficClient.TrafficItemMetadata> trafficResult = null;\r
+            MetadataType metadataType = GetTrafficMetadataType(id);\r
+\r
             if (id.StartsWith("M"))\r
                 trafficResult = api.GetBroadcastArchiveMetadata(id);\r
             else if (id.StartsWith("P"))\r
@@ -157,7 +159,7 @@ namespace Maestro {
             if (trafficResult == null)\r
                 return null;\r
             ArchiveMetadata result = new ArchiveMetadata();\r
-            ArchiveMatadataWrapper actualResult = trafficResult[0];\r
+            TrafficClient.TrafficItemMetadata actualResult = trafficResult[0];\r
             result.itemHouseId = actualResult.ProgID;\r
             result.itemTitle = actualResult.ProgTitle;\r
             result.itemDescription = actualResult.ProgDescription;\r
@@ -230,6 +232,8 @@ namespace Maestro {
         }\r
 \r
         private void OnOctopusIDSelected(string selectedID) {\r
+            trafficIDSelector.ClearSelection();\r
+            archiveMetadata = null;\r
             if (selectedID == null) {\r
                 SelectedMetadata = null;\r
                 return;\r
@@ -239,11 +243,13 @@ namespace Maestro {
                 Tooltip = "Story ID",\r
                 ID = selectedID\r
             };\r
-            EnableArchiveMetadataButtonAndCreateMetadataModel();\r
+            UpdateEditArchiveMetadataEnabled();\r
             UpdateDefineSegmentEnabled();\r
         }\r
 \r
         private void OnTrafficIDSelected(string selectedID, int variantID) {\r
+            octopusIDSelector.ClearSelection();\r
+            archiveMetadata = null;\r
             if (selectedID == null) {\r
                 SelectedMetadata = null;\r
                 return;\r
@@ -254,14 +260,12 @@ namespace Maestro {
                 ID = selectedID,\r
                 VariantID = variantID\r
             };\r
-            EnableArchiveMetadataButtonAndCreateMetadataModel();\r
+            UpdateEditArchiveMetadataEnabled();\r
             UpdateDefineSegmentEnabled();\r
         }\r
 \r
-        private void EnableArchiveMetadataButtonAndCreateMetadataModel() {\r
+        private void UpdateEditArchiveMetadataEnabled() {\r
             ctxiModifyArchiveMetadata.Enabled = selectedMetadata != null;\r
-            if (!ctxiModifyArchiveMetadata.Enabled)\r
-                archiveMetadata = null;\r
         }\r
 \r
         private void UpdateDefineSegmentEnabled() {\r
index 033bdf3470d49a58370cb5207a7aa43c0473fd72..81893c5c47c810365fa5bc742bc8cd309e0ac5db 100644 (file)
@@ -218,7 +218,7 @@ namespace Maestro {
             }\r
 \r
             UpdateDefineSegmentEnabled();\r
-            EnableArchiveMetadataButtonAndCreateMetadataModel();\r
+            UpdateEditArchiveMetadataEnabled();\r
         }\r
 \r
         public void OnTargetPanelsMouseClick(object sender, MouseEventArgs e) {\r
index 5829c36b08af673488fbb538f0be7f1bdb39aba3..f2a7315a8481c0ed43f345af7e6ead85242e5559 100644 (file)
@@ -42,8 +42,8 @@ namespace Maestro {
 \r
         public MaestroForm() {\r
             InitializeComponent();\r
-            trafficIDSelector.clearCheckBox = octopusIDSelector.ClearEveryCheckBox;\r
-            octopusIDSelector.ClearCheckBox = trafficIDSelector.ClearSelectionSource;\r
+            //trafficIDSelector.clearCheckBox = octopusIDSelector.ClearEveryCheckBox;\r
+           //octopusIDSelector.ClearCheckBox = trafficIDSelector.ClearSelection;\r
             octopusIDSelector.ErrorReporter = ReportError;\r
             groups = new GroupBox[] { groupSource, groupMetadata, groupTarget, groupActions };\r
             trafficMetadataSelected = OnTrafficIDSelected;\r
@@ -67,7 +67,7 @@ namespace Maestro {
             columnStatus.HeaderText = StringResources.STATUSZ;\r
             columnLabel.HeaderText = StringResources.CIM;\r
             ctxiDefineSegments.Text = StringResources.SZEGMENS_LETREHOZASA;\r
-            ctxiModifyArchiveMetadata.Text = StringResources.ARCHÍV_METAADATOK_MODOSITASA;\r
+            ctxiModifyArchiveMetadata.Text = StringResources.ARCHIV_METAADATOK;\r
         }\r
 \r
         private void InitializeComponents() {\r
@@ -194,7 +194,7 @@ namespace Maestro {
             }\r
             List<Story> list = stories.ToList();\r
             if (list.Count == 1) {\r
-                EnableArchiveMetadataButtonAndCreateMetadataModel();\r
+                UpdateEditArchiveMetadataEnabled();\r
                 textSelectedMetadata.Text = list[0].ID;\r
                 octopusMetadataSelected?.Invoke(list[0].ID);\r
                 //octopusIDSelector.IDSelectedFromOutside(list[0].ID);\r
@@ -216,7 +216,7 @@ namespace Maestro {
                 return;\r
             }\r
             if (list.Count == 1) {\r
-                EnableArchiveMetadataButtonAndCreateMetadataModel();\r
+                UpdateEditArchiveMetadataEnabled();\r
                 textSelectedMetadata.Text = list[0].ID;\r
                 octopusMetadataSelected?.Invoke(list[0].ID);\r
                 //octopusIDSelector.IDSelectedFromOutside(list[0].ID);\r
@@ -229,7 +229,7 @@ namespace Maestro {
         private void SetTrafficIDToMetadataText() {\r
             TrafficAPI api = trafficIDSelector.trafficAPI;\r
             Cursor.Current = Cursors.WaitCursor;\r
-            List<MamResultWrapper> result = null;\r
+            List<TrafficItem> result = null;\r
             if (startingName.StartsWith("M"))\r
                 result = api.GetBroadcasts(startingName, null, null, true);\r
             else if (startingName.StartsWith("P"))\r
@@ -240,14 +240,14 @@ namespace Maestro {
             Cursor.Current = Cursors.Default;\r
         }\r
 \r
-        private void ProcessMamResults(List<MamResultWrapper> result) {\r
+        private void ProcessMamResults(List<TrafficItem> result) {\r
             if (result == null || result.Count == 0) {\r
                 MessageBox.Show(this, StringResources.NINCS_TALALAT);\r
                 return;\r
             }\r
             if (result.Count == 1) {\r
                 trafficMetadataSelected?.Invoke(result[0].MediaID, result[0].VariantID);\r
-                EnableArchiveMetadataButtonAndCreateMetadataModel();\r
+                UpdateEditArchiveMetadataEnabled();\r
                 textSelectedMetadata.Text = result[0].MediaID;\r
                 return;\r
             }\r
diff --git a/client/Maestro/Properties/DataSources/ArchiveMetadataForm.datasource b/client/Maestro/Properties/DataSources/ArchiveMetadataForm.datasource
new file mode 100644 (file)
index 0000000..61f0aa7
--- /dev/null
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!--\r
+    This file is automatically generated by Visual Studio .Net. It is \r
+    used to store generic object data source configuration information.  \r
+    Renaming the file extension or editing the content of this file may   \r
+    cause the file to be unrecognizable by the program.\r
+-->\r
+<GenericObjectDataSource DisplayName="ArchiveMetadataForm" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">\r
+   <TypeInfo>Maestro.ArchiveMetadataForm, Maestro, Version=1.9.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>\r
+</GenericObjectDataSource>
\ No newline at end of file
index c482b46da73025c36b2a515d0e2285f0318b559d..f9070afab2a8146deea2f0b3004fa66cf1f213bc 100644 (file)
@@ -88,11 +88,11 @@ namespace Maestro {
         }\r
         \r
         /// <summary>\r
-        ///   Looks up a localized string similar to Archív metaadatok módosítása.\r
+        ///   Looks up a localized string similar to Archív adatok.\r
         /// </summary>\r
-        internal static string ARCHÍV_METAADATOK_MODOSITASA {\r
+        internal static string ARCHIV_METAADATOK {\r
             get {\r
-                return ResourceManager.GetString("ARCHÍV_METAADATOK_MODOSITASA", resourceCulture);\r
+                return ResourceManager.GetString("ARCHIV_METAADATOK", resourceCulture);\r
             }\r
         }\r
         \r
@@ -295,7 +295,7 @@ namespace Maestro {
         }\r
         \r
         /// <summary>\r
-        ///   Looks up a localized string similar to Szegmens létrehozása.\r
+        ///   Looks up a localized string similar to Szegmensek.\r
         /// </summary>\r
         internal static string SZEGMENS_LETREHOZASA {\r
             get {\r
index d7a78709f4ff1b29e6b968296050bda3e0781469..d0cfc2822c6e8f4a2612426cb6cf2700278403de 100644 (file)
   <data name="ARCHIVE" xml:space="preserve">\r
     <value>Archive</value>\r
   </data>\r
-  <data name="ARCHÍV_METAADATOK_MODOSITASA" xml:space="preserve">\r
-    <value>Archív metaadatok módosítása</value>\r
+  <data name="ARCHIV_METAADATOK" xml:space="preserve">\r
+    <value>Archív adatok</value>\r
   </data>\r
   <data name="BEFEJEZES" xml:space="preserve">\r
     <value>Befejezés</value>\r
     <value>Státusz</value>\r
   </data>\r
   <data name="SZEGMENS_LETREHOZASA" xml:space="preserve">\r
-    <value>Szegmens létrehozása</value>\r
+    <value>Szegmensek</value>\r
   </data>\r
   <data name="TORLES" xml:space="preserve">\r
     <value>Törlés</value>\r
index 6120be7ebdaf80fbb95b62989d8b1ea82fb2fc19..f300eb4520705cda476ad6d2ebed1ed6941f88c4 100644 (file)
@@ -8,6 +8,7 @@ using Model;
 using System.Text;\r
 using Maestro.Commons;\r
 using Commons;\r
+using Maestro.Metadata;\r
 \r
 namespace Maestro.Targets {\r
 \r
@@ -103,17 +104,16 @@ namespace Maestro.Targets {
                 CreateMetadata();\r
             if (parameters.TargetConfig.SaveSegments && parameters.Segments != null) {\r
                 switch (parameters.MetadataKind) {\r
-                    case Metadata.MetadataType.TrafficMaterial: {\r
+                    case MetadataType.TrafficMaterial:\r
                             SaveMaterialSegments();\r
-                            break; }\r
-                    case Metadata.MetadataType.TrafficAD: {\r
+                            break;\r
+                    case MetadataType.TrafficAD:\r
                             SaveADSegments();\r
-                            break; }\r
-                    case Metadata.MetadataType.TrafficPromo: {\r
+                            break;\r
+                    case MetadataType.TrafficPromo:\r
                             SavePromoSegments();\r
-                            break; }\r
+                            break;\r
                 }\r
-                \r
             }\r
             if (parameters.TargetConfig.SendEmailOnSuccess && !String.IsNullOrEmpty(parameters.TargetConfig.SuccessEmailRecipient) && !String.IsNullOrEmpty(parameters.TargetConfig.SuccessEmailPattern))\r
                 SendEmail(parameters.TargetConfig.SuccessEmailRecipient, parameters.TargetConfig.SuccessEmailPattern);\r
index f7e2b958affd4e3c727f116d6c8cb4324799280a..6553be06de791df3aabab9705093f5dd1a2582ae 100644 (file)
@@ -42,8 +42,8 @@ Global
                {0B44B3D7-52D7-4C0E-9B1C-F48CEEDA36FE}.Release|x86.Build.0 = Release|Any CPU\r
                {BAF3E174-5D82-40FA-9E62-8C76ADBEA1E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
                {BAF3E174-5D82-40FA-9E62-8C76ADBEA1E4}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
-               {BAF3E174-5D82-40FA-9E62-8C76ADBEA1E4}.Debug|x64.ActiveCfg = Debug|Any CPU\r
-               {BAF3E174-5D82-40FA-9E62-8C76ADBEA1E4}.Debug|x64.Build.0 = Debug|Any CPU\r
+               {BAF3E174-5D82-40FA-9E62-8C76ADBEA1E4}.Debug|x64.ActiveCfg = Debug|x64\r
+               {BAF3E174-5D82-40FA-9E62-8C76ADBEA1E4}.Debug|x64.Build.0 = Debug|x64\r
                {BAF3E174-5D82-40FA-9E62-8C76ADBEA1E4}.Debug|x86.ActiveCfg = Debug|x86\r
                {BAF3E174-5D82-40FA-9E62-8C76ADBEA1E4}.Debug|x86.Build.0 = Debug|x86\r
                {BAF3E174-5D82-40FA-9E62-8C76ADBEA1E4}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
@@ -54,8 +54,8 @@ Global
                {BAF3E174-5D82-40FA-9E62-8C76ADBEA1E4}.Release|x86.Build.0 = Release|Any CPU\r
                {CEFD0348-DED4-453E-BF3A-0B52F8890AB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
                {CEFD0348-DED4-453E-BF3A-0B52F8890AB3}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
-               {CEFD0348-DED4-453E-BF3A-0B52F8890AB3}.Debug|x64.ActiveCfg = Debug|Any CPU\r
-               {CEFD0348-DED4-453E-BF3A-0B52F8890AB3}.Debug|x64.Build.0 = Debug|Any CPU\r
+               {CEFD0348-DED4-453E-BF3A-0B52F8890AB3}.Debug|x64.ActiveCfg = Debug|x64\r
+               {CEFD0348-DED4-453E-BF3A-0B52F8890AB3}.Debug|x64.Build.0 = Debug|x64\r
                {CEFD0348-DED4-453E-BF3A-0B52F8890AB3}.Debug|x86.ActiveCfg = Debug|x86\r
                {CEFD0348-DED4-453E-BF3A-0B52F8890AB3}.Debug|x86.Build.0 = Debug|x86\r
                {CEFD0348-DED4-453E-BF3A-0B52F8890AB3}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
@@ -66,8 +66,8 @@ Global
                {CEFD0348-DED4-453E-BF3A-0B52F8890AB3}.Release|x86.Build.0 = Release|Any CPU\r
                {8CC7C930-9DBF-487B-AED5-776937A649D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
                {8CC7C930-9DBF-487B-AED5-776937A649D5}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
-               {8CC7C930-9DBF-487B-AED5-776937A649D5}.Debug|x64.ActiveCfg = Debug|Any CPU\r
-               {8CC7C930-9DBF-487B-AED5-776937A649D5}.Debug|x64.Build.0 = Debug|Any CPU\r
+               {8CC7C930-9DBF-487B-AED5-776937A649D5}.Debug|x64.ActiveCfg = Debug|x64\r
+               {8CC7C930-9DBF-487B-AED5-776937A649D5}.Debug|x64.Build.0 = Debug|x64\r
                {8CC7C930-9DBF-487B-AED5-776937A649D5}.Debug|x86.ActiveCfg = Debug|x86\r
                {8CC7C930-9DBF-487B-AED5-776937A649D5}.Debug|x86.Build.0 = Debug|x86\r
                {8CC7C930-9DBF-487B-AED5-776937A649D5}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
@@ -78,8 +78,8 @@ Global
                {8CC7C930-9DBF-487B-AED5-776937A649D5}.Release|x86.Build.0 = Release|Any CPU\r
                {4A61E975-F8DB-4BBF-BEFF-72FE67B2C08B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
                {4A61E975-F8DB-4BBF-BEFF-72FE67B2C08B}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
-               {4A61E975-F8DB-4BBF-BEFF-72FE67B2C08B}.Debug|x64.ActiveCfg = Debug|Any CPU\r
-               {4A61E975-F8DB-4BBF-BEFF-72FE67B2C08B}.Debug|x64.Build.0 = Debug|Any CPU\r
+               {4A61E975-F8DB-4BBF-BEFF-72FE67B2C08B}.Debug|x64.ActiveCfg = Debug|x64\r
+               {4A61E975-F8DB-4BBF-BEFF-72FE67B2C08B}.Debug|x64.Build.0 = Debug|x64\r
                {4A61E975-F8DB-4BBF-BEFF-72FE67B2C08B}.Debug|x86.ActiveCfg = Debug|x86\r
                {4A61E975-F8DB-4BBF-BEFF-72FE67B2C08B}.Debug|x86.Build.0 = Debug|x86\r
                {4A61E975-F8DB-4BBF-BEFF-72FE67B2C08B}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
@@ -90,7 +90,8 @@ Global
                {4A61E975-F8DB-4BBF-BEFF-72FE67B2C08B}.Release|x86.Build.0 = Release|Any CPU\r
                {616D8912-16A4-493B-BC45-53BF2A5D9B92}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
                {616D8912-16A4-493B-BC45-53BF2A5D9B92}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
-               {616D8912-16A4-493B-BC45-53BF2A5D9B92}.Debug|x64.ActiveCfg = Debug|Any CPU\r
+               {616D8912-16A4-493B-BC45-53BF2A5D9B92}.Debug|x64.ActiveCfg = Debug|x64\r
+               {616D8912-16A4-493B-BC45-53BF2A5D9B92}.Debug|x64.Build.0 = Debug|x64\r
                {616D8912-16A4-493B-BC45-53BF2A5D9B92}.Debug|x86.ActiveCfg = Debug|x86\r
                {616D8912-16A4-493B-BC45-53BF2A5D9B92}.Debug|x86.Build.0 = Debug|x86\r
                {616D8912-16A4-493B-BC45-53BF2A5D9B92}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
@@ -100,8 +101,8 @@ Global
                {616D8912-16A4-493B-BC45-53BF2A5D9B92}.Release|x86.Build.0 = Release|x86\r
                {A7A21311-CB0E-465F-8AD6-829FAF093F00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
                {A7A21311-CB0E-465F-8AD6-829FAF093F00}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
-               {A7A21311-CB0E-465F-8AD6-829FAF093F00}.Debug|x64.ActiveCfg = Debug|Any CPU\r
-               {A7A21311-CB0E-465F-8AD6-829FAF093F00}.Debug|x64.Build.0 = Debug|Any CPU\r
+               {A7A21311-CB0E-465F-8AD6-829FAF093F00}.Debug|x64.ActiveCfg = Debug|x64\r
+               {A7A21311-CB0E-465F-8AD6-829FAF093F00}.Debug|x64.Build.0 = Debug|x64\r
                {A7A21311-CB0E-465F-8AD6-829FAF093F00}.Debug|x86.ActiveCfg = Debug|x86\r
                {A7A21311-CB0E-465F-8AD6-829FAF093F00}.Debug|x86.Build.0 = Debug|x86\r
                {A7A21311-CB0E-465F-8AD6-829FAF093F00}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
@@ -112,8 +113,8 @@ Global
                {A7A21311-CB0E-465F-8AD6-829FAF093F00}.Release|x86.Build.0 = Release|Any CPU\r
                {8C51D508-1759-4C10-84A4-80965FD074FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
                {8C51D508-1759-4C10-84A4-80965FD074FF}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
-               {8C51D508-1759-4C10-84A4-80965FD074FF}.Debug|x64.ActiveCfg = Debug|Any CPU\r
-               {8C51D508-1759-4C10-84A4-80965FD074FF}.Debug|x64.Build.0 = Debug|Any CPU\r
+               {8C51D508-1759-4C10-84A4-80965FD074FF}.Debug|x64.ActiveCfg = Debug|x64\r
+               {8C51D508-1759-4C10-84A4-80965FD074FF}.Debug|x64.Build.0 = Debug|x64\r
                {8C51D508-1759-4C10-84A4-80965FD074FF}.Debug|x86.ActiveCfg = Debug|Any CPU\r
                {8C51D508-1759-4C10-84A4-80965FD074FF}.Debug|x86.Build.0 = Debug|Any CPU\r
                {8C51D508-1759-4C10-84A4-80965FD074FF}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
index 6d1f57373b495372605e726e064edc4197fb7721..52b170f55224d9edc2f1dce0145741822aa654b2 100644 (file)
     <ErrorReport>prompt</ErrorReport>\r
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>\r
   </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">\r
+    <DebugSymbols>true</DebugSymbols>\r
+    <OutputPath>bin\x64\Debug\</OutputPath>\r
+    <DefineConstants>DEBUG;TRACE</DefineConstants>\r
+    <DebugType>full</DebugType>\r
+    <PlatformTarget>x64</PlatformTarget>\r
+    <ErrorReport>prompt</ErrorReport>\r
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">\r
+    <OutputPath>bin\x64\Release\</OutputPath>\r
+    <DefineConstants>TRACE</DefineConstants>\r
+    <Optimize>true</Optimize>\r
+    <DebugType>pdbonly</DebugType>\r
+    <PlatformTarget>x64</PlatformTarget>\r
+    <ErrorReport>prompt</ErrorReport>\r
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>\r
+  </PropertyGroup>\r
   <ItemGroup>\r
     <Reference Include="Microsoft.CSharp" />\r
     <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">\r
index a649b628b540194111f3ca3b7ad76fa5f7692a7e..bafecb0371aa0504e5a9b17ef927baa80b8d9d9e 100644 (file)
     <ErrorReport>prompt</ErrorReport>\r
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>\r
   </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">\r
+    <DebugSymbols>true</DebugSymbols>\r
+    <OutputPath>bin\x64\Debug\</OutputPath>\r
+    <DefineConstants>DEBUG;TRACE</DefineConstants>\r
+    <DebugType>full</DebugType>\r
+    <PlatformTarget>x64</PlatformTarget>\r
+    <ErrorReport>prompt</ErrorReport>\r
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">\r
+    <OutputPath>bin\x64\Release\</OutputPath>\r
+    <DefineConstants>TRACE</DefineConstants>\r
+    <Optimize>true</Optimize>\r
+    <DebugType>pdbonly</DebugType>\r
+    <PlatformTarget>x64</PlatformTarget>\r
+    <ErrorReport>prompt</ErrorReport>\r
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>\r
+  </PropertyGroup>\r
   <ItemGroup>\r
     <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">\r
       <HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>\r
index ed60ce29052c259bc3b8b140cb2258bccaf44790..34e0a2533c6b83e2fe32e74a1ffe96b3206e18d6 100644 (file)
@@ -70,6 +70,7 @@
             this.treeContent.BorderStyle = System.Windows.Forms.BorderStyle.None;\r
             this.treeContent.CheckBoxes = true;\r
             this.treeContent.Dock = System.Windows.Forms.DockStyle.Fill;\r
+            this.treeContent.FullRowSelect = true;\r
             this.treeContent.Location = new System.Drawing.Point(10, 70);\r
             this.treeContent.Name = "treeContent";\r
             this.treeContent.Size = new System.Drawing.Size(251, 273);\r
index bdf326d4ac62d36a211818176f23b5e519485429..eac0c3d7a270875f3329a8909311e8c1754bda89 100644 (file)
@@ -14,9 +14,11 @@ namespace OctopusClient {
     public partial class OctopusIDSelector : UserControl {\r
 \r
         private string id;\r
-        public ClearCheckBox ClearCheckBox { get; set; }\r
+        //TODO!\r
+        //public ClearCheckBox ClearCheckBox { get; set; }\r
 \r
         public OctopusErrorReporterDelegate ErrorReporter { get; set; }\r
+        private TreeNode selectedNode;\r
 \r
         public bool Disposeabel { get; set; }\r
 \r
@@ -25,7 +27,7 @@ namespace OctopusClient {
         private int selectedRundownIndex = -1;\r
         private int selectedStoryFolderIndex = -1;\r
         public TreeNode previousSelectedNode = null;\r
-        private bool checkFromCode;\r
+        //private bool checkFromCode;\r
 \r
         public OnSelectedIDChanged IDChangedEvent { get; set; }\r
 \r
@@ -96,6 +98,7 @@ namespace OctopusClient {
         }\r
 \r
         private void refreshRundowns() {\r
+            ClearSelection();\r
             Cursor.Current = Cursors.WaitCursor;\r
             IEnumerable<Rundown> rundowns = client.GetRundowns(dateScheduled.Value)?.ToArray();\r
             if (rundowns == null) {\r
@@ -118,6 +121,7 @@ namespace OctopusClient {
         }\r
 \r
         private void refreshStoryFolders() {\r
+            ClearSelection();\r
             Cursor.Current = Cursors.WaitCursor;\r
             IEnumerable<StoryFolder> storyFolders = client.getStoryFolders()?.ToArray();\r
             if (storyFolders == null) {\r
@@ -149,9 +153,17 @@ namespace OctopusClient {
         private void treeContent_NodeMouseDoubleClick(object sender, TreeNodeMouseClickEventArgs e) {\r
             if (String.IsNullOrEmpty(e.Node.Name))\r
                 return;\r
-            TreeNode node = e.Node;\r
+\r
+\r
             //meghívódik az InnerAfterCheck\r
-            e.Node.Checked = !e.Node.Checked;\r
+            //selectedNode.Checked = !e.Node.Checked;\r
+        }\r
+\r
+        public void ClearSelection() {\r
+            if (selectedNode == null)\r
+                return;\r
+            selectedNode.Checked = false;\r
+            selectedNode = null;\r
         }\r
 \r
         //public void IDChangeEventCalledFromOutside(string id) {\r
@@ -213,10 +225,13 @@ namespace OctopusClient {
         }\r
 \r
         private void treeContent_AfterCheck(object sender, TreeViewEventArgs e) {\r
-            if (checkFromCode)\r
-                return;\r
-            TreeNode node = e.Node;\r
-            InnerAfterCheck(node);\r
+            if (!e.Node.Equals(selectedNode)) {\r
+                ClearSelection();\r
+                selectedNode = e.Node;\r
+                treeContent.SelectedNode = selectedNode;\r
+            }\r
+            id = selectedNode.Checked ? selectedNode.Name : null;\r
+            IDChangedEvent?.Invoke(id);\r
         }\r
 \r
         public void IDSelectedFromOutside(string id) {\r
@@ -231,30 +246,30 @@ namespace OctopusClient {
             //InitCheckID(treeContent.Nodes);\r
         }\r
 \r
-        private void InnerAfterCheck(TreeNode node) {\r
-            string text = node.Name;\r
-            checkFromCode = false;\r
-            ClearCheckBox?.Invoke();\r
-            ClearSelectionSource(node, treeContent.Nodes);\r
-            id = node.Checked ? text : null;\r
-            IDChangedEvent?.Invoke(id);\r
-            checkFromCode = false;\r
-        }\r
+        //private void HandleCheck(TreeNode node) {\r
+        //    string text = node.Name;\r
+        //    checkFromCode = false;\r
+        //    //ClearCheckBox?.Invoke();\r
+        //    ClearSelectionSource(node, treeContent.Nodes);\r
+        //    id = node.Checked ? text : null;\r
+        //    IDChangedEvent?.Invoke(id);\r
+        //    checkFromCode = false;\r
+        //}\r
 \r
-        private void ClearSelectionSource(TreeNode actualNode, TreeNodeCollection nodes) {\r
-            foreach (TreeNode actual in nodes) {\r
-                if (!actual.Equals(actualNode)) {\r
-                    checkFromCode = true;\r
-                    actual.Checked = false;\r
-                    ClearSelectionSource(actualNode, actual.Nodes);\r
-                }\r
-            }\r
-            checkFromCode = false;\r
-        }\r
+        //private void ClearSelectionSource(TreeNode actualNode, TreeNodeCollection nodes) {\r
+        //    foreach (TreeNode actual in nodes) {\r
+        //        if (!actual.Equals(actualNode)) {\r
+        //            checkFromCode = true;\r
+        //            actual.Checked = false;\r
+        //            ClearSelectionSource(actualNode, actual.Nodes);\r
+        //        }\r
+        //    }\r
+        //    checkFromCode = false;\r
+        //}\r
 \r
-        public void ClearEveryCheckBox() {\r
-            ClearSelectionSource(null, treeContent.Nodes);\r
-        }\r
+        //public void ClearEveryCheckBox() {\r
+        //    ClearSelectionSource(null, treeContent.Nodes);\r
+        //}\r
 \r
         public OctopusAPI GetClient() {\r
             return client;\r
index 0d11f917bb8a1972585c6484c915b97f141dcade..7feb553678586a190268580426e83a13174e5b44 100644 (file)
     <ErrorReport>prompt</ErrorReport>\r
     <WarningLevel>4</WarningLevel>\r
   </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">\r
+    <DebugSymbols>true</DebugSymbols>\r
+    <OutputPath>bin\x64\Debug\</OutputPath>\r
+    <DefineConstants>DEBUG;TRACE</DefineConstants>\r
+    <DebugType>full</DebugType>\r
+    <PlatformTarget>x64</PlatformTarget>\r
+    <ErrorReport>prompt</ErrorReport>\r
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>\r
+    <Prefer32Bit>true</Prefer32Bit>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">\r
+    <OutputPath>bin\x64\Release\</OutputPath>\r
+    <DefineConstants>TRACE</DefineConstants>\r
+    <Optimize>true</Optimize>\r
+    <DebugType>pdbonly</DebugType>\r
+    <PlatformTarget>x64</PlatformTarget>\r
+    <ErrorReport>prompt</ErrorReport>\r
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>\r
+    <Prefer32Bit>true</Prefer32Bit>\r
+  </PropertyGroup>\r
   <ItemGroup>\r
     <Reference Include="System" />\r
     <Reference Include="System.Core" />\r
index c4bf06296c9934d18d3e9cecbeea0d730287c13a..d9017b27e5cddc69e83b24f7627e22148d134ba7 100644 (file)
@@ -14,10 +14,10 @@ namespace TrafficClient {
 \r
     public partial class SearchResult : Form {\r
 \r
-        private List<MamResultWrapper> elements = new List<MamResultWrapper>();\r
+        private List<TrafficItem> elements = new List<TrafficItem>();\r
         public TraficMetadataSelected metadataSelected { get; set; }\r
 \r
-        public SearchResult(List<MamResultWrapper> elements, TraficMetadataSelected metadataSelected) : this() {\r
+        public SearchResult(List<TrafficItem> elements, TraficMetadataSelected metadataSelected) : this() {\r
             this.elements = elements;\r
             this.metadataSelected = metadataSelected;\r
             this.Text = Resources.KERESES_EREDMENYE;\r
@@ -60,7 +60,7 @@ namespace TrafficClient {
 \r
         private void FillDataGridView() {\r
             List<MamDisplay> displayedElements = new List<MamDisplay>();\r
-            foreach (MamResultWrapper actual in elements) {\r
+            foreach (TrafficItem actual in elements) {\r
                 MamDisplay displayed = new MamDisplay() {\r
                     EpisodeNumber = actual.EpisodeNumber,\r
                     EpisodeTitle = actual.EpisodeTitle,\r
index 9ba4108d6ccc402619651929f7ee8a63dda9b421..1a13c3ef0ed8e8b62fbe5eac7ec8401749ce6c61 100644 (file)
@@ -27,11 +27,11 @@ namespace TrafficClient {
             segmentWorker = new SegmentWorker(connection, cliFSPReader, errorReporter);\r
         }\r
 \r
-        public List<MamResultWrapper> GetBroadcasts(string strParam, DateTime? from, DateTime? to, bool missingCopia) {\r
+        public List<TrafficItem> GetBroadcasts(string strParam, DateTime? from, DateTime? to, bool missingCopia) {\r
             return broadvastWorker.GetBroadcasts(strParam, from, to, missingCopia);\r
         }\r
 \r
-        public List<ArchiveMatadataWrapper> GetBroadcastArchiveMetadata(string strParam) {\r
+        public List<TrafficItemMetadata> GetBroadcastArchiveMetadata(string strParam) {\r
             return broadvastWorker.GetBroadcastArchiveMetadata(strParam);\r
         }\r
 \r
@@ -39,11 +39,11 @@ namespace TrafficClient {
             broadvastWorker.SetBroadcastOKForAir(itemID, ok);\r
         }\r
 \r
-        public List<MamResultWrapper> GetPromotionals(string strParam) {\r
+        public List<TrafficItem> GetPromotionals(string strParam) {\r
             return promoWorker.GetPromotionals(strParam);\r
         }\r
 \r
-        public List<ArchiveMatadataWrapper> GetPromotionalArchiveMetadata(string strParam) {\r
+        public List<TrafficItemMetadata> GetPromotionalArchiveMetadata(string strParam) {\r
             return promoWorker.GetPromotionalArchiveMetadata(strParam);\r
         }\r
 \r
@@ -51,7 +51,7 @@ namespace TrafficClient {
             promoWorker.SetPromotionalToOkForAir(spotID, ok);\r
         }\r
 \r
-        public List<MamResultWrapper> GetAdvertisements(string strParam) {\r
+        public List<TrafficItem> GetAdvertisements(string strParam) {\r
             return adWorker.GetAdvertisements(strParam);\r
         }\r
 \r
@@ -59,7 +59,7 @@ namespace TrafficClient {
             adWorker.SetAdvertisementToOkForAir(spotID, ok);\r
         }\r
 \r
-        public List<ArchiveMatadataWrapper> GetAdvertisementArchiveMetadata(string strParam) {\r
+        public List<TrafficItemMetadata> GetAdvertisementArchiveMetadata(string strParam) {\r
             return adWorker.GetAdvertisementArchiveMetadata(strParam);\r
         }\r
 \r
index d51df84a2f4ccfd1a7235591aae22b6fad9600a0..4367e54ad05f5f8dc22433fb43a43d187a192a8d 100644 (file)
     <ErrorReport>prompt</ErrorReport>\r
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>\r
   </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">\r
+    <DebugSymbols>true</DebugSymbols>\r
+    <OutputPath>bin\x64\Debug\</OutputPath>\r
+    <DefineConstants>DEBUG;TRACE</DefineConstants>\r
+    <DebugType>full</DebugType>\r
+    <PlatformTarget>x64</PlatformTarget>\r
+    <ErrorReport>prompt</ErrorReport>\r
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">\r
+    <OutputPath>bin\x64\Release\</OutputPath>\r
+    <DefineConstants>TRACE</DefineConstants>\r
+    <Optimize>true</Optimize>\r
+    <DebugType>pdbonly</DebugType>\r
+    <PlatformTarget>x64</PlatformTarget>\r
+    <ErrorReport>prompt</ErrorReport>\r
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>\r
+  </PropertyGroup>\r
   <ItemGroup>\r
     <Reference Include="NLog">\r
       <HintPath>..\packages\NLog.4.4.11\lib\net45\NLog.dll</HintPath>\r
index e0b11d513812dba4c2a6dcacea6f139a440fa2ec..6870887def983d1e888b00845a85b50045bd43b1 100644 (file)
             this.dataGridView1.TabIndex = 0;\r
             this.dataGridView1.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellContentClick);\r
             this.dataGridView1.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellDoubleClick);\r
-            this.dataGridView1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.dataGridView1_KeyDown);\r
+            this.dataGridView1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.OnDataGridKeyDown);\r
             // \r
             // scheduledDate\r
             // \r
index 45ddfc0ff2bd0b086acb00c40d20d71ad575ef83..8bbc0c03c2d045cbce2311e9cd9ae8043a5e9294 100644 (file)
@@ -1,20 +1,23 @@
 using System.Windows.Forms;\r
 using System;\r
 using System.Drawing;\r
-using System.ComponentModel;\r
-using System.Linq;\r
 using System.Collections.Generic;\r
+using System.Diagnostics;\r
 \r
 namespace TrafficClient {\r
     public delegate void OnSelectedIDChanged(string ID, int variantID);\r
-    public delegate void ClearCheckBox();\r
+    //public delegate void ClearCheckBox();\r
     public delegate void TrafficErrorReporterDelegate(DateTime time, String level, String message, Color color);\r
+\r
     public partial class TrafficIDSelector : UserControl {\r
         public TrafficAPI trafficAPI { get; private set; }\r
         public OnSelectedIDChanged IDChangedEvent { get; set; }\r
-        public ClearCheckBox clearCheckBox { get; set; }\r
-\r
+        private DataGridViewCheckBoxCell selectedCell;\r
         public TrafficErrorReporterDelegate ErrorReporter { get; set; }\r
+\r
+        //TODO\r
+        //public ClearCheckBox clearCheckBox { get; set; }\r
+\r
         public TrafficIDSelector() {\r
             InitializeComponent();\r
             InitializeTexts();\r
@@ -79,6 +82,7 @@ namespace TrafficClient {
         }\r
 \r
         public void RefreshDataGridSource() {\r
+            ClearSelection();\r
             Cursor.Current = Cursors.WaitCursor;\r
             string searchText = textBox1.Text;\r
             DateTime? from = null;\r
@@ -87,7 +91,7 @@ namespace TrafficClient {
                 from = scheduledDate.Value;\r
                 to = scheduledDate.Value.AddDays(1);\r
             }\r
-            MamResultWrapper[] result = null;\r
+            TrafficItem[] result = null;\r
             if (radioButtonBroadCast.Checked)\r
                 result = trafficAPI.GetBroadcasts(searchText, from, to, copiaCheckBox.Checked)?.ToArray();\r
             else if (radioButtonAD.Checked)\r
@@ -99,8 +103,8 @@ namespace TrafficClient {
                 Cursor.Current = Cursors.Default;\r
                 return;\r
             }\r
-            List<MamResultWrapper> list = new List<MamResultWrapper>();\r
-            foreach (MamResultWrapper actual in result)\r
+            List<TrafficItem> list = new List<TrafficItem>();\r
+            foreach (TrafficItem actual in result)\r
                 list.Add(actual);\r
             if (CanSort(list))\r
                 list.Sort((x, y) => DateTime.Compare(x.NextBroadcastDate.Value, y.NextBroadcastDate.Value));\r
@@ -109,8 +113,8 @@ namespace TrafficClient {
             Cursor.Current = Cursors.Default;\r
         }\r
 \r
-        private bool CanSort(List<MamResultWrapper> list) {\r
-            foreach (MamResultWrapper actual in list)\r
+        private bool CanSort(List<TrafficItem> list) {\r
+            foreach (TrafficItem actual in list)\r
                 if (!actual.NextBroadcastDate.HasValue)\r
                     return false;\r
             return true;\r
@@ -123,7 +127,7 @@ namespace TrafficClient {
         }\r
 \r
         private void dataGridView1_CellDoubleClick(object sender, DataGridViewCellEventArgs e) {\r
-            SetCheckBoxAndInvokeIDChangeEvent(dataGridView1.SelectedRows[0]);\r
+            OnSelectionChanged(dataGridView1.SelectedRows[0]);\r
         }\r
 \r
         private void searchButton_Click(object sender, EventArgs e) {\r
@@ -143,37 +147,53 @@ namespace TrafficClient {
             if (gridView == null)\r
                 return;\r
             //nincs multiselect\r
-            SetCheckBoxAndInvokeIDChangeEvent(dataGridView1.SelectedRows[0]);\r
+            OnSelectionChanged(dataGridView1.SelectedRows[0]);\r
         }\r
 \r
-        private void SetCheckBoxAndInvokeIDChangeEvent(DataGridViewRow actualRow) {\r
-            MamResultWrapper res = actualRow.DataBoundItem as MamResultWrapper;\r
-            DataGridViewCheckBoxCell checkBoxCell = actualRow.Cells[0] as DataGridViewCheckBoxCell;\r
-            bool beforeClear = checkBoxCell.Value.Equals(true);\r
-            ClearSelectionSource();\r
-            checkBoxCell.Value = !beforeClear;\r
-            bool selected = checkBoxCell.Value.Equals(true);\r
-            clearCheckBox?.Invoke();\r
+        private void OnSelectionChanged(DataGridViewRow actualRow) {\r
+\r
+            TrafficItem res = actualRow.DataBoundItem as TrafficItem;\r
+            if (String.IsNullOrEmpty(res.MediaID))\r
+                return;\r
+            DataGridViewCheckBoxCell actualCell = actualRow.Cells[0] as DataGridViewCheckBoxCell;\r
+            if (!actualCell.Equals(selectedCell)) {\r
+                ClearSelection();\r
+                selectedCell = actualRow.Cells[0] as DataGridViewCheckBoxCell;\r
+            }\r
+            selectedCell.Value = !(bool)selectedCell.Value;\r
+            bool selected = (bool)selectedCell.Value;\r
+            Debug.WriteLine("Selection {0}", selected);\r
+            //DataGridViewCheckBoxCell checkBoxCell = actualRow.Cells[0] as DataGridViewCheckBoxCell;\r
+            //selectedCell = actualRow.Cells[0] as DataGridViewCheckBoxCell;\r
+            //bool beforeClear = checkBoxCell.Value.Equals(true);\r
+            //ClearSelectionSource();\r
+            //checkBoxCell.Value = !beforeClear;\r
+            //bool selected = checkBoxCell.Value.Equals(true);\r
+            //clearCheckBox?.Invoke();\r
             if (selected) {\r
                 IDChangedEvent?.Invoke(res.MediaID, res.VariantID);\r
             } else\r
                 IDChangedEvent?.Invoke(null, 0);\r
         }\r
 \r
-        public void ClearSelectionSource() {\r
-            foreach (DataGridViewRow row in dataGridView1.Rows) {\r
-                DataGridViewCheckBoxCell actual = row.Cells[0] as DataGridViewCheckBoxCell;\r
-                actual.Value = false;\r
-            }\r
+        public void ClearSelection() {\r
+            if (selectedCell == null)\r
+                return;\r
+            selectedCell.Value = false;\r
+            selectedCell = null;\r
+            //foreach (DataGridViewRow row in dataGridView1.Rows) {\r
+            //    DataGridViewCheckBoxCell actual = row.Cells[0] as DataGridViewCheckBoxCell;\r
+            //    actual.Value = false;\r
+            //}\r
         }\r
 \r
-        private void dataGridView1_KeyDown(object sender, KeyEventArgs e) {\r
+        private void OnDataGridKeyDown(object sender, KeyEventArgs e) {\r
             if (e.KeyCode == Keys.Space && dataGridView1.CurrentCell.GetType() != typeof(DataGridViewCheckBoxCell))\r
-                SetCheckBoxAndInvokeIDChangeEvent(dataGridView1.SelectedRows[0]);\r
+                OnSelectionChanged(dataGridView1.SelectedRows[0]);\r
         }\r
     }\r
 \r
-    public class MamResultWrapper {\r
+    public class TrafficItem {\r
         public bool Selected { get; set; }\r
         public string MediaID { get; set; }\r
         public string Title { get; set; }\r
@@ -184,7 +204,7 @@ namespace TrafficClient {
         public DateTime? NextBroadcastDate { get; set; }\r
     }\r
 \r
-    public class ArchiveMatadataWrapper {\r
+    public class TrafficItemMetadata {\r
 \r
         public string ProgTitle { get; set; }\r
         public string ProgDescription { get; set; }\r
index 36b41b88dccafb5f27f383aff1712ddef378cdd3..692574db0def9aa4a31dd283c04eb251bdb9ddcb 100644 (file)
@@ -13,9 +13,9 @@ namespace TrafficClient.Workers {
             base(connection, cliFSPReader, errorReporter) {\r
         }\r
 \r
-        public List<MamResultWrapper> GetAdvertisements(string strParam) {\r
+        public List<TrafficItem> GetAdvertisements(string strParam) {\r
             List<clIFsp_EC_MAMAdvertismentResult> sqlResult = null;\r
-            List<MamResultWrapper> result = null;\r
+            List<TrafficItem> result = null;\r
             try {\r
                 TryConnect();\r
                 using (SqlCommand cmd = new SqlCommand("dbo.clIFsp_EC_MAM", connection)) {\r
@@ -51,12 +51,12 @@ namespace TrafficClient.Workers {
             return result;\r
         }\r
 \r
-        private List<MamResultWrapper> ProcessMamAdvertismentResult(List<clIFsp_EC_MAMAdvertismentResult> sqlResult) {\r
+        private List<TrafficItem> ProcessMamAdvertismentResult(List<clIFsp_EC_MAMAdvertismentResult> sqlResult) {\r
             if (sqlResult == null)\r
                 return null;\r
-            List<MamResultWrapper> result = new List<MamResultWrapper>();\r
+            List<TrafficItem> result = new List<TrafficItem>();\r
             foreach (clIFsp_EC_MAMAdvertismentResult actual in sqlResult) {\r
-                MamResultWrapper actualObject = new MamResultWrapper() {\r
+                TrafficItem actualObject = new TrafficItem() {\r
                     MediaID = actual.t_MediaID,\r
                     Title = actual.v_Title,\r
                     VariantID = actual.t_SpotID\r
@@ -87,9 +87,9 @@ namespace TrafficClient.Workers {
             }\r
         }\r
 \r
-        public List<ArchiveMatadataWrapper> GetAdvertisementArchiveMetadata(string strParam) {\r
+        public List<TrafficItemMetadata> GetAdvertisementArchiveMetadata(string strParam) {\r
             List<clIFsp_EC_MAMAdvertismentResult> sqlResult = null;\r
-            List<ArchiveMatadataWrapper> result = null;\r
+            List<TrafficItemMetadata> result = null;\r
             try {\r
                 TryConnect();\r
                 using (SqlCommand cmd = new SqlCommand("dbo.clIFsp_EC_MAM", connection)) {\r
@@ -112,12 +112,12 @@ namespace TrafficClient.Workers {
             return result;\r
         }\r
 \r
-        private List<ArchiveMatadataWrapper> ProcessAdvertisementArchiveMetadataResult(List<clIFsp_EC_MAMAdvertismentResult> sqlResult) {\r
+        private List<TrafficItemMetadata> ProcessAdvertisementArchiveMetadataResult(List<clIFsp_EC_MAMAdvertismentResult> sqlResult) {\r
             if (sqlResult == null)\r
                 return null;\r
-            List<ArchiveMatadataWrapper> result = new List<ArchiveMatadataWrapper>();\r
+            List<TrafficItemMetadata> result = new List<TrafficItemMetadata>();\r
             foreach (clIFsp_EC_MAMAdvertismentResult actual in sqlResult) {\r
-                ArchiveMatadataWrapper actualObject = new ArchiveMatadataWrapper() {\r
+                TrafficItemMetadata actualObject = new TrafficItemMetadata() {\r
                     EpisodeID = actual.t_MediaID,\r
                     EpisodeTitle = actual.v_Title,\r
                     ProgID = actual.t_SpotID.ToString(),\r
index 09d97fdee1a19110cee3301b3a64590bcea29f7b..aff803ea3b0c8d290204c407a46e7e073fcdb033 100644 (file)
@@ -14,9 +14,9 @@ namespace TrafficClient.Workers {
             : base(connection, cliFSPReader, errorReporter){\r
         }\r
 \r
-        public List<MamResultWrapper> GetBroadcasts(string strParam, DateTime? from, DateTime? to, bool missingCopia) {\r
+        public List<TrafficItem> GetBroadcasts(string strParam, DateTime? from, DateTime? to, bool missingCopia) {\r
             List<clIFsp_EC_MAMBradocastResult> sqlResult = null;\r
-            List<MamResultWrapper> result = null;\r
+            List<TrafficItem> result = null;\r
             try {\r
                 TryConnect();\r
                 using (SqlCommand cmd = new SqlCommand("dbo.clIFsp_EC_MAM", connection)) {\r
@@ -51,12 +51,12 @@ namespace TrafficClient.Workers {
             return result;\r
         }\r
 \r
-        private List<MamResultWrapper> ProcessMamBroadcastResult(List<clIFsp_EC_MAMBradocastResult> sqlResult) {\r
+        private List<TrafficItem> ProcessMamBroadcastResult(List<clIFsp_EC_MAMBradocastResult> sqlResult) {\r
             if (sqlResult == null)\r
                 return null;\r
-            List<MamResultWrapper> result = new List<MamResultWrapper>();\r
+            List<TrafficItem> result = new List<TrafficItem>();\r
             foreach (clIFsp_EC_MAMBradocastResult actual in sqlResult) {\r
-                MamResultWrapper actualObject = new MamResultWrapper() {\r
+                TrafficItem actualObject = new TrafficItem() {\r
                     MediaID = actual.v_MediaID,\r
                     EpisodeTitle = actual.v_EpTitle,\r
                     Title = actual.v_ProgTitle,\r
@@ -83,9 +83,9 @@ namespace TrafficClient.Workers {
             return result;\r
         }\r
 \r
-        public List<ArchiveMatadataWrapper> GetBroadcastArchiveMetadata(string strParam) {\r
+        public List<TrafficItemMetadata> GetBroadcastArchiveMetadata(string strParam) {\r
             List<clIFsp_EC_MAMBradocastResult> sqlResult = null;\r
-            List<ArchiveMatadataWrapper> result = null;\r
+            List<TrafficItemMetadata> result = null;\r
             try {\r
                 TryConnect();\r
                 using (SqlCommand cmd = new SqlCommand("dbo.clIFsp_EC_MAM", connection)) {\r
@@ -108,12 +108,12 @@ namespace TrafficClient.Workers {
             return result;\r
         }\r
 \r
-        private List<ArchiveMatadataWrapper> ProcessaBroadcastArchiveMetadatResult(List<clIFsp_EC_MAMBradocastResult> sqlResult) {\r
+        private List<TrafficItemMetadata> ProcessaBroadcastArchiveMetadatResult(List<clIFsp_EC_MAMBradocastResult> sqlResult) {\r
             if (sqlResult == null)\r
                 return null;\r
-            List<ArchiveMatadataWrapper> result = new List<ArchiveMatadataWrapper>();\r
+            List<TrafficItemMetadata> result = new List<TrafficItemMetadata>();\r
             foreach (clIFsp_EC_MAMBradocastResult actual in sqlResult) {\r
-                ArchiveMatadataWrapper actualObject = new ArchiveMatadataWrapper() {\r
+                TrafficItemMetadata actualObject = new TrafficItemMetadata() {\r
                     EpisodeID = actual.v_EpisodeID,\r
                     EpisodeTitle = actual.v_EpTitle,\r
                     ProgID = actual.v_ProgrammeID.ToString(),\r
index 19f89e9461311779571aab99d427431e64dc18c9..b6717670cda50e2343e13896b1293e0f9020aea9 100644 (file)
@@ -13,9 +13,9 @@ namespace TrafficClient.Workers {
             : base(connection, cliFSPReader, errorReporter) {\r
         }\r
 \r
-        public List<MamResultWrapper> GetPromotionals(string strParam) {\r
+        public List<TrafficItem> GetPromotionals(string strParam) {\r
             List<clIFsp_EC_MAMPromotionalResult> sqlResult = null;\r
-            List<MamResultWrapper> result = null;\r
+            List<TrafficItem> result = null;\r
             try {\r
                 TryConnect();\r
                 using (SqlCommand cmd = new SqlCommand("dbo.clIFsp_EC_MAM", connection)) {\r
@@ -38,12 +38,12 @@ namespace TrafficClient.Workers {
             return result;\r
         }\r
 \r
-        private List<MamResultWrapper> ProcessMamPromotionalResult(List<clIFsp_EC_MAMPromotionalResult> sqlResult) {\r
+        private List<TrafficItem> ProcessMamPromotionalResult(List<clIFsp_EC_MAMPromotionalResult> sqlResult) {\r
             if (sqlResult == null)\r
                 return null;\r
-            List<MamResultWrapper> result = new List<MamResultWrapper>();\r
+            List<TrafficItem> result = new List<TrafficItem>();\r
             foreach (clIFsp_EC_MAMPromotionalResult actual in sqlResult) {\r
-                MamResultWrapper actualObject = new MamResultWrapper() {\r
+                TrafficItem actualObject = new TrafficItem() {\r
                     MediaID = actual.t_MediaID,\r
                     EpisodeTitle = actual.v_Title,\r
                     Title = actual.v_ProgTitle,\r
@@ -95,9 +95,9 @@ namespace TrafficClient.Workers {
             }\r
         }\r
 \r
-        public List<ArchiveMatadataWrapper> GetPromotionalArchiveMetadata(string strParam) {\r
+        public List<TrafficItemMetadata> GetPromotionalArchiveMetadata(string strParam) {\r
             List<clIFsp_EC_MAMPromotionalResult> sqlResult = null;\r
-            List<ArchiveMatadataWrapper> result = null;\r
+            List<TrafficItemMetadata> result = null;\r
             try {\r
                 TryConnect();\r
                 using (SqlCommand cmd = new SqlCommand("dbo.clIFsp_EC_MAM", connection)) {\r
@@ -120,12 +120,12 @@ namespace TrafficClient.Workers {
             return result;\r
         }\r
 \r
-        private List<ArchiveMatadataWrapper> ProcessPromotionalArchiveMetadataResult(List<clIFsp_EC_MAMPromotionalResult> sqlResult) {\r
+        private List<TrafficItemMetadata> ProcessPromotionalArchiveMetadataResult(List<clIFsp_EC_MAMPromotionalResult> sqlResult) {\r
             if (sqlResult == null)\r
                 return null;\r
-            List<ArchiveMatadataWrapper> result = new List<ArchiveMatadataWrapper>();\r
+            List<TrafficItemMetadata> result = new List<TrafficItemMetadata>();\r
             foreach (clIFsp_EC_MAMPromotionalResult actual in sqlResult) {\r
-                ArchiveMatadataWrapper actualObject = new ArchiveMatadataWrapper() {\r
+                TrafficItemMetadata actualObject = new TrafficItemMetadata() {\r
                     EpisodeID = actual.t_MediaID,\r
                     ProgID = actual.t_SpotID.ToString(),\r
                     ProgTitle = actual.v_ProgTitle,\r