Verbesserung

This commit is contained in:
ja
2021-09-20 13:50:13 +02:00
parent f275e87e7e
commit f334d15e91
4 changed files with 116 additions and 132 deletions

View File

@@ -30,7 +30,6 @@
<asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server"> <asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
<asp:ScriptManager ID="script1" runat="server"></asp:ScriptManager> <asp:ScriptManager ID="script1" runat="server"></asp:ScriptManager>
<asp:UpdatePanel ID="panelupdate1" runat="server" UpdateMode="Conditional"><ContentTemplate> <asp:UpdatePanel ID="panelupdate1" runat="server" UpdateMode="Conditional"><ContentTemplate>
<!-- Webiste-Content--> <!-- Webiste-Content-->

View File

@@ -12,6 +12,7 @@ Partial Class Kundenbereich_Default
Dim LKWNR As String = "" Dim LKWNR As String = ""
Dim KDNAFNR As String = "" Dim KDNAFNR As String = ""
Dim dt As DataTable Dim dt As DataTable
Dim Art As String = Nothing
Protected Sub Page_Load(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.Load Protected Sub Page_Load(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.Load
Page.UnobtrusiveValidationMode = UnobtrusiveValidationMode.WebForms Page.UnobtrusiveValidationMode = UnobtrusiveValidationMode.WebForms
DataBind() DataBind()
@@ -38,14 +39,6 @@ Partial Class Kundenbereich_Default
Response.Redirect("../login/Logout.aspx", True) Response.Redirect("../login/Logout.aspx", True)
End Sub End Sub
Enum ART
Frächter
Kunde
AVISIERER
VERAG
ZOLL
End Enum
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) 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)
Dim blau As Drawing.Color = Drawing.Color.LightBlue Dim blau As Drawing.Color = Drawing.Color.LightBlue
Dim white As Drawing.Color = Drawing.Color.White Dim white As Drawing.Color = Drawing.Color.White
@@ -190,32 +183,31 @@ Partial Class Kundenbereich_Default
Catch ex As Exception Catch ex As Exception
MsgBox(ex.StackTrace, MsgBoxStyle.Exclamation) MsgBox(ex.StackTrace, MsgBoxStyle.Exclamation)
End Try End Try
dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {0, 1, 3, 4, 5}, datevon, datebis, Absender, Empfaenger, LKWNR, KDNAFNR) dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB(Art, Kdnrtext, {0, 1, 2, 3, 4, 5}, datevon, datebis, Absender, Empfaenger, LKWNR, KDNAFNR)
ElseIf rbt_Erf.Selected = True Or rbt_Erf_M.Selected Then ElseIf rbt_Erf.Selected = True Or rbt_Erf_M.Selected Then
dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {0}, Nothing, Nothing, Absender, Empfaenger, LKWNR, KDNAFNR) dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB(Art, Kdnrtext, {0}, Nothing, Nothing, Absender, Empfaenger, LKWNR, KDNAFNR)
ElseIf rbt_Freig.Selected = True Or rbt_Freig_M.Selected = True Then ElseIf rbt_Freig.Selected = True Or rbt_Freig_M.Selected = True Then
Try Try
pickdate1.ValidateRequestMode = UI.ValidateRequestMode.Enabled pickdate1.ValidateRequestMode = UI.ValidateRequestMode.Enabled
datevon = Date.Parse(pickdate1.Text)
pickdate2.ValidateRequestMode = UI.ValidateRequestMode.Enabled pickdate2.ValidateRequestMode = UI.ValidateRequestMode.Enabled
datevon = Date.Parse(pickdate1.Text)
datebis = Date.Parse(pickdate2.Text) datebis = Date.Parse(pickdate2.Text)
Catch ex As Exception Catch ex As Exception
MsgBox(ex.StackTrace, MsgBoxStyle.Exclamation) MsgBox(ex.StackTrace, MsgBoxStyle.Exclamation)
End Try End Try
dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {1}, datevon, datebis, Absender, Empfaenger, LKWNR, KDNAFNR) dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB(Art, Kdnrtext, {1}, datevon, datebis, Absender, Empfaenger, LKWNR, KDNAFNR)
ElseIf rbt_Ankunft.Selected = True Or rbt_Ankunft_M.Selected = True Then ElseIf rbt_Ankunft.Selected = True Or rbt_Ankunft_M.Selected = True Then
dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {3}, Nothing, Nothing, Absender, Empfaenger, LKWNR, KDNAFNR) dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB(Art, Kdnrtext, {3}, Nothing, Nothing, Absender, Empfaenger, LKWNR, KDNAFNR)
ElseIf rbt_Vorb.Selected = True Or rbt_Vorb_M.Selected = True Then ElseIf rbt_Vorb.Selected = True Or rbt_Vorb_M.Selected = True Then
dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {4}, Nothing, Nothing, Absender, Empfaenger, LKWNR, KDNAFNR) dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB(Art, Kdnrtext, {4}, Nothing, Nothing, Absender, Empfaenger, LKWNR, KDNAFNR)
ElseIf rbt_Vorg.Selected = True Or rbt_Vorg_M.Selected = True Then ElseIf rbt_Vorg.Selected = True Or rbt_Vorg_M.Selected = True Then
dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {5}, Nothing, Nothing, Absender, Empfaenger, LKWNR, KDNAFNR) dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB(Art, Kdnrtext, {5}, Nothing, Nothing, Absender, Empfaenger, LKWNR, KDNAFNR)
End If End If
If dt IsNot Nothing Then If dt IsNot Nothing Then
Dim i As Integer = 0 Dim i As Integer = 0
For Each d In dt.Rows For Each d In dt.Rows
Dim tr = New TableRow Dim tr = New TableRow
Dim Cell = New TableCell Dim Cell = New TableCell
@@ -348,4 +340,8 @@ Partial Class Kundenbereich_Default
dt = Nothing dt = Nothing
'txt_KdNr.Focus() 'txt_KdNr.Focus()
End Sub End Sub
Protected Sub Dropdownlst_Selection_Change(sender As Object, e As EventArgs)
End Sub
End Class End Class

View File

@@ -15,18 +15,14 @@
<!-- Bootstrap CSS --> <!-- Bootstrap CSS -->
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC" crossorigin="anonymous"/> <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC" crossorigin="anonymous"/>
<link rel="stylesheet" type="text/css" href="../css/main.css"/> <link rel="stylesheet" type="text/css" href="../css/main.css"/>
<link rel="stylesheet" type="text/css" href="../css/style.css"/> <link rel="stylesheet" type="text/css" href="../css/style.css"/>
<link rel="stylesheet" href="https://unpkg.com/bootstrap-table@1.18.3/dist/bootstrap-table.min.css"/> <link rel="stylesheet" href="https://unpkg.com/bootstrap-table@1.18.3/dist/bootstrap-table.min.css"/>
<link rel="stylesheet" type="text/css" href="../css/Dropdown.css"/> <link rel="stylesheet" type="text/css" href="../css/Dropdown.css"/>
<!-- <link rel="stylesheet" type="text/css" href="../css/style.css"/>--> <!-- <link rel="stylesheet" type="text/css" href="../css/style.css"/>-->
<link rel="stylesheet" type="text/css" href="../css/Customers/MasterpageCustomers.css"/> <link rel="stylesheet" type="text/css" href="../css/Customers/MasterpageCustomers.css"/>
<link rel="stylesheet" type="text/css" href="../css/Customers/LKWs.css"/> <link rel="stylesheet" type="text/css" href="../css/Customers/LKWs.css"/>
<link rel="stylesheet" type="text/css" href="../css/navbarsidebar2.css"/> <link rel="stylesheet" type="text/css" href="../css/navbarsidebar2.css"/>
</asp:Content> </asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server"> <asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
@@ -34,8 +30,6 @@
<asp:UpdatePanel ID="panelupdate5" runat="server"><ContentTemplate> <asp:UpdatePanel ID="panelupdate5" runat="server"><ContentTemplate>
<div class="align-self-flex-center" style="/*margin-top:5px;*/margin-left:25px; margin-top:0.6510416666666667vw; margin-right:25px;"> <div class="align-self-flex-center" style="/*margin-top:5px;*/margin-left:25px; margin-top:0.6510416666666667vw; margin-right:25px;">
<div id="containerseiterand"> <div id="containerseiterand">
<div class="d-flex flex-col-4" style="align-content:center"> <div class="d-flex flex-col-4" style="align-content:center">
<h5>Hier befindet sich eine Übersicht über alle LKWS</h5> <h5>Hier befindet sich eine Übersicht über alle LKWS</h5>
</div> </div>
@@ -55,11 +49,8 @@
</div> </div>
</div> </div>
</div> </div>
<div style="height:/*20px*/2.1621621621621623vh;"></div> <div style="height:/*20px*/2.1621621621621623vh;"></div>
<div id="conovertab"> <div id="conovertab">
<table class="table table-hover table-responsive table-primary" id="tablerechnungen" contenteditable="false"> <table class="table table-hover table-responsive table-primary" id="tablerechnungen" contenteditable="false">
<thead style="width:fit-content;font-size:14px;"><tr><th>Rechnungsnr</th><th>Rechnungsdatum</th><th>LKW</th><th>Grenzsztelle</th><th>Rechnungsbetrag</th><th>Abfertigungsdatum</th><th>Filiale</th><th>Abfertigungsnr.</th><th style="width:/*20px*/ 0.7927070947284979vw;"></th></tr></thead> <thead style="width:fit-content;font-size:14px;"><tr><th>Rechnungsnr</th><th>Rechnungsdatum</th><th>LKW</th><th>Grenzsztelle</th><th>Rechnungsbetrag</th><th>Abfertigungsdatum</th><th>Filiale</th><th>Abfertigungsnr.</th><th style="width:/*20px*/ 0.7927070947284979vw;"></th></tr></thead>
<tbody id="bodyoftable"> <tbody id="bodyoftable">
@@ -69,10 +60,9 @@
<tr><td>25100110</td><td>29.02.2021</td><td>14334234</td><td>SUBEN</td><td>509,21€</td><td>18.08.2021</td><td>SUBEN</td><td>512</td><td><center><button type="button" class="btn btn-primary" data-toggle="tooltip" data-placement="top" title="Hier klicken zum Downlaod der Rechnungen."><img src="../images/pdficon.gif" width="15" height="15"/></button></center></td></tr> <tr><td>25100110</td><td>29.02.2021</td><td>14334234</td><td>SUBEN</td><td>509,21€</td><td>18.08.2021</td><td>SUBEN</td><td>512</td><td><center><button type="button" class="btn btn-primary" data-toggle="tooltip" data-placement="top" title="Hier klicken zum Downlaod der Rechnungen."><img src="../images/pdficon.gif" width="15" height="15"/></button></center></td></tr>
<tr><td>542110</td><td>29.02.2021</td><td>14334234</td><td>SUBEN</td><td>509,21€</td><td>18.08.2021</td><td>SUBEN</td><td>512</td><td><center><button type="button" class="btn btn-primary" data-toggle="tooltip" data-placement="top" title="Hier klicken zum Downlaod der Rechnungen."><img src="../images/pdficon.gif" width="15" height="15"/></button></center></td></tr> <tr><td>542110</td><td>29.02.2021</td><td>14334234</td><td>SUBEN</td><td>509,21€</td><td>18.08.2021</td><td>SUBEN</td><td>512</td><td><center><button type="button" class="btn btn-primary" data-toggle="tooltip" data-placement="top" title="Hier klicken zum Downlaod der Rechnungen."><img src="../images/pdficon.gif" width="15" height="15"/></button></center></td></tr>
</tbody> </tbody>
</table></div> </table>
</div></div></div> </div></div></div></div>
</ContentTemplate></asp:UpdatePanel> </ContentTemplate></asp:UpdatePanel>
<!-- jQuery CDN - Slim version (=without AJAX) --> <!-- jQuery CDN - Slim version (=without AJAX) -->
<script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script> <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
<!-- Popper.JS --> <!-- Popper.JS -->

View File

@@ -42,7 +42,7 @@ hr{
border: none; border: none;
border-radius: 0; border-radius: 0;
transition: color .15s ease-in-out,background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out,border-radius .15s ease; transition: color .15s ease-in-out,background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out,border-radius .15s ease;
height:7px; height:6px;
} }
#RadioButtonList1 { #RadioButtonList1 {
@@ -72,7 +72,6 @@ hr{
transition: none transition: none
} }
} }
.accordion-button:not(.collapsed) { .accordion-button:not(.collapsed) {
color: #043381; color: #043381;
background-color: #fff; background-color: #fff;