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

Änderungen LKW GUi und dateien um wieder lauffähig zu sein und Compilerrelease versionswechsel von 2.0 auf 3.5

Browse Source
This commit is contained in:
ja
2021-12-07 16:20:37 +01:00
parent d2915a4c04
commit ec6339fd01
5 changed files with 118 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
Customers/LKWs.aspx
View File

@@ -59,7 +59,7 @@
<div class="row">
<div class="col-10"></div>
<div class="col-2">
<asp:Button runat="server" Text="Alle" ClientIDMode="Predictable" ID="btn_alle" style="margin-left:-36px;width:56px"/></div>
<asp:Button runat="server" Text="Alle" ClientIDMode="Predictable" ID="btn_alle" OnClick="btn_alle_Click" style="margin-left:-36px;width:56px"/></div>
</div>
<div style="height:5px"></div>
<div class="row">
@@ -67,8 +67,9 @@
<div class="col-9">
<div class="col-9"style="height:10px;"></div>
<div class="flex-col-9">
<asp:Table ID="Table1" runat="server"></asp:Table>
<asp:Table ID="tbl_sidemenue" runat="server" CssClass="table table-striped" style="width:310px;margin-left:-32px;">
<asp:TableHeaderRow style="background-color:#043381;color:#fff;font-size:0.86em"><asp:TableHeaderCell>KFZ-Kennzeichen</asp:TableHeaderCell><asp:TableHeaderCell>Nat.</asp:TableHeaderCell><asp:TableHeaderCell>Verk</asp:TableHeaderCell><asp:TableHeaderCell>KZ-An</asp:TableHeaderCell><asp:TableHeaderCell>Vermerk</asp:TableHeaderCell></asp:TableHeaderRow>
<asp:TableHeaderRow style="background-color:#043381;color:#fff;font-size:0.86em"><asp:TableHeaderCell ID="tbhc_KFZKennz">KFZ-Kennzeichen</asp:TableHeaderCell><asp:TableHeaderCell ID="tbhc_Nat">Nat.</asp:TableHeaderCell><asp:TableHeaderCell ID="tblhc_Verk">Verk</asp:TableHeaderCell><asp:TableHeaderCell ID="tblhc_Kz">KZ-An</asp:TableHeaderCell><asp:TableHeaderCell ID="tblhc_Verm">Vermerk</asp:TableHeaderCell></asp:TableHeaderRow>
</asp:Table>
</div>
@@ -119,51 +120,6 @@
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.0/umd/popper.min.js" integrity="sha384-cs/chFZiN24E4KMATLdqdvsezGxaGsi4hLGOzlXwp5UZB1LY//20VyM2taTB4QvJ" crossorigin="anonymous"></script>
<script>
function filterRENr() {
// Declare variables
var input, filter, table, tr, td, i, txtValue;
input = document.getElementById("myInput3");
filter = input.value.toUpperCase();
table = document.getElementById("bodyoftable");
tr = table.getElementsByTagName("tr");
// Loop through all table rows, and hide those who don't match the search query
for (i = 0; i < tr.length; i++) {
td = tr[i].getElementsByTagName("td")[0];
if (td) {
txtValue = td.textContent || td.innerText;
if (txtValue.toUpperCase().indexOf(filter) > -1) {
tr[i].style.display = "";
} else {
tr[i].style.display = "none";
}
}
}
}
function filterdatvonbis() {
// Declare variables
var input, filter, table, tr, td, i, txtValue;
input = document.getElementById("myInput1");
input2 = document.getElementById("myInput2");
filter = input.value.toUpperCase();
filter = input2.value.toUpperCase();
table = document.getElementById("bodyoftable");
tr = table.getElementsByTagName("tr");
// Loop through all table rows, and hide those who don't match the search query
for (i = 0; i < tr.length; i++) {
td = tr[i].getElementsByTagName("td")[1];
if (td) {
txtValue = td.textContent || td.innerText;
if (txtValue.toUpperCase().indexOf(filter) > -1) {
tr[i].style.display = "";
} else {
tr[i].style.display = "none";
}
}
}
}
</script>
</asp:Content>

96
Customers/LKWs.aspx.vb
View File

@@ -1,15 +1,19 @@

Imports System
Imports System.Web.Security
Imports System.Web.UI.WebControls
Partial Class LKWS
Inherits System.Web.UI.Page
Dim Kdnrtext As String = String.Empty
Dim list = VERAG_PROG_ALLGEMEIN.cSDL.GET_LIST_WEB(401940)
Dim list As Collections.Generic.List(Of VERAG_PROG_ALLGEMEIN.cSDL) = Nothing
Protected Sub Page_Load(sender As Object, ByVal e As System.EventArgs) Handles Me.Load
VERAG_VARIABLES.initerrorcount()
If Me.Page.User.Identity.IsAuthenticated Then
Try
Kdnrtext = Session.Item("CustomerID")
Catch A As UnauthorizedAccessException When String.IsNullOrEmpty(Kdnrtext)
MsgBox("Dieser Bereich ist nicht gestattet! Ein Fehler ist bei der Validierung der ID aufgetreten! Bitte erneut versuchen!", MsgBoxStyle.Information, "Error in User Area!")
'MsgBox("Dieser Bereich ist nicht gestattet! Ein Fehler ist bei der Validierung der ID aufgetreten! Bitte erneut versuchen!", MsgBoxStyle.Information, "Error in User Area!")
End Try
Else
FormsAuthentication.RedirectToLoginPage()
@@ -21,12 +25,98 @@ Partial Class LKWS
End If
End Sub
Protected Sub btn_alle_Click(sender As Object, e As EventArgs)
'list = VERAG_PROG_ALLGEMEIN.cSDL.GET_LIST_WEB(Kdnrtext)
MsgBox("Test1")
list = VERAG_PROG_ALLGEMEIN.cSDL.GET_LIST_WEB(401940)
Dim tbl_sidemenue As Table = FindControl("tbl_sidemenue")
Dim tblhrow As TableHeaderRow = New TableHeaderRow()
Dim tblheader_Cell1 As TableHeaderCell = FindControl("tbhc_KFZKennz")
Dim tblheader_Cellnat As TableHeaderCell = FindControl("tbhc_Nat")
Dim tblheader_cell_KZ As TableHeaderCell = FindControl("tblhc_Kz")
Dim tblheader_cell_Verm As TableHeaderCell = FindControl("tblhc_Verm")
tblhrow.Cells.Add(tblheader_Cell1)
tblhrow.Cells.Add(tblheader_Cellnat)
tblhrow.Cells.Add(tblheader_cell_KZ)
tblhrow.Cells.Add(tblheader_cell_Verm)
tbl_sidemenue.Rows.Add(tblhrow)
'tbl_sidemenue.Rows.Clear()
MsgBox("Test2")
For Each l1 In list
Dim tr1 As TableRow = New TableRow()
Dim tc_KfzKennz As TableCell = New TableCell()
Dim tc_Nationalitaet As TableCell = New TableCell()
Dim tc_Verk As TableCell = New TableCell()
Dim tc_KZ_An As TableCell = New TableCell()
Dim tc_Vermerk As TableCell = New TableCell()
initcells(tr1, tc_KfzKennz, tc_Nationalitaet, tc_Verk, tc_KZ_An, tc_Vermerk)
tc_KfzKennz.Text = l1.KfzKennzeichen
tr1.Cells.Add(tc_KfzKennz)
tc_Nationalitaet.Text = String.Empty
tr1.Cells.Add(tc_Nationalitaet)
Dim cbverk As CheckBox = New CheckBox()
tc_Verk.Controls.Add(cbverk)
tr1.Cells.Add(tc_Verk)
Dim chbx2_Kz_an As CheckBox = New CheckBox()
tc_KZ_An.Controls.Add(chbx2_Kz_an)
tr1.Cells.Add(tc_KZ_An)
tc_Vermerk.Text = l1.Vermerk.ToString
tr1.Cells.Add(tc_Vermerk)
tbl_sidemenue.Rows.Add(tr1)
Next
MsgBox("Test3")
End Sub
Private Sub initcells(tr1 As TableRow, tc_KfzKennz As TableCell, tc_Nationalitaet As TableCell, tc_Verk As TableCell, tc_KZ_An As TableCell, tc_Vermerk As TableCell)
End Sub
Protected Sub btn_Suchen_Click(sender As Object, e As EventArgs)
MsgBox("Test0")
Dim txt_LkwNr As TextBox = Page.FindControl("txt_LkwNr")
'list = VERAG_PROG_ALLGEMEIN.cSDL.GET_LIST_WEB(401940, "COOPER8")
list = VERAG_PROG_ALLGEMEIN.cSDL.GET_LIST_WEB(401940, txt_LkwNr.Text)
Dim tbl_sidemenue2 As Table = FindControl("tbl_sidemenue")
Dim tblhrow As TableHeaderRow = New TableHeaderRow()
Dim tblheader_Cell1 As TableHeaderCell = FindControl("tbhc_KFZKennz")
Dim tblheader_Cellnat As TableHeaderCell = FindControl("tbhc_Nat")
Dim tblheader_cell_KZ As TableHeaderCell = FindControl("tblhc_Kz")
Dim tblheader_cell_Verm As TableHeaderCell = FindControl("tblhc_Verm")
tblhrow.Cells.Add(tblheader_Cell1)
tblhrow.Cells.Add(tblheader_Cellnat)
tblhrow.Cells.Add(tblheader_cell_KZ)
tblhrow.Cells.Add(tblheader_cell_Verm)
tbl_sidemenue2.Rows.Add(tblhrow)
'tbl_sidemenue2.Rows.Clear()
MsgBox("Test1")
For Each l2 In list
Dim tr2 As TableRow = New TableRow()
Dim tc_KfzKennz As TableCell = New TableCell()
Dim tc_Nationalitaet As TableCell = New TableCell()
Dim tc_Verk As TableCell = New TableCell()
Dim tc_KZ_An As TableCell = New TableCell()
Dim tc_Vermerk As TableCell = New TableCell()
tc_KfzKennz.Text = l2.KfzKennzeichen.ToString
tr2.Cells.Add(tc_KfzKennz)
tc_Nationalitaet.Text = String.Empty
tr2.Cells.Add(tc_Nationalitaet)
Dim cbVerk_Such As CheckBox = New CheckBox()
tc_Verk.Controls.Add(cbVerk_Such)
tr2.Cells.Add(tc_Verk)
Dim cb_Kz_An As CheckBox = New CheckBox()
tc_KZ_An.Controls.Add(cb_Kz_An)
tc_Vermerk.Text = l2.Vermerk.ToString
tr2.Cells.Add(tc_Vermerk)
'tr2.Attributes.Add("command", "getinfos")
tbl_sidemenue2.Rows.Add(tr2)
Next
MsgBox("Test2")
End Sub
Protected Sub getinfos(varz As Integer)
End Sub
End Class

10
VERAG_Homepage.sln
View File

@@ -32,7 +32,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
Linkfactory.js = Linkfactory.js
EndProjectSection
EndProject
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "VERAG_PROG_ALLGEMEIN", "..\SDL\SDL\VERAG_PROG_ALLGEMEIN\VERAG_PROG_ALLGEMEIN.vbproj", "{A3B497BD-842C-4A2B-B398-ED1976849DF1}"
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "VERAG_PROG_ALLGEMEIN", "..\SDL\VERAG_PROG_ALLGEMEIN\VERAG_PROG_ALLGEMEIN.vbproj", "{A3B497BD-842C-4A2B-B398-ED1976849DF1}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -52,12 +52,12 @@ Global
{11EF0CDA-BC19-40FB-91C4-25C81F3A27AC}.Release|x64.Build.0 = Debug|Any CPU
{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|x64.ActiveCfg = Debug|Any CPU
{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|x64.Build.0 = Debug|Any CPU
{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|x64.ActiveCfg = Debug|x64
{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|x64.Build.0 = Debug|x64
{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Release|Any CPU.Build.0 = Release|Any CPU
{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Release|x64.ActiveCfg = Release|Any CPU
{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Release|x64.Build.0 = Release|Any CPU
{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Release|x64.ActiveCfg = Release|x64
{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

22
Web.config
View File

@@ -24,15 +24,15 @@
</system.Web>
-->
<system.web>
<webServices>
<protocols>
<add name="HttpGet" />
<add name="HttpPost" />
</protocols>
<conformanceWarnings>
<remove name="BasicProfile1_1" />
</conformanceWarnings>
</webServices>
<webServices>
<protocols>
<add name="HttpGet" />
<add name="HttpPost" />
</protocols>
<conformanceWarnings>
<remove name="BasicProfile1_1" />
</conformanceWarnings>
</webServices>
<authentication mode="Forms">
<forms defaultUrl="/Customers/Welcome.aspx" loginUrl="login/Login_FLEX.aspx" slidingExpiration="true" timeout="2880" />
</authentication>
@@ -153,8 +153,8 @@
</location>
<system.codedom>
<compilers>
<compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:1659;1699;1701" />
<compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+" />
<compiler extension=".cs" language="c#;cs;csharp" warningLevel="4" compilerOptions="/langversion:7.3 /nowarn:1659;1699;1701;612;618" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=3.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
<compiler extension=".vb" language="vb;vbs;visualbasic;vbscript" warningLevel="4" compilerOptions="/langversion:default /nowarn:41008,40000,40008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=3.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
</compilers>
</system.codedom>
</configuration>

3
packages.config
View File

@@ -5,6 +5,7 @@
<package id="CompareNETObjects" version="4.73.0" targetFramework="net47" />
<package id="DotNetZip" version="1.15.0" targetFramework="net47" />
<package id="Google.Protobuf" version="3.14.0" targetFramework="net47" />
<package id="Ionic.Zip" version="1.9.1.8" targetFramework="net47" />
<package id="jQuery" version="1.4.4" targetFramework="net47" />
<package id="jQuery.Validation" version="1.19.3" targetFramework="net47" />
<package id="K4os.Compression.LZ4" version="1.2.6" targetFramework="net47" />
@@ -17,7 +18,7 @@
<package id="Microsoft.CodeAnalysis.CSharp" version="3.9.0" targetFramework="net47" />
<package id="Microsoft.CodeAnalysis.CSharp.Scripting" version="3.9.0" targetFramework="net47" />
<package id="Microsoft.CodeAnalysis.Scripting.Common" version="3.9.0" targetFramework="net47" />
<package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="2.0.0" targetFramework="net47" />
<package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="3.6.0" targetFramework="net47" />
<package id="Microsoft.CSharp" version="4.3.0" targetFramework="net47" />
<package id="Microsoft.CST.DevSkim" version="0.4.253" targetFramework="net47" />
<package id="Microsoft.CST.OAT" version="1.0.88" targetFramework="net47" />