From 35187e3e4e3ed8aae16c352483c484ff6e9549d3 Mon Sep 17 00:00:00 2001 From: Andreas Luxbauer Date: Wed, 22 May 2024 16:15:33 +0200 Subject: [PATCH 1/3] TOBB Mail, ADMIN Berechtigung --- MailSender/MAILSender.vb | 6 +++--- UID/My Project/AssemblyInfo.vb | 4 ++-- UID/Programme/frmBerechtigungsObjekte.vb | 14 +++++++------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/MailSender/MAILSender.vb b/MailSender/MAILSender.vb index 2bd1f37..e81b5ef 100644 --- a/MailSender/MAILSender.vb +++ b/MailSender/MAILSender.vb @@ -328,9 +328,9 @@ Module Mail Dim bool_sent = False Select Case FirmaTmp ' Case "VERAG/ATILLA" : bool_sent = VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail("al@verag.ag", "TOBB " & FirmaTmp & addbetreff, "*Automatic generated e-mail*",,,, "", "al@verag.ag", _list) - Case "VERAG/ATILLA" : bool_sent = VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail("eysan.sans@tobbund.com.tr;kerem.gozutok@tobbund.com.tr;amine.akan@tobbund.com.tr", "TOBB " & FirmaTmp & addbetreff, "*Automatic generated e-mail*",,,, "atilla@verag.ag", "al@verag.ag", _list) - Case "IMEX" : bool_sent = VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail("eysan.sans@tobbund.com.tr;kerem.gozutok@tobbund.com.tr;amine.akan@tobbund.com.tr", "TOBB " & FirmaTmp & addbetreff, "*Automatic generated e-mail*",,,, "info@imex-group.at;Mario.Hoefer@imex-group.at", "al@verag.ag", _list) - Case "UNISPED" : bool_sent = VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail("eysan.sans@tobbund.com.tr;kerem.gozutok@tobbund.com.tr;amine.akan@tobbund.com.tr", "TOBB " & FirmaTmp & addbetreff, "*Automatic generated e-mail*",,,, "Katharina.Haas@unisped.at;Sabine.Muehlboeck@unisped.at;Ernst.Stolzlechner@unisped.at", "al@verag.ag", _list) + Case "VERAG/ATILLA" : bool_sent = VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail("eysan.sans@tobbund.com.tr;kerem.gozutok@tobbund.com.tr;arda.bicakli@tobbund.com.tr;mert.koseoglu@tobbund.com.tr", "TOBB " & FirmaTmp & addbetreff, "*Automatic generated e-mail*",,,, "atilla@verag.ag", "al@verag.ag", _list) + Case "IMEX" : bool_sent = VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail("eysan.sans@tobbund.com.tr;kerem.gozutok@tobbund.com.tr;arda.bicakli@tobbund.com.tr;mert.koseoglu@tobbund.com.tr", "TOBB " & FirmaTmp & addbetreff, "*Automatic generated e-mail*",,,, "info@imex-group.at;Mario.Hoefer@imex-group.at", "al@verag.ag", _list) + Case "UNISPED" : bool_sent = VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail("eysan.sans@tobbund.com.tr;kerem.gozutok@tobbund.com.tr;arda.bicakli@tobbund.com.tr;mert.koseoglu@tobbund.com.tr", "TOBB " & FirmaTmp & addbetreff, "*Automatic generated e-mail*",,,, "Katharina.Haas@unisped.at;Sabine.Muehlboeck@unisped.at;Ernst.Stolzlechner@unisped.at", "al@verag.ag", _list) End Select If bool_sent Then diff --git a/UID/My Project/AssemblyInfo.vb b/UID/My Project/AssemblyInfo.vb index 19e90c9..c0bf175 100644 --- a/UID/My Project/AssemblyInfo.vb +++ b/UID/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/UID/Programme/frmBerechtigungsObjekte.vb b/UID/Programme/frmBerechtigungsObjekte.vb index 4d0604a..be48808 100644 --- a/UID/Programme/frmBerechtigungsObjekte.vb +++ b/UID/Programme/frmBerechtigungsObjekte.vb @@ -62,13 +62,13 @@ cboFirma.Items.Clear() cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", "")) - cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG", "VERAG")) - cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("IMEX", "IMEX")) - cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ATILLA", "ATILLA")) - cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("UNISPED", "UNISPED")) - cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("AMBAR", "AMBAR")) - cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("FRONTOFFICE", "FRONTOFFICE")) - cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERIMEX", "VERIMEX")) + cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG", "1")) + cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("IMEX", "20")) + cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ATILLA", "7")) + cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("UNISPED", "21")) + cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("AMBAR", "24")) + cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("FRONTOFFICE", "17")) + cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERIMEX", "25")) cboAbteilung.Items.Clear() cboAbteilung.fillWithSQL("SELECT [abt_id],[abt_bezeichnung] FROM tblAbteilungen", False, "ADMIN", True) From d1c19098c980ccd4bd6b45bc392f631a121f7bd5 Mon Sep 17 00:00:00 2001 From: Andreas Luxbauer Date: Tue, 28 May 2024 19:57:47 +0200 Subject: [PATCH 2/3] TC --- TELOTEK_Worker_lib/cTC_Functions.vb | 9 ++++++++- TELOTEK_Worker_lib/cTelokec.vb | 18 ++++++++++++++++-- initATLASAufschubkonten/frmStartOptions.vb | 8 ++++++++ 3 files changed, 32 insertions(+), 3 deletions(-) diff --git a/TELOTEK_Worker_lib/cTC_Functions.vb b/TELOTEK_Worker_lib/cTC_Functions.vb index 62ba82a..791e773 100644 --- a/TELOTEK_Worker_lib/cTC_Functions.vb +++ b/TELOTEK_Worker_lib/cTC_Functions.vb @@ -13,7 +13,14 @@ Public Class cTC_Functions If Not IO.File.Exists(file) Then Return False Dim fi As New System.IO.FileInfo(file) - Dim UPLOAD_PFAD = TELOTEC_Worker.cTC_Paramter.GET_PARAM_ByName("TELOTEC_PFAD_SEND", VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM) + + Dim UPLOAD_PFAD = "" + Select Case FRIMA_DY + Case "IMEX" + UPLOAD_PFAD = TELOTEC_Worker.cTC_Paramter.GET_PARAM_ByName("TELOTEC_PFAD_SEND", VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM) + Case Else + UPLOAD_PFAD = TELOTEC_Worker.cTC_Paramter.GET_PARAM_ByName("TELOTEC_PFAD_SEND_VERAG", VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM) + End Select Dim destFilenameTMP = UPLOAD_PFAD + "." & If(IO.File.Exists(UPLOAD_PFAD & "." & fi.Name), Now.ToString("yyMMdd_HHmmss.fff_"), "") & fi.Name diff --git a/TELOTEK_Worker_lib/cTelokec.vb b/TELOTEK_Worker_lib/cTelokec.vb index e0f8823..c19bbbe 100644 --- a/TELOTEK_Worker_lib/cTelokec.vb +++ b/TELOTEK_Worker_lib/cTelokec.vb @@ -178,9 +178,17 @@ Public Class cTelotec_Anmeldung Me.telanm_Status_KEWILL_Equivalent = "00" Me.telanm_Erstellung = Now Me.telanm_Erstellung_SB = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID - Me.telanm_LetzteBearbeitung=now + Me.telanm_LetzteBearbeitung=Now Me.telanm_LetzteBearbeitung_SB = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID - Me.[Mandant_ID] = "IMEX" + Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA + Case "IMEX" + Me.[Mandant_ID] = "IMEX" + Case "ATILLA" + Me.[Mandant_ID] = "Atilla" + Case Else + Me.[Mandant_ID] = "VER" + End Select + Me.[Bereich_ID] = 0 Me.[Referenz_ID] = 0 '"TC_IMP_" & Now.ToShortDateString("ddMMyyyy_HHmmssfff ") Me.[ComIndicator] = 1 @@ -1207,6 +1215,12 @@ Public Class cTelotec_Anmeldung 'jetzt die Standartofferten einfügen For Each p In POSITIONSDATEN p.telpos_telanmId = telanm_id + p.Mandant_ID = Mandant_ID + p.Bereich_ID = Bereich_ID + p.Referenz_ID = Referenz_ID + p.ComIndicator = ComIndicator + ' POS.Pos_ID = cnt + If p.INSERT() Then p.INSERT_Packstücke(p.telpos_id, Me.telanm_id) p.INSERT_Abgaben(p.telpos_id, Me.telanm_id) diff --git a/initATLASAufschubkonten/frmStartOptions.vb b/initATLASAufschubkonten/frmStartOptions.vb index cce3971..1907155 100644 --- a/initATLASAufschubkonten/frmStartOptions.vb +++ b/initATLASAufschubkonten/frmStartOptions.vb @@ -523,6 +523,14 @@ Public Class frmStartOptions Dim f As New frmInfo(PARAM) f.Show() VERAG_PROG_ALLGEMEIN.cSyska_Interface.genDatensatz_Buchungen(24,, "", True) + closeMe() + '------------------------------ + Case "AAS" 'Aviso Alert System + VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False + Dim f As New frmInfo(PARAM) + f.Show() + doAASVermerke_Schwelle() + closeMe() '------------------------------ Case Else From b07e78dd122d6c3f42acf6adad6321625e8d262a Mon Sep 17 00:00:00 2001 From: Andreas Luxbauer Date: Wed, 29 May 2024 09:04:20 +0200 Subject: [PATCH 3/3] vers --- VERAGMonitoring/My Project/AssemblyInfo.vb | 4 +-- VERAGMonitoring/frmMain.vb | 36 ++++++++++++++++++++++ 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/VERAGMonitoring/My Project/AssemblyInfo.vb b/VERAGMonitoring/My Project/AssemblyInfo.vb index e5e084c..bc56376 100644 --- a/VERAGMonitoring/My Project/AssemblyInfo.vb +++ b/VERAGMonitoring/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/VERAGMonitoring/frmMain.vb b/VERAGMonitoring/frmMain.vb index 162f156..f1c49bd 100644 --- a/VERAGMonitoring/frmMain.vb +++ b/VERAGMonitoring/frmMain.vb @@ -250,6 +250,42 @@ Public Class frmMain allowCBX(cbxAufschubEUST_de_UnispedDE, False) allowCBX(cbxAufschub_de_UnispedDE, False) + + + + '-------------------------------------------------- + + If Me.firma.Contains("ATILLA") Or Me.firma.Contains("ALL") Then + + allowCBX(cbxBrg_at_Imex, True) + allowCBX(cbxBrg_at_VeragAG, True) + allowCBX(cbxBrg_de2_VeragAG, True) + allowCBX(cbxBrg_at_VeragAG, True) + allowCBX(cbxBrg_de2_VeragAG, True) + allowCBX(cbxBrg_at_Atilla, True) + End If + If Me.firma.Contains("IMEX") Or Me.firma.Contains("ALL") Then + + + allowCBX(cbxBrg_at_VeragAG, True) + allowCBX(cbxBrg_de2_VeragAG, True) + allowCBX(cbxBrg_at_VeragAG, True) + allowCBX(cbxBrg_de2_VeragAG, True) + allowCBX(cbxAufschub_de_Imex, True) + allowCBX(cbxBrg_at_Imex, True) + allowCBX(cbxAufschubEUST_de_Imex, True) + allowCBX(cbxAufschubEUST_de_Global, True) + allowCBX(cbxAufschub_at_IMEX, True) + End If + If Me.firma.Contains("UNISPED") Or Me.firma.Contains("ALL") Then + + allowCBX(cbxAufschubEUST_de_Unisped, True) + allowCBX(cbxAufschub_de_Unisped, True) + allowCBX(cbxBrg_at_UNISPED, True) + allowCBX(cbxBrg_at_VERAG_CS, True) + allowCBX(cbxAufschubEUST_de_UnispedDE, True) + allowCBX(cbxAufschub_de_UnispedDE, True) + End If End Select End If