diff --git a/app/DD-Record-Organizer/frmConstructor_Main.Designer.vb b/app/DD-Record-Organizer/frmConstructor_Main.Designer.vb index 772573b..d662573 100644 --- a/app/DD-Record-Organizer/frmConstructor_Main.Designer.vb +++ b/app/DD-Record-Organizer/frmConstructor_Main.Designer.vb @@ -225,6 +225,7 @@ Partial Class frmConstructor_Main Me.ToolTipController = New DevExpress.Utils.ToolTipController(Me.components) Me.TBPMO_RECORD_VARIANTTableAdapter = New DD_Record_Organizer.DD_DMSDataSetTableAdapters.TBPMO_RECORD_VARIANTTableAdapter() Me.TimerClearResultfiles = New System.Windows.Forms.Timer(Me.components) + Me.tsbtnPos_Refresh = New System.Windows.Forms.ToolStripButton() CType(Me.SplitContainerMain, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainerMain.SuspendLayout() CType(Me.SplitContainerTop, System.ComponentModel.ISupportInitialize).BeginInit() @@ -839,7 +840,7 @@ Partial Class frmConstructor_Main Me.BindingNavigatorPOS.CountItem = Me.BindingNavigatorCountItem Me.BindingNavigatorPOS.CountItemFormat = "von {0} positions" Me.BindingNavigatorPOS.DeleteItem = Nothing - Me.BindingNavigatorPOS.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.BindingNavigatorMoveFirstItem, Me.BindingNavigatorMovePreviousItem, Me.BindingNavigatorSeparator, Me.BindingNavigatorPositionItem, Me.BindingNavigatorCountItem, Me.BindingNavigatorSeparator1, Me.BindingNavigatorMoveNextItem, Me.BindingNavigatorMoveLastItem, Me.BindingNavigatorSeparator2, Me.BindingNavigatorAddNewItem, Me.BindingNavigatorDeleteItem, Me.tsbtnWork, Me.tslblPoslocked}) + Me.BindingNavigatorPOS.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.BindingNavigatorMoveFirstItem, Me.BindingNavigatorMovePreviousItem, Me.BindingNavigatorSeparator, Me.BindingNavigatorPositionItem, Me.BindingNavigatorCountItem, Me.BindingNavigatorSeparator1, Me.BindingNavigatorMoveNextItem, Me.BindingNavigatorMoveLastItem, Me.BindingNavigatorSeparator2, Me.tsbtnPos_Refresh, Me.BindingNavigatorAddNewItem, Me.BindingNavigatorDeleteItem, Me.tsbtnWork, Me.tslblPoslocked}) resources.ApplyResources(Me.BindingNavigatorPOS, "BindingNavigatorPOS") Me.BindingNavigatorPOS.MoveFirstItem = Me.BindingNavigatorMoveFirstItem Me.BindingNavigatorPOS.MoveLastItem = Me.BindingNavigatorMoveLastItem @@ -1575,6 +1576,12 @@ Partial Class frmConstructor_Main ' Me.TimerClearResultfiles.Interval = 3000 ' + 'tsbtnPos_Refresh + ' + Me.tsbtnPos_Refresh.Image = Global.DD_Record_Organizer.My.Resources.Resources.refresh_16xLG + resources.ApplyResources(Me.tsbtnPos_Refresh, "tsbtnPos_Refresh") + Me.tsbtnPos_Refresh.Name = "tsbtnPos_Refresh" + ' 'frmConstructor_Main ' resources.ApplyResources(Me, "$this") @@ -1846,4 +1853,5 @@ Partial Class frmConstructor_Main Friend WithEvents tsbtnStartFulltext As System.Windows.Forms.ToolStripButton Friend WithEvents OrdnerÖffnenToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem Friend WithEvents TimerClearResultfiles As System.Windows.Forms.Timer + Friend WithEvents tsbtnPos_Refresh As System.Windows.Forms.ToolStripButton End Class diff --git a/app/DD-Record-Organizer/frmConstructor_Main.resx b/app/DD-Record-Organizer/frmConstructor_Main.resx index 6d62511..b478c2f 100644 --- a/app/DD-Record-Organizer/frmConstructor_Main.resx +++ b/app/DD-Record-Organizer/frmConstructor_Main.resx @@ -1256,6 +1256,15 @@ 6, 25 + + Magenta + + + 66, 22 + + + Refresh + False @@ -4002,6 +4011,12 @@ System.Windows.Forms.Timer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + tsbtnPos_Refresh + + + System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + frmConstructor_Main diff --git a/app/DD-Record-Organizer/frmConstructor_Main.vb b/app/DD-Record-Organizer/frmConstructor_Main.vb index ec56534..6bea925 100644 --- a/app/DD-Record-Organizer/frmConstructor_Main.vb +++ b/app/DD-Record-Organizer/frmConstructor_Main.vb @@ -4282,7 +4282,7 @@ Public Class frmConstructor_Main Dim SQL = String.Format("SELECT GUID FROM TBPMO_CONTROL_SCREEN WHERE CONTROL_ID = {0} AND SCREEN_ID = {1}", DR.Item("DEPENDENT_DONE_CTRL_ID"), CURRENT_SCREEN_ID) Dim ctrl_screen_id = ClassDatabase.Execute_Scalar(SQL, True) If ctrl_screen_id > 0 Then - SQL = String.Format("SELECT CAPTION FROM TBPMO_CONTROL_LANGUAGE WHERE CONTROL_SCREEN_ID = {0} AND LANGUAGE_TYPE = '{2}'", ctrl_screen_id, USER_LANGUAGE) + SQL = String.Format("SELECT CAPTION FROM TBPMO_CONTROL_LANGUAGE WHERE CONTROL_SCREEN_ID = {0} AND LANGUAGE_TYPE = '{1}'", ctrl_screen_id, USER_LANGUAGE) Dim captionCheck = ClassDatabase.Execute_Scalar(SQL, True) If Not IsNothing(captionCheck) Then chkFollowUp.Text = CStr(captionCheck) @@ -4715,6 +4715,7 @@ Public Class frmConstructor_Main If ClassRecordCommands.ConnectRecord(PARENT_RECORDID, POS_RECORD_ID, "POS_LINK for Entity " & POS_ENTITY.ToString) = True Then ClassProxy.PRPROXY_RECORD_CONNECT(PARENT_RECORDID, POS_RECORD_ID) End If + Load_Pos_Data() Else MsgBox("Unexpected Error in Creating POS", MsgBoxStyle.Exclamation) End If @@ -6571,4 +6572,8 @@ Public Class frmConstructor_Main TimerClearResultfiles.Stop() End Try End Sub + + Private Sub tsbtnPos_Refresh_Click(sender As Object, e As EventArgs) Handles tsbtnPos_Refresh.Click + Load_Pos_Data() + End Sub End Class \ No newline at end of file diff --git a/app/DD-Record-Organizer/frmMain.Designer.vb b/app/DD-Record-Organizer/frmMain.Designer.vb index 22031b8..043ccb2 100644 --- a/app/DD-Record-Organizer/frmMain.Designer.vb +++ b/app/DD-Record-Organizer/frmMain.Designer.vb @@ -37,6 +37,7 @@ Partial Class frmMain Me.MainMenu = New DevExpress.XtraBars.Ribbon.ApplicationMenu(Me.components) Me.itemSettings = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem19 = New DevExpress.XtraBars.BarButtonItem() + Me.itemScanInbox = New DevExpress.XtraBars.BarButtonItem() Me.itemRefreshProxy = New DevExpress.XtraBars.BarButtonItem() Me.itemInfo = New DevExpress.XtraBars.BarButtonItem() Me.itemAbout = New DevExpress.XtraBars.BarButtonItem() @@ -194,9 +195,9 @@ Partial Class frmMain Me.ribbonMain.ApplicationButtonDropDownControl = Me.MainMenu Me.ribbonMain.BackColor = System.Drawing.Color.DarkGray Me.ribbonMain.ExpandCollapseItem.Id = 0 - Me.ribbonMain.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.ribbonMain.ExpandCollapseItem, Me.LabelMachine, Me.LabelLoggedIn, Me.LabelVersion, Me.itemInfo, Me.itemExit, Me.BarButtonItem1, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.BarButtonItem6, Me.BarButtonItem7, Me.itemSettings, Me.BarButtonItem2, Me.BarButtonItem10, Me.BarButtonItem12, Me.BarButtonItem13, Me.BarButtonItemConnections, Me.BarButtonItem15, Me.BarButtonItem16, Me.BarButtonItem17, Me.BarButtonItem18, Me.LabelLanguage, Me.BarButtonItem20, Me.BarButtonItemSAPConnect, Me.BarButtonItemStructureNOdes, Me.BarSubItem1, Me.BarButtonItem14, Me.BarButtonItem21, Me.BarButtonItem22, Me.BarButtonItem8, Me.BarButtonItem9, Me.itemAbout, Me.BarButtonItem19, Me.btnGlobalSearch, Me.LabelUser, Me.bbtnItemViewsUser, Me.BarButtonItem23, Me.itemRefreshProxy, Me.LabelProxyServer, Me.BarSubItem2, Me.BarButtonItem24, Me.BarButtonItem25, Me.StatusPersonifiedLogin}) + Me.ribbonMain.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.ribbonMain.ExpandCollapseItem, Me.LabelMachine, Me.LabelLoggedIn, Me.LabelVersion, Me.itemInfo, Me.itemExit, Me.BarButtonItem1, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.BarButtonItem6, Me.BarButtonItem7, Me.itemSettings, Me.BarButtonItem2, Me.BarButtonItem10, Me.BarButtonItem12, Me.BarButtonItem13, Me.BarButtonItemConnections, Me.BarButtonItem15, Me.BarButtonItem16, Me.BarButtonItem17, Me.BarButtonItem18, Me.LabelLanguage, Me.BarButtonItem20, Me.BarButtonItemSAPConnect, Me.BarButtonItemStructureNOdes, Me.BarSubItem1, Me.BarButtonItem14, Me.BarButtonItem21, Me.BarButtonItem22, Me.BarButtonItem8, Me.BarButtonItem9, Me.itemAbout, Me.BarButtonItem19, Me.btnGlobalSearch, Me.LabelUser, Me.bbtnItemViewsUser, Me.BarButtonItem23, Me.itemRefreshProxy, Me.LabelProxyServer, Me.BarSubItem2, Me.BarButtonItem24, Me.BarButtonItem25, Me.StatusPersonifiedLogin, Me.itemScanInbox}) resources.ApplyResources(Me.ribbonMain, "ribbonMain") - Me.ribbonMain.MaxItemId = 6 + Me.ribbonMain.MaxItemId = 7 Me.ribbonMain.Name = "ribbonMain" Me.ribbonMain.PageCategories.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageCategory() {Me.RibbonPageCategory1}) Me.ribbonMain.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.pageHome, Me.pageForms, Me.pageAdmin}) @@ -207,6 +208,7 @@ Partial Class frmMain 'MainMenu ' Me.MainMenu.ItemLinks.Add(Me.itemSettings) + Me.MainMenu.ItemLinks.Add(Me.itemScanInbox) Me.MainMenu.ItemLinks.Add(Me.BarButtonItem19) Me.MainMenu.ItemLinks.Add(Me.itemRefreshProxy) Me.MainMenu.ItemLinks.Add(Me.itemInfo) @@ -229,6 +231,14 @@ Partial Class frmMain Me.BarButtonItem19.Id = 47 Me.BarButtonItem19.Name = "BarButtonItem19" ' + 'itemScanInbox + ' + resources.ApplyResources(Me.itemScanInbox, "itemScanInbox") + Me.itemScanInbox.Glyph = CType(resources.GetObject("itemScanInbox.Glyph"), System.Drawing.Image) + Me.itemScanInbox.Id = 6 + Me.itemScanInbox.Name = "itemScanInbox" + Me.itemScanInbox.Visibility = DevExpress.XtraBars.BarItemVisibility.Never + ' 'itemRefreshProxy ' resources.ApplyResources(Me.itemRefreshProxy, "itemRefreshProxy") @@ -794,6 +804,7 @@ Partial Class frmMain Friend WithEvents StatusPersonifiedLogin As DevExpress.XtraBars.BarStaticItem Friend WithEvents TimerInformation As System.Windows.Forms.Timer Friend WithEvents ContextMenuStrip1 As System.Windows.Forms.ContextMenuStrip + Friend WithEvents itemScanInbox As DevExpress.XtraBars.BarButtonItem End Class diff --git a/app/DD-Record-Organizer/frmMain.resx b/app/DD-Record-Organizer/frmMain.resx index 7ff27f3..8702cb0 100644 --- a/app/DD-Record-Organizer/frmMain.resx +++ b/app/DD-Record-Organizer/frmMain.resx @@ -1117,6 +1117,175 @@ gxXhBTzyM4OT531dfdMT3r8GiY4Xirjbybxo0lSDU/jGHY6bjGo+r+c1Q/vgxiQx3lBgickmSU/fQtLV N5fmzFsjzZ5vJqAzz1Rg1tzVPE2llBpcvWDBYiuaD8xbbEnzDC1JfYL2QnwT8eW5ugYWGIYUES7/T/we UVnFoWBr+TznI5VPNdUJyXP+R5GkfwMPT3OfchuhBQAAAABJRU5ErkJggg== + + + + Scan - Inbox + + + + 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 + P2tkH2rU/ce+AAAAAElFTkSuQmCC @@ -3539,6 +3708,12 @@ Konfiguration DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + itemScanInbox + + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + itemRefreshProxy diff --git a/app/DD-Record-Organizer/frmMain.vb b/app/DD-Record-Organizer/frmMain.vb index 04103ea..e6f87f6 100644 --- a/app/DD-Record-Organizer/frmMain.vb +++ b/app/DD-Record-Organizer/frmMain.vb @@ -15,29 +15,6 @@ Public Class frmMain Dim strIPAddress As String Public Shared TIMER_SCAN As New System.Windows.Forms.Timer - Public Shared Sub RUN_TIMER() - Try - If TIMER_SCAN.Enabled = False And CURRENT_SCAN_FOLDERWATCH <> "" And FWSCAN_started = True 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 = 30000 - TIMER_SCAN.Enabled = True - AddHandler TIMER_SCAN.Tick, AddressOf Scan_TickHandler - Else - If TIMER_SCAN.Enabled = True And CURRENT_SCAN_FOLDERWATCH <> "" And FWSCAN_started = True 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) - End Try - - End Sub Private Shared Sub Scan_TickHandler(sender As Object, e As EventArgs) Try If ClassFolderWatcher.NEW_FILES = False Then Exit Sub @@ -139,6 +116,32 @@ Public Class frmMain LabelProxyServer.Visibility = BarItemVisibility.Never End If End Sub + Public Shared Sub RUN_TIMER() + Try + If TIMER_SCAN.Enabled = False And CURRENT_SCAN_FOLDERWATCH <> "" And FWSCAN_started = True 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 = 30000 + TIMER_SCAN.Enabled = True + AddHandler TIMER_SCAN.Tick, AddressOf Scan_TickHandler + Else + If TIMER_SCAN.Enabled = True And CURRENT_SCAN_FOLDERWATCH <> "" And FWSCAN_started = True Then + TIMER_SCAN.Enabled = False + + itemRefreshProxy.Visibility = BarItemVisibility.Always + BarButtonItemScan.visibility = always + 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) + End Try + + End Sub Sub Load_Connection_Dep_Data() SetBackground() If ERROR_INIT = "NONE" Then