AppStd/TaskFlow
8
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

MS

Browse Source
This commit is contained in:
SchreiberM 2020-04-30 16:24:37 +02:00
parent d57049e245
commit f3bc104b37
3 changed files with 20 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
app/DD_PM_WINDREAM/frmValidator.Designer.vb generated
View File

@ -34,7 +34,6 @@ Partial Class frmValidator
Me.BarAndDockingController3 = New DevExpress.XtraBars.BarAndDockingController(Me.components)
Me.BarAndDockingController2 = New DevExpress.XtraBars.BarAndDockingController(Me.components)
Me.BarAndDockingController1 = New DevExpress.XtraBars.BarAndDockingController(Me.components)
Me.TableAdapterManager = New DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TableAdapterManager()
Me.BarManager1 = New DevExpress.XtraBars.BarManager(Me.components)
Me.barDockControlTop = New DevExpress.XtraBars.BarDockControl()
Me.barDockControlBottom = New DevExpress.XtraBars.BarDockControl()
@ -66,9 +65,6 @@ Partial Class frmValidator
Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem()
Me.PdfBarController1 = New DevExpress.XtraPdfViewer.Bars.PdfBarController(Me.components)
Me.PdfBarController2 = New DevExpress.XtraPdfViewer.Bars.PdfBarController(Me.components)
Me.FinalIndexDataSet = New DD_ProcessManager.FinalIndexDataSet()
Me.TBPM_PROFILE_FINAL_INDEXINGBindingSource = New System.Windows.Forms.BindingSource(Me.components)
Me.TBPM_PROFILE_FINAL_INDEXINGTableAdapter = New DD_ProcessManager.FinalIndexDataSetTableAdapters.TBPM_PROFILE_FINAL_INDEXINGTableAdapter()
Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components)
Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl()
Me.bsiError = New DevExpress.XtraBars.BarStaticItem()
@ -102,8 +98,6 @@ Partial Class frmValidator
CType(Me.BarManager1, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.PdfBarController1, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.PdfBarController2, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.FinalIndexDataSet, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.TBPM_PROFILE_FINAL_INDEXINGBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SuspendLayout()
'
@ -175,22 +169,6 @@ Partial Class frmValidator
Me.BarAndDockingController1.PropertiesBar.AllowLinkLighting = False
Me.BarAndDockingController1.PropertiesDocking.ViewStyle = DevExpress.XtraBars.Docking2010.Views.DockingViewStyle.Classic
'
'TableAdapterManager
'
Me.TableAdapterManager.BackupDataSetBeforeUpdate = False
Me.TableAdapterManager.TBDD_CONNECTIONTableAdapter = Nothing
Me.TableAdapterManager.TBDD_EMAIL_TEMPLATETableAdapter = Nothing
Me.TableAdapterManager.TBDD_GUI_LANGUAGE_PHRASETableAdapter = Nothing
Me.TableAdapterManager.TBDD_USERTableAdapter = Nothing
Me.TableAdapterManager.TBPM_CONTROL_TABLETableAdapter = Nothing
Me.TableAdapterManager.TBPM_ERROR_LOGTableAdapter = Nothing
Me.TableAdapterManager.TBPM_KONFIGURATIONTableAdapter = Nothing
Me.TableAdapterManager.TBPM_PROFILE_CONTROLSTableAdapter = Nothing
Me.TableAdapterManager.TBPM_PROFILE_FILESTableAdapter = Nothing
Me.TableAdapterManager.TBPM_PROFILE_FINAL_INDEXINGTableAdapter = Nothing
Me.TableAdapterManager.TBPM_TYPETableAdapter = Nothing
Me.TableAdapterManager.UpdateOrder = DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete
'
'BarManager1
'
Me.BarManager1.Controller = Me.BarAndDockingController3
@ -425,20 +403,6 @@ Partial Class frmValidator
Me.PdfBarController2.BarItems.Add(Me.PdfSetFitWidthZoomModeCheckItem2)
Me.PdfBarController2.BarItems.Add(Me.PdfSetFitVisibleZoomModeCheckItem2)
'
'FinalIndexDataSet
'
Me.FinalIndexDataSet.DataSetName = "FinalIndexDataSet"
Me.FinalIndexDataSet.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema
'
'TBPM_PROFILE_FINAL_INDEXINGBindingSource
'
Me.TBPM_PROFILE_FINAL_INDEXINGBindingSource.DataMember = "TBPM_PROFILE_FINAL_INDEXING"
Me.TBPM_PROFILE_FINAL_INDEXINGBindingSource.DataSource = Me.FinalIndexDataSet
'
'TBPM_PROFILE_FINAL_INDEXINGTableAdapter
'
Me.TBPM_PROFILE_FINAL_INDEXINGTableAdapter.ClearBeforeFill = True
'
'RibbonControl1
'
Me.RibbonControl1.ExpandCollapseItem.Id = 0
@ -652,8 +616,6 @@ Partial Class frmValidator
CType(Me.BarManager1, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.PdfBarController1, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.PdfBarController2, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.FinalIndexDataSet, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.TBPM_PROFILE_FINAL_INDEXINGBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit()
Me.ResumeLayout(False)
Me.PerformLayout()
@ -664,7 +626,6 @@ Partial Class frmValidator
Friend WithEvents btnSave As System.Windows.Forms.Button
Friend WithEvents DESCRIPTIONLabel As System.Windows.Forms.Label
Friend WithEvents pnldesigner As System.Windows.Forms.Panel
Friend WithEvents TableAdapterManager As DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TableAdapterManager
Friend WithEvents PdfBarController1 As DevExpress.XtraPdfViewer.Bars.PdfBarController
Friend WithEvents BarManager1 As DevExpress.XtraBars.BarManager
Friend WithEvents PdfFileOpenBarItem1 As DevExpress.XtraPdfViewer.Bars.PdfFileOpenBarItem
@ -700,9 +661,6 @@ Partial Class frmValidator
Friend WithEvents BarAndDockingController2 As DevExpress.XtraBars.BarAndDockingController
Friend WithEvents BarAndDockingController3 As DevExpress.XtraBars.BarAndDockingController
Friend WithEvents SplitContainer1 As System.Windows.Forms.SplitContainer
Friend WithEvents FinalIndexDataSet As FinalIndexDataSet
Friend WithEvents TBPM_PROFILE_FINAL_INDEXINGBindingSource As BindingSource
Friend WithEvents TBPM_PROFILE_FINAL_INDEXINGTableAdapter As FinalIndexDataSetTableAdapters.TBPM_PROFILE_FINAL_INDEXINGTableAdapter
Friend WithEvents ToolTip1 As ToolTip
Friend WithEvents RibbonControl1 As DevExpress.XtraBars.Ribbon.RibbonControl
Friend WithEvents RibbonPage1 As DevExpress.XtraBars.Ribbon.RibbonPage

44
app/DD_PM_WINDREAM/frmValidator.resx
View File

@ -411,11 +411,8 @@
<metadata name="BarAndDockingController1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>411, 17</value>
</metadata>
<metadata name="TableAdapterManager.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>608, 17</value>
</metadata>
<metadata name="BarManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>929, 17</value>
<value>756, 17</value>
</metadata>
<data name="barDockControlTop.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Top</value>
@ -1160,12 +1157,6 @@
<data name="&gt;&gt;BarAndDockingController1.Type" xml:space="preserve">
<value>DevExpress.XtraBars.BarAndDockingController, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="&gt;&gt;TableAdapterManager.Name" xml:space="preserve">
<value>TableAdapterManager</value>
</data>
<data name="&gt;&gt;TableAdapterManager.Type" xml:space="preserve">
<value>DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TableAdapterManager, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;BarManager1.Name" xml:space="preserve">
<value>BarManager1</value>
</data>
@ -1328,24 +1319,6 @@
<data name="&gt;&gt;PdfBarController2.Type" xml:space="preserve">
<value>DevExpress.XtraPdfViewer.Bars.PdfBarController, DevExpress.XtraPdfViewer.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="&gt;&gt;FinalIndexDataSet.Name" xml:space="preserve">
<value>FinalIndexDataSet</value>
</data>
<data name="&gt;&gt;FinalIndexDataSet.Type" xml:space="preserve">
<value>DD_ProcessManager.FinalIndexDataSet, FinalIndexDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;TBPM_PROFILE_FINAL_INDEXINGBindingSource.Name" xml:space="preserve">
<value>TBPM_PROFILE_FINAL_INDEXINGBindingSource</value>
</data>
<data name="&gt;&gt;TBPM_PROFILE_FINAL_INDEXINGBindingSource.Type" xml:space="preserve">
<value>System.Windows.Forms.BindingSource, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;TBPM_PROFILE_FINAL_INDEXINGTableAdapter.Name" xml:space="preserve">
<value>TBPM_PROFILE_FINAL_INDEXINGTableAdapter</value>
</data>
<data name="&gt;&gt;TBPM_PROFILE_FINAL_INDEXINGTableAdapter.Type" xml:space="preserve">
<value>DD_ProcessManager.FinalIndexDataSetTableAdapters.TBPM_PROFILE_FINAL_INDEXINGTableAdapter, FinalIndexDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;ToolTip1.Name" xml:space="preserve">
<value>ToolTip1</value>
</data>
@ -1777,22 +1750,13 @@
<value>BarButtonItem1</value>
</data>
<metadata name="PdfBarController1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>781, 17</value>
<value>608, 17</value>
</metadata>
<metadata name="PdfBarController2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 56</value>
</metadata>
<metadata name="FinalIndexDataSet.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>165, 56</value>
</metadata>
<metadata name="TBPM_PROFILE_FINAL_INDEXINGBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>314, 56</value>
</metadata>
<metadata name="TBPM_PROFILE_FINAL_INDEXINGTableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>624, 56</value>
<value>881, 17</value>
</metadata>
<metadata name="ToolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>929, 56</value>
<value>1029, 17</value>
</metadata>
<data name="RibbonPageFile.Text" xml:space="preserve">
<value>Datei</value>

25
app/DD_PM_WINDREAM/frmValidator.vb
View File

@ -131,7 +131,7 @@ Public Class frmValidator
End Try
Try
_step = 1
TBPM_PROFILE_FINAL_INDEXINGTableAdapter.Connection.ConnectionString = CONNECTION_STRING
_step = 2
@ -2119,12 +2119,16 @@ Public Class frmValidator
errormessage = oErrorMessage
frmError.ShowDialog()
Else
LOGGER.Info("End of profile - no more documents!")
Dim oMsg = "Ende des Profils - Keine weiteren Vorgänge!"
If USER_LANGUAGE <> "de-DE" Then
oMsg = "End of profile - no more objects!"
End If
LOGGER.Info(oMsg)
Dim oROW As DataRow = ClassAllgemeineFunktionen.GUI_LANGUAGE_MSGBOX("frmValidator.NoMoreDocument")
Try
MsgBox(oROW.Item("STRING1"), MsgBoxStyle.Information, oROW.Item("STRING2"))
Catch ex As Exception
MsgBox("No more documents!" & vbNewLine & "Form will be closed now!", MsgBoxStyle.Information, ADDITIONAL_TITLE)
MsgBox("No more documents! (No translation so far)" & vbNewLine & "Form will be closed now!", MsgBoxStyle.Information, ADDITIONAL_TITLE)
End Try
activate_controls(True)
Me.Close()
@ -3251,13 +3255,16 @@ Public Class frmValidator
If includeFI = True Then
Try
TBPM_PROFILE_FINAL_INDEXINGTableAdapter.Fill(FinalIndexDataSet.TBPM_PROFILE_FINAL_INDEXING, CURRENT_ProfilName)
Dim oDTFinalIndexes As DataTable = FinalIndexDataSet.TBPM_PROFILE_FINAL_INDEXING
If oDTFinalIndexes?.Rows.Count > 0 Then
Dim oSQL = $"SELECT * FROM TBPM_PROFILE_FINAL_INDEXING WHERE PROFIL_ID = {CURRENT_ProfilGUID}"
Dim oDTFinalIndexing = ClassDatabase.Return_Datatable(oSQL)
If oDTFinalIndexing?.Rows.Count > 0 Then
'Jetzt finale Indexe setzen
LOGGER.Debug("FINAL INDEXING STARTING...")
For Each oFinalIndexRow As DataRow In oDTFinalIndexes.Rows
For Each oFinalIndexRow As DataRow In oDTFinalIndexing.Rows
Dim oValue As String = oFinalIndexRow.Item("VALUE").ToString
Dim oIndexType = 0
If IDB_ACTIVE = False Then
oIndexType = WINDREAM.GetTypeOfIndex(oFinalIndexRow.Item("INDEXNAME"))
@ -3265,7 +3272,7 @@ Public Class frmValidator
If oValue.ToUpper = "SQL-Command".ToUpper Then '###### Indexierung mit variablen SQL ###
LOGGER.Debug("Indexing wih dynamic sql...")
Dim oSQLCommand = oFinalIndexRow.Item("SQL_COMMAND")
Dim oConnectionID = oFinalIndexRow.Item("CONNECTION_ID")
oSQLCommand = clsPatterns.ReplaceAllValues(oSQLCommand, pnldesigner, CURRENT_WMFILE, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID)
If IsNothing(oSQLCommand) Then
errormessage = "Error while replacing Values in final indexing - Check the log"
@ -3275,7 +3282,7 @@ Public Class frmValidator
ItemWorked = False
End If
If Not IsNothing(oSQLCommand) Then
Dim oResultfromSQL = ClassDatabase.Execute_Scalar(oSQLCommand, CONNECTION_STRING, True)
Dim oResultfromSQL = ClassDatabase.Execute_Scalar_ConID(oSQLCommand, oConnectionID)
If Not IsNothing(oResultfromSQL) Then
LOGGER.Debug($"oResultfromSQL is [{oResultfromSQL.ToString}]")