diff --git a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlGestellungsgarantie.Designer.vb b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlGestellungsgarantie.Designer.vb index 8d45e2a8..e7d31180 100644 --- a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlGestellungsgarantie.Designer.vb +++ b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlGestellungsgarantie.Designer.vb @@ -129,10 +129,12 @@ Partial Class usrcntlGestellungsgarantie Me.txtEmail._DateTimeOnly = False Me.txtEmail._numbersOnly = False Me.txtEmail._numbersOnlyKommastellen = "" + Me.txtEmail._numbersOnlyTrennzeichen = True Me.txtEmail._Prozent = False Me.txtEmail._ShortDateNew = False Me.txtEmail._ShortDateOnly = False Me.txtEmail._TimeOnly = False + Me.txtEmail._TimeOnly_Seconds = False Me.txtEmail._value = Nothing Me.txtEmail._Waehrung = False Me.txtEmail._WaehrungZeichen = True @@ -150,10 +152,12 @@ Partial Class usrcntlGestellungsgarantie Me.txtFax._DateTimeOnly = False Me.txtFax._numbersOnly = False Me.txtFax._numbersOnlyKommastellen = "" + Me.txtFax._numbersOnlyTrennzeichen = True Me.txtFax._Prozent = False Me.txtFax._ShortDateNew = False Me.txtFax._ShortDateOnly = False Me.txtFax._TimeOnly = False + Me.txtFax._TimeOnly_Seconds = False Me.txtFax._value = Nothing Me.txtFax._Waehrung = False Me.txtFax._WaehrungZeichen = True @@ -171,10 +175,12 @@ Partial Class usrcntlGestellungsgarantie Me.txtTel._DateTimeOnly = False Me.txtTel._numbersOnly = False Me.txtTel._numbersOnlyKommastellen = "" + Me.txtTel._numbersOnlyTrennzeichen = True Me.txtTel._Prozent = False Me.txtTel._ShortDateNew = False Me.txtTel._ShortDateOnly = False Me.txtTel._TimeOnly = False + Me.txtTel._TimeOnly_Seconds = False Me.txtTel._value = Nothing Me.txtTel._Waehrung = False Me.txtTel._WaehrungZeichen = True @@ -192,10 +198,12 @@ Partial Class usrcntlGestellungsgarantie Me.txtAnsprechpartner._DateTimeOnly = False Me.txtAnsprechpartner._numbersOnly = False Me.txtAnsprechpartner._numbersOnlyKommastellen = "" + Me.txtAnsprechpartner._numbersOnlyTrennzeichen = True Me.txtAnsprechpartner._Prozent = False Me.txtAnsprechpartner._ShortDateNew = False Me.txtAnsprechpartner._ShortDateOnly = False Me.txtAnsprechpartner._TimeOnly = False + Me.txtAnsprechpartner._TimeOnly_Seconds = False Me.txtAnsprechpartner._value = Nothing Me.txtAnsprechpartner._Waehrung = False Me.txtAnsprechpartner._WaehrungZeichen = True @@ -213,10 +221,12 @@ Partial Class usrcntlGestellungsgarantie Me.txtAdresse2._DateTimeOnly = False Me.txtAdresse2._numbersOnly = False Me.txtAdresse2._numbersOnlyKommastellen = "" + Me.txtAdresse2._numbersOnlyTrennzeichen = True Me.txtAdresse2._Prozent = False Me.txtAdresse2._ShortDateNew = False Me.txtAdresse2._ShortDateOnly = False Me.txtAdresse2._TimeOnly = False + Me.txtAdresse2._TimeOnly_Seconds = False Me.txtAdresse2._value = Nothing Me.txtAdresse2._Waehrung = False Me.txtAdresse2._WaehrungZeichen = True @@ -234,10 +244,12 @@ Partial Class usrcntlGestellungsgarantie Me.txtAdresse1._DateTimeOnly = False Me.txtAdresse1._numbersOnly = False Me.txtAdresse1._numbersOnlyKommastellen = "" + Me.txtAdresse1._numbersOnlyTrennzeichen = True Me.txtAdresse1._Prozent = False Me.txtAdresse1._ShortDateNew = False Me.txtAdresse1._ShortDateOnly = False Me.txtAdresse1._TimeOnly = False + Me.txtAdresse1._TimeOnly_Seconds = False Me.txtAdresse1._value = Nothing Me.txtAdresse1._Waehrung = False Me.txtAdresse1._WaehrungZeichen = True @@ -255,10 +267,12 @@ Partial Class usrcntlGestellungsgarantie Me.txtFirma._DateTimeOnly = False Me.txtFirma._numbersOnly = False Me.txtFirma._numbersOnlyKommastellen = "" + Me.txtFirma._numbersOnlyTrennzeichen = True Me.txtFirma._Prozent = False Me.txtFirma._ShortDateNew = False Me.txtFirma._ShortDateOnly = False Me.txtFirma._TimeOnly = False + Me.txtFirma._TimeOnly_Seconds = False Me.txtFirma._value = Nothing Me.txtFirma._Waehrung = False Me.txtFirma._WaehrungZeichen = True @@ -353,10 +367,12 @@ Partial Class usrcntlGestellungsgarantie Me.txtBestimmungszollamt._DateTimeOnly = False Me.txtBestimmungszollamt._numbersOnly = False Me.txtBestimmungszollamt._numbersOnlyKommastellen = "" + Me.txtBestimmungszollamt._numbersOnlyTrennzeichen = True Me.txtBestimmungszollamt._Prozent = False Me.txtBestimmungszollamt._ShortDateNew = False Me.txtBestimmungszollamt._ShortDateOnly = False Me.txtBestimmungszollamt._TimeOnly = False + Me.txtBestimmungszollamt._TimeOnly_Seconds = False Me.txtBestimmungszollamt._value = Nothing Me.txtBestimmungszollamt._Waehrung = False Me.txtBestimmungszollamt._WaehrungZeichen = True @@ -384,10 +400,12 @@ Partial Class usrcntlGestellungsgarantie Me.txtEORI._DateTimeOnly = False Me.txtEORI._numbersOnly = False Me.txtEORI._numbersOnlyKommastellen = "" + Me.txtEORI._numbersOnlyTrennzeichen = True Me.txtEORI._Prozent = False Me.txtEORI._ShortDateNew = False Me.txtEORI._ShortDateOnly = False Me.txtEORI._TimeOnly = False + Me.txtEORI._TimeOnly_Seconds = False Me.txtEORI._value = Nothing Me.txtEORI._Waehrung = False Me.txtEORI._WaehrungZeichen = True @@ -414,10 +432,12 @@ Partial Class usrcntlGestellungsgarantie Me.txtZulassungsnummer1._DateTimeOnly = False Me.txtZulassungsnummer1._numbersOnly = False Me.txtZulassungsnummer1._numbersOnlyKommastellen = "" + Me.txtZulassungsnummer1._numbersOnlyTrennzeichen = True Me.txtZulassungsnummer1._Prozent = False Me.txtZulassungsnummer1._ShortDateNew = False Me.txtZulassungsnummer1._ShortDateOnly = False Me.txtZulassungsnummer1._TimeOnly = False + Me.txtZulassungsnummer1._TimeOnly_Seconds = False Me.txtZulassungsnummer1._value = Nothing Me.txtZulassungsnummer1._Waehrung = False Me.txtZulassungsnummer1._WaehrungZeichen = True @@ -465,10 +485,12 @@ Partial Class usrcntlGestellungsgarantie Me.txtZulassungsnummer2._DateTimeOnly = False Me.txtZulassungsnummer2._numbersOnly = False Me.txtZulassungsnummer2._numbersOnlyKommastellen = "" + Me.txtZulassungsnummer2._numbersOnlyTrennzeichen = True Me.txtZulassungsnummer2._Prozent = False Me.txtZulassungsnummer2._ShortDateNew = False Me.txtZulassungsnummer2._ShortDateOnly = False Me.txtZulassungsnummer2._TimeOnly = False + Me.txtZulassungsnummer2._TimeOnly_Seconds = False Me.txtZulassungsnummer2._value = Nothing Me.txtZulassungsnummer2._Waehrung = False Me.txtZulassungsnummer2._WaehrungZeichen = True @@ -496,10 +518,12 @@ Partial Class usrcntlGestellungsgarantie Me.txtAnmerkung1._DateTimeOnly = False Me.txtAnmerkung1._numbersOnly = False Me.txtAnmerkung1._numbersOnlyKommastellen = "" + Me.txtAnmerkung1._numbersOnlyTrennzeichen = True Me.txtAnmerkung1._Prozent = False Me.txtAnmerkung1._ShortDateNew = False Me.txtAnmerkung1._ShortDateOnly = False Me.txtAnmerkung1._TimeOnly = False + Me.txtAnmerkung1._TimeOnly_Seconds = False Me.txtAnmerkung1._value = Nothing Me.txtAnmerkung1._Waehrung = False Me.txtAnmerkung1._WaehrungZeichen = True @@ -517,10 +541,12 @@ Partial Class usrcntlGestellungsgarantie Me.txtAnmerkung2._DateTimeOnly = False Me.txtAnmerkung2._numbersOnly = False Me.txtAnmerkung2._numbersOnlyKommastellen = "" + Me.txtAnmerkung2._numbersOnlyTrennzeichen = True Me.txtAnmerkung2._Prozent = False Me.txtAnmerkung2._ShortDateNew = False Me.txtAnmerkung2._ShortDateOnly = False Me.txtAnmerkung2._TimeOnly = False + Me.txtAnmerkung2._TimeOnly_Seconds = False Me.txtAnmerkung2._value = Nothing Me.txtAnmerkung2._Waehrung = False Me.txtAnmerkung2._WaehrungZeichen = True @@ -538,10 +564,12 @@ Partial Class usrcntlGestellungsgarantie Me.txtAnmerkung3._DateTimeOnly = False Me.txtAnmerkung3._numbersOnly = False Me.txtAnmerkung3._numbersOnlyKommastellen = "" + Me.txtAnmerkung3._numbersOnlyTrennzeichen = True Me.txtAnmerkung3._Prozent = False Me.txtAnmerkung3._ShortDateNew = False Me.txtAnmerkung3._ShortDateOnly = False Me.txtAnmerkung3._TimeOnly = False + Me.txtAnmerkung3._TimeOnly_Seconds = False Me.txtAnmerkung3._value = Nothing Me.txtAnmerkung3._Waehrung = False Me.txtAnmerkung3._WaehrungZeichen = True @@ -602,10 +630,7 @@ Partial Class usrcntlGestellungsgarantie End Sub Friend WithEvents lbl As System.Windows.Forms.Label - Friend WithEvents txtFirma As VERAG_PROG_ALLGEMEIN.MyTextBox - Friend WithEvents txtAdresse1 As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents Label1 As System.Windows.Forms.Label - Friend WithEvents txtAdresse2 As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents txtAnsprechpartner As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents Label2 As System.Windows.Forms.Label Friend WithEvents txtFax As VERAG_PROG_ALLGEMEIN.MyTextBox @@ -621,10 +646,7 @@ Partial Class usrcntlGestellungsgarantie Friend WithEvents btnUp As System.Windows.Forms.Button Friend WithEvents btnDel As System.Windows.Forms.Button Friend WithEvents Label12 As System.Windows.Forms.Label - Friend WithEvents cboSprache As VERAG_PROG_ALLGEMEIN.MyComboBox - Friend WithEvents txtBestimmungszollamt As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents Label3 As System.Windows.Forms.Label - Friend WithEvents txtEORI As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents Label7 As System.Windows.Forms.Label Friend WithEvents txtZulassungsnummer1 As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents Label8 As System.Windows.Forms.Label @@ -635,4 +657,10 @@ Partial Class usrcntlGestellungsgarantie Friend WithEvents txtAnmerkung1 As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents txtAnmerkung2 As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents txtAnmerkung3 As VERAG_PROG_ALLGEMEIN.MyTextBox + Public WithEvents cboSprache As VERAG_PROG_ALLGEMEIN.MyComboBox + Public WithEvents txtAdresse1 As VERAG_PROG_ALLGEMEIN.MyTextBox + Public WithEvents txtBestimmungszollamt As VERAG_PROG_ALLGEMEIN.MyTextBox + Public WithEvents txtEORI As VERAG_PROG_ALLGEMEIN.MyTextBox + Public WithEvents txtAdresse2 As VERAG_PROG_ALLGEMEIN.MyTextBox + Public WithEvents txtFirma As VERAG_PROG_ALLGEMEIN.MyTextBox End Class diff --git a/SDL/kunden/frmOffertenBearbeiten.vb b/SDL/kunden/frmOffertenBearbeiten.vb index 0559f0ba..406e31f9 100644 --- a/SDL/kunden/frmOffertenBearbeiten.vb +++ b/SDL/kunden/frmOffertenBearbeiten.vb @@ -54,12 +54,14 @@ ' MsgBox(c._value) If c.enabled And c.checked Then Dim o As New VERAG_PROG_ALLGEMEIN.cOfferte(kdnr, c._value, False) + o.Art = "Neuanlage" o.SAVE() 'speichern o.LOAD_POSITIONEN() 'positionen Laden If o.POSITIONEN.Count = 0 Then 'wenn keine POS --> neues Offert o.RESET_STANDARTOFFERTEN_FIRMA(VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME, FIRMA_TMP) '--> Standartofferten laden End If + 'SQL.doSQL("INSERT INTO Offertenpositionen WHERE KundenNr=" & kdnr & " AND [OffertenNr]=" & kdnr & "") Else diff --git a/SDL/kunden/usrCntlOfferte.Designer.vb b/SDL/kunden/usrCntlOfferte.Designer.vb index 1c4ffddf..53a25912 100644 --- a/SDL/kunden/usrCntlOfferte.Designer.vb +++ b/SDL/kunden/usrCntlOfferte.Designer.vb @@ -56,17 +56,19 @@ Partial Class usrCntlOfferte Me.btnStandardLaden = New System.Windows.Forms.Button() Me.btnDeleteOfferte = New VERAG_PROG_ALLGEMEIN.FlatButton() Me.sbLeistungAdd = New VERAG_PROG_ALLGEMEIN.MySearchBox() - Me.fbtnBearbeiten = New VERAG_PROG_ALLGEMEIN.FlatButton() Me.btnCreateOffert = New VERAG_PROG_ALLGEMEIN.FlatButton() Me.cbxArchivierteOfferten = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.cbxArchivierteOffertenAnzeigen = New System.Windows.Forms.CheckBox() Me.lblArchivierteOfferten = New System.Windows.Forms.Label() Me.lblEditMode = New System.Windows.Forms.Label() + Me.btnOffertbearbeiten = New System.Windows.Forms.Button() + Me.dgvOfferteNew = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) CType(Me.dgvOfferteDetails, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.dgvOfferte, System.ComponentModel.ISupportInitialize).BeginInit() Me.cntxtAddSdl.SuspendLayout() Me.pnlSperre.SuspendLayout() Me.pnlEdit.SuspendLayout() + CType(Me.dgvOfferteNew, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'lblBesonderheiten @@ -137,7 +139,6 @@ Partial Class usrCntlOfferte ' Me.dgvOfferte.AllowUserToAddRows = False Me.dgvOfferte.AllowUserToDeleteRows = False - Me.dgvOfferte.AllowUserToOrderColumns = True 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 @@ -512,21 +513,6 @@ Partial Class usrCntlOfferte Me.sbLeistungAdd.usrcntl = Nothing Me.sbLeistungAdd.Visible = False ' - 'fbtnBearbeiten - ' - Me.fbtnBearbeiten.allowBorder = False - Me.fbtnBearbeiten.BackgroundImage = Global.SDL.My.Resources.Resources.stift - Me.fbtnBearbeiten.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.fbtnBearbeiten.FlatAppearance.BorderSize = 0 - Me.fbtnBearbeiten.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.fbtnBearbeiten.ForeColor = System.Drawing.Color.Black - Me.fbtnBearbeiten.Location = New System.Drawing.Point(898, 5) - Me.fbtnBearbeiten.Name = "fbtnBearbeiten" - Me.fbtnBearbeiten.Size = New System.Drawing.Size(20, 20) - Me.fbtnBearbeiten.TabIndex = 3 - Me.fbtnBearbeiten.UseVisualStyleBackColor = True - Me.fbtnBearbeiten.Visible = False - ' 'btnCreateOffert ' Me.btnCreateOffert.allowBorder = False @@ -587,11 +573,44 @@ Partial Class usrCntlOfferte Me.lblEditMode.TabIndex = 28 Me.lblEditMode.Text = "Edit Mode" ' + 'btnOffertbearbeiten + ' + Me.btnOffertbearbeiten.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.btnOffertbearbeiten.Location = New System.Drawing.Point(851, 4) + Me.btnOffertbearbeiten.Name = "btnOffertbearbeiten" + Me.btnOffertbearbeiten.Size = New System.Drawing.Size(100, 25) + Me.btnOffertbearbeiten.TabIndex = 29 + Me.btnOffertbearbeiten.Text = "Offert bearbeiten" + Me.btnOffertbearbeiten.UseVisualStyleBackColor = True + Me.btnOffertbearbeiten.Visible = False + ' + 'dgvOfferteNew + ' + Me.dgvOfferteNew.AKTUALISIERUNGS_INTERVALL = -1 + Me.dgvOfferteNew.AllowUserToAddRows = False + Me.dgvOfferteNew.AllowUserToDeleteRows = False + Me.dgvOfferteNew.AllowUserToOrderColumns = True + Me.dgvOfferteNew.AllowUserToResizeRows = False + Me.dgvOfferteNew.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ + Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) + Me.dgvOfferteNew.BackgroundColor = System.Drawing.Color.White + Me.dgvOfferteNew.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.dgvOfferteNew.Location = New System.Drawing.Point(0, 32) + Me.dgvOfferteNew.MultiSelect = False + Me.dgvOfferteNew.Name = "dgvOfferteNew" + Me.dgvOfferteNew.ReadOnly = True + Me.dgvOfferteNew.RowHeadersVisible = False + Me.dgvOfferteNew.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect + Me.dgvOfferteNew.Size = New System.Drawing.Size(228, 347) + Me.dgvOfferteNew.TabIndex = 30 + ' 'usrCntlOfferte ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.BackColor = System.Drawing.Color.White + Me.Controls.Add(Me.dgvOfferteNew) + Me.Controls.Add(Me.btnOffertbearbeiten) Me.Controls.Add(Me.lblEditMode) Me.Controls.Add(Me.lblArchivierteOfferten) Me.Controls.Add(Me.cbxArchivierteOffertenAnzeigen) @@ -603,7 +622,6 @@ Partial Class usrCntlOfferte Me.Controls.Add(Me.sbLeistungAdd) Me.Controls.Add(Me.btnDeleteLeistung) Me.Controls.Add(Me.btnAddLeistung) - Me.Controls.Add(Me.fbtnBearbeiten) Me.Controls.Add(Me.btnCreateOffert) Me.Controls.Add(Me.Label11) Me.Controls.Add(Me.lblBesonderheiten) @@ -622,6 +640,7 @@ Partial Class usrCntlOfferte Me.pnlSperre.PerformLayout() Me.pnlEdit.ResumeLayout(False) Me.pnlEdit.PerformLayout() + CType(Me.dgvOfferteNew, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -633,7 +652,6 @@ Partial Class usrCntlOfferte Friend WithEvents dgvOfferteDetails As System.Windows.Forms.DataGridView Friend WithEvents dgvOfferte As System.Windows.Forms.DataGridView Friend WithEvents btnCreateOffert As VERAG_PROG_ALLGEMEIN.FlatButton - Friend WithEvents fbtnBearbeiten As VERAG_PROG_ALLGEMEIN.FlatButton Friend WithEvents FlatButton5 As Button Friend WithEvents txtSperreGrund As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents txtSperreDat As VERAG_PROG_ALLGEMEIN.MyTextBox @@ -664,4 +682,6 @@ Partial Class usrCntlOfferte Friend WithEvents cbxArchivierteOffertenAnzeigen As CheckBox Friend WithEvents lblArchivierteOfferten As Label Friend WithEvents lblEditMode As Label + Friend WithEvents btnOffertbearbeiten As Button + Friend WithEvents dgvOfferteNew As VERAG_PROG_ALLGEMEIN.MyDatagridview End Class diff --git a/SDL/kunden/usrCntlOfferte.vb b/SDL/kunden/usrCntlOfferte.vb index 2be7bd65..94c13208 100644 --- a/SDL/kunden/usrCntlOfferte.vb +++ b/SDL/kunden/usrCntlOfferte.vb @@ -51,13 +51,15 @@ Public Class usrCntlOfferte End If - With dgvOfferte - .DataSource = SQL.loadDgvBySql("SELECT Offerten.OffertenNr, cast(Offerten.OffertenNr as varchar(3)) + ' - ' + Offertenstamm.OffertenBez as OffertenBez ,Offerten.Besonderheiten FROM Offerten inner join Offertenstamm on [Offerten].OffertenNr=Offertenstamm.OffertenNr WHERE Offerten.KundenNr='" & kdNr & "' " & where & " ORDER BY Offerten.OffertenNr ", "FMZOLL") + With dgvOfferteNew + .DataSource = SQL.loadDgvBySql("SELECT Offerten.OffertenNr, cast(Offerten.OffertenNr as varchar(3)) + ' - ' + Offertenstamm.OffertenBez as OffertenBez ,Offerten.Besonderheiten, Offerten.Art as Art FROM Offerten inner join Offertenstamm on [Offerten].OffertenNr=Offertenstamm.OffertenNr WHERE Offerten.KundenNr='" & kdNr & "' " & where & " ORDER BY Offerten.OffertenNr ", "FMZOLL") .Columns("OffertenNr").Visible = False .Columns("Besonderheiten").Visible = False ' .Columns("OffertenNr").HeaderText = "Nr" .Columns("OffertenBez").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill .Columns("OffertenBez").HeaderText = "Bezeichnung" + .Columns("Art").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill + .Columns("Art").HeaderText = "Art" End With End Sub @@ -140,6 +142,7 @@ Public Class usrCntlOfferte .Columns("Preisänderung").DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopRight ' .Columns("OffertenBez").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill ' .Columns("OffertenBez").HeaderText = "Bezeichnung" + loaded = True End With @@ -150,14 +153,14 @@ Public Class usrCntlOfferte - Private Sub dgvOfferteDetails_SelectionChanged(sender As Object, e As EventArgs) Handles dgvOfferte.SelectionChanged + Private Sub dgvOfferteDetails_SelectionChanged(sender As Object, e As EventArgs) Handles dgvOfferteNew.SelectionChanged cbxArchivierteOffertenAnzeigen.Checked = False cbxArchivierteOfferten.Items.Clear() checkPermissions() - If dgvOfferte.RowCount > 0 Then + If dgvOfferteNew.RowCount > 0 Then - rtbBesonderheiten.Text = cSqlDb.checkNullStr(dgvOfferte.Rows(0).Cells("Besonderheiten").Value) + rtbBesonderheiten.Text = cSqlDb.checkNullStr(dgvOfferteNew.Rows(0).Cells("Besonderheiten").Value) Else btnStandardLaden.Visible = False cbxArchivierteOfferten.Enabled = False @@ -165,8 +168,8 @@ Public Class usrCntlOfferte End If - If dgvOfferte.SelectedRows.Count > 0 Then - initDGVOfferteDetails(dgvOfferte.SelectedRows(0).Cells("OffertenNr").Value) + If dgvOfferteNew.SelectedRows.Count > 0 Then + initDGVOfferteDetails(dgvOfferteNew.SelectedRows(0).Cells("OffertenNr").Value) End If End Sub @@ -197,8 +200,10 @@ Public Class usrCntlOfferte If f.ShowDialog() = DialogResult.OK Then initDGVOfferte() RaiseEvent OfferteChanged() - dgvOfferte.Enabled = True + dgvOfferteNew.Enabled = True isNew = True + isStandard = False + DGVHasChaged = True End If End Sub @@ -251,13 +256,13 @@ Public Class usrCntlOfferte lblLeistunAddErr2.Visible = False Label3.Visible = False - If dgvOfferte.SelectedRows.Count <> 1 Then + If dgvOfferteNew.SelectedRows.Count <> 1 Then Label3.Visible = True End If 'Fehlerprüfung: '------- If cboLeistungenAdd._value = "" Then lblLeistunAddErr.Visible = True : Exit Sub - If LeistungsBezexists(cboLeistungenAdd._value, MyTextBox1.Text, dgvOfferte.SelectedRows(0).Cells("OffertenNr").Value) Then lblLeistunAddErr2.Visible = True : Exit Sub + If LeistungsBezexists(cboLeistungenAdd._value, MyTextBox1.Text, dgvOfferteNew.SelectedRows(0).Cells("OffertenNr").Value) Then lblLeistunAddErr2.Visible = True : Exit Sub '------- Dim l As New VERAG_PROG_ALLGEMEIN.cLeistungen(cboLeistungenAdd._value) @@ -265,7 +270,7 @@ Public Class usrCntlOfferte o.KundenNr = kdNr o.LeistungsNr = l.LeistungsNr o.LeistungsBez = MyTextBox1.Text - o.OffertenNr = dgvOfferte.SelectedRows(0).Cells("OffertenNr").Value + o.OffertenNr = dgvOfferteNew.SelectedRows(0).Cells("OffertenNr").Value 'o.Preis=l.preis o.BerechnungsartNr = l.BerechnungsartNr 'o.Anzahl = l.m @@ -283,8 +288,6 @@ Public Class usrCntlOfferte initDGVOfferteDetails(o.OffertenNr) addLeistung = True End If - DGVHasChaged = True - End Sub @@ -314,14 +317,20 @@ Public Class usrCntlOfferte DGVHasChaged = True End If + saveCurrentOffert() + currentOffert.Art = "Geändert" + currentOffert.SAVE() 'DGVHasChaged = True End Sub Private Sub btnDeleteOfferte_Click(sender As Object, e As EventArgs) Handles btnDeleteOfferte.Click - If dgvOfferte.SelectedRows.Count = 1 Then - If vbYes = MsgBox("Möchten Sie das Offert '" & dgvOfferte.SelectedRows(0).Cells("OffertenBez").Value & "' wirklich löschen", vbYesNoCancel) Then - If SQL.doSQL("DELETE FROM Offerten where [KundenNr]='" & kdNr & "' AND [OffertenNr]='" & dgvOfferte.SelectedRows(0).Cells("OffertenNr").Value & "' ", "FMZOLL") Then + 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 + currentOffert.Art = "gelöscht" + currentOffert.SAVE() + saveArchivierteOfferteNew() + If SQL.doSQL("DELETE FROM Offerten where [KundenNr]='" & kdNr & "' AND [OffertenNr]='" & dgvOfferteNew.SelectedRows(0).Cells("OffertenNr").Value & "' ", "FMZOLL") Then initDGVOfferte() RaiseEvent OfferteChanged() End If @@ -336,7 +345,7 @@ Public Class usrCntlOfferte checkPerimissionsDGVDetails() edit = False handleEditMode(edit) - saveArchivierteOfferte() + 'saveToArchive() OFFERTEBind.updateBinding() RaiseEvent OfferteChanged() @@ -344,11 +353,13 @@ Public Class usrCntlOfferte End Sub - Private Sub fbtnBearbeiten_Click(sender As Object, e As EventArgs) Handles fbtnBearbeiten.Click + Private Sub btnOffertbearbeiten_Click(sender As Object, e As EventArgs) Handles btnOffertbearbeiten.Click edit = True handleEditMode(edit) - saveCurrentOffert() + 'currentOffert.Art = "Geändert" + 'currentOffert.SAVE() + 'saveCurrentOffert() checkPerimissionsDGVDetails() End Sub @@ -368,7 +379,7 @@ Public Class usrCntlOfferte currentOffertArchiv.Gesperrt = currentOffert.Gesperrt currentOffertArchiv.Gesperrt_Datum = currentOffert.Gesperrt_Datum currentOffertArchiv.Gesperrt_Grund = currentOffert.Gesperrt_Grund - currentOffertArchiv.Art = Art + currentOffertArchiv.Art = currentOffert.Art ofID = currentOffertArchiv.SAVERETURNID() If ofID > 0 Then @@ -409,10 +420,10 @@ Public Class usrCntlOfferte handleEditMode(edit) saveCurrentOffert() - - If SQL.doSQL("DELETE FROM Offerten where [KundenNr]='" & kdNr & "' AND [OffertenNr]='" & dgvOfferte.SelectedRows(0).Cells("OffertenNr").Value & "' ", "FMZOLL") Then + 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.SAVE() currentOffert.LOAD_POSITIONEN() If currentOffert.POSITIONEN.Count = 0 Then ' @@ -420,11 +431,12 @@ Public Class usrCntlOfferte End If - 'DGVHasChaged = False + dgvOfferteNew.GetOrder() initDGVOfferte() + dgvOfferteNew.SetOrder() RaiseEvent OfferteChanged() - saveCurrentOffert() - saveArchivierteOfferte() + isStandard = True + isNew = True End If End Sub @@ -452,20 +464,20 @@ Public Class usrCntlOfferte Private Sub cbxArchivierteOffertenAnzeigen_CheckedChanged(sender As Object, e As EventArgs) Handles cbxArchivierteOffertenAnzeigen.CheckedChanged - If dgvOfferte.SelectedRows.Count = 0 Then Exit Sub + If dgvOfferteNew.SelectedRows.Count = 0 Then Exit Sub If cbxArchivierteOffertenAnzeigen.Checked Then cbxArchivierteOfferten.SelectedIndex = -1 cbxArchivierteOfferten.Items.Clear() cbxArchivierteOfferten.Visible = True - cbxArchivierteOfferten.fillWithSQL("SELECT OfID, CONCAT(FORMAT([Archiviert am], 'dd-MM.yyyy HH:mm'),'-',Art) as Archivierungsoffert FROM [tblOffertenArchiv] WHERE KundenNr='" & kdNr & "' and OffertenNr='" & dgvOfferte.SelectedRows(0).Cells("OffertenNr").Value & "'", False, "FMZOLL", True) - fbtnBearbeiten.Visible = False + cbxArchivierteOfferten.fillWithSQL("SELECT OfID, CONCAT(FORMAT([Archiviert am], 'dd-MM.yyyy HH:mm'),'-',Art) as Archivierungsoffert FROM [tblOffertenArchiv] WHERE KundenNr='" & kdNr & "' and OffertenNr='" & dgvOfferteNew.SelectedRows(0).Cells("OffertenNr").Value & "'", False, "FMZOLL", True) + btnOffertbearbeiten.Visible = False Else lblArchivierteOfferten.Visible = False cbxArchivierteOfferten.Visible = False - initDGVOfferteDetails(dgvOfferte.SelectedRows(0).Cells("OffertenNr").Value) - fbtnBearbeiten.Visible = True + initDGVOfferteDetails(dgvOfferteNew.SelectedRows(0).Cells("OffertenNr").Value) + btnOffertbearbeiten.Visible = True End If End Sub @@ -502,7 +514,6 @@ Public Class usrCntlOfferte Private Sub initDGVOfferteDetailsArchived(OffertenId) - loaded = False DGVHasChaged = False @@ -570,8 +581,8 @@ Public Class usrCntlOfferte Private Sub saveCurrentOffert() - dgvOfferte.Enabled = False - currentOffert = New VERAG_PROG_ALLGEMEIN.cOfferte(kdNr, dgvOfferte.SelectedRows(0).Cells("OffertenNr").Value, False) + dgvOfferteNew.Enabled = False + currentOffert = New VERAG_PROG_ALLGEMEIN.cOfferte(kdNr, dgvOfferteNew.SelectedRows(0).Cells("OffertenNr").Value, False) Dim orgDataTable As DataTable = dgvOfferteDetails.DataSource tmpDataTable = orgDataTable.Copy @@ -585,15 +596,15 @@ Public Class usrCntlOfferte pnlEdit.Visible = False pnlSperre.Visible = False btnCreateOffert.Visible = False - dgvOfferte.ReadOnly = True - fbtnBearbeiten.Visible = False + dgvOfferteNew.ReadOnly = True + btnOffertbearbeiten.Visible = False btnStandardLaden.Visible = False cbxArchivierteOfferten.Enabled = False Else dgvOfferteDetails.AllowUserToAddRows = True dgvOfferteDetails.AllowUserToDeleteRows = True dgvOfferteDetails.RowHeadersVisible = True - fbtnBearbeiten.Visible = True + btnOffertbearbeiten.Visible = True btnStandardLaden.Visible = True cbxArchivierteOfferten.Enabled = True cbxArchivierteOffertenAnzeigen.Visible = True @@ -605,9 +616,9 @@ Public Class usrCntlOfferte End If - If dgvOfferte.SelectedRows.Count = 0 Then + If dgvOfferteNew.SelectedRows.Count = 0 Then - fbtnBearbeiten.Visible = False + btnOffertbearbeiten.Visible = False btnStandardLaden.Visible = False cbxArchivierteOffertenAnzeigen.Visible = False @@ -621,11 +632,11 @@ Public Class usrCntlOfferte lblEditMode.Visible = True cbxArchivierteOffertenAnzeigen.Enabled = False cbxArchivierteOffertenAnzeigen.Checked = False - dgvOfferte.Enabled = False + dgvOfferteNew.Enabled = False Else lblEditMode.Visible = False cbxArchivierteOffertenAnzeigen.Enabled = True - dgvOfferte.Enabled = True + dgvOfferteNew.Enabled = True End If End Sub @@ -639,7 +650,11 @@ Public Class usrCntlOfferte If isStandard Then If DGVHasChaged = False AndAlso isNew Then - OfferteArchivieren("Neuer Standard") + OfferteArchivieren() + isNew = False + Exit Sub + ElseIf DGVHasChaged = True AndAlso isNew Then + OfferteArchivieren() isNew = False Exit Sub @@ -650,12 +665,12 @@ Public Class usrCntlOfferte If DGVHasChaged Then If isNew = False Then - OfferteArchivieren("Geändert") + OfferteArchivieren() Exit Sub Else If isNew Then - OfferteArchivieren("Neuanlage") + OfferteArchivieren() isNew = False End If @@ -665,5 +680,49 @@ Public Class usrCntlOfferte End Sub + Private Sub saveArchivierteOfferteNew(Optional forceSave As Boolean = False) + + OfferteArchivieren() + + End Sub + + + Private Sub saveToArchive() + + If isNew = False AndAlso isStandard = False Or isNew AndAlso isStandard = False Then 'Neuanlage oder Anlage über "Standardoffert laden" speichern, + If DGVHasChaged = False Then Exit Sub + End If + + If isStandard Then + If isNew Then + OfferteArchivieren() + isNew = False + + End If + isStandard = False + Else + + If DGVHasChaged Then + If isNew = False Then + isNew = False + OfferteArchivieren() + Exit Sub + + Else + If isNew Then + 'currentOffert.Art = "Neuanlage" + 'currentOffert.SAVE() + 'isNew = False + OfferteArchivieren() + isNew = False + End If + + End If + End If + End If + + + + End Sub End Class diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cOfferte.vb b/VERAG_PROG_ALLGEMEIN/Classes/cOfferte.vb index 8490002a..d35816a2 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cOfferte.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cOfferte.vb @@ -78,6 +78,7 @@ Public Class cOfferte Property Gesperrt_Datum As Object = Nothing Property Gesperrt_Grund As Object = Nothing Property SSMA_TimeStamp As Object = Nothing + Property Art As Object = Nothing Property POSITIONEN As New List(Of cOffertPosition) '= Nothing Dim SQL As New SQL @@ -104,6 +105,7 @@ Public Class cOfferte list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Gesperrt", Gesperrt)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Gesperrt_Datum", Gesperrt_Datum)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Gesperrt_Grund", Gesperrt_Grund)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Art", Art)) Return list End Function