diff --git a/SDL/mdm/usrCntlMDMAuswertungen.vb b/SDL/mdm/usrCntlMDMAuswertungen.vb index 2d72ed3a..6f31aef3 100644 --- a/SDL/mdm/usrCntlMDMAuswertungen.vb +++ b/SDL/mdm/usrCntlMDMAuswertungen.vb @@ -972,6 +972,10 @@ Public Class usrCntlMDMAuswertungen MsgBox("Update erfolgreich.") End If End Sub + + Private Sub UsrCntlMSE_KonvertCSV1_Load(sender As Object, e As EventArgs) Handles UsrCntlMSE_KonvertCSV1.Load + + End Sub End Class Class cMDMAuswertung diff --git a/SDL/mdm/usrCntlMSE_KonvertCSV.vb b/SDL/mdm/usrCntlMSE_KonvertCSV.vb index 79dd4435..7f2dbbdb 100644 --- a/SDL/mdm/usrCntlMSE_KonvertCSV.vb +++ b/SDL/mdm/usrCntlMSE_KonvertCSV.vb @@ -23,14 +23,37 @@ Public Class usrCntlMSE_KonvertCSV Do a = reader.ReadLine If a IsNot Nothing AndAlso a.Contains(";") Then + Dim split = a.Split(";") - If split.Count >= 42 Then + + '====================================================================== + 'Konvertierung RG-NR Format: + '====================================================================== + If split.Count > 42 Then If cnt > 0 Then split(2) = split(42) split(42) = Nothing - - Dim Ergebnis As String = String.Join(";", split) - writer.WriteLine(Ergebnis) End If + + '====================================================================== + 'HU-GO CardNr; Leistung 22 + '====================================================================== + If split.Count > 16 And cnt > 0 Then + If split(15) = "22" Then 'HU-GO + If split(14).Contains("Charge - HU-GO SIM card fee '") Then 'HU-GO + If split(14).Contains("'") Then + Dim splitHuGo = split(14).Split("'") '--> Bezeichnung / Card Nummer auslesen + If splitHuGo.Count >= 2 Then + split(17) = "'" & splitHuGo(1) & "'" '--> Card Nummer in Spalte + split(14) = splitHuGo(0).Trim '--> Bezeichnung in Spalte + End If + End If + End If + End If + + End If + Dim Ergebnis As String = String.Join(";", split) + writer.WriteLine(Ergebnis) + cnt += 1 End If Loop Until a Is Nothing diff --git a/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.Designer.vb b/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.Designer.vb index 174ed116..05c762d6 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() @@ -90,9 +91,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/cProgramFunktions.vb b/VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb index 673eec30..f136853a 100644 --- a/VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb +++ b/VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb @@ -372,7 +372,7 @@ Public Class cProgramFunctions Return False End If Try - mySmtpsvr.Host = "192.168.0.107" + mySmtpsvr.Host = "192.168.0.69" mySmtpsvr.Port = 25 mySmtpsvr.Send(Msg)