edv/SDL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Offerten Bugfix

Browse Source
This commit is contained in:
d.breimaier
2022-11-30 09:27:04 +01:00
parent cb246c0d89
commit 359cb312e5
5 changed files with 168 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
SDL/frmLogin.vb
View File

@@ -179,7 +179,13 @@
txtUser.Text = "ADMIN"
txtPwd.Text = "verag#2"
End If
If Environment.MachineName = "H6CCWP3" Then
txtUser.Text = "daniel"
txtPwd.Text = "debug"
End If
End If
End Sub

12
SDL/kunden/usrCntlOfferte.Designer.vb generated
View File

@@ -23,8 +23,8 @@ Partial Class usrCntlOfferte
<System.Diagnostics.DebuggerStepThrough()>
Private Sub InitializeComponent()
Me.components = New System.ComponentModel.Container()
Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Me.lblBesonderheiten = New System.Windows.Forms.Label()
Me.rtbBesonderheiten = New System.Windows.Forms.RichTextBox()
Me.lblOffert = New System.Windows.Forms.TextBox()
@@ -120,8 +120,8 @@ Partial Class usrCntlOfferte
Me.dgvOfferteDetails.AllowUserToDeleteRows = False
Me.dgvOfferteDetails.AllowUserToOrderColumns = True
Me.dgvOfferteDetails.AllowUserToResizeRows = False
DataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
Me.dgvOfferteDetails.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle3
DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
Me.dgvOfferteDetails.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
Me.dgvOfferteDetails.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
Or System.Windows.Forms.AnchorStyles.Left) _
Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
@@ -140,8 +140,8 @@ Partial Class usrCntlOfferte
Me.dgvOfferte.AllowUserToAddRows = False
Me.dgvOfferte.AllowUserToDeleteRows = False
Me.dgvOfferte.AllowUserToResizeRows = False
DataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
Me.dgvOfferte.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle4
DataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
Me.dgvOfferte.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2
Me.dgvOfferte.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
Me.dgvOfferte.BackgroundColor = System.Drawing.Color.White

23
SDL/kunden/usrCntlOfferte.vb
View File

@@ -238,7 +238,6 @@ Public Class usrCntlOfferte
Dim OffertenNr As String = sender.tag
End If
End Sub
@@ -312,7 +311,7 @@ Public Class usrCntlOfferte
dgvOfferteDetails.Rows(e.RowIndex).Cells("Sachbearbeiter").Value = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME
dgvOfferteDetails.Rows(e.RowIndex).Cells("Geändert am").Value = Now
DGVHasChaged = True
saveCurrentOffert()
'saveCurrentOffert()
If isNew = True Then
currentOffert.Art = "Neuanlage"
@@ -326,15 +325,13 @@ Public Class usrCntlOfferte
End If
'DGVHasChaged = True
End Sub
Private Sub btnDeleteOfferte_Click(sender As Object, e As EventArgs) Handles btnDeleteOfferte.Click
If dgvOfferteNew.SelectedRows.Count = 1 Then
If vbYes = MsgBox("Möchten Sie das Offert '" & dgvOfferteNew.SelectedRows(0).Cells("OffertenBez").Value & "' wirklich löschen", vbYesNoCancel) Then
saveCurrentOffert()
currentOffert.Art = "Gelöscht"
currentOffert.Art = "Offert gelöscht"
currentOffert.SAVE()
OfferteArchivieren()
If SQL.doSQL("DELETE FROM Offerten where [KundenNr]='" & kdNr & "' AND [OffertenNr]='" & dgvOfferteNew.SelectedRows(0).Cells("OffertenNr").Value & "' ", "FMZOLL") Then
@@ -365,6 +362,7 @@ Public Class usrCntlOfferte
edit = True
handleEditMode(edit)
checkPerimissionsDGVDetails()
saveCurrentOffert()
End Sub
@@ -388,6 +386,7 @@ Public Class usrCntlOfferte
If ofID > 0 Then
For Each row As DataRow In tmpDataTable.Rows
If tmpDataTable.Rows.Count = 0 Then Exit Sub
Dim oP As New VERAG_PROG_ALLGEMEIN.cOffertPositionArchiv
oP.OfID = ofID
oP.KundenNr = currentOffertArchiv.KundenNr
@@ -427,7 +426,7 @@ Public Class usrCntlOfferte
If SQL.doSQL("DELETE FROM Offerten where [KundenNr]='" & kdNr & "' AND [OffertenNr]='" & dgvOfferteNew.SelectedRows(0).Cells("OffertenNr").Value & "' ", "FMZOLL") Then
isStandard = True
isNew = True
currentOffert.Art = "Neuer Standard"
currentOffert.Art = "Neuer Standard erstellt"
currentOffert.SAVE()
currentOffert.LOAD_POSITIONEN()
If currentOffert.POSITIONEN.Count = 0 Then '
@@ -495,6 +494,7 @@ Public Class usrCntlOfferte
c.ReadOnly = True
handleEditMode(False)
Next
dgvOfferteDetails.AllowUserToDeleteRows = False
Else
For Each c As DataGridViewColumn In .Columns
If (c.Name = "Preis" Or c.Name = "LeistungsBez" Or c.Name = "Anzahl" Or c.Name = "BerechnungsartNr" Or c.Name = "BerechnungsartPosInkludiert") Then
@@ -503,13 +503,14 @@ Public Class usrCntlOfferte
handleEditMode(edit)
Else
c.ReadOnly = True
handleEditMode(edit)
End If
Else
c.ReadOnly = True
End If
Next
dgvOfferteDetails.AllowUserToDeleteRows = edit
End If
End With
@@ -637,11 +638,14 @@ Public Class usrCntlOfferte
cbxArchivierteOffertenAnzeigen.Enabled = False
cbxArchivierteOffertenAnzeigen.Checked = False
dgvOfferteNew.Enabled = False
dgvOfferteDetails.ReadOnly = False
btnOfferteSpeichern.Enabled = True
Else
lblEditMode.Visible = False
cbxArchivierteOffertenAnzeigen.Enabled = True
dgvOfferteNew.Enabled = True
dgvOfferteDetails.ReadOnly = True
btnOfferteSpeichern.Enabled = False
End If
End Sub
@@ -680,4 +684,7 @@ Public Class usrCntlOfferte
End Sub
Private Sub dgvOfferteDetails_UserDeletingRow(sender As Object, e As DataGridViewRowCancelEventArgs) Handles dgvOfferteDetails.UserDeletingRow
DGVHasChaged = True
End Sub
End Class

140
VERAG_PROG_ALLGEMEIN/Classes/Essensbestellung.vb Normal file
View File

@@ -0,0 +1,140 @@

Imports System.Data.SqlClient
Imports System.Reflection
Public Class cEssensbestellung
Property _BASE_id As Integer
Property eb_kw As Object = Nothing
Property eb_mitid As Object = Nothing
Property eb_montag As Object = Nothing
Property eb_dienstag As Object = Nothing
Property eb_mittwoch As Object = Nothing
Property eb_donnerstag As Object = Nothing
Property eb_freitag As Object = Nothing
Property eb_preis As Object = Nothing
Property eb_gebaeude As Object = Nothing
Property eb_abteilung As Object = Nothing
Property eb_datum As Date = Nothing
Public hasEntry = False
Dim SQL As New SQL
Sub New(eb_kw, eb_mitid, eb_gebaeude, eb_abteilung)
Me.eb_kw = eb_kw
Me.eb_mitid = eb_mitid
Me.eb_gebaeude = eb_gebaeude
Me.eb_abteilung = eb_abteilung
LOAD()
End Sub
Sub New()
End Sub
Function getParameterList() As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
'list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("_BASE_id", _BASE_id,, True))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("eb_kw", eb_kw))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("eb_mitid", eb_mitid))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("eb_montag", eb_montag))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("eb_dienstag", eb_dienstag))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("eb_mittwoch", eb_mittwoch))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("eb_donnerstag", eb_donnerstag))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("eb_freitag", eb_freitag))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("eb_gebaeude", eb_gebaeude))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("eb_abteilung", eb_abteilung))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("eb_preis", eb_preis))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("eb_datum", eb_datum))
Return list
End Function
Public Function SAVE() As Boolean
Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
Dim sqlstr = " BEGIN TRAN IF EXISTS(SELECT * FROM tblEssensbestellungen WHERE eb_kw=@eb_kw AND eb_mitid=@eb_mitid) " &
" BEGIN " & getUpdateCmd() & " END " &
" Else " &
" BEGIN " & getInsertCmd() & " END " &
" commit tran "
Return SQL.doSQLVarList(sqlstr, "AVISO", , list)
End Function
Public Sub LOAD()
Try
hasEntry = False
Using conn As SqlConnection = SQL.GetNewOpenConnectionAVISO()
Using cmd As New SqlCommand("SELECT * FROM tblEssensbestellungen WHERE eb_kw=@eb_kw AND eb_mitid=@eb_mitid ", conn)
cmd.Parameters.AddWithValue("@eb_kw", eb_kw)
cmd.Parameters.AddWithValue("@eb_mitid", eb_mitid)
Dim dr = cmd.ExecuteReader()
If dr.Read Then
For Each li In getParameterList()
Dim propInfo As PropertyInfo = Me.GetType.GetProperty(li.Scalarvariable)
If dr.Item(li.Text) Is DBNull.Value Then
propInfo.SetValue(Me, Nothing)
Else
propInfo.SetValue(Me, dr.Item(li.Text))
End If
Next
hasEntry = True
End If
dr.Close()
End Using
End Using
Catch ex As Exception
MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)
End Try
End Sub
Public Function getUpdateCmd() As String
Try
Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
Dim str As String = ""
For Each i In list
If Not i.isPrimaryParam Then
str &= "[" & i.Text & "] = @" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & ","
End If
Next
str = str.Substring(0, str.Length - 1) 'wg. ','
Return (" UPDATE [tblEssensbestellungen] SET " & str & " WHERE eb_kw=@eb_kw AND eb_mitid=@eb_mitid ")
Catch ex As Exception
MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)
End Try
Return ""
End Function
Public Function getInsertCmd() As String
Try
Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
Dim str As String = ""
Dim values As String = ""
For Each i In list
If Not i.isPrimaryParam Then
str &= "[" & i.Text & "],"
values &= "@" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & ","
End If
Next
str = str.Substring(0, str.Length - 1) 'wg. ','
values = values.Substring(0, values.Length - 1) 'wg. ','
Return (" INSERT INTO tblEssensbestellungen (" & str & ") VALUES(" & values & ") ")
Catch ex As Exception
MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)
End Try
Return ""
End Function
End Class

1
VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj
View File

@@ -364,6 +364,7 @@
<Compile Include="Classes\cRechnungsausgang.vb" />
<Compile Include="Classes\cRechnungsnummern.vb" />
<Compile Include="Classes\cUserActivity.vb" />
<Compile Include="Classes\Essensbestellung.vb" />
<Compile Include="Classes\old_cRKSV_DE.vb" />
<Compile Include="Classes\cSDL.vb" />
<Compile Include="Classes\cSDL_LKW.vb" />