Chat, divers
This commit is contained in:
@@ -228,6 +228,13 @@ Public Class cAdressen
|
||||
|
||||
|
||||
|
||||
Public Function getAdressFromatted()
|
||||
getAdressFromatted = Name_1 & " " & If(Name_2, "") & vbNewLine
|
||||
If If(Straße, "") <> "" Then getAdressFromatted &= Straße & vbNewLine
|
||||
getAdressFromatted &= If(LandKz, "") & " " & If(PLZ, "") & " " & If(Ort, "") & vbNewLine
|
||||
|
||||
End Function
|
||||
|
||||
|
||||
|
||||
Public Function doesOrdnungsbegriffExist() As Boolean
|
||||
|
||||
@@ -55,9 +55,11 @@ Public Class cMessenger
|
||||
|
||||
Property chat_id As Integer = -1
|
||||
Property chat_name As String
|
||||
Property chat_art As String = "CHAT"
|
||||
Property chat_erstelltAm As Date = Now
|
||||
Property chat_erstelltMaId As Integer
|
||||
Property chat_aktiv As Boolean = True
|
||||
Property chat_freigegeben As Boolean = True
|
||||
|
||||
Public CHAT_MEMBERS As New List(Of cMessenger_ChatMembers)
|
||||
Public CHAT_MESSAGES As New List(Of cMessenger_ChatMessages)
|
||||
@@ -82,9 +84,11 @@ Public Class cMessenger
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("chat_id", chat_id,, True))
|
||||
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("chat_name", chat_name))
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("chat_art", chat_art))
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("chat_erstelltAm", chat_erstelltAm))
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("chat_erstelltMaId", chat_erstelltMaId))
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("chat_aktiv", chat_aktiv))
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("chat_freigegeben", chat_freigegeben))
|
||||
|
||||
Return list
|
||||
End Function
|
||||
@@ -730,6 +734,10 @@ Public Class cMessenger
|
||||
Property chatMgSt_MaId As Integer
|
||||
Property chatMgSt_datetime As Date = Now
|
||||
Property chatMgSt_gelesen As Boolean = False
|
||||
Property chatMgSt_bestaetigt As Boolean = False
|
||||
Property chatMgSt_RM_Option As Object = Nothing
|
||||
Property chatMgSt_RM_Text As Object = Nothing
|
||||
Property chatMgSt_datetimeBestaetigt As Object = Nothing
|
||||
|
||||
Dim SQL As New SQL
|
||||
|
||||
@@ -739,10 +747,22 @@ Public Class cMessenger
|
||||
Me.chatMgSt_MaId = chatMgSt_MaId
|
||||
LOAD()
|
||||
End Sub
|
||||
|
||||
Sub New(chatMgSt_chatMsgId, chatMgSt_MaId, chatMgSt_gelesen)
|
||||
Me.chatMgSt_chatMsgId = chatMgSt_chatMsgId
|
||||
Me.chatMgSt_MaId = chatMgSt_MaId
|
||||
Me.chatMgSt_gelesen = chatMgSt_gelesen
|
||||
Me.chatMgSt_bestaetigt = chatMgSt_bestaetigt
|
||||
End Sub
|
||||
|
||||
Sub New(chatMgSt_chatMsgId, chatMgSt_MaId, chatMgSt_gelesen, chatMgSt_bestaetigt, chatMgSt_RM_Option, chatMgSt_RM_Text)
|
||||
Me.chatMgSt_chatMsgId = chatMgSt_chatMsgId
|
||||
Me.chatMgSt_MaId = chatMgSt_MaId
|
||||
Me.chatMgSt_gelesen = chatMgSt_gelesen
|
||||
Me.chatMgSt_bestaetigt = chatMgSt_bestaetigt
|
||||
Me.chatMgSt_RM_Option = chatMgSt_RM_Option
|
||||
Me.chatMgSt_RM_Text = chatMgSt_RM_Text
|
||||
|
||||
End Sub
|
||||
|
||||
Public Function getParameterList() As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
|
||||
@@ -751,11 +771,23 @@ Public Class cMessenger
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("chatMgSt_MaId", chatMgSt_MaId))
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("chatMgSt_datetime", chatMgSt_datetime))
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("chatMgSt_gelesen", chatMgSt_gelesen))
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("chatMgSt_bestaetigt", chatMgSt_bestaetigt))
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("chatMgSt_RM_Option", chatMgSt_RM_Option))
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("chatMgSt_RM_Text", chatMgSt_RM_Text))
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("chatMgSt_datetimeBestaetigt", [chatMgSt_datetimeBestaetigt]))
|
||||
|
||||
Return list
|
||||
End Function
|
||||
|
||||
|
||||
Public Shared Function STATUS_BESTAETIGEN(chatMgSt_chatMsgId, chatMgSt_bestaetigt, Optional chatMgSt_RM_Option = Nothing, Optional chatMgSt_RM_Text = Nothing) As Boolean
|
||||
Dim MGS_STAT As New cMessenger_ChatMessageStatus(chatMgSt_chatMsgId, VERAG_PROG_ALLGEMEIN.cAllgemein.USRID)
|
||||
MGS_STAT.chatMgSt_bestaetigt = chatMgSt_bestaetigt
|
||||
If chatMgSt_RM_Option IsNot Nothing Then MGS_STAT.chatMgSt_RM_Option = chatMgSt_RM_Option
|
||||
If chatMgSt_RM_Text IsNot Nothing Then MGS_STAT.chatMgSt_RM_Text = chatMgSt_RM_Text
|
||||
MGS_STAT.chatMgSt_datetimeBestaetigt = Now
|
||||
Return MGS_STAT.SAVE
|
||||
End Function
|
||||
|
||||
Public Function SAVE() As Boolean
|
||||
Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
|
||||
|
||||
@@ -101,6 +101,7 @@ Public Class cSendungen
|
||||
Property tblSnd_Vorpapier3 As Object = Nothing
|
||||
Property tblSnd_Vorpapier3_Pos As Object = Nothing
|
||||
Property tblSnd_Frachtkosten As Object = Nothing
|
||||
Property tblSnd_FrachtkostenNichtEU As Object = Nothing
|
||||
|
||||
|
||||
Property tblSnd_AbfertigungTR As Object = Nothing
|
||||
@@ -412,6 +413,7 @@ Public Class cSendungen
|
||||
Me.tblSnd_Vorpapier3 = SQL.checkNullReturnValue(dr.Item("tblSnd_Vorpapier3"), Nothing)
|
||||
Me.tblSnd_Vorpapier3_Pos = SQL.checkNullReturnValue(dr.Item("tblSnd_Vorpapier3_Pos"), Nothing)
|
||||
Me.tblSnd_Frachtkosten = SQL.checkNullReturnValue(dr.Item("tblSnd_Frachtkosten"), Nothing)
|
||||
Me.tblSnd_FrachtkostenNichtEU = SQL.checkNullReturnValue(dr.Item("tblSnd_FrachtkostenNichtEU"), Nothing)
|
||||
Me.tblSnd_AbfertigungTR = SQL.checkNullReturnValue(dr.Item("tblSnd_AbfertigungTR"), Nothing)
|
||||
Me.tblSnd_AbfertigungTR_MA = SQL.checkNullReturnValue(dr.Item("tblSnd_AbfertigungTR_MA"), Nothing)
|
||||
|
||||
@@ -624,6 +626,7 @@ Public Class cSendungen
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("tblSnd_Vorpapier3", tblSnd_Vorpapier3))
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("tblSnd_Vorpapier3_Pos", tblSnd_Vorpapier3_Pos))
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("tblSnd_Frachtkosten", tblSnd_Frachtkosten))
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("tblSnd_FrachtkostenNichtEU", tblSnd_FrachtkostenNichtEU))
|
||||
|
||||
'If saveStatus Then --> in getUpdateCmd
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("tblSnd_Status", tblSnd_Status,,, Not saveSachbearbeiter))
|
||||
|
||||
Reference in New Issue
Block a user