From 818eec68b60bdf87c7a7f88bca0a948a3ba60374 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Mon, 7 Nov 2022 11:41:44 +0100 Subject: [PATCH] Feature "Sprachen" in Adminmodul eingebaut --- UID/ADMIN.vbproj | 9 + UID/Programme/frmSprachen.Designer.vb | 228 +++++++++++++++++++++ UID/Programme/frmSprachen.resx | 120 +++++++++++ UID/Programme/frmSprachen.vb | 133 ++++++++++++ UID/Programme/usrCntlProgramme.Designer.vb | 26 ++- UID/Programme/usrCntlProgramme.resx | 4 +- UID/Programme/usrCntlProgramme.vb | 10 + 7 files changed, 527 insertions(+), 3 deletions(-) create mode 100644 UID/Programme/frmSprachen.Designer.vb create mode 100644 UID/Programme/frmSprachen.resx create mode 100644 UID/Programme/frmSprachen.vb diff --git a/UID/ADMIN.vbproj b/UID/ADMIN.vbproj index fd5fd67..9b09447 100644 --- a/UID/ADMIN.vbproj +++ b/UID/ADMIN.vbproj @@ -558,6 +558,12 @@ Form + + frmSprachen.vb + + + Form + frmUserSessions.vb @@ -735,6 +741,9 @@ frmBerechtigungsObjekte.vb + + frmSprachen.vb + frmUserSessions.vb diff --git a/UID/Programme/frmSprachen.Designer.vb b/UID/Programme/frmSprachen.Designer.vb new file mode 100644 index 0000000..970cec4 --- /dev/null +++ b/UID/Programme/frmSprachen.Designer.vb @@ -0,0 +1,228 @@ + _ +Partial Class frmSprachen + Inherits System.Windows.Forms.Form + + 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Wird vom Windows Form-Designer benötigt. + Private components As System.ComponentModel.IContainer + + 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. + 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. + 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. + _ + Private Sub InitializeComponent() + Me.Label1 = New System.Windows.Forms.Label() + Me.cbxSprachen = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.DataGridView = New System.Windows.Forms.DataGridView() + Me.txtObject = New System.Windows.Forms.TextBox() + Me.Label2 = New System.Windows.Forms.Label() + Me.Label3 = New System.Windows.Forms.Label() + Me.txtControl = New System.Windows.Forms.TextBox() + Me.Label4 = New System.Windows.Forms.Label() + Me.txtSubcontrol = New System.Windows.Forms.TextBox() + Me.Label5 = New System.Windows.Forms.Label() + Me.txtDE = New System.Windows.Forms.TextBox() + Me.Label6 = New System.Windows.Forms.Label() + Me.txttranslate = New System.Windows.Forms.TextBox() + Me.Label7 = New System.Windows.Forms.Label() + Me.txtProgramm = New VERAG_PROG_ALLGEMEIN.MyTextBox() + CType(Me.DataGridView, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SuspendLayout() + ' + 'Label1 + ' + Me.Label1.AutoSize = True + Me.Label1.Location = New System.Drawing.Point(12, 9) + Me.Label1.Name = "Label1" + Me.Label1.Size = New System.Drawing.Size(50, 13) + Me.Label1.TabIndex = 0 + Me.Label1.Text = "Sprache:" + ' + 'cbxSprachen + ' + Me.cbxSprachen._allowedValuesFreiText = Nothing + Me.cbxSprachen._allowFreiText = False + Me.cbxSprachen._value = "" + Me.cbxSprachen.FormattingEnabled = True + Me.cbxSprachen.Location = New System.Drawing.Point(68, 6) + Me.cbxSprachen.Name = "cbxSprachen" + Me.cbxSprachen.Size = New System.Drawing.Size(72, 21) + Me.cbxSprachen.TabIndex = 1 + ' + 'DataGridView + ' + Me.DataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.DataGridView.Location = New System.Drawing.Point(15, 82) + Me.DataGridView.Name = "DataGridView" + Me.DataGridView.Size = New System.Drawing.Size(974, 452) + Me.DataGridView.TabIndex = 14 + ' + 'txtObject + ' + Me.txtObject.Location = New System.Drawing.Point(15, 56) + Me.txtObject.Name = "txtObject" + Me.txtObject.Size = New System.Drawing.Size(150, 20) + Me.txtObject.TabIndex = 9 + ' + 'Label2 + ' + Me.Label2.AutoSize = True + Me.Label2.Location = New System.Drawing.Point(12, 40) + Me.Label2.Name = "Label2" + Me.Label2.Size = New System.Drawing.Size(41, 13) + Me.Label2.TabIndex = 4 + Me.Label2.Text = "Object:" + ' + 'Label3 + ' + Me.Label3.AutoSize = True + Me.Label3.Location = New System.Drawing.Point(209, 40) + Me.Label3.Name = "Label3" + Me.Label3.Size = New System.Drawing.Size(43, 13) + Me.Label3.TabIndex = 5 + Me.Label3.Text = "Control:" + ' + 'txtControl + ' + Me.txtControl.Location = New System.Drawing.Point(212, 56) + Me.txtControl.Name = "txtControl" + Me.txtControl.Size = New System.Drawing.Size(150, 20) + Me.txtControl.TabIndex = 10 + ' + 'Label4 + ' + Me.Label4.AutoSize = True + Me.Label4.Location = New System.Drawing.Point(402, 40) + Me.Label4.Name = "Label4" + Me.Label4.Size = New System.Drawing.Size(58, 13) + Me.Label4.TabIndex = 6 + Me.Label4.Text = "Subcontrol" + ' + 'txtSubcontrol + ' + Me.txtSubcontrol.Location = New System.Drawing.Point(405, 56) + Me.txtSubcontrol.Name = "txtSubcontrol" + Me.txtSubcontrol.Size = New System.Drawing.Size(150, 20) + Me.txtSubcontrol.TabIndex = 11 + ' + 'Label5 + ' + Me.Label5.AutoSize = True + Me.Label5.Location = New System.Drawing.Point(600, 40) + Me.Label5.Name = "Label5" + Me.Label5.Size = New System.Drawing.Size(46, 13) + Me.Label5.TabIndex = 7 + Me.Label5.Text = "DE-Text" + ' + 'txtDE + ' + Me.txtDE.Location = New System.Drawing.Point(603, 56) + Me.txtDE.Name = "txtDE" + Me.txtDE.Size = New System.Drawing.Size(170, 20) + Me.txtDE.TabIndex = 12 + ' + 'Label6 + ' + Me.Label6.AutoSize = True + Me.Label6.Location = New System.Drawing.Point(812, 40) + Me.Label6.Name = "Label6" + Me.Label6.Size = New System.Drawing.Size(67, 13) + Me.Label6.TabIndex = 8 + Me.Label6.Text = "Übersetzung" + ' + 'txttranslate + ' + Me.txttranslate.Location = New System.Drawing.Point(815, 56) + Me.txttranslate.Name = "txttranslate" + Me.txttranslate.Size = New System.Drawing.Size(170, 20) + Me.txttranslate.TabIndex = 13 + ' + 'Label7 + ' + Me.Label7.AutoSize = True + Me.Label7.Location = New System.Drawing.Point(829, 14) + Me.Label7.Name = "Label7" + Me.Label7.Size = New System.Drawing.Size(57, 13) + Me.Label7.TabIndex = 2 + Me.Label7.Text = "Programm:" + ' + 'txtProgramm + ' + Me.txtProgramm._DateTimeOnly = False + Me.txtProgramm._numbersOnly = False + Me.txtProgramm._numbersOnlyKommastellen = "" + Me.txtProgramm._numbersOnlyTrennzeichen = True + Me.txtProgramm._Prozent = False + Me.txtProgramm._ShortDateNew = False + Me.txtProgramm._ShortDateOnly = False + Me.txtProgramm._TimeOnly = False + Me.txtProgramm._TimeOnly_Seconds = False + Me.txtProgramm._value = "" + Me.txtProgramm._Waehrung = False + Me.txtProgramm._WaehrungZeichen = True + Me.txtProgramm.ForeColor = System.Drawing.Color.Black + Me.txtProgramm.Location = New System.Drawing.Point(892, 12) + Me.txtProgramm.MaxLineLength = -1 + Me.txtProgramm.MaxLines_Warning = "" + Me.txtProgramm.MaxLines_Warning_Label = Nothing + Me.txtProgramm.Name = "txtProgramm" + Me.txtProgramm.ReadOnly = True + Me.txtProgramm.Size = New System.Drawing.Size(92, 20) + Me.txtProgramm.TabIndex = 3 + Me.txtProgramm.TabStop = False + ' + 'frmSprachen + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(1001, 545) + Me.Controls.Add(Me.txtProgramm) + Me.Controls.Add(Me.Label7) + Me.Controls.Add(Me.Label6) + Me.Controls.Add(Me.txttranslate) + Me.Controls.Add(Me.Label5) + Me.Controls.Add(Me.txtDE) + Me.Controls.Add(Me.Label4) + Me.Controls.Add(Me.txtSubcontrol) + Me.Controls.Add(Me.Label3) + Me.Controls.Add(Me.txtControl) + Me.Controls.Add(Me.Label2) + Me.Controls.Add(Me.txtObject) + Me.Controls.Add(Me.DataGridView) + Me.Controls.Add(Me.cbxSprachen) + Me.Controls.Add(Me.Label1) + Me.Name = "frmSprachen" + Me.Text = "frmSprachen" + CType(Me.DataGridView, System.ComponentModel.ISupportInitialize).EndInit() + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + + Friend WithEvents Label1 As Label + Friend WithEvents cbxSprachen As VERAG_PROG_ALLGEMEIN.MyComboBox + Friend WithEvents DataGridView As DataGridView + Friend WithEvents txtObject As TextBox + Friend WithEvents Label2 As Label + Friend WithEvents Label3 As Label + Friend WithEvents txtControl As TextBox + Friend WithEvents Label4 As Label + Friend WithEvents txtSubcontrol As TextBox + Friend WithEvents Label5 As Label + Friend WithEvents txtDE As TextBox + Friend WithEvents Label6 As Label + Friend WithEvents txttranslate As TextBox + Friend WithEvents Label7 As Label + Friend WithEvents txtProgramm As VERAG_PROG_ALLGEMEIN.MyTextBox +End Class diff --git a/UID/Programme/frmSprachen.resx b/UID/Programme/frmSprachen.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/UID/Programme/frmSprachen.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/UID/Programme/frmSprachen.vb b/UID/Programme/frmSprachen.vb new file mode 100644 index 0000000..7196dab --- /dev/null +++ b/UID/Programme/frmSprachen.vb @@ -0,0 +1,133 @@ +Imports VERAG_PROG_ALLGEMEIN + +Public Class frmSprachen + + Dim SPRACHENBind As cEasyBinding + Public table + Public BIND_DB + Public programId As Integer + Sub New(table, BIND_DB, programId) + Me.table = table + Me.BIND_DB = BIND_DB + Me.programId = programId + InitializeComponent() + End Sub + + Private Sub frmSprachen_Load(sender As Object, e As EventArgs) Handles MyBase.Load + + cbxSprachen.fillWithSQL("SELECT distinct([trs_sprache]) FROM [tblTranslate] WHERE trs_progId='" & programId & "' ORDER By [trs_sprache]", False, "FMZOLL", False) + + cbxSprachen.changeItem("EN") + + If cbxSprachen.SelectedIndex = -1 Then + cbxSprachen.Items.Add("EN") + cbxSprachen.changeItem("EN") + End If + + + txtProgramm.fillWithSQL("SELECT [prog_codename] from [tblProgramme] WHERE [prog_id] ='" & programId & "'", "ADMIN") + + End Sub + + Private Sub cbxSprachen_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cbxSprachen.SelectedIndexChanged + + Dim sqlLanguage = " AND [trs_sprache] = '" & cbxSprachen.SelectedItem.ToString & "'" + + loadDGV(sqlLanguage) + End Sub + + Private Sub loadDGV(Optional language As String = "", Optional sqlwhere As String = "") + + Try + SPRACHENBind = New cEasyBinding(BIND_DB) + + Select Case language + Case <> "" + If sqlwhere = "" Then + + SPRACHENBind.initBinding("SELECT * FROM " & table & " WHERE [trs_progId] = '" & programId & "'" & language, table) + + Else + + SPRACHENBind.initBinding("SELECT * FROM " & table & " WHERE [trs_progId] = '" & programId & "'" & language & sqlwhere, table) + End If + + + Case Else + + If sqlwhere = "" Then + + SPRACHENBind.initBinding("SELECT * FROM " & table & "WHERE [trs_progId] = '" & programId & "'", table) + Else + + SPRACHENBind.initBinding("SELECT * FROM " & table & " WHERE [trs_progId] = '" & programId & "'" & sqlwhere, table) + + End If + + End Select + + DataGridView.DataSource = SPRACHENBind.bindingdataTable + + With DataGridView + + If .Columns.Count > 0 Then + .Columns("trs_id").Visible = False + .Columns("trs_progId").Visible = False + .Columns("trs_progName").Visible = False + .Columns("trs_object").HeaderText = "Object" + .Columns("trs_object").Width = 150 + .Columns("trs_control").HeaderText = "Control" + .Columns("trs_control").Width = 150 + .Columns("trs_subControl").HeaderText = "Subcontrol" + .Columns("trs_sprache").HeaderText = "Spr" + .Columns("trs_sprache").Width = 40 + .Columns("trs_text").HeaderText = "Übersetzung" + .Columns("trs_text").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill + .Columns("trs_textDE").HeaderText = "DE-Text" + .Columns("trs_textDE").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill + .Columns("trs_active").HeaderText = "aktiv" + .Columns("trs_active").Width = 40 + End If + + End With + + + Catch ex As Exception + MsgBox(ex.Message) + End Try + + End Sub + + Private Sub TextBox1_PreviewKeyDown(sender As Object, e As PreviewKeyDownEventArgs) Handles txtObject.PreviewKeyDown, txtDE.PreviewKeyDown, txtSubcontrol.PreviewKeyDown, txtControl.PreviewKeyDown, txttranslate.PreviewKeyDown + + Dim sqladdon As String = "" + + If e.KeyCode = Keys.Enter Then + If txtControl.Text <> "" Then + sqladdon &= " AND [trs_control] like '%" & txtControl.Text & "%'" + End If + + If txtObject.Text <> "" Then + sqladdon &= " AND [trs_object] like '%" & txtObject.Text & "%'" + End If + + If txtSubcontrol.Text <> "" Then + sqladdon &= " AND [trs_subControl] like '%" & txtSubcontrol.Text & "%'" + End If + + If txtDE.Text <> "" Then + sqladdon &= " AND [trs_textDE] like '%" & txtDE.Text & "%'" + End If + + If txttranslate.Text <> "" Then + sqladdon &= " AND [trs_text] like '%" & txttranslate.Text & "%'" + End If + + Dim sqlLanguage = " AND [trs_sprache] = '" & cbxSprachen.SelectedItem.ToString & "'" + + loadDGV(sqlLanguage, sqladdon) + + End If + End Sub + +End Class \ No newline at end of file diff --git a/UID/Programme/usrCntlProgramme.Designer.vb b/UID/Programme/usrCntlProgramme.Designer.vb index 7e25311..fddb548 100644 --- a/UID/Programme/usrCntlProgramme.Designer.vb +++ b/UID/Programme/usrCntlProgramme.Designer.vb @@ -101,6 +101,8 @@ Partial Class usrCntlProgramme Me.Label17 = New System.Windows.Forms.Label() Me.PictureBox14 = New System.Windows.Forms.PictureBox() Me.Button12 = New System.Windows.Forms.Button() + Me.btn_sprache_sdl = New System.Windows.Forms.Button() + Me.btn_sprache_aviso = New System.Windows.Forms.Button() CType(Me.PictureBox4, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox3, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox2, System.ComponentModel.ISupportInitialize).BeginInit() @@ -818,7 +820,7 @@ Partial Class usrCntlProgramme ' 'Button12 ' - Me.Button12.Location = New System.Drawing.Point(76, 491) + Me.Button12.Location = New System.Drawing.Point(76, 522) Me.Button12.Name = "Button12" Me.Button12.Size = New System.Drawing.Size(100, 23) Me.Button12.TabIndex = 109 @@ -826,11 +828,31 @@ Partial Class usrCntlProgramme Me.Button12.UseVisualStyleBackColor = True Me.Button12.Visible = False ' + 'btn_sprache_sdl + ' + Me.btn_sprache_sdl.Location = New System.Drawing.Point(229, 491) + Me.btn_sprache_sdl.Name = "btn_sprache_sdl" + Me.btn_sprache_sdl.Size = New System.Drawing.Size(100, 23) + Me.btn_sprache_sdl.TabIndex = 110 + Me.btn_sprache_sdl.Text = "Sprachen" + Me.btn_sprache_sdl.UseVisualStyleBackColor = True + ' + 'btn_sprache_aviso + ' + Me.btn_sprache_aviso.Location = New System.Drawing.Point(78, 493) + Me.btn_sprache_aviso.Name = "btn_sprache_aviso" + Me.btn_sprache_aviso.Size = New System.Drawing.Size(100, 23) + Me.btn_sprache_aviso.TabIndex = 111 + Me.btn_sprache_aviso.Text = "Sprachen" + Me.btn_sprache_aviso.UseVisualStyleBackColor = True + ' 'usrCntlProgramme ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.Controls.Add(Me.btn_sprache_aviso) + Me.Controls.Add(Me.btn_sprache_sdl) Me.Controls.Add(Me.Button12) Me.Controls.Add(Me.Button11) Me.Controls.Add(Me.Label17) @@ -1007,4 +1029,6 @@ Partial Class usrCntlProgramme Friend WithEvents Label17 As Label Friend WithEvents PictureBox14 As PictureBox Friend WithEvents Button12 As Button + Friend WithEvents btn_sprache_sdl As Button + Friend WithEvents btn_sprache_aviso As Button End Class diff --git a/UID/Programme/usrCntlProgramme.resx b/UID/Programme/usrCntlProgramme.resx index c93e14e..5ba066d 100644 --- a/UID/Programme/usrCntlProgramme.resx +++ b/UID/Programme/usrCntlProgramme.resx @@ -121,7 +121,7 @@ iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAhBJREFUWEftlbFKA1EQRQP5FyG1fyBp/ANT2KYxWNkm+AExtYipLASDlYVpRBSC + wAAADsABataJCQAAAhBJREFUWEftlbFKA1EQRQP5FyG1fyBp/ANT2KYxWNkm+AExtYipLASDlYVpRBSC RRoDQbBYEItAFLQwksJi9Qy5j8ljG5vdZgdmd959M3fuzEaspAVbKaAUUApYE/CzWJjH9h/cn+M46y4I eBuN0ptq1XzcaKzQ1GLhD/V6OhsODectnFoI72u1UM85jpWrWvAgYNrphCSIMBXS+LnXMxwHT/r9kP86 GKyd4dJAPtaZXA1pApbzuV1Crolp8pUkFj+2WpaMCM4QkocwzhKnM4LwOOZePRCCmQCp50ICPieTsCru @@ -136,7 +136,7 @@ iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAYAAADDPmHLAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAD6VJREFUeF7tXWusFdUVpvVRUIOJiiEm0B8CSlR8AD4aJaZiSSk/MBIjP6r+0FYr + wAAADsABataJCQAAD6VJREFUeF7tXWusFdUVpvVRUIOJiiEm0B8CSlR8AD4aJaZiSSk/MBIjP6r+0FYr amKJLZFXmhgTIyaoiZVgjBIlQVETEsXEcr0Xedx7FbgUVB63pSKPi8gtD6G87u79hlmXddZZe2bPOTPn NftLvnDPzJ691+Pba8+ZmTP0Mx65hhdAzuEFkHN4AeQcjSmAnh7z09at5sCKFWbPO++YnS+/bDpnzTJb nnrKfPPII+brhx8O/sVnbMf+ve++G7THcTg+L2gIAfScOGEOrl1rdjz/vPnnffeZtptvNi2XX27+cc45 diff --git a/UID/Programme/usrCntlProgramme.vb b/UID/Programme/usrCntlProgramme.vb index 6b6b3b1..db1e452 100644 --- a/UID/Programme/usrCntlProgramme.vb +++ b/UID/Programme/usrCntlProgramme.vb @@ -205,4 +205,14 @@ frmProgDetails.codename = "RKSV_DE" frmProgDetails.Show() End Sub + + Private Sub btn_sprache_Click(sender As Object, e As EventArgs) Handles btn_sprache_aviso.Click + Dim f As New frmSprachen("tblTranslate", "FMZOLL", ADMIN.AVISO_ID) + f.Show(Me) + End Sub + + Private Sub btn_sprache2_Click(sender As Object, e As EventArgs) Handles btn_sprache_sdl.Click + Dim f As New frmSprachen("tblTranslate", "FMZOLL", ADMIN.SDL_ID) + f.Show(Me) + End Sub End Class