From 9271dfd6cb51b9b6403218b4c2fd554e6fc381b2 Mon Sep 17 00:00:00 2001 From: Yves Schelpe Date: Sun, 19 Nov 2017 22:53:27 +0100 Subject: [PATCH] - #4 Negeren van departementen en VZW's uitgeschakeld. Scherm aangepast zodat er meer ruitme is, en de uitleg verdwenen is die er niet meer toe doet. --- ...ardStep02_SelectExcelFile_View.Designer.cs | 252 ++++++------------ ...ImportWizardStep02_SelectExcelFile_View.cs | 37 +-- ...portWizardStep02_SelectExcelFile_View.resx | 3 - 3 files changed, 101 insertions(+), 191 deletions(-) diff --git a/Source/Frontend/Kostenverdeling.Desktop.WinFormsClient/Wizard/ImportWizard/ImportWizardStep02_SelectExcelFile_View.Designer.cs b/Source/Frontend/Kostenverdeling.Desktop.WinFormsClient/Wizard/ImportWizard/ImportWizardStep02_SelectExcelFile_View.Designer.cs index 2ebfd5d..4005112 100644 --- a/Source/Frontend/Kostenverdeling.Desktop.WinFormsClient/Wizard/ImportWizard/ImportWizardStep02_SelectExcelFile_View.Designer.cs +++ b/Source/Frontend/Kostenverdeling.Desktop.WinFormsClient/Wizard/ImportWizard/ImportWizardStep02_SelectExcelFile_View.Designer.cs @@ -39,14 +39,12 @@ private void InitializeComponent() { this.uxFilterType = new System.Windows.Forms.Label(); this.label9 = new System.Windows.Forms.Label(); this.label6 = new System.Windows.Forms.Label(); - this.label5 = new System.Windows.Forms.Label(); - this.label4 = new System.Windows.Forms.Label(); - this.label3 = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); this.uxUnknown = new System.Windows.Forms.Label(); this.uxLegendDepartmentsAndDivisions = new System.Windows.Forms.Label(); this.uxDepartmentsAndDivisions = new System.Windows.Forms.TreeView(); + this.uxDepartmentsAndDivisionsMenu = new System.Windows.Forms.ContextMenuStrip(this.components); + this.uxToggleIgnoreIncludeDepartmentsAndDivisions = new System.Windows.Forms.ToolStripMenuItem(); this.uxStructuurDepartementen = new System.Windows.Forms.Label(); this.uxEndDateInvoice = new System.Windows.Forms.DateTimePicker(); this.uxStartDateInvoice = new System.Windows.Forms.DateTimePicker(); @@ -60,19 +58,16 @@ private void InitializeComponent() { this.uxProgressInfo = new System.Windows.Forms.Label(); this.uxProgressBar = new System.Windows.Forms.ProgressBar(); this.uxBezigMetVerwerkenGegevens = new System.Windows.Forms.Label(); - this.uxToggleIgnoreIncludeDepartmentsAndDivisions = new System.Windows.Forms.ToolStripMenuItem(); - this.uxDepartmentsAndDivisionsMenu = new System.Windows.Forms.ContextMenuStrip(this.components); this.uxDataPanel.SuspendLayout(); - this.uxBusyPanel.SuspendLayout(); this.uxDepartmentsAndDivisionsMenu.SuspendLayout(); + this.uxBusyPanel.SuspendLayout(); this.SuspendLayout(); // // uxInfo // this.uxInfo.Location = new System.Drawing.Point(0, 0); - this.uxInfo.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.uxInfo.Name = "uxInfo"; - this.uxInfo.Size = new System.Drawing.Size(1000, 36); + this.uxInfo.Size = new System.Drawing.Size(750, 29); this.uxInfo.TabIndex = 1; this.uxInfo.Text = resources.GetString("uxInfo.Text"); // @@ -80,19 +75,17 @@ private void InitializeComponent() { // this.uxExcelFileLabel.AutoSize = true; this.uxExcelFileLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.uxExcelFileLabel.Location = new System.Drawing.Point(4, 44); - this.uxExcelFileLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.uxExcelFileLabel.Location = new System.Drawing.Point(3, 36); this.uxExcelFileLabel.Name = "uxExcelFileLabel"; - this.uxExcelFileLabel.Size = new System.Drawing.Size(125, 17); + this.uxExcelFileLabel.Size = new System.Drawing.Size(99, 13); this.uxExcelFileLabel.TabIndex = 2; this.uxExcelFileLabel.Text = "EXCEL bestand:"; // // uxBrowseExcelFile // - this.uxBrowseExcelFile.Location = new System.Drawing.Point(881, 96); - this.uxBrowseExcelFile.Margin = new System.Windows.Forms.Padding(4); + this.uxBrowseExcelFile.Location = new System.Drawing.Point(661, 78); this.uxBrowseExcelFile.Name = "uxBrowseExcelFile"; - this.uxBrowseExcelFile.Size = new System.Drawing.Size(100, 28); + this.uxBrowseExcelFile.Size = new System.Drawing.Size(75, 23); this.uxBrowseExcelFile.TabIndex = 4; this.uxBrowseExcelFile.Text = "Bladeren..."; this.uxBrowseExcelFile.UseVisualStyleBackColor = true; @@ -100,11 +93,10 @@ private void InitializeComponent() { // // uxExcelFile // - this.uxExcelFile.Location = new System.Drawing.Point(20, 64); - this.uxExcelFile.Margin = new System.Windows.Forms.Padding(4); + this.uxExcelFile.Location = new System.Drawing.Point(15, 52); this.uxExcelFile.Name = "uxExcelFile"; this.uxExcelFile.ReadOnly = true; - this.uxExcelFile.Size = new System.Drawing.Size(960, 22); + this.uxExcelFile.Size = new System.Drawing.Size(721, 20); this.uxExcelFile.TabIndex = 5; this.uxExcelFile.Text = "(geen bestand geselecteerd)"; // @@ -112,10 +104,9 @@ private void InitializeComponent() { // this.uxDataLabel.AutoSize = true; this.uxDataLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.uxDataLabel.Location = new System.Drawing.Point(-4, 0); - this.uxDataLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.uxDataLabel.Location = new System.Drawing.Point(-3, 0); this.uxDataLabel.Name = "uxDataLabel"; - this.uxDataLabel.Size = new System.Drawing.Size(86, 17); + this.uxDataLabel.Size = new System.Drawing.Size(68, 13); this.uxDataLabel.TabIndex = 6; this.uxDataLabel.Text = "Gegevens:"; // @@ -127,10 +118,6 @@ private void InitializeComponent() { this.uxDataPanel.Controls.Add(this.uxFilterType); this.uxDataPanel.Controls.Add(this.label9); this.uxDataPanel.Controls.Add(this.label6); - this.uxDataPanel.Controls.Add(this.label5); - this.uxDataPanel.Controls.Add(this.label4); - this.uxDataPanel.Controls.Add(this.label3); - this.uxDataPanel.Controls.Add(this.label2); this.uxDataPanel.Controls.Add(this.label1); this.uxDataPanel.Controls.Add(this.uxUnknown); this.uxDataPanel.Controls.Add(this.uxLegendDepartmentsAndDivisions); @@ -145,10 +132,9 @@ private void InitializeComponent() { this.uxDataPanel.Controls.Add(this.uxNumberOfRecords); this.uxDataPanel.Controls.Add(this.uxNumberOfRecordsLabel); this.uxDataPanel.Controls.Add(this.uxDataLabel); - this.uxDataPanel.Location = new System.Drawing.Point(8, 132); - this.uxDataPanel.Margin = new System.Windows.Forms.Padding(4); + this.uxDataPanel.Location = new System.Drawing.Point(6, 107); this.uxDataPanel.Name = "uxDataPanel"; - this.uxDataPanel.Size = new System.Drawing.Size(988, 357); + this.uxDataPanel.Size = new System.Drawing.Size(741, 290); this.uxDataPanel.TabIndex = 7; this.uxDataPanel.Visible = false; // @@ -156,10 +142,9 @@ private void InitializeComponent() { // this.label11.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label11.ForeColor = System.Drawing.Color.DimGray; - this.label11.Location = new System.Drawing.Point(275, 70); - this.label11.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label11.Location = new System.Drawing.Point(206, 57); this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(297, 33); + this.label11.Size = new System.Drawing.Size(223, 27); this.label11.TabIndex = 31; this.label11.Text = "Toelichting: Enkel de records met geselecteerde factuurdatum worden meegenomen in" + " de berekening."; @@ -168,10 +153,9 @@ private void InitializeComponent() { // this.uxInvoiceDates.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.uxInvoiceDates.FormattingEnabled = true; - this.uxInvoiceDates.Location = new System.Drawing.Point(277, 41); - this.uxInvoiceDates.Margin = new System.Windows.Forms.Padding(4); + this.uxInvoiceDates.Location = new System.Drawing.Point(208, 33); this.uxInvoiceDates.Name = "uxInvoiceDates"; - this.uxInvoiceDates.Size = new System.Drawing.Size(259, 24); + this.uxInvoiceDates.Size = new System.Drawing.Size(195, 21); this.uxInvoiceDates.TabIndex = 29; this.uxInvoiceDates.SelectedIndexChanged += new System.EventHandler(this.uxInvoiceDates_SelectedIndexChanged); // @@ -179,10 +163,9 @@ private void InitializeComponent() { // this.label8.AutoSize = true; this.label8.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label8.Location = new System.Drawing.Point(273, 21); - this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label8.Location = new System.Drawing.Point(205, 17); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(130, 17); + this.label8.Size = new System.Drawing.Size(97, 13); this.label8.TabIndex = 28; this.label8.Text = "Filter factuurdatum:"; // @@ -190,10 +173,9 @@ private void InitializeComponent() { // this.uxFilterType.AutoSize = true; this.uxFilterType.ForeColor = System.Drawing.Color.DimGray; - this.uxFilterType.Location = new System.Drawing.Point(97, 65); - this.uxFilterType.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.uxFilterType.Location = new System.Drawing.Point(73, 53); this.uxFilterType.Name = "uxFilterType"; - this.uxFilterType.Size = new System.Drawing.Size(13, 17); + this.uxFilterType.Size = new System.Drawing.Size(10, 13); this.uxFilterType.TabIndex = 27; this.uxFilterType.Text = "-"; // @@ -201,10 +183,9 @@ private void InitializeComponent() { // this.label9.AutoSize = true; this.label9.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label9.Location = new System.Drawing.Point(8, 65); - this.label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label9.Location = new System.Drawing.Point(6, 53); this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(89, 17); + this.label9.Size = new System.Drawing.Size(69, 13); this.label9.TabIndex = 26; this.label9.Text = "Filter \"Type\":"; // @@ -212,70 +193,21 @@ private void InitializeComponent() { // this.label6.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label6.ForeColor = System.Drawing.Color.DimGray; - this.label6.Location = new System.Drawing.Point(580, 69); - this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label6.Location = new System.Drawing.Point(435, 56); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(389, 33); + this.label6.Size = new System.Drawing.Size(292, 27); this.label6.TabIndex = 24; this.label6.Text = "Toelichting: Automatisch voorgestelde start- en einddatum voor de factuur. Geliev" + "e deze te controleren en eventueel aan te passen."; - // - // label5 - // - this.label5.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label5.ForeColor = System.Drawing.Color.DimGray; - this.label5.Location = new System.Drawing.Point(95, 290); - this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(413, 64); - this.label5.TabIndex = 23; - this.label5.Text = resources.GetString("label5.Text"); - // - // label4 - // - this.label4.AutoSize = true; - this.label4.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label4.ForeColor = System.Drawing.Color.DimGray; - this.label4.Location = new System.Drawing.Point(17, 290); - this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(70, 15); - this.label4.TabIndex = 22; - this.label4.Text = "Toelichting:"; - // - // label3 - // - this.label3.AutoSize = true; - this.label3.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Strikeout, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label3.ForeColor = System.Drawing.Color.DarkCyan; - this.label3.Location = new System.Drawing.Point(612, 338); - this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(311, 15); - this.label3.TabIndex = 21; - this.label3.Text = "Onbekend bedrijf of project dat niet wordt meegenomen"; - // - // label2 - // - this.label2.AutoSize = true; - this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Strikeout, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label2.ForeColor = System.Drawing.Color.DimGray; - this.label2.Location = new System.Drawing.Point(612, 322); - this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(297, 15); - this.label2.TabIndex = 20; - this.label2.Text = "Gekend bedrijf of project dat niet wordt meegenomen"; // // label1 // this.label1.AutoSize = true; this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label1.ForeColor = System.Drawing.Color.DarkCyan; - this.label1.Location = new System.Drawing.Point(612, 306); - this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label1.Location = new System.Drawing.Point(612, 275); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(154, 15); + this.label1.Size = new System.Drawing.Size(114, 12); this.label1.TabIndex = 19; this.label1.Text = "Onbekend bedrijf of project"; // @@ -284,10 +216,9 @@ private void InitializeComponent() { this.uxUnknown.AutoSize = true; this.uxUnknown.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.uxUnknown.ForeColor = System.Drawing.Color.DimGray; - this.uxUnknown.Location = new System.Drawing.Point(612, 290); - this.uxUnknown.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.uxUnknown.Location = new System.Drawing.Point(612, 263); this.uxUnknown.Name = "uxUnknown"; - this.uxUnknown.Size = new System.Drawing.Size(140, 15); + this.uxUnknown.Size = new System.Drawing.Size(104, 12); this.uxUnknown.TabIndex = 18; this.uxUnknown.Text = "Gekend bedrijf of project"; // @@ -296,48 +227,59 @@ private void InitializeComponent() { this.uxLegendDepartmentsAndDivisions.AutoSize = true; this.uxLegendDepartmentsAndDivisions.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.uxLegendDepartmentsAndDivisions.ForeColor = System.Drawing.Color.DimGray; - this.uxLegendDepartmentsAndDivisions.Location = new System.Drawing.Point(543, 290); - this.uxLegendDepartmentsAndDivisions.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.uxLegendDepartmentsAndDivisions.Location = new System.Drawing.Point(568, 263); this.uxLegendDepartmentsAndDivisions.Name = "uxLegendDepartmentsAndDivisions"; - this.uxLegendDepartmentsAndDivisions.Size = new System.Drawing.Size(59, 15); + this.uxLegendDepartmentsAndDivisions.Size = new System.Drawing.Size(43, 12); this.uxLegendDepartmentsAndDivisions.TabIndex = 17; this.uxLegendDepartmentsAndDivisions.Text = "Legende:"; // // uxDepartmentsAndDivisions // - this.uxDepartmentsAndDivisions.ContextMenuStrip = this.uxDepartmentsAndDivisionsMenu; - this.uxDepartmentsAndDivisions.Location = new System.Drawing.Point(12, 106); - this.uxDepartmentsAndDivisions.Margin = new System.Windows.Forms.Padding(4); + this.uxDepartmentsAndDivisions.Location = new System.Drawing.Point(9, 86); this.uxDepartmentsAndDivisions.Name = "uxDepartmentsAndDivisions"; - this.uxDepartmentsAndDivisions.Size = new System.Drawing.Size(960, 180); + this.uxDepartmentsAndDivisions.Size = new System.Drawing.Size(718, 174); this.uxDepartmentsAndDivisions.TabIndex = 16; // + // uxDepartmentsAndDivisionsMenu + // + this.uxDepartmentsAndDivisionsMenu.Enabled = false; + this.uxDepartmentsAndDivisionsMenu.ImageScalingSize = new System.Drawing.Size(20, 20); + this.uxDepartmentsAndDivisionsMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.uxToggleIgnoreIncludeDepartmentsAndDivisions}); + this.uxDepartmentsAndDivisionsMenu.Name = "uxDepartmentsAndDivisionsMenu"; + this.uxDepartmentsAndDivisionsMenu.Size = new System.Drawing.Size(191, 26); + // + // uxToggleIgnoreIncludeDepartmentsAndDivisions + // + this.uxToggleIgnoreIncludeDepartmentsAndDivisions.Enabled = false; + this.uxToggleIgnoreIncludeDepartmentsAndDivisions.Name = "uxToggleIgnoreIncludeDepartmentsAndDivisions"; + this.uxToggleIgnoreIncludeDepartmentsAndDivisions.Size = new System.Drawing.Size(190, 22); + this.uxToggleIgnoreIncludeDepartmentsAndDivisions.Text = "Negeren / Meenemen"; + this.uxToggleIgnoreIncludeDepartmentsAndDivisions.Click += new System.EventHandler(this.uxToggleIgnoreIncludeDepartmentsAndDivisions_Click); + // // uxStructuurDepartementen // this.uxStructuurDepartementen.AutoSize = true; this.uxStructuurDepartementen.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.uxStructuurDepartementen.Location = new System.Drawing.Point(8, 86); - this.uxStructuurDepartementen.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.uxStructuurDepartementen.Location = new System.Drawing.Point(6, 70); this.uxStructuurDepartementen.Name = "uxStructuurDepartementen"; - this.uxStructuurDepartementen.Size = new System.Drawing.Size(154, 17); + this.uxStructuurDepartementen.Size = new System.Drawing.Size(116, 13); this.uxStructuurDepartementen.TabIndex = 15; this.uxStructuurDepartementen.Text = "Bedrijven en projecten:"; // // uxEndDateInvoice // - this.uxEndDateInvoice.Location = new System.Drawing.Point(777, 41); - this.uxEndDateInvoice.Margin = new System.Windows.Forms.Padding(4); + this.uxEndDateInvoice.Location = new System.Drawing.Point(583, 33); this.uxEndDateInvoice.Name = "uxEndDateInvoice"; - this.uxEndDateInvoice.Size = new System.Drawing.Size(191, 22); + this.uxEndDateInvoice.Size = new System.Drawing.Size(144, 20); this.uxEndDateInvoice.TabIndex = 14; this.uxEndDateInvoice.ValueChanged += new System.EventHandler(this.uxEndDateInvoice_ValueChanged); // // uxStartDateInvoice // - this.uxStartDateInvoice.Location = new System.Drawing.Point(580, 41); - this.uxStartDateInvoice.Margin = new System.Windows.Forms.Padding(4); + this.uxStartDateInvoice.Location = new System.Drawing.Point(435, 33); this.uxStartDateInvoice.Name = "uxStartDateInvoice"; - this.uxStartDateInvoice.Size = new System.Drawing.Size(188, 22); + this.uxStartDateInvoice.Size = new System.Drawing.Size(142, 20); this.uxStartDateInvoice.TabIndex = 13; this.uxStartDateInvoice.ValueChanged += new System.EventHandler(this.uxStartDateInvoice_ValueChanged); // @@ -345,10 +287,9 @@ private void InitializeComponent() { // this.uxEndDateInvoiceLabel.AutoSize = true; this.uxEndDateInvoiceLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.uxEndDateInvoiceLabel.Location = new System.Drawing.Point(777, 21); - this.uxEndDateInvoiceLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.uxEndDateInvoiceLabel.Location = new System.Drawing.Point(583, 17); this.uxEndDateInvoiceLabel.Name = "uxEndDateInvoiceLabel"; - this.uxEndDateInvoiceLabel.Size = new System.Drawing.Size(127, 17); + this.uxEndDateInvoiceLabel.Size = new System.Drawing.Size(96, 13); this.uxEndDateInvoiceLabel.TabIndex = 12; this.uxEndDateInvoiceLabel.Text = "Einddatum factuur:"; // @@ -356,10 +297,9 @@ private void InitializeComponent() { // this.uxStartDateInvoiceLabel.AutoSize = true; this.uxStartDateInvoiceLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.uxStartDateInvoiceLabel.Location = new System.Drawing.Point(576, 21); - this.uxStartDateInvoiceLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.uxStartDateInvoiceLabel.Location = new System.Drawing.Point(432, 17); this.uxStartDateInvoiceLabel.Name = "uxStartDateInvoiceLabel"; - this.uxStartDateInvoiceLabel.Size = new System.Drawing.Size(129, 17); + this.uxStartDateInvoiceLabel.Size = new System.Drawing.Size(97, 13); this.uxStartDateInvoiceLabel.TabIndex = 11; this.uxStartDateInvoiceLabel.Text = "Startdatum factuur:"; // @@ -367,10 +307,9 @@ private void InitializeComponent() { // this.uxNumberOfEmployees.AutoSize = true; this.uxNumberOfEmployees.ForeColor = System.Drawing.Color.DimGray; - this.uxNumberOfEmployees.Location = new System.Drawing.Point(139, 49); - this.uxNumberOfEmployees.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.uxNumberOfEmployees.Location = new System.Drawing.Point(104, 40); this.uxNumberOfEmployees.Name = "uxNumberOfEmployees"; - this.uxNumberOfEmployees.Size = new System.Drawing.Size(13, 17); + this.uxNumberOfEmployees.Size = new System.Drawing.Size(10, 13); this.uxNumberOfEmployees.TabIndex = 10; this.uxNumberOfEmployees.Text = "-"; // @@ -378,10 +317,9 @@ private void InitializeComponent() { // this.uxNumberOfEmployeesLabel.AutoSize = true; this.uxNumberOfEmployeesLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.uxNumberOfEmployeesLabel.Location = new System.Drawing.Point(8, 49); - this.uxNumberOfEmployeesLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.uxNumberOfEmployeesLabel.Location = new System.Drawing.Point(6, 40); this.uxNumberOfEmployeesLabel.Name = "uxNumberOfEmployeesLabel"; - this.uxNumberOfEmployeesLabel.Size = new System.Drawing.Size(132, 17); + this.uxNumberOfEmployeesLabel.Size = new System.Drawing.Size(100, 13); this.uxNumberOfEmployeesLabel.TabIndex = 9; this.uxNumberOfEmployeesLabel.Text = "Aantal werknemers:"; // @@ -389,10 +327,9 @@ private void InitializeComponent() { // this.uxNumberOfRecords.AutoSize = true; this.uxNumberOfRecords.ForeColor = System.Drawing.Color.DimGray; - this.uxNumberOfRecords.Location = new System.Drawing.Point(109, 33); - this.uxNumberOfRecords.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.uxNumberOfRecords.Location = new System.Drawing.Point(82, 27); this.uxNumberOfRecords.Name = "uxNumberOfRecords"; - this.uxNumberOfRecords.Size = new System.Drawing.Size(13, 17); + this.uxNumberOfRecords.Size = new System.Drawing.Size(10, 13); this.uxNumberOfRecords.TabIndex = 8; this.uxNumberOfRecords.Text = "-"; // @@ -400,10 +337,9 @@ private void InitializeComponent() { // this.uxNumberOfRecordsLabel.AutoSize = true; this.uxNumberOfRecordsLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.uxNumberOfRecordsLabel.Location = new System.Drawing.Point(8, 33); - this.uxNumberOfRecordsLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.uxNumberOfRecordsLabel.Location = new System.Drawing.Point(6, 27); this.uxNumberOfRecordsLabel.Name = "uxNumberOfRecordsLabel"; - this.uxNumberOfRecordsLabel.Size = new System.Drawing.Size(104, 17); + this.uxNumberOfRecordsLabel.Size = new System.Drawing.Size(78, 13); this.uxNumberOfRecordsLabel.TabIndex = 7; this.uxNumberOfRecordsLabel.Text = "Aantal records:"; // @@ -412,76 +348,56 @@ private void InitializeComponent() { this.uxBusyPanel.Controls.Add(this.uxProgressInfo); this.uxBusyPanel.Controls.Add(this.uxProgressBar); this.uxBusyPanel.Controls.Add(this.uxBezigMetVerwerkenGegevens); - this.uxBusyPanel.Location = new System.Drawing.Point(8, 132); - this.uxBusyPanel.Margin = new System.Windows.Forms.Padding(4); + this.uxBusyPanel.Location = new System.Drawing.Point(6, 107); this.uxBusyPanel.Name = "uxBusyPanel"; - this.uxBusyPanel.Size = new System.Drawing.Size(988, 357); + this.uxBusyPanel.Size = new System.Drawing.Size(741, 290); this.uxBusyPanel.TabIndex = 8; this.uxBusyPanel.Visible = false; // // uxProgressInfo // this.uxProgressInfo.AutoSize = true; - this.uxProgressInfo.Location = new System.Drawing.Point(8, 21); - this.uxProgressInfo.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.uxProgressInfo.Location = new System.Drawing.Point(6, 17); this.uxProgressInfo.Name = "uxProgressInfo"; - this.uxProgressInfo.Size = new System.Drawing.Size(298, 17); + this.uxProgressInfo.Size = new System.Drawing.Size(226, 13); this.uxProgressInfo.TabIndex = 13; this.uxProgressInfo.Text = "Bezig met verwerken E-Blox EXCEL bestand..."; // // uxProgressBar // - this.uxProgressBar.Location = new System.Drawing.Point(12, 41); - this.uxProgressBar.Margin = new System.Windows.Forms.Padding(4); + this.uxProgressBar.Location = new System.Drawing.Point(9, 33); this.uxProgressBar.Name = "uxProgressBar"; - this.uxProgressBar.Size = new System.Drawing.Size(961, 28); + this.uxProgressBar.Size = new System.Drawing.Size(721, 23); this.uxProgressBar.TabIndex = 12; // // uxBezigMetVerwerkenGegevens // this.uxBezigMetVerwerkenGegevens.AutoSize = true; this.uxBezigMetVerwerkenGegevens.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.uxBezigMetVerwerkenGegevens.Location = new System.Drawing.Point(-3, 0); - this.uxBezigMetVerwerkenGegevens.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.uxBezigMetVerwerkenGegevens.Location = new System.Drawing.Point(-2, 0); this.uxBezigMetVerwerkenGegevens.Name = "uxBezigMetVerwerkenGegevens"; - this.uxBezigMetVerwerkenGegevens.Size = new System.Drawing.Size(113, 17); + this.uxBezigMetVerwerkenGegevens.Size = new System.Drawing.Size(90, 13); this.uxBezigMetVerwerkenGegevens.TabIndex = 6; this.uxBezigMetVerwerkenGegevens.Text = "Even geduld..."; // - // uxToggleIgnoreIncludeDepartmentsAndDivisions - // - this.uxToggleIgnoreIncludeDepartmentsAndDivisions.Name = "uxToggleIgnoreIncludeDepartmentsAndDivisions"; - this.uxToggleIgnoreIncludeDepartmentsAndDivisions.Size = new System.Drawing.Size(229, 26); - this.uxToggleIgnoreIncludeDepartmentsAndDivisions.Text = "Negeren / Meenemen"; - this.uxToggleIgnoreIncludeDepartmentsAndDivisions.Click += new System.EventHandler(this.uxToggleIgnoreIncludeDepartmentsAndDivisions_Click); - // - // uxDepartmentsAndDivisionsMenu - // - this.uxDepartmentsAndDivisionsMenu.ImageScalingSize = new System.Drawing.Size(20, 20); - this.uxDepartmentsAndDivisionsMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.uxToggleIgnoreIncludeDepartmentsAndDivisions}); - this.uxDepartmentsAndDivisionsMenu.Name = "uxDepartmentsAndDivisionsMenu"; - this.uxDepartmentsAndDivisionsMenu.Size = new System.Drawing.Size(230, 58); - // // ImportWizardStep02_SelectExcelFile_View // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.Controls.Add(this.uxExcelFile); this.Controls.Add(this.uxBrowseExcelFile); this.Controls.Add(this.uxExcelFileLabel); this.Controls.Add(this.uxInfo); - this.Controls.Add(this.uxBusyPanel); this.Controls.Add(this.uxDataPanel); - this.Margin = new System.Windows.Forms.Padding(4); - this.MinimumSize = new System.Drawing.Size(1000, 492); + this.Controls.Add(this.uxBusyPanel); + this.MinimumSize = new System.Drawing.Size(750, 400); this.Name = "ImportWizardStep02_SelectExcelFile_View"; - this.Size = new System.Drawing.Size(1000, 492); + this.Size = new System.Drawing.Size(750, 400); this.uxDataPanel.ResumeLayout(false); this.uxDataPanel.PerformLayout(); + this.uxDepartmentsAndDivisionsMenu.ResumeLayout(false); this.uxBusyPanel.ResumeLayout(false); this.uxBusyPanel.PerformLayout(); - this.uxDepartmentsAndDivisionsMenu.ResumeLayout(false); this.ResumeLayout(false); this.PerformLayout(); @@ -509,13 +425,9 @@ private void InitializeComponent() { private System.Windows.Forms.Label uxStartDateInvoiceLabel; private System.Windows.Forms.Label uxStructuurDepartementen; private System.Windows.Forms.TreeView uxDepartmentsAndDivisions; - private System.Windows.Forms.Label label3; - private System.Windows.Forms.Label label2; private System.Windows.Forms.Label label1; private System.Windows.Forms.Label uxUnknown; private System.Windows.Forms.Label uxLegendDepartmentsAndDivisions; - private System.Windows.Forms.Label label5; - private System.Windows.Forms.Label label4; private System.Windows.Forms.Label label6; private System.Windows.Forms.Label uxFilterType; private System.Windows.Forms.Label label9; diff --git a/Source/Frontend/Kostenverdeling.Desktop.WinFormsClient/Wizard/ImportWizard/ImportWizardStep02_SelectExcelFile_View.cs b/Source/Frontend/Kostenverdeling.Desktop.WinFormsClient/Wizard/ImportWizard/ImportWizardStep02_SelectExcelFile_View.cs index 4305d51..15af1b1 100644 --- a/Source/Frontend/Kostenverdeling.Desktop.WinFormsClient/Wizard/ImportWizard/ImportWizardStep02_SelectExcelFile_View.cs +++ b/Source/Frontend/Kostenverdeling.Desktop.WinFormsClient/Wizard/ImportWizard/ImportWizardStep02_SelectExcelFile_View.cs @@ -189,6 +189,7 @@ private void RefreshDepartmentsAndDivisions() { } } } + uxDepartmentsAndDivisions.ExpandAll(); } private void _bgWorker_RunWorkerCompleted(object sender, RunWorkerCompletedEventArgs e) { @@ -264,25 +265,25 @@ private void _bgWorker_DoWork(object sender, DoWorkEventArgs e) { } private void uxToggleIgnoreIncludeDepartmentsAndDivisions_Click(object sender, EventArgs e) { - var selectedNode = uxDepartmentsAndDivisions.SelectedNode; - if(selectedNode != null) { - if(selectedNode.Level == 0) { - // Dept - var department = _result.DepartmentRepository.GetDepartment(Int32.Parse(selectedNode.Tag.ToString())); - department.CanIgnore = !department.CanIgnore; - foreach(var division in department.Divisions) { - division.CanIgnore = !division.CanIgnore; - } - } - if(selectedNode.Level == 1) { - // Div - var department = _result.DepartmentRepository.GetDepartment(Int32.Parse(selectedNode.Parent.Tag.ToString())); - var division = _result.DepartmentRepository.GetDivision(Int32.Parse(selectedNode.Tag.ToString()), department); - division.CanIgnore = !division.CanIgnore; - } - } + //var selectedNode = uxDepartmentsAndDivisions.SelectedNode; + //if(selectedNode != null) { + // if(selectedNode.Level == 0) { + // // Dept + // var department = _result.DepartmentRepository.GetDepartment(Int32.Parse(selectedNode.Tag.ToString())); + // department.CanIgnore = !department.CanIgnore; + // foreach(var division in department.Divisions) { + // division.CanIgnore = !division.CanIgnore; + // } + // } + // if(selectedNode.Level == 1) { + // // Div + // var department = _result.DepartmentRepository.GetDepartment(Int32.Parse(selectedNode.Parent.Tag.ToString())); + // var division = _result.DepartmentRepository.GetDivision(Int32.Parse(selectedNode.Tag.ToString()), department); + // division.CanIgnore = !division.CanIgnore; + // } + //} - RefreshDepartmentsAndDivisions(); + //RefreshDepartmentsAndDivisions(); } private void uxStartDateInvoice_ValueChanged(object sender, EventArgs e) { diff --git a/Source/Frontend/Kostenverdeling.Desktop.WinFormsClient/Wizard/ImportWizard/ImportWizardStep02_SelectExcelFile_View.resx b/Source/Frontend/Kostenverdeling.Desktop.WinFormsClient/Wizard/ImportWizard/ImportWizardStep02_SelectExcelFile_View.resx index 96b1d16..9b9e7d4 100644 --- a/Source/Frontend/Kostenverdeling.Desktop.WinFormsClient/Wizard/ImportWizard/ImportWizardStep02_SelectExcelFile_View.resx +++ b/Source/Frontend/Kostenverdeling.Desktop.WinFormsClient/Wizard/ImportWizard/ImportWizardStep02_SelectExcelFile_View.resx @@ -120,9 +120,6 @@ Selecteer het EXCEL bestand van de E-Blox export met de knop "Bladeren". Het programma zal daarna het EXCEL bestand verwerken zodat u kan zien met welke gegevens u werkt. Indien de gegevens niet correct zijn kan je steeds een ander EXCEL bestand selecteren. - - Selecteer een bedrijf of project en klik daarna met de rechtermuis om het uitklapmenu te tonen. Druk op "Negeren / Meenemen" om een project mee te nemen in de bereking of niet. Wanneer u klaar bent met de configuratie kan u naar de volgende stap gaan. - 17, 17