From 651fcad8868832221c37763a88a1d9d299f0f571 Mon Sep 17 00:00:00 2001 From: Kilian Wirl Date: Mon, 15 Dec 2025 18:28:34 +0100 Subject: [PATCH] =?UTF-8?q?Neue=20Aufgabe=20implementiert.=20OLV=20mit=20C?= =?UTF-8?q?lick=20auf=20Zelle=20f=C3=BCr=20Farbauswahl.=20Aktiv=20wird=20a?= =?UTF-8?q?utomatisch=20bei=20neuer=20Aufgabe=20gespeichert.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AA-Forms/FormAufgabeVW.Designer.cs | 284 ++-- AA-Forms/FormAufgabeVW.cs | 133 +- AA-Forms/FormAufgabeVW.resx | 20 +- AA-Forms/FormBenutzerVW.cs | 1 - AA-Forms/FormMain.Designer.cs | 219 ++- AA-Forms/FormMain.cs | 6 + AA-Forms/FormNeueAufgabe.cs | 1 + AA-Klassen/Aufgabe.cs | 30 +- AA-Klassen/Auftrag.cs | 4 +- AA-Klassen/Funktionen.cs | 3 +- AA-Klassen/Kunde.cs | 4 +- Neue_Table_Columns_SQL_Script_15-12-2025.sql | 27 + Properties/AssemblyInfo.cs | 4 +- SetupVerwaltung/SetupVerwaltung.vdproj | 1457 +----------------- UpdateVerwaltungReadMe.ps1 | 120 +- Verwaltung.csproj | 2 +- Verwaltung_ReadMe.txt | 123 +- 17 files changed, 480 insertions(+), 1958 deletions(-) create mode 100644 Neue_Table_Columns_SQL_Script_15-12-2025.sql diff --git a/AA-Forms/FormAufgabeVW.Designer.cs b/AA-Forms/FormAufgabeVW.Designer.cs index 53a740c..550fdff 100644 --- a/AA-Forms/FormAufgabeVW.Designer.cs +++ b/AA-Forms/FormAufgabeVW.Designer.cs @@ -29,189 +29,96 @@ private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormAufgabeVW)); - this.listViewAufgabeVW = new System.Windows.Forms.ListView(); - this.groupBoxNeueAufgabe = new System.Windows.Forms.GroupBox(); - this.buttonFarbe = new System.Windows.Forms.Button(); - this.label11 = new System.Windows.Forms.Label(); - this.comboBoxAufgabeKat = new System.Windows.Forms.ComboBox(); - this.label2 = new System.Windows.Forms.Label(); - this.label1 = new System.Windows.Forms.Label(); - this.textBoxBeschreibung = new System.Windows.Forms.TextBox(); - this.textBoxBezeichnung = new System.Windows.Forms.TextBox(); - this.buttonAbbrechenAufgabe = new System.Windows.Forms.Button(); - this.buttonSpeichernAufgabe = new System.Windows.Forms.Button(); - this.buttonNeueAufgabe = new System.Windows.Forms.Button(); - this.groupBoxNeueAufgabe.SuspendLayout(); + this.objectListViewAufgabe = new BrightIdeasSoftware.ObjectListView(); + this.buttonNeueAnfrage = new System.Windows.Forms.Button(); + this.buttonAbbrechen = new System.Windows.Forms.Button(); + this.buttonSpeichern = new System.Windows.Forms.Button(); + ((System.ComponentModel.ISupportInitialize)(this.objectListViewAufgabe)).BeginInit(); this.SuspendLayout(); // - // listViewAufgabeVW + // objectListViewAufgabe // - this.listViewAufgabeVW.AllowColumnReorder = true; - this.listViewAufgabeVW.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.listViewAufgabeVW.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.listViewAufgabeVW.FullRowSelect = true; - this.listViewAufgabeVW.GridLines = true; - this.listViewAufgabeVW.HideSelection = false; - this.listViewAufgabeVW.Location = new System.Drawing.Point(11, 11); - this.listViewAufgabeVW.Margin = new System.Windows.Forms.Padding(2); - this.listViewAufgabeVW.Name = "listViewAufgabeVW"; - this.listViewAufgabeVW.Size = new System.Drawing.Size(778, 314); - this.listViewAufgabeVW.TabIndex = 34; - this.listViewAufgabeVW.UseCompatibleStateImageBehavior = false; - this.listViewAufgabeVW.View = System.Windows.Forms.View.Details; - this.listViewAufgabeVW.MouseClick += new System.Windows.Forms.MouseEventHandler(this.listViewAufgabeVW_MouseClick); + this.objectListViewAufgabe.AlternateRowBackColor = System.Drawing.Color.LightSteelBlue; + this.objectListViewAufgabe.CellEditActivation = BrightIdeasSoftware.ObjectListView.CellEditActivateMode.DoubleClick; + this.objectListViewAufgabe.CellEditUseWholeCell = false; + this.objectListViewAufgabe.Cursor = System.Windows.Forms.Cursors.Default; + this.objectListViewAufgabe.Dock = System.Windows.Forms.DockStyle.Top; + this.objectListViewAufgabe.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.objectListViewAufgabe.FullRowSelect = true; + this.objectListViewAufgabe.GridLines = true; + this.objectListViewAufgabe.HideSelection = false; + this.objectListViewAufgabe.Location = new System.Drawing.Point(0, 0); + this.objectListViewAufgabe.MultiSelect = false; + this.objectListViewAufgabe.Name = "objectListViewAufgabe"; + this.objectListViewAufgabe.SelectColumnsOnRightClick = false; + this.objectListViewAufgabe.SelectColumnsOnRightClickBehaviour = BrightIdeasSoftware.ObjectListView.ColumnSelectBehaviour.None; + this.objectListViewAufgabe.ShowGroups = false; + this.objectListViewAufgabe.ShowSortIndicators = false; + this.objectListViewAufgabe.Size = new System.Drawing.Size(800, 410); + this.objectListViewAufgabe.TabIndex = 47; + this.objectListViewAufgabe.UseAlternatingBackColors = true; + this.objectListViewAufgabe.UseCellFormatEvents = true; + this.objectListViewAufgabe.UseCompatibleStateImageBehavior = false; + this.objectListViewAufgabe.UseFiltering = true; + this.objectListViewAufgabe.View = System.Windows.Forms.View.Details; + this.objectListViewAufgabe.CellClick += new System.EventHandler(this.objectListViewAufgabe_CellClick); + this.objectListViewAufgabe.SubItemChecking += new System.EventHandler(this.objectListViewAufgabe_SubItemChecking); + this.objectListViewAufgabe.FormatCell += new System.EventHandler(this.objectListViewAufgabe_FormatCell); // - // groupBoxNeueAufgabe + // buttonNeueAnfrage // - this.groupBoxNeueAufgabe.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.groupBoxNeueAufgabe.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(1)))), ((int)(((byte)(53)))), ((int)(((byte)(101))))); - this.groupBoxNeueAufgabe.Controls.Add(this.buttonFarbe); - this.groupBoxNeueAufgabe.Controls.Add(this.label11); - this.groupBoxNeueAufgabe.Controls.Add(this.comboBoxAufgabeKat); - this.groupBoxNeueAufgabe.Controls.Add(this.label2); - this.groupBoxNeueAufgabe.Controls.Add(this.label1); - this.groupBoxNeueAufgabe.Controls.Add(this.textBoxBeschreibung); - this.groupBoxNeueAufgabe.Controls.Add(this.textBoxBezeichnung); - this.groupBoxNeueAufgabe.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.groupBoxNeueAufgabe.ForeColor = System.Drawing.Color.White; - this.groupBoxNeueAufgabe.Location = new System.Drawing.Point(11, 333); - this.groupBoxNeueAufgabe.Margin = new System.Windows.Forms.Padding(2); - this.groupBoxNeueAufgabe.Name = "groupBoxNeueAufgabe"; - this.groupBoxNeueAufgabe.Padding = new System.Windows.Forms.Padding(2); - this.groupBoxNeueAufgabe.Size = new System.Drawing.Size(778, 87); - this.groupBoxNeueAufgabe.TabIndex = 35; - this.groupBoxNeueAufgabe.TabStop = false; - this.groupBoxNeueAufgabe.Text = "Aufgabe"; + this.buttonNeueAnfrage.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.buttonNeueAnfrage.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(128))))); + this.buttonNeueAnfrage.FlatAppearance.BorderSize = 0; + this.buttonNeueAnfrage.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.buttonNeueAnfrage.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.buttonNeueAnfrage.Location = new System.Drawing.Point(11, 421); + this.buttonNeueAnfrage.Margin = new System.Windows.Forms.Padding(2); + this.buttonNeueAnfrage.Name = "buttonNeueAnfrage"; + this.buttonNeueAnfrage.Size = new System.Drawing.Size(150, 41); + this.buttonNeueAnfrage.TabIndex = 50; + this.buttonNeueAnfrage.Text = "Neue Aufgabe"; + this.buttonNeueAnfrage.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; + this.buttonNeueAnfrage.UseVisualStyleBackColor = false; + this.buttonNeueAnfrage.Click += new System.EventHandler(this.buttonNeueAufgabe_Click); // - // buttonFarbe + // buttonAbbrechen // - this.buttonFarbe.FlatAppearance.BorderColor = System.Drawing.Color.White; - this.buttonFarbe.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.buttonFarbe.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.buttonFarbe.ForeColor = System.Drawing.Color.White; - this.buttonFarbe.Location = new System.Drawing.Point(694, 45); - this.buttonFarbe.Margin = new System.Windows.Forms.Padding(2); - this.buttonFarbe.Name = "buttonFarbe"; - this.buttonFarbe.Size = new System.Drawing.Size(72, 22); - this.buttonFarbe.TabIndex = 47; - this.buttonFarbe.Text = "Farbe"; - this.buttonFarbe.UseVisualStyleBackColor = true; - this.buttonFarbe.Visible = false; + this.buttonAbbrechen.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonAbbrechen.BackColor = System.Drawing.Color.Red; + this.buttonAbbrechen.FlatAppearance.BorderSize = 0; + 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.Image = global::Deckungsbeitrag.Properties.Resources.Close_WhiteNoHalo_16x; + this.buttonAbbrechen.Location = new System.Drawing.Point(748, 421); + this.buttonAbbrechen.Margin = new System.Windows.Forms.Padding(2); + this.buttonAbbrechen.Name = "buttonAbbrechen"; + this.buttonAbbrechen.Size = new System.Drawing.Size(41, 41); + this.buttonAbbrechen.TabIndex = 49; + this.buttonAbbrechen.TextAlign = System.Drawing.ContentAlignment.BottomCenter; + this.buttonAbbrechen.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; + this.buttonAbbrechen.UseVisualStyleBackColor = false; + this.buttonAbbrechen.Click += new System.EventHandler(this.buttonAbbrechenAufgabe_Click); // - // label11 + // buttonSpeichern // - this.label11.AutoSize = true; - this.label11.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label11.Location = new System.Drawing.Point(554, 28); - this.label11.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); - this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(52, 13); - this.label11.TabIndex = 46; - this.label11.Text = "Kategorie"; - // - // comboBoxAufgabeKat - // - this.comboBoxAufgabeKat.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.comboBoxAufgabeKat.FormattingEnabled = true; - this.comboBoxAufgabeKat.Location = new System.Drawing.Point(557, 43); - this.comboBoxAufgabeKat.Margin = new System.Windows.Forms.Padding(2); - this.comboBoxAufgabeKat.Name = "comboBoxAufgabeKat"; - this.comboBoxAufgabeKat.Size = new System.Drawing.Size(133, 25); - this.comboBoxAufgabeKat.TabIndex = 45; - this.comboBoxAufgabeKat.SelectedValueChanged += new System.EventHandler(this.comboBoxAufgabeKat_SelectedValueChanged); - // - // label2 - // - this.label2.AutoSize = true; - this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label2.Location = new System.Drawing.Point(279, 30); - this.label2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(72, 13); - this.label2.TabIndex = 23; - this.label2.Text = "Beschreibung"; - // - // label1 - // - this.label1.AutoSize = true; - this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label1.Location = new System.Drawing.Point(6, 28); - this.label1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(47, 13); - this.label1.TabIndex = 22; - this.label1.Text = "Aufgabe"; - // - // textBoxBeschreibung - // - this.textBoxBeschreibung.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.textBoxBeschreibung.Location = new System.Drawing.Point(281, 45); - this.textBoxBeschreibung.Margin = new System.Windows.Forms.Padding(2); - this.textBoxBeschreibung.Name = "textBoxBeschreibung"; - this.textBoxBeschreibung.Size = new System.Drawing.Size(272, 23); - this.textBoxBeschreibung.TabIndex = 19; - // - // textBoxBezeichnung - // - this.textBoxBezeichnung.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Append; - this.textBoxBezeichnung.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.CustomSource; - this.textBoxBezeichnung.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.textBoxBezeichnung.Location = new System.Drawing.Point(9, 45); - this.textBoxBezeichnung.Margin = new System.Windows.Forms.Padding(2); - this.textBoxBezeichnung.Name = "textBoxBezeichnung"; - this.textBoxBezeichnung.Size = new System.Drawing.Size(269, 23); - this.textBoxBezeichnung.TabIndex = 18; - // - // buttonAbbrechenAufgabe - // - this.buttonAbbrechenAufgabe.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.buttonAbbrechenAufgabe.BackColor = System.Drawing.Color.Red; - this.buttonAbbrechenAufgabe.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.buttonAbbrechenAufgabe.Image = ((System.Drawing.Image)(resources.GetObject("buttonAbbrechenAufgabe.Image"))); - this.buttonAbbrechenAufgabe.Location = new System.Drawing.Point(759, 430); - this.buttonAbbrechenAufgabe.Margin = new System.Windows.Forms.Padding(2); - this.buttonAbbrechenAufgabe.Name = "buttonAbbrechenAufgabe"; - this.buttonAbbrechenAufgabe.Size = new System.Drawing.Size(30, 32); - this.buttonAbbrechenAufgabe.TabIndex = 41; - this.buttonAbbrechenAufgabe.TextAlign = System.Drawing.ContentAlignment.BottomCenter; - this.buttonAbbrechenAufgabe.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; - this.buttonAbbrechenAufgabe.UseVisualStyleBackColor = false; - this.buttonAbbrechenAufgabe.Click += new System.EventHandler(this.buttonAbbrechenAufgabe_Click); - // - // buttonSpeichernAufgabe - // - this.buttonSpeichernAufgabe.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.buttonSpeichernAufgabe.BackColor = System.Drawing.Color.Lime; - this.buttonSpeichernAufgabe.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.buttonSpeichernAufgabe.Image = ((System.Drawing.Image)(resources.GetObject("buttonSpeichernAufgabe.Image"))); - this.buttonSpeichernAufgabe.Location = new System.Drawing.Point(725, 430); - this.buttonSpeichernAufgabe.Margin = new System.Windows.Forms.Padding(2); - this.buttonSpeichernAufgabe.Name = "buttonSpeichernAufgabe"; - this.buttonSpeichernAufgabe.Size = new System.Drawing.Size(30, 32); - this.buttonSpeichernAufgabe.TabIndex = 40; - this.buttonSpeichernAufgabe.TextAlign = System.Drawing.ContentAlignment.BottomCenter; - this.buttonSpeichernAufgabe.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; - this.buttonSpeichernAufgabe.UseVisualStyleBackColor = false; - this.buttonSpeichernAufgabe.Click += new System.EventHandler(this.buttonSpeichern_Click); - // - // buttonNeueAufgabe - // - this.buttonNeueAufgabe.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.buttonNeueAufgabe.BackColor = System.Drawing.Color.Yellow; - this.buttonNeueAufgabe.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.buttonNeueAufgabe.Image = ((System.Drawing.Image)(resources.GetObject("buttonNeueAufgabe.Image"))); - this.buttonNeueAufgabe.Location = new System.Drawing.Point(11, 430); - this.buttonNeueAufgabe.Margin = new System.Windows.Forms.Padding(2); - this.buttonNeueAufgabe.Name = "buttonNeueAufgabe"; - this.buttonNeueAufgabe.Size = new System.Drawing.Size(135, 32); - this.buttonNeueAufgabe.TabIndex = 46; - this.buttonNeueAufgabe.Text = "Neue Aufgabe"; - this.buttonNeueAufgabe.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; - this.buttonNeueAufgabe.UseVisualStyleBackColor = false; - this.buttonNeueAufgabe.Click += new System.EventHandler(this.buttonNeueAufgabe_Click); + this.buttonSpeichern.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonSpeichern.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(0))))); + this.buttonSpeichern.Enabled = false; + this.buttonSpeichern.FlatAppearance.BorderSize = 0; + 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.Image = ((System.Drawing.Image)(resources.GetObject("buttonSpeichern.Image"))); + this.buttonSpeichern.Location = new System.Drawing.Point(703, 421); + this.buttonSpeichern.Margin = new System.Windows.Forms.Padding(2); + this.buttonSpeichern.Name = "buttonSpeichern"; + this.buttonSpeichern.Size = new System.Drawing.Size(41, 41); + this.buttonSpeichern.TabIndex = 48; + this.buttonSpeichern.TextAlign = System.Drawing.ContentAlignment.BottomCenter; + this.buttonSpeichern.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; + this.buttonSpeichern.UseVisualStyleBackColor = false; + this.buttonSpeichern.Visible = false; + this.buttonSpeichern.Click += new System.EventHandler(this.buttonSpeichern_Click); // // FormAufgabeVW // @@ -219,34 +126,23 @@ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(1)))), ((int)(((byte)(53)))), ((int)(((byte)(101))))); this.ClientSize = new System.Drawing.Size(800, 473); - this.Controls.Add(this.buttonNeueAufgabe); - this.Controls.Add(this.groupBoxNeueAufgabe); - this.Controls.Add(this.listViewAufgabeVW); - this.Controls.Add(this.buttonAbbrechenAufgabe); - this.Controls.Add(this.buttonSpeichernAufgabe); + this.Controls.Add(this.buttonNeueAnfrage); + this.Controls.Add(this.buttonAbbrechen); + this.Controls.Add(this.buttonSpeichern); + this.Controls.Add(this.objectListViewAufgabe); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Name = "FormAufgabeVW"; this.Text = "Aufgabeverwaltung"; this.Load += new System.EventHandler(this.FormAufgabeVW_Load); - this.groupBoxNeueAufgabe.ResumeLayout(false); - this.groupBoxNeueAufgabe.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.objectListViewAufgabe)).EndInit(); this.ResumeLayout(false); } #endregion - - private System.Windows.Forms.ListView listViewAufgabeVW; - private System.Windows.Forms.GroupBox groupBoxNeueAufgabe; - private System.Windows.Forms.Button buttonFarbe; - private System.Windows.Forms.Label label11; - private System.Windows.Forms.Button buttonAbbrechenAufgabe; - private System.Windows.Forms.ComboBox comboBoxAufgabeKat; - private System.Windows.Forms.Button buttonSpeichernAufgabe; - private System.Windows.Forms.Label label2; - private System.Windows.Forms.Label label1; - private System.Windows.Forms.TextBox textBoxBeschreibung; - private System.Windows.Forms.TextBox textBoxBezeichnung; - private System.Windows.Forms.Button buttonNeueAufgabe; + private BrightIdeasSoftware.ObjectListView objectListViewAufgabe; + private System.Windows.Forms.Button buttonNeueAnfrage; + private System.Windows.Forms.Button buttonAbbrechen; + private System.Windows.Forms.Button buttonSpeichern; } } \ No newline at end of file diff --git a/AA-Forms/FormAufgabeVW.cs b/AA-Forms/FormAufgabeVW.cs index 4b0a1b1..ef5d0a8 100644 --- a/AA-Forms/FormAufgabeVW.cs +++ b/AA-Forms/FormAufgabeVW.cs @@ -1,4 +1,5 @@ -using DatenDB; +using BrightIdeasSoftware; +using DatenDB; using System; using System.Collections.Generic; using System.ComponentModel; @@ -15,6 +16,9 @@ namespace Deckungsbeitrag public partial class FormAufgabeVW : Form { Aufgabe aufgabe; + private Meldungen meldung = new Meldungen(); + private List list; + bool showMeldung = false; public FormAufgabeVW() { InitializeComponent(); @@ -22,65 +26,28 @@ namespace Deckungsbeitrag private void FormAufgabeVW_Load(object sender, EventArgs e) { - GroupBox_Visibility_State(this.groupBoxNeueAufgabe); - List list = new List(Aufgabe.GetList(null)); - this.listViewAufgabeVW = Funktionen.ListView_Load(this.listViewAufgabeVW, Aufgabe.COLUMNS, list); - - } - private void Clear_controls() - { - foreach (Control ctr in this.groupBoxNeueAufgabe.Controls) + try { - if (ctr.GetType() == typeof(TextBox)) - { - TextBox tb = (TextBox)ctr; - tb.Clear(); - } - if (ctr.GetType() == typeof(CheckBox)) - { - CheckBox cb = (CheckBox)ctr; - cb.Checked = true; - } + list = new List(Aufgabe.GetList(null)); + Load_OLV(list); + } + catch (Exception ex) + { + meldung.IsUpdating(ex); + this.Close(); } } - private void Load_comboBoxAufgabeKat() + private void Load_OLV(List list) { - this.comboBoxAufgabeKat.DataSource = Enum.GetValues(typeof(Kategorie)); - } - private void listViewAufgabeVW_MouseClick(object sender, MouseEventArgs e) - { - ListViewItem item = this.listViewAufgabeVW.GetItemAt(e.X, e.Y); - if (item != null) - { - this.aufgabe = (Aufgabe)item.Tag; - this.groupBoxNeueAufgabe.Text = "Aufgabe bearbeiten"; - this.textBoxBezeichnung.Text = this.aufgabe.Bezeichnung; - this.textBoxBeschreibung.Text = this.aufgabe.Beschreibung; - Load_comboBoxAufgabeKat(); - this.comboBoxAufgabeKat.SelectedItem = this.aufgabe.Kategorie; - comboBoxAufgabeKat_SelectedValueChanged(this, EventArgs.Empty); - if (this.aufgabe.Kategorie == Kategorie.Waschstrasse) - { - this.buttonFarbe.BackColor = this.aufgabe.Farbe; - this.buttonFarbe.Visible = true; - } - } - if(!this.groupBoxNeueAufgabe.Visible) GroupBox_Visibility_State(this.groupBoxNeueAufgabe); - } - private void comboBoxAufgabeKat_SelectedValueChanged(object sender, EventArgs e) - { - if (comboBoxAufgabeKat.SelectedValue.ToString() == "Waschstrasse") - { - this.buttonFarbe.Visible = true; - } - else this.buttonFarbe.Visible = false; + Generator.GenerateColumns(this.objectListViewAufgabe, typeof(Aufgabe), true); + this.objectListViewAufgabe.SetObjects(list); + OLVColumn sortcolumn = (OLVColumn)this.objectListViewAufgabe.Columns[1]; + this.objectListViewAufgabe.Sort(sortcolumn); + + this.objectListViewAufgabe.FilterMenuBuildStrategy = new MeinFilterMenu(); + Funktionen.Columns_Resize(this.objectListViewAufgabe); - } - private void GroupBox_Visibility_State(GroupBox gb) - { - if(gb.Visible) gb.Visible = false; - else gb.Visible = true; } /// @@ -88,33 +55,61 @@ namespace Deckungsbeitrag /// /// /// - private void buttonNewUser_Click(object sender, EventArgs e) - { - GroupBox_Visibility_State(this.groupBoxNeueAufgabe); - this.buttonNeueAufgabe.BackColor = Color.Gray; - this.groupBoxNeueAufgabe.Text = "Neue Aufgabe"; - Load_comboBoxAufgabeKat(); - Clear_controls(); - } private void buttonSpeichern_Click(object sender, EventArgs e) { if (this.aufgabe == null) this.aufgabe = new Aufgabe(); - this.aufgabe.Bezeichnung = this.textBoxBezeichnung.Text; - this.aufgabe.Beschreibung = this.textBoxBeschreibung.Text; - this.aufgabe.Kategorie = (Kategorie)this.comboBoxAufgabeKat.SelectedItem; - this.aufgabe.Farbe = this.buttonFarbe.BackColor; - - if (this.aufgabe.Save() == 1) { Clear_controls(); FormAufgabeVW_Load(this, e); } + if (this.aufgabe.Save() == 1) { FormAufgabeVW_Load(this, e); } } private void buttonAbbrechenAufgabe_Click(object sender, EventArgs e) { + DialogResult = DialogResult.Cancel; this.Close(); } - private void buttonNeueAufgabe_Click(object sender, EventArgs e) { FormNeueAufgabe neueAufgabe = new FormNeueAufgabe(); neueAufgabe.ShowDialog(); } + private void objectListViewAufgabe_SubItemChecking(object sender, SubItemCheckingEventArgs e) + { + Aufgabe aufgabe = (Aufgabe)e.RowObject; + if (aufgabe.Aktiv) aufgabe.Aktiv = false; + else aufgabe.Aktiv = true; + + Save_Aufgabe(aufgabe, false); + } + private void objectListViewAufgabe_CellClick(object sender, CellClickEventArgs e) + { + ObjectListView olv = (ObjectListView)sender; + Aufgabe aufgabe = (Aufgabe)e.Model; + if(e.ColumnIndex == 3) + { + ColorDialog dialog = new ColorDialog(); + if (dialog.ShowDialog() == DialogResult.OK) + { + aufgabe.Farbe = dialog.Color; + Save_Aufgabe(aufgabe, showMeldung); + } + olv.RefreshObject(e); + FormAufgabeVW_Load(this, null); + } + } + private void objectListViewAufgabe_FormatCell(object sender, FormatCellEventArgs e) + { + if (e.ColumnIndex == 3) + { + Aufgabe _aufgabe = (Aufgabe)e.Model; + if (_aufgabe.Farbe != null) + { + e.SubItem.BackColor = _aufgabe.Farbe; + e.SubItem.Text = string.Empty; + } + } + } + private void Save_Aufgabe(Aufgabe _aufgabe, bool show) + { + if (_aufgabe.Save() == 1) { if (show) meldung.Gespeichert(); } + else { if (show) meldung.Speicherfehler(); } + } } } diff --git a/AA-Forms/FormAufgabeVW.resx b/AA-Forms/FormAufgabeVW.resx index 5a21ee9..a68c736 100644 --- a/AA-Forms/FormAufgabeVW.resx +++ b/AA-Forms/FormAufgabeVW.resx @@ -118,30 +118,12 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vAAADrwBlbxySQAAAKhJREFUOE9jYEAC3759M0DmYwM41Xz79q3i27dv/799+5aJLgcDIDmomgp0iYpX - N6/+3xbp/v/t/TtYDQGJgeS2hDj8f37xLMIQkJNApoI0L1Tj/b/WWRfDEJhmkBxIDcgQqEsg3kFXgGwI - PjmE+/AYgk0MQzMMYDOEaM0wgG4ISZpBgCID0DWT5AVsmokORFyaiYpGaiUk8pMykgLyMxMM4MyqSABd - DQCo07laP2majgAAAABJRU5ErkJggg== - - - + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO vAAADrwBlbxySQAAAG5JREFUOE9j+PbtW/i3b9/efPv27T+JGKQnnAHE0C5Y858heA5JGKQHpBdkAIYk sRisF9mAD+8/EoWHswGk4kFqALp/0TH9DEDno4sjG3CneP4xDA3ofHRxZANkkA1BV0jQABCAGQISACkC 0cRiAGlM6tRr9T1CAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAALpJREFUOE+dk7ERwyAMRT1CRsgIKVKkpmcAtklFkSYLsAVDUaoBUTqnnPEJWXZM - /t1vEE8fwTFNixBx5qY1ALggIsia3Lc2eLzuX7dCKeUZY5yNMRt772kfdMm8QbNzbhfOOd+6ZGmqHcLy - 6NKywQaWl6eNcAhzyQZ89gVW3TXQkve8voIULWo3r8HqOPIkIYTzMFet9ZpSAmvtOExCxDdPH4LpD/D0 - IZhEf6ClD8MkAij9L5jEXuEn/AEyPeZVqsLjAAAAAABJRU5ErkJggg== diff --git a/AA-Forms/FormBenutzerVW.cs b/AA-Forms/FormBenutzerVW.cs index a1efd5c..603480d 100644 --- a/AA-Forms/FormBenutzerVW.cs +++ b/AA-Forms/FormBenutzerVW.cs @@ -90,7 +90,6 @@ namespace Deckungsbeitrag { if (benutzer.Save() == 1) if (show) meldung.Gespeichert(); else if (show) meldung.Speicherfehler(); - } private void objectListViewBenutzer_SelectedIndexChanged(object sender, EventArgs e) diff --git a/AA-Forms/FormMain.Designer.cs b/AA-Forms/FormMain.Designer.cs index df2ee3a..1e56766 100644 --- a/AA-Forms/FormMain.Designer.cs +++ b/AA-Forms/FormMain.Designer.cs @@ -84,6 +84,7 @@ namespace Deckungsbeitrag this.textBoxScannTest = new System.Windows.Forms.TextBox(); this.buttonScannTest = new System.Windows.Forms.Button(); this.labelScannTest = new System.Windows.Forms.Label(); + this.buttonNeueAufgabe = new System.Windows.Forms.Button(); this.toolStripMenu.SuspendLayout(); this.panelMain.SuspendLayout(); this.groupBoxStatistik.SuspendLayout(); @@ -121,8 +122,7 @@ namespace Deckungsbeitrag this.toolStripMenu.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.VerticalStackWithOverflow; this.toolStripMenu.Location = new System.Drawing.Point(0, 0); this.toolStripMenu.Name = "toolStripMenu"; - this.toolStripMenu.Padding = new System.Windows.Forms.Padding(0, 0, 2, 0); - this.toolStripMenu.Size = new System.Drawing.Size(318, 1060); + this.toolStripMenu.Size = new System.Drawing.Size(212, 689); this.toolStripMenu.TabIndex = 0; this.toolStripMenu.Text = "toolStripMenu"; // @@ -400,6 +400,7 @@ namespace Deckungsbeitrag // this.panelMain.AllowDrop = true; this.panelMain.BackColor = System.Drawing.Color.White; + this.panelMain.Controls.Add(this.buttonNeueAufgabe); this.panelMain.Controls.Add(this.buttonNeuerUser); this.panelMain.Controls.Add(this.groupBoxStatistik); this.panelMain.Controls.Add(this.groupBoxUpdate); @@ -407,9 +408,10 @@ namespace Deckungsbeitrag this.panelMain.Controls.Add(this.groupBoxAuftrag); this.panelMain.Controls.Add(this.groupBoxScannTest); this.panelMain.Dock = System.Windows.Forms.DockStyle.Right; - this.panelMain.Location = new System.Drawing.Point(327, 0); + this.panelMain.Location = new System.Drawing.Point(218, 0); + this.panelMain.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.panelMain.Name = "panelMain"; - this.panelMain.Size = new System.Drawing.Size(1407, 1060); + this.panelMain.Size = new System.Drawing.Size(938, 689); this.panelMain.TabIndex = 5; this.panelMain.DragDrop += new System.Windows.Forms.DragEventHandler(this.panelMain_DragDrop); this.panelMain.DragEnter += new System.Windows.Forms.DragEventHandler(this.panelMain_DragEnter); @@ -424,9 +426,10 @@ namespace Deckungsbeitrag this.buttonNeuerUser.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.buttonNeuerUser.ForeColor = System.Drawing.Color.Black; this.buttonNeuerUser.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.buttonNeuerUser.Location = new System.Drawing.Point(12, 100); + this.buttonNeuerUser.Location = new System.Drawing.Point(8, 65); + this.buttonNeuerUser.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.buttonNeuerUser.Name = "buttonNeuerUser"; - this.buttonNeuerUser.Size = new System.Drawing.Size(300, 63); + this.buttonNeuerUser.Size = new System.Drawing.Size(200, 41); this.buttonNeuerUser.TabIndex = 62; this.buttonNeuerUser.Text = "Neuer User"; this.buttonNeuerUser.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; @@ -440,11 +443,9 @@ namespace Deckungsbeitrag this.groupBoxStatistik.Controls.Add(this.dateTimePicker1); this.groupBoxStatistik.Controls.Add(this.tableLayoutPanelStatistik); this.groupBoxStatistik.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(1)))), ((int)(((byte)(53)))), ((int)(((byte)(101))))); - this.groupBoxStatistik.Location = new System.Drawing.Point(12, 494); - this.groupBoxStatistik.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.groupBoxStatistik.Location = new System.Drawing.Point(8, 321); this.groupBoxStatistik.Name = "groupBoxStatistik"; - this.groupBoxStatistik.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.groupBoxStatistik.Size = new System.Drawing.Size(418, 303); + this.groupBoxStatistik.Size = new System.Drawing.Size(279, 197); this.groupBoxStatistik.TabIndex = 61; this.groupBoxStatistik.TabStop = false; this.groupBoxStatistik.Text = "STATISTIK"; @@ -455,10 +456,9 @@ namespace Deckungsbeitrag this.dateTimePicker1.CustomFormat = "dddd dd.MM.yyyy"; this.dateTimePicker1.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; - this.dateTimePicker1.Location = new System.Drawing.Point(15, 29); - this.dateTimePicker1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.dateTimePicker1.Location = new System.Drawing.Point(10, 19); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(334, 26); + this.dateTimePicker1.Size = new System.Drawing.Size(224, 26); this.dateTimePicker1.TabIndex = 1; this.dateTimePicker1.CloseUp += new System.EventHandler(this.dateTimePicker1_CloseUp); // @@ -480,8 +480,7 @@ namespace Deckungsbeitrag this.tableLayoutPanelStatistik.Controls.Add(this.labelZahl1, 1, 0); this.tableLayoutPanelStatistik.Controls.Add(this.labelStatistik1, 0, 0); this.tableLayoutPanelStatistik.Dock = System.Windows.Forms.DockStyle.Bottom; - this.tableLayoutPanelStatistik.Location = new System.Drawing.Point(4, 78); - this.tableLayoutPanelStatistik.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.tableLayoutPanelStatistik.Location = new System.Drawing.Point(3, 51); this.tableLayoutPanelStatistik.Name = "tableLayoutPanelStatistik"; this.tableLayoutPanelStatistik.RowCount = 6; this.tableLayoutPanelStatistik.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 16.66667F)); @@ -490,7 +489,7 @@ namespace Deckungsbeitrag this.tableLayoutPanelStatistik.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 16.66667F)); this.tableLayoutPanelStatistik.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 16.66667F)); this.tableLayoutPanelStatistik.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 16.66667F)); - this.tableLayoutPanelStatistik.Size = new System.Drawing.Size(410, 220); + this.tableLayoutPanelStatistik.Size = new System.Drawing.Size(273, 143); this.tableLayoutPanelStatistik.TabIndex = 0; this.tableLayoutPanelStatistik.MouseDown += new System.Windows.Forms.MouseEventHandler(this.groupBox_MouseDown); this.tableLayoutPanelStatistik.MouseMove += new System.Windows.Forms.MouseEventHandler(this.groupBox_MouseMove); @@ -502,10 +501,9 @@ namespace Deckungsbeitrag this.labelZahl6.Dock = System.Windows.Forms.DockStyle.Left; this.labelZahl6.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.labelZahl6.ForeColor = System.Drawing.SystemColors.ControlText; - this.labelZahl6.Location = new System.Drawing.Point(102, 180); - this.labelZahl6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labelZahl6.Location = new System.Drawing.Point(99, 115); this.labelZahl6.Name = "labelZahl6"; - this.labelZahl6.Size = new System.Drawing.Size(53, 40); + this.labelZahl6.Size = new System.Drawing.Size(53, 28); this.labelZahl6.TabIndex = 11; this.labelZahl6.Text = "Zahl 6"; this.labelZahl6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -516,10 +514,9 @@ namespace Deckungsbeitrag this.labelStatistik6.Dock = System.Windows.Forms.DockStyle.Left; this.labelStatistik6.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.labelStatistik6.ForeColor = System.Drawing.SystemColors.ControlText; - this.labelStatistik6.Location = new System.Drawing.Point(4, 180); - this.labelStatistik6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labelStatistik6.Location = new System.Drawing.Point(3, 115); this.labelStatistik6.Name = "labelStatistik6"; - this.labelStatistik6.Size = new System.Drawing.Size(90, 40); + this.labelStatistik6.Size = new System.Drawing.Size(90, 28); this.labelStatistik6.TabIndex = 10; this.labelStatistik6.Text = "Statistik 6"; this.labelStatistik6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -530,10 +527,9 @@ namespace Deckungsbeitrag this.labelZahl5.Dock = System.Windows.Forms.DockStyle.Left; this.labelZahl5.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.labelZahl5.ForeColor = System.Drawing.SystemColors.ControlText; - this.labelZahl5.Location = new System.Drawing.Point(102, 144); - this.labelZahl5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labelZahl5.Location = new System.Drawing.Point(99, 92); this.labelZahl5.Name = "labelZahl5"; - this.labelZahl5.Size = new System.Drawing.Size(53, 36); + this.labelZahl5.Size = new System.Drawing.Size(53, 23); this.labelZahl5.TabIndex = 9; this.labelZahl5.Text = "Zahl 5"; this.labelZahl5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -544,10 +540,9 @@ namespace Deckungsbeitrag this.labelStatistik5.Dock = System.Windows.Forms.DockStyle.Left; this.labelStatistik5.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.labelStatistik5.ForeColor = System.Drawing.SystemColors.ControlText; - this.labelStatistik5.Location = new System.Drawing.Point(4, 144); - this.labelStatistik5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labelStatistik5.Location = new System.Drawing.Point(3, 92); this.labelStatistik5.Name = "labelStatistik5"; - this.labelStatistik5.Size = new System.Drawing.Size(90, 36); + this.labelStatistik5.Size = new System.Drawing.Size(90, 23); this.labelStatistik5.TabIndex = 8; this.labelStatistik5.Text = "Statistik 5"; this.labelStatistik5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -558,10 +553,9 @@ namespace Deckungsbeitrag this.labelZahl4.Dock = System.Windows.Forms.DockStyle.Left; this.labelZahl4.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.labelZahl4.ForeColor = System.Drawing.SystemColors.ControlText; - this.labelZahl4.Location = new System.Drawing.Point(102, 108); - this.labelZahl4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labelZahl4.Location = new System.Drawing.Point(99, 69); this.labelZahl4.Name = "labelZahl4"; - this.labelZahl4.Size = new System.Drawing.Size(53, 36); + this.labelZahl4.Size = new System.Drawing.Size(53, 23); this.labelZahl4.TabIndex = 7; this.labelZahl4.Text = "Zahl 4"; this.labelZahl4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -572,10 +566,9 @@ namespace Deckungsbeitrag this.labelStatistik4.Dock = System.Windows.Forms.DockStyle.Left; this.labelStatistik4.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.labelStatistik4.ForeColor = System.Drawing.SystemColors.ControlText; - this.labelStatistik4.Location = new System.Drawing.Point(4, 108); - this.labelStatistik4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labelStatistik4.Location = new System.Drawing.Point(3, 69); this.labelStatistik4.Name = "labelStatistik4"; - this.labelStatistik4.Size = new System.Drawing.Size(90, 36); + this.labelStatistik4.Size = new System.Drawing.Size(90, 23); this.labelStatistik4.TabIndex = 6; this.labelStatistik4.Text = "Statistik 4"; this.labelStatistik4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -586,10 +579,9 @@ namespace Deckungsbeitrag this.labelZahl3.Dock = System.Windows.Forms.DockStyle.Left; this.labelZahl3.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.labelZahl3.ForeColor = System.Drawing.SystemColors.ControlText; - this.labelZahl3.Location = new System.Drawing.Point(102, 72); - this.labelZahl3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labelZahl3.Location = new System.Drawing.Point(99, 46); this.labelZahl3.Name = "labelZahl3"; - this.labelZahl3.Size = new System.Drawing.Size(53, 36); + this.labelZahl3.Size = new System.Drawing.Size(53, 23); this.labelZahl3.TabIndex = 5; this.labelZahl3.Text = "Zahl 3"; this.labelZahl3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -600,10 +592,9 @@ namespace Deckungsbeitrag this.labelStatistik3.Dock = System.Windows.Forms.DockStyle.Left; this.labelStatistik3.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.labelStatistik3.ForeColor = System.Drawing.SystemColors.ControlText; - this.labelStatistik3.Location = new System.Drawing.Point(4, 72); - this.labelStatistik3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labelStatistik3.Location = new System.Drawing.Point(3, 46); this.labelStatistik3.Name = "labelStatistik3"; - this.labelStatistik3.Size = new System.Drawing.Size(90, 36); + this.labelStatistik3.Size = new System.Drawing.Size(90, 23); this.labelStatistik3.TabIndex = 4; this.labelStatistik3.Text = "Statistik 3"; this.labelStatistik3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -614,10 +605,9 @@ namespace Deckungsbeitrag this.labelZahl2.Dock = System.Windows.Forms.DockStyle.Left; this.labelZahl2.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.labelZahl2.ForeColor = System.Drawing.SystemColors.ControlText; - this.labelZahl2.Location = new System.Drawing.Point(102, 36); - this.labelZahl2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labelZahl2.Location = new System.Drawing.Point(99, 23); this.labelZahl2.Name = "labelZahl2"; - this.labelZahl2.Size = new System.Drawing.Size(53, 36); + this.labelZahl2.Size = new System.Drawing.Size(53, 23); this.labelZahl2.TabIndex = 3; this.labelZahl2.Text = "Zahl 2"; this.labelZahl2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -628,10 +618,9 @@ namespace Deckungsbeitrag this.labelStatistik2.Dock = System.Windows.Forms.DockStyle.Left; this.labelStatistik2.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.labelStatistik2.ForeColor = System.Drawing.SystemColors.ControlText; - this.labelStatistik2.Location = new System.Drawing.Point(4, 36); - this.labelStatistik2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labelStatistik2.Location = new System.Drawing.Point(3, 23); this.labelStatistik2.Name = "labelStatistik2"; - this.labelStatistik2.Size = new System.Drawing.Size(90, 36); + this.labelStatistik2.Size = new System.Drawing.Size(90, 23); this.labelStatistik2.TabIndex = 2; this.labelStatistik2.Text = "Statistik 2"; this.labelStatistik2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -642,10 +631,9 @@ namespace Deckungsbeitrag this.labelZahl1.Dock = System.Windows.Forms.DockStyle.Left; this.labelZahl1.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.labelZahl1.ForeColor = System.Drawing.SystemColors.ControlText; - this.labelZahl1.Location = new System.Drawing.Point(102, 0); - this.labelZahl1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labelZahl1.Location = new System.Drawing.Point(99, 0); this.labelZahl1.Name = "labelZahl1"; - this.labelZahl1.Size = new System.Drawing.Size(53, 36); + this.labelZahl1.Size = new System.Drawing.Size(53, 23); this.labelZahl1.TabIndex = 1; this.labelZahl1.Text = "Zahl 1"; this.labelZahl1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -656,10 +644,9 @@ namespace Deckungsbeitrag this.labelStatistik1.Dock = System.Windows.Forms.DockStyle.Left; this.labelStatistik1.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.labelStatistik1.ForeColor = System.Drawing.SystemColors.ControlText; - this.labelStatistik1.Location = new System.Drawing.Point(4, 0); - this.labelStatistik1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labelStatistik1.Location = new System.Drawing.Point(3, 0); this.labelStatistik1.Name = "labelStatistik1"; - this.labelStatistik1.Size = new System.Drawing.Size(90, 36); + this.labelStatistik1.Size = new System.Drawing.Size(90, 23); this.labelStatistik1.TabIndex = 0; this.labelStatistik1.Text = "Statistik 1"; this.labelStatistik1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -668,11 +655,9 @@ namespace Deckungsbeitrag // this.groupBoxUpdate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.groupBoxUpdate.Controls.Add(this.tableLayoutPanelUpdate); - this.groupBoxUpdate.Location = new System.Drawing.Point(12, 882); - this.groupBoxUpdate.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.groupBoxUpdate.Location = new System.Drawing.Point(8, 573); this.groupBoxUpdate.Name = "groupBoxUpdate"; - this.groupBoxUpdate.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.groupBoxUpdate.Size = new System.Drawing.Size(860, 169); + this.groupBoxUpdate.Size = new System.Drawing.Size(573, 110); this.groupBoxUpdate.TabIndex = 60; this.groupBoxUpdate.TabStop = false; this.groupBoxUpdate.Text = "UPDATE"; @@ -688,23 +673,21 @@ namespace Deckungsbeitrag this.tableLayoutPanelUpdate.Controls.Add(this.progressBarArtikel, 1, 0); this.tableLayoutPanelUpdate.Controls.Add(this.buttonAllUpdate, 0, 2); this.tableLayoutPanelUpdate.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanelUpdate.Location = new System.Drawing.Point(4, 24); - this.tableLayoutPanelUpdate.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.tableLayoutPanelUpdate.Location = new System.Drawing.Point(3, 16); this.tableLayoutPanelUpdate.Name = "tableLayoutPanelUpdate"; this.tableLayoutPanelUpdate.RowCount = 3; this.tableLayoutPanelUpdate.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33333F)); this.tableLayoutPanelUpdate.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33333F)); this.tableLayoutPanelUpdate.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33333F)); - this.tableLayoutPanelUpdate.Size = new System.Drawing.Size(852, 140); + this.tableLayoutPanelUpdate.Size = new System.Drawing.Size(567, 91); this.tableLayoutPanelUpdate.TabIndex = 0; // // progressBarSortiment // this.progressBarSortiment.Dock = System.Windows.Forms.DockStyle.Left; - this.progressBarSortiment.Location = new System.Drawing.Point(217, 51); - this.progressBarSortiment.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.progressBarSortiment.Location = new System.Drawing.Point(144, 33); this.progressBarSortiment.Name = "progressBarSortiment"; - this.progressBarSortiment.Size = new System.Drawing.Size(630, 36); + this.progressBarSortiment.Size = new System.Drawing.Size(420, 24); this.progressBarSortiment.TabIndex = 62; // // buttonSortimentUpdate @@ -712,9 +695,10 @@ namespace Deckungsbeitrag this.buttonSortimentUpdate.BackColor = System.Drawing.Color.White; this.buttonSortimentUpdate.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.buttonSortimentUpdate.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.buttonSortimentUpdate.Location = new System.Drawing.Point(3, 49); + this.buttonSortimentUpdate.Location = new System.Drawing.Point(2, 32); + this.buttonSortimentUpdate.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.buttonSortimentUpdate.Name = "buttonSortimentUpdate"; - this.buttonSortimentUpdate.Size = new System.Drawing.Size(206, 37); + this.buttonSortimentUpdate.Size = new System.Drawing.Size(137, 24); this.buttonSortimentUpdate.TabIndex = 61; this.buttonSortimentUpdate.Text = "Sortiment-Update"; this.buttonSortimentUpdate.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; @@ -726,9 +710,10 @@ namespace Deckungsbeitrag this.buttonArtikelUpdate.BackColor = System.Drawing.Color.White; this.buttonArtikelUpdate.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.buttonArtikelUpdate.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.buttonArtikelUpdate.Location = new System.Drawing.Point(3, 3); + this.buttonArtikelUpdate.Location = new System.Drawing.Point(2, 2); + this.buttonArtikelUpdate.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.buttonArtikelUpdate.Name = "buttonArtikelUpdate"; - this.buttonArtikelUpdate.Size = new System.Drawing.Size(206, 37); + this.buttonArtikelUpdate.Size = new System.Drawing.Size(137, 24); this.buttonArtikelUpdate.TabIndex = 59; this.buttonArtikelUpdate.Text = "Artikel-Update"; this.buttonArtikelUpdate.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; @@ -738,10 +723,9 @@ namespace Deckungsbeitrag // progressBarArtikel // this.progressBarArtikel.Dock = System.Windows.Forms.DockStyle.Left; - this.progressBarArtikel.Location = new System.Drawing.Point(217, 5); - this.progressBarArtikel.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.progressBarArtikel.Location = new System.Drawing.Point(144, 3); this.progressBarArtikel.Name = "progressBarArtikel"; - this.progressBarArtikel.Size = new System.Drawing.Size(630, 36); + this.progressBarArtikel.Size = new System.Drawing.Size(420, 24); this.progressBarArtikel.TabIndex = 58; // // buttonAllUpdate @@ -749,9 +733,10 @@ namespace Deckungsbeitrag this.buttonAllUpdate.BackColor = System.Drawing.Color.White; this.buttonAllUpdate.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.buttonAllUpdate.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.buttonAllUpdate.Location = new System.Drawing.Point(3, 95); + this.buttonAllUpdate.Location = new System.Drawing.Point(2, 62); + this.buttonAllUpdate.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.buttonAllUpdate.Name = "buttonAllUpdate"; - this.buttonAllUpdate.Size = new System.Drawing.Size(206, 38); + this.buttonAllUpdate.Size = new System.Drawing.Size(137, 25); this.buttonAllUpdate.TabIndex = 60; this.buttonAllUpdate.Text = "Alle-Updates starten"; this.buttonAllUpdate.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; @@ -767,9 +752,10 @@ namespace Deckungsbeitrag this.buttonNeuerAuftrag.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.buttonNeuerAuftrag.ForeColor = System.Drawing.Color.White; this.buttonNeuerAuftrag.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.buttonNeuerAuftrag.Location = new System.Drawing.Point(12, 14); + this.buttonNeuerAuftrag.Location = new System.Drawing.Point(8, 9); + this.buttonNeuerAuftrag.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.buttonNeuerAuftrag.Name = "buttonNeuerAuftrag"; - this.buttonNeuerAuftrag.Size = new System.Drawing.Size(300, 63); + this.buttonNeuerAuftrag.Size = new System.Drawing.Size(200, 41); this.buttonNeuerAuftrag.TabIndex = 56; this.buttonNeuerAuftrag.Text = "Neuer Auftrag"; this.buttonNeuerAuftrag.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; @@ -791,11 +777,9 @@ namespace Deckungsbeitrag this.groupBoxAuftrag.Controls.Add(this.rBAlle); this.groupBoxAuftrag.Controls.Add(this.buttonAufAbruf); this.groupBoxAuftrag.Controls.Add(this.buttonAusgeliefert); - this.groupBoxAuftrag.Location = new System.Drawing.Point(993, 231); - this.groupBoxAuftrag.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.groupBoxAuftrag.Location = new System.Drawing.Point(662, 150); this.groupBoxAuftrag.Name = "groupBoxAuftrag"; - this.groupBoxAuftrag.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.groupBoxAuftrag.Size = new System.Drawing.Size(994, 737); + this.groupBoxAuftrag.Size = new System.Drawing.Size(663, 479); this.groupBoxAuftrag.TabIndex = 51; this.groupBoxAuftrag.TabStop = false; this.groupBoxAuftrag.Visible = false; @@ -813,10 +797,9 @@ namespace Deckungsbeitrag this.objectListViewAuftrag.FullRowSelect = true; this.objectListViewAuftrag.GridLines = true; this.objectListViewAuftrag.HideSelection = false; - this.objectListViewAuftrag.Location = new System.Drawing.Point(248, 22); - this.objectListViewAuftrag.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.objectListViewAuftrag.Location = new System.Drawing.Point(165, 14); this.objectListViewAuftrag.Name = "objectListViewAuftrag"; - this.objectListViewAuftrag.Size = new System.Drawing.Size(738, 706); + this.objectListViewAuftrag.Size = new System.Drawing.Size(492, 459); this.objectListViewAuftrag.TabIndex = 58; this.objectListViewAuftrag.UseAlternatingBackColors = true; this.objectListViewAuftrag.UseCompatibleStateImageBehavior = false; @@ -828,8 +811,7 @@ namespace Deckungsbeitrag this.rBAufAbruf.AutoSize = true; this.rBAufAbruf.CheckAlign = System.Drawing.ContentAlignment.MiddleRight; this.rBAufAbruf.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.rBAufAbruf.Location = new System.Drawing.Point(66, 209); - this.rBAufAbruf.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.rBAufAbruf.Location = new System.Drawing.Point(44, 136); this.rBAufAbruf.Name = "rBAufAbruf"; this.rBAufAbruf.Size = new System.Drawing.Size(95, 24); this.rBAufAbruf.TabIndex = 57; @@ -844,8 +826,7 @@ namespace Deckungsbeitrag this.rBAusgeliefert.AutoSize = true; this.rBAusgeliefert.CheckAlign = System.Drawing.ContentAlignment.MiddleRight; this.rBAusgeliefert.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.rBAusgeliefert.Location = new System.Drawing.Point(40, 163); - this.rBAusgeliefert.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.rBAusgeliefert.Location = new System.Drawing.Point(27, 106); this.rBAusgeliefert.Name = "rBAusgeliefert"; this.rBAusgeliefert.Size = new System.Drawing.Size(112, 24); this.rBAusgeliefert.TabIndex = 54; @@ -860,8 +841,7 @@ namespace Deckungsbeitrag this.rBFertig.AutoSize = true; this.rBFertig.CheckAlign = System.Drawing.ContentAlignment.MiddleRight; this.rBFertig.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.rBFertig.Location = new System.Drawing.Point(106, 117); - this.rBFertig.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.rBFertig.Location = new System.Drawing.Point(71, 76); this.rBFertig.Name = "rBFertig"; this.rBFertig.Size = new System.Drawing.Size(68, 24); this.rBFertig.TabIndex = 53; @@ -876,8 +856,7 @@ namespace Deckungsbeitrag this.rBVorbereitet.AutoSize = true; this.rBVorbereitet.CheckAlign = System.Drawing.ContentAlignment.MiddleRight; this.rBVorbereitet.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.rBVorbereitet.Location = new System.Drawing.Point(50, 71); - this.rBVorbereitet.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.rBVorbereitet.Location = new System.Drawing.Point(33, 46); this.rBVorbereitet.Name = "rBVorbereitet"; this.rBVorbereitet.Size = new System.Drawing.Size(106, 24); this.rBVorbereitet.TabIndex = 52; @@ -892,8 +871,7 @@ namespace Deckungsbeitrag this.rBAlle.AutoSize = true; this.rBAlle.CheckAlign = System.Drawing.ContentAlignment.MiddleRight; this.rBAlle.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.rBAlle.Location = new System.Drawing.Point(129, 25); - this.rBAlle.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.rBAlle.Location = new System.Drawing.Point(86, 16); this.rBAlle.Name = "rBAlle"; this.rBAlle.Size = new System.Drawing.Size(53, 24); this.rBAlle.TabIndex = 51; @@ -912,9 +890,10 @@ namespace Deckungsbeitrag this.buttonAufAbruf.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.buttonAufAbruf.ForeColor = System.Drawing.Color.White; this.buttonAufAbruf.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.buttonAufAbruf.Location = new System.Drawing.Point(15, 331); + this.buttonAufAbruf.Location = new System.Drawing.Point(10, 215); + this.buttonAufAbruf.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.buttonAufAbruf.Name = "buttonAufAbruf"; - this.buttonAufAbruf.Size = new System.Drawing.Size(225, 63); + this.buttonAufAbruf.Size = new System.Drawing.Size(150, 41); this.buttonAufAbruf.TabIndex = 56; this.buttonAufAbruf.Text = "AufAbruf"; this.buttonAufAbruf.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; @@ -931,9 +910,10 @@ namespace Deckungsbeitrag this.buttonAusgeliefert.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.buttonAusgeliefert.ForeColor = System.Drawing.Color.White; this.buttonAusgeliefert.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.buttonAusgeliefert.Location = new System.Drawing.Point(15, 262); + this.buttonAusgeliefert.Location = new System.Drawing.Point(10, 170); + this.buttonAusgeliefert.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.buttonAusgeliefert.Name = "buttonAusgeliefert"; - this.buttonAusgeliefert.Size = new System.Drawing.Size(225, 63); + this.buttonAusgeliefert.Size = new System.Drawing.Size(150, 41); this.buttonAusgeliefert.TabIndex = 55; this.buttonAusgeliefert.Text = "Ausgeliefert"; this.buttonAusgeliefert.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; @@ -949,21 +929,18 @@ namespace Deckungsbeitrag this.groupBoxScannTest.Controls.Add(this.textBoxScannTest); this.groupBoxScannTest.Controls.Add(this.buttonScannTest); this.groupBoxScannTest.Controls.Add(this.labelScannTest); - this.groupBoxScannTest.Location = new System.Drawing.Point(1119, 343); - this.groupBoxScannTest.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.groupBoxScannTest.Location = new System.Drawing.Point(746, 223); this.groupBoxScannTest.Name = "groupBoxScannTest"; - this.groupBoxScannTest.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.groupBoxScannTest.Size = new System.Drawing.Size(1398, 406); + this.groupBoxScannTest.Size = new System.Drawing.Size(932, 264); this.groupBoxScannTest.TabIndex = 50; this.groupBoxScannTest.TabStop = false; this.groupBoxScannTest.Visible = false; // // pictureBoxScannTest // - this.pictureBoxScannTest.Location = new System.Drawing.Point(9, 15); - this.pictureBoxScannTest.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.pictureBoxScannTest.Location = new System.Drawing.Point(6, 10); this.pictureBoxScannTest.Name = "pictureBoxScannTest"; - this.pictureBoxScannTest.Size = new System.Drawing.Size(268, 246); + this.pictureBoxScannTest.Size = new System.Drawing.Size(179, 160); this.pictureBoxScannTest.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; this.pictureBoxScannTest.TabIndex = 14; this.pictureBoxScannTest.TabStop = false; @@ -972,20 +949,18 @@ namespace Deckungsbeitrag // textBoxScannTest // this.textBoxScannTest.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.textBoxScannTest.Location = new System.Drawing.Point(9, 271); - this.textBoxScannTest.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.textBoxScannTest.Location = new System.Drawing.Point(6, 176); this.textBoxScannTest.Name = "textBoxScannTest"; - this.textBoxScannTest.Size = new System.Drawing.Size(192, 26); + this.textBoxScannTest.Size = new System.Drawing.Size(129, 26); this.textBoxScannTest.TabIndex = 13; this.textBoxScannTest.Visible = false; this.textBoxScannTest.TextChanged += new System.EventHandler(this.textBoxScannTest_TextChanged); // // buttonScannTest // - this.buttonScannTest.Location = new System.Drawing.Point(9, 320); - this.buttonScannTest.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.buttonScannTest.Location = new System.Drawing.Point(6, 208); this.buttonScannTest.Name = "buttonScannTest"; - this.buttonScannTest.Size = new System.Drawing.Size(112, 35); + this.buttonScannTest.Size = new System.Drawing.Size(75, 23); this.buttonScannTest.TabIndex = 12; this.buttonScannTest.Text = "Test starten"; this.buttonScannTest.UseVisualStyleBackColor = true; @@ -996,24 +971,45 @@ namespace Deckungsbeitrag // this.labelScannTest.AutoSize = true; this.labelScannTest.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.labelScannTest.Location = new System.Drawing.Point(9, 360); - this.labelScannTest.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labelScannTest.Location = new System.Drawing.Point(6, 234); this.labelScannTest.Name = "labelScannTest"; this.labelScannTest.Size = new System.Drawing.Size(60, 24); this.labelScannTest.TabIndex = 11; this.labelScannTest.Text = "label1"; this.labelScannTest.Visible = false; // + // buttonNeueAufgabe + // + this.buttonNeueAufgabe.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(128))))); + this.buttonNeueAufgabe.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(0))))); + this.buttonNeueAufgabe.FlatAppearance.BorderSize = 0; + this.buttonNeueAufgabe.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.buttonNeueAufgabe.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.buttonNeueAufgabe.ForeColor = System.Drawing.Color.Black; + this.buttonNeueAufgabe.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; + this.buttonNeueAufgabe.Location = new System.Drawing.Point(8, 124); + this.buttonNeueAufgabe.Margin = new System.Windows.Forms.Padding(2); + this.buttonNeueAufgabe.Name = "buttonNeueAufgabe"; + this.buttonNeueAufgabe.Size = new System.Drawing.Size(200, 41); + this.buttonNeueAufgabe.TabIndex = 63; + this.buttonNeueAufgabe.Text = "Neue Aufgabe"; + this.buttonNeueAufgabe.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; + this.buttonNeueAufgabe.UseVisualStyleBackColor = false; + this.buttonNeueAufgabe.Click += new System.EventHandler(this.buttonNeueAufgabe_Click); + this.buttonNeueAufgabe.MouseDown += new System.Windows.Forms.MouseEventHandler(this.Button_MouseDown); + this.buttonNeueAufgabe.MouseMove += new System.Windows.Forms.MouseEventHandler(this.Button_MouseMove); + // // FormMain // - this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(1)))), ((int)(((byte)(53)))), ((int)(((byte)(101))))); - this.ClientSize = new System.Drawing.Size(1734, 1060); + this.ClientSize = new System.Drawing.Size(1156, 689); this.Controls.Add(this.toolStripMenu); this.Controls.Add(this.panelMain); this.HelpButton = true; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.Name = "FormMain"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "Wolfgang Wirl GmbH - GRUNDPROGRAMM"; @@ -1097,6 +1093,7 @@ namespace Deckungsbeitrag private System.Windows.Forms.Label labelZahl1; private System.Windows.Forms.DateTimePicker dateTimePicker1; private System.Windows.Forms.Button buttonNeuerUser; + private System.Windows.Forms.Button buttonNeueAufgabe; } } diff --git a/AA-Forms/FormMain.cs b/AA-Forms/FormMain.cs index 6d3e0f1..0851eea 100644 --- a/AA-Forms/FormMain.cs +++ b/AA-Forms/FormMain.cs @@ -922,6 +922,12 @@ namespace Deckungsbeitrag _handlingResize = false; } } + + private void buttonNeueAufgabe_Click(object sender, EventArgs e) + { + FormNeueAufgabe neueAufgabe = new FormNeueAufgabe(); + neueAufgabe.ShowDialog(); + } } } //DONE: DragDrop verbessern diff --git a/AA-Forms/FormNeueAufgabe.cs b/AA-Forms/FormNeueAufgabe.cs index 6c4badc..ed23859 100644 --- a/AA-Forms/FormNeueAufgabe.cs +++ b/AA-Forms/FormNeueAufgabe.cs @@ -37,6 +37,7 @@ namespace Deckungsbeitrag aufgabe.Bezeichnung = textBoxBezeichnung.Text; aufgabe.Beschreibung = textBoxBeschreibung.Text; aufgabe.Kategorie = (Kategorie)comboBoxAufgabeKat.SelectedItem; + aufgabe.Aktiv = true; if (buttonFarbe.Enabled) { if ((bool)buttonFarbe.Tag == true) aufgabe.Farbe = buttonFarbe.FlatAppearance.BorderColor; diff --git a/AA-Klassen/Aufgabe.cs b/AA-Klassen/Aufgabe.cs index ff3e8a1..5230e38 100644 --- a/AA-Klassen/Aufgabe.cs +++ b/AA-Klassen/Aufgabe.cs @@ -1,4 +1,5 @@ -using Npgsql; +using BrightIdeasSoftware; +using Npgsql; using System; using System.Collections.Generic; using System.Drawing; @@ -21,7 +22,7 @@ namespace DatenDB { //AUFGABE TABLE IN DB INTEGRIEREN private static string TABLE = "kundenverwaltung.aufgabe"; - public static string COLUMNS = "aufgabe_id, bezeichnung, beschreibung, kategorie, farbe"; + public static string COLUMNS = "aufgabe_id, bezeichnung, beschreibung, kategorie, farbe, aktive"; public Aufgabe() { } @@ -76,13 +77,13 @@ namespace DatenDB if (this.AufgabeID.HasValue & this.AufgabeID != 0) { - command.CommandText = $"update {TABLE} set bezeichnung = :p1, beschreibung = :p2, kategorie = :p3, farbe = :p4 WHERE aufgabe_id = :p0"; + command.CommandText = $"update {TABLE} set bezeichnung = :p1, beschreibung = :p2, kategorie = :p3, farbe = :p4, aktive = :p5 WHERE aufgabe_id = :p0"; } else { command.CommandText = "select nextval('kundenverwaltung.aufgabe_seq')"; this.AufgabeID = (int)(long)command.ExecuteScalar(); - command.CommandText = $"insert into {TABLE} ({COLUMNS}) values (:p0, :p1, :p2, :p3, :p4)"; + command.CommandText = $"insert into {TABLE} ({COLUMNS}) values (:p0, :p1, :p2, :p3, :p4, :p5)"; } command.Parameters.AddWithValue("p0", this.AufgabeID); @@ -90,9 +91,8 @@ namespace DatenDB command.Parameters.AddWithValue("p2", string.IsNullOrEmpty(this.Beschreibung) ? (object)DBNull.Value : this.Beschreibung); command.Parameters.AddWithValue("p3", (int)this.Kategorie); command.Parameters.AddWithValue("p4", (string)HexConverter(this.Farbe, string.Empty)); + command.Parameters.AddWithValue("p5", this.Aktiv); - - int result = command.ExecuteNonQuery(); DatenbankConnection.GetConnection().Close(); return result; @@ -104,14 +104,28 @@ namespace DatenDB this.Beschreibung = reader.IsDBNull(2) ? string.Empty : reader.GetString(2); this.Kategorie = reader.IsDBNull(3) ? Kategorie.Fahrer : (Kategorie)reader.GetInt16(3); this.Farbe = reader.IsDBNull(4) ? Color.FromArgb(1, 53, 101) : (Color)HexConverter(Color.FromArgb(1, 53, 101), reader.GetString(4)); + this.Aktiv = reader.IsDBNull(5) ? true : reader.GetBoolean(5); } + + [OLVIgnore] public int? AufgabeID { get; set; } + + [OLVColumn("Bezeichnung", DisplayIndex = 0)] public string Bezeichnung { get; set; } + + [OLVColumn("Beschreibung", DisplayIndex = 1)] public string Beschreibung { get; set; } + + [OLVColumn("Kategorie", DisplayIndex = 2)] public Kategorie Kategorie { get; set; } + + [OLVColumn("Farbe", DisplayIndex = 3)] public Color Farbe { get; set; } - private static object HexConverter(Color c, string s) + [OLVColumn("Aktiv", DisplayIndex = 4, CheckBoxes = true)] + public bool Aktiv { get; set; } + + private static object HexConverter(Color c, string s) { ColorConverter cc = new ColorConverter(); if (string.IsNullOrEmpty(s)) { s = "#" + c.R.ToString("X2") + c.G.ToString("X2") + c.B.ToString("X2"); return s; } @@ -122,4 +136,4 @@ namespace DatenDB } } //TODO: Aktive Property einfügen. -//TODO: Spalte Aktiv in DB einfügen. +//INSTALL-REMINDER: Spalte Aktiv in DB einfügen. diff --git a/AA-Klassen/Auftrag.cs b/AA-Klassen/Auftrag.cs index 3ad3172..70c8abe 100644 --- a/AA-Klassen/Auftrag.cs +++ b/AA-Klassen/Auftrag.cs @@ -423,5 +423,5 @@ namespace DatenDB } } -//TODO: AufgabeID als Spalte in DB hinzufügen. -//TODO: AufgabeErledigt als Spalte in DB hinzufügen. \ No newline at end of file +//INSTALL-REMINDER: AufgabeID als Spalte in DB hinzufügen. +//INSTALL-REMINDER: AufgabeErledigt als Spalte in DB hinzufügen. \ No newline at end of file diff --git a/AA-Klassen/Funktionen.cs b/AA-Klassen/Funktionen.cs index 5def798..ae12ebc 100644 --- a/AA-Klassen/Funktionen.cs +++ b/AA-Klassen/Funktionen.cs @@ -955,7 +955,7 @@ namespace Deckungsbeitrag ch.DisplayIndex = 6; ch.Name = "gültig bis"; } - if (ch.Name == "ist_aktiv") + if (ch.Name == "ist_aktiv" || ch.Name == "aktive") { ch.DisplayIndex = 7; ch.Name = "aktiv"; @@ -1004,6 +1004,7 @@ namespace Deckungsbeitrag item.SubItems.Add(auf.Beschreibung); item.SubItems.Add(auf.Kategorie.ToString()); item.SubItems.Add(""); + item.SubItems.Add(auf.Aktiv.ToString()); ColorConverter cc = new ColorConverter(); item.SubItems[3].BackColor = (Color)cc.ConvertFromString(auf.Farbe.ToArgb().ToString()); //COLUMN FARBE SUBITEM BACKCOLOR == FARBE. diff --git a/AA-Klassen/Kunde.cs b/AA-Klassen/Kunde.cs index 6766378..21e95a7 100644 --- a/AA-Klassen/Kunde.cs +++ b/AA-Klassen/Kunde.cs @@ -374,5 +374,5 @@ namespace DatenDB public string Anmerkung { get; set; } } } -//TODO: Spalte Anmerkung in DB hinzufügen. -//TODO: Spalte Aufgabe Count in DB hinzufügen. \ No newline at end of file +//INSTALL-REMINDER: Spalte Anmerkung in DB hinzufügen. +//INSTALL-REMINDER: Spalte Aufgabe Count in DB hinzufügen. \ No newline at end of file diff --git a/Neue_Table_Columns_SQL_Script_15-12-2025.sql b/Neue_Table_Columns_SQL_Script_15-12-2025.sql new file mode 100644 index 0000000..8276918 --- /dev/null +++ b/Neue_Table_Columns_SQL_Script_15-12-2025.sql @@ -0,0 +1,27 @@ +-- This script was generated by the Schema Diff utility in pgAdmin 4. +-- For the circular dependencies, the order in which Schema Diff writes the objects is not very sophisticated +-- and may require manual changes to the script to ensure changes are applied in the correct order. +-- Please report an issue for any failure with the reproduction steps. + BEGIN; + ALTER TABLE IF EXISTS kundenverwaltung.kunde + ADD COLUMN anmerkung character varying(200) COLLATE pg_catalog."default"; + +ALTER TABLE IF EXISTS kundenverwaltung.kunde + ADD COLUMN aufgabe_count numeric(2, 0); +ALTER TABLE IF EXISTS kundenverwaltung.aufgabe + ADD COLUMN aktive boolean DEFAULT true; +ALTER TABLE IF EXISTS kundenverwaltung.auftrag + ADD COLUMN aufgabe_erledigt boolean; +ALTER TABLE kundenverwaltung.wsfach + ALTER COLUMN gewaschen TYPE timestamp without time zone ; + +ALTER TABLE IF EXISTS kundenverwaltung.wsfach + ADD COLUMN aufgabe_id numeric(10, 0); +ALTER TABLE IF EXISTS kundenverwaltung.wsfach + ADD CONSTRAINT aufgabe_fk FOREIGN KEY (aufgabe_id) + REFERENCES kundenverwaltung.aufgabe (aufgabe_id) MATCH SIMPLE + ON UPDATE NO ACTION + ON DELETE NO ACTION + NOT VALID; + + END; \ No newline at end of file diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs index fdea234..cfdb9b0 100644 --- a/Properties/AssemblyInfo.cs +++ b/Properties/AssemblyInfo.cs @@ -31,5 +31,5 @@ using System.Runtime.InteropServices; // // Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden, // indem Sie "*" wie unten gezeigt eingeben: -[assembly: AssemblyVersion("1.0.2.6")] -[assembly: AssemblyFileVersion("1.0.2.6")] +[assembly: AssemblyVersion("1.0.3.0")] +[assembly: AssemblyFileVersion("1.0.3.0")] diff --git a/SetupVerwaltung/SetupVerwaltung.vdproj b/SetupVerwaltung/SetupVerwaltung.vdproj index 1c2c93b..42b176d 100644 --- a/SetupVerwaltung/SetupVerwaltung.vdproj +++ b/SetupVerwaltung/SetupVerwaltung.vdproj @@ -13,204 +13,6 @@ "SccProvider" = "8:" "Hierarchy" { - "Entry" - { - "MsmKey" = "8:_0846CD93A9DEA4DD0DD05E0933FFBC5B" - "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0846CD93A9DEA4DD0DD05E0933FFBC5B" - "OwnerKey" = "8:_8A99731973E81EB05A1847C294F0CECC" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0BD5D517A5EBAEC4CE21A08AB9CD3422" - "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0BD5D517A5EBAEC4CE21A08AB9CD3422" - "OwnerKey" = "8:_4FCAEBB85B559E3350E3A4912FADA0F0" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_14F178F5FD5EFA4C1973A6B30514E332" - "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_14F178F5FD5EFA4C1973A6B30514E332" - "OwnerKey" = "8:_5E4D6952244F4AAC64F327394623EE57" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_1FC10E99927FDE0DB378759FE2A2C1DD" - "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_1FC10E99927FDE0DB378759FE2A2C1DD" - "OwnerKey" = "8:_FD8164C4BBFD975FAFD2A4D86340E915" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_1FC10E99927FDE0DB378759FE2A2C1DD" - "OwnerKey" = "8:_E0CD318B00C3EBC6018E7287D1C5C964" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_1FC10E99927FDE0DB378759FE2A2C1DD" - "OwnerKey" = "8:_CC6E1B525578AF50C3DD3123399882F3" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_1FC10E99927FDE0DB378759FE2A2C1DD" - "OwnerKey" = "8:_BF71649AE43FBD7A416893054714CE91" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_1FC10E99927FDE0DB378759FE2A2C1DD" - "OwnerKey" = "8:_A90E24C686315EC9D9B0BA1C76886A15" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_1FC10E99927FDE0DB378759FE2A2C1DD" - "OwnerKey" = "8:_A00008624800CAF367880713AFB719F2" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_1FC10E99927FDE0DB378759FE2A2C1DD" - "OwnerKey" = "8:_14F178F5FD5EFA4C1973A6B30514E332" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_1FC10E99927FDE0DB378759FE2A2C1DD" - "OwnerKey" = "8:_E73BA90E452C02520292C6FF727EB5AC" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_2DC89B818FE015B8ED93A73216EFCCE7" - "OwnerKey" = "8:_14F178F5FD5EFA4C1973A6B30514E332" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_2DC89B818FE015B8ED93A73216EFCCE7" - "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_2DC89B818FE015B8ED93A73216EFCCE7" - "OwnerKey" = "8:_5E4D6952244F4AAC64F327394623EE57" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_3518CDF283287B9BB382E0C864B0B344" - "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_3518CDF283287B9BB382E0C864B0B344" - "OwnerKey" = "8:_5E4D6952244F4AAC64F327394623EE57" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_3518CDF283287B9BB382E0C864B0B344" - "OwnerKey" = "8:_9C2D77065F590227E595BA5087763024" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_3518CDF283287B9BB382E0C864B0B344" - "OwnerKey" = "8:_14F178F5FD5EFA4C1973A6B30514E332" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_361CD6DDAD5DAD87766154F455EA61CE" - "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_404BC92A271981651469C5BBB22AFBC1" - "OwnerKey" = "8:_E73BA90E452C02520292C6FF727EB5AC" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_404BC92A271981651469C5BBB22AFBC1" - "OwnerKey" = "8:_FD8164C4BBFD975FAFD2A4D86340E915" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_404BC92A271981651469C5BBB22AFBC1" - "OwnerKey" = "8:_CC6E1B525578AF50C3DD3123399882F3" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_404BC92A271981651469C5BBB22AFBC1" - "OwnerKey" = "8:_A00008624800CAF367880713AFB719F2" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_404BC92A271981651469C5BBB22AFBC1" - "OwnerKey" = "8:_5E4D6952244F4AAC64F327394623EE57" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_404BC92A271981651469C5BBB22AFBC1" - "OwnerKey" = "8:_14F178F5FD5EFA4C1973A6B30514E332" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_404BC92A271981651469C5BBB22AFBC1" - "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_404BC92A271981651469C5BBB22AFBC1" - "OwnerKey" = "8:_5DDEB1FF3DD78281FF3203E5E9933C19" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_4FCAEBB85B559E3350E3A4912FADA0F0" - "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_4FCAEBB85B559E3350E3A4912FADA0F0" - "OwnerKey" = "8:_601349A5165EA7E437FA222E90548041" - "MsmSig" = "8:_UNDEFINED" - } "Entry" { "MsmKey" = "8:_52990414836E4CF7BD50C1245D0F9B6F" @@ -219,406 +21,10 @@ } "Entry" { - "MsmKey" = "8:_5CDE0A18B0E8657CBCF9143673DB464A" - "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_5CDE0A18B0E8657CBCF9143673DB464A" - "OwnerKey" = "8:_5E4D6952244F4AAC64F327394623EE57" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_5DDEB1FF3DD78281FF3203E5E9933C19" - "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_5DDEB1FF3DD78281FF3203E5E9933C19" - "OwnerKey" = "8:_A90E24C686315EC9D9B0BA1C76886A15" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_5DDEB1FF3DD78281FF3203E5E9933C19" - "OwnerKey" = "8:_9C2D77065F590227E595BA5087763024" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_5DDEB1FF3DD78281FF3203E5E9933C19" - "OwnerKey" = "8:_5E4D6952244F4AAC64F327394623EE57" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_5DDEB1FF3DD78281FF3203E5E9933C19" - "OwnerKey" = "8:_3518CDF283287B9BB382E0C864B0B344" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_5DDEB1FF3DD78281FF3203E5E9933C19" - "OwnerKey" = "8:_14F178F5FD5EFA4C1973A6B30514E332" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_5E4D6952244F4AAC64F327394623EE57" - "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_601349A5165EA7E437FA222E90548041" - "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_6A4E9AB7C92A8099AD635862468BFCBE" - "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_6A4E9AB7C92A8099AD635862468BFCBE" - "OwnerKey" = "8:_BF71649AE43FBD7A416893054714CE91" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_719473B495FBAC457431A4E48A1F4B17" - "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_8A99731973E81EB05A1847C294F0CECC" - "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_9C2D77065F590227E595BA5087763024" - "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_A00008624800CAF367880713AFB719F2" - "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_A2FA7AC58F6A16AB132434F8A00EA507" - "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_A90E24C686315EC9D9B0BA1C76886A15" - "OwnerKey" = "8:_14F178F5FD5EFA4C1973A6B30514E332" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_A90E24C686315EC9D9B0BA1C76886A15" - "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_AB17FAEB828C8765351F17BFC0E97F98" - "OwnerKey" = "8:_E73BA90E452C02520292C6FF727EB5AC" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_AB17FAEB828C8765351F17BFC0E97F98" - "OwnerKey" = "8:_14F178F5FD5EFA4C1973A6B30514E332" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_AB17FAEB828C8765351F17BFC0E97F98" - "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } - "Entry" - { - "MsmKey" = "8:_BA8B9295763872FA6F6B706A524178AD" - "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_BF71649AE43FBD7A416893054714CE91" - "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_CC6E1B525578AF50C3DD3123399882F3" - "OwnerKey" = "8:_14F178F5FD5EFA4C1973A6B30514E332" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_CC6E1B525578AF50C3DD3123399882F3" - "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_D8C25AA5CDB643A797EB1D8E142E22CE" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_E0CD318B00C3EBC6018E7287D1C5C964" - "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_E73BA90E452C02520292C6FF727EB5AC" - "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_E73BA90E452C02520292C6FF727EB5AC" - "OwnerKey" = "8:_FD8164C4BBFD975FAFD2A4D86340E915" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_E73BA90E452C02520292C6FF727EB5AC" - "OwnerKey" = "8:_E0CD318B00C3EBC6018E7287D1C5C964" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_E73BA90E452C02520292C6FF727EB5AC" - "OwnerKey" = "8:_CC6E1B525578AF50C3DD3123399882F3" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_E73BA90E452C02520292C6FF727EB5AC" - "OwnerKey" = "8:_BF71649AE43FBD7A416893054714CE91" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_E73BA90E452C02520292C6FF727EB5AC" - "OwnerKey" = "8:_A90E24C686315EC9D9B0BA1C76886A15" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_E73BA90E452C02520292C6FF727EB5AC" - "OwnerKey" = "8:_A00008624800CAF367880713AFB719F2" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_E73BA90E452C02520292C6FF727EB5AC" - "OwnerKey" = "8:_5E4D6952244F4AAC64F327394623EE57" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_E73BA90E452C02520292C6FF727EB5AC" - "OwnerKey" = "8:_14F178F5FD5EFA4C1973A6B30514E332" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_FD8164C4BBFD975FAFD2A4D86340E915" - "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_8A99731973E81EB05A1847C294F0CECC" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_0846CD93A9DEA4DD0DD05E0933FFBC5B" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_9C2D77065F590227E595BA5087763024" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_A00008624800CAF367880713AFB719F2" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_FD8164C4BBFD975FAFD2A4D86340E915" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_361CD6DDAD5DAD87766154F455EA61CE" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_719473B495FBAC457431A4E48A1F4B17" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_5E4D6952244F4AAC64F327394623EE57" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_14F178F5FD5EFA4C1973A6B30514E332" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_2DC89B818FE015B8ED93A73216EFCCE7" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_CC6E1B525578AF50C3DD3123399882F3" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_A90E24C686315EC9D9B0BA1C76886A15" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_E0CD318B00C3EBC6018E7287D1C5C964" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_BA8B9295763872FA6F6B706A524178AD" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_3518CDF283287B9BB382E0C864B0B344" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_5DDEB1FF3DD78281FF3203E5E9933C19" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_BF71649AE43FBD7A416893054714CE91" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_E73BA90E452C02520292C6FF727EB5AC" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_404BC92A271981651469C5BBB22AFBC1" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_AB17FAEB828C8765351F17BFC0E97F98" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_1FC10E99927FDE0DB378759FE2A2C1DD" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_601349A5165EA7E437FA222E90548041" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_4FCAEBB85B559E3350E3A4912FADA0F0" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_0BD5D517A5EBAEC4CE21A08AB9CD3422" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_A2FA7AC58F6A16AB132434F8A00EA507" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_6A4E9AB7C92A8099AD635862468BFCBE" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_5CDE0A18B0E8657CBCF9143673DB464A" - "MsmSig" = "8:_UNDEFINED" - } } "Configurations" { @@ -714,285 +120,6 @@ } "File" { - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_0846CD93A9DEA4DD0DD05E0933FFBC5B" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:zxing, Version=0.16.11.0, Culture=neutral, PublicKeyToken=4e88037ac681fe60, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_0846CD93A9DEA4DD0DD05E0933FFBC5B" - { - "Name" = "8:zxing.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:zxing.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C848DFB5E4D140A7A7F5E1F129613626" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_0BD5D517A5EBAEC4CE21A08AB9CD3422" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:AForge, Version=2.2.5.0, Culture=neutral, PublicKeyToken=c1db6ff4eaa06aeb, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_0BD5D517A5EBAEC4CE21A08AB9CD3422" - { - "Name" = "8:AForge.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:AForge.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C848DFB5E4D140A7A7F5E1F129613626" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_14F178F5FD5EFA4C1973A6B30514E332" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Text.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_14F178F5FD5EFA4C1973A6B30514E332" - { - "Name" = "8:System.Text.Json.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:System.Text.Json.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C848DFB5E4D140A7A7F5E1F129613626" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_1FC10E99927FDE0DB378759FE2A2C1DD" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Buffers, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_1FC10E99927FDE0DB378759FE2A2C1DD" - { - "Name" = "8:System.Buffers.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:System.Buffers.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C848DFB5E4D140A7A7F5E1F129613626" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_2DC89B818FE015B8ED93A73216EFCCE7" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_2DC89B818FE015B8ED93A73216EFCCE7" - { - "Name" = "8:System.ValueTuple.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:System.ValueTuple.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C848DFB5E4D140A7A7F5E1F129613626" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_3518CDF283287B9BB382E0C864B0B344" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Microsoft.Bcl.AsyncInterfaces, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_3518CDF283287B9BB382E0C864B0B344" - { - "Name" = "8:Microsoft.Bcl.AsyncInterfaces.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:Microsoft.Bcl.AsyncInterfaces.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C848DFB5E4D140A7A7F5E1F129613626" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_361CD6DDAD5DAD87766154F455EA61CE" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Spire.Barcode, Version=7.4.1.0, Culture=neutral, PublicKeyToken=663f351905198cb3, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_361CD6DDAD5DAD87766154F455EA61CE" - { - "Name" = "8:Spire.Barcode.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:Spire.Barcode.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C848DFB5E4D140A7A7F5E1F129613626" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_404BC92A271981651469C5BBB22AFBC1" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Runtime.CompilerServices.Unsafe, Version=6.0.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_404BC92A271981651469C5BBB22AFBC1" - { - "Name" = "8:System.Runtime.CompilerServices.Unsafe.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:System.Runtime.CompilerServices.Unsafe.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C848DFB5E4D140A7A7F5E1F129613626" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_4FCAEBB85B559E3350E3A4912FADA0F0" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:AForge.Video, Version=2.2.5.0, Culture=neutral, PublicKeyToken=cbfb6e07d173c401, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_4FCAEBB85B559E3350E3A4912FADA0F0" - { - "Name" = "8:AForge.Video.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:AForge.Video.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C848DFB5E4D140A7A7F5E1F129613626" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_52990414836E4CF7BD50C1245D0F9B6F" { "SourcePath" = "8:..\\wirlneu_transparent (1).ico" @@ -1013,584 +140,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_5CDE0A18B0E8657CBCF9143673DB464A" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Net.Sockets, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" - "ScatterAssemblies" - { - "_5CDE0A18B0E8657CBCF9143673DB464A" - { - "Name" = "8:System.Net.Sockets.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:System.Net.Sockets.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C848DFB5E4D140A7A7F5E1F129613626" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_5DDEB1FF3DD78281FF3203E5E9933C19" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Threading.Tasks.Extensions, Version=4.2.4.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_5DDEB1FF3DD78281FF3203E5E9933C19" - { - "Name" = "8:System.Threading.Tasks.Extensions.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:System.Threading.Tasks.Extensions.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C848DFB5E4D140A7A7F5E1F129613626" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_5E4D6952244F4AAC64F327394623EE57" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Npgsql, Version=4.1.14.0, Culture=neutral, PublicKeyToken=5d8b90d52f46fda7, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_5E4D6952244F4AAC64F327394623EE57" - { - "Name" = "8:Npgsql.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:Npgsql.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C848DFB5E4D140A7A7F5E1F129613626" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_601349A5165EA7E437FA222E90548041" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:AForge.Video.DirectShow, Version=2.2.5.0, Culture=neutral, PublicKeyToken=61ea4348d43881b7, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_601349A5165EA7E437FA222E90548041" - { - "Name" = "8:AForge.Video.DirectShow.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:AForge.Video.DirectShow.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C848DFB5E4D140A7A7F5E1F129613626" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_6A4E9AB7C92A8099AD635862468BFCBE" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Runtime.InteropServices.RuntimeInformation, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" - "ScatterAssemblies" - { - "_6A4E9AB7C92A8099AD635862468BFCBE" - { - "Name" = "8:System.Runtime.InteropServices.RuntimeInformation.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:System.Runtime.InteropServices.RuntimeInformation.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C848DFB5E4D140A7A7F5E1F129613626" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_719473B495FBAC457431A4E48A1F4B17" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:ObjectListView, Version=2.9.3.0, Culture=neutral, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_719473B495FBAC457431A4E48A1F4B17" - { - "Name" = "8:ObjectListView.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:ObjectListView.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C848DFB5E4D140A7A7F5E1F129613626" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_8A99731973E81EB05A1847C294F0CECC" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:zxing.presentation, Version=0.16.11.0, Culture=neutral, PublicKeyToken=4e88037ac681fe60, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_8A99731973E81EB05A1847C294F0CECC" - { - "Name" = "8:zxing.presentation.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:zxing.presentation.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C848DFB5E4D140A7A7F5E1F129613626" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_9C2D77065F590227E595BA5087763024" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Threading.Channels, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_9C2D77065F590227E595BA5087763024" - { - "Name" = "8:System.Threading.Channels.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:System.Threading.Channels.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C848DFB5E4D140A7A7F5E1F129613626" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_A00008624800CAF367880713AFB719F2" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Diagnostics.DiagnosticSource, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_A00008624800CAF367880713AFB719F2" - { - "Name" = "8:System.Diagnostics.DiagnosticSource.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:System.Diagnostics.DiagnosticSource.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C848DFB5E4D140A7A7F5E1F129613626" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_A2FA7AC58F6A16AB132434F8A00EA507" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Net.Http, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" - "ScatterAssemblies" - { - "_A2FA7AC58F6A16AB132434F8A00EA507" - { - "Name" = "8:System.Net.Http.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:System.Net.Http.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C848DFB5E4D140A7A7F5E1F129613626" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_A90E24C686315EC9D9B0BA1C76886A15" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.IO.Pipelines, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_A90E24C686315EC9D9B0BA1C76886A15" - { - "Name" = "8:System.IO.Pipelines.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:System.IO.Pipelines.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C848DFB5E4D140A7A7F5E1F129613626" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_AB17FAEB828C8765351F17BFC0E97F98" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Numerics.Vectors, Version=4.1.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_AB17FAEB828C8765351F17BFC0E97F98" - { - "Name" = "8:System.Numerics.Vectors.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:System.Numerics.Vectors.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C848DFB5E4D140A7A7F5E1F129613626" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_BA8B9295763872FA6F6B706A524178AD" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Microsoft.Bcl.HashCode, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_BA8B9295763872FA6F6B706A524178AD" - { - "Name" = "8:Microsoft.Bcl.HashCode.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:Microsoft.Bcl.HashCode.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C848DFB5E4D140A7A7F5E1F129613626" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_BF71649AE43FBD7A416893054714CE91" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:HarfBuzzSharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_BF71649AE43FBD7A416893054714CE91" - { - "Name" = "8:HarfBuzzSharp.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:HarfBuzzSharp.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C848DFB5E4D140A7A7F5E1F129613626" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_CC6E1B525578AF50C3DD3123399882F3" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Text.Encodings.Web, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_CC6E1B525578AF50C3DD3123399882F3" - { - "Name" = "8:System.Text.Encodings.Web.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:System.Text.Encodings.Web.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C848DFB5E4D140A7A7F5E1F129613626" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_D8C25AA5CDB643A797EB1D8E142E22CE" - { - "SourcePath" = "8:..\\Verwaltung_ReadMe.txt" - "TargetName" = "8:Verwaltung_ReadMe.txt" - "Tag" = "8:" - "Folder" = "8:_C848DFB5E4D140A7A7F5E1F129613626" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_E0CD318B00C3EBC6018E7287D1C5C964" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Microsoft.Extensions.Logging.Abstractions, Version=6.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_E0CD318B00C3EBC6018E7287D1C5C964" - { - "Name" = "8:Microsoft.Extensions.Logging.Abstractions.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:Microsoft.Extensions.Logging.Abstractions.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C848DFB5E4D140A7A7F5E1F129613626" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_E73BA90E452C02520292C6FF727EB5AC" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Memory, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_E73BA90E452C02520292C6FF727EB5AC" - { - "Name" = "8:System.Memory.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:System.Memory.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C848DFB5E4D140A7A7F5E1F129613626" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_FD8164C4BBFD975FAFD2A4D86340E915" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Collections.Immutable, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_FD8164C4BBFD975FAFD2A4D86340E915" - { - "Name" = "8:System.Collections.Immutable.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:System.Collections.Immutable.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C848DFB5E4D140A7A7F5E1F129613626" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } } "FileType" { @@ -1647,15 +196,15 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:SetupVerwaltung" - "ProductCode" = "8:{86777761-9DC8-4CDE-916B-AF7A753E5414}" - "PackageCode" = "8:{0B8B46B4-E3DA-42A0-8E69-164483EDA243}" + "ProductCode" = "8:{601F4593-8E33-43BA-BEA7-BAEC889C93C1}" + "PackageCode" = "8:{BFD84107-8494-45DD-8545-61CCDC28A655}" "UpgradeCode" = "8:{2DC7CE56-8D1C-42EB-B326-2E887EBB7F5A}" "AspNetVersion" = "8:" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:FALSE" - "ProductVersion" = "8:1.0.23" + "ProductVersion" = "8:1.0.25" "Manufacturer" = "8:Kilian Wirl GmbH" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:" diff --git a/UpdateVerwaltungReadMe.ps1 b/UpdateVerwaltungReadMe.ps1 index 551f40d..5180d3f 100644 --- a/UpdateVerwaltungReadMe.ps1 +++ b/UpdateVerwaltungReadMe.ps1 @@ -1,20 +1,30 @@ -# UpdateVerwaltungReadMe.ps1 - FINAL mit ERLEDIGTEN TODOs +# ===================================== +# Skript: UpdateVerwaltungReadMe.ps1 - mit INSTALL-REMINDER +# ===================================== $ProjectDir = Split-Path $MyInvocation.MyCommand.Path -Parent $readmePath = Join-Path $ProjectDir "Verwaltung_ReadMe.txt" Write-Host "Aktualisiere ReadMe in: $ProjectDir" -# ReadMe-Vorlage erstellen (falls nicht vorhanden) +# ReadMe-Vorlage (falls nicht vorhanden) if (-not (Test-Path $readmePath)) { - @" +@" ===================================== NEUIGKEITEN - Version ##VERSION## ===================================== Build-Info: - Build-Typ: ##CUSTOM## -- Erledigte TODOs: ##TODOS## +- Erledigte TODOs: ##DONE_COUNT## +- Offene TODOs: ##OPEN_COUNT## +- Install-Reminders: ##REMINDER_COUNT## + +##DONE_TODOS## + +##OPEN_TODOS## + +##INSTALL_REMINDERS## Installation: ##BUILD_DATE## ===================================== @@ -22,7 +32,7 @@ Installation: ##BUILD_DATE## Write-Host "✅ ReadMe-Vorlage erstellt!" } -# 1. VERSION aus AssemblyInfo.cs +# Version bestimmen $version = "1.0.0.0" $assemblyInfoPath = Join-Path $ProjectDir "Properties\AssemblyInfo.cs" if (Test-Path $assemblyInfoPath) { @@ -33,38 +43,96 @@ if (Test-Path $assemblyInfoPath) { } } -# 2. ERLEDIGTE TODOs sammeln +# Dateien durchsuchen +$openTodos = @() $doneTodos = @() +$installReminders = @() $csFiles = Get-ChildItem -Path $ProjectDir -Recurse -Filter "*.cs" -ErrorAction SilentlyContinue + foreach ($file in $csFiles) { $content = Get-Content $file.FullName -Raw -ErrorAction SilentlyContinue - # ERLEDIGTE TODOs: DONE oder [x] - $doneMatches = [regex]::Matches($content, '//\s*(?:DONE|TODO:\s*\[x\])\s*(.+?)(?=\r?\n|$)', 'IgnoreCase') + + # TODO erkennen + $openMatches = [regex]::Matches($content, '//\s*(TODO|todo:|TODO\[[^x]\])\s*:?\s*(.+?)(?=\r?\n|//|$)', 'IgnoreCase') + foreach ($match in $openMatches) { + $txt = $match.Groups[2].Value.Trim() + if ($txt) { $openTodos += "🔄 $txt [$($file.Name)]" } + } + + # DONE erkennen + $doneMatches = [regex]::Matches($content, '//\s*(DONE|TODO:\s*\[x\])\s*(.+?)(?=\r?\n|//|$)', 'IgnoreCase') foreach ($match in $doneMatches) { - $doneText = $match.Groups[1].Value.Trim() - $doneTodos += "✅ $doneText [$($file.Name)]" + $txt = $match.Groups[2].Value.Trim() + if ($txt) { $doneTodos += "✅ $txt [$($file.Name)]" } + } + + # INSTALL-REMINDER erkennen + $reminderMatches = [regex]::Matches($content, '//\s*INSTALL-REMINDER\s*:?\s*(.+?)(?=\r?\n|//|$)', 'IgnoreCase') + foreach ($match in $reminderMatches) { + $txt = $match.Groups[1].Value.Trim() + if ($txt) { $installReminders += "⚙️ $txt [$($file.Name)]" } } } -# 3. Custom-Text mit DONE-Status -if ($doneTodos.Count -gt 0) { - $custom = "Erledigte TODOs: $($doneTodos.Count)" - $todosText = ($doneTodos -join "`n") +# Duplikate entfernen +$openTodos = $openTodos | Sort-Object | Get-Unique +$doneTodos = $doneTodos | Sort-Object | Get-Unique +$installReminders = $installReminders | Sort-Object | Get-Unique + +# Formatierte Abschnitte +$doneSection = if ($doneTodos.Count -gt 0) { + @("=== ✅ ERLEDIGTE TODOs ($($doneTodos.Count)) ===") + + ($doneTodos | ForEach-Object { "- $_" }) } else { - $custom = "Keine erledigten TODOs" - $todosText = "Noch keine Aufgaben abgeschlossen" + @("Keine erledigten TODOs") } +$openSection = if ($openTodos.Count -gt 0) { + @("=== 🔄 OFFENE TODOs ($($openTodos.Count)) ===") + + ($openTodos | ForEach-Object { "- $_" }) +} else { + @("Keine offenen TODOs 🎉") +} + +$installSection = if ($installReminders.Count -gt 0) { + @("=== ⚙️ INSTALL-REMINDER ($($installReminders.Count)) ===") + + ($installReminders | ForEach-Object { "- $_" }) +} else { + @("Keine Install-Reminder vorhanden ✅") +} + +# Textaufbereitung +$doneText = $doneSection -join "`r`n" +$openText = $openSection -join "`r`n" +$installText = $installSection -join "`r`n" + +$custom = "Release Build" $buildDate = Get-Date -Format "dd.MM.yyyy HH:mm" -# 4. Platzhalter ersetzen -$content = Get-Content $readmePath -Raw -Encoding UTF8 -ErrorAction SilentlyContinue -$content = $content -replace "##VERSION##", $version ` - -replace "##CUSTOM##", $custom ` - -replace "##TODOS##", $todosText ` - -replace "##BUILD_DATE##", $buildDate +# ReadMe aufbauen +$readmeContent = @" +===================================== +NEUIGKEITEN - Version $version +===================================== -Set-Content $readmePath $content -Encoding UTF8 -Write-Host "✓ ReadMe aktualisiert!" -Write-Host " Version: $version" -Write-Host " Erledigte TODOs: $($doneTodos.Count)" +Build-Info: +- Build-Typ: $custom +- Erledigte TODOs: $($doneTodos.Count) +- Offene TODOs: $($openTodos.Count) +- Install-Reminders: $($installReminders.Count) + + +$installText + +`r`n$doneText + +`r`n$openText + +Installation: $buildDate +===================================== +"@ + +# Schreiben +$readmeContent | Out-File $readmePath -Encoding UTF8 + +Write-Host "✅ Verwaltung_ReadMe.txt erfolgreich aktualisiert!" diff --git a/Verwaltung.csproj b/Verwaltung.csproj index f40d880..d9a79b7 100644 --- a/Verwaltung.csproj +++ b/Verwaltung.csproj @@ -525,7 +525,7 @@ - powershell -NoProfile -ExecutionPolicy Bypass -File "$(ProjectDir)UpdateVerwaltungReadMe.ps1" + powershell.exe -NoProfile -ExecutionPolicy Bypass -File "$(ProjectDir)UpdateVerwaltungReadMe.ps1" \ No newline at end of file diff --git a/Verwaltung_ReadMe.txt b/Verwaltung_ReadMe.txt index c2670af..9051eee 100644 --- a/Verwaltung_ReadMe.txt +++ b/Verwaltung_ReadMe.txt @@ -1,74 +1,61 @@ ===================================== -NEUIGKEITEN - Version 1.0.2.6 +NEUIGKEITEN - Version 1.0.3.0 ===================================== Build-Info: -- Build-Typ: Erledigte TODOs: 10 -- Erledigte TODOs: ✅ : Für Maschinen keine Anmeldung notwendig. [Program.cs] -✅ : Bei Transport wir ein Fach mit Aktuellem Auftrag erstellt. Das Alte wird bei Transport gespeichert. [FormAusschlager.cs] -✅ : Wenn NeuerAuftrag gewählt Fach ändern nicht vergessen. [FormAusschlager.cs] -✅ : Breite der GridView festlegen. [FormExpedit.cs] -✅ : OLV-Item refresh. Neuer Liefertag speichern. [FormExpedit.cs] -✅ : Testen ob ausblenden der Button Column funktioniert. Benutzer-Verwaltung oder Frottee oder Flach notwendig. [FormExpedit.cs] -✅ : DragDrop verbessern [FormMain.cs] -✅ : GroupBox Realtime verschieben testen. Sonst Endposition nehmen. gb.Location hier entfernen und unten einkommentieren. [FormMain.cs] -✅ : GroupBox wird an Endposition verschoben. [FormMain.cs] -✅ : Funktionalität klären. MessageBox vor Screenauswahl? oder mit Button im Screen Kamera? [Funktionen.cs] +- Build-Typ: Release Build +- Erledigte TODOs: 13 +- Offene TODOs: 22 +- Install-Reminders: 5 -Installation: 11.12.2025 14:53 + +=== ⚙️ INSTALL-REMINDER (5) === +- ⚙️ AufgabeErledigt als Spalte in DB hinzufügen. [Auftrag.cs] +- ⚙️ AufgabeID als Spalte in DB hinzufügen. [Auftrag.cs] +- ⚙️ Spalte Aktiv in DB einfügen. [Aufgabe.cs] +- ⚙️ Spalte Anmerkung in DB hinzufügen. [Kunde.cs] +- ⚙️ Spalte Aufgabe Count in DB hinzufügen. [Kunde.cs] + + +=== ✅ ERLEDIGTE TODOs (13) === +- ✅ : Bei Transport wir ein Fach mit Aktuellem Auftrag erstellt. Das Alte wird bei Transport gespeichert. [FormAusschlager.cs] +- ✅ : Breite der GridView festlegen. [FormExpedit.cs] +- ✅ : DragDrop verbessern [FormMain.cs] +- ✅ : Funktionalität klären. MessageBox vor Screenauswahl? oder mit Button im Screen Kamera? [Funktionen.cs] +- ✅ : Für Maschinen keine Anmeldung notwendig. [Program.cs] +- ✅ : GroupBox Realtime verschieben testen. Sonst Endposition nehmen. gb.Location hier entfernen und unten einkommentieren. [FormMain.cs] +- ✅ : GroupBox wird an Endposition verschoben. [FormMain.cs] +- ✅ : Kunde Anmerkung anzeigen. Spezielle Farbe verwenden. Label oder Textbox? [FormFehlmengeCount.cs] +- ✅ : OLV-Item refresh. Neuer Liefertag speichern. [FormExpedit.cs] +- ✅ : Testen ob ausblenden der Button Column funktioniert. Benutzer-Verwaltung oder Frottee oder Flach notwendig. [FormExpedit.cs] +- ✅ : TextBox Anmerkung ausprogrammieren. (Immer Enabled, Speichern bei Leave oder Button) [FormKundeVW.cs] +- ✅ : Wenn NeuerAuftrag gewählt Fach ändern nicht vergessen. [FormAusschlager.cs] +- ✅ : Zeichenanzahl aktuell/maximal anzeigen. [FormKundeVW.cs] + + +=== 🔄 OFFENE TODOs (22) === +- 🔄 Aktive Property einfügen. [Aufgabe.cs] +- 🔄 Alle Icons in einer Spalte anzeigen? I für Anmerkung und ! für Aufgabe?? [FormExpedit.cs] +- 🔄 Artikel Update weiter testen und programmieren. Für ArtikelKurzliste ausprogrammieren. [FormMain.cs] +- 🔄 Ausprobieren ob die Ausrichtung jetzt richtig ist. Sowohl beim ersten wie auch zweiten Mal. [Funktionen.cs] +- 🔄 Deaktivieren wenn SPS funktioniert. Transport wird simuliert. [FormWSVerfolgung.cs] +- 🔄 Einkommentieren wenn ArtikelUpdate auf ArtikelKurzliste umgestellt werden kann. [FormMain.cs] +- 🔄 Eventuell auch andere ListViews einbinden? [Funktionen.cs] +- 🔄 Eventuell bei erstem Erscheinen Info anzeigen. [FormFehlmengeCount.cs] +- 🔄 für Ladescreen den Progressbar programieren. (perplexity fragen wie der Status an einen anderen Screen übergeben werden kann) [FormMain.cs] +- 🔄 Hier Settings speichern mit UserSettingsManager Klasse. [FormEinstellung.cs] +- 🔄 LadenScreen anzeigen etc. [FormMain.cs] +- 🔄 Nach Test und Rücksprache eventuell wieder umbauen. Benutzer.Rolle etc. [FormFehlmengeCount.cs] +- 🔄 Neue Aufgabe Screen erstellen. [FormNeueAufgabe.cs] +- 🔄 Settings hier ändern auf UserSettingsManager Klasse. [FormEinstellung.cs] +- 🔄 Testen ob Get_ArtikelKurzliste funktioniert. [FormMain.cs] +- 🔄 Testen ob SWS-QRCodes gelesen werden können. Nur notwendig bis alle SWS-QRCodes richtig gedruckt und gelesen werden. [Kunde.cs] +- 🔄 Überlegen ob das der richtige Weg ist. Eventuell in Expedit sowohl KundeAufgabe wie auch AuftragAufgabe anzeigen? NOTWENDIG? [FormNeuerAuftrag.cs] +- 🔄 Umbau in Switch. [FormWSVerfolgung.cs] +- 🔄 UserSetting Properties eintragen und in EinstellungsScreen abrufen. [UserSettingsManager.cs] +- 🔄 Weitere Properties von oben hier zuweisen [UserSettingsManager.cs] +- 🔄 Wenn Nachwäsche oder Müllwäsche alle Artikel anzeigen. [FormFehlmengeCount.cs] +- 🔄 Wenn NeuerAuftrag gewählt wie gehts weiter? [FormAusschlager.cs] + +Installation: 15.12.2025 18:26 ===================================== - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -