edv/VERAG_Homepage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Änderungen an Design sowie Tabllenzeilen

Browse Source
This commit is contained in:
ja
2021-09-15 13:36:44 +02:00
parent 3d669bd139
commit 99c95fa3b7
3 changed files with 92 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

151
Customers/CustomsAviso.aspx
View File

@@ -35,55 +35,54 @@
<div id="containerseiterand" style="margin-left:auto;margin-right:auto"> <div id="containerseiterand" style="margin-left:auto;margin-right:auto">
<div class="container-fluid"> <div class="container-fluid">
<div id="cont1"> <div id="cont1">
<h1>Kundencenter:</h1> <h1>Aufträge</h1>
<div id="line" style="width: 92%;"></div> <div id="line" style="width: 92%;"></div>
<br/> <br/>
<h3>Hier finden Sie Informationen zu den aktuellen Aufträgen.</h3> <h3>Hier finden Sie Informationen zu den aktuellen Aufträgen.</h3>
</div> </div>
<%Try <%Try
VERAG_PROG_ALLGEMEIN.cAllgemein.ERR_OP_GLOBAL = VERAG_PROG_ALLGEMEIN.ERROR_OP.SHOW VERAG_PROG_ALLGEMEIN.cAllgemein.ERR_OP_GLOBAL = VERAG_PROG_ALLGEMEIN.ERROR_OP.SHOW
'Dim AD As New VERAG_PROG_ALLGEMEIN.cAdressen(799124) 'Dim AD As New VERAG_PROG_ALLGEMEIN.cAdressen(799124)
Dim VERAGSQL = New VERAG_PROG_ALLGEMEIN.SQL Dim VERAGSQL = New VERAG_PROG_ALLGEMEIN.SQL
' MsgBox(VERAGSQL.GetADMINConnectionString()) ' MsgBox(VERAGSQL.GetADMINConnectionString())
'Response.Write(AD.Ordnungsbegriff) 'Response.Write(AD.Ordnungsbegriff)
Dim STANDORT = "SUB" Dim STANDORT = "SUB"
If (Request.QueryString.Count > 0) AndAlso (Request.QueryString("STANDORT") IsNot Nothing) Then If (Request.QueryString.Count > 0) AndAlso (Request.QueryString("STANDORT") IsNot Nothing) Then
Try Try
STANDORT = (Request.QueryString("STANDORT")) STANDORT = (Request.QueryString("STANDORT"))
Catch ex As Exception Catch ex As Exception
STANDORT = "SUB" STANDORT = "SUB"
End Try End Try
End If End If
If True Then If True Then
Dim AVISO_dt As System.Data.DataTable = VERAG_PROG_ALLGEMEIN.cAviso.getAVISO_List(STANDORT) Dim AVISO_dt As System.Data.DataTable = VERAG_PROG_ALLGEMEIN.cAviso.getAVISO_List(STANDORT)
If AVISO_dt IsNot Nothing Then If AVISO_dt IsNot Nothing Then
If True Then 'AVISO.Status <> 1 And AVISO.Status <> 2 Then 'SENDUNGSTABELLE'%> If True Then 'AVISO.Status <> 1 And AVISO.Status <> 2 Then 'SENDUNGSTABELLE'%>
<div class="col-12" style="margin-left:4px"> <div class="col-12" style="margin-left:4px">
<div> <div>
<div style="height:0.936768149882904vh"></div>
<div class="col-12" style="margin-left:2px"> <div class="col-12" style="margin-left:2px">
<h2><%=STANDORT %></h2> <h2>Auftrags-Suche</h2>
</div> </div>
<div style="margin-left:6px"> <div style="margin-left:6px">
<div class="col-12" style="margin-left:4px"> <div class="col-12" style="text-align:end">
<asp:Label ID="Label1" runat="server" Text="Bitte eine Auswahl treffen:" ></asp:Label>
<asp:Button ID="btn_resetForm" runat="server" Text="Reset Filters" onclick="btn_resetForm_Click"/> <asp:LinkButton ID="btn_resetForm" runat="server" onclick="btn_resetForm_Click" style="margin-right:2px">Filter zurücksetzen</asp:LinkButton>
</div> </div>
<div class="col-12">
<asp:Label ID="lbl_Kndnr" runat="server" Text="Herzlich Willkommen!"></asp:Label>
</div>
<div style="height:0.936768149882904vh"></div> <div style="height:0.936768149882904vh"></div>
<div class="col-12" style="margin-left:8px" > <div class="col-12" style="margin-left:8px" >
<asp:Label ID="lbl_ArtderAuftraege" runat="server" Text="Art der Aufträge:" data-bs-toggle="tooltip" data-bs-placement="top" title="Wenn nichts angewählt ist, bitte das Datum eingrenzen."></asp:Label> <asp:Label ID="lbl_ArtderAuftraege" runat="server" Text="Auftrags-Status:" data-bs-toggle="tooltip" data-bs-placement="top" title="Wenn nichts angewählt ist, bitte das Datum eingrenzen."></asp:Label>
</div> </div>
<div class="col-12" style="margin-left:8px" > <div class="col-8" style="margin-left:8px" >
<asp:RadioButtonList id="RadioButtonList1" runat="server" RepeatDirection="Horizontal" style="width:100%"> <asp:RadioButtonList id="RadioButtonList1" runat="server" RepeatDirection="Horizontal" style="border-color:#fff">
<asp:ListItem ID="rbt_Erf" GroupName="radio"> Erfasst</asp:ListItem> <asp:ListItem ID="rbt_Erf" GroupName="radio" style="font-size:/*17px*/1.063em"> Erfasst</asp:ListItem>
<asp:ListItem ID="rbt_Vorb" GroupName="radio">Vorbereitet</asp:ListItem> <asp:ListItem ID="rbt_Vorb" GroupName="radio" style="font-size:/*17px*/1.063em">Vorbereitet</asp:ListItem>
<asp:ListItem ID="rbt_Vorg" GroupName="radio"> Vorgeschrieben</asp:ListItem> <asp:ListItem ID="rbt_Vorg" GroupName="radio" style="font-size:/*17px*/1.063em"> Vorgeschrieben</asp:ListItem>
<asp:ListItem ID="rbt_Ankunft" GroupName="radio">Ankunft</asp:ListItem> <asp:ListItem ID="rbt_Ankunft" GroupName="radio" style="font-size:/*17px*/1.063em">Ankunft</asp:ListItem>
<asp:ListItem ID="rbt_Freig" onclick="optionensichtbarkeit()" data-bs-toggle="tooltip" data-bs-placement="top" title="Wenn dieser Filter angewählt ist, bitte das Datum eingrenzen."> Freigabe</asp:ListItem> <asp:ListItem ID="rbt_Freig" onclick="optionensichtbarkeit()" data-bs-toggle="tooltip" data-bs-placement="top" title="Wenn dieser Filter angewählt ist, bitte das Datum eingrenzen." style="font-size:/*17px*/1.063em"> Freigabe</asp:ListItem>
</asp:RadioButtonList> </asp:RadioButtonList>
</div> </div>
</div> </div>
@@ -91,9 +90,6 @@
<div style="height:0.936768149882904vh"></div> <div style="height:0.936768149882904vh"></div>
<div class="col-12" id="cont4"> <div class="col-12" id="cont4">
<div class="col-12"> <div class="col-12">
<div class="row-cols-12" style="margin-left:4px">
<asp:Label ID="lbl_Suchparam_Wichtig" runat="server" Text="Wichtge Suchparamter:"></asp:Label>
</div>
<div class="container2" style="margin-left:2px"> <div class="container2" style="margin-left:2px">
<div class="align-content-start"> <div class="align-content-start">
<asp:Label ID="lbl_von" runat="server" Text="Von:"></asp:Label> <asp:Label ID="lbl_von" runat="server" Text="Von:"></asp:Label>
@@ -107,42 +103,43 @@
<div style="height:/*12px*/0.936768149882904vh"></div> <div style="height:/*12px*/0.936768149882904vh"></div>
<hr> <hr>
<div id="accordion"> <div id="accordion">
<div class="accordion" id="accordionExample"> <div class="accordion" id="accordionExample">
<div class="accordion-item"> <div class="accordion-item" style="height:60px">
<h2 class="accordion-header" id="headingOne"> <h2 class="accordion-header" id="headingOne">
<button class="accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#collapseOne" aria-expanded="false" aria-controls="collapseOne" style="background-color:#fff">Erweiterte Suche</button> <button class="accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#collapseOne" aria-expanded="false" aria-controls="collapseOne" style="background-color:#fff">Erweiterte Suche</button>
</h2> </h2>
</div> </div>
<div id="collapseOne" class="accordion-collapse collapse hide" aria-labelledby="headingOne" data-bs-parent="#accordionExample"> <div id="collapseOne" class="accordion-collapse collapse hide" aria-labelledby="headingOne" data-bs-parent="#accordionExample">
<div class="card card-body"> <div class="card card-body">
<div class="col-12" id="cont3"> <div class="col-12" id="cont3">
<div class="container" style="margin-left:2px">
<div style="height:/*12px*/0.936768149882904vh"></div>
<!-- Optionale Suchparameter-->
<div class="row">
<div class="col-12" style="margin-right:/*1.52px;*/0.33480176211453744vw;">
<asp:Label ID="lbl_LKWNr" runat="server" Text="LKW Nr"></asp:Label>
<asp:TextBox ID="txt_LKWNr" runat="server" style="width:117px; margin-left:25px;"></asp:TextBox>
<div class="container" style="margin-left:2px"> <asp:Label ID="lbl_KdNrAuftrag" runat="server" Text="Kunden Auftrags Nr" style="margin-left:45px"></asp:Label>
<div style="height:/*12px*/0.936768149882904vh"></div> <asp:TextBox ID="txt_KdNrAuftrag" runat="server" style="width:117px; margin-left:6px;"></asp:TextBox>
<!-- Optionale Suchparameter--> </div>
<div class="row"> <div class="col-12" style="margin-right:/*1.52px;*/0.33480176211453744vw;">
<div class="col-12" style="margin-right:/*1.52px;*/0.33480176211453744vw;"> <asp:Label ID="lbl_Absender" runat="server" Text="Absender"></asp:Label>
<asp:Label ID="lbl_LKWNr" runat="server" Text="LKW Nr"></asp:Label> <asp:TextBox ID="txt_Absender" runat="server" style="width:155px; margin-left:8px;"></asp:TextBox>
<asp:TextBox ID="txt_LKWNr" runat="server" style="width:117px; margin-left:25px;"></asp:TextBox>
<asp:Label ID="lbl_KdNrAuftrag" runat="server" Text="Kunden Auftrags Nr" style="margin-left:45px"></asp:Label> <asp:Label ID="lbl_Empfaenger" runat="server" Text="Empfänger" style="margin-left:9px"></asp:Label>
<asp:TextBox ID="txt_KdNrAuftrag" runat="server" style="width:117px; margin-left:6px;"></asp:TextBox> <asp:TextBox ID="txt_Empfaenger" runat="server" style="width:155px; margin-left:52px;"></asp:TextBox>
</div> </div>
<div class="col-12" style="margin-right:/*1.52px;*/0.33480176211453744vw;"> </div>
<asp:Label ID="lbl_Absender" runat="server" Text="Absender"></asp:Label> </div>
<asp:TextBox ID="txt_Absender" runat="server" style="width:155px; margin-left:8px;"></asp:TextBox> </div>
</div>
<asp:Label ID="lbl_Empfaenger" runat="server" Text="Empfänger" style="margin-left:9px"></asp:Label> </div>
<asp:TextBox ID="txt_Empfaenger" runat="server" style="width:155px; margin-left:52px;"></asp:TextBox> </div>
</div>
</div>
</div>
</div>
</div></div></div>
<div style="height:/*24px*/1.873536299765808vh"></div> <div style="height:/*24px*/1.873536299765808vh"></div>
<asp:Button ID="btn_Auftraege" runat="server" Text="Erhalte Aufträge" OnClick="btn_Auftraege_Click" style="margin-left:18px" /> <asp:Button ID="btn_Auftraege" class="btn-primary" runat="server" Text="Erhalte Aufträge" OnClick="btn_Auftraege_Click" style="margin-left:18px" />
<div style="height:/*32px*/2.498048399687744vh"></div> <div style="height:/*32px*/2.498048399687744vh"></div>
<div class="g-3" style="border:/*1.8px*/0.0706436420722135vw #808080 ridge; margin-left:12px"> <div class="g-3" style="border:/*1.8px*/0.0706436420722135vw #808080 ridge; margin-left:12px">
<!-- <input class="form-control mb-4" id="tableSearch" type="text" <!-- <input class="form-control mb-4" id="tableSearch" type="text"
@@ -151,14 +148,12 @@
<asp:Table id="normaltable" runat="server" Width="100%" EnableViewState="false" > <asp:Table id="normaltable" runat="server" Width="100%" EnableViewState="false" >
<asp:TableHeaderRow ID="tbl_Header_row" runat="server"> <asp:TableHeaderRow ID="tbl_Header_row" runat="server">
<asp:TableHeaderCell ID="tbl_HeaderCellIndexNr" runat="server">Index-Nr</asp:TableHeaderCell> <asp:TableHeaderCell ID="tbl_HeaderCellIndexNr" runat="server">Index-Nr</asp:TableHeaderCell>
<asp:TableHeaderCell ID="tbl_HeaderCell_ART" runat="server">ART</asp:TableHeaderCell> <asp:TableHeaderCell ID="tbl_HeaderCell_LKWs" runat="server">LKW_Nr</asp:TableHeaderCell>
<asp:TableHeaderCell ID="tbl_HeaderCell_Status" runat="server">Status</asp:TableHeaderCell> <asp:TableHeaderCell ID="tbl_HeaderCell_Status" runat="server">Status</asp:TableHeaderCell>
<asp:TableHeaderCell ID="tbl_HeaderCell_von" runat="server">von</asp:TableHeaderCell> <asp:TableHeaderCell ID="tbl_HeaderCell_Auftragsdatum" runat="server">Auftragsdatum</asp:TableHeaderCell>
<asp:TableHeaderCell ID="tbl_HeaderCell_bis" runat="server">bis</asp:TableHeaderCell>
<asp:TableHeaderCell ID="tbl_HeaderCell_Absender" runat="server">Absender</asp:TableHeaderCell> <asp:TableHeaderCell ID="tbl_HeaderCell_Absender" runat="server">Absender</asp:TableHeaderCell>
<asp:TableHeaderCell ID="tbl_HeaderCell_Empfaenger" runat="server">Empfänger</asp:TableHeaderCell> <asp:TableHeaderCell ID="tbl_HeaderCell_Empfaenger" runat="server">Empfänger</asp:TableHeaderCell>
<asp:TableHeaderCell ID="tbl_HeaderCell_LKWs" runat="server">LKW_Nr</asp:TableHeaderCell> <asp:TableHeaderCell ID="tbl_HeaderCell_KundAuftNr" runat="server">Auftrags-Nr</asp:TableHeaderCell>
<asp:TableHeaderCell ID="tbl_HeaderCell_KundAuftNr" runat="server">KundenAuftrags_Nr</asp:TableHeaderCell>
<asp:TableHeaderCell ID="tbl_HeaderCell_Info" runat="server">Info</asp:TableHeaderCell> <asp:TableHeaderCell ID="tbl_HeaderCell_Info" runat="server">Info</asp:TableHeaderCell>
</asp:TableHeaderRow> </asp:TableHeaderRow>
</asp:Table> </asp:Table>
@@ -176,11 +171,11 @@
<br /><br /><br /> <br /><br /><br />
<% End If <% End If
End If End If
End If End If
Catch ex As Exception Catch ex As Exception
Response.Write(ex.Message & ex.StackTrace) Response.Write(ex.Message & ex.StackTrace)
End Try %> End Try %>

20
Customers/CustomsAviso.aspx.vb
View File

@@ -132,11 +132,8 @@ Partial Class Kundenbereich_Default
For Each d In dt.Rows For Each d In dt.Rows
Dim Cell = New TableCell Dim Cell = New TableCell
Dim tbl_CellIndex = New TableCell Dim tbl_CellIndex = New TableCell
Dim tbl_CellArt = New TableCell
Dim tbl_CellStatus = New TableCell Dim tbl_CellStatus = New TableCell
Dim tbl_Cellvon = New TableCell Dim tbl_Cell_Auftragsdatum = New TableCell
Dim tbl_Cellbis = New TableCell
Dim tbl_CellAbsender = New TableCell Dim tbl_CellAbsender = New TableCell
Dim tbl_CellEmpfaenger = New TableCell Dim tbl_CellEmpfaenger = New TableCell
Dim tbl_CellLKWs = New TableCell Dim tbl_CellLKWs = New TableCell
@@ -144,10 +141,11 @@ Partial Class Kundenbereich_Default
Dim tbl_CellInfo = New TableCell Dim tbl_CellInfo = New TableCell
'tr = New HtmlTableRow() 'tr = New HtmlTableRow()
Dim tr = New TableRow Dim tr = New TableRow
tbl_CellIndex.Text = i Dim zahl = i + 1
tbl_CellIndex.Text = zahl
tr.Cells.Add(tbl_CellIndex) tr.Cells.Add(tbl_CellIndex)
tbl_CellArt.Text = "" tbl_CellLKWs.Text = d("LKW_Nr").ToString
tr.Cells.Add(tbl_CellArt) tr.Cells.Add(tbl_CellLKWs)
Select Case d("Status") Select Case d("Status")
Case 1 Case 1
@@ -170,16 +168,12 @@ Partial Class Kundenbereich_Default
tr.Cells.Add(tbl_CellStatus) tr.Cells.Add(tbl_CellStatus)
End Select End Select
tbl_Cellvon.Text = d("AvisoEingang").ToString tbl_Cell_Auftragsdatum.Text = d("AvisoEingang").ToString
tr.Cells.Add(tbl_Cellvon) tr.Cells.Add(tbl_Cell_Auftragsdatum)
tbl_Cellbis.Text = d("AvisoEingang").ToString
tr.Cells.Add(tbl_Cellbis)
tbl_CellAbsender.Text = d("Auftraggeber").ToString tbl_CellAbsender.Text = d("Auftraggeber").ToString
tr.Cells.Add(tbl_CellAbsender) tr.Cells.Add(tbl_CellAbsender)
tbl_CellEmpfaenger.Text = d("Auftraggeber").ToString tbl_CellEmpfaenger.Text = d("Auftraggeber").ToString
tr.Cells.Add(tbl_CellEmpfaenger) tr.Cells.Add(tbl_CellEmpfaenger)
tbl_CellLKWs.Text = d("LKW_Nr").ToString
tr.Cells.Add(tbl_CellLKWs)
tbl_CellKundAuftNr.Text = d("KdAuftragsNr_Avisierer").ToString tbl_CellKundAuftNr.Text = d("KdAuftragsNr_Avisierer").ToString
tr.Cells.Add(tbl_CellKundAuftNr) tr.Cells.Add(tbl_CellKundAuftNr)
If rbt_Ankunft.Selected = True AndAlso tbl_CellStatus.Text = "Ankunft" Then If rbt_Ankunft.Selected = True AndAlso tbl_CellStatus.Text = "Ankunft" Then

11
css/Customers/CustomerAVISO.css
View File

@@ -52,8 +52,8 @@ hr{
overflow-anchor: none; overflow-anchor: none;
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
} }
#RadioButtonList1{ #RadioButtonList1 {
width:100%; border:none;
} }
@media (prefers-reduced-motion:reduce) { @media (prefers-reduced-motion:reduce) {
.accordion-button { .accordion-button {
@@ -85,7 +85,6 @@ hr{
background-size: 1.25rem; background-size: 1.25rem;
transition: transform .2s ease-in-out transition: transform .2s ease-in-out
} }
@media (prefers-reduced-motion:reduce) { @media (prefers-reduced-motion:reduce) {
.accordion-button::after { .accordion-button::after {
transition: none transition: none
@@ -102,6 +101,12 @@ hr{
outline: 0; outline: 0;
box-shadow: 0 0 0 .25rem rgba(4, 51, 129,.25) box-shadow: 0 0 0 .25rem rgba(4, 51, 129,.25)
} }
#btn_resetForm {
padding-right:-800px;
}
#rbt_Erf{
font-size:18px;
}
@media (max-width: 558.98px) { @media (max-width: 558.98px) {
h1 { h1 {
color: #043381; color: #043381;