diff --git a/.vs/Vertragsverwaltung/v16/.suo b/.vs/Vertragsverwaltung/v16/.suo index 2ea2a95a..84a6c9e1 100644 Binary files a/.vs/Vertragsverwaltung/v16/.suo and b/.vs/Vertragsverwaltung/v16/.suo differ diff --git a/Crystal Reports-Sicherungsdateien/Reporting20.vbproj b/Crystal Reports-Sicherungsdateien/Reporting20.vbproj index 3fa03e1e..53a54934 100644 --- a/Crystal Reports-Sicherungsdateien/Reporting20.vbproj +++ b/Crystal Reports-Sicherungsdateien/Reporting20.vbproj @@ -64,25 +64,25 @@ - + False - ..\..\TKBDiverse\_Klassen\Reporting\Reporting20\cr\CrystalDecisions.CrystalReports.Engine.dll + bin\Debug\CrystalDecisions.CrystalReports.Engine.dll - + False - ..\..\TKBDiverse\_Klassen\Reporting\Reporting20\cr\CrystalDecisions.ReportSource.dll + bin\Debug\CrystalDecisions.ReportSource.dll - + False - ..\..\TKBDiverse\_Klassen\Reporting\Reporting20\cr\CrystalDecisions.Shared.dll + bin\Debug\CrystalDecisions.Shared.dll - + False - ..\..\TKBDiverse\_Klassen\Reporting\Reporting20\cr\CrystalDecisions.Web.dll + bin\Debug\CrystalDecisions.Web.dll - + False - ..\..\TKBDiverse\_Klassen\Reporting\Reporting20\cr\CrystalDecisions.Windows.Forms.dll + bin\Debug\CrystalDecisions.Windows.Forms.dll False diff --git a/Reporting/Reporting20.vbproj b/Reporting/Reporting20.vbproj index 53a54934..5a0fe388 100644 --- a/Reporting/Reporting20.vbproj +++ b/Reporting/Reporting20.vbproj @@ -64,26 +64,11 @@ - - False - bin\Debug\CrystalDecisions.CrystalReports.Engine.dll - - - False - bin\Debug\CrystalDecisions.ReportSource.dll - - - False - bin\Debug\CrystalDecisions.Shared.dll - - - False - bin\Debug\CrystalDecisions.Web.dll - - - False - bin\Debug\CrystalDecisions.Windows.Forms.dll - + + + + + False ..\..\..\XLSLib\XLSLib\bin\Debug\FlexCel.dll diff --git a/Reporting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/Reporting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 2bd66a47..1b56bec3 100644 Binary files a/Reporting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/Reporting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/Reporting/obj/Debug/Reporting20.vbproj.AssemblyReference.cache b/Reporting/obj/Debug/Reporting20.vbproj.AssemblyReference.cache index dd0acb4c..0ea7442e 100644 Binary files a/Reporting/obj/Debug/Reporting20.vbproj.AssemblyReference.cache and b/Reporting/obj/Debug/Reporting20.vbproj.AssemblyReference.cache differ diff --git a/Vertragsverwaltung/Applikation/Applikation/frmApplikation.designer.vb b/Vertragsverwaltung/Applikation/Applikation/frmApplikation.designer.vb index 58c12c05..ce176294 100644 --- a/Vertragsverwaltung/Applikation/Applikation/frmApplikation.designer.vb +++ b/Vertragsverwaltung/Applikation/Applikation/frmApplikation.designer.vb @@ -318,6 +318,10 @@ Partial Class frmApplikation Me.GroupBox2 = New System.Windows.Forms.GroupBox() Me.C1ApplikationAbhaengigVon = New C1.Win.C1TrueDBGrid.C1TrueDBGrid() Me.ctxMenuAppAbhaengigVon = New System.Windows.Forms.ContextMenuStrip(Me.components) + Me.NeuerEintragToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem() + Me.EintragLöschenToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem() + Me.BemerkungToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripMenuItem6 = New System.Windows.Forms.ToolStripSeparator() Me.ApplikationsdetailsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.GrpApplAbhaengigkeit = New System.Windows.Forms.GroupBox() Me.C1Applikationsabhaengigkeiten = New C1.Win.C1TrueDBGrid.C1TrueDBGrid() @@ -337,9 +341,9 @@ Partial Class frmApplikation Me.tsAppTreeSearchSearch = New System.Windows.Forms.ToolStripButton() Me.tsAppTreeSearchPrev = New System.Windows.Forms.ToolStripButton() Me.tsbtnappabhaengigkeit_neu = New System.Windows.Forms.ToolStrip() + Me.ToolStripButton1 = New System.Windows.Forms.ToolStripButton() Me.tsAppAbhaengigkeit_Export = New System.Windows.Forms.ToolStripButton() Me.tsappabhaengigkeitneu = New System.Windows.Forms.ToolStripButton() - Me.ToolStripButton1 = New System.Windows.Forms.ToolStripButton() Me.ToolStrip1.SuspendLayout() Me.MenuStrip1.SuspendLayout() Me.TreeApplikationenContextMenuStrip.SuspendLayout() @@ -3288,6 +3292,7 @@ Partial Class frmApplikation ' 'GroupBox2 ' + Me.GroupBox2.BackColor = System.Drawing.Color.Transparent Me.GroupBox2.Controls.Add(Me.C1ApplikationAbhaengigVon) Me.GroupBox2.Dock = System.Windows.Forms.DockStyle.Fill Me.GroupBox2.Location = New System.Drawing.Point(228, 248) @@ -3299,7 +3304,9 @@ Partial Class frmApplikation ' 'C1ApplikationAbhaengigVon ' + Me.C1ApplikationAbhaengigVon.AllowDrop = True Me.C1ApplikationAbhaengigVon.AlternatingRows = True + Me.C1ApplikationAbhaengigVon.BackColor = System.Drawing.SystemColors.Control Me.C1ApplikationAbhaengigVon.ContextMenuStrip = Me.ctxMenuAppAbhaengigVon Me.C1ApplikationAbhaengigVon.Dock = System.Windows.Forms.DockStyle.Fill Me.C1ApplikationAbhaengigVon.FetchRowStyles = True @@ -3321,9 +3328,32 @@ Partial Class frmApplikation ' 'ctxMenuAppAbhaengigVon ' - Me.ctxMenuAppAbhaengigVon.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ApplikationsdetailsToolStripMenuItem}) + Me.ctxMenuAppAbhaengigVon.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.NeuerEintragToolStripMenuItem1, Me.EintragLöschenToolStripMenuItem1, Me.BemerkungToolStripMenuItem1, Me.ToolStripMenuItem6, Me.ApplikationsdetailsToolStripMenuItem}) Me.ctxMenuAppAbhaengigVon.Name = "ctxMenuAppAbhaengigVon" - Me.ctxMenuAppAbhaengigVon.Size = New System.Drawing.Size(175, 26) + Me.ctxMenuAppAbhaengigVon.Size = New System.Drawing.Size(175, 98) + ' + 'NeuerEintragToolStripMenuItem1 + ' + Me.NeuerEintragToolStripMenuItem1.Name = "NeuerEintragToolStripMenuItem1" + Me.NeuerEintragToolStripMenuItem1.Size = New System.Drawing.Size(174, 22) + Me.NeuerEintragToolStripMenuItem1.Text = "Neuer Eintrag" + ' + 'EintragLöschenToolStripMenuItem1 + ' + Me.EintragLöschenToolStripMenuItem1.Name = "EintragLöschenToolStripMenuItem1" + Me.EintragLöschenToolStripMenuItem1.Size = New System.Drawing.Size(174, 22) + Me.EintragLöschenToolStripMenuItem1.Text = "Eintrag löschen" + ' + 'BemerkungToolStripMenuItem1 + ' + Me.BemerkungToolStripMenuItem1.Name = "BemerkungToolStripMenuItem1" + Me.BemerkungToolStripMenuItem1.Size = New System.Drawing.Size(174, 22) + Me.BemerkungToolStripMenuItem1.Text = "Bemerkung" + ' + 'ToolStripMenuItem6 + ' + Me.ToolStripMenuItem6.Name = "ToolStripMenuItem6" + Me.ToolStripMenuItem6.Size = New System.Drawing.Size(171, 6) ' 'ApplikationsdetailsToolStripMenuItem ' @@ -3344,7 +3374,9 @@ Partial Class frmApplikation ' 'C1Applikationsabhaengigkeiten ' + Me.C1Applikationsabhaengigkeiten.AllowDrop = True Me.C1Applikationsabhaengigkeiten.AlternatingRows = True + Me.C1Applikationsabhaengigkeiten.BackColor = System.Drawing.SystemColors.Control Me.C1Applikationsabhaengigkeiten.ContextMenuStrip = Me.ctxmenuAbhaengigkeiten Me.C1Applikationsabhaengigkeiten.Dock = System.Windows.Forms.DockStyle.Fill Me.C1Applikationsabhaengigkeiten.FetchRowStyles = True @@ -3492,6 +3524,16 @@ Partial Class frmApplikation Me.tsbtnappabhaengigkeit_neu.TabIndex = 17 Me.tsbtnappabhaengigkeit_neu.Text = "ToolStrip3" ' + 'ToolStripButton1 + ' + Me.ToolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image + Me.ToolStripButton1.Image = CType(resources.GetObject("ToolStripButton1.Image"), System.Drawing.Image) + Me.ToolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta + Me.ToolStripButton1.Name = "ToolStripButton1" + Me.ToolStripButton1.Size = New System.Drawing.Size(23, 22) + Me.ToolStripButton1.Text = "ToolStripButton1" + Me.ToolStripButton1.Visible = False + ' 'tsAppAbhaengigkeit_Export ' Me.tsAppAbhaengigkeit_Export.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image @@ -3512,16 +3554,6 @@ Partial Class frmApplikation Me.tsappabhaengigkeitneu.Text = "ToolStripButton1" Me.tsappabhaengigkeitneu.ToolTipText = "Neuer Eintrag" ' - 'ToolStripButton1 - ' - Me.ToolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.ToolStripButton1.Image = CType(resources.GetObject("ToolStripButton1.Image"), System.Drawing.Image) - Me.ToolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta - Me.ToolStripButton1.Name = "ToolStripButton1" - Me.ToolStripButton1.Size = New System.Drawing.Size(23, 22) - Me.ToolStripButton1.Text = "ToolStripButton1" - Me.ToolStripButton1.Visible = False - ' 'frmApplikation ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -3979,4 +4011,8 @@ Partial Class frmApplikation Friend WithEvents tsappabhaengigkeitneu As ToolStripButton Friend WithEvents BemerkungToolStripMenuItem As ToolStripMenuItem Friend WithEvents ToolStripButton1 As ToolStripButton + Friend WithEvents NeuerEintragToolStripMenuItem1 As ToolStripMenuItem + Friend WithEvents EintragLöschenToolStripMenuItem1 As ToolStripMenuItem + Friend WithEvents BemerkungToolStripMenuItem1 As ToolStripMenuItem + Friend WithEvents ToolStripMenuItem6 As ToolStripSeparator End Class diff --git a/Vertragsverwaltung/Applikation/Applikation/frmApplikation.resx b/Vertragsverwaltung/Applikation/Applikation/frmApplikation.resx index 4613f10f..bf74d06d 100644 --- a/Vertragsverwaltung/Applikation/Applikation/frmApplikation.resx +++ b/Vertragsverwaltung/Applikation/Applikation/frmApplikation.resx @@ -296,7 +296,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADg - CwAAAk1TRnQBSQFMAgEBBQEAAfwBCgH8AQoBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CwAAAk1TRnQBSQFMAgEBBQEAAdwBCwHcAQsBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -360,7 +360,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACM - DwAAAk1TRnQBSQFMAgEBBwEAAfwBCgH8AQoBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + DwAAAk1TRnQBSQFMAgEBBwEAAdwBCwHcAQsBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -467,7 +467,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAw - CQAAAk1TRnQBSQFMAgEBAgEAAYABAgGAAQIBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CQAAAk1TRnQBSQFMAgEBAgEAAWABAwFgAQMBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -634,7 +634,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAA6 - DQAAAk1TRnQBSQFMAgEBBwEAAfwBCgH8AQoBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + DQAAAk1TRnQBSQFMAgEBBwEAAdwBCwHcAQsBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -718,47 +718,6 @@ 563, 95 - - 1288, 95 - - - 1181, 95 - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACkSURBVDhPlZALDsMwCEM5OkfLzbIaMGH5dJkligL2a1o5 - qP9RW3VVXYpzqLV2D+CZQVU/Y27uIg4OQQAJXz+hDsyEDtVQ7dib+1GH1fpUDljD6OF5HgjvKgHvN+iC - A0O1EvB+A8ghPvgqB4j9xPlHhidVB2lwwICfbkBxMAFGqHbszb1RGhywhtGxN/dGXAbgGD4CqACMMGZR - VwrA/Rtn/QiKfADckGXYsnwKqAAAAABJRU5ErkJggg== - - - - - iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACpSURBVFhH7ZLhCoQwDIP36Hu0vdl5DU7GbFx6KtyPfhBQ - 26aBWpIkEfhMYqh9YVRjtS+Maqz2hVGN1T6Z2RCqtULfZzC8M/0GMx2+d45QZCYMjFprzPCkvnwxIwMT - Qw1g6iG82i4ZKYCwcJYMjFcneDXAS5Lxhp+QzOoEDNQvTiMDg4ufkIG6BSfhZf4jwJ0T3A5gIstNjKMn - GPyENzyK4fWOSpIkcShlA/2ShGAugX0dAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAETSURBVDhPrVPLccIwEN0C4Oxw8wUacAPqggOugFQALdAA - M8kx1+Bj7umBAzRAERkQ761XshzZA5nJm3mj1duPpJUk/4aryMGL+JtIbVIP0Gf0/4icMU5M7hACrMjM - 5IiwAFiZlANOx6BPNTus20QWfjVpHG9dsB4FdsX5t5oPUJalx+G0gLG6TKdqv7QFyGE453zTNBrk2uTI - r7r2LE6fMUdagGQfYIR+/OYgYsAchBHJeeoHc6Q7YMNgsJFbjpx/7PfpMXKEApskmTruf8f5cbXyjIE0 - XADwy6LQ5PTKYExOGKjjBVGPvh4YyCASqy9MVkDTtzD6jIkn/oL2IxytBybRiSLvJmXgyrYD7nL8P/wN - InfTOb1kQ+hzeQAAAABJRU5ErkJggg== - - - - 1074, 95 - - - 563, 95 - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -1259,6 +1218,59 @@ <?xml version="1.0"?><Blob><Styles type="C1.Win.C1TrueDBGrid.Design.ContextWrapper"><Data>HighlightRow{ForeColor:HighlightText;BackColor:Highlight;}Style8{}Style7{}EvenRow{BackColor:White;}Normal{}RecordSelector{AlignImage:Center;}OddRow{BackColor:224, 224, 224;}Style3{}Footer{}Style14{}FilterBar{ForeColor:Black;BackColor:255, 255, 192;}Heading{AlignVert:Center;Border:Flat,ControlDark,0, 1, 0, 1;Wrap:True;BackColor:Control;ForeColor:ControlText;}Style5{}Editor{}Style10{AlignHorz:Near;}FilterWatermark{ForeColor:InfoText;BackColor:Info;}Style16{}Selected{ForeColor:HighlightText;BackColor:Highlight;}Style15{}Style13{}Style12{}Style11{}Style4{}Style9{}Group{Border:None,,0, 0, 0, 0;AlignVert:Center;BackColor:ControlDark;}Style6{}Style1{}Caption{AlignHorz:Center;}Style2{}Inactive{ForeColor:InactiveCaptionText;BackColor:InactiveCaption;}</Data></Styles><Splits><C1.Win.C1TrueDBGrid.MergeView HBarHeight="16" VBarHeight="16" Name="" AlternatingRowStyle="True" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" FetchRowStyles="True" FilterBar="True" MarqueeStyle="DottedCellBorder" RecordSelectorWidth="16" DefRecSelWidth="17" VerticalScrollGroup="1" HorizontalScrollGroup="1"><CaptionStyle parent="Style2" me="Style10" /><EditorStyle parent="Editor" me="Style5" /><EvenRowStyle parent="EvenRow" me="Style8" /><FilterBarStyle parent="FilterBar" me="Style13" /><FilterWatermarkStyle parent="FilterWatermark" me="Style14" /><FooterStyle parent="Footer" me="Style3" /><GroupStyle parent="Group" me="Style12" /><HeadingStyle parent="Heading" me="Style2" /><HighLightRowStyle parent="HighlightRow" me="Style7" /><InactiveStyle parent="Inactive" me="Style4" /><OddRowStyle parent="OddRow" me="Style9" /><RecordSelectorStyle parent="RecordSelector" me="Style11" /><SelectedStyle parent="Selected" me="Style6" /><Style parent="Normal" me="Style1" /><ClientRect>0, 0, 421, 202</ClientRect><BorderSide>0</BorderSide></C1.Win.C1TrueDBGrid.MergeView></Splits><NamedStyles><Style parent="" me="Normal" /><Style parent="Normal" me="Heading" /><Style parent="Heading" me="Footer" /><Style parent="Heading" me="Caption" /><Style parent="Heading" me="Inactive" /><Style parent="Normal" me="Selected" /><Style parent="Normal" me="Editor" /><Style parent="Normal" me="HighlightRow" /><Style parent="Normal" me="EvenRow" /><Style parent="Normal" me="OddRow" /><Style parent="Heading" me="RecordSelector" /><Style parent="Normal" me="FilterBar" /><Style parent="FilterBar" me="FilterWatermark" /><Style parent="Caption" me="Group" /></NamedStyles><vertSplits>1</vertSplits><horzSplits>1</horzSplits><Layout>None</Layout><DefaultRecSelWidth>17</DefaultRecSelWidth><ClientArea>0, 0, 421, 202</ClientArea><PrintPageHeaderStyle parent="" me="Style15" /><PrintPageFooterStyle parent="" me="Style16" /></Blob> + + 1288, 95 + + + 1181, 95 + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACkSURBVDhPlZALDsMwCEM5OkfLzbIaMGH5dJkligL2a1o5 + qP9RW3VVXYpzqLV2D+CZQVU/Y27uIg4OQQAJXz+hDsyEDtVQ7dib+1GH1fpUDljD6OF5HgjvKgHvN+iC + A0O1EvB+A8ghPvgqB4j9xPlHhidVB2lwwICfbkBxMAFGqHbszb1RGhywhtGxN/dGXAbgGD4CqACMMGZR + VwrA/Rtn/QiKfADckGXYsnwKqAAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACpSURBVFhH7ZLhCoQwDIP36Hu0vdl5DU7GbFx6KtyPfhBQ + 26aBWpIkEfhMYqh9YVRjtS+Maqz2hVGN1T6Z2RCqtULfZzC8M/0GMx2+d45QZCYMjFprzPCkvnwxIwMT + Qw1g6iG82i4ZKYCwcJYMjFcneDXAS5Lxhp+QzOoEDNQvTiMDg4ufkIG6BSfhZf4jwJ0T3A5gIstNjKMn + GPyENzyK4fWOSpIkcShlA/2ShGAugX0dAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAETSURBVDhPrVPLccIwEN0C4Oxw8wUacAPqggOugFQALdAA + M8kx1+Bj7umBAzRAERkQ761XshzZA5nJm3mj1duPpJUk/4aryMGL+JtIbVIP0Gf0/4icMU5M7hACrMjM + 5IiwAFiZlANOx6BPNTus20QWfjVpHG9dsB4FdsX5t5oPUJalx+G0gLG6TKdqv7QFyGE453zTNBrk2uTI + r7r2LE6fMUdagGQfYIR+/OYgYsAchBHJeeoHc6Q7YMNgsJFbjpx/7PfpMXKEApskmTruf8f5cbXyjIE0 + XADwy6LQ5PTKYExOGKjjBVGPvh4YyCASqy9MVkDTtzD6jIkn/oL2IxytBybRiSLvJmXgyrYD7nL8P/wN + InfTOb1kQ+hzeQAAAABJRU5ErkJggg== + + + + 1074, 95 + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG + YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9 + 0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw + bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc + VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9 + c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32 + Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo + mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+ + kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D + TgDQASA1MVpwzwAAAABJRU5ErkJggg== + + iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -1342,21 +1354,6 @@ OiGWR5jkygfD+ZDtb+trY5xzX9PuNs+OgU+0q8eYswZ2mI9NCnKbzkNg+R9kV5WH0EJkNXMaoXOJ6AIE 9miIGCXLkOP7jSJ6EWkE7jGKYGp+wZlG8HEY3C1yrEek6PMQjD7GxNTBGUdwzr0fgj92GtoyhIbI+Lzn IzD0MdY/mhMpKUS69uY/mTthk1u8I7QAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG - YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9 - 0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw - bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc - VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9 - c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32 - Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo - mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+ - kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D - TgDQASA1MVpwzwAAAABJRU5ErkJggg== diff --git a/Vertragsverwaltung/Applikation/Applikation/frmApplikation.vb b/Vertragsverwaltung/Applikation/Applikation/frmApplikation.vb index a21c5d64..290f3553 100644 --- a/Vertragsverwaltung/Applikation/Applikation/frmApplikation.vb +++ b/Vertragsverwaltung/Applikation/Applikation/frmApplikation.vb @@ -2942,6 +2942,9 @@ Public Class frmApplikation Me.SpaltenTitel.Spaltentitel_aktualisieren(Me.C1Applikationsabhaengigkeiten, "appdependency", Me.Applikation.dtab1) Me.C1ApplikationAbhaengigVon.DataSource = Me.Applikation.dtab2 Me.SpaltenTitel.Spaltentitel_aktualisieren(Me.C1ApplikationAbhaengigVon, "appdependency", Me.Applikation.dtab2) + Me.C1Applikationsabhaengigkeiten.Bookmark = -1 + Me.C1ApplikationAbhaengigVon.Bookmark = -1 + GrpApplAbhaengigkeit.Dock = DockStyle.None GrpApplAbhaengigkeit.Dock = DockStyle.Top @@ -2975,9 +2978,11 @@ Public Class frmApplikation End Sub - + Dim Destinationgrid As Integer = 0 Private Sub NeuerEintragToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles NeuerEintragToolStripMenuItem.Click - + Destinationgrid = 0 + Me.GroupBox2.BackColor = Color.Transparent + Me.GrpApplAbhaengigkeit.BackColor = Color.LightCoral 'Dim originalNode As TreeNode 'For Each originalNode In Me.TreeApplikationen.Nodes ' Dim NewNode As TreeNode = New TreeNode(originalNode.Text) @@ -2994,6 +2999,11 @@ Public Class frmApplikation Me.AppTreeSelect.ExpandAll() Me.AppTreeSelect.SelectedNode = Me.AppTreeSelect.Nodes(0) Me.grpAppselect.Visible = True + If Destinationgrid = 0 Then + Me.GrpApplAbhaengigkeit.BackColor = Color.LightCoral + Else + Me.GroupBox2.BackColor = Color.LightCoral + End If End Sub Private Sub IterateTreeNodes(ByVal originalNode As TreeNode, ByVal rootNode As TreeNode) Dim childNode As TreeNode @@ -3013,8 +3023,12 @@ Public Class frmApplikation End Sub Private Sub AbhängigkeitHinzufügenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles AbhängigkeitHinzufügenToolStripMenuItem.Click + If Destinationgrid = 0 Then + Applikation.Abhaengigkeiten(3, Me.Aktuelle_Applikation, Me.AppTreeSelect.SelectedNode.Tag, Globals.clsmitarbeiter.iMitarbeiternr.Value) + Else + Applikation.Abhaengigkeiten(3, Me.AppTreeSelect.SelectedNode.Tag, Me.Aktuelle_Applikation, Globals.clsmitarbeiter.iMitarbeiternr.Value) + End If - Applikation.Abhaengigkeiten(3, Me.Aktuelle_Applikation, Me.AppTreeSelect.SelectedNode.Tag, Globals.clsmitarbeiter.iMitarbeiternr.Value) refresh_Applikationsabhaengigkeiten() End Sub @@ -3036,6 +3050,8 @@ Public Class frmApplikation Private Sub tsAppTreeSelectClose_Click(sender As Object, e As EventArgs) Handles tsAppTreeSelectClose.Click grpAppselect.Visible = False + Me.GrpApplAbhaengigkeit.BackColor = Color.Transparent + Me.GroupBox2.BackColor = Color.Transparent End Sub Private Sub tsAppTreeSearchSearch_Click(sender As Object, e As EventArgs) Handles tsAppTreeSearchSearch.Click @@ -3190,7 +3206,30 @@ Public Class frmApplikation End Sub Private Sub ctxMenuAppAbhaengigVon_Opening(sender As Object, e As System.ComponentModel.CancelEventArgs) Handles ctxMenuAppAbhaengigVon.Opening - If Me.C1ApplikationAbhaengigVon.Splits(0).Rows.Count < 1 Then ApplikationsdetailsToolStripMenuItem.Enabled = False Else ApplikationsdetailsToolStripMenuItem.Enabled = True + If Me.C1ApplikationAbhaengigVon.Splits(0).Rows.Count < 1 Then + ApplikationsdetailsToolStripMenuItem.Enabled = False + EintragLöschenToolStripMenuItem1.Enabled = False + BemerkungToolStripMenuItem1.Enabled = False + Else + ApplikationsdetailsToolStripMenuItem.Enabled = True + EintragLöschenToolStripMenuItem1.Enabled = True + BemerkungToolStripMenuItem1.Enabled = True + + End If + + + If Me.C1Applikationsabhaengigkeiten.Splits(0).Rows.Count < 1 Then + 'NeuerEintragToolStripMenuItem.Enabled = False + EintragLöschenToolStripMenuItem.Enabled = False + BemerkungToolStripMenuItem.Enabled = False + ApplikatioinsdetailsToolStripMenuItem.Enabled = False + Else + 'NeuerEintragToolStripMenuItem.Enabled = True + EintragLöschenToolStripMenuItem.Enabled = True + BemerkungToolStripMenuItem.Enabled = True + ApplikatioinsdetailsToolStripMenuItem.Enabled = True + End If + End Sub Private Sub ctxmenuAbhaengigkeiten_Opening(sender As Object, e As System.ComponentModel.CancelEventArgs) Handles ctxmenuAbhaengigkeiten.Opening @@ -3206,5 +3245,118 @@ Public Class frmApplikation ApplikatioinsdetailsToolStripMenuItem.Enabled = True End If End Sub + + Private Sub AppTreeSelect_ItemDrag(sender As Object, e As ItemDragEventArgs) Handles AppTreeSelect.ItemDrag + DoDragDrop(e.Item, DragDropEffects.Move) + Me.AppTreeSelect.SelectedNode = e.Item + End Sub + + + + Private Sub C1Applikationsabhaengigkeiten_DragEnter(sender As Object, e As DragEventArgs) Handles C1Applikationsabhaengigkeiten.DragEnter + If e.Data.GetDataPresent("System.Windows.Forms.TreeNode", True) Then + Dim dropnode As TreeNode = CType(e.Data.GetData("System.Windows.Forms.TreeNode"), TreeNode) + If dropnode.TreeView.Name = "AppTreeSelect" Then + 'TreeNode found allow move effect + e.Effect = DragDropEffects.Move + Else + e.Effect = DragDropEffects.None + + End If + + Else + 'No TreeNode found, prevent move + e.Effect = DragDropEffects.None + End If + End Sub + + Private Sub C1Applikationsabhaengigkeiten_DragDrop(sender As Object, e As DragEventArgs) Handles C1Applikationsabhaengigkeiten.DragDrop + If e.Data.GetDataPresent("System.Windows.Forms.TreeNode", True) Then + Dim dropnode As TreeNode = CType(e.Data.GetData("System.Windows.Forms.TreeNode"), TreeNode) + If dropnode.TreeView.Name <> "AppTreeSelect" Then Exit Sub + Applikation.Abhaengigkeiten(3, Me.Aktuelle_Applikation, dropnode.Tag, Globals.clsmitarbeiter.iMitarbeiternr.Value) + refresh_Applikationsabhaengigkeiten() + e.Effect = DragDropEffects.None + End If + + End Sub + + Private Sub C1ApplikationAbhaengigVon_DragDrop(sender As Object, e As DragEventArgs) Handles C1ApplikationAbhaengigVon.DragDrop + If e.Data.GetDataPresent("System.Windows.Forms.TreeNode", True) Then + Dim dropnode As TreeNode = CType(e.Data.GetData("System.Windows.Forms.TreeNode"), TreeNode) + If dropnode.TreeView.Name <> "AppTreeSelect" Then Exit Sub + Applikation.Abhaengigkeiten(3, dropnode.Tag, Me.Aktuelle_Applikation, Globals.clsmitarbeiter.iMitarbeiternr.Value) + refresh_Applikationsabhaengigkeiten() + e.Effect = DragDropEffects.None + End If + End Sub + + Private Sub C1ApplikationAbhaengigVon_DragEnter(sender As Object, e As DragEventArgs) Handles C1ApplikationAbhaengigVon.DragEnter + If e.Data.GetDataPresent("System.Windows.Forms.TreeNode", True) Then + Dim dropnode As TreeNode = CType(e.Data.GetData("System.Windows.Forms.TreeNode"), TreeNode) + If dropnode.TreeView.Name = "AppTreeSelect" Then + 'TreeNode found allow move effect + e.Effect = DragDropEffects.Move + Else + e.Effect = DragDropEffects.None + + End If + + Else + 'No TreeNode found, prevent move + e.Effect = DragDropEffects.None + End If + End Sub + + Private Sub NeuerEintragToolStripMenuItem1_Click(sender As Object, e As EventArgs) Handles NeuerEintragToolStripMenuItem1.Click + + NeuerEintragToolStripMenuItem_Click(sender, e) + Destinationgrid = 1 + Me.GroupBox2.BackColor = Color.LightCoral + Me.GrpApplAbhaengigkeit.BackColor = Color.Transparent + End Sub + + Private Sub EintragLöschenToolStripMenuItem1_Click(sender As Object, e As EventArgs) Handles EintragLöschenToolStripMenuItem1.Click + If MsgBox("Eintrag wirklich löschen?", vbYesNo) = vbYes Then + Me.Applikation.Abhaengigkeiten(4, Me.C1ApplikationAbhaengigVon.Columns("ID").Value, Globals.clsmitarbeiter.iMitarbeiternr.Value, "") + refresh_Applikationsabhaengigkeiten() + End If + End Sub + + Private Sub BemerkungToolStripMenuItem1_Click(sender As Object, e As EventArgs) Handles BemerkungToolStripMenuItem1.Click + Dim s As String + s = Me.C1ApplikationAbhaengigVon.Columns("Bemerkung").Value + Dim f As New frmBemerkung + f.TextBox1.Text = s + f.ShowDialog() + If f.DialogResult = DialogResult.OK Then + Me.Applikation.Abhaengigkeiten(6, f.TextBox1.Text, Me.C1ApplikationAbhaengigVon.Columns("ID").Value, Globals.clsmitarbeiter.iMitarbeiternr.Value) + Me.refresh_Applikationsabhaengigkeiten() + End If + End Sub + + Private Sub C1Applikationsabhaengigkeiten_MouseDown(sender As Object, e As MouseEventArgs) Handles C1Applikationsabhaengigkeiten.MouseDown + Me.C1Applikationsabhaengigkeiten.Bookmark = Me.C1Applikationsabhaengigkeiten.RowContaining(e.Y) + End Sub + + Private Sub C1ApplikationAbhaengigVon_MouseDown(sender As Object, e As MouseEventArgs) Handles C1ApplikationAbhaengigVon.MouseDown + Me.C1ApplikationAbhaengigVon.Bookmark = Me.C1ApplikationAbhaengigVon.RowContaining(e.Y) + End Sub + + Private Sub AppTreeSelect_MouseDown(sender As Object, e As MouseEventArgs) Handles AppTreeSelect.MouseDown + Try + Dim mouseEvents As MouseEventArgs + mouseEvents = e + selectPoint.Y = mouseEvents.Y + selectPoint.X = mouseEvents.X + Me.AppTreeSelect.SelectedNode = Me.AppTreeSelect.GetNodeAt(selectPoint) + + Catch ex As Exception + MsgBox(ex.Message) + End Try + End Sub + + + #End Region End Class \ No newline at end of file diff --git a/Vertragsverwaltung/Utils/Globals.vb b/Vertragsverwaltung/Utils/Globals.vb index 471f9cd5..c97bedfe 100644 --- a/Vertragsverwaltung/Utils/Globals.vb +++ b/Vertragsverwaltung/Utils/Globals.vb @@ -6,7 +6,7 @@ Module Globals ''' ''' Public Version As String = "3.1" - Public Versionsdatum As String = "19.11.2018" + Public Versionsdatum As String = "22.12.2021" ''' ''' Applikationsdaten diff --git a/Vertragsverwaltung/bin/Debug/20211222_ITSM.zip b/Vertragsverwaltung/bin/Debug/20211222_ITSM.zip new file mode 100644 index 00000000..46d44a70 Binary files /dev/null and b/Vertragsverwaltung/bin/Debug/20211222_ITSM.zip differ diff --git a/Vertragsverwaltung/bin/Debug/IT-Service-Management.exe b/Vertragsverwaltung/bin/Debug/IT-Service-Management.exe index 65048fac..e860c6e7 100644 Binary files a/Vertragsverwaltung/bin/Debug/IT-Service-Management.exe and b/Vertragsverwaltung/bin/Debug/IT-Service-Management.exe differ diff --git a/Vertragsverwaltung/bin/Debug/IT-Service-Management.pdb b/Vertragsverwaltung/bin/Debug/IT-Service-Management.pdb index b75b32fe..491aee6d 100644 Binary files a/Vertragsverwaltung/bin/Debug/IT-Service-Management.pdb and b/Vertragsverwaltung/bin/Debug/IT-Service-Management.pdb differ diff --git a/Vertragsverwaltung/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/Vertragsverwaltung/obj/Debug/DesignTimeResolveAssemblyReferences.cache index 45112c90..dadddca8 100644 Binary files a/Vertragsverwaltung/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/Vertragsverwaltung/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/Vertragsverwaltung/obj/Debug/IT-Service-Management.exe b/Vertragsverwaltung/obj/Debug/IT-Service-Management.exe index 65048fac..e860c6e7 100644 Binary files a/Vertragsverwaltung/obj/Debug/IT-Service-Management.exe and b/Vertragsverwaltung/obj/Debug/IT-Service-Management.exe differ diff --git a/Vertragsverwaltung/obj/Debug/IT-Service-Management.pdb b/Vertragsverwaltung/obj/Debug/IT-Service-Management.pdb index b75b32fe..491aee6d 100644 Binary files a/Vertragsverwaltung/obj/Debug/IT-Service-Management.pdb and b/Vertragsverwaltung/obj/Debug/IT-Service-Management.pdb differ diff --git a/Vertragsverwaltung/obj/Debug/Vertragsverwaltung.frmApplikation.resources b/Vertragsverwaltung/obj/Debug/Vertragsverwaltung.frmApplikation.resources index 2fe7d33e..8eb7b56c 100644 Binary files a/Vertragsverwaltung/obj/Debug/Vertragsverwaltung.frmApplikation.resources and b/Vertragsverwaltung/obj/Debug/Vertragsverwaltung.frmApplikation.resources differ diff --git a/Vertragsverwaltung/obj/Debug/Vertragsverwaltung.vbproj.GenerateResource.cache b/Vertragsverwaltung/obj/Debug/Vertragsverwaltung.vbproj.GenerateResource.cache index 9d55c29c..b19f0fdb 100644 Binary files a/Vertragsverwaltung/obj/Debug/Vertragsverwaltung.vbproj.GenerateResource.cache and b/Vertragsverwaltung/obj/Debug/Vertragsverwaltung.vbproj.GenerateResource.cache differ