Fehler bei Status Julius wurde ausgebessert.

This commit is contained in:
ja
2021-09-20 16:25:51 +02:00
parent 4b0bc6bc9d
commit 4dd530cfbc
4 changed files with 86 additions and 63 deletions

View File

@@ -76,29 +76,28 @@
<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 class="d-none d-md-block">
<div style=" width:750px; margin-left:8px">
<div style=" width:780px; margin-left:8px">
<asp:RadioButtonList id="RadioButtonList1" runat="server" RepeatDirection="Horizontal" style="border-color:#fff">
<asp:ListItem ID="rbt_Alle" GroupName="radios" style="font-size:/*17px*/1.063em">Alle</asp:ListItem>
<asp:ListItem ID="rbt_Erf" GroupName="radios" style="font-size:/*17px*/1.063em">Erfasst</asp:ListItem>
<asp:ListItem ID="rbt_Vorb" GroupName="radios" style="font-size:/*17px*/1.063em">Vorbereitet</asp:ListItem>
<asp:ListItem ID="rbt_Vorg" GroupName="radios" style="font-size:/*17px*/1.063em"> Vorgeschrieben</asp:ListItem>
<asp:ListItem ID="rbt_Ankunft" GroupName="radios" style="font-size:/*17px*/1.063em">Ankunft</asp:ListItem>
<asp:ListItem ID="rbt_Freig" GroupName="radios" 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:ListItem ID="rbt_Alle" GroupName="radios" style="font-size:/*17px*/1.063em;margin-left:0px"><span style="margin-left:3px;">Alle</span></asp:ListItem>
<asp:ListItem ID="rbt_Erf" GroupName="radios" style="font-size:/*17px*/1.063em;margin-left:4px"><span name="Erfasst" style="margin-left:3px;">Erfasst</span></asp:ListItem>
<asp:ListItem ID="rbt_Vorb" GroupName="radios" style="font-size:/*17px*/1.063em;margin-left:4px"><span style="margin-left:3px;">Vorbereitet</span></asp:ListItem>
<asp:ListItem ID="rbt_Vorg" GroupName="radios" style="font-size:/*17px*/1.063em;margin-left:4px"><span style="margin-left:3px;">Vorgeschrieben</span></asp:ListItem>
<asp:ListItem ID="rbt_Ankunft" GroupName="radios" style="font-size:/*17px*/1.063em;margin-left:4px"><span style="margin-left:3px;">Ankunft</asp:ListItem>
<asp:ListItem ID="rbt_Freig" GroupName="radios" 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;margin-left:4px"><label style="margin-left:3px;">Freigabe</label></asp:ListItem>
</asp:RadioButtonList>
</div>
</div>
<div class="d-md-none">
<div class="col-8" style="margin-left:8px" >
<asp:RadioButtonList id="RadioButtonList2" runat="server" RepeatDirection="Vertical" style="border-color:#fff">
<asp:ListItem ID="rbt_Alle_M" GroupName="radios2" style="font-size:/*17px*/1.063em">Alle</asp:ListItem>
<asp:ListItem ID="rbt_Erf_M" GroupName="radios2" style="font-size:/*17px*/1.063em">Erfasst</asp:ListItem>
<asp:ListItem ID="rbt_Vorb_M" GroupName="radios2" style="font-size:/*17px*/1.063em">Vorbereitet</asp:ListItem>
<asp:ListItem ID="rbt_Vorg_M" GroupName="radios2" style="font-size:/*17px*/1.063em">Vorgeschrieben</asp:ListItem>
<asp:ListItem ID="rbt_Ankunft_M" GroupName="radios2" style="font-size:/*17px*/1.063em">Ankunft</asp:ListItem>
<asp:ListItem ID="rbt_Freig_M" GroupName="radios2" 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:ListItem ID="rbt_Alle_M" GroupName="radios2" style="font-size:/*17px*/1.063em"><span style="margin-left:3px;">Alle</span></asp:ListItem>
<asp:ListItem ID="rbt_Erf_M" GroupName="radios2" style="font-size:/*17px*/1.063em"><span style="margin-left:3px;">Erfasst</asp:ListItem>
<asp:ListItem ID="rbt_Vorb_M" GroupName="radios2" style="font-size:/*17px*/1.063em"><span style="margin-left:3px;">Vorbereitet</asp:ListItem>
<asp:ListItem ID="rbt_Vorg_M" GroupName="radios2" style="font-size:/*17px*/1.063em"><span style="margin-left:3px;">Vorgeschrieben</asp:ListItem>
<asp:ListItem ID="rbt_Ankunft_M" GroupName="radios2" style="font-size:/*17px*/1.063em"><span style="margin-left:3px;">Ankunft</asp:ListItem>
<asp:ListItem ID="rbt_Freig_M" GroupName="radios2" 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"><span style="margin-left:3px;">Freigabe</asp:ListItem>
</asp:RadioButtonList>
</div>
</div>
</div>
<div style="height:0.936768149882904vh"></div>
@@ -178,9 +177,9 @@
placeholder="Einen Begriff eingeben oder den Anfang davon ...">-->
<div id="conovertab" style="overflow-x:auto;"margin-left="-2px">
<asp:Table class="table table-responsive table-striped" id="normaltable" runat="server" EnableViewState="false" BorderWidth="2px">
<asp:TableHeaderRow ID="tbl_Header_row" runat="server" BackColor="DarkBlue" ForeColor="White">
<asp:TableHeaderRow id="tbl_Header_row" runat="server" style="background-color:#043381;color:#fff">
<asp:TableHeaderCell ID="tbl_HeaderCellIndexNr" runat="server">Index-Nr</asp:TableHeaderCell>
<asp:TableHeaderCell ID="tbl_HeaderCell_LKWs" runat="server">LKW_Nr</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_Auftragsdatum" runat="server">Auftragsdatum</asp:TableHeaderCell>
<asp:TableHeaderCell ID="tbl_HeaderCell_Absender" runat="server">Absender</asp:TableHeaderCell>
@@ -231,18 +230,18 @@
$(document).ready(function () {
$("#container2").hide();
$('#<%=RadioButtonList1.ClientID %> input[type="radio"]').change(function () {
if ($(this).val() == "Freigabe") {
if ($(this).val() == HTMLSpanElement.val() == "Freigabe") {
$("#container2").show();
} else if ($(this).val() == "Alle") {
} else if ($(this).val() == HTMLSpanElement.val() == "Alle") {
$("#container2").show();
} else {
$("#container2").hide();
}
});
$('#<%=RadioButtonList2.ClientID %> input[type="radio"]').change(function () {
if ($(this).val() == "Freigabe") {
if ($(this).val() == HTMLSpanElement.val()=="Freigabe") {
$("#container2").show();
} else if ($(this).val() == "Alle") {
} else if ($(this).val == HTMLSpanElement.val() == "Alle") {
$("#container2").show();
} else {
$("#container2").hide();

View File

@@ -12,7 +12,7 @@ Partial Class Kundenbereich_Default
Dim LKWNR As String = ""
Dim KDNAFNR As String = ""
Dim dt As DataTable
Dim Art As String = Nothing
Dim Art As String = ""
Protected Sub Page_Load(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.Load
Page.UnobtrusiveValidationMode = UnobtrusiveValidationMode.WebForms
DataBind()
@@ -22,9 +22,11 @@ Partial Class Kundenbereich_Default
If (Page.IsPostBack And normaltable.EnableViewState = False) Then
Dim erster = New Date(Now().Year, Now().Month, 1)
Dim ersterdat = erster.Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString
pickdate1.Text = erster.Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString
' MsgBox(ersterdat)
datevon = ersterdat
datebis = Date.Parse(Now().Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString).ToString
pickdate2.Text = Date.Parse(Now().Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString).ToString
Else
datevon = Nothing
datebis = Nothing
@@ -40,19 +42,18 @@ Partial Class Kundenbereich_Default
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)
Dim blau As Drawing.Color = Drawing.Color.LightBlue
Dim white As Drawing.Color = Drawing.Color.White
Dim schwarz As Drawing.Color = Drawing.Color.Black
Dim darkgrau As Drawing.Color = Drawing.Color.DarkGray
Dim darkblue = Drawing.Color.FromArgb(4, 51, 129)
tr.BackColor = blau
tr.BackColor = white
If t1.Text = "" Then
t1.BackColor = blau
t1.BackColor = white
t1.ForeColor = schwarz
Else
t1.BackColor = blau
t1.BackColor = white
t1.ForeColor = schwarz
End If
If t2.Text = "Erfasst" Then
@@ -71,7 +72,7 @@ Partial Class Kundenbereich_Default
t2.BackColor = Drawing.Color.Purple
t2.ForeColor = white
ElseIf t2.Text = "Freigabe" Then
t2.BackColor = Drawing.Color.DarkOliveGreen
t2.BackColor = Drawing.Color.Green
t2.ForeColor = white
ElseIf t2.Text = "Undefiniert" Then
t2.BackColor = Drawing.Color.DarkGray
@@ -81,45 +82,45 @@ Partial Class Kundenbereich_Default
t2.ForeColor = white
End If
If t3.Text = "" Then
t3.BackColor = blau
t3.BackColor = white
t3.ForeColor = schwarz
Else
t3.BackColor = blau
t3.BackColor = white
t3.ForeColor = schwarz
End If
If t4.Text = "" Then
t4.BackColor = blau
t4.BackColor = white
t4.ForeColor = schwarz
Else
t4.BackColor = blau
t4.BackColor = white
t4.ForeColor = schwarz
End If
If t5.Text = "" Then
t5.BackColor = blau
t5.BackColor = white
t5.ForeColor = schwarz
Else
t5.BackColor = blau
t5.BackColor = white
t5.ForeColor = schwarz
End If
If t6.Text = "" Then
t6.BackColor = blau
t6.BackColor = white
t6.ForeColor = schwarz
Else
t6.BackColor = blau
t6.BackColor = white
t6.ForeColor = schwarz
End If
If t7.Text = "" Then
t7.BackColor = blau
t7.BackColor = white
t7.ForeColor = schwarz
Else
t7.BackColor = blau
t7.BackColor = white
t7.ForeColor = schwarz
End If
If t8.Text = "" Then
t8.BackColor = blau
t8.BackColor = white
t8.ForeColor = schwarz
Else
t8.BackColor = blau
t8.BackColor = white
t8.ForeColor = schwarz
End If
th1.Font.Bold = True
@@ -181,27 +182,49 @@ Partial Class Kundenbereich_Default
End If
If rbt_Alle.Selected = True Or rbt_Alle_M.Selected = True Then
Try
datevon = Date.Parse(pickdate1.Text)
datebis = Date.Parse(pickdate2.Text)
Catch ex As Exception
MsgBox(ex.StackTrace, MsgBoxStyle.Exclamation)
End Try
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
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
Try
pickdate1.ValidateRequestMode = UI.ValidateRequestMode.Enabled
pickdate2.ValidateRequestMode = UI.ValidateRequestMode.Enabled
dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB(Art, Kdnrtext, {0, 1, 2, 3, 4, 5}, datevon, datebis, Absender, Empfaenger, LKWNR, KDNAFNR)
If pickdate1.Text = Nothing Or pickdate2.Text = Nothing Then
Dim erster = New Date(Now().Year, Now().Month, 1)
Dim ersterdat = erster.Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString
' MsgBox(ersterdat)
datevon = ersterdat
pickdate1.Text = erster.Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString
datebis = Date.Parse(Now().Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString).ToString
pickdate2.Text = Date.Parse(Now().Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString).ToString
Else
Try
datevon = Date.Parse(pickdate1.Text)
datebis = Date.Parse(pickdate2.Text)
Catch ex As Exception
MsgBox(ex.StackTrace, MsgBoxStyle.Exclamation)
End Try
End If
ElseIf rbt_Erf.Selected = True Or rbt_Erf_M.Selected = True Then
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
pickdate1.ValidateRequestMode = UI.ValidateRequestMode.Enabled
pickdate2.ValidateRequestMode = UI.ValidateRequestMode.Enabled
If pickdate1.Text = Nothing Or pickdate2.Text = Nothing Then
Dim erster = New Date(Now().Year, Now().Month, 1)
Dim ersterdat = erster.Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString
pickdate1.Text = erster.Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString
' MsgBox(ersterdat)
datevon = ersterdat
datebis = Date.Parse(Now().Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString).ToString
pickdate2.Text = Date.Parse(Now().Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString).ToString
Else
Try
datevon = Date.Parse(pickdate1.Text)
MsgBox(pickdate1.Text)
datebis = Date.Parse(pickdate2.Text)
MsgBox(pickdate2.Text)
dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB(Art, Kdnrtext, {1}, datevon, datebis, Absender, Empfaenger, LKWNR, KDNAFNR)
Catch ex As Exception
MsgBox(ex.StackTrace, MsgBoxStyle.Exclamation)
End Try
End If
ElseIf rbt_Ankunft.Selected = True Or rbt_Ankunft_M.Selected = True Then
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

View File

@@ -114,6 +114,10 @@ hr{
#rbt_Erf{
font-size:18px;
}
.tbl_style {
background-color: #043381;
color: #fff;
}
@media (max-width: 558.98px) {
h1 {
color: #043381;
@@ -176,7 +180,6 @@ hr{
max-width: /*390px;*/ 85.90308370044053vw;
overflow-x: auto;
}
}
@media (min-width: 558.98px) {
#txt_Absender {
@@ -194,5 +197,4 @@ hr{
#normaltable {
width: 100%;
}
}

View File

@@ -459,9 +459,8 @@
<%
Else
%>
<tr <% Response.Write(trBg) %> style="color:#043381;" <a href="#collapseExample" data-toggle="collapse" data-target="#demo<%=cnt %>" role="button" aria-expanded="false" aria-controls="collapseExample" data-bs-toggle="tooltip" data-bs-placement="top" title="Für zusätzliche Infos auf die Zeile oder das Info-Symbol tippen."><td><center>
<button type="button" class="btn btn-primary" data-toggle="collapse" data-target="#demo<%=cnt %>" id="togglecollapse"><img src="images/Icons/service/hilfe.png" width="15" height="15" /></button></center></td><td <% Response.Write(statOK_style) %> > <% Response.Write(statOK) %> </td><td><center> <% Response.Write(cnt) %></center></td><td> <% Response.Write(txtCluster)%> </td><td> <% Response.Write(sndDat) %> </td><td> <% Response.Write(If(s.tblSnd_Absender, "")) %> </td><td> <% Response.Write(If(s.tblSnd_Empfaenger, "")) %> </td></a><!--</button>--></tr>
<tr <% Response.Write(trBg) %> style="color:#043381;" <a href="#collapseExample" data-toggle="collapse" data-target="#demo<%=cnt %>" role="button" aria-expanded="false" aria-controls="collapseExample" data-bs-toggle="tooltip" data-bs-placement="top" title="Für zusätzliche Infos auf die Zeile oder das Info-Symbol tippen."><td><center><button type="button" class="btn btn-primary" data-toggle="collapse" data-target="#demo<%=cnt %>" id="togglecollapse"><img src="images/Icons/service/hilfe.png" width="15" height="15" /></button></center></td><td <% Response.Write(statOK_style) %> > <% Response.Write(statOK) %> </td><td><center> <% Response.Write(cnt) %></center></td><td> <% Response.Write(txtCluster)%> </td><td> <% Response.Write(sndDat) %> </td><td> <% Response.Write(If(s.tblSnd_Absender, "")) %> </td><td> <% Response.Write(If(s.tblSnd_Empfaenger, "")) %> </td></a><!--</button>--></tr>
<% End If
Dim VERMERKE = VERAGSQL.loadDgvBySql("SELECT [VermerkID],[VermerkArt],[AvisoID],[SendungID],[Datum],VermerkeCodes.Bezeichnung,VermerkeCode FROM [Vermerke] inner join VermerkeCodes ON VermerkeCode=VermerkCodeId WHERE LKW_Vermerk=1 AND SendungID=" & s.tblSnd_SendungID & " /*AND VermerkIDAufgehoben IS NULL*/ ORDER BY Datum", "AVISO")
If VERMERKE IsNot Nothing Then