Merge branch 'master' of http://scmadmin@172.24.11.74:90/scm/git/RecordOrganizer
This commit is contained in:
SchreiberM
commit
9f46f34821
@ -142,40 +142,6 @@ Public Class ClassWindreamDocGrid
|
||||
|
||||
RESULT_CONFIG_IDS = New Hashtable()
|
||||
|
||||
' Datentypen der DataTable setzen
|
||||
'For Each row As DataRow In DT_WINDREAM_RESULTLIST.Rows
|
||||
' Dim guid As Integer = row.Item("GUID")
|
||||
' Dim typeID As Integer = row.Item("TYPE_ID")
|
||||
' Dim isVisible As Boolean = row.Item("VISIBLE")
|
||||
' Dim isEditable As Boolean
|
||||
' If SearchType = "RECORD" Then
|
||||
' isEditable = row.Item("EDITABLE")
|
||||
' Else
|
||||
' isEditable = False
|
||||
' End If
|
||||
' Dim columnTitle As String = row.Item("HEADER_CAPTION")
|
||||
|
||||
' RESULT_CONFIG_IDS.Add(columnTitle, guid)
|
||||
|
||||
' ' Checkbox Spalte auf Boolean setzen
|
||||
' If typeID = 2 And isVisible Then
|
||||
' Dim checkboxColumn As DataColumn = clonedTable.Columns(columnTitle)
|
||||
|
||||
' If Not IsNothing(checkboxColumn) Then
|
||||
' checkboxColumn.DataType = GetType(Boolean)
|
||||
' End If
|
||||
' End If
|
||||
|
||||
' ' Datepicker Spalte auf Date setzen
|
||||
' If typeID = 3 And isVisible = True Then
|
||||
' Dim datepickerColumn As DataColumn = clonedTable.Columns(columnTitle)
|
||||
|
||||
' If Not IsNothing(datepickerColumn) Then
|
||||
' 'datepickerColumn.DataType = GetType(DateTime)
|
||||
' End If
|
||||
' End If
|
||||
'Next
|
||||
|
||||
' Tabelle zurückspielen und zuweisen
|
||||
Try
|
||||
clonedTable.Load(DT_RESULT.CreateDataReader())
|
||||
@ -184,7 +150,7 @@ Public Class ClassWindreamDocGrid
|
||||
' Neues Dataset für Master- und Detail-Tabelle erstellen
|
||||
Dim ds As New DataSet()
|
||||
|
||||
Dim DT_DETAILS_SQL = String.Format("SELECT T.[GUID],T.[DocID],T.[CONFIG_ID],T1.HEADER_CAPTION,T.[VALUE],T1.[LANGUAGE], T1.COLUMN_VIEW,T1.EDITABLE,T1.TYPE_ID,T1.VISIBLE " &
|
||||
Dim DT_DETAILS_SQL = String.Format("SELECT T.[GUID],T.[DocID],T.[CONFIG_ID],T1.HEADER_CAPTION,T.[VALUE],T1.[LANGUAGE], T1.COLUMN_VIEW,T1.EDITABLE,T1.TYPE_ID,T1.VISIBLE,T.CHANGED_WHEN,T.CHANGED_WHO " &
|
||||
"FROM TBPMO_DOC_VALUES T INNER JOIN TBPMO_DOCSEARCH_RESULTLIST_CONFIG T1 ON T.CONFIG_ID = T1.GUID WHERE T1.ENTITY_ID = {0} AND LANGUAGE = '{1}'", CURRENT_FORM_ID, USER_LANGUAGE)
|
||||
Dim DT_DETAILS As DataTable = ClassDatabase.Return_Datatable(DT_DETAILS_SQL)
|
||||
|
||||
@ -216,10 +182,11 @@ Public Class ClassWindreamDocGrid
|
||||
grvwDetail.OptionsView.ShowGroupPanel = False
|
||||
grvwDetail.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.Style3D
|
||||
grvwDetail.OptionsView.EnableAppearanceEvenRow = True
|
||||
grvwDetail.Appearance.EvenRow.BackColor = Color.Aqua
|
||||
grvwDetail.Appearance.HeaderPanel.BackColor = Color.Aqua
|
||||
grvwDetail.Appearance.EvenRow.BackColor = Color.Orange
|
||||
grvwDetail.Appearance.HeaderPanel.BackColor = Color.Orange
|
||||
grvwDetail.Appearance.HeaderPanel.Options.UseBackColor = True
|
||||
|
||||
|
||||
gridControl.LevelTree.Nodes.Add("docIdDetails", grvwDetail)
|
||||
Catch ex As Exception
|
||||
MsgBox("Error in FillColumns: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
|
||||
@ -278,10 +245,11 @@ Public Class ClassWindreamDocGrid
|
||||
|
||||
If typeId = 2 Then
|
||||
Dim checkEdit As New RepositoryItemCheckEdit()
|
||||
checkEdit.ValueChecked = True
|
||||
checkEdit.ValueUnchecked = False
|
||||
checkEdit.ValueChecked = "True"
|
||||
checkEdit.ValueUnchecked = "False"
|
||||
checkEdit.GlyphAlignment = HorzAlignment.Near
|
||||
checkEdit.Caption = String.Empty
|
||||
|
||||
' TODO: Add Checkbox handler
|
||||
AddHandler checkEdit.CheckedChanged, _checkValueChangedHandler
|
||||
|
||||
e.RepositoryItem = checkEdit
|
||||
@ -289,9 +257,16 @@ Public Class ClassWindreamDocGrid
|
||||
|
||||
If typeId = 3 Then
|
||||
Dim dateedit As New RepositoryItemDateEdit()
|
||||
'dateedit.DisplayFormat = CURRENT_DATE_FORMAT & " HH:MM:ss"
|
||||
|
||||
AddHandler dateedit.EditValueChanged, _datepickerValueChangedHandler
|
||||
' Brauchen wir Zeitangaben in den Custom Fields?
|
||||
'AddHandler dateedit.CustomDisplayText, Sub(sender As Object, _e As DevExpress.XtraEditors.Controls.CustomDisplayTextEventArgs)
|
||||
' Dim value As String = _e.Value
|
||||
' _e.DisplayText = value
|
||||
' Dim parsedDate As DateTime = DateTime.ParseExact(value, "yyyy-MM-dd", System.Globalization.DateTimeFormatInfo.InvariantInfo)
|
||||
|
||||
' _e.DisplayText = parsedDate.ToString(CURRENT_DATE_FORMAT & " HH:MM:ss")
|
||||
' End Sub
|
||||
|
||||
e.RepositoryItem = dateedit
|
||||
End If
|
||||
@ -313,6 +288,9 @@ Public Class ClassWindreamDocGrid
|
||||
e.RepositoryItem = dropdown
|
||||
|
||||
End If
|
||||
ElseIf (e.Column.Name <> "colVALUE") Then
|
||||
' Erlaube Editieren nur für VALUE Spalte
|
||||
e.Column.OptionsColumn.AllowEdit = False
|
||||
End If
|
||||
End Sub
|
||||
|
||||
@ -320,6 +298,7 @@ Public Class ClassWindreamDocGrid
|
||||
Dim detailView As GridView = sender.GetDetailView(e.RowHandle, e.RelationIndex)
|
||||
|
||||
With detailView.Columns
|
||||
'Spalten ausblenden
|
||||
.Item("GUID").Visible = False
|
||||
.Item("DocID").Visible = False
|
||||
.Item("CONFIG_ID").Visible = False
|
||||
@ -328,6 +307,23 @@ Public Class ClassWindreamDocGrid
|
||||
.Item("EDITABLE").Visible = False
|
||||
.Item("TYPE_ID").Visible = False
|
||||
.Item("VISIBLE").Visible = False
|
||||
|
||||
'Spalten formatieren
|
||||
|
||||
.Item("CHANGED_WHEN").DisplayFormat.FormatType = FormatType.DateTime
|
||||
.Item("CHANGED_WHEN").DisplayFormat.FormatString = CURRENT_DATE_FORMAT & " HH:MM:ss"
|
||||
|
||||
If USER_LANGUAGE = "de-DE" Then
|
||||
.Item("HEADER_CAPTION").Caption = "Beschreibung"
|
||||
.Item("VALUE").Caption = "Wert"
|
||||
.Item("CHANGED_WHEN").Caption = "Geändert Wann"
|
||||
.Item("CHANGED_WHO").Caption = "Geändert Wer"
|
||||
Else
|
||||
.Item("HEADER_CAPTION").Caption = "Description"
|
||||
.Item("VALUE").Caption = "Value"
|
||||
.Item("CHANGED_WHEN").Caption = "Changed when"
|
||||
.Item("CHANGED_WHO").Caption = "changed Who"
|
||||
End If
|
||||
End With
|
||||
|
||||
AddHandler detailView.CustomRowCellEdit, AddressOf detailView_CustomRowCellEdit
|
||||
|
||||
17
app/DD-Record-Organiser/frmMain.Designer.vb
generated
17
app/DD-Record-Organiser/frmMain.Designer.vb
generated
@ -22,19 +22,18 @@ Partial Class frmMain
|
||||
'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
|
||||
<System.Diagnostics.DebuggerStepThrough()> _
|
||||
Private Sub InitializeComponent()
|
||||
Me.components = New System.ComponentModel.Container()
|
||||
Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmMain))
|
||||
Me.NotifyIcon = New System.Windows.Forms.NotifyIcon(Me.components)
|
||||
Me.cmsSystray = New System.Windows.Forms.ContextMenuStrip(Me.components)
|
||||
Me.NotifyIcon = New System.Windows.Forms.NotifyIcon()
|
||||
Me.cmsSystray = New System.Windows.Forms.ContextMenuStrip()
|
||||
Me.ADDIBeendenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
|
||||
Me.CockpitAnzeigenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
|
||||
Me.TimerTasks = New System.Windows.Forms.Timer(Me.components)
|
||||
Me.TimerTasks = New System.Windows.Forms.Timer()
|
||||
Me.DD_DMSDataSet = New DD_Record_Organiser.DD_DMSDataSet()
|
||||
Me.VWPMO_WF_ACTIVEBindingSource = New System.Windows.Forms.BindingSource(Me.components)
|
||||
Me.VWPMO_WF_ACTIVEBindingSource = New System.Windows.Forms.BindingSource()
|
||||
Me.VWPMO_WF_ACTIVETableAdapter = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.VWPMO_WF_ACTIVETableAdapter()
|
||||
Me.TableAdapterManager = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.TableAdapterManager()
|
||||
Me.ribbonMain = New DevExpress.XtraBars.Ribbon.RibbonControl()
|
||||
Me.MainMenu = New DevExpress.XtraBars.Ribbon.ApplicationMenu(Me.components)
|
||||
Me.MainMenu = New DevExpress.XtraBars.Ribbon.ApplicationMenu()
|
||||
Me.itemSettings = New DevExpress.XtraBars.BarButtonItem()
|
||||
Me.itemInfo = New DevExpress.XtraBars.BarButtonItem()
|
||||
Me.itemAbout = New DevExpress.XtraBars.BarButtonItem()
|
||||
@ -80,9 +79,9 @@ Partial Class frmMain
|
||||
Me.RibbonPageGroupMenue = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
|
||||
Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
|
||||
Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar()
|
||||
Me.DefaultLookAndFeel1 = New DevExpress.LookAndFeel.DefaultLookAndFeel(Me.components)
|
||||
Me.DefaultLookAndFeel1 = New DevExpress.LookAndFeel.DefaultLookAndFeel()
|
||||
Me.BarButtonItem11 = New DevExpress.XtraBars.BarButtonItem()
|
||||
Me.TimerClose3Minutes = New System.Windows.Forms.Timer(Me.components)
|
||||
Me.TimerClose3Minutes = New System.Windows.Forms.Timer()
|
||||
Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
|
||||
Me.cmsSystray.SuspendLayout()
|
||||
CType(Me.DD_DMSDataSet, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
@ -185,7 +184,7 @@ Partial Class frmMain
|
||||
Me.ribbonMain.MaxItemId = 1
|
||||
Me.ribbonMain.Name = "ribbonMain"
|
||||
Me.ribbonMain.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.pageHome, Me.pageForms, Me.pageAdmin})
|
||||
Me.ribbonMain.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonControlStyle.Office2013
|
||||
Me.ribbonMain.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonControlStyle.Office2010
|
||||
Me.ribbonMain.StatusBar = Me.RibbonStatusBar1
|
||||
Me.ribbonMain.ToolbarLocation = DevExpress.XtraBars.Ribbon.RibbonQuickAccessToolbarLocation.Hidden
|
||||
'
|
||||
|
||||
@ -1,12 +1,15 @@
|
||||
Imports DevExpress.XtraNavBar
|
||||
Imports DevExpress.XtraBars.Ribbon
|
||||
Imports DevExpress.XtraBars
|
||||
Imports DevExpress.XtraBars.Ribbon
|
||||
Imports DevExpress.XtraBars.Ribbon.Helpers
|
||||
Imports DevExpress.XtraBars.Ribbon.ViewInfo
|
||||
Imports System.ComponentModel
|
||||
Imports System.Threading
|
||||
Imports System.Globalization
|
||||
Imports System.Net
|
||||
Imports System.Net.Sockets
|
||||
|
||||
|
||||
Public Class frmMain
|
||||
Dim strIPAddress As String
|
||||
Public Shared TIMER_SCAN As New System.Windows.Forms.Timer
|
||||
@ -72,7 +75,7 @@ Public Class frmMain
|
||||
TIMER_SCAN.Enabled = False
|
||||
End Try
|
||||
End Sub
|
||||
|
||||
|
||||
|
||||
|
||||
Private Sub frmMain_Load(sender As Object, e As EventArgs) Handles Me.Load
|
||||
@ -428,7 +431,7 @@ Public Class frmMain
|
||||
Catch ex As Exception
|
||||
ClassLogger.Add("Unexpected Error in Load BackgroundImage: " & ex.Message)
|
||||
End Try
|
||||
|
||||
|
||||
End Sub
|
||||
|
||||
Sub Refresh_TaskReminder()
|
||||
@ -800,4 +803,37 @@ Public Class frmMain
|
||||
frmLicense_User.ShowDialog()
|
||||
End Sub
|
||||
|
||||
Private Sub frmMain_MdiChildActivate(sender As Object, e As EventArgs) Handles Me.MdiChildActivate
|
||||
Dim mainForm As Form = sender
|
||||
Dim constructorFound = False
|
||||
|
||||
For Each childForm As Form In mainForm.MdiChildren
|
||||
If (childForm.Name = "frmConstructor_Main") Then
|
||||
Dim form As frmConstructor_Main = childForm
|
||||
Dim formOpening = Not (form.Disposing Or form.IsDisposed)
|
||||
|
||||
' Wird das Child Formular gerade geöffnet?
|
||||
If formOpening Then
|
||||
constructorFound = True
|
||||
End If
|
||||
End If
|
||||
Next
|
||||
|
||||
' Wenn gerade ein frmConstructor_Main geöffnet wurde,
|
||||
' wird ribbonMain minimiert
|
||||
If constructorFound Then
|
||||
ribbonMain.Minimized = True
|
||||
Else
|
||||
ribbonMain.Minimized = False
|
||||
End If
|
||||
End Sub
|
||||
|
||||
Private Sub ribbonMain_MouseMove(sender As Object, e As MouseEventArgs) Handles ribbonMain.MouseMove
|
||||
Dim hitInfo As RibbonHitInfo = ribbonMain.CalcHitInfo(e.Location)
|
||||
|
||||
' Wenn ribbonMain minimiert ist und die Maus über den Reitern
|
||||
If (ribbonMain.Minimized And hitInfo.HitTest = RibbonHitTest.PageHeader) Then
|
||||
ribbonMain.Minimized = False
|
||||
End If
|
||||
End Sub
|
||||
End Class
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user