diff --git a/SDL/kunden/frmBonitaet.Designer.vb b/SDL/kunden/frmBonitaet.Designer.vb index b62765e6..a5fda4ab 100644 --- a/SDL/kunden/frmBonitaet.Designer.vb +++ b/SDL/kunden/frmBonitaet.Designer.vb @@ -38,13 +38,16 @@ Partial Class frmBonitaet Me.cboRisikostufe = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.txtBonitaetsindex = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.txtCRDatum = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.lblWarning = New System.Windows.Forms.Label() + Me.Label3 = New System.Windows.Forms.Label() + Me.lblWarning2 = New System.Windows.Forms.Label() Me.SuspendLayout() ' 'lblBonitätsindex ' Me.lblBonitätsindex.AutoSize = True Me.lblBonitätsindex.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblBonitätsindex.Location = New System.Drawing.Point(14, 68) + Me.lblBonitätsindex.Location = New System.Drawing.Point(14, 75) Me.lblBonitätsindex.Name = "lblBonitätsindex" Me.lblBonitätsindex.Size = New System.Drawing.Size(87, 13) Me.lblBonitätsindex.TabIndex = 2 @@ -83,7 +86,7 @@ Partial Class frmBonitaet ' Me.Label1.AutoSize = True Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label1.Location = New System.Drawing.Point(14, 113) + Me.Label1.Location = New System.Drawing.Point(14, 118) Me.Label1.Name = "Label1" Me.Label1.Size = New System.Drawing.Size(82, 13) Me.Label1.TabIndex = 5 @@ -92,7 +95,7 @@ Partial Class frmBonitaet 'Label2 ' Me.Label2.AutoSize = True - Me.Label2.Location = New System.Drawing.Point(104, 89) + Me.Label2.Location = New System.Drawing.Point(104, 95) Me.Label2.Name = "Label2" Me.Label2.Size = New System.Drawing.Size(28, 13) Me.Label2.TabIndex = 4 @@ -101,7 +104,7 @@ Partial Class frmBonitaet 'Label12 ' Me.Label12.AutoSize = True - Me.Label12.Location = New System.Drawing.Point(14, 142) + Me.Label12.Location = New System.Drawing.Point(14, 147) Me.Label12.Name = "Label12" Me.Label12.Size = New System.Drawing.Size(70, 13) Me.Label12.TabIndex = 7 @@ -110,7 +113,7 @@ Partial Class frmBonitaet 'Label4 ' Me.Label4.AutoSize = True - Me.Label4.Location = New System.Drawing.Point(14, 168) + Me.Label4.Location = New System.Drawing.Point(14, 173) Me.Label4.Name = "Label4" Me.Label4.Size = New System.Drawing.Size(91, 13) Me.Label4.TabIndex = 9 @@ -152,7 +155,7 @@ Partial Class frmBonitaet Me.txtGruendungsdatum._Waehrung = False Me.txtGruendungsdatum._WaehrungZeichen = True Me.txtGruendungsdatum.ForeColor = System.Drawing.Color.Black - Me.txtGruendungsdatum.Location = New System.Drawing.Point(107, 165) + Me.txtGruendungsdatum.Location = New System.Drawing.Point(107, 170) Me.txtGruendungsdatum.MaxLength = 10 Me.txtGruendungsdatum.MaxLineLength = -1 Me.txtGruendungsdatum.MaxLines_Warning = "" @@ -177,7 +180,7 @@ Partial Class frmBonitaet Me.txtHoechstkredit._Waehrung = True Me.txtHoechstkredit._WaehrungZeichen = True Me.txtHoechstkredit.ForeColor = System.Drawing.Color.Black - Me.txtHoechstkredit.Location = New System.Drawing.Point(107, 139) + Me.txtHoechstkredit.Location = New System.Drawing.Point(107, 144) Me.txtHoechstkredit.MaxLineLength = -1 Me.txtHoechstkredit.MaxLines_Warning = "" Me.txtHoechstkredit.MaxLines_Warning_Label = Nothing @@ -192,7 +195,7 @@ Partial Class frmBonitaet Me.cboRisikostufe._value = "" Me.cboRisikostufe.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold) Me.cboRisikostufe.FormattingEnabled = True - Me.cboRisikostufe.Location = New System.Drawing.Point(107, 105) + Me.cboRisikostufe.Location = New System.Drawing.Point(107, 110) Me.cboRisikostufe.Name = "cboRisikostufe" Me.cboRisikostufe.Size = New System.Drawing.Size(129, 28) Me.cboRisikostufe.TabIndex = 6 @@ -213,7 +216,7 @@ Partial Class frmBonitaet Me.txtBonitaetsindex._WaehrungZeichen = True Me.txtBonitaetsindex.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.txtBonitaetsindex.ForeColor = System.Drawing.Color.Black - Me.txtBonitaetsindex.Location = New System.Drawing.Point(107, 60) + Me.txtBonitaetsindex.Location = New System.Drawing.Point(107, 67) Me.txtBonitaetsindex.MaxLength = 10 Me.txtBonitaetsindex.MaxLineLength = -1 Me.txtBonitaetsindex.MaxLines_Warning = "" @@ -249,12 +252,42 @@ Partial Class frmBonitaet Me.txtCRDatum.TabIndex = 1 Me.txtCRDatum.TextAlign = System.Windows.Forms.HorizontalAlignment.Right ' + 'lblWarning + ' + Me.lblWarning.AutoSize = True + Me.lblWarning.ForeColor = System.Drawing.Color.Red + Me.lblWarning.Location = New System.Drawing.Point(14, 55) + Me.lblWarning.Name = "lblWarning" + Me.lblWarning.Size = New System.Drawing.Size(0, 13) + Me.lblWarning.TabIndex = 16 + ' + 'Label3 + ' + Me.Label3.AutoSize = True + Me.Label3.ForeColor = System.Drawing.Color.Red + Me.Label3.Location = New System.Drawing.Point(126, 130) + Me.Label3.Name = "Label3" + Me.Label3.Size = New System.Drawing.Size(0, 13) + Me.Label3.TabIndex = 17 + ' + 'lblWarning2 + ' + Me.lblWarning2.AutoSize = True + Me.lblWarning2.ForeColor = System.Drawing.Color.Red + Me.lblWarning2.Location = New System.Drawing.Point(14, 95) + Me.lblWarning2.Name = "lblWarning2" + Me.lblWarning2.Size = New System.Drawing.Size(0, 13) + Me.lblWarning2.TabIndex = 18 + ' 'frmBonitaet ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.BackColor = System.Drawing.Color.White Me.ClientSize = New System.Drawing.Size(253, 272) + Me.Controls.Add(Me.lblWarning2) + Me.Controls.Add(Me.Label3) + Me.Controls.Add(Me.lblWarning) Me.Controls.Add(Me.cboTool) Me.Controls.Add(Me.Label5) Me.Controls.Add(Me.txtGruendungsdatum) @@ -294,4 +327,7 @@ Partial Class frmBonitaet Friend WithEvents Label4 As Label Friend WithEvents Label5 As Label Friend WithEvents cboTool As VERAG_PROG_ALLGEMEIN.MyComboBox + Friend WithEvents lblWarning As Label + Friend WithEvents Label3 As Label + Friend WithEvents lblWarning2 As Label End Class diff --git a/SDL/kunden/frmBonitaet.vb b/SDL/kunden/frmBonitaet.vb index a16377c1..960c45b3 100644 --- a/SDL/kunden/frmBonitaet.vb +++ b/SDL/kunden/frmBonitaet.vb @@ -1,6 +1,7 @@ Imports System.Web.UI.WebControls.Expressions Imports com.sun.tools.internal.ws.wsdl.document.mime Imports com.sun.xml.internal.ws.client +Imports VERAG_PROG_ALLGEMEIN Public Class frmBonitaet @@ -18,12 +19,9 @@ Public Class frmBonitaet End Sub Private Sub btnStandardPreiseLaden_Click(sender As Object, e As EventArgs) Handles btnStandardPreiseLaden.Click - If txtBonitaetsindex.Text = "" And cboRisikostufe.Text = "" Then Exit Sub - If txtBonitaetsindex.Text <> "" Then - If Not IsNumeric(txtBonitaetsindex.Text) Then Exit Sub - If CInt(txtBonitaetsindex.Text) < 10 And CInt(txtBonitaetsindex.Text) <> 0 Then Exit Sub - End If + If checkValues() = False Then Exit Sub + Try Dim cBonitaetsauskunft As VERAG_PROG_ALLGEMEIN.cBonitaetsauskunft = VERAG_PROG_ALLGEMEIN.cBonitaetsauskunft.LOADByKdNrDate(KdNR, Now) @@ -85,10 +83,9 @@ Public Class frmBonitaet KDERW.kde_CreditSaveBonitaetsScore = cBonitaetsauskunft.ba_CreditSaveBonitaetsScore KDERW.kde_CreditSaveBonitaetsklasse = cBonitaetsauskunft.ba_CreditSaveRisikoklasse KDERW.kde_BonitaetsStufe = cBonitaetsauskunft.ba_Risikostufe - KDERW.SAVE() - Me.Close() - End If + Me.Close() + End If Catch ex As Exception MsgBox(ex.Message) @@ -99,7 +96,7 @@ Public Class frmBonitaet Private Sub frmBonitaet_Load(sender As Object, e As EventArgs) Handles Me.Load - Label2.Visible = False + cboTool.Items.Clear() cboTool.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("CreditSafe AT", "creditsafe AT")) @@ -114,13 +111,16 @@ Public Class frmBonitaet If ADRESSE.LandKz = "A" Or ADRESSE.LandKz = "AT" Then cboTool.changeItem("CreditSafe AT") lblBonitätsindex.Text = "Boni-Score" + Label2.Visible = False Else cboTool.changeItem("CreditSafe") lblBonitätsindex.Text = "Bonitätsindex:" + Label2.Visible = False End If Else cboTool.changeItem("Creditreform") lblBonitätsindex.Text = "Bonitätsindex:" + Label2.Visible = True End If End Select @@ -179,12 +179,99 @@ Public Class frmBonitaet If cboTool._value = "creditsafe AT" Then lblBonitätsindex.Text = "Boni-Score" + Label2.Visible = False + ElseIf cboTool._value = "creditsafe" Then + lblBonitätsindex.Text = "Bonitätsindex:" + Label2.Visible = False + Else lblBonitätsindex.Text = "Bonitätsindex:" + Label2.Visible = True End If End Sub + Private Function checkValues() As Boolean + + lblWarning.Text = "" + lblWarning2.Text = "" + If txtBonitaetsindex.Text = "" And cboRisikostufe.Text = "" Then Return False + + If txtBonitaetsindex.Text = "" And Not cboTool._value = "creditreform" Then + lblWarning.Text = "Bitte Boni-Score/Bonitätsindex angeben!" + Return False + End If + + If cboRisikostufe.Text = "" And Not cboTool._value = "creditreform" Then + lblWarning2.Text = "Bitte Risikostufeangegeben!" + Return False + End If + + + Select Case ADRESSE.LandKz.ToString + + Case "AT", "A" + If (CInt(txtBonitaetsindex.Text) < 100 Or CInt(txtBonitaetsindex.Text) > 700) And cboTool._value = "creditsafe AT" Then + lblWarning.Text = "B-Score muss zwischen 100 und 700 liegen" + Return False + End If + + If cboTool._value = "creditsafe" Then + lblWarning.Text = "falsches Prüfungstool, bitte AT auswählen" + Return False + End If + + + If CInt(txtBonitaetsindex.Text) < 10 And CInt(txtBonitaetsindex.Text) <> 0 And cboTool._value = "creditreform" Then + lblWarning.Text = "B-Index muss größer als 10 sein" + Return False + End If + + + + + Case "DE", "D" + If (CDbl(txtBonitaetsindex.Text) < 1.0 Or CDbl(txtBonitaetsindex.Text) > 5.0) And cboTool._value = "creditsafe" Then + lblWarning.Text = "B-Index muss zwischen 1.0 und 5.0 liegen" + Return False + End If + + If cboTool._value = "creditsafe AT" Then + lblWarning.Text = "falsches Prüfungstool, bitte Creditsafe auswählen" + Return False + End If + + If CInt(txtBonitaetsindex.Text) < 10 And CInt(txtBonitaetsindex.Text) <> 0 And cboTool._value = "creditreform" Then + lblWarning.Text = "B-Index muss größer als 10 sein" + Return False + End If + + + Case Else + If (CDbl(txtBonitaetsindex.Text) < 1.0 Or CDbl(txtBonitaetsindex.Text) > 1000.0) And cboTool._value = "creditsafe" Then + lblWarning.Text = "B-Index muss zwischen 1.0 und 1000.0 liegen" + Return False + End If + + If cboTool._value = "creditsafe AT" Then + lblWarning.Text = "falsches Prüfungstool, bitte Creditsafe auswählen" + Return False + End If + + If CInt(txtBonitaetsindex.Text) < 10 And CInt(txtBonitaetsindex.Text) <> 0 And cboTool._value = "creditreform" Then + lblWarning.Text = "B-Index muss größer als 10 sein" + Return False + End If + + + End Select + + lblWarning.Text = "" + lblWarning2.Text = "" + Return True + + + End Function End Class \ No newline at end of file diff --git a/SDL/kunden/usrCntlKundenuebersicht.vb b/SDL/kunden/usrCntlKundenuebersicht.vb index 677177fb..e1823f6d 100644 --- a/SDL/kunden/usrCntlKundenuebersicht.vb +++ b/SDL/kunden/usrCntlKundenuebersicht.vb @@ -565,6 +565,20 @@ Public Class usrCntlKundenuebersicht End If + ' select case backgrounndcolor + Select Case lblBonitaetRisikostufe.Text + Case "A", "1" : lblBonitaetRisikostufe.BackColor = Color.Green + Case "B", "2" : lblBonitaetRisikostufe.BackColor = Color.LightGreen + Case "C", "3" : lblBonitaetRisikostufe.BackColor = Color.Yellow + Case "D", "4" : lblBonitaetRisikostufe.BackColor = Color.Orange + Case "E", "5" : lblBonitaetRisikostufe.BackColor = Color.Red + Case "F", "6" : lblBonitaetRisikostufe.BackColor = Color.Red + Case Else : lblBonitaetRisikostufe.BackColor = Color.WhiteSmoke + + End Select + + + If lblBonitaet.Text = "0" Then lblBonitaet.Text = "" If KUNDE.Bonitätsdatum IsNot Nothing AndAlso IsDate(KUNDE.Bonitätsdatum) Then