MS Release
This commit is contained in:
parent
5ce027cb07
commit
d738b31b4f
@ -312,8 +312,8 @@ Public Class ClassInit
|
|||||||
End Try
|
End Try
|
||||||
|
|
||||||
LOGGER.Debug("Username: " & USER_USERNAME)
|
LOGGER.Debug("Username: " & USER_USERNAME)
|
||||||
Dim oFnct As New RefreshHelper.SW("FNDD_CHECK_USER_MODULE")
|
Dim oFnct As New RefreshHelper.SW("FNDD_LOGIN_USER_MODULE")
|
||||||
oSQL = String.Format("SELECT * FROM [dbo].[FNDD_CHECK_USER_MODULE] ('{0}','PM',{1})", USER_USERNAME, CLIENT_SELECTED)
|
oSQL = String.Format("SELECT * FROM [dbo].[FNDD_LOGIN_USER_MODULE] ('{0}','PM',{1})", USER_USERNAME, CLIENT_SELECTED)
|
||||||
Dim DT_CHECKUSER_MODULE As DataTable
|
Dim DT_CHECKUSER_MODULE As DataTable
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -604,7 +604,7 @@ Public Class frmMain
|
|||||||
|
|
||||||
End Function
|
End Function
|
||||||
|
|
||||||
Private Function GetXML_LayoutName()
|
Private Function GetLayoutName_GridMain()
|
||||||
Dim Filename As String = String.Format("DevExpressGridViewOverview_UserLayout_{0}_{1}.xml", GRID_LOAD_TYPE, USER_LANGUAGE)
|
Dim Filename As String = String.Format("DevExpressGridViewOverview_UserLayout_{0}_{1}.xml", GRID_LOAD_TYPE, USER_LANGUAGE)
|
||||||
Return System.IO.Path.Combine(CONFIG.UserConfigPath.Replace("UserConfig.xml", ""), Filename)
|
Return System.IO.Path.Combine(CONFIG.UserConfigPath.Replace("UserConfig.xml", ""), Filename)
|
||||||
End Function
|
End Function
|
||||||
@ -616,11 +616,11 @@ Public Class frmMain
|
|||||||
End If
|
End If
|
||||||
|
|
||||||
Try
|
Try
|
||||||
Dim xml As String = GetXML_LayoutName()
|
Dim xml As String = GetLayoutName_GridMain()
|
||||||
GridView_Docs.SaveLayoutToXml(xml, OptionsLayoutBase.FullLayout)
|
GridView_Docs.SaveLayoutToXml(xml, OptionsLayoutBase.FullLayout)
|
||||||
Catch ex As Exception
|
Catch ex As Exception
|
||||||
LOGGER.Error(ex)
|
LOGGER.Error(ex)
|
||||||
LOGGER.Info("Error while saving GridLayout: " & ex.Message)
|
LOGGER.Info("Error while saving GridLayout MainGrid: " & ex.Message)
|
||||||
End Try
|
End Try
|
||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
@ -630,17 +630,17 @@ Public Class frmMain
|
|||||||
End If
|
End If
|
||||||
|
|
||||||
Try
|
Try
|
||||||
Dim oXml As String = GetXML_LayoutName()
|
Dim oXml As String = GetLayoutName_GridMain()
|
||||||
GridView_Docs.RestoreLayoutFromXml(oXml, OptionsLayoutBase.FullLayout)
|
GridView_Docs.RestoreLayoutFromXml(oXml, OptionsLayoutBase.FullLayout)
|
||||||
Catch ex As Exception
|
Catch ex As Exception
|
||||||
LOGGER.Info("Error while restoring layout: " & ex.Message)
|
LOGGER.Info("Error while restoring layout MainGrid: " & ex.Message)
|
||||||
End Try
|
End Try
|
||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
Private Sub ResetLayout()
|
Private Sub ResetLayout()
|
||||||
Try
|
Try
|
||||||
Timer_Inactivity_Reset_Disable("ResetLayout")
|
Timer_Inactivity_Reset_Disable("ResetLayout")
|
||||||
Dim xml As String = GetXML_LayoutName()
|
Dim xml As String = GetLayoutName_GridMain()
|
||||||
IO.File.Delete(xml)
|
IO.File.Delete(xml)
|
||||||
Try
|
Try
|
||||||
GridView_Docs.Columns.Clear()
|
GridView_Docs.Columns.Clear()
|
||||||
@ -1192,7 +1192,7 @@ Public Class frmMain
|
|||||||
Private Function Column_inGridViewLayout(Col2bChecked As String) As Boolean
|
Private Function Column_inGridViewLayout(Col2bChecked As String) As Boolean
|
||||||
Try
|
Try
|
||||||
Dim oGridView As New GridView
|
Dim oGridView As New GridView
|
||||||
Dim oXml As String = GetXML_LayoutName()
|
Dim oXml As String = GetLayoutName_GridMain()
|
||||||
oGridView.RestoreLayoutFromXml(oXml, OptionsLayoutBase.FullLayout)
|
oGridView.RestoreLayoutFromXml(oXml, OptionsLayoutBase.FullLayout)
|
||||||
Dim oViewColumn_exists As Boolean = False
|
Dim oViewColumn_exists As Boolean = False
|
||||||
For Each oActGridColumn As GridColumn In oGridView.Columns
|
For Each oActGridColumn As GridColumn In oGridView.Columns
|
||||||
@ -2326,7 +2326,7 @@ Public Class frmMain
|
|||||||
Sub GetBaseData(pMode As String)
|
Sub GetBaseData(pMode As String)
|
||||||
Dim oStopWatch As New RefreshHelper.SW("GetBaseData")
|
Dim oStopWatch As New RefreshHelper.SW("GetBaseData")
|
||||||
Try
|
Try
|
||||||
Dim oSQL = String.Format("SELECT * FROM [dbo].[FNDD_CHECK_USER_MODULE] ('{0}','PM',{1})", USER_USERNAME, CLIENT_SELECTED)
|
Dim oSQL = String.Format("SELECT * FROM [dbo].[FNDD_LOGIN_USER_MODULE] ('{0}','PM',{1})", USER_USERNAME, CLIENT_SELECTED)
|
||||||
Dim DT_CHECKUSER_MODULE As DataTable
|
Dim DT_CHECKUSER_MODULE As DataTable
|
||||||
DT_CHECKUSER_MODULE = DatabaseFallback.GetDatatable("TBDD_USER_MODULE", New GetDatatableOptions(oSQL, DatabaseType.ECM) With {
|
DT_CHECKUSER_MODULE = DatabaseFallback.GetDatatable("TBDD_USER_MODULE", New GetDatatableOptions(oSQL, DatabaseType.ECM) With {
|
||||||
.FilterExpression = $"USERNAME = '{USER_USERNAME.ToLower}' AND MODULE_SHORT = 'PM'"
|
.FilterExpression = $"USERNAME = '{USER_USERNAME.ToLower}' AND MODULE_SHORT = 'PM'"
|
||||||
|
|||||||
@ -3136,9 +3136,7 @@ Public Class frmValidator
|
|||||||
oControName = oControl.Name
|
oControName = oControl.Name
|
||||||
Dim oLoadIndex As Boolean = oControlRow.Item("LOAD_IDX_VALUE")
|
Dim oLoadIndex As Boolean = oControlRow.Item("LOAD_IDX_VALUE")
|
||||||
|
|
||||||
If oSourceIndexName = "Netto" Then
|
|
||||||
Console.WriteLine("Bing Netto")
|
|
||||||
End If
|
|
||||||
|
|
||||||
LOGGER.Debug("INDEX: " & oSourceIndexName & " - CONTROLNAME: " & oControl.Name & " - LOAD IDXVALUES: " & oLoadIndex.ToString)
|
LOGGER.Debug("INDEX: " & oSourceIndexName & " - CONTROLNAME: " & oControl.Name & " - LOAD IDXVALUES: " & oLoadIndex.ToString)
|
||||||
Select Case oType
|
Select Case oType
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user