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

Optionale Suchparameter eingebunden

Browse Source
This commit is contained in:
ja
2021-09-14 16:18:11 +02:00
parent 6e09744a8c
commit 1fc5c1b695
3 changed files with 78 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
Customers/CustomsAviso.aspx
View File

@@ -60,7 +60,7 @@
If True Then 'AVISO.Status <> 1 And AVISO.Status <> 2 Then 'SENDUNGSTABELLE'%>
<div class="flex-fill" style="margin-left:4px">
<div style="border:/*1px*/0.04071661237785016vw #043381 solid">
<div>
<div class="col-12" style="margin-left:2px">
<h2><%=STANDORT %></h2>
@@ -82,17 +82,17 @@
<asp:RadioButton ID="rbt_Vorb" runat="server" Text="Vorbereitet"/>
<asp:RadioButton ID="rbt_Vorg" runat="server" Text="Vorgeschrieben"/>
<asp:RadioButton ID="rbt_Ankunft" runat="server" Text="Ankunft"/>
<asp:RadioButton ID="rbt_Freig" runat="server" Text="Freigabe" onclick="rbt_Freig_Click" data-bs-toggle="tooltip" data-bs-placement="top" title="Wenn dieser Filter angewählt ist, bitte das Datum eingrenzen."/>
<asp:RadioButton ID="rbt_Freig" runat="server" onclick="optionensichtbarkeit()" Text="Freigabe" data-bs-toggle="tooltip" data-bs-placement="top" title="Wenn dieser Filter angewählt ist, bitte das Datum eingrenzen."/>
</div>
</div>
</div>
<div style="height:0.936768149882904vh"></div>
<div class="col-12" id="cont4">
<div class="col-12" style="border:/*1px*/0.04071661237785016vw #043381 solid; margin:-4px 2px -4px 2px">
<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="container" style="margin-left:2px">
<div class="container2" style="margin-left:2px">
<div class="align-content-start">
<asp:Label ID="lbl_von" runat="server" Text="Von:"></asp:Label>
<asp:TextBox id="pickdate1" Type="Date" runat="server"></asp:TextBox>
@@ -102,48 +102,41 @@
</div>
</div>
</div>
<div style="height:/*12px*/0.936768149882904vh"></div>
<div style="height:/*12px*/0.936768149882904vh"></div>
<button class="btn btn-primary" id="btn_collapseoptionalparams" type="button" data-bs-toggle="collapse" data-bs-target="#collapseExample" aria-expanded="false" aria-controls="collapseExample" style="width:100%; background-color:#fff;color">Für die erweiteren Optionen klicken!</button>
<div class="collapse" id="collapseExample">
<div class="card card-body">
<div class="col-12" id="cont3" style="border:/*1px*/0.04071661237785016vw #043381 solid; margin: 2px 2px 2px 2px">
<div class="container" style="margin-left:2px">
<asp:Label ID="lbl_option_Suchparam" runat="server" Text="Optionale Suchparameter:" data-bs-toggle="tooltip" data-bs-placement="top" title="Wenn nichts angewählt ist, bitte das Datum eingrenzen."></asp:Label>
<div style="height:/*12px*/0.936768149882904vh"></div>
<!-- Optionale Suchparameter-->
<div class="row">
<div class="col-4">
<asp:Label ID="lbl_Absender" runat="server" Text="Absender"></asp:Label>
</div>
<div class="col-8" style="margin-right:/*1.52px;*/0.33480176211453744vw;">
<asp:TextBox ID="txt_Absender" runat="server" style="width:117px"></asp:TextBox>
</div>
</div>
<div style="height:/*12px*/0.936768149882904vh"></div>
<div class="row">
<div class="col-4">
<asp:Label ID="lbl_Absender" runat="server" Text="Absender"></asp:Label>
<asp:TextBox ID="txt_Absender" runat="server" style="width:117px"></asp:TextBox>
<asp:Label ID="lbl_Empfaenger" runat="server" Text="Empfänger"></asp:Label>
</div>
<div class="col-8" style="margin-right:/*1.52px;*/0.33480176211453744vw;">
<asp:TextBox ID="txt_Empfaenger" runat="server" style="width:117px"></asp:TextBox>
</div>
</div>
<div style="height:/*12px*/0.936768149882904vh"></div>
<div class="row">
<div class="col-4">
<asp:Label ID="lbl_LKWNr" runat="server" Text="LKW Nr"></asp:Label>
</div>
<div class="col-8" style="margin-right:/*1.52px;*/0.33480176211453744vw;">
<asp:TextBox ID="txt_LKWNr" runat="server" style="width:117px"></asp:TextBox>
</div>
</div>
<div style="height:/*12px*/0.936768149882904vh"></div>
<div class="row">
<div class="col-4">
<asp:Label ID="lbl_KdNrAuftrag" runat="server" Text="Kunden Auftrags Nr"></asp:Label>
</div>
<div class="col-8" style="margin-right:/*1.52px;*/0.33480176211453744vw;">
<asp:TextBox ID="txt_KdNrAuftrag" runat="server" style="width:117px"></asp:TextBox>
</div>
</div>
</div>
</div>
</div></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" />
<div style="height:/*32px*/2.498048399687744vh"></div>
@@ -197,5 +190,16 @@
</table>
</div>
</div>--%>
<script type="text/javascript">
function optionensichtbarkeit() {
if (rbt_Freig.checked) {
document.getElementById("container2").style.display = "inline";
} else {
document.getElementById("container2").style.display= "hidden";
}
}
</script>
<script src="//code.jquery.com/jquery-1.11.1.min.js"></script>
</asp:Content>

55
Customers/CustomsAviso.aspx.vb
View File

@@ -24,6 +24,10 @@ Partial Class Kundenbereich_Default
Dim datevon As DateTime
Dim datebis As DateTime
Dim Kdnrtext As String
Dim Absender As String = ""
Dim Empfaenger As String = ""
Dim LKWNR As String = ""
Dim KDNAFNR As String = ""
Dim dt As DataTable
Protected Sub btn_Auftraege_Click(sender As Object, e As EventArgs)
@@ -32,10 +36,24 @@ Partial Class Kundenbereich_Default
'MsgBox(Session.Item("PW").ToString)
Kdnrtext = Session.Item("CustomerID").ToString
dt = Nothing
If txt_Absender.Text IsNot "" Then
Absender = txt_Absender.Text
ElseIf txt_Empfaenger.Text IsNot "" Then
Empfaenger = txt_Empfaenger.Text
ElseIf txt_KdNrAuftrag.Text IsNot "" Then
KDNAFNR = txt_KdNrAuftrag.Text
ElseIf txt_LKWNr.Text IsNot "" Then
LKWNR = txt_LKWNr.Text
Else
Absender = ""
Empfaenger = ""
KDNAFNR = ""
LKWNR = ""
End If
'Dim tr
If rbt_Erf.Checked = True Then
dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {0})
dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {0},,, Absender, Empfaenger, LKWNR, KDNAFNR)
ElseIf rbt_Freig.Checked = True Then
If pickdate1.Text = "TT.MM.JJJJ" And pickdate2.Text = "TT.MM.JJJJ" Then
If Date.Parse(pickdate2.Text) > Date.Parse(pickdate1.Text) Then
@@ -47,20 +65,21 @@ Partial Class Kundenbereich_Default
End Try
Else
End If
dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {1}, datevon, datebis)
dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {1}, datevon, datebis, Absender, Empfaenger, LKWNR, KDNAFNR)
Else
dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {1}, Date.Parse("01-MM-yyyy", "dd-MM-yyyy", Nothing), Date.Now)
dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {1}, Date.ParseExact("01-MM-yyyy", "dd-MM-yyyy", Nothing), Date.Now)
End If
ElseIf rbt_Ankunft.Checked = True Then
dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {3})
dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {3},,, Absender, Empfaenger, LKWNR, KDNAFNR)
ElseIf rbt_Vorb.Checked = True Then
dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {4})
dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {4},,, Absender, Empfaenger, LKWNR, KDNAFNR)
ElseIf rbt_Vorg.Checked = True Then
dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {5})
dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {5},,, Absender, Empfaenger, LKWNR, KDNAFNR)
ElseIf rbt_Erf.Checked = False And rbt_Freig.Checked = False And rbt_Ankunft.Checked = False And rbt_Vorb.Checked = False And rbt_Vorg.Checked = False Then
If pickdate1.Text = "TT.MM.JJJJ" And pickdate2.Text = "TT.MM.JJJJ" Then
MsgBox("Bitte ein Datum auswählen!", MsgBoxStyle.Information, "Information!")
pickdate1.Text = Date.ParseExact("01" + "-" + Date.Now.Month.ToString + "-" + Date.Now.Year.ToString, "dd-MM-yyyy", Nothing).ToString
End If
pickdate1.Text = Date.ParseExact("01" + "-" + Date.Now.Month.ToString + "-" + Date.Now.Year.ToString, "dd-MM-yyyy", Nothing).ToString
pickdate2.Text = Date.ParseExact(Date.Now.Day.ToString + "-" + Date.Now.Month.ToString + "-" + Date.Now.Year.ToString, "dd-MM-yyyy", Nothing).ToString
datevon = Date.ParseExact(pickdate1.Text, "dd-MM-yyyy", Nothing)
datebis = Date.ParseExact(pickdate2.Text, "dd-MM-yyyy", Nothing)
@@ -71,10 +90,10 @@ Partial Class Kundenbereich_Default
Catch ex As Exception
MsgBox(ex.StackTrace, MsgBoxStyle.Exclamation)
End Try
dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext,, datevon, datebis)
dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext,, datevon, datebis, Absender, Empfaenger, LKWNR, KDNAFNR)
End If
End If
dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext,, datevon, datebis)
dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext,, datevon, datebis, Absender, Empfaenger, LKWNR, KDNAFNR)
Else
If Date.Parse(pickdate2.Text) > Date.Parse(pickdate1.Text) Then
Try
@@ -85,7 +104,7 @@ Partial Class Kundenbereich_Default
End Try
Else
End If
dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext,, datevon, datebis)
dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext,, datevon, datebis, Absender, Empfaenger, LKWNR, KDNAFNR)
End If
If dt IsNot Nothing Then
@@ -133,8 +152,9 @@ Partial Class Kundenbereich_Default
tr.Cells.Add(tbl_CellIndex)
tbl_CellArt.Text = ""
tr.Cells.Add(tbl_CellArt)
tbl_CellKundenNr.Text = d("Auftraggeber_KdNr").ToString
tr.Cells.Add(tbl_CellKundenNr)
'tbl_CellKundenNr.Text = d("Auftraggeber_KdNr").ToString
' tr.Cells.Add(tbl_CellKundenNr)
Select Case d("Status")
Case 1
tbl_CellStatus.Text = "Erfasst"
@@ -187,13 +207,8 @@ Partial Class Kundenbereich_Default
End If
End Sub
Protected Sub rbt_Freig_Click(sender As Object, e As EventArgs)
MsgBox("Es funzt!")
' datepicker1.Visible = True
' datepicker2.Visible = True
End Sub
Protected Sub btn_resetForm_Click(sender As Object, e As EventArgs)
rbt_Ankunft.Checked = False
rbt_Ankunft.Enabled = True
rbt_Erf.Checked = False
@@ -209,7 +224,7 @@ Partial Class Kundenbereich_Default
pickdate2.Text = ""
datevon = Nothing
datebis = Nothing
dt = New DataTable
dt = Nothing
Kdnrtext = ""
'txt_KdNr.Focus()
End Sub

8
css/Customers/CustomerAVISO.css
View File

@@ -26,6 +26,14 @@ h1 {
color:#043381;
background-color:#fff;
}
#btn_collapseoptionalparams {
color: #043381;
background-color: #fff;
}
btn_collapseoptionalparams:hover {
color: #fff;
background-color: #043381;
}
@media (max-width: 558.98px) {
#conovertab {
margin-left: 0px;