AppStd/FileFlow
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add new SQLEditor

Browse Source
This commit is contained in:
Jonathan Jenne 2022-05-12 11:04:53 +02:00
parent 3b316c43ef
commit 81c8c26a9b
3 changed files with 44 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Global_Indexer/Global_Indexer.vbproj
View File

@ -163,6 +163,9 @@
<Reference Include="DigitalData.Controls.LookupGrid"> <Reference Include="DigitalData.Controls.LookupGrid">
<HintPath>..\..\DDMonorepo\Controls.LookupGrid\bin\Debug\DigitalData.Controls.LookupGrid.dll</HintPath> <HintPath>..\..\DDMonorepo\Controls.LookupGrid\bin\Debug\DigitalData.Controls.LookupGrid.dll</HintPath>
</Reference> </Reference>
<Reference Include="DigitalData.GUIs.Common">
<HintPath>..\..\DDMonorepo\GUIs.Common\bin\Debug\DigitalData.GUIs.Common.dll</HintPath>
</Reference>
<Reference Include="DigitalData.GUIs.GlobalIndexer"> <Reference Include="DigitalData.GUIs.GlobalIndexer">
<HintPath>..\..\DDMonorepo\GUIs.GlobalIndexer\bin\Debug\DigitalData.GUIs.GlobalIndexer.dll</HintPath> <HintPath>..\..\DDMonorepo\GUIs.GlobalIndexer\bin\Debug\DigitalData.GUIs.GlobalIndexer.dll</HintPath>
</Reference> </Reference>

50
Global_Indexer/frmAdministration.vb
View File

@ -518,14 +518,27 @@ Public Class frmAdministration
oSQLCommand = txtManIndexSQL.Text oSQLCommand = txtManIndexSQL.Text
End If End If
Dim oForm As New frmSQL_DESIGNER(oIndexGuid, oDocTypeGuid) With { 'Dim oForm As New frmSQL_DESIGNER(oIndexGuid, oDocTypeGuid) With {
' .SQLCommand = oSQLCommand,
' .ConnectionID = oConnection
'}
Dim oDatatable = DATABASE_ECM.GetDatatable($"SELECT * FROM TBDD_INDEX_MAN WHERE DOK_ID = {oDocTypeGuid} AND ACTIVE = 1")
Dim oPlaceholders = oDatatable.AsEnumerable().
ToDictionary(Of String, String)(Function(row) row.Item("NAME"), Function(row) row.Item("WD_INDEX"))
Dim oForm2 As New DigitalData.GUIs.Common.frmSQLEditor(LOGCONFIG, DATABASE_ECM) With {
.SQLCommand = oSQLCommand, .SQLCommand = oSQLCommand,
.ConnectionID = oConnection .SQLConnection = oConnection,
.PlaceholdersManual = oPlaceholders
} }
If oForm.ShowDialog() = DialogResult.OK Then Dim oResult = oForm2.ShowDialog()
txtManIndexSQL.Text = oForm.SQLCommand If oResult = DialogResult.OK Then
txtManIndexConnectionId.Text = oForm.SQLConnectionId txtManIndexSQL.Text = oForm2.SQLCommand
txtManIndexConnectionId.Text = oForm2.SQLConnection
End If End If
Catch ex As Exception Catch ex As Exception
LOGGER.Error(ex) LOGGER.Error(ex)
@ -630,14 +643,31 @@ Public Class frmAdministration
oSQLCommand = txtAutomIndexSQLResult.Text oSQLCommand = txtAutomIndexSQLResult.Text
End If End If
Dim oForm As New frmSQL_DESIGNER(oIndexGuid, oDocTypeGuid) With { 'Dim oForm As New frmSQL_DESIGNER(oIndexGuid, oDocTypeGuid) With {
' .SQLCommand = oSQLCommand,
' .ConnectionID = oConnection
'}
'If oForm.ShowDialog() = DialogResult.OK Then
' txtAutomIndexSQLResult.Text = oForm.SQLCommand
' txtAutomIndexConnectionId.Text = oForm.SQLConnectionId
'End If
Dim oDatatable = DATABASE_ECM.GetDatatable($"SELECT * FROM TBDD_INDEX_MAN WHERE DOK_ID = {oDocTypeGuid} AND ACTIVE = 1")
Dim oPlaceholders = oDatatable.AsEnumerable().
ToDictionary(Of String, String)(Function(row) row.Item("NAME"), Function(row) row.Item("WD_INDEX"))
Dim oForm2 As New DigitalData.GUIs.Common.frmSQLEditor(LOGCONFIG, DATABASE_ECM) With {
.SQLCommand = oSQLCommand, .SQLCommand = oSQLCommand,
.ConnectionID = oConnection .SQLConnection = oConnection,
.PlaceholdersManual = oPlaceholders,
.PlaceholdersManualTitle = "Manueller Index"
} }
If oForm.ShowDialog() = DialogResult.OK Then Dim oResult = oForm2.ShowDialog()
txtAutomIndexSQLResult.Text = oForm.SQLCommand If oResult = DialogResult.OK Then
txtAutomIndexConnectionId.Text = oForm.SQLConnectionId txtManIndexSQL.Text = oForm2.SQLCommand
txtManIndexConnectionId.Text = oForm2.SQLConnection
End If End If
Catch ex As Exception Catch ex As Exception
LOGGER.Error(ex) LOGGER.Error(ex)

1
SetupVS19/Product.wxs
View File

@ -123,6 +123,7 @@
<File Id="DocumentViewer" Name="DigitalData.Controls.DocumentViewer.dll" Source="DigitalData.Controls.DocumentViewer.dll" KeyPath="no" /> <File Id="DocumentViewer" Name="DigitalData.Controls.DocumentViewer.dll" Source="DigitalData.Controls.DocumentViewer.dll" KeyPath="no" />
<File Id="LookupGrid" Name="DigitalData.Controls.LookupGrid.dll" Source="DigitalData.Controls.LookupGrid.dll" KeyPath="no" /> <File Id="LookupGrid" Name="DigitalData.Controls.LookupGrid.dll" Source="DigitalData.Controls.LookupGrid.dll" KeyPath="no" />
<File Id="Globix" Name="DigitalData.GUIs.GlobalIndexer.dll" Source="DigitalData.GUIs.GlobalIndexer.dll" KeyPath="no" /> <File Id="Globix" Name="DigitalData.GUIs.GlobalIndexer.dll" Source="DigitalData.GUIs.GlobalIndexer.dll" KeyPath="no" />
<File Id="Globix" Name="DigitalData.GUIs.Common.dll" Source="DigitalData.GUIs.Common.dll" KeyPath="no" />
<File Id="Encryption" Name="DigitalData.Modules.Encryption.dll" Source="DigitalData.Modules.Encryption.dll" KeyPath="no" /> <File Id="Encryption" Name="DigitalData.Modules.Encryption.dll" Source="DigitalData.Modules.Encryption.dll" KeyPath="no" />
</Component> </Component>