From a150983076cd98f98452d5fa3a0043e163814f1c Mon Sep 17 00:00:00 2001 From: ja Date: Mon, 29 Nov 2021 16:28:58 +0100 Subject: [PATCH] =?UTF-8?q?=C3=84nderungen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Customers/CustomsAviso.aspx | 18 ++++++++++-------- Customers/CustomsAviso.aspx.vb | 11 +++++------ Customers/Default.aspx.vb | 4 ++++ Customers/Invoices.aspx | 4 ++-- Customers/Invoices.aspx.vb | 5 ++--- 5 files changed, 23 insertions(+), 19 deletions(-) diff --git a/Customers/CustomsAviso.aspx b/Customers/CustomsAviso.aspx index 30f8c69..92d8b35 100644 --- a/Customers/CustomsAviso.aspx +++ b/Customers/CustomsAviso.aspx @@ -1,4 +1,4 @@ -<%@ Page Title="Aufträge VERAG" Language="VB" MasterPageFile="~/Customers/Customers.master" ViewStateMode="Enabled" AutoEventWireup="false" CodeFile="CustomsAviso.aspx.vb" Inherits="CustomsAviso" UnobtrusiveValidationMode="None"%> +<%@ Page Title="Aufträge VERAG" Language="VB" MasterPageFile="~/Customers/Customers.master" ViewStateMode="Enabled" AutoEventWireup="true" CodeFile="CustomsAviso.aspx.vb" Inherits="CustomsAviso" UnobtrusiveValidationMode="None"%> @@ -112,7 +112,9 @@ - + + +
@@ -270,22 +272,22 @@
- +
- +
- +
- +
@@ -297,7 +299,7 @@
- +
@@ -325,7 +327,7 @@ Response.Write(ex.Message & ex.StackTrace) End Try %>
- + diff --git a/Customers/CustomsAviso.aspx.vb b/Customers/CustomsAviso.aspx.vb index cc491be..071d96a 100644 --- a/Customers/CustomsAviso.aspx.vb +++ b/Customers/CustomsAviso.aspx.vb @@ -44,7 +44,7 @@ Partial Class CustomsAviso tbl_Header_row.TableSection = TableRowSection.TableHeader ' MsgBox(datebis) - + btn_Auftraege.Enabled = True If (Page.IsPostBack) Then Page.MaintainScrollPositionOnPostBack = True @@ -211,11 +211,12 @@ Partial Class CustomsAviso datevon = Nothing datebis = Nothing End If + addrows() Else Page.MaintainScrollPositionOnPostBack = False rbt_Alle.Checked = True - normaltable.EnableViewState = True + lbl_von.Visible = True lbl_bis.Visible = True @@ -276,9 +277,7 @@ Partial Class CustomsAviso 'Console.WriteLine(VERAG_VARIABLES.geterrornumb() + "The User is not authenticated to this page. Please login again!", vbAbort, "Error User") FormsAuthentication.RedirectToLoginPage() End If - If Not IsNothing(Session.Item("mytable")) Then - addrows() - End If + End Sub Protected Sub initcells(tr As TableRow, t1 As TableCell, t2 As TableCell, t3 As TableCell, t4 As TableCell, t5 As TableCell, t6 As TableCell, t7 As TableCell, t8 As TableCell, th1 As TableHeaderCell, th2 As TableHeaderCell, th3 As TableHeaderCell, th4 As TableHeaderCell, th5 As TableHeaderCell, th6 As TableHeaderCell, th7 As TableHeaderCell, th8 As TableHeaderCell) @@ -388,7 +387,7 @@ Partial Class CustomsAviso th8.ForeColor = white End Sub - Protected Sub btn_Auftraege_Click(sender As Object, e As EventArgs) + Protected Sub btn_Auftraege_Click(ByVal sender As Object, e As EventArgs) Handles btn_Auftraege.Click dt = Nothing Session.Add("mytable", Nothing) If Session.Item("mytable") = Nothing Then diff --git a/Customers/Default.aspx.vb b/Customers/Default.aspx.vb index 35e5e9e..074d713 100644 --- a/Customers/Default.aspx.vb +++ b/Customers/Default.aspx.vb @@ -16,6 +16,7 @@ Partial Class Customers_Default If Page.IsPostBack = True Then Page.MaintainScrollPositionOnPostBack = True VERAG_VARIABLES.initerrorcount() + tbl_main = ViewState("Message") Else Page.MaintainScrollPositionOnPostBack = False VERAG_VARIABLES.initerrorcount() @@ -23,6 +24,8 @@ Partial Class Customers_Default End Sub + + Protected Sub Btn_btn_Click(sender As Object, e As EventArgs) Dim tbl_id As TableCell = New TableCell Dim tbl_name As TableCell = New TableCell @@ -35,5 +38,6 @@ Partial Class Customers_Default tbl_main.Rows.Add(tr) + ViewState("Message") = tbl_main End Sub End Class diff --git a/Customers/Invoices.aspx b/Customers/Invoices.aspx index 6c0e7eb..4954cd7 100644 --- a/Customers/Invoices.aspx +++ b/Customers/Invoices.aspx @@ -221,7 +221,7 @@
- a + Erhalte Rechnungen
@@ -245,7 +245,7 @@ Catch ex As Exception 'Response.Write(ex.Message & ex.StackTrace) Response.Write("Fehler bei den SQL-Einstellungen. Bitte den Admin kontaktieren.") - End Try %> + End Try%>
diff --git a/Customers/Invoices.aspx.vb b/Customers/Invoices.aspx.vb index cad1488..5d2011f 100644 --- a/Customers/Invoices.aspx.vb +++ b/Customers/Invoices.aspx.vb @@ -506,7 +506,7 @@ Partial Class Customers_Default3 End Try End If - If valdaterage_1.IsValid AndAlso valdaterange_2.IsValid Then + If valdaterage_1.IsValid = True AndAlso valdaterange_2.IsValid = True Then If String.IsNullOrEmpty(Kdnrtext) = False Then If String.IsNullOrEmpty(Kdnrtext) = False AndAlso String.IsNullOrEmpty(datevon.ToShortDateString) = False AndAlso String.IsNullOrEmpty(datebis.ToShortDateString) = False Then dt = VERAG_PROG_ALLGEMEIN.cRechnungsausgang.GET_LIST_WEB(Integer.Parse(Kdnrtext), datevon, datebis, Integer.Parse(reNr), Absender, Empfaenger, LKWNR, KDNAFNR) @@ -556,8 +556,7 @@ Partial Class Customers_Default3 txt_LKW.Text = String.Empty txt_ReNr.Text = String.Empty - valdaterage_1.Enabled = True - valdaterange_2.Enabled = True + valdaterage_1.Enabled = valdaterange_2.Enabled = True valreq_pickdate1.Enabled = True valreq_pickdate2.Enabled = True regex_txt_Absender_M.Enabled = True