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

Änderungen

Browse Source
This commit is contained in:
ja
2021-09-14 11:34:20 +02:00
parent 27be5db198
commit 6a7d54222c
2 changed files with 61 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
Customers/CustomsAviso.aspx
View File

@@ -41,24 +41,24 @@
<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="flex-fill" style="margin-left:4px"> <div class="flex-fill" style="margin-left:4px">
<div style="border:/*1px*/0.04071661237785016vw #043381 solid"> <div style="border:/*1px*/0.04071661237785016vw #043381 solid">
@@ -67,22 +67,22 @@
</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="margin-left:4px">
<asp:Label ID="Label1" runat="server" Text="Bitte eine Auswahl treffen:"></asp:Label> <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:Button ID="btn_resetForm" runat="server" Text="Reset Filters" onclick="btn_resetForm_Click"/>
</div> </div>
<div class="col-12"> <div class="col-12">
<asp:Label ID="lbl_Kndnr" runat="server" Text="Herzlich Willkommen!"></asp:Label> <asp:Label ID="lbl_Kndnr" runat="server" Text="Herzlich Willkommen!"></asp:Label>
</div> </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:"></asp:Label> <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>
</div> </div>
<div class="col-12" style="margin-left:8px"> <div class="col-12" style="margin-left:8px" >
<asp:RadioButton ID="rbt_Erf" runat="server" Text="Erfasst"/> <asp:RadioButton ID="rbt_Erf" runat="server" Text="Erfasst"/>
<asp:RadioButton ID="rbt_Vorb" runat="server" Text="Vorbereitet"/> <asp:RadioButton ID="rbt_Vorb" runat="server" Text="Vorbereitet"/>
<asp:RadioButton ID="rbt_Vorg" runat="server" Text="Vorgeschrieben"/> <asp:RadioButton ID="rbt_Vorg" runat="server" Text="Vorgeschrieben"/>
<asp:RadioButton ID="rbt_Ankunft" runat="server" Text="Ankunft"/> <asp:RadioButton ID="rbt_Ankunft" runat="server" Text="Ankunft"/>
<asp:RadioButton ID="rbt_Freig" runat="server" Text="Freigabe" onclick="rbt_Freig_Click"/> <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."/>
</div> </div>
</div> </div>
</div> </div>
@@ -105,7 +105,7 @@
<div style="height:/*12px*/0.936768149882904vh"></div> <div style="height:/*12px*/0.936768149882904vh"></div>
<div class="col-12" id="cont3" style="border:/*1px*/0.04071661237785016vw #043381 solid; margin: 2px 2px 2px 2px"> <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"> <div class="container" style="margin-left:2px">
<asp:Label ID="lbl_option_Suchparam" runat="server" Text="Optionale Suchparameter:"></asp:Label> <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> <div style="height:/*12px*/0.936768149882904vh"></div>
<!-- Optionale Suchparameter--> <!-- Optionale Suchparameter-->
<div class="row"> <div class="row">
@@ -185,11 +185,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 %>
@@ -202,5 +202,5 @@
</table> </table>
</div> </div>
</div>--%> </div>--%>
</asp:Content> </asp:Content>

71
Customers/CustomsAviso.aspx.vb
View File

@@ -16,8 +16,6 @@ Partial Class Kundenbereich_Default
End If End If
End Sub End Sub
Protected Sub LogOutBtn1_Click(sender As Object, e As EventArgs) Protected Sub LogOutBtn1_Click(sender As Object, e As EventArgs)
FormsAuthentication.SignOut() FormsAuthentication.SignOut()
@@ -46,31 +44,37 @@ Partial Class Kundenbereich_Default
dt = Nothing dt = Nothing
If Date.Parse(pickdate2.Text) > Date.Parse(pickdate1.Text) Then
Try
datevon = Date.Parse(pickdate1.Text)
datebis = Date.Parse(pickdate2.Text)
Catch ex As Exception
MsgBox(ex.StackTrace, MsgBoxStyle.Exclamation)
End Try
End If
'Dim tr 'Dim tr
If rbt_Erf.Checked = True Then 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})
ElseIf rbt_Freig.Checked = True Then ElseIf rbt_Freig.Checked = True Then
dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {1}, datevon, datebis) If pickdate1.Text = "TT.MM.JJJJ" And pickdate2.Text = "TT.MM.JJJJ" Then
If Date.Parse(pickdate2.Text) > Date.Parse(pickdate1.Text) Then
Try
datevon = Date.Parse(pickdate1.Text)
datebis = Date.Parse(pickdate2.Text)
Catch ex As Exception
MsgBox(ex.StackTrace, MsgBoxStyle.Exclamation)
End Try
Else
End If
dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {1}, datevon, datebis)
Else
dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {1}, Date.Parse("01-MM-yyyy", "dd-MM-yyyy", Nothing), Date.Now)
End If
ElseIf rbt_Ankunft.Checked = True Then 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})
ElseIf rbt_Vorb.Checked = True Then 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})
ElseIf rbt_Vorg.Checked = True Then 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})
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 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 If pickdate1.Text = "TT.MM.JJJJ" And pickdate2.Text = "TT.MM.JJJJ" Then
MsgBox("Bitte ein Datum auswählen!", MsgBoxStyle.Information, "Information!") 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 pickdate1.Text = Date.ParseExact("01" + "-" + Date.Now.Month.ToString + "-" + Date.Now.Year.ToString, "dd-MM-yyyy", Nothing).ToString
@@ -78,7 +82,17 @@ Partial Class Kundenbereich_Default
datevon = Date.ParseExact(pickdate1.Text, "dd-MM-yyyy", Nothing) datevon = Date.ParseExact(pickdate1.Text, "dd-MM-yyyy", Nothing)
datebis = Date.ParseExact(pickdate2.Text, "dd-MM-yyyy", Nothing) datebis = Date.ParseExact(pickdate2.Text, "dd-MM-yyyy", Nothing)
dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext,, datevon, datebis) dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext,, datevon, datebis)
Else Else
If Date.Parse(pickdate2.Text) > Date.Parse(pickdate1.Text) Then
Try
datevon = Date.Parse(pickdate1.Text)
datebis = Date.Parse(pickdate2.Text)
Catch ex As Exception
MsgBox(ex.StackTrace, MsgBoxStyle.Exclamation)
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)
End If End If
End If End If
@@ -165,14 +179,11 @@ Partial Class Kundenbereich_Default
tr.Cells.Add(tbl_CellKundAuftNr) tr.Cells.Add(tbl_CellKundAuftNr)
normaltable.Rows.Add(tr) normaltable.Rows.Add(tr)
i += 1 i += 1
Next Next
End If End If
End Sub End Sub
Protected Sub rbt_Freig_Click(sender As Object, e As EventArgs) Protected Sub rbt_Freig_Click(sender As Object, e As EventArgs)
MsgBox("Es funzt!") MsgBox("Es funzt!")
' datepicker1.Visible = True ' datepicker1.Visible = True
@@ -197,23 +208,5 @@ Partial Class Kundenbereich_Default
dt = Nothing dt = Nothing
Kdnrtext = "" Kdnrtext = ""
'txt_KdNr.Focus() 'txt_KdNr.Focus()
End Sub End Sub
End Class
End Class