MS2

2017-03-07 16:51:36 +01:00
parent d821a07c18
commit dd721411f8
13 changed files with 681 additions and 120 deletions
--- a/app/DD-Record-Organizer/ClassProxy.vb
+++ b/app/DD-Record-Organizer/ClassProxy.vb
@@ -177,5 +177,22 @@ Public Class ClassProxy
            Return BUSY
        End If
    End Function
-
+    Public Shared Function PRPROXY_DOC_VALUES(DocID As Integer)
+        If LICENSE_SITE_PROXY = False Or clsDatabase.DB_PROXY_INITIALIZED = False Then
+            Return False
+        End If
+        Dim sel = String.Format("DECLARE @return_value int" & vbNewLine & _
+      "EXEC @return_value = [dbo].[PRPROXY_DOC_VALUES] {0} " & vbNewLine & _
+      "SELECT	'Return Value' = @return_value", DocID)
+        Dim Result As DataTable = ClassDatabase.Return_Datatable(sel, True)
+        If Not IsNothing(Result) Then
+            If Result.Rows(0).Item(0) = 0 Then
+                Return True
+            Else
+                Return False
+            End If
+        Else
+            Return False
+        End If
+    End Function
 End Class
--- a/app/DD-Record-Organizer/frmConstructor_Main.resx
+++ b/app/DD-Record-Organizer/frmConstructor_Main.resx
@@ -525,7 +525,7 @@
    <value>0, 25</value>
  </data>
  <data name="GridControlMain.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1074, 212</value>
+    <value>1067, 212</value>
  </data>
  <data name="GridControlMain.TabIndex" type="System.Int32, mscorlib">
    <value>0</value>
@@ -665,7 +665,7 @@
    <value>0, 0</value>
  </data>
  <data name="ToolStripRecords.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1074, 25</value>
+    <value>1067, 25</value>
  </data>
  <data name="ToolStripRecords.TabIndex" type="System.Int32, mscorlib">
    <value>0</value>
@@ -749,7 +749,7 @@
    <value>0, 0</value>
  </data>
  <data name="pnlDetails.Size" type="System.Drawing.Size, System.Drawing">
-    <value>786, 343</value>
+    <value>786, 336</value>
  </data>
  <data name="pnlDetails.TabIndex" type="System.Int32, mscorlib">
    <value>0</value>
@@ -779,7 +779,7 @@
    <value>0, 26</value>
  </data>
  <data name="pnlDocFill.Size" type="System.Drawing.Size, System.Drawing">
-    <value>561, 293</value>
+    <value>554, 286</value>
  </data>
  <data name="pnlDocFill.TabIndex" type="System.Int32, mscorlib">
    <value>1</value>
@@ -826,10 +826,10 @@
    <value>Ansicht eingeschränkt - Klick Bearbeiten für Entsperren</value>
  </data>
  <data name="statStripDoc.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 319</value>
+    <value>0, 312</value>
  </data>
  <data name="statStripDoc.Size" type="System.Drawing.Size, System.Drawing">
-    <value>561, 24</value>
+    <value>554, 24</value>
  </data>
  <data name="statStripDoc.TabIndex" type="System.Int32, mscorlib">
    <value>0</value>
@@ -856,7 +856,7 @@
    <value>0, 0</value>
  </data>
  <data name="pnlDocToolStrip.Size" type="System.Drawing.Size, System.Drawing">
-    <value>561, 26</value>
+    <value>554, 26</value>
  </data>
  <data name="pnlDocToolStrip.TabIndex" type="System.Int32, mscorlib">
    <value>0</value>
@@ -877,7 +877,7 @@
    <value>Panel2</value>
  </data>
  <data name="SplitContainerDetails.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1356, 347</value>
+    <value>1356, 340</value>
  </data>
  <data name="SplitContainerDetails.TabIndex" type="System.Int32, mscorlib">
    <value>1</value>
@@ -1050,7 +1050,7 @@
    <value>1</value>
  </data>
  <data name="TabDetails.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1356, 372</value>
+    <value>1356, 365</value>
  </data>
  <data name="TabDetails.Text" xml:space="preserve">
    <value>Detailansicht</value>
@@ -1068,7 +1068,7 @@
    <value>0</value>
  </data>
  <data name="TCDetails.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1362, 403</value>
+    <value>1362, 396</value>
  </data>
  <data name="TCDetails.TabIndex" type="System.Int32, mscorlib">
    <value>1</value>
@@ -1083,7 +1083,7 @@
    <value>Cyan</value>
  </data>
  <data name="GridControlPos.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1356, 347</value>
+    <value>1356, 340</value>
  </data>
  <data name="GridControlPos.TabIndex" type="System.Int32, mscorlib">
    <value>0</value>
@@ -1107,7 +1107,7 @@
    <value>0, 25</value>
  </data>
  <data name="Panel1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1356, 347</value>
+    <value>1356, 340</value>
  </data>
  <data name="Panel1.TabIndex" type="System.Int32, mscorlib">
    <value>2</value>
@@ -1361,7 +1361,7 @@
 </value>
  </data>
  <data name="TabPos.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1356, 372</value>
+    <value>1356, 365</value>
  </data>
  <data name="TabPos.Text" xml:space="preserve">
    <value>Positionen</value>
@@ -1423,7 +1423,7 @@
    <value>Aqua</value>
  </data>
  <data name="GridControlDocSearch.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1356, 347</value>
+    <value>1356, 340</value>
  </data>
  <data name="GridControlDocSearch.TabIndex" type="System.Int32, mscorlib">
    <value>7</value>
@@ -1525,7 +1525,7 @@
    <value>1</value>
  </data>
  <data name="TabWindream.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1356, 372</value>
+    <value>1356, 365</value>
  </data>
  <data name="TabWindream.Text" xml:space="preserve">
    <value>Dateien</value>
@@ -1956,7 +1956,7 @@
    <value>2</value>
  </data>
  <data name="TabFollowUp.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1356, 372</value>
+    <value>1356, 365</value>
  </data>
  <data name="TabFollowUp.Text" xml:space="preserve">
    <value>Wiedervorlage</value>
@@ -2067,7 +2067,7 @@
    <value>5</value>
  </data>
  <data name="GridControl1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1356, 347</value>
+    <value>1356, 340</value>
  </data>
  <data name="GridControl1.TabIndex" type="System.Int32, mscorlib">
    <value>90</value>
@@ -2139,7 +2139,7 @@
    <value>1</value>
  </data>
  <data name="TabPageVariant.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1356, 372</value>
+    <value>1356, 365</value>
  </data>
  <data name="TabPageVariant.Text" xml:space="preserve">
    <value>Vorgängervarianten</value>
@@ -2636,7 +2636,7 @@
    <value>True</value>
  </metadata>
  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>25</value>
+    <value>140</value>
  </metadata>
  <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
    <value>6, 13</value>
--- a/app/DD-Record-Organizer/frmConstructor_Main.vb
+++ b/app/DD-Record-Organizer/frmConstructor_Main.vb
@@ -3637,6 +3637,7 @@ Public Class frmConstructor_Main

            Dim Sql As String = String.Format("EXEC PRPMO_DOC_VALUE {0}, {1}, '{2}', '{3}'", docId, configId, value, user)
            ClassDatabase.Execute_non_Query(Sql)
+            ClassProxy.PRPROXY_DOC_VALUES(docId)
        Catch ex As Exception
            ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in OnCBSelectedValueChanged: ", ex.Message)
        End Try
@@ -3656,26 +3657,24 @@ Public Class frmConstructor_Main

            If oldValue = DatePicker.EditValue Then
                Exit Sub
-                End If
+            End If
+            'Dim colTitle = DirectCast(GridControlDocSearch.MainView, DevExpress.XtraGrid.Views.Grid.GridView).FocusedColumn.FieldName
+            'Dim configId As Integer = ClassWindreamDocGrid.RESULT_CONFIG_IDS.Item(colTitle)
+            ' Config id über mainView -> detailView herausfinden
+            Dim mainView As GridView = GridControlDocSearch.MainView
+            Dim detailView As GridView = mainView.GetDetailView(mainView.FocusedRowHandle, mainView.GetRelationIndex(mainView.FocusedRowHandle, "docIdDetails"))
+            Dim detailRow As DataRowView = detailView.GetRow(detailView.FocusedRowHandle)
+            Dim configid = detailRow.Item("CONFIG_ID")

-
-                'Dim colTitle = DirectCast(GridControlDocSearch.MainView, DevExpress.XtraGrid.Views.Grid.GridView).FocusedColumn.FieldName
-                'Dim configId As Integer = ClassWindreamDocGrid.RESULT_CONFIG_IDS.Item(colTitle)
-                ' Config id über mainView -> detailView herausfinden
-                Dim mainView As GridView = GridControlDocSearch.MainView
-                Dim detailView As GridView = mainView.GetDetailView(mainView.FocusedRowHandle, mainView.GetRelationIndex(mainView.FocusedRowHandle, "docIdDetails"))
-                Dim detailRow As DataRowView = detailView.GetRow(detailView.FocusedRowHandle)
-                Dim configid = detailRow.Item("CONFIG_ID")
-
-                Dim docId As Integer = ClassWindreamDocGrid.SELECTED_DOC_ID
-                Dim user As String = USER_USERNAME
-
-                Dim dateString = value.ToString("yyyy-MM-dd") 'hh:mm:ss.fff
-
-                Dim Sql As String = String.Format("EXEC PRPMO_DOC_VALUE {0}, {1}, '{2}', '{3}'", docId, configid, dateString, user)
-                If ClassDatabase.Execute_non_Query(Sql) = False Then
-                    ClassHelper.MSGBOX_Handler("ERROR", "UnexpectedError:", "Error updating doc-metadata (date): " & vbNewLine & "Check the log for further information!")
-                End If
+            Dim docId As Integer = ClassWindreamDocGrid.SELECTED_DOC_ID
+            Dim user As String = USER_USERNAME
+            Dim dateString = value.ToString("yyyy-MM-dd") 'hh:mm:ss.fff
+            Dim Sql As String = String.Format("EXEC PRPMO_DOC_VALUE {0}, {1}, '{2}', '{3}'", docId, configid, dateString, user)
+            If ClassDatabase.Execute_non_Query(Sql) = False Then
+                ClassHelper.MSGBOX_Handler("ERROR", "UnexpectedError:", "Error updating doc-metadata (date): " & vbNewLine & "Check the log for further information!")
+            Else
+                ClassProxy.PRPROXY_DOC_VALUES(docId)
+            End If
        Catch ex As Exception
            ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in OnDateSelectedValueChanged: ", ex.Message)
        End Try
@@ -3703,6 +3702,8 @@ Public Class frmConstructor_Main
            Dim Sql As String = String.Format("EXEC PRPMO_DOC_VALUE {0}, {1}, '{2}', '{3}'", docId, configid, value, user)
            If ClassDatabase.Execute_non_Query(Sql) = False Then
                ClassHelper.MSGBOX_Handler("ERROR", "UnexpectedError:", "Error updating doc-metadata (textbox): " & vbNewLine & "Check the log for further information!")
+            Else
+                ClassProxy.PRPROXY_DOC_VALUES(docId)
            End If
        Catch ex As Exception
            ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in OnTextSelectedValueChanged: ", ex.Message)
@@ -3727,6 +3728,8 @@ Public Class frmConstructor_Main
            Dim Sql As String = String.Format("EXEC PRPMO_DOC_VALUE {0}, {1}, '{2}', '{3}'", docId, configid, value, user)
            If ClassDatabase.Execute_non_Query(Sql) = False Then
                ClassHelper.MSGBOX_Handler("ERROR", "UnexpectedError:", "Error updating doc-metadata (checkbox): " & vbNewLine & "Check the log for further information!")
+            Else
+                ClassProxy.PRPROXY_DOC_VALUES(docId)
            End If
        Catch ex As Exception
            ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in OnCheckboxValueChanged: ", ex.Message)
--- a/app/DD-Record-Organizer/frmWD_IndexFile.vb
+++ b/app/DD-Record-Organizer/frmWD_IndexFile.vb
@@ -378,10 +378,10 @@ Public Class frmWD_IndexFile
                MsgBox("No Record chosen or the documenttype was not chosen!", MsgBoxStyle.Information)
                Exit Sub
            End If
-            If lvwIndices.Items.Count = 0 Then
-                MsgBox("Please choose a documenttxpe!", MsgBoxStyle.Information)
-                Exit Sub
-            End If
+            'If lvwIndices.Items.Count = 0 Then
+            '    MsgBox("Please choose a documenttxpe!", MsgBoxStyle.Information)
+            '    Exit Sub
+            'End If
            If Not IsNothing(CURRENT_TBPMO_INDEX_MAN) Then
                If CURRENT_TBPMO_INDEX_MAN.Rows.Count > 0 Then
                    If ClassFileResult.CheckWrite_IndexeMan(grbxControls) = False Then