diff --git a/AA-Forms/CustomInputBox.cs b/AA-Forms/CustomInputBox.cs index 689ed17..c626372 100644 --- a/AA-Forms/CustomInputBox.cs +++ b/AA-Forms/CustomInputBox.cs @@ -54,6 +54,7 @@ namespace Deckungsbeitrag.AA_Forms } private void TextBoxText_Enter(object sender, EventArgs e) { + this.textBoxText.Clear(); this.textBoxText.SelectAll(); } @@ -83,7 +84,7 @@ namespace Deckungsbeitrag.AA_Forms { MessageBox.Show("Bitte nur ganze Zahlen eingeben.", "Fehler", MessageBoxButtons.OK, MessageBoxIcon.Error); e.Cancel = true; - this.textBoxText.SelectAll(); + this.textBoxText.Clear(); } } else diff --git a/AA-Forms/FormAuftragDetail.Designer.cs b/AA-Forms/FormAuftragDetail.Designer.cs index 9f9bdeb..19fab90 100644 --- a/AA-Forms/FormAuftragDetail.Designer.cs +++ b/AA-Forms/FormAuftragDetail.Designer.cs @@ -252,7 +252,7 @@ this.comboBoxPriority.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.comboBoxPriority.FormattingEnabled = true; this.comboBoxPriority.Location = new System.Drawing.Point(121, 249); - this.comboBoxPriority.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.comboBoxPriority.Margin = new System.Windows.Forms.Padding(4); this.comboBoxPriority.Name = "comboBoxPriority"; this.comboBoxPriority.Size = new System.Drawing.Size(348, 37); this.comboBoxPriority.TabIndex = 41; @@ -263,11 +263,12 @@ this.comboBoxFahrer.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.comboBoxFahrer.FormattingEnabled = true; this.comboBoxFahrer.Location = new System.Drawing.Point(121, 192); - this.comboBoxFahrer.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.comboBoxFahrer.Margin = new System.Windows.Forms.Padding(4); this.comboBoxFahrer.Name = "comboBoxFahrer"; this.comboBoxFahrer.Size = new System.Drawing.Size(348, 37); this.comboBoxFahrer.TabIndex = 42; this.comboBoxFahrer.SelectedValueChanged += new System.EventHandler(this.ComboBox_SelectedValueChanged); + this.comboBoxFahrer.Leave += new System.EventHandler(this.ComboBoxFahrer_Leave); // // pictureBoxDirtMinus // @@ -353,7 +354,7 @@ this.oLVArtikel.GridLines = true; this.oLVArtikel.HideSelection = false; this.oLVArtikel.Location = new System.Drawing.Point(493, 78); - this.oLVArtikel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.oLVArtikel.Margin = new System.Windows.Forms.Padding(4); this.oLVArtikel.Name = "oLVArtikel"; this.oLVArtikel.ShowImagesOnSubItems = true; this.oLVArtikel.Size = new System.Drawing.Size(601, 521); @@ -375,7 +376,7 @@ this.buttonKundeInfo.Font = new System.Drawing.Font("Microsoft Sans Serif", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.buttonKundeInfo.ForeColor = System.Drawing.Color.White; this.buttonKundeInfo.Location = new System.Drawing.Point(21, 620); - this.buttonKundeInfo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.buttonKundeInfo.Margin = new System.Windows.Forms.Padding(4); this.buttonKundeInfo.MinimumSize = new System.Drawing.Size(51, 50); this.buttonKundeInfo.Name = "buttonKundeInfo"; this.buttonKundeInfo.Size = new System.Drawing.Size(51, 50); diff --git a/AA-Forms/FormAuftragDetail.cs b/AA-Forms/FormAuftragDetail.cs index 577cc9c..b1a49b7 100644 --- a/AA-Forms/FormAuftragDetail.cs +++ b/AA-Forms/FormAuftragDetail.cs @@ -35,6 +35,8 @@ namespace Deckungsbeitrag bool etikettgedruckt = false; bool zahlenChanged = false; bool infoOpen = false; + private Saison saison = Saison.GetAktivSaison(); + //WENN AUFTRAG SPEICHERN @@ -83,7 +85,6 @@ namespace Deckungsbeitrag this.auftrag = auftrag; this.benutzer = benutzer; } - public FormAuftragDetail(Auftrag auftrag, Benutzer benutzer, List kndartListe) : this(auftrag, benutzer) { this.kndartListe = kndartListe; @@ -101,8 +102,10 @@ namespace Deckungsbeitrag this.labelContainer.Text = auftrag.ContainerClean.ToString(); this.labelContDirt.Text = auftrag.Container.ToString(); this.textBoxZusatz.Text = $"{auftrag.ZusatzInfo}\n{this.kunde.Anmerkung}\n{Aufgabe.GetAufgabe(null, this.kunde.Aufgabe).Bezeichnung}"; - if (auftrag.Fahrer == null) this.comboBoxFahrer.SelectedIndex = -1; - else this.comboBoxFahrer.SelectedValue = auftrag.Fahrer; + //if (auftrag.Fahrer == null) this.comboBoxFahrer.SelectedIndex = -1; + //else this.comboBoxFahrer.SelectedValue = auftrag.Fahrer; + if (auftrag.TourID == null) this.comboBoxFahrer.SelectedIndex = -1; + else this.comboBoxFahrer.SelectedValue = auftrag.TourID; this.comboBoxPriority.SelectedItem = auftrag.Priority; // Events nach dem Laden der Daten wieder den ComboBoxen zuweisen. @@ -113,15 +116,16 @@ namespace Deckungsbeitrag { case AuftragTyp.Inventur: { - if (this.auftrag.Status == AuftragStatus.Herrichten) Load_OLV(); - else - { - if (this.auftrag.Status == AuftragStatus.Warten) - { - buttonFertig.Visible = false; //TODO: Speichern der Inventur prüfen wenn Button nicht Visible ist. - Load_UCInventur(this.auftrag); - } - } + Load_OLV(); + //if (this.auftrag.Status == AuftragStatus.Herrichten) Load_OLV(); + //else + //{ + // if (this.auftrag.Status == AuftragStatus.Warten) + // { + // buttonFertig.Visible = false; //TODO: Speichern der Inventur prüfen wenn Button nicht Visible ist. + // Load_UCInventur(this.auftrag); + // } + //} } break; case AuftragTyp.SOLL_Erhoehung: Load_OLV(); @@ -210,9 +214,14 @@ namespace Deckungsbeitrag this.comboBoxFahrer.SelectedValueChanged -= ComboBox_SelectedValueChanged; this.comboBoxPriority.SelectedValueChanged -= ComboBox_SelectedValueChanged; - List benutzerliste = Benutzer.GetFahrerList(); - this.comboBoxFahrer.DataSource = benutzerliste; - this.comboBoxFahrer.ValueMember = "BenutzerName"; + List liste = Tour.GetSaisonListe(saison); + this.comboBoxFahrer.DataSource = liste; + this.comboBoxFahrer.DisplayMember = "Bezeichnung"; + this.comboBoxFahrer.ValueMember = "TourID"; + + //List benutzerliste = Benutzer.GetFahrerList(); + //this.comboBoxFahrer.DataSource = benutzerliste; + //this.comboBoxFahrer.ValueMember = "BenutzerName"; this.comboBoxPriority.DataSource = Enum.GetValues(typeof(Priority)); } @@ -232,7 +241,8 @@ namespace Deckungsbeitrag auftrag.Liefertag = dTPLiefertag.Value; auftrag.ContainerClean = int.Parse(this.labelContainer.Text); auftrag.Container = int.Parse(this.labelContDirt.Text); - auftrag.ArbeiterID = this.comboBoxFahrer.SelectedIndex == -1 ? null : ((Benutzer)this.comboBoxFahrer.SelectedItem).BenutzerID; + //auftrag.ArbeiterID = this.comboBoxFahrer.SelectedIndex == -1 ? null : ((Benutzer)this.comboBoxFahrer.SelectedItem).BenutzerID; + auftrag.TourID = this.comboBoxFahrer.SelectedIndex == -1 ? null : (int?)this.comboBoxFahrer.SelectedValue; auftrag.Priority = this.comboBoxPriority.SelectedIndex == -1 ? Priority.None : ((Priority)this.comboBoxPriority.SelectedItem); auftrag.ZusatzInfo = this.textBoxZusatz.Text; auftrag.Save(); @@ -251,15 +261,15 @@ namespace Deckungsbeitrag { KundeArtikel kndart = KundeArtikel.GetItem(kvp.Key); - if (kndart.Korrektur > 0 & kvp.Value[3] > 0) + if (kndart.Korrektur > 0) { kndart.Korrektur -= kvp.Value[3]; kndart.KorrekturBearbeitet = this.benutzer.BenutzerName + " am " + DateTime.Now.ToString(); } kndart.Save(); } + goto default; } - break; case AuftragTyp.SOLL_Verminderung: { foreach (var kvp in dictionary) @@ -420,6 +430,11 @@ namespace Deckungsbeitrag //AUFTRAG ABSCHLIESSEN private void ButtonFertig_Click(object sender, EventArgs e) { + if (!this.dTPLiefertag.Checked) + { + MessageBox.Show("Liefertag muss ausgewählt und angehakt werden.", "FEHLER", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } if (this.kndartListe != null) { foreach (OLVListItem item in this.oLVArtikel.Items) @@ -527,7 +542,11 @@ namespace Deckungsbeitrag this.DialogResult = DialogResult.OK; this.Close(); } - else this.Close(); + else + { + this.DialogResult = DialogResult.OK; + this.Close(); + } } @@ -869,6 +888,13 @@ namespace Deckungsbeitrag } e.Cancel = true; } + + private void ComboBoxFahrer_Leave(object sender, EventArgs e) + { + if (this.comboBoxFahrer.SelectedIndex == -1) return; + Tour tour = Tour.FindeTour((int?)this.comboBoxFahrer.SelectedValue, null, null); + this.comboBoxPriority.SelectedItem = tour.Priority; + } } } //CHANGES: 1. Es wird ab sofort nur ein Button zum Speichern und Abschließen bereitgestellt. System entscheidet was getan wird. diff --git a/AA-Forms/FormEinstellung.Designer.cs b/AA-Forms/FormEinstellung.Designer.cs index 970dc4f..a27cc82 100644 --- a/AA-Forms/FormEinstellung.Designer.cs +++ b/AA-Forms/FormEinstellung.Designer.cs @@ -78,9 +78,13 @@ this.comboBoxSWSDrucker = new System.Windows.Forms.ComboBox(); this.comboBoxEtikettDrucker = new System.Windows.Forms.ComboBox(); this.groupBoxDrucker = new System.Windows.Forms.GroupBox(); + this.comboBoxTourenlisteDrucker = new System.Windows.Forms.ComboBox(); + this.label24 = new System.Windows.Forms.Label(); this.numericUpDownSWSKopien = new System.Windows.Forms.NumericUpDown(); this.label1 = new System.Windows.Forms.Label(); this.tabControlEinstellung = new System.Windows.Forms.TabControl(); + this.tabPageAllgemein = new System.Windows.Forms.TabPage(); + this.groupBoxPfade = new System.Windows.Forms.GroupBox(); this.tabPageFarben = new System.Windows.Forms.TabPage(); this.tabPageDeckungsbeitrag = new System.Windows.Forms.TabPage(); this.tabPageDrucker = new System.Windows.Forms.TabPage(); @@ -103,12 +107,14 @@ this.comboBoxLieferrhythmus = new System.Windows.Forms.ComboBox(); this.label16 = new System.Windows.Forms.Label(); this.label15 = new System.Windows.Forms.Label(); - this.tabPageAllgemein = new System.Windows.Forms.TabPage(); - this.panelButtons = new System.Windows.Forms.Panel(); - this.comboBoxTourenlisteDrucker = new System.Windows.Forms.ComboBox(); - this.label24 = new System.Windows.Forms.Label(); - this.groupBoxPfade = new System.Windows.Forms.GroupBox(); this.tabPageExpedit = new System.Windows.Forms.TabPage(); + this.panelButtons = new System.Windows.Forms.Panel(); + this.groupBox2 = new System.Windows.Forms.GroupBox(); + this.textBoxApiKey = new System.Windows.Forms.TextBox(); + this.textBoxToken = new System.Windows.Forms.TextBox(); + this.label25 = new System.Windows.Forms.Label(); + this.label26 = new System.Windows.Forms.Label(); + this.buttonSaveCredentials = new System.Windows.Forms.Button(); ((System.ComponentModel.ISupportInitialize)(this.numUpDownMinWert)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.numUpDownMaxWert)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.numUpDownAnzahl)).BeginInit(); @@ -117,14 +123,15 @@ this.groupBoxDrucker.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDownSWSKopien)).BeginInit(); this.tabControlEinstellung.SuspendLayout(); + this.tabPageAllgemein.SuspendLayout(); + this.groupBoxPfade.SuspendLayout(); this.tabPageFarben.SuspendLayout(); this.tabPageDeckungsbeitrag.SuspendLayout(); this.tabPageDrucker.SuspendLayout(); this.tabPageTourenplanung.SuspendLayout(); this.groupBoxRegeln.SuspendLayout(); - this.tabPageAllgemein.SuspendLayout(); this.panelButtons.SuspendLayout(); - this.groupBoxPfade.SuspendLayout(); + this.groupBox2.SuspendLayout(); this.SuspendLayout(); // // buttonVarKost @@ -136,10 +143,10 @@ this.buttonVarKost.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.buttonVarKost.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.buttonVarKost.ForeColor = System.Drawing.Color.White; - this.buttonVarKost.Location = new System.Drawing.Point(10, 214); - this.buttonVarKost.Margin = new System.Windows.Forms.Padding(2); + this.buttonVarKost.Location = new System.Drawing.Point(13, 263); + this.buttonVarKost.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.buttonVarKost.Name = "buttonVarKost"; - this.buttonVarKost.Size = new System.Drawing.Size(160, 24); + this.buttonVarKost.Size = new System.Drawing.Size(213, 30); this.buttonVarKost.TabIndex = 0; this.buttonVarKost.Text = "Variable Kosten"; this.buttonVarKost.UseVisualStyleBackColor = false; @@ -148,10 +155,10 @@ // textBoxVarKosten // this.textBoxVarKosten.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.textBoxVarKosten.Location = new System.Drawing.Point(202, 214); - this.textBoxVarKosten.Margin = new System.Windows.Forms.Padding(2); + this.textBoxVarKosten.Location = new System.Drawing.Point(269, 263); + this.textBoxVarKosten.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.textBoxVarKosten.Name = "textBoxVarKosten"; - this.textBoxVarKosten.Size = new System.Drawing.Size(234, 26); + this.textBoxVarKosten.Size = new System.Drawing.Size(311, 30); this.textBoxVarKosten.TabIndex = 1; this.textBoxVarKosten.Visible = false; // @@ -161,10 +168,10 @@ this.buttonVarSpeichern.FlatAppearance.BorderSize = 0; this.buttonVarSpeichern.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.buttonVarSpeichern.Image = ((System.Drawing.Image)(resources.GetObject("buttonVarSpeichern.Image"))); - this.buttonVarSpeichern.Location = new System.Drawing.Point(175, 214); - this.buttonVarSpeichern.Margin = new System.Windows.Forms.Padding(2); + this.buttonVarSpeichern.Location = new System.Drawing.Point(233, 263); + this.buttonVarSpeichern.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.buttonVarSpeichern.Name = "buttonVarSpeichern"; - this.buttonVarSpeichern.Size = new System.Drawing.Size(22, 24); + this.buttonVarSpeichern.Size = new System.Drawing.Size(29, 30); this.buttonVarSpeichern.TabIndex = 2; this.buttonVarSpeichern.UseVisualStyleBackColor = false; this.buttonVarSpeichern.Visible = false; @@ -176,10 +183,10 @@ this.buttonFixLohnSpeichern.FlatAppearance.BorderSize = 0; this.buttonFixLohnSpeichern.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.buttonFixLohnSpeichern.Image = ((System.Drawing.Image)(resources.GetObject("buttonFixLohnSpeichern.Image"))); - this.buttonFixLohnSpeichern.Location = new System.Drawing.Point(175, 243); - this.buttonFixLohnSpeichern.Margin = new System.Windows.Forms.Padding(2); + this.buttonFixLohnSpeichern.Location = new System.Drawing.Point(233, 299); + this.buttonFixLohnSpeichern.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.buttonFixLohnSpeichern.Name = "buttonFixLohnSpeichern"; - this.buttonFixLohnSpeichern.Size = new System.Drawing.Size(22, 24); + this.buttonFixLohnSpeichern.Size = new System.Drawing.Size(29, 30); this.buttonFixLohnSpeichern.TabIndex = 5; this.buttonFixLohnSpeichern.UseVisualStyleBackColor = false; this.buttonFixLohnSpeichern.Visible = false; @@ -188,10 +195,10 @@ // textBoxFixLohnKosten // this.textBoxFixLohnKosten.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.textBoxFixLohnKosten.Location = new System.Drawing.Point(202, 243); - this.textBoxFixLohnKosten.Margin = new System.Windows.Forms.Padding(2); + this.textBoxFixLohnKosten.Location = new System.Drawing.Point(269, 299); + this.textBoxFixLohnKosten.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.textBoxFixLohnKosten.Name = "textBoxFixLohnKosten"; - this.textBoxFixLohnKosten.Size = new System.Drawing.Size(234, 26); + this.textBoxFixLohnKosten.Size = new System.Drawing.Size(311, 30); this.textBoxFixLohnKosten.TabIndex = 4; this.textBoxFixLohnKosten.Visible = false; // @@ -204,10 +211,10 @@ this.buttonFixLohnKosten.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.buttonFixLohnKosten.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.buttonFixLohnKosten.ForeColor = System.Drawing.Color.White; - this.buttonFixLohnKosten.Location = new System.Drawing.Point(10, 243); - this.buttonFixLohnKosten.Margin = new System.Windows.Forms.Padding(2); + this.buttonFixLohnKosten.Location = new System.Drawing.Point(13, 299); + this.buttonFixLohnKosten.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.buttonFixLohnKosten.Name = "buttonFixLohnKosten"; - this.buttonFixLohnKosten.Size = new System.Drawing.Size(160, 24); + this.buttonFixLohnKosten.Size = new System.Drawing.Size(213, 30); this.buttonFixLohnKosten.TabIndex = 3; this.buttonFixLohnKosten.Text = "Fix Lohn Kosten"; this.buttonFixLohnKosten.UseVisualStyleBackColor = false; @@ -219,10 +226,10 @@ this.buttonFixMietSpeichern.FlatAppearance.BorderSize = 0; this.buttonFixMietSpeichern.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.buttonFixMietSpeichern.Image = ((System.Drawing.Image)(resources.GetObject("buttonFixMietSpeichern.Image"))); - this.buttonFixMietSpeichern.Location = new System.Drawing.Point(175, 273); - this.buttonFixMietSpeichern.Margin = new System.Windows.Forms.Padding(2); + this.buttonFixMietSpeichern.Location = new System.Drawing.Point(233, 336); + this.buttonFixMietSpeichern.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.buttonFixMietSpeichern.Name = "buttonFixMietSpeichern"; - this.buttonFixMietSpeichern.Size = new System.Drawing.Size(22, 24); + this.buttonFixMietSpeichern.Size = new System.Drawing.Size(29, 30); this.buttonFixMietSpeichern.TabIndex = 8; this.buttonFixMietSpeichern.UseVisualStyleBackColor = false; this.buttonFixMietSpeichern.Visible = false; @@ -231,10 +238,10 @@ // textBoxFixMietKosten // this.textBoxFixMietKosten.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.textBoxFixMietKosten.Location = new System.Drawing.Point(202, 273); - this.textBoxFixMietKosten.Margin = new System.Windows.Forms.Padding(2); + this.textBoxFixMietKosten.Location = new System.Drawing.Point(269, 336); + this.textBoxFixMietKosten.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.textBoxFixMietKosten.Name = "textBoxFixMietKosten"; - this.textBoxFixMietKosten.Size = new System.Drawing.Size(234, 26); + this.textBoxFixMietKosten.Size = new System.Drawing.Size(311, 30); this.textBoxFixMietKosten.TabIndex = 7; this.textBoxFixMietKosten.Visible = false; // @@ -247,10 +254,10 @@ this.buttonFixMietKosten.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.buttonFixMietKosten.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.buttonFixMietKosten.ForeColor = System.Drawing.Color.White; - this.buttonFixMietKosten.Location = new System.Drawing.Point(10, 273); - this.buttonFixMietKosten.Margin = new System.Windows.Forms.Padding(2); + this.buttonFixMietKosten.Location = new System.Drawing.Point(13, 336); + this.buttonFixMietKosten.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.buttonFixMietKosten.Name = "buttonFixMietKosten"; - this.buttonFixMietKosten.Size = new System.Drawing.Size(160, 24); + this.buttonFixMietKosten.Size = new System.Drawing.Size(213, 30); this.buttonFixMietKosten.TabIndex = 6; this.buttonFixMietKosten.Text = "Fix Miet Kosten"; this.buttonFixMietKosten.UseVisualStyleBackColor = false; @@ -265,10 +272,10 @@ this.buttonColNeg.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.buttonColNeg.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.buttonColNeg.ForeColor = System.Drawing.Color.White; - this.buttonColNeg.Location = new System.Drawing.Point(4, 35); - this.buttonColNeg.Margin = new System.Windows.Forms.Padding(2); + this.buttonColNeg.Location = new System.Drawing.Point(5, 43); + this.buttonColNeg.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.buttonColNeg.Name = "buttonColNeg"; - this.buttonColNeg.Size = new System.Drawing.Size(160, 41); + this.buttonColNeg.Size = new System.Drawing.Size(213, 50); this.buttonColNeg.TabIndex = 9; this.buttonColNeg.Text = "Farbe Negativsumme"; this.buttonColNeg.UseVisualStyleBackColor = false; @@ -283,10 +290,10 @@ this.buttonColPos.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.buttonColPos.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.buttonColPos.ForeColor = System.Drawing.Color.White; - this.buttonColPos.Location = new System.Drawing.Point(170, 35); - this.buttonColPos.Margin = new System.Windows.Forms.Padding(2); + this.buttonColPos.Location = new System.Drawing.Point(227, 43); + this.buttonColPos.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.buttonColPos.Name = "buttonColPos"; - this.buttonColPos.Size = new System.Drawing.Size(160, 41); + this.buttonColPos.Size = new System.Drawing.Size(213, 50); this.buttonColPos.TabIndex = 10; this.buttonColPos.Text = "Farbe Positivsumme"; this.buttonColPos.UseVisualStyleBackColor = false; @@ -301,10 +308,10 @@ this.buttonColEqu.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.buttonColEqu.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.buttonColEqu.ForeColor = System.Drawing.Color.White; - this.buttonColEqu.Location = new System.Drawing.Point(334, 35); - this.buttonColEqu.Margin = new System.Windows.Forms.Padding(2); + this.buttonColEqu.Location = new System.Drawing.Point(445, 43); + this.buttonColEqu.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.buttonColEqu.Name = "buttonColEqu"; - this.buttonColEqu.Size = new System.Drawing.Size(160, 41); + this.buttonColEqu.Size = new System.Drawing.Size(213, 50); this.buttonColEqu.TabIndex = 11; this.buttonColEqu.Text = "Farbe Nullsumme"; this.buttonColEqu.UseVisualStyleBackColor = false; @@ -314,10 +321,9 @@ // this.label2.AutoSize = true; this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 16.2F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label2.Location = new System.Drawing.Point(5, 178); - this.label2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label2.Location = new System.Drawing.Point(7, 219); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(286, 26); + this.label2.Size = new System.Drawing.Size(363, 32); this.label2.TabIndex = 13; this.label2.Text = "Konto Nr. für Kostenstelle"; // @@ -325,10 +331,9 @@ // this.label3.AutoSize = true; this.label3.Font = new System.Drawing.Font("Microsoft Sans Serif", 16.2F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label3.Location = new System.Drawing.Point(5, 28); - this.label3.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label3.Location = new System.Drawing.Point(7, 34); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(81, 26); + this.label3.Size = new System.Drawing.Size(103, 32); this.label3.TabIndex = 14; this.label3.Text = "Rating"; // @@ -342,15 +347,15 @@ 0, 0, 0}); - this.numUpDownMinWert.Location = new System.Drawing.Point(10, 88); - this.numUpDownMinWert.Margin = new System.Windows.Forms.Padding(2); + this.numUpDownMinWert.Location = new System.Drawing.Point(13, 108); + this.numUpDownMinWert.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.numUpDownMinWert.Maximum = new decimal(new int[] { 1000000, 0, 0, 0}); this.numUpDownMinWert.Name = "numUpDownMinWert"; - this.numUpDownMinWert.Size = new System.Drawing.Size(112, 26); + this.numUpDownMinWert.Size = new System.Drawing.Size(149, 30); this.numUpDownMinWert.TabIndex = 15; this.numUpDownMinWert.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; this.numUpDownMinWert.ThousandsSeparator = true; @@ -365,15 +370,15 @@ 0, 0, 0}); - this.numUpDownMaxWert.Location = new System.Drawing.Point(127, 88); - this.numUpDownMaxWert.Margin = new System.Windows.Forms.Padding(2); + this.numUpDownMaxWert.Location = new System.Drawing.Point(169, 108); + this.numUpDownMaxWert.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.numUpDownMaxWert.Maximum = new decimal(new int[] { 1000000, 0, 0, 0}); this.numUpDownMaxWert.Name = "numUpDownMaxWert"; - this.numUpDownMaxWert.Size = new System.Drawing.Size(112, 26); + this.numUpDownMaxWert.Size = new System.Drawing.Size(149, 30); this.numUpDownMaxWert.TabIndex = 16; this.numUpDownMaxWert.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; this.numUpDownMaxWert.ThousandsSeparator = true; @@ -381,15 +386,15 @@ // numUpDownAnzahl // this.numUpDownAnzahl.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.numUpDownAnzahl.Location = new System.Drawing.Point(244, 88); - this.numUpDownAnzahl.Margin = new System.Windows.Forms.Padding(2); + this.numUpDownAnzahl.Location = new System.Drawing.Point(325, 108); + this.numUpDownAnzahl.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.numUpDownAnzahl.Maximum = new decimal(new int[] { 20, 0, 0, 0}); this.numUpDownAnzahl.Name = "numUpDownAnzahl"; - this.numUpDownAnzahl.Size = new System.Drawing.Size(73, 26); + this.numUpDownAnzahl.Size = new System.Drawing.Size(97, 30); this.numUpDownAnzahl.TabIndex = 17; this.numUpDownAnzahl.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; // @@ -397,10 +402,9 @@ // this.label6.AutoSize = true; this.label6.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label6.Location = new System.Drawing.Point(241, 69); - this.label6.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label6.Location = new System.Drawing.Point(321, 85); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(51, 17); + this.label6.Size = new System.Drawing.Size(60, 20); this.label6.TabIndex = 20; this.label6.Text = "Anzahl"; // @@ -408,10 +412,10 @@ // this.checkBoxMinWert.AutoSize = true; this.checkBoxMinWert.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.checkBoxMinWert.Location = new System.Drawing.Point(10, 66); - this.checkBoxMinWert.Margin = new System.Windows.Forms.Padding(2); + this.checkBoxMinWert.Location = new System.Drawing.Point(13, 81); + this.checkBoxMinWert.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.checkBoxMinWert.Name = "checkBoxMinWert"; - this.checkBoxMinWert.Size = new System.Drawing.Size(87, 21); + this.checkBoxMinWert.Size = new System.Drawing.Size(103, 24); this.checkBoxMinWert.TabIndex = 21; this.checkBoxMinWert.Text = "Min. Wert"; this.checkBoxMinWert.UseVisualStyleBackColor = true; @@ -421,10 +425,10 @@ // this.checkBoxMaxWert.AutoSize = true; this.checkBoxMaxWert.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.checkBoxMaxWert.Location = new System.Drawing.Point(127, 66); - this.checkBoxMaxWert.Margin = new System.Windows.Forms.Padding(2); + this.checkBoxMaxWert.Location = new System.Drawing.Point(169, 81); + this.checkBoxMaxWert.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.checkBoxMaxWert.Name = "checkBoxMaxWert"; - this.checkBoxMaxWert.Size = new System.Drawing.Size(90, 21); + this.checkBoxMaxWert.Size = new System.Drawing.Size(107, 24); this.checkBoxMaxWert.TabIndex = 22; this.checkBoxMaxWert.Text = "Max. Wert"; this.checkBoxMaxWert.UseVisualStyleBackColor = true; @@ -433,10 +437,9 @@ // label5 // this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(87, 39); - this.label5.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label5.Location = new System.Drawing.Point(116, 48); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(185, 13); + this.label5.Size = new System.Drawing.Size(231, 16); this.label5.TabIndex = 24; this.label5.Text = "Regelt die Sterneverteilung im Rating."; // @@ -446,11 +449,11 @@ this.groupBox1.Controls.Add(this.label9); this.groupBox1.Controls.Add(this.label8); this.groupBox1.Controls.Add(this.label7); - this.groupBox1.Location = new System.Drawing.Point(340, 28); - this.groupBox1.Margin = new System.Windows.Forms.Padding(2); + this.groupBox1.Location = new System.Drawing.Point(453, 34); + this.groupBox1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Padding = new System.Windows.Forms.Padding(2); - this.groupBox1.Size = new System.Drawing.Size(330, 84); + this.groupBox1.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.groupBox1.Size = new System.Drawing.Size(440, 103); this.groupBox1.TabIndex = 25; this.groupBox1.TabStop = false; // @@ -458,50 +461,45 @@ // this.label10.AutoSize = true; this.label10.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label10.Location = new System.Drawing.Point(4, 65); - this.label10.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label10.Location = new System.Drawing.Point(5, 80); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(331, 13); + this.label10.Size = new System.Drawing.Size(390, 16); this.label10.TabIndex = 3; this.label10.Text = "Wenn nicht angehackt wird Wert automatisch berechnet."; // // label9 // this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(4, 49); - this.label9.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label9.Location = new System.Drawing.Point(5, 60); this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(233, 13); + this.label9.Size = new System.Drawing.Size(288, 16); this.label9.TabIndex = 2; this.label9.Text = "-> Anzahl: Maximal mögliche Anzahl an Sternen."; // // label8 // this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(4, 32); - this.label8.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label8.Location = new System.Drawing.Point(5, 39); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(329, 13); + this.label8.Size = new System.Drawing.Size(404, 16); this.label8.TabIndex = 1; this.label8.Text = "-> Max.Wert: Alle Werte darüber werden mit Max. Sternen versehen."; // // label7 // this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(4, 16); - this.label7.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label7.Location = new System.Drawing.Point(5, 20); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(306, 13); + this.label7.Size = new System.Drawing.Size(373, 16); this.label7.TabIndex = 0; this.label7.Text = "-> Min.Wert: Alle Wert darunter werden mit 0 Sternen versehen."; // // label11 // this.label11.AutoSize = true; - this.label11.Location = new System.Drawing.Point(302, 189); - this.label11.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label11.Location = new System.Drawing.Point(403, 233); this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(275, 13); + this.label11.Size = new System.Drawing.Size(335, 16); this.label11.TabIndex = 26; this.label11.Text = "KontoNr. zu einer Kostenstelle für den Import hinzufügen."; // @@ -509,20 +507,19 @@ // this.label12.AutoSize = true; this.label12.Font = new System.Drawing.Font("Microsoft Sans Serif", 16.2F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label12.Location = new System.Drawing.Point(5, 123); - this.label12.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label12.Location = new System.Drawing.Point(7, 151); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(182, 26); + this.label12.Size = new System.Drawing.Size(231, 32); this.label12.TabIndex = 27; this.label12.Text = "DokumentPfade"; // // textBoxSortiment // this.textBoxSortiment.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.textBoxSortiment.Location = new System.Drawing.Point(170, 34); - this.textBoxSortiment.Margin = new System.Windows.Forms.Padding(2); + this.textBoxSortiment.Location = new System.Drawing.Point(227, 42); + this.textBoxSortiment.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.textBoxSortiment.Name = "textBoxSortiment"; - this.textBoxSortiment.Size = new System.Drawing.Size(422, 26); + this.textBoxSortiment.Size = new System.Drawing.Size(561, 30); this.textBoxSortiment.TabIndex = 28; this.textBoxSortiment.Visible = false; this.textBoxSortiment.TextChanged += new System.EventHandler(this.TextBox_TextChanged); @@ -532,10 +529,10 @@ // textBoxRatingbild // this.textBoxRatingbild.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.textBoxRatingbild.Location = new System.Drawing.Point(170, 63); - this.textBoxRatingbild.Margin = new System.Windows.Forms.Padding(2); + this.textBoxRatingbild.Location = new System.Drawing.Point(227, 78); + this.textBoxRatingbild.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.textBoxRatingbild.Name = "textBoxRatingbild"; - this.textBoxRatingbild.Size = new System.Drawing.Size(422, 26); + this.textBoxRatingbild.Size = new System.Drawing.Size(561, 30); this.textBoxRatingbild.TabIndex = 30; this.textBoxRatingbild.Visible = false; this.textBoxRatingbild.TextChanged += new System.EventHandler(this.TextBox_TextChanged); @@ -551,10 +548,10 @@ this.buttonSortiment.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.buttonSortiment.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.buttonSortiment.ForeColor = System.Drawing.Color.White; - this.buttonSortiment.Location = new System.Drawing.Point(5, 34); - this.buttonSortiment.Margin = new System.Windows.Forms.Padding(2); + this.buttonSortiment.Location = new System.Drawing.Point(7, 42); + this.buttonSortiment.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.buttonSortiment.Name = "buttonSortiment"; - this.buttonSortiment.Size = new System.Drawing.Size(160, 24); + this.buttonSortiment.Size = new System.Drawing.Size(213, 30); this.buttonSortiment.TabIndex = 32; this.buttonSortiment.Text = "Sortiment"; this.buttonSortiment.UseVisualStyleBackColor = false; @@ -569,10 +566,10 @@ this.buttonRatingbild.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.buttonRatingbild.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.buttonRatingbild.ForeColor = System.Drawing.Color.White; - this.buttonRatingbild.Location = new System.Drawing.Point(5, 63); - this.buttonRatingbild.Margin = new System.Windows.Forms.Padding(2); + this.buttonRatingbild.Location = new System.Drawing.Point(7, 78); + this.buttonRatingbild.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.buttonRatingbild.Name = "buttonRatingbild"; - this.buttonRatingbild.Size = new System.Drawing.Size(160, 24); + this.buttonRatingbild.Size = new System.Drawing.Size(213, 30); this.buttonRatingbild.TabIndex = 33; this.buttonRatingbild.Text = "Ratingbild"; this.buttonRatingbild.UseVisualStyleBackColor = false; @@ -588,10 +585,10 @@ this.buttonSpeichern.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.buttonSpeichern.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.buttonSpeichern.ForeColor = System.Drawing.Color.White; - this.buttonSpeichern.Location = new System.Drawing.Point(856, 10); - this.buttonSpeichern.Margin = new System.Windows.Forms.Padding(2); + this.buttonSpeichern.Location = new System.Drawing.Point(1141, 12); + this.buttonSpeichern.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.buttonSpeichern.Name = "buttonSpeichern"; - this.buttonSpeichern.Size = new System.Drawing.Size(160, 28); + this.buttonSpeichern.Size = new System.Drawing.Size(213, 34); this.buttonSpeichern.TabIndex = 34; this.buttonSpeichern.Text = "Speichern"; this.buttonSpeichern.UseVisualStyleBackColor = false; @@ -608,10 +605,10 @@ this.buttonAbbrechen.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.buttonAbbrechen.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.buttonAbbrechen.ForeColor = System.Drawing.Color.White; - this.buttonAbbrechen.Location = new System.Drawing.Point(1021, 10); - this.buttonAbbrechen.Margin = new System.Windows.Forms.Padding(2); + this.buttonAbbrechen.Location = new System.Drawing.Point(1361, 12); + this.buttonAbbrechen.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.buttonAbbrechen.Name = "buttonAbbrechen"; - this.buttonAbbrechen.Size = new System.Drawing.Size(160, 28); + this.buttonAbbrechen.Size = new System.Drawing.Size(213, 34); this.buttonAbbrechen.TabIndex = 35; this.buttonAbbrechen.Text = "Abbrechen"; this.buttonAbbrechen.UseVisualStyleBackColor = false; @@ -626,10 +623,10 @@ this.buttonBeladeband.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.buttonBeladeband.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.buttonBeladeband.ForeColor = System.Drawing.Color.White; - this.buttonBeladeband.Location = new System.Drawing.Point(4, 80); - this.buttonBeladeband.Margin = new System.Windows.Forms.Padding(2); + this.buttonBeladeband.Location = new System.Drawing.Point(5, 98); + this.buttonBeladeband.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.buttonBeladeband.Name = "buttonBeladeband"; - this.buttonBeladeband.Size = new System.Drawing.Size(160, 41); + this.buttonBeladeband.Size = new System.Drawing.Size(213, 50); this.buttonBeladeband.TabIndex = 36; this.buttonBeladeband.Text = "Farbe Beladeband"; this.buttonBeladeband.UseVisualStyleBackColor = false; @@ -644,10 +641,10 @@ this.buttonTrockner.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.buttonTrockner.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.buttonTrockner.ForeColor = System.Drawing.Color.White; - this.buttonTrockner.Location = new System.Drawing.Point(664, 80); - this.buttonTrockner.Margin = new System.Windows.Forms.Padding(2); + this.buttonTrockner.Location = new System.Drawing.Point(885, 98); + this.buttonTrockner.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.buttonTrockner.Name = "buttonTrockner"; - this.buttonTrockner.Size = new System.Drawing.Size(160, 41); + this.buttonTrockner.Size = new System.Drawing.Size(213, 50); this.buttonTrockner.TabIndex = 37; this.buttonTrockner.Text = "Farbe Trockner"; this.buttonTrockner.UseVisualStyleBackColor = false; @@ -662,10 +659,10 @@ this.buttonHubband.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.buttonHubband.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.buttonHubband.ForeColor = System.Drawing.Color.White; - this.buttonHubband.Location = new System.Drawing.Point(500, 80); - this.buttonHubband.Margin = new System.Windows.Forms.Padding(2); + this.buttonHubband.Location = new System.Drawing.Point(667, 98); + this.buttonHubband.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.buttonHubband.Name = "buttonHubband"; - this.buttonHubband.Size = new System.Drawing.Size(160, 41); + this.buttonHubband.Size = new System.Drawing.Size(213, 50); this.buttonHubband.TabIndex = 38; this.buttonHubband.Text = "Farbe Hubband"; this.buttonHubband.UseVisualStyleBackColor = false; @@ -680,10 +677,10 @@ this.buttonPresse.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.buttonPresse.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.buttonPresse.ForeColor = System.Drawing.Color.White; - this.buttonPresse.Location = new System.Drawing.Point(334, 80); - this.buttonPresse.Margin = new System.Windows.Forms.Padding(2); + this.buttonPresse.Location = new System.Drawing.Point(445, 98); + this.buttonPresse.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.buttonPresse.Name = "buttonPresse"; - this.buttonPresse.Size = new System.Drawing.Size(160, 41); + this.buttonPresse.Size = new System.Drawing.Size(213, 50); this.buttonPresse.TabIndex = 39; this.buttonPresse.Text = "Farbe Presse"; this.buttonPresse.UseVisualStyleBackColor = false; @@ -698,10 +695,10 @@ this.buttonWaschstrasse.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.buttonWaschstrasse.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.buttonWaschstrasse.ForeColor = System.Drawing.Color.White; - this.buttonWaschstrasse.Location = new System.Drawing.Point(170, 80); - this.buttonWaschstrasse.Margin = new System.Windows.Forms.Padding(2); + this.buttonWaschstrasse.Location = new System.Drawing.Point(227, 98); + this.buttonWaschstrasse.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.buttonWaschstrasse.Name = "buttonWaschstrasse"; - this.buttonWaschstrasse.Size = new System.Drawing.Size(160, 41); + this.buttonWaschstrasse.Size = new System.Drawing.Size(213, 50); this.buttonWaschstrasse.TabIndex = 40; this.buttonWaschstrasse.Text = "Farbe Waschstrasse"; this.buttonWaschstrasse.UseVisualStyleBackColor = false; @@ -716,10 +713,10 @@ this.buttonEntladeband.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.buttonEntladeband.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.buttonEntladeband.ForeColor = System.Drawing.Color.White; - this.buttonEntladeband.Location = new System.Drawing.Point(830, 80); - this.buttonEntladeband.Margin = new System.Windows.Forms.Padding(2); + this.buttonEntladeband.Location = new System.Drawing.Point(1107, 98); + this.buttonEntladeband.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.buttonEntladeband.Name = "buttonEntladeband"; - this.buttonEntladeband.Size = new System.Drawing.Size(160, 41); + this.buttonEntladeband.Size = new System.Drawing.Size(213, 50); this.buttonEntladeband.TabIndex = 41; this.buttonEntladeband.Text = "Farbe Entladeband"; this.buttonEntladeband.UseVisualStyleBackColor = false; @@ -740,11 +737,11 @@ this.groupBoxFarben.Controls.Add(this.buttonHubband); this.groupBoxFarben.Controls.Add(this.buttonTrockner); this.groupBoxFarben.Font = new System.Drawing.Font("Microsoft Sans Serif", 16.2F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.groupBoxFarben.Location = new System.Drawing.Point(7, 5); - this.groupBoxFarben.Margin = new System.Windows.Forms.Padding(2); + this.groupBoxFarben.Location = new System.Drawing.Point(9, 6); + this.groupBoxFarben.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.groupBoxFarben.Name = "groupBoxFarben"; - this.groupBoxFarben.Padding = new System.Windows.Forms.Padding(2); - this.groupBoxFarben.Size = new System.Drawing.Size(1043, 176); + this.groupBoxFarben.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.groupBoxFarben.Size = new System.Drawing.Size(1391, 217); this.groupBoxFarben.TabIndex = 42; this.groupBoxFarben.TabStop = false; this.groupBoxFarben.Text = "Farben"; @@ -758,10 +755,10 @@ this.buttonAuftBald.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.buttonAuftBald.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.buttonAuftBald.ForeColor = System.Drawing.Color.White; - this.buttonAuftBald.Location = new System.Drawing.Point(170, 126); - this.buttonAuftBald.Margin = new System.Windows.Forms.Padding(2); + this.buttonAuftBald.Location = new System.Drawing.Point(227, 155); + this.buttonAuftBald.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.buttonAuftBald.Name = "buttonAuftBald"; - this.buttonAuftBald.Size = new System.Drawing.Size(160, 41); + this.buttonAuftBald.Size = new System.Drawing.Size(213, 50); this.buttonAuftBald.TabIndex = 43; this.buttonAuftBald.Text = "Farbe Auftrag bald"; this.buttonAuftBald.UseVisualStyleBackColor = false; @@ -776,10 +773,10 @@ this.buttonAuftAbgel.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.buttonAuftAbgel.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.buttonAuftAbgel.ForeColor = System.Drawing.Color.White; - this.buttonAuftAbgel.Location = new System.Drawing.Point(4, 126); - this.buttonAuftAbgel.Margin = new System.Windows.Forms.Padding(2); + this.buttonAuftAbgel.Location = new System.Drawing.Point(5, 155); + this.buttonAuftAbgel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.buttonAuftAbgel.Name = "buttonAuftAbgel"; - this.buttonAuftAbgel.Size = new System.Drawing.Size(160, 41); + this.buttonAuftAbgel.Size = new System.Drawing.Size(213, 50); this.buttonAuftAbgel.TabIndex = 42; this.buttonAuftAbgel.Text = "Farbe Auftrag zu spät"; this.buttonAuftAbgel.UseVisualStyleBackColor = false; @@ -789,10 +786,9 @@ // this.label4.AutoSize = true; this.label4.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label4.Location = new System.Drawing.Point(500, 49); - this.label4.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label4.Location = new System.Drawing.Point(667, 60); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(208, 13); + this.label4.Size = new System.Drawing.Size(255, 16); this.label4.TabIndex = 23; this.label4.Text = "Gibt an welche Farben verwendet werden."; // @@ -800,10 +796,9 @@ // this.label13.AutoSize = true; this.label13.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label13.Location = new System.Drawing.Point(5, 37); - this.label13.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label13.Location = new System.Drawing.Point(7, 46); this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(73, 13); + this.label13.Size = new System.Drawing.Size(94, 17); this.label13.TabIndex = 44; this.label13.Text = "SWS-Drucker"; // @@ -811,10 +806,9 @@ // this.label14.AutoSize = true; this.label14.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label14.Location = new System.Drawing.Point(5, 64); - this.label14.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label14.Location = new System.Drawing.Point(7, 79); this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(78, 13); + this.label14.Size = new System.Drawing.Size(102, 17); this.label14.TabIndex = 45; this.label14.Text = "Etikett-Drucker"; // @@ -822,18 +816,20 @@ // this.comboBoxSWSDrucker.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.comboBoxSWSDrucker.FormattingEnabled = true; - this.comboBoxSWSDrucker.Location = new System.Drawing.Point(123, 29); + this.comboBoxSWSDrucker.Location = new System.Drawing.Point(164, 36); + this.comboBoxSWSDrucker.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.comboBoxSWSDrucker.Name = "comboBoxSWSDrucker"; - this.comboBoxSWSDrucker.Size = new System.Drawing.Size(195, 21); + this.comboBoxSWSDrucker.Size = new System.Drawing.Size(259, 25); this.comboBoxSWSDrucker.TabIndex = 46; // // comboBoxEtikettDrucker // this.comboBoxEtikettDrucker.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.comboBoxEtikettDrucker.FormattingEnabled = true; - this.comboBoxEtikettDrucker.Location = new System.Drawing.Point(123, 56); + this.comboBoxEtikettDrucker.Location = new System.Drawing.Point(164, 69); + this.comboBoxEtikettDrucker.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.comboBoxEtikettDrucker.Name = "comboBoxEtikettDrucker"; - this.comboBoxEtikettDrucker.Size = new System.Drawing.Size(195, 21); + this.comboBoxEtikettDrucker.Size = new System.Drawing.Size(259, 25); this.comboBoxEtikettDrucker.TabIndex = 47; // // groupBoxDrucker @@ -847,29 +843,51 @@ this.groupBoxDrucker.Controls.Add(this.label13); this.groupBoxDrucker.Controls.Add(this.label14); this.groupBoxDrucker.Font = new System.Drawing.Font("Microsoft Sans Serif", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.groupBoxDrucker.Location = new System.Drawing.Point(14, 32); + this.groupBoxDrucker.Location = new System.Drawing.Point(19, 39); + this.groupBoxDrucker.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.groupBoxDrucker.Name = "groupBoxDrucker"; - this.groupBoxDrucker.Size = new System.Drawing.Size(547, 123); + this.groupBoxDrucker.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBoxDrucker.Size = new System.Drawing.Size(729, 151); this.groupBoxDrucker.TabIndex = 48; this.groupBoxDrucker.TabStop = false; this.groupBoxDrucker.Text = "Standart Drucker"; // + // comboBoxTourenlisteDrucker + // + this.comboBoxTourenlisteDrucker.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.comboBoxTourenlisteDrucker.FormattingEnabled = true; + this.comboBoxTourenlisteDrucker.Location = new System.Drawing.Point(164, 102); + this.comboBoxTourenlisteDrucker.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.comboBoxTourenlisteDrucker.Name = "comboBoxTourenlisteDrucker"; + this.comboBoxTourenlisteDrucker.Size = new System.Drawing.Size(259, 25); + this.comboBoxTourenlisteDrucker.TabIndex = 51; + // + // label24 + // + this.label24.AutoSize = true; + this.label24.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label24.Location = new System.Drawing.Point(7, 112); + this.label24.Name = "label24"; + this.label24.Size = new System.Drawing.Size(134, 17); + this.label24.TabIndex = 50; + this.label24.Text = "Tourenliste-Drucker"; + // // numericUpDownSWSKopien // this.numericUpDownSWSKopien.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.numericUpDownSWSKopien.Location = new System.Drawing.Point(404, 30); + this.numericUpDownSWSKopien.Location = new System.Drawing.Point(539, 37); + this.numericUpDownSWSKopien.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.numericUpDownSWSKopien.Name = "numericUpDownSWSKopien"; - this.numericUpDownSWSKopien.Size = new System.Drawing.Size(47, 20); + this.numericUpDownSWSKopien.Size = new System.Drawing.Size(63, 23); this.numericUpDownSWSKopien.TabIndex = 49; // // label1 // this.label1.AutoSize = true; this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label1.Location = new System.Drawing.Point(331, 37); - this.label1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label1.Location = new System.Drawing.Point(441, 46); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(68, 13); + this.label1.Size = new System.Drawing.Size(88, 17); this.label1.TabIndex = 48; this.label1.Text = "SWS-Kopien"; // @@ -885,18 +903,48 @@ this.tabControlEinstellung.Controls.Add(this.tabPageTourenplanung); this.tabControlEinstellung.Controls.Add(this.tabPageExpedit); this.tabControlEinstellung.Location = new System.Drawing.Point(0, 0); + this.tabControlEinstellung.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tabControlEinstellung.Name = "tabControlEinstellung"; this.tabControlEinstellung.SelectedIndex = 0; - this.tabControlEinstellung.Size = new System.Drawing.Size(1192, 623); + this.tabControlEinstellung.Size = new System.Drawing.Size(1589, 767); this.tabControlEinstellung.TabIndex = 49; // + // tabPageAllgemein + // + this.tabPageAllgemein.Controls.Add(this.groupBox2); + this.tabPageAllgemein.Controls.Add(this.groupBoxPfade); + this.tabPageAllgemein.Location = new System.Drawing.Point(4, 25); + this.tabPageAllgemein.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.tabPageAllgemein.Name = "tabPageAllgemein"; + this.tabPageAllgemein.Size = new System.Drawing.Size(1581, 738); + this.tabPageAllgemein.TabIndex = 4; + this.tabPageAllgemein.Text = "Allgemein"; + this.tabPageAllgemein.UseVisualStyleBackColor = true; + // + // groupBoxPfade + // + this.groupBoxPfade.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.groupBoxPfade.Controls.Add(this.textBoxSortiment); + this.groupBoxPfade.Controls.Add(this.buttonSortiment); + this.groupBoxPfade.Controls.Add(this.buttonRatingbild); + this.groupBoxPfade.Controls.Add(this.textBoxRatingbild); + this.groupBoxPfade.Location = new System.Drawing.Point(11, 559); + this.groupBoxPfade.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBoxPfade.Name = "groupBoxPfade"; + this.groupBoxPfade.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBoxPfade.Size = new System.Drawing.Size(869, 161); + this.groupBoxPfade.TabIndex = 34; + this.groupBoxPfade.TabStop = false; + this.groupBoxPfade.Text = "Pfade für Dokumente"; + // // tabPageFarben // this.tabPageFarben.Controls.Add(this.groupBoxFarben); - this.tabPageFarben.Location = new System.Drawing.Point(4, 22); + this.tabPageFarben.Location = new System.Drawing.Point(4, 25); + this.tabPageFarben.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tabPageFarben.Name = "tabPageFarben"; - this.tabPageFarben.Padding = new System.Windows.Forms.Padding(3); - this.tabPageFarben.Size = new System.Drawing.Size(1184, 597); + this.tabPageFarben.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.tabPageFarben.Size = new System.Drawing.Size(1581, 738); this.tabPageFarben.TabIndex = 0; this.tabPageFarben.Text = "Farben"; this.tabPageFarben.UseVisualStyleBackColor = true; @@ -924,10 +972,11 @@ this.tabPageDeckungsbeitrag.Controls.Add(this.buttonVarSpeichern); this.tabPageDeckungsbeitrag.Controls.Add(this.textBoxFixLohnKosten); this.tabPageDeckungsbeitrag.Controls.Add(this.buttonFixLohnKosten); - this.tabPageDeckungsbeitrag.Location = new System.Drawing.Point(4, 22); + this.tabPageDeckungsbeitrag.Location = new System.Drawing.Point(4, 25); + this.tabPageDeckungsbeitrag.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tabPageDeckungsbeitrag.Name = "tabPageDeckungsbeitrag"; - this.tabPageDeckungsbeitrag.Padding = new System.Windows.Forms.Padding(3); - this.tabPageDeckungsbeitrag.Size = new System.Drawing.Size(1184, 597); + this.tabPageDeckungsbeitrag.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.tabPageDeckungsbeitrag.Size = new System.Drawing.Size(1581, 738); this.tabPageDeckungsbeitrag.TabIndex = 1; this.tabPageDeckungsbeitrag.Text = "Deckungsbeitrag"; this.tabPageDeckungsbeitrag.UseVisualStyleBackColor = true; @@ -935,9 +984,10 @@ // tabPageDrucker // this.tabPageDrucker.Controls.Add(this.groupBoxDrucker); - this.tabPageDrucker.Location = new System.Drawing.Point(4, 22); + this.tabPageDrucker.Location = new System.Drawing.Point(4, 25); + this.tabPageDrucker.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tabPageDrucker.Name = "tabPageDrucker"; - this.tabPageDrucker.Size = new System.Drawing.Size(1184, 597); + this.tabPageDrucker.Size = new System.Drawing.Size(1581, 738); this.tabPageDrucker.TabIndex = 2; this.tabPageDrucker.Text = "Drucker"; this.tabPageDrucker.UseVisualStyleBackColor = true; @@ -948,9 +998,10 @@ this.tabPageTourenplanung.Controls.Add(this.comboBoxLieferrhythmus); this.tabPageTourenplanung.Controls.Add(this.label16); this.tabPageTourenplanung.Controls.Add(this.label15); - this.tabPageTourenplanung.Location = new System.Drawing.Point(4, 22); + this.tabPageTourenplanung.Location = new System.Drawing.Point(4, 25); + this.tabPageTourenplanung.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tabPageTourenplanung.Name = "tabPageTourenplanung"; - this.tabPageTourenplanung.Size = new System.Drawing.Size(1184, 597); + this.tabPageTourenplanung.Size = new System.Drawing.Size(1581, 738); this.tabPageTourenplanung.TabIndex = 3; this.tabPageTourenplanung.Text = "Tourenplanung"; this.tabPageTourenplanung.UseVisualStyleBackColor = true; @@ -971,11 +1022,11 @@ this.groupBoxRegeln.Controls.Add(this.label18); this.groupBoxRegeln.Controls.Add(this.label19); this.groupBoxRegeln.Controls.Add(this.label20); - this.groupBoxRegeln.Location = new System.Drawing.Point(12, 98); - this.groupBoxRegeln.Margin = new System.Windows.Forms.Padding(2); + this.groupBoxRegeln.Location = new System.Drawing.Point(16, 121); + this.groupBoxRegeln.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.groupBoxRegeln.Name = "groupBoxRegeln"; - this.groupBoxRegeln.Padding = new System.Windows.Forms.Padding(2); - this.groupBoxRegeln.Size = new System.Drawing.Size(1165, 249); + this.groupBoxRegeln.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.groupBoxRegeln.Size = new System.Drawing.Size(1553, 306); this.groupBoxRegeln.TabIndex = 48; this.groupBoxRegeln.TabStop = false; // @@ -983,18 +1034,18 @@ // this.comboBox5.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.comboBox5.FormattingEnabled = true; - this.comboBox5.Location = new System.Drawing.Point(235, 87); + this.comboBox5.Location = new System.Drawing.Point(313, 107); + this.comboBox5.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.comboBox5.Name = "comboBox5"; - this.comboBox5.Size = new System.Drawing.Size(45, 21); + this.comboBox5.Size = new System.Drawing.Size(59, 25); this.comboBox5.TabIndex = 58; // // label23 // this.label23.AutoSize = true; - this.label23.Location = new System.Drawing.Point(205, 90); - this.label23.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label23.Location = new System.Drawing.Point(273, 111); this.label23.Name = "label23"; - this.label23.Size = new System.Drawing.Size(25, 13); + this.label23.Size = new System.Drawing.Size(29, 16); this.label23.TabIndex = 57; this.label23.Text = "und"; // @@ -1002,27 +1053,28 @@ // this.comboBox3.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.comboBox3.FormattingEnabled = true; - this.comboBox3.Location = new System.Drawing.Point(155, 87); + this.comboBox3.Location = new System.Drawing.Point(207, 107); + this.comboBox3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.comboBox3.Name = "comboBox3"; - this.comboBox3.Size = new System.Drawing.Size(45, 21); + this.comboBox3.Size = new System.Drawing.Size(59, 25); this.comboBox3.TabIndex = 56; // // comboBox4 // this.comboBox4.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.comboBox4.FormattingEnabled = true; - this.comboBox4.Location = new System.Drawing.Point(75, 87); + this.comboBox4.Location = new System.Drawing.Point(100, 107); + this.comboBox4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.comboBox4.Name = "comboBox4"; - this.comboBox4.Size = new System.Drawing.Size(45, 21); + this.comboBox4.Size = new System.Drawing.Size(59, 25); this.comboBox4.TabIndex = 55; // // label22 // this.label22.AutoSize = true; - this.label22.Location = new System.Drawing.Point(125, 90); - this.label22.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label22.Location = new System.Drawing.Point(167, 111); this.label22.Name = "label22"; - this.label22.Size = new System.Drawing.Size(25, 13); + this.label22.Size = new System.Drawing.Size(29, 16); this.label22.TabIndex = 54; this.label22.Text = "und"; // @@ -1030,27 +1082,28 @@ // this.comboBox1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.comboBox1.FormattingEnabled = true; - this.comboBox1.Location = new System.Drawing.Point(155, 43); + this.comboBox1.Location = new System.Drawing.Point(207, 53); + this.comboBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.comboBox1.Name = "comboBox1"; - this.comboBox1.Size = new System.Drawing.Size(45, 21); + this.comboBox1.Size = new System.Drawing.Size(59, 25); this.comboBox1.TabIndex = 53; // // comboBox2 // this.comboBox2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.comboBox2.FormattingEnabled = true; - this.comboBox2.Location = new System.Drawing.Point(75, 40); + this.comboBox2.Location = new System.Drawing.Point(100, 49); + this.comboBox2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.comboBox2.Name = "comboBox2"; - this.comboBox2.Size = new System.Drawing.Size(45, 21); + this.comboBox2.Size = new System.Drawing.Size(59, 25); this.comboBox2.TabIndex = 52; // // label21 // this.label21.AutoSize = true; - this.label21.Location = new System.Drawing.Point(125, 43); - this.label21.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label21.Location = new System.Drawing.Point(167, 53); this.label21.Name = "label21"; - this.label21.Size = new System.Drawing.Size(25, 13); + this.label21.Size = new System.Drawing.Size(29, 16); this.label21.TabIndex = 51; this.label21.Text = "und"; // @@ -1058,58 +1111,56 @@ // this.comboBoxLT2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.comboBoxLT2.FormattingEnabled = true; - this.comboBoxLT2.Location = new System.Drawing.Point(155, 13); + this.comboBoxLT2.Location = new System.Drawing.Point(207, 16); + this.comboBoxLT2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.comboBoxLT2.Name = "comboBoxLT2"; - this.comboBoxLT2.Size = new System.Drawing.Size(45, 21); + this.comboBoxLT2.Size = new System.Drawing.Size(59, 25); this.comboBoxLT2.TabIndex = 50; // // comboBoxLT1 // this.comboBoxLT1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.comboBoxLT1.FormattingEnabled = true; - this.comboBoxLT1.Location = new System.Drawing.Point(75, 13); + this.comboBoxLT1.Location = new System.Drawing.Point(100, 16); + this.comboBoxLT1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.comboBoxLT1.Name = "comboBoxLT1"; - this.comboBoxLT1.Size = new System.Drawing.Size(45, 21); + this.comboBoxLT1.Size = new System.Drawing.Size(59, 25); this.comboBoxLT1.TabIndex = 49; // // label17 // this.label17.AutoSize = true; this.label17.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label17.Location = new System.Drawing.Point(4, 224); - this.label17.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label17.Location = new System.Drawing.Point(5, 276); this.label17.Name = "label17"; - this.label17.Size = new System.Drawing.Size(331, 13); + this.label17.Size = new System.Drawing.Size(390, 16); this.label17.TabIndex = 3; this.label17.Text = "Wenn nicht angehackt wird Wert automatisch berechnet."; // // label18 // this.label18.AutoSize = true; - this.label18.Location = new System.Drawing.Point(4, 90); - this.label18.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label18.Location = new System.Drawing.Point(5, 111); this.label18.Name = "label18"; - this.label18.Size = new System.Drawing.Size(66, 13); + this.label18.Size = new System.Drawing.Size(80, 16); this.label18.TabIndex = 2; this.label18.Text = "3 Liefertage:"; // // label19 // this.label19.AutoSize = true; - this.label19.Location = new System.Drawing.Point(125, 16); - this.label19.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label19.Location = new System.Drawing.Point(167, 20); this.label19.Name = "label19"; - this.label19.Size = new System.Drawing.Size(25, 13); + this.label19.Size = new System.Drawing.Size(29, 16); this.label19.TabIndex = 1; this.label19.Text = "und"; // // label20 // this.label20.AutoSize = true; - this.label20.Location = new System.Drawing.Point(4, 16); - this.label20.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label20.Location = new System.Drawing.Point(5, 20); this.label20.Name = "label20"; - this.label20.Size = new System.Drawing.Size(66, 13); + this.label20.Size = new System.Drawing.Size(80, 16); this.label20.TabIndex = 0; this.label20.Text = "2 Liefertage:"; // @@ -1117,18 +1168,18 @@ // this.comboBoxLieferrhythmus.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.comboBoxLieferrhythmus.FormattingEnabled = true; - this.comboBoxLieferrhythmus.Location = new System.Drawing.Point(281, 77); + this.comboBoxLieferrhythmus.Location = new System.Drawing.Point(375, 95); + this.comboBoxLieferrhythmus.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.comboBoxLieferrhythmus.Name = "comboBoxLieferrhythmus"; - this.comboBoxLieferrhythmus.Size = new System.Drawing.Size(195, 21); + this.comboBoxLieferrhythmus.Size = new System.Drawing.Size(259, 25); this.comboBoxLieferrhythmus.TabIndex = 47; // // label16 // this.label16.AutoSize = true; - this.label16.Location = new System.Drawing.Point(9, 80); - this.label16.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label16.Location = new System.Drawing.Point(12, 98); this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(267, 13); + this.label16.Size = new System.Drawing.Size(334, 16); this.label16.TabIndex = 25; this.label16.Text = "Folgende Regeln gelten bei Kunden mit Lieferrhythmus:"; // @@ -1136,85 +1187,114 @@ // this.label15.AutoSize = true; this.label15.Font = new System.Drawing.Font("Microsoft Sans Serif", 16.2F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label15.Location = new System.Drawing.Point(7, 19); - this.label15.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label15.Location = new System.Drawing.Point(9, 23); this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(442, 26); + this.label15.Size = new System.Drawing.Size(568, 32); this.label15.TabIndex = 15; this.label15.Text = "Regeln für automatische Tourenplanung:"; // - // tabPageAllgemein + // tabPageExpedit // - this.tabPageAllgemein.Controls.Add(this.groupBoxPfade); - this.tabPageAllgemein.Location = new System.Drawing.Point(4, 22); - this.tabPageAllgemein.Name = "tabPageAllgemein"; - this.tabPageAllgemein.Size = new System.Drawing.Size(1184, 597); - this.tabPageAllgemein.TabIndex = 4; - this.tabPageAllgemein.Text = "Allgemein"; - this.tabPageAllgemein.UseVisualStyleBackColor = true; + this.tabPageExpedit.Location = new System.Drawing.Point(4, 25); + this.tabPageExpedit.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.tabPageExpedit.Name = "tabPageExpedit"; + this.tabPageExpedit.Size = new System.Drawing.Size(1581, 738); + this.tabPageExpedit.TabIndex = 5; + this.tabPageExpedit.Text = "Expedit"; + this.tabPageExpedit.UseVisualStyleBackColor = true; // // panelButtons // this.panelButtons.Controls.Add(this.buttonAbbrechen); this.panelButtons.Controls.Add(this.buttonSpeichern); this.panelButtons.Dock = System.Windows.Forms.DockStyle.Bottom; - this.panelButtons.Location = new System.Drawing.Point(0, 629); + this.panelButtons.Location = new System.Drawing.Point(0, 774); + this.panelButtons.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.panelButtons.Name = "panelButtons"; - this.panelButtons.Size = new System.Drawing.Size(1192, 49); + this.panelButtons.Size = new System.Drawing.Size(1589, 60); this.panelButtons.TabIndex = 50; // - // comboBoxTourenlisteDrucker + // groupBox2 // - this.comboBoxTourenlisteDrucker.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.comboBoxTourenlisteDrucker.FormattingEnabled = true; - this.comboBoxTourenlisteDrucker.Location = new System.Drawing.Point(123, 83); - this.comboBoxTourenlisteDrucker.Name = "comboBoxTourenlisteDrucker"; - this.comboBoxTourenlisteDrucker.Size = new System.Drawing.Size(195, 21); - this.comboBoxTourenlisteDrucker.TabIndex = 51; + this.groupBox2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.groupBox2.Controls.Add(this.buttonSaveCredentials); + this.groupBox2.Controls.Add(this.label26); + this.groupBox2.Controls.Add(this.label25); + this.groupBox2.Controls.Add(this.textBoxApiKey); + this.groupBox2.Controls.Add(this.textBoxToken); + this.groupBox2.Location = new System.Drawing.Point(18, 17); + this.groupBox2.Margin = new System.Windows.Forms.Padding(4); + this.groupBox2.Name = "groupBox2"; + this.groupBox2.Padding = new System.Windows.Forms.Padding(4); + this.groupBox2.Size = new System.Drawing.Size(869, 161); + this.groupBox2.TabIndex = 35; + this.groupBox2.TabStop = false; + this.groupBox2.Text = "Trello-Credentials"; // - // label24 + // textBoxApiKey // - this.label24.AutoSize = true; - this.label24.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label24.Location = new System.Drawing.Point(5, 91); - this.label24.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); - this.label24.Name = "label24"; - this.label24.Size = new System.Drawing.Size(100, 13); - this.label24.TabIndex = 50; - this.label24.Text = "Tourenliste-Drucker"; + this.textBoxApiKey.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.textBoxApiKey.Location = new System.Drawing.Point(227, 42); + this.textBoxApiKey.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.textBoxApiKey.Name = "textBoxApiKey"; + this.textBoxApiKey.Size = new System.Drawing.Size(561, 30); + this.textBoxApiKey.TabIndex = 28; // - // groupBoxPfade + // textBoxToken // - this.groupBoxPfade.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.groupBoxPfade.Controls.Add(this.textBoxSortiment); - this.groupBoxPfade.Controls.Add(this.buttonSortiment); - this.groupBoxPfade.Controls.Add(this.buttonRatingbild); - this.groupBoxPfade.Controls.Add(this.textBoxRatingbild); - this.groupBoxPfade.Location = new System.Drawing.Point(8, 454); - this.groupBoxPfade.Name = "groupBoxPfade"; - this.groupBoxPfade.Size = new System.Drawing.Size(652, 131); - this.groupBoxPfade.TabIndex = 34; - this.groupBoxPfade.TabStop = false; - this.groupBoxPfade.Text = "Pfade für Dokumente"; + this.textBoxToken.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.textBoxToken.Location = new System.Drawing.Point(227, 78); + this.textBoxToken.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.textBoxToken.Name = "textBoxToken"; + this.textBoxToken.Size = new System.Drawing.Size(561, 30); + this.textBoxToken.TabIndex = 30; // - // tabPageExpedit + // label25 // - this.tabPageExpedit.Location = new System.Drawing.Point(4, 22); - this.tabPageExpedit.Name = "tabPageExpedit"; - this.tabPageExpedit.Size = new System.Drawing.Size(1184, 597); - this.tabPageExpedit.TabIndex = 5; - this.tabPageExpedit.Text = "Expedit"; - this.tabPageExpedit.UseVisualStyleBackColor = true; + this.label25.AutoSize = true; + this.label25.Location = new System.Drawing.Point(7, 52); + this.label25.Name = "label25"; + this.label25.Size = new System.Drawing.Size(72, 16); + this.label25.TabIndex = 34; + this.label25.Text = "Trello-Key:"; + // + // label26 + // + this.label26.AutoSize = true; + this.label26.Location = new System.Drawing.Point(7, 88); + this.label26.Name = "label26"; + this.label26.Size = new System.Drawing.Size(88, 16); + this.label26.TabIndex = 35; + this.label26.Text = "Trello-Token:"; + // + // buttonSaveCredentials + // + this.buttonSaveCredentials.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonSaveCredentials.BackColor = System.Drawing.Color.Green; + this.buttonSaveCredentials.FlatAppearance.BorderColor = System.Drawing.Color.Green; + this.buttonSaveCredentials.FlatAppearance.BorderSize = 0; + this.buttonSaveCredentials.FlatAppearance.MouseDownBackColor = System.Drawing.Color.LightSteelBlue; + this.buttonSaveCredentials.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.buttonSaveCredentials.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.buttonSaveCredentials.ForeColor = System.Drawing.Color.White; + this.buttonSaveCredentials.Location = new System.Drawing.Point(575, 121); + this.buttonSaveCredentials.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.buttonSaveCredentials.Name = "buttonSaveCredentials"; + this.buttonSaveCredentials.Size = new System.Drawing.Size(213, 34); + this.buttonSaveCredentials.TabIndex = 36; + this.buttonSaveCredentials.Text = "Credentials Speichern"; + this.buttonSaveCredentials.UseVisualStyleBackColor = false; + this.buttonSaveCredentials.Click += new System.EventHandler(this.buttonSaveCredentials_Click); // // FormEinstellung // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1192, 678); + this.ClientSize = new System.Drawing.Size(1589, 834); this.Controls.Add(this.panelButtons); this.Controls.Add(this.tabControlEinstellung); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.Margin = new System.Windows.Forms.Padding(2); + this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.Name = "FormEinstellung"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "Einstellung"; @@ -1230,6 +1310,9 @@ this.groupBoxDrucker.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDownSWSKopien)).EndInit(); this.tabControlEinstellung.ResumeLayout(false); + this.tabPageAllgemein.ResumeLayout(false); + this.groupBoxPfade.ResumeLayout(false); + this.groupBoxPfade.PerformLayout(); this.tabPageFarben.ResumeLayout(false); this.tabPageDeckungsbeitrag.ResumeLayout(false); this.tabPageDeckungsbeitrag.PerformLayout(); @@ -1238,10 +1321,9 @@ this.tabPageTourenplanung.PerformLayout(); this.groupBoxRegeln.ResumeLayout(false); this.groupBoxRegeln.PerformLayout(); - this.tabPageAllgemein.ResumeLayout(false); this.panelButtons.ResumeLayout(false); - this.groupBoxPfade.ResumeLayout(false); - this.groupBoxPfade.PerformLayout(); + this.groupBox2.ResumeLayout(false); + this.groupBox2.PerformLayout(); this.ResumeLayout(false); } @@ -1328,5 +1410,11 @@ private System.Windows.Forms.Label label24; private System.Windows.Forms.GroupBox groupBoxPfade; private System.Windows.Forms.TabPage tabPageExpedit; + private System.Windows.Forms.GroupBox groupBox2; + private System.Windows.Forms.Label label26; + private System.Windows.Forms.Label label25; + private System.Windows.Forms.TextBox textBoxApiKey; + private System.Windows.Forms.TextBox textBoxToken; + private System.Windows.Forms.Button buttonSaveCredentials; } } \ No newline at end of file diff --git a/AA-Forms/FormEinstellung.cs b/AA-Forms/FormEinstellung.cs index cbfc0a7..8904abf 100644 --- a/AA-Forms/FormEinstellung.cs +++ b/AA-Forms/FormEinstellung.cs @@ -11,6 +11,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Windows.Forms; +using TrelloIntegration; namespace Deckungsbeitrag { @@ -232,5 +233,14 @@ namespace Deckungsbeitrag if (MessageBox.Show("Möchtest du die Änderungen verwerfen?", "Frage", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) this.Close(); else return; } + + private void buttonSaveCredentials_Click(object sender, EventArgs e) + { + TrelloConfig.CreateEncryptedConfigValues( + textBoxApiKey.Text, + textBoxToken.Text); + + MessageBox.Show("Verschlüsselte Werte wurden in der Console ausgegeben."); + } } } diff --git a/AA-Forms/FormExpedit.Designer.cs b/AA-Forms/FormExpedit.Designer.cs index a362637..683b565 100644 --- a/AA-Forms/FormExpedit.Designer.cs +++ b/AA-Forms/FormExpedit.Designer.cs @@ -444,6 +444,7 @@ // // objectListViewSonder // + this.objectListViewSonder.AllowColumnReorder = true; this.objectListViewSonder.AlternateRowBackColor = System.Drawing.Color.LightBlue; this.objectListViewSonder.CellEditActivation = BrightIdeasSoftware.ObjectListView.CellEditActivateMode.DoubleClick; this.objectListViewSonder.CellEditUseWholeCell = false; diff --git a/AA-Forms/FormExpedit.cs b/AA-Forms/FormExpedit.cs index 5c94c66..206f023 100644 --- a/AA-Forms/FormExpedit.cs +++ b/AA-Forms/FormExpedit.cs @@ -22,6 +22,7 @@ using System.Threading.Tasks; using System.Windows.Forms; using System.Windows.Forms.DataVisualization.Charting; using System.Xml.Resolvers; +using TrelloIntegration; using ZXing; namespace Deckungsbeitrag @@ -65,6 +66,8 @@ namespace Deckungsbeitrag private List listVorbereitet; private List listSonderAuftrag; private List listRampe; + public TrelloCardClient _trelloClient; + private bool TrelloKarte = true; #endregion public FormExpedit(Benutzer benutzer) { @@ -95,8 +98,12 @@ namespace Deckungsbeitrag this.SuspendLayout(); _settings.Load(); - - + if (TrelloConfig.HasCredentials()) + { + var apiKey = TrelloConfig.GetApiKey(); + var token = TrelloConfig.GetToken(); + _trelloClient = new TrelloCardClient(apiKey, token); + } UCFeedback fb = new UCFeedback(this.benutzer); this.Controls.Add(fb); @@ -137,7 +144,13 @@ namespace Deckungsbeitrag } private void FormExpedit_FormClosing(object sender, FormClosingEventArgs e) { + + // === SPEICHERN DES OLV-STATUS === _settings.OLV_State = this.objectListViewAuftrag.SaveState(); + _settings.OLV_Rampe_State = this.objectListViewRampe.SaveState(); + _settings.OLV_Geschaeft_State = this.objectListViewGeschaeft.SaveState(); + _settings.OLV_Sonder_State = this.objectListViewSonder.SaveState(); + _settings.OLV_Vorbereitet_State = this.objectListViewVorbereitet.SaveState(); _settings.Save(); } private void FormExpedit_Resize(object sender, EventArgs e) @@ -228,8 +241,8 @@ namespace Deckungsbeitrag if (fahrer != null) { - List auftragliste = Auftrag.GetTourenListe(fahrer); - if (auftragliste.Count > 0) Funktionen.TourenListe_Drucken(auftragliste, fahrer, this, this.benutzer); + //List auftragliste = Auftrag.GetTourenListe(fahrer); + //if (auftragliste.Count > 0) Funktionen.TourenListe_Drucken(auftragliste, fahrer, this, this.benutzer); } } @@ -268,6 +281,7 @@ namespace Deckungsbeitrag if (olv.SelectedItem != null) { + TrelloKarte = true; int idx = col.Index; olv.StartCellEdit(olv.SelectedItem, idx); } @@ -412,6 +426,13 @@ namespace Deckungsbeitrag // === SPALTEN JE NACH TAB/ROLLE === GetUnvisibleColumns(olv); + // === RESTORE OLV-STATUS === + if (olv.Name.Contains("Auftrag")) this.objectListViewAuftrag.RestoreState(_settings.OLV_State); + if (olv.Name.Contains("Rampe")) this.objectListViewRampe.RestoreState(_settings.OLV_Rampe_State); + if (olv.Name.Contains("Vorbereitet")) this.objectListViewVorbereitet.RestoreState(_settings.OLV_Vorbereitet_State); + if (olv.Name.Contains("Sonder")) this.objectListViewSonder.RestoreState(_settings.OLV_Sonder_State); + if (olv.Name.Contains("Geschaeft")) this.objectListViewGeschaeft.RestoreState(_settings.OLV_Geschaeft_State); + // === SPALTENBREITE ANPASSEN === olv = Funktionen.Columns_Resize(null, olv).olv; @@ -516,7 +537,6 @@ namespace Deckungsbeitrag default: break; } - } } private void Olv_CellToolTipShowing(object sender, ToolTipShowingEventArgs e) @@ -694,7 +714,11 @@ namespace Deckungsbeitrag if (_auftrag == null) return; FormKundeVW kndVW = new FormKundeVW(_kunde, this.benutzer); - kndVW.ShowDialog(); + if (kndVW.ShowDialog() == DialogResult.OK) + { + if (kndVW.aufgabeErledigt) Aufgabe_erledigt(_auftrag, _kunde, _kunde.Suchtext ?? _kunde.KundeName); + + } return; } else @@ -870,20 +894,43 @@ namespace Deckungsbeitrag if (meldung.GetAchtung(this, text, false) == DialogResult.No) return; else { + Kunde _kunde = Kunde.GetKunde(null, this.auftrag.KundeID, null); + string name; + if (string.IsNullOrWhiteSpace(_kunde.Suchtext)) name = _kunde.KundeName; + else name = _kunde.Suchtext; + this.auftrag.Erledigt = DateTime.Now; this.auftrag.ErledigtVon = (int)this.benutzer.BenutzerID; + Aufgabe_erledigt(this.auftrag, _kunde, name); } } if (this.auftrag.Typ < AuftragTyp.Inventur || (this.auftrag.Typ >= AuftragTyp.Inventur && this.auftrag.ContainerClean > 0)) { + var rslt = DialogResult.None; PrepareContainerCleanForEtikett(); - var result = Funktionen.Etikett_Drucken(auftrag, nocont); - if (result == DialogResult.OK) + if (this.auftrag.ContainerClean == 0) { - this.auftrag.Gedruckt = DateTime.Now; - this.auftrag.GedrucktVon = (int)this.benutzer.BenutzerID; + rslt = MessageBox.Show("Der Auftrag hat 0 saubere Container. Möchtest du ein Etikett drucken?", "FRAGE", MessageBoxButtons.YesNoCancel, MessageBoxIcon.Question); + } + + switch (rslt) + { + case DialogResult.Cancel: + return; + case DialogResult.Yes: + goto default; + case DialogResult.No: + break; + default: + var result = Funktionen.Etikett_Drucken(auftrag, nocont); + if (result == DialogResult.OK) + { + this.auftrag.Gedruckt = DateTime.Now; + this.auftrag.GedrucktVon = (int)this.benutzer.BenutzerID; + } + break; } } @@ -993,8 +1040,8 @@ namespace Deckungsbeitrag //Für FrotteeExpedit Etiketten drucken ausblenden. if (this.benutzer.Rolle == BenutzerRolle.Frottee) if (col.Text == "Etikett" & col.IsButton) col.IsVisible = false; - } + olv.RebuildColumns(); } @@ -1003,7 +1050,7 @@ namespace Deckungsbeitrag /// /// /// - private void ObjectListViewAuftrag_CellEditFinished(object sender, CellEditEventArgs e) + private async void ObjectListViewAuftrag_CellEditFinished(object sender, CellEditEventArgs e) { ObjectListView olv = (ObjectListView)sender; this.auftrag = Auftrag.GetAuftrag(((View_Auftrag_Expedit)e.RowObject).AuftragID); @@ -1052,6 +1099,61 @@ namespace Deckungsbeitrag { if (int.TryParse(e.NewValue.ToString(), out int i)) this.auftrag.Container = i; else return; + } + break; + case var t when t == "Liefertag": + { + if (this.benutzer.Rolle == BenutzerRolle.Verwaltung || this.benutzer.Rolle == BenutzerRolle.Admin) + { + if (!TrelloKarte) return; + + if (_trelloClient == null) + { + MessageBox.Show("Bitte zuerst Credentials speichern.", "Fehler", + MessageBoxButtons.OK, MessageBoxIcon.Warning); + return; + } + + if (MessageBox.Show("Möchtest du eine Trello-Karte für die Änderung erstellen?", "FRAGE", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No) { TrelloKarte = false; goto default; } + + try + { + DateTime oldDate = DateTime.Parse(e.Value.ToString()); + DateTime newDate = DateTime.Parse(e.NewValue.ToString()); + Benutzer _fahrer = Benutzer.GetBenutzer(null, this.auftrag.ErstelltVon); + Kunde _kunde = Kunde.GetKunde(null, this.auftrag.KundeID, null); + string kndName = _kunde.KundeName?? _kunde.Suchtext; + + // Wenn kein Fahrer hinterlegt oder keine Tour(Trello-Listen-ID) beim Fahrer wird die Allgmeine-Listen_ID verwendet. + string listID = _fahrer?.Tour?? "69cf1a3adfbfd598e8d98be9"; + this.auftrag.Liefertag = newDate; + + var options = new CreateCardOptions + { + Name = $"Der Liefertag von {kndName} wurde von {oldDate.Date:d} zu {newDate.Date:d} verschoben.", + Desc = "Diese Karte wurde automatisch erstellt. Bitte gegebenenfalls korrigieren.", + IdList = $"{listID}", + Pos = "top", + DueDate = newDate + }; + + var card = _trelloClient.CreateCardAndParseAsync(options); + TrelloKarte = false; + + //MessageBox.Show( + // $"Karte erstellt:\nID: {card.Id}\nName: {card.Name}\nURL: {card.ShortUrl}", + // "Erfolg", + // MessageBoxButtons.OK, + // MessageBoxIcon.Information); + } + catch (Exception ex) + { + MessageBox.Show($"Fehler beim Erstellen der Karte:\n{ex.Message}", "Fehler", + MessageBoxButtons.OK, MessageBoxIcon.Error); + } + + } + else goto default; } break; @@ -1414,7 +1516,7 @@ namespace Deckungsbeitrag Status = AuftragStatus.Vorbereitet, }; - _auftrag.Save(); + FormAuftragDetail detail = new FormAuftragDetail(_auftrag, this.benutzer, kndartListe); detail.Show(); @@ -1426,7 +1528,8 @@ namespace Deckungsbeitrag } } } -//TODO: Lösung zum Löschen von Aufträgen überlegen. (Kevin fragen) +//DONE: Lösung zum Löschen von Aufträgen überlegen. (Kevin fragen) +//CHANGES: Trello-Karte nach Liefertagänderung kann von Admin oder Verwaltung erstellt werden. //CHANGES: Im Tab Vorbereitet wird beim Ändern der sauberen Containeranzahl gefragt ob die Etiketten neu gedruckt werden sollen. //CHANGES: Im Tab Rampe wird bei DoppelClick der Auftrag als gewaschen markiert und im Tab Aufträge heute sichtbar. //CHANGES: Wenn ein anderer Fahrer ausgewählt wird, wird auch die Priority laut dem Fahrer geändert. diff --git a/AA-Forms/FormFehlmengeCount.cs b/AA-Forms/FormFehlmengeCount.cs index 9afecf4..2ed0284 100644 --- a/AA-Forms/FormFehlmengeCount.cs +++ b/AA-Forms/FormFehlmengeCount.cs @@ -22,6 +22,7 @@ namespace Deckungsbeitrag { public partial class FormFehlmengeCount : Form { + int[] artZahl = new int[8]; private FilterInfoCollection videoDevices; Kunde kunde; Auftrag auftrag; @@ -310,7 +311,7 @@ namespace Deckungsbeitrag } } - + int i = 0; // Button mit Tag bearbeiten. Buttons ohne Tag werden deaktiviert. foreach(Button btn in this.tableLayoutPanelArtikel.Controls) { @@ -319,11 +320,12 @@ namespace Deckungsbeitrag { KundeArtikel art = (KundeArtikel)btn.Tag; int index = art.ArtikelName.IndexOf(" "); - btn.Text = art.ArtikelName; + btn.Text = art.ArtikelName + "\n" + artZahl[i].ToString(); btn.Font = new Font(btn.Font.Name, 18); btn.BackColor = Color.Turquoise; btn.Enabled = true; } + i++; } } @@ -342,6 +344,8 @@ namespace Deckungsbeitrag }; this.groupBoxArtikel.Controls.Add(flowPanel); + artZahl = new int[artikelListe.Count]; + int i = 0; foreach (KundeArtikel artikel in artikelListe) { int index = artikel.ArtikelName.IndexOf(" "); @@ -350,9 +354,9 @@ namespace Deckungsbeitrag else name = artikel.ArtikelName; Button btn = new Button { - Text = name, + Text = name + "\n" + artZahl[i].ToString(), Tag = artikel, - Name = $"btn_{artikel.ArtikelNR}", + Name = $"buttonArt{i + 1}", AutoSize = true, Margin = new Padding(0), BackColor = Color.Turquoise, @@ -363,6 +367,7 @@ namespace Deckungsbeitrag btn.MouseDown += Button_MouseDown; flowPanel.Controls.Add(btn); + i++; } int buttons = flowPanel.Controls.OfType