From 0b0d0f953878922e7212aa3d27883ff723543594 Mon Sep 17 00:00:00 2001 From: ms Date: Thu, 7 Nov 2019 09:47:16 +0100 Subject: [PATCH] Nachrichten verbessert, Bugs beseitigt, ... --- Dokumentation/Classes/cSQL.vb | 12 +++ Dokumentation/Main.vb | 28 +++++-- .../My Project/Resources.Designer.vb | 2 +- Dokumentation/My Project/Resources.resx | 2 +- Dokumentation/frmHostBearbeiten.Designer.vb | 23 +++--- Dokumentation/uscntr_SendMSG.Designer.vb | 19 +++-- Dokumentation/uscntr_SendMSG.vb | 13 ++- Dokumentation/uscntr_TSSitzungen.Designer.vb | 81 +++++++++++-------- Dokumentation/uscntr_TSSitzungen.vb | 33 +++++--- Dokumentation_Updater/Update.vb | 4 +- 10 files changed, 137 insertions(+), 80 deletions(-) diff --git a/Dokumentation/Classes/cSQL.vb b/Dokumentation/Classes/cSQL.vb index 6bd027a..5d0a670 100644 --- a/Dokumentation/Classes/cSQL.vb +++ b/Dokumentation/Classes/cSQL.vb @@ -50,6 +50,18 @@ Public Class cSQL con.Close() End Sub + Public Shared Sub SQLCommand(command As String) + Dim con As New SqlConnection + Dim cmd As New SqlCommand + con.ConnectionString = Class1.DBConString + cmd.Connection = con + + con.Open() + cmd.CommandText = command + cmd.ExecuteNonQuery() + con.Close() + End Sub + End Class diff --git a/Dokumentation/Main.vb b/Dokumentation/Main.vb index b4a6766..3163006 100644 --- a/Dokumentation/Main.vb +++ b/Dokumentation/Main.vb @@ -23,7 +23,7 @@ Public Class Main Public Startparameter As String = "" Public sAppPath As String = Application.StartupPath - Public Updatequelle As String = "\\192.168.0.91\f\Programme\Doku\" + Public Updatequelle As String = "\\share01.verag.ost.dmn\Programme\Doku\" Private Version As String = My.Resources.Version @@ -38,9 +38,6 @@ Public Class Main LblUhrzeit.Text = "Willkommen " & Class1.LoggedOnUser.Name Class1.EnableDoubleBuffered(DgVMain) - - - Me.KeyPreview = True 'MsgBox(sAppPath) @@ -537,9 +534,12 @@ Public Class Main If SelectedDGVIndex < DgVMain.Rows.Count - 1 Then - DgVMain.ClearSelection() - DgVMain.Rows(SelectedDGVIndex).Selected = True - DgVMain.FirstDisplayedScrollingRowIndex = FirstDisplayedDGVEntry + Try + DgVMain.ClearSelection() + DgVMain.Rows(SelectedDGVIndex).Selected = True + DgVMain.FirstDisplayedScrollingRowIndex = FirstDisplayedDGVEntry + Catch + End Try Else DgVMain.Rows(0).Selected = True End If @@ -784,6 +784,7 @@ Public Class Main If cBerechtigungen.BenutzerBerechtigungfuerStandort(Class1.LoggedOnUser.BenutzeranmeldeName, LstStandort.SelectedItem) = "R" Then frm.Panel1.Enabled = False : frm.PanFirewall.Enabled = False End If + frm.StartPosition = FormStartPosition.CenterScreen AddHandler frm.FormClosing, Function() Me.BringToFront() dgvload_filter(Suchbegriff) @@ -808,13 +809,22 @@ Public Class Main Me.BringToFront() dgvload(Tabelle) LstAllgemein.SelectedItem = Eintrag.rubrik - DgVMain.Rows(SelectedDGVIndex).Selected = True + DgVMain.Rows(returncleandgvindex(SelectedDGVIndex)).Selected = True End Function frm.Show() End If End Sub + Function returncleandgvindex(dgvindex As Integer) + Try + DgVMain.Rows(dgvindex).Selected = True + Return dgvindex + Catch ex As Exception + Return 0 + End Try + End Function + Public Function StartHostBearbeiten() HostBearbeiten.StartPosition = FormStartPosition.Manual HostBearbeiten.Location = New Point(Location.X + 150, Location.Y + 150) @@ -1216,6 +1226,7 @@ Public Class Main Private Sub btnTest3_Click(sender As Object, e As EventArgs) Handles btnTest3.Click panTSSitzungen.Controls.Clear() Dim dingsi As New uscntr_TSSitzungen + ' Threading.Thread.Sleep(2000) panTSSitzungen.Controls.Add(dingsi) @@ -1275,6 +1286,7 @@ Public Class Main End If End Sub + Private Sub ObjektLöschenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ObjektLöschenToolStripMenuItem.Click If Tabelle = "TbL_Netzwerkclients" Then Dim ds As New DataSet diff --git a/Dokumentation/My Project/Resources.Designer.vb b/Dokumentation/My Project/Resources.Designer.vb index c3a5482..debc12b 100644 --- a/Dokumentation/My Project/Resources.Designer.vb +++ b/Dokumentation/My Project/Resources.Designer.vb @@ -199,7 +199,7 @@ Namespace My.Resources End Property ''' - ''' Sucht eine lokalisierte Zeichenfolge, die 0.0.1.38 ähnelt. + ''' Sucht eine lokalisierte Zeichenfolge, die 0.0.1.41 ähnelt. ''' Friend ReadOnly Property Version() As String Get diff --git a/Dokumentation/My Project/Resources.resx b/Dokumentation/My Project/Resources.resx index 4dee1ae..b5722b6 100644 --- a/Dokumentation/My Project/Resources.resx +++ b/Dokumentation/My Project/Resources.resx @@ -128,7 +128,7 @@ ..\Resources\Bearbeiten20.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - 0.0.1.38 + 0.0.1.41 ..\Resources\Print20x20.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a diff --git a/Dokumentation/frmHostBearbeiten.Designer.vb b/Dokumentation/frmHostBearbeiten.Designer.vb index 5680c4f..ff818ba 100644 --- a/Dokumentation/frmHostBearbeiten.Designer.vb +++ b/Dokumentation/frmHostBearbeiten.Designer.vb @@ -61,6 +61,7 @@ Partial Class frmHostBearbeiten Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.MitHTTPFüllenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.KopierenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.FFPortToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.CmdIPUp = New System.Windows.Forms.Button() Me.CmdDateien = New System.Windows.Forms.Button() Me.Label6 = New System.Windows.Forms.Label() @@ -78,7 +79,6 @@ Partial Class frmHostBearbeiten Me.PanFirewall = New System.Windows.Forms.Panel() Me.PanSlaves = New System.Windows.Forms.Panel() Me.PanNavTop = New System.Windows.Forms.Panel() - Me.FFPortToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ContextMenuStrip2.SuspendLayout() Me.ContextMenuStrip1.SuspendLayout() Me.Panel1.SuspendLayout() @@ -410,20 +410,27 @@ Partial Class frmHostBearbeiten ' Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.MitHTTPFüllenToolStripMenuItem, Me.KopierenToolStripMenuItem, Me.FFPortToolStripMenuItem}) Me.ContextMenuStrip1.Name = "ContextMenuStrip1" - Me.ContextMenuStrip1.Size = New System.Drawing.Size(181, 92) + Me.ContextMenuStrip1.Size = New System.Drawing.Size(157, 70) ' 'MitHTTPFüllenToolStripMenuItem ' Me.MitHTTPFüllenToolStripMenuItem.Name = "MitHTTPFüllenToolStripMenuItem" - Me.MitHTTPFüllenToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.MitHTTPFüllenToolStripMenuItem.Size = New System.Drawing.Size(156, 22) Me.MitHTTPFüllenToolStripMenuItem.Text = "mit HTTP füllen" ' 'KopierenToolStripMenuItem ' Me.KopierenToolStripMenuItem.Name = "KopierenToolStripMenuItem" - Me.KopierenToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.KopierenToolStripMenuItem.Size = New System.Drawing.Size(156, 22) Me.KopierenToolStripMenuItem.Text = "Kopieren" ' + 'FFPortToolStripMenuItem + ' + Me.FFPortToolStripMenuItem.Name = "FFPortToolStripMenuItem" + Me.FFPortToolStripMenuItem.Size = New System.Drawing.Size(156, 22) + Me.FFPortToolStripMenuItem.Text = "FF Port" + Me.FFPortToolStripMenuItem.Visible = False + ' 'CmdIPUp ' Me.CmdIPUp.BackColor = System.Drawing.SystemColors.ControlLightLight @@ -635,13 +642,6 @@ Partial Class frmHostBearbeiten Me.PanNavTop.Size = New System.Drawing.Size(309, 32) Me.PanNavTop.TabIndex = 141 ' - 'FFPortToolStripMenuItem - ' - Me.FFPortToolStripMenuItem.Name = "FFPortToolStripMenuItem" - Me.FFPortToolStripMenuItem.Size = New System.Drawing.Size(180, 22) - Me.FFPortToolStripMenuItem.Text = "FF Port" - Me.FFPortToolStripMenuItem.Visible = False - ' 'frmHostBearbeiten ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -658,6 +658,7 @@ Partial Class frmHostBearbeiten Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) Me.KeyPreview = True Me.Name = "frmHostBearbeiten" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent Me.Text = " Host bearbeiten" Me.ContextMenuStrip2.ResumeLayout(False) Me.ContextMenuStrip1.ResumeLayout(False) diff --git a/Dokumentation/uscntr_SendMSG.Designer.vb b/Dokumentation/uscntr_SendMSG.Designer.vb index 42bff78..0a11f5f 100644 --- a/Dokumentation/uscntr_SendMSG.Designer.vb +++ b/Dokumentation/uscntr_SendMSG.Designer.vb @@ -55,7 +55,7 @@ Partial Class uscntr_SendMSG 'cmdSenden ' Me.cmdSenden.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.cmdSenden.Location = New System.Drawing.Point(383, 173) + Me.cmdSenden.Location = New System.Drawing.Point(383, 224) Me.cmdSenden.Name = "cmdSenden" Me.cmdSenden.Size = New System.Drawing.Size(75, 23) Me.cmdSenden.TabIndex = 2 @@ -64,20 +64,23 @@ Partial Class uscntr_SendMSG ' 'Panel1 ' + Me.Panel1.AutoSize = True Me.Panel1.Controls.Add(Me.TextBox1) Me.Panel1.Controls.Add(Me.Label1) Me.Panel1.Dock = System.Windows.Forms.DockStyle.Top Me.Panel1.Location = New System.Drawing.Point(0, 0) Me.Panel1.Name = "Panel1" - Me.Panel1.Size = New System.Drawing.Size(461, 108) + Me.Panel1.Size = New System.Drawing.Size(461, 100) Me.Panel1.TabIndex = 3 ' 'PanServerListe ' + Me.PanServerListe.AutoSize = True Me.PanServerListe.Dock = System.Windows.Forms.DockStyle.Left - Me.PanServerListe.Location = New System.Drawing.Point(0, 108) + Me.PanServerListe.Location = New System.Drawing.Point(0, 100) + Me.PanServerListe.MinimumSize = New System.Drawing.Size(196, 0) Me.PanServerListe.Name = "PanServerListe" - Me.PanServerListe.Size = New System.Drawing.Size(196, 91) + Me.PanServerListe.Size = New System.Drawing.Size(196, 150) Me.PanServerListe.TabIndex = 0 ' 'PanMain @@ -89,9 +92,9 @@ Partial Class uscntr_SendMSG Me.PanMain.Controls.Add(Me.cmdSenden) Me.PanMain.Dock = System.Windows.Forms.DockStyle.Fill Me.PanMain.Location = New System.Drawing.Point(0, 0) - Me.PanMain.MinimumSize = New System.Drawing.Size(461, 199) + Me.PanMain.MinimumSize = New System.Drawing.Size(461, 220) Me.PanMain.Name = "PanMain" - Me.PanMain.Size = New System.Drawing.Size(461, 199) + Me.PanMain.Size = New System.Drawing.Size(461, 250) Me.PanMain.TabIndex = 4 ' 'LabelInfo @@ -106,7 +109,7 @@ Partial Class uscntr_SendMSG 'cmdVorschau ' Me.cmdVorschau.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.cmdVorschau.Location = New System.Drawing.Point(205, 173) + Me.cmdVorschau.Location = New System.Drawing.Point(205, 224) Me.cmdVorschau.Name = "cmdVorschau" Me.cmdVorschau.Size = New System.Drawing.Size(75, 23) Me.cmdVorschau.TabIndex = 3 @@ -124,7 +127,7 @@ Partial Class uscntr_SendMSG Me.Controls.Add(Me.PanMain) Me.MinimumSize = New System.Drawing.Size(461, 199) Me.Name = "uscntr_SendMSG" - Me.Size = New System.Drawing.Size(461, 199) + Me.Size = New System.Drawing.Size(461, 250) Me.Panel1.ResumeLayout(False) Me.Panel1.PerformLayout() Me.PanMain.ResumeLayout(False) diff --git a/Dokumentation/uscntr_SendMSG.vb b/Dokumentation/uscntr_SendMSG.vb index abb4ad9..871a58d 100644 --- a/Dokumentation/uscntr_SendMSG.vb +++ b/Dokumentation/uscntr_SendMSG.vb @@ -66,9 +66,9 @@ If SingleUserRec = True Then msgfin = String.Format(msg, recuser.NameKurz, recuser.TSServer, TextBox1.Text) Else - msgfin = String.Format(msg, "*", recserver(0), TextBox1.Text) + msgfin = String.Format(msg, "*", ErsterEintragVonListOfString(recserver), TextBox1.Text) End If - LabelInfo.Text = "msg" & msgfin + ' LabelInfo.Text = "msg" & msgfin End Sub Private Sub cmdSenden_Click(sender As Object, e As EventArgs) Handles cmdSenden.Click @@ -78,8 +78,17 @@ Else For Each srv As String In recserver Ext_Programme.msgsend(String.Format(msg, "*", srv, TextBox1.Text)) + Threading.Thread.Sleep(3000) Next End If End If End Sub + + Function ErsterEintragVonListOfString(liste As List(Of String)) + If liste.Count > 0 Then + Return liste(0) + Else + Return "" + End If + End Function End Class diff --git a/Dokumentation/uscntr_TSSitzungen.Designer.vb b/Dokumentation/uscntr_TSSitzungen.Designer.vb index d1fdb0b..816bb8a 100644 --- a/Dokumentation/uscntr_TSSitzungen.Designer.vb +++ b/Dokumentation/uscntr_TSSitzungen.Designer.vb @@ -25,18 +25,19 @@ Partial Class uscntr_TSSitzungen Me.components = New System.ComponentModel.Container() Me.dgvTSSitzungen = New System.Windows.Forms.DataGridView() Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components) + Me.VerbindenMitTeamVToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.NachrichtSendenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.UpdateToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.Timer1 = New System.Windows.Forms.Timer(Me.components) Me.Panel1 = New System.Windows.Forms.Panel() + Me.lblAnzahl = New System.Windows.Forms.Label() Me.cmdNachricht = New System.Windows.Forms.Button() Me.chkAutoUpdate = New System.Windows.Forms.CheckBox() Me.CmdUpdate = New System.Windows.Forms.Button() Me.Panel2 = New System.Windows.Forms.Panel() - Me.TextBox1 = New System.Windows.Forms.TextBox() - Me.Label1 = New System.Windows.Forms.Label() Me.btnReset = New System.Windows.Forms.Button() - Me.lblAnzahl = New System.Windows.Forms.Label() + Me.Label1 = New System.Windows.Forms.Label() + Me.TextBox1 = New System.Windows.Forms.TextBox() CType(Me.dgvTSSitzungen, System.ComponentModel.ISupportInitialize).BeginInit() Me.ContextMenuStrip1.SuspendLayout() Me.Panel1.SuspendLayout() @@ -48,6 +49,7 @@ Partial Class uscntr_TSSitzungen Me.dgvTSSitzungen.AllowUserToAddRows = False Me.dgvTSSitzungen.AllowUserToDeleteRows = False Me.dgvTSSitzungen.AllowUserToResizeRows = False + Me.dgvTSSitzungen.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill Me.dgvTSSitzungen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvTSSitzungen.ContextMenuStrip = Me.ContextMenuStrip1 Me.dgvTSSitzungen.Dock = System.Windows.Forms.DockStyle.Fill @@ -62,20 +64,26 @@ Partial Class uscntr_TSSitzungen ' 'ContextMenuStrip1 ' - Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.NachrichtSendenToolStripMenuItem, Me.UpdateToolStripMenuItem}) + Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.VerbindenMitTeamVToolStripMenuItem, Me.NachrichtSendenToolStripMenuItem, Me.UpdateToolStripMenuItem}) Me.ContextMenuStrip1.Name = "ContextMenuStrip1" - Me.ContextMenuStrip1.Size = New System.Drawing.Size(168, 48) + Me.ContextMenuStrip1.Size = New System.Drawing.Size(190, 70) + ' + 'VerbindenMitTeamVToolStripMenuItem + ' + Me.VerbindenMitTeamVToolStripMenuItem.Name = "VerbindenMitTeamVToolStripMenuItem" + Me.VerbindenMitTeamVToolStripMenuItem.Size = New System.Drawing.Size(189, 22) + Me.VerbindenMitTeamVToolStripMenuItem.Text = "Verbinden mit TeamV." ' 'NachrichtSendenToolStripMenuItem ' Me.NachrichtSendenToolStripMenuItem.Name = "NachrichtSendenToolStripMenuItem" - Me.NachrichtSendenToolStripMenuItem.Size = New System.Drawing.Size(167, 22) + Me.NachrichtSendenToolStripMenuItem.Size = New System.Drawing.Size(189, 22) Me.NachrichtSendenToolStripMenuItem.Text = "Nachricht senden" ' 'UpdateToolStripMenuItem ' Me.UpdateToolStripMenuItem.Name = "UpdateToolStripMenuItem" - Me.UpdateToolStripMenuItem.Size = New System.Drawing.Size(167, 22) + Me.UpdateToolStripMenuItem.Size = New System.Drawing.Size(189, 22) Me.UpdateToolStripMenuItem.Text = "Update" ' 'Timer1 @@ -95,6 +103,17 @@ Partial Class uscntr_TSSitzungen Me.Panel1.Size = New System.Drawing.Size(365, 67) Me.Panel1.TabIndex = 2 ' + 'lblAnzahl + ' + Me.lblAnzahl.AutoSize = True + Me.lblAnzahl.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblAnzahl.ForeColor = System.Drawing.SystemColors.WindowFrame + Me.lblAnzahl.Location = New System.Drawing.Point(9, 11) + Me.lblAnzahl.Name = "lblAnzahl" + Me.lblAnzahl.Size = New System.Drawing.Size(43, 12) + Me.lblAnzahl.TabIndex = 13 + Me.lblAnzahl.Text = "lblAnzahl" + ' 'cmdNachricht ' Me.cmdNachricht.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) @@ -114,6 +133,8 @@ Partial Class uscntr_TSSitzungen 'chkAutoUpdate ' Me.chkAutoUpdate.AutoSize = True + Me.chkAutoUpdate.Checked = True + Me.chkAutoUpdate.CheckState = System.Windows.Forms.CheckState.Checked Me.chkAutoUpdate.Location = New System.Drawing.Point(220, 11) Me.chkAutoUpdate.Name = "chkAutoUpdate" Me.chkAutoUpdate.Size = New System.Drawing.Size(127, 17) @@ -149,25 +170,6 @@ Partial Class uscntr_TSSitzungen Me.Panel2.Size = New System.Drawing.Size(365, 36) Me.Panel2.TabIndex = 3 ' - 'TextBox1 - ' - Me.TextBox1.Location = New System.Drawing.Point(103, 8) - Me.TextBox1.Margin = New System.Windows.Forms.Padding(8) - Me.TextBox1.Name = "TextBox1" - Me.TextBox1.Size = New System.Drawing.Size(157, 20) - Me.TextBox1.TabIndex = 0 - ' - 'Label1 - ' - Me.Label1.AutoSize = True - Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label1.Location = New System.Drawing.Point(8, 12) - Me.Label1.Margin = New System.Windows.Forms.Padding(8) - Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(93, 13) - Me.Label1.TabIndex = 1 - Me.Label1.Text = "TSUser Suche:" - ' 'btnReset ' Me.btnReset.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) @@ -183,16 +185,24 @@ Partial Class uscntr_TSSitzungen Me.btnReset.Text = "Reset" Me.btnReset.UseVisualStyleBackColor = False ' - 'lblAnzahl + 'Label1 ' - Me.lblAnzahl.AutoSize = True - Me.lblAnzahl.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblAnzahl.ForeColor = System.Drawing.SystemColors.WindowFrame - Me.lblAnzahl.Location = New System.Drawing.Point(9, 11) - Me.lblAnzahl.Name = "lblAnzahl" - Me.lblAnzahl.Size = New System.Drawing.Size(43, 12) - Me.lblAnzahl.TabIndex = 13 - Me.lblAnzahl.Text = "lblAnzahl" + Me.Label1.AutoSize = True + Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label1.Location = New System.Drawing.Point(8, 12) + Me.Label1.Margin = New System.Windows.Forms.Padding(8) + Me.Label1.Name = "Label1" + Me.Label1.Size = New System.Drawing.Size(93, 13) + Me.Label1.TabIndex = 1 + Me.Label1.Text = "TSUser Suche:" + ' + 'TextBox1 + ' + Me.TextBox1.Location = New System.Drawing.Point(103, 8) + Me.TextBox1.Margin = New System.Windows.Forms.Padding(8) + Me.TextBox1.Name = "TextBox1" + Me.TextBox1.Size = New System.Drawing.Size(157, 20) + Me.TextBox1.TabIndex = 0 ' 'uscntr_TSSitzungen ' @@ -230,4 +240,5 @@ Partial Class uscntr_TSSitzungen Friend WithEvents TextBox1 As TextBox Friend WithEvents btnReset As Button Friend WithEvents lblAnzahl As Label + Friend WithEvents VerbindenMitTeamVToolStripMenuItem As ToolStripMenuItem End Class diff --git a/Dokumentation/uscntr_TSSitzungen.vb b/Dokumentation/uscntr_TSSitzungen.vb index f886772..020e368 100644 --- a/Dokumentation/uscntr_TSSitzungen.vb +++ b/Dokumentation/uscntr_TSSitzungen.vb @@ -1,6 +1,7 @@ Public Class uscntr_TSSitzungen Private Sub uscntr_TSSitzungen_Load(sender As Object, e As EventArgs) Handles Me.Load + Class1.EnableDoubleBuffered(dgvTSSitzungen) Load2DGV() End Sub @@ -11,20 +12,21 @@ With dgvTSSitzungen .RowHeadersVisible = False .DataSource = ds.Tables(0) - .AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.DisplayedCells - .Columns("BenutzerAnmeldeName").Visible = False - '.Columns("BenutzerAnmeldeName").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill + .Columns("Domain").Visible = False .Columns("LastLogon").Visible = False - .Columns("LastLogon").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill - '.Columns("LastReport").Width = 85 - '.Columns("TeamviewerID").Width = 80 - '.Columns("TSServer").Width = 60 + .Columns("BenutzerAnmeldeName").Visible = False + + .Columns("Name").Width = 110 'AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill + .Columns("TeamviewerID").Width = 80 + .Columns("TSServer").Width = 55 + + .AutoResizeColumn(1) End With lblAnzahl.Text = dgvTSSitzungen.Rows.Count LoadTSServer() End Function - Private Sub dgvTSSitzungen_CellContentClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvTSSitzungen.CellContentDoubleClick + Private Sub dgvTSSitzungen_CellContentClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvTSSitzungen.CellDoubleClick 'dgvTSSitzungen.CellContentDoubleClick, Dim sitzung As String = Class1.DBNull2emptyString(dgvTSSitzungen.CurrentRow.Cells("TeamviewerID").Value) StartTeamviewer(sitzung) @@ -40,7 +42,6 @@ End With teamviewer.Start() - End Function Private Sub Timer1_Tick(sender As Object, e As EventArgs) Handles Timer1.Tick @@ -61,10 +62,13 @@ Private Function LoadTSServer() Dim ds As New DataSet - cSQL.SQL2DS("SELECT DISTINCT TSServer FROM TbL_TSSitzungen", ds) + cSQL.SQLCommand("DELETE FROM TbL_TSSitzungen where LastReport < (dateadd(HOUR, -1, getdate()))") + cSQL.SQL2DS("SELECT DISTINCT TSServer, Domain FROM TbL_TSSitzungen", ds) + + Class1.TerminalServerList.Clear() For Each r As DataRow In ds.Tables(0).Rows - Class1.TerminalServerList.Add(r.Item(0).ToString) + Class1.TerminalServerList.Add(r.Item(0).ToString & "." & r.Item(1).ToString) Next @@ -84,7 +88,7 @@ Dim usrcntrl As New uscntr_SendMSG usrcntrl.recuser.Name = dgvTSSitzungen.CurrentRow.Cells("Name").Value.ToString usrcntrl.recuser.BenutzerAnmeldeName = dgvTSSitzungen.CurrentRow.Cells("BenutzerAnmeldeName").Value.ToString - usrcntrl.recuser.TSServer = dgvTSSitzungen.CurrentRow.Cells("TSServer").Value.ToString + usrcntrl.recuser.TSServer = dgvTSSitzungen.CurrentRow.Cells("TSServer").Value.ToString & "." & dgvTSSitzungen.CurrentRow.Cells("Domain").Value.ToString usrcntrl.Dock = DockStyle.Fill : send.PanMain.Controls.Add(usrcntrl) send.Show() End Sub @@ -101,4 +105,9 @@ Private Sub btnReset_Click(sender As Object, e As EventArgs) Handles btnReset.Click TextBox1.Text = "" End Sub + + Private Sub VerbindenMitTeamVToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles VerbindenMitTeamVToolStripMenuItem.Click + Dim sitzung As String = Class1.DBNull2emptyString(dgvTSSitzungen.CurrentRow.Cells("TeamviewerID").Value) + StartTeamviewer(sitzung) + End Sub End Class diff --git a/Dokumentation_Updater/Update.vb b/Dokumentation_Updater/Update.vb index 9e780de..38a73c1 100644 --- a/Dokumentation_Updater/Update.vb +++ b/Dokumentation_Updater/Update.vb @@ -39,7 +39,7 @@ Public Class Update My.Computer.FileSystem.DeleteFile(sAppPath & "\" & "Dokumentation.exe") Catch ex As Exception MsgBox("Löschen fehlgeschlagen: " & ex.Message) - TxtInfo.Text &= ex.Message + 'TxtInfo.Text &= ex.Message End Try Dim files As String() = IO.Directory.GetFiles(Updatequelle) @@ -48,7 +48,7 @@ Public Class Update TxtInfo.Text &= "Kopiere " & System.IO.Path.GetFileName(file) & vbCrLf My.Computer.FileSystem.CopyFile(file, sAppPath & "\" & System.IO.Path.GetFileName(file), True) Catch ex As Exception - TxtInfo.Text &= "... Datei übersprungen:" & vbCrLf & ex.Message + ' TxtInfo.Text &= "... Datei übersprungen:" & vbCrLf & ex.Message End Try Next CmdUpdate.Enabled = True