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

MS

Browse Source
This commit is contained in:
SchreiberM
2016-06-20 14:00:58 +02:00
parent c7af54d4fa
commit 333788145f
4 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/DD-Record-Organiser/ClassControlValues.vb
View File

@@ -132,8 +132,10 @@ Public Class ClassControlValues
If IsNothing(metadata.Required) OrElse metadata.Required = False Then If IsNothing(metadata.Required) OrElse metadata.Required = False Then
Continue For Continue For
End If End If
If Control.Name = "Jährllicher Betrag" Then
If Not ControlHasValue(Control) Then Console.WriteLine("Obacht")
End If
If Not ControlHasValue(Control) And Control.Enabled = True Then
missingValues.Add(Control.Name) missingValues.Add(Control.Name)
End If End If
@@ -841,7 +843,9 @@ Public Class ClassControlValues
Public Shared Function Get_Control_Value_for_ID(Control_ID As Integer, Record_ID As Integer) Public Shared Function Get_Control_Value_for_ID(Control_ID As Integer, Record_ID As Integer)
Try Try
Return ClassDatabase.Execute_Scalar("SELECT VALUE FROM TBPMO_CONTROL_VALUE WHERE CONTROL_ID = " & Control_ID & " AND RECORD_ID = " & Record_ID, True) Dim sql = "SELECT VALUE FROM TBPMO_CONTROL_VALUE WHERE CONTROL_ID = " & Control_ID & " AND RECORD_ID = " & Record_ID
CURRENT_LAST_SQL = sql
Return ClassDatabase.Execute_Scalar(sql, True)
Catch ex As Exception Catch ex As Exception
ClassLogger.Add("Unexpected Error in GetControlValueForControlID: " & ex.Message, True) ClassLogger.Add("Unexpected Error in GetControlValueForControlID: " & ex.Message, True)
MsgBox("Error in GetControlValueForControlID:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) MsgBox("Error in GetControlValueForControlID:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)

9
app/DD-Record-Organiser/ClassImport_Windream.vb
View File

@@ -226,10 +226,13 @@ Public Class ClassImport_Windream
If IsNumeric(CONTROL_ID) Then If IsNumeric(CONTROL_ID) Then
Dim CONTROLVALUE = ClassControlValues.Get_Control_Value_for_ID(CONTROL_ID, CURRENT_RECORD_ID) Dim CONTROLVALUE = ClassControlValues.Get_Control_Value_for_ID(CONTROL_ID, CURRENT_RECORD_ID)
If IsNothing(CONTROLVALUE) Then If IsNothing(CONTROLVALUE) Then
If LogErrorsOnly = False Then ClassLogger.Add(" >> unexpected: CONTROLVALUE is nothing!!", False) ClassLogger.Add(">> NameConvention should be filled with value of Control-ID '" & CONTROL_ID & "', but result was nothing.", False)
ClassLogger.Add(">> SQL-Command: " & CURRENT_LAST_SQL)
value = "" value = ""
Else Else
If IsDBNull(CONTROLVALUE) Then If IsDBNull(CONTROLVALUE) Then
ClassLogger.Add(">> NameConvention should be filled with value of Control-ID '" & CONTROL_ID & "', but result was DBNULL.", False)
ClassLogger.Add(">> SQL-Command: " & CURRENT_LAST_SQL)
value = "" value = ""
Else Else
Dim sql1 = "SELECT * FROM TBPMO_WD_NAMECONVENTION_FORMAT WHERE ID = (SELECT TOP 1 GUID FROM TBPMO_WD_FORMVIEW_DOKTYPES WHERE DOCTYPE_ID = " & DocTypeID & " AND FORMVIEW_ID = " & CURRENT_FORMVIEW_ID & ")" Dim sql1 = "SELECT * FROM TBPMO_WD_NAMECONVENTION_FORMAT WHERE ID = (SELECT TOP 1 GUID FROM TBPMO_WD_FORMVIEW_DOKTYPES WHERE DOCTYPE_ID = " & DocTypeID & " AND FORMVIEW_ID = " & CURRENT_FORMVIEW_ID & ")"
@@ -243,7 +246,7 @@ Public Class ClassImport_Windream
Catch ex As Exception Catch ex As Exception
End Try End Try
If Not IsNothing(result) Then If Not IsNothing(result) Then
Dim _rule = result.Item("FORMAT_RULE") Dim _rule = result.Item("FORMAT_RULE")
If Not IsNothing(_rule) Then If Not IsNothing(_rule) Then
@@ -258,7 +261,7 @@ Public Class ClassImport_Windream
End If End If
End If End If
End If End If
value = CONTROLVALUE value = CONTROLVALUE
End If End If
End If End If

1
app/DD-Record-Organiser/ModuleRuntimeVariables.vb
View File

@@ -76,5 +76,6 @@
Public MASS_COLUMN_LIST As ArrayList Public MASS_COLUMN_LIST As ArrayList
Public SUCCESSFULL As Boolean = False Public SUCCESSFULL As Boolean = False
Public CURRENT_LAST_SQL As String
End Module End Module

2
app/DD-Record-Organiser/frmConstructor_Main.vb
View File

@@ -1433,7 +1433,7 @@ Public Class frmConstructor_Main
End If End If
ClassControlValues.LoadDefaultValues(ENTITY_ID, SELECTED_RECORD_ID, pnlDetails.Controls, CURRENT_PARENT_ENTITY_ID, ENTITY_ID) ClassControlValues.LoadDefaultValues(ENTITY_ID, SELECTED_RECORD_ID, pnlDetails.Controls, CURRENT_PARENT_ENTITY_ID, ENTITY_ID)
ClassControlValues.Enable_Depending_Controls(ENTITY_ID, RECORD_ID, PARENT_RECORDID, CtrlBuilder.AllControls, ENTITY_ID)
' Das StatusLabel aktualisieren ' Das StatusLabel aktualisieren
Update_Record_Label(NEW_RECORD_ID) Update_Record_Label(NEW_RECORD_ID)
' Im gegensatz zu EnableEditMode muss hier nur der save button enabled werden ' Im gegensatz zu EnableEditMode muss hier nur der save button enabled werden