From b4d6e451380701505f33e53d34fab6bafaa0abda Mon Sep 17 00:00:00 2001 From: ja Date: Wed, 11 Aug 2021 10:00:33 +0200 Subject: [PATCH] =?UTF-8?q?Alle=20Tabellen=20in=20status=5FJulius=20wurden?= =?UTF-8?q?=20angepasst=20und=20in=20newpageJulius=5FSidebar.aspx=20wurde?= =?UTF-8?q?=20das=20Sprachenmen=C3=BC=20angepasst,=20sodass=20die=20Flagge?= =?UTF-8?q?n=20passen.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- newpageJulius_Sidebar.aspx | 48 +++++++++++++---------- status_Julius.aspx | 78 ++++++++++++++++++++------------------ 2 files changed, 69 insertions(+), 57 deletions(-) diff --git a/newpageJulius_Sidebar.aspx b/newpageJulius_Sidebar.aspx index e0dbc50..912c600 100644 --- a/newpageJulius_Sidebar.aspx +++ b/newpageJulius_Sidebar.aspx @@ -734,14 +734,20 @@ Dim flagpath = "images/flags/flagge_DE_AT.gif" - Select Case laenderkuerzel - Case "DE" : flagpath = "images/flags/flagge_DE_AT.gif" - Case "EN" : flagpath = "images/flags/flagge_GB.gif" - Case "SRB" : flagpath = "images/flags/flagge_BIH.gif" - Case "SM" : flagpath = "images/flags/flagge_SM.gif" - Case "BG" : flagpath = "images/flags/flagge_BG.gif" - Case "TR" : flagpath = "images/flags/flagge_TR.gif" - End Select%> + Dim lan3 As String = Request.QueryString("lan3") + If laenderkuerzel = "DE" And lan3 = "0" Then + flagpath = "images/flags/flagge_DE_AT.gif" + ElseIf laenderKuerzel = "EN" And lan3 = "0" Then + flagpath = "images/flags/flagge_GB.gif" + ElseIf laenderKuerzel = "SRB" And lan3 = "0" Then + flagpath = "images/flags/flagge_BIH.gif" + ElseIf laenderKuerzel = "SRB" And lan3 = "1" Then + flagpath = "images/flags/flagge_SM.gif" + ElseIf laenderKuerzel = "BG" And lan3 = "0" Then + flagpath = "images/flags/flagge_BG.gif" + ElseIf laenderKuerzel = "TR" And lan3 = "0" Then + flagpath = "images/flags/flagge_TR.gif" + End If%> <% For Each nav As cNavigation In navigation %>
@@ -805,7 +811,7 @@
  • - +
    <% Dim stringDE = "  DE" Dim stringEN = "  EN" @@ -814,12 +820,12 @@ Dim stringBG = "  BG" Dim stringTR = "  TR"%> - /><%=stringDE%> - /><%=stringTR%> - /><%=stringEN%> - /><%=stringBIH%> - /><%=stringSRB%> - /><%=stringBG%> + /><%=stringDE%> + /><%=stringTR%> + /><%=stringEN%> + /><%=stringBIH%> + /><%=stringSRB%> + /><%=stringBG%>
    • @@ -851,27 +857,27 @@
    diff --git a/status_Julius.aspx b/status_Julius.aspx index 00cd4dd..306f81c 100644 --- a/status_Julius.aspx +++ b/status_Julius.aspx @@ -456,14 +456,20 @@ Imports System.Data.SqlClient imgPath = "../" End If - Select Case lan - Case "DE" : flagpath = "images/flags/flagge_DE_AT.gif" - Case "EN" : flagpath = "images/flags/flagge_GB.gif" - Case "SRB" : flagpath = "images/flags/flagge_BIH.gif" - Case "YU" : flagpath = "images/flags/flagge_SM.gif" - Case "BG" : flagpath = "images/flags/flagge_BG.gif" - Case "TR" : flagpath = "images/flags/flagge_TR.gif" - End Select + Dim lan3 As String = Request.QueryString("lan3") + If lan = "DE" And lan3 = "0" Then + flagpath = "images/flags/flagge_DE_AT.gif" + ElseIf lan = "EN" And lan3 = "0" Then + flagpath = "images/flags/flagge_GB.gif" + ElseIf lan = "SRB" And lan3 = "0" Then + flagpath = "images/flags/flagge_BIH.gif" + ElseIf lan = "SRB" And lan3 = "1" Then + flagpath = "images/flags/flagge_SM.gif" + ElseIf lan = "BG" And lan3 = "0" Then + flagpath = "images/flags/flagge_BG.gif" + ElseIf lan = "TR" And lan3 = "0" Then + flagpath = "images/flags/flagge_TR.gif" + End If %> @@ -475,15 +481,15 @@ Imports System.Data.SqlClient
    Logo Schriftzug: Verag AG Blaue Schrift: Verag Spedition Graue Schrift: AG <% - Dim curentMenuId As String = "1" - If Not Request.QueryString("menuID") Is Nothing Then - curentMenuId = Request.QueryString("menuID") - End If + Dim curentMenuId As String = "1" + If Not Request.QueryString("menuID") Is Nothing Then + curentMenuId = Request.QueryString("menuID") + End If %>
    - +
    <% Dim stringDE = "  DE" Dim stringEN = "  EN" @@ -492,12 +498,12 @@ Imports System.Data.SqlClient Dim stringBG = "  BG" Dim stringTR = "  TR"%> - /><%=stringDE%> - /><%=stringTR%> - /><%=stringEN%> - /><%=stringBIH%> - /><%=stringSRB%> - /><%=stringBG%> + /><%=stringDE%> + /><%=stringTR%> + /><%=stringEN%> + /><%=stringBIH%> + /><%=stringSRB%> + /><%=stringBG%>
    @@ -527,27 +533,27 @@ Imports System.Data.SqlClient
  • - /><%=strDElang %> + /><%=strDElang %>
  • - /><%=strENlang %> + /><%=strENlang %>
  • - /><%=strBIHLang %> + /><%=strBIHLang %>
  • - /><%=strSRBlang %> + /><%=strSRBlang %>
  • - /><%=strBGlang %> + /><%=strBGlang %>
  • - /><%=strTRlang %> + /><%=strSRBlang %>
    • @@ -630,12 +636,12 @@ Imports System.Data.SqlClient End Select %> - + <% - If AVISO.AvisoEingang <> VERAG_PROG_ALLGEMEIN.cAllgemein.LeerDatum Then Response.Write("" & LT.getTxt(13, lan, "Aviso-Eingang") & ":  " & AVISO.AvisoEingang & "") - If AVISO.Datum <> VERAG_PROG_ALLGEMEIN.cAllgemein.LeerDatum Then Response.Write("" & LT.getTxt(7, lan, "Erfasst") & ":  " & AVISO.Datum & "") - If AVISO.Ankunft <> VERAG_PROG_ALLGEMEIN.cAllgemein.LeerDatum Then Response.Write("" & LT.getTxt(10, lan, "Ankunft") & ":  " & AVISO.Ankunft & "") - If AVISO.Freigabe <> VERAG_PROG_ALLGEMEIN.cAllgemein.LeerDatum Then Response.Write("" & LT.getTxt(15, lan, "Freigabe") & ":  " & AVISO.Freigabe & "") %> + If AVISO.AvisoEingang <> VERAG_PROG_ALLGEMEIN.cAllgemein.LeerDatum Then Response.Write("" & LT.getTxt(13, lan, "Aviso-Eingang") & "" & AVISO.AvisoEingang & "") + If AVISO.Datum <> VERAG_PROG_ALLGEMEIN.cAllgemein.LeerDatum Then Response.Write("" & LT.getTxt(7, lan, "Erfasst") & ":" & AVISO.Datum & "") + If AVISO.Ankunft <> VERAG_PROG_ALLGEMEIN.cAllgemein.LeerDatum Then Response.Write("" & LT.getTxt(10, lan, "Ankunft") & "" & AVISO.Ankunft & "") + If AVISO.Freigabe <> VERAG_PROG_ALLGEMEIN.cAllgemein.LeerDatum Then Response.Write("" & LT.getTxt(15, lan, "Freigabe") & ":" & AVISO.Freigabe & "") %> @@ -670,10 +676,10 @@ Imports System.Data.SqlClient <% - If AVISO.AvisoEingang <> VERAG_PROG_ALLGEMEIN.cAllgemein.LeerDatum Then Response.Write("") - If AVISO.Datum <> VERAG_PROG_ALLGEMEIN.cAllgemein.LeerDatum Then Response.Write("") - If AVISO.Ankunft <> VERAG_PROG_ALLGEMEIN.cAllgemein.LeerDatum Then Response.Write("") - If AVISO.Freigabe <> VERAG_PROG_ALLGEMEIN.cAllgemein.LeerDatum Then Response.Write("") + If AVISO.AvisoEingang <> VERAG_PROG_ALLGEMEIN.cAllgemein.LeerDatum Then Response.Write("") + If AVISO.Datum <> VERAG_PROG_ALLGEMEIN.cAllgemein.LeerDatum Then Response.Write("") + If AVISO.Ankunft <> VERAG_PROG_ALLGEMEIN.cAllgemein.LeerDatum Then Response.Write("") + If AVISO.Freigabe <> VERAG_PROG_ALLGEMEIN.cAllgemein.LeerDatum Then Response.Write("") %>
    " & LT.getTxt(13, lan, "Aviso-Eingang") & ":  " & AVISO.AvisoEingang & "
    " & LT.getTxt(7, lan, "Erfasst") & ":  " & AVISO.Datum & "
    " & LT.getTxt(10, lan, "Ankunft") & ":  " & AVISO.Ankunft & "
    " & LT.getTxt(15, lan, "Freigabe") & ":  " & AVISO.Freigabe & "
    " & LT.getTxt(13, lan, "Aviso-Eingang") & ":" & AVISO.AvisoEingang & "
    " & LT.getTxt(7, lan, "Erfasst") & ":" & AVISO.Datum & "
    " & LT.getTxt(10, lan, "Ankunft") & ":" & AVISO.Ankunft & "
    " & LT.getTxt(15, lan, "Freigabe") & ":" & AVISO.Freigabe & "
    @@ -725,7 +731,7 @@ Imports System.Data.SqlClient <%= LT.getTxt(18, lan, "Bitte haben Sie noch Geduld bis ihr Auftrag fertig ist. Sie können den aktuellen Status Ihres LKWs am Bildschirm verfolgen.
    Bei Status ""OK"" können Sie an den Schalter kommen.") %>     <% End If %> -

    +

    Allgemeine Vermerke


    @@ -750,7 +756,7 @@ Imports System.Data.SqlClient

    <%= LT.getTxt(19, lan, "Sendungsliste!") %>

    -
    +