diff --git a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlCBAM_Checkliste.Designer.vb b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlCBAM_Checkliste.Designer.vb index a2088199..3f218863 100644 --- a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlCBAM_Checkliste.Designer.vb +++ b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlCBAM_Checkliste.Designer.vb @@ -37,6 +37,8 @@ Partial Class usrcntlCBAM_Checkliste Me.btnDel = New System.Windows.Forms.Button() Me.Label12 = New System.Windows.Forms.Label() Me.cboSprache = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.cboFirma = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.Label42 = New System.Windows.Forms.Label() CType(Me.pic, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' @@ -62,6 +64,7 @@ Partial Class usrcntlCBAM_Checkliste ' Me.btn.BackgroundImage = Global.SDL.My.Resources.Resources.search Me.btn.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.btn.Enabled = False Me.btn.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btn.Location = New System.Drawing.Point(937, 34) Me.btn.Name = "btn" @@ -234,7 +237,7 @@ Partial Class usrcntlCBAM_Checkliste 'Label12 ' Me.Label12.AutoSize = True - Me.Label12.Location = New System.Drawing.Point(44, 37) + Me.Label12.Location = New System.Drawing.Point(18, 56) Me.Label12.Name = "Label12" Me.Label12.Size = New System.Drawing.Size(50, 13) Me.Label12.TabIndex = 5 @@ -246,17 +249,40 @@ Partial Class usrcntlCBAM_Checkliste Me.cboSprache._allowFreiText = False Me.cboSprache._value = "" Me.cboSprache.FormattingEnabled = True - Me.cboSprache.Location = New System.Drawing.Point(47, 53) + Me.cboSprache.Location = New System.Drawing.Point(74, 53) Me.cboSprache.Name = "cboSprache" Me.cboSprache.Size = New System.Drawing.Size(89, 21) Me.cboSprache.TabIndex = 10 ' + 'cboFirma + ' + Me.cboFirma._allowedValuesFreiText = Nothing + Me.cboFirma._allowFreiText = False + Me.cboFirma._value = "" + Me.cboFirma.FormattingEnabled = True + Me.cboFirma.Location = New System.Drawing.Point(74, 80) + Me.cboFirma.Name = "cboFirma" + Me.cboFirma.Size = New System.Drawing.Size(144, 21) + Me.cboFirma.TabIndex = 37 + ' + 'Label42 + ' + Me.Label42.AutoSize = True + Me.Label42.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.Label42.Location = New System.Drawing.Point(18, 83) + Me.Label42.Name = "Label42" + Me.Label42.Size = New System.Drawing.Size(35, 13) + Me.Label42.TabIndex = 36 + Me.Label42.Text = "Firma:" + ' 'usrcntlCBAM_Checkliste ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.BackColor = System.Drawing.Color.WhiteSmoke Me.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.Controls.Add(Me.cboFirma) + Me.Controls.Add(Me.Label42) Me.Controls.Add(Me.Label12) Me.Controls.Add(Me.cboSprache) Me.Controls.Add(Me.btnDown) @@ -273,7 +299,7 @@ Partial Class usrcntlCBAM_Checkliste Me.Controls.Add(Me.txtFirma) Me.Controls.Add(Me.lbl) Me.Name = "usrcntlCBAM_Checkliste" - Me.Size = New System.Drawing.Size(1000, 105) + Me.Size = New System.Drawing.Size(1000, 116) CType(Me.pic, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -294,4 +320,6 @@ Partial Class usrcntlCBAM_Checkliste 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 cboFirma As VERAG_PROG_ALLGEMEIN.MyComboBox + Friend WithEvents Label42 As Label End Class diff --git a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlCBAM_Checkliste.vb b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlCBAM_Checkliste.vb index d1a243e1..f399bf91 100644 --- a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlCBAM_Checkliste.vb +++ b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlCBAM_Checkliste.vb @@ -1,4 +1,6 @@ -Public Class usrcntlCBAM_Checkliste +Imports VERAG_PROG_ALLGEMEIN.TESTJSON + +Public Class usrcntlCBAM_Checkliste Implements FormualrInterface Public Event CHANGED(name, value) @@ -75,6 +77,17 @@ cboSprache.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Deutsch", "DE")) 'cboSprache.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Englisch", "EN")) + cboFirma.Items.Clear() + + cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA, VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA)) + cboFirma.changeItem(VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA) + 'Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA Then + ' Case "IMEX" + ' cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG", "VERAG")) + ' Case "UNISPED" + ' cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG", "VERAG")) + 'End Select + ' txtDauer.Text = Now.ToShortDateString & " - " & Now.AddYears(1).ToShortDateString diff --git a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlCBAM_indirekt.vb b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlCBAM_indirekt.vb index 998425fa..3d9f81df 100644 --- a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlCBAM_indirekt.vb +++ b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlCBAM_indirekt.vb @@ -74,6 +74,7 @@ cboSprache.Items.Clear() cboSprache.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Deutsch", "DE")) cboSprache.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Englisch", "EN")) + cboSprache.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Türkisch", "TR")) txtCBAM_Onboarding_Paket_1._value = 200 diff --git a/SDL/Formulare/KDFormulare/frmFormulare.vb b/SDL/Formulare/KDFormulare/frmFormulare.vb index 23b8e7a1..a153c10f 100644 --- a/SDL/Formulare/KDFormulare/frmFormulare.vb +++ b/SDL/Formulare/KDFormulare/frmFormulare.vb @@ -215,8 +215,11 @@ Public Class frmFormulare Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA Case "IMEX" + MyListBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("CBAM Checkliste", FormularManagerArten.CBAM_Checkliste)) Case "AMBAR" Case "ATILLA" + Case "UNISPED" + MyListBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("CBAM Checkliste", FormularManagerArten.CBAM_Checkliste)) Case "VERAG" MyListBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("CBAM direkt Kunden", FormularManagerArten.CBAM)) MyListBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("CBAM Zertifikate", FormularManagerArten.CBAM_Zertifikate)) @@ -1846,12 +1849,11 @@ Public Class FormularManagerNEU - Select Case usrCntl.cboSprache._value Case "EN" - Return fm.fillPDF("DOKUMENTE", "VORLAGEN", "SONSTIGE", "VERAG", "", "CBAM_Checkliste", listTowrite) + Return fm.fillPDF("DOKUMENTE", "VORLAGEN", "SONSTIGE", usrCntl.cboFirma._value, "", "CBAM_Checkliste", listTowrite) Case Else - Return fm.fillPDF("DOKUMENTE", "VORLAGEN", "SONSTIGE", "VERAG", "", "CBAM_Checkliste", listTowrite) + Return fm.fillPDF("DOKUMENTE", "VORLAGEN", "SONSTIGE", usrCntl.cboFirma._value, "", "CBAM_Checkliste", listTowrite) End Select Return "" @@ -1868,8 +1870,12 @@ Public Class FormularManagerNEU listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtFirma.Text, 17.6, Top + 60.2, 150, 6, "", 10, , iTextSharp.text.Element.ALIGN_LEFT)) listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtAdresse1.Text, 17.6, Top + 63.6, 150, 6, "", 10, , iTextSharp.text.Element.ALIGN_LEFT)) listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtAdresse2.Text, 17.6, Top + 66.8, 150, 6, "", 10, , iTextSharp.text.Element.ALIGN_LEFT)) - listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtVertragsbeginn.Text, 45, Top + 47.4, 90, 6, "bold", 10, , iTextSharp.text.Element.ALIGN_LEFT)) - + Select Case usrCntl.cboSprache._value + Case "TR" + listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtVertragsbeginn.Text, 59, Top + 47.4, 90, 6, "bold", 10, , iTextSharp.text.Element.ALIGN_LEFT)) + Case Else + listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtVertragsbeginn.Text, 45, Top + 47.4, 90, 6, "bold", 10, , iTextSharp.text.Element.ALIGN_LEFT)) + End Select listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(formatAmountEUR(usrCntl.txtCBAM_Onboarding_Paket_1._value, True), 168, Top + 49.5, 25, 6, "bold", 10, , iTextSharp.text.Element.ALIGN_RIGHT, 2)) listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(formatAmountEUR(usrCntl.txtCBAM_MonatPausch_Paket_1._value, True), 168, Top + 58.5, 25, 6, "bold", 10, , iTextSharp.text.Element.ALIGN_RIGHT, 2)) @@ -1881,6 +1887,8 @@ Public Class FormularManagerNEU ' Dim firma=getUO2() Select Case usrCntl.cboSprache._value + Case "TR" + Return fm.fillPDF("DOKUMENTE", "VORLAGEN", "SONSTIGE", "VERAG", "", "CBAM_indirekt_TR", listTowrite) Case "EN" Return fm.fillPDF("DOKUMENTE", "VORLAGEN", "SONSTIGE", "VERAG", "", "CBAM_indirekt_EN", listTowrite) Case Else