Merge branch 'master' of https://verag.visualstudio.com/SDL/_git/SDL
This commit is contained in:
@@ -42,8 +42,10 @@
|
||||
<DefineTrace>true</DefineTrace>
|
||||
<OutputPath>bin\Debug\</OutputPath>
|
||||
<DocumentationFile>SDL.xml</DocumentationFile>
|
||||
<NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
|
||||
<NoWarn>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036</NoWarn>
|
||||
<Prefer32Bit>false</Prefer32Bit>
|
||||
<WarningsAsErrors>
|
||||
</WarningsAsErrors>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||
<PlatformTarget>AnyCPU</PlatformTarget>
|
||||
@@ -53,8 +55,10 @@
|
||||
<Optimize>true</Optimize>
|
||||
<OutputPath>bin\Release\</OutputPath>
|
||||
<DocumentationFile>SDL.xml</DocumentationFile>
|
||||
<NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
|
||||
<NoWarn>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036</NoWarn>
|
||||
<Prefer32Bit>false</Prefer32Bit>
|
||||
<WarningsAsErrors>
|
||||
</WarningsAsErrors>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<OptionExplicit>On</OptionExplicit>
|
||||
|
||||
@@ -331,7 +331,7 @@ Public Class frmMitarbeitersuche
|
||||
If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_niederlassung <> "" Then
|
||||
Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG
|
||||
Case "SUB" : timestp = timestp.AddHours(1)
|
||||
Case "SBG" : timestp = timestp.AddHours(1) '? 30
|
||||
Case "SBG" : timestp = timestp.AddHours(1) 'Verag Post + AT Zoll
|
||||
Case "WAI" : timestp = timestp.AddMinutes(30)
|
||||
Case "NKD" : timestp = timestp.AddMinutes(20)
|
||||
Case "DTB" : timestp = timestp.AddMinutes(30)
|
||||
@@ -384,13 +384,13 @@ Public Class frmMitarbeitersuche
|
||||
End If
|
||||
|
||||
MsgBox(info)
|
||||
Thread.Sleep(2000) 'warten bis Eintrag in Timas-DB
|
||||
requestDone = False
|
||||
initTimasData()
|
||||
End If
|
||||
Thread.Sleep(2000) 'warten bis Eintrag in Timas-DB
|
||||
requestDone = False
|
||||
initTimasData()
|
||||
End If
|
||||
|
||||
|
||||
Else
|
||||
Else
|
||||
|
||||
'normales kommen/gehen
|
||||
Dim a As MsgBoxResult = MsgBox(IIf(cbxHomeoffice.Checked, "Homeoffice", "Büro") & vbNewLine & sender.text & " für " & VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME & vbNewLine & Now.ToString(), vbYesNo)
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
<TargetFrameworkProfile />
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<PlatformTarget>x64</PlatformTarget>
|
||||
<PlatformTarget>AnyCPU</PlatformTarget>
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<DebugType>full</DebugType>
|
||||
<DefineDebug>true</DefineDebug>
|
||||
|
||||
Reference in New Issue
Block a user