diff --git a/Customers/CustomsAviso.aspx b/Customers/CustomsAviso.aspx index 26142d6..435492d 100644 --- a/Customers/CustomsAviso.aspx +++ b/Customers/CustomsAviso.aspx @@ -116,9 +116,7 @@ - +
diff --git a/Customers/CustomsAviso.aspx.vb b/Customers/CustomsAviso.aspx.vb index 536ca3a..337a5af 100644 --- a/Customers/CustomsAviso.aspx.vb +++ b/Customers/CustomsAviso.aspx.vb @@ -50,6 +50,15 @@ Partial Class Kundenbereich_Default th.Cells.Add(New HtmlTableCell("Auftraggeber_KdNr")) normaltable.Rows.Add(th) If rbt_Erf.Checked = True Then + rbt_Freig.Checked = False + rbt_Freig.Enabled = False + rbt_Ankunft.Checked = False + rbt_Ankunft.Enabled = False + rbt_Vorb.Checked = False + rbt_Vorb.Enabled = False + rbt_Vorg.Checked = False + rbt_Vorg.Enabled = False + dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {0}) Dim i As Integer = 0 @@ -57,15 +66,26 @@ Partial Class Kundenbereich_Default For Each d In dt.Rows If i <= dt.Rows.Count Then - - 'Dim tr = New TableRow tr = New HtmlTableRow() 'Cell.Controls.Add(New HtmlTableCell(i)) tr.Cells.Add(New HtmlTableCell(i)) tr.Cells.Add(New HtmlTableCell("")) tr.Cells.Add(New HtmlTableCell(d("Auftraggeber_KdNr"))) - tr.Cells.Add(New HtmlTableCell(d("Status"))) + Select Case d("Status") + Case 1 + tr.Cells.Add(New HtmlTableCell("Erfasst")) + 'Case 2 + ' tr.Cells.Add(New HtmlTableCell("Nicht eingetroffen")) + Case 3 + tr.Cells.Add(New HtmlTableCell("Ankunft")) + Case 4 + tr.Cells.Add(New HtmlTableCell("Vorbereitet")) + Case 5 + tr.Cells.Add(New HtmlTableCell("Vorgeschrieben")) + Case Else + tr.Cells.Add(New HtmlTableCell("Undefiend")) + End Select tr.Cells.Add(New HtmlTableCell(d("AvisoEingang"))) tr.Cells.Add(New HtmlTableCell(d("AvisoEingang"))) tr.Cells.Add(New HtmlTableCell(d("Auftraggeber"))) @@ -79,6 +99,14 @@ Partial Class Kundenbereich_Default Next ElseIf rbt_Freig.Checked = True Then + rbt_Erf.Checked = False + rbt_Erf.Enabled = False + rbt_Ankunft.Checked = False + rbt_Ankunft.Enabled = False + rbt_Vorb.Checked = False + rbt_Vorb.Enabled = False + rbt_Vorg.Checked = False + rbt_Vorg.Enabled = False dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {1}, datevon, datebis) Dim i As Integer = 0 @@ -92,7 +120,20 @@ Partial Class Kundenbereich_Default tr.Cells.Add(New HtmlTableCell(i)) tr.Cells.Add(New HtmlTableCell("")) tr.Cells.Add(New HtmlTableCell(d("Auftraggeber_KdNr"))) - tr.Cells.Add(New HtmlTableCell(d("Status"))) + Select Case d("Status") + Case 1 + tr.Cells.Add(New HtmlTableCell("Erfasst")) + 'Case 2 + ' tr.Cells.Add(New HtmlTableCell("Nicht eingetroffen")) + Case 3 + tr.Cells.Add(New HtmlTableCell("Ankunft")) + Case 4 + tr.Cells.Add(New HtmlTableCell("Vorbereitet")) + Case 5 + tr.Cells.Add(New HtmlTableCell("Vorgeschrieben")) + Case Else + tr.Cells.Add(New HtmlTableCell("Undefiend")) + End Select tr.Cells.Add(New HtmlTableCell(d("AvisoEingang"))) tr.Cells.Add(New HtmlTableCell(d("AvisoEingang"))) tr.Cells.Add(New HtmlTableCell(d("Auftraggeber"))) @@ -101,12 +142,19 @@ Partial Class Kundenbereich_Default tr.Cells.Add(New HtmlTableCell(d("Auftraggeber_KdNr"))) normaltable.Rows.Add(tr) - i = i + 1 End If Next ElseIf rbt_Ankunft.Checked = True Then + rbt_Erf.Checked = False + rbt_Erf.Enabled = False + rbt_Freig.Checked = False + rbt_Freig.Enabled = False + rbt_Vorb.Checked = False + rbt_Vorb.Enabled = False + rbt_Vorg.Checked = False + rbt_Vorg.Enabled = False dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {3}) Dim i As Integer = 0 @@ -120,7 +168,20 @@ Partial Class Kundenbereich_Default tr.Cells.Add(New HtmlTableCell(i)) tr.Cells.Add(New HtmlTableCell("")) tr.Cells.Add(New HtmlTableCell(d("Auftraggeber_KdNr"))) - tr.Cells.Add(New HtmlTableCell(d("Status"))) + Select Case d("Status") + Case 1 + tr.Cells.Add(New HtmlTableCell("Erfasst")) + 'Case 2 + ' tr.Cells.Add(New HtmlTableCell("Nicht eingetroffen")) + Case 3 + tr.Cells.Add(New HtmlTableCell("Ankunft")) + Case 4 + tr.Cells.Add(New HtmlTableCell("Vorbereitet")) + Case 5 + tr.Cells.Add(New HtmlTableCell("Vorgeschrieben")) + Case Else + tr.Cells.Add(New HtmlTableCell("Undefiend")) + End Select tr.Cells.Add(New HtmlTableCell("")) tr.Cells.Add(New HtmlTableCell("")) tr.Cells.Add(New HtmlTableCell(d("Auftraggeber"))) @@ -134,6 +195,15 @@ Partial Class Kundenbereich_Default Next ElseIf rbt_Vorb.Checked = True Then + rbt_Ankunft.Checked = False + rbt_Ankunft.Enabled = False + rbt_Erf.Checked = False + rbt_Erf.Enabled = False + rbt_Freig.Checked = False + rbt_Freig.Enabled = False + rbt_Vorg.Checked = False + rbt_Vorg.Enabled = False + dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {4}) Dim i As Integer = 0 @@ -147,7 +217,20 @@ Partial Class Kundenbereich_Default tr.Cells.Add(New HtmlTableCell(i)) tr.Cells.Add(New HtmlTableCell("")) tr.Cells.Add(New HtmlTableCell(d("Auftraggeber_KdNr"))) - tr.Cells.Add(New HtmlTableCell(d("Status"))) + Select Case d("Status") + Case 1 + tr.Cells.Add(New HtmlTableCell("Erfasst")) + 'Case 2 + ' tr.Cells.Add(New HtmlTableCell("Nicht eingetroffen")) + Case 3 + tr.Cells.Add(New HtmlTableCell("Ankunft")) + Case 4 + tr.Cells.Add(New HtmlTableCell("Vorbereitet")) + Case 5 + tr.Cells.Add(New HtmlTableCell("Vorgeschrieben")) + Case Else + tr.Cells.Add(New HtmlTableCell("Undefiend")) + End Select tr.Cells.Add(New HtmlTableCell("")) tr.Cells.Add(New HtmlTableCell("")) tr.Cells.Add(New HtmlTableCell(d("Auftraggeber"))) @@ -161,6 +244,14 @@ Partial Class Kundenbereich_Default Next ElseIf rbt_Vorg.Checked = True Then + rbt_Ankunft.Enabled = False + rbt_Ankunft.Checked = False + rbt_Erf.Enabled = False + rbt_Erf.Checked = False + rbt_Freig.Enabled = False + rbt_Freig.Checked = False + rbt_Vorb.Enabled = False + rbt_Vorb.Checked = False dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {5}) Dim i As Integer = 0 @@ -177,7 +268,20 @@ Partial Class Kundenbereich_Default tr.Cells.Add(New HtmlTableCell(i)) tr.Cells.Add(New HtmlTableCell("")) tr.Cells.Add(New HtmlTableCell(d("Auftraggeber_KdNr"))) - tr.Cells.Add(New HtmlTableCell(d("Status"))) + Select Case d("Status") + Case 1 + tr.Cells.Add(New HtmlTableCell("Erfasst")) + 'Case 2 + ' tr.Cells.Add(New HtmlTableCell("Nicht eingetroffen")) + Case 3 + tr.Cells.Add(New HtmlTableCell("Ankunft")) + Case 4 + tr.Cells.Add(New HtmlTableCell("Vorbereitet")) + Case 5 + tr.Cells.Add(New HtmlTableCell("Vorgeschrieben")) + Case Else + tr.Cells.Add(New HtmlTableCell("Undefiend")) + End Select tr.Cells.Add(New HtmlTableCell("")) tr.Cells.Add(New HtmlTableCell("")) tr.Cells.Add(New HtmlTableCell(d("Auftraggeber"))) @@ -204,8 +308,21 @@ Partial Class Kundenbereich_Default 'Cell.Controls.Add(New HtmlTableCell(i)) tr.Cells.Add(New HtmlTableCell("nA")) tr.Cells.Add(New HtmlTableCell(d("Auftraggeber_KdNr"))) - tr.Cells.Add(New HtmlTableCell(d("Status"))) - tr.Cells.Add(New HtmlTableCell(d("AvisoEingang"))) + Select Case d("Status") + Case 1 + tr.Cells.Add(New HtmlTableCell("Erfasst")) + Case 2 + tr.Cells.Add(New HtmlTableCell("Nicht eingetroffen")) + Case 3 + tr.Cells.Add(New HtmlTableCell("Ankunft")) + Case 4 + tr.Cells.Add(New HtmlTableCell("Vorbereitet")) + Case 5 + tr.Cells.Add(New HtmlTableCell("Vorgeschrieben")) + Case Else + tr.Cells.Add(New HtmlTableCell("Undefiend")) + End Select + tr.Cells.Add(New HtmlTableCell(d("AvisoEingang"))) tr.Cells.Add(New HtmlTableCell(d("AvisoEingang"))) tr.Cells.Add(New HtmlTableCell(d("Auftraggeber"))) tr.Cells.Add(New HtmlTableCell(d("Auftraggeber"))) @@ -227,10 +344,15 @@ Partial Class Kundenbereich_Default 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 + rbt_Erf.Enabled = True rbt_Freig.Checked = False + rbt_Freig.Enabled = True rbt_Vorg.Checked = False + rbt_Vorg.Enabled = True rbt_Vorb.Checked = False + rbt_Vorb.Enabled = True txt_KdNr.Text = "" txt_KdNr.Focus()