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

ms3

Browse Source
This commit is contained in:
SchreiberM 2015-11-17 17:04:20 +01:00
parent daee309cd7
commit 82cb58bf90
4 changed files with 88 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/DD-Record-Organiser/My Project/AssemblyInfo.vb
View File

@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("1.9.0.0")>
<Assembly: AssemblyVersion("2.0.0.0")>
<Assembly: AssemblyFileVersion("1.0.0.0")>

4
app/DD-Record-Organiser/frmForm_Constructor.vb
View File

@ -869,7 +869,7 @@ Public Class frmForm_Constructor
'The file name
param.Add("szLongName")
'The document-Type
param.Add("szText39")
param.Add("szText37")
'Versionsnummer
param.Add("dwVersionNumber")
'Datumsangaben
@ -889,7 +889,7 @@ Public Class frmForm_Constructor
Case "szLongName"
'Dateiname
width = 300
Case "szText39"
Case "szText37"
'Dokumentart
width = 160
Case "dwCreationDate"

129
app/DD-Record-Organiser/frmForm_Constructor_Main.vb
View File

@ -113,7 +113,6 @@ Public Class frmForm_Constructor_Main
End If
Try
'SplitCont_Details.Collapsed = True
CONSTRUCTORID = CURRENT_CONSTRUCTOR_ID
ClassWindowLocation.LoadFormLocationSize(Me, CONSTRUCTORID, CURRENT_SCREEN_ID, "CONSTRUCTOR_MAIN")
@ -256,7 +255,14 @@ Public Class frmForm_Constructor_Main
Private Sub ResetNav()
' Grid zurücksetzen
Clear_Grid_View()
ACT_EBENE = 0
ACT_EBENE_STRING = ""
EBENE1_ENTITY = ""
EBENE1_RECID = 0
EBENE2_ENTITY = ""
EBENE2_RECID = 0
EBENE3_ENTITY = ""
EBENE3_RECID = 0
' Navigation zurücksetzen
NavPane.Categories.Clear()
' TreeView zurücksetzen
@ -264,7 +270,7 @@ Public Class frmForm_Constructor_Main
TreeViewMain.SelectedNode = Nothing
SetSelectedNodeStyle(TreeViewMain.Nodes)
Load_Tree_View(CURRENT_CONSTRUCTOR_ID)
Load_Tree_View(CONSTRUCTORID)
End Sub
#End Region
@ -924,7 +930,7 @@ Public Class frmForm_Constructor_Main
GRID_TYPE = GridType.Grid
GridControlMain.MainView = grvwGrid
End Select
SELECTED_RECORD_ID = 0
' SELECTED_RECORD_ID = 0
Dim DT As DataTable
Dim sql As String = "SELECT PARENT_ID FROM VWPMO_CONSTRUCTOR_FORMS WHERE CONSTRUCT_ID = " & CONSTRUCTORID & " AND FORM_ID = " & CURRENT_FORM_ID
Dim PARENT_ID = ClassDatabase.Execute_Scalar(sql)
@ -1777,55 +1783,80 @@ Public Class frmForm_Constructor_Main
AxObjectListControl.SetIconMode(True)
AxObjectListControl.RemoveAllColumnHeader()
Me.AxObjectListControl.SetSession(ClassWindream.oSession, "", "")
'Change the status icon
'ICON STATES:
Me.AxObjectListControl.SetStatusIcon(0)
'Change the icon
Me.AxObjectListControl.SetStatusIcon(2)
Try
Dim sql_ResultList = "select * from TBPMO_WINDREAM_RESULTLIST_CONFIG where guid = 1"
Dim DT As DataTable = ClassDatabase.Return_Datatable(sql_ResultList, "GET RESULTLIST KONFIG")
If Not DT Is Nothing Then
If Not DT Is Nothing And DT.Rows.Count = 1 Then
Dim anzparam As Integer = 1
For Each Column As DataColumn In DT.Columns
If Column.ColumnName.StartsWith("COLUMN") And Column.ColumnName.EndsWith("WIDTH") = False Then
Dim sql = String.Format("select {0} from TBPMO_WINDREAM_RESULTLIST_CONFIG Where GUID = 1", Column.ColumnName)
Dim ColumnName = ClassDatabase.Execute_Scalar(sql, True)
If Not IsDBNull(ColumnName) Then
If Not IsDBNull(ColumnName) Or IsNothing(ColumnName) Or ColumnName <> "" Or ColumnName <> "{}" Then
'Jetzt die Spalten aus Array hinzufügen und Breite konfigurieren
sql = String.Format("select COLUMN{0}_WIDTH from TBPMO_WINDREAM_RESULTLIST_CONFIG Where GUID = 1", anzparam)
Dim Width = ClassDatabase.Execute_Scalar(sql, True)
If IsNothing(Width) Or IsDBNull(Width) Then
Width = 200
End If
'You need to use the column name here
'Please note that some attributes or indices will not be displayed
'Try not to add the same header twice, it will throw cause problems if you do that
Me.AxObjectListControl.AddColumnHeader(ColumnName, Width)
anzparam += 1
End If
End If
End If
Next
Else
Dim param As New List(Of String)
'The file name
param.Add("szLongName")
'The document-Type
param.Add("szText37")
'Versionsnummer
param.Add("dwVersionNumber")
'Datumsangaben
param.Add("dwCreationDate")
param.Add("dwCreation_Time")
'Add all search params
For Each spar As String In param
Dim width As Integer = 200
Select Case spar
Case "szLongName"
'Dateiname
width = 300
Case "szText37"
'Dokumentart
width = 160
Case "dwCreationDate"
'Erstelldatum
width = 90
Case "dwCreation_Time"
'Erstell-Zeit
width = 120
End Select
'You need to use the column name here
'Please note that some attributes or indices will not be displayed
'Try not to add the same header twice, it will throw cause problems if you do that
Me.AxObjectListControl.AddColumnHeader(spar, width)
Next
End If
Catch ex As Exception
MsgBox("Unexpected Error in Construct windreamResultList: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
End Try
Dim param As New List(Of String)
'The file name
param.Add("szLongName")
'The document-Type
param.Add("szText39")
'Versionsnummer
param.Add("dwVersionNumber")
'Datumsangaben
param.Add("dwCreationDate")
param.Add("dwCreation_Time")
Me.AxObjectListControl.SetSession(ClassWindream.oSession, "", "")
'Change the satus icon
'ICON STATES:
Me.AxObjectListControl.SetStatusIcon(0)
'Change the icon
Me.AxObjectListControl.SetStatusIcon(2)
'Add all search params
For Each spar As String In param
Dim width As Integer = 200
Select Case spar
Case "szLongName"
'Dateiname
width = 300
Case "szText39"
'Dokumentart
width = 160
Case "dwCreationDate"
'Erstelldatum
width = 90
Case "dwCreation_Time"
'Erstell-Zeit
width = 120
End Select
'You need to use the column name here
'Please note that some attributes or indices will not be displayed
'Try not to add the same header twice, it will throw cause problems if you do that
Me.AxObjectListControl.AddColumnHeader(spar, width)
Next
If LogErrorsOnly = False Then ClassLogger.Add(">> AxObjectListControl geladen ", False)
'Execute the search
Dim results As WMObjects = windreamSucheErgebnisse
@ -1861,7 +1892,6 @@ Public Class frmForm_Constructor_Main
Cursor = Cursors.Default
End Try
End Sub
Private Function Return_SearchPattern(ByVal content As String)
Select Case content.ToUpper
@ -2254,7 +2284,16 @@ Public Class frmForm_Constructor_Main
#End Region
Private Sub ResetEbenenAuswahlToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ResetEbenenAuswahlToolStripMenuItem.Click
ACT_EBENE = 0
ACT_EBENE_STRING = ""
EBENE1_ENTITY = ""
EBENE1_RECID = 0
EBENE2_ENTITY = ""
EBENE2_RECID = 0
EBENE3_ENTITY = ""
EBENE3_RECID = 0
Load_Tree_View(CONSTRUCTORID)
End Sub
Private Sub DateiimportEntitätToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles DateiimportEntitätToolStripMenuItem.Click

2
app/SetupWiX/Product.wxs
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
<Product Name="Record Organizer" Id="*" UpgradeCode="{6387325E-F6D7-46BE-BBA8-D0E37BEEF800}" Version="1.9.0.0" Manufacturer="Digital Data" Language="1031" Codepage="1252">
<Product Name="Record Organizer" Id="*" UpgradeCode="{6387325E-F6D7-46BE-BBA8-D0E37BEEF800}" Version="2.0.0.0" Manufacturer="Digital Data" Language="1031" Codepage="1252">
<Package Id="*" Keywords="Installer" Description="Digital Data Record Organizer Setup" Comments="Record Organizer is a registered Trademark of Digital Data" Manufacturer="Digital Data" InstallerVersion="100" Languages="1031" Compressed="yes" SummaryCodepage="1252"/>
<!-- Nicht entfernen! -->