MS_ChangesKW38

This commit is contained in:
Digital Data - Marlon Schreiber 2017-09-25 13:59:52 +02:00
parent 0e5a48f92c
commit ce89aef1cd
16 changed files with 3549 additions and 3978 deletions

View File

@ -312,6 +312,7 @@ Public Class ClassDOC_SEARCH
Next Next
'Jetzt das Array zusammenbauen um die Spaltenwerte zu erhalten 'Jetzt das Array zusammenbauen um die Spaltenwerte zu erhalten
For Each rw As DataRow In DT_WINDREAM_RESULTLIST.Rows For Each rw As DataRow In DT_WINDREAM_RESULTLIST.Rows
Dim colname = rw.Item("COLUMN_VIEW")
ColArrayDEFINITION.Add(rw.Item("COLUMN_VIEW")) ColArrayDEFINITION.Add(rw.Item("COLUMN_VIEW"))
Next Next
End If End If

View File

@ -30,8 +30,9 @@ Public Class ClassUpdate
Dim KONFIG_DT As DataTable = clsDatabase.Return_Datatable(sql, False) Dim KONFIG_DT As DataTable = clsDatabase.Return_Datatable(sql, False)
If KONFIG_DT.Rows.Count = 1 Then If KONFIG_DT.Rows.Count = 1 Then
MyServer_UpdatePath = KONFIG_DT.Rows(0).Item("VERSION_UPATE_PATH") MyServer_UpdatePath = KONFIG_DT.Rows(0).Item("VERSION_UPATE_PATH")
MIN_REQUIRED_VERSION = KONFIG_DT.Rows(0).Item("MIN_REQUIRED_VERSION")
End If End If
sql = String.Format("SELECT * FROM TBDD_VERSION_UPDATE WHERE GUID = (SELECT MAX(GUID) FROM TBDD_VERSION_UPDATE WHERE UPPER(MODULE_NAME) = UPPER('{0}'))", "Record-Organizer") sql = String.Format("Select * FROM TBDD_VERSION_UPDATE WHERE GUID = (Select MAX(GUID) FROM TBDD_VERSION_UPDATE WHERE UPPER(MODULE_NAME) = UPPER('{0}'))", "Record-Organizer")
DT_UPDATE = clsDatabase.Return_Datatable(sql, False) DT_UPDATE = clsDatabase.Return_Datatable(sql, False)
If Not IsNothing(DT_UPDATE) Then If Not IsNothing(DT_UPDATE) Then
If DT_UPDATE.Rows.Count = 1 Then If DT_UPDATE.Rows.Count = 1 Then
@ -259,6 +260,8 @@ Public Class ClassUpdate
Dim error_while_replacing = False Dim error_while_replacing = False
For Each Upd_item As DataRow In DT_UPDATE_ITEMS.Rows For Each Upd_item As DataRow In DT_UPDATE_ITEMS.Rows
Dim BackUpOfFileToReplace As String = MY_INSTALL_PATH & "\" & Upd_item.Item("INFO1") & Upd_item.Item("ITEM_INFO") & ".bac" Dim BackUpOfFileToReplace As String = MY_INSTALL_PATH & "\" & Upd_item.Item("INFO1") & Upd_item.Item("ITEM_INFO") & ".bac"
BackUpOfFileToReplace = BackUpOfFileToReplace.Replace("//", "/")
Dim sourcefile = Path.Combine(FOLDER_TEMP, Upd_item.Item("ITEM_INFO")) Dim sourcefile = Path.Combine(FOLDER_TEMP, Upd_item.Item("ITEM_INFO"))
Dim targetfile Dim targetfile
If IsDBNull(Upd_item.Item("INFO1")) Then If IsDBNull(Upd_item.Item("INFO1")) Then
@ -270,11 +273,12 @@ Public Class ClassUpdate
targetfile = Path.Combine(MY_INSTALL_PATH, Upd_item.Item("ITEM_INFO")) targetfile = Path.Combine(MY_INSTALL_PATH, Upd_item.Item("ITEM_INFO"))
End If End If
End If End If
targetfile = targetfile.ToString.Replace("//", "/")
Try Try
' Replace the file. ' Replace the file.
If File.Exists(targetfile) Then If File.Exists(targetfile) Then
If File_Rename(targetfile, BackUpOfFileToReplace) = True Then If File_Rename(targetfile, BackUpOfFileToReplace) = True Then
If File.Exists(BackUpOfFileToReplace) Then
If MoveFile(sourcefile, targetfile) = True Then If MoveFile(sourcefile, targetfile) = True Then
File_Delete(BackUpOfFileToReplace) File_Delete(BackUpOfFileToReplace)
Else Else
@ -282,6 +286,8 @@ Public Class ClassUpdate
File_Rename(BackUpOfFileToReplace, targetfile) File_Rename(BackUpOfFileToReplace, targetfile)
End If End If
End If End If
End If
Else Else
MoveFile(sourcefile, targetfile) MoveFile(sourcefile, targetfile)
End If End If
@ -302,7 +308,6 @@ Public Class ClassUpdate
End Sub End Sub
Private Shared Function File_Rename(targetfile As String, Renamefilestring As String) Private Shared Function File_Rename(targetfile As String, Renamefilestring As String)
Try Try
Renamefilestring = Renamefilestring.Replace("\\", "\") Renamefilestring = Renamefilestring.Replace("\\", "\")
If File.Exists(Renamefilestring) Then If File.Exists(Renamefilestring) Then
@ -310,11 +315,10 @@ Public Class ClassUpdate
Return False Return False
End If End If
End If End If
Rename(targetfile, Renamefilestring) Rename(targetfile, Renamefilestring)
Return True Return True
Catch ex As Exception Catch ex As Exception
ClassLogger.Add(String.Format("Unexpected Error in File_Rename: " & "targetfile '{0}'" & "Renamefilestring '{1}'" & "ERROR: {2}", targetfile, Renamefilestring, ex.Message)) ClassLogger.Add(String.Format("ClassUpdate - Unexpected Error in File_Rename: " & "OldPath '{0}'" & "NewPath '{1}'" & "ERROR: {2}", targetfile, Renamefilestring, ex.Message))
UPDATE_ERROR = True UPDATE_ERROR = True
Return False Return False
End Try End Try

View File

@ -125,8 +125,9 @@
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>D:\Programme\Sprachen\DevExpress 15.2\Components\Bin\Framework\DevExpress.Sparkline.v15.2.Core.dll</HintPath> <HintPath>D:\Programme\Sprachen\DevExpress 15.2\Components\Bin\Framework\DevExpress.Sparkline.v15.2.Core.dll</HintPath>
</Reference> </Reference>
<Reference Include="DevExpress.Utils.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL"> <Reference Include="DevExpress.Utils.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Utils.v15.2.dll</HintPath>
</Reference> </Reference>
<Reference Include="DevExpress.XtraBars.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL"> <Reference Include="DevExpress.XtraBars.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>

View File

@ -1,6 +1,8 @@
Module ModuleRuntimeVariables Module ModuleRuntimeVariables
Public ESC_Hidden As Boolean = False Public ESC_Hidden As Boolean = False
Public MIN_REQUIRED_VERSION As String
Public MAIN_FORM As frmMain = Nothing Public MAIN_FORM As frmMain = Nothing
Public ERROR_INIT = "NONE" Public ERROR_INIT = "NONE"

View File

@ -33,7 +33,7 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben: ' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")> ' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("2.4.9.1")> <Assembly: AssemblyVersion("2.4.9.2")>
<Assembly: AssemblyFileVersion("1.0.0.0")> <Assembly: AssemblyFileVersion("1.0.0.0")>
<Assembly: NeutralResourcesLanguageAttribute("")> <Assembly: NeutralResourcesLanguageAttribute("")>

View File

@ -1,3 +1,4 @@
DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraBars.Navigation.TileNavPane, DevExpress.XtraBars.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraBars.Navigation.TileNavPane, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

View File

@ -1,9 +1,9 @@
<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _ <Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
Partial Class frmMain Partial Class frmMain
Inherits DevExpress.XtraBars.Ribbon.RibbonForm Inherits DevExpress.XtraBars.Ribbon.RibbonForm
'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
<System.Diagnostics.DebuggerNonUserCode()> _ <System.Diagnostics.DebuggerNonUserCode()>
Protected Overrides Sub Dispose(ByVal disposing As Boolean) Protected Overrides Sub Dispose(ByVal disposing As Boolean)
Try Try
If disposing AndAlso components IsNot Nothing Then If disposing AndAlso components IsNot Nothing Then
@ -20,7 +20,7 @@ Partial Class frmMain
'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
'Das Bearbeiten ist mit dem Windows Form-Designer möglich. 'Das Bearbeiten ist mit dem Windows Form-Designer möglich.
'Das Bearbeiten mit dem Code-Editor ist nicht möglich. 'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
<System.Diagnostics.DebuggerStepThrough()> _ <System.Diagnostics.DebuggerStepThrough()>
Private Sub InitializeComponent() Private Sub InitializeComponent()
Me.components = New System.ComponentModel.Container() Me.components = New System.ComponentModel.Container()
Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmMain)) Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmMain))
@ -38,7 +38,6 @@ Partial Class frmMain
Me.itemSettings = New DevExpress.XtraBars.BarButtonItem() Me.itemSettings = New DevExpress.XtraBars.BarButtonItem()
Me.itemScanInbox = New DevExpress.XtraBars.BarButtonItem() Me.itemScanInbox = New DevExpress.XtraBars.BarButtonItem()
Me.BarButtonItem19 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem19 = New DevExpress.XtraBars.BarButtonItem()
Me.itemRefreshProxy = New DevExpress.XtraBars.BarButtonItem()
Me.itemInfo = New DevExpress.XtraBars.BarButtonItem() Me.itemInfo = New DevExpress.XtraBars.BarButtonItem()
Me.itemAbout = New DevExpress.XtraBars.BarButtonItem() Me.itemAbout = New DevExpress.XtraBars.BarButtonItem()
Me.itemExit = New DevExpress.XtraBars.BarButtonItem() Me.itemExit = New DevExpress.XtraBars.BarButtonItem()
@ -108,26 +107,26 @@ Partial Class frmMain
'NotifyIcon 'NotifyIcon
' '
Me.NotifyIcon.BalloonTipIcon = System.Windows.Forms.ToolTipIcon.Info Me.NotifyIcon.BalloonTipIcon = System.Windows.Forms.ToolTipIcon.Info
resources.ApplyResources(Me.NotifyIcon, "NotifyIcon")
Me.NotifyIcon.ContextMenuStrip = Me.cmsSystray Me.NotifyIcon.ContextMenuStrip = Me.cmsSystray
resources.ApplyResources(Me.NotifyIcon, "NotifyIcon")
' '
'cmsSystray 'cmsSystray
' '
resources.ApplyResources(Me.cmsSystray, "cmsSystray")
Me.cmsSystray.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ADDIBeendenToolStripMenuItem, Me.CockpitAnzeigenToolStripMenuItem}) Me.cmsSystray.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ADDIBeendenToolStripMenuItem, Me.CockpitAnzeigenToolStripMenuItem})
Me.cmsSystray.Name = "cmsSystray" Me.cmsSystray.Name = "cmsSystray"
resources.ApplyResources(Me.cmsSystray, "cmsSystray")
' '
'ADDIBeendenToolStripMenuItem 'ADDIBeendenToolStripMenuItem
' '
resources.ApplyResources(Me.ADDIBeendenToolStripMenuItem, "ADDIBeendenToolStripMenuItem")
Me.ADDIBeendenToolStripMenuItem.Image = Global.DD_Record_Organizer.My.Resources.Resources.cancel1 Me.ADDIBeendenToolStripMenuItem.Image = Global.DD_Record_Organizer.My.Resources.Resources.cancel1
Me.ADDIBeendenToolStripMenuItem.Name = "ADDIBeendenToolStripMenuItem" Me.ADDIBeendenToolStripMenuItem.Name = "ADDIBeendenToolStripMenuItem"
resources.ApplyResources(Me.ADDIBeendenToolStripMenuItem, "ADDIBeendenToolStripMenuItem")
' '
'CockpitAnzeigenToolStripMenuItem 'CockpitAnzeigenToolStripMenuItem
' '
resources.ApplyResources(Me.CockpitAnzeigenToolStripMenuItem, "CockpitAnzeigenToolStripMenuItem")
Me.CockpitAnzeigenToolStripMenuItem.Image = Global.DD_Record_Organizer.My.Resources.Resources.WebUserControl_ascx__11270_16x Me.CockpitAnzeigenToolStripMenuItem.Image = Global.DD_Record_Organizer.My.Resources.Resources.WebUserControl_ascx__11270_16x
Me.CockpitAnzeigenToolStripMenuItem.Name = "CockpitAnzeigenToolStripMenuItem" Me.CockpitAnzeigenToolStripMenuItem.Name = "CockpitAnzeigenToolStripMenuItem"
resources.ApplyResources(Me.CockpitAnzeigenToolStripMenuItem, "CockpitAnzeigenToolStripMenuItem")
' '
'TimerTasks 'TimerTasks
' '
@ -191,11 +190,11 @@ Partial Class frmMain
' '
'ribbonMain 'ribbonMain
' '
resources.ApplyResources(Me.ribbonMain, "ribbonMain")
Me.ribbonMain.ApplicationButtonDropDownControl = Me.MainMenu Me.ribbonMain.ApplicationButtonDropDownControl = Me.MainMenu
Me.ribbonMain.BackColor = System.Drawing.Color.DarkGray Me.ribbonMain.BackColor = System.Drawing.Color.DarkGray
Me.ribbonMain.ExpandCollapseItem.Id = 0 Me.ribbonMain.ExpandCollapseItem.Id = 0
Me.ribbonMain.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.ribbonMain.ExpandCollapseItem, Me.LabelMachine, Me.LabelLoggedIn, Me.LabelVersion, Me.itemInfo, Me.itemExit, Me.BarButtonItem1, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.BarButtonItem6, Me.BarButtonItem7, Me.itemSettings, Me.BarButtonItem2, Me.BarButtonItem10, Me.BarButtonItem12, Me.BarButtonItemConnections, Me.BarButtonItem15, Me.BarButtonItem16, Me.BarButtonItem17, Me.BarButtonItem18, Me.LabelLanguage, Me.BarButtonItem20, Me.BarButtonItemSAPConnect, Me.BarButtonItemStructureNOdes, Me.BarSubItem1, Me.BarButtonItem14, Me.BarButtonItem21, Me.BarButtonItem22, Me.BarButtonItem8, Me.BarButtonItem9, Me.itemAbout, Me.BarButtonItem19, Me.btnGlobalSearch, Me.LabelUser, Me.bbtnItemViewsUser, Me.BarButtonItem23, Me.itemRefreshProxy, Me.LabelProxyServer, Me.BarSubItem2, Me.BarButtonItem25, Me.StatusPersonifiedLogin, Me.itemScanInbox, Me.BarButtonItem13}) Me.ribbonMain.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.ribbonMain.ExpandCollapseItem, Me.LabelMachine, Me.LabelLoggedIn, Me.LabelVersion, Me.itemInfo, Me.itemExit, Me.BarButtonItem1, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.BarButtonItem6, Me.BarButtonItem7, Me.itemSettings, Me.BarButtonItem2, Me.BarButtonItem10, Me.BarButtonItem12, Me.BarButtonItemConnections, Me.BarButtonItem15, Me.BarButtonItem16, Me.BarButtonItem17, Me.BarButtonItem18, Me.LabelLanguage, Me.BarButtonItem20, Me.BarButtonItemSAPConnect, Me.BarButtonItemStructureNOdes, Me.BarSubItem1, Me.BarButtonItem14, Me.BarButtonItem21, Me.BarButtonItem22, Me.BarButtonItem8, Me.BarButtonItem9, Me.itemAbout, Me.BarButtonItem19, Me.btnGlobalSearch, Me.LabelUser, Me.bbtnItemViewsUser, Me.BarButtonItem23, Me.LabelProxyServer, Me.BarSubItem2, Me.BarButtonItem25, Me.StatusPersonifiedLogin, Me.itemScanInbox, Me.BarButtonItem13})
resources.ApplyResources(Me.ribbonMain, "ribbonMain")
Me.ribbonMain.MaxItemId = 8 Me.ribbonMain.MaxItemId = 8
Me.ribbonMain.Name = "ribbonMain" Me.ribbonMain.Name = "ribbonMain"
Me.ribbonMain.PageCategories.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageCategory() {Me.RibbonPageCategory1}) Me.ribbonMain.PageCategories.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageCategory() {Me.RibbonPageCategory1})
@ -209,14 +208,9 @@ Partial Class frmMain
Me.MainMenu.ItemLinks.Add(Me.itemSettings) Me.MainMenu.ItemLinks.Add(Me.itemSettings)
Me.MainMenu.ItemLinks.Add(Me.itemScanInbox) Me.MainMenu.ItemLinks.Add(Me.itemScanInbox)
Me.MainMenu.ItemLinks.Add(Me.BarButtonItem19) Me.MainMenu.ItemLinks.Add(Me.BarButtonItem19)
Me.MainMenu.ItemLinks.Add(Me.itemRefreshProxy)
Me.MainMenu.ItemLinks.Add(Me.itemInfo) Me.MainMenu.ItemLinks.Add(Me.itemInfo)
Me.MainMenu.ItemLinks.Add(Me.itemAbout) Me.MainMenu.ItemLinks.Add(Me.itemAbout)
Me.MainMenu.ItemLinks.Add(Me.itemExit) Me.MainMenu.ItemLinks.Add(Me.itemExit)
Me.MainMenu.MenuAppearance.HeaderItemAppearance.FontSizeDelta = CType(resources.GetObject("MainMenu.MenuAppearance.HeaderItemAppearance.FontSizeDelta"), Integer)
Me.MainMenu.MenuAppearance.HeaderItemAppearance.FontStyleDelta = CType(resources.GetObject("MainMenu.MenuAppearance.HeaderItemAppearance.FontStyleDelta"), System.Drawing.FontStyle)
Me.MainMenu.MenuAppearance.HeaderItemAppearance.GradientMode = CType(resources.GetObject("MainMenu.MenuAppearance.HeaderItemAppearance.GradientMode"), System.Drawing.Drawing2D.LinearGradientMode)
Me.MainMenu.MenuAppearance.HeaderItemAppearance.Image = CType(resources.GetObject("MainMenu.MenuAppearance.HeaderItemAppearance.Image"), System.Drawing.Image)
Me.MainMenu.Name = "MainMenu" Me.MainMenu.Name = "MainMenu"
Me.MainMenu.Ribbon = Me.ribbonMain Me.MainMenu.Ribbon = Me.ribbonMain
' '
@ -242,13 +236,6 @@ Partial Class frmMain
Me.BarButtonItem19.Id = 47 Me.BarButtonItem19.Id = 47
Me.BarButtonItem19.Name = "BarButtonItem19" Me.BarButtonItem19.Name = "BarButtonItem19"
' '
'itemRefreshProxy
'
resources.ApplyResources(Me.itemRefreshProxy, "itemRefreshProxy")
Me.itemRefreshProxy.Glyph = CType(resources.GetObject("itemRefreshProxy.Glyph"), System.Drawing.Image)
Me.itemRefreshProxy.Id = 1
Me.itemRefreshProxy.Name = "itemRefreshProxy"
'
'itemInfo 'itemInfo
' '
resources.ApplyResources(Me.itemInfo, "itemInfo") resources.ApplyResources(Me.itemInfo, "itemInfo")
@ -441,10 +428,6 @@ Partial Class frmMain
resources.ApplyResources(Me.BarSubItem1, "BarSubItem1") resources.ApplyResources(Me.BarSubItem1, "BarSubItem1")
Me.BarSubItem1.Id = 38 Me.BarSubItem1.Id = 38
Me.BarSubItem1.LinksPersistInfo.AddRange(New DevExpress.XtraBars.LinkPersistInfo() {New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem14), New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem21), New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem22), New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem8), New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem9), New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem23)}) Me.BarSubItem1.LinksPersistInfo.AddRange(New DevExpress.XtraBars.LinkPersistInfo() {New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem14), New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem21), New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem22), New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem8), New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem9), New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem23)})
Me.BarSubItem1.MenuAppearance.HeaderItemAppearance.FontSizeDelta = CType(resources.GetObject("BarSubItem1.MenuAppearance.HeaderItemAppearance.FontSizeDelta"), Integer)
Me.BarSubItem1.MenuAppearance.HeaderItemAppearance.FontStyleDelta = CType(resources.GetObject("BarSubItem1.MenuAppearance.HeaderItemAppearance.FontStyleDelta"), System.Drawing.FontStyle)
Me.BarSubItem1.MenuAppearance.HeaderItemAppearance.GradientMode = CType(resources.GetObject("BarSubItem1.MenuAppearance.HeaderItemAppearance.GradientMode"), System.Drawing.Drawing2D.LinearGradientMode)
Me.BarSubItem1.MenuAppearance.HeaderItemAppearance.Image = CType(resources.GetObject("BarSubItem1.MenuAppearance.HeaderItemAppearance.Image"), System.Drawing.Image)
Me.BarSubItem1.Name = "BarSubItem1" Me.BarSubItem1.Name = "BarSubItem1"
Me.BarSubItem1.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.Large Me.BarSubItem1.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.Large
' '
@ -521,8 +504,6 @@ Partial Class frmMain
Me.LabelProxyServer.Glyph = CType(resources.GetObject("LabelProxyServer.Glyph"), System.Drawing.Image) Me.LabelProxyServer.Glyph = CType(resources.GetObject("LabelProxyServer.Glyph"), System.Drawing.Image)
Me.LabelProxyServer.Id = 1 Me.LabelProxyServer.Id = 1
Me.LabelProxyServer.ItemAppearance.Normal.Font = CType(resources.GetObject("LabelProxyServer.ItemAppearance.Normal.Font"), System.Drawing.Font) Me.LabelProxyServer.ItemAppearance.Normal.Font = CType(resources.GetObject("LabelProxyServer.ItemAppearance.Normal.Font"), System.Drawing.Font)
Me.LabelProxyServer.ItemAppearance.Normal.FontSizeDelta = CType(resources.GetObject("LabelProxyServer.ItemAppearance.Normal.FontSizeDelta"), Integer)
Me.LabelProxyServer.ItemAppearance.Normal.FontStyleDelta = CType(resources.GetObject("LabelProxyServer.ItemAppearance.Normal.FontStyleDelta"), System.Drawing.FontStyle)
Me.LabelProxyServer.ItemAppearance.Normal.ForeColor = CType(resources.GetObject("LabelProxyServer.ItemAppearance.Normal.ForeColor"), System.Drawing.Color) Me.LabelProxyServer.ItemAppearance.Normal.ForeColor = CType(resources.GetObject("LabelProxyServer.ItemAppearance.Normal.ForeColor"), System.Drawing.Color)
Me.LabelProxyServer.ItemAppearance.Normal.Options.UseFont = True Me.LabelProxyServer.ItemAppearance.Normal.Options.UseFont = True
Me.LabelProxyServer.ItemAppearance.Normal.Options.UseForeColor = True Me.LabelProxyServer.ItemAppearance.Normal.Options.UseForeColor = True
@ -535,10 +516,6 @@ Partial Class frmMain
resources.ApplyResources(Me.BarSubItem2, "BarSubItem2") resources.ApplyResources(Me.BarSubItem2, "BarSubItem2")
Me.BarSubItem2.Id = 2 Me.BarSubItem2.Id = 2
Me.BarSubItem2.LinksPersistInfo.AddRange(New DevExpress.XtraBars.LinkPersistInfo() {New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem25)}) Me.BarSubItem2.LinksPersistInfo.AddRange(New DevExpress.XtraBars.LinkPersistInfo() {New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem25)})
Me.BarSubItem2.MenuAppearance.HeaderItemAppearance.FontSizeDelta = CType(resources.GetObject("BarSubItem2.MenuAppearance.HeaderItemAppearance.FontSizeDelta"), Integer)
Me.BarSubItem2.MenuAppearance.HeaderItemAppearance.FontStyleDelta = CType(resources.GetObject("BarSubItem2.MenuAppearance.HeaderItemAppearance.FontStyleDelta"), System.Drawing.FontStyle)
Me.BarSubItem2.MenuAppearance.HeaderItemAppearance.GradientMode = CType(resources.GetObject("BarSubItem2.MenuAppearance.HeaderItemAppearance.GradientMode"), System.Drawing.Drawing2D.LinearGradientMode)
Me.BarSubItem2.MenuAppearance.HeaderItemAppearance.Image = CType(resources.GetObject("BarSubItem2.MenuAppearance.HeaderItemAppearance.Image"), System.Drawing.Image)
Me.BarSubItem2.Name = "BarSubItem2" Me.BarSubItem2.Name = "BarSubItem2"
' '
'BarButtonItem25 'BarButtonItem25
@ -549,12 +526,9 @@ Partial Class frmMain
' '
'StatusPersonifiedLogin 'StatusPersonifiedLogin
' '
resources.ApplyResources(Me.StatusPersonifiedLogin, "StatusPersonifiedLogin")
Me.StatusPersonifiedLogin.Glyph = Global.DD_Record_Organizer.My.Resources.Resources.user_16xLG Me.StatusPersonifiedLogin.Glyph = Global.DD_Record_Organizer.My.Resources.Resources.user_16xLG
Me.StatusPersonifiedLogin.Id = 5 Me.StatusPersonifiedLogin.Id = 5
Me.StatusPersonifiedLogin.ItemAppearance.Normal.Font = CType(resources.GetObject("StatusPersonifiedLogin.ItemAppearance.Normal.Font"), System.Drawing.Font) Me.StatusPersonifiedLogin.ItemAppearance.Normal.Font = CType(resources.GetObject("StatusPersonifiedLogin.ItemAppearance.Normal.Font"), System.Drawing.Font)
Me.StatusPersonifiedLogin.ItemAppearance.Normal.FontSizeDelta = CType(resources.GetObject("StatusPersonifiedLogin.ItemAppearance.Normal.FontSizeDelta"), Integer)
Me.StatusPersonifiedLogin.ItemAppearance.Normal.FontStyleDelta = CType(resources.GetObject("StatusPersonifiedLogin.ItemAppearance.Normal.FontStyleDelta"), System.Drawing.FontStyle)
Me.StatusPersonifiedLogin.ItemAppearance.Normal.ForeColor = CType(resources.GetObject("StatusPersonifiedLogin.ItemAppearance.Normal.ForeColor"), System.Drawing.Color) Me.StatusPersonifiedLogin.ItemAppearance.Normal.ForeColor = CType(resources.GetObject("StatusPersonifiedLogin.ItemAppearance.Normal.ForeColor"), System.Drawing.Color)
Me.StatusPersonifiedLogin.ItemAppearance.Normal.Options.UseFont = True Me.StatusPersonifiedLogin.ItemAppearance.Normal.Options.UseFont = True
Me.StatusPersonifiedLogin.ItemAppearance.Normal.Options.UseForeColor = True Me.StatusPersonifiedLogin.ItemAppearance.Normal.Options.UseForeColor = True
@ -606,10 +580,6 @@ Partial Class frmMain
'pageForms 'pageForms
' '
Me.pageForms.Appearance.BackColor = CType(resources.GetObject("pageForms.Appearance.BackColor"), System.Drawing.Color) Me.pageForms.Appearance.BackColor = CType(resources.GetObject("pageForms.Appearance.BackColor"), System.Drawing.Color)
Me.pageForms.Appearance.FontSizeDelta = CType(resources.GetObject("pageForms.Appearance.FontSizeDelta"), Integer)
Me.pageForms.Appearance.FontStyleDelta = CType(resources.GetObject("pageForms.Appearance.FontStyleDelta"), System.Drawing.FontStyle)
Me.pageForms.Appearance.GradientMode = CType(resources.GetObject("pageForms.Appearance.GradientMode"), System.Drawing.Drawing2D.LinearGradientMode)
Me.pageForms.Appearance.Image = CType(resources.GetObject("pageForms.Appearance.Image"), System.Drawing.Image)
Me.pageForms.Appearance.Options.UseBackColor = True Me.pageForms.Appearance.Options.UseBackColor = True
Me.pageForms.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.groupQuickAccessForm2}) Me.pageForms.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.groupQuickAccessForm2})
Me.pageForms.Image = Global.DD_Record_Organizer.My.Resources.Resources.application_form Me.pageForms.Image = Global.DD_Record_Organizer.My.Resources.Resources.application_form
@ -672,7 +642,6 @@ Partial Class frmMain
' '
'RibbonStatusBar1 'RibbonStatusBar1
' '
resources.ApplyResources(Me.RibbonStatusBar1, "RibbonStatusBar1")
Me.RibbonStatusBar1.ItemLinks.Add(Me.LabelMachine) Me.RibbonStatusBar1.ItemLinks.Add(Me.LabelMachine)
Me.RibbonStatusBar1.ItemLinks.Add(Me.LabelUser) Me.RibbonStatusBar1.ItemLinks.Add(Me.LabelUser)
Me.RibbonStatusBar1.ItemLinks.Add(Me.StatusPersonifiedLogin) Me.RibbonStatusBar1.ItemLinks.Add(Me.StatusPersonifiedLogin)
@ -680,6 +649,7 @@ Partial Class frmMain
Me.RibbonStatusBar1.ItemLinks.Add(Me.LabelVersion) Me.RibbonStatusBar1.ItemLinks.Add(Me.LabelVersion)
Me.RibbonStatusBar1.ItemLinks.Add(Me.LabelLanguage) Me.RibbonStatusBar1.ItemLinks.Add(Me.LabelLanguage)
Me.RibbonStatusBar1.ItemLinks.Add(Me.LabelProxyServer) Me.RibbonStatusBar1.ItemLinks.Add(Me.LabelProxyServer)
resources.ApplyResources(Me.RibbonStatusBar1, "RibbonStatusBar1")
Me.RibbonStatusBar1.Name = "RibbonStatusBar1" Me.RibbonStatusBar1.Name = "RibbonStatusBar1"
Me.RibbonStatusBar1.Ribbon = Me.ribbonMain Me.RibbonStatusBar1.Ribbon = Me.ribbonMain
' '
@ -717,19 +687,15 @@ Partial Class frmMain
' '
'ContextMenuStrip1 'ContextMenuStrip1
' '
resources.ApplyResources(Me.ContextMenuStrip1, "ContextMenuStrip1")
Me.ContextMenuStrip1.Name = "ContextMenuStrip1" Me.ContextMenuStrip1.Name = "ContextMenuStrip1"
resources.ApplyResources(Me.ContextMenuStrip1, "ContextMenuStrip1")
' '
'frmMain 'frmMain
' '
resources.ApplyResources(Me, "$this")
Me.Appearance.BackColor = CType(resources.GetObject("frmMain.Appearance.BackColor"), System.Drawing.Color) Me.Appearance.BackColor = CType(resources.GetObject("frmMain.Appearance.BackColor"), System.Drawing.Color)
Me.Appearance.FontSizeDelta = CType(resources.GetObject("frmMain.Appearance.FontSizeDelta"), Integer)
Me.Appearance.FontStyleDelta = CType(resources.GetObject("frmMain.Appearance.FontStyleDelta"), System.Drawing.FontStyle)
Me.Appearance.GradientMode = CType(resources.GetObject("frmMain.Appearance.GradientMode"), System.Drawing.Drawing2D.LinearGradientMode)
Me.Appearance.Image = CType(resources.GetObject("frmMain.Appearance.Image"), System.Drawing.Image)
Me.Appearance.Options.UseBackColor = True Me.Appearance.Options.UseBackColor = True
Me.Appearance.Options.UseFont = True Me.Appearance.Options.UseFont = True
resources.ApplyResources(Me, "$this")
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.Controls.Add(Me.RibbonStatusBar1) Me.Controls.Add(Me.RibbonStatusBar1)
Me.Controls.Add(Me.ribbonMain) Me.Controls.Add(Me.ribbonMain)
@ -813,7 +779,6 @@ Partial Class frmMain
Friend WithEvents BarStaticItem1 As DevExpress.XtraBars.BarStaticItem Friend WithEvents BarStaticItem1 As DevExpress.XtraBars.BarStaticItem
Friend WithEvents bbtnItemViewsUser As DevExpress.XtraBars.BarButtonItem Friend WithEvents bbtnItemViewsUser As DevExpress.XtraBars.BarButtonItem
Friend WithEvents BarButtonItem23 As DevExpress.XtraBars.BarButtonItem Friend WithEvents BarButtonItem23 As DevExpress.XtraBars.BarButtonItem
Friend WithEvents itemRefreshProxy As DevExpress.XtraBars.BarButtonItem
Friend WithEvents LabelProxyServer As DevExpress.XtraBars.BarStaticItem Friend WithEvents LabelProxyServer As DevExpress.XtraBars.BarStaticItem
Friend WithEvents BarSubItem2 As DevExpress.XtraBars.BarSubItem Friend WithEvents BarSubItem2 As DevExpress.XtraBars.BarSubItem
Friend WithEvents BarButtonItem25 As DevExpress.XtraBars.BarButtonItem Friend WithEvents BarButtonItem25 As DevExpress.XtraBars.BarButtonItem
@ -822,6 +787,5 @@ Partial Class frmMain
Friend WithEvents ContextMenuStrip1 As System.Windows.Forms.ContextMenuStrip Friend WithEvents ContextMenuStrip1 As System.Windows.Forms.ContextMenuStrip
Friend WithEvents itemScanInbox As DevExpress.XtraBars.BarButtonItem Friend WithEvents itemScanInbox As DevExpress.XtraBars.BarButtonItem
Friend WithEvents BarButtonItem13 As DevExpress.XtraBars.BarButtonItem Friend WithEvents BarButtonItem13 As DevExpress.XtraBars.BarButtonItem
End Class End Class

View File

@ -1514,20 +1514,6 @@
yfvkPPhE1Ql+k9vzOv3/P/ifoPoeVeUDAqiG6o3/Nb1j0KB/AMYUfCkDw9hpAAAAAElFTkSuQmCC yfvkPPhE1Ql+k9vzOv3/P/ifoPoeVeUDAqiG6o3/Nb1j0KB/AMYUfCkDw9hpAAAAAElFTkSuQmCC
</value> </value>
</data> </data>
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="MainMenu.MenuAppearance.HeaderItemAppearance.FontSizeDelta" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="MainMenu.MenuAppearance.HeaderItemAppearance.FontStyleDelta" type="System.Drawing.FontStyle, System.Drawing">
<value>Regular</value>
</data>
<data name="MainMenu.MenuAppearance.HeaderItemAppearance.GradientMode" type="System.Drawing.Drawing2D.LinearGradientMode, System.Drawing">
<value>Horizontal</value>
</data>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="MainMenu.MenuAppearance.HeaderItemAppearance.Image" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="BarButtonItem1.Caption" xml:space="preserve"> <data name="BarButtonItem1.Caption" xml:space="preserve">
<value>Calendar</value> <value>Calendar</value>
</data> </data>
@ -2358,18 +2344,6 @@
qy3lS/H/Rm5QvyqWfPjLAcv+Bd859emhr0AKAAAAAElFTkSuQmCC qy3lS/H/Rm5QvyqWfPjLAcv+Bd859emhr0AKAAAAAElFTkSuQmCC
</value> </value>
</data> </data>
<data name="BarSubItem1.MenuAppearance.HeaderItemAppearance.FontSizeDelta" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="BarSubItem1.MenuAppearance.HeaderItemAppearance.FontStyleDelta" type="System.Drawing.FontStyle, System.Drawing">
<value>Regular</value>
</data>
<data name="BarSubItem1.MenuAppearance.HeaderItemAppearance.GradientMode" type="System.Drawing.Drawing2D.LinearGradientMode, System.Drawing">
<value>Horizontal</value>
</data>
<data name="BarSubItem1.MenuAppearance.HeaderItemAppearance.Image" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="btnGlobalSearch.Caption" xml:space="preserve"> <data name="btnGlobalSearch.Caption" xml:space="preserve">
<value>global search</value> <value>global search</value>
</data> </data>
@ -2482,30 +2456,6 @@
gM1WZEy2AaNhMGTCgByMVZB4/J8BAMCa3yXIH1ZEAAAAAElFTkSuQmCC gM1WZEy2AaNhMGTCgByMVZB4/J8BAMCa3yXIH1ZEAAAAAElFTkSuQmCC
</value> </value>
</data> </data>
<data name="LabelProxyServer.ItemAppearance.Normal.FontSizeDelta" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="LabelProxyServer.ItemAppearance.Normal.FontStyleDelta" type="System.Drawing.FontStyle, System.Drawing">
<value>Regular</value>
</data>
<data name="BarSubItem2.MenuAppearance.HeaderItemAppearance.FontSizeDelta" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="BarSubItem2.MenuAppearance.HeaderItemAppearance.FontStyleDelta" type="System.Drawing.FontStyle, System.Drawing">
<value>Regular</value>
</data>
<data name="BarSubItem2.MenuAppearance.HeaderItemAppearance.GradientMode" type="System.Drawing.Drawing2D.LinearGradientMode, System.Drawing">
<value>Horizontal</value>
</data>
<data name="BarSubItem2.MenuAppearance.HeaderItemAppearance.Image" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="StatusPersonifiedLogin.ItemAppearance.Normal.FontSizeDelta" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="StatusPersonifiedLogin.ItemAppearance.Normal.FontStyleDelta" type="System.Drawing.FontStyle, System.Drawing">
<value>Regular</value>
</data>
<data name="BarButtonItem13.Glyph" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="BarButtonItem13.Glyph" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAA90RVh0VGl0 iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAA90RVh0VGl0
@ -2561,18 +2511,6 @@
<data name="pageHome.Text" xml:space="preserve"> <data name="pageHome.Text" xml:space="preserve">
<value>Home - Main Views</value> <value>Home - Main Views</value>
</data> </data>
<data name="pageForms.Appearance.FontSizeDelta" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="pageForms.Appearance.FontStyleDelta" type="System.Drawing.FontStyle, System.Drawing">
<value>Regular</value>
</data>
<data name="pageForms.Appearance.GradientMode" type="System.Drawing.Drawing2D.LinearGradientMode, System.Drawing">
<value>Horizontal</value>
</data>
<data name="pageForms.Appearance.Image" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="pageForms.Text" xml:space="preserve"> <data name="pageForms.Text" xml:space="preserve">
<value>Other Views</value> <value>Other Views</value>
</data> </data>
@ -2589,28 +2527,16 @@
<value>SQL Configuration</value> <value>SQL Configuration</value>
</data> </data>
<data name="ribbonMain.Size" type="System.Drawing.Size, System.Drawing"> <data name="ribbonMain.Size" type="System.Drawing.Size, System.Drawing">
<value>1436, 150</value> <value>1444, 150</value>
</data> </data>
<data name="RibbonStatusBar1.Location" type="System.Drawing.Point, System.Drawing"> <data name="RibbonStatusBar1.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 763</value> <value>0, 767</value>
</data> </data>
<data name="RibbonStatusBar1.Size" type="System.Drawing.Size, System.Drawing"> <data name="RibbonStatusBar1.Size" type="System.Drawing.Size, System.Drawing">
<value>1436, 23</value> <value>1444, 23</value>
</data>
<data name="frmMain.Appearance.FontSizeDelta" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="frmMain.Appearance.FontStyleDelta" type="System.Drawing.FontStyle, System.Drawing">
<value>Regular</value>
</data>
<data name="frmMain.Appearance.GradientMode" type="System.Drawing.Drawing2D.LinearGradientMode, System.Drawing">
<value>Horizontal</value>
</data>
<data name="frmMain.Appearance.Image" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data> </data>
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing"> <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>1436, 786</value> <value>1444, 790</value>
</data> </data>
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>

File diff suppressed because it is too large Load Diff

View File

@ -76,7 +76,7 @@ Public Class frmMain
LabelUser.Caption = USER_USERNAME LabelUser.Caption = USER_USERNAME
'IP-Adresse-Auslesen 'IP-Adresse-Auslesen
Dim Addresslist() As IPAddress = _ Dim Addresslist() As IPAddress =
Dns.GetHostEntry(Dns.GetHostName()).AddressList Dns.GetHostEntry(Dns.GetHostName()).AddressList
Dim IPs As IPAddress Dim IPs As IPAddress
For Each IPs In Addresslist For Each IPs In Addresslist
@ -108,11 +108,11 @@ Public Class frmMain
End Sub End Sub
Sub Proxy_Server_Controls() Sub Proxy_Server_Controls()
If LICENSE_PROXY = True And clsDatabase.DB_PROXY_INITIALIZED = True Then If LICENSE_PROXY = True And clsDatabase.DB_PROXY_INITIALIZED = True Then
itemRefreshProxy.Visibility = BarItemVisibility.Always 'itemRefreshProxy.Visibility = BarItemVisibility.Always
LabelProxyServer.Visibility = BarItemVisibility.Always LabelProxyServer.Visibility = BarItemVisibility.Always
ClassLogger.Add(">> PROXY-SERVER is being used", False) ClassLogger.Add(">> PROXY-SERVER is being used", False)
Else Else
itemRefreshProxy.Visibility = BarItemVisibility.Never 'itemRefreshProxy.Visibility = BarItemVisibility.Never
LabelProxyServer.Visibility = BarItemVisibility.Never LabelProxyServer.Visibility = BarItemVisibility.Never
End If End If
End Sub End Sub
@ -146,9 +146,9 @@ Public Class frmMain
If ERROR_INIT = "NONE" Then If ERROR_INIT = "NONE" Then
If USER_IS_ADMIN = True Then If USER_IS_ADMIN = True Then
pageAdmin.Visible = True pageAdmin.Visible = True
itemRefreshProxy.Visibility = BarItemVisibility.Always ' itemRefreshProxy.Visibility = BarItemVisibility.Always
Else Else
itemRefreshProxy.Visibility = BarItemVisibility.Never 'itemRefreshProxy.Visibility = BarItemVisibility.Never
End If End If
Dim msg = "Anzahl Angemeldete User: " & USERS_LOGGED_IN.ToString() Dim msg = "Anzahl Angemeldete User: " & USERS_LOGGED_IN.ToString()
If USER_LANGUAGE <> "de-DE" Then If USER_LANGUAGE <> "de-DE" Then
@ -225,8 +225,8 @@ Public Class frmMain
Public Sub LoadMenuItems2() Public Sub LoadMenuItems2()
Try Try
Dim SQL2 As String = String.Format("SELECT GUID, dbo.FNPMO_GETOBJECTCAPTION('{0}', 'CONSTR_MENUE' + CONVERT(VARCHAR(5), GUID), {1}) AS FORM_TITLE, SEQUENCE_MENU, ADDED_WHO, ADDED_WHEN, CHANGED_WHO," & _ Dim SQL2 As String = String.Format("SELECT GUID, dbo.FNPMO_GETOBJECTCAPTION('{0}', 'CONSTR_MENUE' + CONVERT(VARCHAR(5), GUID), {1}) AS FORM_TITLE, SEQUENCE_MENU, ADDED_WHO, ADDED_WHEN, CHANGED_WHO," &
"CHANGED_WHEN, MENU_IMG, SHORT_TITLE, LANGUAGE, " & _ "CHANGED_WHEN, MENU_IMG, SHORT_TITLE, LANGUAGE, " &
"'CONSTR_MENUE' + CONVERT(VARCHAR(5), GUID) as OBECTNAME FROM TBPMO_FORM_CONSTRUCTOR where GUID in (SELECT CONSTRUCT_ID FROM TBPMO_CONSTRUCTOR_USER WHERE HOME_MENUE = 0 AND USER_ID = {2}) ORDER BY SEQUENCE_MENU", USER_LANGUAGE, CURRENT_SCREEN_ID, USER_GUID) "'CONSTR_MENUE' + CONVERT(VARCHAR(5), GUID) as OBECTNAME FROM TBPMO_FORM_CONSTRUCTOR where GUID in (SELECT CONSTRUCT_ID FROM TBPMO_CONSTRUCTOR_USER WHERE HOME_MENUE = 0 AND USER_ID = {2}) ORDER BY SEQUENCE_MENU", USER_LANGUAGE, CURRENT_SCREEN_ID, USER_GUID)
Dim dt As DataTable = ClassDatabase.Return_Datatable(SQL2) Dim dt As DataTable = ClassDatabase.Return_Datatable(SQL2)
@ -247,7 +247,7 @@ Public Class frmMain
If title = "CAPTION (OBJ) NOT TRANSLATED" Then If title = "CAPTION (OBJ) NOT TRANSLATED" Then
Dim objectname = row.Item("OBECTNAME") Dim objectname = row.Item("OBECTNAME")
Dim objectname_temp = String.Format("Object {0} not translated", objectname) Dim objectname_temp = String.Format("Object {0} not translated", objectname)
Dim ins = String.Format("INSERT INTO TBPMO_LANGUAGE_OBJECT (LANGUAGE_TYPE,SCREEN_ID,PMO_OBJECT_NAME,CAPTION) VALUES " & _ Dim ins = String.Format("INSERT INTO TBPMO_LANGUAGE_OBJECT (LANGUAGE_TYPE,SCREEN_ID,PMO_OBJECT_NAME,CAPTION) VALUES " &
"('{0}',{1},'{2}', '{3}')", USER_LANGUAGE, CURRENT_SCREEN_ID, objectname, objectname_temp) "('{0}',{1},'{2}', '{3}')", USER_LANGUAGE, CURRENT_SCREEN_ID, objectname, objectname_temp)
If ClassDatabase.Execute_non_Query(ins) = True Then If ClassDatabase.Execute_non_Query(ins) = True Then
title = objectname_temp title = objectname_temp
@ -324,8 +324,8 @@ Public Class frmMain
End Sub End Sub
Public Sub LoadQuickStartItems() Public Sub LoadQuickStartItems()
Try Try
Dim SQL2 As String = String.Format("SELECT GUID, dbo.FNPMO_GETOBJECTCAPTION('{0}', 'CONSTR_MENUE' + CONVERT(VARCHAR(5), GUID), {1}) AS FORM_TITLE, SEQUENCE_MENU, ADDED_WHO, ADDED_WHEN, CHANGED_WHO," & _ Dim SQL2 As String = String.Format("SELECT GUID, dbo.FNPMO_GETOBJECTCAPTION('{0}', 'CONSTR_MENUE' + CONVERT(VARCHAR(5), GUID), {1}) AS FORM_TITLE, SEQUENCE_MENU, ADDED_WHO, ADDED_WHEN, CHANGED_WHO," &
"CHANGED_WHEN, MENU_IMG, SHORT_TITLE, LANGUAGE, " & _ "CHANGED_WHEN, MENU_IMG, SHORT_TITLE, LANGUAGE, " &
"'CONSTR_MENUE' + CONVERT(VARCHAR(5), GUID) as OBECTNAME FROM TBPMO_FORM_CONSTRUCTOR where GUID in (SELECT CONSTRUCT_ID FROM TBPMO_CONSTRUCTOR_USER WHERE HOME_MENUE = 1 AND USER_ID = {2}) ORDER BY SEQUENCE_MENU", USER_LANGUAGE, CURRENT_SCREEN_ID, USER_GUID) "'CONSTR_MENUE' + CONVERT(VARCHAR(5), GUID) as OBECTNAME FROM TBPMO_FORM_CONSTRUCTOR where GUID in (SELECT CONSTRUCT_ID FROM TBPMO_CONSTRUCTOR_USER WHERE HOME_MENUE = 1 AND USER_ID = {2}) ORDER BY SEQUENCE_MENU", USER_LANGUAGE, CURRENT_SCREEN_ID, USER_GUID)
Dim dt As DataTable = ClassDatabase.Return_Datatable(SQL2) Dim dt As DataTable = ClassDatabase.Return_Datatable(SQL2)
Dim image2 As Bitmap = LoadNoImage() Dim image2 As Bitmap = LoadNoImage()
@ -353,7 +353,7 @@ Public Class frmMain
If title = "CAPTION (OBJ) NOT TRANSLATED" Then If title = "CAPTION (OBJ) NOT TRANSLATED" Then
Dim objectname = row.Item("OBECTNAME") Dim objectname = row.Item("OBECTNAME")
Dim objectname_temp = String.Format("Object {0} not translated", objectname) Dim objectname_temp = String.Format("Object {0} not translated", objectname)
Dim ins = String.Format("INSERT INTO TBPMO_LANGUAGE_OBJECT (LANGUAGE_TYPE,SCREEN_ID,PMO_OBJECT_NAME,CAPTION) VALUES " & _ Dim ins = String.Format("INSERT INTO TBPMO_LANGUAGE_OBJECT (LANGUAGE_TYPE,SCREEN_ID,PMO_OBJECT_NAME,CAPTION) VALUES " &
"('{0}',{1},'{2}', '{3}')", USER_LANGUAGE, CURRENT_SCREEN_ID, objectname, objectname_temp) "('{0}',{1},'{2}', '{3}')", USER_LANGUAGE, CURRENT_SCREEN_ID, objectname, objectname_temp)
If ClassDatabase.Execute_non_Query(ins) = True Then If ClassDatabase.Execute_non_Query(ins) = True Then
title = objectname_temp title = objectname_temp
@ -516,6 +516,7 @@ Public Class frmMain
End Sub End Sub
Private Sub frmMain_Shown(sender As Object, e As EventArgs) Handles Me.Shown Private Sub frmMain_Shown(sender As Object, e As EventArgs) Handles Me.Shown
Try
Me.Cursor = Cursors.WaitCursor Me.Cursor = Cursors.WaitCursor
If ERROR_INIT <> "INVALID USER" Then If ERROR_INIT <> "INVALID USER" Then
If Task_Popup_minutes <> 0 Then If Task_Popup_minutes <> 0 Then
@ -583,6 +584,15 @@ Public Class frmMain
Me.Close() Me.Close()
End If End If
Dim myversion = CInt(My.Application.Info.Version.ToString.Replace(".", ""))
Dim minreqver = CInt(MIN_REQUIRED_VERSION.Replace(".", ""))
If myversion < minreqver Then
MsgBox(String.Format("Your version '{0}' does not match the minimum required version and needs to be updated! Please contact Your systemadministrator!" & vbNewLine & "Application will close now.", My.Application.Info.Version.ToString), MsgBoxStyle.Exclamation)
Me.Close()
End If
Catch ex As Exception
MsgBox("Unexpected Error in FormShown: " & ex.Message, MsgBoxStyle.Critical)
End Try
@ -659,7 +669,7 @@ Public Class frmMain
Private Sub itemSettings_ItemClick(sender As Object, e As ItemClickEventArgs) Handles itemSettings.ItemClick Private Sub itemSettings_ItemClick(sender As Object, e As ItemClickEventArgs) Handles itemSettings.ItemClick
Load_ConfigBasic() Load_ConfigBasic()
End Sub End Sub
Private Sub itemRefreshProxy_ItemClick(sender As Object, e As ItemClickEventArgs) Handles itemRefreshProxy.ItemClick Private Sub itemRefreshProxy_ItemClick(sender As Object, e As ItemClickEventArgs)
Me.Cursor = Cursors.WaitCursor Me.Cursor = Cursors.WaitCursor
Dim upd = "UPDATE TBPROXY_CONFIG SET SYNC_RUNNING = 1 WHERE GUID = 1" Dim upd = "UPDATE TBPROXY_CONFIG SET SYNC_RUNNING = 1 WHERE GUID = 1"
clsDatabase.Execute_non_Query(upd, True) clsDatabase.Execute_non_Query(upd, True)

File diff suppressed because it is too large Load Diff

View File

@ -400,20 +400,31 @@ Public Class frmRecordView
Else Else
Comment = String.Format(">> " & Now.ToString & ": User {0} Changed the state to: {1}", Environment.UserName, State_DESC) Comment = String.Format(">> " & Now.ToString & ": User {0} Changed the state to: {1}", Environment.UserName, State_DESC)
End If End If
upd = String.Format("UPDATE TBPMO_WORKFLOW_TASK SET COMMENT = '{0}', DUE_DATE = '{1}',CHANGED_WHO = '{2}', TASK_DATE = '{3}' " & _
"WHERE GUID = {4}", Comment, DUE_DATEDateTimePicker.Value, USER_USERNAME, DateTimePickerTASK_DATE.Value, WF_TASK_ID)
ClassDatabase.Execute_non_Query(upd, True)
If STATE_id > 0 Then If STATE_id > 0 Then
ins = String.Format("INSERT INTO TBPMO_WORKFLOW_TASK_HISTORY (WF_TASK_ID,STATE_ID,STATE_DESC,COMMENT,ADDED_WHO) VALUES" & _ ins = String.Format("INSERT INTO TBPMO_WORKFLOW_TASK_HISTORY (WF_TASK_ID,STATE_ID,STATE_DESC,COMMENT,ADDED_WHO) VALUES" &
"({0},{1},'{2}','{3}','{4}')", WF_TASK_ID, STATE_id, State_DESC, Comment, USER_USERNAME) "({0},{1},'{2}','{3}','{4}')", WF_TASK_ID, STATE_id, State_DESC, Comment, USER_USERNAME)
STATE_IDComboBox.SelectedIndex = -1 If ClassDatabase.Execute_non_Query(ins) Then
If clsDatabase.DB_PROXY_INITIALIZED = True Then
ClassDatabase.Execute_non_Query("EXEC PRPROXY_TBPMO_WORKFLOW_TASK_HISTORY_INS " & WF_TASK_ID, True)
End If
End If
End If
If STATE_id > 0 Then
upd = String.Format("UPDATE TBPMO_WORKFLOW_TASK SET STATE_ID= {5}, COMMENT = '{0}', DUE_DATE = '{1}',CHANGED_WHO = '{2}', TASK_DATE = '{3}' " &
"WHERE GUID = {4}", Comment, DUE_DATEDateTimePicker.Value, USER_USERNAME, DateTimePickerTASK_DATE.Value, WF_TASK_ID, STATE_id)
Else Else
upd = String.Format("UPDATE TBPMO_WORKFLOW_TASK SET COMMENT = '{0}', DUE_DATE = '{1}',CHANGED_WHO = '{2}', TASK_DATE = '{3}' " &
"WHERE GUID = {4}", Comment, DUE_DATEDateTimePicker.Value, USER_USERNAME, DateTimePickerTASK_DATE.Value, WF_TASK_ID)
End If
If ClassDatabase.Execute_non_Query(upd) Then
If clsDatabase.DB_PROXY_INITIALIZED = True Then
ClassDatabase.Execute_non_Query("EXEC PRPROXY_TBPMO_WORKFLOW_TASK_UPDATE " & WF_TASK_ID, True)
End If
End If
STATE_IDComboBox.SelectedIndex = -1 STATE_IDComboBox.SelectedIndex = -1
End If
If ClassDatabase.Execute_non_Query(ins, True) Then
ClassWorkflow.Refresh_Workflows_Entity() ClassWorkflow.Refresh_Workflows_Entity()
ClassProxy.Refresh_Workflow_Data() ClassProxy.Refresh_Workflow_Data()
Load_Task_Data() Load_Task_Data()
@ -423,9 +434,7 @@ Public Class frmRecordView
Load_History() Load_History()
End If End If
_Changed = False _Changed = False
Else
MsgBox("Update not successfull. Please check logfile.", MsgBoxStyle.Exclamation)
End If
' Me.TBPMO_WORKFLOW_TASKTableAdapter.cmdUpdate(COMMENTTextBox.Text, DUE_DATEDateTimePicker.Value, STATE_IDComboBox.SelectedValue, 1, USER_USERNAME, DateTimePicker1.Value, Me.GUIDTextBox.Text) ' Me.TBPMO_WORKFLOW_TASKTableAdapter.cmdUpdate(COMMENTTextBox.Text, DUE_DATEDateTimePicker.Value, STATE_IDComboBox.SelectedValue, 1, USER_USERNAME, DateTimePicker1.Value, Me.GUIDTextBox.Text)
Catch ex As Exception Catch ex As Exception
MsgBox("Error in save Workflow:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) MsgBox("Error in save Workflow:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
@ -734,7 +743,9 @@ Public Class frmRecordView
If (Me.ListViewExclusiveUser.SelectedItems.Count > 0) Then If (Me.ListViewExclusiveUser.SelectedItems.Count > 0) Then
Dim sql = "DELETE FROM TBPMO_WORKFLOW_TASK_USER WHERE GUID = " & Me.ListViewExclusiveUser.SelectedItems.Item(0).Text Dim sql = "DELETE FROM TBPMO_WORKFLOW_TASK_USER WHERE GUID = " & Me.ListViewExclusiveUser.SelectedItems.Item(0).Text
ClassDatabase.Execute_non_Query(sql, False) ClassDatabase.Execute_non_Query(sql, False)
ClassProxy.Refresh_Workflow_Data() If clsDatabase.DB_PROXY_INITIALIZED Then
ClassDatabase.Execute_non_Query(sql, False)
End If
Load_TASK_USER() Load_TASK_USER()
End If End If
Catch ex As Exception Catch ex As Exception

View File

@ -86,7 +86,7 @@ Partial Class frmStart
Me.Button2.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.Button2.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.Button2.Image = Global.RecordOrganizer_RightManager.My.Resources.Resources.folder_Closed_16xSM Me.Button2.Image = Global.RecordOrganizer_RightManager.My.Resources.Resources.folder_Closed_16xSM
Me.Button2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft Me.Button2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.Button2.Location = New System.Drawing.Point(707, 14) Me.Button2.Location = New System.Drawing.Point(711, 14)
Me.Button2.Name = "Button2" Me.Button2.Name = "Button2"
Me.Button2.Size = New System.Drawing.Size(111, 23) Me.Button2.Size = New System.Drawing.Size(111, 23)
Me.Button2.TabIndex = 1 Me.Button2.TabIndex = 1
@ -140,7 +140,7 @@ Partial Class frmStart
' '
Me.GroupBox1.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.GroupBox1.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.GroupBox1.Controls.Add(Me.chkLogerrorsonly) Me.GroupBox1.Controls.Add(Me.chkLogerrorsonly)
Me.GroupBox1.Location = New System.Drawing.Point(618, 43) Me.GroupBox1.Location = New System.Drawing.Point(622, 43)
Me.GroupBox1.Name = "GroupBox1" Me.GroupBox1.Name = "GroupBox1"
Me.GroupBox1.Size = New System.Drawing.Size(200, 67) Me.GroupBox1.Size = New System.Drawing.Size(200, 67)
Me.GroupBox1.TabIndex = 6 Me.GroupBox1.TabIndex = 6
@ -164,7 +164,7 @@ Partial Class frmStart
Me.XtraTabPage2.Controls.Add(Me.GridControl1) Me.XtraTabPage2.Controls.Add(Me.GridControl1)
Me.XtraTabPage2.Controls.Add(Me.Label1) Me.XtraTabPage2.Controls.Add(Me.Label1)
Me.XtraTabPage2.Name = "XtraTabPage2" Me.XtraTabPage2.Name = "XtraTabPage2"
Me.XtraTabPage2.Size = New System.Drawing.Size(825, 222) Me.XtraTabPage2.Size = New System.Drawing.Size(821, 219)
Me.XtraTabPage2.Text = "Rights 2b worked" Me.XtraTabPage2.Text = "Rights 2b worked"
' '
'btnrefreshJobs 'btnrefreshJobs
@ -299,7 +299,7 @@ Partial Class frmStart
Me.Label1.Name = "Label1" Me.Label1.Name = "Label1"
Me.Label1.Size = New System.Drawing.Size(536, 13) Me.Label1.Size = New System.Drawing.Size(536, 13)
Me.Label1.TabIndex = 0 Me.Label1.TabIndex = 0
Me.Label1.Text = "Following rights will be set within the next minutes. If not check wether Servic" & _ Me.Label1.Text = "Following rights will be set within the next minutes. If not check wether Servic" &
"e DD Rights Manager is running." "e DD Rights Manager is running."
' '
'VWPMO_RIGHTS_2B_WORKEDTableAdapter 'VWPMO_RIGHTS_2B_WORKEDTableAdapter

View File

@ -13,6 +13,7 @@ Module ModuleMySettings
Public MyConnectionString As String = "" Public MyConnectionString As String = ""
Public MyServer_UpdatePath As String = "" Public MyServer_UpdatePath As String = ""
Public VERSION_SERVER = "1.0.0.0" Public VERSION_SERVER = "1.0.0.0"
Public MIN_REQUIRED_VERSION = "1.0.0.0"
Public VERSION_USER = "1.0.0.0" Public VERSION_USER = "1.0.0.0"
Public FORCE_UPDATE As Boolean = False Public FORCE_UPDATE As Boolean = False
Public UPDATE_ID As Integer Public UPDATE_ID As Integer

View File

@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben: ' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")> ' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("1.1.0.1")> <Assembly: AssemblyVersion("1.2.0.0")>
<Assembly: AssemblyFileVersion("1.0.0.0")> <Assembly: AssemblyFileVersion("1.0.0.0")>

View File

@ -165,7 +165,9 @@ Public Class frmVersionCheck
Dim error_while_replacing = False Dim error_while_replacing = False
For Each Upd_item As DataRow In DT_UPDATE_ITEMS.Rows For Each Upd_item As DataRow In DT_UPDATE_ITEMS.Rows
Dim BackUpOfFileToReplace As String = MY_INSTALL_PATH & "\" & Upd_item.Item("ITEM_INFO") & ".bac" Dim BackUpOfFileToReplace As String = MY_INSTALL_PATH & "\" & Upd_item.Item("ITEM_INFO") & ".bac"
BackUpOfFileToReplace = BackUpOfFileToReplace.ToString.Replace("\\", "\")
Dim sourcefile = Path.Combine(FOLDER_TEMP, Upd_item.Item("ITEM_INFO")) Dim sourcefile = Path.Combine(FOLDER_TEMP, Upd_item.Item("ITEM_INFO"))
sourcefile = sourcefile.ToString.Replace("\\", "\")
Dim targetfile Dim targetfile
If IsDBNull(Upd_item.Item("INFO1")) Then If IsDBNull(Upd_item.Item("INFO1")) Then
targetfile = Path.Combine(MY_INSTALL_PATH, Upd_item.Item("ITEM_INFO")) targetfile = Path.Combine(MY_INSTALL_PATH, Upd_item.Item("ITEM_INFO"))
@ -177,10 +179,12 @@ Public Class frmVersionCheck
End If End If
End If End If
targetfile = targetfile.ToString.Replace("\\", "\")
Try Try
' Replace the file. ' Replace the file.
If File.Exists(targetfile) Then If File.Exists(targetfile) Then
If File_Rename(targetfile, BackUpOfFileToReplace) = True Then If File_Rename(targetfile, BackUpOfFileToReplace) = True Then
If File.Exists(BackUpOfFileToReplace) Then
If MoveFile(sourcefile, targetfile) = True Then If MoveFile(sourcefile, targetfile) = True Then
File_Delete(BackUpOfFileToReplace) File_Delete(BackUpOfFileToReplace)
Else Else
@ -189,6 +193,9 @@ Public Class frmVersionCheck
End If End If
End If End If
Else Else
End If
Else
MoveFile(sourcefile, targetfile) MoveFile(sourcefile, targetfile)
End If End If
@ -254,7 +261,7 @@ Public Class frmVersionCheck
Rename(targetfile, Renamefilestring) Rename(targetfile, Renamefilestring)
Return True Return True
Catch ex As Exception Catch ex As Exception
ClassLogger.Add(String.Format("Unexpected Error in File_Rename: " & " targetfile '{0}'" & "Renamefilestring '{1}'" & "ERROR: {2}", targetfile, Renamefilestring, ex.Message)) ClassLogger.Add(String.Format("frmVersionCheck - Unexpected Error in File_Rename: " & " OldPath '{0}'" & "NewPath '{1}'" & "ERROR: {2}", targetfile, Renamefilestring, ex.Message))
ClassLogger.Add("myRow: " & myRow.ToString, False) ClassLogger.Add("myRow: " & myRow.ToString, False)
Return False Return False
End Try End Try
@ -273,7 +280,7 @@ Public Class frmVersionCheck
File.Move(sourcefile, targetfile) File.Move(sourcefile, targetfile)
Return True Return True
Catch ex As Exception Catch ex As Exception
ClassLogger.Add(String.Format("Unexpected Error in MoveFile: sourcefile '{0}', targetfile '{1}' - ERROR: {2}", sourcefile, targetfile, ex.Message)) ClassLogger.Add(String.Format("Unexpected Error in MoveFile: sourcefile '{0}', destfilename '{1}' - ERROR: {2}", sourcefile, targetfile, ex.Message))
Return False Return False
End Try End Try
End Function End Function