From 945223b97c5f740103101631995b52e667aa9754 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Tue, 5 Mar 2024 08:47:02 +0100 Subject: [PATCH 1/5] timas-Abfrage --- .../Mitarbeiterverzeichnis/frmUeberstundenauszahlen.vb | 6 +----- VERAG_PROG_ALLGEMEIN/Schnittstellen/TIMAS/cTimasAPI.vb | 5 +---- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.vb b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.vb index fd8b5d31..230cdbc5 100644 --- a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.vb +++ b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.vb @@ -1,12 +1,8 @@  -Imports System.Data.Common -Imports System.Drawing -Imports System.Runtime.InteropServices.ComTypes Imports System.Text Imports System.Threading Imports System.Web.UI.WebControls Imports System.Windows.Forms -Imports System.Windows.Forms.VisualStyles.VisualStyleElement.ToolTip Public Class frmUeberstundenauszahlen Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL @@ -309,7 +305,7 @@ Public Class frmUeberstundenauszahlen picDel.Visible = False For Each c As Control In Panel1.Controls - If TypeOf c Is TextBox Then + If TypeOf c Is Windows.Forms.TextBox Then c.Text = "0" End If Next diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/TIMAS/cTimasAPI.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/TIMAS/cTimasAPI.vb index 8746a01f..144a6347 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/TIMAS/cTimasAPI.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/TIMAS/cTimasAPI.vb @@ -145,8 +145,6 @@ Public Class cTimasAPI rest.AddQueryParam("from", Today().AddDays(-1).ToString("yyyy-MM-ddTHH:mm:ss")) rest.AddQueryParam("to", Now().ToString("yyyy-MM-ddTHH:mm:ss")) - - Dim Response As String rest.IdleTimeoutMs = 5000 '5 sec Response = rest.FullRequestNoBody("GET", "/rest/web-api/employees/" & maid & "/bookings") @@ -191,8 +189,7 @@ Public Class cTimasAPI Dim timeEntry As Chilkat.JsonObject = jsonArray.ObjectAt(j) If IsDate(timeEntry.StringOf("stamp")) Then - If CDate(timeEntry.StringOf("stamp")) >= CDate(Today()) Or CDate(timeEntry.StringOf("stamp")) >= CDate(Today().AddDays(-1)) AndAlso CDate(timeEntry.StringOf("stamp")).Hour >= 16 Then 'entweder heute keine Stempelung oder gestern > 16 Uhr (wegen Nachtschicht!) - + If CDate(timeEntry.StringOf("stamp")) >= CDate(Today()) Or CDate(timeEntry.StringOf("stamp")) >= CDate(Today().AddDays(-1)) AndAlso CDate(timeEntry.StringOf("stamp")).Hour >= 16 AndAlso timeEntry.StringOf("type") = "in" Then 'entweder heute keine Stempelung oder gestern > 16 Uhr (wegen Nachtschicht!) Dim R As DataRow = dt.NewRow 'R("statusid") = timeEntry.StringOf("statusid") From 25d5767574892ba9e1f29309394a9297c08939c3 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Thu, 7 Mar 2024 14:21:52 +0100 Subject: [PATCH 2/5] Messenger, Ueberstunden --- VERAG_PROG_ALLGEMEIN/Classes/cMessenger.vb | 8 +++ VERAG_PROG_ALLGEMEIN/Classes/cUeberstunden.vb | 2 + .../Messenger/frmMessenger.Designer.vb | 13 ++-- .../Messenger/frmMessenger.vb | 2 +- .../frmUeberstundenauszahlen.Designer.vb | 63 +++++++++++-------- .../frmUeberstundenauszahlen.resx | 2 +- .../frmUeberstundenauszahlen.vb | 46 ++++++++++++-- .../Schnittstellen/TIMAS/cTimasAPI.vb | 44 ++++++++++++- 8 files changed, 142 insertions(+), 38 deletions(-) diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cMessenger.vb b/VERAG_PROG_ALLGEMEIN/Classes/cMessenger.vb index 1ea4cd6c..557d2be2 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cMessenger.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cMessenger.vb @@ -486,6 +486,14 @@ Public Class cMessenger End Function + Public Function SetOldChatsInactiv(olderthan As Integer) As Boolean + + Dim dateBack = If(olderthan <> "", CDate(Now.AddDays(olderthan * -1)), CDate(Now.AddDays(30 * -1))) + Dim sqlstr = " Update [tblMessenger_Chat] set [chat_aktiv] = 0 WHERE chat_aktiv = 1 and chat_lastMsg <=" & dateBack + Return SQL.doSQL(sqlstr, "ADMIN") + End Function + + End Class Public Class cMessenger_ChatMembers diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cUeberstunden.vb b/VERAG_PROG_ALLGEMEIN/Classes/cUeberstunden.vb index 13eef051..02ed31d2 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cUeberstunden.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cUeberstunden.vb @@ -20,6 +20,7 @@ Public Class cUeberstunden Property uest_ignoreLimit As Boolean Property uest_overwriteValue As Boolean Property uest_paidout_sum As Object = Nothing + Property uest_isParttime As Boolean Public hasEntry = False @@ -57,6 +58,7 @@ Public Class cUeberstunden list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("uest_maxUE", uest_maxUE)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("uest_overwriteValue", uest_overwriteValue)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("uest_paidout_sum", uest_paidout_sum)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("uest_isParttime", uest_isParttime)) Return list End Function diff --git a/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.Designer.vb b/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.Designer.vb index 5d1e86b9..248466b5 100644 --- a/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.Designer.vb +++ b/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.Designer.vb @@ -24,6 +24,7 @@ Partial Class frmMessenger 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. _ Private Sub InitializeComponent() + Me.components = New System.ComponentModel.Container() Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() @@ -38,11 +39,11 @@ Partial Class frmMessenger Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmMessenger)) Me.SplitContainer = New System.Windows.Forms.SplitContainer() Me.SplitContainer2 = New System.Windows.Forms.SplitContainer() - Me.dgvChats = New VERAG_PROG_ALLGEMEIN.MyDatagridview() + Me.dgvChats = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.Panel6 = New System.Windows.Forms.Panel() Me.lblLKWChat_MsgCntInaktiv = New System.Windows.Forms.Label() Me.cbxInaktiveChats = New System.Windows.Forms.CheckBox() - Me.DGVSonstige = New VERAG_PROG_ALLGEMEIN.MyDatagridview() + Me.DGVSonstige = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.Panel5 = New System.Windows.Forms.Panel() Me.MyTextBox2 = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.PictureBox2 = New System.Windows.Forms.PictureBox() @@ -63,7 +64,7 @@ Partial Class frmMessenger Me.btnNeu = New System.Windows.Forms.Button() Me.Button1 = New System.Windows.Forms.Button() Me.SplitContainer1 = New System.Windows.Forms.SplitContainer() - Me.MyFlowLayoutPanel1 = New VERAG_PROG_ALLGEMEIN.MyFlowLayoutPanel() + Me.MyFlowLayoutPanel1 = New VERAG_PROG_ALLGEMEIN.MyFlowLayoutPanel(Me.components) Me.UsrCntlMessenger_ChatElement1 = New VERAG_PROG_ALLGEMEIN.usrCntlMessenger_ChatElement() Me.Panel3 = New System.Windows.Forms.Panel() Me.btnTeilnehmer = New System.Windows.Forms.Button() @@ -91,9 +92,9 @@ Partial Class frmMessenger Me.btnSendAtt = New System.Windows.Forms.Button() Me.btnSenden = New System.Windows.Forms.Button() Me.rtbChatMessage = New System.Windows.Forms.RichTextBox() - Me.TimerNEW_MESSAGE = New System.Windows.Forms.Timer() - Me.Timer_REFRESH = New System.Windows.Forms.Timer() - Me.cntxt = New System.Windows.Forms.ContextMenuStrip() + Me.TimerNEW_MESSAGE = New System.Windows.Forms.Timer(Me.components) + Me.Timer_REFRESH = New System.Windows.Forms.Timer(Me.components) + Me.cntxt = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ChatDeaktivierenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.toolChatReminder = New System.Windows.Forms.ToolStripMenuItem() Me.DataGridViewTextBoxColumn1 = New System.Windows.Forms.DataGridViewTextBoxColumn() diff --git a/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.vb b/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.vb index b5c0635b..e69ac451 100644 --- a/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.vb +++ b/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.vb @@ -814,7 +814,7 @@ Public Class frmMessenger Dim Dt_New As DataTable = SQL.loadDgvBySql("SELECT [chat_id],CASE WHEN chat_name<>'' THEN chat_name ELSE (SELECT TOP 1 mit_vname + ' ' + mit_nname FROM tblMessenger_ChatMembers INNER JOIN tblMitarbeiter ON mit_id=chatMb_maId where chatMb_chatId=chat_id AND chatMb_maId <>" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRID & ") END as chat_name ,(SELECT REPLACE(COUNT(*),'0','') FROM tblMessenger_ChatMessages INNER JOIN tblMessenger_ChatMessageStatus ON chatMgSt_chatMsgId=chatMg_id WHERE [chat_id]=chatMg_chatId AND chatMgSt_MaId=" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRID & " AND chatMgSt_gelesen=0) as ungelesen FROM [tblMessenger_Chat] WHERE (SELECT COUNT(*) FROM tblMessenger_ChatMembers WHERE chatMB_chatId=chat_id AND chatMB_maId=" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRID & ")>0 - AND chat_aktiv='" & (Not cbxInaktiveChats.Checked) & "' ORDER BY chat_lastMsg DESC", "ADMIN") + AND chat_aktiv=" & IIf(Not cbxInaktiveChats.Checked, 1, 0) & " ORDER BY chat_lastMsg DESC", "ADMIN") Dim Dt_Current As DataTable = dgvChats.DataSource If Dt_New Is Nothing Then Return True diff --git a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.Designer.vb b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.Designer.vb index e0860b2e..56609c72 100644 --- a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.Designer.vb +++ b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.Designer.vb @@ -22,6 +22,7 @@ Partial Class frmUeberstundenauszahlen 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. Private Sub InitializeComponent() + Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmUeberstundenauszahlen)) Me.dtpMonat = New System.Windows.Forms.DateTimePicker() Me.lblMonat = New System.Windows.Forms.Label() @@ -52,6 +53,7 @@ Partial Class frmUeberstundenauszahlen Me.picDel = New System.Windows.Forms.PictureBox() Me.txtAusz50vonSaldo = New System.Windows.Forms.TextBox() Me.Panel1 = New System.Windows.Forms.Panel() + Me.picShow = New System.Windows.Forms.PictureBox() Me.txtAuszManuell = New System.Windows.Forms.TextBox() Me.cx25 = New System.Windows.Forms.CheckBox() Me.cbx50 = New System.Windows.Forms.CheckBox() @@ -61,14 +63,14 @@ Partial Class frmUeberstundenauszahlen Me.Label8 = New System.Windows.Forms.Label() Me.txt50x1 = New System.Windows.Forms.TextBox() Me.cbxTeilzeit = New System.Windows.Forms.CheckBox() - Me.dgvUeberstunden = New VERAG_PROG_ALLGEMEIN.MyDatagridview() Me.PictureBox1 = New System.Windows.Forms.PictureBox() - Me.picShow = New System.Windows.Forms.PictureBox() + Me.dgvUeberstunden = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) + Me.lblWarning = New System.Windows.Forms.Label() CType(Me.picDel, System.ComponentModel.ISupportInitialize).BeginInit() Me.Panel1.SuspendLayout() - CType(Me.dgvUeberstunden, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.picShow, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.dgvUeberstunden, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'dtpMonat @@ -361,6 +363,17 @@ Partial Class frmUeberstundenauszahlen Me.Panel1.Size = New System.Drawing.Size(619, 235) Me.Panel1.TabIndex = 30 ' + 'picShow + ' + Me.picShow.BackgroundImage = Global.VERAG_PROG_ALLGEMEIN.My.Resources.Resources.today + Me.picShow.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.picShow.Location = New System.Drawing.Point(431, 11) + Me.picShow.Name = "picShow" + Me.picShow.Size = New System.Drawing.Size(21, 16) + Me.picShow.TabIndex = 38 + Me.picShow.TabStop = False + Me.picShow.Visible = False + ' 'txtAuszManuell ' Me.txtAuszManuell.Location = New System.Drawing.Point(272, 196) @@ -447,6 +460,16 @@ Partial Class frmUeberstundenauszahlen Me.cbxTeilzeit.Text = "Teilzeit" Me.cbxTeilzeit.UseVisualStyleBackColor = True ' + 'PictureBox1 + ' + Me.PictureBox1.BackgroundImage = CType(resources.GetObject("PictureBox1.BackgroundImage"), System.Drawing.Image) + Me.PictureBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.PictureBox1.Location = New System.Drawing.Point(422, 12) + Me.PictureBox1.Name = "PictureBox1" + Me.PictureBox1.Size = New System.Drawing.Size(29, 26) + Me.PictureBox1.TabIndex = 38 + Me.PictureBox1.TabStop = False + ' 'dgvUeberstunden ' Me.dgvUeberstunden.AKTUALISIERUNGS_INTERVALL = -1 @@ -461,32 +484,21 @@ Partial Class frmUeberstundenauszahlen Me.dgvUeberstunden.TabIndex = 13 Me.dgvUeberstunden.Visible = False ' - 'PictureBox1 + 'lblWarning ' - Me.PictureBox1.BackgroundImage = CType(resources.GetObject("PictureBox1.BackgroundImage"), System.Drawing.Image) - Me.PictureBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.PictureBox1.Location = New System.Drawing.Point(422, 12) - Me.PictureBox1.Name = "PictureBox1" - Me.PictureBox1.Size = New System.Drawing.Size(29, 26) - Me.PictureBox1.TabIndex = 38 - Me.PictureBox1.TabStop = False - ' - 'picShow - ' - Me.picShow.BackgroundImage = Global.VERAG_PROG_ALLGEMEIN.My.Resources.Resources.today - Me.picShow.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.picShow.Location = New System.Drawing.Point(431, 11) - Me.picShow.Name = "picShow" - Me.picShow.Size = New System.Drawing.Size(21, 16) - Me.picShow.TabIndex = 38 - Me.picShow.TabStop = False - Me.picShow.Visible = False + Me.lblWarning.AutoSize = True + Me.lblWarning.ForeColor = System.Drawing.Color.Red + Me.lblWarning.Location = New System.Drawing.Point(413, 48) + Me.lblWarning.Name = "lblWarning" + Me.lblWarning.Size = New System.Drawing.Size(0, 13) + Me.lblWarning.TabIndex = 39 ' 'frmUeberstundenauszahlen ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(646, 337) + Me.Controls.Add(Me.lblWarning) Me.Controls.Add(Me.PictureBox1) Me.Controls.Add(Me.cbxTeilzeit) Me.Controls.Add(Me.Panel1) @@ -503,9 +515,9 @@ Partial Class frmUeberstundenauszahlen CType(Me.picDel, System.ComponentModel.ISupportInitialize).EndInit() Me.Panel1.ResumeLayout(False) Me.Panel1.PerformLayout() - CType(Me.dgvUeberstunden, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.picShow, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.dgvUeberstunden, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -552,4 +564,5 @@ Partial Class frmUeberstundenauszahlen Friend WithEvents txtAuszManuell As Windows.Forms.TextBox Friend WithEvents PictureBox1 As Windows.Forms.PictureBox Friend WithEvents picShow As Windows.Forms.PictureBox + Friend WithEvents lblWarning As Windows.Forms.Label End Class diff --git a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.resx b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.resx index 39a83121..54496850 100644 --- a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.resx +++ b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.resx @@ -168,7 +168,7 @@ XTesb3QPLh88M+QwdP6m681Lt7xuXbu94vbgcOjwnZHokdE77DtTd1PuvriXeW/h/sYH6AdFD6UeVjxS fNTws+7PbaOWo6fHXMf6Hwc/vj/OGn/2S8Yv7ycKnpCfVEyqTDZPmU2dmnafvvF05dOJZ+nPFmYKf5X+ tfa5zvMffnP8rX82YnbiBf/Fp99LXsq/PPRq2aueuYC5R69TXy/MF72Rf3P4LeNt37vwd5MLWe+x7ys/ - 6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALEQAACxEBf2RfkQAAHeBJREFUeF7t2VtuI0nT + 6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALDAAACwwBP0AiyAAAHeBJREFUeF7t2VtuI0nT bdu/VaeNp9ffViEzoQunJF4iyAi38TBeHJUSudzMl4D6v//9738AwDB5CACsLQ8BgLXlIQCwtjwEANaW hwDA2vIQAFhbHgIAa8tDAGBteQgArC0PAYC15SEAsLY8BADWlocAwNryEABYWx4CAGvLQwBgbXkIAKwt DwGAteUhALC2PAQA1paHAMDa8hAAWFseAgBry0MAYG15CACsLQ8BgLXlIQCwtjwEANaWhwDA2vIQAFhb diff --git a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.vb b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.vb index 230cdbc5..9ff08b7a 100644 --- a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.vb +++ b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.vb @@ -9,6 +9,7 @@ Public Class frmUeberstundenauszahlen Dim MA As cMitarbeiter = Nothing Dim timas As cTimasAPI = New cTimasAPI Dim dt As New DataTable + Dim customFields As New DataTable Dim timeaccountdt As New DataTable Dim dtResult As New DataTable 'Dim dtbereitsausgezahlteUE As New DataTable @@ -17,6 +18,7 @@ Public Class frmUeberstundenauszahlen Dim maxUberstundenpruefung As Boolean = True Dim istTeilzeit As Boolean = False Dim faktorTeilzeit As Double = 100 + Dim faktorSamstagsarbeit As Double = 150 Dim stunden100ausz, stunden50ausz, stunden100auszbere, stunden50auszbere, stunden100bereitsausbezahl, stunden50bereitsausbezahlt, stunden25bereitsausbezahlt, mehrabeit, stundenlfdSaldo, stundenlfdSaldobere, overwrittenSum As Double @@ -29,6 +31,7 @@ Public Class frmUeberstundenauszahlen MA = New cMitarbeiter(mit_id) tag = New cFeiertage(DateTime.Parse(dtpMonat.Value).Year) Label7.Text = MA.mit_vname & " " & MA.mit_nname + timas.getEmployee(MA.mit_timasId, customFields) timas.getTimeaccountList(dt) '65;"01-Lfd Saldo" @@ -73,6 +76,39 @@ Public Class frmUeberstundenauszahlen getUeberstunden(False) + For Each row As DataRow In customFields.Rows + If Not IsDBNull(row.Item("value")) AndAlso Not IsDBNull(row.Item("name")) Then + + If row.Item("name") = "Teilzeit" Then + If row.Item("value") = "true" Then + cbxTeilzeit.Checked = True + Else + cbxTeilzeit.Checked = False + End If + End If + + If row.Item("name") = "SA-Zuschlag" Then + If row.Item("value") = "true" Then + faktorSamstagsarbeit = 150 'Samstagsarbeit wir im Timas hochgerechnet + Else + faktorSamstagsarbeit = 100 'Samstagsarbeit wir im Timas NICHT hochgerechnet + End If + End If + + If row.Item("name") = "Zuschlagsfrei" Then + If row.Item("value") = "true" Then + lblWarning.Text = "Zuschlagsfrei" + Else + lblWarning.Text = "" + End If + End If + + End If + + Next + + + End Sub @@ -127,10 +163,11 @@ Public Class frmUeberstundenauszahlen timas.getTimeAccounts(startdate, enddate, MA.mit_timasId, timeaccountdt, dtResult) If dtResult.Rows.Count < 1 Then - MsgBox("Für den gewählten Zeitraum konnten keine Stunden ermittelt werden!") + lblWarning.Text = "Für den gewählten Zeitraum konnten keine Stunden ermittelt werden!" Panel1.Enabled = False Exit Sub Else + lblWarning.Text = "" Panel1.Enabled = True End If @@ -438,7 +475,7 @@ Public Class frmUeberstundenauszahlen Dim sum100, sum50, sum0, gesamt As Double sum100 = RoundOfDigits(CDbl(txtAusz100.Text) * 100 / 200, 2) 'Übergabe in ZE-System als heruntergerechnete 100%ige bzw. 50%ige ÜS! - sum50 = RoundOfDigits(CDbl(txtAusz50.Text) * 100 / 150, 2) + sum50 = RoundOfDigits(CDbl(txtAusz50.Text) * 100 / faktorSamstagsarbeit, 2) sum0 = RoundOfDigits(CDbl(txtAusz50vonSaldo.Text) * 100 / faktorTeilzeit, 2) gesamt = IIf(overwrittenSum > 0, overwrittenSum, CDbl(txtAusz.Text)) @@ -494,6 +531,7 @@ Public Class frmUeberstundenauszahlen ues.uest_ignoreLimit = Not maxUberstundenpruefung ues.uest_maxUE = CDbl(txtSummeAuszb.Text) ues.uest_paidout_sum = gesamt + ues.uest_isParttime = cbxTeilzeit.Checked If istTeilzeit Then ues.uest_25 = sum0 @@ -683,9 +721,9 @@ Public Class frmUeberstundenauszahlen If stundenlfdSaldo <= 0 Then Button1.Enabled = False If (stunden100bereitsausbezahl + stunden50bereitsausbezahlt + stunden25bereitsausbezahlt) > 0 Then - txtSummeAuszb.Text = stundenlfdSaldo - Else txtSummeAuszb.Text = stundenlfdSaldobere + Else + txtSummeAuszb.Text = stundenlfdSaldo End If diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/TIMAS/cTimasAPI.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/TIMAS/cTimasAPI.vb index 144a6347..89133296 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/TIMAS/cTimasAPI.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/TIMAS/cTimasAPI.vb @@ -385,7 +385,7 @@ Public Class cTimasAPI End Try End Sub - Public Function getEmployee(mitarbeiterID As String) As cTimasEmployee + Public Function getEmployee(mitarbeiterID As String, ByRef datatableTimas As DataTable) As cTimasEmployee Try @@ -469,6 +469,33 @@ Public Class cTimasAPI i = i + 1 End While + Dim customFields As Chilkat.JsonArray = json.ArrayOf("customFields") + If (json.LastMethodSuccess = False) Then + Debug.WriteLine("customFields member not found.") + Else + + + Dim dt As New DataTable + dt.Columns.Add("value", GetType(String)) + dt.Columns.Add("name", GetType(String)) + dt.Columns.Add("type", GetType(String)) + + Dim numcustomFields As Integer = customFields.Size + Dim j As Integer = 0 + While j < numcustomFields + Dim customField As Chilkat.JsonObject = customFields.ObjectAt(j) + Dim R As DataRow = dt.NewRow + R("value") = customField.StringOf("value") + R("name") = customField.StringOf("name") + R("type") = customField.StringOf("type") + dt.Rows.Add(R) + j = j + 1 + End While + If datatableTimas IsNot Nothing Then datatableTimas = dt + End If + + + Debug.WriteLine(json) @@ -1237,6 +1264,7 @@ Public Class cTimasEmployee Public exitDate As String Public Gruppen As List(Of cTimasGruppe) + Public customFields As List(Of cTimascustomFields) Sub New() @@ -1256,4 +1284,18 @@ Public Class cTimasGruppe Me.empID = empId End Sub +End Class + +Public Class cTimascustomFields + + Public empID As Integer + Public Id As Integer + Public name As String + Public type As String + Public value As String + + Sub New(empId) + Me.empID = empId + End Sub + End Class \ No newline at end of file From dee2b8af48efae2bfd197f7f714495ea5df91052 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Thu, 7 Mar 2024 14:25:31 +0100 Subject: [PATCH 3/5] commit --- SDL/My Project/AssemblyInfo.vb | 4 ++-- VERAG_PROG_ALLGEMEIN/Classes/cMessenger.vb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/SDL/My Project/AssemblyInfo.vb b/SDL/My Project/AssemblyInfo.vb index 38fbb09b..e0bd4bd7 100644 --- a/SDL/My Project/AssemblyInfo.vb +++ b/SDL/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cMessenger.vb b/VERAG_PROG_ALLGEMEIN/Classes/cMessenger.vb index 557d2be2..7b4cbc65 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cMessenger.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cMessenger.vb @@ -486,7 +486,7 @@ Public Class cMessenger End Function - Public Function SetOldChatsInactiv(olderthan As Integer) As Boolean + Public Function setOldChatsInactiv(olderthan As Integer) As Boolean Dim dateBack = If(olderthan <> "", CDate(Now.AddDays(olderthan * -1)), CDate(Now.AddDays(30 * -1))) Dim sqlstr = " Update [tblMessenger_Chat] set [chat_aktiv] = 0 WHERE chat_aktiv = 1 and chat_lastMsg <=" & dateBack From 72e3ca944225d06d69ffa31de1b5a4fa1cc04a7e Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Thu, 7 Mar 2024 16:46:16 +0100 Subject: [PATCH 4/5] messenger, Ueberstunden, timas --- VERAG_PROG_ALLGEMEIN/Classes/cMessenger.vb | 14 +- .../Messenger/frmMessenger.Designer.vb | 534 +++++++++--------- .../frmUeberstundenauszahlen.Designer.vb | 37 +- .../frmUeberstundenauszahlen.vb | 83 +-- .../Schnittstellen/TIMAS/cTimasAPI.vb | 51 +- 5 files changed, 395 insertions(+), 324 deletions(-) diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cMessenger.vb b/VERAG_PROG_ALLGEMEIN/Classes/cMessenger.vb index 7b4cbc65..2e3ef32b 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cMessenger.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cMessenger.vb @@ -486,10 +486,10 @@ Public Class cMessenger End Function - Public Function setOldChatsInactiv(olderthan As Integer) As Boolean + Public Function setOldChatsInactiv(olderthan As String) As Boolean Dim dateBack = If(olderthan <> "", CDate(Now.AddDays(olderthan * -1)), CDate(Now.AddDays(30 * -1))) - Dim sqlstr = " Update [tblMessenger_Chat] set [chat_aktiv] = 0 WHERE chat_aktiv = 1 and chat_lastMsg <=" & dateBack + Dim sqlstr = " Update [tblMessenger_Chat] set [chat_aktiv] = 0 from [tblMessenger_Chat] as chat WHERE chat.chat_aktiv = 1 and (chat.chat_id not in (select chatMg_chatId from [tblMessenger_ChatMessages] where chatMg_datetime >= '" & dateBack.ToShortDateString & "') and chat_erstelltAm <= '" & dateBack.ToShortDateString & "') or (chat_erstelltAm <= '" & dateBack.ToShortDateString & "' and (select count(*) from [tblMessenger_ChatMessages] where chat_id = chatMg_chatId) = 0) and chat.chat_aktiv = 1" Return SQL.doSQL(sqlstr, "ADMIN") End Function @@ -525,10 +525,10 @@ Public Class cMessenger Public Function SAVE() As Boolean Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList() - Dim sqlstr = " BEGIN TRAN IF EXISTS(SELECT * FROM [tblMessenger_ChatMembers] WHERE chatMb_chatId=@chatMb_chatId AND chatMb_maId=@chatMb_maId) " & - " BEGIN " & getUpdateCmd() & " END " & + Dim sqlstr = " BEGIN TRAN If EXISTS(Select * FROM [tblMessenger_ChatMembers] WHERE chatMb_chatId=@chatMb_chatId And chatMb_maId=@chatMb_maId) " & + " BEGIN " & getUpdateCmd() & " End " & " Else " & - " BEGIN " & getInsertCmd() & " END " & + " BEGIN " & getInsertCmd() & " End " & " commit tran " Return SQL.doSQLVarList(sqlstr, "ADMIN", , list) @@ -537,7 +537,7 @@ Public Class cMessenger Public Sub LOAD() Try Using conn As SqlConnection = SQL.GetNewOpenConnectionADMIN() - Using cmd As New SqlCommand("SELECT * FROM [tblMessenger_ChatMembers] WHERE chatMb_chatId=@chatMb_chatId AND chatMb_maId=@chatMb_maId ", conn) + Using cmd As New SqlCommand("Select * FROM [tblMessenger_ChatMembers] WHERE chatMb_chatId=@chatMb_chatId And chatMb_maId=@chatMb_maId ", conn) cmd.Parameters.AddWithValue("@chatMb_chatId", chatMb_chatId) cmd.Parameters.AddWithValue("@chatMb_maId", chatMb_maId) Dim dr = cmd.ExecuteReader() @@ -558,7 +558,7 @@ Public Class cMessenger End Using End Using Catch ex As Exception - MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace) + MsgBox("Fehler In der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace) End Try End Sub diff --git a/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.Designer.vb b/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.Designer.vb index 248466b5..b666af37 100644 --- a/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.Designer.vb +++ b/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.Designer.vb @@ -24,7 +24,9 @@ Partial Class frmMessenger 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. _ Private Sub InitializeComponent() - Me.components = New System.ComponentModel.Container() + Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle11 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() @@ -33,19 +35,13 @@ Partial Class frmMessenger Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle11 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmMessenger)) Me.SplitContainer = New System.Windows.Forms.SplitContainer() Me.SplitContainer2 = New System.Windows.Forms.SplitContainer() - Me.dgvChats = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.Panel6 = New System.Windows.Forms.Panel() Me.lblLKWChat_MsgCntInaktiv = New System.Windows.Forms.Label() Me.cbxInaktiveChats = New System.Windows.Forms.CheckBox() - Me.DGVSonstige = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.Panel5 = New System.Windows.Forms.Panel() - Me.MyTextBox2 = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.PictureBox2 = New System.Windows.Forms.PictureBox() Me.Label1 = New System.Windows.Forms.Label() Me.Button8 = New System.Windows.Forms.Button() @@ -55,17 +51,11 @@ Partial Class frmMessenger Me.cbxInaktiveChatsSpecial = New System.Windows.Forms.CheckBox() Me.Panel1 = New System.Windows.Forms.Panel() Me.FlowLayoutPanel1 = New System.Windows.Forms.FlowLayoutPanel() - Me.UsrCntlChat_Art_Btn_MACHAT = New VERAG_PROG_ALLGEMEIN.usrCntlChat_Art_Btn() - Me.UsrCntlChat_Art_Btn_LKWCHAT = New VERAG_PROG_ALLGEMEIN.usrCntlChat_Art_Btn() - Me.UsrCntlChat_Art_Btn_SNDCHAT = New VERAG_PROG_ALLGEMEIN.usrCntlChat_Art_Btn() - Me.MyTextBox1 = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.PictureBox1 = New System.Windows.Forms.PictureBox() Me.lbl = New System.Windows.Forms.Label() Me.btnNeu = New System.Windows.Forms.Button() Me.Button1 = New System.Windows.Forms.Button() Me.SplitContainer1 = New System.Windows.Forms.SplitContainer() - Me.MyFlowLayoutPanel1 = New VERAG_PROG_ALLGEMEIN.MyFlowLayoutPanel(Me.components) - Me.UsrCntlMessenger_ChatElement1 = New VERAG_PROG_ALLGEMEIN.usrCntlMessenger_ChatElement() Me.Panel3 = New System.Windows.Forms.Panel() Me.btnTeilnehmer = New System.Windows.Forms.Button() Me.Panel4 = New System.Windows.Forms.Panel() @@ -77,10 +67,6 @@ Partial Class frmMessenger Me.pnlTeilnehmer = New System.Windows.Forms.Panel() Me.Label4 = New System.Windows.Forms.Label() Me.dgvChatMembers = New System.Windows.Forms.DataGridView() - Me.clmnMaId = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.clmnName = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.clmnFirma = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.clmnStatus = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.Panel8 = New System.Windows.Forms.Panel() Me.Label2 = New System.Windows.Forms.Label() Me.Panel9 = New System.Windows.Forms.Panel() @@ -92,14 +78,29 @@ Partial Class frmMessenger Me.btnSendAtt = New System.Windows.Forms.Button() Me.btnSenden = New System.Windows.Forms.Button() Me.rtbChatMessage = New System.Windows.Forms.RichTextBox() - Me.TimerNEW_MESSAGE = New System.Windows.Forms.Timer(Me.components) - Me.Timer_REFRESH = New System.Windows.Forms.Timer(Me.components) - Me.cntxt = New System.Windows.Forms.ContextMenuStrip(Me.components) + Me.TimerNEW_MESSAGE = New System.Windows.Forms.Timer() + Me.Timer_REFRESH = New System.Windows.Forms.Timer() + Me.cntxt = New System.Windows.Forms.ContextMenuStrip() Me.ChatDeaktivierenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.toolChatReminder = New System.Windows.Forms.ToolStripMenuItem() + Me.Label3 = New System.Windows.Forms.Label() Me.DataGridViewTextBoxColumn1 = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.DataGridViewTextBoxColumn2 = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.DataGridViewTextBoxColumn3 = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.DataGridViewTextBoxColumn4 = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.dgvChats = New VERAG_PROG_ALLGEMEIN.MyDatagridview() + Me.DGVSonstige = New VERAG_PROG_ALLGEMEIN.MyDatagridview() + Me.MyTextBox2 = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.UsrCntlChat_Art_Btn_MACHAT = New VERAG_PROG_ALLGEMEIN.usrCntlChat_Art_Btn() + Me.UsrCntlChat_Art_Btn_LKWCHAT = New VERAG_PROG_ALLGEMEIN.usrCntlChat_Art_Btn() + Me.UsrCntlChat_Art_Btn_SNDCHAT = New VERAG_PROG_ALLGEMEIN.usrCntlChat_Art_Btn() + Me.MyTextBox1 = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.MyFlowLayoutPanel1 = New VERAG_PROG_ALLGEMEIN.MyFlowLayoutPanel() + Me.UsrCntlMessenger_ChatElement1 = New VERAG_PROG_ALLGEMEIN.usrCntlMessenger_ChatElement() + Me.clmnMaId = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.clmnName = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.clmnFirma = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.clmnStatus = New System.Windows.Forms.DataGridViewTextBoxColumn() CType(Me.SplitContainer, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainer.Panel1.SuspendLayout() Me.SplitContainer.Panel2.SuspendLayout() @@ -108,9 +109,7 @@ Partial Class frmMessenger Me.SplitContainer2.Panel1.SuspendLayout() Me.SplitContainer2.Panel2.SuspendLayout() Me.SplitContainer2.SuspendLayout() - CType(Me.dgvChats, System.ComponentModel.ISupportInitialize).BeginInit() Me.Panel6.SuspendLayout() - CType(Me.DGVSonstige, System.ComponentModel.ISupportInitialize).BeginInit() Me.Panel5.SuspendLayout() CType(Me.PictureBox2, System.ComponentModel.ISupportInitialize).BeginInit() Me.Panel2.SuspendLayout() @@ -121,7 +120,6 @@ Partial Class frmMessenger Me.SplitContainer1.Panel1.SuspendLayout() Me.SplitContainer1.Panel2.SuspendLayout() Me.SplitContainer1.SuspendLayout() - Me.MyFlowLayoutPanel1.SuspendLayout() Me.Panel3.SuspendLayout() Me.pnl.SuspendLayout() CType(Me.SplitContainer3, System.ComponentModel.ISupportInitialize).BeginInit() @@ -134,6 +132,9 @@ Partial Class frmMessenger Me.Panel9.SuspendLayout() CType(Me.pic, System.ComponentModel.ISupportInitialize).BeginInit() Me.cntxt.SuspendLayout() + CType(Me.dgvChats, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.DGVSonstige, System.ComponentModel.ISupportInitialize).BeginInit() + Me.MyFlowLayoutPanel1.SuspendLayout() Me.SuspendLayout() ' 'SplitContainer @@ -175,66 +176,20 @@ Partial Class frmMessenger Me.SplitContainer2.Panel2.Controls.Add(Me.DGVSonstige) Me.SplitContainer2.Panel2.Controls.Add(Me.Panel5) Me.SplitContainer2.Panel2Collapsed = True - Me.SplitContainer2.Size = New System.Drawing.Size(275, 794) + Me.SplitContainer2.Size = New System.Drawing.Size(275, 787) Me.SplitContainer2.SplitterDistance = 590 Me.SplitContainer2.SplitterWidth = 3 Me.SplitContainer2.TabIndex = 8 ' - 'dgvChats - ' - Me.dgvChats.AKTUALISIERUNGS_INTERVALL = -1 - Me.dgvChats.AllowUserToAddRows = False - Me.dgvChats.AllowUserToDeleteRows = False - Me.dgvChats.AllowUserToResizeColumns = False - Me.dgvChats.AllowUserToResizeRows = False - Me.dgvChats.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvChats.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle1 - Me.dgvChats.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - Me.dgvChats.ColumnHeadersVisible = False - DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvChats.DefaultCellStyle = DataGridViewCellStyle2 - Me.dgvChats.Dock = System.Windows.Forms.DockStyle.Fill - Me.dgvChats.Location = New System.Drawing.Point(0, 0) - Me.dgvChats.Name = "dgvChats" - Me.dgvChats.ReadOnly = True - DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvChats.RowHeadersDefaultCellStyle = DataGridViewCellStyle3 - Me.dgvChats.RowHeadersVisible = False - Me.dgvChats.RowHeadersWidth = 62 - DataGridViewCellStyle4.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.dgvChats.RowsDefaultCellStyle = DataGridViewCellStyle4 - Me.dgvChats.RowTemplate.Height = 30 - Me.dgvChats.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvChats.Size = New System.Drawing.Size(275, 773) - Me.dgvChats.TabIndex = 0 - ' 'Panel6 ' + Me.Panel6.Controls.Add(Me.Label3) Me.Panel6.Controls.Add(Me.lblLKWChat_MsgCntInaktiv) Me.Panel6.Controls.Add(Me.cbxInaktiveChats) Me.Panel6.Dock = System.Windows.Forms.DockStyle.Bottom - Me.Panel6.Location = New System.Drawing.Point(0, 773) + Me.Panel6.Location = New System.Drawing.Point(0, 739) Me.Panel6.Name = "Panel6" - Me.Panel6.Size = New System.Drawing.Size(275, 21) + Me.Panel6.Size = New System.Drawing.Size(275, 48) Me.Panel6.TabIndex = 7 ' 'lblLKWChat_MsgCntInaktiv @@ -261,53 +216,6 @@ Partial Class frmMessenger Me.cbxInaktiveChats.Text = "inaktive Chats" Me.cbxInaktiveChats.UseVisualStyleBackColor = True ' - 'DGVSonstige - ' - Me.DGVSonstige.AKTUALISIERUNGS_INTERVALL = -1 - Me.DGVSonstige.AllowUserToAddRows = False - Me.DGVSonstige.AllowUserToDeleteRows = False - Me.DGVSonstige.AllowUserToResizeColumns = False - Me.DGVSonstige.AllowUserToResizeRows = False - Me.DGVSonstige.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.DGVSonstige.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle5 - Me.DGVSonstige.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - Me.DGVSonstige.ColumnHeadersVisible = False - DataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle6.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.DGVSonstige.DefaultCellStyle = DataGridViewCellStyle6 - Me.DGVSonstige.Dock = System.Windows.Forms.DockStyle.Fill - Me.DGVSonstige.Location = New System.Drawing.Point(0, 63) - Me.DGVSonstige.Name = "DGVSonstige" - Me.DGVSonstige.ReadOnly = True - DataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.DGVSonstige.RowHeadersDefaultCellStyle = DataGridViewCellStyle7 - Me.DGVSonstige.RowHeadersVisible = False - Me.DGVSonstige.RowHeadersWidth = 62 - DataGridViewCellStyle8.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.DGVSonstige.RowsDefaultCellStyle = DataGridViewCellStyle8 - Me.DGVSonstige.RowTemplate.Height = 30 - Me.DGVSonstige.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.DGVSonstige.Size = New System.Drawing.Size(150, 0) - Me.DGVSonstige.TabIndex = 1 - ' 'Panel5 ' Me.Panel5.BackColor = System.Drawing.Color.White @@ -322,30 +230,6 @@ Partial Class frmMessenger Me.Panel5.Size = New System.Drawing.Size(150, 63) Me.Panel5.TabIndex = 2 ' - 'MyTextBox2 - ' - Me.MyTextBox2._DateTimeOnly = False - Me.MyTextBox2._numbersOnly = False - Me.MyTextBox2._numbersOnlyKommastellen = "" - Me.MyTextBox2._numbersOnlyTrennzeichen = True - Me.MyTextBox2._Prozent = False - Me.MyTextBox2._ShortDateNew = False - Me.MyTextBox2._ShortDateOnly = False - Me.MyTextBox2._TimeOnly = False - Me.MyTextBox2._TimeOnly_Seconds = False - Me.MyTextBox2._value = "" - Me.MyTextBox2._Waehrung = False - Me.MyTextBox2._WaehrungZeichen = True - Me.MyTextBox2.ForeColor = System.Drawing.Color.Black - Me.MyTextBox2.Location = New System.Drawing.Point(20, 40) - Me.MyTextBox2.Margin = New System.Windows.Forms.Padding(2) - Me.MyTextBox2.MaxLineLength = -1 - Me.MyTextBox2.MaxLines_Warning = "" - Me.MyTextBox2.MaxLines_Warning_Label = Nothing - Me.MyTextBox2.Name = "MyTextBox2" - Me.MyTextBox2.Size = New System.Drawing.Size(250, 20) - Me.MyTextBox2.TabIndex = 4 - ' 'PictureBox2 ' Me.PictureBox2.BackgroundImage = Global.VERAG_PROG_ALLGEMEIN.My.Resources.Resources.search @@ -409,9 +293,9 @@ Partial Class frmMessenger ' Me.Panel2.Controls.Add(Me.cbxInaktiveChatsSpecial) Me.Panel2.Dock = System.Windows.Forms.DockStyle.Bottom - Me.Panel2.Location = New System.Drawing.Point(0, 899) + Me.Panel2.Location = New System.Drawing.Point(0, 892) Me.Panel2.Name = "Panel2" - Me.Panel2.Size = New System.Drawing.Size(275, 23) + Me.Panel2.Size = New System.Drawing.Size(275, 30) Me.Panel2.TabIndex = 6 ' 'cbxInaktiveChatsSpecial @@ -451,60 +335,6 @@ Partial Class frmMessenger Me.FlowLayoutPanel1.Size = New System.Drawing.Size(275, 30) Me.FlowLayoutPanel1.TabIndex = 10 ' - 'UsrCntlChat_Art_Btn_MACHAT - ' - Me.UsrCntlChat_Art_Btn_MACHAT._aktiv = True - Me.UsrCntlChat_Art_Btn_MACHAT._name = "Allgemein" - Me.UsrCntlChat_Art_Btn_MACHAT.Location = New System.Drawing.Point(0, 0) - Me.UsrCntlChat_Art_Btn_MACHAT.Margin = New System.Windows.Forms.Padding(0) - Me.UsrCntlChat_Art_Btn_MACHAT.Name = "UsrCntlChat_Art_Btn_MACHAT" - Me.UsrCntlChat_Art_Btn_MACHAT.Size = New System.Drawing.Size(90, 29) - Me.UsrCntlChat_Art_Btn_MACHAT.TabIndex = 8 - ' - 'UsrCntlChat_Art_Btn_LKWCHAT - ' - Me.UsrCntlChat_Art_Btn_LKWCHAT._aktiv = False - Me.UsrCntlChat_Art_Btn_LKWCHAT._name = "LKW" - Me.UsrCntlChat_Art_Btn_LKWCHAT.Location = New System.Drawing.Point(90, 0) - Me.UsrCntlChat_Art_Btn_LKWCHAT.Margin = New System.Windows.Forms.Padding(0) - Me.UsrCntlChat_Art_Btn_LKWCHAT.Name = "UsrCntlChat_Art_Btn_LKWCHAT" - Me.UsrCntlChat_Art_Btn_LKWCHAT.Size = New System.Drawing.Size(90, 29) - Me.UsrCntlChat_Art_Btn_LKWCHAT.TabIndex = 9 - ' - 'UsrCntlChat_Art_Btn_SNDCHAT - ' - Me.UsrCntlChat_Art_Btn_SNDCHAT._aktiv = False - Me.UsrCntlChat_Art_Btn_SNDCHAT._name = "Sendung" - Me.UsrCntlChat_Art_Btn_SNDCHAT.Location = New System.Drawing.Point(180, 0) - Me.UsrCntlChat_Art_Btn_SNDCHAT.Margin = New System.Windows.Forms.Padding(0) - Me.UsrCntlChat_Art_Btn_SNDCHAT.Name = "UsrCntlChat_Art_Btn_SNDCHAT" - Me.UsrCntlChat_Art_Btn_SNDCHAT.Size = New System.Drawing.Size(90, 29) - Me.UsrCntlChat_Art_Btn_SNDCHAT.TabIndex = 10 - ' - 'MyTextBox1 - ' - Me.MyTextBox1._DateTimeOnly = False - Me.MyTextBox1._numbersOnly = False - Me.MyTextBox1._numbersOnlyKommastellen = "" - Me.MyTextBox1._numbersOnlyTrennzeichen = True - Me.MyTextBox1._Prozent = False - Me.MyTextBox1._ShortDateNew = False - Me.MyTextBox1._ShortDateOnly = False - Me.MyTextBox1._TimeOnly = False - Me.MyTextBox1._TimeOnly_Seconds = False - Me.MyTextBox1._value = "" - Me.MyTextBox1._Waehrung = False - Me.MyTextBox1._WaehrungZeichen = True - Me.MyTextBox1.ForeColor = System.Drawing.Color.Black - Me.MyTextBox1.Location = New System.Drawing.Point(20, 40) - Me.MyTextBox1.Margin = New System.Windows.Forms.Padding(2) - Me.MyTextBox1.MaxLineLength = -1 - Me.MyTextBox1.MaxLines_Warning = "" - Me.MyTextBox1.MaxLines_Warning_Label = Nothing - Me.MyTextBox1.Name = "MyTextBox1" - Me.MyTextBox1.Size = New System.Drawing.Size(250, 20) - Me.MyTextBox1.TabIndex = 4 - ' 'PictureBox1 ' Me.PictureBox1.BackgroundImage = Global.VERAG_PROG_ALLGEMEIN.My.Resources.Resources.search @@ -570,28 +400,6 @@ Partial Class frmMessenger Me.SplitContainer1.SplitterDistance = 600 Me.SplitContainer1.TabIndex = 0 ' - 'MyFlowLayoutPanel1 - ' - Me.MyFlowLayoutPanel1.AutoScroll = True - Me.MyFlowLayoutPanel1.BackColor = System.Drawing.Color.White - Me.MyFlowLayoutPanel1.Controls.Add(Me.UsrCntlMessenger_ChatElement1) - Me.MyFlowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill - Me.MyFlowLayoutPanel1.Location = New System.Drawing.Point(0, 44) - Me.MyFlowLayoutPanel1.Name = "MyFlowLayoutPanel1" - Me.MyFlowLayoutPanel1.Size = New System.Drawing.Size(633, 556) - Me.MyFlowLayoutPanel1.TabIndex = 0 - ' - 'UsrCntlMessenger_ChatElement1 - ' - Me.UsrCntlMessenger_ChatElement1.BackColor = System.Drawing.Color.White - Me.UsrCntlMessenger_ChatElement1.CHAT_MSG = Nothing - Me.UsrCntlMessenger_ChatElement1.Location = New System.Drawing.Point(4, 5) - Me.UsrCntlMessenger_ChatElement1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.UsrCntlMessenger_ChatElement1.Name = "UsrCntlMessenger_ChatElement1" - Me.UsrCntlMessenger_ChatElement1.Size = New System.Drawing.Size(378, 48) - Me.UsrCntlMessenger_ChatElement1.TabIndex = 4 - Me.UsrCntlMessenger_ChatElement1.Visible = False - ' 'Panel3 ' Me.Panel3.BackColor = System.Drawing.Color.White @@ -773,38 +581,6 @@ Partial Class frmMessenger Me.dgvChatMembers.Size = New System.Drawing.Size(220, 146) Me.dgvChatMembers.TabIndex = 8 ' - 'clmnMaId - ' - Me.clmnMaId.HeaderText = "Column1" - Me.clmnMaId.MinimumWidth = 8 - Me.clmnMaId.Name = "clmnMaId" - Me.clmnMaId.ReadOnly = True - Me.clmnMaId.Visible = False - Me.clmnMaId.Width = 150 - ' - 'clmnName - ' - Me.clmnName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill - Me.clmnName.HeaderText = "Name" - Me.clmnName.MinimumWidth = 8 - Me.clmnName.Name = "clmnName" - Me.clmnName.ReadOnly = True - ' - 'clmnFirma - ' - Me.clmnFirma.HeaderText = "Firma" - Me.clmnFirma.MinimumWidth = 8 - Me.clmnFirma.Name = "clmnFirma" - Me.clmnFirma.ReadOnly = True - Me.clmnFirma.Width = 85 - ' - 'clmnStatus - ' - Me.clmnStatus.HeaderText = "" - Me.clmnStatus.Name = "clmnStatus" - Me.clmnStatus.ReadOnly = True - Me.clmnStatus.Width = 20 - ' 'Panel8 ' Me.Panel8.BackColor = System.Drawing.SystemColors.Control @@ -962,6 +738,15 @@ Partial Class frmMessenger Me.toolChatReminder.Text = "Reminder ein/aus" Me.toolChatReminder.Visible = False ' + 'Label3 + ' + Me.Label3.AutoSize = True + Me.Label3.Location = New System.Drawing.Point(5, 23) + Me.Label3.Name = "Label3" + Me.Label3.Size = New System.Drawing.Size(237, 13) + Me.Label3.TabIndex = 108 + Me.Label3.Text = "Chats werden nach 30 Tagen auf inaktiv gesetzt" + ' 'DataGridViewTextBoxColumn1 ' Me.DataGridViewTextBoxColumn1.HeaderText = "Column1" @@ -987,6 +772,239 @@ Partial Class frmMessenger Me.DataGridViewTextBoxColumn3.ReadOnly = True Me.DataGridViewTextBoxColumn3.Width = 150 ' + 'DataGridViewTextBoxColumn4 + ' + Me.DataGridViewTextBoxColumn4.HeaderText = "" + Me.DataGridViewTextBoxColumn4.Name = "DataGridViewTextBoxColumn4" + Me.DataGridViewTextBoxColumn4.ReadOnly = True + Me.DataGridViewTextBoxColumn4.Width = 20 + ' + 'dgvChats + ' + Me.dgvChats.AKTUALISIERUNGS_INTERVALL = -1 + Me.dgvChats.AllowUserToAddRows = False + Me.dgvChats.AllowUserToDeleteRows = False + Me.dgvChats.AllowUserToResizeColumns = False + Me.dgvChats.AllowUserToResizeRows = False + Me.dgvChats.BackgroundColor = System.Drawing.Color.White + DataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvChats.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle1 + Me.dgvChats.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.dgvChats.ColumnHeadersVisible = False + DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvChats.DefaultCellStyle = DataGridViewCellStyle2 + Me.dgvChats.Dock = System.Windows.Forms.DockStyle.Fill + Me.dgvChats.Location = New System.Drawing.Point(0, 0) + Me.dgvChats.Name = "dgvChats" + Me.dgvChats.ReadOnly = True + DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvChats.RowHeadersDefaultCellStyle = DataGridViewCellStyle3 + Me.dgvChats.RowHeadersVisible = False + Me.dgvChats.RowHeadersWidth = 62 + DataGridViewCellStyle4.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.dgvChats.RowsDefaultCellStyle = DataGridViewCellStyle4 + Me.dgvChats.RowTemplate.Height = 30 + Me.dgvChats.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect + Me.dgvChats.Size = New System.Drawing.Size(275, 739) + Me.dgvChats.TabIndex = 0 + ' + 'DGVSonstige + ' + Me.DGVSonstige.AKTUALISIERUNGS_INTERVALL = -1 + Me.DGVSonstige.AllowUserToAddRows = False + Me.DGVSonstige.AllowUserToDeleteRows = False + Me.DGVSonstige.AllowUserToResizeColumns = False + Me.DGVSonstige.AllowUserToResizeRows = False + Me.DGVSonstige.BackgroundColor = System.Drawing.Color.White + DataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.DGVSonstige.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle5 + Me.DGVSonstige.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.DGVSonstige.ColumnHeadersVisible = False + DataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle6.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.DGVSonstige.DefaultCellStyle = DataGridViewCellStyle6 + Me.DGVSonstige.Dock = System.Windows.Forms.DockStyle.Fill + Me.DGVSonstige.Location = New System.Drawing.Point(0, 63) + Me.DGVSonstige.Name = "DGVSonstige" + Me.DGVSonstige.ReadOnly = True + DataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.DGVSonstige.RowHeadersDefaultCellStyle = DataGridViewCellStyle7 + Me.DGVSonstige.RowHeadersVisible = False + Me.DGVSonstige.RowHeadersWidth = 62 + DataGridViewCellStyle8.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.DGVSonstige.RowsDefaultCellStyle = DataGridViewCellStyle8 + Me.DGVSonstige.RowTemplate.Height = 30 + Me.DGVSonstige.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect + Me.DGVSonstige.Size = New System.Drawing.Size(150, 0) + Me.DGVSonstige.TabIndex = 1 + ' + 'MyTextBox2 + ' + Me.MyTextBox2._DateTimeOnly = False + Me.MyTextBox2._numbersOnly = False + Me.MyTextBox2._numbersOnlyKommastellen = "" + Me.MyTextBox2._numbersOnlyTrennzeichen = True + Me.MyTextBox2._Prozent = False + Me.MyTextBox2._ShortDateNew = False + Me.MyTextBox2._ShortDateOnly = False + Me.MyTextBox2._TimeOnly = False + Me.MyTextBox2._TimeOnly_Seconds = False + Me.MyTextBox2._value = "" + Me.MyTextBox2._Waehrung = False + Me.MyTextBox2._WaehrungZeichen = True + Me.MyTextBox2.ForeColor = System.Drawing.Color.Black + Me.MyTextBox2.Location = New System.Drawing.Point(20, 40) + Me.MyTextBox2.Margin = New System.Windows.Forms.Padding(2) + Me.MyTextBox2.MaxLineLength = -1 + Me.MyTextBox2.MaxLines_Warning = "" + Me.MyTextBox2.MaxLines_Warning_Label = Nothing + Me.MyTextBox2.Name = "MyTextBox2" + Me.MyTextBox2.Size = New System.Drawing.Size(250, 20) + Me.MyTextBox2.TabIndex = 4 + ' + 'UsrCntlChat_Art_Btn_MACHAT + ' + Me.UsrCntlChat_Art_Btn_MACHAT._aktiv = True + Me.UsrCntlChat_Art_Btn_MACHAT._name = "Allgemein" + Me.UsrCntlChat_Art_Btn_MACHAT.Location = New System.Drawing.Point(0, 0) + Me.UsrCntlChat_Art_Btn_MACHAT.Margin = New System.Windows.Forms.Padding(0) + Me.UsrCntlChat_Art_Btn_MACHAT.Name = "UsrCntlChat_Art_Btn_MACHAT" + Me.UsrCntlChat_Art_Btn_MACHAT.Size = New System.Drawing.Size(90, 29) + Me.UsrCntlChat_Art_Btn_MACHAT.TabIndex = 8 + ' + 'UsrCntlChat_Art_Btn_LKWCHAT + ' + Me.UsrCntlChat_Art_Btn_LKWCHAT._aktiv = False + Me.UsrCntlChat_Art_Btn_LKWCHAT._name = "LKW" + Me.UsrCntlChat_Art_Btn_LKWCHAT.Location = New System.Drawing.Point(90, 0) + Me.UsrCntlChat_Art_Btn_LKWCHAT.Margin = New System.Windows.Forms.Padding(0) + Me.UsrCntlChat_Art_Btn_LKWCHAT.Name = "UsrCntlChat_Art_Btn_LKWCHAT" + Me.UsrCntlChat_Art_Btn_LKWCHAT.Size = New System.Drawing.Size(90, 29) + Me.UsrCntlChat_Art_Btn_LKWCHAT.TabIndex = 9 + ' + 'UsrCntlChat_Art_Btn_SNDCHAT + ' + Me.UsrCntlChat_Art_Btn_SNDCHAT._aktiv = False + Me.UsrCntlChat_Art_Btn_SNDCHAT._name = "Sendung" + Me.UsrCntlChat_Art_Btn_SNDCHAT.Location = New System.Drawing.Point(180, 0) + Me.UsrCntlChat_Art_Btn_SNDCHAT.Margin = New System.Windows.Forms.Padding(0) + Me.UsrCntlChat_Art_Btn_SNDCHAT.Name = "UsrCntlChat_Art_Btn_SNDCHAT" + Me.UsrCntlChat_Art_Btn_SNDCHAT.Size = New System.Drawing.Size(90, 29) + Me.UsrCntlChat_Art_Btn_SNDCHAT.TabIndex = 10 + ' + 'MyTextBox1 + ' + Me.MyTextBox1._DateTimeOnly = False + Me.MyTextBox1._numbersOnly = False + Me.MyTextBox1._numbersOnlyKommastellen = "" + Me.MyTextBox1._numbersOnlyTrennzeichen = True + Me.MyTextBox1._Prozent = False + Me.MyTextBox1._ShortDateNew = False + Me.MyTextBox1._ShortDateOnly = False + Me.MyTextBox1._TimeOnly = False + Me.MyTextBox1._TimeOnly_Seconds = False + Me.MyTextBox1._value = "" + Me.MyTextBox1._Waehrung = False + Me.MyTextBox1._WaehrungZeichen = True + Me.MyTextBox1.ForeColor = System.Drawing.Color.Black + Me.MyTextBox1.Location = New System.Drawing.Point(20, 40) + Me.MyTextBox1.Margin = New System.Windows.Forms.Padding(2) + Me.MyTextBox1.MaxLineLength = -1 + Me.MyTextBox1.MaxLines_Warning = "" + Me.MyTextBox1.MaxLines_Warning_Label = Nothing + Me.MyTextBox1.Name = "MyTextBox1" + Me.MyTextBox1.Size = New System.Drawing.Size(250, 20) + Me.MyTextBox1.TabIndex = 4 + ' + 'MyFlowLayoutPanel1 + ' + Me.MyFlowLayoutPanel1.AutoScroll = True + Me.MyFlowLayoutPanel1.BackColor = System.Drawing.Color.White + Me.MyFlowLayoutPanel1.Controls.Add(Me.UsrCntlMessenger_ChatElement1) + Me.MyFlowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill + Me.MyFlowLayoutPanel1.Location = New System.Drawing.Point(0, 44) + Me.MyFlowLayoutPanel1.Name = "MyFlowLayoutPanel1" + Me.MyFlowLayoutPanel1.Size = New System.Drawing.Size(633, 556) + Me.MyFlowLayoutPanel1.TabIndex = 0 + ' + 'UsrCntlMessenger_ChatElement1 + ' + Me.UsrCntlMessenger_ChatElement1.BackColor = System.Drawing.Color.White + Me.UsrCntlMessenger_ChatElement1.CHAT_MSG = Nothing + Me.UsrCntlMessenger_ChatElement1.Location = New System.Drawing.Point(4, 5) + Me.UsrCntlMessenger_ChatElement1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.UsrCntlMessenger_ChatElement1.Name = "UsrCntlMessenger_ChatElement1" + Me.UsrCntlMessenger_ChatElement1.Size = New System.Drawing.Size(378, 48) + Me.UsrCntlMessenger_ChatElement1.TabIndex = 4 + Me.UsrCntlMessenger_ChatElement1.Visible = False + ' + 'clmnMaId + ' + Me.clmnMaId.HeaderText = "Column1" + Me.clmnMaId.MinimumWidth = 8 + Me.clmnMaId.Name = "clmnMaId" + Me.clmnMaId.ReadOnly = True + Me.clmnMaId.Visible = False + Me.clmnMaId.Width = 150 + ' + 'clmnName + ' + Me.clmnName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill + Me.clmnName.HeaderText = "Name" + Me.clmnName.MinimumWidth = 8 + Me.clmnName.Name = "clmnName" + Me.clmnName.ReadOnly = True + ' + 'clmnFirma + ' + Me.clmnFirma.HeaderText = "Firma" + Me.clmnFirma.MinimumWidth = 8 + Me.clmnFirma.Name = "clmnFirma" + Me.clmnFirma.ReadOnly = True + Me.clmnFirma.Width = 85 + ' + 'clmnStatus + ' + Me.clmnStatus.HeaderText = "" + Me.clmnStatus.Name = "clmnStatus" + Me.clmnStatus.ReadOnly = True + Me.clmnStatus.Width = 20 + ' 'frmMessenger ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -1005,10 +1023,8 @@ Partial Class frmMessenger Me.SplitContainer2.Panel2.ResumeLayout(False) CType(Me.SplitContainer2, System.ComponentModel.ISupportInitialize).EndInit() Me.SplitContainer2.ResumeLayout(False) - CType(Me.dgvChats, System.ComponentModel.ISupportInitialize).EndInit() Me.Panel6.ResumeLayout(False) Me.Panel6.PerformLayout() - CType(Me.DGVSonstige, System.ComponentModel.ISupportInitialize).EndInit() Me.Panel5.ResumeLayout(False) Me.Panel5.PerformLayout() CType(Me.PictureBox2, System.ComponentModel.ISupportInitialize).EndInit() @@ -1022,7 +1038,6 @@ Partial Class frmMessenger Me.SplitContainer1.Panel2.ResumeLayout(False) CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).EndInit() Me.SplitContainer1.ResumeLayout(False) - Me.MyFlowLayoutPanel1.ResumeLayout(False) Me.Panel3.ResumeLayout(False) Me.Panel3.PerformLayout() Me.pnl.ResumeLayout(False) @@ -1037,6 +1052,9 @@ Partial Class frmMessenger Me.Panel9.ResumeLayout(False) CType(Me.pic, System.ComponentModel.ISupportInitialize).EndInit() Me.cntxt.ResumeLayout(False) + CType(Me.dgvChats, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.DGVSonstige, System.ComponentModel.ISupportInitialize).EndInit() + Me.MyFlowLayoutPanel1.ResumeLayout(False) Me.ResumeLayout(False) End Sub @@ -1104,4 +1122,6 @@ Partial Class frmMessenger Friend WithEvents clmnName As DataGridViewTextBoxColumn Friend WithEvents clmnFirma As DataGridViewTextBoxColumn Friend WithEvents clmnStatus As DataGridViewTextBoxColumn + Friend WithEvents DataGridViewTextBoxColumn4 As DataGridViewTextBoxColumn + Friend WithEvents Label3 As Label End Class diff --git a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.Designer.vb b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.Designer.vb index 56609c72..f444db68 100644 --- a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.Designer.vb +++ b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.Designer.vb @@ -60,17 +60,17 @@ Partial Class frmUeberstundenauszahlen Me.cbx100 = New System.Windows.Forms.CheckBox() Me.txtberAusz25 = New System.Windows.Forms.TextBox() Me.cbxoverwrite = New System.Windows.Forms.CheckBox() + Me.dgvUeberstunden = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.Label8 = New System.Windows.Forms.Label() Me.txt50x1 = New System.Windows.Forms.TextBox() Me.cbxTeilzeit = New System.Windows.Forms.CheckBox() Me.PictureBox1 = New System.Windows.Forms.PictureBox() - Me.dgvUeberstunden = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.lblWarning = New System.Windows.Forms.Label() CType(Me.picDel, System.ComponentModel.ISupportInitialize).BeginInit() Me.Panel1.SuspendLayout() CType(Me.picShow, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.dgvUeberstunden, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'dtpMonat @@ -105,9 +105,8 @@ Partial Class frmUeberstundenauszahlen Me.Label3.AutoSize = True Me.Label3.Location = New System.Drawing.Point(32, 131) Me.Label3.Name = "Label3" - Me.Label3.Size = New System.Drawing.Size(138, 13) + Me.Label3.Size = New System.Drawing.Size(0, 13) Me.Label3.TabIndex = 3 - Me.Label3.Text = "Mehrarbeit (autom. ausbez.)" ' 'Label4 ' @@ -432,6 +431,20 @@ Partial Class frmUeberstundenauszahlen Me.cbxoverwrite.Text = "max. auszahlbar" Me.cbxoverwrite.UseVisualStyleBackColor = True ' + 'dgvUeberstunden + ' + Me.dgvUeberstunden.AKTUALISIERUNGS_INTERVALL = -1 + Me.dgvUeberstunden.AllowUserToAddRows = False + Me.dgvUeberstunden.AllowUserToDeleteRows = False + Me.dgvUeberstunden.BackgroundColor = System.Drawing.Color.White + Me.dgvUeberstunden.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.dgvUeberstunden.Location = New System.Drawing.Point(381, 30) + Me.dgvUeberstunden.Name = "dgvUeberstunden" + Me.dgvUeberstunden.ReadOnly = True + Me.dgvUeberstunden.Size = New System.Drawing.Size(227, 98) + Me.dgvUeberstunden.TabIndex = 13 + Me.dgvUeberstunden.Visible = False + ' 'Label8 ' Me.Label8.AutoSize = True @@ -470,20 +483,6 @@ Partial Class frmUeberstundenauszahlen Me.PictureBox1.TabIndex = 38 Me.PictureBox1.TabStop = False ' - 'dgvUeberstunden - ' - Me.dgvUeberstunden.AKTUALISIERUNGS_INTERVALL = -1 - Me.dgvUeberstunden.AllowUserToAddRows = False - Me.dgvUeberstunden.AllowUserToDeleteRows = False - Me.dgvUeberstunden.BackgroundColor = System.Drawing.Color.White - Me.dgvUeberstunden.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - Me.dgvUeberstunden.Location = New System.Drawing.Point(381, 30) - Me.dgvUeberstunden.Name = "dgvUeberstunden" - Me.dgvUeberstunden.ReadOnly = True - Me.dgvUeberstunden.Size = New System.Drawing.Size(227, 98) - Me.dgvUeberstunden.TabIndex = 13 - Me.dgvUeberstunden.Visible = False - ' 'lblWarning ' Me.lblWarning.AutoSize = True @@ -516,8 +515,8 @@ Partial Class frmUeberstundenauszahlen Me.Panel1.ResumeLayout(False) Me.Panel1.PerformLayout() CType(Me.picShow, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.dgvUeberstunden, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() diff --git a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.vb b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.vb index 9ff08b7a..e4063e9e 100644 --- a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.vb +++ b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.vb @@ -31,7 +31,7 @@ Public Class frmUeberstundenauszahlen MA = New cMitarbeiter(mit_id) tag = New cFeiertage(DateTime.Parse(dtpMonat.Value).Year) Label7.Text = MA.mit_vname & " " & MA.mit_nname - timas.getEmployee(MA.mit_timasId, customFields) + customFields = timas.getEmployeecustomFields(MA.mit_timasId) timas.getTimeaccountList(dt) '65;"01-Lfd Saldo" @@ -76,38 +76,7 @@ Public Class frmUeberstundenauszahlen getUeberstunden(False) - For Each row As DataRow In customFields.Rows - If Not IsDBNull(row.Item("value")) AndAlso Not IsDBNull(row.Item("name")) Then - - If row.Item("name") = "Teilzeit" Then - If row.Item("value") = "true" Then - cbxTeilzeit.Checked = True - Else - cbxTeilzeit.Checked = False - End If - End If - - If row.Item("name") = "SA-Zuschlag" Then - If row.Item("value") = "true" Then - faktorSamstagsarbeit = 150 'Samstagsarbeit wir im Timas hochgerechnet - Else - faktorSamstagsarbeit = 100 'Samstagsarbeit wir im Timas NICHT hochgerechnet - End If - End If - - If row.Item("name") = "Zuschlagsfrei" Then - If row.Item("value") = "true" Then - lblWarning.Text = "Zuschlagsfrei" - Else - lblWarning.Text = "" - End If - End If - - End If - - Next - - + getAddDataFromTimas() End Sub @@ -239,6 +208,8 @@ Public Class frmUeberstundenauszahlen End Sub Private Sub PictureBox1_Click(sender As Object, e As EventArgs) Handles PictureBox1.Click + customFields = timas.getEmployeecustomFields(MA.mit_timasId) + getAddDataFromTimas() getUeberstunden(cbxabwDatum.Checked) End Sub @@ -703,7 +674,7 @@ Public Class frmUeberstundenauszahlen txtlfdSaldo.Text = timas.getTimeSaldo(MA.mit_timasId, "", "overallBalance") stunden100auszbere = RoundOfDigits(stunden100ausz * 2, 2) - stunden50auszbere = RoundOfDigits(stunden50ausz * 1.5, 2) + stunden50auszbere = RoundOfDigits(stunden50ausz * 100 / faktorSamstagsarbeit, 2) txt100x2.Text = stunden100auszbere txt50x15.Text = stunden50auszbere @@ -729,4 +700,48 @@ Public Class frmUeberstundenauszahlen End Sub + + Private Sub getAddDataFromTimas() + + For Each row As DataRow In customFields.Rows + If Not IsDBNull(row.Item("value")) AndAlso Not IsDBNull(row.Item("name")) Then + + If row.Item("name") = "Teilzeit" Then + If row.Item("value") = "true" Then + cbxTeilzeit.Checked = True + Else + cbxTeilzeit.Checked = False + End If + End If + + If row.Item("name") = "SA-Zuschlag" Then + If row.Item("value") = "true" Then + faktorSamstagsarbeit = 150 'Samstagsarbeit wir im Timas hochgerechnet + lblMA.Text = "Mitarbeiter (mit SA-Zuschlag):" + Else + lblMA.Text = "Mitarbeiter (ohne SA-Zuschlag):" + faktorSamstagsarbeit = 100 'Samstagsarbeit wir im Timas NICHT hochgerechnet + End If + End If + + If row.Item("name") = "ÜS werden nicht auf lfd. Saldo hinzugezählt" Then + If row.Item("value") = "true" Then + MsgBox("ÜS werden nicht auf lfd. Saldo hinzugezählt") + Else + lblWarning.Text = "" + End If + End If + + If row.Item("name") = "Automatisch auszahlen" Then + If row.Item("value") = "true" Then + Label3.Text = "Mehrarbeit (autom. ausbez.)" + Else + Label3.Text = "Mehrarbeit (NICHT autom. ausbez.)" + End If + End If + + End If + + Next + End Sub End Class \ No newline at end of file diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/TIMAS/cTimasAPI.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/TIMAS/cTimasAPI.vb index 89133296..8c72e983 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/TIMAS/cTimasAPI.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/TIMAS/cTimasAPI.vb @@ -385,7 +385,7 @@ Public Class cTimasAPI End Try End Sub - Public Function getEmployee(mitarbeiterID As String, ByRef datatableTimas As DataTable) As cTimasEmployee + Public Function getEmployee(mitarbeiterID As String) As cTimasEmployee Try @@ -469,13 +469,53 @@ Public Class cTimasAPI i = i + 1 End While + + Debug.WriteLine(json) + + Return emp + + Catch ex As WebException + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) + End Try + + End Function + + + Public Function getEmployeecustomFields(mitarbeiterID As String) As DataTable + + Try + Dim dt As New DataTable + + If Not checkConnectionTImas("") Then + Return Nothing + End If + + Dim responseJson As String = rest.FullRequestNoBody("GET", "/rest/web-api/employees/" & mitarbeiterID) + If (rest.LastMethodSuccess <> True) Then + Debug.WriteLine(rest.LastErrorText) + Return Nothing + End If + + If (rest.ResponseStatusCode <> 200) Then + Debug.WriteLine(rest.ResponseHeader) + MsgBox(rest.ResponseStatusCode & " " & rest.ResponseStatusText) + Return Nothing + End If + + Debug.WriteLine(responseJson) + + + Dim json As New Chilkat.JsonObject + Dim success = json.Load(responseJson) + If (success <> True) Then + Debug.WriteLine(json.LastErrorText) + End If + Dim customFields As Chilkat.JsonArray = json.ArrayOf("customFields") If (json.LastMethodSuccess = False) Then Debug.WriteLine("customFields member not found.") Else - - Dim dt As New DataTable dt.Columns.Add("value", GetType(String)) dt.Columns.Add("name", GetType(String)) dt.Columns.Add("type", GetType(String)) @@ -491,15 +531,12 @@ Public Class cTimasAPI dt.Rows.Add(R) j = j + 1 End While - If datatableTimas IsNot Nothing Then datatableTimas = dt End If - - Debug.WriteLine(json) - Return emp + Return dt Catch ex As WebException VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) From aa0b0ea6ffebca209c5071850d6374cb2c38f767 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Thu, 7 Mar 2024 16:47:15 +0100 Subject: [PATCH 5/5] Chat deaktivieren --- .../Messenger/frmMessenger.Designer.vb | 523 +++++++++--------- 1 file changed, 262 insertions(+), 261 deletions(-) diff --git a/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.Designer.vb b/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.Designer.vb index b666af37..e107caa2 100644 --- a/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.Designer.vb +++ b/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.Designer.vb @@ -24,9 +24,7 @@ Partial Class frmMessenger 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. _ Private Sub InitializeComponent() - Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle11 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Me.components = New System.ComponentModel.Container() Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() @@ -35,13 +33,20 @@ Partial Class frmMessenger Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle11 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmMessenger)) Me.SplitContainer = New System.Windows.Forms.SplitContainer() Me.SplitContainer2 = New System.Windows.Forms.SplitContainer() + Me.dgvChats = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.Panel6 = New System.Windows.Forms.Panel() + Me.Label3 = New System.Windows.Forms.Label() Me.lblLKWChat_MsgCntInaktiv = New System.Windows.Forms.Label() Me.cbxInaktiveChats = New System.Windows.Forms.CheckBox() + Me.DGVSonstige = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.Panel5 = New System.Windows.Forms.Panel() + Me.MyTextBox2 = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.PictureBox2 = New System.Windows.Forms.PictureBox() Me.Label1 = New System.Windows.Forms.Label() Me.Button8 = New System.Windows.Forms.Button() @@ -51,11 +56,17 @@ Partial Class frmMessenger Me.cbxInaktiveChatsSpecial = New System.Windows.Forms.CheckBox() Me.Panel1 = New System.Windows.Forms.Panel() Me.FlowLayoutPanel1 = New System.Windows.Forms.FlowLayoutPanel() + Me.UsrCntlChat_Art_Btn_MACHAT = New VERAG_PROG_ALLGEMEIN.usrCntlChat_Art_Btn() + Me.UsrCntlChat_Art_Btn_LKWCHAT = New VERAG_PROG_ALLGEMEIN.usrCntlChat_Art_Btn() + Me.UsrCntlChat_Art_Btn_SNDCHAT = New VERAG_PROG_ALLGEMEIN.usrCntlChat_Art_Btn() + Me.MyTextBox1 = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.PictureBox1 = New System.Windows.Forms.PictureBox() Me.lbl = New System.Windows.Forms.Label() Me.btnNeu = New System.Windows.Forms.Button() Me.Button1 = New System.Windows.Forms.Button() Me.SplitContainer1 = New System.Windows.Forms.SplitContainer() + Me.MyFlowLayoutPanel1 = New VERAG_PROG_ALLGEMEIN.MyFlowLayoutPanel(Me.components) + Me.UsrCntlMessenger_ChatElement1 = New VERAG_PROG_ALLGEMEIN.usrCntlMessenger_ChatElement() Me.Panel3 = New System.Windows.Forms.Panel() Me.btnTeilnehmer = New System.Windows.Forms.Button() Me.Panel4 = New System.Windows.Forms.Panel() @@ -67,6 +78,10 @@ Partial Class frmMessenger Me.pnlTeilnehmer = New System.Windows.Forms.Panel() Me.Label4 = New System.Windows.Forms.Label() Me.dgvChatMembers = New System.Windows.Forms.DataGridView() + Me.clmnMaId = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.clmnName = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.clmnFirma = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.clmnStatus = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.Panel8 = New System.Windows.Forms.Panel() Me.Label2 = New System.Windows.Forms.Label() Me.Panel9 = New System.Windows.Forms.Panel() @@ -78,29 +93,15 @@ Partial Class frmMessenger Me.btnSendAtt = New System.Windows.Forms.Button() Me.btnSenden = New System.Windows.Forms.Button() Me.rtbChatMessage = New System.Windows.Forms.RichTextBox() - Me.TimerNEW_MESSAGE = New System.Windows.Forms.Timer() - Me.Timer_REFRESH = New System.Windows.Forms.Timer() - Me.cntxt = New System.Windows.Forms.ContextMenuStrip() + Me.TimerNEW_MESSAGE = New System.Windows.Forms.Timer(Me.components) + Me.Timer_REFRESH = New System.Windows.Forms.Timer(Me.components) + Me.cntxt = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ChatDeaktivierenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.toolChatReminder = New System.Windows.Forms.ToolStripMenuItem() - Me.Label3 = New System.Windows.Forms.Label() Me.DataGridViewTextBoxColumn1 = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.DataGridViewTextBoxColumn2 = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.DataGridViewTextBoxColumn3 = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.DataGridViewTextBoxColumn4 = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.dgvChats = New VERAG_PROG_ALLGEMEIN.MyDatagridview() - Me.DGVSonstige = New VERAG_PROG_ALLGEMEIN.MyDatagridview() - Me.MyTextBox2 = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.UsrCntlChat_Art_Btn_MACHAT = New VERAG_PROG_ALLGEMEIN.usrCntlChat_Art_Btn() - Me.UsrCntlChat_Art_Btn_LKWCHAT = New VERAG_PROG_ALLGEMEIN.usrCntlChat_Art_Btn() - Me.UsrCntlChat_Art_Btn_SNDCHAT = New VERAG_PROG_ALLGEMEIN.usrCntlChat_Art_Btn() - Me.MyTextBox1 = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.MyFlowLayoutPanel1 = New VERAG_PROG_ALLGEMEIN.MyFlowLayoutPanel() - Me.UsrCntlMessenger_ChatElement1 = New VERAG_PROG_ALLGEMEIN.usrCntlMessenger_ChatElement() - Me.clmnMaId = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.clmnName = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.clmnFirma = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.clmnStatus = New System.Windows.Forms.DataGridViewTextBoxColumn() CType(Me.SplitContainer, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainer.Panel1.SuspendLayout() Me.SplitContainer.Panel2.SuspendLayout() @@ -109,7 +110,9 @@ Partial Class frmMessenger Me.SplitContainer2.Panel1.SuspendLayout() Me.SplitContainer2.Panel2.SuspendLayout() Me.SplitContainer2.SuspendLayout() + CType(Me.dgvChats, System.ComponentModel.ISupportInitialize).BeginInit() Me.Panel6.SuspendLayout() + CType(Me.DGVSonstige, System.ComponentModel.ISupportInitialize).BeginInit() Me.Panel5.SuspendLayout() CType(Me.PictureBox2, System.ComponentModel.ISupportInitialize).BeginInit() Me.Panel2.SuspendLayout() @@ -120,6 +123,7 @@ Partial Class frmMessenger Me.SplitContainer1.Panel1.SuspendLayout() Me.SplitContainer1.Panel2.SuspendLayout() Me.SplitContainer1.SuspendLayout() + Me.MyFlowLayoutPanel1.SuspendLayout() Me.Panel3.SuspendLayout() Me.pnl.SuspendLayout() CType(Me.SplitContainer3, System.ComponentModel.ISupportInitialize).BeginInit() @@ -132,9 +136,6 @@ Partial Class frmMessenger Me.Panel9.SuspendLayout() CType(Me.pic, System.ComponentModel.ISupportInitialize).BeginInit() Me.cntxt.SuspendLayout() - CType(Me.dgvChats, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.DGVSonstige, System.ComponentModel.ISupportInitialize).BeginInit() - Me.MyFlowLayoutPanel1.SuspendLayout() Me.SuspendLayout() ' 'SplitContainer @@ -181,6 +182,53 @@ Partial Class frmMessenger Me.SplitContainer2.SplitterWidth = 3 Me.SplitContainer2.TabIndex = 8 ' + 'dgvChats + ' + Me.dgvChats.AKTUALISIERUNGS_INTERVALL = -1 + Me.dgvChats.AllowUserToAddRows = False + Me.dgvChats.AllowUserToDeleteRows = False + Me.dgvChats.AllowUserToResizeColumns = False + Me.dgvChats.AllowUserToResizeRows = False + Me.dgvChats.BackgroundColor = System.Drawing.Color.White + DataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvChats.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle1 + Me.dgvChats.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.dgvChats.ColumnHeadersVisible = False + DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvChats.DefaultCellStyle = DataGridViewCellStyle2 + Me.dgvChats.Dock = System.Windows.Forms.DockStyle.Fill + Me.dgvChats.Location = New System.Drawing.Point(0, 0) + Me.dgvChats.Name = "dgvChats" + Me.dgvChats.ReadOnly = True + DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvChats.RowHeadersDefaultCellStyle = DataGridViewCellStyle3 + Me.dgvChats.RowHeadersVisible = False + Me.dgvChats.RowHeadersWidth = 62 + DataGridViewCellStyle4.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.dgvChats.RowsDefaultCellStyle = DataGridViewCellStyle4 + Me.dgvChats.RowTemplate.Height = 30 + Me.dgvChats.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect + Me.dgvChats.Size = New System.Drawing.Size(275, 739) + Me.dgvChats.TabIndex = 0 + ' 'Panel6 ' Me.Panel6.Controls.Add(Me.Label3) @@ -192,6 +240,15 @@ Partial Class frmMessenger Me.Panel6.Size = New System.Drawing.Size(275, 48) Me.Panel6.TabIndex = 7 ' + 'Label3 + ' + Me.Label3.AutoSize = True + Me.Label3.Location = New System.Drawing.Point(5, 23) + Me.Label3.Name = "Label3" + Me.Label3.Size = New System.Drawing.Size(237, 13) + Me.Label3.TabIndex = 108 + Me.Label3.Text = "Chats werden nach 30 Tagen auf inaktiv gesetzt" + ' 'lblLKWChat_MsgCntInaktiv ' Me.lblLKWChat_MsgCntInaktiv.BackColor = System.Drawing.Color.Red @@ -216,6 +273,53 @@ Partial Class frmMessenger Me.cbxInaktiveChats.Text = "inaktive Chats" Me.cbxInaktiveChats.UseVisualStyleBackColor = True ' + 'DGVSonstige + ' + Me.DGVSonstige.AKTUALISIERUNGS_INTERVALL = -1 + Me.DGVSonstige.AllowUserToAddRows = False + Me.DGVSonstige.AllowUserToDeleteRows = False + Me.DGVSonstige.AllowUserToResizeColumns = False + Me.DGVSonstige.AllowUserToResizeRows = False + Me.DGVSonstige.BackgroundColor = System.Drawing.Color.White + DataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.DGVSonstige.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle5 + Me.DGVSonstige.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.DGVSonstige.ColumnHeadersVisible = False + DataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle6.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.DGVSonstige.DefaultCellStyle = DataGridViewCellStyle6 + Me.DGVSonstige.Dock = System.Windows.Forms.DockStyle.Fill + Me.DGVSonstige.Location = New System.Drawing.Point(0, 63) + Me.DGVSonstige.Name = "DGVSonstige" + Me.DGVSonstige.ReadOnly = True + DataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.DGVSonstige.RowHeadersDefaultCellStyle = DataGridViewCellStyle7 + Me.DGVSonstige.RowHeadersVisible = False + Me.DGVSonstige.RowHeadersWidth = 62 + DataGridViewCellStyle8.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.DGVSonstige.RowsDefaultCellStyle = DataGridViewCellStyle8 + Me.DGVSonstige.RowTemplate.Height = 30 + Me.DGVSonstige.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect + Me.DGVSonstige.Size = New System.Drawing.Size(150, 0) + Me.DGVSonstige.TabIndex = 1 + ' 'Panel5 ' Me.Panel5.BackColor = System.Drawing.Color.White @@ -230,6 +334,30 @@ Partial Class frmMessenger Me.Panel5.Size = New System.Drawing.Size(150, 63) Me.Panel5.TabIndex = 2 ' + 'MyTextBox2 + ' + Me.MyTextBox2._DateTimeOnly = False + Me.MyTextBox2._numbersOnly = False + Me.MyTextBox2._numbersOnlyKommastellen = "" + Me.MyTextBox2._numbersOnlyTrennzeichen = True + Me.MyTextBox2._Prozent = False + Me.MyTextBox2._ShortDateNew = False + Me.MyTextBox2._ShortDateOnly = False + Me.MyTextBox2._TimeOnly = False + Me.MyTextBox2._TimeOnly_Seconds = False + Me.MyTextBox2._value = "" + Me.MyTextBox2._Waehrung = False + Me.MyTextBox2._WaehrungZeichen = True + Me.MyTextBox2.ForeColor = System.Drawing.Color.Black + Me.MyTextBox2.Location = New System.Drawing.Point(20, 40) + Me.MyTextBox2.Margin = New System.Windows.Forms.Padding(2) + Me.MyTextBox2.MaxLineLength = -1 + Me.MyTextBox2.MaxLines_Warning = "" + Me.MyTextBox2.MaxLines_Warning_Label = Nothing + Me.MyTextBox2.Name = "MyTextBox2" + Me.MyTextBox2.Size = New System.Drawing.Size(250, 20) + Me.MyTextBox2.TabIndex = 4 + ' 'PictureBox2 ' Me.PictureBox2.BackgroundImage = Global.VERAG_PROG_ALLGEMEIN.My.Resources.Resources.search @@ -335,6 +463,60 @@ Partial Class frmMessenger Me.FlowLayoutPanel1.Size = New System.Drawing.Size(275, 30) Me.FlowLayoutPanel1.TabIndex = 10 ' + 'UsrCntlChat_Art_Btn_MACHAT + ' + Me.UsrCntlChat_Art_Btn_MACHAT._aktiv = True + Me.UsrCntlChat_Art_Btn_MACHAT._name = "Allgemein" + Me.UsrCntlChat_Art_Btn_MACHAT.Location = New System.Drawing.Point(0, 0) + Me.UsrCntlChat_Art_Btn_MACHAT.Margin = New System.Windows.Forms.Padding(0) + Me.UsrCntlChat_Art_Btn_MACHAT.Name = "UsrCntlChat_Art_Btn_MACHAT" + Me.UsrCntlChat_Art_Btn_MACHAT.Size = New System.Drawing.Size(90, 29) + Me.UsrCntlChat_Art_Btn_MACHAT.TabIndex = 8 + ' + 'UsrCntlChat_Art_Btn_LKWCHAT + ' + Me.UsrCntlChat_Art_Btn_LKWCHAT._aktiv = False + Me.UsrCntlChat_Art_Btn_LKWCHAT._name = "LKW" + Me.UsrCntlChat_Art_Btn_LKWCHAT.Location = New System.Drawing.Point(90, 0) + Me.UsrCntlChat_Art_Btn_LKWCHAT.Margin = New System.Windows.Forms.Padding(0) + Me.UsrCntlChat_Art_Btn_LKWCHAT.Name = "UsrCntlChat_Art_Btn_LKWCHAT" + Me.UsrCntlChat_Art_Btn_LKWCHAT.Size = New System.Drawing.Size(90, 29) + Me.UsrCntlChat_Art_Btn_LKWCHAT.TabIndex = 9 + ' + 'UsrCntlChat_Art_Btn_SNDCHAT + ' + Me.UsrCntlChat_Art_Btn_SNDCHAT._aktiv = False + Me.UsrCntlChat_Art_Btn_SNDCHAT._name = "Sendung" + Me.UsrCntlChat_Art_Btn_SNDCHAT.Location = New System.Drawing.Point(180, 0) + Me.UsrCntlChat_Art_Btn_SNDCHAT.Margin = New System.Windows.Forms.Padding(0) + Me.UsrCntlChat_Art_Btn_SNDCHAT.Name = "UsrCntlChat_Art_Btn_SNDCHAT" + Me.UsrCntlChat_Art_Btn_SNDCHAT.Size = New System.Drawing.Size(90, 29) + Me.UsrCntlChat_Art_Btn_SNDCHAT.TabIndex = 10 + ' + 'MyTextBox1 + ' + Me.MyTextBox1._DateTimeOnly = False + Me.MyTextBox1._numbersOnly = False + Me.MyTextBox1._numbersOnlyKommastellen = "" + Me.MyTextBox1._numbersOnlyTrennzeichen = True + Me.MyTextBox1._Prozent = False + Me.MyTextBox1._ShortDateNew = False + Me.MyTextBox1._ShortDateOnly = False + Me.MyTextBox1._TimeOnly = False + Me.MyTextBox1._TimeOnly_Seconds = False + Me.MyTextBox1._value = "" + Me.MyTextBox1._Waehrung = False + Me.MyTextBox1._WaehrungZeichen = True + Me.MyTextBox1.ForeColor = System.Drawing.Color.Black + Me.MyTextBox1.Location = New System.Drawing.Point(20, 40) + Me.MyTextBox1.Margin = New System.Windows.Forms.Padding(2) + Me.MyTextBox1.MaxLineLength = -1 + Me.MyTextBox1.MaxLines_Warning = "" + Me.MyTextBox1.MaxLines_Warning_Label = Nothing + Me.MyTextBox1.Name = "MyTextBox1" + Me.MyTextBox1.Size = New System.Drawing.Size(250, 20) + Me.MyTextBox1.TabIndex = 4 + ' 'PictureBox1 ' Me.PictureBox1.BackgroundImage = Global.VERAG_PROG_ALLGEMEIN.My.Resources.Resources.search @@ -400,6 +582,28 @@ Partial Class frmMessenger Me.SplitContainer1.SplitterDistance = 600 Me.SplitContainer1.TabIndex = 0 ' + 'MyFlowLayoutPanel1 + ' + Me.MyFlowLayoutPanel1.AutoScroll = True + Me.MyFlowLayoutPanel1.BackColor = System.Drawing.Color.White + Me.MyFlowLayoutPanel1.Controls.Add(Me.UsrCntlMessenger_ChatElement1) + Me.MyFlowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill + Me.MyFlowLayoutPanel1.Location = New System.Drawing.Point(0, 44) + Me.MyFlowLayoutPanel1.Name = "MyFlowLayoutPanel1" + Me.MyFlowLayoutPanel1.Size = New System.Drawing.Size(633, 556) + Me.MyFlowLayoutPanel1.TabIndex = 0 + ' + 'UsrCntlMessenger_ChatElement1 + ' + Me.UsrCntlMessenger_ChatElement1.BackColor = System.Drawing.Color.White + Me.UsrCntlMessenger_ChatElement1.CHAT_MSG = Nothing + Me.UsrCntlMessenger_ChatElement1.Location = New System.Drawing.Point(4, 5) + Me.UsrCntlMessenger_ChatElement1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.UsrCntlMessenger_ChatElement1.Name = "UsrCntlMessenger_ChatElement1" + Me.UsrCntlMessenger_ChatElement1.Size = New System.Drawing.Size(378, 48) + Me.UsrCntlMessenger_ChatElement1.TabIndex = 4 + Me.UsrCntlMessenger_ChatElement1.Visible = False + ' 'Panel3 ' Me.Panel3.BackColor = System.Drawing.Color.White @@ -581,6 +785,38 @@ Partial Class frmMessenger Me.dgvChatMembers.Size = New System.Drawing.Size(220, 146) Me.dgvChatMembers.TabIndex = 8 ' + 'clmnMaId + ' + Me.clmnMaId.HeaderText = "Column1" + Me.clmnMaId.MinimumWidth = 8 + Me.clmnMaId.Name = "clmnMaId" + Me.clmnMaId.ReadOnly = True + Me.clmnMaId.Visible = False + Me.clmnMaId.Width = 150 + ' + 'clmnName + ' + Me.clmnName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill + Me.clmnName.HeaderText = "Name" + Me.clmnName.MinimumWidth = 8 + Me.clmnName.Name = "clmnName" + Me.clmnName.ReadOnly = True + ' + 'clmnFirma + ' + Me.clmnFirma.HeaderText = "Firma" + Me.clmnFirma.MinimumWidth = 8 + Me.clmnFirma.Name = "clmnFirma" + Me.clmnFirma.ReadOnly = True + Me.clmnFirma.Width = 85 + ' + 'clmnStatus + ' + Me.clmnStatus.HeaderText = "" + Me.clmnStatus.Name = "clmnStatus" + Me.clmnStatus.ReadOnly = True + Me.clmnStatus.Width = 20 + ' 'Panel8 ' Me.Panel8.BackColor = System.Drawing.SystemColors.Control @@ -738,15 +974,6 @@ Partial Class frmMessenger Me.toolChatReminder.Text = "Reminder ein/aus" Me.toolChatReminder.Visible = False ' - 'Label3 - ' - Me.Label3.AutoSize = True - Me.Label3.Location = New System.Drawing.Point(5, 23) - Me.Label3.Name = "Label3" - Me.Label3.Size = New System.Drawing.Size(237, 13) - Me.Label3.TabIndex = 108 - Me.Label3.Text = "Chats werden nach 30 Tagen auf inaktiv gesetzt" - ' 'DataGridViewTextBoxColumn1 ' Me.DataGridViewTextBoxColumn1.HeaderText = "Column1" @@ -779,232 +1006,6 @@ Partial Class frmMessenger Me.DataGridViewTextBoxColumn4.ReadOnly = True Me.DataGridViewTextBoxColumn4.Width = 20 ' - 'dgvChats - ' - Me.dgvChats.AKTUALISIERUNGS_INTERVALL = -1 - Me.dgvChats.AllowUserToAddRows = False - Me.dgvChats.AllowUserToDeleteRows = False - Me.dgvChats.AllowUserToResizeColumns = False - Me.dgvChats.AllowUserToResizeRows = False - Me.dgvChats.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvChats.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle1 - Me.dgvChats.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - Me.dgvChats.ColumnHeadersVisible = False - DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvChats.DefaultCellStyle = DataGridViewCellStyle2 - Me.dgvChats.Dock = System.Windows.Forms.DockStyle.Fill - Me.dgvChats.Location = New System.Drawing.Point(0, 0) - Me.dgvChats.Name = "dgvChats" - Me.dgvChats.ReadOnly = True - DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvChats.RowHeadersDefaultCellStyle = DataGridViewCellStyle3 - Me.dgvChats.RowHeadersVisible = False - Me.dgvChats.RowHeadersWidth = 62 - DataGridViewCellStyle4.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.dgvChats.RowsDefaultCellStyle = DataGridViewCellStyle4 - Me.dgvChats.RowTemplate.Height = 30 - Me.dgvChats.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvChats.Size = New System.Drawing.Size(275, 739) - Me.dgvChats.TabIndex = 0 - ' - 'DGVSonstige - ' - Me.DGVSonstige.AKTUALISIERUNGS_INTERVALL = -1 - Me.DGVSonstige.AllowUserToAddRows = False - Me.DGVSonstige.AllowUserToDeleteRows = False - Me.DGVSonstige.AllowUserToResizeColumns = False - Me.DGVSonstige.AllowUserToResizeRows = False - Me.DGVSonstige.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.DGVSonstige.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle5 - Me.DGVSonstige.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - Me.DGVSonstige.ColumnHeadersVisible = False - DataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle6.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.DGVSonstige.DefaultCellStyle = DataGridViewCellStyle6 - Me.DGVSonstige.Dock = System.Windows.Forms.DockStyle.Fill - Me.DGVSonstige.Location = New System.Drawing.Point(0, 63) - Me.DGVSonstige.Name = "DGVSonstige" - Me.DGVSonstige.ReadOnly = True - DataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.DGVSonstige.RowHeadersDefaultCellStyle = DataGridViewCellStyle7 - Me.DGVSonstige.RowHeadersVisible = False - Me.DGVSonstige.RowHeadersWidth = 62 - DataGridViewCellStyle8.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.DGVSonstige.RowsDefaultCellStyle = DataGridViewCellStyle8 - Me.DGVSonstige.RowTemplate.Height = 30 - Me.DGVSonstige.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.DGVSonstige.Size = New System.Drawing.Size(150, 0) - Me.DGVSonstige.TabIndex = 1 - ' - 'MyTextBox2 - ' - Me.MyTextBox2._DateTimeOnly = False - Me.MyTextBox2._numbersOnly = False - Me.MyTextBox2._numbersOnlyKommastellen = "" - Me.MyTextBox2._numbersOnlyTrennzeichen = True - Me.MyTextBox2._Prozent = False - Me.MyTextBox2._ShortDateNew = False - Me.MyTextBox2._ShortDateOnly = False - Me.MyTextBox2._TimeOnly = False - Me.MyTextBox2._TimeOnly_Seconds = False - Me.MyTextBox2._value = "" - Me.MyTextBox2._Waehrung = False - Me.MyTextBox2._WaehrungZeichen = True - Me.MyTextBox2.ForeColor = System.Drawing.Color.Black - Me.MyTextBox2.Location = New System.Drawing.Point(20, 40) - Me.MyTextBox2.Margin = New System.Windows.Forms.Padding(2) - Me.MyTextBox2.MaxLineLength = -1 - Me.MyTextBox2.MaxLines_Warning = "" - Me.MyTextBox2.MaxLines_Warning_Label = Nothing - Me.MyTextBox2.Name = "MyTextBox2" - Me.MyTextBox2.Size = New System.Drawing.Size(250, 20) - Me.MyTextBox2.TabIndex = 4 - ' - 'UsrCntlChat_Art_Btn_MACHAT - ' - Me.UsrCntlChat_Art_Btn_MACHAT._aktiv = True - Me.UsrCntlChat_Art_Btn_MACHAT._name = "Allgemein" - Me.UsrCntlChat_Art_Btn_MACHAT.Location = New System.Drawing.Point(0, 0) - Me.UsrCntlChat_Art_Btn_MACHAT.Margin = New System.Windows.Forms.Padding(0) - Me.UsrCntlChat_Art_Btn_MACHAT.Name = "UsrCntlChat_Art_Btn_MACHAT" - Me.UsrCntlChat_Art_Btn_MACHAT.Size = New System.Drawing.Size(90, 29) - Me.UsrCntlChat_Art_Btn_MACHAT.TabIndex = 8 - ' - 'UsrCntlChat_Art_Btn_LKWCHAT - ' - Me.UsrCntlChat_Art_Btn_LKWCHAT._aktiv = False - Me.UsrCntlChat_Art_Btn_LKWCHAT._name = "LKW" - Me.UsrCntlChat_Art_Btn_LKWCHAT.Location = New System.Drawing.Point(90, 0) - Me.UsrCntlChat_Art_Btn_LKWCHAT.Margin = New System.Windows.Forms.Padding(0) - Me.UsrCntlChat_Art_Btn_LKWCHAT.Name = "UsrCntlChat_Art_Btn_LKWCHAT" - Me.UsrCntlChat_Art_Btn_LKWCHAT.Size = New System.Drawing.Size(90, 29) - Me.UsrCntlChat_Art_Btn_LKWCHAT.TabIndex = 9 - ' - 'UsrCntlChat_Art_Btn_SNDCHAT - ' - Me.UsrCntlChat_Art_Btn_SNDCHAT._aktiv = False - Me.UsrCntlChat_Art_Btn_SNDCHAT._name = "Sendung" - Me.UsrCntlChat_Art_Btn_SNDCHAT.Location = New System.Drawing.Point(180, 0) - Me.UsrCntlChat_Art_Btn_SNDCHAT.Margin = New System.Windows.Forms.Padding(0) - Me.UsrCntlChat_Art_Btn_SNDCHAT.Name = "UsrCntlChat_Art_Btn_SNDCHAT" - Me.UsrCntlChat_Art_Btn_SNDCHAT.Size = New System.Drawing.Size(90, 29) - Me.UsrCntlChat_Art_Btn_SNDCHAT.TabIndex = 10 - ' - 'MyTextBox1 - ' - Me.MyTextBox1._DateTimeOnly = False - Me.MyTextBox1._numbersOnly = False - Me.MyTextBox1._numbersOnlyKommastellen = "" - Me.MyTextBox1._numbersOnlyTrennzeichen = True - Me.MyTextBox1._Prozent = False - Me.MyTextBox1._ShortDateNew = False - Me.MyTextBox1._ShortDateOnly = False - Me.MyTextBox1._TimeOnly = False - Me.MyTextBox1._TimeOnly_Seconds = False - Me.MyTextBox1._value = "" - Me.MyTextBox1._Waehrung = False - Me.MyTextBox1._WaehrungZeichen = True - Me.MyTextBox1.ForeColor = System.Drawing.Color.Black - Me.MyTextBox1.Location = New System.Drawing.Point(20, 40) - Me.MyTextBox1.Margin = New System.Windows.Forms.Padding(2) - Me.MyTextBox1.MaxLineLength = -1 - Me.MyTextBox1.MaxLines_Warning = "" - Me.MyTextBox1.MaxLines_Warning_Label = Nothing - Me.MyTextBox1.Name = "MyTextBox1" - Me.MyTextBox1.Size = New System.Drawing.Size(250, 20) - Me.MyTextBox1.TabIndex = 4 - ' - 'MyFlowLayoutPanel1 - ' - Me.MyFlowLayoutPanel1.AutoScroll = True - Me.MyFlowLayoutPanel1.BackColor = System.Drawing.Color.White - Me.MyFlowLayoutPanel1.Controls.Add(Me.UsrCntlMessenger_ChatElement1) - Me.MyFlowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill - Me.MyFlowLayoutPanel1.Location = New System.Drawing.Point(0, 44) - Me.MyFlowLayoutPanel1.Name = "MyFlowLayoutPanel1" - Me.MyFlowLayoutPanel1.Size = New System.Drawing.Size(633, 556) - Me.MyFlowLayoutPanel1.TabIndex = 0 - ' - 'UsrCntlMessenger_ChatElement1 - ' - Me.UsrCntlMessenger_ChatElement1.BackColor = System.Drawing.Color.White - Me.UsrCntlMessenger_ChatElement1.CHAT_MSG = Nothing - Me.UsrCntlMessenger_ChatElement1.Location = New System.Drawing.Point(4, 5) - Me.UsrCntlMessenger_ChatElement1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.UsrCntlMessenger_ChatElement1.Name = "UsrCntlMessenger_ChatElement1" - Me.UsrCntlMessenger_ChatElement1.Size = New System.Drawing.Size(378, 48) - Me.UsrCntlMessenger_ChatElement1.TabIndex = 4 - Me.UsrCntlMessenger_ChatElement1.Visible = False - ' - 'clmnMaId - ' - Me.clmnMaId.HeaderText = "Column1" - Me.clmnMaId.MinimumWidth = 8 - Me.clmnMaId.Name = "clmnMaId" - Me.clmnMaId.ReadOnly = True - Me.clmnMaId.Visible = False - Me.clmnMaId.Width = 150 - ' - 'clmnName - ' - Me.clmnName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill - Me.clmnName.HeaderText = "Name" - Me.clmnName.MinimumWidth = 8 - Me.clmnName.Name = "clmnName" - Me.clmnName.ReadOnly = True - ' - 'clmnFirma - ' - Me.clmnFirma.HeaderText = "Firma" - Me.clmnFirma.MinimumWidth = 8 - Me.clmnFirma.Name = "clmnFirma" - Me.clmnFirma.ReadOnly = True - Me.clmnFirma.Width = 85 - ' - 'clmnStatus - ' - Me.clmnStatus.HeaderText = "" - Me.clmnStatus.Name = "clmnStatus" - Me.clmnStatus.ReadOnly = True - Me.clmnStatus.Width = 20 - ' 'frmMessenger ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -1023,8 +1024,10 @@ Partial Class frmMessenger Me.SplitContainer2.Panel2.ResumeLayout(False) CType(Me.SplitContainer2, System.ComponentModel.ISupportInitialize).EndInit() Me.SplitContainer2.ResumeLayout(False) + CType(Me.dgvChats, System.ComponentModel.ISupportInitialize).EndInit() Me.Panel6.ResumeLayout(False) Me.Panel6.PerformLayout() + CType(Me.DGVSonstige, System.ComponentModel.ISupportInitialize).EndInit() Me.Panel5.ResumeLayout(False) Me.Panel5.PerformLayout() CType(Me.PictureBox2, System.ComponentModel.ISupportInitialize).EndInit() @@ -1038,6 +1041,7 @@ Partial Class frmMessenger Me.SplitContainer1.Panel2.ResumeLayout(False) CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).EndInit() Me.SplitContainer1.ResumeLayout(False) + Me.MyFlowLayoutPanel1.ResumeLayout(False) Me.Panel3.ResumeLayout(False) Me.Panel3.PerformLayout() Me.pnl.ResumeLayout(False) @@ -1052,9 +1056,6 @@ Partial Class frmMessenger Me.Panel9.ResumeLayout(False) CType(Me.pic, System.ComponentModel.ISupportInitialize).EndInit() Me.cntxt.ResumeLayout(False) - CType(Me.dgvChats, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.DGVSonstige, System.ComponentModel.ISupportInitialize).EndInit() - Me.MyFlowLayoutPanel1.ResumeLayout(False) Me.ResumeLayout(False) End Sub