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

MS

Browse Source
This commit is contained in:
SchreiberM
2017-03-20 14:25:58 +01:00
parent e9bf1d36c7
commit 06afe3bd1f
8 changed files with 77 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
app/DD-Record-Organizer/frmWD_IndexFile.vb
View File

@@ -10,6 +10,7 @@ Public Class frmWD_IndexFile
Dim aktFiledropped As String
Dim MULTIFILES As Integer = 0
Dim formloaded As Boolean = False
Dim DTVWPMO_DOKUMENTTYPES As DataTable
Function WORK_FILE(ImportFilePath As String, VerzeichnisZiel As String, vDokart_ID As Integer, vDokart As String, multiindex As Boolean)
Try
@@ -1035,17 +1036,20 @@ Public Class frmWD_IndexFile
ElseIf HandleType = "SCAM" Then
droptype = "scan"
End If
VWPMO_DOKUMENTTYPESTableAdapter.Connection.ConnectionString = MyConnectionString
Me.VWPMO_DOKUMENTTYPESTableAdapter.Fill(Me.DD_DMSDataSet.VWPMO_DOKUMENTTYPES, CURRENT_FORMVIEW_ID)
Dim sql = String.Format("SELECT FORMVIEW_ID, FORM_ID, FORM_TITLE, DOKUMENTTYPE_ID, DOKUMENTTYPE, PATH, SHORTNAME, OBJECT_TYPE, FW_DOCTYPE_ID FROM VWPMO_DOKUMENTTYPES WHERE (FORMVIEW_ID = {0}) " & _
"ORDER BY SEQUENCE, DOKUMENTTYPE", CURRENT_FORMVIEW_ID)
DTVWPMO_DOKUMENTTYPES = ClassDatabase.Return_Datatable(sql, True)
'VWPMO_DOKUMENTTYPESTableAdapter.Connection.ConnectionString = MyConnectionString
'Me.VWPMO_DOKUMENTTYPESTableAdapter.Fill(Me.DD_DMSDataSet.VWPMO_DOKUMENTTYPES, CURRENT_FORMVIEW_ID)
CURRENT_REDUNDANT_FORM_ID = 0
CURRENT_REDUNDANT_FORMVIEW_ID = 0
If DD_DMSDataSet.VWPMO_DOKUMENTTYPES.Rows.Count = 0 Then
If DTVWPMO_DOKUMENTTYPES.Rows.Count = 0 Then ' DD_DMSDataSet.VWPMO_DOKUMENTTYPES.Rows.Count = 0 Then
If CURRENT_ENTITY_REDUNDANT_ID <> 0 Then
Dim FVID = ClassDatabase.Execute_Scalar(String.Format("SELECT GUID FROM TBPMO_FORM_VIEW WHERE FORM_ID = {0} and SCREEN_ID = 1", CURRENT_ENTITY_REDUNDANT_ID), True)
Me.VWPMO_DOKUMENTTYPESTableAdapter.Fill(Me.DD_DMSDataSet.VWPMO_DOKUMENTTYPES, FVID)
If DD_DMSDataSet.VWPMO_DOKUMENTTYPES.Rows.Count = 0 Then
'Me.VWPMO_DOKUMENTTYPESTableAdapter.Fill(Me.DD_DMSDataSet.VWPMO_DOKUMENTTYPES, FVID)
If DTVWPMO_DOKUMENTTYPES.Rows.Count = 0 Then 'DD_DMSDataSet.VWPMO_DOKUMENTTYPES.Rows.Count = 0 Then
MsgBox("No documenttypes for the redundant entity configured either! Indexing is not possible!" & vbNewLine & "Please check the configuration!", MsgBoxStyle.Exclamation)
Exit Sub
Else
@@ -1076,14 +1080,19 @@ Public Class frmWD_IndexFile
If My.Settings.WD_INDEXDOKART_SAVE <> String.Empty Then
Me.cmbDokumentart.SelectedItem = Me.cmbDokumentart.Items.IndexOf(My.Settings.WD_INDEXDOKART_SAVE)
' cmbDokumentart.SelectedIndex = cmbDokumentart.FindStringExact(My.Settings.WD_INDEXDOKART_SAVE)
Else
If DD_DMSDataSet.VWPMO_DOKUMENTTYPES.Rows.Count = 1 Then
End If
If DTVWPMO_DOKUMENTTYPES.Rows.Count >= 1 Then
cmbDokumentart.DataSource = DTVWPMO_DOKUMENTTYPES
cmbDokumentart.DisplayMember = DTVWPMO_DOKUMENTTYPES.Columns(4).ColumnName
cmbDokumentart.ValueMember = DTVWPMO_DOKUMENTTYPES.Columns(3).ColumnName
If DTVWPMO_DOKUMENTTYPES.Rows.Count = 1 Then
cmbDokumentart.SelectedIndex = 0
CURRENT_DOKARTID = cmbDokumentart.SelectedValue
CURRENT_DOKARTSTRING = cmbDokumentart.Text
Refresh_indices()
End If
End If
Me.Hide()
Me.Visible = True
Me.Activate()