Merge branch 'master' of https://verag.visualstudio.com/SDL/_git/SDL
This commit is contained in:
@@ -1276,8 +1276,6 @@ Public Class cRKSV
|
||||
' print.LoadDocument(rpt)
|
||||
|
||||
|
||||
rpt.Run(False)
|
||||
rpt.Document.Printer.PrinterSettings.Copies = 1
|
||||
If printername <> "" Then
|
||||
rpt.Document.Printer.PrinterName = printername
|
||||
Else
|
||||
@@ -1289,6 +1287,9 @@ Public Class cRKSV
|
||||
End If
|
||||
End If
|
||||
|
||||
rpt.Run(False)
|
||||
rpt.Document.Printer.PrinterSettings.Copies = 1
|
||||
|
||||
If Not rpt.Document.Print(False, False) Then
|
||||
MsgBox("Problem beim Drucken.")
|
||||
End If
|
||||
|
||||
@@ -1318,6 +1318,15 @@ Public Class cFakturierung
|
||||
' Dim RG_Bezeichnung = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "_Rechnung_" & If(RECHNUNG.RechnungsNr, "") & ".pdf"
|
||||
Dim RG_Bezeichnung = If(RECHNUNG.[BelegartenKz] = "AR", "Rechnung_", "Gutschrift_") & If(RECHNUNG.RechnungsNr, "") & ".pdf"
|
||||
|
||||
'--------------------------------
|
||||
' --> TEST wegen Size Problem
|
||||
'--------------------------------
|
||||
If PrinterName <> "" Then
|
||||
rpt.Document.Printer.PrinterName = PrinterName
|
||||
End If
|
||||
rpt.Document.Printer.PaperSize = rpt.Document.Printer.PrinterSettings.DefaultPageSettings.PaperSize
|
||||
'--------------------------------
|
||||
|
||||
'Immer Exportieren, da in Therefore speichern
|
||||
Dim tmpPath = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath(RG_Bezeichnung, ".pdf", , False)
|
||||
Dim p As New GrapeCity.ActiveReports.Export.Pdf.Section.PdfExport
|
||||
|
||||
@@ -39,7 +39,6 @@ Public Class rptSDLBrief
|
||||
Dim order As String = " ORDER BY SDLNr, Bestelldatum, BestellNr,Ausstellungsdatum,KartenNr,OBUID"
|
||||
|
||||
|
||||
|
||||
Select Case sdlNr
|
||||
Case 200 : SubReport.Report = New subrptBriefSDL_AT(sqlStr & " AND SDLNr=" & sdlNr & " " & order)
|
||||
Case 203 : SubReport.Report = New subrptBriefSDL_CZ(sqlStr & " AND SDLNr=" & sdlNr & " " & order)
|
||||
|
||||
@@ -84,10 +84,10 @@
|
||||
<SignManifests>true</SignManifests>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<SignAssembly>true</SignAssembly>
|
||||
<SignAssembly>false</SignAssembly>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<AssemblyOriginatorKeyFile>Test.pfx</AssemblyOriginatorKeyFile>
|
||||
<AssemblyOriginatorKeyFile>SDL_TemporaryKey.pfx</AssemblyOriginatorKeyFile>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="Accessibility" />
|
||||
|
||||
@@ -360,7 +360,7 @@ Public Class frmBU_Mahnlauf
|
||||
rpt.txtLeistung.Text = cFakturierung.checkNull(rpt.Fields.Item("OP_Typ").Value)
|
||||
rpt.Label15.Text = cFakturierung.checkNull(rpt.Fields.Item("Rechnungsdatum").Value)
|
||||
|
||||
If (CDate(rpt.Fields.Item("Faelligkeit").Value) >= CDate(Now.ToShortDateString) And cFakturierung.checkNull(rpt.Fields.Item("Ausstand").Value, 0) > 0) Or cFakturierung.checkNull(rpt.Fields.Item("Ausstand").Value, 0) <= 0 Then
|
||||
If (CDate(rpt.Fields.Item("Faelligkeit").Value) > CDate(Now.ToShortDateString) And cFakturierung.checkNull(rpt.Fields.Item("Ausstand").Value, 0) > 0) Or cFakturierung.checkNull(rpt.Fields.Item("Ausstand").Value, 0) <= 0 Then
|
||||
rpt.Label16.Text = ""
|
||||
Else
|
||||
rpt.Label16.Text = cFakturierung.checkNull(rpt.Fields.Item("Faelligkeit").Value)
|
||||
|
||||
@@ -45,7 +45,6 @@ Public Class cProgramFunctions
|
||||
' System.Diagnostics.Debug.WriteLine("Hier 3: " & Now.ToString("HH:mm:ss.ffff"))
|
||||
If runReport Then rpt.Run(False)
|
||||
' System.Diagnostics.Debug.WriteLine("Hier 4: " & Now.ToString("HH:mm:ss.ffff"))
|
||||
rpt.Document.Printer.PrinterSettings.Copies = 1
|
||||
If printername <> "" Then
|
||||
rpt.Document.Printer.PrinterName = printername
|
||||
Else
|
||||
@@ -60,6 +59,7 @@ Public Class cProgramFunctions
|
||||
|
||||
'Test
|
||||
rpt.Document.Printer.PaperSize = rpt.Document.Printer.PrinterSettings.DefaultPageSettings.PaperSize
|
||||
rpt.Document.Printer.PrinterSettings.Copies = 1
|
||||
Dim dt1 = Now
|
||||
|
||||
System.Diagnostics.Debug.WriteLine("Report START: " & dt1.ToString("HH:mm:ss.ffff"))
|
||||
|
||||
@@ -242,10 +242,12 @@ Public Class frmSDLAbholungEintrag
|
||||
" WHEN '214' THEN 'ROADMASTER' " &
|
||||
" WHEN '215' THEN 'IT' " &
|
||||
" WHEN '216' THEN 'CZ' " &
|
||||
" WHEN '217' THEN 'MED PASS' " &
|
||||
" WHEN '203' THEN 'CZ' " &
|
||||
" WHEN '209' THEN 'PL' " &
|
||||
" WHEN '500' THEN 'ABGASPLAKETTE' " &
|
||||
" WHEN '501' THEN 'VERAG-CARD' " &
|
||||
" WHEN '502' THEN 'VERAG-CARD' " &
|
||||
" Else '-' " &
|
||||
" END as VARCHAR(30)) AS KARTEBOX, " &
|
||||
" cast(CASE [SDLNr] " &
|
||||
@@ -261,17 +263,19 @@ Public Class frmSDLAbholungEintrag
|
||||
" WHEN '214' THEN cast(OBUID as VARCHAR(200)) " &
|
||||
" WHEN '215' THEN cast([TELEPASS-Nr] as VARCHAR(200)) " &
|
||||
" WHEN '216' THEN cast(KartenNr as VARCHAR(200)) " &
|
||||
" WHEN '217' THEN cast(OBUID as VARCHAR(200)) " &
|
||||
" WHEN '203' THEN cast(KartenNr as VARCHAR(200)) " &
|
||||
" WHEN '209' THEN cast(KartenNr/*[MSE-Kd-Nr]*/ as VARCHAR(200)) " &
|
||||
" WHEN '500' THEN '-' " &
|
||||
" WHEN '501' THEN cast(KartenNr as VARCHAR(200)) " &
|
||||
" WHEN '502' THEN cast(KartenNr as VARCHAR(200)) " &
|
||||
" Else '-' " &
|
||||
" END as VARCHAR(200)) AS KARTEBOX_NR, " &
|
||||
" [PIN] " &
|
||||
" FROM [SDL] " &
|
||||
" WHERE KundenNr = " & KdFirma.KdNr_value
|
||||
If sdlnr > 0 Then : sqlStr &= " AND SDLNr=" & sdlnr
|
||||
Else : sqlStr &= " AND SDLNr IN (100,101,202,207,208,210,211,212,213,214,215,216,500,501)"
|
||||
Else : sqlStr &= " AND SDLNr IN (100,101,202,207,208,210,211,212,213,214,215,216,217,500,501,502)"
|
||||
End If
|
||||
sqlStr &= " AND Lieferdatum between '" & datVon.Value.ToShortDateString & "' and '" & datBis.Value.ToShortDateString & "' "
|
||||
|
||||
|
||||
@@ -516,7 +516,7 @@ Public Class usrCntlKartenDaten
|
||||
Case 214 : SQL_STR = "SELECT " & IIf(cbxMax200Eintrage.Checked, " top 200 ", "") & " KundenNr, SDL.SDLNr, KfzKennzeichen, History, Bestelldatum, Lieferdatum, /*KartenNr,*/ OBUID, PIN, PLOSEKundenNr, /*GültigBis,*/Vermerk, Gesperrt, Defekt, Verloren, Gestohlen, Retourniert, SDL.Erfassungsdatum, SDL.Änderungsdatum, SDL.Sachbearbeiter FROM SDL INNER JOIN [VERAG].[dbo].Adressen ON [VERAG].[dbo].Adressen.AdressenNr=SDL.KundenNr WHERE SDLNr=214"
|
||||
Case 215 : SQL_STR = "SELECT " & IIf(cbxMax200Eintrage.Checked, " top 200 ", "") & " KundenNr, SDL.SDLNr, KfzKennzeichen, History, Bestelldatum, Lieferdatum, [TELEPASS-Nr], PLOSEKundenNr, /*GültigBis,*/Vermerk, Gesperrt, Defekt, Verloren, Gestohlen, Retourniert, SDL.Erfassungsdatum, SDL.Änderungsdatum, SDL.Sachbearbeiter FROM SDL INNER JOIN [VERAG].[dbo].Adressen ON [VERAG].[dbo].Adressen.AdressenNr=SDL.KundenNr WHERE SDLNr=215"
|
||||
Case 216 : SQL_STR = "SELECT " & IIf(cbxMax200Eintrage.Checked, " top 200 ", "") & " KundenNr, SDL.SDLNr, KfzKennzeichen, History, Bestelldatum, Lieferdatum, KartenNr, OBUID, PIN, PLOSEKundenNr, /*GültigBis,*/Vermerk, Gesperrt, Defekt, Verloren, Gestohlen, Retourniert, SDL.Erfassungsdatum, SDL.Änderungsdatum, SDL.Sachbearbeiter FROM SDL INNER JOIN [VERAG].[dbo].Adressen ON [VERAG].[dbo].Adressen.AdressenNr=SDL.KundenNr WHERE SDLNr=216"
|
||||
Case 217 : SQL_STR = "SELECT " & IIf(cbxMax200Eintrage.Checked, " top 200 ", "") & " KundenNr, SDL.SDLNr, KfzKennzeichen, History, Bestelldatum, Lieferdatum, KartenNr, OBUID, PIN, PLOSEKundenNr, /*GültigBis,*/Vermerk, Gesperrt, Defekt, Verloren, Gestohlen, Retourniert, SDL.Erfassungsdatum, SDL.Änderungsdatum, SDL.Sachbearbeiter FROM SDL INNER JOIN [VERAG].[dbo].Adressen ON [VERAG].[dbo].Adressen.AdressenNr=SDL.KundenNr WHERE SDLNr=217"
|
||||
Case 217 : SQL_STR = "SELECT " & IIf(cbxMax200Eintrage.Checked, " top 200 ", "") & " KundenNr, SDL.SDLNr, KfzKennzeichen, History, Bestelldatum, Lieferdatum, OBUID, PLOSEKundenNr, /*GültigBis,*/Vermerk, Gesperrt, Defekt, Verloren, Gestohlen, Retourniert, SDL.Erfassungsdatum, SDL.Änderungsdatum, SDL.Sachbearbeiter FROM SDL INNER JOIN [VERAG].[dbo].Adressen ON [VERAG].[dbo].Adressen.AdressenNr=SDL.KundenNr WHERE SDLNr=217"
|
||||
Case 209 : SQL_STR = "SELECT " & IIf(cbxMax200Eintrage.Checked, " top 200 ", "") & " KundenNr, SDL.SDLNr, KfzKennzeichen, History, Bestelldatum, Lieferdatum, [MSE-Kd-Nr], KartenNr, Vermerk,Gesperrt, Defekt, Verloren, Gestohlen, Retourniert, SDL.Erfassungsdatum, SDL.Änderungsdatum, SDL.Sachbearbeiter FROM SDL WHERE SDLNr=209"
|
||||
Case 210 : SQL_STR = "SELECT " & IIf(cbxMax200Eintrage.Checked, " top 200 ", "") & " KundenNr, SDL.SDLNr, KfzKennzeichen, History, Bestelldatum, Lieferdatum, [MSE-Kd-Nr], KartenNr, OBUID, [SERIE-Nr],Vermerk, Gesperrt, Defekt, Verloren, Gestohlen, Retourniert, SDL.Erfassungsdatum, SDL.Änderungsdatum, SDL.Sachbearbeiter FROM SDL WHERE SDLNr=210"
|
||||
Case 208 : SQL_STR = "SELECT " & IIf(cbxMax200Eintrage.Checked, " top 200 ", "") & " KundenNr, SDL.SDLNr, KfzKennzeichen, History, Bestelldatum, Lieferdatum, [MSE-Kd-Nr], KartenNr, GültigBis,Vermerk,Gesperrt, Defekt, Verloren, Gestohlen, Retourniert, SDL.Erfassungsdatum, SDL.Änderungsdatum, SDL.Sachbearbeiter FROM SDL WHERE SDLNr=208"
|
||||
@@ -526,7 +526,7 @@ Public Class usrCntlKartenDaten
|
||||
Case 206 : SQL_STR = "SELECT " & IIf(cbxMax200Eintrage.Checked, " top 200 ", "") & " KundenNr, SDL.SDLNr, KfzKennzeichen, History, Bestelldatum, Lieferdatum, [MSE-Kd-Nr], [PAN-Nr], [SERIE-Nr], GültigBis,Vermerk, Gesperrt, Defekt, Verloren, Gestohlen, Ersatzkarte, SDL.Erfassungsdatum, SDL.Änderungsdatum, SDL.Sachbearbeiter FROM SDL WHERE SDLNr=206"
|
||||
Case 500 : SQL_STR = "SELECT " & IIf(cbxMax200Eintrage.Checked, " top 200 ", "") & " KundenNr, SDL.SDLNr, KfzKennzeichen, History, Bestelldatum, Lieferdatum, Vermerk, Gesperrt, Defekt, Verloren, Gestohlen, Ersatzkarte,SDL.Erfassungsdatum, SDL.Änderungsdatum, SDL.Sachbearbeiter FROM SDL WHERE SDLNr=500"
|
||||
Case 501 : SQL_STR = "SELECT " & IIf(cbxMax200Eintrage.Checked, " top 200 ", "") & " KundenNr, SDL.SDLNr, KfzKennzeichen, History, Bestelldatum, Lieferdatum, KartenNr,Fahrer,Kaution, Vermerk,Gesperrt, Defekt, Verloren, Gestohlen, Ersatzkarte, SDL.Erfassungsdatum, SDL.Änderungsdatum, SDL.Sachbearbeiter FROM SDL WHERE SDLNr=501"
|
||||
Case 502 : SQL_STR = "SELECT " & IIf(cbxMax200Eintrage.Checked, " top 200 ", "") & " KundenNr, SDL.SDLNr, KfzKennzeichen, History, Bestelldatum, Lieferdatum, KartenNr,Fahrer,Kaution, Vermerk,Gesperrt, Defekt, Verloren, Gestohlen, Ersatzkarte, SDL.Erfassungsdatum, SDL.Änderungsdatum, SDL.Sachbearbeiter FROM SDL WHERE SDLNr=502"
|
||||
Case 502 : SQL_STR = "SELECT " & IIf(cbxMax200Eintrage.Checked, " top 200 ", "") & " KundenNr, SDL.SDLNr, KfzKennzeichen, History, Bestelldatum, Lieferdatum, KartenNr,Vermerk,Gesperrt, Defekt, Verloren, Gestohlen, Ersatzkarte, SDL.Erfassungsdatum, SDL.Änderungsdatum, SDL.Sachbearbeiter FROM SDL WHERE SDLNr=502"
|
||||
Case Else
|
||||
SQL_STR = "SELECT " & IIf(cbxMax200Eintrage.Checked, " top 200 ", "") & " KundenNr, SDL.SDLNr,SDLBez, KfzKennzeichen, History, Vermerk, Gesperrt, Defekt, Verloren, Gestohlen, Ersatzkarte, SDL.Erfassungsdatum, SDL.Änderungsdatum, SDL.Sachbearbeiter FROM SDL INNER JOIN Speditionsdienstleistungen ON Speditionsdienstleistungen.SDLNr=SDL.SDLNr"
|
||||
SQL_STR &= " AND Speditionsdienstleistungen.SDLTypNr IN (1,2) "
|
||||
|
||||
@@ -206,7 +206,7 @@ Public Class cMessenger
|
||||
|
||||
If CHAT.chat_id <= 0 Then
|
||||
'Neuer Chat
|
||||
Dim chatName = Sendung.AbfertigungsNr & "/" & Sendung.FilialenNr & " (" & Aviso.LKW_Nr & ")"
|
||||
Dim chatName = Sendung.FilialenNr & "/" & Sendung.AbfertigungsNr & " (" & Aviso.LKW_Nr & ")"
|
||||
'"SND CHAT: " &
|
||||
|
||||
Dim MB_LIST As New List(Of Integer)
|
||||
|
||||
@@ -38,8 +38,13 @@ Partial Class frmMessenger_NeuerChat
|
||||
Me.MyComboBox1 = New VERAG_PROG_ALLGEMEIN.MyComboBox()
|
||||
Me.MyTextBox2 = New VERAG_PROG_ALLGEMEIN.MyTextBox()
|
||||
Me.MyTextBox1 = New VERAG_PROG_ALLGEMEIN.MyTextBox()
|
||||
Me.dgvChatgruppe = New System.Windows.Forms.DataGridView()
|
||||
Me.Label3 = New System.Windows.Forms.Label()
|
||||
Me.grpID = New System.Windows.Forms.DataGridViewTextBoxColumn()
|
||||
Me.grpName = New System.Windows.Forms.DataGridViewTextBoxColumn()
|
||||
CType(Me.dgvMitarbeiter, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
CType(Me.dgvChatMembers, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
CType(Me.dgvChatgruppe, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
Me.SuspendLayout()
|
||||
'
|
||||
'dgvMitarbeiter
|
||||
@@ -55,7 +60,7 @@ Partial Class frmMessenger_NeuerChat
|
||||
Me.dgvMitarbeiter.Name = "dgvMitarbeiter"
|
||||
Me.dgvMitarbeiter.RowHeadersVisible = False
|
||||
Me.dgvMitarbeiter.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
|
||||
Me.dgvMitarbeiter.Size = New System.Drawing.Size(304, 393)
|
||||
Me.dgvMitarbeiter.Size = New System.Drawing.Size(304, 330)
|
||||
Me.dgvMitarbeiter.TabIndex = 1
|
||||
'
|
||||
'dgvChatMembers
|
||||
@@ -69,7 +74,7 @@ Partial Class frmMessenger_NeuerChat
|
||||
Me.dgvChatMembers.ReadOnly = True
|
||||
Me.dgvChatMembers.RowHeadersVisible = False
|
||||
Me.dgvChatMembers.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
|
||||
Me.dgvChatMembers.Size = New System.Drawing.Size(327, 323)
|
||||
Me.dgvChatMembers.Size = New System.Drawing.Size(327, 314)
|
||||
Me.dgvChatMembers.TabIndex = 2
|
||||
'
|
||||
'clmnMaId
|
||||
@@ -206,12 +211,54 @@ Partial Class frmMessenger_NeuerChat
|
||||
Me.MyTextBox1.Size = New System.Drawing.Size(228, 20)
|
||||
Me.MyTextBox1.TabIndex = 0
|
||||
'
|
||||
'dgvChatgruppe
|
||||
'
|
||||
Me.dgvChatgruppe.AllowUserToAddRows = False
|
||||
Me.dgvChatgruppe.AllowUserToDeleteRows = False
|
||||
Me.dgvChatgruppe.AllowUserToResizeColumns = False
|
||||
Me.dgvChatgruppe.AllowUserToResizeRows = False
|
||||
Me.dgvChatgruppe.BackgroundColor = System.Drawing.Color.White
|
||||
Me.dgvChatgruppe.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
|
||||
Me.dgvChatgruppe.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.grpID, Me.grpName})
|
||||
Me.dgvChatgruppe.Location = New System.Drawing.Point(13, 392)
|
||||
Me.dgvChatgruppe.MultiSelect = False
|
||||
Me.dgvChatgruppe.Name = "dgvChatgruppe"
|
||||
Me.dgvChatgruppe.RowHeadersVisible = False
|
||||
Me.dgvChatgruppe.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
|
||||
Me.dgvChatgruppe.Size = New System.Drawing.Size(304, 47)
|
||||
Me.dgvChatgruppe.TabIndex = 9
|
||||
Me.dgvChatgruppe.Visible = False
|
||||
'
|
||||
'Label3
|
||||
'
|
||||
Me.Label3.AutoSize = True
|
||||
Me.Label3.Location = New System.Drawing.Point(12, 379)
|
||||
Me.Label3.Name = "Label3"
|
||||
Me.Label3.Size = New System.Drawing.Size(65, 13)
|
||||
Me.Label3.TabIndex = 10
|
||||
Me.Label3.Text = "Chatgruppe:"
|
||||
Me.Label3.Visible = False
|
||||
'
|
||||
'grpID
|
||||
'
|
||||
Me.grpID.HeaderText = "grpID"
|
||||
Me.grpID.Name = "grpID"
|
||||
Me.grpID.Visible = False
|
||||
'
|
||||
'grpName
|
||||
'
|
||||
Me.grpName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill
|
||||
Me.grpName.HeaderText = "Name"
|
||||
Me.grpName.Name = "grpName"
|
||||
'
|
||||
'frmMessenger_NeuerChat
|
||||
'
|
||||
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
|
||||
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
|
||||
Me.BackColor = System.Drawing.Color.White
|
||||
Me.ClientSize = New System.Drawing.Size(662, 451)
|
||||
Me.Controls.Add(Me.Label3)
|
||||
Me.Controls.Add(Me.dgvChatgruppe)
|
||||
Me.Controls.Add(Me.MyComboBox1)
|
||||
Me.Controls.Add(Me.Label2)
|
||||
Me.Controls.Add(Me.MyTextBox2)
|
||||
@@ -227,6 +274,7 @@ Partial Class frmMessenger_NeuerChat
|
||||
Me.Text = "Neuer Chat"
|
||||
CType(Me.dgvMitarbeiter, System.ComponentModel.ISupportInitialize).EndInit()
|
||||
CType(Me.dgvChatMembers, System.ComponentModel.ISupportInitialize).EndInit()
|
||||
CType(Me.dgvChatgruppe, System.ComponentModel.ISupportInitialize).EndInit()
|
||||
Me.ResumeLayout(False)
|
||||
Me.PerformLayout()
|
||||
|
||||
@@ -247,4 +295,8 @@ Partial Class frmMessenger_NeuerChat
|
||||
Friend WithEvents DataGridViewTextBoxColumn1 As Windows.Forms.DataGridViewTextBoxColumn
|
||||
Friend WithEvents DataGridViewTextBoxColumn2 As Windows.Forms.DataGridViewTextBoxColumn
|
||||
Friend WithEvents DataGridViewTextBoxColumn3 As Windows.Forms.DataGridViewTextBoxColumn
|
||||
Friend WithEvents dgvChatgruppe As Windows.Forms.DataGridView
|
||||
Friend WithEvents Label3 As Windows.Forms.Label
|
||||
Friend WithEvents grpID As Windows.Forms.DataGridViewTextBoxColumn
|
||||
Friend WithEvents grpName As Windows.Forms.DataGridViewTextBoxColumn
|
||||
End Class
|
||||
|
||||
@@ -126,6 +126,12 @@
|
||||
<metadata name="clmnFirma.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
<metadata name="grpID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
<metadata name="grpName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
<value>
|
||||
|
||||
@@ -53,6 +53,12 @@ Public Class frmMessenger_NeuerChat
|
||||
MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("IMEX", "IMEX"))
|
||||
MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("UNISPED", "UNISPED"))
|
||||
MyComboBox1.changeItem("")
|
||||
|
||||
dgvChatgruppe.Rows.Clear()
|
||||
dgvChatgruppe.Rows.Add({"BUCHHALTUNG", "BUCHHALTUNG"})
|
||||
|
||||
|
||||
|
||||
loaded = True
|
||||
initDGV()
|
||||
If CHAT IsNot Nothing Then
|
||||
@@ -60,6 +66,12 @@ Public Class frmMessenger_NeuerChat
|
||||
Me.MyTextBox2.Text = CHAT.chat_name
|
||||
Me.MyTextBox2.Enabled = False
|
||||
btn.Text = "Hinzufügen"
|
||||
|
||||
Select Case CHAT.chat_art
|
||||
Case "SND_CHAT", "LKW_CHAT"
|
||||
Label3.Visible = True
|
||||
dgvChatgruppe.Visible = True
|
||||
End Select
|
||||
End If
|
||||
End Sub
|
||||
|
||||
@@ -103,6 +115,22 @@ Public Class frmMessenger_NeuerChat
|
||||
End If
|
||||
End Sub
|
||||
|
||||
Sub addSelMAGruppe()
|
||||
If dgvChatgruppe.SelectedRows.Count > 0 Then
|
||||
Select Case dgvChatgruppe.SelectedRows(0).Cells(0).Value
|
||||
Case "BUCHHALTUNG"
|
||||
dgvChatMembers.Rows.Add(405, "Anna Stockenhuber", "VERAG")
|
||||
dgvChatMembers.Rows.Add(599, "Isabella Miesenbeck", "VERAG")
|
||||
dgvChatMembers.Rows.Add(170, "Kerstin Bauböck", "VERAG")
|
||||
End Select
|
||||
|
||||
initAddRemoveDGV()
|
||||
MyTextBox1.Text = ""
|
||||
MyTextBox1.Focus()
|
||||
dgvChatgruppe.ClearSelection()
|
||||
End If
|
||||
End Sub
|
||||
|
||||
Sub initAddRemoveDGV()
|
||||
If dgvChatMembers.Rows.Count = 1 Then
|
||||
MyTextBox2.Text = dgvChatMembers.Rows(0).Cells("clmnName").Value 'dgvMitarbeiter.SelectedRows(0).Cells("MAname").Value
|
||||
@@ -174,7 +202,16 @@ Public Class frmMessenger_NeuerChat
|
||||
End Sub
|
||||
|
||||
|
||||
Private Sub dgvChatgruppe_CellDoubleClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvChatgruppe.CellDoubleClick
|
||||
addSelMAGruppe()
|
||||
End Sub
|
||||
|
||||
|
||||
Private Sub dgvChatMembers_RowsRemoved(sender As Object, e As DataGridViewRowsRemovedEventArgs) Handles dgvChatMembers.RowsRemoved
|
||||
initAddRemoveDGV()
|
||||
End Sub
|
||||
|
||||
Private Sub frmMessenger_NeuerChat_Shown(sender As Object, e As EventArgs) Handles Me.Shown
|
||||
dgvChatgruppe.ClearSelection()
|
||||
End Sub
|
||||
End Class
|
||||
@@ -67,7 +67,7 @@
|
||||
<PlatformTarget>x64</PlatformTarget>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<SignAssembly>true</SignAssembly>
|
||||
<SignAssembly>false</SignAssembly>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<AssemblyOriginatorKeyFile>ProgAllg.pfx</AssemblyOriginatorKeyFile>
|
||||
|
||||
Reference in New Issue
Block a user