diff --git a/.vs/DPM2016/v15/.suo b/.vs/DPM2016/v15/.suo index 394e284..0dac9c1 100644 Binary files a/.vs/DPM2016/v15/.suo and b/.vs/DPM2016/v15/.suo differ diff --git a/.vs/DPM2016/v15/Server/sqlite3/storage.ide b/.vs/DPM2016/v15/Server/sqlite3/storage.ide index 7d89042..81b4aee 100644 Binary files a/.vs/DPM2016/v15/Server/sqlite3/storage.ide and b/.vs/DPM2016/v15/Server/sqlite3/storage.ide differ diff --git a/DPM2016/Behandlung/Leistungen.Designer.vb b/DPM2016/Behandlung/Leistungen.Designer.vb index b4b625c..f215dcf 100644 --- a/DPM2016/Behandlung/Leistungen.Designer.vb +++ b/DPM2016/Behandlung/Leistungen.Designer.vb @@ -158,6 +158,7 @@ Partial Class Leistungen ' Me.lbtarif1.BackgroundStyle.Class = "ListBoxAdv" Me.lbtarif1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square + Me.lbtarif1.CheckStateMember = Nothing Me.lbtarif1.ContainerControlProcessDialogKey = True Me.lbtarif1.ContextMenuStrip = Me.ContextMenuStrip1 Me.lbtarif1.Dock = System.Windows.Forms.DockStyle.Fill @@ -288,6 +289,7 @@ Partial Class Leistungen ' Me.lbPakete.BackgroundStyle.Class = "ListBoxAdv" Me.lbPakete.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square + Me.lbPakete.CheckStateMember = Nothing Me.lbPakete.ContainerControlProcessDialogKey = True Me.lbPakete.Dock = System.Windows.Forms.DockStyle.Fill Me.lbPakete.DragDropSupport = True diff --git a/DPM2016/Behandlung/Leistungen.resx b/DPM2016/Behandlung/Leistungen.resx index 44b73b7..e87381f 100644 --- a/DPM2016/Behandlung/Leistungen.resx +++ b/DPM2016/Behandlung/Leistungen.resx @@ -197,6 +197,6 @@ - <?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{}RecordSelector{AlignImage:Center;}Inactive{ForeColor:InactiveCaptionText;BackColor:InactiveCaption;}OddRow{BackColor:ControlLight;}Style3{}Footer{}Style14{}Heading{ForeColor:ControlText;Border:Flat,ControlDark,0, 1, 0, 1;AlignVert:Center;BackColor:Control;Wrap:True;}Style5{}Editor{}Style10{}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;}Style1{}Caption{AlignHorz:Center;}Style6{}FilterBar{BackColor:Info;}</Data></Styles><Splits><C1.Win.C1TrueDBGrid.MergeView Name="" AlternatingRowStyle="True" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" FilterBar="True" MarqueeStyle="DottedCellBorder" RecordSelectorWidth="17" 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, 1071, 137</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, 1071, 137</ClientArea><PrintPageHeaderStyle parent="" me="Style15" /><PrintPageFooterStyle parent="" me="Style16" /></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{}RecordSelector{AlignImage:Center;}OddRow{BackColor:ControlLight;}Style3{}Footer{}Style14{}FilterBar{BackColor:Info;}Heading{AlignVert:Center;Border:Flat,ControlDark,0, 1, 0, 1;ForeColor:ControlText;BackColor:Control;Wrap:True;}Style5{}Editor{}Style10{}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 Name="" AlternatingRowStyle="True" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" FilterBar="True" MarqueeStyle="DottedCellBorder" RecordSelectorWidth="17" 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, 1071, 137</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, 1071, 137</ClientArea><PrintPageHeaderStyle parent="" me="Style15" /><PrintPageFooterStyle parent="" me="Style16" /></Blob> \ No newline at end of file diff --git a/DPM2016/Behandlung/Leistungen.vb b/DPM2016/Behandlung/Leistungen.vb index 3ef77a1..49b3f8c 100644 --- a/DPM2016/Behandlung/Leistungen.vb +++ b/DPM2016/Behandlung/Leistungen.vb @@ -701,16 +701,20 @@ Public Class Leistungen End Sub Sub Leistung_Einfuegen(Optional ssonummer As String = "", Optional anzahl As Integer = 1) + If ssonummer = "" Then Exit Sub If interror > 0 Then interror = 0 Exit Sub End If - If Dentotar = True And Me.txtPosition.Text.Substring(0, 1) = "4" Then - Leistung_Einfuegen_Dentotar(ssonummer, anzahl) - Exit Sub + If Dentotar = True Then + If Me.txtPosition.Text.Substring(0, 1) = "4" Then + Leistung_Einfuegen_Dentotar(ssonummer, anzahl) + Exit Sub + End If End If + Dim dv As DataView If ssonummer = "" Then dv = New DataView(IntTables.Inttables.Tables("Tarif"), "sso_nummer='" + Me.txtPosition.Text.ToString + "'", "", DataViewRowState.CurrentRows) @@ -859,29 +863,40 @@ Public Class Leistungen End Try Me.cbboxnrbehandler.SelectedValue = Me.behandler If Me.Dentotar = True Then - Dim dv As New DataView(IntTables.Inttables.Tables("paketpos"), "nrpaket=" + Me.lbPakete.SelectedValue.ToString, "", DataViewRowState.CurrentRows) + Dim dv As New DataView(IntTables.Inttables.Tables("paketpos"), "aktiv=1 and nrpaket=" + Me.lbPakete.SelectedValue.ToString, "", DataViewRowState.CurrentRows) + Dim dvt As DataView For Each drv As DataRowView In dv - Dim dvt As New DataView(IntTables.Inttables.Tables("Tarif"), "nrtarif=" + drv.Item("nrtarif").ToString, "", DataViewRowState.CurrentRows) - For Each dvtr As DataRowView In dvt - Dim s As String = dvtr("SSO_Nummer").ToString - s = s.Substring(0, 1) + "." + s.Substring(1, 3) + "0" - If s.Substring(0, 1) = "4" Then - Leistung_Einfuegen_Dentotar("", Me.intAnzahl.Value, s) - Else - Leistung_Einfuegen(dvtr("SSO_Nummer").ToString, Me.intAnzahl.Value) - End If - - Next - Next + If drv.Item("Dentotar") = True Then + Dim s As String = drv.Item("nrtarif") + s = s.Substring(0, 1) + "." + s.Substring(1, 4) + ' dvt = New DataView(IntTables.Inttables.Tables("Dentotar"), "Leistungnrneu=" + drv.Item("nrtarif").ToString, "", DataViewRowState.CurrentRows) + Leistung_Einfuegen_Dentotar("", Me.intAnzahl.Value, s) + Else + dvt = New DataView(IntTables.Inttables.Tables("Tarif"), "aktiv=1 and nrtarif=" + drv.Item("nrtarif").ToString, "", DataViewRowState.CurrentRows) + For Each dvtr As DataRowView In dvt + Dim s As String = dvtr("SSO_Nummer").ToString + s = s.Substring(0, 1) + "." + s.Substring(1, 3) + "0" + If s.Substring(0, 1) = "4" Then + Leistung_Einfuegen_Dentotar("", Me.intAnzahl.Value, s) + Else + Leistung_Einfuegen(dvtr("SSO_Nummer").ToString, Me.intAnzahl.Value) + End If + Next + End If + Next Else - Dim dv As New DataView(IntTables.Inttables.Tables("paketpos"), "nrpaket=" + Me.lbPakete.SelectedValue.ToString, "", DataViewRowState.CurrentRows) + Dim dv As New DataView(IntTables.Inttables.Tables("paketpos"), "aktiv=1 and nrpaket=" + Me.lbPakete.SelectedValue.ToString, "", DataViewRowState.CurrentRows) For Each drv As DataRowView In dv - Dim dvt As New DataView(IntTables.Inttables.Tables("Tarif"), "nrtarif=" + drv.Item("nrtarif").ToString, "", DataViewRowState.CurrentRows) - For Each dvtr As DataRowView In dvt - Leistung_Einfuegen(dvtr("SSO_Nummer").ToString, Me.intAnzahl.Value) - Next + Dim dvt As DataView + If drv.Item("Dentotar") = False Then + dvt = New DataView(IntTables.Inttables.Tables("Tarif"), "nrtarif=" + drv.Item("nrtarif").ToString, "", DataViewRowState.CurrentRows) + For Each dvtr As DataRowView In dvt + Leistung_Einfuegen(dvtr("SSO_Nummer").ToString, Me.intAnzahl.Value) + Next + End If + Next End If diff --git a/DPM2016/Behandlung/clsFakturaFunktionen.vb b/DPM2016/Behandlung/clsFakturaFunktionen.vb index a5055e1..1f40147 100644 --- a/DPM2016/Behandlung/clsFakturaFunktionen.vb +++ b/DPM2016/Behandlung/clsFakturaFunktionen.vb @@ -149,13 +149,14 @@ Dim db1 As New clsDB Dim anzahlraten As Integer = 0 Dim Behandlungsnr As Integer + Dim Empfaenger As String = "" db.Get_Tabledata("Faktura", "", "Select nrbehandlung from faktura where nrfaktura=" + Fakturanr) Behandlungsnr = db.dsDaten.Tables(0).Rows(0).Item("nrbehandlung") db.Get_Tabledata("Behandlu", "where nrbehandlung=" + db.dsDaten.Tables(0).Rows(0).Item("nrbehandlung").ToString) db1.Get_Tabledata("estyp", "where nrestyp=" + db.dsDaten.Tables(0).Rows(0).Item("nrestyp").ToString) anzahlraten = db.dsDaten.Tables(0).Rows(0).Item("Anzahlraten") - + Empfaenger = db.dsDaten.Tables(0).Rows(0).Item("Empfaenger") If anzahlraten = 0 Then anzahlraten = 1 Dim reportnr As Integer @@ -176,6 +177,15 @@ While doloop = True For i As Integer = 1 To anzahlraten + If i = 1 And Empfaenger <> "" Then + Dim f0 As New frmReportView(9999, False, "Vorschau Rechung", " where nrbehandlung = " + Behandlungsnr.ToString, Behandlungsnr.ToString) + f0.Visible = False + f0.Show() + f0.Visible = False + f0.Fakturierung(9999, Behandlungsnr.ToString, "", i, buchen:=False) + f0.Close() + Globals.FakturaNr = 0 + End If Dim f As New frmReportView(reportnr, False, "Vorschau Rechung", " where nrbehandlung = " + Behandlungsnr.ToString, Behandlungsnr.ToString) f.Visible = False f.Show() diff --git a/DPM2016/Finanzaen/frmMahnungen.resx b/DPM2016/Finanzaen/frmMahnungen.resx index dcfb973..f5b1ce4 100644 --- a/DPM2016/Finanzaen/frmMahnungen.resx +++ b/DPM2016/Finanzaen/frmMahnungen.resx @@ -437,7 +437,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{}RecordSelector{AlignImage:Center;}OddRow{BackColor:ControlLight;}Style3{}Footer{}Style14{}FilterBar{BackColor:Info;}Heading{AlignVert:Center;Border:Flat,ControlDark,0, 1, 0, 1;Wrap:True;BackColor:Control;ForeColor:ControlText;}Style5{}Editor{}Style10{}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 Name="" AlternatingRowStyle="True" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" FetchRowStyles="True" FilterBar="True" MarqueeStyle="DottedCellBorder" RecordSelectorWidth="17" 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, 792, 123</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, 792, 123</ClientArea><PrintPageHeaderStyle parent="" me="Style15" /><PrintPageFooterStyle parent="" me="Style16" /></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{}RecordSelector{AlignImage:Center;}Inactive{ForeColor:InactiveCaptionText;BackColor:InactiveCaption;}OddRow{BackColor:ControlLight;}Style3{}Footer{}Style14{}Heading{ForeColor:ControlText;Border:Flat,ControlDark,0, 1, 0, 1;AlignVert:Center;BackColor:Control;Wrap:True;}Style5{}Editor{}Style10{}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;}Style1{}Caption{AlignHorz:Center;}Style6{}FilterBar{BackColor:Info;}</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"><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, 792, 123</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, 792, 123</ClientArea><PrintPageHeaderStyle parent="" me="Style15" /><PrintPageFooterStyle parent="" me="Style16" /></Blob> 560, 17 @@ -497,7 +497,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{}RecordSelector{AlignImage:Center;}Inactive{ForeColor:InactiveCaptionText;BackColor:InactiveCaption;}OddRow{BackColor:ControlLight;}Style3{}Footer{}Style14{}Heading{Wrap:True;Border:Flat,ControlDark,0, 1, 0, 1;AlignVert:Center;BackColor:Control;ForeColor:ControlText;}Style5{}Editor{}Style10{}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;}Style1{}Caption{AlignHorz:Center;}Style6{}FilterBar{BackColor:Info;}</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"><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, 792, 168</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, 792, 168</ClientArea><PrintPageHeaderStyle parent="" me="Style15" /><PrintPageFooterStyle parent="" me="Style16" /></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{}RecordSelector{AlignImage:Center;}OddRow{BackColor:ControlLight;}Style3{}Footer{}Style14{}FilterBar{BackColor:Info;}Heading{AlignVert:Center;Border:Flat,ControlDark,0, 1, 0, 1;Wrap:True;BackColor:Control;ForeColor:ControlText;}Style5{}Editor{}Style10{}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 Name="" AlternatingRowStyle="True" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" FetchRowStyles="True" FilterBar="True" MarqueeStyle="DottedCellBorder" RecordSelectorWidth="17" 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, 792, 168</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, 792, 168</ClientArea><PrintPageHeaderStyle parent="" me="Style15" /><PrintPageFooterStyle parent="" me="Style16" /></Blob> 453, 17 @@ -557,7 +557,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{}RecordSelector{AlignImage:Center;}Inactive{ForeColor:InactiveCaptionText;BackColor:InactiveCaption;}OddRow{BackColor:ControlLight;}Style3{}Footer{}Style14{}Heading{ForeColor:ControlText;Border:Flat,ControlDark,0, 1, 0, 1;AlignVert:Center;BackColor:Control;Wrap:True;}Style5{}Editor{}Style10{}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;}Style1{}Caption{AlignHorz:Center;}Style6{}FilterBar{BackColor:Info;}</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"><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, 792, 123</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, 792, 123</ClientArea><PrintPageHeaderStyle parent="" me="Style15" /><PrintPageFooterStyle parent="" me="Style16" /></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{}RecordSelector{AlignImage:Center;}OddRow{BackColor:ControlLight;}Style3{}Footer{}Style14{}FilterBar{BackColor:Info;}Heading{AlignVert:Center;Border:Flat,ControlDark,0, 1, 0, 1;ForeColor:ControlText;BackColor:Control;Wrap:True;}Style5{}Editor{}Style10{}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 Name="" AlternatingRowStyle="True" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" FetchRowStyles="True" FilterBar="True" MarqueeStyle="DottedCellBorder" RecordSelectorWidth="17" 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, 792, 123</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, 792, 123</ClientArea><PrintPageHeaderStyle parent="" me="Style15" /><PrintPageFooterStyle parent="" me="Style16" /></Blob> 667, 17 @@ -617,7 +617,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{}RecordSelector{AlignImage:Center;}OddRow{BackColor:ControlLight;}Style3{}Footer{}Style14{}FilterBar{BackColor:Info;}Heading{AlignVert:Center;Border:Flat,ControlDark,0, 1, 0, 1;ForeColor:ControlText;BackColor:Control;Wrap:True;}Style5{}Editor{}Style10{}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 Name="" AlternatingRowStyle="True" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" FetchRowStyles="True" FilterBar="True" MarqueeStyle="DottedCellBorder" RecordSelectorWidth="17" 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, 792, 138</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, 792, 138</ClientArea><PrintPageHeaderStyle parent="" me="Style15" /><PrintPageFooterStyle parent="" me="Style16" /></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{}RecordSelector{AlignImage:Center;}Inactive{ForeColor:InactiveCaptionText;BackColor:InactiveCaption;}OddRow{BackColor:ControlLight;}Style3{}Footer{}Style14{}Heading{Wrap:True;Border:Flat,ControlDark,0, 1, 0, 1;AlignVert:Center;BackColor:Control;ForeColor:ControlText;}Style5{}Editor{}Style10{}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;}Style1{}Caption{AlignHorz:Center;}Style6{}FilterBar{BackColor:Info;}</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"><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, 792, 138</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, 792, 138</ClientArea><PrintPageHeaderStyle parent="" me="Style15" /><PrintPageFooterStyle parent="" me="Style16" /></Blob> 108 diff --git a/DPM2016/Klassen/clsSpalten.vb b/DPM2016/Klassen/clsSpalten.vb index f9160a5..0b2e4ee 100644 --- a/DPM2016/Klassen/clsSpalten.vb +++ b/DPM2016/Klassen/clsSpalten.vb @@ -153,7 +153,7 @@ Public Class Tabellenspalte daten.HeadingStyle.WrapText = False End Function - Public Function Spaltentitel_aktualisieren(ByRef daten As Object, ByRef tablename As String, ByRef dt As DataTable, Optional ByVal Aktiv_Spalte_True_Setzen As Boolean = True) + Public Function Spaltentitel_aktualisieren(ByRef daten As Object, ByVal tablename As String, ByRef dt As DataTable, Optional ByVal Aktiv_Spalte_True_Setzen As Boolean = True) Dim anzcols As Integer Dim i As Integer Dim t As New DataTable() diff --git a/DPM2016/Klassen/clsStammdaten_Bez.Designer.vb b/DPM2016/Klassen/clsStammdaten_Bez.Designer.vb index 5618aad..a559029 100644 --- a/DPM2016/Klassen/clsStammdaten_Bez.Designer.vb +++ b/DPM2016/Klassen/clsStammdaten_Bez.Designer.vb @@ -23,22 +23,22 @@ Partial Class clsStammdaten_Bez _ Private Sub InitializeComponent() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(clsStammdaten_Bez)) - Dim Style1 As C1.Win.C1TrueDBGrid.Style = New C1.Win.C1TrueDBGrid.Style() - Dim Style2 As C1.Win.C1TrueDBGrid.Style = New C1.Win.C1TrueDBGrid.Style() - Dim Style3 As C1.Win.C1TrueDBGrid.Style = New C1.Win.C1TrueDBGrid.Style() - Dim Style4 As C1.Win.C1TrueDBGrid.Style = New C1.Win.C1TrueDBGrid.Style() - Dim Style5 As C1.Win.C1TrueDBGrid.Style = New C1.Win.C1TrueDBGrid.Style() - Dim Style6 As C1.Win.C1TrueDBGrid.Style = New C1.Win.C1TrueDBGrid.Style() - Dim Style7 As C1.Win.C1TrueDBGrid.Style = New C1.Win.C1TrueDBGrid.Style() - Dim Style8 As C1.Win.C1TrueDBGrid.Style = New C1.Win.C1TrueDBGrid.Style() - Dim Style9 As C1.Win.C1TrueDBGrid.Style = New C1.Win.C1TrueDBGrid.Style() - Dim Style10 As C1.Win.C1TrueDBGrid.Style = New C1.Win.C1TrueDBGrid.Style() - Dim Style11 As C1.Win.C1TrueDBGrid.Style = New C1.Win.C1TrueDBGrid.Style() - Dim Style12 As C1.Win.C1TrueDBGrid.Style = New C1.Win.C1TrueDBGrid.Style() - Dim Style13 As C1.Win.C1TrueDBGrid.Style = New C1.Win.C1TrueDBGrid.Style() - Dim Style14 As C1.Win.C1TrueDBGrid.Style = New C1.Win.C1TrueDBGrid.Style() - Dim Style15 As C1.Win.C1TrueDBGrid.Style = New C1.Win.C1TrueDBGrid.Style() - Dim Style16 As C1.Win.C1TrueDBGrid.Style = New C1.Win.C1TrueDBGrid.Style() + Dim Style33 As C1.Win.C1TrueDBGrid.Style = New C1.Win.C1TrueDBGrid.Style() + Dim Style34 As C1.Win.C1TrueDBGrid.Style = New C1.Win.C1TrueDBGrid.Style() + Dim Style35 As C1.Win.C1TrueDBGrid.Style = New C1.Win.C1TrueDBGrid.Style() + Dim Style36 As C1.Win.C1TrueDBGrid.Style = New C1.Win.C1TrueDBGrid.Style() + Dim Style37 As C1.Win.C1TrueDBGrid.Style = New C1.Win.C1TrueDBGrid.Style() + Dim Style38 As C1.Win.C1TrueDBGrid.Style = New C1.Win.C1TrueDBGrid.Style() + Dim Style39 As C1.Win.C1TrueDBGrid.Style = New C1.Win.C1TrueDBGrid.Style() + Dim Style40 As C1.Win.C1TrueDBGrid.Style = New C1.Win.C1TrueDBGrid.Style() + Dim Style41 As C1.Win.C1TrueDBGrid.Style = New C1.Win.C1TrueDBGrid.Style() + Dim Style42 As C1.Win.C1TrueDBGrid.Style = New C1.Win.C1TrueDBGrid.Style() + Dim Style43 As C1.Win.C1TrueDBGrid.Style = New C1.Win.C1TrueDBGrid.Style() + Dim Style44 As C1.Win.C1TrueDBGrid.Style = New C1.Win.C1TrueDBGrid.Style() + Dim Style45 As C1.Win.C1TrueDBGrid.Style = New C1.Win.C1TrueDBGrid.Style() + Dim Style46 As C1.Win.C1TrueDBGrid.Style = New C1.Win.C1TrueDBGrid.Style() + Dim Style47 As C1.Win.C1TrueDBGrid.Style = New C1.Win.C1TrueDBGrid.Style() + Dim Style48 As C1.Win.C1TrueDBGrid.Style = New C1.Win.C1TrueDBGrid.Style() Me.ToolStrip1 = New System.Windows.Forms.ToolStrip() Me.ToolStripButton5 = New System.Windows.Forms.ToolStripButton() Me.ToolStripButton1 = New System.Windows.Forms.ToolStripButton() @@ -59,10 +59,15 @@ Partial Class clsStammdaten_Bez Me.C1DropDownRight = New C1.Win.C1TrueDBGrid.C1TrueDBDropdown() Me.C1DropDownLeft = New C1.Win.C1TrueDBGrid.C1TrueDBDropdown() Me.c1DatenBottom = New C1.Win.C1TrueDBGrid.C1TrueDBGrid() + Me.ToolStrip2 = New System.Windows.Forms.ToolStrip() + Me.btnStandard = New System.Windows.Forms.ToolStripButton() + Me.btnDentotar = New System.Windows.Forms.ToolStripButton() Me.ToolStrip1.SuspendLayout() + CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainer1.Panel1.SuspendLayout() Me.SplitContainer1.Panel2.SuspendLayout() Me.SplitContainer1.SuspendLayout() + CType(Me.SplitContainer2, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainer2.Panel1.SuspendLayout() Me.SplitContainer2.Panel2.SuspendLayout() Me.SplitContainer2.SuspendLayout() @@ -75,6 +80,7 @@ Partial Class clsStammdaten_Bez CType(Me.C1DropDownRight, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.C1DropDownLeft, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.c1DatenBottom, System.ComponentModel.ISupportInitialize).BeginInit() + Me.ToolStrip2.SuspendLayout() Me.SuspendLayout() ' 'ToolStrip1 @@ -204,6 +210,7 @@ Partial Class clsStammdaten_Bez 'GroupBox2 ' Me.GroupBox2.Controls.Add(Me.c1DatenRight) + Me.GroupBox2.Controls.Add(Me.ToolStrip2) Me.GroupBox2.Dock = System.Windows.Forms.DockStyle.Fill Me.GroupBox2.Location = New System.Drawing.Point(0, 0) Me.GroupBox2.Name = "GroupBox2" @@ -219,13 +226,13 @@ Partial Class clsStammdaten_Bez Me.c1DatenRight.FilterBar = True Me.c1DatenRight.GroupByCaption = "Drag a column header here to group by that column" Me.c1DatenRight.Images.Add(CType(resources.GetObject("c1DatenRight.Images"), System.Drawing.Image)) - Me.c1DatenRight.Location = New System.Drawing.Point(3, 16) + Me.c1DatenRight.Location = New System.Drawing.Point(3, 41) Me.c1DatenRight.Name = "c1DatenRight" Me.c1DatenRight.PreviewInfo.Location = New System.Drawing.Point(0, 0) Me.c1DatenRight.PreviewInfo.Size = New System.Drawing.Size(0, 0) Me.c1DatenRight.PreviewInfo.ZoomFactor = 75.0R Me.c1DatenRight.PrintInfo.PageSettings = CType(resources.GetObject("c1DatenRight.PrintInfo.PageSettings"), System.Drawing.Printing.PageSettings) - Me.c1DatenRight.Size = New System.Drawing.Size(536, 214) + Me.c1DatenRight.Size = New System.Drawing.Size(536, 189) Me.c1DatenRight.TabIndex = 1 Me.c1DatenRight.Text = "C1TrueDBGrid1" Me.c1DatenRight.PropBag = resources.GetString("c1DatenRight.PropBag") @@ -243,7 +250,7 @@ Partial Class clsStammdaten_Bez ' 'BtnFocusRight ' - Me.BtnFocusRight.ImageIndex = 2 + Me.BtnFocusRight.Image = CType(resources.GetObject("BtnFocusRight.Image"), System.Drawing.Image) Me.BtnFocusRight.Location = New System.Drawing.Point(1021, 5) Me.BtnFocusRight.Name = "BtnFocusRight" Me.BtnFocusRight.Size = New System.Drawing.Size(30, 23) @@ -252,7 +259,7 @@ Partial Class clsStammdaten_Bez ' 'BtnFocusLeft ' - Me.BtnFocusLeft.ImageIndex = 1 + Me.BtnFocusLeft.Image = CType(resources.GetObject("BtnFocusLeft.Image"), System.Drawing.Image) Me.BtnFocusLeft.Location = New System.Drawing.Point(3, 6) Me.BtnFocusLeft.Name = "BtnFocusLeft" Me.BtnFocusLeft.Size = New System.Drawing.Size(30, 23) @@ -261,8 +268,8 @@ Partial Class clsStammdaten_Bez ' 'BtnVerbinden ' + Me.BtnVerbinden.Image = CType(resources.GetObject("BtnVerbinden.Image"), System.Drawing.Image) Me.BtnVerbinden.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.BtnVerbinden.ImageIndex = 0 Me.BtnVerbinden.Location = New System.Drawing.Point(479, 5) Me.BtnVerbinden.Name = "BtnVerbinden" Me.BtnVerbinden.Size = New System.Drawing.Size(84, 23) @@ -290,25 +297,25 @@ Partial Class clsStammdaten_Bez Me.C1DropDownRight.AllowColSelect = True Me.C1DropDownRight.AllowRowSizing = C1.Win.C1TrueDBGrid.RowSizingEnum.AllRows Me.C1DropDownRight.AlternatingRows = False - Me.C1DropDownRight.CaptionStyle = Style1 + Me.C1DropDownRight.CaptionStyle = Style33 Me.C1DropDownRight.ColumnCaptionHeight = 17 Me.C1DropDownRight.ColumnFooterHeight = 17 - Me.C1DropDownRight.EvenRowStyle = Style2 + Me.C1DropDownRight.EvenRowStyle = Style34 Me.C1DropDownRight.FetchRowStyles = False - Me.C1DropDownRight.FooterStyle = Style3 - Me.C1DropDownRight.HeadingStyle = Style4 - Me.C1DropDownRight.HighLightRowStyle = Style5 + Me.C1DropDownRight.FooterStyle = Style35 + Me.C1DropDownRight.HeadingStyle = Style36 + Me.C1DropDownRight.HighLightRowStyle = Style37 Me.C1DropDownRight.Images.Add(CType(resources.GetObject("C1DropDownRight.Images"), System.Drawing.Image)) Me.C1DropDownRight.Location = New System.Drawing.Point(477, 29) Me.C1DropDownRight.Name = "C1DropDownRight" - Me.C1DropDownRight.OddRowStyle = Style6 - Me.C1DropDownRight.RecordSelectorStyle = Style7 + Me.C1DropDownRight.OddRowStyle = Style38 + Me.C1DropDownRight.RecordSelectorStyle = Style39 Me.C1DropDownRight.RowDivider.Color = System.Drawing.Color.DarkGray Me.C1DropDownRight.RowDivider.Style = C1.Win.C1TrueDBGrid.LineStyleEnum.[Single] Me.C1DropDownRight.RowSubDividerColor = System.Drawing.Color.DarkGray Me.C1DropDownRight.ScrollTips = False Me.C1DropDownRight.Size = New System.Drawing.Size(100, 150) - Me.C1DropDownRight.Style = Style8 + Me.C1DropDownRight.Style = Style40 Me.C1DropDownRight.TabIndex = 3 Me.C1DropDownRight.Visible = False Me.C1DropDownRight.PropBag = resources.GetString("C1DropDownRight.PropBag") @@ -319,25 +326,25 @@ Partial Class clsStammdaten_Bez Me.C1DropDownLeft.AllowColSelect = True Me.C1DropDownLeft.AllowRowSizing = C1.Win.C1TrueDBGrid.RowSizingEnum.AllRows Me.C1DropDownLeft.AlternatingRows = False - Me.C1DropDownLeft.CaptionStyle = Style9 + Me.C1DropDownLeft.CaptionStyle = Style41 Me.C1DropDownLeft.ColumnCaptionHeight = 17 Me.C1DropDownLeft.ColumnFooterHeight = 17 - Me.C1DropDownLeft.EvenRowStyle = Style10 + Me.C1DropDownLeft.EvenRowStyle = Style42 Me.C1DropDownLeft.FetchRowStyles = False - Me.C1DropDownLeft.FooterStyle = Style11 - Me.C1DropDownLeft.HeadingStyle = Style12 - Me.C1DropDownLeft.HighLightRowStyle = Style13 + Me.C1DropDownLeft.FooterStyle = Style43 + Me.C1DropDownLeft.HeadingStyle = Style44 + Me.C1DropDownLeft.HighLightRowStyle = Style45 Me.C1DropDownLeft.Images.Add(CType(resources.GetObject("C1DropDownLeft.Images"), System.Drawing.Image)) Me.C1DropDownLeft.Location = New System.Drawing.Point(68, 3) Me.C1DropDownLeft.Name = "C1DropDownLeft" - Me.C1DropDownLeft.OddRowStyle = Style14 - Me.C1DropDownLeft.RecordSelectorStyle = Style15 + Me.C1DropDownLeft.OddRowStyle = Style46 + Me.C1DropDownLeft.RecordSelectorStyle = Style47 Me.C1DropDownLeft.RowDivider.Color = System.Drawing.Color.DarkGray Me.C1DropDownLeft.RowDivider.Style = C1.Win.C1TrueDBGrid.LineStyleEnum.[Single] Me.C1DropDownLeft.RowSubDividerColor = System.Drawing.Color.DarkGray Me.C1DropDownLeft.ScrollTips = False Me.C1DropDownLeft.Size = New System.Drawing.Size(100, 150) - Me.C1DropDownLeft.Style = Style16 + Me.C1DropDownLeft.Style = Style48 Me.C1DropDownLeft.TabIndex = 2 Me.C1DropDownLeft.Text = "C1DropDownLeft" Me.C1DropDownLeft.Visible = False @@ -361,6 +368,33 @@ Partial Class clsStammdaten_Bez Me.c1DatenBottom.Text = "C1TrueDBGrid1" Me.c1DatenBottom.PropBag = resources.GetString("c1DatenBottom.PropBag") ' + 'ToolStrip2 + ' + Me.ToolStrip2.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.btnStandard, Me.btnDentotar}) + Me.ToolStrip2.Location = New System.Drawing.Point(3, 16) + Me.ToolStrip2.Name = "ToolStrip2" + Me.ToolStrip2.Size = New System.Drawing.Size(536, 25) + Me.ToolStrip2.TabIndex = 2 + Me.ToolStrip2.Text = "Toolstrip_Tarif" + ' + 'btnStandard + ' + Me.btnStandard.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text + Me.btnStandard.Image = CType(resources.GetObject("btnStandard.Image"), System.Drawing.Image) + Me.btnStandard.ImageTransparentColor = System.Drawing.Color.Magenta + Me.btnStandard.Name = "btnStandard" + Me.btnStandard.Size = New System.Drawing.Size(92, 22) + Me.btnStandard.Text = "Standard-Tarife" + ' + 'btnDentotar + ' + Me.btnDentotar.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text + Me.btnDentotar.Image = CType(resources.GetObject("btnDentotar.Image"), System.Drawing.Image) + Me.btnDentotar.ImageTransparentColor = System.Drawing.Color.Magenta + Me.btnDentotar.Name = "btnDentotar" + Me.btnDentotar.Size = New System.Drawing.Size(57, 22) + Me.btnDentotar.Text = "Dentotar" + ' 'clsStammdaten_Bez ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -373,19 +407,24 @@ Partial Class clsStammdaten_Bez Me.ToolStrip1.PerformLayout() Me.SplitContainer1.Panel1.ResumeLayout(False) Me.SplitContainer1.Panel2.ResumeLayout(False) + CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).EndInit() Me.SplitContainer1.ResumeLayout(False) Me.SplitContainer2.Panel1.ResumeLayout(False) Me.SplitContainer2.Panel2.ResumeLayout(False) + CType(Me.SplitContainer2, System.ComponentModel.ISupportInitialize).EndInit() Me.SplitContainer2.ResumeLayout(False) Me.GroupBox1.ResumeLayout(False) CType(Me.c1Datenleft, System.ComponentModel.ISupportInitialize).EndInit() Me.GroupBox2.ResumeLayout(False) + Me.GroupBox2.PerformLayout() CType(Me.c1DatenRight, System.ComponentModel.ISupportInitialize).EndInit() Me.Panel1.ResumeLayout(False) Me.GroupBox3.ResumeLayout(False) CType(Me.C1DropDownRight, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.C1DropDownLeft, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.c1DatenBottom, System.ComponentModel.ISupportInitialize).EndInit() + Me.ToolStrip2.ResumeLayout(False) + Me.ToolStrip2.PerformLayout() Me.ResumeLayout(False) Me.PerformLayout() @@ -410,5 +449,7 @@ Partial Class clsStammdaten_Bez Friend WithEvents c1DatenBottom As C1.Win.C1TrueDBGrid.C1TrueDBGrid Friend WithEvents C1DropDownLeft As C1.Win.C1TrueDBGrid.C1TrueDBDropdown Friend WithEvents C1DropDownRight As C1.Win.C1TrueDBGrid.C1TrueDBDropdown - + Friend WithEvents ToolStrip2 As ToolStrip + Friend WithEvents btnStandard As ToolStripButton + Friend WithEvents btnDentotar As ToolStripButton End Class diff --git a/DPM2016/Klassen/clsStammdaten_Bez.resx b/DPM2016/Klassen/clsStammdaten_Bez.resx index 270f651..3b50d67 100644 --- a/DPM2016/Klassen/clsStammdaten_Bez.resx +++ b/DPM2016/Klassen/clsStammdaten_Bez.resx @@ -112,31 +112,31 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + 17, 17 - + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAK1SURBVDhPnZLdS1NhHMcfCPoDuummi+i6KwcmvSBuc5vH - szM3l5vnnG0nXTkzKnqDrOzdt7Qs1EKHqVQYlVoZZdmLopGhlIVUKyoiukiiiKSLgk/HFxa7rB984Pk9 - 8Hx4vr/nEf9TX14NBX98GP/VsTOT+a256qrI7e0+mEvv4RmkJD2HJC7us3M/vpWpyX4+T1zn++tBzu+2 - pgp6KmTSMuysWGUjY81f0ldZWW5ZzXSin0Tvfsaa/HxNPKBrryNV0F0uk2l1YrNL2B2uJNZsJ+mrbbzs - iDDWojPaHGTq+S0uH8hJFTgaBFLVAnLsPiSXgpTjRpJkXC6ZNVaJyXaD0TMhHjYG+TTWMxt1/qgQtmpB - 4lMnTlOSm6XhdgZQJD+K7EV2e8hyuHkWDzPSpDPYUMi74QvcqFTmBLYqwcT7VtoHBZmVAnu9wHlKIJcv - xqsE8eT5yc71Md6iMXhSZ/rmUl4MtHGrxotw1Qoeva0kPiJoHTbXb4p5/DbCk4/hWclaT5j8/CCSJ8Dj - ZpV7JzR+9i/j+Y0mBur9c4K7iR3ExwXxMUHbM0H7pODptwiOk4JgfjEFgRDufI2RxgADx4O07nDypKea - Bw2B2QgWuxmh78V6OhOCrJkIxwSOE4K8fUvQ1SiqbuALGgw1+Lldt5YrBxUeXahguFFNDtGSXSPofePD - eVxgBLZhaGUY4RIMI0rEKCIQinKv3svNWh99VV6Gzm5n9HQo5RktTvPKSu1CosZmosWlFEdLZiky0dbF - uFProa8yj6tHPPQ3xRhvjaQIREfZSjaUllEa20Lpxk1JYiZFJZu5XSNz7ahC92E31+pCTLQVIXRdR9dC - aFoYVZ3BXKua2atJVLMvKNTZFQtwrkIxf6DMpUN5THaunxviv1Kup+/u2OP6/epcLDXCP9QikzQhhOUP - pATCqsio1ToAAAAASUVORK5CYII= + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAK1SURBVDhPnZLfS1NhGMdfCPoDuummi+i6KwcWZYjb3Obx + 7MzN5dY5Z9tJV86MirIgK8t++KssC63IYSoVRaVWRmn2Q9FIUcpCyiXVRXiRRCFIFwWfjhqLXdYDH3if + F94P7/d5X/E/9XVyIDj7aexn295M/mwt1vWK3K6Oyly6js0jJek8KnHjkJ2n8V3MTPTwZfwes+/7ubrf + mirorJBJW2tnzXobazf8JX29ldWWDOYSPSS6DjPa5Odb4hnXDzpSBR3lMplWJza7hN3hSmLNdpKeYeNd + W4TRSzrD54PMvHnIrSM5qQJHg0CqXkKO3YfkUpBy3EiSjMsls8EqMdFqMHwxxPPGINOjnQtR/xwVwlYj + SEy34zQluVkabmcARfKjyF5kt4csh5vX8TBDTTr9DZv4OHiN+1XKosBWLRj/1ExrvyCzSmCvFzjPCeTy + 5XiVIJ48P9m5PsYuafSf1Zl7sJK3fS08rPUiXHWCFx+qiA8JmgfN9VQRIx8ivPwcXpBs9ITJzw8ieQKM + nFd5ckbjR88q3txvoq/evyh4nCgjPiaIjwpaXgtaJwSvvkdwnBUE84soCIRw52sMNQboOx2kuczJy84a + njUEFiJY7GaE7rdbaE8IsuYjnBQ4zgjyDq1AV6OouoEvaDDQ4Kf31EZuVyq8uFbBYKOaHKIlu1bQNeXD + eVpgBHZjaKUY4WIMI0rEKCQQivKk3suDOh/d1V4GLu9h+EIo5RktTvPKSt1SosYOokUlFEWLFyg00TbH + eFTnobsqjzvHPfQ0xRhrjqQIRFvpOraWlFIS20nJtu1JYiaFxTvorZW5e0Kh45ibu6dCjLcUInRdR9dC + aFoYVZ3HXKua2atJVLMv2KSzLxbgSoVi/kCZm0fzmGjfsjjEf6VcT99/+YDj1+SVWGqEf6hlJmlCCMtv + k4rCoiUUiGcAAAAASUVORK5CYII= @@ -157,16 +157,16 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIXSURBVDhPlY9fSJNhFMa/CylqduHIEk2pbaWwqMyLpCsL - +oNhSjKCCKTRnQ0lvCgK5mhd2UVQBnYx6tvfNmvbtzWnW20rZjclaCG51ginuc/N3OYu2sjv6R28l22z - Hzyc9z3nOee8L7MVfBKJ831Ly216/T+muroeP2QY6Gpq4JdKP7+TyWppqTLC/JP2uVgErrv38YAMGROJ - 8LK+HjMSSSe1lOf37K1keqINichTRBd4jO2X4FFVFTix+A61lGYzqmV/+c4j4WzGkpHBsu8MIitJvFYN - /KCW0ggx7bl0UIGES04GSLE0LkbS04qf1m2Izb5oprZ/E/GotvOB63mebE5NnkLctgtrkx1kkAx/fCIV - tZVmc27Qz7vlWJs6S15wmGxuQ9J7ElnPnjC1lEaI3FSmPO1YdR/DekABnnxh/W0PPo0eEr5Ya6uprTSF - +dE4725F7sMNJCdOIBO8ghTZLgQPXqKW8uS/PkN6wYH0zD1k3nST7RdRCB4fp+XyjIxcFYF3IPvtFTYW - A8jF/ciFOzdouTKNjXvll3s6kPnuQp4PA4WoNbv8cTctV6ahqenCjp3V2FdXx6UWpxtoemuEQqEDarV6 - WKPRaFmjUaHTPe8zmUz9drt9qCiHw9FPpCS6xnFcr9PpPO31emW0nWFsNtsRs9ncTZr69Hr9gMFgGCJx - mER1UfRczA0SKVmW7bVYLEcZhmH+Am4yJFh72phxAAAAAElFTkSuQmCC + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIWSURBVDhPlY9dSJNhFMffCylqduHIEk2pbaWwqMyLpCsL + +sAwJRlBBNLozoYSXhQFc7Su7CKwArsYte82a5/N6VbbitlFIWgh+bZGOM29buY2d9FGvv+ewXPZu9kP + /pznOed/znkeZisEJBLX+5aW2/T6f0x1dT16yDDQ1dQgKJV+fieT1dJSZfj5J+1zcRaeu/fxgAwZE4nw + sr4eMxJJJ7WU5/fsrVRmog1J9iliCxzG9kswWlUFt1h8h1qE2Yxp9b8C55F0NWPJxGA5cAbsSgqvVQM/ + qEUYPq49lwkrkPTIyQAplsbFSPla8dO2DfHZF83U9m9Yn2o7F7pe4Mjm9OQpJOy7sDbZQQbJ8CcgUlGb + MJtzg0HOK8fa1FnygsNkcxtS/pPI+fZEqUUYnr2pTPvaseo9hvWQAhz5wvrbHnwcPcR/sdVWU5swxfnH + Cc7bivyHG0hNnEA2fAVpsp0PH7xELeUpfH2GzIITmZl7yL7pJtsvohg+Pk7L5RkZuSoC50Tu2ytsLIaQ + TwSRj3Zu0HJlGhv3yi/3dCD73YMCFwWKMVtu+dNuWq5MQ1PThR07q7Gvrs6dXpxuoOmtEYlEDqjV6mGN + RqPVm0wKne55n9ls7nc4HEMlOZ3OfiIl0TW3293rcrlO+/1+GW1nGLvdfsRisXSTpj6DwTBgNBqHSBwm + UV0SPZdyg0RKvV7fa7VajzIMw/wFZqgkVE0bQ30AAAAASUVORK5CYII= @@ -201,16 +201,16 @@ 1l2RSH4BvQRqc//87N0AAAAASUVORK5CYII= - + iVBORw0KGgoAAAANSUhEUgAAAAkAAAAJCAYAAADgkQYQAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAA0SURBVChTdYkBCgAgDAL9/6eLIsd0eSCKhw/r9aCLtC88 vAdHMEIXKUIUhMK76EfagglgA6CqHOQpL6GyAAAAAElFTkSuQmCC - + - AAEAAAD/////AQAAAAAAAAAMAgAAAFFTeXN0ZW0uRHJhd2luZywgVmVyc2lvbj0yLjAuMC4wLCBDdWx0 + AAEAAAD/////AQAAAAAAAAAMAgAAAFFTeXN0ZW0uRHJhd2luZywgVmVyc2lvbj00LjAuMC4wLCBDdWx0 dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWIwM2Y1ZjdmMTFkNTBhM2EFAQAAACRTeXN0ZW0uRHJh d2luZy5QcmludGluZy5QYWdlU2V0dGluZ3MHAAAAD3ByaW50ZXJTZXR0aW5ncwVjb2xvcglwYXBlclNp emULcGFwZXJTb3VyY2URcHJpbnRlclJlc29sdXRpb24JbGFuZHNjYXBlB21hcmdpbnMEBAQEBAQEJ1N5 @@ -237,19 +237,52 @@ ZAAAAGQAAAAAAAAAAABZQAAAAAAAAFlAAAAAAAAAWUAAAAAAAABZQAs= - - <?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:ControlLight;}Style3{}Footer{}Style14{}FilterBar{BackColor:Info;}Heading{AlignVert:Center;Border:Flat,ControlDark,0, 1, 0, 1;ForeColor:ControlText;BackColor:Control;Wrap:True;}Style5{}Editor{}Style10{}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 Name="" AlternatingRowStyle="True" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" FilterBar="True" MarqueeStyle="DottedCellBorder" RecordSelectorWidth="17" 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, 500, 212</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, 500, 212</ClientArea><PrintPageHeaderStyle parent="" me="Style15" /><PrintPageFooterStyle parent="" me="Style16" /></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{}RecordSelector{AlignImage:Center;}OddRow{BackColor:ControlLight;}Style3{}Footer{}Style14{}FilterBar{BackColor:Info;}Heading{AlignVert:Center;Border:Flat,ControlDark,0, 1, 0, 1;Wrap:True;BackColor:Control;ForeColor:ControlText;}Style5{}Editor{}Style10{}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 Name="" AlternatingRowStyle="True" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" FilterBar="True" MarqueeStyle="DottedCellBorder" RecordSelectorWidth="17" 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, 534, 187</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, 534, 187</ClientArea><PrintPageHeaderStyle parent="" me="Style15" /><PrintPageFooterStyle parent="" me="Style16" /></Blob> - + + 124, 17 + + + + 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== + + + + + 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== + + + iVBORw0KGgoAAAANSUhEUgAAAAkAAAAJCAYAAADgkQYQAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAA0SURBVChTdYkBCgAgDAL9/6eLIsd0eSCKhw/r9aCLtC88 vAdHMEIXKUIUhMK76EfagglgA6CqHOQpL6GyAAAAAElFTkSuQmCC - + - AAEAAAD/////AQAAAAAAAAAMAgAAAFFTeXN0ZW0uRHJhd2luZywgVmVyc2lvbj0yLjAuMC4wLCBDdWx0 + AAEAAAD/////AQAAAAAAAAAMAgAAAFFTeXN0ZW0uRHJhd2luZywgVmVyc2lvbj00LjAuMC4wLCBDdWx0 dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWIwM2Y1ZjdmMTFkNTBhM2EFAQAAACRTeXN0ZW0uRHJh d2luZy5QcmludGluZy5QYWdlU2V0dGluZ3MHAAAAD3ByaW50ZXJTZXR0aW5ncwVjb2xvcglwYXBlclNp emULcGFwZXJTb3VyY2URcHJpbnRlclJlc29sdXRpb24JbGFuZHNjYXBlB21hcmdpbnMEBAQEBAQEJ1N5 @@ -276,8 +309,56 @@ ZAAAAGQAAAAAAAAAAABZQAAAAAAAAFlAAAAAAAAAWUAAAAAAAABZQAs= - - <?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:ControlLight;}Style3{}Footer{}Style14{}FilterBar{BackColor:Info;}Heading{AlignVert:Center;Border:Flat,ControlDark,0, 1, 0, 1;ForeColor:ControlText;BackColor:Control;Wrap:True;}Style5{}Editor{}Style10{}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 Name="" AlternatingRowStyle="True" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" FilterBar="True" MarqueeStyle="DottedCellBorder" RecordSelectorWidth="17" 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, 534, 212</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, 534, 212</ClientArea><PrintPageHeaderStyle parent="" me="Style15" /><PrintPageFooterStyle parent="" me="Style16" /></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{}RecordSelector{AlignImage:Center;}OddRow{BackColor:ControlLight;}Style3{}Footer{}Style14{}FilterBar{BackColor:Info;}Heading{AlignVert:Center;Border:Flat,ControlDark,0, 1, 0, 1;Wrap:True;BackColor:Control;ForeColor:ControlText;}Style5{}Editor{}Style10{}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 Name="" AlternatingRowStyle="True" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" FilterBar="True" MarqueeStyle="DottedCellBorder" RecordSelectorWidth="17" 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, 500, 212</ClientRect><BorderSide>0</BorderSide><Level>0</Level><AllowHorizontalSplit>False</AllowHorizontalSplit><AllowVerticalSplit>False</AllowVerticalSplit></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, 500, 212</ClientArea><PrintPageHeaderStyle parent="" me="Style15" /><PrintPageFooterStyle parent="" me="Style16" /></Blob> + + + + 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 + @@ -287,7 +368,7 @@ - <?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{}RecordSelector{AlignImage:Center;}Inactive{ForeColor:InactiveCaptionText;BackColor:InactiveCaption;}OddRow{}Style14{}Footer{}Heading{Wrap:True;Border:Flat,ControlDark,0, 1, 0, 1;AlignVert:Center;BackColor:Control;ForeColor:ControlText;}Style5{}Editor{}Style10{}FilterWatermark{ForeColor:InfoText;BackColor:Info;}Style3{}Selected{ForeColor:HighlightText;BackColor:Highlight;}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.DropdownView Name="" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" MarqueeStyle="DottedCellBorder" RecordSelectorWidth="17" DefRecSelWidth="17" RecordSelectors="False" 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, 98, 148</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="FilterBar" me="FilterWatermark" /><Style parent="Caption" me="Group" /></NamedStyles><vertSplits>1</vertSplits><horzSplits>1</horzSplits><Layout>None</Layout><DefaultRecSelWidth>17</DefaultRecSelWidth><ClientArea>0, 0, 98, 148</ClientArea></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{}RecordSelector{AlignImage:Center;}Inactive{ForeColor:InactiveCaptionText;BackColor:InactiveCaption;}OddRow{}Style14{}Footer{}Heading{ForeColor:ControlText;Border:Flat,ControlDark,0, 1, 0, 1;AlignVert:Center;BackColor:Control;Wrap:True;}Style5{}Editor{}Style10{}FilterWatermark{ForeColor:InfoText;BackColor:Info;}Style3{}Selected{ForeColor:HighlightText;BackColor:Highlight;}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.DropdownView Name="" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" MarqueeStyle="DottedCellBorder" RecordSelectorWidth="17" DefRecSelWidth="17" RecordSelectors="False" 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, 98, 148</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="FilterBar" me="FilterWatermark" /><Style parent="Caption" me="Group" /></NamedStyles><vertSplits>1</vertSplits><horzSplits>1</horzSplits><Layout>None</Layout><DefaultRecSelWidth>17</DefaultRecSelWidth><ClientArea>0, 0, 98, 148</ClientArea></Blob> @@ -297,7 +378,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{}RecordSelector{AlignImage:Center;}OddRow{}Style14{}Footer{}FilterBar{}Heading{AlignVert:Center;Border:Flat,ControlDark,0, 1, 0, 1;ForeColor:ControlText;BackColor:Control;Wrap:True;}Style5{}Editor{}Style10{}FilterWatermark{ForeColor:InfoText;BackColor:Info;}Style3{}Selected{ForeColor:HighlightText;BackColor:Highlight;}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.DropdownView Name="" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" MarqueeStyle="DottedCellBorder" RecordSelectorWidth="17" DefRecSelWidth="17" RecordSelectors="False" 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, 98, 148</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="FilterBar" me="FilterWatermark" /><Style parent="Caption" me="Group" /></NamedStyles><vertSplits>1</vertSplits><horzSplits>1</horzSplits><Layout>None</Layout><DefaultRecSelWidth>17</DefaultRecSelWidth><ClientArea>0, 0, 98, 148</ClientArea></Blob> + <?xml version="1.0"?><Blob><Styles type="C1.Win.C1TrueDBGrid.Design.ContextWrapper"><Data>HighlightRow{ForeColor:HighlightText;BackColor:Highlight;}Style8{}Style7{}EvenRow{BackColor:Aqua;}Normal{}RecordSelector{AlignImage:Center;}OddRow{}Style14{}Footer{}FilterBar{}Heading{AlignVert:Center;Border:Flat,ControlDark,0, 1, 0, 1;Wrap:True;BackColor:Control;ForeColor:ControlText;}Style5{}Editor{}Style10{}FilterWatermark{ForeColor:InfoText;BackColor:Info;}Style3{}Selected{ForeColor:HighlightText;BackColor:Highlight;}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.DropdownView Name="" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" MarqueeStyle="DottedCellBorder" RecordSelectorWidth="17" DefRecSelWidth="17" RecordSelectors="False" 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, 98, 148</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="FilterBar" me="FilterWatermark" /><Style parent="Caption" me="Group" /></NamedStyles><vertSplits>1</vertSplits><horzSplits>1</horzSplits><Layout>None</Layout><DefaultRecSelWidth>17</DefaultRecSelWidth><ClientArea>0, 0, 98, 148</ClientArea></Blob> @@ -308,7 +389,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAFFTeXN0ZW0uRHJhd2luZywgVmVyc2lvbj0yLjAuMC4wLCBDdWx0 + AAEAAAD/////AQAAAAAAAAAMAgAAAFFTeXN0ZW0uRHJhd2luZywgVmVyc2lvbj00LjAuMC4wLCBDdWx0 dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWIwM2Y1ZjdmMTFkNTBhM2EFAQAAACRTeXN0ZW0uRHJh d2luZy5QcmludGluZy5QYWdlU2V0dGluZ3MHAAAAD3ByaW50ZXJTZXR0aW5ncwVjb2xvcglwYXBlclNp emULcGFwZXJTb3VyY2URcHJpbnRlclJlc29sdXRpb24JbGFuZHNjYXBlB21hcmdpbnMEBAQEBAQEJ1N5 @@ -336,6 +417,6 @@ - <?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:ControlLight;}Style3{}Footer{}Style14{}FilterBar{BackColor:Info;}Heading{AlignVert:Center;Border:Flat,ControlDark,0, 1, 0, 1;ForeColor:ControlText;BackColor:Control;Wrap:True;}Style5{}Editor{}Style10{}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 Name="" AlternatingRowStyle="True" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" FilterBar="True" MarqueeStyle="DottedCellBorder" RecordSelectorWidth="17" 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, 1046, 187</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, 1046, 187</ClientArea><PrintPageHeaderStyle parent="" me="Style15" /><PrintPageFooterStyle parent="" me="Style16" /></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{}RecordSelector{AlignImage:Center;}OddRow{BackColor:ControlLight;}Style3{}Footer{}Style14{}FilterBar{BackColor:Info;}Heading{AlignVert:Center;Border:Flat,ControlDark,0, 1, 0, 1;Wrap:True;BackColor:Control;ForeColor:ControlText;}Style5{}Editor{}Style10{}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 Name="" AlternatingRowStyle="True" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" FilterBar="True" MarqueeStyle="DottedCellBorder" RecordSelectorWidth="17" 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, 1046, 187</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, 1046, 187</ClientArea><PrintPageHeaderStyle parent="" me="Style15" /><PrintPageFooterStyle parent="" me="Style16" /></Blob> \ No newline at end of file diff --git a/DPM2016/Klassen/clsStammdaten_Bez.vb b/DPM2016/Klassen/clsStammdaten_Bez.vb index a4ad8e9..52270d8 100644 --- a/DPM2016/Klassen/clsStammdaten_Bez.vb +++ b/DPM2016/Klassen/clsStammdaten_Bez.vb @@ -1,6 +1,6 @@ Public Class clsStammdaten_Bez - + Dim spalten As New Tabellenspalte Dim m_connectionstring As String Property Connectionstring As String Get @@ -19,6 +19,7 @@ Set(value As String) m_tablename_left = value get_data_left() + Me.GroupBox1.Text = value End Set End Property @@ -28,8 +29,17 @@ Return m_tablename_right End Get Set(value As String) - m_tablename_left = value + m_tablename_right = value get_data_right() + Me.GroupBox2.Text = value + If value = "Tarif" Or value = "Dentotar" Then + Me.ToolStrip2.Visible = True + If value = "Tarif" Then KeyField_right = "nrtarif" + If value = "Dentotar" Then KeyField_right = "LeistungNrNeu" + Else + Me.ToolStrip2.Visible = False + End If + End Set End Property @@ -41,6 +51,7 @@ Set(value As String) m_tablename_bottom = value get_data_bottom() + Me.GroupBox3.Text = value End Set End Property @@ -94,14 +105,17 @@ db_left.dsDaten.Tables.Clear() db_left.Get_Tabledata(Me.Tablename_left) Me.c1Datenleft.DataSource = db_left.dsDaten.Tables(0) + spalten.Spaltentitel_aktualisieren(Me.c1Datenleft, Me.Tablename_left, db_left.dsDaten.Tables(0)) + Catch End Try End Sub Private Sub get_data_right() Try db_right.dsDaten.Tables.Clear() - db_right.Get_Tabledata(Me.Tablename_left) + db_right.Get_Tabledata(Me.Tablename_right) Me.c1DatenRight.DataSource = db_right.dsDaten.Tables(0) + spalten.Spaltentitel_aktualisieren(Me.c1DatenRight, Me.Tablename_right, db_right.dsDaten.Tables(0)) Catch End Try End Sub @@ -111,7 +125,7 @@ db_bottom.dsDaten.Tables.Clear() db_bottom.Get_Tabledata(Me.Tablename_bottom, wherestatement) Me.c1DatenBottom.DataSource = db_bottom.dsDaten.Tables(0) - + spalten.Spaltentitel_aktualisieren(Me.c1DatenBottom, Me.Tablename_bottom, db_bottom.dsDaten.Tables(0)) Me.C1DropDownLeft.DataSource = db_left.dsDaten.Tables(0) Me.C1DropDownLeft.DisplayMember = Me.Keyfieldbez_left @@ -138,6 +152,7 @@ Private Sub clsStammdaten_Bez_Load(sender As Object, e As EventArgs) Handles Me.Load Me.BtnFocusRight.Left = Me.Panel1.Width - 10 - Me.BtnFocusRight.Width Me.BtnVerbinden.Left = Me.SplitContainer2.SplitterDistance - (Me.BtnVerbinden.Width / 2) + clsStammdaten_Bez_Resize(sender, e) End Sub Private Sub clsStammdaten_Bez_Resize(sender As Object, e As EventArgs) Handles Me.Resize @@ -189,10 +204,27 @@ End Sub Private Sub BtnVerbinden_Click(sender As Object, e As EventArgs) Handles BtnVerbinden.Click + Dim s As String + If Me.GroupBox2.Text = "Dentotar" Then + s = Me.c1DatenRight.Columns(KeyField_right).Value + s = s.Replace(".", "") + If Len(s) < 5 Then + MsgBox("Bitte wählen Sie eine Tarifpostionen mit einer 5-stelligen Nummer") + Exit Sub + End If + End If + Dim r As DataRow r = db_bottom.dsDaten.Tables(0).NewRow + If Me.GroupBox2.Text = "Dentotar" Then + r("Dentotar") = True + r("nrtarif") = s + + Else + r("Dentotar") = False + r(KeyField_right) = Me.c1DatenRight.Columns(KeyField_right).Value + End If r(KeyField_left) = Me.c1Datenleft.Columns(KeyField_left).Value - r(KeyField_right) = Me.c1DatenRight.Columns(KeyField_right).Value r("erstellt_am") = Now r("mutiert_am") = Now r("mutierer") = Globals.actuser @@ -205,4 +237,12 @@ Private Sub ToolStripButton5_Click(sender As Object, e As EventArgs) Handles ToolStripButton5.Click db_bottom.Update_Data() End Sub + + Private Sub btnStandard_Click(sender As Object, e As EventArgs) Handles btnStandard.Click + Me.Tablename_right = "Tarif" + End Sub + + Private Sub btnDentotar_Click(sender As Object, e As EventArgs) Handles btnDentotar.Click + Me.Tablename_right = "Dentotar" + End Sub End Class diff --git a/DPM2016/Klassen/clsStammdaten_flat.Designer.vb b/DPM2016/Klassen/clsStammdaten_flat.Designer.vb index c33bdf0..24cfd7f 100644 --- a/DPM2016/Klassen/clsStammdaten_flat.Designer.vb +++ b/DPM2016/Klassen/clsStammdaten_flat.Designer.vb @@ -53,16 +53,20 @@ Partial Class clsStammdaten_flat Me.C1TrueDBDropdown2 = New C1.Win.C1TrueDBGrid.C1TrueDBDropdown() Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.NeuerBenutzerEröffnenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.PasswortÄndernToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ctxMenuTarif = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.TarifBearbeitenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.NeuerTarifeintragErstellenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.PasswortÄndernToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.ctxmenuDentotar = New System.Windows.Forms.ContextMenuStrip(Me.components) + Me.ContextMenuStrip2 = New System.Windows.Forms.ContextMenuStrip(Me.components) + Me.TarifBearbeitenToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem() CType(Me.c1daten, System.ComponentModel.ISupportInitialize).BeginInit() Me.ToolStrip1.SuspendLayout() CType(Me.C1TrueDBDropdown1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.C1TrueDBDropdown2, System.ComponentModel.ISupportInitialize).BeginInit() Me.ContextMenuStrip1.SuspendLayout() Me.ctxMenuTarif.SuspendLayout() + Me.ContextMenuStrip2.SuspendLayout() Me.SuspendLayout() ' 'c1daten @@ -227,7 +231,7 @@ Partial Class clsStammdaten_flat ' Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.NeuerBenutzerEröffnenToolStripMenuItem, Me.PasswortÄndernToolStripMenuItem}) Me.ContextMenuStrip1.Name = "ContextMenuStrip1" - Me.ContextMenuStrip1.Size = New System.Drawing.Size(204, 70) + Me.ContextMenuStrip1.Size = New System.Drawing.Size(204, 48) ' 'NeuerBenutzerEröffnenToolStripMenuItem ' @@ -235,6 +239,12 @@ Partial Class clsStammdaten_flat Me.NeuerBenutzerEröffnenToolStripMenuItem.Size = New System.Drawing.Size(203, 22) Me.NeuerBenutzerEröffnenToolStripMenuItem.Text = "Neuer Benutzer eröffnen" ' + 'PasswortÄndernToolStripMenuItem + ' + Me.PasswortÄndernToolStripMenuItem.Name = "PasswortÄndernToolStripMenuItem" + Me.PasswortÄndernToolStripMenuItem.Size = New System.Drawing.Size(203, 22) + Me.PasswortÄndernToolStripMenuItem.Text = "Passwort ändern" + ' 'ctxMenuTarif ' Me.ctxMenuTarif.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.TarifBearbeitenToolStripMenuItem, Me.NeuerTarifeintragErstellenToolStripMenuItem}) @@ -253,11 +263,22 @@ Partial Class clsStammdaten_flat Me.NeuerTarifeintragErstellenToolStripMenuItem.Size = New System.Drawing.Size(216, 22) Me.NeuerTarifeintragErstellenToolStripMenuItem.Text = "Neuer Tarifeintrag erstellen" ' - 'PasswortÄndernToolStripMenuItem + 'ctxmenuDentotar ' - Me.PasswortÄndernToolStripMenuItem.Name = "PasswortÄndernToolStripMenuItem" - Me.PasswortÄndernToolStripMenuItem.Size = New System.Drawing.Size(203, 22) - Me.PasswortÄndernToolStripMenuItem.Text = "Passwort ändern" + Me.ctxmenuDentotar.Name = "ctxmenuDentotar" + Me.ctxmenuDentotar.Size = New System.Drawing.Size(61, 4) + ' + 'ContextMenuStrip2 + ' + Me.ContextMenuStrip2.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.TarifBearbeitenToolStripMenuItem1}) + Me.ContextMenuStrip2.Name = "ContextMenuStrip2" + Me.ContextMenuStrip2.Size = New System.Drawing.Size(181, 48) + ' + 'TarifBearbeitenToolStripMenuItem1 + ' + Me.TarifBearbeitenToolStripMenuItem1.Name = "TarifBearbeitenToolStripMenuItem1" + Me.TarifBearbeitenToolStripMenuItem1.Size = New System.Drawing.Size(180, 22) + Me.TarifBearbeitenToolStripMenuItem1.Text = "Tarif bearbeiten" ' 'clsStammdaten_flat ' @@ -276,6 +297,7 @@ Partial Class clsStammdaten_flat CType(Me.C1TrueDBDropdown2, System.ComponentModel.ISupportInitialize).EndInit() Me.ContextMenuStrip1.ResumeLayout(False) Me.ctxMenuTarif.ResumeLayout(False) + Me.ContextMenuStrip2.ResumeLayout(False) Me.ResumeLayout(False) Me.PerformLayout() @@ -297,4 +319,7 @@ Partial Class clsStammdaten_flat Friend WithEvents TarifBearbeitenToolStripMenuItem As ToolStripMenuItem Friend WithEvents NeuerTarifeintragErstellenToolStripMenuItem As ToolStripMenuItem Friend WithEvents PasswortÄndernToolStripMenuItem As ToolStripMenuItem + Friend WithEvents ctxmenuDentotar As ContextMenuStrip + Friend WithEvents ContextMenuStrip2 As ContextMenuStrip + Friend WithEvents TarifBearbeitenToolStripMenuItem1 As ToolStripMenuItem End Class diff --git a/DPM2016/Klassen/clsStammdaten_flat.resx b/DPM2016/Klassen/clsStammdaten_flat.resx index 8a493fd..9835bd8 100644 --- a/DPM2016/Klassen/clsStammdaten_flat.resx +++ b/DPM2016/Klassen/clsStammdaten_flat.resx @@ -155,27 +155,27 @@ - <?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{}RecordSelector{AlignImage:Center;}Inactive{ForeColor:InactiveCaptionText;BackColor:InactiveCaption;}OddRow{BackColor:ControlLight;}Style3{}Footer{}Style14{}Heading{ForeColor:ControlText;Border:Flat,ControlDark,0, 1, 0, 1;AlignVert:Center;BackColor:Control;Wrap:True;}Style5{}Editor{}Style10{}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;}Style1{}Caption{AlignHorz:Center;}Style6{}FilterBar{BackColor:Info;}</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"><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, 756, 374</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, 756, 374</ClientArea><PrintPageHeaderStyle parent="" me="Style15" /><PrintPageFooterStyle parent="" me="Style16" /></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{}RecordSelector{AlignImage:Center;}OddRow{BackColor:ControlLight;}Style3{}Footer{}Style14{}FilterBar{BackColor:Info;}Heading{AlignVert:Center;Border:Flat,ControlDark,0, 1, 0, 1;ForeColor:ControlText;BackColor:Control;Wrap:True;}Style5{}Editor{}Style10{}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 Name="" AlternatingRowStyle="True" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" FetchRowStyles="True" FilterBar="True" MarqueeStyle="DottedCellBorder" RecordSelectorWidth="17" 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, 756, 374</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, 756, 374</ClientArea><PrintPageHeaderStyle parent="" me="Style15" /><PrintPageFooterStyle parent="" me="Style16" /></Blob> - 17, 17 + 163, 17 iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAK0SURBVDhPnZLfS1NhGMdfCPoDuummi+i6qwYmlYjb3Obx - 7MzN1dY5Z9tJV86Min5BlvZb07Is1CKHqVQYlVoZaZmlaGQopSLmkuwigoooguii4NNRY7HLeuAD7/PC - ++H9Pu8r/qc+Tw8EP8yO/mzZm8mfrYVqK8/tbD+SS+exOaQkHUclrpfZeRzfyafJHj6O3eXb636u7rem - CjrKZVal21m91kZ6xl/S1lpZaVnH90QPic5DjNT7+ZJ4QttBR6qgvVQm0+rEZpewO1xJrNlO0tbZeNUS - YeSSznBDkE8T3dw8nJMqcNQKpMpF5Nh9SC4FKceNJMm4XDIZVonJZoPhiyGe1gV5P9IxH/XPUSFsJwWJ - 9604TUlulobbGUCR/CiyF9ntIcvhZjweZqhep792I7OD17hXoSwIbJWCsbeNNPcLMisE9hqB87xALl2K - VwniyfOTnetj9JJG/zmd7/eXM9XbRHeVF+GqFjx7U0F8SNA4aK5nCnn+JsKLd+F5yXpPmPz8IJInwPMG - lb6zGj96VjBxr57eGv+C4FFiD/FRQXxE0DQuaJ4UvPwawXFOEMwvZEMghDtfY6guQO+ZII17nLzoOMmT - 2sB8BIvdjNA1tZnWhCBrLsIpgeOsIK9sGboaRdUNfEGDgVo/D06v59YRhWfXyhmsU5NDtGRXCTpnfDjP - CIzALgytBCNchGFEiRgFBEJR+mq83K/20VXpZeDyboYvhFKe0eI0r6xULyZqbCdaWExhtGieAhNtU4yH - 1R66KvK4fdxDT32M0cZIikC0lKxhS3EJxbEdFG/dliRmUlC0nQdVMndOKLQfc3PndIixpgKEruvoWghN - C6Oqc5hrVTN7NYlq9hs26uyLBbhSrpg/UObG0TwmWzcvDPFfKdXT9jccyPg1fSWWGuEfaonJKiGE5Tdo - FcKGVVlc7gAAAABJRU5ErkJggg== + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAK1SURBVDhPnZLfS1NhGMdfCPoDuummi+i6qwYWZYjb3Obx + 7MzN1dY5Z9tJV86Min5BVpZWmpa/wlnkMJWKolIrozT7oWioKGUh1YrsIiKKKILoouDTUWOxy3rgA+/z + wvvh/T7vK/6nPr8cCn6YmfzZsSeLP1vzdak8r6erIo+eI7NIKborJS4ftPMgsYNP0318nLrJt1eDXNhn + TRd0l8usWGVn5Robq9b+JWONleWWTL4n+0j2HGIi7udL8iGXDjjSBV1lMllWJza7hN3hSmHNcZKRaeNF + R4SJszpjLUE+PbvD1cO56QJHo0CqXkCu3YfkUpBy3UiSjMsls9YqMd1uMHYmxKPmIO8nuuei/jkqhO24 + IPm+E6cpycvWcDsDKJIfRfYiuz1kO9w8TYQZiesMNm5gZvgit6qUeYGtWjD1tpX2QUFWlcBeJ3CeEshl + i/EqQTz5fnLyfEye1Rhs0vl+eynPB9q4U+NFuGoFo2+qSIwIWofN9esixt9EePwuPCdZ5wlTUBBE8gQY + b1G536Dxo28Zz27FGajzzwvuJXeTmBQkJgRtTwXt04InXyM4mgTBgiLWB0K4CzRGmgMM1Adp3e3kcfdx + HjYG5iJY7GaE3ueb6EwKsmcjnBA4GgT5B5egq1FU3cAXNBhq9NN/ch3XKhRGL5Yz3KymhmjJqRH0vPbh + rBcYgZ0YWilGuBjDiBIxCgmEotyv83K71kdvtZehc7sYOx1Ke0aL07yyUruQqLGNaFEJRdHiOQpNtI0x + 7tZ66K3K5/pRD33xGJOtkTSB6ChdzeaSUkpi2ynZsjVFzKSweBv9NTI3jil0HXFz42SIqbZChK7r6FoI + TQujqrOYa1UzezWFavbrN+jsjQU4X66YP1DmSmU+052b5of4r5TpGfvi+zN/vTwfS4/wD7XIZIUQwvIb + Y67Cg1IxmR0AAAAASUVORK5CYII= @@ -196,16 +196,16 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIWSURBVDhPlY9dSJNhFMffCylqeuHIEr+obaWwqMyLpCsL - +sAwJRlBBNLozoYSXhQFc7SujAj6ALsYte82a++7rTndalsyuwlBC8m1Rjitvb0zt7mLNnL/nsFz2Tb7 - wZ/zPOf8zznPw2wFn0TCzbS13aTX/2O6p+fRA4aBrrYWfqn04zuZrI6WKlNYfNK5EIvAdfsu7pEh4yIR - XjY0YE4i6aaW8vyevyGkJjuQiDxFdInH+F4JHlZVwSkW36KW0mxGtfpfvrNIcK1YMTFY9Z1C5IeA16qh - b9RSmkJMeyYVVCDhkpMBUqxMiCF42vHdtg2x+Ret1PZvIh7Vdj5wNceTzcmpE4jba7A21UUGyfDHJ1JR - W2k2F4b9vFuOtenT5AUHyeYOCN7jyHh2h6mlNIXIdWXS04mf7iNYDyjAky+sv+3D7P0DhU+2umpqK01+ - 8XGcd7cj+/4ahMljSAcvIUm2F4L7L1BLeXKfnyG1xCI1dwfpN71k+3nkg0cnaLk8Y2OXReBZZL68wsZy - ANm4H9lw9wYtV6a5eY/8Yl8X0l9dyPFhIB+1ZVY/7KLlyjS2tJzbsbMaTfX1zuTybCNNb41QKLRPrVaP - ajQard5kUuh0zwfMZvOgw+EYKYpl2UEiJdEVp9PZz3HcSa/XK6PtDGO32w9ZLJZe0jRgMBiGjEbjCImj - JKqLoudibphIqdfr+61W62GGYZi/U88kSkH5lkEAAAAASUVORK5CYII= + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIXSURBVDhPlY9dSJNhFMffCylqduHIEk2pdyuFRWVeJF1Z + 0AeGKckIIpBGdzaU8KIomKN1ZUHQB9jFqH23Wdv7bs3pVtuK1U0IWki+rRFOa2+buc1dtJH79wyey7bZ + D/6c5znnf855HmYj+FmWe9vWdp1e/4/pnp4H9xgG+ro6BGSyj2/k8npaqk5x/lHnXEyA++Zt3CFDxiUS + PG9sxAzLdlNLZX7PXkumJzuQEB4juiBifDeL+zU14KXSG9RSnvWozvDLfxoJrhVLZgbL/hMQfiTxUj30 + jVrKU4zpTqVDSiTcCjJAhqUJKZLedny3b0Js9lkrtf0bwaveLAYv50WyOTV1DHHHNqxMdZFBcvzxS9TU + Vp71ueGA6FFgZfokecF+srkDSd9RZL07ItRSnqJwVZXyduKn5xBWg0qI5Aurr/sQubuv+MleX0tt5SnM + P4yLnnbk3l9BcvIIMqELSJHtxdDec9RSmfznJ0gvuJCeuYXMq16y/SwKocMTtFyZsbGLEoguZL+8wNpi + ELl4ALlI9xotV6e5eafifF8XMl/dyIsRoBC1Z5c/bKfl6jS1tJzZsrUWuxoa+NTiuyaa3hjhcHiPRqMZ + 1Wq1OoPZrNTrnw5YLJZBp9M5UpLL5RokUhFd4nm+n+O44z6fT07bGcbhcBywWq29pGnAaDQOmUymERJH + SdSURM+l3DCRymAw9NtstoMMwzB/AVAKJEhi14wrAAAAAElFTkSuQmCC @@ -243,191 +243,191 @@ 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 @@ -453,7 +453,7 @@ - <?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{}RecordSelector{AlignImage:Center;}Inactive{ForeColor:InactiveCaptionText;BackColor:InactiveCaption;}OddRow{}Style14{}Footer{}Heading{ForeColor:ControlText;Border:Flat,ControlDark,0, 1, 0, 1;AlignVert:Center;BackColor:Control;Wrap:True;}Style5{}Editor{}Style10{}FilterWatermark{ForeColor:InfoText;BackColor:Info;}Style3{}Selected{ForeColor:HighlightText;BackColor:Highlight;}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.DropdownView Name="" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" MarqueeStyle="DottedCellBorder" RecordSelectorWidth="17" DefRecSelWidth="17" RecordSelectors="False" 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, 213, 148</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="FilterBar" me="FilterWatermark" /><Style parent="Caption" me="Group" /></NamedStyles><vertSplits>1</vertSplits><horzSplits>1</horzSplits><Layout>None</Layout><DefaultRecSelWidth>17</DefaultRecSelWidth><ClientArea>0, 0, 213, 148</ClientArea></Blob> + <?xml version="1.0"?><Blob><Styles type="C1.Win.C1TrueDBGrid.Design.ContextWrapper"><Data>HighlightRow{ForeColor:HighlightText;BackColor:Highlight;}Style8{}Style7{}EvenRow{BackColor:Aqua;}Normal{}RecordSelector{AlignImage:Center;}OddRow{}Style14{}Footer{}FilterBar{}Heading{AlignVert:Center;Border:Flat,ControlDark,0, 1, 0, 1;ForeColor:ControlText;BackColor:Control;Wrap:True;}Style5{}Editor{}Style10{}FilterWatermark{ForeColor:InfoText;BackColor:Info;}Style3{}Selected{ForeColor:HighlightText;BackColor:Highlight;}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.DropdownView Name="" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" MarqueeStyle="DottedCellBorder" RecordSelectorWidth="17" DefRecSelWidth="17" RecordSelectors="False" 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, 213, 148</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="FilterBar" me="FilterWatermark" /><Style parent="Caption" me="Group" /></NamedStyles><vertSplits>1</vertSplits><horzSplits>1</horzSplits><Layout>None</Layout><DefaultRecSelWidth>17</DefaultRecSelWidth><ClientArea>0, 0, 213, 148</ClientArea></Blob> @@ -463,12 +463,18 @@ - <?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{}RecordSelector{AlignImage:Center;}Inactive{ForeColor:InactiveCaptionText;BackColor:InactiveCaption;}OddRow{}Style14{}Footer{}Heading{ForeColor:ControlText;Border:Flat,ControlDark,0, 1, 0, 1;AlignVert:Center;BackColor:Control;Wrap:True;}Style5{}Editor{}Style10{}FilterWatermark{ForeColor:InfoText;BackColor:Info;}Style3{}Selected{ForeColor:HighlightText;BackColor:Highlight;}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.DropdownView Name="" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" MarqueeStyle="DottedCellBorder" RecordSelectorWidth="17" DefRecSelWidth="17" RecordSelectors="False" 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, 231, 148</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="FilterBar" me="FilterWatermark" /><Style parent="Caption" me="Group" /></NamedStyles><vertSplits>1</vertSplits><horzSplits>1</horzSplits><Layout>None</Layout><DefaultRecSelWidth>17</DefaultRecSelWidth><ClientArea>0, 0, 231, 148</ClientArea></Blob> + <?xml version="1.0"?><Blob><Styles type="C1.Win.C1TrueDBGrid.Design.ContextWrapper"><Data>HighlightRow{ForeColor:HighlightText;BackColor:Highlight;}Style8{}Style7{}EvenRow{BackColor:Aqua;}Normal{}RecordSelector{AlignImage:Center;}OddRow{}Style14{}Footer{}FilterBar{}Heading{AlignVert:Center;Border:Flat,ControlDark,0, 1, 0, 1;ForeColor:ControlText;BackColor:Control;Wrap:True;}Style5{}Editor{}Style10{}FilterWatermark{ForeColor:InfoText;BackColor:Info;}Style3{}Selected{ForeColor:HighlightText;BackColor:Highlight;}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.DropdownView Name="" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" MarqueeStyle="DottedCellBorder" RecordSelectorWidth="17" DefRecSelWidth="17" RecordSelectors="False" 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, 231, 148</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="FilterBar" me="FilterWatermark" /><Style parent="Caption" me="Group" /></NamedStyles><vertSplits>1</vertSplits><horzSplits>1</horzSplits><Layout>None</Layout><DefaultRecSelWidth>17</DefaultRecSelWidth><ClientArea>0, 0, 231, 148</ClientArea></Blob> - 124, 17 + 270, 17 - 281, 17 + 427, 17 + + + 17, 17 + + + 550, 17 \ No newline at end of file diff --git a/DPM2016/Klassen/clsStammdaten_flat.vb b/DPM2016/Klassen/clsStammdaten_flat.vb index e3986c9..16575bf 100644 --- a/DPM2016/Klassen/clsStammdaten_flat.vb +++ b/DPM2016/Klassen/clsStammdaten_flat.vb @@ -65,6 +65,7 @@ Public Class clsStammdaten_flat Dim spalten As New Tabellenspalte spalten.Spaltentitel_aktualisieren(Me.c1daten, Me.Tablename, db.dsDaten.Tables(0)) + Me.c1d.ContextMenuStrip = Nothing Select Case Tablename Case "Auswertung" Dim printer As New clsPrinter @@ -78,6 +79,9 @@ Public Class clsStammdaten_flat Me.c1d.ContextMenuStrip = Me.ContextMenuStrip1 Case "Tarif" Me.c1d.ContextMenuStrip = Me.ctxMenuTarif + Case "Dentotar" + Me.c1d.ContextMenuStrip = Me.ctxmenudentotar + End Select Catch ex As Exception End Try @@ -173,30 +177,35 @@ Public Class clsStammdaten_flat Private Sub c1daten_DoubleClick(sender As Object, e As EventArgs) Handles c1daten.DoubleClick Select Case Tablename Case "Dentotar" - Dim f As New frmDentotarDetails - f.Update_Data(Me.c1daten.Columns("LeistungNrNeu").Value) - - f.TextBox2.Text = Me.c1daten.Columns("LeistungD").Value - f.TextBox3.Text = Me.c1daten.Columns("Interpretationd").Value - f.TextBox4.Text = Me.c1daten.Columns("Abrechnungseinheit").Value - f.TextBox5.Text = Me.c1daten.Columns("Taxpunkte_UV_MV_IV").Value - f.TextBox6.Text = Me.c1daten.Columns("PP_MIN").Value - f.TextBox7.Text = Me.c1daten.Columns("PP_Privat").Value - f.TextBox8.Text = Me.c1daten.Columns("PP_Max").Value - f.TextBox9.Text = Me.c1daten.Columns("BetragInCHF").Value - - - - f.ShowDialog() - Me.c1daten.Columns("LeistungD").Value = f.TextBox2.Text - Me.c1daten.Columns("Interpretationd").Value = f.TextBox3.Text - Me.c1daten.Columns("Abrechnungseinheit").Value = f.TextBox4.Text - Me.c1daten.Columns("Taxpunkte_UV_MV_IV").Value = f.TextBox5.Text - Me.c1daten.Columns("PP_MIN").Value = f.TextBox6.Text - Me.c1daten.Columns("PP_Privat").Value = f.TextBox7.Text - Me.c1daten.Columns("PP_Max").Value = f.TextBox8.Text - Me.c1daten.Columns("BetragInCHF").Value = f.TextBox9.Text + Try + Dim f As New frmDentotarDetails + f.Update_Data(Me.c1daten.Columns("LeistungNrNeu").Value) + + f.TextBox2.Text = Me.c1daten.Columns("LeistungD").Value.ToString + f.TextBox3.Text = Me.c1daten.Columns("Interpretationd").Value.ToString + f.TextBox4.Text = Me.c1daten.Columns("Abrechnungseinheit").Value.ToString + f.TextBox5.Text = Me.c1daten.Columns("Taxpunkte_UV_MV_IV").Value.ToString + f.TextBox6.Text = Me.c1daten.Columns("PP_MIN").Value.ToString + f.TextBox7.Text = Me.c1daten.Columns("PP_Privat").Value.ToString + f.TextBox8.Text = Me.c1daten.Columns("PP_Max").Value.ToString + f.TextBox9.Text = Me.c1daten.Columns("BetragInCHF").Value.ToString + + + + f.ShowDialog() + Me.c1daten.Columns("LeistungD").Value = f.TextBox2.Text + Me.c1daten.Columns("Interpretationd").Value = f.TextBox3.Text + Me.c1daten.Columns("Abrechnungseinheit").Value = f.TextBox4.Text + Me.c1daten.Columns("Taxpunkte_UV_MV_IV").Value = f.TextBox5.Text + Me.c1daten.Columns("PP_MIN").Value = f.TextBox6.Text + Me.c1daten.Columns("PP_Privat").Value = f.TextBox7.Text + Me.c1daten.Columns("PP_Max").Value = f.TextBox8.Text + Me.c1daten.Columns("BetragInCHF").Value = f.TextBox9.Text ' Me.c1daten.Columns("LeistungD").Value = f.TextBox1.Text + Catch ex As Exception + MsgBox("Ein Fehler bei der Bearbeitung über den Dialog ist aufgetreten: " + ex.Message + vbCrLf + "Bitte Daten direkt in der Tabelle ändern.", vbExclamation) + End Try + Case "Tarif" Dim f As New frmTarifDetail f.txtnrtarif.Text = Me.c1daten.Columns("nrtarif").Value @@ -266,4 +275,8 @@ Public Class clsStammdaten_flat f.txtPassword.Text = Me.c1daten.Columns("Passwort").Value f.ShowDialog() End Sub + + Private Sub TarifBearbeitenToolStripMenuItem1_Click(sender As Object, e As EventArgs) Handles TarifBearbeitenToolStripMenuItem1.Click + c1daten_DoubleClick(sender, e) + End Sub End Class diff --git a/DPM2016/Sysadmin/frmStammdaten.vb b/DPM2016/Sysadmin/frmStammdaten.vb index 05e412e..f73a331 100644 --- a/DPM2016/Sysadmin/frmStammdaten.vb +++ b/DPM2016/Sysadmin/frmStammdaten.vb @@ -60,6 +60,7 @@ Public Class frmStammdaten Me.ClsStammdaten_flat1.Visible = False Me.ClsStammdaten_Bez1.Visible = True Me.ClsStammdaten_Bez1.Dock = DockStyle.Fill + Me.ClsStammdaten_Bez1.Width = Me.ClsStammdaten_Bez1.Width + 1 Exit Sub End If Me.ClsStammdaten_flat1.Check_Changes() diff --git a/DPM2016/Utils/frmSuche.Designer.vb b/DPM2016/Utils/frmSuche.Designer.vb index 9c7b2fd..c7d1fd5 100644 --- a/DPM2016/Utils/frmSuche.Designer.vb +++ b/DPM2016/Utils/frmSuche.Designer.vb @@ -30,45 +30,50 @@ Partial Class frmSuche Me.ToolStrip1 = New System.Windows.Forms.ToolStrip() Me.tsbtnquit = New System.Windows.Forms.ToolStripButton() Me.SuperTabControl1 = New DevComponents.DotNetBar.SuperTabControl() - Me.SuperTabControlPanel3 = New DevComponents.DotNetBar.SuperTabControlPanel() - Me.Button3 = New System.Windows.Forms.Button() - Me.Label3 = New System.Windows.Forms.Label() - Me.TextBox3 = New System.Windows.Forms.TextBox() - Me.SuperTabItem3 = New DevComponents.DotNetBar.SuperTabItem() + Me.SuperTabControlPanel5 = New DevComponents.DotNetBar.SuperTabControlPanel() + Me.Button6 = New System.Windows.Forms.Button() + Me.Button5 = New System.Windows.Forms.Button() + Me.Label5 = New System.Windows.Forms.Label() + Me.TextBox5 = New System.Windows.Forms.TextBox() + Me.Dokumente = New DevComponents.DotNetBar.SuperTabItem() Me.SuperTabControlPanel4 = New DevComponents.DotNetBar.SuperTabControlPanel() Me.Button4 = New System.Windows.Forms.Button() Me.Label4 = New System.Windows.Forms.Label() Me.TextBox4 = New System.Windows.Forms.TextBox() Me.SuperTabItem4 = New DevComponents.DotNetBar.SuperTabItem() - Me.SuperTabControlPanel2 = New DevComponents.DotNetBar.SuperTabControlPanel() - Me.Button2 = New System.Windows.Forms.Button() - Me.Label2 = New System.Windows.Forms.Label() - Me.TextBox2 = New System.Windows.Forms.TextBox() - Me.SuperTabItem2 = New DevComponents.DotNetBar.SuperTabItem() Me.SuperTabControlPanel1 = New DevComponents.DotNetBar.SuperTabControlPanel() Me.Button1 = New System.Windows.Forms.Button() Me.Label1 = New System.Windows.Forms.Label() Me.TextBox1 = New System.Windows.Forms.TextBox() Me.SuperTabItem1 = New DevComponents.DotNetBar.SuperTabItem() + Me.SuperTabControlPanel2 = New DevComponents.DotNetBar.SuperTabControlPanel() + Me.Button2 = New System.Windows.Forms.Button() + Me.Label2 = New System.Windows.Forms.Label() + Me.TextBox2 = New System.Windows.Forms.TextBox() + Me.SuperTabItem2 = New DevComponents.DotNetBar.SuperTabItem() + Me.SuperTabControlPanel3 = New DevComponents.DotNetBar.SuperTabControlPanel() + Me.Button3 = New System.Windows.Forms.Button() + Me.Label3 = New System.Windows.Forms.Label() + Me.TextBox3 = New System.Windows.Forms.TextBox() + Me.SuperTabItem3 = New DevComponents.DotNetBar.SuperTabItem() Me.C1Daten = New C1.Win.C1TrueDBGrid.C1TrueDBGrid() Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.DettailsAnzeigenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.Dokumente = New DevComponents.DotNetBar.SuperTabItem() - Me.SuperTabControlPanel5 = New DevComponents.DotNetBar.SuperTabControlPanel() - Me.Button5 = New System.Windows.Forms.Button() - Me.Label5 = New System.Windows.Forms.Label() - Me.TextBox5 = New System.Windows.Forms.TextBox() + Me.ContextMenuStrip2 = New System.Windows.Forms.ContextMenuStrip(Me.components) + Me.DokumentAnzeigenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.PatientFirmaAnzeigenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.MenuStrip1.SuspendLayout() Me.ToolStrip1.SuspendLayout() CType(Me.SuperTabControl1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuperTabControl1.SuspendLayout() - Me.SuperTabControlPanel3.SuspendLayout() + Me.SuperTabControlPanel5.SuspendLayout() Me.SuperTabControlPanel4.SuspendLayout() - Me.SuperTabControlPanel2.SuspendLayout() Me.SuperTabControlPanel1.SuspendLayout() + Me.SuperTabControlPanel2.SuspendLayout() + Me.SuperTabControlPanel3.SuspendLayout() CType(Me.C1Daten, System.ComponentModel.ISupportInitialize).BeginInit() Me.ContextMenuStrip1.SuspendLayout() - Me.SuperTabControlPanel5.SuspendLayout() + Me.ContextMenuStrip2.SuspendLayout() Me.SuspendLayout() ' 'MenuStrip1 @@ -129,9 +134,9 @@ Partial Class frmSuche Me.SuperTabControl1.ControlBox.Name = "" Me.SuperTabControl1.ControlBox.SubItems.AddRange(New DevComponents.DotNetBar.BaseItem() {Me.SuperTabControl1.ControlBox.MenuBox, Me.SuperTabControl1.ControlBox.CloseBox}) Me.SuperTabControl1.Controls.Add(Me.SuperTabControlPanel5) + Me.SuperTabControl1.Controls.Add(Me.SuperTabControlPanel1) Me.SuperTabControl1.Controls.Add(Me.SuperTabControlPanel4) Me.SuperTabControl1.Controls.Add(Me.SuperTabControlPanel2) - Me.SuperTabControl1.Controls.Add(Me.SuperTabControlPanel1) Me.SuperTabControl1.Controls.Add(Me.SuperTabControlPanel3) Me.SuperTabControl1.Dock = System.Windows.Forms.DockStyle.Top Me.SuperTabControl1.Location = New System.Drawing.Point(0, 49) @@ -145,49 +150,59 @@ Partial Class frmSuche Me.SuperTabControl1.Tabs.AddRange(New DevComponents.DotNetBar.BaseItem() {Me.SuperTabItem1, Me.SuperTabItem2, Me.SuperTabItem3, Me.SuperTabItem4, Me.Dokumente}) Me.SuperTabControl1.Text = "SuperTabControl1" ' - 'SuperTabControlPanel3 + 'SuperTabControlPanel5 ' - Me.SuperTabControlPanel3.Controls.Add(Me.Button3) - Me.SuperTabControlPanel3.Controls.Add(Me.Label3) - Me.SuperTabControlPanel3.Controls.Add(Me.TextBox3) - Me.SuperTabControlPanel3.Dock = System.Windows.Forms.DockStyle.Fill - Me.SuperTabControlPanel3.Location = New System.Drawing.Point(0, 25) - Me.SuperTabControlPanel3.Name = "SuperTabControlPanel3" - Me.SuperTabControlPanel3.Size = New System.Drawing.Size(800, 104) - Me.SuperTabControlPanel3.TabIndex = 0 - Me.SuperTabControlPanel3.TabItem = Me.SuperTabItem3 + Me.SuperTabControlPanel5.Controls.Add(Me.Button6) + Me.SuperTabControlPanel5.Controls.Add(Me.Button5) + Me.SuperTabControlPanel5.Controls.Add(Me.Label5) + Me.SuperTabControlPanel5.Controls.Add(Me.TextBox5) + Me.SuperTabControlPanel5.Dock = System.Windows.Forms.DockStyle.Fill + Me.SuperTabControlPanel5.Location = New System.Drawing.Point(0, 25) + Me.SuperTabControlPanel5.Name = "SuperTabControlPanel5" + Me.SuperTabControlPanel5.Size = New System.Drawing.Size(800, 104) + Me.SuperTabControlPanel5.TabIndex = 0 + Me.SuperTabControlPanel5.TabItem = Me.Dokumente ' - 'Button3 + 'Button6 ' - Me.Button3.Location = New System.Drawing.Point(12, 75) - Me.Button3.Name = "Button3" - Me.Button3.Size = New System.Drawing.Size(75, 23) - Me.Button3.TabIndex = 8 - Me.Button3.Text = "Suchen" - Me.Button3.UseVisualStyleBackColor = True + Me.Button6.Location = New System.Drawing.Point(104, 70) + Me.Button6.Name = "Button6" + Me.Button6.Size = New System.Drawing.Size(151, 23) + Me.Button6.TabIndex = 15 + Me.Button6.Text = "100 neueste Dokumente" + Me.Button6.UseVisualStyleBackColor = True ' - 'Label3 + 'Button5 ' - Me.Label3.AutoSize = True - Me.Label3.Location = New System.Drawing.Point(12, 19) - Me.Label3.Name = "Label3" - Me.Label3.Size = New System.Drawing.Size(61, 13) - Me.Label3.TabIndex = 7 - Me.Label3.Text = "Suchbegriff" + Me.Button5.Location = New System.Drawing.Point(12, 70) + Me.Button5.Name = "Button5" + Me.Button5.Size = New System.Drawing.Size(75, 23) + Me.Button5.TabIndex = 14 + Me.Button5.Text = "Suchen" + Me.Button5.UseVisualStyleBackColor = True ' - 'TextBox3 + 'Label5 ' - Me.TextBox3.Location = New System.Drawing.Point(79, 16) - Me.TextBox3.Name = "TextBox3" - Me.TextBox3.Size = New System.Drawing.Size(154, 20) - Me.TextBox3.TabIndex = 6 + Me.Label5.AutoSize = True + Me.Label5.Location = New System.Drawing.Point(12, 14) + Me.Label5.Name = "Label5" + Me.Label5.Size = New System.Drawing.Size(61, 13) + Me.Label5.TabIndex = 13 + Me.Label5.Text = "Suchbegriff" ' - 'SuperTabItem3 + 'TextBox5 ' - Me.SuperTabItem3.AttachedControl = Me.SuperTabControlPanel3 - Me.SuperTabItem3.GlobalItem = False - Me.SuperTabItem3.Name = "SuperTabItem3" - Me.SuperTabItem3.Text = "Rechnung" + Me.TextBox5.Location = New System.Drawing.Point(79, 11) + Me.TextBox5.Name = "TextBox5" + Me.TextBox5.Size = New System.Drawing.Size(176, 20) + Me.TextBox5.TabIndex = 12 + ' + 'Dokumente + ' + Me.Dokumente.AttachedControl = Me.SuperTabControlPanel5 + Me.Dokumente.GlobalItem = False + Me.Dokumente.Name = "Dokumente" + Me.Dokumente.Text = "Dokumente" ' 'SuperTabControlPanel4 ' @@ -233,6 +248,50 @@ Partial Class frmSuche Me.SuperTabItem4.Name = "SuperTabItem4" Me.SuperTabItem4.Text = "Zahlung" ' + 'SuperTabControlPanel1 + ' + Me.SuperTabControlPanel1.Controls.Add(Me.Button1) + Me.SuperTabControlPanel1.Controls.Add(Me.Label1) + Me.SuperTabControlPanel1.Controls.Add(Me.TextBox1) + Me.SuperTabControlPanel1.Dock = System.Windows.Forms.DockStyle.Fill + Me.SuperTabControlPanel1.Location = New System.Drawing.Point(0, 25) + Me.SuperTabControlPanel1.Name = "SuperTabControlPanel1" + Me.SuperTabControlPanel1.Size = New System.Drawing.Size(800, 104) + Me.SuperTabControlPanel1.TabIndex = 1 + Me.SuperTabControlPanel1.TabItem = Me.SuperTabItem1 + ' + 'Button1 + ' + Me.Button1.Location = New System.Drawing.Point(12, 75) + Me.Button1.Name = "Button1" + Me.Button1.Size = New System.Drawing.Size(75, 23) + Me.Button1.TabIndex = 2 + Me.Button1.Text = "Suchen" + Me.Button1.UseVisualStyleBackColor = True + ' + 'Label1 + ' + Me.Label1.AutoSize = True + Me.Label1.Location = New System.Drawing.Point(12, 18) + Me.Label1.Name = "Label1" + Me.Label1.Size = New System.Drawing.Size(61, 13) + Me.Label1.TabIndex = 1 + Me.Label1.Text = "Suchbegriff" + ' + 'TextBox1 + ' + Me.TextBox1.Location = New System.Drawing.Point(79, 15) + Me.TextBox1.Name = "TextBox1" + Me.TextBox1.Size = New System.Drawing.Size(154, 20) + Me.TextBox1.TabIndex = 0 + ' + 'SuperTabItem1 + ' + Me.SuperTabItem1.AttachedControl = Me.SuperTabControlPanel1 + Me.SuperTabItem1.GlobalItem = False + Me.SuperTabItem1.Name = "SuperTabItem1" + Me.SuperTabItem1.Text = "Patient" + ' 'SuperTabControlPanel2 ' Me.SuperTabControlPanel2.Controls.Add(Me.Button2) @@ -277,49 +336,49 @@ Partial Class frmSuche Me.SuperTabItem2.Name = "SuperTabItem2" Me.SuperTabItem2.Text = "Firma" ' - 'SuperTabControlPanel1 + 'SuperTabControlPanel3 ' - Me.SuperTabControlPanel1.Controls.Add(Me.Button1) - Me.SuperTabControlPanel1.Controls.Add(Me.Label1) - Me.SuperTabControlPanel1.Controls.Add(Me.TextBox1) - Me.SuperTabControlPanel1.Dock = System.Windows.Forms.DockStyle.Fill - Me.SuperTabControlPanel1.Location = New System.Drawing.Point(0, 25) - Me.SuperTabControlPanel1.Name = "SuperTabControlPanel1" - Me.SuperTabControlPanel1.Size = New System.Drawing.Size(800, 104) - Me.SuperTabControlPanel1.TabIndex = 1 - Me.SuperTabControlPanel1.TabItem = Me.SuperTabItem1 + Me.SuperTabControlPanel3.Controls.Add(Me.Button3) + Me.SuperTabControlPanel3.Controls.Add(Me.Label3) + Me.SuperTabControlPanel3.Controls.Add(Me.TextBox3) + Me.SuperTabControlPanel3.Dock = System.Windows.Forms.DockStyle.Fill + Me.SuperTabControlPanel3.Location = New System.Drawing.Point(0, 25) + Me.SuperTabControlPanel3.Name = "SuperTabControlPanel3" + Me.SuperTabControlPanel3.Size = New System.Drawing.Size(800, 104) + Me.SuperTabControlPanel3.TabIndex = 0 + Me.SuperTabControlPanel3.TabItem = Me.SuperTabItem3 ' - 'Button1 + 'Button3 ' - Me.Button1.Location = New System.Drawing.Point(12, 75) - Me.Button1.Name = "Button1" - Me.Button1.Size = New System.Drawing.Size(75, 23) - Me.Button1.TabIndex = 2 - Me.Button1.Text = "Suchen" - Me.Button1.UseVisualStyleBackColor = True + Me.Button3.Location = New System.Drawing.Point(12, 75) + Me.Button3.Name = "Button3" + Me.Button3.Size = New System.Drawing.Size(75, 23) + Me.Button3.TabIndex = 8 + Me.Button3.Text = "Suchen" + Me.Button3.UseVisualStyleBackColor = True ' - 'Label1 + 'Label3 ' - Me.Label1.AutoSize = True - Me.Label1.Location = New System.Drawing.Point(12, 18) - Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(61, 13) - Me.Label1.TabIndex = 1 - Me.Label1.Text = "Suchbegriff" + Me.Label3.AutoSize = True + Me.Label3.Location = New System.Drawing.Point(12, 19) + Me.Label3.Name = "Label3" + Me.Label3.Size = New System.Drawing.Size(61, 13) + Me.Label3.TabIndex = 7 + Me.Label3.Text = "Suchbegriff" ' - 'TextBox1 + 'TextBox3 ' - Me.TextBox1.Location = New System.Drawing.Point(79, 15) - Me.TextBox1.Name = "TextBox1" - Me.TextBox1.Size = New System.Drawing.Size(154, 20) - Me.TextBox1.TabIndex = 0 + Me.TextBox3.Location = New System.Drawing.Point(79, 16) + Me.TextBox3.Name = "TextBox3" + Me.TextBox3.Size = New System.Drawing.Size(154, 20) + Me.TextBox3.TabIndex = 6 ' - 'SuperTabItem1 + 'SuperTabItem3 ' - Me.SuperTabItem1.AttachedControl = Me.SuperTabControlPanel1 - Me.SuperTabItem1.GlobalItem = False - Me.SuperTabItem1.Name = "SuperTabItem1" - Me.SuperTabItem1.Text = "Patient" + Me.SuperTabItem3.AttachedControl = Me.SuperTabControlPanel3 + Me.SuperTabItem3.GlobalItem = False + Me.SuperTabItem3.Name = "SuperTabItem3" + Me.SuperTabItem3.Text = "Rechnung" ' 'C1Daten ' @@ -353,49 +412,23 @@ Partial Class frmSuche Me.DettailsAnzeigenToolStripMenuItem.Size = New System.Drawing.Size(163, 22) Me.DettailsAnzeigenToolStripMenuItem.Text = "Dettails anzeigen" ' - 'Dokumente + 'ContextMenuStrip2 ' - Me.Dokumente.AttachedControl = Me.SuperTabControlPanel5 - Me.Dokumente.GlobalItem = False - Me.Dokumente.Name = "Dokumente" - Me.Dokumente.Text = "Dokumente" + Me.ContextMenuStrip2.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.DokumentAnzeigenToolStripMenuItem, Me.PatientFirmaAnzeigenToolStripMenuItem}) + Me.ContextMenuStrip2.Name = "ContextMenuStrip2" + Me.ContextMenuStrip2.Size = New System.Drawing.Size(197, 70) ' - 'SuperTabControlPanel5 + 'DokumentAnzeigenToolStripMenuItem ' - Me.SuperTabControlPanel5.Controls.Add(Me.Button5) - Me.SuperTabControlPanel5.Controls.Add(Me.Label5) - Me.SuperTabControlPanel5.Controls.Add(Me.TextBox5) - Me.SuperTabControlPanel5.Dock = System.Windows.Forms.DockStyle.Fill - Me.SuperTabControlPanel5.Location = New System.Drawing.Point(0, 25) - Me.SuperTabControlPanel5.Name = "SuperTabControlPanel5" - Me.SuperTabControlPanel5.Size = New System.Drawing.Size(800, 104) - Me.SuperTabControlPanel5.TabIndex = 0 - Me.SuperTabControlPanel5.TabItem = Me.Dokumente + Me.DokumentAnzeigenToolStripMenuItem.Name = "DokumentAnzeigenToolStripMenuItem" + Me.DokumentAnzeigenToolStripMenuItem.Size = New System.Drawing.Size(196, 22) + Me.DokumentAnzeigenToolStripMenuItem.Text = "Dokument anzeigen" ' - 'Button5 + 'PatientFirmaAnzeigenToolStripMenuItem ' - Me.Button5.Location = New System.Drawing.Point(12, 70) - Me.Button5.Name = "Button5" - Me.Button5.Size = New System.Drawing.Size(75, 23) - Me.Button5.TabIndex = 14 - Me.Button5.Text = "Suchen" - Me.Button5.UseVisualStyleBackColor = True - ' - 'Label5 - ' - Me.Label5.AutoSize = True - Me.Label5.Location = New System.Drawing.Point(12, 14) - Me.Label5.Name = "Label5" - Me.Label5.Size = New System.Drawing.Size(61, 13) - Me.Label5.TabIndex = 13 - Me.Label5.Text = "Suchbegriff" - ' - 'TextBox5 - ' - Me.TextBox5.Location = New System.Drawing.Point(79, 11) - Me.TextBox5.Name = "TextBox5" - Me.TextBox5.Size = New System.Drawing.Size(154, 20) - Me.TextBox5.TabIndex = 12 + Me.PatientFirmaAnzeigenToolStripMenuItem.Name = "PatientFirmaAnzeigenToolStripMenuItem" + Me.PatientFirmaAnzeigenToolStripMenuItem.Size = New System.Drawing.Size(196, 22) + Me.PatientFirmaAnzeigenToolStripMenuItem.Text = "Patient/Firma anzeigen" ' 'frmSuche ' @@ -414,18 +447,19 @@ Partial Class frmSuche Me.ToolStrip1.PerformLayout() CType(Me.SuperTabControl1, System.ComponentModel.ISupportInitialize).EndInit() Me.SuperTabControl1.ResumeLayout(False) - Me.SuperTabControlPanel3.ResumeLayout(False) - Me.SuperTabControlPanel3.PerformLayout() + Me.SuperTabControlPanel5.ResumeLayout(False) + Me.SuperTabControlPanel5.PerformLayout() Me.SuperTabControlPanel4.ResumeLayout(False) Me.SuperTabControlPanel4.PerformLayout() - Me.SuperTabControlPanel2.ResumeLayout(False) - Me.SuperTabControlPanel2.PerformLayout() Me.SuperTabControlPanel1.ResumeLayout(False) Me.SuperTabControlPanel1.PerformLayout() + Me.SuperTabControlPanel2.ResumeLayout(False) + Me.SuperTabControlPanel2.PerformLayout() + Me.SuperTabControlPanel3.ResumeLayout(False) + Me.SuperTabControlPanel3.PerformLayout() CType(Me.C1Daten, System.ComponentModel.ISupportInitialize).EndInit() Me.ContextMenuStrip1.ResumeLayout(False) - Me.SuperTabControlPanel5.ResumeLayout(False) - Me.SuperTabControlPanel5.PerformLayout() + Me.ContextMenuStrip2.ResumeLayout(False) Me.ResumeLayout(False) Me.PerformLayout() @@ -465,4 +499,8 @@ Partial Class frmSuche Friend WithEvents Button5 As Button Friend WithEvents Label5 As Label Friend WithEvents TextBox5 As TextBox + Friend WithEvents Button6 As Button + Friend WithEvents ContextMenuStrip2 As ContextMenuStrip + Friend WithEvents DokumentAnzeigenToolStripMenuItem As ToolStripMenuItem + Friend WithEvents PatientFirmaAnzeigenToolStripMenuItem As ToolStripMenuItem End Class diff --git a/DPM2016/Utils/frmSuche.resx b/DPM2016/Utils/frmSuche.resx index 6ee26ab..a915fa7 100644 --- a/DPM2016/Utils/frmSuche.resx +++ b/DPM2016/Utils/frmSuche.resx @@ -182,6 +182,9 @@ - <?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:ControlLight;}Style3{}Footer{}Style14{}FilterBar{BackColor:Info;}Heading{AlignVert:Center;Border:Flat,ControlDark,0, 1, 0, 1;Wrap:True;BackColor:Control;ForeColor:ControlText;}Style5{}Editor{}Style10{}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 Name="" AlternatingRowStyle="True" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" FilterBar="True" MarqueeStyle="DottedCellBorder" RecordSelectorWidth="17" 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, 798, 270</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, 798, 270</ClientArea><PrintPageHeaderStyle parent="" me="Style15" /><PrintPageFooterStyle parent="" me="Style16" /></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{}RecordSelector{AlignImage:Center;}OddRow{BackColor:ControlLight;}Style3{}Footer{}Style14{}FilterBar{BackColor:Info;}Heading{AlignVert:Center;Border:Flat,ControlDark,0, 1, 0, 1;ForeColor:ControlText;BackColor:Control;Wrap:True;}Style5{}Editor{}Style10{}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 Name="" AlternatingRowStyle="True" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" FilterBar="True" MarqueeStyle="DottedCellBorder" RecordSelectorWidth="17" 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, 798, 270</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, 798, 270</ClientArea><PrintPageHeaderStyle parent="" me="Style15" /><PrintPageFooterStyle parent="" me="Style16" /></Blob> + + 388, 17 + \ No newline at end of file diff --git a/DPM2016/Utils/frmSuche.vb b/DPM2016/Utils/frmSuche.vb index 9446506..25a9576 100644 --- a/DPM2016/Utils/frmSuche.vb +++ b/DPM2016/Utils/frmSuche.vb @@ -1,4 +1,5 @@ -Public Class frmSuche +Imports System.IO +Public Class frmSuche Dim m_dokumentsuche As Boolean Property Dokumentsuche As Boolean @@ -32,7 +33,7 @@ Try - key = Me.C1Daten.Columns(0).Value + Key = Me.C1Daten.Columns(0).Value If Me.Dokumentsuche Then Me.DialogResult = DialogResult.OK @@ -44,14 +45,14 @@ End Try Try - key = Me.C1Daten.Columns(0).Value + Key = Me.C1Daten.Columns(0).Value Select Case Me.SuperTabControl1.SelectedTab.Text Case "Patient" Cursor = Cursors.WaitCursor Dim f As New Patient f.MdiParent = Me.MdiParent f.Show() - f.PatientNr = key + f.PatientNr = Key Cursor = Cursors.Default Case "Firma" @@ -59,15 +60,15 @@ Dim f As New frmFirma f.MdiParent = Me.MdiParent f.Show() - f.Firmanr = key + f.Firmanr = Key Cursor = Cursors.Default Case "Rechnung", "Zahlung" - key = Me.C1Daten.Columns("DebitorNr").Value - If key < 49999 Then + Key = Me.C1Daten.Columns("DebitorNr").Value + If Key < 49999 Then Cursor = Cursors.WaitCursor Dim f As New Patient f.MdiParent = Me.MdiParent - f.PatientNr = key + f.PatientNr = Key f.Show() Cursor = Cursors.Default @@ -76,9 +77,11 @@ Dim f As New frmFirma f.MdiParent = Me.MdiParent f.Show() - f.Firmanr = key + f.Firmanr = Key Cursor = Cursors.Default End If + Case "Dokumente" + DokumentAnzeigenToolStripMenuItem_Click(sender, e) End Select Catch End Try @@ -163,6 +166,101 @@ Me.C1Date_DoubleClick(sender, e) End Sub + + Private Sub Button6_Click(sender As Object, e As EventArgs) Handles Button6.Click + Dim db As New clsDB + db.Get_Tabledata("Dokumente", "", "SELECT top 100 nreintrag, dbo.get_name(Keyvalue) AS Empfaenger, bezeichnung, beschreibung, pfad, erstellt_am, Keyvalue FROM dbo.DMS_Dokument where aktiv=1 order by erstellt_am desc") + Me.C1Daten.DataSource = Nothing + Me.C1Daten.DataSource = db.dsDaten.Tables(0) + Me.C1Daten.DataMember = db.dsDaten.Tables(0).TableName + End Sub + + Private Sub TextBox5_KeyDown(sender As Object, e As KeyEventArgs) Handles TextBox5.KeyDown + If e.KeyCode = Keys.Enter Then Button5_Click(sender, e) + End Sub + Private Sub Button5_Click(sender As Object, e As EventArgs) Handles Button5.Click + Dim sql As String = "SELECT nreintrag as Nr, dbo.get_name(Keyvalue) AS Empfaenger, Bezeichnung, Beschreibung, Pfad, InDB, Erstellt_am, KeyValue FROM dbo.DMS_Dokument where aktiv=1 and " + + sql = sql + "(" + If IsNumeric(Me.TextBox5.Text) Then + sql = sql + "Keyvalue='" + Me.TextBox5.Text + "' or dbo.get_name(keyvalue) like '%" + TextBox5.Text + "&' " + Else + sql = sql + "dbo.get_name(keyvalue) like '%" + TextBox5.Text + "%' " + + End If + sql = sql + "or bezeichnung like '%" + TextBox5.Text + "%' " + sql = sql + "or beschreibung like '%" + TextBox5.Text + "%' " + sql = sql + ")" + Dim db As New clsDB + db.Get_Tabledata("Dokumente", "", sql) + Me.C1Daten.DataSource = Nothing + Me.C1Daten.DataSource = db.dsDaten.Tables(0) + Me.C1Daten.DataMember = db.dsDaten.Tables(0).TableName + Me.C1Daten.Splits(0).DisplayColumns(0).Width = 0 + Me.C1Daten.Splits(0).DisplayColumns(1).Width = 150 + Me.C1Daten.Splits(0).DisplayColumns(2).Width = 150 + Me.C1Daten.Splits(0).DisplayColumns(3).Width = 150 + Me.C1Daten.Splits(0).DisplayColumns(4).Width = 150 + Me.C1Daten.Splits(0).DisplayColumns(5).Width = 0 + Me.C1Daten.Splits(0).DisplayColumns(6).Width = 70 + Me.C1Daten.Splits(0).DisplayColumns(7).Width = 0 + + End Sub + + Private Sub DokumentAnzeigenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles DokumentAnzeigenToolStripMenuItem.Click + Try + If C1Daten.Columns("indb").Value = "True" Then + Dim d As New clsDok + Dim s As String = d.Get_Dokument(Me.C1Daten.Columns("Nr").Value) + Process.Start(s) + IsFileInUse(s) + Else + Process.Start(Me.C1Daten.Columns("pfad").Value) + End If + Catch + End Try + End Sub + Public Function IsFileInUse(sFile As String) As Boolean + Try + Using f As New IO.FileStream(sFile, FileMode.Open, FileAccess.ReadWrite, FileShare.None) + End Using + Catch Ex As Exception + Return True + End Try + Return False + End Function + + Private Sub PatientFirmaAnzeigenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles PatientFirmaAnzeigenToolStripMenuItem.Click + Key = Me.C1Daten.Columns("keyvalue").Value + If Key < 49999 Then + Cursor = Cursors.WaitCursor + Dim f As New Patient + f.MdiParent = Me.MdiParent + f.PatientNr = Key + f.Show() + + Cursor = Cursors.Default + Else + Cursor = Cursors.WaitCursor + Dim f As New frmFirma + f.MdiParent = Me.MdiParent + f.Show() + f.Firmanr = Key + Cursor = Cursors.Default + End If + End Sub + + Private Sub SuperTabControl1_SelectedTabChanged(sender As Object, e As DevComponents.DotNetBar.SuperTabStripSelectedTabChangedEventArgs) Handles SuperTabControl1.SelectedTabChanged + Try + Select Case Me.SuperTabControl1.SelectedTab.Name + Case "Dokumente" + Me.C1Daten.ContextMenuStrip = Me.ContextMenuStrip2 + Case Else + Me.C1Daten.ContextMenuStrip = Me.ContextMenuStrip1 + End Select + Catch + End Try + End Sub End Class \ No newline at end of file diff --git a/DPM2016/bin/Debug/DPM2018.application b/DPM2016/bin/Debug/DPM2018.application index 14fc953..ddda850 100644 --- a/DPM2016/bin/Debug/DPM2018.application +++ b/DPM2016/bin/Debug/DPM2018.application @@ -7,14 +7,14 @@ - + - kT32j7oJA2WzlxmF/VEypk4fizSgLGc4YbzymxaX6nI= + U8nrCqNUKJYdJS2uuAZSmjnTJBUo6VyxTU3WKWWI4Fk= diff --git a/DPM2016/bin/Debug/DPM2018.exe b/DPM2016/bin/Debug/DPM2018.exe index 9ccec49..15b2502 100644 Binary files a/DPM2016/bin/Debug/DPM2018.exe and b/DPM2016/bin/Debug/DPM2018.exe differ diff --git a/DPM2016/bin/Debug/DPM2018.exe.manifest b/DPM2016/bin/Debug/DPM2018.exe.manifest index 18209a0..2f7e7ef 100644 --- a/DPM2016/bin/Debug/DPM2018.exe.manifest +++ b/DPM2016/bin/Debug/DPM2018.exe.manifest @@ -161,50 +161,50 @@ - + - 7Lkgjo5MqWHQrQ7iYtWFj4uBn0ID+3Ky2fmfOMUNXiw= + EkaMgN8Fjw9gwdIwAcPhSorQN0vlxpkq5FeIvIGJKow= - - + + - 2U6bOkyGIdEx+eav8x86aZkeOhCsyZ4Bms/AufqQn8Y= + Q4G0ogKvbQzRIJzuroDUiWIrdBwZD46FuFb1mHdASHw= - + - wpAwxZO9F6GJFAWImOIhm+QET1EReXo76VvWNc7F4F8= + x6TKeRADnpG8iL/70WnGw1xisC+RBP+9WmhHQbG017E= - + - QZnddgw7fYoUdX8ZJTVvUGa3jUXm0KVe/iMOy4kKq3o= + ybdrHZO0BacH/7QbqvtfSecWyzFfJXyRv3MInd4Z/f0= diff --git a/DPM2016/bin/Debug/DPM2018.pdb b/DPM2016/bin/Debug/DPM2018.pdb index a9a5bdc..91bfd84 100644 Binary files a/DPM2016/bin/Debug/DPM2018.pdb and b/DPM2016/bin/Debug/DPM2018.pdb differ diff --git a/DPM2016/bin/Debug/Dentis/Reporting/Report/1.pdf b/DPM2016/bin/Debug/Dentis/Reporting/Report/1.pdf deleted file mode 100644 index dd3890c..0000000 Binary files a/DPM2016/bin/Debug/Dentis/Reporting/Report/1.pdf and /dev/null differ diff --git a/DPM2016/bin/Debug/Dentis/Reporting/Report/2.pdf b/DPM2016/bin/Debug/Dentis/Reporting/Report/2.pdf deleted file mode 100644 index eb30e98..0000000 Binary files a/DPM2016/bin/Debug/Dentis/Reporting/Report/2.pdf and /dev/null differ diff --git a/DPM2016/bin/Debug/FastReport.Bars.dll b/DPM2016/bin/Debug/FastReport.Bars.dll index 5e897f5..f2adc16 100644 Binary files a/DPM2016/bin/Debug/FastReport.Bars.dll and b/DPM2016/bin/Debug/FastReport.Bars.dll differ diff --git a/DPM2016/bin/Debug/FastReport.Editor.dll b/DPM2016/bin/Debug/FastReport.Editor.dll index 00920c5..f0ccf5a 100644 Binary files a/DPM2016/bin/Debug/FastReport.Editor.dll and b/DPM2016/bin/Debug/FastReport.Editor.dll differ diff --git a/DPM2016/bin/Debug/FastReport.dll b/DPM2016/bin/Debug/FastReport.dll index 7972272..313dcb7 100644 Binary files a/DPM2016/bin/Debug/FastReport.dll and b/DPM2016/bin/Debug/FastReport.dll differ diff --git a/DPM2016/bin/Debug/app.publish/DPM2018.exe b/DPM2016/bin/Debug/app.publish/DPM2018.exe index 5045145..5b73169 100644 Binary files a/DPM2016/bin/Debug/app.publish/DPM2018.exe and b/DPM2016/bin/Debug/app.publish/DPM2018.exe differ diff --git a/DPM2016/obj/Debug/DPM2016.Leistungen.resources b/DPM2016/obj/Debug/DPM2016.Leistungen.resources index 8f776f6..bafdc6c 100644 Binary files a/DPM2016/obj/Debug/DPM2016.Leistungen.resources and b/DPM2016/obj/Debug/DPM2016.Leistungen.resources differ diff --git a/DPM2016/obj/Debug/DPM2016.Mahnungen.resources b/DPM2016/obj/Debug/DPM2016.Mahnungen.resources index 4412798..31a0759 100644 Binary files a/DPM2016/obj/Debug/DPM2016.Mahnungen.resources and b/DPM2016/obj/Debug/DPM2016.Mahnungen.resources differ diff --git a/DPM2016/obj/Debug/DPM2016.clsStammdaten_Bez.resources b/DPM2016/obj/Debug/DPM2016.clsStammdaten_Bez.resources index ecb4c1e..25d2b67 100644 Binary files a/DPM2016/obj/Debug/DPM2016.clsStammdaten_Bez.resources and b/DPM2016/obj/Debug/DPM2016.clsStammdaten_Bez.resources differ diff --git a/DPM2016/obj/Debug/DPM2016.clsStammdaten_flat.resources b/DPM2016/obj/Debug/DPM2016.clsStammdaten_flat.resources index 40abd5d..7e77b79 100644 Binary files a/DPM2016/obj/Debug/DPM2016.clsStammdaten_flat.resources and b/DPM2016/obj/Debug/DPM2016.clsStammdaten_flat.resources differ diff --git a/DPM2016/obj/Debug/DPM2016.frmSuche.resources b/DPM2016/obj/Debug/DPM2016.frmSuche.resources index baea34c..299fdb9 100644 Binary files a/DPM2016/obj/Debug/DPM2016.frmSuche.resources and b/DPM2016/obj/Debug/DPM2016.frmSuche.resources differ diff --git a/DPM2016/obj/Debug/DPM2016.vbproj.FileListAbsolute.txt b/DPM2016/obj/Debug/DPM2016.vbproj.FileListAbsolute.txt index e941b71..1e3811d 100644 --- a/DPM2016/obj/Debug/DPM2016.vbproj.FileListAbsolute.txt +++ b/DPM2016/obj/Debug/DPM2016.vbproj.FileListAbsolute.txt @@ -110,3 +110,4 @@ E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\Syncfusion.Pdf.Base.xml E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\Syncfusion.Shared.Base.xml E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\Syncfusion.Shared.Windows.xml E:\Software-Projekte\DPM\DPM2016\DPM2016\obj\Debug\DPM2016.vbprojResolveAssemblyReference.cache +E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\FastReport.xml diff --git a/DPM2016/obj/Debug/DPM2016.vbproj.GenerateResource.Cache b/DPM2016/obj/Debug/DPM2016.vbproj.GenerateResource.Cache index adaf5cf..9d4bdab 100644 Binary files a/DPM2016/obj/Debug/DPM2016.vbproj.GenerateResource.Cache and b/DPM2016/obj/Debug/DPM2016.vbproj.GenerateResource.Cache differ diff --git a/DPM2016/obj/Debug/DPM2016.vbprojResolveAssemblyReference.cache b/DPM2016/obj/Debug/DPM2016.vbprojResolveAssemblyReference.cache index 056a7bc..963a574 100644 Binary files a/DPM2016/obj/Debug/DPM2016.vbprojResolveAssemblyReference.cache and b/DPM2016/obj/Debug/DPM2016.vbprojResolveAssemblyReference.cache differ diff --git a/DPM2016/obj/Debug/DPM2018.application b/DPM2016/obj/Debug/DPM2018.application index 14fc953..ddda850 100644 --- a/DPM2016/obj/Debug/DPM2018.application +++ b/DPM2016/obj/Debug/DPM2018.application @@ -7,14 +7,14 @@ - + - kT32j7oJA2WzlxmF/VEypk4fizSgLGc4YbzymxaX6nI= + U8nrCqNUKJYdJS2uuAZSmjnTJBUo6VyxTU3WKWWI4Fk= diff --git a/DPM2016/obj/Debug/DPM2018.exe b/DPM2016/obj/Debug/DPM2018.exe index 9ccec49..15b2502 100644 Binary files a/DPM2016/obj/Debug/DPM2018.exe and b/DPM2016/obj/Debug/DPM2018.exe differ diff --git a/DPM2016/obj/Debug/DPM2018.exe.manifest b/DPM2016/obj/Debug/DPM2018.exe.manifest index 18209a0..2f7e7ef 100644 --- a/DPM2016/obj/Debug/DPM2018.exe.manifest +++ b/DPM2016/obj/Debug/DPM2018.exe.manifest @@ -161,50 +161,50 @@ - + - 7Lkgjo5MqWHQrQ7iYtWFj4uBn0ID+3Ky2fmfOMUNXiw= + EkaMgN8Fjw9gwdIwAcPhSorQN0vlxpkq5FeIvIGJKow= - - + + - 2U6bOkyGIdEx+eav8x86aZkeOhCsyZ4Bms/AufqQn8Y= + Q4G0ogKvbQzRIJzuroDUiWIrdBwZD46FuFb1mHdASHw= - + - wpAwxZO9F6GJFAWImOIhm+QET1EReXo76VvWNc7F4F8= + x6TKeRADnpG8iL/70WnGw1xisC+RBP+9WmhHQbG017E= - + - QZnddgw7fYoUdX8ZJTVvUGa3jUXm0KVe/iMOy4kKq3o= + ybdrHZO0BacH/7QbqvtfSecWyzFfJXyRv3MInd4Z/f0= diff --git a/DPM2016/obj/Debug/DPM2018.pdb b/DPM2016/obj/Debug/DPM2018.pdb index a9a5bdc..91bfd84 100644 Binary files a/DPM2016/obj/Debug/DPM2018.pdb and b/DPM2016/obj/Debug/DPM2018.pdb differ diff --git a/DPM2016/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/DPM2016/obj/Debug/DesignTimeResolveAssemblyReferences.cache index 1ac0b14..45940f4 100644 Binary files a/DPM2016/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/DPM2016/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/DPM2016/obj/Debug/dpm2018.exe.licenses b/DPM2016/obj/Debug/dpm2018.exe.licenses index 7b5a097..68fe5bf 100644 Binary files a/DPM2016/obj/Debug/dpm2018.exe.licenses and b/DPM2016/obj/Debug/dpm2018.exe.licenses differ