diff --git a/.vs/EDOKAApp/v16/.suo b/.vs/EDOKAApp/v16/.suo index 1d02d1a..4c43b4e 100644 Binary files a/.vs/EDOKAApp/v16/.suo and b/.vs/EDOKAApp/v16/.suo differ diff --git a/BusinessFacade/bin/EDOKALib.BusinessFacade.dll b/BusinessFacade/bin/EDOKALib.BusinessFacade.dll index 78928ed..f8eb330 100644 Binary files a/BusinessFacade/bin/EDOKALib.BusinessFacade.dll and b/BusinessFacade/bin/EDOKALib.BusinessFacade.dll differ diff --git a/BusinessFacade/bin/EDOKALib.BusinessFacade.pdb b/BusinessFacade/bin/EDOKALib.BusinessFacade.pdb index 02396a1..48f3284 100644 Binary files a/BusinessFacade/bin/EDOKALib.BusinessFacade.pdb and b/BusinessFacade/bin/EDOKALib.BusinessFacade.pdb differ diff --git a/BusinessFacade/bin/EDOKALib.Common.dll b/BusinessFacade/bin/EDOKALib.Common.dll index 789b226..e11b96e 100644 Binary files a/BusinessFacade/bin/EDOKALib.Common.dll and b/BusinessFacade/bin/EDOKALib.Common.dll differ diff --git a/BusinessFacade/bin/EDOKALib.Common.pdb b/BusinessFacade/bin/EDOKALib.Common.pdb index adeaed5..b53e8e6 100644 Binary files a/BusinessFacade/bin/EDOKALib.Common.pdb and b/BusinessFacade/bin/EDOKALib.Common.pdb differ diff --git a/BusinessFacade/bin/EDOKALib.DataAccess.dll b/BusinessFacade/bin/EDOKALib.DataAccess.dll index 912df00..c44131a 100644 Binary files a/BusinessFacade/bin/EDOKALib.DataAccess.dll and b/BusinessFacade/bin/EDOKALib.DataAccess.dll differ diff --git a/BusinessFacade/bin/EDOKALib.DataAccess.pdb b/BusinessFacade/bin/EDOKALib.DataAccess.pdb index 6f3b0e4..278b6e3 100644 Binary files a/BusinessFacade/bin/EDOKALib.DataAccess.pdb and b/BusinessFacade/bin/EDOKALib.DataAccess.pdb differ diff --git a/BusinessFacade/obj/Debug/BusinessFacade.vbproj.AssemblyReference.cache b/BusinessFacade/obj/Debug/BusinessFacade.vbproj.AssemblyReference.cache index e46e0d2..47836ea 100644 Binary files a/BusinessFacade/obj/Debug/BusinessFacade.vbproj.AssemblyReference.cache and b/BusinessFacade/obj/Debug/BusinessFacade.vbproj.AssemblyReference.cache differ diff --git a/BusinessFacade/obj/Debug/EDOKALib.BusinessFacade.dll b/BusinessFacade/obj/Debug/EDOKALib.BusinessFacade.dll index 78928ed..f8eb330 100644 Binary files a/BusinessFacade/obj/Debug/EDOKALib.BusinessFacade.dll and b/BusinessFacade/obj/Debug/EDOKALib.BusinessFacade.dll differ diff --git a/BusinessFacade/obj/Debug/EDOKALib.BusinessFacade.pdb b/BusinessFacade/obj/Debug/EDOKALib.BusinessFacade.pdb index 02396a1..48f3284 100644 Binary files a/BusinessFacade/obj/Debug/EDOKALib.BusinessFacade.pdb and b/BusinessFacade/obj/Debug/EDOKALib.BusinessFacade.pdb differ diff --git a/Common/bin/EDOKALib.Common.dll b/Common/bin/EDOKALib.Common.dll index 789b226..e11b96e 100644 Binary files a/Common/bin/EDOKALib.Common.dll and b/Common/bin/EDOKALib.Common.dll differ diff --git a/Common/bin/EDOKALib.Common.pdb b/Common/bin/EDOKALib.Common.pdb index adeaed5..b53e8e6 100644 Binary files a/Common/bin/EDOKALib.Common.pdb and b/Common/bin/EDOKALib.Common.pdb differ diff --git a/Common/obj/Debug/Common.vbproj.AssemblyReference.cache b/Common/obj/Debug/Common.vbproj.AssemblyReference.cache index 5978c63..dbbc0fd 100644 Binary files a/Common/obj/Debug/Common.vbproj.AssemblyReference.cache and b/Common/obj/Debug/Common.vbproj.AssemblyReference.cache differ diff --git a/Common/obj/Debug/EDOKALib.Common.dll b/Common/obj/Debug/EDOKALib.Common.dll index 789b226..e11b96e 100644 Binary files a/Common/obj/Debug/EDOKALib.Common.dll and b/Common/obj/Debug/EDOKALib.Common.dll differ diff --git a/Common/obj/Debug/EDOKALib.Common.pdb b/Common/obj/Debug/EDOKALib.Common.pdb index adeaed5..b53e8e6 100644 Binary files a/Common/obj/Debug/EDOKALib.Common.pdb and b/Common/obj/Debug/EDOKALib.Common.pdb differ diff --git a/DataAccess/bin/EDOKALib.Common.dll b/DataAccess/bin/EDOKALib.Common.dll index 789b226..e11b96e 100644 Binary files a/DataAccess/bin/EDOKALib.Common.dll and b/DataAccess/bin/EDOKALib.Common.dll differ diff --git a/DataAccess/bin/EDOKALib.Common.pdb b/DataAccess/bin/EDOKALib.Common.pdb index adeaed5..b53e8e6 100644 Binary files a/DataAccess/bin/EDOKALib.Common.pdb and b/DataAccess/bin/EDOKALib.Common.pdb differ diff --git a/DataAccess/bin/EDOKALib.DataAccess.dll b/DataAccess/bin/EDOKALib.DataAccess.dll index 912df00..c44131a 100644 Binary files a/DataAccess/bin/EDOKALib.DataAccess.dll and b/DataAccess/bin/EDOKALib.DataAccess.dll differ diff --git a/DataAccess/bin/EDOKALib.DataAccess.pdb b/DataAccess/bin/EDOKALib.DataAccess.pdb index 6f3b0e4..278b6e3 100644 Binary files a/DataAccess/bin/EDOKALib.DataAccess.pdb and b/DataAccess/bin/EDOKALib.DataAccess.pdb differ diff --git a/DataAccess/obj/Debug/DataAccess.vbproj.AssemblyReference.cache b/DataAccess/obj/Debug/DataAccess.vbproj.AssemblyReference.cache index 75c6e18..9a3d03e 100644 Binary files a/DataAccess/obj/Debug/DataAccess.vbproj.AssemblyReference.cache and b/DataAccess/obj/Debug/DataAccess.vbproj.AssemblyReference.cache differ diff --git a/DataAccess/obj/Debug/EDOKALib.DataAccess.dll b/DataAccess/obj/Debug/EDOKALib.DataAccess.dll index 912df00..c44131a 100644 Binary files a/DataAccess/obj/Debug/EDOKALib.DataAccess.dll and b/DataAccess/obj/Debug/EDOKALib.DataAccess.dll differ diff --git a/DataAccess/obj/Debug/EDOKALib.DataAccess.pdb b/DataAccess/obj/Debug/EDOKALib.DataAccess.pdb index 6f3b0e4..278b6e3 100644 Binary files a/DataAccess/obj/Debug/EDOKALib.DataAccess.pdb and b/DataAccess/obj/Debug/EDOKALib.DataAccess.pdb differ diff --git a/EDOKA/Dokumentmanagement/frmMultiDelete.Designer.vb b/EDOKA/Dokumentmanagement/frmMultiDelete.Designer.vb index ec5b01d..38f6289 100644 --- a/EDOKA/Dokumentmanagement/frmMultiDelete.Designer.vb +++ b/EDOKA/Dokumentmanagement/frmMultiDelete.Designer.vb @@ -38,6 +38,8 @@ Partial Class frmMultiDelete Me.Label7 = New System.Windows.Forms.Label() Me.Label8 = New System.Windows.Forms.Label() Me.Label9 = New System.Windows.Forms.Label() + Me.cbboxGrund = New System.Windows.Forms.ComboBox() + Me.Label10 = New System.Windows.Forms.Label() CType(Me.DokList, System.ComponentModel.ISupportInitialize).BeginInit() Me.GroupBox1.SuspendLayout() Me.GroupBox2.SuspendLayout() @@ -85,6 +87,8 @@ Partial Class frmMultiDelete ' 'GroupBox1 ' + Me.GroupBox1.Controls.Add(Me.Label10) + Me.GroupBox1.Controls.Add(Me.cbboxGrund) Me.GroupBox1.Controls.Add(Me.txtGrund) Me.GroupBox1.Dock = System.Windows.Forms.DockStyle.Top Me.GroupBox1.Location = New System.Drawing.Point(0, 0) @@ -96,11 +100,10 @@ Partial Class frmMultiDelete ' 'txtGrund ' - Me.txtGrund.Dock = System.Windows.Forms.DockStyle.Fill - Me.txtGrund.Location = New System.Drawing.Point(3, 16) + Me.txtGrund.Location = New System.Drawing.Point(3, 50) Me.txtGrund.Multiline = True Me.txtGrund.Name = "txtGrund" - Me.txtGrund.Size = New System.Drawing.Size(1160, 81) + Me.txtGrund.Size = New System.Drawing.Size(1160, 47) Me.txtGrund.TabIndex = 0 ' 'GroupBox2 @@ -195,6 +198,23 @@ Partial Class frmMultiDelete Me.Label9.TabIndex = 39 Me.Label9.Text = "Legende" ' + 'cbboxGrund + ' + Me.cbboxGrund.FormattingEnabled = True + Me.cbboxGrund.Location = New System.Drawing.Point(112, 20) + Me.cbboxGrund.Name = "cbboxGrund" + Me.cbboxGrund.Size = New System.Drawing.Size(1042, 21) + Me.cbboxGrund.TabIndex = 1 + ' + 'Label10 + ' + Me.Label10.AutoSize = True + Me.Label10.Location = New System.Drawing.Point(6, 23) + Me.Label10.Name = "Label10" + Me.Label10.Size = New System.Drawing.Size(88, 13) + Me.Label10.TabIndex = 2 + Me.Label10.Text = "Standard-Gründe" + ' 'frmMultiDelete ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -213,6 +233,7 @@ Partial Class frmMultiDelete Me.Controls.Add(Me.GroupBox1) Me.Controls.Add(Me.btnOK) Me.Controls.Add(Me.btnCancel) + Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) Me.Name = "frmMultiDelete" Me.Text = "Mehrfach-Löschung / Aufhebung" CType(Me.DokList, System.ComponentModel.ISupportInitialize).EndInit() @@ -239,4 +260,6 @@ Partial Class frmMultiDelete Friend WithEvents Label7 As Label Friend WithEvents Label8 As Label Friend WithEvents Label9 As Label + Friend WithEvents Label10 As Label + Friend WithEvents cbboxGrund As ComboBox End Class diff --git a/EDOKA/Dokumentmanagement/frmMultiDelete.resx b/EDOKA/Dokumentmanagement/frmMultiDelete.resx index 1b928a8..c58c984 100644 --- a/EDOKA/Dokumentmanagement/frmMultiDelete.resx +++ b/EDOKA/Dokumentmanagement/frmMultiDelete.resx @@ -157,4 +157,21 @@ <?xml version="1.0"?><Blob><Styles type="C1.Win.C1TrueDBGrid.Design.ContextWrapper"><Data>HighlightRow{ForeColor:HighlightText;BackColor:Highlight;}Style8{}Style7{}Style2{}EvenRow{BackColor:White;}Normal{BackColor:Control;}RecordSelector{AlignImage:Center;}Inactive{ForeColor:InactiveCaptionText;BackColor:InactiveCaption;}OddRow{BackColor:224, 224, 224;}Style14{}Footer{}Heading{ForeColor:ControlText;Border:Raised,,1, 1, 1, 1;AlignVert:Center;BackColor:Control;Wrap:True;}Style5{}Editor{}Style10{AlignHorz:Near;}Style3{}Selected{ForeColor:HighlightText;BackColor:Highlight;}Style15{}Style27{}Style26{}Style13{}Style12{}Style11{}Style4{}Style9{}Group{Border:None,,0, 0, 0, 0;AlignVert:Center;BackColor:ControlDark;}Style1{}Caption{AlignHorz:Center;}Style6{}FilterBar{BackColor:255, 255, 192;}</Data></Styles><Splits><C1.Win.C1TrueDBGrid.MergeView Name="" AlternatingRowStyle="True" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" FetchRowStyles="True" FilterBar="True" MarqueeStyle="DottedCellBorder" RecordSelectorWidth="17" DefRecSelWidth="17" VerticalScrollGroup="1" HorizontalScrollGroup="1"><Height>288</Height><CaptionStyle parent="Heading" me="Style10" /><EditorStyle parent="Editor" me="Style2" /><EvenRowStyle parent="EvenRow" me="Style8" /><FilterBarStyle parent="FilterBar" me="Style27" /><FooterStyle parent="Footer" me="Style4" /><GroupStyle parent="Group" me="Style12" /><HeadingStyle parent="Heading" me="Style3" /><HighLightRowStyle parent="HighlightRow" me="Style7" /><InactiveStyle parent="Inactive" me="Style6" /><OddRowStyle parent="OddRow" me="Style9" /><RecordSelectorStyle parent="RecordSelector" me="Style11" /><SelectedStyle parent="Selected" me="Style5" /><Style parent="Normal" me="Style1" /><ClientRect>0, 0, 1158, 288</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="Caption" me="Group" /></NamedStyles><vertSplits>1</vertSplits><horzSplits>1</horzSplits><Layout>Modified</Layout><DefaultRecSelWidth>17</DefaultRecSelWidth><ClientArea>0, 0, 1158, 288</ClientArea><PrintPageHeaderStyle parent="" me="Style14" /><PrintPageFooterStyle parent="" me="Style15" /></Blob> + + + AAABAAEAICAEAAAAAADoAgAAFgAAACgAAAAgAAAAQAAAAAEABAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAACAAACAAAAAgIAAgAAAAIAAgACAgAAAgICAAMDAwAAAAP8AAP8AAAD//wD/AAAA/wD/AP// + AAD///8AAAAAAAcAAAAAAAAAAAAAAAAAAAAHiAAAAAAAAAAAAAAAAAAAf/+IAAAAAAAAAAAAAAAAAH// + /4gAAAAAAAAAAAAAAAf/////iAAAAAAAAAAAAAAH//////+IAAAAAAAAAAAAf//////3/4gAAAAAAAAA + AH///////4f/gAAAAAAAAAf/////9w//iAAAAAAAAAAH/4f////3D/gAAAAAAAAAf///h//3//iAiAAA + AAAAAH/4f////4f/gP+IAAAAAAf///h//3//iA///4gAAAAH9//////4f/gP/4f/iAAAf4VX//9w//iA + ////h/+AAH91VVf//3D/gP+I///4AAf/VV9VV///iA//iIiP+AAHf4dV/1d4//gP94iIiIAAAAd/91VX + d3iA//iIiI+AAAAH93/3d3d/gP//iHiIAAAAf4Inf/h3iA////iI+AAAAH8ij/d/+PgP//h//4AAAAf4 + Io//d3+A////+H+AAAAH8iKP9//3cP//h//4AAAAf/IiL/d////3D/+H+AAAAHf4Iij/93////cP/4AA + AAAAd/gi//83f///9w+AAAAAAAB3////M/d////4AAAAAAAAAHf//z+AB3//+AAAAAAAAAAAd///gAAH + f4AAAAAAAAAAAAB3+AAAAAdwAAAAAAAAAAAAAHcAAAAAAAAAAAD/j////4P///8A////AD///gAP//4A + A//8AAD//AAA//gAAf/4AAD/8AAAP/AAAA/gAAAD4AAAAMAAAADAAAABgAAAAYAAAAPgAAAD4AAAB8AA + AAfAAAAPgAAAD4AAAB8AAAAfAAAAP8AAAD/wAAB//ACAf/8A4P//wfj///H//w== + + \ No newline at end of file diff --git a/EDOKA/Dokumentmanagement/frmMultiDelete.vb b/EDOKA/Dokumentmanagement/frmMultiDelete.vb index 2f95f2b..86e44ef 100644 --- a/EDOKA/Dokumentmanagement/frmMultiDelete.vb +++ b/EDOKA/Dokumentmanagement/frmMultiDelete.vb @@ -54,8 +54,16 @@ Public Class frmMultiDelete End Sub Private Sub frmMultiDelete_Load(sender As Object, e As EventArgs) Handles MyBase.Load + Cursor = Cursors.WaitCursor dt.Rows.Clear() dt.Columns.Clear() + Me.cbboxGrund.Items.Clear() + Dim gruende As DataTable = Get_Grund() + For Each r As DataRow In gruende.Rows + cbboxGrund.Items.Add(r("grund").ToString) + Next + cbboxGrund.SelectedIndex = 0 + Me.txtGrund.Text = "" dt.TableName = "DoksToDelete" dt.Columns.Add("Funktion") @@ -91,14 +99,15 @@ Public Class frmMultiDelete Me.DokList.Splits(0).DisplayColumns(6).Width = 0 Me.DokList.Splits(0).DisplayColumns(7).Width = 0 - Label1.BackColor = Color.GreenYellow + Label1.BackColor = Color.LightGray Label5.Text = "Nicht abgeschlossenes Dokument löschen" - Label4.BackColor = Color.LightPink - Label8.Text = "Fehlende Berechtigungen um das Dokument zu löschen/aufheben" Label2.BackColor = Color.LightGreen Label6.Text = "Abgeschlossenes Dokument löschen" Label3.BackColor = Color.LightSeaGreen Label7.Text = "Abgeschlossenes Dokument aufheben" + Label4.BackColor = Color.LightPink + Label8.Text = "Fehlende Berechtigungen um das Dokument zu löschen/aufheben" + Cursor = Cursors.Default End Sub Private Function check_dok(ByVal dokumenttypnr As String, partnernr As String, dokumentid As String, vertraulich As Integer, ByVal verantwortlich As Integer, aktivesdokument As Integer) As String @@ -145,6 +154,26 @@ Public Class frmMultiDelete End Try End Function + Private Function Get_Grund() As DataTable + Dim scmCmdToExecute As SqlCommand = New SqlCommand() + scmCmdToExecute.CommandText = "dbo.sp_get_grund" + scmCmdToExecute.CommandType = CommandType.StoredProcedure + Dim dtToReturn As DataTable = New DataTable() + Dim sdaAdapter As SqlDataAdapter = New SqlDataAdapter(scmCmdToExecute) + Try + scmCmdToExecute.Connection = conn.scoDBConnection + scmCmdToExecute.Parameters.Add(New SqlParameter("@grundtyp", SqlDbType.Int, 4, ParameterDirection.Input, True, 10, 0, "", DataRowVersion.Proposed, 99)) + sdaAdapter.Fill(dtToReturn) + Return dtToReturn + Catch ex As Exception + Finally + scmCmdToExecute.Dispose() + sdaAdapter.Dispose() + dtToReturn.Dispose() + End Try + End Function + + Private Function get_contextmenu_ber(ByVal dokumentid As String) As DataTable Dim scmCmdToExecute As SqlCommand = New SqlCommand() scmCmdToExecute.CommandText = "dbo.sp_contextmenu" @@ -199,7 +228,7 @@ Public Class frmMultiDelete e.CellStyle.BackColor = Color.LightPink End If If Me.DokList.Columns(0).CellValue(e.Row).ToString = "Löschen" Then - e.CellStyle.BackColor = Color.GreenYellow + e.CellStyle.BackColor = Color.LightGray End If If Me.DokList.Columns(0).CellValue(e.Row).ToString = "Löschung" Then e.CellStyle.BackColor = Color.LightGreen @@ -211,4 +240,8 @@ Public Class frmMultiDelete End Try End Sub + + Private Sub cbboxGrund_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cbboxGrund.SelectedIndexChanged + Me.txtGrund.Text = Me.cbboxGrund.Text + End Sub End Class \ No newline at end of file diff --git a/EDOKA/Trefferlisten/frmTrefferliste.resx b/EDOKA/Trefferlisten/frmTrefferliste.resx index f3f76ed..149b65a 100644 --- a/EDOKA/Trefferlisten/frmTrefferliste.resx +++ b/EDOKA/Trefferlisten/frmTrefferliste.resx @@ -125,7 +125,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACg - EwAAAk1TRnQBSQFMAgEBEAEAATwBCQE8AQkBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + EwAAAk1TRnQBSQFMAgEBEAEAAXQBCQF0AQkBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAAVADAAEBAQABCAYAARQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -264,7 +264,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACA - RAAAAk1TRnQBSQFMAgEBSQEAATwBCQE8AQkBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + RAAAAk1TRnQBSQFMAgEBSQEAAXQBCQF0AQkBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAATABAQIAAQEBAAEIBgABTBgAAYACAAGAAwACgAEAAYADAAGAAQABgAEAAoACAAPAAQABwAHc AcABAAHwAcoBpgEAATMFAAEzAQABMwEAATMBAAIzAgADFgEAAxwBAAMiAQADKQEAA1UBAANNAQADQgEA AzkBAAGAAXwB/wEAAlAB/wEAAZMBAAHWAQAB/wHsAcwBAAHGAdYB7wEAAdYC5wEAAZABqQGtAgAB/wEz @@ -598,7 +598,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADA - NQAAAk1TRnQBSQFMAgEBNAEAATwBCQE8AQkBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + NQAAAk1TRnQBSQFMAgEBNAEAAXQBCQF0AQkBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAAeADAAEBAQABCAYAATgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -876,7 +876,7 @@ - <?xml version="1.0"?><Blob><Styles type="C1.Win.C1TrueDBGrid.Design.ContextWrapper"><Data>HighlightRow{ForeColor:HighlightText;BackColor:Highlight;}Style8{}Style7{}EvenRow{BackColor:Aqua;}Normal{BackColor:White;}RecordSelector{AlignImage:Center;}OddRow{}Style14{}Footer{}FilterBar{}Heading{AlignVert:Center;Border:Raised,,1, 1, 1, 1;ForeColor:ControlText;BackColor:Control;Wrap:True;}Style5{}Editor{}Style10{AlignHorz:Near;}Style3{}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 Name="" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" MarqueeStyle="DottedCellBorder" RecordSelectorWidth="17" DefRecSelWidth="17" VerticalScrollGroup="1" HorizontalScrollGroup="1"><Height>190</Height><CaptionStyle parent="Style2" me="Style10" /><EditorStyle parent="Editor" me="Style5" /><EvenRowStyle parent="EvenRow" me="Style8" /><FilterBarStyle parent="FilterBar" me="Style13" /><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, 708, 190</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="Caption" me="Group" /></NamedStyles><vertSplits>1</vertSplits><horzSplits>1</horzSplits><Layout>None</Layout><DefaultRecSelWidth>17</DefaultRecSelWidth><ClientArea>0, 0, 708, 190</ClientArea><PrintPageHeaderStyle parent="" me="Style14" /><PrintPageFooterStyle parent="" me="Style15" /></Blob> + <?xml version="1.0"?><Blob><Styles type="C1.Win.C1TrueDBGrid.Design.ContextWrapper"><Data>HighlightRow{ForeColor:HighlightText;BackColor:Highlight;}Style8{}Style7{}Style2{}EvenRow{BackColor:Aqua;}Normal{BackColor:White;}RecordSelector{AlignImage:Center;}Inactive{ForeColor:InactiveCaptionText;BackColor:InactiveCaption;}OddRow{}Style14{}Footer{}Heading{ForeColor:ControlText;Border:Raised,,1, 1, 1, 1;AlignVert:Center;BackColor:Control;Wrap:True;}Style5{}Editor{}Style10{AlignHorz:Near;}Style3{}Selected{ForeColor:HighlightText;BackColor:Highlight;}Style15{}Style13{}Style12{}Style11{}Style4{}Style9{}Group{Border:None,,0, 0, 0, 0;AlignVert:Center;BackColor:ControlDark;}Style1{}Caption{AlignHorz:Center;}Style6{}FilterBar{}</Data></Styles><Splits><C1.Win.C1TrueDBGrid.MergeView Name="" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" MarqueeStyle="DottedCellBorder" RecordSelectorWidth="17" DefRecSelWidth="17" VerticalScrollGroup="1" HorizontalScrollGroup="1"><Height>190</Height><CaptionStyle parent="Style2" me="Style10" /><EditorStyle parent="Editor" me="Style5" /><EvenRowStyle parent="EvenRow" me="Style8" /><FilterBarStyle parent="FilterBar" me="Style13" /><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, 708, 190</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="Caption" me="Group" /></NamedStyles><vertSplits>1</vertSplits><horzSplits>1</horzSplits><Layout>None</Layout><DefaultRecSelWidth>17</DefaultRecSelWidth><ClientArea>0, 0, 708, 190</ClientArea><PrintPageHeaderStyle parent="" me="Style14" /><PrintPageFooterStyle parent="" me="Style15" /></Blob> @@ -915,7 +915,7 @@ - <?xml version="1.0"?><Blob><Styles type="C1.Win.C1TrueDBGrid.Design.ContextWrapper"><Data>HighlightRow{ForeColor:HighlightText;BackColor:Highlight;}Style8{}Style7{}EvenRow{BackColor:White;}Normal{BackColor:224, 224, 224;}RecordSelector{AlignImage:Center;}OddRow{BackColor:224, 224, 224;}Style14{}Footer{}FilterBar{BackColor:255, 255, 192;}Heading{ForeColor:ControlText;Border:Raised,,1, 1, 1, 1;AlignVert:Center;BackColor:Control;Wrap:True;}Style5{}Editor{}Style10{AlignHorz:Near;}Style3{}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 Name="" AlternatingRowStyle="True" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" MarqueeStyle="DottedCellBorder" RecordSelectorWidth="17" DefRecSelWidth="17" VerticalScrollGroup="1" HorizontalScrollGroup="1"><Height>192</Height><CaptionStyle parent="Style2" me="Style10" /><EditorStyle parent="Editor" me="Style5" /><EvenRowStyle parent="EvenRow" me="Style8" /><FilterBarStyle parent="FilterBar" me="Style13" /><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, 359, 192</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="Caption" me="Group" /></NamedStyles><vertSplits>1</vertSplits><horzSplits>1</horzSplits><Layout>None</Layout><DefaultRecSelWidth>17</DefaultRecSelWidth><ClientArea>0, 0, 359, 194</ClientArea><PrintPageHeaderStyle parent="" me="Style14" /><PrintPageFooterStyle parent="" me="Style15" /></Blob> + <?xml version="1.0"?><Blob><Styles type="C1.Win.C1TrueDBGrid.Design.ContextWrapper"><Data>HighlightRow{ForeColor:HighlightText;BackColor:Highlight;}Style8{}Style7{}Style2{}EvenRow{BackColor:White;}Normal{BackColor:224, 224, 224;}RecordSelector{AlignImage:Center;}Inactive{ForeColor:InactiveCaptionText;BackColor:InactiveCaption;}OddRow{BackColor:224, 224, 224;}Style14{}Footer{}Heading{AlignVert:Center;Border:Raised,,1, 1, 1, 1;Wrap:True;BackColor:Control;ForeColor:ControlText;}Style5{}Editor{}Style10{AlignHorz:Near;}Style3{}Selected{ForeColor:HighlightText;BackColor:Highlight;}Style15{}Style13{}Style12{}Style11{}Style4{}Style9{}Group{Border:None,,0, 0, 0, 0;AlignVert:Center;BackColor:ControlDark;}Style1{}Caption{AlignHorz:Center;}Style6{}FilterBar{BackColor:255, 255, 192;}</Data></Styles><Splits><C1.Win.C1TrueDBGrid.MergeView Name="" AlternatingRowStyle="True" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" MarqueeStyle="DottedCellBorder" RecordSelectorWidth="17" DefRecSelWidth="17" VerticalScrollGroup="1" HorizontalScrollGroup="1"><Height>192</Height><CaptionStyle parent="Style2" me="Style10" /><EditorStyle parent="Editor" me="Style5" /><EvenRowStyle parent="EvenRow" me="Style8" /><FilterBarStyle parent="FilterBar" me="Style13" /><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, 359, 192</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="Caption" me="Group" /></NamedStyles><vertSplits>1</vertSplits><horzSplits>1</horzSplits><Layout>None</Layout><DefaultRecSelWidth>17</DefaultRecSelWidth><ClientArea>0, 0, 359, 194</ClientArea><PrintPageHeaderStyle parent="" me="Style14" /><PrintPageFooterStyle parent="" me="Style15" /></Blob> 837, 54 @@ -957,7 +957,7 @@ - <?xml version="1.0"?><Blob><Styles type="C1.Win.C1TrueDBGrid.Design.ContextWrapper"><Data>HighlightRow{ForeColor:HighlightText;BackColor:Highlight;}Style19{}Style18{}EvenRow{BackColor:White;}Normal{BackColor:White;}RecordSelector{AlignImage:Center;}OddRow{BackColor:224, 224, 224;}Style14{}Footer{}FilterBar{BackColor:255, 255, 192;}Style24{}Heading{ForeColor:ControlText;Border:Flat,ControlDark,0, 1, 0, 1;AlignVert:Center;BackColor:Control;Wrap:True;}Editor{}Style17{}Style16{}Selected{ForeColor:HighlightText;BackColor:Highlight;}Style15{}Style20{}Style26{}Style25{}Style13{}Group{Border:None,,0, 0, 0, 0;AlignVert:Center;BackColor:ControlDark;}Style23{AlignHorz:Near;}Style22{}Style21{}Style1{}Caption{AlignHorz:Center;}Style2{}Inactive{ForeColor:InactiveCaptionText;BackColor:InactiveCaption;}</Data></Styles><Splits><C1.Win.C1TrueDBGrid.HierarchicalView Name="" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" MarqueeStyle="DottedCellBorder" RecordSelectorWidth="17" DefRecSelWidth="17" VerticalScrollGroup="1" HorizontalScrollGroup="1"><Height>192</Height><CaptionStyle parent="Heading" me="Style23" /><EditorStyle parent="Editor" me="Style15" /><EvenRowStyle parent="EvenRow" me="Style21" /><FilterBarStyle parent="FilterBar" me="Style26" /><FooterStyle parent="Footer" me="Style17" /><GroupStyle parent="Group" me="Style25" /><HeadingStyle parent="Heading" me="Style16" /><HighLightRowStyle parent="HighlightRow" me="Style20" /><InactiveStyle parent="Inactive" me="Style19" /><OddRowStyle parent="OddRow" me="Style22" /><RecordSelectorStyle parent="RecordSelector" me="Style24" /><SelectedStyle parent="Selected" me="Style18" /><Style parent="Normal" me="Style14" /><ClientRect>0, 0, 332, 192</ClientRect><BorderSide>0</BorderSide></C1.Win.C1TrueDBGrid.HierarchicalView></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="Caption" me="Group" /></NamedStyles><vertSplits>1</vertSplits><horzSplits>1</horzSplits><Layout>None</Layout><DefaultRecSelWidth>17</DefaultRecSelWidth><ClientArea>0, 0, 334, 194</ClientArea><PrintPageHeaderStyle parent="" me="Style1" /><PrintPageFooterStyle parent="" me="Style2" /></Blob> + <?xml version="1.0"?><Blob><Styles type="C1.Win.C1TrueDBGrid.Design.ContextWrapper"><Data>HighlightRow{ForeColor:HighlightText;BackColor:Highlight;}Style19{}Style18{}EvenRow{BackColor:White;}Normal{BackColor:White;}RecordSelector{AlignImage:Center;}Inactive{ForeColor:InactiveCaptionText;BackColor:InactiveCaption;}OddRow{BackColor:224, 224, 224;}Style14{}Footer{}Style24{}Heading{AlignVert:Center;Border:Flat,ControlDark,0, 1, 0, 1;Wrap:True;BackColor:Control;ForeColor:ControlText;}Editor{}Style17{}Style16{}Selected{ForeColor:HighlightText;BackColor:Highlight;}Style15{}Style20{}Style26{}Style25{}Style13{}Group{Border:None,,0, 0, 0, 0;AlignVert:Center;BackColor:ControlDark;}Style23{AlignHorz:Near;}Style22{}Style21{}Style1{}Caption{AlignHorz:Center;}Style2{}FilterBar{BackColor:255, 255, 192;}</Data></Styles><Splits><C1.Win.C1TrueDBGrid.HierarchicalView Name="" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" MarqueeStyle="DottedCellBorder" RecordSelectorWidth="17" DefRecSelWidth="17" VerticalScrollGroup="1" HorizontalScrollGroup="1"><Height>192</Height><CaptionStyle parent="Heading" me="Style23" /><EditorStyle parent="Editor" me="Style15" /><EvenRowStyle parent="EvenRow" me="Style21" /><FilterBarStyle parent="FilterBar" me="Style26" /><FooterStyle parent="Footer" me="Style17" /><GroupStyle parent="Group" me="Style25" /><HeadingStyle parent="Heading" me="Style16" /><HighLightRowStyle parent="HighlightRow" me="Style20" /><InactiveStyle parent="Inactive" me="Style19" /><OddRowStyle parent="OddRow" me="Style22" /><RecordSelectorStyle parent="RecordSelector" me="Style24" /><SelectedStyle parent="Selected" me="Style18" /><Style parent="Normal" me="Style14" /><ClientRect>0, 0, 332, 192</ClientRect><BorderSide>0</BorderSide></C1.Win.C1TrueDBGrid.HierarchicalView></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="Caption" me="Group" /></NamedStyles><vertSplits>1</vertSplits><horzSplits>1</horzSplits><Layout>None</Layout><DefaultRecSelWidth>17</DefaultRecSelWidth><ClientArea>0, 0, 334, 194</ClientArea><PrintPageHeaderStyle parent="" me="Style1" /><PrintPageFooterStyle parent="" me="Style2" /></Blob> 386, 91 @@ -999,7 +999,7 @@ - <?xml version="1.0"?><Blob><Styles type="C1.Win.C1TrueDBGrid.Design.ContextWrapper"><Data>HighlightRow{ForeColor:HighlightText;BackColor:Highlight;}Style8{}Style7{}EvenRow{BackColor:White;}Normal{BackColor:224, 224, 224;}RecordSelector{AlignImage:Center;}OddRow{BackColor:224, 224, 224;}Style14{}Footer{}FilterBar{BackColor:255, 255, 192;}Heading{ForeColor:ControlText;Border:Raised,,1, 1, 1, 1;AlignVert:Center;BackColor:Control;Wrap:True;}Style5{}Editor{}Style10{AlignHorz:Near;}Style3{}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 Name="" AlternatingRowStyle="True" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" MarqueeStyle="DottedCellBorder" RecordSelectorWidth="17" DefRecSelWidth="17" VerticalScrollGroup="1" HorizontalScrollGroup="1"><Height>218</Height><CaptionStyle parent="Style2" me="Style10" /><EditorStyle parent="Editor" me="Style5" /><EvenRowStyle parent="EvenRow" me="Style8" /><FilterBarStyle parent="FilterBar" me="Style13" /><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, 706, 218</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="Caption" me="Group" /></NamedStyles><vertSplits>1</vertSplits><horzSplits>1</horzSplits><Layout>None</Layout><DefaultRecSelWidth>17</DefaultRecSelWidth><ClientArea>0, 0, 706, 220</ClientArea><PrintPageHeaderStyle parent="" me="Style14" /><PrintPageFooterStyle parent="" me="Style15" /></Blob> + <?xml version="1.0"?><Blob><Styles type="C1.Win.C1TrueDBGrid.Design.ContextWrapper"><Data>HighlightRow{ForeColor:HighlightText;BackColor:Highlight;}Style8{}Style7{}Style2{}EvenRow{BackColor:White;}Normal{BackColor:224, 224, 224;}RecordSelector{AlignImage:Center;}Inactive{ForeColor:InactiveCaptionText;BackColor:InactiveCaption;}OddRow{BackColor:224, 224, 224;}Style14{}Footer{}Heading{AlignVert:Center;Border:Raised,,1, 1, 1, 1;Wrap:True;BackColor:Control;ForeColor:ControlText;}Style5{}Editor{}Style10{AlignHorz:Near;}Style3{}Selected{ForeColor:HighlightText;BackColor:Highlight;}Style15{}Style13{}Style12{}Style11{}Style4{}Style9{}Group{Border:None,,0, 0, 0, 0;AlignVert:Center;BackColor:ControlDark;}Style1{}Caption{AlignHorz:Center;}Style6{}FilterBar{BackColor:255, 255, 192;}</Data></Styles><Splits><C1.Win.C1TrueDBGrid.MergeView Name="" AlternatingRowStyle="True" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" MarqueeStyle="DottedCellBorder" RecordSelectorWidth="17" DefRecSelWidth="17" VerticalScrollGroup="1" HorizontalScrollGroup="1"><Height>218</Height><CaptionStyle parent="Style2" me="Style10" /><EditorStyle parent="Editor" me="Style5" /><EvenRowStyle parent="EvenRow" me="Style8" /><FilterBarStyle parent="FilterBar" me="Style13" /><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, 706, 218</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="Caption" me="Group" /></NamedStyles><vertSplits>1</vertSplits><horzSplits>1</horzSplits><Layout>None</Layout><DefaultRecSelWidth>17</DefaultRecSelWidth><ClientArea>0, 0, 706, 220</ClientArea><PrintPageHeaderStyle parent="" me="Style14" /><PrintPageFooterStyle parent="" me="Style15" /></Blob> @@ -1009,7 +1009,7 @@ - <?xml version="1.0"?><Blob><Styles type="C1.Win.C1TrueDBGrid.Design.ContextWrapper"><Data>Style6{}EvenRow{BackColor:White;}Group{Border:None,,0, 0, 0, 0;AlignVert:Center;BackColor:ControlDark;}Style13{}Style9{}OddRow{BackColor:224, 224, 224;}Style1{}Style5{}FilterBar{}Normal{}Selected{ForeColor:HighlightText;BackColor:Highlight;}Style8{}Style2{}Editor{}HighlightRow{ForeColor:HighlightText;BackColor:Highlight;}RecordSelector{AlignImage:Center;}Footer{}Style10{AlignHorz:Near;}Style12{}Style3{}Style7{}Style4{}Caption{AlignHorz:Center;}Heading{AlignVert:Center;Border:Raised,,1, 1, 1, 1;ForeColor:ControlText;BackColor:Control;Wrap:True;}Style11{}Inactive{ForeColor:InactiveCaptionText;BackColor:InactiveCaption;}</Data></Styles><Splits><C1.Win.C1TrueDBGrid.DropdownView Name="" AlternatingRowStyle="True" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" MarqueeStyle="DottedCellBorder" RecordSelectorWidth="17" DefRecSelWidth="17" RecordSelectors="False" VerticalScrollGroup="1" HorizontalScrollGroup="1"><Height>76</Height><CaptionStyle parent="Style2" me="Style10" /><EditorStyle parent="Editor" me="Style5" /><EvenRowStyle parent="EvenRow" me="Style8" /><FilterBarStyle parent="FilterBar" me="Style13" /><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, 36, 76</ClientRect><BorderSide>0</BorderSide></C1.Win.C1TrueDBGrid.DropdownView></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="Caption" me="Group" /></NamedStyles><vertSplits>1</vertSplits><horzSplits>1</horzSplits><Layout>None</Layout><DefaultRecSelWidth>17</DefaultRecSelWidth><ClientArea>0, 0, 38, 78</ClientArea></Blob> + <?xml version="1.0"?><Blob><Styles type="C1.Win.C1TrueDBGrid.Design.ContextWrapper"><Data>Style6{}Inactive{ForeColor:InactiveCaptionText;BackColor:InactiveCaption;}EvenRow{BackColor:White;}Group{Border:None,,0, 0, 0, 0;AlignVert:Center;BackColor:ControlDark;}Style13{}Style9{}OddRow{BackColor:224, 224, 224;}Style1{}Style5{}FilterBar{}Normal{}Selected{ForeColor:HighlightText;BackColor:Highlight;}Style8{}Editor{}HighlightRow{ForeColor:HighlightText;BackColor:Highlight;}RecordSelector{AlignImage:Center;}Footer{}Style12{}Style3{}Style7{}Style4{}Caption{AlignHorz:Center;}Style11{}Heading{ForeColor:ControlText;Border:Raised,,1, 1, 1, 1;AlignVert:Center;BackColor:Control;Wrap:True;}Style10{AlignHorz:Near;}Style2{}</Data></Styles><Splits><C1.Win.C1TrueDBGrid.DropdownView Name="" AlternatingRowStyle="True" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" MarqueeStyle="DottedCellBorder" RecordSelectorWidth="17" DefRecSelWidth="17" RecordSelectors="False" VerticalScrollGroup="1" HorizontalScrollGroup="1"><Height>76</Height><CaptionStyle parent="Style2" me="Style10" /><EditorStyle parent="Editor" me="Style5" /><EvenRowStyle parent="EvenRow" me="Style8" /><FilterBarStyle parent="FilterBar" me="Style13" /><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, 36, 76</ClientRect><BorderSide>0</BorderSide></C1.Win.C1TrueDBGrid.DropdownView></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="Caption" me="Group" /></NamedStyles><vertSplits>1</vertSplits><horzSplits>1</horzSplits><Layout>None</Layout><DefaultRecSelWidth>17</DefaultRecSelWidth><ClientArea>0, 0, 38, 78</ClientArea></Blob> 140, 91 @@ -1051,7 +1051,7 @@ - <?xml version="1.0"?><Blob><Styles type="C1.Win.C1TrueDBGrid.Design.ContextWrapper"><Data>HighlightRow{ForeColor:HighlightText;BackColor:Highlight;}Style8{}Style7{}EvenRow{BackColor:White;}Normal{BackColor:224, 224, 224;}RecordSelector{AlignImage:Center;}OddRow{BackColor:224, 224, 224;}Style14{}Footer{}FilterBar{BackColor:255, 255, 192;}Heading{AlignVert:Center;Border:Raised,,1, 1, 1, 1;ForeColor:ControlText;BackColor:Control;Wrap:True;}Style5{}Editor{}Style10{AlignHorz:Near;}Style3{}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 Name="" AlternatingRowStyle="True" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" MarqueeStyle="DottedCellBorder" RecordSelectorWidth="17" DefRecSelWidth="17" VerticalScrollGroup="1" HorizontalScrollGroup="1"><Height>218</Height><CaptionStyle parent="Style2" me="Style10" /><EditorStyle parent="Editor" me="Style5" /><EvenRowStyle parent="EvenRow" me="Style8" /><FilterBarStyle parent="FilterBar" me="Style13" /><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, 706, 218</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="Caption" me="Group" /></NamedStyles><vertSplits>1</vertSplits><horzSplits>1</horzSplits><Layout>None</Layout><DefaultRecSelWidth>17</DefaultRecSelWidth><ClientArea>0, 0, 706, 220</ClientArea><PrintPageHeaderStyle parent="" me="Style14" /><PrintPageFooterStyle parent="" me="Style15" /></Blob> + <?xml version="1.0"?><Blob><Styles type="C1.Win.C1TrueDBGrid.Design.ContextWrapper"><Data>HighlightRow{ForeColor:HighlightText;BackColor:Highlight;}Style8{}Style7{}Style2{}EvenRow{BackColor:White;}Normal{BackColor:224, 224, 224;}RecordSelector{AlignImage:Center;}Inactive{ForeColor:InactiveCaptionText;BackColor:InactiveCaption;}OddRow{BackColor:224, 224, 224;}Style14{}Footer{}Heading{ForeColor:ControlText;Border:Raised,,1, 1, 1, 1;AlignVert:Center;BackColor:Control;Wrap:True;}Style5{}Editor{}Style10{AlignHorz:Near;}Style3{}Selected{ForeColor:HighlightText;BackColor:Highlight;}Style15{}Style13{}Style12{}Style11{}Style4{}Style9{}Group{Border:None,,0, 0, 0, 0;AlignVert:Center;BackColor:ControlDark;}Style1{}Caption{AlignHorz:Center;}Style6{}FilterBar{BackColor:255, 255, 192;}</Data></Styles><Splits><C1.Win.C1TrueDBGrid.MergeView Name="" AlternatingRowStyle="True" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" MarqueeStyle="DottedCellBorder" RecordSelectorWidth="17" DefRecSelWidth="17" VerticalScrollGroup="1" HorizontalScrollGroup="1"><Height>218</Height><CaptionStyle parent="Style2" me="Style10" /><EditorStyle parent="Editor" me="Style5" /><EvenRowStyle parent="EvenRow" me="Style8" /><FilterBarStyle parent="FilterBar" me="Style13" /><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, 706, 218</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="Caption" me="Group" /></NamedStyles><vertSplits>1</vertSplits><horzSplits>1</horzSplits><Layout>None</Layout><DefaultRecSelWidth>17</DefaultRecSelWidth><ClientArea>0, 0, 706, 220</ClientArea><PrintPageHeaderStyle parent="" me="Style14" /><PrintPageFooterStyle parent="" me="Style15" /></Blob> 911, 91 @@ -1093,7 +1093,7 @@ - <?xml version="1.0"?><Blob><Styles type="C1.Win.C1TrueDBGrid.Design.ContextWrapper"><Data>HighlightRow{ForeColor:HighlightText;BackColor:Highlight;}Style8{}Style7{}EvenRow{BackColor:White;}Normal{BackColor:224, 224, 224;}RecordSelector{AlignImage:Center;}OddRow{BackColor:224, 224, 224;}Style14{}Footer{}FilterBar{BackColor:255, 255, 192;}Heading{ForeColor:ControlText;Border:Raised,,1, 1, 1, 1;AlignVert:Center;BackColor:Control;Wrap:True;}Style5{}Editor{}Style10{AlignHorz:Near;}Style3{}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 Name="" AlternatingRowStyle="True" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" FetchRowStyles="True" MarqueeStyle="DottedCellBorder" RecordSelectorWidth="17" DefRecSelWidth="17" VerticalScrollGroup="1" HorizontalScrollGroup="1"><Height>218</Height><CaptionStyle parent="Style2" me="Style10" /><EditorStyle parent="Editor" me="Style5" /><EvenRowStyle parent="EvenRow" me="Style8" /><FilterBarStyle parent="FilterBar" me="Style13" /><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, 706, 218</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="Caption" me="Group" /></NamedStyles><vertSplits>1</vertSplits><horzSplits>1</horzSplits><Layout>None</Layout><DefaultRecSelWidth>17</DefaultRecSelWidth><ClientArea>0, 0, 706, 220</ClientArea><PrintPageHeaderStyle parent="" me="Style14" /><PrintPageFooterStyle parent="" me="Style15" /></Blob> + <?xml version="1.0"?><Blob><Styles type="C1.Win.C1TrueDBGrid.Design.ContextWrapper"><Data>HighlightRow{ForeColor:HighlightText;BackColor:Highlight;}Style8{}Style7{}Style2{}EvenRow{BackColor:White;}Normal{BackColor:224, 224, 224;}RecordSelector{AlignImage:Center;}Inactive{ForeColor:InactiveCaptionText;BackColor:InactiveCaption;}OddRow{BackColor:224, 224, 224;}Style14{}Footer{}Heading{AlignVert:Center;Border:Raised,,1, 1, 1, 1;Wrap:True;BackColor:Control;ForeColor:ControlText;}Style5{}Editor{}Style10{AlignHorz:Near;}Style3{}Selected{ForeColor:HighlightText;BackColor:Highlight;}Style15{}Style13{}Style12{}Style11{}Style4{}Style9{}Group{Border:None,,0, 0, 0, 0;AlignVert:Center;BackColor:ControlDark;}Style1{}Caption{AlignHorz:Center;}Style6{}FilterBar{BackColor:255, 255, 192;}</Data></Styles><Splits><C1.Win.C1TrueDBGrid.MergeView Name="" AlternatingRowStyle="True" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" FetchRowStyles="True" MarqueeStyle="DottedCellBorder" RecordSelectorWidth="17" DefRecSelWidth="17" VerticalScrollGroup="1" HorizontalScrollGroup="1"><Height>218</Height><CaptionStyle parent="Style2" me="Style10" /><EditorStyle parent="Editor" me="Style5" /><EvenRowStyle parent="EvenRow" me="Style8" /><FilterBarStyle parent="FilterBar" me="Style13" /><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, 706, 218</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="Caption" me="Group" /></NamedStyles><vertSplits>1</vertSplits><horzSplits>1</horzSplits><Layout>None</Layout><DefaultRecSelWidth>17</DefaultRecSelWidth><ClientArea>0, 0, 706, 220</ClientArea><PrintPageHeaderStyle parent="" me="Style14" /><PrintPageFooterStyle parent="" me="Style15" /></Blob> 1107, 91 @@ -1135,7 +1135,7 @@ - <?xml version="1.0"?><Blob><Styles type="C1.Win.C1TrueDBGrid.Design.ContextWrapper"><Data>HighlightRow{ForeColor:HighlightText;BackColor:Highlight;}Style8{}Style7{}EvenRow{BackColor:White;}Normal{BackColor:224, 224, 224;}RecordSelector{AlignImage:Center;}OddRow{BackColor:224, 224, 224;}Style14{}Footer{}FilterBar{BackColor:255, 255, 192;}Heading{ForeColor:ControlText;Border:Raised,,1, 1, 1, 1;AlignVert:Center;BackColor:Control;Wrap:True;}Style5{}Editor{}Style10{AlignHorz:Near;}Style3{}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 Name="" AlternatingRowStyle="True" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" MarqueeStyle="DottedCellBorder" RecordSelectorWidth="17" DefRecSelWidth="17" VerticalScrollGroup="1" HorizontalScrollGroup="1"><Height>218</Height><CaptionStyle parent="Style2" me="Style10" /><EditorStyle parent="Editor" me="Style5" /><EvenRowStyle parent="EvenRow" me="Style8" /><FilterBarStyle parent="FilterBar" me="Style13" /><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, 706, 218</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="Caption" me="Group" /></NamedStyles><vertSplits>1</vertSplits><horzSplits>1</horzSplits><Layout>None</Layout><DefaultRecSelWidth>17</DefaultRecSelWidth><ClientArea>0, 0, 706, 220</ClientArea><PrintPageHeaderStyle parent="" me="Style14" /><PrintPageFooterStyle parent="" me="Style15" /></Blob> + <?xml version="1.0"?><Blob><Styles type="C1.Win.C1TrueDBGrid.Design.ContextWrapper"><Data>HighlightRow{ForeColor:HighlightText;BackColor:Highlight;}Style8{}Style7{}Style2{}EvenRow{BackColor:White;}Normal{BackColor:224, 224, 224;}RecordSelector{AlignImage:Center;}Inactive{ForeColor:InactiveCaptionText;BackColor:InactiveCaption;}OddRow{BackColor:224, 224, 224;}Style14{}Footer{}Heading{AlignVert:Center;Border:Raised,,1, 1, 1, 1;Wrap:True;BackColor:Control;ForeColor:ControlText;}Style5{}Editor{}Style10{AlignHorz:Near;}Style3{}Selected{ForeColor:HighlightText;BackColor:Highlight;}Style15{}Style13{}Style12{}Style11{}Style4{}Style9{}Group{Border:None,,0, 0, 0, 0;AlignVert:Center;BackColor:ControlDark;}Style1{}Caption{AlignHorz:Center;}Style6{}FilterBar{BackColor:255, 255, 192;}</Data></Styles><Splits><C1.Win.C1TrueDBGrid.MergeView Name="" AlternatingRowStyle="True" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" MarqueeStyle="DottedCellBorder" RecordSelectorWidth="17" DefRecSelWidth="17" VerticalScrollGroup="1" HorizontalScrollGroup="1"><Height>218</Height><CaptionStyle parent="Style2" me="Style10" /><EditorStyle parent="Editor" me="Style5" /><EvenRowStyle parent="EvenRow" me="Style8" /><FilterBarStyle parent="FilterBar" me="Style13" /><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, 706, 218</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="Caption" me="Group" /></NamedStyles><vertSplits>1</vertSplits><horzSplits>1</horzSplits><Layout>None</Layout><DefaultRecSelWidth>17</DefaultRecSelWidth><ClientArea>0, 0, 706, 220</ClientArea><PrintPageHeaderStyle parent="" me="Style14" /><PrintPageFooterStyle parent="" me="Style15" /></Blob> 17, 17 @@ -1177,7 +1177,7 @@ - <?xml version="1.0"?><Blob><Styles type="C1.Win.C1TrueDBGrid.Design.ContextWrapper"><Data>HighlightRow{ForeColor:HighlightText;BackColor:Highlight;}Style8{}Style7{}EvenRow{BackColor:White;}Normal{BackColor:224, 224, 224;}RecordSelector{AlignImage:Center;}OddRow{BackColor:224, 224, 224;}Style14{}Footer{}FilterBar{BackColor:255, 255, 192;}Heading{ForeColor:ControlText;Border:Raised,,1, 1, 1, 1;AlignVert:Center;BackColor:Control;Wrap:True;}Style5{}Editor{}Style10{AlignHorz:Near;}Style3{}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 Name="" AlternatingRowStyle="True" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" MarqueeStyle="DottedCellBorder" RecordSelectorWidth="17" DefRecSelWidth="17" VerticalScrollGroup="1" HorizontalScrollGroup="1"><Height>218</Height><CaptionStyle parent="Style2" me="Style10" /><EditorStyle parent="Editor" me="Style5" /><EvenRowStyle parent="EvenRow" me="Style8" /><FilterBarStyle parent="FilterBar" me="Style13" /><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, 706, 218</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="Caption" me="Group" /></NamedStyles><vertSplits>1</vertSplits><horzSplits>1</horzSplits><Layout>None</Layout><DefaultRecSelWidth>17</DefaultRecSelWidth><ClientArea>0, 0, 706, 220</ClientArea><PrintPageHeaderStyle parent="" me="Style14" /><PrintPageFooterStyle parent="" me="Style15" /></Blob> + <?xml version="1.0"?><Blob><Styles type="C1.Win.C1TrueDBGrid.Design.ContextWrapper"><Data>HighlightRow{ForeColor:HighlightText;BackColor:Highlight;}Style8{}Style7{}Style2{}EvenRow{BackColor:White;}Normal{BackColor:224, 224, 224;}RecordSelector{AlignImage:Center;}Inactive{ForeColor:InactiveCaptionText;BackColor:InactiveCaption;}OddRow{BackColor:224, 224, 224;}Style14{}Footer{}Heading{AlignVert:Center;Border:Raised,,1, 1, 1, 1;Wrap:True;BackColor:Control;ForeColor:ControlText;}Style5{}Editor{}Style10{AlignHorz:Near;}Style3{}Selected{ForeColor:HighlightText;BackColor:Highlight;}Style15{}Style13{}Style12{}Style11{}Style4{}Style9{}Group{Border:None,,0, 0, 0, 0;AlignVert:Center;BackColor:ControlDark;}Style1{}Caption{AlignHorz:Center;}Style6{}FilterBar{BackColor:255, 255, 192;}</Data></Styles><Splits><C1.Win.C1TrueDBGrid.MergeView Name="" AlternatingRowStyle="True" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" MarqueeStyle="DottedCellBorder" RecordSelectorWidth="17" DefRecSelWidth="17" VerticalScrollGroup="1" HorizontalScrollGroup="1"><Height>218</Height><CaptionStyle parent="Style2" me="Style10" /><EditorStyle parent="Editor" me="Style5" /><EvenRowStyle parent="EvenRow" me="Style8" /><FilterBarStyle parent="FilterBar" me="Style13" /><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, 706, 218</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="Caption" me="Group" /></NamedStyles><vertSplits>1</vertSplits><horzSplits>1</horzSplits><Layout>None</Layout><DefaultRecSelWidth>17</DefaultRecSelWidth><ClientArea>0, 0, 706, 220</ClientArea><PrintPageHeaderStyle parent="" me="Style14" /><PrintPageFooterStyle parent="" me="Style15" /></Blob> 263, 91 @@ -1206,7 +1206,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACw - DAAAAk1TRnQBSQFMAgEBBgEAATwBCQE8AQkBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + DAAAAk1TRnQBSQFMAgEBBgEAAXQBCQF0AQkBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -1303,7 +1303,7 @@ - <?xml version="1.0"?><Blob><Styles type="C1.Win.C1TrueDBGrid.Design.ContextWrapper"><Data>HighlightRow{ForeColor:HighlightText;BackColor:Highlight;}Style8{}Style7{}Style2{}EvenRow{BackColor:White;}Normal{BackColor:Control;}RecordSelector{AlignImage:Center;}Inactive{ForeColor:InactiveCaptionText;BackColor:InactiveCaption;}OddRow{BackColor:224, 224, 224;}Style14{}Footer{}Heading{ForeColor:ControlText;Border:Raised,,1, 1, 1, 1;AlignVert:Center;BackColor:Control;Wrap:True;}Style5{}Editor{}Style10{AlignHorz:Near;}Style3{}Selected{ForeColor:HighlightText;BackColor:Highlight;}Style15{}Style27{}Style26{}Style13{}Style12{}Style11{}Style4{}Style9{}Group{Border:None,,0, 0, 0, 0;AlignVert:Center;BackColor:ControlDark;}Style1{}Caption{AlignHorz:Center;}Style6{}FilterBar{BackColor:255, 255, 192;}</Data></Styles><Splits><C1.Win.C1TrueDBGrid.MergeView Name="" AlternatingRowStyle="True" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" FetchRowStyles="True" FilterBar="True" MarqueeStyle="DottedCellBorder" RecordSelectorWidth="17" DefRecSelWidth="17" VerticalScrollGroup="1" HorizontalScrollGroup="1"><Height>271</Height><CaptionStyle parent="Heading" me="Style10" /><EditorStyle parent="Editor" me="Style2" /><EvenRowStyle parent="EvenRow" me="Style8" /><FilterBarStyle parent="FilterBar" me="Style27" /><FooterStyle parent="Footer" me="Style4" /><GroupStyle parent="Group" me="Style12" /><HeadingStyle parent="Heading" me="Style3" /><HighLightRowStyle parent="HighlightRow" me="Style7" /><InactiveStyle parent="Inactive" me="Style6" /><OddRowStyle parent="OddRow" me="Style9" /><RecordSelectorStyle parent="RecordSelector" me="Style11" /><SelectedStyle parent="Selected" me="Style5" /><Style parent="Normal" me="Style1" /><ClientRect>0, 0, 714, 271</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="Caption" me="Group" /></NamedStyles><vertSplits>1</vertSplits><horzSplits>1</horzSplits><Layout>Modified</Layout><DefaultRecSelWidth>17</DefaultRecSelWidth><ClientArea>0, 0, 714, 271</ClientArea><PrintPageHeaderStyle parent="" me="Style14" /><PrintPageFooterStyle parent="" me="Style15" /></Blob> + <?xml version="1.0"?><Blob><Styles type="C1.Win.C1TrueDBGrid.Design.ContextWrapper"><Data>HighlightRow{ForeColor:HighlightText;BackColor:Highlight;}Style8{}Style7{}EvenRow{BackColor:White;}Normal{BackColor:Control;}RecordSelector{AlignImage:Center;}OddRow{BackColor:224, 224, 224;}Style14{}Footer{}FilterBar{BackColor:255, 255, 192;}Heading{AlignVert:Center;Border:Raised,,1, 1, 1, 1;Wrap:True;BackColor:Control;ForeColor:ControlText;}Style5{}Editor{}Style10{AlignHorz:Near;}Style3{}Selected{ForeColor:HighlightText;BackColor:Highlight;}Style15{}Style27{}Style26{}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 Name="" AlternatingRowStyle="True" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" FetchRowStyles="True" FilterBar="True" MarqueeStyle="DottedCellBorder" RecordSelectorWidth="17" DefRecSelWidth="17" VerticalScrollGroup="1" HorizontalScrollGroup="1"><Height>271</Height><CaptionStyle parent="Heading" me="Style10" /><EditorStyle parent="Editor" me="Style2" /><EvenRowStyle parent="EvenRow" me="Style8" /><FilterBarStyle parent="FilterBar" me="Style27" /><FooterStyle parent="Footer" me="Style4" /><GroupStyle parent="Group" me="Style12" /><HeadingStyle parent="Heading" me="Style3" /><HighLightRowStyle parent="HighlightRow" me="Style7" /><InactiveStyle parent="Inactive" me="Style6" /><OddRowStyle parent="OddRow" me="Style9" /><RecordSelectorStyle parent="RecordSelector" me="Style11" /><SelectedStyle parent="Selected" me="Style5" /><Style parent="Normal" me="Style1" /><ClientRect>0, 0, 714, 271</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="Caption" me="Group" /></NamedStyles><vertSplits>1</vertSplits><horzSplits>1</horzSplits><Layout>Modified</Layout><DefaultRecSelWidth>17</DefaultRecSelWidth><ClientArea>0, 0, 714, 271</ClientArea><PrintPageHeaderStyle parent="" me="Style14" /><PrintPageFooterStyle parent="" me="Style15" /></Blob> @@ -1349,7 +1349,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAB0 - CQAAAk1TRnQBSQFMAgEBAwEAATwBCQE8AQkBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CQAAAk1TRnQBSQFMAgEBAwEAAXQBCQF0AQkBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA diff --git a/EDOKA/Trefferlisten/frmTrefferliste.vb b/EDOKA/Trefferlisten/frmTrefferliste.vb index fb3797e..5f9ee47 100644 --- a/EDOKA/Trefferlisten/frmTrefferliste.vb +++ b/EDOKA/Trefferlisten/frmTrefferliste.vb @@ -2518,7 +2518,7 @@ Public Class frmTrefferliste 'mnuDokumenteAufhebenLoeschen ' Me.mnuDokumenteAufhebenLoeschen.Index = 0 - Me.mnuDokumenteAufhebenLoeschen.Text = "Dokumente aufheben / Löschen" + Me.mnuDokumenteAufhebenLoeschen.Text = "Dokumente aufheben / löschen" ' 'frmTrefferliste ' @@ -8662,26 +8662,91 @@ Public Class frmTrefferliste Private Sub ToolStripMenuItem1_Click(sender As Object, e As EventArgs) End Sub - + Dim tmpfiltercollection As New Collection + Dim sortcolumn As String + Dim sortdir As String Private Sub mnuDokumenteAufhebenLoeschen_Click(sender As Object, e As EventArgs) Handles mnuDokumenteAufhebenLoeschen.Click Dim gendokcold As New Collection() Dim i As Integer Dim colRows As C1.Win.C1TrueDBGrid.SelectedRowCollection colRows = Me.DokList.SelectedRows + Dim docname As String = "" + Dim docnamesort As String = "" + docname = DivFnkt.Get_Filename("mdlayout.lyt", "") + sortcolumn = 0 + sortdir = "" + + Me.tmpfiltercollection.Clear() + + For i = 0 To Me.DokList.Columns.Count - 1 + If Me.DokList.Columns(i).SortDirection <> 0 Then + sortcolumn = Me.DokList.Columns(i).Caption + sortdir = Me.DokList.Columns(i).SortDirection + End If + If Me.DokList.Columns(i).FilterText.ToString <> "" Then + Dim fc As New Filterclass + Try + fc.add(Me.DokList.Columns(i).DataField.ToString, Me.DokList.Columns(i).FilterText.ToString) + tmpfiltercollection.Add(New Filterclass(Me.DokList.Columns(i).DataField.ToString, Me.DokList.Columns(i).FilterText.ToString)) + Catch ex As Exception + End Try + End If + Next + 'Me.DokList.SaveLayout(docname) Dim fd As New frmMultiDelete fd.ColRows = colRows fd.dlist = Me.DokList fd.ShowDialog() + Try + Cursor = Cursors.WaitCursor + If PreviewAlleDokumente = True Then AlleDokumente = True Update_Doklist() + AlleDokumente = False + + + + 'Me.DokList.LoadLayout(docname) + + For i = 1 To Me.tmpfiltercollection.Count + Dim fc As New Filterclass + fc = Me.tmpfiltercollection.Item(i) + Dim ii As Integer + For ii = 0 To Me.DokList.Columns.Count - 1 + If Me.DokList.Columns(ii).DataField.ToString = fc.Columname Then + Me.DokList.Columns(ii).FilterText = fc.FilterValue + Exit For + End If + Next + Next + If sortdir <> "" And sortcolumn <> "" Then + If sortdir = 1 Then + DokList.DataSource.defaultview.sort = sortcolumn + " asc" + End If + If sortdir = 2 Then + DokList.DataSource.defaultview.sort = sortcolumn + " desc" + End If + DokList.Columns(sortcolumn).SortDirection = C1.Win.C1TrueDBGrid.SortDirEnum.Ascending + + End If + + + DokList.ContextMenu = ContextMenu1 + Cursor = Cursors.WaitCursor + Catch ex As Exception + Cursor = Cursors.Default + End Try End Sub + + + #End Region End Class diff --git a/EDOKA/Utils/Globals.vb b/EDOKA/Utils/Globals.vb index 3545e83..e2868d7 100644 --- a/EDOKA/Utils/Globals.vb +++ b/EDOKA/Utils/Globals.vb @@ -17,7 +17,7 @@ Module Globals Public WithEvents Generic_Event_Handler As New Generic_Event_Handler 'EDOKA-Version Public Version As String = "5.6" - Public Versionsdatum As String = "21.03.2022" + Public Versionsdatum As String = "24.03.2022" Public Force_Exit As Boolean = False 'Datenbankvariablen Public sConnectionString As String diff --git a/EDOKA/bin/20220103_EDOKA-zip.zip b/EDOKA/bin/20220103_EDOKA-zip.zip deleted file mode 100644 index c30060e..0000000 Binary files a/EDOKA/bin/20220103_EDOKA-zip.zip and /dev/null differ diff --git a/EDOKA/bin/20220322_EDOKA.zip b/EDOKA/bin/20220322_EDOKA.zip new file mode 100644 index 0000000..fd3d989 Binary files /dev/null and b/EDOKA/bin/20220322_EDOKA.zip differ diff --git a/EDOKA/bin/20220324_edoka.zip b/EDOKA/bin/20220324_edoka.zip new file mode 100644 index 0000000..b17c1c6 Binary files /dev/null and b/EDOKA/bin/20220324_edoka.zip differ diff --git a/EDOKA/bin/EDOKA.exe b/EDOKA/bin/EDOKA.exe index b7ae191..40614a3 100644 Binary files a/EDOKA/bin/EDOKA.exe and b/EDOKA/bin/EDOKA.exe differ diff --git a/EDOKA/bin/EDOKA.pdb b/EDOKA/bin/EDOKA.pdb index 38c1593..e7d41c8 100644 Binary files a/EDOKA/bin/EDOKA.pdb and b/EDOKA/bin/EDOKA.pdb differ diff --git a/EDOKA/bin/EDOKALib.Common.dll b/EDOKA/bin/EDOKALib.Common.dll index 789b226..e11b96e 100644 Binary files a/EDOKA/bin/EDOKALib.Common.dll and b/EDOKA/bin/EDOKALib.Common.dll differ diff --git a/EDOKA/bin/EDOKALib.Common.pdb b/EDOKA/bin/EDOKALib.Common.pdb index adeaed5..b53e8e6 100644 Binary files a/EDOKA/bin/EDOKALib.Common.pdb and b/EDOKA/bin/EDOKALib.Common.pdb differ diff --git a/EDOKA/bin/EDOKALib.DataAccess.dll b/EDOKA/bin/EDOKALib.DataAccess.dll index 912df00..c44131a 100644 Binary files a/EDOKA/bin/EDOKALib.DataAccess.dll and b/EDOKA/bin/EDOKALib.DataAccess.dll differ diff --git a/EDOKA/bin/EDOKALib.DataAccess.pdb b/EDOKA/bin/EDOKALib.DataAccess.pdb index 6f3b0e4..278b6e3 100644 Binary files a/EDOKA/bin/EDOKALib.DataAccess.pdb and b/EDOKA/bin/EDOKALib.DataAccess.pdb differ diff --git a/EDOKA/frmEdokaMain.resx b/EDOKA/frmEdokaMain.resx index 39f30d6..5b9404f 100644 --- a/EDOKA/frmEdokaMain.resx +++ b/EDOKA/frmEdokaMain.resx @@ -123,7 +123,7 @@ - 0, 275 + 0, 255 890, 17 @@ -538,7 +538,7 @@ 5, 13 - 1020, 297 + 1020, 277 Fill @@ -1720,7 +1720,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABK - DAAAAk1TRnQBSQFMAgEBBwEAAWABAQFgAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + DAAAAk1TRnQBSQFMAgEBBwEAAWgBAQFoAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA diff --git a/EDOKA/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/EDOKA/obj/Debug/DesignTimeResolveAssemblyReferences.cache index d41f7a3..4df3b2c 100644 Binary files a/EDOKA/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/EDOKA/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/EDOKA/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/EDOKA/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index ee7fb46..81aa46e 100644 Binary files a/EDOKA/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/EDOKA/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/EDOKA/obj/Debug/EDOKA.exe b/EDOKA/obj/Debug/EDOKA.exe index b7ae191..40614a3 100644 Binary files a/EDOKA/obj/Debug/EDOKA.exe and b/EDOKA/obj/Debug/EDOKA.exe differ diff --git a/EDOKA/obj/Debug/EDOKA.pdb b/EDOKA/obj/Debug/EDOKA.pdb index 38c1593..e7d41c8 100644 Binary files a/EDOKA/obj/Debug/EDOKA.pdb and b/EDOKA/obj/Debug/EDOKA.pdb differ diff --git a/EDOKA/obj/Debug/EDOKAApp.EDOKAMain.resources b/EDOKA/obj/Debug/EDOKAApp.EDOKAMain.resources index 2785ddd..b90a3e9 100644 Binary files a/EDOKA/obj/Debug/EDOKAApp.EDOKAMain.resources and b/EDOKA/obj/Debug/EDOKAApp.EDOKAMain.resources differ diff --git a/EDOKA/obj/Debug/EDOKAApp.frmMultiDelete.resources b/EDOKA/obj/Debug/EDOKAApp.frmMultiDelete.resources index 00db8c2..5f6274a 100644 Binary files a/EDOKA/obj/Debug/EDOKAApp.frmMultiDelete.resources and b/EDOKA/obj/Debug/EDOKAApp.frmMultiDelete.resources differ diff --git a/EDOKA/obj/Debug/EDOKAApp.frmTrefferliste.resources b/EDOKA/obj/Debug/EDOKAApp.frmTrefferliste.resources index da41bee..02f2460 100644 Binary files a/EDOKA/obj/Debug/EDOKAApp.frmTrefferliste.resources and b/EDOKA/obj/Debug/EDOKAApp.frmTrefferliste.resources differ diff --git a/EDOKA/obj/Debug/EDOKAApp.vbproj.AssemblyReference.cache b/EDOKA/obj/Debug/EDOKAApp.vbproj.AssemblyReference.cache index aeb166d..07b7b11 100644 Binary files a/EDOKA/obj/Debug/EDOKAApp.vbproj.AssemblyReference.cache and b/EDOKA/obj/Debug/EDOKAApp.vbproj.AssemblyReference.cache differ diff --git a/EDOKA/obj/Debug/EDOKAApp.vbproj.GenerateResource.cache b/EDOKA/obj/Debug/EDOKAApp.vbproj.GenerateResource.cache index 2fecc8f..f461acd 100644 Binary files a/EDOKA/obj/Debug/EDOKAApp.vbproj.GenerateResource.cache and b/EDOKA/obj/Debug/EDOKAApp.vbproj.GenerateResource.cache differ