From 0a7e4feedd15ae13e9cdc81493c259c0124d520b Mon Sep 17 00:00:00 2001 From: Andreas Luxbauer Date: Mon, 22 Jun 2020 13:32:11 +0200 Subject: [PATCH] neu --- Aviso/Anhänge/frmSendungAnhangImport.vb | 29 +++++++--- Aviso/My Project/AssemblyInfo.vb | 4 +- Aviso/My Project/Resources.Designer.vb | 20 +++---- Aviso/My Project/Resources.resx | 4 +- Aviso/frmHauptfenster.Designer.vb | 2 +- Aviso/frmHauptfenster.vb | 49 +++++++++++++++-- Aviso/usrCntlBenachrichtigungen.Designer.vb | 59 +++++++++++++-------- Aviso/usrCntlBenachrichtigungen.vb | 41 ++++++++++++-- 8 files changed, 156 insertions(+), 52 deletions(-) diff --git a/Aviso/Anhänge/frmSendungAnhangImport.vb b/Aviso/Anhänge/frmSendungAnhangImport.vb index 89ca505..f4e91ac 100644 --- a/Aviso/Anhänge/frmSendungAnhangImport.vb +++ b/Aviso/Anhänge/frmSendungAnhangImport.vb @@ -927,6 +927,7 @@ Public Class frmSendungAnhangImport ' VERAG_PROG_ALLGEMEIN.cAvisoAnhaenge.LOAD_LIST_ByAviso(ANH_LIST, AvisoId) 'LÄDT alle Sendungs-Anhänge 'End If VERAG_PROG_ALLGEMEIN.cAvisoAnhaenge.LOAD_LIST_ByAviso(ANH_LIST, AvisoId) 'LÄDT alle Aviso-Anhänge + If pnl Is Nothing OrElse pnl Is flpnlSendungen Then flpnlSendungen.Controls.Clear() If pnl Is Nothing OrElse pnl Is flpnlAviso Then flpnlAviso.Controls.Clear() lblWarenbeichnung.Text = "" @@ -942,27 +943,37 @@ Public Class frmSendungAnhangImport lblEmpfaenger.Text = If(SND.tblSnd_Empfaenger, "") End If + Dim SndNr = cboSendungen._value + Dim ListToAdd_flpnlSendungen As New List(Of usrCntlSendungAnhangElement) + Dim ListToAdd_flpnlAviso As New List(Of usrCntlSendungAnhangElement) For Each a In ANH_LIST If If(a.anh_SendungsId, 0) > 0 Then - If cboSendungen._value <> "" AndAlso cboSendungen._value = a.anh_SendungsId Then + If SndNr <> "" AndAlso SndNr = a.anh_SendungsId Then If pnl Is Nothing OrElse pnl Is flpnlSendungen Then - addtoPnl(a, flpnlSendungen, keepActive, aktiveId) + ListToAdd_flpnlSendungen.Add(addtoPnl(a, flpnlSendungen, keepActive, aktiveId, True)) End If End If Else If pnl Is Nothing OrElse pnl Is flpnlAviso Then - addtoPnl(a, flpnlAviso, keepActive, aktiveId) + ListToAdd_flpnlAviso.Add(addtoPnl(a, flpnlAviso, keepActive, aktiveId, True)) End If End If Next + + If pnl Is Nothing OrElse pnl Is flpnlSendungen Then flpnlSendungen.Controls.AddRange(ListToAdd_flpnlSendungen.ToArray) + If pnl Is Nothing OrElse pnl Is flpnlAviso Then flpnlAviso.Controls.AddRange(ListToAdd_flpnlAviso.ToArray) + 'If act Is Nothing Then initLocationViewer("", "PDF") End Sub - Sub addtoPnl(a As VERAG_PROG_ALLGEMEIN.cAvisoAnhaenge, pnl As FlowLayoutPanel, keepActive As Boolean, aktiveId As Integer) + Function addtoPnl(a As VERAG_PROG_ALLGEMEIN.cAvisoAnhaenge, pnl As FlowLayoutPanel, keepActive As Boolean, aktiveId As Integer, Optional ByVal returnElement As Boolean = False) As usrCntlSendungAnhangElement Dim USRCNTL As New usrCntlSendungAnhangElement - USRCNTL.FILE_PATH = VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(a.anh_docId) + USRCNTL.FILE_PATH = VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID_onlyPATH(a.anh_docId) + 'USRCNTL.FILE_PATH = SQL.getValueTxtBySql("SELECT TOP (1) [coll_pfad] FROM [tblDatenarchiv_Collection] where coll_daId=" & a.anh_docId & " ORDER BY coll_date DESC", "FMZOLL") + + USRCNTL.FILE_NAME = a.anh_Name USRCNTL.FILE_TYPE = a.anh_Typ @@ -975,8 +986,12 @@ Public Class frmSendungAnhangImport End If End If initElement(USRCNTL) - pnl.Controls.Add(USRCNTL) - End Sub + If Not returnElement Then + pnl.Controls.Add(USRCNTL) + End If + + Return USRCNTL + End Function Private Sub Button3_Click(sender As Object, e As EventArgs) Handles btnAnfuegenAll.Click clearPnlAnfuegen() diff --git a/Aviso/My Project/AssemblyInfo.vb b/Aviso/My Project/AssemblyInfo.vb index 7e8323e..ccc2edf 100644 --- a/Aviso/My Project/AssemblyInfo.vb +++ b/Aviso/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/Aviso/My Project/Resources.Designer.vb b/Aviso/My Project/Resources.Designer.vb index 6034fd1..30d5220 100644 --- a/Aviso/My Project/Resources.Designer.vb +++ b/Aviso/My Project/Resources.Designer.vb @@ -100,15 +100,6 @@ Namespace My.Resources End Get End Property - ''' - ''' Sucht eine lokalisierte Zeichenfolge, die ähnelt. - ''' - Friend ReadOnly Property adasda3asdsa3adsa() As String - Get - Return ResourceManager.GetString("adasda3asdsa3adsa", resourceCulture) - End Get - End Property - ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' @@ -1058,6 +1049,15 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die ähnelt. + ''' + Friend ReadOnly Property sdfsdfsdfsdf3sdfsdfsdf() As String + Get + Return ResourceManager.GetString("sdfsdfsdfsdf3sdfsdfsdf", resourceCulture) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' @@ -1368,7 +1368,7 @@ Namespace My.Resources End Property ''' - ''' Sucht eine lokalisierte Zeichenfolge, die 3.4.9.7 ähnelt. + ''' Sucht eine lokalisierte Zeichenfolge, die 3.5.0.2 ähnelt. ''' Friend ReadOnly Property Version() As String Get diff --git a/Aviso/My Project/Resources.resx b/Aviso/My Project/Resources.resx index 0cbde51..1db0f27 100644 --- a/Aviso/My Project/Resources.resx +++ b/Aviso/My Project/Resources.resx @@ -344,7 +344,7 @@ ..\Resources\akt_ATILLA.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - 3.4.9.7 + 3.5.0.2 ..\Resources\Verag-AG-Logopng.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -565,7 +565,7 @@ ..\Resources\mitarbeiter_s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + \ No newline at end of file diff --git a/Aviso/frmHauptfenster.Designer.vb b/Aviso/frmHauptfenster.Designer.vb index 5d2acef..75ce445 100644 --- a/Aviso/frmHauptfenster.Designer.vb +++ b/Aviso/frmHauptfenster.Designer.vb @@ -1277,7 +1277,7 @@ Partial Class frmHauptfenster Me.Button3.Name = "Button3" Me.Button3.Size = New System.Drawing.Size(75, 23) Me.Button3.TabIndex = 5 - Me.Button3.Text = "asd" + Me.Button3.Text = "TEST" Me.Button3.UseVisualStyleBackColor = True Me.Button3.Visible = False ' diff --git a/Aviso/frmHauptfenster.vb b/Aviso/frmHauptfenster.vb index 6b861a5..d5d9e9f 100644 --- a/Aviso/frmHauptfenster.vb +++ b/Aviso/frmHauptfenster.vb @@ -261,7 +261,7 @@ Public Class frmHauptfenster If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ADMIN", Me) Then AdministrationToolStripMenuItem.Visible = True lblMitarbeiter.Text += " (Admin)" - + Button3.Visible = True Button12.Visible = True Label22.Visible = True Label22.Text = "XX" @@ -775,7 +775,7 @@ Public Class frmHauptfenster End If hSQL += " ORDER BY Ankunft ASC, AvisoEingang ASC, Datum ASC" - MsgBox(hSQL) + ' MsgBox(hSQL) 'If hSort = "" Then 'hSQL += " ORDER BY Ankunft DESC, AvisoEingang DESC, Datum DESC" ' Else @@ -2428,8 +2428,51 @@ Public Class frmHauptfenster If formTmp IsNot Nothing Then formTmp.Focus() End Sub - Private Sub Button3_Click_1(sender As Object, e As EventArgs) Handles Button3.Click + Public Function ConvertFileToBase64(ByVal fileName As String) As String + Return Convert.ToBase64String(System.IO.File.ReadAllBytes(fileName)) + End Function + Private Sub Button3_Click_1(sender As Object, e As EventArgs) Handles Button3.Click + 'Me.Cursor = Cursors.WaitCursor + + Dim firma = "" + MsgBox("LOS" & vbNewLine & firma) + + Dim path = SDL.cFinanzOnlineWebService.genUID_Formular("ATU74813856") + If path <> "" Then + Process.Start(path) + End If + 'If SDL.cFinanzOnlineWebService.Call_Web_Service_MethodUID_Abfrage_NEU2020(firma, "ATU74813856") = 0 Then + ' MsgBox("HURRA2" & vbNewLine & firma) + + + 'End If + + + Exit Sub + + + MsgBox("1" & Environment.UserDomainName) + MsgBox("1" & Environment.UserName) + Exit Sub + Dim file As System.IO.StreamWriter + file = My.Computer.FileSystem.OpenTextFileWriter("C:\Users\DEVELOPER1\Desktop\test.txt", True) + file.WriteLine(ConvertFileToBase64("C:\Users\DEVELOPER1\Desktop\Example.pdf")) + file.Close() + + MsgBox("2") + + Exit Sub + + Dim SH As New VERAG_PROG_ALLGEMEIN.cVERAG_in_TRAviso + SH.POSITIONS.Add(New cVERAG_in_TRAviso_shipments) + SH.DOCUMENTS.Add(New cVERAG_in_TRAviso_document) + SH.POSITIONS(0).ADDRESS.Add(New cVERAG_in_TRAviso_Adressen) + SH.POSITIONS(0).DOCUMENTS.Add(New cVERAG_in_TRAviso_document) + Dim resultJson = FromClass(SH) + + MsgBox(resultJson) + Exit Sub Dim jsonPost As New VERAG_PROG_ALLGEMEIN.cJsonPost("https://api.verag.ag/api/V001/CustomsDeclaration?value=test123") Dim dictData As New Dictionary(Of String, Object) diff --git a/Aviso/usrCntlBenachrichtigungen.Designer.vb b/Aviso/usrCntlBenachrichtigungen.Designer.vb index ef20200..7ea0839 100644 --- a/Aviso/usrCntlBenachrichtigungen.Designer.vb +++ b/Aviso/usrCntlBenachrichtigungen.Designer.vb @@ -23,16 +23,17 @@ Partial Class usrCntlBenachrichtigungen _ Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() - Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Me.Panel2 = New System.Windows.Forms.Panel() Me.gridAvisoBenachrichtigungen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.Panel4 = New System.Windows.Forms.Panel() Me.Button10 = New System.Windows.Forms.Button() Me.Panel3 = New System.Windows.Forms.Panel() Me.MyComboBox2 = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.cbxTeams = New System.Windows.Forms.CheckBox() Me.Label22 = New System.Windows.Forms.Label() Me.Label25 = New System.Windows.Forms.Label() - Me.cbxTeams = New System.Windows.Forms.CheckBox() + Me.cbxCluster = New System.Windows.Forms.CheckBox() Me.Panel2.SuspendLayout() CType(Me.gridAvisoBenachrichtigungen, System.ComponentModel.ISupportInitialize).BeginInit() Me.Panel4.SuspendLayout() @@ -48,7 +49,7 @@ Partial Class usrCntlBenachrichtigungen Me.Panel2.Dock = System.Windows.Forms.DockStyle.Fill Me.Panel2.Location = New System.Drawing.Point(0, 0) Me.Panel2.Name = "Panel2" - Me.Panel2.Size = New System.Drawing.Size(184, 203) + Me.Panel2.Size = New System.Drawing.Size(236, 203) Me.Panel2.TabIndex = 2 ' 'gridAvisoBenachrichtigungen @@ -58,8 +59,8 @@ Partial Class usrCntlBenachrichtigungen Me.gridAvisoBenachrichtigungen.AllowUserToDeleteRows = False Me.gridAvisoBenachrichtigungen.AllowUserToOrderColumns = True Me.gridAvisoBenachrichtigungen.AllowUserToResizeRows = False - DataGridViewCellStyle2.BackColor = System.Drawing.Color.Azure - Me.gridAvisoBenachrichtigungen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2 + DataGridViewCellStyle3.BackColor = System.Drawing.Color.Azure + Me.gridAvisoBenachrichtigungen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle3 Me.gridAvisoBenachrichtigungen.BackgroundColor = System.Drawing.Color.White Me.gridAvisoBenachrichtigungen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.gridAvisoBenachrichtigungen.Dock = System.Windows.Forms.DockStyle.Fill @@ -67,7 +68,7 @@ Partial Class usrCntlBenachrichtigungen Me.gridAvisoBenachrichtigungen.Name = "gridAvisoBenachrichtigungen" Me.gridAvisoBenachrichtigungen.ReadOnly = True Me.gridAvisoBenachrichtigungen.RowHeadersVisible = False - Me.gridAvisoBenachrichtigungen.Size = New System.Drawing.Size(184, 144) + Me.gridAvisoBenachrichtigungen.Size = New System.Drawing.Size(236, 144) Me.gridAvisoBenachrichtigungen.TabIndex = 2 ' 'Panel4 @@ -77,7 +78,7 @@ Partial Class usrCntlBenachrichtigungen Me.Panel4.Dock = System.Windows.Forms.DockStyle.Bottom Me.Panel4.Location = New System.Drawing.Point(0, 165) Me.Panel4.Name = "Panel4" - Me.Panel4.Size = New System.Drawing.Size(184, 38) + Me.Panel4.Size = New System.Drawing.Size(236, 38) Me.Panel4.TabIndex = 5 ' 'Button10 @@ -88,7 +89,7 @@ Partial Class usrCntlBenachrichtigungen Me.Button10.ForeColor = System.Drawing.Color.Black Me.Button10.Image = Global.AVISO.My.Resources.Resources.ok Me.Button10.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button10.Location = New System.Drawing.Point(59, 3) + Me.Button10.Location = New System.Drawing.Point(111, 3) Me.Button10.Name = "Button10" Me.Button10.Size = New System.Drawing.Size(121, 30) Me.Button10.TabIndex = 3 @@ -100,13 +101,14 @@ Partial Class usrCntlBenachrichtigungen 'Panel3 ' Me.Panel3.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.Panel3.Controls.Add(Me.cbxCluster) Me.Panel3.Controls.Add(Me.cbxTeams) Me.Panel3.Controls.Add(Me.Label22) Me.Panel3.Controls.Add(Me.Label25) Me.Panel3.Dock = System.Windows.Forms.DockStyle.Top Me.Panel3.Location = New System.Drawing.Point(0, 0) Me.Panel3.Name = "Panel3" - Me.Panel3.Size = New System.Drawing.Size(184, 21) + Me.Panel3.Size = New System.Drawing.Size(236, 21) Me.Panel3.TabIndex = 3 ' 'MyComboBox2 @@ -120,12 +122,23 @@ Partial Class usrCntlBenachrichtigungen Me.MyComboBox2.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.MyComboBox2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) Me.MyComboBox2.FormattingEnabled = True - Me.MyComboBox2.Location = New System.Drawing.Point(101, 70) + Me.MyComboBox2.Location = New System.Drawing.Point(112, 86) Me.MyComboBox2.Name = "MyComboBox2" - Me.MyComboBox2.Size = New System.Drawing.Size(83, 21) + Me.MyComboBox2.Size = New System.Drawing.Size(71, 21) Me.MyComboBox2.TabIndex = 27 Me.MyComboBox2.Visible = False ' + 'cbxTeams + ' + Me.cbxTeams.AutoSize = True + Me.cbxTeams.ForeColor = System.Drawing.Color.White + Me.cbxTeams.Location = New System.Drawing.Point(135, 4) + Me.cbxTeams.Name = "cbxTeams" + Me.cbxTeams.Size = New System.Drawing.Size(78, 17) + Me.cbxTeams.TabIndex = 28 + Me.cbxTeams.Text = "Alle Teams" + Me.cbxTeams.UseVisualStyleBackColor = True + ' 'Label22 ' Me.Label22.AutoSize = True @@ -141,23 +154,24 @@ Partial Class usrCntlBenachrichtigungen ' Me.Label25.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.Label25.ForeColor = System.Drawing.Color.White - Me.Label25.Location = New System.Drawing.Point(527, 6) + Me.Label25.Location = New System.Drawing.Point(579, 6) Me.Label25.Name = "Label25" Me.Label25.Size = New System.Drawing.Size(207, 19) Me.Label25.TabIndex = 1 Me.Label25.Text = "0 Akte vom Arbeitsplatz übernommen" Me.Label25.TextAlign = System.Drawing.ContentAlignment.TopRight ' - 'cbxTeams + 'cbxCluster ' - Me.cbxTeams.AutoSize = True - Me.cbxTeams.ForeColor = System.Drawing.Color.White - Me.cbxTeams.Location = New System.Drawing.Point(135, 4) - Me.cbxTeams.Name = "cbxTeams" - Me.cbxTeams.Size = New System.Drawing.Size(78, 17) - Me.cbxTeams.TabIndex = 28 - Me.cbxTeams.Text = "Alle Teams" - Me.cbxTeams.UseVisualStyleBackColor = True + Me.cbxCluster.AutoSize = True + Me.cbxCluster.ForeColor = System.Drawing.Color.White + Me.cbxCluster.Location = New System.Drawing.Point(219, 4) + Me.cbxCluster.Name = "cbxCluster" + Me.cbxCluster.Size = New System.Drawing.Size(58, 17) + Me.cbxCluster.TabIndex = 29 + Me.cbxCluster.Text = "Cluster" + Me.cbxCluster.UseVisualStyleBackColor = True + Me.cbxCluster.Visible = False ' 'usrCntlBenachrichtigungen ' @@ -165,7 +179,7 @@ Partial Class usrCntlBenachrichtigungen Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.Controls.Add(Me.Panel2) Me.Name = "usrCntlBenachrichtigungen" - Me.Size = New System.Drawing.Size(184, 203) + Me.Size = New System.Drawing.Size(236, 203) Me.Panel2.ResumeLayout(False) CType(Me.gridAvisoBenachrichtigungen, System.ComponentModel.ISupportInitialize).EndInit() Me.Panel4.ResumeLayout(False) @@ -184,4 +198,5 @@ Partial Class usrCntlBenachrichtigungen Friend WithEvents Label25 As Label Public WithEvents gridAvisoBenachrichtigungen As VERAG_PROG_ALLGEMEIN.MyDatagridview Friend WithEvents cbxTeams As CheckBox + Friend WithEvents cbxCluster As CheckBox End Class diff --git a/Aviso/usrCntlBenachrichtigungen.vb b/Aviso/usrCntlBenachrichtigungen.vb index 00b9777..9da90ca 100644 --- a/Aviso/usrCntlBenachrichtigungen.vb +++ b/Aviso/usrCntlBenachrichtigungen.vb @@ -31,10 +31,15 @@ Dim whereMA = " AND ( 1<>1 " - whereMA &= " OR (ab_TO_Art='B' AND ab_TO_Code='" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRID & "') " - whereMA &= " OR (ab_TO_Art='N' AND ab_TO_Code='" & VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG & "') " - whereMA &= " OR (ab_TO_Art='A' AND ab_TO_Code='" & VERAG_PROG_ALLGEMEIN.cAllgemein.ABTEILUNG & "') " - whereMA &= " OR (ab_TO_Art='F' AND ab_TO_Code='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "') " + If cbxCluster.Checked Then + whereMA &= " OR (ab_TO_Art='F' AND ab_TO_Code='" & VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER & "') " + Else + whereMA &= " OR (ab_TO_Art='B' AND ab_TO_Code='" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRID & "') " + whereMA &= " OR (ab_TO_Art='N' AND ab_TO_Code='" & VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG & "') " + whereMA &= " OR (ab_TO_Art='A' AND ab_TO_Code='" & VERAG_PROG_ALLGEMEIN.cAllgemein.ABTEILUNG & "') " + whereMA &= " OR (ab_TO_Art='F' AND ab_TO_Code='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "') " + End If + If cbxTeams.Checked Then whereMA &= " Or (ab_TO_Art='T' AND ab_TO_Code IN (SELECT [team_id] FROM ADMIN.dbo.[tblTeams] WHERE team_firma = '" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "')) " @@ -157,7 +162,29 @@ 'MyComboBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Benutzer", "Benutzer")) 'MyComboBox2.fillWithSQL("SELECT team_id, team_bezeichnung FROM tblTeams WHERE team_firma='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "'", False, "ADMIN", True, False) 'MyComboBox2.changeItem("Benutzer") - '' MyComboBox2.changeItem(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_teamId) + ' MyComboBox2.chang + + + MyComboBox2.Items.Clear() + MyComboBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG", "VERAG")) + MyComboBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("IMEX", "IMEX")) + MyComboBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("FRONTOFFICE", "FRONTOFFICE")) + MyComboBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("UNISPED", "UNISPED")) + MyComboBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("AMBAR", "AMBAR")) + MyComboBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ATILLA", "ATILLA")) + MyComboBox2.changeItem(VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA) + + + If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("BENACHRICHTIGUNGEN_SeeCluster", "AVISO") Then + cbxCluster.Visible = True + If VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER <> "" Then + cbxCluster.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER + End If + End If + + + + ' MyComboBox2.changeItem(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_teamId) End Sub Private Sub Button10_Click(sender As Object, e As EventArgs) Handles Button10.Click @@ -215,4 +242,8 @@ 'initDgvAvisoBenachrichtigungen(True, Me.Font) initDgvAvisoBenachrichtigungen(True, Me.Font) End Sub + + Private Sub cbxCluster_CheckedChanged(sender As Object, e As EventArgs) Handles cbxCluster.CheckedChanged + initDgvAvisoBenachrichtigungen(True, Me.Font) + End Sub End Class