diff --git a/.vs/DPM2016/v15/.suo b/.vs/DPM2016/v15/.suo index 414ebc5..9436183 100644 Binary files a/.vs/DPM2016/v15/.suo and b/.vs/DPM2016/v15/.suo differ diff --git a/DPM2016/Behandlung/Behandlung.Designer.vb b/DPM2016/Behandlung/Behandlung.Designer.vb index 82fcc34..079cbe4 100644 --- a/DPM2016/Behandlung/Behandlung.Designer.vb +++ b/DPM2016/Behandlung/Behandlung.Designer.vb @@ -35,8 +35,10 @@ Partial Class Behandlung Me.ToolStripMenuItem2 = New System.Windows.Forms.ToolStripSeparator() Me.BehandlungabschliessenToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem() Me.BehandlungZurücksetzenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.BehandlungKopierenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripMenuItem3 = New System.Windows.Forms.ToolStripSeparator() Me.BehandlungLöschenToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem() + Me.KopieErstellenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ImageList1 = New System.Windows.Forms.ImageList(Me.components) Me.Node2 = New DevComponents.AdvTree.Node() Me.NodeConnector1 = New DevComponents.AdvTree.NodeConnector() @@ -62,7 +64,13 @@ Partial Class Behandlung Me.ToolStripButton1 = New System.Windows.Forms.ToolStripButton() Me.tsbtnbehandlungdelete = New System.Windows.Forms.ToolStrip() Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components) - Me.KopieErstellenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.SofortRechnungDruckenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripMenuItem4 = New System.Windows.Forms.ToolStripSeparator() + Me.VorschauToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.EntwurfToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripMenuItem5 = New System.Windows.Forms.ToolStripSeparator() + Me.RechungKVVorschauToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.RechnungKVEntwurfToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.tsbtndelete.SuspendLayout() Me.GroupBox1.SuspendLayout() CType(Me.treebehandlungen, System.ComponentModel.ISupportInitialize).BeginInit() @@ -155,44 +163,56 @@ Partial Class Behandlung ' 'ctxmenubehandlung ' - Me.ctxmenubehandlung.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.NeueBehandlungToolStripMenuItem1, Me.ToolStripMenuItem2, Me.BehandlungabschliessenToolStripMenuItem1, Me.BehandlungZurücksetzenToolStripMenuItem, Me.ToolStripMenuItem3, Me.BehandlungLöschenToolStripMenuItem1, Me.KopieErstellenToolStripMenuItem}) + Me.ctxmenubehandlung.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.NeueBehandlungToolStripMenuItem1, Me.ToolStripMenuItem2, Me.BehandlungabschliessenToolStripMenuItem1, Me.BehandlungZurücksetzenToolStripMenuItem, Me.BehandlungKopierenToolStripMenuItem, Me.ToolStripMenuItem4, Me.SofortRechnungDruckenToolStripMenuItem, Me.KopieErstellenToolStripMenuItem, Me.ToolStripMenuItem3, Me.BehandlungLöschenToolStripMenuItem1, Me.ToolStripMenuItem5, Me.RechungKVVorschauToolStripMenuItem, Me.RechnungKVEntwurfToolStripMenuItem}) Me.ctxmenubehandlung.Name = "ContextMenuStrip1" - Me.ctxmenubehandlung.Size = New System.Drawing.Size(210, 148) + Me.ctxmenubehandlung.Size = New System.Drawing.Size(212, 248) ' 'NeueBehandlungToolStripMenuItem1 ' Me.NeueBehandlungToolStripMenuItem1.Name = "NeueBehandlungToolStripMenuItem1" - Me.NeueBehandlungToolStripMenuItem1.Size = New System.Drawing.Size(209, 22) + Me.NeueBehandlungToolStripMenuItem1.Size = New System.Drawing.Size(211, 22) Me.NeueBehandlungToolStripMenuItem1.Text = "&Neue Behandlung" ' 'ToolStripMenuItem2 ' Me.ToolStripMenuItem2.Name = "ToolStripMenuItem2" - Me.ToolStripMenuItem2.Size = New System.Drawing.Size(206, 6) + Me.ToolStripMenuItem2.Size = New System.Drawing.Size(208, 6) ' 'BehandlungabschliessenToolStripMenuItem1 ' Me.BehandlungabschliessenToolStripMenuItem1.Name = "BehandlungabschliessenToolStripMenuItem1" - Me.BehandlungabschliessenToolStripMenuItem1.Size = New System.Drawing.Size(209, 22) + Me.BehandlungabschliessenToolStripMenuItem1.Size = New System.Drawing.Size(211, 22) Me.BehandlungabschliessenToolStripMenuItem1.Text = "Behandlung &abschliessen" ' 'BehandlungZurücksetzenToolStripMenuItem ' Me.BehandlungZurücksetzenToolStripMenuItem.Name = "BehandlungZurücksetzenToolStripMenuItem" - Me.BehandlungZurücksetzenToolStripMenuItem.Size = New System.Drawing.Size(209, 22) + Me.BehandlungZurücksetzenToolStripMenuItem.Size = New System.Drawing.Size(211, 22) Me.BehandlungZurücksetzenToolStripMenuItem.Text = "Behandlung zurücksetzen" ' + 'BehandlungKopierenToolStripMenuItem + ' + Me.BehandlungKopierenToolStripMenuItem.Name = "BehandlungKopierenToolStripMenuItem" + Me.BehandlungKopierenToolStripMenuItem.Size = New System.Drawing.Size(211, 22) + Me.BehandlungKopierenToolStripMenuItem.Text = "Behandlung kopieren" + ' 'ToolStripMenuItem3 ' Me.ToolStripMenuItem3.Name = "ToolStripMenuItem3" - Me.ToolStripMenuItem3.Size = New System.Drawing.Size(206, 6) + Me.ToolStripMenuItem3.Size = New System.Drawing.Size(208, 6) ' 'BehandlungLöschenToolStripMenuItem1 ' Me.BehandlungLöschenToolStripMenuItem1.Name = "BehandlungLöschenToolStripMenuItem1" - Me.BehandlungLöschenToolStripMenuItem1.Size = New System.Drawing.Size(209, 22) + Me.BehandlungLöschenToolStripMenuItem1.Size = New System.Drawing.Size(211, 22) Me.BehandlungLöschenToolStripMenuItem1.Text = "&Behandlung löschen" ' + 'KopieErstellenToolStripMenuItem + ' + Me.KopieErstellenToolStripMenuItem.Name = "KopieErstellenToolStripMenuItem" + Me.KopieErstellenToolStripMenuItem.Size = New System.Drawing.Size(211, 22) + Me.KopieErstellenToolStripMenuItem.Text = "Rechnungskopie erstellen" + ' 'ImageList1 ' Me.ImageList1.ImageStream = CType(resources.GetObject("ImageList1.ImageStream"), System.Windows.Forms.ImageListStreamer) @@ -404,11 +424,46 @@ Partial Class Behandlung Me.ContextMenuStrip1.Name = "ContextMenuStrip1" Me.ContextMenuStrip1.Size = New System.Drawing.Size(244, 142) ' - 'KopieErstellenToolStripMenuItem + 'SofortRechnungDruckenToolStripMenuItem ' - Me.KopieErstellenToolStripMenuItem.Name = "KopieErstellenToolStripMenuItem" - Me.KopieErstellenToolStripMenuItem.Size = New System.Drawing.Size(209, 22) - Me.KopieErstellenToolStripMenuItem.Text = "Kopie erstellen" + Me.SofortRechnungDruckenToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.VorschauToolStripMenuItem, Me.EntwurfToolStripMenuItem}) + Me.SofortRechnungDruckenToolStripMenuItem.Name = "SofortRechnungDruckenToolStripMenuItem" + Me.SofortRechnungDruckenToolStripMenuItem.Size = New System.Drawing.Size(211, 22) + Me.SofortRechnungDruckenToolStripMenuItem.Text = "Sofort-Rechnung drucken" + ' + 'ToolStripMenuItem4 + ' + Me.ToolStripMenuItem4.Name = "ToolStripMenuItem4" + Me.ToolStripMenuItem4.Size = New System.Drawing.Size(208, 6) + ' + 'VorschauToolStripMenuItem + ' + Me.VorschauToolStripMenuItem.Name = "VorschauToolStripMenuItem" + Me.VorschauToolStripMenuItem.Size = New System.Drawing.Size(152, 22) + Me.VorschauToolStripMenuItem.Text = "Vorschau" + ' + 'EntwurfToolStripMenuItem + ' + Me.EntwurfToolStripMenuItem.Name = "EntwurfToolStripMenuItem" + Me.EntwurfToolStripMenuItem.Size = New System.Drawing.Size(152, 22) + Me.EntwurfToolStripMenuItem.Text = "Entwurf" + ' + 'ToolStripMenuItem5 + ' + Me.ToolStripMenuItem5.Name = "ToolStripMenuItem5" + Me.ToolStripMenuItem5.Size = New System.Drawing.Size(208, 6) + ' + 'RechungKVVorschauToolStripMenuItem + ' + Me.RechungKVVorschauToolStripMenuItem.Name = "RechungKVVorschauToolStripMenuItem" + Me.RechungKVVorschauToolStripMenuItem.Size = New System.Drawing.Size(211, 22) + Me.RechungKVVorschauToolStripMenuItem.Text = "Rechung/KV Vorschau" + ' + 'RechnungKVEntwurfToolStripMenuItem + ' + Me.RechnungKVEntwurfToolStripMenuItem.Name = "RechnungKVEntwurfToolStripMenuItem" + Me.RechnungKVEntwurfToolStripMenuItem.Size = New System.Drawing.Size(211, 22) + Me.RechnungKVEntwurfToolStripMenuItem.Text = "Rechnung/KV Entwurf" ' 'Behandlung ' @@ -476,4 +531,12 @@ Partial Class Behandlung Friend WithEvents ToolStripMenuItem3 As ToolStripSeparator Friend WithEvents ToolStripButton2 As ToolStripButton Friend WithEvents KopieErstellenToolStripMenuItem As ToolStripMenuItem + Friend WithEvents BehandlungKopierenToolStripMenuItem As ToolStripMenuItem + Friend WithEvents ToolStripMenuItem4 As ToolStripSeparator + Friend WithEvents SofortRechnungDruckenToolStripMenuItem As ToolStripMenuItem + Friend WithEvents VorschauToolStripMenuItem As ToolStripMenuItem + Friend WithEvents EntwurfToolStripMenuItem As ToolStripMenuItem + Friend WithEvents ToolStripMenuItem5 As ToolStripSeparator + Friend WithEvents RechungKVVorschauToolStripMenuItem As ToolStripMenuItem + Friend WithEvents RechnungKVEntwurfToolStripMenuItem As ToolStripMenuItem End Class diff --git a/DPM2016/Behandlung/Behandlung.resx b/DPM2016/Behandlung/Behandlung.resx index fee1432..7e723a0 100644 --- a/DPM2016/Behandlung/Behandlung.resx +++ b/DPM2016/Behandlung/Behandlung.resx @@ -236,7 +236,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABO - DQAAAk1TRnQBSQFMAgEBBQEAAYABAgGAAQIBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + DQAAAk1TRnQBSQFMAgEBBQEAAZgBAgGYAQIBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA diff --git a/DPM2016/Behandlung/Behandlung.vb b/DPM2016/Behandlung/Behandlung.vb index 54f2fc8..70de269 100644 --- a/DPM2016/Behandlung/Behandlung.vb +++ b/DPM2016/Behandlung/Behandlung.vb @@ -1,4 +1,7 @@ Imports System.ComponentModel +Imports DevComponents.AdvTree +Imports Syncfusion.Pdf +Imports Syncfusion.Pdf.Parsing Public Class Behandlung @@ -386,6 +389,38 @@ Public Class Behandlung r.Item("nrbehandler") = 1 r.Item("nrrgtyp") = pat.dsDaten.Tables(0).Rows(0).Item("nrrgtyp") r.Item("rabatt") = pat.dsDaten.Tables(0).Rows(0).Item("rabatt") + Try + If pat.dsDaten.Tables(0).Rows(0).Item("nrgarant") > 0 Then r.Item("nrgarant") = pat.dsDaten.Tables(0).Rows(0).Item("nrgarant") + Catch + End Try + + Try + If pat.dsDaten.Tables(0).Rows(0).Item("nrgesvertreter") > 0 Then r.Item("nrgarant") = pat.dsDaten.Tables(0).Rows(0).Item("nrgesvertreter") + Catch + End Try + + Try + If pat.dsDaten.Tables(0).Rows(0).Item("nrvs") > 0 Then r.Item("nrgarant") = pat.dsDaten.Tables(0).Rows(0).Item("nrvs") + Catch + End Try + + Try + If pat.dsDaten.Tables(0).Rows(0).Item("nrkk") > 0 Then r.Item("nrgarant") = pat.dsDaten.Tables(0).Rows(0).Item("nrkk") + Catch + End Try + + Try + If pat.dsDaten.Tables(0).Rows(0).Item("nrfs") > 0 Then r.Item("nrgarant") = pat.dsDaten.Tables(0).Rows(0).Item("nrfs") + Catch + End Try + + + Try + If pat.dsDaten.Tables(0).Rows(0).Item("nriv") > 0 Then r.Item("nrgarant") = pat.dsDaten.Tables(0).Rows(0).Item("nriv") + Catch + End Try + + 'If pat.dsDaten.Tables(0).Rows(0).Item("nrgesvertrater") > 0 Then r.Item("nrgarant") = pat.dsDaten.Tables(0).Rows(0).Item("nrgesvertreter") r.Item("behandlungsbeginn") = Now r.Item("status") = Status @@ -394,6 +429,8 @@ Public Class Behandlung r.Item("mutiert_am") = Now r.Item("mutierer") = Globals.ActUser r.Item("aktiv") = True + + db.dsDaten.Tables(0).Rows.Add(r) db.Update_Data() pat.Dispose() @@ -439,6 +476,33 @@ Public Class Behandlung 'End If End Sub + Private Sub BehandlunKopierenToolStripMenuItem1_Click(sender As Object, e As EventArgs) Handles BehandlungKopierenToolStripMenuItem.Click + If BehandlungKopierenToolStripMenuItem.Text = "Kostenvoranschlag kopieren" Then + Dim dl As MsgBoxResult = MsgBox("Als Kostenvoranschlag kopieren (Ja) oder als neue Behandlung kopieren (Nein)?", vbYesNoCancel + vbQuestion) + If dl = vbYes Then + Dim db As New clsDB + db.Copy_Behandlung(Me.treebehandlungen.SelectedNode.Tag.ToString.ToString, 1) + End If + If dl = vbNo Then + Dim db As New clsDB + db.Copy_Behandlung(Me.treebehandlungen.SelectedNode.Tag.ToString, 2) + End If + Else + Dim dl As MsgBoxResult = MsgBox("Als Behandlung kopieren (Ja) oder als neuer KV kopieren (Nein)?", vbYesNoCancel + vbQuestion) + If dl = vbYes Then + Dim db As New clsDB + db.Copy_Behandlung(Me.treebehandlungen.SelectedNode.Tag.ToString, 3) + End If + If dl = vbNo Then + Dim db As New clsDB + db.Copy_Behandlung(Me.treebehandlungen.SelectedNode.Tag.ToString, 4) + End If + End If + Get_Behandlungen() + End Sub + + + Private Sub tsbtndelete_ItemClicked(sender As Object, e As ToolStripItemClickedEventArgs) Handles tsbtndelete.ItemClicked @@ -453,18 +517,40 @@ Public Class Behandlung i = Me.treebehandlungen.SelectedNode.Tag End Try - - Me.ctxmenubehandlung.Enabled = True + Me.NeueBehandlungToolStripMenuItem.Enabled = True + Me.BehandlungAbschliessenToolStripMenuItem.Enabled = True + Me.BehandlungZurücksetzenToolStripMenuItem.Enabled = True + Me.BehandlungKopierenToolStripMenuItem.Enabled = True + Me.SofortRechnungDruckenToolStripMenuItem.Enabled = True + Me.KopieErstellenToolStripMenuItem.Enabled = True + Me.BehandlungKopierenToolStripMenuItem.Enabled = True + Me.NeueBehandlungToolStripMenuItem.Visible = True + Me.BehandlungAbschliessenToolStripMenuItem.Visible = True + Me.BehandlungZurücksetzenToolStripMenuItem.Visible = True + Me.BehandlungKopierenToolStripMenuItem.Visible = True + Me.SofortRechnungDruckenToolStripMenuItem.Visible = True + Me.KopieErstellenToolStripMenuItem.Visible = True + Me.BehandlungKopierenToolStripMenuItem.Visible = True + Me.SofortRechnungDruckenToolStripMenuItem.Text = "Sofort-Rechnung drucken" + + ' Me.ctxmenubehandlung.Enabled = True Select Case i Case -11 Me.BehandlungZurücksetzenToolStripMenuItem.Enabled = False Me.BehandlungabschliessenToolStripMenuItem1.Enabled = True + Me.KopieErstellenToolStripMenuItem.Enabled = False + Me.SofortRechnungDruckenToolStripMenuItem.Enabled = False Case -12 Me.BehandlungZurücksetzenToolStripMenuItem.Enabled = True Me.BehandlungabschliessenToolStripMenuItem1.Enabled = False + Me.SofortRechnungDruckenToolStripMenuItem.Enabled = True + KopieErstellenToolStripMenuItem.Enabled = False + Case -13 Me.BehandlungZurücksetzenToolStripMenuItem.Enabled = True Me.BehandlungabschliessenToolStripMenuItem1.Enabled = False + Me.SofortRechnungDruckenToolStripMenuItem.Enabled = False + Me.KopieErstellenToolStripMenuItem.Enabled = True End Select Select Case i @@ -475,6 +561,11 @@ Public Class Behandlung Me.BehandlungZurücksetzenToolStripMenuItem.Text = "Kostenvoranschlag zurücksetzen" Me.BehandlungZurücksetzenToolStripMenuItem.Visible = True Me.BehandlungLöschenToolStripMenuItem1.Text = "Kostenvoranschlag löschen" + Me.BehandlungKopierenToolStripMenuItem.Text = "Kostenvoranschlag kopieren" + Me.SofortRechnungDruckenToolStripMenuItem.Enabled = False + Me.KopieErstellenToolStripMenuItem.Enabled = False + Me.SofortRechnungDruckenToolStripMenuItem.Text = "Kostenvoranschlag drucken" + Me.SofortRechnungDruckenToolStripMenuItem.Enabled = True Case -2 Me.BehandlungabschliessenToolStripMenuItem1.Text = "Kostenvoranschlag abschliessen" Me.BehandlungabschliessenToolStripMenuItem1.Enabled = False @@ -484,7 +575,7 @@ Public Class Behandlung Me.BehandlungZurücksetzenToolStripMenuItem.Enabled = False Me.BehandlungLöschenToolStripMenuItem1.Text = "Kostenvoranschlag löschen" Me.BehandlungLöschenToolStripMenuItem1.Enabled = False - + Me.BehandlungKopierenToolStripMenuItem.Text = "Kostenvoranschlag kopieren" Case > -20 Me.BehandlungabschliessenToolStripMenuItem1.Text = "Behandlung abschliessen" @@ -492,6 +583,7 @@ Public Class Behandlung Me.BehandlungZurücksetzenToolStripMenuItem.Text = "Behandlung zurücksetzen" Me.BehandlungZurücksetzenToolStripMenuItem.Visible = True Me.BehandlungLöschenToolStripMenuItem1.Text = "Behandlung löschen" + Me.BehandlungKopierenToolStripMenuItem.Text = "Behandlung kopieren" Case < -20 And Me.BehandlungabschliessenToolStripMenuItem1.Text = "Kostenvoranschlag abschliessen" BehandlungabschliessenToolStripMenuItem1.Enabled = True @@ -500,7 +592,9 @@ Public Class Behandlung Me.BehandlungZurücksetzenToolStripMenuItem.Text = "Kostenvoranschlag zurücksetzen" Me.BehandlungZurücksetzenToolStripMenuItem.Visible = False Me.BehandlungLöschenToolStripMenuItem1.Text = "Kostenvoranschlag löschen" - + Me.BehandlungKopierenToolStripMenuItem.Text = "Kostenvoranschlag kopieren" + Me.SofortRechnungDruckenToolStripMenuItem.Enabled = False + Me.KopieErstellenToolStripMenuItem.Enabled = False End Select @@ -511,16 +605,26 @@ Public Class Behandlung End Sub Private Sub BehandlungZurücksetzenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles BehandlungZurücksetzenToolStripMenuItem.Click + Dim db As New clsDB + Dim Messagetext As String + Dim key As Integer = Me.treebehandlungen.SelectedNode.Tag + db.Get_Tabledata("Behandlu", "where nrbehandlung=" + key.ToString) + If db.dsDaten.Tables(0).Rows(0).Item("Status") = 2 Or db.dsDaten.Tables(0).Rows(0).Item("Status") = 3 Then + Messagetext = "Behandlung " + Else + Messagetext = "Kostenvoranschlag" + End If + Dim fakt As New clsFakturierung - Dim Result = fakt.verrechnet(Me.treebehandlungen.SelectedNode.Tag) + Dim Result = fakt.Verrechnet(Me.treebehandlungen.SelectedNode.Tag) Select Case Result Case 0 - If MsgBox("Behandlung zurücksetzen?", vbYesNo + vbQuestion, "Behandlung zurücksetzen") = MsgBoxResult.Yes Then + If MsgBox(Messagetext + " zurücksetzen?", vbYesNo + vbQuestion, Messagetext + " zurücksetzen") = MsgBoxResult.Yes Then Behandlung_Zurücksetzen(Me.treebehandlungen.SelectedNode.Tag.ToString) End If Case 1 If MsgBox("Rechnung stornieren und Behandlung zurücksetzen?", vbYesNo + vbQuestion) = vbYes Then - fakt.storno(Me.treebehandlungen.SelectedNode.Tag) + fakt.Storno(Me.treebehandlungen.SelectedNode.Tag) Behandlung_Zurücksetzen(Me.treebehandlungen.SelectedNode.Tag.ToString) End If Case 2 @@ -557,18 +661,34 @@ Public Class Behandlung Sub Behandlung_Abschliessen(ByVal nrbehandlung) Dim istKV As Boolean = False - If MsgBox("Behandlung/KKV abschliessen?", vbYesNo + vbQuestion) = vbYes Then + Dim db As New clsDB + Dim Messagetext As String + Dim key As Integer = Me.treebehandlungen.SelectedNode.Tag + db.Get_Tabledata("Behandlu", "where nrbehandlung=" + nrbehandlung.ToString) + If db.dsDaten.Tables(0).Rows(0).Item("Status") = 1 Then + + Messagetext = "Behandlung " + Else + + istKV = True + Messagetext = "Kostenvoranschlag" + End If + + If MsgBox(Messagetext + " abschliessen?", vbYesNo + vbQuestion) = vbYes Then Me.Behandungdetail1.Save_Data() - Dim db As New clsDB - Dim key As Integer = Me.treebehandlungen.SelectedNode.Tag + db.Get_Tabledata("Behandlu", "where nrbehandlung=" + nrbehandlung.ToString) If db.dsDaten.Tables(0).Rows(0).Item("Status") = 1 Then db.dsDaten.Tables(0).Rows(0).Item("Status") = 2 + Messagetext = "Behandlung " Else db.dsDaten.Tables(0).Rows(0).Item("Status") = 5 istKV = True + Messagetext = "Kostenvoranschlag" + End If + If db.dsDaten.Tables(0).Rows(0).Item("Behandlungsende").ToString = "" Then + db.dsDaten.Tables(0).Rows(0).Item("Behandlungsende") = db.dsDaten.Tables(0).Rows(0).Item("Behandlungsbeginn") End If - db.dsDaten.Tables(0).Rows(0).Item("mutiert_am") = Now db.dsDaten.Tables(0).Rows(0).Item("mutierer") = Globals.ActUser db.Update_Data() @@ -642,6 +762,7 @@ Public Class Behandlung End Sub Private Sub KopieErstellenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles KopieErstellenToolStripMenuItem.Click + Globals.RGCollection.Clear() Dim anzahlraten As Integer = 0 DB.Get_Tabledata("Behandlu", "where nrbehandlung=" + Me.treebehandlungen.SelectedNode.Tag.ToString) Dim behandlungsnr As Integer = DB.dsDaten.Tables(0).Rows(0).Item("nrbehandlung") @@ -658,7 +779,7 @@ Public Class Behandlung Catch fakturanr = 0 End Try - + Globals.FakturaNr = fakturanr Dim Folgeauswertung As Integer Dim Separater_Druckjob As Boolean @@ -698,12 +819,60 @@ Public Class Behandlung End If End While + If Globals.RGCollection.Count > 1 Then + Dim document As New PdfDocument() + document.EnableMemoryOptimization = True + Dim i As Integer = 0 + Dim fn As String = "" + For Each inputDocument As String In Globals.RGCollection + i = i + 1 + If i = 1 Then fn = inputDocument + Dim loadedDocument As New PdfLoadedDocument(inputDocument) + loadedDocument.EnableMemoryOptimization = True + document.ImportPageRange(loadedDocument, 0, loadedDocument.Pages.Count - 1) + loadedDocument.Close(True) + Next + document.Save(fn + ".copy.pdf") + document.Close() + End If + + + + End Sub + + Private Sub SofortRechnungDruckenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles SofortRechnungDruckenToolStripMenuItem.Click + Behandungdetail1.ToolStripDropDownButton1_Click(sender, e) + End Sub + + Private Sub VorschauToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles VorschauToolStripMenuItem.Click + Behandungdetail1.VorschaRechnungToolStripMenuItem_Click(sender, e) + End Sub + Private Sub EntwurfToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles EntwurfToolStripMenuItem.Click + Behandungdetail1.DesignRechnungToolStripMenuItem_Click(sender, e) + End Sub + + Private Sub RechungKVVorschauToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles RechungKVVorschauToolStripMenuItem.Click + Behandungdetail1.VorschaRechnungToolStripMenuItem_Click(sender, e) + End Sub + + Private Sub RechnungKVEntwurfToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles RechnungKVEntwurfToolStripMenuItem.Click + Behandungdetail1.DesignRechnungToolStripMenuItem_Click(sender, e) + End Sub + Private Sub treebehandlungen_AfterNodeSelect(sender As Object, e As AdvTreeNodeEventArgs) Handles treebehandlungen.AfterNodeSelect + Me.treebehandlungen_Click(sender, e) + End Sub + Private Sub evh_Refresh_Behandlung(behandlungsnr As Integer) Handles evh.Refresh_Behandlung + Me.Get_Behandlungen() + Me.treebehandlungen.SelectedNode = Globals.FindNode(Me.treebehandlungen.Nodes, behandlungsnr, behandlungsnr) + Me.nodeselected() End Sub + + #End Region End Class diff --git a/DPM2016/Behandlung/Benhandungdetail.Designer.vb b/DPM2016/Behandlung/Benhandungdetail.Designer.vb index 9332086..1138bd3 100644 --- a/DPM2016/Behandlung/Benhandungdetail.Designer.vb +++ b/DPM2016/Behandlung/Benhandungdetail.Designer.vb @@ -1,9 +1,9 @@ - _ + Partial Class Benhandungdetail Inherits System.Windows.Forms.UserControl 'UserControl überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. - _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) Try If disposing AndAlso components IsNot Nothing Then @@ -20,7 +20,7 @@ Partial Class Benhandungdetail 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. - _ + Private Sub InitializeComponent() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(Benhandungdetail)) Me.GrpPatient = New System.Windows.Forms.GroupBox() @@ -42,6 +42,7 @@ Partial Class Benhandungdetail Me.txtcKVTotal = New System.Windows.Forms.Label() Me.Label2 = New System.Windows.Forms.Label() Me.GrpGaramt = New System.Windows.Forms.GroupBox() + Me.Button1 = New System.Windows.Forms.Button() Me.lblGesetz = New System.Windows.Forms.Label() Me.cbboxNrGesetz = New DPM2016.MyCombobox() Me.cbboxNrZuweiser = New DPM2016.MyCombobox() @@ -106,6 +107,7 @@ Partial Class Benhandungdetail Me.VorschaRechnungToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.DesignRechnungToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator() + Me.tsbtnGarantAnzeigen = New System.Windows.Forms.ToolStripButton() Me.GrpRechnungstext = New System.Windows.Forms.GroupBox() Me.cbboxrgtext = New DPM2016.MyCombobox() Me.txtRechnungsbemerkung = New System.Windows.Forms.TextBox() @@ -114,6 +116,8 @@ Partial Class Benhandungdetail Me.lblGLNListe = New System.Windows.Forms.Label() Me.txtGLN_Liste = New System.Windows.Forms.TextBox() Me.grpglndiagnose = New System.Windows.Forms.GroupBox() + Me.txtBehandlungsgrund = New System.Windows.Forms.TextBox() + Me.lblBehandlungsgrund = New System.Windows.Forms.Label() Me.GrpPatient.SuspendLayout() Me.grpZusammenfassugn.SuspendLayout() Me.GrpGaramt.SuspendLayout() @@ -329,6 +333,7 @@ Partial Class Benhandungdetail ' 'GrpGaramt ' + Me.GrpGaramt.Controls.Add(Me.Button1) Me.GrpGaramt.Controls.Add(Me.lblGesetz) Me.GrpGaramt.Controls.Add(Me.cbboxNrGesetz) Me.GrpGaramt.Controls.Add(Me.cbboxNrZuweiser) @@ -355,11 +360,20 @@ Partial Class Benhandungdetail Me.GrpGaramt.Controls.Add(Me.rbversicherung) Me.GrpGaramt.Location = New System.Drawing.Point(312, 283) Me.GrpGaramt.Name = "GrpGaramt" - Me.GrpGaramt.Size = New System.Drawing.Size(299, 261) + Me.GrpGaramt.Size = New System.Drawing.Size(735, 261) Me.GrpGaramt.TabIndex = 14 Me.GrpGaramt.TabStop = False Me.GrpGaramt.Text = "Garant" ' + 'Button1 + ' + Me.Button1.Location = New System.Drawing.Point(373, 61) + Me.Button1.Name = "Button1" + Me.Button1.Size = New System.Drawing.Size(16, 23) + Me.Button1.TabIndex = 224 + Me.Button1.UseVisualStyleBackColor = True + Me.Button1.Visible = False + ' 'lblGesetz ' Me.lblGesetz.AutoSize = True @@ -375,7 +389,7 @@ Partial Class Benhandungdetail Me.cbboxNrGesetz.Displaymember = Nothing Me.cbboxNrGesetz.Location = New System.Drawing.Point(94, 136) Me.cbboxNrGesetz.Name = "cbboxNrGesetz" - Me.cbboxNrGesetz.Size = New System.Drawing.Size(196, 21) + Me.cbboxNrGesetz.Size = New System.Drawing.Size(151, 21) Me.cbboxNrGesetz.TabIndex = 9 Me.cbboxNrGesetz.Table = Nothing Me.cbboxNrGesetz.TableAlias = "" @@ -387,7 +401,7 @@ Partial Class Benhandungdetail Me.cbboxNrZuweiser.Displaymember = Nothing Me.cbboxNrZuweiser.Location = New System.Drawing.Point(94, 239) Me.cbboxNrZuweiser.Name = "cbboxNrZuweiser" - Me.cbboxNrZuweiser.Size = New System.Drawing.Size(196, 21) + Me.cbboxNrZuweiser.Size = New System.Drawing.Size(169, 21) Me.cbboxNrZuweiser.TabIndex = 13 Me.cbboxNrZuweiser.Table = Nothing Me.cbboxNrZuweiser.TableAlias = "" @@ -404,19 +418,21 @@ Partial Class Benhandungdetail ' 'btnDeleteKogudatum ' - Me.btnDeleteKogudatum.Location = New System.Drawing.Point(280, 211) + Me.btnDeleteKogudatum.Location = New System.Drawing.Point(356, 211) Me.btnDeleteKogudatum.Name = "btnDeleteKogudatum" Me.btnDeleteKogudatum.Size = New System.Drawing.Size(10, 23) Me.btnDeleteKogudatum.TabIndex = 219 Me.btnDeleteKogudatum.UseVisualStyleBackColor = True + Me.btnDeleteKogudatum.Visible = False ' 'btnDeleteUnfalldatum ' - Me.btnDeleteUnfalldatum.Location = New System.Drawing.Point(280, 185) + Me.btnDeleteUnfalldatum.Location = New System.Drawing.Point(356, 185) Me.btnDeleteUnfalldatum.Name = "btnDeleteUnfalldatum" Me.btnDeleteUnfalldatum.Size = New System.Drawing.Size(10, 23) Me.btnDeleteUnfalldatum.TabIndex = 218 Me.btnDeleteUnfalldatum.UseVisualStyleBackColor = True + Me.btnDeleteUnfalldatum.Visible = False ' 'Label1 ' @@ -431,7 +447,7 @@ Partial Class Benhandungdetail ' Me.txtKostengutsprache_Nummer.Location = New System.Drawing.Point(94, 213) Me.txtKostengutsprache_Nummer.Name = "txtKostengutsprache_Nummer" - Me.txtKostengutsprache_Nummer.Size = New System.Drawing.Size(196, 20) + Me.txtKostengutsprache_Nummer.Size = New System.Drawing.Size(151, 20) Me.txtKostengutsprache_Nummer.TabIndex = 12 ' 'DDTDatum_Kostengutsprache @@ -475,7 +491,7 @@ Partial Class Benhandungdetail Me.DDTDatum_Kostengutsprache.MonthCalendar.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square Me.DDTDatum_Kostengutsprache.MonthCalendar.TodayButtonVisible = True Me.DDTDatum_Kostengutsprache.Name = "DDTDatum_Kostengutsprache" - Me.DDTDatum_Kostengutsprache.Size = New System.Drawing.Size(180, 20) + Me.DDTDatum_Kostengutsprache.Size = New System.Drawing.Size(151, 20) Me.DDTDatum_Kostengutsprache.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled Me.DDTDatum_Kostengutsprache.TabIndex = 11 ' @@ -529,7 +545,7 @@ Partial Class Benhandungdetail Me.DDTUnfalldatum.MonthCalendar.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square Me.DDTUnfalldatum.MonthCalendar.TodayButtonVisible = True Me.DDTUnfalldatum.Name = "DDTUnfalldatum" - Me.DDTUnfalldatum.Size = New System.Drawing.Size(180, 20) + Me.DDTUnfalldatum.Size = New System.Drawing.Size(151, 20) Me.DDTUnfalldatum.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled Me.DDTUnfalldatum.TabIndex = 10 ' @@ -557,7 +573,7 @@ Partial Class Benhandungdetail Me.cbboxNrAnsprechpartner.Displaymember = Nothing Me.cbboxNrAnsprechpartner.Location = New System.Drawing.Point(94, 84) Me.cbboxNrAnsprechpartner.Name = "cbboxNrAnsprechpartner" - Me.cbboxNrAnsprechpartner.Size = New System.Drawing.Size(196, 21) + Me.cbboxNrAnsprechpartner.Size = New System.Drawing.Size(151, 21) Me.cbboxNrAnsprechpartner.TabIndex = 7 Me.cbboxNrAnsprechpartner.Table = Nothing Me.cbboxNrAnsprechpartner.TableAlias = "" @@ -576,7 +592,7 @@ Partial Class Benhandungdetail ' Me.txtFallnummer.Location = New System.Drawing.Point(94, 113) Me.txtFallnummer.Name = "txtFallnummer" - Me.txtFallnummer.Size = New System.Drawing.Size(196, 20) + Me.txtFallnummer.Size = New System.Drawing.Size(151, 20) Me.txtFallnummer.TabIndex = 8 ' 'cbboxNrGarant @@ -585,7 +601,7 @@ Partial Class Benhandungdetail Me.cbboxNrGarant.Displaymember = Nothing Me.cbboxNrGarant.Location = New System.Drawing.Point(94, 61) Me.cbboxNrGarant.Name = "cbboxNrGarant" - Me.cbboxNrGarant.Size = New System.Drawing.Size(196, 21) + Me.cbboxNrGarant.Size = New System.Drawing.Size(277, 21) Me.cbboxNrGarant.TabIndex = 6 Me.cbboxNrGarant.Table = Nothing Me.cbboxNrGarant.TableAlias = "" @@ -603,7 +619,7 @@ Partial Class Benhandungdetail 'rbPrivatPersonen ' Me.rbPrivatPersonen.AutoSize = True - Me.rbPrivatPersonen.Location = New System.Drawing.Point(193, 38) + Me.rbPrivatPersonen.Location = New System.Drawing.Point(199, 41) Me.rbPrivatPersonen.Name = "rbPrivatPersonen" Me.rbPrivatPersonen.Size = New System.Drawing.Size(100, 17) Me.rbPrivatPersonen.TabIndex = 5 @@ -614,7 +630,7 @@ Partial Class Benhandungdetail 'rbkk ' Me.rbkk.AutoSize = True - Me.rbkk.Location = New System.Drawing.Point(104, 38) + Me.rbkk.Location = New System.Drawing.Point(106, 40) Me.rbkk.Name = "rbkk" Me.rbkk.Size = New System.Drawing.Size(93, 17) Me.rbkk.TabIndex = 4 @@ -636,7 +652,7 @@ Partial Class Benhandungdetail 'rbiv ' Me.rbiv.AutoSize = True - Me.rbiv.Location = New System.Drawing.Point(193, 15) + Me.rbiv.Location = New System.Drawing.Point(199, 20) Me.rbiv.Name = "rbiv" Me.rbiv.Size = New System.Drawing.Size(64, 17) Me.rbiv.TabIndex = 2 @@ -930,6 +946,7 @@ Partial Class Benhandungdetail Me.btnAbschliessen.TabIndex = 209 Me.btnAbschliessen.Text = "Abschliessen" Me.btnAbschliessen.UseVisualStyleBackColor = True + Me.btnAbschliessen.Visible = False ' 'btnZuruecksetzen ' @@ -939,6 +956,7 @@ Partial Class Benhandungdetail Me.btnZuruecksetzen.TabIndex = 208 Me.btnZuruecksetzen.Text = "Zurücksetzen" Me.btnZuruecksetzen.UseVisualStyleBackColor = True + Me.btnZuruecksetzen.Visible = False ' 'lblRGStellung ' @@ -1160,7 +1178,7 @@ Partial Class Benhandungdetail ' 'ToolStrip1 ' - Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsbtnSave, Me.ToolStripDropDownButton1, Me.ToolStripSeparator1}) + Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsbtnSave, Me.ToolStripDropDownButton1, Me.ToolStripSeparator1, Me.tsbtnGarantAnzeigen}) Me.ToolStrip1.Location = New System.Drawing.Point(0, 0) Me.ToolStrip1.Name = "ToolStrip1" Me.ToolStrip1.Size = New System.Drawing.Size(1062, 25) @@ -1203,6 +1221,17 @@ Partial Class Benhandungdetail Me.ToolStripSeparator1.Name = "ToolStripSeparator1" Me.ToolStripSeparator1.Size = New System.Drawing.Size(6, 25) ' + 'tsbtnGarantAnzeigen + ' + Me.tsbtnGarantAnzeigen.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text + Me.tsbtnGarantAnzeigen.Image = CType(resources.GetObject("tsbtnGarantAnzeigen.Image"), System.Drawing.Image) + Me.tsbtnGarantAnzeigen.ImageTransparentColor = System.Drawing.Color.Magenta + Me.tsbtnGarantAnzeigen.Name = "tsbtnGarantAnzeigen" + Me.tsbtnGarantAnzeigen.Size = New System.Drawing.Size(96, 22) + Me.tsbtnGarantAnzeigen.Text = "Garant anzeigen" + Me.tsbtnGarantAnzeigen.TextImageRelation = System.Windows.Forms.TextImageRelation.TextBeforeImage + Me.tsbtnGarantAnzeigen.ToolTipText = "Garant anzeigen" + ' 'GrpRechnungstext ' Me.GrpRechnungstext.Controls.Add(Me.cbboxrgtext) @@ -1269,6 +1298,8 @@ Partial Class Benhandungdetail ' 'grpglndiagnose ' + Me.grpglndiagnose.Controls.Add(Me.txtBehandlungsgrund) + Me.grpglndiagnose.Controls.Add(Me.lblBehandlungsgrund) Me.grpglndiagnose.Controls.Add(Me.txtGLN_Liste) Me.grpglndiagnose.Controls.Add(Me.lblGLNListe) Me.grpglndiagnose.Controls.Add(Me.txtDiagnose) @@ -1280,6 +1311,22 @@ Partial Class Benhandungdetail Me.grpglndiagnose.TabStop = False Me.grpglndiagnose.Text = "GLN / Diagnose" ' + 'txtBehandlungsgrund + ' + Me.txtBehandlungsgrund.Location = New System.Drawing.Point(95, 76) + Me.txtBehandlungsgrund.Name = "txtBehandlungsgrund" + Me.txtBehandlungsgrund.Size = New System.Drawing.Size(329, 20) + Me.txtBehandlungsgrund.TabIndex = 222 + ' + 'lblBehandlungsgrund + ' + Me.lblBehandlungsgrund.AutoSize = True + Me.lblBehandlungsgrund.Location = New System.Drawing.Point(9, 79) + Me.lblBehandlungsgrund.Name = "lblBehandlungsgrund" + Me.lblBehandlungsgrund.Size = New System.Drawing.Size(61, 13) + Me.lblBehandlungsgrund.TabIndex = 223 + Me.lblBehandlungsgrund.Text = "Beh.-Grund" + ' 'Benhandungdetail ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -1418,4 +1465,8 @@ Partial Class Benhandungdetail Friend WithEvents lblGesetz As Label Friend WithEvents cbboxNrGesetz As MyCombobox Friend WithEvents DDTBehandlungsbeginn As DevComponents.Editors.DateTimeAdv.DateTimeInput + Friend WithEvents txtBehandlungsgrund As TextBox + Friend WithEvents lblBehandlungsgrund As Label + Friend WithEvents Button1 As Button + Friend WithEvents tsbtnGarantAnzeigen As ToolStripButton End Class diff --git a/DPM2016/Behandlung/Benhandungdetail.resx b/DPM2016/Behandlung/Benhandungdetail.resx index 3067eb9..8dab3fe 100644 --- a/DPM2016/Behandlung/Benhandungdetail.resx +++ b/DPM2016/Behandlung/Benhandungdetail.resx @@ -138,6 +138,21 @@ +BewLlFVVS3I8xxRGKJUGW7uZrh9fBK5vp9BpSlWUYgsy2pBkiS82IU4jvnJgnRjpeder4fJxIXv+/A8 rwXtOc4Vd5pnWGCg4Xjs8i9RSrWg0MwIDPo6fV2opkC6yk2BPlbHGI1ACs1MTx/7nU0pp6KEbduFrulY 1ifZ/XIlNzeApwAAAABJRU5ErkJggg== + + + + + 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== \ No newline at end of file diff --git a/DPM2016/Behandlung/Benhandungdetail.vb b/DPM2016/Behandlung/Benhandungdetail.vb index 4ac3eb5..28ebbc6 100644 --- a/DPM2016/Behandlung/Benhandungdetail.vb +++ b/DPM2016/Behandlung/Benhandungdetail.vb @@ -13,11 +13,13 @@ Set(value As Integer) m_behandlungsnr = value If value <> 0 Then + Me.OnLoad = True Get_Stammdaten() OnGetData = True Get_Data() OnGetData = False Recalc_Totale() + Me.OnLoad = False End If End Set End Property @@ -210,6 +212,7 @@ Dim NrAnsprechpartner As Integer = 0 Sub Get_Data() + 'Me.lblGarantText.Text = "" db.Get_Tabledata("behandlu", " where nrbehandlung=" + Me.Behandlungsnr.ToString) Dim r As DataRow = db.dsDaten.Tables(0).Rows(0) Me.Behandlungsstatus = r("status") @@ -229,7 +232,6 @@ Catch ex As Exception End Try - AddChanges(Me) Me.HasChanges = False End Sub @@ -331,16 +333,21 @@ End Sub Sub Get_Garantdata(ByVal Key As Integer) + Dim db1 As New clsDB Dim garantdatan As New DataTable If Key > 49999 Then - db.Get_Tabledata("Firma", "", "Select nrfirma,name1+', '+ort as Name1 from firma where aktiv=1 and nrfirma=" + Key.ToString + " order by name1") + db1.Get_Tabledata("Firma", "", "Select nrfirma,name1+', '+ort +' ('+ltrim(rtrim(str(nrfirma)))+')' as Name1 from firma where aktiv=1 and nrfirma=" + Key.ToString + " order by name1") + 'Me.lblGarantText.Text = db.dsDaten.Tables(0).Rows(0).Item("nrfirma").ToString + " - " + db.dsDaten.Tables(0).Rows(0).Item("name1") + + Else - db.Get_Tabledata("Privat", "", "Select nrprivat,name+' '+vorname+', '+plz+' '+ort as Name1 from privat where nrprivat=" + Key.ToString + " and aktiv=1 and garant=1 order by name, vorname") + db1.Get_Tabledata("Privat", "", "Select nrprivat,name+' '+vorname+', '+plz+' '+ort +' ('+ltrim(rtrim(str(nrprivat)))+')' as Name1 from privat where nrprivat=" + Key.ToString + " and aktiv=1 and (garant=1 or gesvertreter=1) order by name, vorname") + 'Me.lblGarantText.Text = db.dsDaten.Tables(0).Rows(0).Item("nrprivat").ToString + " - " + db.dsDaten.Tables(0).Rows(0).Item("name1") End If Me.cbboxNrGarant.DataSource = Nothing - garantdatan = db.dsDaten.Tables(0).Copy + garantdatan = db1.dsDaten.Tables(0).Copy Me.cbboxNrGarant.DataSource = garantdatan If Key > 49999 Then Me.cbboxNrGarant.Displaymember = "name1" @@ -353,7 +360,8 @@ If Key > 49999 Then get_ansprechpartner(Key) End If - + db1.Dispose() + Application.DoEvents() End Sub Sub get_ansprechpartner(ByVal key As Integer) @@ -447,6 +455,8 @@ Public Sub Get_Stammdaten() + 'Me.OnLoad = True + Me.cbboxnrbehandler.Dataselection = db.Get_SQL(2) Me.cbboxnrbehandler.TableAlias = "Behandler_BH" Me.cbboxnrbehandler.Table = "Behandler" @@ -489,13 +499,13 @@ Me.cbboxNrtaxpunkt.Table = "Taxpunkt" Me.cbboxNrtaxpunkt.Displaymember = "Bezd" Me.cbboxNrtaxpunkt.Valuemember = "nrtaxpunkt" - Me.OnLoad = True + Me.cbboxrgtext.Dataselection = db.Get_SQL(21) Me.cbboxrgtext.TableAlias = "Rechnungstext" Me.cbboxrgtext.Table = "Rechtext" Me.cbboxrgtext.Displaymember = "Textd" Me.cbboxrgtext.Valuemember = "Nrrechnungstext" - Me.OnLoad = False + ' Me.OnLoad = False End Sub @@ -623,7 +633,7 @@ End Sub - Private Sub cbboxNRRGtyp_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cbboxNRRGtyp.SelectedValueChanged + Private Sub cbboxNRRGtyp_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cbboxNRRGtyp.SelectedIndexChanged If OnGetData Then Exit Sub Try For Each r As DataRow In IntTables.Inttables.Tables("rgtyp").Rows @@ -717,7 +727,7 @@ Private Sub rbversicherung_CheckedChanged(sender As Object, e As EventArgs) Handles rbversicherung.CheckedChanged If rbversicherung.Checked Then Dim garantdatan As New DataTable - db.Get_Tabledata("Firma", "", "Select nrfirma, name1 +', '+ort as Name1 from firma where vs=1 and aktiv=1 order by name1") + db.Get_Tabledata("Firma", "", "Select nrfirma, name1 +', '+ort +' ('+ltrim(rtrim(str(nrfirma)))+')' as Name1 from firma where vs=1 and aktiv=1 order by name1") Me.cbboxNrGarant.DataSource = Nothing garantdatan = db.dsDaten.Tables(0).Copy Me.cbboxNrGarant.DataSource = garantdatan @@ -731,7 +741,7 @@ Private Sub rbfs_CheckedChanged(sender As Object, e As EventArgs) Handles rbfs.CheckedChanged If rbfs.Checked Then Dim garantdatan As New DataTable - db.Get_Tabledata("Firma", "", "Select nrfirma,name1+', '+ort as Name1 from firma where fs=1 and aktiv=1 order by name1") + db.Get_Tabledata("Firma", "", "Select nrfirma, name1 +', '+ort +' ('+ltrim(rtrim(str(nrfirma)))+')' as Name1 from firma where fs=1 and aktiv=1 order by name1") Me.cbboxNrGarant.DataSource = Nothing garantdatan = db.dsDaten.Tables(0).Copy Me.cbboxNrGarant.DataSource = garantdatan @@ -745,7 +755,7 @@ Private Sub rbiv_CheckedChanged(sender As Object, e As EventArgs) Handles rbiv.CheckedChanged If rbiv.Checked Then Dim garantdatan As New DataTable - db.Get_Tabledata("Firma", "", "Select nrfirma,name1+', '+ort as Name1 from firma where iv=1 and aktiv=1 order by name1") + db.Get_Tabledata("Firma", "", "Select nrfirma, name1 +', '+ort +' ('+ltrim(rtrim(str(nrfirma)))+')' as Name1 from firma where iv=1 and aktiv=1 order by name1") Me.cbboxNrGarant.DataSource = Nothing garantdatan = db.dsDaten.Tables(0).Copy Me.cbboxNrGarant.DataSource = garantdatan @@ -758,7 +768,7 @@ Private Sub rbdiverseFirmen_CheckedChanged(sender As Object, e As EventArgs) Handles rbdiverseFirmen.CheckedChanged Dim garantdatan As New DataTable - db.Get_Tabledata("Firma", "", "Select nrfirma,name1+', '+ort as Name1 from firma where aktiv=1 order by name1") + db.Get_Tabledata("Firma", "", "Select nrfirma, name1 +', '+ort +' ('+ltrim(rtrim(str(nrfirma)))+')' as Name1 from firma where aktiv=1 order by name1") Me.cbboxNrGarant.DataSource = Nothing garantdatan = db.dsDaten.Tables(0).Copy Me.cbboxNrGarant.DataSource = garantdatan @@ -771,7 +781,7 @@ Private Sub rbkk_CheckedChanged(sender As Object, e As EventArgs) Handles rbkk.CheckedChanged If rbkk.Checked Then Dim garantdatan As New DataTable - db.Get_Tabledata("Firma", "", "Select nrfirma,name1+', '+ort as Name1 from firma where kk=1 and aktiv=1 order by name1") + db.Get_Tabledata("Firma", "", "Select nrfirma, name1 +', '+ort +' ('+ltrim(rtrim(str(nrfirma)))+')' as Name1 from firma where kk=1 and aktiv=1 order by name1") Me.cbboxNrGarant.DataSource = Nothing garantdatan = db.dsDaten.Tables(0).Copy Me.cbboxNrGarant.DataSource = garantdatan @@ -785,7 +795,7 @@ Private Sub rbPrivatPersonen_CheckedChanged(sender As Object, e As EventArgs) Handles rbPrivatPersonen.CheckedChanged If rbPrivatPersonen.Checked Then Dim garantdatan As New DataTable - db.Get_Tabledata("Privat", "", "Select nrprivat,name+' '+vorname+', '+plz+' '+ort as Name1 from privat where aktiv=1 and garant=1 order by name, vorname") + db.Get_Tabledata("Privat", "", "Select nrprivat,name+' '+vorname+', '+plz+' '+ort +' ('+ltrim(rtrim(str(nrprivat)))+')' as Name1 from privat where aktiv=1 and (garant=1 or gesvertreter=1) order by name, vorname") Me.cbboxNrGarant.DataSource = Nothing garantdatan = db.dsDaten.Tables(0).Copy Me.cbboxNrGarant.DataSource = garantdatan @@ -830,8 +840,8 @@ End Sub - Private Sub ToolStripDropDownButton1_Click(sender As Object, e As EventArgs) Handles ToolStripDropDownButton1.Click - Check_Changes() + Public Sub ToolStripDropDownButton1_Click(sender As Object, e As EventArgs) Handles ToolStripDropDownButton1.Click + Me.Save_Data() Dim result As String = db.Get_Datavalue("Select status from behandlu where nrbehandlung=" + Me.Behandlungsnr.ToString, "") If result <> 2 And result <> 5 Then If MsgBox("Es können nur abgeschlossene Rechnungen/KV gedruckt und verbucht werden. Abschliessen und drucken/verbuchen?", vbYesNo + vbQuestion) = vbYes Then @@ -840,7 +850,12 @@ Exit Sub End If End If - If MsgBox("Rechnung drucken und verbuchen?", vbYesNo + vbQuestion) = vbYes Then + Dim Meldung As String + + If result = 5 Then Meldung = "Kostenvoranschlag drucken?" Else Meldung = "Rechnung drucken und verbuchen?" + If MsgBox(Meldung, vbYesNo + vbQuestion) = vbYes Then + Dim buchen As Boolean = True + If result = 5 Then buchen = False Dim anzahlraten As Integer = 0 db.Get_Tabledata("Behandlu", "where nrbehandlung=" + Me.Behandlungsnr.ToString) anzahlraten = db.dsDaten.Tables(0).Rows(0).Item("Anzahlraten") @@ -855,11 +870,13 @@ Folgeauswertung = db.dsDaten.Tables(0).Rows(0).Item("Folge_Report") Separater_Druckjob = db.dsDaten.Tables(0).Rows(0).Item("Folgereport_Sep_Druckjob") Dim hauptfaktura As Integer + Globals.FakturaNr = 0 While doloop = True For i As Integer = 1 To anzahlraten Dim f As New frmReportView(reportnr, False, "Vorschau Rechung", " where nrbehandlung = " + Me.Behandlungsnr.ToString, Me.Behandlungsnr.ToString) + f.Visible = False f.Show() - f.Fakturierung(reportnr, Me.Behandlungsnr, "", i) + f.Fakturierung(reportnr, Me.Behandlungsnr, "", i, buchen:=buchen) 'f.Print_Rechnung(False, False, i) f.Close() 'If i = 1 Then @@ -872,6 +889,7 @@ 'End If Next i If Folgeauswertung > 0 Then + buchen = False reportnr = Folgeauswertung db.Get_Tabledata("Auswertung", "where auswertungnr=" + Folgeauswertung.ToString) Folgeauswertung = db.dsDaten.Tables(0).Rows(0).Item("Folge_Report") @@ -880,15 +898,16 @@ doloop = False End If End While - + evh.Refresh_Behandlungen(Me.Behandlungsnr) End If - + Globals.FakturaNr = 0 End Sub - Private Sub DesignRechnungToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles DesignRechnungToolStripMenuItem.Click + Public Sub DesignRechnungToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles DesignRechnungToolStripMenuItem.Click + Me.Save_Data() Dim anzahlraten As Integer = 0 db.Get_Tabledata("Behandlu", "where nrbehandlung=" + Me.Behandlungsnr.ToString) anzahlraten = db.dsDaten.Tables(0).Rows(0).Item("Anzahlraten") @@ -918,7 +937,8 @@ End While End Sub - Private Sub VorschaRechnungToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles VorschaRechnungToolStripMenuItem.Click + Public Sub VorschaRechnungToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles VorschaRechnungToolStripMenuItem.Click + Me.Save_Data() Dim anzahlraten As Integer = 0 db.Get_Tabledata("Behandlu", "where nrbehandlung=" + Me.Behandlungsnr.ToString) anzahlraten = db.dsDaten.Tables(0).Rows(0).Item("Anzahlraten") @@ -992,6 +1012,7 @@ Private Sub DDTUnfalldatum_KeyDown(sender As Object, e As KeyEventArgs) Handles DDTUnfalldatum.KeyDown, DDTDatum_Kostengutsprache.KeyDown, DDTBehandlungsbeginn.KeyDown, DDTBehandlungsende.KeyDown, DDTRGStellung.KeyDown If e.KeyCode = Keys.Escape Then delete_date(sender) If e.KeyCode = Keys.Decimal Then SendKeys.SendWait("{TAB}") + If e.KeyCode = 190 Then SendKeys.SendWait("{TAB}") End Sub @@ -999,6 +1020,93 @@ sender.value = Nothing End Sub + Private Sub cbboxNRRGtyp_SelectedIndexChanged_1(sender As Object, e As EventArgs) Handles cbboxNRRGtyp.SelectedIndexChanged + If OnLoad Then Exit Sub + Dim result As String = db.Get_Datavalue("Select status from behandlu where nrbehandlung=" + Me.Behandlungsnr.ToString, "") + Dim kv As Boolean = False + If result = 3 Or result = 4 Then kv = True + + Select Case Me.cbboxNRRGtyp.Text + Case "Dentotar" + If kv Then + result = db.Get_Datavalue("Select nrestyp from estyp where default_bei_kv_dentotar=1") + Me.cbboxNrGesetz.SelectedValue = 2 + Else + result = db.Get_Datavalue("Select nrestyp from estyp where default_bei_rg_dentotar=1") + Me.cbboxNrGesetz.SelectedValue = 2 + Me.chkMitdatum.Checked = True + End If + Case Else + If kv Then + result = db.Get_Datavalue("Select nrestyp from estyp where default_bei_kv=1") + Me.cbboxNrGesetz.SelectedValue = 1 + Else + result = db.Get_Datavalue("Select nrestyp from estyp where default_bei_rg=1") + Me.cbboxNrGesetz.SelectedValue = 1 + + End If + + End Select + Try + Me.cbboxNRESTyp.SelectedValue = result + Catch + End Try + + End Sub + + Private Sub cbboxNrAbrechnungstyp_SelectedIndexChanged_1(sender As Object, e As EventArgs) Handles cbboxNrAbrechnungstyp.SelectedIndexChanged + + End Sub + + Private Sub cbboxNRESTyp_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cbboxNRESTyp.SelectedIndexChanged + Try + For Each r As DataRow In IntTables.Inttables.Tables("estyp").Rows + If r.Item("nrestyp") = cbboxNRESTyp.SelectedValue Then + Me.cbboxNRRGtyp.SelectedValue = r.Item("Default_rgtyp") + End If + Next + Catch + End Try + + End Sub + + Private Sub lblGarantText_Click(sender As Object, e As EventArgs) + + End Sub + + + Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click + + Try + Me.Cursor = Cursors.WaitCursor + + Dim s As String = Me.cbboxNrGarant.SelectedValue + If s > 49999 Then + Dim f As New frmFirma + f.MdiParent = Globals.Mainweindow + f.Show() + f.Firmanr = s + + Else + Dim f As New Patient + f.MdiParent = Globals.Mainweindow + f.Show() + f.PatientNr = s + + End If + Catch + Finally + Me.Cursor = Cursors.Default + End Try + + End Sub + + + + Private Sub tsbtnGarantAnzeigen_Click(sender As Object, e As EventArgs) Handles tsbtnGarantAnzeigen.Click + Button1_Click(sender, e) + End Sub + diff --git a/DPM2016/Behandlung/Leistungen.Designer.vb b/DPM2016/Behandlung/Leistungen.Designer.vb index b6f3c99..f215dcf 100644 --- a/DPM2016/Behandlung/Leistungen.Designer.vb +++ b/DPM2016/Behandlung/Leistungen.Designer.vb @@ -49,6 +49,8 @@ Partial Class Leistungen Me.intAnzahl = New DevComponents.Editors.IntegerInput() Me.lblAnzahl = New System.Windows.Forms.Label() Me.grpLeistungsdetails = New System.Windows.Forms.GroupBox() + Me.txtErgänzung = New System.Windows.Forms.TextBox() + Me.Label2 = New System.Windows.Forms.Label() Me.txtBezD = New System.Windows.Forms.TextBox() Me.lblBeschreibung = New System.Windows.Forms.Label() Me.cbboxnrbehandler = New DPM2016.MyCombobox() @@ -72,6 +74,7 @@ Partial Class Leistungen Me.BearbeitenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.LöschenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.AnzeigenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.LeistungsdatumÄndernToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.Panel2 = New System.Windows.Forms.Panel() Me.Panel3 = New System.Windows.Forms.Panel() Me.ToolStrip1.SuspendLayout() @@ -155,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 @@ -175,7 +179,7 @@ Partial Class Leistungen 'TarifdetailsToolStripMenuItem ' Me.TarifdetailsToolStripMenuItem.Name = "TarifdetailsToolStripMenuItem" - Me.TarifdetailsToolStripMenuItem.Size = New System.Drawing.Size(152, 22) + Me.TarifdetailsToolStripMenuItem.Size = New System.Drawing.Size(131, 22) Me.TarifdetailsToolStripMenuItem.Text = "Tarifdetails" ' 'ToolStrip2 @@ -272,7 +276,7 @@ Partial Class Leistungen Me.TabPage2.Location = New System.Drawing.Point(4, 22) Me.TabPage2.Name = "TabPage2" Me.TabPage2.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage2.Size = New System.Drawing.Size(481, 239) + Me.TabPage2.Size = New System.Drawing.Size(712, 239) Me.TabPage2.TabIndex = 1 Me.TabPage2.Text = "Leistungspaket" Me.TabPage2.UseVisualStyleBackColor = True @@ -285,13 +289,14 @@ 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 Me.lbPakete.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F" Me.lbPakete.Location = New System.Drawing.Point(3, 33) Me.lbPakete.Name = "lbPakete" - Me.lbPakete.Size = New System.Drawing.Size(475, 203) + Me.lbPakete.Size = New System.Drawing.Size(706, 203) Me.lbPakete.TabIndex = 2 Me.lbPakete.Text = "ListBoxAdv1" ' @@ -303,7 +308,7 @@ Partial Class Leistungen Me.Panel1.Dock = System.Windows.Forms.DockStyle.Top Me.Panel1.Location = New System.Drawing.Point(3, 3) Me.Panel1.Name = "Panel1" - Me.Panel1.Size = New System.Drawing.Size(475, 30) + Me.Panel1.Size = New System.Drawing.Size(706, 30) Me.Panel1.TabIndex = 1 ' 'btnPaketeinfuegen @@ -341,6 +346,8 @@ Partial Class Leistungen ' 'grpLeistungsdetails ' + Me.grpLeistungsdetails.Controls.Add(Me.txtErgänzung) + Me.grpLeistungsdetails.Controls.Add(Me.Label2) Me.grpLeistungsdetails.Controls.Add(Me.txtBezD) Me.grpLeistungsdetails.Controls.Add(Me.lblBeschreibung) Me.grpLeistungsdetails.Controls.Add(Me.cbboxnrbehandler) @@ -365,13 +372,30 @@ Partial Class Leistungen Me.grpLeistungsdetails.TabStop = False Me.grpLeistungsdetails.Text = "Leistungsdetails" ' + 'txtErgänzung + ' + Me.txtErgänzung.Location = New System.Drawing.Point(85, 166) + Me.txtErgänzung.Multiline = True + Me.txtErgänzung.Name = "txtErgänzung" + Me.txtErgänzung.Size = New System.Drawing.Size(177, 18) + Me.txtErgänzung.TabIndex = 4 + ' + 'Label2 + ' + Me.Label2.AutoSize = True + Me.Label2.Location = New System.Drawing.Point(11, 169) + Me.Label2.Name = "Label2" + Me.Label2.Size = New System.Drawing.Size(58, 13) + Me.Label2.TabIndex = 24 + Me.Label2.Text = "Ergänzung" + ' 'txtBezD ' Me.txtBezD.Location = New System.Drawing.Point(85, 115) Me.txtBezD.Multiline = True Me.txtBezD.Name = "txtBezD" Me.txtBezD.Size = New System.Drawing.Size(177, 45) - Me.txtBezD.TabIndex = 6 + Me.txtBezD.TabIndex = 3 ' 'lblBeschreibung ' @@ -405,17 +429,17 @@ Partial Class Leistungen ' 'BtnInsertLeistung ' - Me.BtnInsertLeistung.Location = New System.Drawing.Point(14, 248) + Me.BtnInsertLeistung.Location = New System.Drawing.Point(194, 246) Me.BtnInsertLeistung.Name = "BtnInsertLeistung" Me.BtnInsertLeistung.Size = New System.Drawing.Size(120, 23) - Me.BtnInsertLeistung.TabIndex = 7 + Me.BtnInsertLeistung.TabIndex = 8 Me.BtnInsertLeistung.Text = "Leistung einfügen" Me.BtnInsertLeistung.UseVisualStyleBackColor = True ' 'txtTotal ' Me.txtTotal.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtTotal.Location = New System.Drawing.Point(49, 220) + Me.txtTotal.Location = New System.Drawing.Point(49, 246) Me.txtTotal.Name = "txtTotal" Me.txtTotal.RightToLeft = System.Windows.Forms.RightToLeft.No Me.txtTotal.Size = New System.Drawing.Size(92, 13) @@ -427,7 +451,7 @@ Partial Class Leistungen ' Me.Label1.AutoSize = True Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label1.Location = New System.Drawing.Point(11, 220) + Me.Label1.Location = New System.Drawing.Point(11, 246) Me.Label1.Name = "Label1" Me.Label1.Size = New System.Drawing.Size(36, 13) Me.Label1.TabIndex = 10 @@ -436,7 +460,7 @@ Partial Class Leistungen 'lblWert ' Me.lblWert.AutoSize = True - Me.lblWert.Location = New System.Drawing.Point(11, 196) + Me.lblWert.Location = New System.Drawing.Point(11, 220) Me.lblWert.Name = "lblWert" Me.lblWert.Size = New System.Drawing.Size(30, 13) Me.lblWert.TabIndex = 9 @@ -451,16 +475,16 @@ Partial Class Leistungen Me.diwert.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square Me.diwert.ButtonFreeText.Shortcut = DevComponents.DotNetBar.eShortcut.F2 Me.diwert.Increment = 1.0R - Me.diwert.Location = New System.Drawing.Point(85, 192) + Me.diwert.Location = New System.Drawing.Point(85, 216) Me.diwert.Name = "diwert" Me.diwert.ShowUpDown = True Me.diwert.Size = New System.Drawing.Size(68, 20) - Me.diwert.TabIndex = 4 + Me.diwert.TabIndex = 7 ' 'lblMenge ' Me.lblMenge.AutoSize = True - Me.lblMenge.Location = New System.Drawing.Point(11, 169) + Me.lblMenge.Location = New System.Drawing.Point(11, 193) Me.lblMenge.Name = "lblMenge" Me.lblMenge.Size = New System.Drawing.Size(40, 13) Me.lblMenge.TabIndex = 7 @@ -475,16 +499,16 @@ Partial Class Leistungen Me.DIMenge.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square Me.DIMenge.ButtonFreeText.Shortcut = DevComponents.DotNetBar.eShortcut.F2 Me.DIMenge.Increment = 1.0R - Me.DIMenge.Location = New System.Drawing.Point(85, 166) + Me.DIMenge.Location = New System.Drawing.Point(85, 190) Me.DIMenge.Name = "DIMenge" Me.DIMenge.ShowUpDown = True Me.DIMenge.Size = New System.Drawing.Size(68, 20) - Me.DIMenge.TabIndex = 3 + Me.DIMenge.TabIndex = 5 ' 'lblTaxpunkte ' Me.lblTaxpunkte.AutoSize = True - Me.lblTaxpunkte.Location = New System.Drawing.Point(159, 169) + Me.lblTaxpunkte.Location = New System.Drawing.Point(159, 193) Me.lblTaxpunkte.Name = "lblTaxpunkte" Me.lblTaxpunkte.Size = New System.Drawing.Size(41, 13) Me.lblTaxpunkte.TabIndex = 5 @@ -498,11 +522,11 @@ Partial Class Leistungen Me.DIPunkte.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square Me.DIPunkte.ButtonFreeText.Shortcut = DevComponents.DotNetBar.eShortcut.F2 Me.DIPunkte.Increment = 1.0R - Me.DIPunkte.Location = New System.Drawing.Point(206, 166) + Me.DIPunkte.Location = New System.Drawing.Point(206, 190) Me.DIPunkte.Name = "DIPunkte" Me.DIPunkte.ShowUpDown = True Me.DIPunkte.Size = New System.Drawing.Size(56, 20) - Me.DIPunkte.TabIndex = 5 + Me.DIPunkte.TabIndex = 6 ' 'txtPosition ' @@ -606,28 +630,34 @@ Partial Class Leistungen ' 'ctxMenuLeistung ' - Me.ctxMenuLeistung.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.BearbeitenToolStripMenuItem, Me.LöschenToolStripMenuItem, Me.AnzeigenToolStripMenuItem}) + Me.ctxMenuLeistung.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.BearbeitenToolStripMenuItem, Me.LöschenToolStripMenuItem, Me.AnzeigenToolStripMenuItem, Me.LeistungsdatumÄndernToolStripMenuItem}) Me.ctxMenuLeistung.Name = "ctxMenuLeistung" - Me.ctxMenuLeistung.Size = New System.Drawing.Size(131, 70) + Me.ctxMenuLeistung.Size = New System.Drawing.Size(200, 92) ' 'BearbeitenToolStripMenuItem ' Me.BearbeitenToolStripMenuItem.Name = "BearbeitenToolStripMenuItem" - Me.BearbeitenToolStripMenuItem.Size = New System.Drawing.Size(130, 22) + Me.BearbeitenToolStripMenuItem.Size = New System.Drawing.Size(199, 22) Me.BearbeitenToolStripMenuItem.Text = "&Bearbeiten" ' 'LöschenToolStripMenuItem ' Me.LöschenToolStripMenuItem.Name = "LöschenToolStripMenuItem" - Me.LöschenToolStripMenuItem.Size = New System.Drawing.Size(130, 22) + Me.LöschenToolStripMenuItem.Size = New System.Drawing.Size(199, 22) Me.LöschenToolStripMenuItem.Text = "&Löschen" ' 'AnzeigenToolStripMenuItem ' Me.AnzeigenToolStripMenuItem.Name = "AnzeigenToolStripMenuItem" - Me.AnzeigenToolStripMenuItem.Size = New System.Drawing.Size(130, 22) + Me.AnzeigenToolStripMenuItem.Size = New System.Drawing.Size(199, 22) Me.AnzeigenToolStripMenuItem.Text = "Anzeigen" ' + 'LeistungsdatumÄndernToolStripMenuItem + ' + Me.LeistungsdatumÄndernToolStripMenuItem.Name = "LeistungsdatumÄndernToolStripMenuItem" + Me.LeistungsdatumÄndernToolStripMenuItem.Size = New System.Drawing.Size(199, 22) + Me.LeistungsdatumÄndernToolStripMenuItem.Text = "Leistungsdatum ändern" + ' 'Panel2 ' Me.Panel2.Controls.Add(Me.GrpTarif) @@ -735,4 +765,7 @@ Partial Class Leistungen Friend WithEvents ToolStripLabel1 As ToolStripLabel Friend WithEvents ContextMenuStrip1 As ContextMenuStrip Friend WithEvents TarifdetailsToolStripMenuItem As ToolStripMenuItem + Friend WithEvents txtErgänzung As TextBox + Friend WithEvents Label2 As Label + Friend WithEvents LeistungsdatumÄndernToolStripMenuItem As ToolStripMenuItem End Class diff --git a/DPM2016/Behandlung/Leistungen.resx b/DPM2016/Behandlung/Leistungen.resx index e87381f..0fc5df8 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{}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> + <?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" 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 862981c..025441a 100644 --- a/DPM2016/Behandlung/Leistungen.vb +++ b/DPM2016/Behandlung/Leistungen.vb @@ -1,4 +1,5 @@ Imports System.ComponentModel +Imports C1.Win.C1TrueDBGrid Public Class Leistungen @@ -100,12 +101,12 @@ Public Class Leistungen If Dentotar = True Then For Each r As DataRow In IntTables.Inttables.Tables("Tarife").Rows Select Case Trim(r("Bezeichnung")) - Case "Dentotar" + Case "UV_MV_IV" Dim tn As New DevComponents.AdvTree.Node tn.Text = r("Bezeichnung") Me.TreeTarifGruppen.Nodes.Add(tn) Dim sortstring As String = "KapitelNrNeu" - Dim dv As New DataView(IntTables.Inttables.Tables("dentotar"), "Level=1 and KapitelNrNeu<>'00'", sortstring, DataViewRowState.CurrentRows) + Dim dv As New DataView(IntTables.Inttables.Tables("dentotar"), "Level=1 and KapitelNrNeu<>'00' and KapitelNrNeu<>'000' ", sortstring, DataViewRowState.CurrentRows) For Each rowView As DataRowView In dv Dim r2 As DataRow = rowView.Row Dim tn1 As New DevComponents.AdvTree.Node @@ -202,7 +203,7 @@ Public Class Leistungen Try Dim db As New DataView(IntTables.Inttables.Tables("Dentotar")) Dim sortstring As String = "leistungnrneu, leistungd" - Dim Wherestring As String = "Level=3 and Kapitelleistung='Lei' and KapitelNrNeu like '" + Me.TreeTarifGruppen.SelectedNode.DataKeyString + "%'" + Dim Wherestring As String = "Kapitelleistung='Lei' and KapitelNrNeu like '" + Me.TreeTarifGruppen.SelectedNode.DataKeyString + "%'" dv = New DataView(IntTables.Inttables.Tables("dentotar"), Wherestring, sortstring, DataViewRowState.CurrentRows) Me.lbtarif1.DataSource = Nothing Me.lbtarif1.DataSource = dv @@ -223,7 +224,7 @@ Public Class Leistungen Else SortString = "Nr_Bez desc" End If - dv1 = New DataView(IntTables.Inttables.Tables("Tarif"), "SSO_Nummer >=" + Me.TreeTarifGruppen.SelectedNode.DataKeyString + " and SSO_Nummer <=" + Me.TreeTarifGruppen.SelectedNode.TagString, SortString, DataViewRowState.CurrentRows) + dv1 = New DataView(IntTables.Inttables.Tables("Tarif"), "SSO_Nummer >='" + Me.TreeTarifGruppen.SelectedNode.DataKeyString + "' and SSO_Nummer <='" + Me.TreeTarifGruppen.SelectedNode.TagString + "'", SortString, DataViewRowState.CurrentRows) @@ -233,7 +234,7 @@ Public Class Leistungen lbtarif1.ValueMember = "nrtarif" Catch ex As Exception - 'MsgBox(ex.Message) + MsgBox(ex.Message) End Try End Sub @@ -261,10 +262,74 @@ Public Class Leistungen End Sub Private Sub txtfilter_KeyUp(sender As Object, e As KeyEventArgs) Handles txtfilter.KeyUp + + + Dim T As New DataTable + T.Columns.Add("NR") + T.Columns.Add("NR_BEZ") + Dim SortString As String = "" + + If Dentotar = True Then + + Dim dv1 As New DataView(IntTables.Inttables.Tables("Dentotar"), "", "leistungnrneu", DataViewRowState.CurrentRows) + dv1.RowFilter = "nr_bez like '%" + Me.txtfilter.Text + "%'" + For Each rowView As DataRowView In dv1 + Dim row As DataRow = rowView.Row + Dim nr As DataRow = T.NewRow + nr.Item(0) = row.Item("leistungnrneu") + nr.Item(1) = row.Item("nr_bez") + T.Rows.Add(nr) + Next + + If intSort = 0 Then + SortString = "Nr_Bez asc" + Else + SortString = "Nr_Bez desc" + End If + + Dim dv2 As New DataView(IntTables.Inttables.Tables("Tarif"), "", SortString, DataViewRowState.CurrentRows) + dv2.RowFilter = "NR_BEZ like '%" + Me.txtfilter.Text + "%'" + + For Each rowView As DataRowView In dv2 + Dim row As DataRow = rowView.Row + If row.Item("sso_nummer").ToString > "4999" Then + + Dim nr As DataRow = T.NewRow + nr.Item(0) = row.Item("nrtarif") + nr.Item(1) = row.Item("nr_bez") + T.Rows.Add(nr) + End If + + Next + Else + Dim dv2 As New DataView(IntTables.Inttables.Tables("Tarif"), "", SortString, DataViewRowState.CurrentRows) + dv2.RowFilter = "NR_BEZ like '%" + Me.txtfilter.Text + "%'" + + For Each rowView As DataRowView In dv2 + Dim row As DataRow = rowView.Row + + + Dim nr As DataRow = T.NewRow + nr.Item(0) = row.Item("nrtarif") + nr.Item(1) = row.Item("nr_bez") + T.Rows.Add(nr) + + + Next + End If + + + + Me.lbtarif1.DataSource = Nothing + Me.lbtarif1.DataSource = T + Me.lbtarif1.DisplayMember = "nr_bez" + Me.lbtarif1.ValueMember = "nr" + Exit Sub + If Dentotar = True And Len(Me.TreeTarifGruppen.SelectedNode.DataKeyString) < 3 Then If e.KeyCode <> Keys.Enter Then Me.lbtarif1.DataSource = Nothing - Dim sortstring As String + 'Dim sortstring As String Dim wherestring As String Dim db As New DataView(IntTables.Inttables.Tables("Dentotar"), "", "leistungnrneu", DataViewRowState.CurrentRows) @@ -272,13 +337,32 @@ Public Class Leistungen Me.lbtarif1.DataSource = db Me.lbtarif1.DisplayMember = "nr_bez" Me.lbtarif1.ValueMember = "LeistungNrNeu" + + Me.lbtarif1.DataSource = Nothing + + If intSort = 0 Then + SortString = "Nr_Bez asc" + Else + SortString = "Nr_Bez desc" + End If + Exit Sub + 'Dim dv As New DataView(IntTables.Inttables.Tables("Tarif"), "nrtarifgruppe=" + Me.lbtarife.SelectedValue.ToString, SortString, DataViewRowState.CurrentRows) + 'Dim dv As New DataView(IntTables.Inttables.Tables("Tarif"), "SSO_Nummer >=" + Me.TreeTarifGruppen.SelectedNode.DataKeyString + " and SSO_Nummer <=" + Me.TreeTarifGruppen.SelectedNode.TagString, SortString, DataViewRowState.CurrentRows) + Dim dv As New DataView(IntTables.Inttables.Tables("Tarif"), "", SortString, DataViewRowState.CurrentRows) + + dv.RowFilter = "NR_BEZ like '%" + Me.txtfilter.Text + "%'" + Me.lbtarif1.DataSource = dv + Me.lbtarif1.DisplayMember = "nr_Bez" + Me.lbtarif1.ValueMember = "nrtarif" End If + + Exit Sub End If If e.KeyCode <> Keys.Enter Then Me.lbtarif1.DataSource = Nothing - Dim SortString As String = "" + ' Dim SortString As String = "" If intSort = 0 Then SortString = "Nr_Bez asc" Else @@ -308,7 +392,28 @@ Public Class Leistungen End If End Sub + Private Function Get_Tarifposition(ByVal value As String) As String + Dim sortstring As String = "" + Dim wherestring As String = "Leistungnrneu='" + value + "'" + Dim db As New DataView(IntTables.Inttables.Tables("Dentotar"), wherestring, sortstring, DataViewRowState.CurrentRows) + If db.Count > 0 Then + For Each drv As DataRowView In db + Return drv.Item("Leistungnrneu").ToString + Next + + Exit Function + End If + Dim dv As New DataView(IntTables.Inttables.Tables("Tarif"), "nrtarif=" + value, "", DataViewRowState.CurrentRows) + For Each drv As DataRowView In dv + Return drv.Item("sso_nummer").ToString + Next + End Function Private Sub lbtarif1_ItemClick(sender As Object, e As EventArgs) Handles lbtarif1.ItemClick + Me.txtPosition.Text = Get_Tarifposition(Me.lbtarif1.SelectedValue.ToString) + txtPosition_TextChanged(sender, e) + Exit Sub + + If Dentotar = True And Len(Me.TreeTarifGruppen.SelectedNode.DataKeyString) < 3 Then Dim sortstring As String = "" Dim wherestring As String = "Leistungnrneu='" + Me.lbtarif1.SelectedValue.ToString + "'" @@ -328,7 +433,7 @@ Public Class Leistungen End Sub Private Sub lbtarif1_ItemDoubleClick(sender As Object, e As EventArgs) Handles lbtarif1.ItemDoubleClick - If Dentotar = True And Len(Me.TreeTarifGruppen.SelectedNode.DataKeyString) < 3 Then + If Dentotar = True And Me.txtPosition.Text.Substring(0, 1) = 4 Then Dim dv1 As New DataView(IntTables.Inttables.Tables("Dentotar"), "Leistungnrneu='" + Me.lbtarif1.SelectedValue.ToString + "'", "", DataViewRowState.CurrentRows) For Each drv As DataRowView In dv1 Me.txtPosition.Text = drv.Item("Leistungnrneu").ToString @@ -359,10 +464,22 @@ Public Class Leistungen Me.cbboxnrbehandler.SelectedValue = Me.behandler End Try 'Me.cbboxnrbehandler.SelectedValue = Me.behandler - If Dentotar = True And Len(Me.TreeTarifGruppen.SelectedNode.DataKeyString) < 3 Then - Dim sortstring As String = "" - Dim wherestring As String = "LeistungnrNeu='" + Me.txtPosition.Text + "'" - Dim dv1 As New DataView(IntTables.Inttables.Tables("Dentotar"), wherestring, sortstring, DataViewRowState.CurrentRows) + + If Me.Dentotar = True And Me.txtPosition.Text.Substring(0, 1) = "4" Then + Dim s As String = Me.txtPosition.Text + If s.IndexOf(".") = -1 Then s = s.Substring(0, 1) + "." + s.Substring(1, Len(s) - 1) + If Len(s) < 6 Then + While Len(s) < 6 + s = s + "0" + End While + End If + Me.txtPosition.Text = s + End If + + Dim sortstring As String = "" + Dim wherestring As String = "LeistungnrNeu='" + Me.txtPosition.Text + "'" + Dim dv1 As New DataView(IntTables.Inttables.Tables("Dentotar"), wherestring, sortstring, DataViewRowState.CurrentRows) + If dv1.Count > 0 Then Dim dr As DataRowView Try dr = dv1(0) @@ -395,8 +512,11 @@ Public Class Leistungen Exit Sub End Try + Exit Sub + End If - Dim dv As New DataView(IntTables.Inttables.Tables("Tarif"), "sso_nummer=" + Me.txtPosition.Text.ToString, "", DataViewRowState.CurrentRows) + + Dim dv As New DataView(IntTables.Inttables.Tables("Tarif"), "sso_nummer='" + Me.txtPosition.Text.ToString + "'", "", DataViewRowState.CurrentRows) For Each drv As DataRowView In dv If drv.Item("Frankenbetrag") < 0.1 Then Select Case Me.TaxPunkte @@ -474,7 +594,14 @@ Public Class Leistungen dv = New DataView(IntTables.Inttables.Tables("Dentotar"), wherestring, sortstring, DataViewRowState.CurrentRows) End If - Dim drv As DataRowView = dv(0) + Dim drv As DataRowView + Try + drv = dv(0) + Catch + MsgBox("Leistungsposition nicht vorhanden.") + Exit Sub + End Try + Dim db As New clsDB Dim newkey As Integer = db.Get_DBKey("Leistung") @@ -496,9 +623,9 @@ Public Class Leistungen r.Item("nrtarif") = 0 r.Item("sso_nummer") = drv("LeistungNrNeu") If SSONummer = "" Then - r.Item("bezd") = Me.txtBezD.Text + r.Item("bezd") = Me.txtBezD.Text + " " + Me.txtErgänzung.Text Else - r.Item("bezd") = drv("Leistungd") + r.Item("bezd") = drv("Leistungd") + " " + Me.txtErgänzung.Text End If Dim betraginchf As Decimal @@ -577,7 +704,7 @@ Public Class Leistungen interror = 0 Exit Sub End If - If Dentotar = True And Len(Me.TreeTarifGruppen.SelectedNode.DataKeyString) < 3 Then + If Dentotar = True And Me.txtPosition.Text.Substring(0, 1) = "4" Then Leistung_Einfuegen_Dentotar(ssonummer, anzahl) Exit Sub End If @@ -585,9 +712,9 @@ Public Class Leistungen Dim dv As DataView If ssonummer = "" Then - dv = New DataView(IntTables.Inttables.Tables("Tarif"), "sso_nummer=" + Me.txtPosition.Text.ToString, "", DataViewRowState.CurrentRows) + dv = New DataView(IntTables.Inttables.Tables("Tarif"), "sso_nummer='" + Me.txtPosition.Text.ToString + "'", "", DataViewRowState.CurrentRows) Else - dv = New DataView(IntTables.Inttables.Tables("Tarif"), "sso_nummer=" + ssonummer.ToString, "", DataViewRowState.CurrentRows) + dv = New DataView(IntTables.Inttables.Tables("Tarif"), "sso_nummer='" + ssonummer.ToString + "'", "", DataViewRowState.CurrentRows) End If Dim drv As DataRowView = dv(0) @@ -612,9 +739,9 @@ Public Class Leistungen r.Item("nrtarif") = drv("Nrtarif") r.Item("sso_nummer") = drv("SSO_Nummer") If ssonummer = "" Then - r.Item("bezd") = Me.txtBezD.Text + r.Item("bezd") = Me.txtBezD.Text + " " + Me.txtErgänzung.Text Else - r.Item("bezd") = drv("bezd") + r.Item("bezd") = drv("bezd") + " " + Me.txtErgänzung.Text End If If ssonummer = "" Then @@ -677,7 +804,7 @@ Public Class Leistungen Sub refresh_leistungen() Me.C1Leistungen.DataSource = Nothing ldb.dsDaten.Tables.Clear() - ldb.Get_Tabledata("Leistung", " where aktiv=1 and nrbehandlung=" + Me.Behandlungnr.ToString + " and aktiv=1") + ldb.Get_Tabledata("Leistung", " where aktiv=1 and nrbehandlung=" + Me.Behandlungnr.ToString + " and aktiv=1 order by datum desc, sso_nummer asc") Me.C1Leistungen.DataSource = ldb.dsDaten.Tables(0) Me.C1Leistungen.DataMember = ldb.dsDaten.Tables(0).TableName spalten.Spaltentitel_aktualisieren(Me.C1Leistungen, ldb.dsDaten.Tables(0).TableName, ldb.dsDaten.Tables(0)) @@ -842,13 +969,14 @@ Public Class Leistungen Private Sub dtdatum_KeyDown(sender As Object, e As KeyEventArgs) Handles dtdatum.KeyDown If e.KeyCode = Keys.Escape Then delete_date(sender) If e.KeyCode = Keys.Decimal Then SendKeys.SendWait("{TAB}") + If e.KeyCode = 190 Then SendKeys.SendWait("{TAB}") End Sub Sub delete_date(sender) sender.value = Nothing End Sub - Private Sub ContextMenuStrip1_Opening(sender As Object, e As CancelEventArgs) Handles ContextMenuStrip1.Opening + Private Sub ContextMenuStrip1_Opening(sender As Object, e As System.ComponentModel.CancelEventArgs) Handles ContextMenuStrip1.Opening If Dentotar = True Then Me.TarifdetailsToolStripMenuItem.Enabled = True Else Me.TarifdetailsToolStripMenuItem.Enabled = False End Sub @@ -857,4 +985,53 @@ Public Class Leistungen f.Show() f.Update_Data(Me.lbtarif1.SelectedValue.ToString) End Sub + + Private Sub txtfilter_Click(sender As Object, e As EventArgs) Handles txtfilter.Click + + End Sub + + Private Sub TreeTarifGruppen_Click(sender As Object, e As EventArgs) Handles TreeTarifGruppen.Click + + End Sub + + Private Sub LeistungsdatumÄndernToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles LeistungsdatumÄndernToolStripMenuItem.Click + Dim f As New frmKalender + f.ShowDialog() + If Me.C1Leistungen.SelectedRows.Count > 0 Then + Dim colRows As C1.Win.C1TrueDBGrid.SelectedRowCollection + colRows = Me.C1Leistungen.SelectedRows + Dim db As New clsDB + For i As Integer = 0 To colRows.Count - 1 + Try + + db.Get_Tabledata("Leistung", "where nrleistung=" + Me.C1Leistungen.Columns("nrleistung").CellValue(colRows(i)).ToString) + db.dsDaten.Tables(0).Rows(0).Item("Datum") = f.MaskedTextBox1.Text + db.Update_Data() + + Catch ex As Exception + MsgBox(ex.Message) + End Try + Next + db.Dispose() + refresh_leistungen() + Else + Dim db As New clsDB + db.Get_Tabledata("Leistung", "where nrleistung=" + Me.C1Leistungen.Columns("nrleistung").Value.ToString) + db.dsDaten.Tables(0).Rows(0).Item("Datum") = f.MaskedTextBox1.Text + db.Update_Data() + Me.C1Leistungen.Columns("datum").Value = f.MaskedTextBox1.Text + db.Dispose() + End If + End Sub + + Private Sub lbtarif1_DoubleClick(sender As Object, e As EventArgs) Handles lbtarif1.DoubleClick + ' Leistung_Einfuegen() + End Sub + + Private Sub C1Leistungen_AfterColUpdate(sender As Object, e As ColEventArgs) Handles C1Leistungen.AfterColUpdate + 'ldb.dsDaten.AcceptChanges() + Me.C1Leistungen.UpdateData() + ldb.Update_Data() + 'ldb.Update_Tabeldata() + End Sub End Class diff --git a/DPM2016/Behandlung/frmLeistungDetail.vb b/DPM2016/Behandlung/frmLeistungDetail.vb index e9a7e17..a27b2e1 100644 --- a/DPM2016/Behandlung/frmLeistungDetail.vb +++ b/DPM2016/Behandlung/frmLeistungDetail.vb @@ -68,6 +68,7 @@ db.dsDaten.Tables(0).Rows(0).Item("frankenprotaxpunkt") = Me.diwert.Value db.dsDaten.Tables(0).Rows(0).Item("nrbehandler") = Me.cbboxnrbehandler.SelectedValue db.dsDaten.Tables(0).Rows(0).Item("total") = Me.txtTotal.Text + db.dsDaten.Tables(0).Rows(0).Item("mutiert_am") = Now db.Update_Data() Me.Close() End Sub @@ -79,6 +80,7 @@ Private Sub dtdatum_KeyDown(sender As Object, e As KeyEventArgs) Handles dtdatum.KeyDown If e.KeyCode = Keys.Escape Then delete_date(sender) If e.KeyCode = Keys.Decimal Then SendKeys.SendWait("{TAB}") + If e.KeyCode = 190 Then SendKeys.SendWait("{TAB}") End Sub Sub delete_date(sender) diff --git a/DPM2016/DPM2016.vbproj b/DPM2016/DPM2016.vbproj index d152a01..d7ca64f 100644 --- a/DPM2016/DPM2016.vbproj +++ b/DPM2016/DPM2016.vbproj @@ -108,6 +108,10 @@ ..\..\DPM_Reporting\_PropertyGrid\Source\PropertyGridEx\bin\Debug\PropertyGridEx.dll + + + + @@ -144,12 +148,6 @@ - - Form2.vb - - - Form - FremAuswertung.vb @@ -220,6 +218,12 @@ UserControl + + frmMahnungen.vb + + + Form + frmFirma.vb @@ -250,6 +254,7 @@ Component + Patient.vb @@ -337,6 +342,12 @@ Form + + frmTarifDetail.vb + + + Form + @@ -351,6 +362,24 @@ Form + + frmFormSelector.vb + + + Form + + + frmFortschritt.vb + + + Form + + + frmKalender.vb + + + Form + frmLogin.vb @@ -363,6 +392,12 @@ Form + + frmSuche.vb + + + Form + SplashForm.vb @@ -378,9 +413,6 @@ - - Form2.vb - FremAuswertung.vb @@ -414,6 +446,9 @@ Finanzen.vb + + frmMahnungen.vb + frmFirma.vb @@ -467,18 +502,33 @@ Designer + + frmTarifDetail.vb + frmDBConnection.vb frmDentotarDetails.vb + + frmFormSelector.vb + + + frmFortschritt.vb + + + frmKalender.vb + frmLogin.vb frmSplash.vb + + frmSuche.vb + SplashForm.vb @@ -487,7 +537,9 @@ - + + Designer + MyApplicationCodeGenerator diff --git a/DPM2016/Database/clsDB.vb b/DPM2016/Database/clsDB.vb index c9ead8b..74cf6d6 100644 --- a/DPM2016/Database/clsDB.vb +++ b/DPM2016/Database/clsDB.vb @@ -262,6 +262,26 @@ Public Class clsDB End Function + Public Sub Copy_Behandlung(ByVal behandlugnsnr As String, typ As String) + Dim scmCmdToExecute As SqlCommand = New SqlCommand() + scmCmdToExecute.CommandText = "dbo.[sp_copy_behandlung]" + Dim conn As New SqlConnection(My.Settings.ConnectionString) + scmCmdToExecute.CommandType = CommandType.StoredProcedure + scmCmdToExecute.Connection = conn + Try + scmCmdToExecute.Parameters.Add(New SqlParameter("@behandlungsnr", SqlDbType.VarChar, 255, ParameterDirection.Input, True, 0, 0, "", DataRowVersion.Proposed, behandlugnsnr)) + scmCmdToExecute.Parameters.Add(New SqlParameter("@typ", SqlDbType.VarChar, 255, ParameterDirection.Input, True, 0, 0, "", DataRowVersion.Proposed, typ)) + + scmCmdToExecute.Connection.Open() + scmCmdToExecute.ExecuteNonQuery() + Return + Catch ex As Exception + MsgBox(ex.Message) + Finally + scmCmdToExecute.Connection.Close() + End Try + End Sub + #End Region #Region "Spalten" @@ -321,6 +341,7 @@ Public Class clsDB Public Function Search(ByVal Type As String, ByVal Searchstring As String) As Integer Select Case Type Case "Patient" + If IsNumeric(Searchstring) Then Get_Tabledata("privat", " where nrprivat=" + Searchstring + " order by name, vorname, ort") If dsDaten.Tables(0).Rows.Count = 0 Then @@ -338,6 +359,7 @@ Public Class clsDB Return (dsDaten.Tables(0).Rows(0).Item("nrprivat")) Else Dim f As New frmPrivatSelect + f.Text = "Patient-Suche" f.TreeView1.Nodes.Clear() For Each r As DataRow In dsDaten.Tables(0).Rows @@ -374,6 +396,7 @@ Public Class clsDB Return (dsDaten.Tables(0).Rows(0).Item("nrfirma")) Else Dim f As New frmPrivatSelect + f.Text = "Firmensuche" f.TreeView1.Nodes.Clear() For Each r As DataRow In dsDaten.Tables(0).Rows @@ -431,6 +454,8 @@ Public Class clsDB Me.Get_Tabledata("NewKeyZahlung", "", Me.Get_SQL(20)) Case "Recall" Me.Get_Tabledata("NewKeyRecall", "", Me.Get_SQL(31)) + Case "Tarif" + Me.Get_Tabledata("Tarif", "", "Select top 1 nrtarif+1 from tarif order by nrtarif desc") End Select Return Me.dsDaten.Tables(0).Rows(0).Item(0) @@ -582,6 +607,19 @@ Public Class clsDB End Try End Function + + Public Function Get_ReportNr_by_ESTypnr(ByVal ESTypNr As String) As Integer + Try + Get_Tabledata("ESTyp", "where nrestyp=" + ESTypNr) + + Get_Tabledata("Auswertung", "where es_typ='" + dsDaten.Tables(0).Rows(0).Item("estyp") + "'") + Return dsDaten.Tables(0).Rows(0).Item(0) + Catch ex As Exception + Return 0 + End Try + + End Function + #End Region #Region "Fakturierung" @@ -716,5 +754,13 @@ Public Class clsDB Update_Data() End Sub +#End Region + +#Region "Security" + Public Function Objexists(ByVal securityform As String, ByVal securityobjecttype As String, ByVal securityobject As String, ByVal securityobjectitem As String) As Boolean + Get_Tabledata("SecurityObject", "SecurityForm='" + securityform + "' and securityobjecttype='" + securityobjecttype + "' and securityobject='" + securityobject + "' and securityobjectitem='" + securityobjectitem + "? and aktiv=1") + If dsDaten.Tables(0).Rows.Count > 0 Then Return True Else Return False + End Function + #End Region End Class diff --git a/DPM2016/Database/frmPrivatSelect.vb b/DPM2016/Database/frmPrivatSelect.vb index 9170bfb..c349109 100644 --- a/DPM2016/Database/frmPrivatSelect.vb +++ b/DPM2016/Database/frmPrivatSelect.vb @@ -35,4 +35,10 @@ Public Class frmPrivatSelect Me.DialogResult = DialogResult.Abort Me.Close() End Sub + + Private Sub TreeView1_KeyDown(sender As Object, e As KeyEventArgs) Handles TreeView1.KeyDown + If e.KeyCode = Keys.Enter Then + TreeView1_DoubleClick(sender, e) + End If + End Sub End Class \ No newline at end of file diff --git a/DPM2016/EventHandler/Generic_Event_Handler.vb b/DPM2016/EventHandler/Generic_Event_Handler.vb index 3ad7027..4a5a701 100644 --- a/DPM2016/EventHandler/Generic_Event_Handler.vb +++ b/DPM2016/EventHandler/Generic_Event_Handler.vb @@ -12,6 +12,8 @@ Public Class Generic_Event_Handler Public Event Behandlung_Abschliessen(ByVal behandlungsnummer As Integer, patient As Integer) Public Event Behandlung_Zurücksetzen(ByVal behandlungsnummer As Integer, patient As Integer) Public Event Recall_Anzeigen(Datum As DateTime, patient As Integer, behandler As Integer) + Public Event Refresh_PrinterConfig() + Public Event Refresh_Behandlung(behandlungsnr As Integer) Public Function Fire_PatName_Changed(ByVal name As String, ByVal nr As Integer) RaiseEvent PatName_Changed(name, nr) @@ -55,5 +57,13 @@ Public Class Generic_Event_Handler Public Function Fire_Recall_Anzeigen(ByVal datum As DateTime, ByVal patient As Integer, ByVal behandler As Integer) RaiseEvent Recall_Anzeigen(datum, patient, behandler) End Function + + Public Function Fire_Refresh_PrinterConfig() + RaiseEvent Refresh_PrinterConfig() + End Function + + Public Function Refresh_Behandlungen(ByVal Behandlungsnr As Integer) + RaiseEvent Refresh_Behandlung(Behandlungsnr) + End Function End Class diff --git a/DPM2016/Fakturierung/frmFakturierung.resx b/DPM2016/Fakturierung/frmFakturierung.resx index 0519f92..74348cc 100644 --- a/DPM2016/Fakturierung/frmFakturierung.resx +++ b/DPM2016/Fakturierung/frmFakturierung.resx @@ -258,37 +258,37 @@ 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 - 6YeQrFnzP84KtrvywWJtAAAAAElFTkSuQmCC + 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 + fgrJmjX/B6getrXatE37AAAAAElFTkSuQmCC @@ -434,7 +434,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" 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, 765, 140</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, 765, 140</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, 765, 140</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, 765, 140</ClientArea><PrintPageHeaderStyle parent="" me="Style15" /><PrintPageFooterStyle parent="" me="Style16" /></Blob> @@ -473,7 +473,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" 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, 765, 140</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, 765, 140</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, 765, 140</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, 765, 140</ClientArea><PrintPageHeaderStyle parent="" me="Style15" /><PrintPageFooterStyle parent="" me="Style16" /></Blob> diff --git a/DPM2016/Fakturierung/frmFakturierung.vb b/DPM2016/Fakturierung/frmFakturierung.vb index 6a59f7b..0613a51 100644 --- a/DPM2016/Fakturierung/frmFakturierung.vb +++ b/DPM2016/Fakturierung/frmFakturierung.vb @@ -17,8 +17,26 @@ Private Sub ToolStripButton5_Click(sender As Object, e As EventArgs) Handles ToolStripButton5.Click If MsgBox("Fakturierung ausführen?", vbYesNo + vbQuestion) = vbNo Then Exit Sub + Dim fp As New frmFortschritt + fp.Show() Dim dt As New DataTable dt = Me.C1Abgeschlossen.DataSource + + fp.ProgressBar1.Minimum = 1 + fp.ProgressBar1.Maximum = dt.Rows.Count + 1 + fp.ProgressBar1.Value = 1 + + For Each r In dt.Rows + Faktura_Aufbereiten(r) + fp.ProgressBar1.Value = fp.ProgressBar1.Value + 1 + fp.Refresh() + Next + fp.Close() + Me.Close() + + Exit Sub + + Dim f As New frmReportView() For Each r In dt.Rows If r.item("raten") > 0 Then @@ -34,6 +52,44 @@ f.Close() End Sub + Sub Faktura_Aufbereiten(ByVal r As DataRow) + Dim buchen As Boolean = True + Dim anzahlraten As Integer = 0 + db.Get_Tabledata("Behandlu", "where nrbehandlung=" + r.Item("nrbehandlung").ToString) + anzahlraten = db.dsDaten.Tables(0).Rows(0).Item("Anzahlraten") + If anzahlraten = 0 Then anzahlraten = 1 + Globals.FakturaNr = 0 + Dim reportnr As Integer + reportnr = db.Get_ReportNr_by_ESTypnr(r.Item("nrestyp")) + + Dim Folgeauswertung As Integer + Dim Separater_Druckjob As Boolean + Dim doloop As Boolean = True + db.Get_Tabledata("Auswertung", "where auswertungnr=" + reportnr.ToString) + Folgeauswertung = db.dsDaten.Tables(0).Rows(0).Item("Folge_Report") + Separater_Druckjob = db.dsDaten.Tables(0).Rows(0).Item("Folgereport_Sep_Druckjob") + Dim hauptfaktura As Integer + While doloop = True + For i As Integer = 1 To anzahlraten + Dim f As New frmReportView(reportnr, False, "Vorschau Rechung", " where nrbehandlung = " + r.Item("nrbehandlung").ToString, r.Item("nrbehandlung").ToString) + f.Show() + f.Fakturierung(reportnr, r.Item("nrbehandlung"), "", i, buchen:=buchen) + 'f.Print_Rechnung(False, False, i) + f.Close() + Next i + If Folgeauswertung > 0 Then + buchen = False + reportnr = Folgeauswertung + db.Get_Tabledata("Auswertung", "where auswertungnr=" + Folgeauswertung.ToString) + Folgeauswertung = db.dsDaten.Tables(0).Rows(0).Item("Folge_Report") + Separater_Druckjob = db.dsDaten.Tables(0).Rows(0).Item("Folgereport_Sep_Druckjob") + Else + doloop = False + End If + End While + Globals.FakturaNr = 0 + End Sub + Private Sub ToolStripButton6_Click(sender As Object, e As EventArgs) Handles ToolStripButton6.Click Dim f As New frmPrinterselect f.MdiParent = Me.MdiParent diff --git a/DPM2016/Finanzaen/Finanzen.Designer.vb b/DPM2016/Finanzaen/Finanzen.Designer.vb index 2d35bb6..8a08f64 100644 --- a/DPM2016/Finanzaen/Finanzen.Designer.vb +++ b/DPM2016/Finanzaen/Finanzen.Designer.vb @@ -30,7 +30,6 @@ Partial Class Finanzen Me.btnBuchen = New System.Windows.Forms.Button() Me.chkVorauszahlung = New System.Windows.Forms.CheckBox() Me.lblVorauszahlung = New System.Windows.Forms.Label() - Me.cbboxKonto = New DPM2016.MyCombobox() Me.lblKonto = New System.Windows.Forms.Label() Me.lblBetrag = New System.Windows.Forms.Label() Me.diBetrag = New DevComponents.Editors.DoubleInput() @@ -48,6 +47,27 @@ Partial Class Finanzen Me.C1OffeneRechnungen = New C1.Win.C1TrueDBGrid.C1TrueDBGrid() Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ZahlungBuchenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.GroupBox1 = New System.Windows.Forms.GroupBox() + Me.Label1 = New System.Windows.Forms.Label() + Me.Label2 = New System.Windows.Forms.Label() + Me.Label3 = New System.Windows.Forms.Label() + Me.Label4 = New System.Windows.Forms.Label() + Me.Mahndatum1 = New System.Windows.Forms.Label() + Me.Label6 = New System.Windows.Forms.Label() + Me.Mahnfaelligkeit1 = New System.Windows.Forms.Label() + Me.Mahngebühr1 = New System.Windows.Forms.Label() + Me.Mahngebühr2 = New System.Windows.Forms.Label() + Me.Mahnfaelligkeit2 = New System.Windows.Forms.Label() + Me.Mahndatum2 = New System.Windows.Forms.Label() + Me.Label9 = New System.Windows.Forms.Label() + Me.Label10 = New System.Windows.Forms.Label() + Me.Mahngebühr3 = New System.Windows.Forms.Label() + Me.Mahnfaelligkeit3 = New System.Windows.Forms.Label() + Me.Mahndatum3 = New System.Windows.Forms.Label() + Me.btnZurücksetzen1 = New System.Windows.Forms.Button() + Me.btnzurücksetzen2 = New System.Windows.Forms.Button() + Me.btnzurücksetzen3 = New System.Windows.Forms.Button() + Me.cbboxKonto = New DPM2016.MyCombobox() Me.GrpZahlung.SuspendLayout() CType(Me.diBetrag, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.dtdatum, System.ComponentModel.ISupportInitialize).BeginInit() @@ -57,6 +77,7 @@ Partial Class Finanzen Me.GrpBehandlungen.SuspendLayout() CType(Me.C1OffeneRechnungen, System.ComponentModel.ISupportInitialize).BeginInit() Me.ContextMenuStrip1.SuspendLayout() + Me.GroupBox1.SuspendLayout() Me.SuspendLayout() ' 'ToolStrip1 @@ -124,18 +145,6 @@ Partial Class Finanzen Me.lblVorauszahlung.TabIndex = 17 Me.lblVorauszahlung.Text = "Vorauszahlung" ' - 'cbboxKonto - ' - Me.cbboxKonto.Dataselection = Nothing - Me.cbboxKonto.Displaymember = Nothing - Me.cbboxKonto.Location = New System.Drawing.Point(147, 109) - Me.cbboxKonto.Name = "cbboxKonto" - Me.cbboxKonto.Size = New System.Drawing.Size(177, 21) - Me.cbboxKonto.TabIndex = 15 - Me.cbboxKonto.Table = Nothing - Me.cbboxKonto.TableAlias = "" - Me.cbboxKonto.Valuemember = Nothing - ' 'lblKonto ' Me.lblKonto.AutoSize = True @@ -245,7 +254,7 @@ Partial Class Finanzen Me.GrpZahlungen.Dock = System.Windows.Forms.DockStyle.Top Me.GrpZahlungen.Location = New System.Drawing.Point(345, 25) Me.GrpZahlungen.Name = "GrpZahlungen" - Me.GrpZahlungen.Size = New System.Drawing.Size(645, 401) + Me.GrpZahlungen.Size = New System.Drawing.Size(645, 302) Me.GrpZahlungen.TabIndex = 2 Me.GrpZahlungen.TabStop = False Me.GrpZahlungen.Text = "Verbuchte Zahlungen" @@ -264,7 +273,7 @@ Partial Class Finanzen Me.C1Zahlungen.PreviewInfo.Size = New System.Drawing.Size(0, 0) Me.C1Zahlungen.PreviewInfo.ZoomFactor = 75.0R Me.C1Zahlungen.PrintInfo.PageSettings = CType(resources.GetObject("C1Zahlungen.PrintInfo.PageSettings"), System.Drawing.Printing.PageSettings) - Me.C1Zahlungen.Size = New System.Drawing.Size(639, 382) + Me.C1Zahlungen.Size = New System.Drawing.Size(639, 283) Me.C1Zahlungen.TabIndex = 3 Me.C1Zahlungen.Text = "C1TrueDBGrid1" Me.C1Zahlungen.PropBag = resources.GetString("C1Zahlungen.PropBag") @@ -296,10 +305,10 @@ Partial Class Finanzen 'GrpBehandlungen ' Me.GrpBehandlungen.Controls.Add(Me.C1OffeneRechnungen) - Me.GrpBehandlungen.Dock = System.Windows.Forms.DockStyle.Fill - Me.GrpBehandlungen.Location = New System.Drawing.Point(345, 426) + Me.GrpBehandlungen.Dock = System.Windows.Forms.DockStyle.Top + Me.GrpBehandlungen.Location = New System.Drawing.Point(345, 327) Me.GrpBehandlungen.Name = "GrpBehandlungen" - Me.GrpBehandlungen.Size = New System.Drawing.Size(645, 161) + Me.GrpBehandlungen.Size = New System.Drawing.Size(645, 139) Me.GrpBehandlungen.TabIndex = 3 Me.GrpBehandlungen.TabStop = False Me.GrpBehandlungen.Text = "Offene Rechnungen" @@ -318,7 +327,7 @@ Partial Class Finanzen Me.C1OffeneRechnungen.PreviewInfo.Size = New System.Drawing.Size(0, 0) Me.C1OffeneRechnungen.PreviewInfo.ZoomFactor = 75.0R Me.C1OffeneRechnungen.PrintInfo.PageSettings = CType(resources.GetObject("C1OffeneRechnungen.PrintInfo.PageSettings"), System.Drawing.Printing.PageSettings) - Me.C1OffeneRechnungen.Size = New System.Drawing.Size(639, 142) + Me.C1OffeneRechnungen.Size = New System.Drawing.Size(639, 120) Me.C1OffeneRechnungen.TabIndex = 4 Me.C1OffeneRechnungen.Text = "C1OffeneRechnungen" Me.C1OffeneRechnungen.PropBag = resources.GetString("C1OffeneRechnungen.PropBag") @@ -335,10 +344,227 @@ Partial Class Finanzen Me.ZahlungBuchenToolStripMenuItem.Size = New System.Drawing.Size(161, 22) Me.ZahlungBuchenToolStripMenuItem.Text = "&Zahlung buchen" ' + 'GroupBox1 + ' + Me.GroupBox1.Controls.Add(Me.btnzurücksetzen3) + Me.GroupBox1.Controls.Add(Me.btnzurücksetzen2) + Me.GroupBox1.Controls.Add(Me.btnZurücksetzen1) + Me.GroupBox1.Controls.Add(Me.Label10) + Me.GroupBox1.Controls.Add(Me.Mahngebühr3) + Me.GroupBox1.Controls.Add(Me.Mahnfaelligkeit3) + Me.GroupBox1.Controls.Add(Me.Mahndatum3) + Me.GroupBox1.Controls.Add(Me.Label9) + Me.GroupBox1.Controls.Add(Me.Mahngebühr2) + Me.GroupBox1.Controls.Add(Me.Mahnfaelligkeit2) + Me.GroupBox1.Controls.Add(Me.Mahndatum2) + Me.GroupBox1.Controls.Add(Me.Mahngebühr1) + Me.GroupBox1.Controls.Add(Me.Mahnfaelligkeit1) + Me.GroupBox1.Controls.Add(Me.Label6) + Me.GroupBox1.Controls.Add(Me.Mahndatum1) + Me.GroupBox1.Controls.Add(Me.Label4) + Me.GroupBox1.Controls.Add(Me.Label3) + Me.GroupBox1.Controls.Add(Me.Label2) + Me.GroupBox1.Controls.Add(Me.Label1) + Me.GroupBox1.Dock = System.Windows.Forms.DockStyle.Fill + Me.GroupBox1.Location = New System.Drawing.Point(345, 466) + Me.GroupBox1.Name = "GroupBox1" + Me.GroupBox1.Size = New System.Drawing.Size(645, 121) + Me.GroupBox1.TabIndex = 4 + Me.GroupBox1.TabStop = False + Me.GroupBox1.Text = "Mahnungen" + ' + 'Label1 + ' + Me.Label1.AutoSize = True + Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label1.Location = New System.Drawing.Point(77, 16) + Me.Label1.Name = "Label1" + Me.Label1.Size = New System.Drawing.Size(72, 13) + Me.Label1.TabIndex = 0 + Me.Label1.Text = "Mahndatum" + ' + 'Label2 + ' + Me.Label2.AutoSize = True + Me.Label2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label2.Location = New System.Drawing.Point(175, 16) + Me.Label2.Name = "Label2" + Me.Label2.Size = New System.Drawing.Size(86, 13) + Me.Label2.TabIndex = 1 + Me.Label2.Text = "Mahnfälligkeit" + ' + 'Label3 + ' + Me.Label3.AutoSize = True + Me.Label3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label3.Location = New System.Drawing.Point(292, 16) + Me.Label3.Name = "Label3" + Me.Label3.Size = New System.Drawing.Size(77, 13) + Me.Label3.TabIndex = 2 + Me.Label3.Text = "Mahngebühr" + ' + 'Label4 + ' + Me.Label4.AutoSize = True + Me.Label4.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label4.Location = New System.Drawing.Point(7, 16) + Me.Label4.Name = "Label4" + Me.Label4.Size = New System.Drawing.Size(37, 13) + Me.Label4.TabIndex = 3 + Me.Label4.Text = "Stufe" + ' + 'Mahndatum1 + ' + Me.Mahndatum1.AutoSize = True + Me.Mahndatum1.Location = New System.Drawing.Point(77, 44) + Me.Mahndatum1.Name = "Mahndatum1" + Me.Mahndatum1.Size = New System.Drawing.Size(39, 13) + Me.Mahndatum1.TabIndex = 4 + Me.Mahndatum1.Text = "Label5" + ' + 'Label6 + ' + Me.Label6.AutoSize = True + Me.Label6.Location = New System.Drawing.Point(7, 44) + Me.Label6.Name = "Label6" + Me.Label6.Size = New System.Drawing.Size(13, 13) + Me.Label6.TabIndex = 5 + Me.Label6.Text = "1" + ' + 'Mahnfaelligkeit1 + ' + Me.Mahnfaelligkeit1.AutoSize = True + Me.Mahnfaelligkeit1.Location = New System.Drawing.Point(175, 44) + Me.Mahnfaelligkeit1.Name = "Mahnfaelligkeit1" + Me.Mahnfaelligkeit1.Size = New System.Drawing.Size(39, 13) + Me.Mahnfaelligkeit1.TabIndex = 6 + Me.Mahnfaelligkeit1.Text = "Label7" + ' + 'Mahngebühr1 + ' + Me.Mahngebühr1.AutoSize = True + Me.Mahngebühr1.Location = New System.Drawing.Point(292, 44) + Me.Mahngebühr1.Name = "Mahngebühr1" + Me.Mahngebühr1.Size = New System.Drawing.Size(39, 13) + Me.Mahngebühr1.TabIndex = 7 + Me.Mahngebühr1.Text = "Label8" + ' + 'Mahngebühr2 + ' + Me.Mahngebühr2.AutoSize = True + Me.Mahngebühr2.Location = New System.Drawing.Point(292, 67) + Me.Mahngebühr2.Name = "Mahngebühr2" + Me.Mahngebühr2.Size = New System.Drawing.Size(39, 13) + Me.Mahngebühr2.TabIndex = 10 + Me.Mahngebühr2.Text = "Label8" + ' + 'Mahnfaelligkeit2 + ' + Me.Mahnfaelligkeit2.AutoSize = True + Me.Mahnfaelligkeit2.Location = New System.Drawing.Point(175, 66) + Me.Mahnfaelligkeit2.Name = "Mahnfaelligkeit2" + Me.Mahnfaelligkeit2.Size = New System.Drawing.Size(39, 13) + Me.Mahnfaelligkeit2.TabIndex = 9 + Me.Mahnfaelligkeit2.Text = "Label7" + ' + 'Mahndatum2 + ' + Me.Mahndatum2.AutoSize = True + Me.Mahndatum2.Location = New System.Drawing.Point(77, 66) + Me.Mahndatum2.Name = "Mahndatum2" + Me.Mahndatum2.Size = New System.Drawing.Size(39, 13) + Me.Mahndatum2.TabIndex = 8 + Me.Mahndatum2.Text = "Label5" + ' + 'Label9 + ' + Me.Label9.AutoSize = True + Me.Label9.Location = New System.Drawing.Point(7, 67) + Me.Label9.Name = "Label9" + Me.Label9.Size = New System.Drawing.Size(13, 13) + Me.Label9.TabIndex = 11 + Me.Label9.Text = "2" + ' + 'Label10 + ' + Me.Label10.AutoSize = True + Me.Label10.Location = New System.Drawing.Point(7, 90) + Me.Label10.Name = "Label10" + Me.Label10.Size = New System.Drawing.Size(13, 13) + Me.Label10.TabIndex = 15 + Me.Label10.Text = "3" + ' + 'Mahngebühr3 + ' + Me.Mahngebühr3.AutoSize = True + Me.Mahngebühr3.Location = New System.Drawing.Point(292, 90) + Me.Mahngebühr3.Name = "Mahngebühr3" + Me.Mahngebühr3.Size = New System.Drawing.Size(39, 13) + Me.Mahngebühr3.TabIndex = 14 + Me.Mahngebühr3.Text = "Label8" + ' + 'Mahnfaelligkeit3 + ' + Me.Mahnfaelligkeit3.AutoSize = True + Me.Mahnfaelligkeit3.Location = New System.Drawing.Point(175, 89) + Me.Mahnfaelligkeit3.Name = "Mahnfaelligkeit3" + Me.Mahnfaelligkeit3.Size = New System.Drawing.Size(45, 13) + Me.Mahnfaelligkeit3.TabIndex = 13 + Me.Mahnfaelligkeit3.Text = "Label12" + ' + 'Mahndatum3 + ' + Me.Mahndatum3.AutoSize = True + Me.Mahndatum3.Location = New System.Drawing.Point(77, 89) + Me.Mahndatum3.Name = "Mahndatum3" + Me.Mahndatum3.Size = New System.Drawing.Size(39, 13) + Me.Mahndatum3.TabIndex = 12 + Me.Mahndatum3.Text = "Label5" + ' + 'btnZurücksetzen1 + ' + Me.btnZurücksetzen1.Location = New System.Drawing.Point(379, 39) + Me.btnZurücksetzen1.Name = "btnZurücksetzen1" + Me.btnZurücksetzen1.Size = New System.Drawing.Size(98, 23) + Me.btnZurücksetzen1.TabIndex = 16 + Me.btnZurücksetzen1.Text = "Zurücksetzen" + Me.btnZurücksetzen1.UseVisualStyleBackColor = True + ' + 'btnzurücksetzen2 + ' + Me.btnzurücksetzen2.Location = New System.Drawing.Point(379, 62) + Me.btnzurücksetzen2.Name = "btnzurücksetzen2" + Me.btnzurücksetzen2.Size = New System.Drawing.Size(98, 23) + Me.btnzurücksetzen2.TabIndex = 17 + Me.btnzurücksetzen2.Text = "Zurücksetzen" + Me.btnzurücksetzen2.UseVisualStyleBackColor = True + ' + 'btnzurücksetzen3 + ' + Me.btnzurücksetzen3.Location = New System.Drawing.Point(379, 85) + Me.btnzurücksetzen3.Name = "btnzurücksetzen3" + Me.btnzurücksetzen3.Size = New System.Drawing.Size(98, 23) + Me.btnzurücksetzen3.TabIndex = 18 + Me.btnzurücksetzen3.Text = "Zurücksetzen" + Me.btnzurücksetzen3.UseVisualStyleBackColor = True + ' + 'cbboxKonto + ' + Me.cbboxKonto.Dataselection = Nothing + Me.cbboxKonto.Displaymember = Nothing + Me.cbboxKonto.Location = New System.Drawing.Point(147, 109) + Me.cbboxKonto.Name = "cbboxKonto" + Me.cbboxKonto.Size = New System.Drawing.Size(177, 21) + Me.cbboxKonto.TabIndex = 15 + Me.cbboxKonto.Table = Nothing + Me.cbboxKonto.TableAlias = "" + Me.cbboxKonto.Valuemember = Nothing + ' 'Finanzen ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.GroupBox1) Me.Controls.Add(Me.GrpBehandlungen) Me.Controls.Add(Me.GrpZahlungen) Me.Controls.Add(Me.GrpZahlung) @@ -355,6 +581,8 @@ Partial Class Finanzen Me.GrpBehandlungen.ResumeLayout(False) CType(Me.C1OffeneRechnungen, System.ComponentModel.ISupportInitialize).EndInit() Me.ContextMenuStrip1.ResumeLayout(False) + Me.GroupBox1.ResumeLayout(False) + Me.GroupBox1.PerformLayout() Me.ResumeLayout(False) Me.PerformLayout() @@ -383,4 +611,24 @@ Partial Class Finanzen Friend WithEvents Button1 As Button Friend WithEvents VorauszahlungAnBehandlungZuweisenToolStripMenuItem As ToolStripMenuItem Friend WithEvents VorauszahlungVonBehandlungLösenToolStripMenuItem As ToolStripMenuItem + Friend WithEvents GroupBox1 As GroupBox + Friend WithEvents Label10 As Label + Friend WithEvents Mahngebühr3 As Label + Friend WithEvents Mahnfaelligkeit3 As Label + Friend WithEvents Mahndatum3 As Label + Friend WithEvents Label9 As Label + Friend WithEvents Mahngebühr2 As Label + Friend WithEvents Mahnfaelligkeit2 As Label + Friend WithEvents Mahndatum2 As Label + Friend WithEvents Mahngebühr1 As Label + Friend WithEvents Mahnfaelligkeit1 As Label + Friend WithEvents Label6 As Label + Friend WithEvents Mahndatum1 As Label + Friend WithEvents Label4 As Label + Friend WithEvents Label3 As Label + Friend WithEvents Label2 As Label + Friend WithEvents Label1 As Label + Friend WithEvents btnZurücksetzen1 As Button + Friend WithEvents btnzurücksetzen3 As Button + Friend WithEvents btnzurücksetzen2 As Button End Class diff --git a/DPM2016/Finanzaen/Finanzen.resx b/DPM2016/Finanzaen/Finanzen.resx index cbb884c..c9d2675 100644 --- a/DPM2016/Finanzaen/Finanzen.resx +++ b/DPM2016/Finanzaen/Finanzen.resx @@ -161,7 +161,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" 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, 637, 380</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, 637, 380</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" 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, 637, 281</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, 637, 281</ClientArea><PrintPageHeaderStyle parent="" me="Style15" /><PrintPageFooterStyle parent="" me="Style16" /></Blob> 124, 17 @@ -203,6 +203,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, 637, 140</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, 637, 140</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, 637, 118</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, 637, 118</ClientArea><PrintPageHeaderStyle parent="" me="Style15" /><PrintPageFooterStyle parent="" me="Style16" /></Blob> \ No newline at end of file diff --git a/DPM2016/Finanzaen/Finanzen.vb b/DPM2016/Finanzaen/Finanzen.vb index 877882a..d6a2147 100644 --- a/DPM2016/Finanzaen/Finanzen.vb +++ b/DPM2016/Finanzaen/Finanzen.vb @@ -26,12 +26,29 @@ Public Class Finanzen Me.C1Zahlungen.DataSource = Nothing Me.C1Zahlungen.DataSource = Zahlungen Me.C1Zahlungen.DataMember = dbz.dsDaten.Tables(0).TableName + spalten.Spaltentitel_aktualisieren(Me.C1Zahlungen, "Zahlungen", Zahlungen) dbz.Get_Tabledata("OffeneRechnungen", "", dbz.Get_SQL(22), Me.Patientnr.ToString) Offene_Rechnungen = dbz.dsDaten.Tables(0).Copy Me.C1OffeneRechnungen.DataSource = Nothing Me.C1OffeneRechnungen.DataSource = Offene_Rechnungen Me.C1OffeneRechnungen.DataMember = Offene_Rechnungen.TableName spalten.Spaltentitel_aktualisieren(Me.C1OffeneRechnungen, "Offene_Rechnungen", Offene_Rechnungen) + + Me.Mahndatum1.Text = "" + Me.Mahndatum2.Text = "" + Me.Mahndatum3.Text = "" + Me.Mahnfaelligkeit1.Text = "" + Me.Mahnfaelligkeit2.Text = "" + Me.Mahnfaelligkeit3.Text = "" + Me.Mahngebühr1.Text = "" + Me.Mahngebühr2.Text = "" + Me.Mahngebühr3.Text = "" + + Me.btnZurücksetzen1.Visible = False + Me.btnzurücksetzen2.Visible = False + Me.btnzurücksetzen3.Visible = False + + Catch ex As Exception MsgBox(ex.Message) End Try @@ -40,6 +57,7 @@ Public Class Finanzen Public Sub Refresh_Data() refresh_konto() Refresh_Zahlungen() + Get_Mahndaten() End Sub Sub refresh_konto() dbk.Get_Tabledata("Konto", "where aktiv=1") @@ -109,6 +127,11 @@ Public Class Finanzen db5.Insert_ZJournal(r("nrfaktura"), r("nrdebitor"), db5.Get_Datavalue("Select dbo.get_name(" + r.Item("nrdebitor").ToString + ")"), r.Item("Betrag"), db5.Get_Datavalue("Select Konto from konto where nrkonto=" + r.Item("nrkonto").ToString), vz, "") db5.Exec_SQL("Update debitor set mutiert_am=getdate(),betrag=betrag-" + r("betrag").ToString + "where nrfaktura=" + r("nrfaktura").ToString) Me.Refresh_Zahlungen() + If vz = "J" Then + If MsgBox("Vorauszahlung einer Behandlung zuweisen?", vbYesNo + vbQuestion) Then + VorauszahlungAnBehandlungZuweisenToolStripMenuItem_Click(sender, e) + End If + End If End Sub Private Sub ToolStrip1_ItemClicked(sender As Object, e As ToolStripItemClickedEventArgs) Handles ToolStrip1.ItemClicked @@ -120,10 +143,66 @@ Public Class Finanzen Me.dtdatum.Value = Now Me.txtRGNummer.Text = Me.C1OffeneRechnungen.Columns("nrfaktura").Value Me.diBetrag.Value = Me.C1OffeneRechnungen.Columns("Betrag").Value + get_mahndaten Catch ex As Exception End Try End Sub + Sub Get_Mahndaten() + Me.Mahndatum1.Text = "" + Me.Mahndatum2.Text = "" + Me.Mahndatum3.Text = "" + Me.Mahnfaelligkeit1.Text = "" + Me.Mahnfaelligkeit2.Text = "" + Me.Mahnfaelligkeit3.Text = "" + Me.Mahngebühr1.Text = "" + Me.Mahngebühr2.Text = "" + Me.Mahngebühr3.Text = "" + Me.btnZurücksetzen1.Visible = False + Me.btnzurücksetzen2.Visible = False + Me.btnzurücksetzen3.Visible = False + Dim dd As Date + Try + Me.Mahndatum1.Text = ShortDate(Me.C1OffeneRechnungen.Columns("Mahndatum1").Value.ToString) + Me.Mahndatum2.Text = ShortDate(Me.C1OffeneRechnungen.Columns("Mahndatum2").Value.ToString) + Me.Mahndatum3.Text = ShortDate(Me.C1OffeneRechnungen.Columns("Mahndatum3").Value.ToString) + + Me.Mahnfaelligkeit1.Text = ShortDate(Me.C1OffeneRechnungen.Columns("mahnfaelligkeit1").Value.ToString) + Me.Mahnfaelligkeit2.Text = ShortDate(Me.C1OffeneRechnungen.Columns("mahnfaelligkeit2").Value.ToString) + Me.Mahnfaelligkeit3.Text = ShortDate(Me.C1OffeneRechnungen.Columns("mahnfaelligkeit3").Value.ToString) + + Me.Mahngebühr1.Text = Me.C1OffeneRechnungen.Columns("mahngebuehr1").Value.ToString + Me.Mahngebühr2.Text = Me.C1OffeneRechnungen.Columns("mahngebuehr2").Value.ToString + Me.Mahngebühr3.Text = Me.C1OffeneRechnungen.Columns("mahngebuehr3").Value.ToString + + If Me.Mahndatum3.Text <> "" Then + Me.btnzurücksetzen3.Visible = True + Else + If Me.Mahndatum2.Text <> "" Then + Me.btnzurücksetzen2.Visible = True + Else + If Me.Mahndatum1.Text <> "" Then + Me.btnZurücksetzen1.Visible = True + End If + End If + End If + + Catch + End Try + + End Sub + + Function ShortDate(ByVal dd As String) As String + Try + Dim d As Date + d = dd + Return d + Catch + Return "" + End Try + + End Function + Private Sub ZahlungBuchenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ZahlungBuchenToolStripMenuItem.Click btnBuchen_Click(sender, e) @@ -193,4 +272,43 @@ Public Class Finanzen Sub delete_date(sender) sender.value = Nothing End Sub + + Private Sub btnZurücksetzen1_Click(sender As Object, e As EventArgs) Handles btnZurücksetzen1.Click + If MsgBox("Mahnstufe 1 zurückseten?", vbYesNo + vbQuestion) = vbYes Then + Mahnstufe_Zurücksetzen(1) + End If + End Sub + + + Private Sub btnzurücksetzen2_Click(sender As Object, e As EventArgs) Handles btnzurücksetzen2.Click + If MsgBox("Mahnstufe 2 zurückseten?", vbYesNo + vbQuestion) = vbYes Then + Mahnstufe_Zurücksetzen(2) + End If + End Sub + + Private Sub btnzurücksetzen3_Click(sender As Object, e As EventArgs) Handles btnzurücksetzen3.Click + If MsgBox("Mahnstufe 3 zurückseten?", vbYesNo + vbQuestion) = vbYes Then + Mahnstufe_Zurücksetzen(3) + End If + End Sub + + Sub Mahnstufe_Zurücksetzen(ByVal typ As Integer) + Dim db As New clsDB + Dim sql As String + + Select Case typ + Case 1 + sql = "Exec sp_reset_mahnstufe 1," + Me.C1OffeneRechnungen.Columns("nrfaktura").Value.ToString + db.Exec_SQL(sql) + Case 2 + sql = "Exec sp_reset_mahnstufe 2," + Me.C1OffeneRechnungen.Columns("nrfaktura").Value.ToString + db.Exec_SQL(sql) + Case 3 + sql = "Exec sp_reset_mahnstufe 3," + Me.C1OffeneRechnungen.Columns("nrfaktura").Value.ToString + db.Exec_SQL(sql) + + End Select + Refresh_Zahlungen() + Get_Mahndaten() + End Sub End Class diff --git a/DPM2016/Firmen/frmFirma.Designer.vb b/DPM2016/Firmen/frmFirma.Designer.vb index 3456944..c07334b 100644 --- a/DPM2016/Firmen/frmFirma.Designer.vb +++ b/DPM2016/Firmen/frmFirma.Designer.vb @@ -34,13 +34,13 @@ Partial Class frmFirma Me.ToolStripButton2 = New System.Windows.Forms.ToolStripButton() Me.ToolStripButton3 = New System.Windows.Forms.ToolStripButton() Me.ToolStripLabel1 = New System.Windows.Forms.ToolStripLabel() + Me.tsbtnFinanzen = New System.Windows.Forms.ToolStripButton() Me.tstxtsuche = New System.Windows.Forms.ToolStripTextBox() Me.tsbtnfirst = New System.Windows.Forms.ToolStripButton() Me.tsbtprev = New System.Windows.Forms.ToolStripButton() Me.tsbtnnext = New System.Windows.Forms.ToolStripButton() Me.tsbtnlast = New System.Windows.Forms.ToolStripButton() Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator() - Me.tsbtnFinanzen = New System.Windows.Forms.ToolStripButton() Me.txtName1 = New System.Windows.Forms.TextBox() Me.txtnrfirma = New System.Windows.Forms.TextBox() Me.lblNr = New System.Windows.Forms.Label() @@ -98,11 +98,22 @@ Partial Class frmFirma Me.txtGLN = New System.Windows.Forms.TextBox() Me.lblGLN = New System.Windows.Forms.Label() Me.Finanzen1 = New DPM2016.Finanzen() + Me.SuperTabControl1 = New DevComponents.DotNetBar.SuperTabControl() + Me.SuperTabControlPanel1 = New DevComponents.DotNetBar.SuperTabControlPanel() + Me.Panel1 = New System.Windows.Forms.Panel() + Me.Stammdaten = New DevComponents.DotNetBar.SuperTabItem() + Me.SuperTabControlPanel2 = New DevComponents.DotNetBar.SuperTabControlPanel() + Me.Finanzen = New DevComponents.DotNetBar.SuperTabItem() Me.MenuStrip1.SuspendLayout() Me.ToolStrip1.SuspendLayout() Me.GroupBox1.SuspendLayout() CType(Me.c1daten, System.ComponentModel.ISupportInitialize).BeginInit() Me.ToolStrip2.SuspendLayout() + CType(Me.SuperTabControl1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SuperTabControl1.SuspendLayout() + Me.SuperTabControlPanel1.SuspendLayout() + Me.Panel1.SuspendLayout() + Me.SuperTabControlPanel2.SuspendLayout() Me.SuspendLayout() ' 'MenuStrip1 @@ -131,7 +142,7 @@ Partial Class frmFirma 'ToolStrip1 ' Me.ToolStrip1.AllowDrop = True - Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsbtnquit, Me.tsbtnSave, Me.tsbtnnew, Me.ToolStripButton4, Me.ToolStripButton2, Me.ToolStripButton3, Me.ToolStripLabel1, Me.tstxtsuche, Me.tsbtnfirst, Me.tsbtprev, Me.tsbtnnext, Me.tsbtnlast, Me.ToolStripSeparator1, Me.tsbtnFinanzen}) + Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsbtnquit, Me.tsbtnSave, Me.tsbtnnew, Me.ToolStripButton4, Me.ToolStripButton2, Me.ToolStripButton3, Me.ToolStripLabel1, Me.tsbtnFinanzen, Me.tstxtsuche, Me.tsbtnfirst, Me.tsbtprev, Me.tsbtnnext, Me.tsbtnlast, Me.ToolStripSeparator1}) Me.ToolStrip1.Location = New System.Drawing.Point(0, 24) Me.ToolStrip1.Name = "ToolStrip1" Me.ToolStrip1.Size = New System.Drawing.Size(1003, 25) @@ -201,6 +212,16 @@ Partial Class frmFirma Me.ToolStripLabel1.Size = New System.Drawing.Size(39, 22) Me.ToolStripLabel1.Text = "Suche" ' + 'tsbtnFinanzen + ' + Me.tsbtnFinanzen.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text + Me.tsbtnFinanzen.Image = CType(resources.GetObject("tsbtnFinanzen.Image"), System.Drawing.Image) + Me.tsbtnFinanzen.ImageTransparentColor = System.Drawing.Color.Magenta + Me.tsbtnFinanzen.Name = "tsbtnFinanzen" + Me.tsbtnFinanzen.Size = New System.Drawing.Size(58, 22) + Me.tsbtnFinanzen.Text = "Finanzen" + Me.tsbtnFinanzen.Visible = False + ' 'tstxtsuche ' Me.tstxtsuche.Name = "tstxtsuche" @@ -247,18 +268,9 @@ Partial Class frmFirma Me.ToolStripSeparator1.Name = "ToolStripSeparator1" Me.ToolStripSeparator1.Size = New System.Drawing.Size(6, 25) ' - 'tsbtnFinanzen - ' - Me.tsbtnFinanzen.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text - Me.tsbtnFinanzen.Image = CType(resources.GetObject("tsbtnFinanzen.Image"), System.Drawing.Image) - Me.tsbtnFinanzen.ImageTransparentColor = System.Drawing.Color.Magenta - Me.tsbtnFinanzen.Name = "tsbtnFinanzen" - Me.tsbtnFinanzen.Size = New System.Drawing.Size(58, 22) - Me.tsbtnFinanzen.Text = "Finanzen" - ' 'txtName1 ' - Me.txtName1.Location = New System.Drawing.Point(72, 88) + Me.txtName1.Location = New System.Drawing.Point(69, 38) Me.txtName1.Name = "txtName1" Me.txtName1.Size = New System.Drawing.Size(162, 20) Me.txtName1.TabIndex = 1 @@ -266,7 +278,7 @@ Partial Class frmFirma 'txtnrfirma ' Me.txtnrfirma.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtnrfirma.Location = New System.Drawing.Point(72, 62) + Me.txtnrfirma.Location = New System.Drawing.Point(69, 12) Me.txtnrfirma.Name = "txtnrfirma" Me.txtnrfirma.ReadOnly = True Me.txtnrfirma.RightToLeft = System.Windows.Forms.RightToLeft.Yes @@ -277,7 +289,7 @@ Partial Class frmFirma ' Me.lblNr.AutoSize = True Me.lblNr.BackColor = System.Drawing.Color.Transparent - Me.lblNr.Location = New System.Drawing.Point(13, 62) + Me.lblNr.Location = New System.Drawing.Point(10, 12) Me.lblNr.Name = "lblNr" Me.lblNr.Size = New System.Drawing.Size(21, 13) Me.lblNr.TabIndex = 111 @@ -287,7 +299,7 @@ Partial Class frmFirma ' Me.lblAnrede.AutoSize = True Me.lblAnrede.BackColor = System.Drawing.Color.Transparent - Me.lblAnrede.Location = New System.Drawing.Point(13, 91) + Me.lblAnrede.Location = New System.Drawing.Point(10, 41) Me.lblAnrede.Name = "lblAnrede" Me.lblAnrede.Size = New System.Drawing.Size(51, 13) Me.lblAnrede.TabIndex = 112 @@ -297,7 +309,7 @@ Partial Class frmFirma ' Me.lblName2.AutoSize = True Me.lblName2.BackColor = System.Drawing.Color.Transparent - Me.lblName2.Location = New System.Drawing.Point(13, 117) + Me.lblName2.Location = New System.Drawing.Point(10, 67) Me.lblName2.Name = "lblName2" Me.lblName2.Size = New System.Drawing.Size(51, 13) Me.lblName2.TabIndex = 114 @@ -305,7 +317,7 @@ Partial Class frmFirma ' 'txtName2 ' - Me.txtName2.Location = New System.Drawing.Point(72, 114) + Me.txtName2.Location = New System.Drawing.Point(69, 64) Me.txtName2.Name = "txtName2" Me.txtName2.Size = New System.Drawing.Size(162, 20) Me.txtName2.TabIndex = 2 @@ -314,7 +326,7 @@ Partial Class frmFirma ' Me.lblStrasse.AutoSize = True Me.lblStrasse.BackColor = System.Drawing.Color.Transparent - Me.lblStrasse.Location = New System.Drawing.Point(13, 143) + Me.lblStrasse.Location = New System.Drawing.Point(10, 93) Me.lblStrasse.Name = "lblStrasse" Me.lblStrasse.Size = New System.Drawing.Size(42, 13) Me.lblStrasse.TabIndex = 116 @@ -322,7 +334,7 @@ Partial Class frmFirma ' 'txtStrasse ' - Me.txtStrasse.Location = New System.Drawing.Point(72, 140) + Me.txtStrasse.Location = New System.Drawing.Point(69, 90) Me.txtStrasse.Name = "txtStrasse" Me.txtStrasse.Size = New System.Drawing.Size(162, 20) Me.txtStrasse.TabIndex = 3 @@ -331,7 +343,7 @@ Partial Class frmFirma ' Me.lblPostfach.AutoSize = True Me.lblPostfach.BackColor = System.Drawing.Color.Transparent - Me.lblPostfach.Location = New System.Drawing.Point(13, 169) + Me.lblPostfach.Location = New System.Drawing.Point(10, 119) Me.lblPostfach.Name = "lblPostfach" Me.lblPostfach.Size = New System.Drawing.Size(49, 13) Me.lblPostfach.TabIndex = 118 @@ -339,7 +351,7 @@ Partial Class frmFirma ' 'txtPostfach ' - Me.txtPostfach.Location = New System.Drawing.Point(72, 166) + Me.txtPostfach.Location = New System.Drawing.Point(69, 116) Me.txtPostfach.Name = "txtPostfach" Me.txtPostfach.Size = New System.Drawing.Size(162, 20) Me.txtPostfach.TabIndex = 4 @@ -348,7 +360,7 @@ Partial Class frmFirma ' Me.lblPlz.AutoSize = True Me.lblPlz.BackColor = System.Drawing.Color.Transparent - Me.lblPlz.Location = New System.Drawing.Point(13, 195) + Me.lblPlz.Location = New System.Drawing.Point(10, 145) Me.lblPlz.Name = "lblPlz" Me.lblPlz.Size = New System.Drawing.Size(46, 13) Me.lblPlz.TabIndex = 120 @@ -356,14 +368,14 @@ Partial Class frmFirma ' 'txtPlz ' - Me.txtPlz.Location = New System.Drawing.Point(72, 192) + Me.txtPlz.Location = New System.Drawing.Point(69, 142) Me.txtPlz.Name = "txtPlz" Me.txtPlz.Size = New System.Drawing.Size(48, 20) Me.txtPlz.TabIndex = 5 ' 'txtOrt ' - Me.txtOrt.Location = New System.Drawing.Point(126, 192) + Me.txtOrt.Location = New System.Drawing.Point(123, 142) Me.txtOrt.Name = "txtOrt" Me.txtOrt.Size = New System.Drawing.Size(108, 20) Me.txtOrt.TabIndex = 6 @@ -372,7 +384,7 @@ Partial Class frmFirma ' Me.lblTelefon.AutoSize = True Me.lblTelefon.BackColor = System.Drawing.Color.Transparent - Me.lblTelefon.Location = New System.Drawing.Point(16, 248) + Me.lblTelefon.Location = New System.Drawing.Point(13, 198) Me.lblTelefon.Name = "lblTelefon" Me.lblTelefon.Size = New System.Drawing.Size(43, 13) Me.lblTelefon.TabIndex = 123 @@ -380,7 +392,7 @@ Partial Class frmFirma ' 'txtTel ' - Me.txtTel.Location = New System.Drawing.Point(72, 245) + Me.txtTel.Location = New System.Drawing.Point(69, 195) Me.txtTel.Name = "txtTel" Me.txtTel.Size = New System.Drawing.Size(162, 20) Me.txtTel.TabIndex = 8 @@ -389,7 +401,7 @@ Partial Class frmFirma ' Me.lblTelefax.AutoSize = True Me.lblTelefax.BackColor = System.Drawing.Color.Transparent - Me.lblTelefax.Location = New System.Drawing.Point(13, 274) + Me.lblTelefax.Location = New System.Drawing.Point(15, 221) Me.lblTelefax.Name = "lblTelefax" Me.lblTelefax.Size = New System.Drawing.Size(42, 13) Me.lblTelefax.TabIndex = 125 @@ -397,7 +409,7 @@ Partial Class frmFirma ' 'txtFax ' - Me.txtFax.Location = New System.Drawing.Point(72, 271) + Me.txtFax.Location = New System.Drawing.Point(69, 221) Me.txtFax.Name = "txtFax" Me.txtFax.Size = New System.Drawing.Size(162, 20) Me.txtFax.TabIndex = 9 @@ -406,7 +418,7 @@ Partial Class frmFirma ' Me.lblMobile.AutoSize = True Me.lblMobile.BackColor = System.Drawing.Color.Transparent - Me.lblMobile.Location = New System.Drawing.Point(13, 300) + Me.lblMobile.Location = New System.Drawing.Point(15, 247) Me.lblMobile.Name = "lblMobile" Me.lblMobile.Size = New System.Drawing.Size(38, 13) Me.lblMobile.TabIndex = 127 @@ -414,7 +426,7 @@ Partial Class frmFirma ' 'txtnatel ' - Me.txtnatel.Location = New System.Drawing.Point(72, 297) + Me.txtnatel.Location = New System.Drawing.Point(69, 247) Me.txtnatel.Name = "txtnatel" Me.txtnatel.Size = New System.Drawing.Size(162, 20) Me.txtnatel.TabIndex = 10 @@ -423,7 +435,7 @@ Partial Class frmFirma ' Me.lblEmail.AutoSize = True Me.lblEmail.BackColor = System.Drawing.Color.Transparent - Me.lblEmail.Location = New System.Drawing.Point(13, 326) + Me.lblEmail.Location = New System.Drawing.Point(15, 273) Me.lblEmail.Name = "lblEmail" Me.lblEmail.Size = New System.Drawing.Size(36, 13) Me.lblEmail.TabIndex = 129 @@ -431,7 +443,7 @@ Partial Class frmFirma ' 'txtE_Mail ' - Me.txtE_Mail.Location = New System.Drawing.Point(72, 323) + Me.txtE_Mail.Location = New System.Drawing.Point(69, 273) Me.txtE_Mail.Name = "txtE_Mail" Me.txtE_Mail.Size = New System.Drawing.Size(162, 20) Me.txtE_Mail.TabIndex = 11 @@ -440,7 +452,7 @@ Partial Class frmFirma ' Me.lblInterner.AutoSize = True Me.lblInterner.BackColor = System.Drawing.Color.Transparent - Me.lblInterner.Location = New System.Drawing.Point(13, 352) + Me.lblInterner.Location = New System.Drawing.Point(15, 299) Me.lblInterner.Name = "lblInterner" Me.lblInterner.Size = New System.Drawing.Size(43, 13) Me.lblInterner.TabIndex = 131 @@ -448,7 +460,7 @@ Partial Class frmFirma ' 'txtweb ' - Me.txtweb.Location = New System.Drawing.Point(72, 349) + Me.txtweb.Location = New System.Drawing.Point(69, 299) Me.txtweb.Name = "txtweb" Me.txtweb.Size = New System.Drawing.Size(162, 20) Me.txtweb.TabIndex = 12 @@ -457,7 +469,7 @@ Partial Class frmFirma ' Me.cbboxSprache.Dataselection = Nothing Me.cbboxSprache.Displaymember = Nothing - Me.cbboxSprache.Location = New System.Drawing.Point(321, 114) + Me.cbboxSprache.Location = New System.Drawing.Point(318, 64) Me.cbboxSprache.Name = "cbboxSprache" Me.cbboxSprache.Size = New System.Drawing.Size(162, 21) Me.cbboxSprache.TabIndex = 14 @@ -469,7 +481,7 @@ Partial Class frmFirma ' Me.cbboxStatus.Dataselection = Nothing Me.cbboxStatus.Displaymember = Nothing - Me.cbboxStatus.Location = New System.Drawing.Point(321, 87) + Me.cbboxStatus.Location = New System.Drawing.Point(318, 37) Me.cbboxStatus.Name = "cbboxStatus" Me.cbboxStatus.Size = New System.Drawing.Size(162, 21) Me.cbboxStatus.TabIndex = 13 @@ -481,7 +493,7 @@ Partial Class frmFirma ' Me.Label15.AutoSize = True Me.Label15.BackColor = System.Drawing.Color.Transparent - Me.Label15.Location = New System.Drawing.Point(251, 201) + Me.Label15.Location = New System.Drawing.Point(248, 151) Me.Label15.Name = "Label15" Me.Label15.Size = New System.Drawing.Size(50, 13) Me.Label15.TabIndex = 211 @@ -491,7 +503,7 @@ Partial Class frmFirma ' Me.Label14.AutoSize = True Me.Label14.BackColor = System.Drawing.Color.Transparent - Me.Label14.Location = New System.Drawing.Point(251, 177) + Me.Label14.Location = New System.Drawing.Point(248, 127) Me.Label14.Name = "Label14" Me.Label14.Size = New System.Drawing.Size(49, 13) Me.Label14.TabIndex = 210 @@ -499,17 +511,17 @@ Partial Class frmFirma ' 'txtBemerkung ' - Me.txtBemerkung.Location = New System.Drawing.Point(502, 107) + Me.txtBemerkung.Location = New System.Drawing.Point(499, 57) Me.txtBemerkung.Multiline = True Me.txtBemerkung.Name = "txtBemerkung" - Me.txtBemerkung.Size = New System.Drawing.Size(427, 197) + Me.txtBemerkung.Size = New System.Drawing.Size(427, 226) Me.txtBemerkung.TabIndex = 19 ' 'Label2 ' Me.Label2.AutoSize = True Me.Label2.BackColor = System.Drawing.Color.Transparent - Me.Label2.Location = New System.Drawing.Point(499, 87) + Me.Label2.Location = New System.Drawing.Point(496, 37) Me.Label2.Name = "Label2" Me.Label2.Size = New System.Drawing.Size(61, 13) Me.Label2.TabIndex = 209 @@ -519,7 +531,7 @@ Partial Class frmFirma ' Me.lblSprache.AutoSize = True Me.lblSprache.BackColor = System.Drawing.Color.Transparent - Me.lblSprache.Location = New System.Drawing.Point(251, 118) + Me.lblSprache.Location = New System.Drawing.Point(248, 68) Me.lblSprache.Name = "lblSprache" Me.lblSprache.Size = New System.Drawing.Size(47, 13) Me.lblSprache.TabIndex = 208 @@ -529,7 +541,7 @@ Partial Class frmFirma ' Me.lblStatus.AutoSize = True Me.lblStatus.BackColor = System.Drawing.Color.Transparent - Me.lblStatus.Location = New System.Drawing.Point(251, 91) + Me.lblStatus.Location = New System.Drawing.Point(248, 41) Me.lblStatus.Name = "lblStatus" Me.lblStatus.Size = New System.Drawing.Size(37, 13) Me.lblStatus.TabIndex = 207 @@ -539,7 +551,7 @@ Partial Class frmFirma ' Me.Label13.AutoSize = True Me.Label13.BackColor = System.Drawing.Color.Transparent - Me.Label13.Location = New System.Drawing.Point(251, 228) + Me.Label13.Location = New System.Drawing.Point(248, 178) Me.Label13.Name = "Label13" Me.Label13.Size = New System.Drawing.Size(53, 13) Me.Label13.TabIndex = 213 @@ -549,18 +561,18 @@ Partial Class frmFirma ' Me.chklbAdresstyp.FormattingEnabled = True Me.chklbAdresstyp.Items.AddRange(New Object() {"Arbeitgeber", "Fürsorge", "Garant", "IV", "Krankenkasse", "Versicherung"}) - Me.chklbAdresstyp.Location = New System.Drawing.Point(318, 224) + Me.chklbAdresstyp.Location = New System.Drawing.Point(318, 174) Me.chklbAdresstyp.Name = "chklbAdresstyp" - Me.chklbAdresstyp.Size = New System.Drawing.Size(165, 109) + Me.chklbAdresstyp.Size = New System.Drawing.Size(162, 109) Me.chklbAdresstyp.TabIndex = 18 ' 'GroupBox1 ' Me.GroupBox1.Controls.Add(Me.c1daten) Me.GroupBox1.Controls.Add(Me.ToolStrip2) - Me.GroupBox1.Location = New System.Drawing.Point(13, 388) + Me.GroupBox1.Location = New System.Drawing.Point(10, 338) Me.GroupBox1.Name = "GroupBox1" - Me.GroupBox1.Size = New System.Drawing.Size(916, 114) + Me.GroupBox1.Size = New System.Drawing.Size(916, 186) Me.GroupBox1.TabIndex = 214 Me.GroupBox1.TabStop = False Me.GroupBox1.Text = "Ansprechpartner" @@ -580,7 +592,7 @@ Partial Class frmFirma Me.c1daten.PreviewInfo.Size = New System.Drawing.Size(0, 0) Me.c1daten.PreviewInfo.ZoomFactor = 75.0R Me.c1daten.PrintInfo.PageSettings = CType(resources.GetObject("c1daten.PrintInfo.PageSettings"), System.Drawing.Printing.PageSettings) - Me.c1daten.Size = New System.Drawing.Size(910, 70) + Me.c1daten.Size = New System.Drawing.Size(910, 142) Me.c1daten.TabAction = C1.Win.C1TrueDBGrid.TabActionEnum.ColumnNavigation Me.c1daten.TabIndex = 1 Me.c1daten.Text = "C1TrueDBGrid1" @@ -708,21 +720,21 @@ Partial Class frmFirma ' 'dtgueltigab ' - Me.dtgueltigab.Location = New System.Drawing.Point(321, 169) + Me.dtgueltigab.Location = New System.Drawing.Point(318, 119) Me.dtgueltigab.Name = "dtgueltigab" Me.dtgueltigab.Size = New System.Drawing.Size(141, 20) Me.dtgueltigab.TabIndex = 16 ' 'dtgueltigbis ' - Me.dtgueltigbis.Location = New System.Drawing.Point(321, 198) + Me.dtgueltigbis.Location = New System.Drawing.Point(318, 148) Me.dtgueltigbis.Name = "dtgueltigbis" Me.dtgueltigbis.Size = New System.Drawing.Size(141, 20) Me.dtgueltigbis.TabIndex = 17 ' 'btndeldatetimeab ' - Me.btndeldatetimeab.Location = New System.Drawing.Point(468, 169) + Me.btndeldatetimeab.Location = New System.Drawing.Point(465, 119) Me.btndeldatetimeab.Name = "btndeldatetimeab" Me.btndeldatetimeab.Size = New System.Drawing.Size(15, 23) Me.btndeldatetimeab.TabIndex = 217 @@ -730,7 +742,7 @@ Partial Class frmFirma ' 'btndeldatetimebis ' - Me.btndeldatetimebis.Location = New System.Drawing.Point(468, 198) + Me.btndeldatetimebis.Location = New System.Drawing.Point(465, 148) Me.btndeldatetimebis.Name = "btndeldatetimebis" Me.btndeldatetimebis.Size = New System.Drawing.Size(15, 23) Me.btndeldatetimebis.TabIndex = 218 @@ -740,7 +752,7 @@ Partial Class frmFirma ' Me.cbtxtboxKanton.FormattingEnabled = True Me.cbtxtboxKanton.Items.AddRange(New Object() {"AG", "AR", "AI", "BL", "BS", "BE", "FR", "GE", "GL", "GR", "JU", "LU", "NE", "NW", "OW", "SG", "SH", "SZ", "SO", "TG", "TI", "UR", "VD", "VS", "ZG", "ZH"}) - Me.cbtxtboxKanton.Location = New System.Drawing.Point(72, 218) + Me.cbtxtboxKanton.Location = New System.Drawing.Point(69, 168) Me.cbtxtboxKanton.Name = "cbtxtboxKanton" Me.cbtxtboxKanton.Size = New System.Drawing.Size(162, 21) Me.cbtxtboxKanton.TabIndex = 7 @@ -749,7 +761,7 @@ Partial Class frmFirma ' Me.Label3.AutoSize = True Me.Label3.BackColor = System.Drawing.Color.Transparent - Me.Label3.Location = New System.Drawing.Point(18, 221) + Me.Label3.Location = New System.Drawing.Point(15, 171) Me.Label3.Name = "Label3" Me.Label3.Size = New System.Drawing.Size(41, 13) Me.Label3.TabIndex = 219 @@ -757,7 +769,7 @@ Partial Class frmFirma ' 'txtGLN ' - Me.txtGLN.Location = New System.Drawing.Point(321, 143) + Me.txtGLN.Location = New System.Drawing.Point(318, 93) Me.txtGLN.Name = "txtGLN" Me.txtGLN.Size = New System.Drawing.Size(162, 20) Me.txtGLN.TabIndex = 15 @@ -766,7 +778,7 @@ Partial Class frmFirma ' Me.lblGLN.AutoSize = True Me.lblGLN.BackColor = System.Drawing.Color.Transparent - Me.lblGLN.Location = New System.Drawing.Point(251, 146) + Me.lblGLN.Location = New System.Drawing.Point(248, 96) Me.lblGLN.Name = "lblGLN" Me.lblGLN.Size = New System.Drawing.Size(43, 13) Me.lblGLN.TabIndex = 221 @@ -774,63 +786,134 @@ Partial Class frmFirma ' 'Finanzen1 ' - Me.Finanzen1.Location = New System.Drawing.Point(0, 62) + Me.Finanzen1.Location = New System.Drawing.Point(1, 3) Me.Finanzen1.Name = "Finanzen1" Me.Finanzen1.Patientnr = 0 Me.Finanzen1.Size = New System.Drawing.Size(990, 587) Me.Finanzen1.TabIndex = 222 - Me.Finanzen1.Visible = False + ' + 'SuperTabControl1 + ' + ' + ' + ' + ' + ' + ' + Me.SuperTabControl1.ControlBox.CloseBox.Name = "" + ' + ' + ' + Me.SuperTabControl1.ControlBox.MenuBox.Name = "" + 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.SuperTabControlPanel1) + Me.SuperTabControl1.Controls.Add(Me.SuperTabControlPanel2) + Me.SuperTabControl1.Dock = System.Windows.Forms.DockStyle.Fill + Me.SuperTabControl1.Location = New System.Drawing.Point(0, 49) + Me.SuperTabControl1.Name = "SuperTabControl1" + Me.SuperTabControl1.ReorderTabsEnabled = True + Me.SuperTabControl1.SelectedTabFont = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold) + Me.SuperTabControl1.SelectedTabIndex = 0 + Me.SuperTabControl1.Size = New System.Drawing.Size(1003, 608) + Me.SuperTabControl1.TabFont = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.SuperTabControl1.TabIndex = 223 + Me.SuperTabControl1.Tabs.AddRange(New DevComponents.DotNetBar.BaseItem() {Me.Stammdaten, Me.Finanzen}) + Me.SuperTabControl1.Text = "SuperTabControl1" + ' + 'SuperTabControlPanel1 + ' + Me.SuperTabControlPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled + Me.SuperTabControlPanel1.Controls.Add(Me.Panel1) + 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(1003, 583) + Me.SuperTabControlPanel1.TabIndex = 1 + Me.SuperTabControlPanel1.TabItem = Me.Stammdaten + ' + 'Panel1 + ' + Me.Panel1.Controls.Add(Me.txtnrfirma) + Me.Panel1.Controls.Add(Me.lblNr) + Me.Panel1.Controls.Add(Me.txtnatel) + Me.Panel1.Controls.Add(Me.cbboxSprache) + Me.Panel1.Controls.Add(Me.txtStrasse) + Me.Panel1.Controls.Add(Me.btndeldatetimeab) + Me.Panel1.Controls.Add(Me.lblPlz) + Me.Panel1.Controls.Add(Me.Label2) + Me.Panel1.Controls.Add(Me.txtGLN) + Me.Panel1.Controls.Add(Me.lblSprache) + Me.Panel1.Controls.Add(Me.txtOrt) + Me.Panel1.Controls.Add(Me.dtgueltigbis) + Me.Panel1.Controls.Add(Me.chklbAdresstyp) + Me.Panel1.Controls.Add(Me.lblName2) + Me.Panel1.Controls.Add(Me.txtName1) + Me.Panel1.Controls.Add(Me.lblTelefax) + Me.Panel1.Controls.Add(Me.cbboxStatus) + Me.Panel1.Controls.Add(Me.lblMobile) + Me.Panel1.Controls.Add(Me.txtPlz) + Me.Panel1.Controls.Add(Me.lblStrasse) + Me.Panel1.Controls.Add(Me.lblGLN) + Me.Panel1.Controls.Add(Me.btndeldatetimebis) + Me.Panel1.Controls.Add(Me.txtTel) + Me.Panel1.Controls.Add(Me.txtBemerkung) + Me.Panel1.Controls.Add(Me.Label13) + Me.Panel1.Controls.Add(Me.lblStatus) + Me.Panel1.Controls.Add(Me.lblAnrede) + Me.Panel1.Controls.Add(Me.dtgueltigab) + Me.Panel1.Controls.Add(Me.Label15) + Me.Panel1.Controls.Add(Me.txtName2) + Me.Panel1.Controls.Add(Me.txtweb) + Me.Panel1.Controls.Add(Me.txtFax) + Me.Panel1.Controls.Add(Me.lblPostfach) + Me.Panel1.Controls.Add(Me.txtE_Mail) + Me.Panel1.Controls.Add(Me.cbtxtboxKanton) + Me.Panel1.Controls.Add(Me.txtPostfach) + Me.Panel1.Controls.Add(Me.lblTelefon) + Me.Panel1.Controls.Add(Me.Label3) + Me.Panel1.Controls.Add(Me.lblEmail) + Me.Panel1.Controls.Add(Me.Label14) + Me.Panel1.Controls.Add(Me.GroupBox1) + Me.Panel1.Controls.Add(Me.lblInterner) + Me.Panel1.Dock = System.Windows.Forms.DockStyle.Fill + Me.Panel1.Location = New System.Drawing.Point(0, 0) + Me.Panel1.Name = "Panel1" + Me.Panel1.Size = New System.Drawing.Size(1003, 583) + Me.Panel1.TabIndex = 222 + ' + 'Stammdaten + ' + Me.Stammdaten.AttachedControl = Me.SuperTabControlPanel1 + Me.Stammdaten.GlobalItem = False + Me.Stammdaten.Name = "Stammdaten" + Me.Stammdaten.Text = "Stammdaten" + ' + 'SuperTabControlPanel2 + ' + Me.SuperTabControlPanel2.Controls.Add(Me.Finanzen1) + Me.SuperTabControlPanel2.Dock = System.Windows.Forms.DockStyle.Fill + Me.SuperTabControlPanel2.Location = New System.Drawing.Point(0, 25) + Me.SuperTabControlPanel2.Name = "SuperTabControlPanel2" + Me.SuperTabControlPanel2.Size = New System.Drawing.Size(1003, 583) + Me.SuperTabControlPanel2.TabIndex = 0 + Me.SuperTabControlPanel2.TabItem = Me.Finanzen + ' + 'Finanzen + ' + Me.Finanzen.AttachedControl = Me.SuperTabControlPanel2 + Me.Finanzen.GlobalItem = False + Me.Finanzen.Name = "Finanzen" + Me.Finanzen.Text = "Finanzen" ' 'frmFirma ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(1003, 657) - Me.Controls.Add(Me.Finanzen1) - Me.Controls.Add(Me.txtnrfirma) - Me.Controls.Add(Me.txtGLN) + Me.Controls.Add(Me.SuperTabControl1) Me.Controls.Add(Me.ToolStrip1) - Me.Controls.Add(Me.txtName1) Me.Controls.Add(Me.MenuStrip1) - Me.Controls.Add(Me.lblGLN) - Me.Controls.Add(Me.lblNr) - Me.Controls.Add(Me.lblAnrede) - Me.Controls.Add(Me.txtweb) - Me.Controls.Add(Me.cbtxtboxKanton) - Me.Controls.Add(Me.lblEmail) - Me.Controls.Add(Me.lblInterner) - Me.Controls.Add(Me.Label3) - Me.Controls.Add(Me.txtE_Mail) - Me.Controls.Add(Me.txtName2) - Me.Controls.Add(Me.lblStatus) - Me.Controls.Add(Me.btndeldatetimebis) - Me.Controls.Add(Me.lblMobile) - Me.Controls.Add(Me.lblName2) - Me.Controls.Add(Me.lblSprache) - Me.Controls.Add(Me.btndeldatetimeab) - Me.Controls.Add(Me.txtnatel) - Me.Controls.Add(Me.txtStrasse) - Me.Controls.Add(Me.Label2) - Me.Controls.Add(Me.dtgueltigbis) - Me.Controls.Add(Me.lblTelefax) - Me.Controls.Add(Me.lblStrasse) - Me.Controls.Add(Me.txtBemerkung) - Me.Controls.Add(Me.dtgueltigab) - Me.Controls.Add(Me.txtFax) - Me.Controls.Add(Me.txtPostfach) - Me.Controls.Add(Me.Label14) - Me.Controls.Add(Me.GroupBox1) - Me.Controls.Add(Me.lblTelefon) - Me.Controls.Add(Me.lblPostfach) - Me.Controls.Add(Me.Label15) - Me.Controls.Add(Me.Label13) - Me.Controls.Add(Me.txtTel) - Me.Controls.Add(Me.txtPlz) - Me.Controls.Add(Me.cbboxStatus) - Me.Controls.Add(Me.chklbAdresstyp) - Me.Controls.Add(Me.txtOrt) - Me.Controls.Add(Me.lblPlz) - Me.Controls.Add(Me.cbboxSprache) Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) Me.Name = "frmFirma" Me.Text = "Firmen" @@ -843,6 +926,12 @@ Partial Class frmFirma CType(Me.c1daten, System.ComponentModel.ISupportInitialize).EndInit() Me.ToolStrip2.ResumeLayout(False) Me.ToolStrip2.PerformLayout() + CType(Me.SuperTabControl1, System.ComponentModel.ISupportInitialize).EndInit() + Me.SuperTabControl1.ResumeLayout(False) + Me.SuperTabControlPanel1.ResumeLayout(False) + Me.Panel1.ResumeLayout(False) + Me.Panel1.PerformLayout() + Me.SuperTabControlPanel2.ResumeLayout(False) Me.ResumeLayout(False) Me.PerformLayout() @@ -923,4 +1012,10 @@ Partial Class frmFirma Friend WithEvents ToolStripSeparator1 As ToolStripSeparator Friend WithEvents tsbtnFinanzen As ToolStripButton Friend WithEvents Finanzen1 As Finanzen + Friend WithEvents SuperTabControl1 As DevComponents.DotNetBar.SuperTabControl + Friend WithEvents SuperTabControlPanel1 As DevComponents.DotNetBar.SuperTabControlPanel + Friend WithEvents Stammdaten As DevComponents.DotNetBar.SuperTabItem + Friend WithEvents Panel1 As Panel + Friend WithEvents SuperTabControlPanel2 As DevComponents.DotNetBar.SuperTabControlPanel + Friend WithEvents Finanzen As DevComponents.DotNetBar.SuperTabItem End Class diff --git a/DPM2016/Firmen/frmFirma.resx b/DPM2016/Firmen/frmFirma.resx index f4c358e..c450006 100644 --- a/DPM2016/Firmen/frmFirma.resx +++ b/DPM2016/Firmen/frmFirma.resx @@ -210,6 +210,21 @@ wJoACUUiMjHalXRcPsqEWL7fcMfjSR5gxpzZAtc7N97anSgWi1fEuERy5+69S+73H/me4aHeYiLCv6Cb MWDevIil18vI5vOjYryr+w+lt7X6Z9sGw2xxmGdN88VPPn/tpeUVfL7PNf4Gp8To/ysQCBzhOO5yuVw+ 1l2RSH4BvQRqc//87N0AAAAASUVORK5CYII= + + + + + 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== @@ -337,21 +352,6 @@ ykBy01dwSJJh1fZjmhVbXS3olDfCLShxyLegDVHyGUQpZnAkTQ5jG88BOrzE6h2u4PU/Qzh5D5gxmf99 z9w5S8/K6106/MZE83NN3U7FDelb+b5ab2X1ysLWa3DbvgAjOrzE1oC47x0FYqwwd3jynrHdQXr77bEr QviZc3RGgMWe4BX01u/8xujp/R8+75YoB9R89wAAAABJRU5ErkJggg== - - - - - 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== @@ -391,7 +391,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, 908, 68</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, 908, 68</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, 908, 140</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, 908, 140</ClientArea><PrintPageHeaderStyle parent="" me="Style15" /><PrintPageFooterStyle parent="" me="Style16" /></Blob> 231, 17 diff --git a/DPM2016/Firmen/frmFirma.vb b/DPM2016/Firmen/frmFirma.vb index bbc51fe..5d2408e 100644 --- a/DPM2016/Firmen/frmFirma.vb +++ b/DPM2016/Firmen/frmFirma.vb @@ -18,6 +18,7 @@ Public Class frmFirma End Get Set(value As Integer) m_firmanr = value + Fill_Stammdaten() Get_Data() AddChanges(Me) Me.txtName1.Select() @@ -201,12 +202,21 @@ Public Class frmFirma End Sub Private Sub frmFirma_Load(sender As Object, e As EventArgs) Handles MyBase.Load + Select Case Globals.Funktionsstufe + Case 2 + + Me.Finanzen.Visible = False + End Select Dim db As New clsDB If Firmanr = 0 Then - db.Get_Tabledata("Firma", "", "", "", False) + db.Get_Tabledata("Firma", "Select * from firma order by name1, ort", "", "", False) Me.Firmanr = db.dsDaten.Tables(0).Rows(0).Item(0) End If Get_Data() + Select Case Globals.Funktionsstufe + Case 2 + Me.tsbtnFinanzen.Visible = False + End Select End Sub Sub Get_Data() @@ -217,7 +227,7 @@ Public Class frmFirma Dim r As DataRow = DB.dsDaten.Tables(0).Rows(0) For Each c As DataColumn In DB.dsDaten.Tables(0).Columns colname = c.ColumnName - For Each Ctl As Control In Me.Controls + For Each Ctl As Control In Me.Panel1.Controls ' Me.Controls 'Dim objtype As System.Type = Ctl.GetType 'If objtype.Name = "Label" Then ' Exit For @@ -352,7 +362,7 @@ Public Class frmFirma Dim r As DataRow = DB.dsDaten.Tables(0).Rows(0) For Each c As DataColumn In DB.dsDaten.Tables(0).Columns - For Each Ctl As Control In Me.Controls + For Each Ctl As Control In Me.Panel1.Controls 'Me.Controls If UCase(Ctl.Name) = "TXT" + UCase(c.ColumnName) Then If UCase(Ctl.Name) <> "TXTMUTIERT_AM" And UCase(Ctl.Name) <> "TXTERSTLLT_AM" Then r(c.ColumnName) = Ctl.Text @@ -455,7 +465,7 @@ Public Class frmFirma If Me.Check_Changes = False Then Exit Sub Dim db As New clsDB Try - db.Get_Tabledata("Firma", "", db.Get_SQL(26), Me.Firmanr.ToString) + db.Get_Tabledata("Firma", "", db.Get_SQL(26), "'" + Me.txtName1.Text + "'") Me.Firmanr = db.dsDaten.Tables(0).Rows(0).Item(0) Catch Me.Firmanr = Me.Firmanr @@ -467,7 +477,7 @@ Public Class frmFirma If Me.Check_Changes = False Then Exit Sub Dim db As New clsDB Try - db.Get_Tabledata("firma", "", db.Get_SQL(27), Me.Firmanr.ToString) + db.Get_Tabledata("firma", "", db.Get_SQL(27), "'" + Me.txtName1.Text + "'") Me.Firmanr = db.dsDaten.Tables(0).Rows(0).Item(0) Catch Me.Firmanr = Me.Firmanr @@ -563,6 +573,14 @@ Public Class frmFirma If Me.Finanzen1.Visible = False Then Me.Finanzen1.Visible = True Else Me.Finanzen1.Visible = False End Sub + Private Sub txtName1_TextChanged(sender As Object, e As EventArgs) Handles txtName1.TextChanged, txtName2.TextChanged, txtOrt.TextChanged, txtPlz.TextChanged + Me.Text = Me.txtnrfirma.Text + " " + Me.txtName1.Text + " " + Me.txtName2.Text + ", " + Me.txtPlz.Text + " " + Me.txtOrt.Text + End Sub + + Private Sub tstxtsuche_Click(sender As Object, e As EventArgs) Handles tstxtsuche.Click + + End Sub + #End Region End Class \ No newline at end of file diff --git a/DPM2016/Klassen/MyCombobox.vb b/DPM2016/Klassen/MyCombobox.vb index 4a3a74f..bccc225 100644 --- a/DPM2016/Klassen/MyCombobox.vb +++ b/DPM2016/Klassen/MyCombobox.vb @@ -86,7 +86,11 @@ End Get Set(value As String) m_valuememeber = value - MyBase.ValueMember = m_valuememeber + Try + MyBase.ValueMember = m_valuememeber + Catch + End Try + End Set End Property diff --git a/DPM2016/Klassen/clsStammdaten_flat.Designer.vb b/DPM2016/Klassen/clsStammdaten_flat.Designer.vb index 7584437..c33bdf0 100644 --- a/DPM2016/Klassen/clsStammdaten_flat.Designer.vb +++ b/DPM2016/Klassen/clsStammdaten_flat.Designer.vb @@ -53,11 +53,16 @@ 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.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() 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.SuspendLayout() ' 'c1daten @@ -220,9 +225,9 @@ Partial Class clsStammdaten_flat ' 'ContextMenuStrip1 ' - Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.NeuerBenutzerEröffnenToolStripMenuItem}) + 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, 26) + Me.ContextMenuStrip1.Size = New System.Drawing.Size(204, 70) ' 'NeuerBenutzerEröffnenToolStripMenuItem ' @@ -230,6 +235,30 @@ Partial Class clsStammdaten_flat Me.NeuerBenutzerEröffnenToolStripMenuItem.Size = New System.Drawing.Size(203, 22) Me.NeuerBenutzerEröffnenToolStripMenuItem.Text = "Neuer Benutzer eröffnen" ' + 'ctxMenuTarif + ' + Me.ctxMenuTarif.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.TarifBearbeitenToolStripMenuItem, Me.NeuerTarifeintragErstellenToolStripMenuItem}) + Me.ctxMenuTarif.Name = "ctxMenuTarif" + Me.ctxMenuTarif.Size = New System.Drawing.Size(217, 48) + ' + 'TarifBearbeitenToolStripMenuItem + ' + Me.TarifBearbeitenToolStripMenuItem.Name = "TarifBearbeitenToolStripMenuItem" + Me.TarifBearbeitenToolStripMenuItem.Size = New System.Drawing.Size(216, 22) + Me.TarifBearbeitenToolStripMenuItem.Text = "Tarif bearbeiten" + ' + 'NeuerTarifeintragErstellenToolStripMenuItem + ' + Me.NeuerTarifeintragErstellenToolStripMenuItem.Name = "NeuerTarifeintragErstellenToolStripMenuItem" + Me.NeuerTarifeintragErstellenToolStripMenuItem.Size = New System.Drawing.Size(216, 22) + Me.NeuerTarifeintragErstellenToolStripMenuItem.Text = "Neuer Tarifeintrag erstellen" + ' + 'PasswortÄndernToolStripMenuItem + ' + Me.PasswortÄndernToolStripMenuItem.Name = "PasswortÄndernToolStripMenuItem" + Me.PasswortÄndernToolStripMenuItem.Size = New System.Drawing.Size(203, 22) + Me.PasswortÄndernToolStripMenuItem.Text = "Passwort ändern" + ' 'clsStammdaten_flat ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -246,6 +275,7 @@ Partial Class clsStammdaten_flat CType(Me.C1TrueDBDropdown1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.C1TrueDBDropdown2, System.ComponentModel.ISupportInitialize).EndInit() Me.ContextMenuStrip1.ResumeLayout(False) + Me.ctxMenuTarif.ResumeLayout(False) Me.ResumeLayout(False) Me.PerformLayout() @@ -263,4 +293,8 @@ Partial Class clsStammdaten_flat Friend WithEvents ContextMenuStrip1 As ContextMenuStrip Friend WithEvents NeuerBenutzerEröffnenToolStripMenuItem As ToolStripMenuItem Friend WithEvents ToolStripButton7 As ToolStripButton + Friend WithEvents ctxMenuTarif As ContextMenuStrip + Friend WithEvents TarifBearbeitenToolStripMenuItem As ToolStripMenuItem + Friend WithEvents NeuerTarifeintragErstellenToolStripMenuItem As ToolStripMenuItem + Friend WithEvents PasswortÄndernToolStripMenuItem As ToolStripMenuItem End Class diff --git a/DPM2016/Klassen/clsStammdaten_flat.resx b/DPM2016/Klassen/clsStammdaten_flat.resx index 453f3f9..8a493fd 100644 --- a/DPM2016/Klassen/clsStammdaten_flat.resx +++ b/DPM2016/Klassen/clsStammdaten_flat.resx @@ -155,7 +155,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, 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{}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> 17, 17 @@ -163,19 +163,19 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAK2SURBVDhPnZLdS1NhHMcfCPoDuummi+i6qwYWZZjb3Obx - 7MzN1dY5Z9tJZ84Mi95AK3vXNC0L7c1hKiVFpVZKafaiaKgoZSHViuoiuuiFIoguCj4dNRa7tB984Pk9 - 8Hx4vr/nEf9TX14OBj+/nfjVujODv1uzdbkip6vjQA5dh6aRknQelLiy186D+FY+TfXycfIW318NcKnM - mirorJBZtsLO8lU2Vqz+R9oqK0st6fxI9JLo2sd4o5+viYdc3uNIFXSUy2RYndjsEnaHK4k1y0lauo0X - rRHGz+uMng7y6dkdru3PThU46gVS1Tyy7T4kl4KU7UaSZFwumdVWiakWg9GzIR41BPkw3jkT9e9RIWxH - BYkPbThNSU6mhtsZQJH8KLIX2e0h0+HmaTzMcKPOQP163g6101OpzApsVYLJd020DAgyKgX2OoHzlEAu - X4hXCeLJ9ZOV42PivMbASZ0ftxfzvL+ZO9VehKtGMPKmkviwoGnIXL8uYOxNhMfvwzOStZ4weXlBJE+A - sdMq909o/OxdwrOeRvrr/LOCe4kdxCcE8XFB81NBy5TgybcIjpOCYF4B6wIh3Hkaww0B+o8Hadrh5HHn - UR7WB2YiWOxmhO7nhbQlBJnTEY4JHCcEuXsXoatRVN3AFzQYrPfTV7uW6wcURtorGGpQk0O0ZFULul77 - cB4XGIFtGFoJRrgIw4gSMfIJhKLcr/Nyu8ZHd5WXwQvbGT0TSnlGi9O8slIzn6hRSrSgmIJo0Qz5JtqG - GHdrPHRX5nLjsIfexhgTTZEUgWgtWcnG4hKKY1so3rQ5Scwkv6iUvmqZm0cUOg65uVkbYrI5H6HrOroW - QtPCqOo05lrVzF5Nopr9uvU6u2IBLlYo5g+UuXowl6m2wtkhzpVyPa3s3O41v19ejKVGmEMtMFkmhLD8 - AXVKwo8FvT+zAAAAAElFTkSuQmCC + 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== @@ -196,16 +196,16 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIWSURBVDhPlY9dSJNhFMffCylqduHIEk2pbaWwsMyLpCsL - +sAwJRlBBNLoTocSXhQFc7Su7KLoA+xi1L7brH02p1ttS1YEIWghudYIp7W3d+Y2d9FGvv+ewXPZu9kP - /pznOed/znkeZjMEJBLXTEvLdXr9P6a7ux/cZRjoamoQlEo/vpHJammpMvzCo475RAyem7dxhwwZF4nw - vL4esxJJF7WU5/fcNS4z2Y5U7DHiiyzG90pwv6oKbrH4BrUIsxHX6n8FziDlasayicFK4CRiPzi8VA19 - oxZh+IT2dCasQMojJwOkWJ4Qg/O14bttCxJzz5qp7d/EfKqtbOhKgSWb01PHkbTvwOpUJxkkw5+ASEVt - wmzMDwdZrxyr06fICw6Sze3g/MeQ8+2KUoswfOyqMu3rwE/vYayFFGDJF9Ze9+L9vQP8J1ttNbUJU1x4 - mGS9bci/GwQ3eRTZ8EWkyXY+vP88tZSn8PkJMotOZGZvIfuqh2w/h2L4yAQtl2ds7JIIrBO5Ly+wvhRC - PhlEPtq1TsuVaWzcLb/Q24nsVw8KbBQoxm25lQ87abkyDU1NZ7dtr8aeujp3eultA01vjkgksk+tVo9q - NBqt3mRS6HRP+81m84DD4Rgpyel0DhApiS673e4+l8t1wu/3y2g7w9jt9laLxdJDmvoNBsOQ0WgcIXGU - RHVJ9FzKDRMp9Xp9n9VqPcQwDPMXXx4kUDB8DQsAAAAASUVORK5CYII= + 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= @@ -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{}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> + <?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> @@ -463,9 +463,12 @@ - <?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> + <?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> 124, 17 + + 281, 17 + \ No newline at end of file diff --git a/DPM2016/Klassen/clsStammdaten_flat.vb b/DPM2016/Klassen/clsStammdaten_flat.vb index 376614a..aa3a715 100644 --- a/DPM2016/Klassen/clsStammdaten_flat.vb +++ b/DPM2016/Klassen/clsStammdaten_flat.vb @@ -28,7 +28,7 @@ Public Class clsStammdaten_flat End Set End Property - Dim db As New clsDB + Dim db As clsDB Dim c1d As New C1.Win.C1TrueDBGrid.C1TrueDBGrid @@ -43,7 +43,12 @@ Public Class clsStammdaten_flat Public Sub get_data() Try + Try + db = Nothing + Catch ex As Exception + End Try + db = New clsDB Me.c1daten.DataSource = Nothing Me.c1daten.DataMember = Nothing @@ -62,24 +67,45 @@ Public Class clsStammdaten_flat Dim spalten As New Tabellenspalte spalten.Spaltentitel_aktualisieren(Me.c1daten, Me.Tablename, db.dsDaten.Tables(0)) - If Tablename = "Auswertung" Then - Dim printer As New clsPrinter - printer.Get_Printers() - Me.C1TrueDBDropdown1.DataSource = printer.Printers - Me.C1TrueDBDropdown1.DataMember = printer.Printers.Columns(0).ColumnName - Me.C1TrueDBDropdown1.ValueMember = printer.Printers.Columns(0).ColumnName - Me.C1TrueDBDropdown1.DisplayMember = printer.Printers.Columns(0).ColumnName - Me.c1daten.Columns("Drucker").DropDown = Me.C1TrueDBDropdown1 - End If - If Tablename = "User" Then Me.c1d.ContextMenuStrip = Me.ContextMenuStrip1 Else Me.c1d.ContextMenuStrip = Nothing - + Select Case Tablename + Case "Auswertung" + Dim printer As New clsPrinter + printer.Get_Printers() + Me.C1TrueDBDropdown1.DataSource = printer.Printers + Me.C1TrueDBDropdown1.DataMember = printer.Printers.Columns(0).ColumnName + Me.C1TrueDBDropdown1.ValueMember = printer.Printers.Columns(0).ColumnName + Me.C1TrueDBDropdown1.DisplayMember = printer.Printers.Columns(0).ColumnName + Me.c1daten.Columns("Drucker").DropDown = Me.C1TrueDBDropdown1 + Case "User" + Me.c1d.ContextMenuStrip = Me.ContextMenuStrip1 + Case "Tarif" + Me.c1d.ContextMenuStrip = Me.ctxMenuTarif + End Select Catch ex As Exception End Try End Sub + Public Sub Check_Changes() + + Try + Dim ds As New DataSet + ds = c1daten.DataSource + Dim xdata As DataTable = ds.Tables(0).GetChanges + If xdata.Rows.Count > 0 Then + If MsgBox("Daten wurden geändert. Speichern?", vbYesNo + vbQuestion) = vbYes Then + db.Update_Data() + End If + End If + + Catch + End Try + + End Sub Private Sub ToolStripButton5_Click(sender As Object, e As EventArgs) Handles ToolStripButton5.Click + Check_Changes() If Tablename = "Spalten" Then Globals.Spaltendaten.Rows.Clear() - db.Update_Data() + Me.c1daten.DataSource = Nothing + 'db.Update_Data() End Sub @@ -142,11 +168,99 @@ Public Class clsStammdaten_flat End Sub Private Sub c1daten_DoubleClick(sender As Object, e As EventArgs) Handles c1daten.DoubleClick - If Tablename = "Dentotar" Then - Dim f As New frmDentotarDetails - f.Update_Data(Me.c1daten.Columns("LeistungNrNeu").Value) + 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 + ' Me.c1daten.Columns("LeistungD").Value = f.TextBox1.Text + Case "Tarif" + Dim f As New frmTarifDetail + f.txtnrtarif.Text = Me.c1daten.Columns("nrtarif").Value + f.cbboxTarifgruppe.SelectedValue = Me.c1daten.Columns("Nrtarifgruppe").Value + f.txtNummer.Text = Me.c1daten.Columns("sso_nummer").Value + f.txtBezd.Text = Me.c1daten.Columns("bezd").Value + f.txtBezf.Text = Me.c1daten.Columns("bezf").Value + f.txtBezi.Text = Me.c1daten.Columns("bezi").Value + f.txtprivat.Text = Me.c1daten.Columns("privattarif").Value + f.txtsuva.Text = Me.c1daten.Columns("suvatarif").Value + f.txtmin.Text = Me.c1daten.Columns("minimaltarif").Value + f.txtmax.Text = Me.c1daten.Columns("maximaltarif").Value + If Me.c1daten.Columns("MitLabor").Value = 1 Then f.cbboxmitlabor.Checked = True Else f.cbboxmitlabor.Checked = False + f.txtfrankenwert.Text = Me.c1daten.Columns("Frankenbetrag").Value + f.ShowDialog() + If f.DialogResult = DialogResult.OK Then + Me.c1daten.Columns("nrtarif").Value = f.txtnrtarif.Text + Me.c1daten.Columns("Nrtarifgruppe").Value = f.cbboxTarifgruppe.SelectedValue + Me.c1daten.Columns("sso_nummer").Value = f.txtNummer.Text + Me.c1daten.Columns("bezd").Value = f.txtBezd.Text + Me.c1daten.Columns("bezf").Value = f.txtBezf.Text + Me.c1daten.Columns("bezi").Value = f.txtBezi.Text + Me.c1daten.Columns("privattarif").Value = f.txtprivat.Text + Me.c1daten.Columns("suvatarif").Value = f.txtsuva.Text + Me.c1daten.Columns("minimaltarif").Value = f.txtmin.Text + Me.c1daten.Columns("maximaltarif").Value = f.txtmax.Text + If f.cbboxmitlabor.Checked Then + Me.c1daten.Columns("MitLabor").Value = 1 + Else + Me.c1daten.Columns("MitLabor").Value = 0 + End If + Me.c1daten.Columns("Frankenbetrag").Value = f.txtfrankenwert.Text + End If + + End Select + + + End Sub + + Private Sub ContextMenuStrip1_Opening(sender As Object, e As System.ComponentModel.CancelEventArgs) Handles ContextMenuStrip1.Opening + + End Sub - f.ShowDialog() - End If + Private Sub TarifBearbeitenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles TarifBearbeitenToolStripMenuItem.Click + c1daten_DoubleClick(sender, e) + End Sub + + Private Sub NeuerTarifeintragErstellenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles NeuerTarifeintragErstellenToolStripMenuItem.Click + Dim f As New frmTarifDetail + Dim newkey As Integer = f.New_Tarif + f.Dispose() + get_data() + Dim d As DataSet = c1daten.DataSource + Dim i As Integer = 0 + For Each r As DataRow In d.Tables(0).Rows + i = i + 1 + If newkey = r.Item(0) Then + c1daten.Bookmark = i + End If + Next + c1daten_DoubleClick(sender, e) + End Sub + + Private Sub PasswortÄndernToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles PasswortÄndernToolStripMenuItem.Click + Dim f As New frmLogin + f.txtUserName.Text = Me.c1daten.Columns("User").Value + f.txtPassword.Text = Me.c1daten.Columns("Passwort").Value + f.ShowDialog() End Sub End Class diff --git a/DPM2016/My Project/Settings.Designer.vb b/DPM2016/My Project/Settings.Designer.vb index 0ce7ec0..f33ffe5 100644 --- a/DPM2016/My Project/Settings.Designer.vb +++ b/DPM2016/My Project/Settings.Designer.vb @@ -15,7 +15,7 @@ Option Explicit On Namespace My _ Partial Friend NotInheritable Class MySettings Inherits Global.System.Configuration.ApplicationSettingsBase @@ -68,7 +68,7 @@ Namespace My _ + Global.System.Configuration.DefaultSettingValueAttribute("h:\dpm\dmp1\dmp2")> _ Public Property TempPath() As String Get Return CType(Me("TempPath"),String) @@ -92,8 +92,8 @@ Namespace My _ + Global.System.Configuration.DefaultSettingValueAttribute("data source=shu00;initial catalog=dpm2018_1;integrated security=SSPI;persist secu"& _ + "rity info=false;workstation id=;packet size=4096;user id=sa;password=*shu29")> _ Public Property ConnectionString() As String Get Return CType(Me("ConnectionString"),String) diff --git a/DPM2016/My Project/Settings.settings b/DPM2016/My Project/Settings.settings index f69626b..e03f97f 100644 --- a/DPM2016/My Project/Settings.settings +++ b/DPM2016/My Project/Settings.settings @@ -6,13 +6,13 @@ 2 - h:\dpm + h:\dpm\dmp1\dmp2 h:\dpm\docarchiv - data source=shu00;initial catalog=dpm2018;integrated security=SSPI;persist security info=false;workstation id=;packet size=4096;user id=sa;password=*shu29 + data source=shu00;initial catalog=dpm2018_1;integrated security=SSPI;persist security info=false;workstation id=;packet size=4096;user id=sa;password=*shu29 \ No newline at end of file diff --git a/DPM2016/Patient/Patient.Designer.vb b/DPM2016/Patient/Patient.Designer.vb index 359151b..3c0c9ed 100644 --- a/DPM2016/Patient/Patient.Designer.vb +++ b/DPM2016/Patient/Patient.Designer.vb @@ -41,35 +41,36 @@ Partial Class Patient Me.SuperTabControl1 = New DevComponents.DotNetBar.SuperTabControl() Me.SuperTabControlPanel1 = New DevComponents.DotNetBar.SuperTabControlPanel() Me.btnVTX = New System.Windows.Forms.Button() - Me.PatientDetails1 = New DPM2016.PatientDetails() Me.Stammdaten = New DevComponents.DotNetBar.SuperTabItem() Me.SuperTabControlPanel3 = New DevComponents.DotNetBar.SuperTabControlPanel() - Me.Behandlung1 = New DPM2016.Behandlung() Me.Behandlungen = New DevComponents.DotNetBar.SuperTabItem() Me.SuperTabControlPanel2 = New DevComponents.DotNetBar.SuperTabControlPanel() - Me.PatientAbrechnung1 = New DPM2016.PatientAbrechnung() Me.Abrechnung = New DevComponents.DotNetBar.SuperTabItem() + Me.SuperTabControlPanel5 = New DevComponents.DotNetBar.SuperTabControlPanel() + Me.Finanzen = New DevComponents.DotNetBar.SuperTabItem() Me.SuperTabControlPanel4 = New DevComponents.DotNetBar.SuperTabControlPanel() - Me.Krankengeschichte1 = New DPM2016.Krankengeschichte() Me.Krankengeschichte = New DevComponents.DotNetBar.SuperTabItem() Me.SuperTabControlPanel6 = New DevComponents.DotNetBar.SuperTabControlPanel() - Me.Recall1 = New DPM2016.Recall() Me.Recall = New DevComponents.DotNetBar.SuperTabItem() - Me.SuperTabControlPanel5 = New DevComponents.DotNetBar.SuperTabControlPanel() - Me.Finanzen1 = New DPM2016.Finanzen() - Me.Finanzen = New DevComponents.DotNetBar.SuperTabItem() Me.MenuStrip1 = New System.Windows.Forms.MenuStrip() Me.DateiToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.BeendenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.Label1 = New System.Windows.Forms.Label() + Me.PatientDetails1 = New DPM2016.PatientDetails() + Me.Behandlung1 = New DPM2016.Behandlung() + Me.PatientAbrechnung1 = New DPM2016.PatientAbrechnung() + Me.Finanzen1 = New DPM2016.Finanzen() + Me.Krankengeschichte1 = New DPM2016.Krankengeschichte() + Me.Recall1 = New DPM2016.Recall() Me.ToolStrip1.SuspendLayout() CType(Me.SuperTabControl1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuperTabControl1.SuspendLayout() Me.SuperTabControlPanel1.SuspendLayout() Me.SuperTabControlPanel3.SuspendLayout() Me.SuperTabControlPanel2.SuspendLayout() + Me.SuperTabControlPanel5.SuspendLayout() Me.SuperTabControlPanel4.SuspendLayout() Me.SuperTabControlPanel6.SuspendLayout() - Me.SuperTabControlPanel5.SuspendLayout() Me.MenuStrip1.SuspendLayout() Me.SuspendLayout() ' @@ -219,9 +220,9 @@ Partial Class Patient Me.SuperTabControl1.Controls.Add(Me.SuperTabControlPanel1) Me.SuperTabControl1.Controls.Add(Me.SuperTabControlPanel3) Me.SuperTabControl1.Controls.Add(Me.SuperTabControlPanel2) + Me.SuperTabControl1.Controls.Add(Me.SuperTabControlPanel5) Me.SuperTabControl1.Controls.Add(Me.SuperTabControlPanel4) Me.SuperTabControl1.Controls.Add(Me.SuperTabControlPanel6) - Me.SuperTabControl1.Controls.Add(Me.SuperTabControlPanel5) Me.SuperTabControl1.Dock = System.Windows.Forms.DockStyle.Fill Me.SuperTabControl1.Location = New System.Drawing.Point(0, 49) Me.SuperTabControl1.Name = "SuperTabControl1" @@ -254,17 +255,6 @@ Partial Class Patient Me.btnVTX.TabIndex = 18 Me.btnVTX.UseVisualStyleBackColor = True ' - 'PatientDetails1 - ' - Me.PatientDetails1.Dock = System.Windows.Forms.DockStyle.Fill - Me.PatientDetails1.HasChanges = False - Me.PatientDetails1.Location = New System.Drawing.Point(0, 0) - Me.PatientDetails1.Name = "PatientDetails1" - Me.PatientDetails1.Patientname = " " - Me.PatientDetails1.PatientNr = 0 - Me.PatientDetails1.Size = New System.Drawing.Size(1278, 612) - Me.PatientDetails1.TabIndex = 17 - ' 'Stammdaten ' Me.Stammdaten.AttachedControl = Me.SuperTabControlPanel1 @@ -282,16 +272,6 @@ Partial Class Patient Me.SuperTabControlPanel3.TabIndex = 0 Me.SuperTabControlPanel3.TabItem = Me.Behandlungen ' - 'Behandlung1 - ' - Me.Behandlung1.Dock = System.Windows.Forms.DockStyle.Fill - Me.Behandlung1.HasChanges = False - Me.Behandlung1.Location = New System.Drawing.Point(0, 0) - Me.Behandlung1.Name = "Behandlung1" - Me.Behandlung1.PatientNr = 0 - Me.Behandlung1.Size = New System.Drawing.Size(1278, 612) - Me.Behandlung1.TabIndex = 0 - ' 'Behandlungen ' Me.Behandlungen.AttachedControl = Me.SuperTabControlPanel3 @@ -305,20 +285,10 @@ Partial Class Patient Me.SuperTabControlPanel2.Dock = System.Windows.Forms.DockStyle.Fill Me.SuperTabControlPanel2.Location = New System.Drawing.Point(0, 25) Me.SuperTabControlPanel2.Name = "SuperTabControlPanel2" - Me.SuperTabControlPanel2.Size = New System.Drawing.Size(1006, 803) + Me.SuperTabControlPanel2.Size = New System.Drawing.Size(1278, 612) Me.SuperTabControlPanel2.TabIndex = 0 Me.SuperTabControlPanel2.TabItem = Me.Abrechnung ' - 'PatientAbrechnung1 - ' - Me.PatientAbrechnung1.Dock = System.Windows.Forms.DockStyle.Fill - Me.PatientAbrechnung1.HasChanges = False - Me.PatientAbrechnung1.Location = New System.Drawing.Point(0, 0) - Me.PatientAbrechnung1.Name = "PatientAbrechnung1" - Me.PatientAbrechnung1.PatientNr = 0 - Me.PatientAbrechnung1.Size = New System.Drawing.Size(1006, 803) - Me.PatientAbrechnung1.TabIndex = 0 - ' 'Abrechnung ' Me.Abrechnung.AttachedControl = Me.SuperTabControlPanel2 @@ -326,25 +296,33 @@ Partial Class Patient Me.Abrechnung.Name = "Abrechnung" Me.Abrechnung.Text = "Abrechnung" ' + 'SuperTabControlPanel5 + ' + Me.SuperTabControlPanel5.Controls.Add(Me.Finanzen1) + 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(1278, 612) + Me.SuperTabControlPanel5.TabIndex = 0 + Me.SuperTabControlPanel5.TabItem = Me.Finanzen + ' + 'Finanzen + ' + Me.Finanzen.AttachedControl = Me.SuperTabControlPanel5 + Me.Finanzen.GlobalItem = False + Me.Finanzen.Name = "Finanzen" + Me.Finanzen.Text = "Finanzen" + ' 'SuperTabControlPanel4 ' Me.SuperTabControlPanel4.Controls.Add(Me.Krankengeschichte1) Me.SuperTabControlPanel4.Dock = System.Windows.Forms.DockStyle.Fill Me.SuperTabControlPanel4.Location = New System.Drawing.Point(0, 25) Me.SuperTabControlPanel4.Name = "SuperTabControlPanel4" - Me.SuperTabControlPanel4.Size = New System.Drawing.Size(1006, 803) + Me.SuperTabControlPanel4.Size = New System.Drawing.Size(1278, 612) Me.SuperTabControlPanel4.TabIndex = 0 Me.SuperTabControlPanel4.TabItem = Me.Krankengeschichte ' - 'Krankengeschichte1 - ' - Me.Krankengeschichte1.Dock = System.Windows.Forms.DockStyle.Fill - Me.Krankengeschichte1.Location = New System.Drawing.Point(0, 0) - Me.Krankengeschichte1.Name = "Krankengeschichte1" - Me.Krankengeschichte1.Patientnr = 0 - Me.Krankengeschichte1.Size = New System.Drawing.Size(1006, 803) - Me.Krankengeschichte1.TabIndex = 0 - ' 'Krankengeschichte ' Me.Krankengeschichte.AttachedControl = Me.SuperTabControlPanel4 @@ -359,19 +337,10 @@ Partial Class Patient Me.SuperTabControlPanel6.Dock = System.Windows.Forms.DockStyle.Fill Me.SuperTabControlPanel6.Location = New System.Drawing.Point(0, 25) Me.SuperTabControlPanel6.Name = "SuperTabControlPanel6" - Me.SuperTabControlPanel6.Size = New System.Drawing.Size(1006, 803) + Me.SuperTabControlPanel6.Size = New System.Drawing.Size(1278, 612) Me.SuperTabControlPanel6.TabIndex = 0 Me.SuperTabControlPanel6.TabItem = Me.Recall ' - 'Recall1 - ' - Me.Recall1.Dock = System.Windows.Forms.DockStyle.Fill - Me.Recall1.Location = New System.Drawing.Point(0, 0) - Me.Recall1.Name = "Recall1" - Me.Recall1.Patientnr = 0 - Me.Recall1.Size = New System.Drawing.Size(1006, 803) - Me.Recall1.TabIndex = 0 - ' 'Recall ' Me.Recall.AttachedControl = Me.SuperTabControlPanel6 @@ -379,32 +348,6 @@ Partial Class Patient Me.Recall.Name = "Recall" Me.Recall.Text = "Recall" ' - 'SuperTabControlPanel5 - ' - Me.SuperTabControlPanel5.Controls.Add(Me.Finanzen1) - 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(1006, 803) - Me.SuperTabControlPanel5.TabIndex = 0 - Me.SuperTabControlPanel5.TabItem = Me.Finanzen - ' - 'Finanzen1 - ' - Me.Finanzen1.Dock = System.Windows.Forms.DockStyle.Fill - Me.Finanzen1.Location = New System.Drawing.Point(0, 0) - Me.Finanzen1.Name = "Finanzen1" - Me.Finanzen1.Patientnr = 0 - Me.Finanzen1.Size = New System.Drawing.Size(1006, 803) - Me.Finanzen1.TabIndex = 0 - ' - 'Finanzen - ' - Me.Finanzen.AttachedControl = Me.SuperTabControlPanel5 - Me.Finanzen.GlobalItem = False - Me.Finanzen.Name = "Finanzen" - Me.Finanzen.Text = "Finanzen" - ' 'MenuStrip1 ' Me.MenuStrip1.AllowMerge = False @@ -428,11 +371,81 @@ Partial Class Patient Me.BeendenToolStripMenuItem.Size = New System.Drawing.Size(120, 22) Me.BeendenToolStripMenuItem.Text = "&Beenden" ' + 'Label1 + ' + Me.Label1.AutoSize = True + Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label1.Location = New System.Drawing.Point(928, 0) + Me.Label1.Name = "Label1" + Me.Label1.Size = New System.Drawing.Size(63, 20) + Me.Label1.TabIndex = 20 + Me.Label1.Text = "Label1" + Me.Label1.TextAlign = System.Drawing.ContentAlignment.TopRight + ' + 'PatientDetails1 + ' + Me.PatientDetails1.Dock = System.Windows.Forms.DockStyle.Fill + Me.PatientDetails1.HasChanges = False + Me.PatientDetails1.Location = New System.Drawing.Point(0, 0) + Me.PatientDetails1.Name = "PatientDetails1" + Me.PatientDetails1.Patientname = "0 " + Me.PatientDetails1.PatientNr = 0 + Me.PatientDetails1.Size = New System.Drawing.Size(1278, 612) + Me.PatientDetails1.TabIndex = 17 + ' + 'Behandlung1 + ' + Me.Behandlung1.Dock = System.Windows.Forms.DockStyle.Fill + Me.Behandlung1.HasChanges = False + Me.Behandlung1.Location = New System.Drawing.Point(0, 0) + Me.Behandlung1.Name = "Behandlung1" + Me.Behandlung1.PatientNr = 0 + Me.Behandlung1.Size = New System.Drawing.Size(1278, 612) + Me.Behandlung1.TabIndex = 0 + ' + 'PatientAbrechnung1 + ' + Me.PatientAbrechnung1.Dock = System.Windows.Forms.DockStyle.Fill + Me.PatientAbrechnung1.HasChanges = False + Me.PatientAbrechnung1.Location = New System.Drawing.Point(0, 0) + Me.PatientAbrechnung1.Name = "PatientAbrechnung1" + Me.PatientAbrechnung1.PatientNr = 0 + Me.PatientAbrechnung1.Size = New System.Drawing.Size(1278, 612) + Me.PatientAbrechnung1.TabIndex = 0 + ' + 'Finanzen1 + ' + Me.Finanzen1.Dock = System.Windows.Forms.DockStyle.Fill + Me.Finanzen1.Location = New System.Drawing.Point(0, 0) + Me.Finanzen1.Name = "Finanzen1" + Me.Finanzen1.Patientnr = 0 + Me.Finanzen1.Size = New System.Drawing.Size(1278, 612) + Me.Finanzen1.TabIndex = 0 + ' + 'Krankengeschichte1 + ' + Me.Krankengeschichte1.Dock = System.Windows.Forms.DockStyle.Fill + Me.Krankengeschichte1.Location = New System.Drawing.Point(0, 0) + Me.Krankengeschichte1.Name = "Krankengeschichte1" + Me.Krankengeschichte1.Patientnr = 0 + Me.Krankengeschichte1.Size = New System.Drawing.Size(1278, 612) + Me.Krankengeschichte1.TabIndex = 0 + ' + 'Recall1 + ' + Me.Recall1.Dock = System.Windows.Forms.DockStyle.Fill + Me.Recall1.Location = New System.Drawing.Point(0, 0) + Me.Recall1.Name = "Recall1" + Me.Recall1.Patientnr = 0 + Me.Recall1.Size = New System.Drawing.Size(1278, 612) + Me.Recall1.TabIndex = 0 + ' 'Patient ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(1278, 686) + Me.Controls.Add(Me.Label1) Me.Controls.Add(Me.SuperTabControl1) Me.Controls.Add(Me.ToolStrip1) Me.Controls.Add(Me.MenuStrip1) @@ -448,9 +461,9 @@ Partial Class Patient Me.SuperTabControlPanel1.ResumeLayout(False) Me.SuperTabControlPanel3.ResumeLayout(False) Me.SuperTabControlPanel2.ResumeLayout(False) + Me.SuperTabControlPanel5.ResumeLayout(False) Me.SuperTabControlPanel4.ResumeLayout(False) Me.SuperTabControlPanel6.ResumeLayout(False) - Me.SuperTabControlPanel5.ResumeLayout(False) Me.MenuStrip1.ResumeLayout(False) Me.MenuStrip1.PerformLayout() Me.ResumeLayout(False) @@ -495,4 +508,5 @@ Partial Class Patient Friend WithEvents ToolStripSeparator1 As ToolStripSeparator Friend WithEvents tsbtnVTX As ToolStripButton Friend WithEvents btnVTX As Button + Friend WithEvents Label1 As Label End Class diff --git a/DPM2016/Patient/Patient.vb b/DPM2016/Patient/Patient.vb index f4e7917..5cde9ea 100644 --- a/DPM2016/Patient/Patient.vb +++ b/DPM2016/Patient/Patient.vb @@ -6,6 +6,7 @@ Return m_nrpatient End Get Set(value As Integer) + Cursor = Cursors.WaitCursor Globals.OnLoad = True m_nrpatient = value Me.PatientDetails1.PatientNr = value @@ -14,7 +15,7 @@ Me.Finanzen1.Patientnr = value Me.Recall1.Patientnr = value Globals.OnLoad = False - + Cursor = Cursors.Default End Set End Property @@ -54,6 +55,11 @@ End Function Private Sub Patient_Load(sender As Object, e As EventArgs) Handles MyBase.Load + Select Case Globals.Funktionsstufe + Case 2 + Me.Behandlungen.Visible = False + Me.Finanzen.Visible = False + End Select Me.tsbtnfirst_Click(sender, e) Dim db As New clsDB If db.Get_Option(9999) = "" Then @@ -85,6 +91,8 @@ Private Sub evh_PatName_Changed(name As String, nr As Integer) Handles evh.PatName_Changed If nr = Me.PatientNr Then Me.Text = name + Me.Label1.Text = PatientDetails1.Patientname + Me.Label1.Left = Me.Width / 2 - 8 - Me.Label1.Width / 2 End Sub Private Sub BeendenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles BeendenToolStripMenuItem.Click @@ -97,13 +105,14 @@ Private Sub evh_PatSaved(Nr As Integer) Handles evh.PatSaved Me.Text = PatientDetails1.Patientname + Me.Label1.Text = PatientDetails1.Patientname End Sub Private Sub tsbtnfirst_Click(sender As Object, e As EventArgs) Handles tsbtnfirst.Click If detail_has_changes() = False Then Return Dim db As New clsDB - db.Get_Tabledata("Patient", "", db.Get_SQL(9)) + db.Get_Tabledata("Patient", "", "Select top 1 * from privat where nrprivat>0 order by name, vorname, ort,nrprivat") Me.PatientNr = db.dsDaten.Tables(0).Rows(0).Item(0) db.Dispose() End Sub @@ -118,26 +127,46 @@ Private Sub tsbtnnext_Click(sender As Object, e As EventArgs) Handles tsbtnnext.Click If detail_has_changes() = False Then Return + Dim xx As Integer = 0 Dim db As New clsDB Try - db.Get_Tabledata("Patient", "", db.Get_SQL(11), Me.m_nrpatient.ToString) + Me.Cursor = Cursors.WaitCursor + db.Get_Tabledata("Patient", "", "select * from privat where nrprivat=" + Me.PatientNr.ToString) + Dim searchstring As String = "" + searchstring = searchstring + db.dsDaten.Tables(0).Rows(0).Item("Name").ToString + searchstring = searchstring + db.dsDaten.Tables(0).Rows(0).Item("Vorname").ToString + searchstring = searchstring + db.dsDaten.Tables(0).Rows(0).Item("ort").ToString + db.Get_Tabledata("Patient", "", "Select top 1 * from privat where name <>'' and nrprivat>0 and name+vorname+ort>='" + searchstring + "' and nrprivat<>" + Me.PatientNr.ToString + " order by name, vorname, ort, nrprivat") + ' db.Get_Tabledata("Patient", "", db.Get_SQL(11), Me.m_nrpatient.ToString) Me.PatientNr = db.dsDaten.Tables(0).Rows(0).Item(0) - Catch + Catch ex As Exception + 'MsgBox(ex.Message) Me.PatientNr = Me.PatientNr End Try db.Dispose() + Me.Cursor = Cursors.Default End Sub Private Sub tsbtprev_Click(sender As Object, e As EventArgs) Handles tsbtprev.Click If detail_has_changes() = False Then Return + Dim xx As Integer = 0 Dim db As New clsDB Try - db.Get_Tabledata("Patient", "", db.Get_SQL(12), Me.m_nrpatient.ToString) + Me.Cursor = Cursors.WaitCursor + db.Get_Tabledata("Patient", "", "select * from privat where nrprivat=" + Me.PatientNr.ToString) + Dim searchstring As String = "" + searchstring = searchstring + db.dsDaten.Tables(0).Rows(0).Item("Name").ToString + searchstring = searchstring + db.dsDaten.Tables(0).Rows(0).Item("Vorname").ToString + searchstring = searchstring + db.dsDaten.Tables(0).Rows(0).Item("ort").ToString + db.Get_Tabledata("Patient", "", "Select top 1 * from privat where name <>'' and nrprivat>0 and name+vorname+ort<='" + searchstring + "' and nrprivat<>" + Me.PatientNr.ToString + " order by name desc, vorname desc, ort desc , nrprivat desc") + ' db.Get_Tabledata("Patient", "", db.Get_SQL(11), Me.m_nrpatient.ToString) Me.PatientNr = db.dsDaten.Tables(0).Rows(0).Item(0) - Catch + Catch ex As Exception + 'MsgBox(ex.Message) Me.PatientNr = Me.PatientNr End Try db.Dispose() + Me.Cursor = Cursors.Default End Sub Private Sub ToolStripButton1_Click(sender As Object, e As EventArgs) Handles tsbtnnew.Click @@ -219,7 +248,7 @@ PrintLine(1, "ERRORTEXT=0") FileClose(1) Try - MsgBox(vddsmodule + " " + filename) + ' MsgBox(vddsmodule + " " + filename) Process.Start(vddsmodule, filename) Catch End Try @@ -229,4 +258,12 @@ Private Sub tnVTX_Click(sender As Object, e As EventArgs) Handles btnVTX.Click Me.tsbtnVTX_Click(sender, e) End Sub + + Private Sub Patient_Resize(sender As Object, e As EventArgs) Handles Me.Resize + Me.Label1.Left = Me.Width / 2 - 8 - Me.Label1.Width / 2 + End Sub + + Private Sub ToolStrip1_ItemClicked(sender As Object, e As ToolStripItemClickedEventArgs) Handles ToolStrip1.ItemClicked + + End Sub End Class \ No newline at end of file diff --git a/DPM2016/Patient/PatientDetails.Designer.vb b/DPM2016/Patient/PatientDetails.Designer.vb index 0c9f8fb..1ec3aaa 100644 --- a/DPM2016/Patient/PatientDetails.Designer.vb +++ b/DPM2016/Patient/PatientDetails.Designer.vb @@ -77,17 +77,17 @@ Partial Class PatientDetails Me.dtgebdat = New System.Windows.Forms.DateTimePicker() Me.dtGueltigab = New System.Windows.Forms.DateTimePicker() Me.dtgueltigbis = New System.Windows.Forms.DateTimePicker() - Me.cbboxNRArbeitgeber = New DPM2016.MyCombobox() - Me.cbboxNrGeschlecht = New DPM2016.MyCombobox() - Me.cbboxSprache = New DPM2016.MyCombobox() - Me.cbboxStatus = New DPM2016.MyCombobox() - Me.cbboxNRTitel = New DPM2016.MyCombobox() - Me.cbboxNrAnrede = New DPM2016.MyCombobox() Me.Label3 = New System.Windows.Forms.Label() Me.cbtxtboxKanton = New System.Windows.Forms.ComboBox() Me.lblGLN = New System.Windows.Forms.Label() Me.txtGLN = New System.Windows.Forms.TextBox() Me.txtZSR = New System.Windows.Forms.TextBox() + Me.cbboxNRArbeitgeber = New DPM2016.MyCombobox() + Me.cbboxGeschlecht = New DPM2016.MyCombobox() + Me.cbboxSprache = New DPM2016.MyCombobox() + Me.cbboxStatus = New DPM2016.MyCombobox() + Me.cbboxNRTitel = New DPM2016.MyCombobox() + Me.cbboxNrAnrede = New DPM2016.MyCombobox() Me.SuspendLayout() ' 'txtnrprivat @@ -578,6 +578,49 @@ Partial Class PatientDetails Me.dtgueltigbis.Size = New System.Drawing.Size(162, 20) Me.dtgueltigbis.TabIndex = 28 ' + 'Label3 + ' + Me.Label3.AutoSize = True + Me.Label3.BackColor = System.Drawing.Color.Transparent + Me.Label3.Location = New System.Drawing.Point(3, 225) + Me.Label3.Name = "Label3" + Me.Label3.Size = New System.Drawing.Size(41, 13) + Me.Label3.TabIndex = 208 + Me.Label3.Text = "Kanton" + ' + 'cbtxtboxKanton + ' + Me.cbtxtboxKanton.FormattingEnabled = True + Me.cbtxtboxKanton.Items.AddRange(New Object() {"AG", "AR", "AI", "BL", "BS", "BE", "FR", "GE", "GL", "GR", "JU", "LU", "NE", "NW", "OW", "SG", "SH", "SZ", "SO", "TG", "TI", "UR", "VD", "VS", "ZG", "ZH"}) + Me.cbtxtboxKanton.Location = New System.Drawing.Point(74, 221) + Me.cbtxtboxKanton.Name = "cbtxtboxKanton" + Me.cbtxtboxKanton.Size = New System.Drawing.Size(162, 21) + Me.cbtxtboxKanton.TabIndex = 9 + ' + 'lblGLN + ' + Me.lblGLN.AutoSize = True + Me.lblGLN.BackColor = System.Drawing.Color.Transparent + Me.lblGLN.Location = New System.Drawing.Point(272, 174) + Me.lblGLN.Name = "lblGLN" + Me.lblGLN.Size = New System.Drawing.Size(56, 13) + Me.lblGLN.TabIndex = 210 + Me.lblGLN.Text = "GLN/ZSR" + ' + 'txtGLN + ' + Me.txtGLN.Location = New System.Drawing.Point(342, 171) + Me.txtGLN.Name = "txtGLN" + Me.txtGLN.Size = New System.Drawing.Size(107, 20) + Me.txtGLN.TabIndex = 23 + ' + 'txtZSR + ' + Me.txtZSR.Location = New System.Drawing.Point(455, 171) + Me.txtZSR.Name = "txtZSR" + Me.txtZSR.Size = New System.Drawing.Size(49, 20) + Me.txtZSR.TabIndex = 24 + ' 'cbboxNRArbeitgeber ' Me.cbboxNRArbeitgeber.Dataselection = Nothing @@ -590,17 +633,17 @@ Partial Class PatientDetails Me.cbboxNRArbeitgeber.TableAlias = "" Me.cbboxNRArbeitgeber.Valuemember = Nothing ' - 'cbboxNrGeschlecht + 'cbboxGeschlecht ' - Me.cbboxNrGeschlecht.Dataselection = Nothing - Me.cbboxNrGeschlecht.Displaymember = Nothing - Me.cbboxNrGeschlecht.Location = New System.Drawing.Point(74, 405) - Me.cbboxNrGeschlecht.Name = "cbboxNrGeschlecht" - Me.cbboxNrGeschlecht.Size = New System.Drawing.Size(162, 21) - Me.cbboxNrGeschlecht.TabIndex = 16 - Me.cbboxNrGeschlecht.Table = Nothing - Me.cbboxNrGeschlecht.TableAlias = "" - Me.cbboxNrGeschlecht.Valuemember = Nothing + Me.cbboxGeschlecht.Dataselection = Nothing + Me.cbboxGeschlecht.Displaymember = Nothing + Me.cbboxGeschlecht.Location = New System.Drawing.Point(74, 405) + Me.cbboxGeschlecht.Name = "cbboxGeschlecht" + Me.cbboxGeschlecht.Size = New System.Drawing.Size(162, 21) + Me.cbboxGeschlecht.TabIndex = 16 + Me.cbboxGeschlecht.Table = Nothing + Me.cbboxGeschlecht.TableAlias = "" + Me.cbboxGeschlecht.Valuemember = Nothing ' 'cbboxSprache ' @@ -650,49 +693,6 @@ Partial Class PatientDetails Me.cbboxNrAnrede.TableAlias = "" Me.cbboxNrAnrede.Valuemember = Nothing ' - 'Label3 - ' - Me.Label3.AutoSize = True - Me.Label3.BackColor = System.Drawing.Color.Transparent - Me.Label3.Location = New System.Drawing.Point(3, 225) - Me.Label3.Name = "Label3" - Me.Label3.Size = New System.Drawing.Size(41, 13) - Me.Label3.TabIndex = 208 - Me.Label3.Text = "Kanton" - ' - 'cbtxtboxKanton - ' - Me.cbtxtboxKanton.FormattingEnabled = True - Me.cbtxtboxKanton.Items.AddRange(New Object() {"AG", "AR", "AI", "BL", "BS", "BE", "FR", "GE", "GL", "GR", "JU", "LU", "NE", "NW", "OW", "SG", "SH", "SZ", "SO", "TG", "TI", "UR", "VD", "VS", "ZG", "ZH"}) - Me.cbtxtboxKanton.Location = New System.Drawing.Point(74, 221) - Me.cbtxtboxKanton.Name = "cbtxtboxKanton" - Me.cbtxtboxKanton.Size = New System.Drawing.Size(162, 21) - Me.cbtxtboxKanton.TabIndex = 9 - ' - 'lblGLN - ' - Me.lblGLN.AutoSize = True - Me.lblGLN.BackColor = System.Drawing.Color.Transparent - Me.lblGLN.Location = New System.Drawing.Point(272, 174) - Me.lblGLN.Name = "lblGLN" - Me.lblGLN.Size = New System.Drawing.Size(56, 13) - Me.lblGLN.TabIndex = 210 - Me.lblGLN.Text = "GLN/ZSR" - ' - 'txtGLN - ' - Me.txtGLN.Location = New System.Drawing.Point(342, 171) - Me.txtGLN.Name = "txtGLN" - Me.txtGLN.Size = New System.Drawing.Size(107, 20) - Me.txtGLN.TabIndex = 23 - ' - 'txtZSR - ' - Me.txtZSR.Location = New System.Drawing.Point(455, 171) - Me.txtZSR.Name = "txtZSR" - Me.txtZSR.Size = New System.Drawing.Size(49, 20) - Me.txtZSR.TabIndex = 24 - ' 'PatientDetails ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -703,7 +703,7 @@ Partial Class PatientDetails Me.Controls.Add(Me.cbtxtboxKanton) Me.Controls.Add(Me.Label3) Me.Controls.Add(Me.cbboxNRArbeitgeber) - Me.Controls.Add(Me.cbboxNrGeschlecht) + Me.Controls.Add(Me.cbboxGeschlecht) Me.Controls.Add(Me.cbboxSprache) Me.Controls.Add(Me.cbboxStatus) Me.Controls.Add(Me.cbboxNRTitel) @@ -828,7 +828,7 @@ Partial Class PatientDetails Friend WithEvents cbboxNRTitel As DPM2016.MyCombobox Friend WithEvents cbboxStatus As DPM2016.MyCombobox Friend WithEvents cbboxSprache As DPM2016.MyCombobox - Friend WithEvents cbboxNrGeschlecht As DPM2016.MyCombobox + Friend WithEvents cbboxGeschlecht As DPM2016.MyCombobox Friend WithEvents cbboxNRArbeitgeber As DPM2016.MyCombobox Friend WithEvents Label3 As Label Friend WithEvents cbtxtboxKanton As ComboBox diff --git a/DPM2016/Patient/PatientDetails.vb b/DPM2016/Patient/PatientDetails.vb index c6d9ce7..296af64 100644 --- a/DPM2016/Patient/PatientDetails.vb +++ b/DPM2016/Patient/PatientDetails.vb @@ -222,9 +222,9 @@ Public Class PatientDetails Me.cbboxStatus.Displaymember = "Status" Me.cbboxStatus.Valuemember = "nrstatus" - Me.cbboxNrGeschlecht.Table = "Geschlecht" - Me.cbboxNrGeschlecht.Displaymember = "Geschlecht" - Me.cbboxNrGeschlecht.Valuemember = "NrGeschlecht" + Me.cbboxGeschlecht.Table = "Geschlecht" + Me.cbboxGeschlecht.Displaymember = "Geschlecht" + Me.cbboxGeschlecht.Valuemember = "NrGeschlecht" Me.cbboxNRArbeitgeber.Dataselection = DB.Get_SQL(1) Me.cbboxNRArbeitgeber.Table = "Arbeitgeber" @@ -284,11 +284,23 @@ Public Class PatientDetails log.Writelog("--Partnerdtails: Get_Data: " + Ctl.Name + " " + c.ColumnName, clsLog.Logtype.Information) Dim dt As DateTimePicker dt = Ctl + 'Try + ' dt.Value = r(c.ColumnName) + 'Catch + ' dt.Value = " . . " + 'End Try + Try dt.Value = r(c.ColumnName) + dt.Format = DateTimePickerFormat.Short Catch + + dt.CustomFormat = " " 'An empty SPACE + dt.Format = DateTimePickerFormat.Custom + End Try + Exit For End If Next @@ -467,4 +479,12 @@ Public Class PatientDetails Private Sub txtPLZ_Leave(sender As Object, e As EventArgs) Handles txtPLZ.Leave If Me.txtOrt.Text = "" Then IntTables.Get_Ort_Kantton(Me.txtPLZ.Text, Me.txtOrt, Me.cbtxtboxKanton) End Sub + + Private Sub PatientDetails_Load(sender As Object, e As EventArgs) Handles MyBase.Load + + End Sub + + Private Sub cbboxNrAnrede_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cbboxNrAnrede.SelectedIndexChanged + If Me.cbboxNrAnrede.Text = "Herr" Then Me.cbboxGeschlecht.SelectedValue = 2 Else Me.cbboxGeschlecht.SelectedValue = 1 + End Sub End Class diff --git a/DPM2016/Reporting/frmReportView.vb b/DPM2016/Reporting/frmReportView.vb index fbe6d5f..7f3cf20 100644 --- a/DPM2016/Reporting/frmReportView.vb +++ b/DPM2016/Reporting/frmReportView.vb @@ -1,4 +1,8 @@ -Public Class frmReportView +Imports Syncfusion.DocToPDFConverter +Imports Syncfusion.Pdf +Imports Syncfusion.XPS + +Public Class frmReportView Dim splitter() As String Dim WithEvents freport As FastReport.Report @@ -28,12 +32,14 @@ Dim dbr As DataRow = paramdaten.NewRow Dim db As New clsDB - Public Sub Fakturierung(ByVal reportnr As String, ByVal nrbehandlung As Integer, ByVal Parameter As String, ByVal rate As Integer, Optional kopie As Integer = 0, Optional fakturanr As Integer = 0) + Public Sub Fakturierung(ByVal reportnr As String, ByVal nrbehandlung As Integer, ByVal Parameter As String, ByVal rate As Integer, Optional kopie As Integer = 0, Optional fakturanr As Integer = 0, Optional buchen As Boolean = True) Me.ReportNr = reportnr Me.Parameter = Parameter Me.NrBehandlung = nrbehandlung + If Globals.FakturaNr <> 0 Then fakturanr = Globals.FakturaNr Print_Rechnung(False, False, rate, kopie, fakturanr) If kopie = 1 Then Exit Sub + If buchen = False Then Exit Sub rechnung_buchen(rate, daten.Tables("ESDaten").Rows(0).Item("Nur_Franken") + daten.Tables("ESDaten").Rows(0).Item("Nur_Rappen") / 100) End Sub @@ -45,10 +51,10 @@ Public Sub Print_Rechnung(Optional vorschaue As Boolean = False, Optional design As Boolean = False, Optional Rate As Integer = 0, Optional kopie As Integer = 0, Optional Fakturanr As Integer = 0) If Rate > 1 Then ReportNr = ReportNr + 1 - + Dim kopien As Integer = 1 db.Get_Tabledata("Auswertung", "where Auswertungnr=" + Me.ReportNr.ToString) - + kopien = db.dsDaten.Tables(0).Rows(0).Item("Kopien") freport = New FastReport.Report Dim FILENAME As String = db.get_reportdata(Me.ReportNr, Parameter) @@ -165,6 +171,7 @@ get_esdaten(Rate, kopie, Fakturanr) daten.Tables.Add(db.dsDaten.Tables(0).Copy) + Globals.FakturaNr = db.dsDaten.Tables(0).Rows(0).Item("fakturanr") daten.Tables(daten.Tables.Count - 1).TableName = "ESDaten" @@ -197,14 +204,22 @@ Dim papierschacht As String printer.Get_Printersettings(ReportNr, printername, papierschacht) freport.PrintSettings.Printer = printername + freport.PrintSettings.Copies = kopien Try freport.PrintSettings.PaperSource = papierschacht Catch End Try + + freport.PrintSettings.ShowDialog = False freport.Print() - Dim s As String = My.Settings.DocArchivPath + "\" + Now.ToString("yyyyddMMhhmmss_" + Me.NrBehandlung.ToString + ".pdf") + Exit Sub + Dim s As String = My.Settings.DocArchivPath + "\" + Now.ToString("yyyyddMMhhmmss") + "_" + Me.NrBehandlung.ToString + Dim xpsfilename As String = s + ".xps" + Dim pdffilename As String = s + ".pdf" + Dim imagefilename As String = s + ".jpg" + Dim rtffilename As String = s + ".rtf" 'Dim pdfExport As New FastReport.Export.Pdf.PDFExport() 'pdfExport.ShowProgress = False @@ -213,7 +228,48 @@ 'pdfExport.Compressed = False 'pdfExport.AllowPrint = True 'pdfExport.EmbeddingFonts = True - 'freport.Export(pdfExport, s) + + 'freport.Prepare() + 'freport.Export(pdfExport, s + ".PDF") + 'Exit Sub + + Dim XPSEXPORT As New FastReport.Export.OoXML.XPSExport + freport.Export(XPSEXPORT, xpsfilename) + 'Process.Start(Application.StartupPath + "\xpstopdf.exe", "-input=" + xpsfilename) + Dim p As New ProcessStartInfo + p.Arguments = xpsfilename + p.FileName = Application.StartupPath + "\topdf.bat" + p.WindowStyle = ProcessWindowStyle.Hidden + Process.Start(p) + Globals.RGCollection.Add(pdffilename) + + 'Dim rtfexport As New FastReport.Export.RichText.RTFExport + 'freport.Export(rtfexport, rtffilename) + 'Dim rtfDocument As New Syncfusion.DocIO.DLS.WordDocument(rtffilename) + 'Dim converter As New DocToPDFConverter() + 'Dim pdfDocument As PdfDocument = converter.ConvertToPDF(rtfDocument) + 'pdfDocument.Save(pdffilename) + 'pdfDocument.Close(True) + 'rtfDocument.Close() + + 'Dim imgexport As New FastReport.Export.Image.ImageExport + 'imgexport.ImageFormat = FastReport.Export.Image.ImageExportFormat.Jpeg + 'imgexport.ResolutionX = 300 + 'imgexport.Resolution = 300 + 'freport.Export(imgexport, imagefilename) + + + + + 'Dim xexport As New FastReport.Export.Image.ImageExport + 'xexport.ImageFormat = FastReport.Export.Image.ImageExportFormat.Tiff + 'xexport.ResolutionX = 300 + 'xexport.ResolutionY = 300 + 'freport.Prepare() + 'freport.Export(xexport, s + ".TIF") + + + End If End Sub @@ -254,7 +310,7 @@ s = db.dsDaten.Tables(0).Rows(0).Item("Nur_Franken").ToString S1 = db.dsDaten.Tables(0).Rows(0).Item("Nur_Rappen").ToString While Len(S1) < 2 - S1 = S1 + "0" + S1 = "0" + S1 End While s = s + S1 While Len(s) < 10 @@ -266,23 +322,28 @@ s = db.dsDaten.Tables(0).Rows(0).Item("vs_besrid").ToString + db.dsDaten.Tables(0).Rows(0).Item("fakturanr").ToString + "0000" Dim dd As String - dd = Year(Now).ToString - dd = dd.Substring(0, 2) - s = s + dd - dd = Month(Now).ToString + dd = DatePart(DateInterval.Day, Now) While Len(dd) < 2 dd = "0" + dd End While s = s + dd - dd = DatePart(DateInterval.Day, Now) - + dd = DatePart(DateInterval.Month, Now) While Len(dd) < 2 dd = "0" + dd End While + s = s + dd + dd = Year(Now).ToString + dd = dd.Substring(2, 2) + s = s + dd s = s + Trim(Pruefziffer(s)) - Referenznr = Referenznr + "+" + s - db.dsDaten.Tables(0).Rows(0).Item("referenzzeile1") = s + " " + Dim ref1 As String + ref1 = s.Substring(0, 2) + " " + s.Substring(2, 5) + " " + s.Substring(7, 5) + " " + s.Substring(12, 5) + " " + s.Substring(17, 5) + " " + s.Substring(22, 5) + + Referenznr = Referenznr + s + "+" + + db.dsDaten.Tables(0).Rows(0).Item("referenzzeile1") = ref1 + s = db.dsDaten.Tables(0).Rows(0).Item("Vs_teilnehmernummer") s = s + Trim(Pruefziffer(s)) + ">" Referenznr = Referenznr + " " + s diff --git a/DPM2016/Sysadmin/frmAuswertungen.Designer.vb b/DPM2016/Sysadmin/frmAuswertungen.Designer.vb index 91a78dc..5ea0ddb 100644 --- a/DPM2016/Sysadmin/frmAuswertungen.Designer.vb +++ b/DPM2016/Sysadmin/frmAuswertungen.Designer.vb @@ -1,9 +1,9 @@ - _ + Partial Class frmAuswertungen Inherits System.Windows.Forms.Form 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. - _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) Try If disposing AndAlso components IsNot Nothing Then @@ -20,9 +20,10 @@ Partial Class frmAuswertungen 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. - _ + Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() + Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmAuswertungen)) 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() @@ -39,18 +40,21 @@ Partial Class frmAuswertungen 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 resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmAuswertungen)) Me.MenuStrip1 = New System.Windows.Forms.MenuStrip() Me.DateiToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.SchliessenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStrip1 = New System.Windows.Forms.ToolStrip() + Me.ToolStripButton5 = New System.Windows.Forms.ToolStripButton() + Me.ToolStripButton6 = New System.Windows.Forms.ToolStripButton() + Me.ToolStripLabel1 = New System.Windows.Forms.ToolStripLabel() + Me.cbboxprinter = New System.Windows.Forms.ToolStripComboBox() + Me.ToolStripButton1 = New System.Windows.Forms.ToolStripButton() + Me.ToolStripButton2 = New System.Windows.Forms.ToolStripButton() Me.C1Auswertungen = New C1.Win.C1TrueDBGrid.C1TrueDBGrid() Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.BearbeitenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.C1TrueDBDropdown1 = New C1.Win.C1TrueDBGrid.C1TrueDBDropdown() Me.C1TrueDBDropdown2 = New C1.Win.C1TrueDBGrid.C1TrueDBDropdown() - Me.ToolStripButton5 = New System.Windows.Forms.ToolStripButton() - Me.ToolStripButton6 = New System.Windows.Forms.ToolStripButton() Me.MenuStrip1.SuspendLayout() Me.ToolStrip1.SuspendLayout() CType(Me.C1Auswertungen, System.ComponentModel.ISupportInitialize).BeginInit() @@ -83,13 +87,60 @@ Partial Class frmAuswertungen ' 'ToolStrip1 ' - Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripButton5, Me.ToolStripButton6}) + Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripButton5, Me.ToolStripButton6, Me.ToolStripLabel1, Me.cbboxprinter, Me.ToolStripButton1, Me.ToolStripButton2}) Me.ToolStrip1.Location = New System.Drawing.Point(0, 24) Me.ToolStrip1.Name = "ToolStrip1" Me.ToolStrip1.Size = New System.Drawing.Size(772, 25) Me.ToolStrip1.TabIndex = 16 Me.ToolStrip1.Text = "ToolStrip1" ' + 'ToolStripButton5 + ' + Me.ToolStripButton5.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image + Me.ToolStripButton5.Image = CType(resources.GetObject("ToolStripButton5.Image"), System.Drawing.Image) + Me.ToolStripButton5.ImageTransparentColor = System.Drawing.Color.Magenta + Me.ToolStripButton5.Name = "ToolStripButton5" + Me.ToolStripButton5.Size = New System.Drawing.Size(23, 22) + Me.ToolStripButton5.Text = "ToolStripButton5" + ' + 'ToolStripButton6 + ' + Me.ToolStripButton6.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image + Me.ToolStripButton6.Image = CType(resources.GetObject("ToolStripButton6.Image"), System.Drawing.Image) + Me.ToolStripButton6.ImageTransparentColor = System.Drawing.Color.Magenta + Me.ToolStripButton6.Name = "ToolStripButton6" + Me.ToolStripButton6.Size = New System.Drawing.Size(23, 22) + Me.ToolStripButton6.Text = "ToolStripButton6" + ' + 'ToolStripLabel1 + ' + Me.ToolStripLabel1.Name = "ToolStripLabel1" + Me.ToolStripLabel1.Size = New System.Drawing.Size(100, 22) + Me.ToolStripLabel1.Text = "Standard-Drucker" + ' + 'cbboxprinter + ' + Me.cbboxprinter.Name = "cbboxprinter" + Me.cbboxprinter.Size = New System.Drawing.Size(300, 25) + ' + 'ToolStripButton1 + ' + Me.ToolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image + Me.ToolStripButton1.Image = CType(resources.GetObject("ToolStripButton1.Image"), System.Drawing.Image) + Me.ToolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta + Me.ToolStripButton1.Name = "ToolStripButton1" + Me.ToolStripButton1.Size = New System.Drawing.Size(23, 22) + Me.ToolStripButton1.Text = "DruckerKonfiguration speichern" + ' + 'ToolStripButton2 + ' + Me.ToolStripButton2.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image + Me.ToolStripButton2.Image = CType(resources.GetObject("ToolStripButton2.Image"), System.Drawing.Image) + Me.ToolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta + Me.ToolStripButton2.Name = "ToolStripButton2" + Me.ToolStripButton2.Size = New System.Drawing.Size(23, 22) + Me.ToolStripButton2.Text = "ToolStripButton2" + ' 'C1Auswertungen ' Me.C1Auswertungen.AlternatingRows = True @@ -179,24 +230,6 @@ Partial Class frmAuswertungen Me.C1TrueDBDropdown2.Visible = False Me.C1TrueDBDropdown2.PropBag = resources.GetString("C1TrueDBDropdown2.PropBag") ' - 'ToolStripButton5 - ' - Me.ToolStripButton5.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.ToolStripButton5.Image = CType(resources.GetObject("ToolStripButton5.Image"), System.Drawing.Image) - Me.ToolStripButton5.ImageTransparentColor = System.Drawing.Color.Magenta - Me.ToolStripButton5.Name = "ToolStripButton5" - Me.ToolStripButton5.Size = New System.Drawing.Size(23, 22) - Me.ToolStripButton5.Text = "ToolStripButton5" - ' - 'ToolStripButton6 - ' - Me.ToolStripButton6.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.ToolStripButton6.Image = CType(resources.GetObject("ToolStripButton6.Image"), System.Drawing.Image) - Me.ToolStripButton6.ImageTransparentColor = System.Drawing.Color.Magenta - Me.ToolStripButton6.Name = "ToolStripButton6" - Me.ToolStripButton6.Size = New System.Drawing.Size(23, 22) - Me.ToolStripButton6.Text = "ToolStripButton6" - ' 'frmAuswertungen ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -235,4 +268,8 @@ Partial Class frmAuswertungen Friend WithEvents C1TrueDBDropdown2 As C1.Win.C1TrueDBGrid.C1TrueDBDropdown Friend WithEvents ToolStripButton5 As ToolStripButton Friend WithEvents ToolStripButton6 As ToolStripButton + Friend WithEvents ToolStripLabel1 As ToolStripLabel + Friend WithEvents cbboxprinter As ToolStripComboBox + Friend WithEvents ToolStripButton1 As ToolStripButton + Friend WithEvents ToolStripButton2 As ToolStripButton End Class diff --git a/DPM2016/Sysadmin/frmAuswertungen.resx b/DPM2016/Sysadmin/frmAuswertungen.resx index e3478ff..9156ca4 100644 --- a/DPM2016/Sysadmin/frmAuswertungen.resx +++ b/DPM2016/Sysadmin/frmAuswertungen.resx @@ -127,209 +127,239 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAK2SURBVDhPnZLdS1NhHMcfCPoDuummi+i6qwYWZZjb3Obx - 7MzN1dY5Z9tJZ84Mi95AK3vXNC0L7c1hKiVFpVZKafaiaKgoZSHViuoiuuiFIoguCj4dNRa7tB984Pk9 - 8Hx4vr/nEf9TX14OBj+/nfjVujODv1uzdbkip6vjQA5dh6aRknQelLiy186D+FY+TfXycfIW318NcKnM - mirorJBZtsLO8lU2Vqz+R9oqK0st6fxI9JLo2sd4o5+viYdc3uNIFXSUy2RYndjsEnaHK4k1y0lauo0X - rRHGz+uMng7y6dkdru3PThU46gVS1Tyy7T4kl4KU7UaSZFwumdVWiakWg9GzIR41BPkw3jkT9e9RIWxH - BYkPbThNSU6mhtsZQJH8KLIX2e0h0+HmaTzMcKPOQP163g6101OpzApsVYLJd020DAgyKgX2OoHzlEAu - X4hXCeLJ9ZOV42PivMbASZ0ftxfzvL+ZO9VehKtGMPKmkviwoGnIXL8uYOxNhMfvwzOStZ4weXlBJE+A - sdMq909o/OxdwrOeRvrr/LOCe4kdxCcE8XFB81NBy5TgybcIjpOCYF4B6wIh3Hkaww0B+o8Hadrh5HHn - UR7WB2YiWOxmhO7nhbQlBJnTEY4JHCcEuXsXoatRVN3AFzQYrPfTV7uW6wcURtorGGpQk0O0ZFULul77 - cB4XGIFtGFoJRrgIw4gSMfIJhKLcr/Nyu8ZHd5WXwQvbGT0TSnlGi9O8slIzn6hRSrSgmIJo0Qz5JtqG - GHdrPHRX5nLjsIfexhgTTZEUgWgtWcnG4hKKY1so3rQ5Scwkv6iUvmqZm0cUOg65uVkbYrI5H6HrOroW - QtPCqOo05lrVzF5Nopr9uvU6u2IBLlYo5g+UuXowl6m2wtkhzpVyPa3s3O41v19ejKVGmEMtMFkmhLD8 - AXVKwo8FvT+zAAAAAElFTkSuQmCC + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAK1SURBVDhPnZLfS1NhGMdfCPoDuummi+i6qwYWWYnb3Obx + 7MzN1dY5Z9tJV86Min5BlpZWmpZloRk6TMWkqNTKMMt+KBoZSllIuUK7iC6SKILoouDTUWOxy3rgA+/z + wvvh/T7vK/6nPk8NBT/NjP9s25/Bn62FulKW09NVnkPPsTmkJN0VEldL7TyK72Z2sp9PE7f59naQywet + qYLuMplVa+ysTrexZv1f0tKtrLSs43uin0TPEcYa/HxJPObKYUeqoKtEJsPqxGaXsDtcSaxZTtLW2XjT + FmGsSWf0QpDZV3e5fjQ7VeCoE0hVi8i2+5BcClK2G0mScblk1lslJlsNRi+GeFIf5ONY93zUP0eFsJ0U + JD624zQlOZkabmcARfKjyF5kt4dMh5uX8TAjDTqDdZuZGe7kTqWyILBVCSbeN9M6KMioFNhrBc7zArlk + KV4liCfXT1aOj/EmjcFzOt/7lvN6oIW71V6Eq0bwdLqS+Iigedhcvyvg2XSE5x/C85KNnjB5eUEkT4Bn + F1QentX40b+CV3caGKj1LwgeJPYRHxfExwQtLwWtk4IXXyM4zgmCeQVsCoRw52mM1AcYOBOkeZ+T590n + eVwXmI9gsZsRel9vpT0hyJyLcErgOCvILV2GrkZRdQNf0GCozs+90xu5Ua7wtLOM4Xo1OURLVrWg550P + 5xmBEdiDoRVjhAsxjCgRI59AKMrDWi99NT56q7wMXdrLaGMo5RktTvPKSs1iosZOogVFFEQL58k30bbE + uF/jobcyl5vHPfQ3xBhvjqQIRFvxWrYVFVMU20XR9h1JYib5hTu5Vy1z64RC1zE3t06HmGjJR+i6jq6F + 0LQwqjqHuVY1s1eTqGa/abPOgViAjjLF/IEy1ypymWzfujDEf6VETzvYeGjDr6mOWGqEf6glJquEEJbf + bHzCicLnpnMAAAAASUVORK5CYII= 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 + wRBvDQAAAABJRU5ErkJggg== + + + + + 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== @@ -372,7 +402,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" 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, 770, 398</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, 770, 398</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" 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, 770, 398</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, 770, 398</ClientArea><PrintPageHeaderStyle parent="" me="Style15" /><PrintPageFooterStyle parent="" me="Style16" /></Blob> @@ -382,7 +412,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, 326, 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, 326, 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{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, 326, 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, 326, 148</ClientArea></Blob> @@ -392,7 +422,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;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, 309, 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, 309, 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, 309, 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, 309, 148</ClientArea></Blob> diff --git a/DPM2016/Sysadmin/frmAuswertungen.vb b/DPM2016/Sysadmin/frmAuswertungen.vb index 9d21406..e742606 100644 --- a/DPM2016/Sysadmin/frmAuswertungen.vb +++ b/DPM2016/Sysadmin/frmAuswertungen.vb @@ -1,13 +1,24 @@ Imports C1.Win.C1TrueDBGrid +Imports System.Drawing.Printing +Imports System.IO Public Class frmAuswertungen Dim db As New clsDB + Dim WithEvents evh As Generic_Event_Handler = Globals.EVH Private Sub SchliessenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles SchliessenToolStripMenuItem.Click Me.Close() End Sub Private Sub frmAuswertungen_Load(sender As Object, e As EventArgs) Handles MyBase.Load + + For Each existing_printer As String In PrinterSettings.InstalledPrinters + Me.cbboxprinter.Items.Add(existing_printer) + Next existing_printer + Dim oPS As New System.Drawing.Printing.PrinterSettings + For i = 0 To cbboxprinter.Items.Count - 1 + If cbboxprinter.Items(i) = oPS.PrinterName Then cbboxprinter.SelectedItem = oPS.PrinterName + Next Dim dt As New DataTable db.Get_Tabledata("Auswertung") dt = db.dsDaten.Tables(0).Copy @@ -21,6 +32,10 @@ Public Class frmAuswertungen Me.C1TrueDBDropdown1.ValueMember = printer.Printers.Columns(0).ColumnName Me.C1TrueDBDropdown1.DisplayMember = printer.Printers.Columns(0).ColumnName Me.C1Auswertungen.Columns("Drucker").DropDown = Me.C1TrueDBDropdown1 + Me.C1TrueDBDropdown1.DisplayColumns(0).AutoSize() + + Dim spalten As New Tabellenspalte + spalten.Spaltentitel_aktualisieren(Me.C1Auswertungen, "Auswertung", db.dsDaten.Tables(0)) End Sub Private Sub BearbeitenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles BearbeitenToolStripMenuItem.Click @@ -54,7 +69,8 @@ Public Class frmAuswertungen Me.C1TrueDBDropdown2.ValueMember = printer.Papersources.Columns(0).ColumnName Me.C1TrueDBDropdown2.DisplayMember = printer.Papersources.Columns(1).ColumnName Me.C1Auswertungen.Columns("Papierschacht").DropDown = Me.C1TrueDBDropdown2 - + Me.C1TrueDBDropdown2.DisplayColumns(0).AutoSize() + Me.C1TrueDBDropdown2.DisplayColumns(1).AutoSize() End Sub Private Sub ToolStripButton5_Click(sender As Object, e As EventArgs) Handles ToolStripButton5.Click @@ -66,4 +82,77 @@ Public Class frmAuswertungen MsgBox("Daten wurden gespeichert") End Sub + + Private Sub ToolStripButton1_Click(sender As Object, e As EventArgs) Handles ToolStripButton1.Click + Dim ppath As String + ppath = Application.StartupPath + "\" + Globals.Auswertungsverzeicnis + "\PrinterConfig" + If Not System.IO.Directory.Exists(ppath) Then + MsgBox("Pfad für Printer-Konfigurationen fehlt - bitte erstellen:" + ppath) + Exit Sub + End If + Dim PName As String + PName = InputBox("Name für die Drucker-Konfiguration:") + If PName = "" Then Exit Sub + + Dim file As System.IO.StreamWriter + file = My.Computer.FileSystem.OpenTextFileWriter(ppath + "\" + PName + ".cfg", True) + file.WriteLine(Me.cbboxprinter.Text) + Dim dt As New DataTable + dt = C1Auswertungen.DataSource + + For Each row In dt.Rows + + + + + + file.WriteLine(row("Auswertungnr").ToString + ";" + row("Drucker").ToString + ";" + row("Papierschacht").ToString + ";" + row("Kopien").ToString) + Next + file.Close() + evh.Fire_Refresh_PrinterConfig() + End Sub + + Shared Sub Chenge_Profile(ByVal Filename As String) + Dim i As Integer = 0 + Dim line As String + Dim readFile As System.IO.TextReader = New StreamReader(Filename) + While True + line = readFile.ReadLine() + i = i + 1 + If line Is Nothing Then + Exit While + Else + If i = 1 Then + Globals.defaultprinter = line + Else + Update_Printerdata(line) + + End If + End If + End While + readFile.Close() + readFile = Nothing + + End Sub + + Shared Sub Update_Printerdata(ByVal line As String) + Try + Dim splitter() As String + splitter = line.Split(";") + Dim db As New clsDB + db.Get_Tabledata("Auswertung", "Where auswertungnr=" + splitter(0)) + db.dsDaten.Tables(0).Rows(0).Item("Drucker") = splitter(1) + db.dsDaten.Tables(0).Rows(0).Item("Papierschacht") = splitter(2) + db.dsDaten.Tables(0).Rows(0).Item("Kopien") = splitter(3) + db.Update_Data() + db.Dispose() + Catch + End Try + + + End Sub + + Private Sub ToolStripButton2_Click(sender As Object, e As EventArgs) Handles ToolStripButton2.Click + + End Sub End Class \ No newline at end of file diff --git a/DPM2016/Sysadmin/frmStammdaten.resx b/DPM2016/Sysadmin/frmStammdaten.resx index 24f69f6..1f84cc3 100644 --- a/DPM2016/Sysadmin/frmStammdaten.resx +++ b/DPM2016/Sysadmin/frmStammdaten.resx @@ -158,7 +158,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{}Style3{}Footer{}Style14{}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;}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="" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" 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, 751, 423</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, 751, 423</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:Aqua;}Normal{}RecordSelector{AlignImage:Center;}Inactive{ForeColor:InactiveCaptionText;BackColor:InactiveCaption;}OddRow{}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{}</Data></Styles><Splits><C1.Win.C1TrueDBGrid.MergeView Name="" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" 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, 751, 423</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, 751, 423</ClientArea><PrintPageHeaderStyle parent="" me="Style15" /><PrintPageFooterStyle parent="" me="Style16" /></Blob> 239, 17 diff --git a/DPM2016/Sysadmin/frmStammdaten.vb b/DPM2016/Sysadmin/frmStammdaten.vb index d214107..7239d3c 100644 --- a/DPM2016/Sysadmin/frmStammdaten.vb +++ b/DPM2016/Sysadmin/frmStammdaten.vb @@ -9,7 +9,11 @@ Public Class frmStammdaten End Sub Private Sub TreeView1_AfterSelect(sender As Object, e As TreeViewEventArgs) Handles TreeView1.AfterSelect + refresh_Details + End Sub + Sub Refresh_Details() Try + If Me.TreeView1.SelectedNode.Tag <> "" Then Dim splitter() splitter = Me.TreeView1.SelectedNode.Tag.ToString.Split(";") @@ -32,11 +36,13 @@ Public Class frmStammdaten Next End If + Me.ClsStammdaten_flat1.Visible = False Me.ClsStammdaten_Bez1.Visible = True Me.ClsStammdaten_Bez1.Dock = DockStyle.Fill Exit Sub End If + Me.ClsStammdaten_flat1.Check_Changes() Me.ClsStammdaten_Bez1.Visible = False Me.ClsStammdaten_flat1.Visible = True Me.ClsStammdaten_flat1.Dock = DockStyle.Fill @@ -147,4 +153,12 @@ Public Class frmStammdaten Private Sub ToolStripButton1_Click(sender As Object, e As EventArgs) Me.Close() End Sub + + Private Sub TreeView1_Click(sender As Object, e As EventArgs) Handles TreeView1.Click + Refresh_Details() + End Sub + + Private Sub ClsStammdaten_flat1_Load(sender As Object, e As EventArgs) Handles ClsStammdaten_flat1.Load + + End Sub End Class \ No newline at end of file diff --git a/DPM2016/Utils/Globals.vb b/DPM2016/Utils/Globals.vb index 2d9ecda..6295d6e 100644 --- a/DPM2016/Utils/Globals.vb +++ b/DPM2016/Utils/Globals.vb @@ -1,5 +1,6 @@ Imports System.Math Module Globals + Public RGCollection As New Collection Public Spaltendaten As New DataTable Public SQLStatements As New DataTable Public ActUser As Integer = 1 @@ -8,11 +9,17 @@ Module Globals Public Mandant As Integer = 1 Public Auswertungsverzeicnis As String = "\Default" Public Version As String = "1.0.1.1801" - Public Versionastaum As String = "31.01.2018" + Public Versionastaum As String = "13.05.2018" Public LogedIn As Boolean = False - + Public FakturaNr As Integer = 0 + Public DefaultPrinter As String = "" + Public Funktionsstufe As Integer = 0 Public encryptkey As String = "StefanHutterUnternehmensberatung2018" Public encrypted As Boolean = False + Public SecurityDaten As New DataSet + Public Mainweindow As Windows.Forms.Form + Public Databasename As String + Public Function Round5(ByVal inp As String) As String Dim Rappen5 As Double Rappen5 = CDbl(inp) diff --git a/DPM2016/app.config b/DPM2016/app.config index f256b9c..da30d59 100644 --- a/DPM2016/app.config +++ b/DPM2016/app.config @@ -32,13 +32,13 @@ 2 - h:\dpm + h:\dpm\dmp1\dmp2 h:\dpm\docarchiv - data source=shu00;initial catalog=dpm2018;integrated security=SSPI;persist security info=false;workstation id=;packet size=4096;user id=sa;password=*shu29 + data source=shu00;initial catalog=dpm2018_1;integrated security=SSPI;persist security info=false;workstation id=;packet size=4096;user id=sa;password=*shu29 diff --git a/DPM2016/bin/Debug/FastReport.Bars.dll b/DPM2016/bin/Debug/FastReport.Bars.dll index ce7c73e..5e897f5 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 a0d20bc..00920c5 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 feaa65c..7972272 100644 Binary files a/DPM2016/bin/Debug/FastReport.dll and b/DPM2016/bin/Debug/FastReport.dll differ diff --git a/DPM2016/bin/Debug/_FRReporting.dll b/DPM2016/bin/Debug/_FRReporting.dll index 69b10ab..cb9db4b 100644 Binary files a/DPM2016/bin/Debug/_FRReporting.dll and b/DPM2016/bin/Debug/_FRReporting.dll differ diff --git a/DPM2016/bin/Debug/_FRReporting.pdb b/DPM2016/bin/Debug/_FRReporting.pdb index 9072919..2538213 100644 Binary files a/DPM2016/bin/Debug/_FRReporting.pdb and b/DPM2016/bin/Debug/_FRReporting.pdb differ diff --git a/DPM2016/bin/Debug/_FRReporting.xml b/DPM2016/bin/Debug/_FRReporting.xml index 44c3ea8..064c1c8 100644 --- a/DPM2016/bin/Debug/_FRReporting.xml +++ b/DPM2016/bin/Debug/_FRReporting.xml @@ -6,6 +6,22 @@ _FRReporting + + + Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. + + + + + Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird. + + + + + Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle + Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden. + + Purpose: Data Access class for the table 'Auswertung'. @@ -1307,21 +1323,5 @@ Prüft, ob das Security-Objekt bereits auf der DB vorhanden ist - - - Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. - - - - - Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird. - - - - - Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle - Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden. - - diff --git a/DPM2016/frmMain.Designer.vb b/DPM2016/frmMain.Designer.vb index de10259..9750c51 100644 --- a/DPM2016/frmMain.Designer.vb +++ b/DPM2016/frmMain.Designer.vb @@ -28,33 +28,37 @@ Partial Class frmMain Me.BeendenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.AbmeldenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripMenuItem3 = New System.Windows.Forms.ToolStripMenuItem() - Me.StammdatenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.SpaltentitelToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.StammdatenToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem() - Me.AuswertungenToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem() Me.PatientToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.FirmenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.AuswertungenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.PruefzifferToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.AuswertungenToolStripMenuItem2 = New System.Windows.Forms.ToolStripMenuItem() Me.FinanzenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.RechnungenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.MahnungenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripMenuItem2 = New System.Windows.Forms.ToolStripSeparator() Me.ZahlungsdateiVerarbeitenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.AuswertungenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.PruefzifferToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.AuswertungenToolStripMenuItem2 = New System.Windows.Forms.ToolStripMenuItem() + Me.StammdatenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.SpaltentitelToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.StammdatenToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem() + Me.AuswertungenToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem() + Me.SecurityObjekteToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem() + Me.cbboxPrinterConfig = New System.Windows.Forms.ToolStripComboBox() Me.DruckerToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.EncryptToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.SepaToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.Label1 = New System.Windows.Forms.Label() + Me.SuchenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.mnuMain.SuspendLayout() Me.SuspendLayout() ' 'mnuMain ' - Me.mnuMain.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.DateiToolStripMenuItem, Me.StammdatenToolStripMenuItem, Me.PatientToolStripMenuItem, Me.FirmenToolStripMenuItem, Me.AuswertungenToolStripMenuItem, Me.FinanzenToolStripMenuItem, Me.ToolStripMenuItem1, Me.DruckerToolStripMenuItem, Me.EncryptToolStripMenuItem, Me.SepaToolStripMenuItem}) + Me.mnuMain.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.DateiToolStripMenuItem, Me.PatientToolStripMenuItem, Me.FirmenToolStripMenuItem, Me.FinanzenToolStripMenuItem, Me.AuswertungenToolStripMenuItem, Me.StammdatenToolStripMenuItem, Me.ToolStripMenuItem1, Me.cbboxPrinterConfig, Me.SuchenToolStripMenuItem, Me.DruckerToolStripMenuItem, Me.EncryptToolStripMenuItem, Me.SepaToolStripMenuItem}) Me.mnuMain.Location = New System.Drawing.Point(0, 0) Me.mnuMain.Name = "mnuMain" - Me.mnuMain.Size = New System.Drawing.Size(1325, 24) + Me.mnuMain.Size = New System.Drawing.Size(1325, 27) Me.mnuMain.TabIndex = 0 Me.mnuMain.Text = "MenuStrip1" ' @@ -62,7 +66,7 @@ Partial Class frmMain ' Me.DateiToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.BeendenToolStripMenuItem, Me.AbmeldenToolStripMenuItem, Me.ToolStripMenuItem3}) Me.DateiToolStripMenuItem.Name = "DateiToolStripMenuItem" - Me.DateiToolStripMenuItem.Size = New System.Drawing.Size(46, 20) + Me.DateiToolStripMenuItem.Size = New System.Drawing.Size(46, 23) Me.DateiToolStripMenuItem.Text = "&Datei" ' 'BeendenToolStripMenuItem @@ -83,48 +87,53 @@ Partial Class frmMain Me.ToolStripMenuItem3.Size = New System.Drawing.Size(183, 22) Me.ToolStripMenuItem3.Text = "Datenbank wechseln" ' - 'StammdatenToolStripMenuItem + 'PatientToolStripMenuItem ' - Me.StammdatenToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.SpaltentitelToolStripMenuItem, Me.StammdatenToolStripMenuItem1, Me.AuswertungenToolStripMenuItem1}) - Me.StammdatenToolStripMenuItem.Name = "StammdatenToolStripMenuItem" - Me.StammdatenToolStripMenuItem.Size = New System.Drawing.Size(87, 20) - Me.StammdatenToolStripMenuItem.Text = "&Stammdaten" + Me.PatientToolStripMenuItem.Name = "PatientToolStripMenuItem" + Me.PatientToolStripMenuItem.Size = New System.Drawing.Size(56, 23) + Me.PatientToolStripMenuItem.Text = "Patient" ' - 'SpaltentitelToolStripMenuItem + 'FirmenToolStripMenuItem ' - Me.SpaltentitelToolStripMenuItem.Name = "SpaltentitelToolStripMenuItem" - Me.SpaltentitelToolStripMenuItem.Size = New System.Drawing.Size(151, 22) - Me.SpaltentitelToolStripMenuItem.Text = "&Spaltentitel" + Me.FirmenToolStripMenuItem.Name = "FirmenToolStripMenuItem" + Me.FirmenToolStripMenuItem.Size = New System.Drawing.Size(56, 23) + Me.FirmenToolStripMenuItem.Text = "&Firmen" ' - 'StammdatenToolStripMenuItem1 + 'FinanzenToolStripMenuItem ' - Me.StammdatenToolStripMenuItem1.Name = "StammdatenToolStripMenuItem1" - Me.StammdatenToolStripMenuItem1.Size = New System.Drawing.Size(151, 22) - Me.StammdatenToolStripMenuItem1.Text = "Stammdaten" + Me.FinanzenToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.RechnungenToolStripMenuItem, Me.MahnungenToolStripMenuItem, Me.ToolStripMenuItem2, Me.ZahlungsdateiVerarbeitenToolStripMenuItem}) + Me.FinanzenToolStripMenuItem.Name = "FinanzenToolStripMenuItem" + Me.FinanzenToolStripMenuItem.Size = New System.Drawing.Size(66, 23) + Me.FinanzenToolStripMenuItem.Text = "Finanzen" ' - 'AuswertungenToolStripMenuItem1 + 'RechnungenToolStripMenuItem ' - Me.AuswertungenToolStripMenuItem1.Name = "AuswertungenToolStripMenuItem1" - Me.AuswertungenToolStripMenuItem1.Size = New System.Drawing.Size(151, 22) - Me.AuswertungenToolStripMenuItem1.Text = "&Auswertungen" + Me.RechnungenToolStripMenuItem.Name = "RechnungenToolStripMenuItem" + Me.RechnungenToolStripMenuItem.Size = New System.Drawing.Size(211, 22) + Me.RechnungenToolStripMenuItem.Text = "Rechnungen" ' - 'PatientToolStripMenuItem + 'MahnungenToolStripMenuItem ' - Me.PatientToolStripMenuItem.Name = "PatientToolStripMenuItem" - Me.PatientToolStripMenuItem.Size = New System.Drawing.Size(56, 20) - Me.PatientToolStripMenuItem.Text = "Patient" + Me.MahnungenToolStripMenuItem.Name = "MahnungenToolStripMenuItem" + Me.MahnungenToolStripMenuItem.Size = New System.Drawing.Size(211, 22) + Me.MahnungenToolStripMenuItem.Text = "Mahnungen" ' - 'FirmenToolStripMenuItem + 'ToolStripMenuItem2 ' - Me.FirmenToolStripMenuItem.Name = "FirmenToolStripMenuItem" - Me.FirmenToolStripMenuItem.Size = New System.Drawing.Size(56, 20) - Me.FirmenToolStripMenuItem.Text = "&Firmen" + Me.ToolStripMenuItem2.Name = "ToolStripMenuItem2" + Me.ToolStripMenuItem2.Size = New System.Drawing.Size(208, 6) + ' + 'ZahlungsdateiVerarbeitenToolStripMenuItem + ' + Me.ZahlungsdateiVerarbeitenToolStripMenuItem.Name = "ZahlungsdateiVerarbeitenToolStripMenuItem" + Me.ZahlungsdateiVerarbeitenToolStripMenuItem.Size = New System.Drawing.Size(211, 22) + Me.ZahlungsdateiVerarbeitenToolStripMenuItem.Text = "Zahlungsdatei verarbeiten" ' 'AuswertungenToolStripMenuItem ' Me.AuswertungenToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.PruefzifferToolStripMenuItem, Me.AuswertungenToolStripMenuItem2}) Me.AuswertungenToolStripMenuItem.Name = "AuswertungenToolStripMenuItem" - Me.AuswertungenToolStripMenuItem.Size = New System.Drawing.Size(96, 20) + Me.AuswertungenToolStripMenuItem.Size = New System.Drawing.Size(96, 23) Me.AuswertungenToolStripMenuItem.Text = "Auswertungen" ' 'PruefzifferToolStripMenuItem @@ -141,65 +150,91 @@ Partial Class frmMain Me.AuswertungenToolStripMenuItem2.Text = "Auswertungen" Me.AuswertungenToolStripMenuItem2.Visible = False ' - 'FinanzenToolStripMenuItem + 'StammdatenToolStripMenuItem ' - Me.FinanzenToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.RechnungenToolStripMenuItem, Me.MahnungenToolStripMenuItem, Me.ToolStripMenuItem2, Me.ZahlungsdateiVerarbeitenToolStripMenuItem}) - Me.FinanzenToolStripMenuItem.Name = "FinanzenToolStripMenuItem" - Me.FinanzenToolStripMenuItem.Size = New System.Drawing.Size(66, 20) - Me.FinanzenToolStripMenuItem.Text = "Finanzen" + Me.StammdatenToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.SpaltentitelToolStripMenuItem, Me.StammdatenToolStripMenuItem1, Me.AuswertungenToolStripMenuItem1, Me.SecurityObjekteToolStripMenuItem}) + Me.StammdatenToolStripMenuItem.Name = "StammdatenToolStripMenuItem" + Me.StammdatenToolStripMenuItem.Size = New System.Drawing.Size(90, 23) + Me.StammdatenToolStripMenuItem.Text = "&Einstellungen" ' - 'RechnungenToolStripMenuItem + 'SpaltentitelToolStripMenuItem ' - Me.RechnungenToolStripMenuItem.Name = "RechnungenToolStripMenuItem" - Me.RechnungenToolStripMenuItem.Size = New System.Drawing.Size(211, 22) - Me.RechnungenToolStripMenuItem.Text = "Rechnungen" + Me.SpaltentitelToolStripMenuItem.Name = "SpaltentitelToolStripMenuItem" + Me.SpaltentitelToolStripMenuItem.Size = New System.Drawing.Size(196, 22) + Me.SpaltentitelToolStripMenuItem.Text = "&Spaltentitel" ' - 'MahnungenToolStripMenuItem + 'StammdatenToolStripMenuItem1 ' - Me.MahnungenToolStripMenuItem.Name = "MahnungenToolStripMenuItem" - Me.MahnungenToolStripMenuItem.Size = New System.Drawing.Size(211, 22) - Me.MahnungenToolStripMenuItem.Text = "Mahnungen" + Me.StammdatenToolStripMenuItem1.Name = "StammdatenToolStripMenuItem1" + Me.StammdatenToolStripMenuItem1.Size = New System.Drawing.Size(196, 22) + Me.StammdatenToolStripMenuItem1.Text = "Optinen / Stammdaten" ' - 'ToolStripMenuItem2 + 'AuswertungenToolStripMenuItem1 ' - Me.ToolStripMenuItem2.Name = "ToolStripMenuItem2" - Me.ToolStripMenuItem2.Size = New System.Drawing.Size(208, 6) + Me.AuswertungenToolStripMenuItem1.Name = "AuswertungenToolStripMenuItem1" + Me.AuswertungenToolStripMenuItem1.Size = New System.Drawing.Size(196, 22) + Me.AuswertungenToolStripMenuItem1.Text = "&Formulare" ' - 'ZahlungsdateiVerarbeitenToolStripMenuItem + 'SecurityObjekteToolStripMenuItem ' - Me.ZahlungsdateiVerarbeitenToolStripMenuItem.Name = "ZahlungsdateiVerarbeitenToolStripMenuItem" - Me.ZahlungsdateiVerarbeitenToolStripMenuItem.Size = New System.Drawing.Size(211, 22) - Me.ZahlungsdateiVerarbeitenToolStripMenuItem.Text = "Zahlungsdatei verarbeiten" + Me.SecurityObjekteToolStripMenuItem.Name = "SecurityObjekteToolStripMenuItem" + Me.SecurityObjekteToolStripMenuItem.Size = New System.Drawing.Size(196, 22) + Me.SecurityObjekteToolStripMenuItem.Text = "Security-Objekte" ' 'ToolStripMenuItem1 ' Me.ToolStripMenuItem1.Name = "ToolStripMenuItem1" - Me.ToolStripMenuItem1.Size = New System.Drawing.Size(12, 20) + Me.ToolStripMenuItem1.Size = New System.Drawing.Size(12, 23) + ' + 'cbboxPrinterConfig + ' + Me.cbboxPrinterConfig.Name = "cbboxPrinterConfig" + Me.cbboxPrinterConfig.Size = New System.Drawing.Size(150, 23) ' 'DruckerToolStripMenuItem ' Me.DruckerToolStripMenuItem.Name = "DruckerToolStripMenuItem" - Me.DruckerToolStripMenuItem.Size = New System.Drawing.Size(60, 20) + Me.DruckerToolStripMenuItem.Size = New System.Drawing.Size(60, 23) Me.DruckerToolStripMenuItem.Text = "Drucker" + Me.DruckerToolStripMenuItem.Visible = False ' 'EncryptToolStripMenuItem ' Me.EncryptToolStripMenuItem.Name = "EncryptToolStripMenuItem" - Me.EncryptToolStripMenuItem.Size = New System.Drawing.Size(59, 20) + Me.EncryptToolStripMenuItem.Size = New System.Drawing.Size(59, 23) Me.EncryptToolStripMenuItem.Text = "Encrypt" Me.EncryptToolStripMenuItem.Visible = False ' 'SepaToolStripMenuItem ' Me.SepaToolStripMenuItem.Name = "SepaToolStripMenuItem" - Me.SepaToolStripMenuItem.Size = New System.Drawing.Size(44, 20) + Me.SepaToolStripMenuItem.Size = New System.Drawing.Size(44, 23) Me.SepaToolStripMenuItem.Text = "Sepa" + Me.SepaToolStripMenuItem.Visible = False + ' + 'Label1 + ' + Me.Label1.AutoSize = True + Me.Label1.BackColor = System.Drawing.Color.SkyBlue + Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label1.Location = New System.Drawing.Point(1116, 3) + Me.Label1.Name = "Label1" + Me.Label1.Size = New System.Drawing.Size(72, 24) + Me.Label1.TabIndex = 2 + Me.Label1.Text = "Label1" + ' + 'SuchenToolStripMenuItem + ' + Me.SuchenToolStripMenuItem.Name = "SuchenToolStripMenuItem" + Me.SuchenToolStripMenuItem.Size = New System.Drawing.Size(58, 23) + Me.SuchenToolStripMenuItem.Text = "Suchen" ' 'frmMain ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(1325, 793) + Me.Controls.Add(Me.Label1) Me.Controls.Add(Me.mnuMain) Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) Me.IsMdiContainer = True @@ -235,4 +270,8 @@ Partial Class frmMain Friend WithEvents EncryptToolStripMenuItem As ToolStripMenuItem Friend WithEvents ToolStripMenuItem3 As ToolStripMenuItem Friend WithEvents SepaToolStripMenuItem As ToolStripMenuItem + Friend WithEvents cbboxPrinterConfig As ToolStripComboBox + Friend WithEvents SecurityObjekteToolStripMenuItem As ToolStripMenuItem + Friend WithEvents Label1 As Label + Friend WithEvents SuchenToolStripMenuItem As ToolStripMenuItem End Class diff --git a/DPM2016/frmMain.vb b/DPM2016/frmMain.vb index c9d12e7..f4c01f6 100644 --- a/DPM2016/frmMain.vb +++ b/DPM2016/frmMain.vb @@ -1,6 +1,9 @@  -Public Class frmMain +Imports System.IO +Public Class frmMain + Dim WithEvents evh As Generic_Event_Handler = Globals.EVH + 'Dim sec As New MySecurity Private Sub BeendenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles BeendenToolStripMenuItem.Click Me.Close() @@ -26,6 +29,7 @@ Public Class frmMain End Sub Private Sub frmMain_Load(sender As Object, e As EventArgs) Handles MyBase.Load + Globals.Mainweindow = Me If check_db_connection() Then @@ -40,9 +44,65 @@ Public Class frmMain Dim f As New frmLogin f.ShowDialog() If ActUser = -1 Then Me.Close() - + PatientToolStripMenuItem_Click(sender, e) End If End If + Me.Label1.Text = Globals.Databasename + Me.Label1.Left = Me.Width - 20 - Me.Label1.Width + Me.Text = "DPM 2018 - " + Globals.Databasename + Refresh_Printerconfig() + 'sec.Set_Form_Security(Me) + Me.FinanzenToolStripMenuItem.Visible = True + Me.AuswertungenToolStripMenuItem.Visible = True + Me.StammdatenToolStripMenuItem.Visible = True + + Select Case Globals.Funktionsstufe + Case 2 + Me.FinanzenToolStripMenuItem.Visible = False + Me.AuswertungenToolStripMenuItem.Visible = False + Me.StammdatenToolStripMenuItem.Visible = False + End Select + + Check_Tempdir + + End Sub + + Sub Check_Tempdir() + Dim splitter() As String + splitter = My.Settings.TempPath.Split("\") + Dim root As String + root = splitter(0) + "\" + splitter(1) + If Not System.IO.Directory.Exists(root) Then + System.IO.Directory.CreateDirectory(root) + End If + If splitter.Length > 2 Then + For i = 2 To splitter.Length - 1 + root = root + "\" + splitter(i) + If Not System.IO.Directory.Exists(root) Then + System.IO.Directory.CreateDirectory(root) + End If + + Next + End If + For i = 2 To splitter.Length - 2 + + Next + + If Not System.IO.Directory.Exists(My.Settings.TempPath) Then + + End If + End Sub + Sub Refresh_Printerconfig() + Me.cbboxPrinterConfig.Items.Clear() + Dim ppath As String + ppath = Application.StartupPath + "\" + Globals.Auswertungsverzeicnis + "\PrinterConfig" + Dim di As DirectoryInfo = New DirectoryInfo(ppath) + Me.cbboxPrinterConfig.Items.Clear() + Me.cbboxPrinterConfig.Items.Add("") + + For Each fi In di.GetFiles() + Me.cbboxPrinterConfig.Items.Add(fi.Name) + Next End Sub Function check_db_connection() As Boolean @@ -168,6 +228,16 @@ Public Class frmMain Dim f As New frmLogin f.ShowDialog() End While + Me.FinanzenToolStripMenuItem.Visible = True + Me.AuswertungenToolStripMenuItem.Visible = True + Me.StammdatenToolStripMenuItem.Visible = True + + Select Case Globals.Funktionsstufe + Case 2 + Me.FinanzenToolStripMenuItem.Visible = False + Me.AuswertungenToolStripMenuItem.Visible = False + Me.StammdatenToolStripMenuItem.Visible = False + End Select @@ -200,4 +270,79 @@ Public Class frmMain Private Sub SepaToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles SepaToolStripMenuItem.Click End Sub + + + + Private Sub cbboxPrinterConfig_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cbboxPrinterConfig.SelectedIndexChanged + If MsgBox("Druckereinstellungen anpassen?", vbYesNo + vbQuestion) = vbYes Then + Dim ppath As String + ppath = Application.StartupPath + "\" + Globals.Auswertungsverzeicnis + "\PrinterConfig\" + Me.cbboxPrinterConfig.Text + Dim f As New frmAuswertung + frmAuswertungen.Chenge_Profile(ppath) + End If + End Sub + + Private Sub evh_Refresh_PrinterConfig() Handles evh.Refresh_PrinterConfig + Refresh_Printerconfig() + End Sub + + Private Sub SecurityObjekgeToolStripMenuItem_Click(sender As Object, e As EventArgs) + + End Sub + + Private Sub MahnungenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles MahnungenToolStripMenuItem.Click + + End Sub + + Private Sub frmMain_Resize(sender As Object, e As EventArgs) Handles Me.Resize + Me.Label1.Left = Me.Width - 20 - Me.Label1.Width + End Sub + + Private Sub SuchenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles SuchenToolStripMenuItem.Click + Dim f As New frmSuche + f.MdiParent = Me + f.Show() + + End Sub + + 'Private Sub SecurityObjekteToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles SecurityObjekteToolStripMenuItem.Click + ' Dim formselector As New frmFormSelector + ' formselector.ListForms.Items.Clear() + ' formselector.ListForms.Items.Add(Me.Name) + ' For Each x As Form In Me.MdiChildren + ' formselector.ListForms.Items.Add(x.Name) + ' Next + ' formselector.ShowDialog() + + ' For Each it As Object In formselector.ListForms.SelectedItems + ' If it = Me.Name Then + ' Select Case formselector.DialogResult + ' Case Windows.Forms.DialogResult.Retry + ' sec.Check_Obsoloet(Me) + ' Case Windows.Forms.DialogResult.OK + ' sec.List_Form_Controls(Me) + ' Case Windows.Forms.DialogResult.Ignore + ' sec.Delete_Obsoloet(Me) + ' End Select + ' Else + ' For Each x As Form In Me.MdiChildren + ' If x.Name = it Then + ' Select Case formselector.DialogResult + ' Case Windows.Forms.DialogResult.Retry + ' sec.Check_Obsoloet(x) + ' Case Windows.Forms.DialogResult.OK + ' sec.List_Form_Controls(x) + ' Case Windows.Forms.DialogResult.Ignore + ' sec.Delete_Obsoloet(x) + ' End Select + ' End If + ' Next + ' End If + ' Next + + + ' Exit Sub + + 'End Sub + End Class diff --git a/DPM2016/obj/Debug/CoreCompileInputs.cache b/DPM2016/obj/Debug/CoreCompileInputs.cache index 5e3a047..f6eb6a5 100644 --- a/DPM2016/obj/Debug/CoreCompileInputs.cache +++ b/DPM2016/obj/Debug/CoreCompileInputs.cache @@ -1 +1 @@ -5a6f41365c32419caba70dfcf71a6d6eaa80359d +64c5099c96a810c8f544c19925ae2126164beae2 diff --git a/DPM2016/obj/Debug/DPM2016.Behandlung.resources b/DPM2016/obj/Debug/DPM2016.Behandlung.resources index 6e62938..e23f8e6 100644 Binary files a/DPM2016/obj/Debug/DPM2016.Behandlung.resources and b/DPM2016/obj/Debug/DPM2016.Behandlung.resources differ diff --git a/DPM2016/obj/Debug/DPM2016.Benhandungdetail.resources b/DPM2016/obj/Debug/DPM2016.Benhandungdetail.resources index 1d98108..c5f7a7b 100644 Binary files a/DPM2016/obj/Debug/DPM2016.Benhandungdetail.resources and b/DPM2016/obj/Debug/DPM2016.Benhandungdetail.resources differ diff --git a/DPM2016/obj/Debug/DPM2016.Finanzen.resources b/DPM2016/obj/Debug/DPM2016.Finanzen.resources index 37efac0..ba3e3a1 100644 Binary files a/DPM2016/obj/Debug/DPM2016.Finanzen.resources and b/DPM2016/obj/Debug/DPM2016.Finanzen.resources differ diff --git a/DPM2016/obj/Debug/DPM2016.Leistungen.resources b/DPM2016/obj/Debug/DPM2016.Leistungen.resources index bafdc6c..96aa7bb 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.clsStammdaten_flat.resources b/DPM2016/obj/Debug/DPM2016.clsStammdaten_flat.resources index 5a685c2..40abd5d 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.frmAuswertungen.resources b/DPM2016/obj/Debug/DPM2016.frmAuswertungen.resources index 0972c17..5d2daee 100644 Binary files a/DPM2016/obj/Debug/DPM2016.frmAuswertungen.resources and b/DPM2016/obj/Debug/DPM2016.frmAuswertungen.resources differ diff --git a/DPM2016/obj/Debug/DPM2016.frmFakturierung.resources b/DPM2016/obj/Debug/DPM2016.frmFakturierung.resources index c9a7b65..276a8f2 100644 Binary files a/DPM2016/obj/Debug/DPM2016.frmFakturierung.resources and b/DPM2016/obj/Debug/DPM2016.frmFakturierung.resources differ diff --git a/DPM2016/obj/Debug/DPM2016.frmFirma.resources b/DPM2016/obj/Debug/DPM2016.frmFirma.resources index 75a53a2..412e763 100644 Binary files a/DPM2016/obj/Debug/DPM2016.frmFirma.resources and b/DPM2016/obj/Debug/DPM2016.frmFirma.resources differ diff --git a/DPM2016/obj/Debug/DPM2016.frmStammdaten.resources b/DPM2016/obj/Debug/DPM2016.frmStammdaten.resources index 150774b..0386859 100644 Binary files a/DPM2016/obj/Debug/DPM2016.frmStammdaten.resources and b/DPM2016/obj/Debug/DPM2016.frmStammdaten.resources differ diff --git a/DPM2016/obj/Debug/DPM2016.vbproj.FileListAbsolute.txt b/DPM2016/obj/Debug/DPM2016.vbproj.FileListAbsolute.txt index fa38d46..391e37f 100644 --- a/DPM2016/obj/Debug/DPM2016.vbproj.FileListAbsolute.txt +++ b/DPM2016/obj/Debug/DPM2016.vbproj.FileListAbsolute.txt @@ -1,3 +1,36 @@ +E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\Database1.mdf +E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\Database1_log.ldf +E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\DPM2018.exe.config +E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\DPM2018.exe +E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\DPM2018.pdb +E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\DPM2018.xml +E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\Aga.Controls.dll +E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\C1.Data.2.dll +E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\C1.Win.C1Command.4.dll +E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\C1.Win.C1Input.4.dll +E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\C1.Win.C1TrueDBGrid.2.dll +E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\DevComponents.DotNetBar.Charts.dll +E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\DevComponents.DotNetBar.Schedule.dll +E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\DevComponents.DotNetBar2.dll +E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\FastReport.Bars.dll +E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\FastReport.dll +E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\FastReport.Editor.dll +E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\FlexCel.dll +E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\Syncfusion.Shared.Base.dll +E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\_FRReporting.dll +E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\XLSLib.dll +E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\Aga.Controls.pdb +E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\C1.Data.2.xml +E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\C1.Win.C1Command.4.xml +E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\C1.Win.C1Input.4.xml +E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\C1.Win.C1TrueDBGrid.2.xml +E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\DevComponents.DotNetBar.Schedule.xml +E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\DevComponents.DotNetBar2.xml +E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\Syncfusion.Shared.Base.xml +E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\_FRReporting.pdb +E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\_FRReporting.xml +E:\Software-Projekte\DPM\DPM2016\DPM2016\obj\Debug\DPM2016.frmAuswertung.resources +E:\Software-Projekte\DPM\DPM2016\DPM2016\obj\Debug\DPM2016.frmreport.resources E:\Software-Projekte\DPM\DPM2016\DPM2016\obj\Debug\DPM2016.Behandlung.resources E:\Software-Projekte\DPM\DPM2016\DPM2016\obj\Debug\DPM2016.Benhandungdetail.resources E:\Software-Projekte\DPM\DPM2016\DPM2016\obj\Debug\DPM2016.frmLeistungDetail.resources @@ -24,53 +57,33 @@ E:\Software-Projekte\DPM\DPM2016\DPM2016\obj\Debug\DPM2016.clsStammdaten_Bez.res E:\Software-Projekte\DPM\DPM2016\DPM2016\obj\Debug\DPM2016.clsStammdaten_flat.resources E:\Software-Projekte\DPM\DPM2016\DPM2016\obj\Debug\DPM2016.Resources.resources E:\Software-Projekte\DPM\DPM2016\DPM2016\obj\Debug\DPM2016.frmSysadminTableSelector.resources -E:\Software-Projekte\DPM\DPM2016\DPM2016\obj\Debug\DPM2016.frmZahlung.resources -E:\Software-Projekte\DPM\DPM2016\DPM2016\obj\Debug\DPM2016.vbproj.GenerateResource.Cache -E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\Database1.mdf -E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\Database1_log.ldf -E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\Aga.Controls.dll -E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\C1.Win.C1TrueDBGrid.2.dll -E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\DevComponents.DotNetBar.Schedule.dll -E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\DevComponents.DotNetBar2.dll -E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\FastReport.Bars.dll -E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\FastReport.dll -E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\FastReport.Editor.dll -E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\FlexCel.dll -E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\Syncfusion.Shared.Base.dll -E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\_FRReporting.dll -E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\XLSLib.dll -E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\Aga.Controls.pdb -E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\C1.Win.C1TrueDBGrid.2.xml -E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\DevComponents.DotNetBar.Schedule.xml -E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\DevComponents.DotNetBar2.xml -E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\Syncfusion.Shared.Base.xml -E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\_FRReporting.pdb -E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\_FRReporting.xml -E:\Software-Projekte\DPM\DPM2016\DPM2016\obj\Debug\DPM2016.Form2.resources -E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\PropertyGridEx.dll -E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\PropertyGridEx.pdb -E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\PropertyGridEx.xml -E:\Software-Projekte\DPM\DPM2016\DPM2016\obj\Debug\DPM2016.frmAuswertung.resources -E:\Software-Projekte\DPM\DPM2016\DPM2016\obj\Debug\DPM2016.frmreport.resources -E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\C1.Data.2.dll -E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\C1.Data.2.xml +E:\Software-Projekte\DPM\DPM2016\DPM2016\obj\Debug\DPM2016.frmTarifDetail.resources +E:\Software-Projekte\DPM\DPM2016\DPM2016\obj\Debug\DPM2016.frmDBConnection.resources +E:\Software-Projekte\DPM\DPM2016\DPM2016\obj\Debug\DPM2016.frmDentotarDetails.resources +E:\Software-Projekte\DPM\DPM2016\DPM2016\obj\Debug\DPM2016.frmFortschritt.resources +E:\Software-Projekte\DPM\DPM2016\DPM2016\obj\Debug\DPM2016.frmLogin.resources E:\Software-Projekte\DPM\DPM2016\DPM2016\obj\Debug\DPM2016.frmSplash.resources E:\Software-Projekte\DPM\DPM2016\DPM2016\obj\Debug\DPM2016.SplashForm.resources -E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\DevComponents.DotNetBar.Charts.dll -E:\Software-Projekte\DPM\DPM2016\DPM2016\obj\Debug\DPM2016.frmLogin.resources -E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\C1.Win.C1Command.4.dll -E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\C1.Win.C1Input.4.dll -E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\C1.Win.C1Command.4.xml -E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\C1.Win.C1Input.4.xml -E:\Software-Projekte\DPM\DPM2016\DPM2016\obj\Debug\DPM2016.vbprojResolveAssemblyReference.cache -E:\Software-Projekte\DPM\DPM2016\DPM2016\obj\Debug\DPM2016.frmDBConnection.resources -E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\DPM2018.exe.config -E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\DPM2018.exe -E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\DPM2018.pdb -E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\DPM2018.xml +E:\Software-Projekte\DPM\DPM2016\DPM2016\obj\Debug\DPM2016.frmZahlung.resources +E:\Software-Projekte\DPM\DPM2016\DPM2016\obj\Debug\DPM2016.vbproj.GenerateResource.Cache E:\Software-Projekte\DPM\DPM2016\DPM2016\obj\Debug\DPM2018.exe.licenses E:\Software-Projekte\DPM\DPM2016\DPM2016\obj\Debug\DPM2018.exe E:\Software-Projekte\DPM\DPM2016\DPM2016\obj\Debug\DPM2018.xml E:\Software-Projekte\DPM\DPM2016\DPM2016\obj\Debug\DPM2018.pdb -E:\Software-Projekte\DPM\DPM2016\DPM2016\obj\Debug\DPM2016.frmDentotarDetails.resources -E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\TCDev.SEPA.dll +E:\Software-Projekte\DPM\DPM2016\DPM2016\obj\Debug\DPM2016.frmKalender.resources +E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\Syncfusion.Compression.Base.dll +E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\Syncfusion.Pdf.Base.dll +E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\Syncfusion.Compression.Base.xml +E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\Syncfusion.Pdf.Base.xml +E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\Syncfusion.DocIO.Base.dll +E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\Syncfusion.DocToPDFConverter.Base.dll +E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\Syncfusion.OfficeChart.Base.dll +E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\Syncfusion.DocIO.Base.xml +E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\Syncfusion.DocToPDFConverter.Base.xml +E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\Syncfusion.OfficeChart.Base.xml +E:\Software-Projekte\DPM\DPM2016\DPM2016\obj\Debug\DPM2016.vbproj.CoreCompileInputs.cache +E:\Software-Projekte\DPM\DPM2016\DPM2016\obj\Debug\DPM2016.vbproj.CopyComplete +E:\Software-Projekte\DPM\DPM2016\DPM2016\obj\Debug\DPM2016.frmFormSelector.resources +E:\Software-Projekte\DPM\DPM2016\DPM2016\obj\Debug\DPM2016.Mahnungen.resources +E:\Software-Projekte\DPM\DPM2016\DPM2016\obj\Debug\DPM2016.vbprojResolveAssemblyReference.cache +E:\Software-Projekte\DPM\DPM2016\DPM2016\obj\Debug\DPM2016.frmSuche.resources diff --git a/DPM2016/obj/Debug/DPM2016.vbproj.GenerateResource.Cache b/DPM2016/obj/Debug/DPM2016.vbproj.GenerateResource.Cache index e477e63..4885a1c 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 a8b1593..52c07bc 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/DesignTimeResolveAssemblyReferences.cache b/DPM2016/obj/Debug/DesignTimeResolveAssemblyReferences.cache index d432357..6504a33 100644 Binary files a/DPM2016/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/DPM2016/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/DPM2016/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/DPM2016/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index a593aeb..dba10fc 100644 Binary files a/DPM2016/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/DPM2016/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/DPM2016/obj/Debug/TempPE/My Project.Resources.Designer.vb.dll b/DPM2016/obj/Debug/TempPE/My Project.Resources.Designer.vb.dll index e97e368..e8c2988 100644 Binary files a/DPM2016/obj/Debug/TempPE/My Project.Resources.Designer.vb.dll and b/DPM2016/obj/Debug/TempPE/My Project.Resources.Designer.vb.dll differ diff --git a/Dentotar/Dentotar.xlsx b/Dentotar/Dentotar.xlsx index 113c080..0bf2fe6 100644 Binary files a/Dentotar/Dentotar.xlsx and b/Dentotar/Dentotar.xlsx differ diff --git a/_FRReporting/bin/Debug/_FRReporting.dll b/_FRReporting/bin/Debug/_FRReporting.dll index 69b10ab..cb9db4b 100644 Binary files a/_FRReporting/bin/Debug/_FRReporting.dll and b/_FRReporting/bin/Debug/_FRReporting.dll differ diff --git a/_FRReporting/bin/Debug/_FRReporting.pdb b/_FRReporting/bin/Debug/_FRReporting.pdb index 9072919..2538213 100644 Binary files a/_FRReporting/bin/Debug/_FRReporting.pdb and b/_FRReporting/bin/Debug/_FRReporting.pdb differ diff --git a/_FRReporting/bin/Debug/_FRReporting.xml b/_FRReporting/bin/Debug/_FRReporting.xml index 44c3ea8..064c1c8 100644 --- a/_FRReporting/bin/Debug/_FRReporting.xml +++ b/_FRReporting/bin/Debug/_FRReporting.xml @@ -6,6 +6,22 @@ _FRReporting + + + Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. + + + + + Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird. + + + + + Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle + Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden. + + Purpose: Data Access class for the table 'Auswertung'. @@ -1307,21 +1323,5 @@ Prüft, ob das Security-Objekt bereits auf der DB vorhanden ist - - - Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. - - - - - Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird. - - - - - Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle - Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden. - - diff --git a/_FRReporting/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/_FRReporting/obj/Debug/DesignTimeResolveAssemblyReferences.cache index cbd16aa..e47ebe6 100644 Binary files a/_FRReporting/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/_FRReporting/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/_FRReporting/obj/Debug/_FRReporting.dll b/_FRReporting/obj/Debug/_FRReporting.dll index 69b10ab..cb9db4b 100644 Binary files a/_FRReporting/obj/Debug/_FRReporting.dll and b/_FRReporting/obj/Debug/_FRReporting.dll differ diff --git a/_FRReporting/obj/Debug/_FRReporting.pdb b/_FRReporting/obj/Debug/_FRReporting.pdb index 9072919..2538213 100644 Binary files a/_FRReporting/obj/Debug/_FRReporting.pdb and b/_FRReporting/obj/Debug/_FRReporting.pdb differ diff --git a/_FRReporting/obj/Debug/_FRReporting.vbproj.FileListAbsolute.txt b/_FRReporting/obj/Debug/_FRReporting.vbproj.FileListAbsolute.txt index 970b1f4..d3e28a1 100644 --- a/_FRReporting/obj/Debug/_FRReporting.vbproj.FileListAbsolute.txt +++ b/_FRReporting/obj/Debug/_FRReporting.vbproj.FileListAbsolute.txt @@ -43,3 +43,5 @@ E:\Software-Projekte\DPM\DPM2016\_FRReporting\bin\Debug\C1.Win.C1TrueDBGrid.2.dl E:\Software-Projekte\DPM\DPM2016\_FRReporting\bin\Debug\C1.Win.C1TrueDBGrid.2.xml E:\Software-Projekte\DPM\DPM2016\_FRReporting\obj\Debug\_FRReporting.dll E:\Software-Projekte\DPM\DPM2016\_FRReporting\obj\Debug\_FRReporting.pdb +E:\Software-Projekte\DPM\DPM2016\_FRReporting\obj\Debug\_FRReporting.vbproj.CoreCompileInputs.cache +E:\Software-Projekte\DPM\DPM2016\_FRReporting\obj\Debug\_FRReporting.vbproj.CopyComplete diff --git a/_FRReporting/obj/Debug/_FRReporting.vbprojResolveAssemblyReference.cache b/_FRReporting/obj/Debug/_FRReporting.vbprojResolveAssemblyReference.cache index 15a47dc..279547b 100644 Binary files a/_FRReporting/obj/Debug/_FRReporting.vbprojResolveAssemblyReference.cache and b/_FRReporting/obj/Debug/_FRReporting.vbprojResolveAssemblyReference.cache differ diff --git a/_FRReporting/obj/Debug/_FRReporting.xml b/_FRReporting/obj/Debug/_FRReporting.xml index 44c3ea8..064c1c8 100644 --- a/_FRReporting/obj/Debug/_FRReporting.xml +++ b/_FRReporting/obj/Debug/_FRReporting.xml @@ -6,6 +6,22 @@ _FRReporting + + + Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. + + + + + Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird. + + + + + Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle + Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden. + + Purpose: Data Access class for the table 'Auswertung'. @@ -1307,21 +1323,5 @@ Prüft, ob das Security-Objekt bereits auf der DB vorhanden ist - - - Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. - - - - - Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird. - - - - - Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle - Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden. - - diff --git a/_FRReporting/obj/Debug/_frreporting.dll.licenses b/_FRReporting/obj/Debug/_frreporting.dll.licenses index 71bdf9d..5bedb2e 100644 Binary files a/_FRReporting/obj/Debug/_frreporting.dll.licenses and b/_FRReporting/obj/Debug/_frreporting.dll.licenses differ