MS_05042016

app/DD-Record-Organiser/frmMain.vb

@@ -78,12 +78,12 @@ Public Class frmMain
             LabelVersion.Caption = String.Format("Version {0}", My.Application.Info.Version.ToString)
             LabelUser.Caption = Environment.UserName
             LabelMachine.Caption = My.Computer.Name
-
+            LabelLanguage.Caption = "Language: " & USER_LANGUAGE
             Load_Connection_Dep_Data()
 
             'Wenn Argumente übergeben wurden, wird Formular geladen und zu record gesprungen
             ClassJumpRecord.ParseArgs()
-
+            TimerTasks.Interval = Task_Popup_minutes * 60000
         Catch ex As Exception
             MsgBox("Error in Load Form:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
         End Try
@@ -107,9 +107,9 @@ Public Class frmMain
     End Sub
     Sub Load_TasksforUser()
         Try
-            VWPMO_WF_USER_ACTIVETableAdapter.Connection.ConnectionString = MyConnectionString
-            Me.VWPMO_WF_USER_ACTIVETableAdapter.FillByUser(Me.DD_DMSDataSet.VWPMO_WF_USER_ACTIVE, Environment.UserName)
-            CURRENT_TASKS_GENERAL = Me.DD_DMSDataSet.VWPMO_WF_USER_ACTIVE
+            VWPMO_WF_ACTIVETableAdapter.Connection.ConnectionString = MyConnectionString
+            Me.VWPMO_WF_ACTIVETableAdapter.Fill(Me.DD_DMSDataSet.VWPMO_WF_ACTIVE, USER_LANGUAGE, Environment.UserName)
+            CURRENT_TASKS_GENERAL = Me.DD_DMSDataSet.VWPMO_WF_ACTIVE
         Catch ex As Exception
             MsgBox("Error in Load Tasks:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
         End Try
@@ -396,7 +396,7 @@ Public Class frmMain
     Sub Refresh_TaskReminder()
         Load_TasksforUser()
         Try
-            If DD_DMSDataSet.VWPMO_WF_USER_ACTIVE.Rows.Count > 0 Then
+            If DD_DMSDataSet.VWPMO_WF_ACTIVE.Rows.Count > 0 Then
                 NotifyIcon.Visible = True
                 If USER_LANGUAGE = "de-DE" Then
                     NotifyIcon.ShowBalloonTip(50000, "ADDI-Unerledigte Tasks", "Sie haben unerledigte Tasks in Ihrem Verantwortungsbereich." & vbNewLine & "Bitte überprüfen Sie Ihre Workflow-Tasks", ToolTipIcon.Info)
@@ -436,7 +436,7 @@ Public Class frmMain
 
     End Sub
 
-    Private Sub Timer1_Tick(sender As Object, e As EventArgs) Handles Timer1.Tick
+    Private Sub Timer1_Tick(sender As Object, e As EventArgs) Handles TimerTasks.Tick
         Refresh_TaskReminder()
     End Sub
 
@@ -448,7 +448,7 @@ Public Class frmMain
 
     Private Sub frmMain_Shown(sender As Object, e As EventArgs) Handles Me.Shown
         Refresh_TaskReminder()
-        Timer1.Start()
+        TimerTasks.Start()
         RUN_TIMER()
         If Sett_ConstructorStart <> 0 Then
             Cursor = Cursors.WaitCursor
@@ -548,6 +548,10 @@ Public Class frmMain
         If CONNECTION_CHANGED = True Then
             Load_Connection_Dep_Data()
         End If
+        TimerTasks.Stop()
+        TimerTasks.Interval = Task_Popup_minutes * 60000
+        TimerTasks.Start()
+
     End Sub
     Private Sub BarButtonItem3_ItemClick(sender As Object, e As ItemClickEventArgs) Handles BarButtonItem3.ItemClick
         Cursor = Cursors.WaitCursor
@@ -662,10 +666,6 @@ Public Class frmMain
 
     End Sub
 
-    Private Sub NotifyIcon_Click(sender As Object, e As EventArgs) Handles NotifyIcon.Click
-
-    End Sub
-
     Private Sub NotifyIcon_BalloonTipClicked(sender As Object, e As EventArgs) Handles NotifyIcon.BalloonTipClicked
         OpenFormCockpit()
     End Sub
@@ -674,4 +674,16 @@ Public Class frmMain
         Close_Maximized_Forms()
         OpenWindream_Files()
     End Sub
+
+    Private Sub CockpitAnzeigenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles CockpitAnzeigenToolStripMenuItem.Click
+        OpenFormCockpit()
+    End Sub
+
+    Private Sub BarButtonItem20_ItemClick(sender As Object, e As ItemClickEventArgs) Handles BarButtonItem20.ItemClick
+        Close_Maximized_Forms()
+        Dim frm As New frmGroup_Rights
+        frm = frmGroup_Rights.Instance()
+        frm.MdiParent = MAIN_FORM
+        frm.Show()
+    End Sub
 End Class