This commit is contained in:
Digital Data - Marlon Schreiber 2017-12-13 14:56:40 +01:00
parent abbc238bf6
commit 06080901f5
7 changed files with 78 additions and 42 deletions

View File

@ -368,7 +368,7 @@ Public Class ClassWindream_allgemein
Dim Values = oChoiceList
Values = oChoiceList.GetVariableValue("vItems")
Dim anz As Integer = 0
If LogErrorsOnly = False Then MsgBox("Try getting values for resullist: " & _auswahlliste)
For Each CLItem In Values
If oChoiceList.aName IsNot Nothing Then
anz += 1
@ -377,6 +377,7 @@ Public Class ClassWindream_allgemein
Dim strListe(anz - 1)
Dim zahl As Integer = 0
For Each CLItem In Values
If LogErrorsOnly = False Then MsgBox("Item: " & CLItem)
If oChoiceList.aName IsNot Nothing Then
strListe(zahl) = CLItem
zahl += 1

View File

@ -59,10 +59,6 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Data.v15.2.dll</HintPath>
</Reference>
<Reference Include="DevExpress.Pdf.v15.2.Core, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Pdf.v15.2.Core.dll</HintPath>
</Reference>
<Reference Include="DevExpress.Pdf.v15.2.Drawing, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Pdf.v15.2.Drawing.dll</HintPath>
@ -71,6 +67,10 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Printing.v15.2.Core.dll</HintPath>
</Reference>
<Reference Include="DevExpress.Utils.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Utils.v15.2.dll</HintPath>
</Reference>
<Reference Include="DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraBars.v15.2.dll</HintPath>
@ -95,6 +95,10 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraPrinting.v15.2.dll</HintPath>
</Reference>
<Reference Include="DevExpress.XtraTreeList.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraTreeList.v15.2.dll</HintPath>
</Reference>
<Reference Include="DLLLicenseManager">
<HintPath>..\..\..\LizenzManager\LizenzManager\bin\Debug\DLLLicenseManager.dll</HintPath>
</Reference>

View File

@ -18,7 +18,7 @@ Imports System.Runtime.InteropServices
<Assembly: ComVisible(False)>
'Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird
<Assembly: Guid("158d9c39-8ba7-48ec-b2e8-39bc1031be67")>
<Assembly: Guid("158d9c39-8ba7-48ec-b2e8-39bc1031be67")>
' Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten:
'
@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("1.9.3.3")>
<Assembly: AssemblyVersion("1.9.3.4")>
<Assembly: AssemblyFileVersion("1.0.0.0")>

View File

@ -1,5 +1,6 @@
Imports WINDREAMLib
Imports DLLLicenseManager
Imports DevExpress.LookAndFeel
Imports System.Globalization
Public Class frmMain
@ -33,6 +34,7 @@ Public Class frmMain
End Sub
Private Sub frmProfiles_Load(sender As Object, e As System.EventArgs) Handles Me.Load
UserLookAndFeel.Default.SetSkinStyle("VS2010")
tslblVersion.Text = String.Format("Version {0}", My.Application.Info.Version.ToString)
If ERROR_STATE = "NO DB-CONNECTION" Or ERROR_STATE = "FAILED DBCONNECTION" Then
MsgBox("Bitte hinterlegen Sie die Datenbankverbindung in der Konfiguration!", MsgBoxStyle.Critical, "Fehlende Konfiguration:")
@ -59,7 +61,7 @@ Public Class frmMain
Else
ClassLogger.Add(">> Username: " & Environment.UserName, False)
'Wenn license abgelaufen und der User nicht admin ist!
If license_expired = True Then
If LICENSE_EXPIRED = True Then
If USER_IS_ADMIN = False Then
Me.Close()
End If
@ -76,7 +78,7 @@ Public Class frmMain
Catch ex As Exception
MsgBox(ex.Message, MsgBoxStyle.Exclamation, "Fehler bei User Check:")
End Try
Try
tsstlblUser.Text = Environment.UserName
LoadProfile_PM()
@ -90,23 +92,9 @@ Public Class frmMain
Timer.Start()
Check_Timer_Notification()
Restore_Form_Position()
End If
Try
' Sind Werte hinterlegt?
If My.Settings.frmMainPosition.IsEmpty = False Then
If My.Settings.frmMainPosition.X > 0 And My.Settings.frmMainPosition.Y > 0 Then
' Gespeicherte Werte verwenden
Me.Location = My.Settings.frmValidatorPosition
End If
End If
' Sind Werte hinterlegt?
If Not My.Settings.frmMainSize.IsEmpty Then
' Gespeicherte Werte verwenden
Me.Size = My.Settings.frmMainSize
End If
Catch ex As Exception
ClassLogger.Add("Error in Load FormLayout: " & ex.Message)
End Try
End Sub
Sub Check_Timer_Notification()
If My.Settings.IntervallReminder <> 0 Then
@ -118,6 +106,24 @@ Public Class frmMain
TimerReminder.Stop()
End If
End Sub
Sub Restore_Form_Position()
Try
' Sind Werte hinterlegt?
If My.Settings.frmMainPosition.IsEmpty = False Then
If My.Settings.frmMainPosition.X > 0 And My.Settings.frmMainPosition.Y > 0 Then
' Gespeicherte Werte verwenden
Me.Location = My.Settings.frmMainPosition
End If
End If
' Sind Werte hinterlegt?
If Not My.Settings.frmMainSize.IsEmpty Then
' Gespeicherte Werte verwenden
Me.Size = My.Settings.frmMainSize
End If
Catch ex As Exception
ClassLogger.Add("Error in Load FormLayout: " & ex.Message)
End Try
End Sub
Function Refresh_ConnectionString()
Try
TBPM_KONFIGURATIONTableAdapter.Connection.ConnectionString = MyConnectionString
@ -265,4 +271,8 @@ Public Class frmMain
Private Sub TimerReminder_Tick(sender As Object, e As EventArgs) Handles TimerReminder.Tick
If PROFILE_COUNT > 0 Then NotifyIcon1.ShowBalloonTip(30000, "Validation-Reminder", "Sie haben unerledigte Dokumente in Ihrem Verantwortungsbereich.", ToolTipIcon.Info)
End Sub
Private Sub frmMain_Shown(sender As Object, e As EventArgs) Handles Me.Shown
End Sub
End Class

View File

@ -1,9 +1,9 @@
<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
Partial Class frmValidator
Inherits System.Windows.Forms.Form
'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)
Try
If disposing AndAlso components IsNot Nothing Then
@ -20,7 +20,7 @@ Partial Class frmValidator
'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
'Das Bearbeiten ist mit dem Windows Form-Designer möglich.
'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
<System.Diagnostics.DebuggerStepThrough()> _
<System.Diagnostics.DebuggerStepThrough()>
Private Sub InitializeComponent()
Me.components = New System.ComponentModel.Container()
Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmValidator))
@ -172,16 +172,19 @@ Partial Class frmValidator
'
'BarAndDockingController3
'
Me.BarAndDockingController3.PropertiesBar.AllowLinkLighting = False
Me.BarAndDockingController3.PropertiesBar.DefaultGlyphSize = New System.Drawing.Size(16, 16)
Me.BarAndDockingController3.PropertiesBar.DefaultLargeGlyphSize = New System.Drawing.Size(32, 32)
'
'BarAndDockingController2
'
Me.BarAndDockingController2.PropertiesBar.AllowLinkLighting = False
Me.BarAndDockingController2.PropertiesBar.DefaultGlyphSize = New System.Drawing.Size(16, 16)
Me.BarAndDockingController2.PropertiesBar.DefaultLargeGlyphSize = New System.Drawing.Size(32, 32)
'
'BarAndDockingController1
'
Me.BarAndDockingController1.PropertiesBar.AllowLinkLighting = False
Me.BarAndDockingController1.PropertiesBar.DefaultGlyphSize = New System.Drawing.Size(16, 16)
Me.BarAndDockingController1.PropertiesBar.DefaultLargeGlyphSize = New System.Drawing.Size(32, 32)
'
@ -945,7 +948,7 @@ Partial Class frmValidator
'tslblWebbrowser
'
Me.tslblWebbrowser.Name = "tslblWebbrowser"
Me.tslblWebbrowser.Size = New System.Drawing.Size(121, 17)
Me.tslblWebbrowser.Size = New System.Drawing.Size(120, 17)
Me.tslblWebbrowser.Text = "ToolStripStatusLabel1"
'
'grpBetreff

View File

@ -7,6 +7,8 @@ Imports System.Globalization
Imports Oracle.ManagedDataAccess.Client
Imports Independentsoft
Imports System.IO
Imports DevExpress.Pdf.pdfdo
Imports DevExpress.Pdf
Public Class frmValidator
Dim viewerID
@ -48,7 +50,7 @@ Public Class frmValidator
Dim pdfxchange As Boolean = False
Dim sumatra As Boolean = False
<DllImport("user32.dll", CharSet:=CharSet.Ansi, SetLastError:=True, ExactSpelling:=True)> _
<DllImport("user32.dll", CharSet:=CharSet.Ansi, SetLastError:=True, ExactSpelling:=True)>
Public Shared Function SetForegroundWindow(ByVal hwnd As IntPtr) As <MarshalAs(UnmanagedType.Bool)> Boolean
End Function
Function set_foreground()
@ -131,7 +133,7 @@ Public Class frmValidator
KillU_Viewer()
End If
End Sub
Sub KillU_Viewer()
@ -498,9 +500,13 @@ Public Class frmValidator
Dim ControlID = TBPM_PROFILE_CONTROLSTableAdapter.cmdGetGUID(CURRENT_ProfilGUID, cmbname)
If LogErrorsOnly = False Then ClassLogger.Add(" >> In add_ComboBox - GUID: " & ControlID, False)
If ControlID > 0 Then
If LogErrorsOnly = False Then ClassLogger.Add(" >>ControlID > 0", False)
Dim ConID = Me.TBPM_PROFILE_CONTROLSTableAdapter.cmdgetConnectionID(ControlID)
If ConID Is Nothing = False Then
If ConID > 0 And TBPM_PROFILE_CONTROLSTableAdapter.cmdGetSQL(ControlID) <> "" Then
Dim commandsql = TBPM_PROFILE_CONTROLSTableAdapter.cmdGetSQL(ControlID)
If LogErrorsOnly = False Then ClassLogger.Add(" >> ConID Is Nothing = False", False)
If ConID > 0 And commandsql <> "" Then
If LogErrorsOnly = False Then ClassLogger.Add(" >> CConID > 0 And TBPM_PROFILE_CONTROLSTableAdapter.cmdGetSQL(ControlID)", False)
Dim connectionString As String
Me.TBPM_CONNECTIONTableAdapter.FillByID(Me.DD_DMSLiteDataSet.TBPM_CONNECTION, ConID)
Dim DT As DataTable = Me.DD_DMSLiteDataSet.TBPM_CONNECTION
@ -518,7 +524,7 @@ Public Class frmValidator
Dim conn As New OracleConnectionStringBuilder
Dim connstr As String
If drConnection.Item("SERVER") <> "" And drConnection.Item("DATENBANK").GetType.ToString <> "system.dbnull" Then
connstr = "Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=" & drConnection.Item("SERVER") & ")(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=" & _
connstr = "Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=" & drConnection.Item("SERVER") & ")(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=" &
drConnection.Item("DATENBANK") & ")));User Id=" & drConnection.Item("USERNAME") & ";Password=" & drConnection.Item("PASSWORD") & ";"
Else
conn.DataSource = drConnection.Item("SERVER")
@ -564,8 +570,11 @@ Public Class frmValidator
MsgBox(ex.Message, MsgBoxStyle.Critical, "Fehler bei GetValues SQL:")
End Try
End If
Else
If LogErrorsOnly = False Then ClassLogger.Add(" >> Else Row 571", False)
End If
Else
If LogErrorsOnly = False Then ClassLogger.Add(" >> AListe Handling", False)
Dim AListe As String = TBPM_PROFILE_CONTROLSTableAdapter.cmdGetChoiceListName(ControlID)
If LogErrorsOnly = False Then ClassLogger.Add(" >> In add_ComboBox - AListe: " & AListe, False)
If AListe Is Nothing = False Then
@ -576,7 +585,11 @@ Public Class frmValidator
cmb.Items.Add(index)
Next
cmb.SelectedIndex = -1
Else
MsgBox("Resultliste windream is nothing!", MsgBoxStyle.Exclamation, AListe)
End If
Else
MsgBox("AListe from database is nothing!", MsgBoxStyle.Exclamation, AListe)
End If
End If
@ -980,7 +993,7 @@ Public Class frmValidator
Catch ex As Exception
MsgBox("Fehler in ShowFile_UniversalViewer:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
End Try
End Sub
Public Function IsProcessRunning(name As String) As Boolean
@ -1105,7 +1118,7 @@ Public Class frmValidator
CURRENT_DOC_ID = DT.Rows(0).Item("GUID")
tsslblDocID.Text = "Document-ID: " & CURRENT_DOC_ID
AnzDoks = DT.Rows.Count
End Sub
@ -1515,8 +1528,8 @@ Public Class frmValidator
For Each inctrl As Control In Me.pnldesigner.Controls
Dim CONTROL_ID = inctrl.Tag
Dim controlRow = (From form In DD_DMSLiteDataSet.VWPM_CONTROL_INDEX.AsEnumerable()
Select form
Where form.Item("GUID") = CONTROL_ID).Single()
Select form
Where form.Item("GUID") = CONTROL_ID).Single()
Dim Type As String = inctrl.GetType.ToString
Dim Typ As String = controlRow.Item("CTRL_TYPE")
@ -1559,7 +1572,7 @@ Public Class frmValidator
End If
End If
End If
End If
If wertWD Is Nothing = False Then
@ -1577,7 +1590,7 @@ Public Class frmValidator
ClassLogger.Add(">> Indexname windream: " & indexname, False)
Exit Sub
End Try
Case "System.Windows.Forms.ComboBox"
controltype = "ComboBox"
Dim cmb As ComboBox = inctrl
@ -2161,7 +2174,7 @@ Public Class frmValidator
ClassLogger.Add("Unvorhergesehener Fehler in Check_UpdateIndexe:" & ex.Message & " - Line: " & st.GetFrame(0).GetFileLineNumber().ToString, True)
Return True
End Try
Case "System.Windows.Forms.ComboBox"
Dim cmb As ComboBox = inctrl
'Wenn kein Wert ausgewählt wurde und der Index aber gesetzt werden muss
@ -2296,7 +2309,7 @@ Public Class frmValidator
End If
Bool_WD = CBool(_Value)
End If
End If
' Dim Bool_WD = CBool(aktivesDokument.GetVariableValue(_IDXName))
@ -2703,4 +2716,8 @@ Public Class frmValidator
btnSave.Enabled = True
End If
End Sub
Private Sub Button1_Click(sender As Object, e As EventArgs)
End Sub
End Class

View File

@ -58,7 +58,7 @@
</Component>
<Component Id="ReleaseNotes" Guid="D1496E4D-98C2-4849-9914-DB47D47CC6BE">
<File Id="ReleaseNote" Name="Release Notes.txt" Source="P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\Digital Data - Process Manager\Release_Notes.txt" KeyPath="yes">
<File Id="ReleaseNote" Name="Release Notes.txt" Source="P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DD_MODULE\DD Process Manager\Release_Notes.txt" KeyPath="yes">
</File>
</Component>
@ -92,6 +92,7 @@
<File Id="DevExpress.XtraLayout.v15.2" Name="DevExpress.XtraLayout.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraLayout.v15.2.dll"/>
<File Id="DevExpress.XtraPdfViewer.v15.2" Name="DevExpress.XtraPdfViewer.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraPdfViewer.v15.2.dll"/>
<File Id="DevExpress.XtraPrinting.v15.2" Name="DevExpress.XtraPrinting.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraPrinting.v15.2.dll"/>
<File Id="DevExpress.XtraTreeList.v15.2" Name="DevExpress.XtraTreeList.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraTreeList.v15.2.dll"/>
</Component>
<Component Id="RegistryKeys" Guid="4503BF18-22F2-4DBF-B281-06DE039F52C8">