MS07062016

2016-06-08 11:17:46 +02:00 · 2016-06-08 11:17:46 +02:00 · 9920ffe9e6
commit 9920ffe9e6
parent 65788f29f8
7 changed files with 68 additions and 52 deletions
--- a/app/DD-Record-Organiser/ClassControlBuilder.vb
+++ b/app/DD-Record-Organiser/ClassControlBuilder.vb
@ -318,11 +318,10 @@ Public Class ClassControlBuilder
                    Select Case row.Item("CONTROL_TYPE_ID")
                        Case 4 'DatePicker
                            Try
-                                value = CDate(value)
+                                value = CDate(Format(value, "dd-MM-yyyy"))
                            Catch ex As Exception
                                ClassLogger.Add("Unexpected Error in converting Value '" & value & "' to date - Control-ID: " & CONTROL_ID.ToString & "- Error: " & ex.Message)
                            End Try
-
                    End Select
                    ' Diese Abfrage verhindert, dass Werte, die aus z.B. CheckedListBoxen kommen,
                    ' nicht überschrieben werden. Diese Werte werden bereits mit UpdateMultipleValues gespeichert
@ -364,7 +363,7 @@ Public Class ClassControlBuilder
                                    Dim val = dt.Rows(0).Item(0)
                                    Dim dateValue
                                    Try
-                                        dateValue = CDate(val)
+                                        dateValue = CDate(Format(val, "dd-MM-yyyy"))
                                    Catch ex As Exception
                                        ClassLogger.Add("Unexpected Error in converting Value '" & value & "' to date - Control-ID: " & dependingControlId.ToString & "- Error: " & ex.Message)
                                        Continue For
--- a/app/DD-Record-Organiser/ClassControlCommandsUI.vb
+++ b/app/DD-Record-Organiser/ClassControlCommandsUI.vb
@ -986,7 +986,7 @@ Public Class ClassControlCommandsUI
                End Select
                Select Case DT_FORMAT_TYPE.Rows(0).Item(1)
                    Case 4 'DateEdit
-                        Value = CDate(Value)
+                        Value = CDate(Format(Value, "dd-MM-yyyy"))
                End Select
            End If

--- a/app/DD-Record-Organiser/ClassImport_Windream.vb
+++ b/app/DD-Record-Organiser/ClassImport_Windream.vb
@ -248,7 +248,7 @@ Public Class ClassImport_Windream
                                                                Dim _rule = result.Item("FORMAT_RULE")
                                                                If Not IsNothing(_rule) Then
                                                                    If IsDate(CONTROLVALUE) Then
-                                                                        Dim _date = CDate(CONTROLVALUE)
+                                                                        Dim _date = CDate(Format(CONTROLVALUE, "dd-MM-yyyy"))
                                                                        _rule = _rule.ToString.Replace("Y", "y")
                                                                        _rule = _rule.ToString.Replace("D", "d")
                                                                        Dim convertedvalue = _date.ToString(_rule)
--- a/app/DD-Record-Organiser/ClassLicence.vb
+++ b/app/DD-Record-Organiser/ClassLicence.vb
@ -18,7 +18,7 @@ Public Class ClassLicence
            End If
            License_Date = CDate(split(1))
            If CDate(split(1)) < CDate(Now.ToShortDateString) Then
-                MsgBox("Ihre Lizenz ist abgelaufen!" & vbNewLine & "Letztes Gültigkeitsdatum: " & split(1) & vbNewLine & "Bitte setzen Sie sich mit Digital Data in Verbindung", MsgBoxStyle.Exclamation)
+                MsgBox("Your license evaluated!" & vbNewLine & "Last valid date: " & split(1) & vbNewLine & "Please contact Digital Data.", MsgBoxStyle.Exclamation)
                LICENSE_EXPIRED = True
                LICENSE_COUNT = 0
            End If
@ -32,13 +32,13 @@ Public Class ClassLicence
                LICENSE_DOSSIER_COUNT = 0
            End Try
        Catch ex As Exception
-            MsgBox(ex.Message, MsgBoxStyle.Exclamation, "Fehler bei Licensemanager:")
+            MsgBox(ex.Message, MsgBoxStyle.Exclamation, "Error in licensemanager:")
        End Try
    End Sub

    Public Shared Function license_is_Valid()
        If LICENSE_EXPIRED Then
-            MsgBox("Ihre Lizenz ist abgelaufen!" & vbNewLine & "Letztes Gültigkeitsdatum: " & License_Date & vbNewLine & "Bitte setzen Sie sich mit Digital Data in Verbindung", MsgBoxStyle.Exclamation)
+            MsgBox("Your license has expired!" & vbNewLine & "Last valid date: " & License_Date & vbNewLine & "Please contact Digital Data!", MsgBoxStyle.Exclamation)
            Return False
        Else : Return True

--- a/app/DD-Record-Organiser/frmConfig_Basic.vb
+++ b/app/DD-Record-Organiser/frmConfig_Basic.vb
@ -261,23 +261,22 @@ Public Class frmConfig_Basic
    End Sub
    Sub CheckScanFolder(mypath As String)
        Try
-            Try
-                If (Not System.IO.Directory.Exists(mypath)) Then
-                    System.IO.Directory.CreateDirectory(mypath)
-                End If
-            Catch ex As Exception
-                ClassLogger.Add(" >> Fehler beim Erstellen des Folderwatchordners: " & mypath, False)
-                ClassLogger.Add(" >> " & ex.Message, False)
-
-                MsgBox("Error in creating Hotfolder: " & mypath & vbNewLine & "Please check the rights!" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
-
-
-                Exit Sub
-            End Try
+            If mypath <> "" Then
+                Try
+                    If (Not System.IO.Directory.Exists(mypath)) Then
+                        System.IO.Directory.CreateDirectory(mypath)
+                    End If
+                Catch ex As Exception
+                    ClassLogger.Add(" >> Fehler beim Erstellen des Folderwatchordners: " & mypath, False)
+                    ClassLogger.Add(" >> " & ex.Message, False)
+                    MsgBox("Error in creating Hotfolder: " & mypath & vbNewLine & "Please check the rights!" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
+                    Exit Sub
+                End Try
+            End If

            Dim folderwatch = ClassDatabase.Execute_Scalar("SELECT GUID FROM TBPMO_FOLDERWATCH_USER WHERE USER_ID = " & USER_GUID & " AND FOLDER_TYPE = 'SCAN'", True)
            Dim sql As String
-            If folderwatch Is Nothing Then
+            If folderwatch Is Nothing And mypath <> "" Then
                sql = "INSERT INTO TBPMO_FOLDERWATCH_USER (USER_ID, FOLDER_PATH, FOLDER_TYPE, ADDED_WHO) VALUES (" & USER_GUID & ",'" & mypath & "','SCAN','" & Environment.UserName & "')"
            Else
                sql = "UPDATE TBPMO_FOLDERWATCH_USER SET FOLDER_PATH = '" & mypath & "', CHANGED_WHO = '" & Environment.UserName & "' where GUID = " & folderwatch
@ -403,4 +402,8 @@ Public Class frmConfig_Basic
            MsgBox("Log Mail was sent to Digital Data!", MsgBoxStyle.Information, "Success!")
        End If
    End Sub
+
+    Private Sub txtScanFolderWatch_TextChanged(sender As Object, e As EventArgs) Handles txtScanFolderWatch.TextChanged
+        CheckScanFolder(txtScanFolderWatch.Text)
+    End Sub
 End Class
--- a/app/DD-Record-Organiser/frmConstructor_Main.vb
+++ b/app/DD-Record-Organiser/frmConstructor_Main.vb
@ -2135,16 +2135,9 @@ Public Class frmConstructor_Main
                        grvwTiles.FocusedRowHandle = -1
                        grvwTiles.OptionsTiles.HighlightFocusedTileOnGridLoad = False
                    End If
-                    Dim RecLoaded As Boolean = False
-                    If LOAD_DIRECT = True Then
-                        Load_Record_Direct()
-                        RecLoaded = True
-                    End If
-                    If ENTITY_RECORD_COUNT = 1 Then
-                        If RecLoaded = False Then
-                            Load_Record_Direct()
-                        End If
-                    End If
+
+                    Load_Grid_Layout()
+                    Load_Splitter_Layout()
                    '    Dim sql1 = _ENTITYSQL
                    '    sql1.Replace("T.*", "TOP 1 [Record-ID]")
                    '    Dim id = ClassDatabase.Execute_Scalar(sql1, True)
@ -2155,8 +2148,7 @@ Public Class frmConstructor_Main
                    'End If
                    'Überprüfen ob es für diese Entität Wiedervorlagen gibt?
                    Check_FOLLOWUP_IsConfigured(ENTITY_ID)
-                    Load_Grid_Layout()
-                    Load_Splitter_Layout()
+
                    SET_ROWCOUNT_STRING()
                End If
                If POS_ENTITY > 0 Then
@ -2185,6 +2177,16 @@ Public Class frmConstructor_Main

                'Zurücksetzen
                ENTITY_LOADED = True
+                Dim RecLoaded As Boolean = False
+                If LOAD_DIRECT = True Then
+                    Load_Record_Direct()
+                    RecLoaded = True
+                End If
+                If ENTITY_RECORD_COUNT = 1 Then
+                    If RecLoaded = False Then
+                        Load_Record_Direct()
+                    End If
+                End If
            End If

            sw.Done()
@ -2203,26 +2205,27 @@ Public Class frmConstructor_Main
    End Sub
    Sub Load_Record_Direct()
        Try
-
+            grvwGrid.FocusedRowHandle = 0
            Dim Grid_RecordID = Get_Focused_Row_Cell_Value("Record-ID")
            If Not IsNothing(Grid_RecordID) Then
                Select Case ACT_EBENE
                    Case 1
-                        PARENT_RECORDID = Grid_RecordID
-                        CURRENT_RECORD_ID = PARENT_RECORDID
-                        SELECTED_RECORD_ID = Grid_RecordID
-                        RECORD_ID = Grid_RecordID
-                        ENTITY_RELOAD_AFT_CONTROL_LOAD = False
-                        'Daten zu Record in jedem Fall laden
-                        'ClassControlValues.LoadControlValues(SELECTED_RECORD_ID, ENTITY_ID, CtrlBuilder.AllControls)
-                        CtrlBuilder.WatchRecordChanges = False
-                        ClassControlValues.LoadControlValuesListWithPlaceholders(ENTITY_ID, Grid_RecordID, PARENT_RECORDID, CtrlBuilder.AllControls, ENTITY_ID)
-                        ClassControlValues.LoadControlValues(SELECTED_RECORD_ID, PARENT_RECORDID, ENTITY_ID, CtrlBuilder.AllControls, ENTITY_ID)
-                        CtrlBuilder.WatchRecordChanges = True
-                        ' Laden der Daten bedeutet nicht dass Daten vom Benutzer geändert wurden!
-                        RECORD_CHANGED = False
-                        Update_Record_Label(Grid_RecordID)
-                        Check_Rights()
+                        Column_Row_Handler()
+                        'PARENT_RECORDID = Grid_RecordID
+                        'CURRENT_RECORD_ID = PARENT_RECORDID
+                        'SELECTED_RECORD_ID = Grid_RecordID
+                        'RECORD_ID = Grid_RecordID
+                        'ENTITY_RELOAD_AFT_CONTROL_LOAD = False
+                        ''Daten zu Record in jedem Fall laden
+                        ''ClassControlValues.LoadControlValues(SELECTED_RECORD_ID, ENTITY_ID, CtrlBuilder.AllControls)
+                        'CtrlBuilder.WatchRecordChanges = False
+                        'ClassControlValues.LoadControlValuesListWithPlaceholders(ENTITY_ID, Grid_RecordID, PARENT_RECORDID, CtrlBuilder.AllControls, ENTITY_ID)
+                        'ClassControlValues.LoadControlValues(SELECTED_RECORD_ID, PARENT_RECORDID, ENTITY_ID, CtrlBuilder.AllControls, ENTITY_ID)
+                        'CtrlBuilder.WatchRecordChanges = True
+                        '' Laden der Daten bedeutet nicht dass Daten vom Benutzer geändert wurden!
+                        'RECORD_CHANGED = False
+                        'Update_Record_Label(Grid_RecordID)
+                        'Check_Rights()
                End Select
            End If
        Catch ex As Exception
--- a/app/DD-Record-Organiser/frmMain.vb
+++ b/app/DD-Record-Organiser/frmMain.vb
@ -13,10 +13,21 @@ Public Class frmMain

    Public Shared Sub RUN_TIMER()
        Try
-            If TIMER_SCAN.Enabled = False Then
+            If TIMER_SCAN.Enabled = False And CURRENT_SCAN_FOLDERWATCH <> "" Then
+                If System.IO.Directory.Exists(CURRENT_SCAN_FOLDERWATCH) = False Then
+                    ClassLogger.Add(">> SCAN PATH '" & CURRENT_SCAN_FOLDERWATCH & "'not accessable!", False)
+                    Exit Sub
+                End If
                TIMER_SCAN.Interval = 10000
                TIMER_SCAN.Enabled = True
                AddHandler TIMER_SCAN.Tick, AddressOf Scan_TickHandler
+            Else
+                If TIMER_SCAN.Enabled = True And CURRENT_SCAN_FOLDERWATCH <> "" Then
+                    TIMER_SCAN.Enabled = False
+                    RUN_TIMER()
+                Else
+                    TIMER_SCAN.Enabled = False
+                End If
            End If
        Catch ex As Exception
            MsgBox("Unexpected Error in RUN_TIMER:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
@ -593,7 +604,7 @@ Public Class frmMain
            TimerTasks.Enabled = False
            TimerTasks.Stop()
        End If
-
+        RUN_TIMER()

    End Sub
    Private Sub BarButtonItem3_ItemClick(sender As Object, e As ItemClickEventArgs) Handles BarButtonItem3.ItemClick