From 3b75d566a23af6dc5c8ff6adc707b663bf2460c4 Mon Sep 17 00:00:00 2001 From: Digital Data - Marlon Schreiber Date: Fri, 15 Jul 2022 09:05:54 +0200 Subject: [PATCH] MS Notifications --- app/DD_PM_WINDREAM/ClassIDBData.vb | 4 ++-- app/DD_PM_WINDREAM/ClassParamRefresh.vb | 10 +++++++++- app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb | 2 +- app/DD_PM_WINDREAM/frmMain.vb | 13 +++++++++++++ 4 files changed, 25 insertions(+), 4 deletions(-) diff --git a/app/DD_PM_WINDREAM/ClassIDBData.vb b/app/DD_PM_WINDREAM/ClassIDBData.vb index 4146033..0a90678 100644 --- a/app/DD_PM_WINDREAM/ClassIDBData.vb +++ b/app/DD_PM_WINDREAM/ClassIDBData.vb @@ -207,7 +207,7 @@ Next If oExists = False Then Dim oInfo2 = $"Value [{oOldAttributeResult}] no longer existing in Vector-Attribute [{oAttributeName}] - will be deleted!" - LOGGER.Info(oInfo2) + LOGGER.Debug(oInfo2) 'SetVariableValue(CURRENT_PROFILE_LOG_INDEX, oInfo2) Delete_Term_Object_From_Metadata(oAttributeName, oOldAttributeResult) End If @@ -215,7 +215,7 @@ '### there is only ONE new value ### If oDTMyNewValues.Rows(0).Item(1) <> oOldAttributeResult Then Dim oInfo = $"Value [{oOldAttributeResult}] of Attribute [{oAttributeName}] obviously was updated during runtime - will be deleted!" - LOGGER.Info(oInfo) + LOGGER.Debug(oInfo) SetVariableValue(CURRENT_PROFILE_LOG_INDEX, oInfo) Delete_Term_Object_From_Metadata(oAttributeName, oOldAttributeResult) Else diff --git a/app/DD_PM_WINDREAM/ClassParamRefresh.vb b/app/DD_PM_WINDREAM/ClassParamRefresh.vb index 9d3e813..1c5c43a 100644 --- a/app/DD_PM_WINDREAM/ClassParamRefresh.vb +++ b/app/DD_PM_WINDREAM/ClassParamRefresh.vb @@ -34,13 +34,14 @@ Public Class ClassParamRefresh End Try Try ADDITIONAL_TITLE = DT_CHECKUSER.Rows(0).Item("ADDITIONAL_TITLE") + If ADDITIONAL_TITLE = String.Empty Then ADDITIONAL_TITLE = My.Application.Info.ProductName End If Catch ex As Exception ADDITIONAL_TITLE = My.Application.Info.ProductName End Try - + TITLE_NOTIFICATIONS = ADDITIONAL_TITLE Dim oSplitWorkMode As String() = WORKING_MODE.Split("#") ' Use For Each loop over words and display them. @@ -177,6 +178,13 @@ Public Class ClassParamRefresh Catch ex As Exception TL_ICON = False End Try + ElseIf oMode.StartsWith("PM.TITLE_NOTIFICATIONS") Then + Dim oParam = oMode.Replace("PM.TITLE_NOTIFICATIONS=", "") + Try + TITLE_NOTIFICATIONS = oParam + Catch ex As Exception + TITLE_NOTIFICATIONS = "" + End Try ElseIf oMode.StartsWith("PM.START_CW") Then Dim oAfterReplace = oMode.Replace("PM.START_CW=", "") Try diff --git a/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb b/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb index 407cd92..d07fe09 100644 --- a/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb +++ b/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb @@ -89,7 +89,7 @@ Module ModuleRuntimeVariables Public Property SEARCH1 As String = "" Public Property SEARCH2 As String = "" Public Property TL_ICON As Boolean = True - + Public Property TITLE_NOTIFICATIONS As String = "" Public Property START_CW As Boolean = False Public Property START_CW_CAPTION As String Public Property START_CW_LOC_VARIANT As String = 0 diff --git a/app/DD_PM_WINDREAM/frmMain.vb b/app/DD_PM_WINDREAM/frmMain.vb index 199ccdb..9fd078d 100644 --- a/app/DD_PM_WINDREAM/frmMain.vb +++ b/app/DD_PM_WINDREAM/frmMain.vb @@ -2330,6 +2330,19 @@ Public Class frmMain Await Decide_Load(True) Handling_DEBUG_USER() + Dim oSQL = $"SELECT * FROM TBDD_NOTIFICATIONS_SYSTEM + where DISPLAY_UNTIL <= CONVERT(DATE,GETDATE()) or DISPLAY_UNTIL IS NULL AND MODULE = 'PM' + AND GUID NOT IN (SELECT NOTIFY_ID FROM TBDD_NOTIFICATIONS_USER_HISTORY WHERE USR_ID = {USER_ID})" + Dim oDT As DataTable = DatabaseFallback.GetDatatable("TBDD_NOTIFICATIONS_SYSTEM", New GetDatatableOptions(oSQL, DatabaseType.ECM)) + If Not IsNothing(oDT) Then + If oDT.Rows.Count > 0 Then + Dim oEnvironment = GetEnvironment() + Dim oNForm As New frmNotification_Startup(oDT, LOGCONFIG, GDPICTURE_LICENSE, TITLE_NOTIFICATIONS, oEnvironment) + oNForm.ShowDialog() + End If + + End If + End Sub Sub Handling_DEBUG_USER() If DEBUG = True Then