Wirl/Programm_Wirl
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'Development'

Browse Source
This commit is contained in:
Kilian Wirl 2025-12-11 14:23:36 +01:00
commit 78eb77dca2
9 changed files with 170 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
AA-Forms/FormAusschlager.cs
View File

@ -308,9 +308,8 @@ namespace Deckungsbeitrag
} }
//TODO: Wenn NeuerAuftrag gewählt wie gehts weiter? //TODO: Wenn NeuerAuftrag gewählt wie gehts weiter?
//TODO: Bei Transport wir ein Fach mit Aktuellem Auftrag erstellt. Das Alte wird bei Transport gespeichert. //DONE: Bei Transport wir ein Fach mit Aktuellem Auftrag erstellt. Das Alte wird bei Transport gespeichert.
//TODO: Wenn NeuerAuftrag gewählt Fach ändern nicht vergessen. //DONE: Wenn NeuerAuftrag gewählt Fach ändern nicht vergessen.
//TODO: Eventuell einen "Nächsten Auftrag" erstellen damit im Vorraus erstellt werden kann?
} }
} }

6
AA-Forms/FormExpedit.cs
View File

@ -79,7 +79,6 @@ namespace Deckungsbeitrag
this.buttonDrucken.Enabled = this.buttonNeuerAuftrag.Enabled = this.buttonSWS_Drucken.Enabled = false; this.buttonDrucken.Enabled = this.buttonNeuerAuftrag.Enabled = this.buttonSWS_Drucken.Enabled = false;
this.groupBoxEtikett.Enabled = false; this.groupBoxEtikett.Enabled = false;
//TODO: Testen ob ausblenden der Button Column funktioniert. Benutzer-Verwaltung oder Frottee oder Flach notwendig.
GetUnvisibleButtonColumn(); GetUnvisibleButtonColumn();
break; break;
case BenutzerRolle.Fahrer: case BenutzerRolle.Fahrer:
@ -261,7 +260,6 @@ namespace Deckungsbeitrag
// Alle Zeilenhöhen an Zellinhalt anpassen // Alle Zeilenhöhen an Zellinhalt anpassen
this.dGArtikel.AutoSizeRowsMode = DataGridViewAutoSizeRowsMode.AllCells; this.dGArtikel.AutoSizeRowsMode = DataGridViewAutoSizeRowsMode.AllCells;
//TODO: Breite der GridView festlegen.
this.dGArtikel = Funktionen.DGV_Size_Anpassen(this.dGArtikel); this.dGArtikel = Funktionen.DGV_Size_Anpassen(this.dGArtikel);
this.dGArtikel.Width = this.Width - dGArtikel.Left; this.dGArtikel.Width = this.Width - dGArtikel.Left;
@ -662,7 +660,6 @@ namespace Deckungsbeitrag
} }
private void Liefertag_rB_Checked(object sender, EventArgs e) private void Liefertag_rB_Checked(object sender, EventArgs e)
{ {
//TODO: OLV-Item refresh. Neuer Liefertag speichern.
foreach (RadioButton radioButton in this.groupBoxEtikett.Controls.OfType<RadioButton>()) foreach (RadioButton radioButton in this.groupBoxEtikett.Controls.OfType<RadioButton>())
{ {
if (radioButton.Checked) radioButton.BackColor = Color.Yellow; if (radioButton.Checked) radioButton.BackColor = Color.Yellow;
@ -778,3 +775,6 @@ namespace Deckungsbeitrag
} }
} }
//DONE: Breite der GridView festlegen.
//DONE: OLV-Item refresh. Neuer Liefertag speichern.
//DONE: Testen ob ausblenden der Button Column funktioniert. Benutzer-Verwaltung oder Frottee oder Flach notwendig.

7
AA-Forms/FormMain.cs
View File

@ -93,7 +93,6 @@ namespace Deckungsbeitrag
} }
this.Activate(); this.Activate();
meldung.GetInfo(this, null, false);
} }
private void Paint_Boarder(Size size, Point location, PaintEventArgs e) private void Paint_Boarder(Size size, Point location, PaintEventArgs e)
@ -778,7 +777,6 @@ namespace Deckungsbeitrag
gb = (GroupBox)ctr.Parent; gb = (GroupBox)ctr.Parent;
} }
Panel panel = (Panel)gb.Parent; Panel panel = (Panel)gb.Parent;
//TODO: DragDrop verbessern
if (isDragging) if (isDragging)
{ {
// Neue Position berechnen, relativ zum ursprünglichen Klickpunkt // Neue Position berechnen, relativ zum ursprünglichen Klickpunkt
@ -792,7 +790,6 @@ namespace Deckungsbeitrag
// Position des Controls setzen // Position des Controls setzen
newLocation = panel.PointToClient(newLocation); newLocation = panel.PointToClient(newLocation);
//TODO: GroupBox Realtime verschieben testen. Sonst Endposition nehmen. gb.Location hier entfernen und unten einkommentieren.
} }
} }
private void groupBox_MouseUp(object sender, MouseEventArgs e) private void groupBox_MouseUp(object sender, MouseEventArgs e)
@ -808,7 +805,6 @@ namespace Deckungsbeitrag
if (e.Button == MouseButtons.Left) if (e.Button == MouseButtons.Left)
{ {
isDragging = false; isDragging = false;
//TODO: GroupBox wird an Endposition verschoben.
gb.Location = newLocation; gb.Location = newLocation;
} }
Properties.Settings.Default.Location_GroupBoxStatistik_Main = gb.Location; Properties.Settings.Default.Location_GroupBoxStatistik_Main = gb.Location;
@ -909,4 +905,7 @@ namespace Deckungsbeitrag
} }
} }
//DONE: DragDrop verbessern
//DONE: GroupBox Realtime verschieben testen. Sonst Endposition nehmen. gb.Location hier entfernen und unten einkommentieren.
//DONE: GroupBox wird an Endposition verschoben.

4
AA-Klassen/Funktionen.cs
View File

@ -546,7 +546,7 @@ namespace Deckungsbeitrag
} }
else else
{ {
//TODO: Funktionalität klären. MessageBox vor Screenauswahl? oder mit Button im Screen Kamera?
//if (meldung.HandEingabe()) this.kunde = Funktionen.Open_List(); //if (meldung.HandEingabe()) this.kunde = Funktionen.Open_List();
//else this.kunde = Funktionen.Open_Kamera(videoDevices); //else this.kunde = Funktionen.Open_Kamera(videoDevices);
kunde = Open_Kamera(videoDevices); kunde = Open_Kamera(videoDevices);
@ -1097,3 +1097,5 @@ namespace Deckungsbeitrag
} }
} }
} }
//DONE: Funktionalität klären. MessageBox vor Screenauswahl? oder mit Button im Screen Kamera?

2
Program.cs
View File

@ -27,7 +27,7 @@ namespace Deckungsbeitrag
Application.SetCompatibleTextRenderingDefault(false); Application.SetCompatibleTextRenderingDefault(false);
Screen[] screens = Screen.AllScreens; Screen[] screens = Screen.AllScreens;
//TODO: Wenn mit Anmeldung dann if-Clause entfernen und Switch alleine verwenden. //DONE: Für Maschinen keine Anmeldung notwendig.
if (userid.StartsWith("ms") | userid.StartsWith("ps")) if (userid.StartsWith("ms") | userid.StartsWith("ps"))
{ {
if (userid.Contains("wstrasse")) Application.Run(new FormWSVerfolgung(userid)); if (userid.Contains("wstrasse")) Application.Run(new FormWSVerfolgung(userid));

5
Properties/AssemblyInfo.cs
View File

@ -31,6 +31,5 @@ using System.Runtime.InteropServices;
// //
// Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden, // Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
// indem Sie "*" wie unten gezeigt eingeben: // indem Sie "*" wie unten gezeigt eingeben:
// [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("1.0.2.6")]
[assembly: AssemblyVersion("1.0.1.9")] [assembly: AssemblyFileVersion("1.0.2.6")]
[assembly: AssemblyFileVersion("1.0.1.9")]

136
SetupVerwaltung/SetupVerwaltung.vdproj
View File

@ -40,25 +40,19 @@
"Entry" "Entry"
{ {
"MsmKey" = "8:_14F178F5FD5EFA4C1973A6B30514E332" "MsmKey" = "8:_14F178F5FD5EFA4C1973A6B30514E332"
"OwnerKey" = "8:_5E4D6952244F4AAC64F327394623EE57"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_14F178F5FD5EFA4C1973A6B30514E332"
"OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72"
"MsmSig" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED"
} }
"Entry" "Entry"
{ {
"MsmKey" = "8:_1FC10E99927FDE0DB378759FE2A2C1DD" "MsmKey" = "8:_14F178F5FD5EFA4C1973A6B30514E332"
"OwnerKey" = "8:_BF71649AE43FBD7A416893054714CE91" "OwnerKey" = "8:_5E4D6952244F4AAC64F327394623EE57"
"MsmSig" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED"
} }
"Entry" "Entry"
{ {
"MsmKey" = "8:_1FC10E99927FDE0DB378759FE2A2C1DD" "MsmKey" = "8:_1FC10E99927FDE0DB378759FE2A2C1DD"
"OwnerKey" = "8:_A00008624800CAF367880713AFB719F2" "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72"
"MsmSig" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED"
} }
"Entry" "Entry"
@ -70,7 +64,7 @@
"Entry" "Entry"
{ {
"MsmKey" = "8:_1FC10E99927FDE0DB378759FE2A2C1DD" "MsmKey" = "8:_1FC10E99927FDE0DB378759FE2A2C1DD"
"OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" "OwnerKey" = "8:_E0CD318B00C3EBC6018E7287D1C5C964"
"MsmSig" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED"
} }
"Entry" "Entry"
@ -82,19 +76,25 @@
"Entry" "Entry"
{ {
"MsmKey" = "8:_1FC10E99927FDE0DB378759FE2A2C1DD" "MsmKey" = "8:_1FC10E99927FDE0DB378759FE2A2C1DD"
"OwnerKey" = "8:_BF71649AE43FBD7A416893054714CE91"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_1FC10E99927FDE0DB378759FE2A2C1DD"
"OwnerKey" = "8:_A90E24C686315EC9D9B0BA1C76886A15" "OwnerKey" = "8:_A90E24C686315EC9D9B0BA1C76886A15"
"MsmSig" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED"
} }
"Entry" "Entry"
{ {
"MsmKey" = "8:_1FC10E99927FDE0DB378759FE2A2C1DD" "MsmKey" = "8:_1FC10E99927FDE0DB378759FE2A2C1DD"
"OwnerKey" = "8:_14F178F5FD5EFA4C1973A6B30514E332" "OwnerKey" = "8:_A00008624800CAF367880713AFB719F2"
"MsmSig" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED"
} }
"Entry" "Entry"
{ {
"MsmKey" = "8:_1FC10E99927FDE0DB378759FE2A2C1DD" "MsmKey" = "8:_1FC10E99927FDE0DB378759FE2A2C1DD"
"OwnerKey" = "8:_E0CD318B00C3EBC6018E7287D1C5C964" "OwnerKey" = "8:_14F178F5FD5EFA4C1973A6B30514E332"
"MsmSig" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED"
} }
"Entry" "Entry"
@ -130,6 +130,12 @@
"Entry" "Entry"
{ {
"MsmKey" = "8:_3518CDF283287B9BB382E0C864B0B344" "MsmKey" = "8:_3518CDF283287B9BB382E0C864B0B344"
"OwnerKey" = "8:_5E4D6952244F4AAC64F327394623EE57"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_3518CDF283287B9BB382E0C864B0B344"
"OwnerKey" = "8:_9C2D77065F590227E595BA5087763024" "OwnerKey" = "8:_9C2D77065F590227E595BA5087763024"
"MsmSig" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED"
} }
@ -141,12 +147,6 @@
} }
"Entry" "Entry"
{ {
"MsmKey" = "8:_3518CDF283287B9BB382E0C864B0B344"
"OwnerKey" = "8:_5E4D6952244F4AAC64F327394623EE57"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_361CD6DDAD5DAD87766154F455EA61CE" "MsmKey" = "8:_361CD6DDAD5DAD87766154F455EA61CE"
"OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72"
"MsmSig" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED"
@ -160,18 +160,6 @@
"Entry" "Entry"
{ {
"MsmKey" = "8:_404BC92A271981651469C5BBB22AFBC1" "MsmKey" = "8:_404BC92A271981651469C5BBB22AFBC1"
"OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_404BC92A271981651469C5BBB22AFBC1"
"OwnerKey" = "8:_A00008624800CAF367880713AFB719F2"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_404BC92A271981651469C5BBB22AFBC1"
"OwnerKey" = "8:_FD8164C4BBFD975FAFD2A4D86340E915" "OwnerKey" = "8:_FD8164C4BBFD975FAFD2A4D86340E915"
"MsmSig" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED"
} }
@ -184,7 +172,7 @@
"Entry" "Entry"
{ {
"MsmKey" = "8:_404BC92A271981651469C5BBB22AFBC1" "MsmKey" = "8:_404BC92A271981651469C5BBB22AFBC1"
"OwnerKey" = "8:_14F178F5FD5EFA4C1973A6B30514E332" "OwnerKey" = "8:_A00008624800CAF367880713AFB719F2"
"MsmSig" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED"
} }
"Entry" "Entry"
@ -196,6 +184,18 @@
"Entry" "Entry"
{ {
"MsmKey" = "8:_404BC92A271981651469C5BBB22AFBC1" "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" "OwnerKey" = "8:_5DDEB1FF3DD78281FF3203E5E9933C19"
"MsmSig" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED"
} }
@ -232,13 +232,13 @@
"Entry" "Entry"
{ {
"MsmKey" = "8:_5DDEB1FF3DD78281FF3203E5E9933C19" "MsmKey" = "8:_5DDEB1FF3DD78281FF3203E5E9933C19"
"OwnerKey" = "8:_3518CDF283287B9BB382E0C864B0B344" "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72"
"MsmSig" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED"
} }
"Entry" "Entry"
{ {
"MsmKey" = "8:_5DDEB1FF3DD78281FF3203E5E9933C19" "MsmKey" = "8:_5DDEB1FF3DD78281FF3203E5E9933C19"
"OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" "OwnerKey" = "8:_A90E24C686315EC9D9B0BA1C76886A15"
"MsmSig" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED"
} }
"Entry" "Entry"
@ -256,13 +256,13 @@
"Entry" "Entry"
{ {
"MsmKey" = "8:_5DDEB1FF3DD78281FF3203E5E9933C19" "MsmKey" = "8:_5DDEB1FF3DD78281FF3203E5E9933C19"
"OwnerKey" = "8:_14F178F5FD5EFA4C1973A6B30514E332" "OwnerKey" = "8:_3518CDF283287B9BB382E0C864B0B344"
"MsmSig" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED"
} }
"Entry" "Entry"
{ {
"MsmKey" = "8:_5DDEB1FF3DD78281FF3203E5E9933C19" "MsmKey" = "8:_5DDEB1FF3DD78281FF3203E5E9933C19"
"OwnerKey" = "8:_A90E24C686315EC9D9B0BA1C76886A15" "OwnerKey" = "8:_14F178F5FD5EFA4C1973A6B30514E332"
"MsmSig" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED"
} }
"Entry" "Entry"
@ -340,13 +340,13 @@
"Entry" "Entry"
{ {
"MsmKey" = "8:_AB17FAEB828C8765351F17BFC0E97F98" "MsmKey" = "8:_AB17FAEB828C8765351F17BFC0E97F98"
"OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" "OwnerKey" = "8:_14F178F5FD5EFA4C1973A6B30514E332"
"MsmSig" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED"
} }
"Entry" "Entry"
{ {
"MsmKey" = "8:_AB17FAEB828C8765351F17BFC0E97F98" "MsmKey" = "8:_AB17FAEB828C8765351F17BFC0E97F98"
"OwnerKey" = "8:_14F178F5FD5EFA4C1973A6B30514E332" "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72"
"MsmSig" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED"
} }
"Entry" "Entry"
@ -381,6 +381,12 @@
} }
"Entry" "Entry"
{ {
"MsmKey" = "8:_D8C25AA5CDB643A797EB1D8E142E22CE"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_E0CD318B00C3EBC6018E7287D1C5C964" "MsmKey" = "8:_E0CD318B00C3EBC6018E7287D1C5C964"
"OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72"
"MsmSig" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED"
@ -388,37 +394,31 @@
"Entry" "Entry"
{ {
"MsmKey" = "8:_E73BA90E452C02520292C6FF727EB5AC" "MsmKey" = "8:_E73BA90E452C02520292C6FF727EB5AC"
"OwnerKey" = "8:_BF71649AE43FBD7A416893054714CE91"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_E73BA90E452C02520292C6FF727EB5AC"
"OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72"
"MsmSig" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED"
} }
"Entry" "Entry"
{ {
"MsmKey" = "8:_E73BA90E452C02520292C6FF727EB5AC" "MsmKey" = "8:_E73BA90E452C02520292C6FF727EB5AC"
"OwnerKey" = "8:_A00008624800CAF367880713AFB719F2"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_E73BA90E452C02520292C6FF727EB5AC"
"OwnerKey" = "8:_FD8164C4BBFD975FAFD2A4D86340E915" "OwnerKey" = "8:_FD8164C4BBFD975FAFD2A4D86340E915"
"MsmSig" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED"
} }
"Entry" "Entry"
{ {
"MsmKey" = "8:_E73BA90E452C02520292C6FF727EB5AC" "MsmKey" = "8:_E73BA90E452C02520292C6FF727EB5AC"
"OwnerKey" = "8:_E0CD318B00C3EBC6018E7287D1C5C964"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_E73BA90E452C02520292C6FF727EB5AC"
"OwnerKey" = "8:_CC6E1B525578AF50C3DD3123399882F3" "OwnerKey" = "8:_CC6E1B525578AF50C3DD3123399882F3"
"MsmSig" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED"
} }
"Entry" "Entry"
{ {
"MsmKey" = "8:_E73BA90E452C02520292C6FF727EB5AC" "MsmKey" = "8:_E73BA90E452C02520292C6FF727EB5AC"
"OwnerKey" = "8:_14F178F5FD5EFA4C1973A6B30514E332" "OwnerKey" = "8:_BF71649AE43FBD7A416893054714CE91"
"MsmSig" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED"
} }
"Entry" "Entry"
@ -430,13 +430,19 @@
"Entry" "Entry"
{ {
"MsmKey" = "8:_E73BA90E452C02520292C6FF727EB5AC" "MsmKey" = "8:_E73BA90E452C02520292C6FF727EB5AC"
"OwnerKey" = "8:_A00008624800CAF367880713AFB719F2"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_E73BA90E452C02520292C6FF727EB5AC"
"OwnerKey" = "8:_5E4D6952244F4AAC64F327394623EE57" "OwnerKey" = "8:_5E4D6952244F4AAC64F327394623EE57"
"MsmSig" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED"
} }
"Entry" "Entry"
{ {
"MsmKey" = "8:_E73BA90E452C02520292C6FF727EB5AC" "MsmKey" = "8:_E73BA90E452C02520292C6FF727EB5AC"
"OwnerKey" = "8:_E0CD318B00C3EBC6018E7287D1C5C964" "OwnerKey" = "8:_14F178F5FD5EFA4C1973A6B30514E332"
"MsmSig" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED"
} }
"Entry" "Entry"
@ -1472,6 +1478,26 @@
"IsDependency" = "11:TRUE" "IsDependency" = "11:TRUE"
"IsolateTo" = "8:" "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" "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_E0CD318B00C3EBC6018E7287D1C5C964"
{ {
"AssemblyRegister" = "3:1" "AssemblyRegister" = "3:1"
@ -1621,15 +1647,15 @@
{ {
"Name" = "8:Microsoft Visual Studio" "Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:SetupVerwaltung" "ProductName" = "8:SetupVerwaltung"
"ProductCode" = "8:{6D0E142B-44EA-43EA-9CA0-F4A2BFBC22AF}" "ProductCode" = "8:{86777761-9DC8-4CDE-916B-AF7A753E5414}"
"PackageCode" = "8:{4252B4CA-B810-4CA9-9A37-AF7373000FBA}" "PackageCode" = "8:{0B8B46B4-E3DA-42A0-8E69-164483EDA243}"
"UpgradeCode" = "8:{2DC7CE56-8D1C-42EB-B326-2E887EBB7F5A}" "UpgradeCode" = "8:{2DC7CE56-8D1C-42EB-B326-2E887EBB7F5A}"
"AspNetVersion" = "8:" "AspNetVersion" = "8:"
"RestartWWWService" = "11:FALSE" "RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:FALSE" "InstallAllUsers" = "11:FALSE"
"ProductVersion" = "8:1.0.15" "ProductVersion" = "8:1.0.23"
"Manufacturer" = "8:Kilian Wirl GmbH" "Manufacturer" = "8:Kilian Wirl GmbH"
"ARPHELPTELEPHONE" = "8:" "ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:" "ARPHELPLINK" = "8:"

70
UpdateVerwaltungReadMe.ps1 Normal file
View File

@ -0,0 +1,70 @@
# UpdateVerwaltungReadMe.ps1 - FINAL mit ERLEDIGTEN TODOs
$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)
if (-not (Test-Path $readmePath)) {
@"
=====================================
NEUIGKEITEN - Version ##VERSION##
=====================================
Build-Info:
- Build-Typ: ##CUSTOM##
- Erledigte TODOs: ##TODOS##
Installation: ##BUILD_DATE##
=====================================
"@ | Out-File $readmePath -Encoding UTF8
Write-Host "✅ ReadMe-Vorlage erstellt!"
}
# 1. VERSION aus AssemblyInfo.cs
$version = "1.0.0.0"
$assemblyInfoPath = Join-Path $ProjectDir "Properties\AssemblyInfo.cs"
if (Test-Path $assemblyInfoPath) {
$assemblyContent = Get-Content $assemblyInfoPath -Raw -ErrorAction SilentlyContinue
if ($assemblyContent -match 'AssemblyVersion\s*\(\s*"([^"]+)"\s*\)') {
$version = $matches[1]
Write-Host "✓ Version: $version"
}
}
# 2. ERLEDIGTE TODOs sammeln
$doneTodos = @()
$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')
foreach ($match in $doneMatches) {
$doneText = $match.Groups[1].Value.Trim()
$doneTodos += "✅ $doneText [$($file.Name)]"
}
}
# 3. Custom-Text mit DONE-Status
if ($doneTodos.Count -gt 0) {
$custom = "Erledigte TODOs: $($doneTodos.Count)"
$todosText = ($doneTodos -join "`n")
} else {
$custom = "Keine erledigten TODOs"
$todosText = "Noch keine Aufgaben abgeschlossen"
}
$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
Set-Content $readmePath $content -Encoding UTF8
Write-Host "✓ ReadMe aktualisiert!"
Write-Host " Version: $version"
Write-Host " Erledigte TODOs: $($doneTodos.Count)"

5
Verwaltung.csproj
View File

@ -478,6 +478,7 @@
<DependentUpon>Settings.settings</DependentUpon> <DependentUpon>Settings.settings</DependentUpon>
<DesignTimeSharedInput>True</DesignTimeSharedInput> <DesignTimeSharedInput>True</DesignTimeSharedInput>
</Compile> </Compile>
<None Include="UpdateVerwaltungReadMe.ps1" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="App.config" /> <None Include="App.config" />
@ -522,4 +523,8 @@
</PropertyGroup> </PropertyGroup>
<Error Condition="!Exists('packages\Microsoft.Extensions.Logging.Abstractions.6.0.0\build\Microsoft.Extensions.Logging.Abstractions.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.Extensions.Logging.Abstractions.6.0.0\build\Microsoft.Extensions.Logging.Abstractions.targets'))" /> <Error Condition="!Exists('packages\Microsoft.Extensions.Logging.Abstractions.6.0.0\build\Microsoft.Extensions.Logging.Abstractions.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.Extensions.Logging.Abstractions.6.0.0\build\Microsoft.Extensions.Logging.Abstractions.targets'))" />
</Target> </Target>
<PropertyGroup>
<PreBuildEvent>powershell -NoProfile -ExecutionPolicy Bypass -File "$(ProjectDir)UpdateVerwaltungReadMe.ps1"
</PreBuildEvent>
</PropertyGroup>
</Project> </Project>