Last State wurde entfernt; DI und NI starten nur über AutoStart oder Aktivieren durch Nutzer - Settings, frmDIHauptseite, frmNIHautpseite, frmStart
This commit is contained in:
parent
6c9543b7af
commit
565eaf764c
24
ToolCollection/My Project/Settings.Designer.vb
generated
24
ToolCollection/My Project/Settings.Designer.vb
generated
@ -678,30 +678,6 @@ Namespace My
|
||||
End Get
|
||||
End Property
|
||||
|
||||
<Global.System.Configuration.UserScopedSettingAttribute(), _
|
||||
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
|
||||
Global.System.Configuration.DefaultSettingValueAttribute("False")> _
|
||||
Public Property NI_RUNNING() As Boolean
|
||||
Get
|
||||
Return CType(Me("NI_RUNNING"),Boolean)
|
||||
End Get
|
||||
Set
|
||||
Me("NI_RUNNING") = value
|
||||
End Set
|
||||
End Property
|
||||
|
||||
<Global.System.Configuration.UserScopedSettingAttribute(), _
|
||||
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
|
||||
Global.System.Configuration.DefaultSettingValueAttribute("False")> _
|
||||
Public Property DI_RUNNING() As Boolean
|
||||
Get
|
||||
Return CType(Me("DI_RUNNING"),Boolean)
|
||||
End Get
|
||||
Set
|
||||
Me("DI_RUNNING") = value
|
||||
End Set
|
||||
End Property
|
||||
|
||||
<Global.System.Configuration.ApplicationScopedSettingAttribute(), _
|
||||
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
|
||||
Global.System.Configuration.DefaultSettingValueAttribute("@Domain#@User#@PW")> _
|
||||
|
||||
@ -166,12 +166,6 @@
|
||||
</SerializableConnectionString></DesignTimeValue>
|
||||
<Value Profile="(Default)">Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM_TEST;Persist Security Info=True;User ID=sa;Password=dd</Value>
|
||||
</Setting>
|
||||
<Setting Name="NI_RUNNING" Type="System.Boolean" Scope="User">
|
||||
<Value Profile="(Default)">False</Value>
|
||||
</Setting>
|
||||
<Setting Name="DI_RUNNING" Type="System.Boolean" Scope="User">
|
||||
<Value Profile="(Default)">False</Value>
|
||||
</Setting>
|
||||
<Setting Name="WM_PERS_LOGIN" Type="System.String" Scope="Application">
|
||||
<Value Profile="(Default)">@Domain#@User#@PW</Value>
|
||||
</Setting>
|
||||
|
||||
@ -147,12 +147,6 @@
|
||||
<setting name="myDateiname" serializeAs="String">
|
||||
<value>myInvalidDateiname.pdf</value>
|
||||
</setting>
|
||||
<setting name="NI_RUNNING" serializeAs="String">
|
||||
<value>False</value>
|
||||
</setting>
|
||||
<setting name="DI_RUNNING" serializeAs="String">
|
||||
<value>False</value>
|
||||
</setting>
|
||||
<setting name="vDeleteLogsTime" serializeAs="String">
|
||||
<value />
|
||||
</setting>
|
||||
|
||||
@ -155,7 +155,6 @@ Public Class frmDIHauptseite
|
||||
Me.tvLog.Visible = False
|
||||
Me.timRun_Dateiimport.Stop()
|
||||
Durchlauf = False
|
||||
My.Settings.DI_RUNNING = False
|
||||
|
||||
End If
|
||||
Me.progressImport.Enabled = False
|
||||
@ -240,16 +239,11 @@ Public Class frmDIHauptseite
|
||||
Formloaded = True
|
||||
Me.LoadProfilesInCombobox()
|
||||
|
||||
If AUTOSTART_FIM Or My.Settings.DI_RUNNING Then
|
||||
If AUTOSTART_FIM Then
|
||||
Me.rbAutomatisch.Checked = True
|
||||
Automatischer_Durchlauf(False)
|
||||
If AUTOSTART_FIM Then
|
||||
_Logger.Info("AUTOSTART_FIM = True - Dateiimport wird gestartet.")
|
||||
AUTOSTART_FIM = False
|
||||
End If
|
||||
If My.Settings.DI_RUNNING Then
|
||||
_Logger.Info("My.Settings.DI_RUNNING = True - Dateiimport wird gestartet.")
|
||||
End If
|
||||
_Logger.Info("AUTOSTART_FIM = True - Dateiimport wird gestartet.")
|
||||
AUTOSTART_FIM = False
|
||||
Else
|
||||
_Logger.Info("Dateiimport Hauptformular wurde geladen - Dateiimport wird NICHT gestartet.")
|
||||
End If
|
||||
@ -2307,7 +2301,6 @@ Public Class frmDIHauptseite
|
||||
|
||||
Me.timRun_Dateiimport.Interval = Me.numIntervallDurchlauf.Value * 60 * 1000
|
||||
Me.timRun_Dateiimport.Start()
|
||||
My.Settings.DI_RUNNING = True
|
||||
My.Settings.Save()
|
||||
'Direkt einen Durchlauf starten
|
||||
If runnow = True Then
|
||||
@ -2326,7 +2319,6 @@ Public Class frmDIHauptseite
|
||||
Me.tvLog.Visible = False
|
||||
Me.timRun_Dateiimport.Stop()
|
||||
Durchlauf = False
|
||||
My.Settings.DI_RUNNING = False
|
||||
End If
|
||||
Catch ex As Exception
|
||||
MsgBox(ex.Message, MsgBoxStyle.Critical, "Fehler bei btnDurchlauf.Click:")
|
||||
|
||||
@ -113,15 +113,10 @@ Public Class frmNIHauptseite
|
||||
_MyLogger.Debug = False
|
||||
End If
|
||||
|
||||
If AUTOSTART_FIH Or My.Settings.NI_RUNNING Then
|
||||
If AUTOSTART_FIH Then
|
||||
Start_NachindexierungThreads()
|
||||
If AUTOSTART_FIH Then
|
||||
_Logger.Info("AUTOSTART_FIH = True - Nachindexierung wird gestartet.")
|
||||
AUTOSTART_FIH = False
|
||||
End If
|
||||
If My.Settings.NI_RUNNING Then
|
||||
_Logger.Info("My.Settings.NI_RUNNING = True - Nachindexierung wird gestartet.")
|
||||
End If
|
||||
_Logger.Info("AUTOSTART_FIH = True - Nachindexierung wird gestartet.")
|
||||
AUTOSTART_FIH = False
|
||||
Else
|
||||
_Logger.Info("Nachindexierung Hauptformular wurde geladen - Nachindexierungslauf wird NICHT gestartet.")
|
||||
End If
|
||||
@ -2748,7 +2743,6 @@ Public Class frmNIHauptseite
|
||||
bwDatei.WorkerReportsProgress = True
|
||||
bwDatei.WorkerSupportsCancellation = True
|
||||
|
||||
My.Settings.NI_RUNNING = True
|
||||
My.Settings.Save()
|
||||
' den Indexierungsvorgang direkt (zum ersten Mal) durchführen
|
||||
Me.Profile_Durchlaufen()
|
||||
@ -2790,7 +2784,6 @@ Public Class frmNIHauptseite
|
||||
If keeprunning = False Then
|
||||
_Logger.Debug("keeprunning = False - Zurücksetzen")
|
||||
'Abbruch der Nachindexierung
|
||||
My.Settings.NI_RUNNING = False
|
||||
Me.numIntervall.Enabled = True
|
||||
Me.pnlInfos.Visible = False
|
||||
Me.tslblStatus.Visible = False
|
||||
|
||||
@ -383,10 +383,12 @@ Public Class frmStart
|
||||
|
||||
Private Sub FMStart_Shown(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.Shown
|
||||
TimerNIRestart.Start()
|
||||
If My.Settings.DI_RUNNING Or AUTOSTART_FIM Then
|
||||
'If My.Settings.DI_RUNNING Or AUTOSTART_FIM Then
|
||||
If AUTOSTART_FIM Then
|
||||
Open_DI_Main()
|
||||
End If
|
||||
If NIDurchlaufRunning Or AUTOSTART_FIH Then
|
||||
'If NIDurchlaufRunning Or AUTOSTART_FIH Then
|
||||
If AUTOSTART_FIH Then
|
||||
Open_NI_Main()
|
||||
End If
|
||||
End Sub
|
||||
@ -530,7 +532,6 @@ Public Class frmStart
|
||||
|
||||
Private Sub TimerNIRestart_Tick(sender As Object, e As EventArgs) Handles TimerNIRestart.Tick
|
||||
If NI_Restart = True Then
|
||||
My.Settings.NI_RUNNING = True
|
||||
|
||||
NI_Restart = False
|
||||
Open_NI_Main()
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user