diff --git a/SDL/mdm/Besuchsberichte/frmBesuchsberichte.vb b/SDL/mdm/Besuchsberichte/frmBesuchsberichte.vb index 4a598a62..db7fc2e6 100644 --- a/SDL/mdm/Besuchsberichte/frmBesuchsberichte.vb +++ b/SDL/mdm/Besuchsberichte/frmBesuchsberichte.vb @@ -77,7 +77,7 @@ txtDerzeitigerLieferant.Text = If(BB.bb_DerzeitigerLieferant, "") cboZufrieden.changeItem(If(BB.bb_Zufrieden, "")) - txtZufriedenNEIN.Text = If(BB.bb_ZufriedenNEIN, "") + txtZufriedenNEIN.Text = If(BB.bb_ZufriedenNEIN, "") 'Konvertierung in Bit-Datatyoe durchführen txtGarantie.Text = If(BB.bb_Garantie, "") txtVermerk.Text = If(BB.bb_Vermerk, "") @@ -103,7 +103,7 @@ BB.bb_Anpsprechpartner = txtAnsprechpartner.Text BB.bb_Mail = txtMail.Text BB.bb_Telefon = txtTel.Text - BB.bb_Umsatz = If(txtUmsatz._value = 22, Nothing, txtUmsatz._value) + BB.bb_Umsatz = If(txtUmsatz._value = "", Nothing, txtUmsatz._value) BB.bb_FuhrparkEigentum = txtFuhrparkEigene.Text BB.bb_FuhrparkLeasing = txtFuhrparkLeasing.Text BB.bb_LKW_Plane = cbxPlane.Checked @@ -169,6 +169,6 @@ End Sub Private Sub btnPDFReport_Click(sender As Object, e As EventArgs) Handles btnPDFReport.Click - + 'Erstellung der BerichtsPDF End Sub End Class \ No newline at end of file diff --git a/SDL/mdm/Besuchsberichte/usrCntlBesuchsberichte.Designer.vb b/SDL/mdm/Besuchsberichte/usrCntlBesuchsberichte.Designer.vb index bc4a6dee..6b61c160 100644 --- a/SDL/mdm/Besuchsberichte/usrCntlBesuchsberichte.Designer.vb +++ b/SDL/mdm/Besuchsberichte/usrCntlBesuchsberichte.Designer.vb @@ -26,8 +26,8 @@ Partial Class usrCntlBesuchsberichte Me.pnlFilter = New System.Windows.Forms.Panel() Me.Label1 = New System.Windows.Forms.Label() Me.Panel1 = New System.Windows.Forms.Panel() - Me.Button14 = New System.Windows.Forms.Button() - Me.FlatButton2 = New System.Windows.Forms.Button() + Me.btnNew = New System.Windows.Forms.Button() + Me.btnDelete = New System.Windows.Forms.Button() Me.dgvBesuchsberichte = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.Panel1.SuspendLayout() CType(Me.dgvBesuchsberichte, System.ComponentModel.ISupportInitialize).BeginInit() @@ -57,9 +57,9 @@ Partial Class usrCntlBesuchsberichte 'Panel1 ' Me.Panel1.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.Panel1.Controls.Add(Me.Button14) + Me.Panel1.Controls.Add(Me.btnNew) Me.Panel1.Controls.Add(Me.Label1) - Me.Panel1.Controls.Add(Me.FlatButton2) + Me.Panel1.Controls.Add(Me.btnDelete) Me.Panel1.Controls.Add(Me.pnlFilter) Me.Panel1.Dock = System.Windows.Forms.DockStyle.Top Me.Panel1.Location = New System.Drawing.Point(0, 0) @@ -67,36 +67,36 @@ Partial Class usrCntlBesuchsberichte Me.Panel1.Size = New System.Drawing.Size(1072, 77) Me.Panel1.TabIndex = 13 ' - 'Button14 + 'btnNew ' - Me.Button14.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.Button14.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button14.ForeColor = System.Drawing.Color.Black - Me.Button14.Image = Global.SDL.My.Resources.Resources.plus - Me.Button14.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button14.Location = New System.Drawing.Point(898, 3) - Me.Button14.Name = "Button14" - Me.Button14.Size = New System.Drawing.Size(75, 39) - Me.Button14.TabIndex = 18 - Me.Button14.Text = "Neu" - Me.Button14.TextAlign = System.Drawing.ContentAlignment.MiddleRight - Me.Button14.UseVisualStyleBackColor = True + Me.btnNew.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.btnNew.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnNew.ForeColor = System.Drawing.Color.Black + Me.btnNew.Image = Global.SDL.My.Resources.Resources.plus + Me.btnNew.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnNew.Location = New System.Drawing.Point(898, 3) + Me.btnNew.Name = "btnNew" + Me.btnNew.Size = New System.Drawing.Size(75, 39) + Me.btnNew.TabIndex = 18 + Me.btnNew.Text = "Neu" + Me.btnNew.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.btnNew.UseVisualStyleBackColor = True ' - 'FlatButton2 + 'btnDelete ' - Me.FlatButton2.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.FlatButton2.Enabled = False - Me.FlatButton2.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.FlatButton2.ForeColor = System.Drawing.Color.Black - Me.FlatButton2.Image = Global.SDL.My.Resources.Resources.del - Me.FlatButton2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.FlatButton2.Location = New System.Drawing.Point(983, 3) - Me.FlatButton2.Name = "FlatButton2" - Me.FlatButton2.Size = New System.Drawing.Size(86, 39) - Me.FlatButton2.TabIndex = 19 - Me.FlatButton2.Text = "Löschen" - Me.FlatButton2.TextAlign = System.Drawing.ContentAlignment.MiddleRight - Me.FlatButton2.UseVisualStyleBackColor = True + Me.btnDelete.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.btnDelete.Enabled = False + Me.btnDelete.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnDelete.ForeColor = System.Drawing.Color.Black + Me.btnDelete.Image = Global.SDL.My.Resources.Resources.del + Me.btnDelete.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnDelete.Location = New System.Drawing.Point(983, 3) + Me.btnDelete.Name = "btnDelete" + Me.btnDelete.Size = New System.Drawing.Size(86, 39) + Me.btnDelete.TabIndex = 19 + Me.btnDelete.Text = "Löschen" + Me.btnDelete.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.btnDelete.UseVisualStyleBackColor = True ' 'dgvBesuchsberichte ' @@ -133,6 +133,6 @@ Partial Class usrCntlBesuchsberichte Friend WithEvents Label1 As System.Windows.Forms.Label Friend WithEvents Panel1 As System.Windows.Forms.Panel Friend WithEvents dgvBesuchsberichte As VERAG_PROG_ALLGEMEIN.MyDatagridview - Friend WithEvents Button14 As Button - Friend WithEvents FlatButton2 As Button + Friend WithEvents btnNew As Button + Friend WithEvents btnDelete As Button End Class diff --git a/SDL/mdm/Besuchsberichte/usrCntlBesuchsberichte.vb b/SDL/mdm/Besuchsberichte/usrCntlBesuchsberichte.vb index 9c9914ae..fdbeb98e 100644 --- a/SDL/mdm/Besuchsberichte/usrCntlBesuchsberichte.vb +++ b/SDL/mdm/Besuchsberichte/usrCntlBesuchsberichte.vb @@ -55,20 +55,13 @@ Public Class usrCntlBesuchsberichte End Try End Sub - Private Sub Button14_Click(sender As Object, e As EventArgs) - End Sub - - Private Sub FlatButton2_Click_1(sender As Object, e As EventArgs) - - End Sub - - Private Sub Button14_Click_1(sender As Object, e As EventArgs) Handles Button14.Click + Private Sub btnNew_Click(sender As Object, e As EventArgs) Handles btnNew.Click Dim f As New frmBesuchsberichte f.ShowDialog(Me) End Sub - Private Sub FlatButton2_Click(sender As Object, e As EventArgs) Handles FlatButton2.Click + Private Sub btnDelete_Click(sender As Object, e As EventArgs) Handles btnDelete.Click If dgvBesuchsberichte.SelectedRows.Count > 0 Then If vbYes = MsgBox("Möchten Sie den Eintrag wirklich löschen?", vbYesNoCancel) Then If VERAG_PROG_ALLGEMEIN.cBesuchsbericht.DELETE(dgvBesuchsberichte.SelectedRows(0).Cells("bb_id").Value) Then