Merge branch 'master' of http://git.dd:3000/AppStd/TaskFlow
This commit is contained in:
commit
6fa8f157a0
@ -5,6 +5,7 @@ Imports DigitalData.Modules.EDMI.API
|
||||
Imports DigitalData.Modules.EDMI.API.DatabaseWithFallback
|
||||
Imports DigitalData.Modules.EDMI.API.Constants
|
||||
Imports DigitalData.Modules.Database
|
||||
Imports System.Windows.Forms.VisualStyles.VisualStyleElement
|
||||
|
||||
Public Class ClassInit
|
||||
Public _lizenzManager As ClassLicenseManager
|
||||
@ -220,7 +221,21 @@ Public Class ClassInit
|
||||
If split.Length >= 2 Then
|
||||
LICENSE_VALID = True
|
||||
End If
|
||||
Dim oLICDATE = CDate(split(1))
|
||||
Dim oLICDATE As Date
|
||||
Try
|
||||
oLICDATE = CDate(split(1))
|
||||
Catch ex As Exception
|
||||
LOGGER.Warn($"Error Converting Value {split(1)} to DATE")
|
||||
Try
|
||||
Dim expenddt As Date = Date.ParseExact(split(1), "dd.MM.yyyy", System.Globalization.DateTimeFormatInfo.InvariantInfo)
|
||||
oLICDATE = expenddt
|
||||
Catch ex1 As Exception
|
||||
LOGGER.Warn($"Second Error Converting DATE with ParseExact - Setting Date = Today")
|
||||
oLICDATE = Now.Date
|
||||
End Try
|
||||
|
||||
End Try
|
||||
|
||||
If oLICDATE < CDate(Now) Then
|
||||
MsgBox("Your license has expired!" & vbNewLine & "Last valid date: " & split(1) & vbNewLine & "Please contact Your sysadmin", MsgBoxStyle.Exclamation)
|
||||
LICENSE_EXPIRED = True
|
||||
|
||||
@ -108,9 +108,12 @@ Public Class ClassParamRefresh
|
||||
' If ClassDatabase.Init(CONNECTION_STRING_IDB_APP_SERVER) = True Then
|
||||
' LOGGER.Info($"Got an IDB APP-Server-Connection [{CON_ID}]!")
|
||||
' End If
|
||||
ElseIf oMode = "PM.EXCEL_OVERVIEW" Then
|
||||
EXCEL_OVERVIEW = True
|
||||
LOGGER.Debug($"EXCEL_OVERVIEW [{EXCEL_OVERVIEW}]")
|
||||
ElseIf oMode = "PM.MONITORING" Then
|
||||
MONITORING_ACTIVE = True
|
||||
LOGGER.Debug($"SHOW_MASS_VALIDATOR [{SHOW_MASS_VALIDATOR}]")
|
||||
LOGGER.Debug($"MONITORING_ACTIVE [{MONITORING_ACTIVE}]")
|
||||
ElseIf oMode = "PM.GHOSTMODE" Then
|
||||
GHOSTMODE_ACTIVE = True
|
||||
LOGGER.Debug($"GHOSTMODE_ACTIVE [{GHOSTMODE_ACTIVE}]")
|
||||
|
||||
@ -79,6 +79,7 @@ Module ModuleRuntimeVariables
|
||||
Public Property SHOW_MASS_VALIDATOR As Boolean = True
|
||||
Public Property WORKING_MODE As String = ""
|
||||
Public Property MONITORING_ACTIVE As Boolean = False
|
||||
Public Property EXCEL_OVERVIEW As Boolean = False
|
||||
Public Property GHOSTMODE_ACTIVE As Boolean = False
|
||||
Public Property RIBBON_COLOR_SCHEME As String = ""
|
||||
Public Property ADDITIONAL_TITLE As String = ""
|
||||
|
||||
@ -49,7 +49,7 @@ Public Class clsPatterns
|
||||
Public Const INT_VALUE_DOMAIN = "DOMAIN"
|
||||
Public Const INT_VALUE_DATE = "DATE"
|
||||
|
||||
Public Const MAX_TRY_COUNT = 50
|
||||
Public Const MAX_TRY_COUNT = 20
|
||||
|
||||
''' <summary>
|
||||
''' This value will be valid as any datatype,
|
||||
|
||||
@ -463,7 +463,7 @@ Public Class frmMain
|
||||
Else
|
||||
RibbonPageGroupBasicConf.Visible = True
|
||||
End If
|
||||
If USER_IS_ADMIN = True Then
|
||||
If EXCEL_OVERVIEW = True Then
|
||||
BarButtonItemExportExcel.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
|
||||
Else
|
||||
BarButtonItemExportExcel.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
|
||||
@ -3112,7 +3112,9 @@ where (CONVERT(DATE,GETDATE()) <= NOTE.DISPLAY_UNTIL or NOTE.DISPLAY_UNTIL IS NU
|
||||
If ribbon.SelectedPage Is RibbonPageAktionen Then
|
||||
Select Case GridViewItem_Clicked
|
||||
Case "GROUP"
|
||||
If SHOW_MASS_VALIDATOR = True Then
|
||||
BarButtonItemMassValidation.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
|
||||
End If
|
||||
Case "ROW"
|
||||
' If selectedRows.Count > 1 Then
|
||||
' CMFileStart.Enabled = False
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user