Qualitaetskontrolle, Barbelege + Qualitätskontrolle, ProgrammID wird nun beim start korrekt geladen, etc.
This commit is contained in:
@@ -280,6 +280,7 @@ Public Class cDATENSERVER
|
||||
s = s.Replace("І", "I") 'cyrillic I
|
||||
s = s.Replace("Ј", "J") 'cyrillic J
|
||||
s = s.Replace("Е", "E") 'cyrillic E
|
||||
s = s.Replace("?", "")
|
||||
|
||||
Dim temp = s
|
||||
s = Regex.Replace(s, "[бБвгГдДёЁжЖзЗиИйЙкКлЛмнпПртфФхХцЦчЧшШщЩъЪыЫьЬэЭюЮяЯ]", "").Replace("""", "") 'REMOVE cyrillic letters
|
||||
@@ -287,6 +288,7 @@ Public Class cDATENSERVER
|
||||
|
||||
Dim tempBytes = System.Text.Encoding.GetEncoding("ISO-8859-8").GetBytes(s)
|
||||
s = System.Text.Encoding.UTF8.GetString(tempBytes)
|
||||
s = s.Replace("<EFBFBD>", "")
|
||||
|
||||
Return s
|
||||
End Function
|
||||
|
||||
@@ -127,7 +127,7 @@ Public Class cAllgemein
|
||||
End If
|
||||
|
||||
|
||||
|
||||
LOAD_PROGRAMM()
|
||||
LOAD_PARAM()
|
||||
LOAD_TRANSLATE()
|
||||
LOAD_TRANSLATE_AUTO()
|
||||
@@ -154,6 +154,21 @@ Public Class cAllgemein
|
||||
|
||||
End Sub
|
||||
|
||||
Public Shared Sub LOAD_PROGRAMM()
|
||||
Dim prog_Name = My.Application.Info.ProductName
|
||||
|
||||
|
||||
Select Case prog_Name.ToUpper
|
||||
Case "AVISO"
|
||||
PROGID = 16
|
||||
Case "SDL"
|
||||
PROGID = 7
|
||||
Case Else
|
||||
PROGID = SQL.getValueTxtBySql("SELECT isnull([prog_id],0) FROM [tblProgramme] WHERe [prog_codename]='" & prog_Name & "'", "ADMIN")
|
||||
End Select
|
||||
PROGNAME = SQL.getValueTxtBySql("SELECT prog_name FROM [tblProgramme] WHERe [prog_id]='" & PROGID & "'", "ADMIN")
|
||||
End Sub
|
||||
|
||||
Public Shared Sub LOAD_PARAM()
|
||||
PARAMS = New cParameterList(PROGID, FIRMA)
|
||||
End Sub
|
||||
|
||||
Reference in New Issue
Block a user