diff --git a/SDL.sln b/SDL.sln index 5f4524a9..be591be3 100644 --- a/SDL.sln +++ b/SDL.sln @@ -17,12 +17,12 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "VERAG_PROG_ALLGEMEIN", "VER EndProject Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Gemeinsames", "..\..\AVISO\Aviso\Gemeinsames\Gemeinsames.vbproj", "{110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}" EndProject -Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "TELOTEC_Worker_lib", "..\..\ADMIN\ADMIN\TELOTEK_Worker_lib\TELOTEC_Worker_lib.vbproj", "{5B947A66-009A-4BB6-B925-F84A01045095}" -EndProject Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Parkzeit", "..\..\Parkzeit\Parkzeit\Parkzeit\Parkzeit.vbproj", "{E4190547-B222-4AE3-A0BE-A44EAEE70335}" EndProject Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "MDM_Worker_lib", "..\..\ADMIN\ADMIN\MDM_Worker\MDM_Worker_lib.vbproj", "{2E4DBC09-E57B-4AC5-8554-6117D71F993B}" EndProject +Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "TELOTEC_Worker_lib", "..\..\ADMIN\ADMIN\TELOTEK_Worker_lib\TELOTEC_Worker_lib.vbproj", "{5B947A66-009A-4BB6-B925-F84A01045095}" +EndProject Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "DAKOSY_Worker_lib", "..\..\ADMIN\ADMIN\DAKOSY_Worker\DAKOSY_Worker_lib.vbproj", "{50E8E49B-4FD9-4DD4-B159-BDC2B7D0E94F}" EndProject Global @@ -105,18 +105,6 @@ Global {110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Release|Mixed Platforms.Build.0 = Release|x86 {110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Release|x86.ActiveCfg = Release|x86 {110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Release|x86.Build.0 = Release|x86 - {5B947A66-009A-4BB6-B925-F84A01045095}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5B947A66-009A-4BB6-B925-F84A01045095}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5B947A66-009A-4BB6-B925-F84A01045095}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {5B947A66-009A-4BB6-B925-F84A01045095}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {5B947A66-009A-4BB6-B925-F84A01045095}.Debug|x86.ActiveCfg = Debug|Any CPU - {5B947A66-009A-4BB6-B925-F84A01045095}.Debug|x86.Build.0 = Debug|Any CPU - {5B947A66-009A-4BB6-B925-F84A01045095}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5B947A66-009A-4BB6-B925-F84A01045095}.Release|Any CPU.Build.0 = Release|Any CPU - {5B947A66-009A-4BB6-B925-F84A01045095}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {5B947A66-009A-4BB6-B925-F84A01045095}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {5B947A66-009A-4BB6-B925-F84A01045095}.Release|x86.ActiveCfg = Release|Any CPU - {5B947A66-009A-4BB6-B925-F84A01045095}.Release|x86.Build.0 = Release|Any CPU {E4190547-B222-4AE3-A0BE-A44EAEE70335}.Debug|Any CPU.ActiveCfg = Debug|x86 {E4190547-B222-4AE3-A0BE-A44EAEE70335}.Debug|Mixed Platforms.ActiveCfg = Debug|x64 {E4190547-B222-4AE3-A0BE-A44EAEE70335}.Debug|x86.ActiveCfg = Debug|x86 @@ -138,6 +126,18 @@ Global {2E4DBC09-E57B-4AC5-8554-6117D71F993B}.Release|Mixed Platforms.Build.0 = Release|Any CPU {2E4DBC09-E57B-4AC5-8554-6117D71F993B}.Release|x86.ActiveCfg = Release|Any CPU {2E4DBC09-E57B-4AC5-8554-6117D71F993B}.Release|x86.Build.0 = Release|Any CPU + {5B947A66-009A-4BB6-B925-F84A01045095}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5B947A66-009A-4BB6-B925-F84A01045095}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5B947A66-009A-4BB6-B925-F84A01045095}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {5B947A66-009A-4BB6-B925-F84A01045095}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {5B947A66-009A-4BB6-B925-F84A01045095}.Debug|x86.ActiveCfg = Debug|Any CPU + {5B947A66-009A-4BB6-B925-F84A01045095}.Debug|x86.Build.0 = Debug|Any CPU + {5B947A66-009A-4BB6-B925-F84A01045095}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5B947A66-009A-4BB6-B925-F84A01045095}.Release|Any CPU.Build.0 = Release|Any CPU + {5B947A66-009A-4BB6-B925-F84A01045095}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {5B947A66-009A-4BB6-B925-F84A01045095}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {5B947A66-009A-4BB6-B925-F84A01045095}.Release|x86.ActiveCfg = Release|Any CPU + {5B947A66-009A-4BB6-B925-F84A01045095}.Release|x86.Build.0 = Release|Any CPU {50E8E49B-4FD9-4DD4-B159-BDC2B7D0E94F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {50E8E49B-4FD9-4DD4-B159-BDC2B7D0E94F}.Debug|Any CPU.Build.0 = Debug|Any CPU {50E8E49B-4FD9-4DD4-B159-BDC2B7D0E94F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU diff --git a/SDL/My Project/Resources.Designer.vb b/SDL/My Project/Resources.Designer.vb index 884cbcb7..33f563d4 100644 --- a/SDL/My Project/Resources.Designer.vb +++ b/SDL/My Project/Resources.Designer.vb @@ -618,6 +618,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property email_big_gray() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("email_big_gray", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' diff --git a/SDL/My Project/Resources.resx b/SDL/My Project/Resources.resx index cb738bcb..a0f69aa3 100644 --- a/SDL/My Project/Resources.resx +++ b/SDL/My Project/Resources.resx @@ -157,6 +157,9 @@ ..\..\..\data\reloadFinance.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\pdf1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\mse.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -166,11 +169,17 @@ ..\Resources\liste-logo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\fax.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\axxes.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\email_big.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\RG_ZF.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\Resources\Plakette1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\WAI.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -184,18 +193,12 @@ ..\Resources\statistik2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Logo_blue_globe_Horizontal.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\IMEX-LOGO-AEO_sig.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\sicherheit1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\stift1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\mic-logo - short.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -226,9 +229,6 @@ ..\Resources\android-add-contact.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\zoll.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\exit.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -262,6 +262,9 @@ ..\Resources\pfeil_oben.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Route5.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\warenkorb1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -277,6 +280,9 @@ ..\Resources\person_default.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Einheitspapier-0735_Position.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\entwurf.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -286,8 +292,8 @@ ..\Resources\email11.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\abc_obu.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Einheitspapier-0735_top.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\flagge_tr.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -319,17 +325,17 @@ ..\Resources\Atilla_big1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\list_new_small2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\Einheitspapier-0777_kurz.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\lorry_motion.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Route1_IR.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\picboxRotateLeft_Enter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\zoll.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\uhr_green.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -352,6 +358,9 @@ ..\Resources\sgs.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Route1_IR.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\passpic.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -409,15 +418,15 @@ ..\Resources\Excel_2013_logo-155x110.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\compose.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\picboxNext_Enter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\handy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\android-friends.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\plose_big.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -427,15 +436,9 @@ ..\Resources\cards1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\picboxRotateRight_Enter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\spedbuch1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\toll-collect.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\flagge_D.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -451,8 +454,8 @@ ..\Resources\checklist.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Verag-AG-Logo21.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\uta.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\data.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -460,9 +463,15 @@ ..\Resources\ambar_simple.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Einheitspapier-0735_bottom.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\unisped_aeo_ZS_AT.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\house1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\ok_gray.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -490,6 +499,9 @@ ..\Resources\belegEUR1.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\..\..\data\awor.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\asfinag.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -517,6 +529,9 @@ ..\Resources\sms.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\..\..\..\AVISO\Aviso\Diverses\Verag_Customs_Service_AEO.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Route4.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -532,8 +547,8 @@ ..\Resources\person.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\kasse.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\IMEX-LOGO_simple.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\aktiveVeredelung1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -574,8 +589,8 @@ ..\Resources\transp.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\uta.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\android-friends.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\LKW1.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -628,8 +643,8 @@ ..\Resources\Atilla _sig.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\vorauszahlung.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\stift1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\open.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -652,17 +667,14 @@ ..\Resources\passpic_sw.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\today.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\Verag-Customs-Service-GMBH-Logo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\Route3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\compose.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Logo_blue_globe_Horizontal.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\transfer.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -673,8 +685,8 @@ ..\Resources\axxes.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Route5.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\toll-collect.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\FA_Graz_EV-Veranlagung_Muster.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -682,8 +694,8 @@ ..\Resources\seal.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\picboxRotateLeft_Enter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\abc_obu.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\vorauszahlung1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -694,8 +706,8 @@ ..\Resources\Aviso1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\fax.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\picboxRotateRight_Enter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\aeo_DE.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -703,17 +715,14 @@ ..\Resources\SR_EVOLOG.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\Resources\SR_TransFerry360.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\Resources\aeo.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Einheitspapier-0735_bottom.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\SR_TransFerry360.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\Resources\Einheitspapier-0735_top.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\today.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\android-note12.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -730,14 +739,14 @@ ..\Resources\Unisped_ZS_logo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Einheitspapier-0735_Position.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\email_big.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\beleg_rot1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\pdf1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\list_new_small2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\pfeil_rechts.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -748,8 +757,8 @@ ..\Resources\email_big1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\..\..\..\AVISO\Aviso\Diverses\Verag_Customs_Service_AEO.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\vorauszahlung.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\sicherheit1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -787,8 +796,8 @@ ..\Resources\report.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\RG_ZF.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\Resources\kasse.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\moneybag1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -796,9 +805,6 @@ ..\..\..\data\mahn.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\IMEX-LOGO_simple.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\VERAG-UNISPED-Logo.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -811,14 +817,11 @@ ..\Resources\picboxZoomOut_Enter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\del1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\scanner1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\house1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\del1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\rechnung.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -829,8 +832,8 @@ ..\Resources\checklist.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Plakette1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Verag-AG-Logo21.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\..\..\..\AVISO\Aviso\Diverses\sms_s.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -838,7 +841,7 @@ ..\Resources\flagge_A.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\..\..\data\awor.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\email_big_gray.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/SDL/Resources/email_big_gray.jpg b/SDL/Resources/email_big_gray.jpg new file mode 100644 index 00000000..bb359298 Binary files /dev/null and b/SDL/Resources/email_big_gray.jpg differ diff --git a/SDL/SDL.vbproj b/SDL/SDL.vbproj index 07bf24e8..2a991372 100644 --- a/SDL/SDL.vbproj +++ b/SDL/SDL.vbproj @@ -106,6 +106,10 @@ ..\..\..\AVISO\Aviso\packages\ExcelNumberFormat.1.0.10\lib\net20\ExcelNumberFormat.dll + + False + ..\..\..\Aviso\AVISO\Gemeinsames\bin\x64\Debug\Gemeinsames.dll + False ..\..\..\dll\Ghostscript.NET.dll @@ -570,6 +574,12 @@ Form + + frmKundenZOLLVollmachten.vb + + + Form + frmKundenZOLLVollmachtenUebersicht.vb @@ -588,6 +598,12 @@ UserControl + + usrCntlKundenZollVollmachten.vb + + + UserControl + frmBesuchsberichte.vb @@ -1622,12 +1638,6 @@ Form - - frmKundenZOLLVollmachten.vb - - - Form - frmKundenSucheUebersicht.vb @@ -2786,6 +2796,9 @@ frmKundenUIDEORI_List.vb + + frmKundenZOLLVollmachten.vb + frmKundenZOLLVollmachtenUebersicht.vb @@ -2795,6 +2808,9 @@ usrCntlKundenBesonderheiten.vb + + usrCntlKundenZollVollmachten.vb + frmBesuchsberichte.vb @@ -3303,9 +3319,6 @@ frmKundenZOLLOffertenSperre.vb - - frmKundenZOLLVollmachten.vb - frmKundenSucheUebersicht.vb @@ -4236,6 +4249,7 @@ + @@ -4531,11 +4545,6 @@ {5b947a66-009a-4bb6-b925-f84a01045095} TELOTEC_Worker_lib - - {110c923b-cb02-4fd0-af24-95e0f0eeeff5} - Gemeinsames - False - {e4190547-b222-4ae3-a0be-a44eaee70335} Parkzeit diff --git a/SDL/kunden/frmKundenZOLLVollmachten.Designer.vb b/SDL/kunden/frmKundenZOLLVollmachten.Designer.vb index b12a83bc..837459ba 100644 --- a/SDL/kunden/frmKundenZOLLVollmachten.Designer.vb +++ b/SDL/kunden/frmKundenZOLLVollmachten.Designer.vb @@ -25,6 +25,8 @@ Partial Class frmKundenZOLLVollmachten Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmKundenZOLLVollmachten)) Me.pnl = New System.Windows.Forms.Panel() + Me.btnUploadPDF = New System.Windows.Forms.Button() + Me.lblPDFavailable = New System.Windows.Forms.Label() Me.btnNeu = New System.Windows.Forms.Button() Me.dgvVollmachtenEmbedded = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.MyComboBox1 = New VERAG_PROG_ALLGEMEIN.MyComboBox() @@ -33,31 +35,33 @@ Partial Class frmKundenZOLLVollmachten Me.cbxErhaltenAm = New System.Windows.Forms.CheckBox() Me.lbl = New System.Windows.Forms.Label() Me.pnlDetails = New VERAG_PROG_ALLGEMEIN.MyPanel(Me.components) + Me.lblWarning = New System.Windows.Forms.Label() Me.lblGueltigVon = New System.Windows.Forms.Label() Me.cbxVMarchivieren = New System.Windows.Forms.CheckBox() Me.Label3 = New System.Windows.Forms.Label() Me.txtVermerk = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Panel1 = New System.Windows.Forms.Panel() - Me.picPDF = New System.Windows.Forms.PictureBox() - Me.btnUploadPDF = New System.Windows.Forms.Button() + Me.picDeleteEmail = New System.Windows.Forms.PictureBox() + Me.picEmail = New System.Windows.Forms.PictureBox() Me.picDeletePDF = New System.Windows.Forms.PictureBox() - Me.lblPDFavailable = New System.Windows.Forms.Label() + Me.picPDF = New System.Windows.Forms.PictureBox() Me.lblGueltigBis = New System.Windows.Forms.Label() Me.txtGueltigVon = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.txtGueltigBis = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.cbxArchiviert = New System.Windows.Forms.CheckBox() - Me.btnSave = New System.Windows.Forms.Button() Me.btnOK = New System.Windows.Forms.Button() + Me.btnSave = New System.Windows.Forms.Button() Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem() Me.LöschenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.lblWarning = New System.Windows.Forms.Label() Me.pnl.SuspendLayout() CType(Me.dgvVollmachtenEmbedded, System.ComponentModel.ISupportInitialize).BeginInit() Me.pnlDetails.SuspendLayout() Me.Panel1.SuspendLayout() - CType(Me.picPDF, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.picDeleteEmail, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.picEmail, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.picDeletePDF, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.picPDF, System.ComponentModel.ISupportInitialize).BeginInit() Me.ContextMenuStrip1.SuspendLayout() Me.SuspendLayout() ' @@ -65,6 +69,8 @@ Partial Class frmKundenZOLLVollmachten ' Me.pnl.BackColor = System.Drawing.Color.White Me.pnl.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.pnl.Controls.Add(Me.btnUploadPDF) + Me.pnl.Controls.Add(Me.lblPDFavailable) Me.pnl.Controls.Add(Me.btnNeu) Me.pnl.Controls.Add(Me.dgvVollmachtenEmbedded) Me.pnl.Controls.Add(Me.MyComboBox1) @@ -76,9 +82,30 @@ Partial Class frmKundenZOLLVollmachten Me.pnl.Dock = System.Windows.Forms.DockStyle.Fill Me.pnl.Location = New System.Drawing.Point(0, 0) Me.pnl.Name = "pnl" - Me.pnl.Size = New System.Drawing.Size(499, 383) + Me.pnl.Size = New System.Drawing.Size(513, 383) Me.pnl.TabIndex = 1 ' + 'btnUploadPDF + ' + Me.btnUploadPDF.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnUploadPDF.Location = New System.Drawing.Point(155, 179) + Me.btnUploadPDF.Name = "btnUploadPDF" + Me.btnUploadPDF.Size = New System.Drawing.Size(134, 25) + Me.btnUploadPDF.TabIndex = 12 + Me.btnUploadPDF.Text = "PDF hochladen" + Me.btnUploadPDF.UseVisualStyleBackColor = True + Me.btnUploadPDF.Visible = False + ' + 'lblPDFavailable + ' + Me.lblPDFavailable.Location = New System.Drawing.Point(297, 182) + Me.lblPDFavailable.Name = "lblPDFavailable" + Me.lblPDFavailable.Size = New System.Drawing.Size(140, 13) + Me.lblPDFavailable.TabIndex = 13 + Me.lblPDFavailable.Text = "Kein PDF vorhanden." + Me.lblPDFavailable.TextAlign = System.Drawing.ContentAlignment.TopRight + Me.lblPDFavailable.Visible = False + ' 'btnNeu ' Me.btnNeu.Image = Global.SDL.My.Resources.Resources.plus @@ -116,7 +143,7 @@ Partial Class frmKundenZOLLVollmachten Me.MyComboBox1.FormattingEnabled = True Me.MyComboBox1.Location = New System.Drawing.Point(98, 6) Me.MyComboBox1.Name = "MyComboBox1" - Me.MyComboBox1.Size = New System.Drawing.Size(127, 21) + Me.MyComboBox1.Size = New System.Drawing.Size(243, 21) Me.MyComboBox1.TabIndex = 15 Me.MyComboBox1.Visible = False ' @@ -127,7 +154,7 @@ Partial Class frmKundenZOLLVollmachten Me.Button1.DialogResult = System.Windows.Forms.DialogResult.Cancel Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button1.ForeColor = System.Drawing.Color.White - Me.Button1.Location = New System.Drawing.Point(455, 0) + Me.Button1.Location = New System.Drawing.Point(469, 0) Me.Button1.Name = "Button1" Me.Button1.Size = New System.Drawing.Size(42, 23) Me.Button1.TabIndex = 9 @@ -186,6 +213,17 @@ Partial Class frmKundenZOLLVollmachten Me.pnlDetails.Size = New System.Drawing.Size(492, 159) Me.pnlDetails.TabIndex = 28 ' + 'lblWarning + ' + Me.lblWarning.AutoSize = True + Me.lblWarning.ForeColor = System.Drawing.Color.Red + Me.lblWarning.Location = New System.Drawing.Point(118, 30) + Me.lblWarning.Name = "lblWarning" + Me.lblWarning.Size = New System.Drawing.Size(105, 13) + Me.lblWarning.TabIndex = 30 + Me.lblWarning.Text = "Gültig von eintragen!" + Me.lblWarning.Visible = False + ' 'lblGueltigVon ' Me.lblGueltigVon.AutoSize = True @@ -242,41 +280,41 @@ Partial Class frmKundenZOLLVollmachten ' 'Panel1 ' - Me.Panel1.Controls.Add(Me.picPDF) - Me.Panel1.Controls.Add(Me.btnUploadPDF) + Me.Panel1.Controls.Add(Me.picDeleteEmail) + Me.Panel1.Controls.Add(Me.picEmail) Me.Panel1.Controls.Add(Me.picDeletePDF) - Me.Panel1.Controls.Add(Me.lblPDFavailable) - Me.Panel1.Location = New System.Drawing.Point(254, 42) + Me.Panel1.Controls.Add(Me.picPDF) + Me.Panel1.Location = New System.Drawing.Point(356, 45) Me.Panel1.Name = "Panel1" - Me.Panel1.Size = New System.Drawing.Size(233, 70) + Me.Panel1.Size = New System.Drawing.Size(130, 74) Me.Panel1.TabIndex = 17 Me.Panel1.Visible = False ' - 'picPDF + 'picDeleteEmail ' - Me.picPDF.Image = Global.SDL.My.Resources.Resources.pdf_gray - Me.picPDF.Location = New System.Drawing.Point(178, 10) - Me.picPDF.Name = "picPDF" - Me.picPDF.Size = New System.Drawing.Size(44, 48) - Me.picPDF.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom - Me.picPDF.TabIndex = 17 - Me.picPDF.TabStop = False - Me.picPDF.Visible = False + Me.picDeleteEmail.Image = Global.SDL.My.Resources.Resources.del + Me.picDeleteEmail.Location = New System.Drawing.Point(27, 0) + Me.picDeleteEmail.Name = "picDeleteEmail" + Me.picDeleteEmail.Size = New System.Drawing.Size(20, 20) + Me.picDeleteEmail.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom + Me.picDeleteEmail.TabIndex = 19 + Me.picDeleteEmail.TabStop = False + Me.picDeleteEmail.Visible = False ' - 'btnUploadPDF + 'picEmail ' - Me.btnUploadPDF.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnUploadPDF.Location = New System.Drawing.Point(11, 10) - Me.btnUploadPDF.Name = "btnUploadPDF" - Me.btnUploadPDF.Size = New System.Drawing.Size(134, 25) - Me.btnUploadPDF.TabIndex = 12 - Me.btnUploadPDF.Text = "PDF hochladen" - Me.btnUploadPDF.UseVisualStyleBackColor = True + Me.picEmail.Image = Global.SDL.My.Resources.Resources.email_big_gray + Me.picEmail.Location = New System.Drawing.Point(13, 23) + Me.picEmail.Name = "picEmail" + Me.picEmail.Size = New System.Drawing.Size(44, 48) + Me.picEmail.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom + Me.picEmail.TabIndex = 18 + Me.picEmail.TabStop = False ' 'picDeletePDF ' Me.picDeletePDF.Image = Global.SDL.My.Resources.Resources.del - Me.picDeletePDF.Location = New System.Drawing.Point(11, 38) + Me.picDeletePDF.Location = New System.Drawing.Point(90, 1) Me.picDeletePDF.Name = "picDeletePDF" Me.picDeletePDF.Size = New System.Drawing.Size(20, 20) Me.picDeletePDF.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom @@ -284,14 +322,16 @@ Partial Class frmKundenZOLLVollmachten Me.picDeletePDF.TabStop = False Me.picDeletePDF.Visible = False ' - 'lblPDFavailable + 'picPDF ' - Me.lblPDFavailable.Location = New System.Drawing.Point(5, 38) - Me.lblPDFavailable.Name = "lblPDFavailable" - Me.lblPDFavailable.Size = New System.Drawing.Size(140, 13) - Me.lblPDFavailable.TabIndex = 13 - Me.lblPDFavailable.Text = "Kein PDF vorhanden." - Me.lblPDFavailable.TextAlign = System.Drawing.ContentAlignment.TopRight + Me.picPDF.Image = Global.SDL.My.Resources.Resources.pdf_gray + Me.picPDF.Location = New System.Drawing.Point(79, 23) + Me.picPDF.Name = "picPDF" + Me.picPDF.Size = New System.Drawing.Size(44, 48) + Me.picPDF.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom + Me.picPDF.TabIndex = 17 + Me.picPDF.TabStop = False + Me.picPDF.Visible = False ' 'lblGueltigBis ' @@ -364,17 +404,6 @@ Partial Class frmKundenZOLLVollmachten Me.cbxArchiviert.Text = "Archiviert" Me.cbxArchiviert.UseVisualStyleBackColor = True ' - 'btnSave - ' - Me.btnSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnSave.Location = New System.Drawing.Point(410, 125) - Me.btnSave.Name = "btnSave" - Me.btnSave.Size = New System.Drawing.Size(66, 24) - Me.btnSave.TabIndex = 29 - Me.btnSave.Text = "Speichern" - Me.btnSave.UseVisualStyleBackColor = True - Me.btnSave.Visible = False - ' 'btnOK ' Me.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK @@ -386,6 +415,17 @@ Partial Class frmKundenZOLLVollmachten Me.btnOK.Text = "OK" Me.btnOK.UseVisualStyleBackColor = True ' + 'btnSave + ' + Me.btnSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnSave.Location = New System.Drawing.Point(410, 125) + Me.btnSave.Name = "btnSave" + Me.btnSave.Size = New System.Drawing.Size(66, 24) + Me.btnSave.TabIndex = 29 + Me.btnSave.Text = "Speichern" + Me.btnSave.UseVisualStyleBackColor = True + Me.btnSave.Visible = False + ' 'ContextMenuStrip1 ' Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem1, Me.LöschenToolStripMenuItem}) @@ -407,22 +447,11 @@ Partial Class frmKundenZOLLVollmachten Me.LöschenToolStripMenuItem.Size = New System.Drawing.Size(118, 22) Me.LöschenToolStripMenuItem.Text = "Löschen" ' - 'lblWarning - ' - Me.lblWarning.AutoSize = True - Me.lblWarning.ForeColor = System.Drawing.Color.Red - Me.lblWarning.Location = New System.Drawing.Point(118, 30) - Me.lblWarning.Name = "lblWarning" - Me.lblWarning.Size = New System.Drawing.Size(105, 13) - Me.lblWarning.TabIndex = 30 - Me.lblWarning.Text = "Gültig von eintragen!" - Me.lblWarning.Visible = False - ' 'frmKundenZOLLVollmachten ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(499, 383) + Me.ClientSize = New System.Drawing.Size(513, 383) Me.Controls.Add(Me.pnl) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) @@ -435,8 +464,10 @@ Partial Class frmKundenZOLLVollmachten Me.pnlDetails.ResumeLayout(False) Me.pnlDetails.PerformLayout() Me.Panel1.ResumeLayout(False) - CType(Me.picPDF, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.picDeleteEmail, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.picEmail, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.picDeletePDF, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.picPDF, System.ComponentModel.ISupportInitialize).EndInit() Me.ContextMenuStrip1.ResumeLayout(False) Me.ResumeLayout(False) @@ -469,4 +500,6 @@ Partial Class frmKundenZOLLVollmachten Friend WithEvents lblGueltigVon As Label Friend WithEvents btnSave As Button Friend WithEvents lblWarning As Label + Friend WithEvents picDeleteEmail As PictureBox + Friend WithEvents picEmail As PictureBox End Class diff --git a/SDL/kunden/frmKundenZOLLVollmachten.vb b/SDL/kunden/frmKundenZOLLVollmachten.vb index 68c0fcf6..857d9a67 100644 --- a/SDL/kunden/frmKundenZOLLVollmachten.vb +++ b/SDL/kunden/frmKundenZOLLVollmachten.vb @@ -26,10 +26,10 @@ Public Class frmKundenZOLLVollmachten 'Dim cDATENSERVER As New VERAG_PROG_ALLGEMEIN.cDATENSERVER Dim ksql As New kundenSQL Dim vollmachtartId As Integer + Dim emailId As Integer Dim vermerk As String = "" Dim vmId As Integer = -1 - 'Dim currentVM As frmKundenZOLLVollmachten = Nothing - Dim currentVM2 As New VERAG_PROG_ALLGEMEIN.cKundenVollmachten + Dim currentVM As New VERAG_PROG_ALLGEMEIN.cKundenVollmachten Sub New(kdnr, vollmachtartId) Me.InitializeComponent() @@ -68,67 +68,14 @@ Public Class frmKundenZOLLVollmachten 'Me.Height = Me.Height - Panel1.Height End Select - If currentVM2.kdvm_datenarchivId > 0 Then - picDeletePDF.Visible = True - picPDF.Image = My.Resources.pdf - - lblPDFavailable.Text = "PDF vorhanden." - lblPDFavailable.Cursor = Cursors.Hand - End If End Sub - Private Sub btnUploadPDF_Click(sender As Object, e As EventArgs) Handles btnUploadPDF.Click - If Me.MyComboBox1._value < 0 Then Exit Sub - Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "VOLLMACHTEN", "VMID_" & vmId, "", "", MyComboBox1.Text, kdnr) - Dim path = DS.uploadDataToDATENSERVERFileDialog() ' cDATENSERVER.uploadDataToDATENSERVERFileDialog("DOKUMENTE", "VOLLMACHTEN", kdnr, MyComboBox1.Text) - If path <> "" Then - currentVM2.kdvm_datenarchivId = DS.da_id 'cDATENSERVER.getLAST_ID(path) - lblPDFavailable.Text = "PDF vorhanden." - lblPDFavailable.Cursor = Cursors.Hand - End If - picDeletePDF.Visible = True = (currentVM2.kdvm_datenarchivId > 0) - - saveVM(currentVM2) - - dgvVollmachtenEmbedded.GetOrder() - initDGVVollmachtenEmbedded(True) - dgvVollmachtenEmbedded.SetOrder() - - End Sub - - Private Sub picDeletePDF_Click(sender As Object, e As EventArgs) Handles picDeletePDF.Click - - lblPDFavailable.Cursor = Cursors.WaitCursor - 'If (currentVM.id > 0) Then 'cDATENSERVER.deleteFileByDatenarchivId(id) - If (currentVM2.kdvm_datenarchivId > 0) Then - If vbYes = MsgBox("Möchten Sie das PDF wirklich löschen?", vbYesNoCancel) Then - - 'Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER(currentVM.id) - Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER(currentVM2.kdvm_datenarchivId) - DS.DELETE_COMPLETE() - - 'If ksql.setVollmacht_DSId(kdnr, vmId, -1) Then - currentVM2.kdvm_datenarchivId = -1 - If currentVM2.SAVE Then - currentVM2.kdvm_datenarchivId = -1 : picDeletePDF.Visible = False - lblPDFavailable.Text = "Kein PDF vorhanden." - picPDF.Image = My.Resources.pdf_gray - End If - End If - End If - lblPDFavailable.Cursor = Cursors.Default - - dgvVollmachtenEmbedded.GetOrder() - initDGVVollmachtenEmbedded(True) - dgvVollmachtenEmbedded.SetOrder() - - End Sub Private Sub btnOK_Click(sender As Object, e As EventArgs) Handles btnOK.Click - 'test + End Sub Sub saveVM(VM As VERAG_PROG_ALLGEMEIN.cKundenVollmachten) @@ -172,9 +119,6 @@ Public Class frmKundenZOLLVollmachten dgvVollmachtenEmbedded.Enabled = True End If - If btnUploadPDF.Enabled = False Then - btnUploadPDF.Enabled = True - End If dgvVollmachtenEmbedded.GetOrder() initDGVVollmachtenEmbedded(True) @@ -183,9 +127,9 @@ Public Class frmKundenZOLLVollmachten End Sub Private Sub lblNoPDFavailable_Click(sender As Object, e As EventArgs) Handles lblPDFavailable.Click - If currentVM2.kdvm_datenarchivId > 0 Then + If currentVM.kdvm_datenarchivId > 0 Then ' cDATENSERVER.openDataTMPByDatenarchivId(id) - Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER(currentVM2.kdvm_datenarchivId) + Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER(currentVM.kdvm_datenarchivId) DS.OPEN_SINGLE() End If End Sub @@ -367,22 +311,9 @@ Public Class frmKundenZOLLVollmachten txtGueltigVon.Text = VM.kdvm_erhalten_Datum txtGueltigBis.Text = VM.kdvm_gueltig_bis - - If VM.kdvm_datenarchivId > 0 Then - picDeletePDF.Visible = True - picPDF.Visible = True - - picPDF.Image = My.Resources.pdf - lblPDFavailable.Text = "PDF vorhanden." - lblPDFavailable.Cursor = Cursors.Hand - Else - picDeletePDF.Visible = False - picPDF.Visible = True - lblPDFavailable.Text = "Kein PDF vorhanden." - picPDF.Image = My.Resources.pdf_gray - End If - - setOKButton() + checkEmailIsPresent() + checkPDFisPresent() + setOKButton() 'Listener für Änderungen im Detail-Panel For Each c As Control In pnlDetails.Controls @@ -394,26 +325,48 @@ Public Class frmKundenZOLLVollmachten Next End Sub + Private Sub SomethingChanged(sender As Object, e As EventArgs) setSaveButton() End Sub + Sub checkPDFisPresent() + If currentVM.kdvm_datenarchivId > 0 Then + picDeletePDF.Visible = True + picPDF.Visible = True + picPDF.Image = My.Resources.pdf + picPDF.Cursor = Cursors.Default + Else + picDeletePDF.Visible = False + picPDF.Visible = True + picPDF.Image = My.Resources.pdf_gray + picPDF.Cursor = Cursors.Hand + End If + End Sub - 'Private Sub dgvVollmachtenEmbedded_CellClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvVollmachtenEmbedded.CellClick - 'wird aktuell nicht mehr verwendet - ' currentVM = New frmKundenZOLLVollmachten(dgvVollmachtenEmbedded.SelectedRows(0).Cells("kdvm_KundenNr").Value, dgvVollmachtenEmbedded.SelectedRows(0).Cells("kdvma_Id").Value, dgvVollmachtenEmbedded.SelectedRows(0).Cells("kdvm_Id").Value, dgvVollmachtenEmbedded.SelectedRows(0).Cells("kdvm_erhalten").Value, dgvVollmachtenEmbedded.SelectedRows(0).Cells("kdvm_archiviert").Value, dgvVollmachtenEmbedded.SelectedRows(0).Cells("kdvm_erhalten_Datum").Value, dgvVollmachtenEmbedded.SelectedRows(0).Cells("kdvm_gueltig_bis").Value, dgvVollmachtenEmbedded.SelectedRows(0).Cells("kdvm_vermerk").Value, dgvVollmachtenEmbedded.SelectedRows(0).Cells("kdvm_datenarchivId").Value, dgvVollmachtenEmbedded.SelectedRows(0).Cells("kdvm_Id").Value) - ' loadChangedVMToPanel(True, currentVM) + Sub checkEmailIsPresent() + If currentVM.kdvm_emailId > 0 Then + picDeleteEmail.Visible = True + picEmail.Visible = True + picEmail.Image = My.Resources.email_big1 + picEmail.Cursor = Cursors.Default + Else + picDeleteEmail.Visible = False + picEmail.Visible = True + picEmail.Image = My.Resources.email_big_gray + picEmail.Cursor = Cursors.Hand + End If + End Sub - 'End Sub Private Sub dgvVollmachtenEmbedded_CellDoubleClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvVollmachtenEmbedded.CellDoubleClick - 'Öffnet das PDFs im DGV + If dgvVollmachtenEmbedded.Columns(e.ColumnIndex).Name = "clmnPDF" Then If dgvVollmachtenEmbedded.Rows(e.RowIndex).Cells("kdvm_datenarchivId").Value IsNot DBNull.Value AndAlso CInt(dgvVollmachtenEmbedded.Rows(e.RowIndex).Cells("kdvm_datenarchivId").Value) > 0 Then - ' cDATENSERVER.openDataTMPByDatenarchivId(dgvVollmachten.Rows(e.RowIndex).Cells("kdvm_datenarchivId").Value) + Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER(dgvVollmachtenEmbedded.Rows(e.RowIndex).Cells("kdvm_datenarchivId").Value) DS.OPEN_SINGLE(True) End If @@ -448,19 +401,20 @@ Public Class frmKundenZOLLVollmachten End If dgvVollmachtenEmbedded.Enabled = False - btnUploadPDF.Enabled = False - currentVM2 = New VERAG_PROG_ALLGEMEIN.cKundenVollmachten With { + currentVM = New VERAG_PROG_ALLGEMEIN.cKundenVollmachten With { .kdvm_KundenNr = kdnr, .kdvm_kdvmaId = vollmachtartId, .kdvm_Info = "", .kdvm_erhalten = False, .kdvm_archiviert = False, .kdvm_datenarchivId = -1, - .kdvm_erhalten_Datum = Now.ToShortDateString + .kdvm_erhalten_Datum = Now.ToShortDateString, + .kdvm_emailId = -1 } - loadChangedVMToPanel(True, currentVM2) + loadChangedVMToPanel(True, currentVM) + hideAttachementControl() setSaveButton() End Sub @@ -504,20 +458,18 @@ Public Class frmKundenZOLLVollmachten If dgvVollmachtenEmbedded.SelectedRows.Count > 0 Then Dim rowindex = dgvVollmachtenEmbedded.SelectedRows(0).Index - currentVM2 = New VERAG_PROG_ALLGEMEIN.cKundenVollmachten(dgvVollmachtenEmbedded.SelectedRows(0).Cells("kdvm_id").Value) + currentVM = New VERAG_PROG_ALLGEMEIN.cKundenVollmachten(dgvVollmachtenEmbedded.SelectedRows(0).Cells("kdvm_id").Value) - loadChangedVMToPanel(True, currentVM2) + loadChangedVMToPanel(True, currentVM) If dgvVollmachtenEmbedded.Enabled = False Then Exit Sub vmId = dgvVollmachtenEmbedded.SelectedRows(0).Cells("kdvm_id").Value - If btnUploadPDF.Enabled = False Then - btnUploadPDF.Enabled = True - End If + End If End Sub Private Sub btnSave_Click(sender As Object, e As EventArgs) Handles btnSave.Click - saveVM(currentVM2) + saveVM(currentVM) setOKButton() End Sub @@ -525,4 +477,123 @@ Public Class frmKundenZOLLVollmachten btnOK.Visible = True btnSave.Visible = False End Sub + + + Private Sub picPDF_Click(sender As Object, e As EventArgs) Handles picPDF.Click + + If Me.MyComboBox1._value < 0 Then Exit Sub + + Dim DS As Object + + If currentVM.kdvm_datenarchivId > 0 Then + DS = New VERAG_PROG_ALLGEMEIN.cDATENSERVER(currentVM.kdvm_datenarchivId) + DS.OPEN_SINGLE() + 'MsgBox("Open PDF") + Else + DS = New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "VOLLMACHTEN", "VMID_" & vmId, "", "", "PDF_" & MyComboBox1.Text, kdnr) + Dim path = DS.uploadDataToDATENSERVERFileDialog() + + If path <> "" Then + currentVM.kdvm_datenarchivId = DS.da_id + End If + + picDeletePDF.Visible = True = (currentVM.kdvm_datenarchivId > 0) + saveVM(currentVM) + End If + + dgvVollmachtenEmbedded.GetOrder() + initDGVVollmachtenEmbedded(True) + dgvVollmachtenEmbedded.SetOrder() + + End Sub + + Private Sub picDeletePDF_Click(sender As Object, e As EventArgs) Handles picDeletePDF.Click + + lblPDFavailable.Cursor = Cursors.WaitCursor + If (currentVM.kdvm_datenarchivId > 0) Then + If vbYes = MsgBox("Möchten Sie das PDF wirklich löschen?", vbYesNoCancel) Then + + Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER(currentVM.kdvm_datenarchivId) + DS.DELETE_COMPLETE() + + currentVM.kdvm_datenarchivId = -1 + If currentVM.SAVE Then + currentVM.kdvm_datenarchivId = -1 : picDeletePDF.Visible = False + picPDF.Image = My.Resources.pdf_gray + End If + End If + End If + lblPDFavailable.Cursor = Cursors.Default + + dgvVollmachtenEmbedded.GetOrder() + initDGVVollmachtenEmbedded(True) + dgvVollmachtenEmbedded.SetOrder() + + End Sub + + + Private Sub picEmail_Click(sender As Object, e As EventArgs) Handles picEmail.Click + If Me.MyComboBox1._value < 0 Then Exit Sub + + Dim DS As Object + + If currentVM.kdvm_emailId > 0 Then + + DS = New VERAG_PROG_ALLGEMEIN.cDATENSERVER(currentVM.kdvm_emailId) + DS.OPEN_SINGLE() + 'MsgBox("Open EMail") + + Else + + DS = New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "VOLLMACHTEN", "VMID_" & vmId, "", "", "Email_" & MyComboBox1.Text, kdnr) + Dim path = DS.uploadDataToDATENSERVERFileDialog() + + If path <> "" Then + currentVM.kdvm_emailId = DS.da_id + End If + + picDeleteEmail.Visible = True = (currentVM.kdvm_emailId > 0) + + saveVM(currentVM) + End If + + dgvVollmachtenEmbedded.GetOrder() + initDGVVollmachtenEmbedded(True) + dgvVollmachtenEmbedded.SetOrder() + End Sub + + Private Sub picDeleteEmail_Click(sender As Object, e As EventArgs) Handles picDeleteEmail.Click + + lblPDFavailable.Cursor = Cursors.WaitCursor + If (currentVM.kdvm_emailId > 0) Then + If vbYes = MsgBox("Möchten Sie die Email wirklich löschen?", vbYesNoCancel) Then + + Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER(currentVM.kdvm_emailId) + DS.DELETE_COMPLETE() + + currentVM.kdvm_emailId = -1 + If currentVM.SAVE Then + currentVM.kdvm_emailId = -1 : picDeleteEmail.Visible = False + + picEmail.Image = My.Resources.email_big_gray + + End If + End If + End If + lblPDFavailable.Cursor = Cursors.Default + + dgvVollmachtenEmbedded.GetOrder() + initDGVVollmachtenEmbedded(True) + dgvVollmachtenEmbedded.SetOrder() + + End Sub + + Sub hideAttachementControl() + + picDeletePDF.Visible = False + picPDF.Visible = False + picDeleteEmail.Visible = False + picEmail.Visible = False + End Sub + End Class \ No newline at end of file diff --git a/SDL/kunden/usrCntlKundenKontakte.vb b/SDL/kunden/usrCntlKundenKontakte.vb index 70c8883e..1dc4e86d 100644 --- a/SDL/kunden/usrCntlKundenKontakte.vb +++ b/SDL/kunden/usrCntlKundenKontakte.vb @@ -1,4 +1,5 @@ -Public Class usrCntlKundenKontakte + +Public Class usrCntlKundenKontakte 'Dim KD_KONTAKT As VERAG_PROG_ALLGEMEIN.cKundenKontakt = Nothing Public kdNr As Integer diff --git a/SDL/kunden/usrCntlKundenZOLLVollmachten.Designer.vb b/SDL/kunden/usrCntlKundenZOLLVollmachten.Designer.vb new file mode 100644 index 00000000..ea57aaa1 --- /dev/null +++ b/SDL/kunden/usrCntlKundenZOLLVollmachten.Designer.vb @@ -0,0 +1,240 @@ + +Partial Class usrCntlKundenZollVollmachten + Inherits System.Windows.Forms.UserControl + + 'UserControl überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. + + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Wird vom Windows Form-Designer benötigt. + Private components As System.ComponentModel.IContainer + + 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. + 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. + 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. + + Private Sub InitializeComponent() + Me.components = New System.ComponentModel.Container() + Me.lblWarning = New System.Windows.Forms.Label() + Me.Label3 = New System.Windows.Forms.Label() + Me.txtVermerkNew = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.lblGueltigVon = New System.Windows.Forms.Label() + Me.cbxVMarchivieren = New System.Windows.Forms.CheckBox() + Me.lblGueltigBis = New System.Windows.Forms.Label() + Me.txtGueltigVon = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtGueltigBis = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.cbxArchiviert = New System.Windows.Forms.CheckBox() + Me.btnNeu = New System.Windows.Forms.Button() + Me.gdvKundenvollmachten = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) + CType(Me.gdvKundenvollmachten, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SuspendLayout() + ' + 'lblWarning + ' + Me.lblWarning.AutoSize = True + Me.lblWarning.ForeColor = System.Drawing.Color.Red + Me.lblWarning.Location = New System.Drawing.Point(107, 234) + Me.lblWarning.Name = "lblWarning" + Me.lblWarning.Size = New System.Drawing.Size(105, 13) + Me.lblWarning.TabIndex = 42 + Me.lblWarning.Text = "Gültig von eintragen!" + Me.lblWarning.Visible = False + ' + 'Label3 + ' + Me.Label3.AutoSize = True + Me.Label3.Location = New System.Drawing.Point(10, 209) + Me.Label3.Name = "Label3" + Me.Label3.Size = New System.Drawing.Size(49, 13) + Me.Label3.TabIndex = 38 + Me.Label3.Text = "Vermerk:" + ' + 'txtVermerkNew + ' + Me.txtVermerkNew._DateTimeOnly = False + Me.txtVermerkNew._numbersOnly = False + Me.txtVermerkNew._numbersOnlyKommastellen = "" + Me.txtVermerkNew._numbersOnlyTrennzeichen = False + Me.txtVermerkNew._Prozent = False + Me.txtVermerkNew._ShortDateNew = False + Me.txtVermerkNew._ShortDateOnly = False + Me.txtVermerkNew._TimeOnly = False + Me.txtVermerkNew._TimeOnly_Seconds = False + Me.txtVermerkNew._value = "" + Me.txtVermerkNew._Waehrung = False + Me.txtVermerkNew._WaehrungZeichen = False + Me.txtVermerkNew.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtVermerkNew.ForeColor = System.Drawing.Color.Black + Me.txtVermerkNew.Location = New System.Drawing.Point(85, 199) + Me.txtVermerkNew.MaxLength = 100 + Me.txtVermerkNew.MaxLineLength = -1 + Me.txtVermerkNew.MaxLines_Warning = "" + Me.txtVermerkNew.MaxLines_Warning_Label = Nothing + Me.txtVermerkNew.Name = "txtVermerkNew" + Me.txtVermerkNew.Size = New System.Drawing.Size(390, 23) + Me.txtVermerkNew.TabIndex = 37 + ' + 'lblGueltigVon + ' + Me.lblGueltigVon.AutoSize = True + Me.lblGueltigVon.Location = New System.Drawing.Point(10, 255) + Me.lblGueltigVon.Name = "lblGueltigVon" + Me.lblGueltigVon.Size = New System.Drawing.Size(75, 13) + Me.lblGueltigVon.TabIndex = 40 + Me.lblGueltigVon.Text = "VM gültig von:" + ' + 'cbxVMarchivieren + ' + Me.cbxVMarchivieren.AutoSize = True + Me.cbxVMarchivieren.Location = New System.Drawing.Point(12, 341) + Me.cbxVMarchivieren.Name = "cbxVMarchivieren" + Me.cbxVMarchivieren.Size = New System.Drawing.Size(198, 17) + Me.cbxVMarchivieren.TabIndex = 39 + Me.cbxVMarchivieren.Text = "bestehende Vollmachten archivieren" + Me.cbxVMarchivieren.UseVisualStyleBackColor = True + Me.cbxVMarchivieren.Visible = False + ' + 'lblGueltigBis + ' + Me.lblGueltigBis.AutoSize = True + Me.lblGueltigBis.Location = New System.Drawing.Point(9, 284) + Me.lblGueltigBis.Name = "lblGueltigBis" + Me.lblGueltigBis.Size = New System.Drawing.Size(70, 13) + Me.lblGueltigBis.TabIndex = 36 + Me.lblGueltigBis.Text = "VM gültig bis:" + ' + 'txtGueltigVon + ' + Me.txtGueltigVon._DateTimeOnly = False + Me.txtGueltigVon._numbersOnly = False + Me.txtGueltigVon._numbersOnlyKommastellen = "" + Me.txtGueltigVon._numbersOnlyTrennzeichen = True + Me.txtGueltigVon._Prozent = False + Me.txtGueltigVon._ShortDateNew = True + Me.txtGueltigVon._ShortDateOnly = False + Me.txtGueltigVon._TimeOnly = False + Me.txtGueltigVon._TimeOnly_Seconds = False + Me.txtGueltigVon._value = "" + Me.txtGueltigVon._Waehrung = False + Me.txtGueltigVon._WaehrungZeichen = False + Me.txtGueltigVon.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtGueltigVon.ForeColor = System.Drawing.Color.Black + Me.txtGueltigVon.Location = New System.Drawing.Point(85, 250) + Me.txtGueltigVon.MaxLength = 10 + Me.txtGueltigVon.MaxLineLength = -1 + Me.txtGueltigVon.MaxLines_Warning = "" + Me.txtGueltigVon.MaxLines_Warning_Label = Nothing + Me.txtGueltigVon.Name = "txtGueltigVon" + Me.txtGueltigVon.Size = New System.Drawing.Size(127, 23) + Me.txtGueltigVon.TabIndex = 33 + Me.txtGueltigVon.TextAlign = System.Windows.Forms.HorizontalAlignment.Center + ' + 'txtGueltigBis + ' + Me.txtGueltigBis._DateTimeOnly = False + Me.txtGueltigBis._numbersOnly = False + Me.txtGueltigBis._numbersOnlyKommastellen = "" + Me.txtGueltigBis._numbersOnlyTrennzeichen = True + Me.txtGueltigBis._Prozent = False + Me.txtGueltigBis._ShortDateNew = True + Me.txtGueltigBis._ShortDateOnly = False + Me.txtGueltigBis._TimeOnly = False + Me.txtGueltigBis._TimeOnly_Seconds = False + Me.txtGueltigBis._value = "" + Me.txtGueltigBis._Waehrung = False + Me.txtGueltigBis._WaehrungZeichen = False + Me.txtGueltigBis.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtGueltigBis.ForeColor = System.Drawing.Color.Black + Me.txtGueltigBis.Location = New System.Drawing.Point(85, 279) + Me.txtGueltigBis.MaxLength = 10 + Me.txtGueltigBis.MaxLineLength = -1 + Me.txtGueltigBis.MaxLines_Warning = "" + Me.txtGueltigBis.MaxLines_Warning_Label = Nothing + Me.txtGueltigBis.Name = "txtGueltigBis" + Me.txtGueltigBis.Size = New System.Drawing.Size(127, 23) + Me.txtGueltigBis.TabIndex = 35 + Me.txtGueltigBis.TextAlign = System.Windows.Forms.HorizontalAlignment.Center + ' + 'cbxArchiviert + ' + Me.cbxArchiviert.AutoSize = True + Me.cbxArchiviert.Location = New System.Drawing.Point(13, 318) + Me.cbxArchiviert.Name = "cbxArchiviert" + Me.cbxArchiviert.Size = New System.Drawing.Size(70, 17) + Me.cbxArchiviert.TabIndex = 34 + Me.cbxArchiviert.Text = "Archiviert" + Me.cbxArchiviert.UseVisualStyleBackColor = True + ' + 'btnNeu + ' + Me.btnNeu.Image = Global.SDL.My.Resources.Resources.plus + Me.btnNeu.Location = New System.Drawing.Point(430, 333) + Me.btnNeu.Name = "btnNeu" + Me.btnNeu.Size = New System.Drawing.Size(77, 37) + Me.btnNeu.TabIndex = 41 + Me.btnNeu.TextAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnNeu.TextImageRelation = System.Windows.Forms.TextImageRelation.TextBeforeImage + Me.btnNeu.UseVisualStyleBackColor = True + Me.btnNeu.Visible = False + ' + 'gdvKundenvollmachten + ' + Me.gdvKundenvollmachten.AKTUALISIERUNGS_INTERVALL = -1 + Me.gdvKundenvollmachten.AllowUserToAddRows = False + Me.gdvKundenvollmachten.AllowUserToDeleteRows = False + Me.gdvKundenvollmachten.AllowUserToResizeColumns = False + Me.gdvKundenvollmachten.AllowUserToResizeRows = False + Me.gdvKundenvollmachten.BackgroundColor = System.Drawing.Color.White + Me.gdvKundenvollmachten.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.gdvKundenvollmachten.Location = New System.Drawing.Point(12, 0) + Me.gdvKundenvollmachten.MultiSelect = False + Me.gdvKundenvollmachten.Name = "gdvKundenvollmachten" + Me.gdvKundenvollmachten.ReadOnly = True + Me.gdvKundenvollmachten.RowHeadersVisible = False + Me.gdvKundenvollmachten.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect + Me.gdvKundenvollmachten.Size = New System.Drawing.Size(495, 180) + Me.gdvKundenvollmachten.TabIndex = 43 + ' + 'usrCntlKundenZollVollmachten + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.gdvKundenvollmachten) + Me.Controls.Add(Me.lblWarning) + Me.Controls.Add(Me.Label3) + Me.Controls.Add(Me.txtVermerkNew) + Me.Controls.Add(Me.lblGueltigVon) + Me.Controls.Add(Me.cbxVMarchivieren) + Me.Controls.Add(Me.lblGueltigBis) + Me.Controls.Add(Me.txtGueltigVon) + Me.Controls.Add(Me.txtGueltigBis) + Me.Controls.Add(Me.cbxArchiviert) + Me.Controls.Add(Me.btnNeu) + Me.Name = "usrCntlKundenZollVollmachten" + Me.Size = New System.Drawing.Size(523, 378) + CType(Me.gdvKundenvollmachten, System.ComponentModel.ISupportInitialize).EndInit() + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + + Friend WithEvents lblWarning As Label + Friend WithEvents Label3 As Label + Friend WithEvents txtVermerkNew As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents lblGueltigVon As Label + Friend WithEvents cbxVMarchivieren As CheckBox + Friend WithEvents lblGueltigBis As Label + Friend WithEvents txtGueltigVon As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents txtGueltigBis As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents cbxArchiviert As CheckBox + Friend WithEvents btnNeu As Button + Friend WithEvents gdvKundenvollmachten As VERAG_PROG_ALLGEMEIN.MyDatagridview +End Class diff --git a/SDL/kunden/usrCntlKundenZOLLVollmachten.resx b/SDL/kunden/usrCntlKundenZOLLVollmachten.resx new file mode 100644 index 00000000..1af7de15 --- /dev/null +++ b/SDL/kunden/usrCntlKundenZOLLVollmachten.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/SDL/kunden/usrCntlKundenZOLLVollmachten.vb b/SDL/kunden/usrCntlKundenZOLLVollmachten.vb new file mode 100644 index 00000000..2127f2f1 --- /dev/null +++ b/SDL/kunden/usrCntlKundenZOLLVollmachten.vb @@ -0,0 +1,230 @@ +Imports com.sun.org.apache.xerces.internal.impl.dtd.models +Imports jdk.nashorn.internal.objects.annotations +Imports sun.misc +Imports VERAG_PROG_ALLGEMEIN + +Public Class usrCntlKundenZollVollmachten + + + Public kdnr As Integer = -1 + Public filePath As String + Public erhalten As Boolean = False + Public archiviert As Boolean = False + Public geloescht As Boolean = False + 'Dim id As Integer = -1 + Dim ksql As New kundenSQL + Public vollmachtartId As Integer + Dim vermerk As String = "" + Public vmId As Integer = -1 + Dim vollmacht As New VERAG_PROG_ALLGEMEIN.cKundenVollmachten + + Sub New() + ' Dieser Aufruf ist für den Designer erforderlich. + InitializeComponent() + + ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. + End Sub + + Sub New(kdnr, vollmachtartId, filepath) + Me.InitializeComponent() + Me.erhalten = True + Me.kdnr = kdnr + Me.filePath = filepath + Me.vollmachtartId = vollmachtartId + + End Sub + + + 'Private Sub dgvVollmachtenEmbedded_SelectionChanged(sender As Object, e As EventArgs) Handles gdvKundenvollmachten.SelectionChanged + + + ' If gdvKundenvollmachten.SelectedRows.Count > 0 Then + + ' Dim rowindex = gdvKundenvollmachten.SelectedRows(0).Index + ' vollmacht = New VERAG_PROG_ALLGEMEIN.cKundenVollmachten(gdvKundenvollmachten.SelectedRows(0).Cells("kdvm_id").Value) + ' loadChangedVMToUsrCntl(vollmacht) + + ' End If + + 'End Sub + + Sub init(kdnr As Integer, vollmachtartId As Integer) + 'dgvVollmachten.Rows.Clear() + Me.kdnr = kdnr + Me.vollmachtartId = vollmachtartId + initDGV() + Me.Reset() + + End Sub + + + Private Sub initDGV() + + Dim where = " And art.kdvma_Firma='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "'" + + If kdnr > 0 AndAlso vollmachtartId >= 0 Then + + + With gdvKundenvollmachten + .Columns.Clear() + + + .DataSource = ksql.loadDgvBySql("SELECT abf.kdvm_Id,art.kdvma_Id, art.kdvma_Bezeichnung, abf.[kdvm_KundenNr], abf.[kdvm_erhalten],abf.[kdvm_erhalten_Datum], abf.kdvm_datenarchivId,abf.kdvm_Info, abf.[kdvm_archiviert], abf.[kdvm_gueltig_bis], abf.[kdvm_vermerk], abf.[kdvm_geloescht]" & + " FROM [tblKundenVollmachtenArt] as art " & + " INNER JOIN (select * from [tblKundenVollmachten]) as abf on art.[kdvma_Id]=abf.[kdvm_kdvmaId]" & + " WHERE art.kdvma_visible=1 AND abf.kdvm_erhalten = 1 AND ISNULL(abf.[kdvm_geloescht],0) != 1 AND [kdvm_KundenNr]='" & kdnr & "' AND [kdvm_kdvmaId]='" & vollmachtartId & "'" & where & + " ORDER BY kdvm_archiviert asc, abf.kdvm_gueltig_bis asc, abf.kdvm_erhalten_Datum desc ", "FMZOLL") + + + '.RowTemplate.Height = 30 + .Columns("kdvm_Id").Visible = False + .Columns("kdvma_Id").Visible = False + .Columns("kdvm_KundenNr").Visible = False + .Columns("kdvm_datenarchivId").Visible = False + .Columns("kdvma_Bezeichnung").Visible = False + .Columns("kdvma_Bezeichnung").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill + .Columns("kdvma_Bezeichnung").HeaderText = "Bezeichnung" + .Columns("kdvm_erhalten").Width = 50 + .Columns("kdvm_erhalten").HeaderText = "Erhalten" + .Columns("kdvm_erhalten").Visible = False + .Columns("kdvm_erhalten").DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopCenter + .Columns("kdvm_erhalten_Datum").Width = 100 + .Columns("kdvm_erhalten_Datum").HeaderText = "Gültig von" + .Columns("kdvm_erhalten_Datum").DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopCenter + .Columns("kdvm_Info").Width = 200 + .Columns("kdvm_Info").HeaderText = "Info" + .Columns("kdvm_Info").Visible = False + .Columns("kdvm_gueltig_bis").Visible = True + .Columns("kdvm_gueltig_bis").Width = 100 + .Columns("kdvm_gueltig_bis").HeaderText = "Gültig bis" + .Columns("kdvm_gueltig_bis").DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopCenter + .Columns("kdvm_archiviert").Visible = True + .Columns("kdvm_archiviert").Width = 60 + .Columns("kdvm_archiviert").HeaderText = "Archiviert" + .Columns("kdvm_archiviert").DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopCenter + .Columns("kdvm_vermerk").MinimumWidth = 100 + .Columns("kdvm_vermerk").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill + .Columns("kdvm_vermerk").HeaderText = "Vermerk" + .Columns("kdvm_vermerk").Visible = True + .Columns("kdvm_geloescht").Visible = False + + + End With + + End If + + + End Sub + + + + Public Sub btnNeu_Click(sender As Object, e As EventArgs) Handles btnNeu.Click + + vollmacht = New VERAG_PROG_ALLGEMEIN.cKundenVollmachten With { + .kdvm_KundenNr = Me.kdnr, + .kdvm_kdvmaId = Me.vollmachtartId, + .kdvm_Info = "", + .kdvm_erhalten = False, + .kdvm_archiviert = False, + .kdvm_datenarchivId = -1, + .kdvm_erhalten_Datum = Now.ToShortDateString + } + + vollmacht.kdvm_gueltig_bis = txtGueltigBis + + vollmacht.kdvm_vermerk = Me.txtVermerkNew.Text + + vollmacht.kdvm_archiviert = Me.cbxArchiviert.Checked + + If txtGueltigVon.Text = "" Or Not IsDate(txtGueltigVon.Text) Then + txtGueltigVon.ForeColor = Color.Red + lblWarning.Visible = True + Exit Sub + Else + vollmacht.kdvm_erhalten_Datum = txtGueltigVon.Text + vollmacht.kdvm_gueltig_ab = txtGueltigVon.Text + vollmacht.kdvm_erhalten = True + End If + + If txtGueltigBis.Text IsNot "" And Not IsDate(txtGueltigBis.Text) Then + txtGueltigBis.ForeColor = Color.Red + Exit Sub + + ElseIf txtGueltigBis.Text = "" Then + vollmacht.kdvm_gueltig_bis = Nothing + Else + vollmacht.kdvm_gueltig_bis = txtGueltigBis.Text + End If + + + + If vollmacht.SAVEVM > 0 Then + vollmachtenArchivieren() + vmId = vollmacht.SAVEVM + + End If + + + End Sub + + Private Sub loadChangedVMToUsrCntl(VM As VERAG_PROG_ALLGEMEIN.cKundenVollmachten) + + Me.Reset() + cbxArchiviert.Checked = VM.kdvm_archiviert + txtVermerkNew.Text = VM.kdvm_vermerk + txtGueltigVon.Text = VM.kdvm_erhalten_Datum + txtGueltigBis.Text = VM.kdvm_gueltig_bis + + + + End Sub + + Public Sub Reset() + + If gdvKundenvollmachten.Rows.Count > 0 Then + cbxVMarchivieren.Visible = True + cbxVMarchivieren.Checked = True + + Else + cbxVMarchivieren.Visible = False + cbxVMarchivieren.Checked = False + + End If + + txtGueltigBis.Clear() + txtGueltigVon.Clear() + txtGueltigVon.Text = Now.ToShortDateString + txtVermerkNew.Clear() + cbxArchiviert.Checked = False + + End Sub + + + Private Sub vollmachtenArchivieren() + + If cbxVMarchivieren.Checked = False Then Exit Sub + Dim count As Integer = 0 + With gdvKundenvollmachten + + For Each r As DataGridViewRow In .Rows + Dim VMindex = r.Cells("kdvm_Id").Value + If r.Cells("kdvm_archiviert").Value <> True Then + count += 1 + Dim currentVollmacht = New VERAG_PROG_ALLGEMEIN.cKundenVollmachten(VMindex) + currentVollmacht.kdvm_archiviert = True + currentVollmacht.SAVE() + End If + Next + + If count > 0 Then + MsgBox("Bestehende Vollmachten wurden archiviert.") + End If + End With + + cbxVMarchivieren.Visible = False + cbxVMarchivieren.Checked = False + + + End Sub + +End Class diff --git a/SDL/kunden/usrCntlKundenuebersicht.vb b/SDL/kunden/usrCntlKundenuebersicht.vb index d5cdec39..9c780a92 100644 --- a/SDL/kunden/usrCntlKundenuebersicht.vb +++ b/SDL/kunden/usrCntlKundenuebersicht.vb @@ -1567,7 +1567,7 @@ Public Class usrCntlKundenuebersicht 'Dim datum = IIf(dgvVollmachten.Rows(tmprowindex).Cells("kdvm_erhalten_Datum").Value Is DBNull.Value, Now, dgvVollmachten.Rows(tmprowindex).Cells("kdvm_erhalten_Datum").Value) 'Dim gueltigBis = IIf(dgvVollmachten.Rows(tmprowindex).Cells("kdvm_gueltig_bis").Value Is DBNull.Value, Nothing, dgvVollmachten.Rows(tmprowindex).Cells("kdvm_gueltig_bis").Value) 'Dim l As New frmKundenZOLLVollmachten(kdNr, dgvVollmachten.Rows(tmprowindex).Cells("kdvma_Id").Value, dgvVollmachten.Rows(tmprowindex).Cells("kdvma_Id").Value, dgvVollmachten.Rows(tmprowindex).Cells("kdvm_erhalten").Value, dgvVollmachten.Rows(tmprowindex).Cells("kdvm_archiviert").Value, dgvVollmachten.Rows(tmprowindex).Cells("kdvm_erhalten_Datum").Value, dgvVollmachten.Rows(tmprowindex).Cells("kdvm_gueltig_bis").Value, dgvVollmachten.Rows(tmprowindex).Cells("kdvm_vermerk").Value, dgvVollmachten.Rows(tmprowindex).Cells("kdvm_datenarchivId").Value) - Dim l As New frmKundenZOLLVollmachten(kdNr, dgvVollmachten.Rows(tmprowindex).Cells("kdvma_Id").Value) + Dim l As New frmKundenZOLLVollmachten(kdNr, dgvVollmachten.Rows(tmprowindex).Cells("kdvma_Id").Value) ' If l.ShowDialog(frmGrayOut) = DialogResult.OK Then l.initDGVVollmachtenEmbedded(False) 'initDGVVollmachten() diff --git a/SDL/mdm/Besuchsberichte/frmBesuchsberichte.vb b/SDL/mdm/Besuchsberichte/frmBesuchsberichte.vb index b69b6535..b9c5713a 100644 --- a/SDL/mdm/Besuchsberichte/frmBesuchsberichte.vb +++ b/SDL/mdm/Besuchsberichte/frmBesuchsberichte.vb @@ -1,16 +1,9 @@ -Imports System.ComponentModel -Imports com.esendex.sdk -Imports javax.validation.constraints -Imports VERAG_PROG_ALLGEMEIN - -Public Class frmBesuchsberichte +Public Class frmBesuchsberichte Public KdNr As Integer = -1 Public bb_id As Integer = -1 - Dim BB As New VERAG_PROG_ALLGEMEIN.cBesuchsbericht - Sub New(bb_id, Optional kdNr = -1) InitializeComponent() @@ -22,24 +15,27 @@ Public Class frmBesuchsberichte Private Sub KdSearchBox1_TextChanged(sender As Object, e As EventArgs) Handles kdFirma.TextChanged - If kdFirma.KdNr_value > 0 AndAlso kdFirma.kdNrField IsNot Nothing Then + If kdFirma.KdNr_value > 0 AndAlso kdFirma.KdNr IsNot Nothing Then Dim AD = kdFirma.KdData_ADRESSEN Dim KD = kdFirma.KdData_KUNDE txtFirma.Enabled = True + BB.bb_KundenNr = kdFirma.KdNr_value + + txtFirma.Text = If(AD.Name_1, "") & If(AD.Name_2, "") txtFirma.Text &= vbNewLine & If(AD.Straße, "") txtFirma.Text &= vbNewLine & If(AD.LandKz, "") & If(AD.PLZ, "") & If(AD.Ort, "") + BB.bb_Kunde = If(txtFirma.Text, "-") txtFirma.Enabled = False Else txtFirma.Enabled = True End If + End Sub Private Sub frmBesuchsberichte_Load(sender As Object, e As EventArgs) Handles Me.Load - kdFirma.initKdBox(Me) - cboKontaktart.Items.Clear() cboKontaktart.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", "")) cboKontaktart.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Persönlich", "PERSON")) @@ -49,8 +45,8 @@ Public Class frmBesuchsberichte cboZufrieden.Items.Clear() cboZufrieden.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", "")) - cboZufrieden.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("JA", True)) - cboZufrieden.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("NEIN", False)) + cboZufrieden.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("JA", "True")) + cboZufrieden.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("NEIN", "False")) cboZufrieden.changeItem("") If KdNr > 0 Then @@ -58,7 +54,6 @@ Public Class frmBesuchsberichte kdFirma.Enabled = False txtFirma.ReadOnly = True - Else kdFirma.Enabled = True txtFirma.ReadOnly = False @@ -70,11 +65,9 @@ Public Class frmBesuchsberichte UsrcntlPDFScanList1.Enabled = True 'UsrcntlPDFScanList1.INIT(-1, "BESUCHSBERICHTE", VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA, bb_id) - UsrcntlPDFScanList1.INIT(BB.bb_KundenNr, "BESUCHSBERICHTE") - + UsrcntlPDFScanList1.INIT(BB.bb_KundenNr, "BESUCHSBERICHTE", bb_id) Else UsrcntlPDFScanList1.Enabled = False - End If @@ -104,12 +97,10 @@ Public Class frmBesuchsberichte cbxSprinter.Checked = BB.bb_LKW_Sprinter cbxSiloTank.Checked = BB.bb_LKW_SiloTank - txtAuftraggeber.Text = If(BB.bb_Auftraggeber, "") txtTransportRoute.Text = If(BB.bb_Route, "") txtDerzeitigerLieferant.Text = If(BB.bb_DerzeitigerLieferant, "") - cboZufrieden.changeItem(If(BB.bb_Zufrieden.ToString, Nothing)) - + cboZufrieden.changeItem(If(BB.bb_Zufrieden.ToString, "")) txtZufriedenNEIN.Text = If(BB.bb_ZufriedenNEIN, "") txtGarantie.Text = If(BB.bb_Garantie, "") @@ -130,9 +121,16 @@ Public Class frmBesuchsberichte BB.bb_Teilnehmer = txtTeilgenommen.Text BB.bb_Kontaktart = cboKontaktart._value If If(BB.bb_KundenNr, -1) <= 0 Then - BB.bb_Kunde = If(txtFirma.Text, "") + If txtFirma.Text <> "" Then + If txtFirma.Text.Length > 35 Then + BB.bb_Kunde = txtFirma.Text.Substring(0, 35) + Else + BB.bb_Kunde = txtFirma.Text + End If + Else + BB.bb_Kunde = "-" 'diese Fall kann nicht eintreten, wird im Formular abgefangen. + End If End If - BB.bb_Geschaeftsfuehrer = txtGF.Text BB.bb_Anpsprechpartner = txtAnsprechpartner.Text BB.bb_Mail = txtMail.Text @@ -172,15 +170,14 @@ Public Class frmBesuchsberichte Private Sub btnSave_Click(sender As Object, e As EventArgs) Handles btnSave.Click If getvalues(BB) Then UsrcntlPDFScanList1.Enabled = True - btnPDFReport.Enabled = True 'UsrcntlPDFScanList1.INIT(-1, "BESUCHSBERICHTE", VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA, bb_id) + UsrcntlPDFScanList1.INIT(BB.bb_KundenNr, "BESUCHSBERICHTE") End If End Sub Private Sub btnOK_Click(sender As Object, e As EventArgs) Handles btnOK.Click If getvalues(BB) Then - btnPDFReport.Enabled = True Me.Close() End If End Sub @@ -221,8 +218,6 @@ Public Class frmBesuchsberichte list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Ansprechpartner", BB.bb_Anpsprechpartner.ToString)) - 'list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Firma", BB.bb_Firma.ToString)) - list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Firma", txtFirma.Text)) list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Umatz", BB.bb_Umsatz)) 'ACHTUNG -> im Formular wurde das Feld "Umatz" benannt, nicht korrigieren! @@ -269,16 +264,24 @@ Public Class frmBesuchsberichte list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Ferry", IIf(BB.bb_Interesse_Ferry = True, "On", "Off"))) - If BB.bb_Zufrieden = True Then + + + If BB.bb_Zufrieden = "" Or IsNothing(BB.bb_Zufrieden) Then + + list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("JA", "Off")) + list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("NEIN", "Off")) + + + ElseIf BB.bb_Zufrieden = True Then + list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("JA", "On")) list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("NEIN", "Off")) ElseIf BB.bb_Zufrieden = False Then + list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("JA", "Off")) list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("NEIN", "On")) list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ZufriedenNEIN", IIf(BB.bb_ZufriedenNEIN <> "", BB.bb_ZufriedenNEIN.ToString, ""))) - ElseIf BB.bb_Zufrieden = "" Or IsNothing(BB.bb_Zufrieden) Then - list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("JA", "Off")) - list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("NEIN", "Off")) + End If Select Case BB.bb_Kontaktart.ToString @@ -296,7 +299,7 @@ Public Class frmBesuchsberichte End Sub - Private Sub kdFirma_PropertyChanged(sender As Object, e As PropertyChangedEventArgs) Handles kdFirma.PropertyChanged + Private Sub kdFirma_PropertyChanged(sender As Object, e As EventArgs) Handles kdFirma.PropertyChanged If kdFirma.KdNr_value > 0 AndAlso kdFirma.KdData_ADRESSEN IsNot Nothing AndAlso kdFirma.KdData_KUNDE IsNot Nothing Then @@ -320,6 +323,6 @@ Public Class frmBesuchsberichte txtZufriedenNEIN.Clear() End If - End Sub + End Sub End Class \ No newline at end of file diff --git a/SDL/mdm/Besuchsberichte/usrCntlBesuchsberichte.Designer.vb b/SDL/mdm/Besuchsberichte/usrCntlBesuchsberichte.Designer.vb index 6b61c160..864c3f7a 100644 --- a/SDL/mdm/Besuchsberichte/usrCntlBesuchsberichte.Designer.vb +++ b/SDL/mdm/Besuchsberichte/usrCntlBesuchsberichte.Designer.vb @@ -23,25 +23,34 @@ Partial Class usrCntlBesuchsberichte Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() - Me.pnlFilter = New System.Windows.Forms.Panel() + Me.dgvFILTER = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.Label1 = New System.Windows.Forms.Label() Me.Panel1 = New System.Windows.Forms.Panel() Me.btnNew = New System.Windows.Forms.Button() Me.btnDelete = New System.Windows.Forms.Button() Me.dgvBesuchsberichte = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) + Me.lblEinträge = New System.Windows.Forms.Label() + CType(Me.dgvFILTER, System.ComponentModel.ISupportInitialize).BeginInit() Me.Panel1.SuspendLayout() CType(Me.dgvBesuchsberichte, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' - 'pnlFilter + 'dgvFILTER ' - Me.pnlFilter.BackColor = System.Drawing.Color.White - Me.pnlFilter.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - Me.pnlFilter.Dock = System.Windows.Forms.DockStyle.Bottom - Me.pnlFilter.Location = New System.Drawing.Point(0, 43) - Me.pnlFilter.Name = "pnlFilter" - Me.pnlFilter.Size = New System.Drawing.Size(1072, 34) - Me.pnlFilter.TabIndex = 11 + Me.dgvFILTER.AKTUALISIERUNGS_INTERVALL = -1 + Me.dgvFILTER.AllowUserToAddRows = False + Me.dgvFILTER.AllowUserToDeleteRows = False + Me.dgvFILTER.AllowUserToResizeColumns = False + Me.dgvFILTER.AllowUserToResizeRows = False + Me.dgvFILTER.BackgroundColor = System.Drawing.Color.White + Me.dgvFILTER.BorderStyle = System.Windows.Forms.BorderStyle.None + Me.dgvFILTER.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.dgvFILTER.ColumnHeadersVisible = False + Me.dgvFILTER.Location = New System.Drawing.Point(0, 45) + Me.dgvFILTER.Name = "dgvFILTER" + Me.dgvFILTER.ScrollBars = System.Windows.Forms.ScrollBars.None + Me.dgvFILTER.Size = New System.Drawing.Size(1072, 34) + Me.dgvFILTER.TabIndex = 16 ' 'Label1 ' @@ -57,14 +66,15 @@ Partial Class usrCntlBesuchsberichte 'Panel1 ' Me.Panel1.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.Panel1.Controls.Add(Me.lblEinträge) + Me.Panel1.Controls.Add(Me.dgvFILTER) Me.Panel1.Controls.Add(Me.btnNew) Me.Panel1.Controls.Add(Me.Label1) Me.Panel1.Controls.Add(Me.btnDelete) - Me.Panel1.Controls.Add(Me.pnlFilter) Me.Panel1.Dock = System.Windows.Forms.DockStyle.Top Me.Panel1.Location = New System.Drawing.Point(0, 0) Me.Panel1.Name = "Panel1" - Me.Panel1.Size = New System.Drawing.Size(1072, 77) + Me.Panel1.Size = New System.Drawing.Size(1072, 79) Me.Panel1.TabIndex = 13 ' 'btnNew @@ -108,13 +118,23 @@ Partial Class usrCntlBesuchsberichte Me.dgvBesuchsberichte.AllowUserToResizeRows = False Me.dgvBesuchsberichte.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvBesuchsberichte.Dock = System.Windows.Forms.DockStyle.Fill - Me.dgvBesuchsberichte.Location = New System.Drawing.Point(0, 77) + Me.dgvBesuchsberichte.Location = New System.Drawing.Point(0, 79) Me.dgvBesuchsberichte.Name = "dgvBesuchsberichte" Me.dgvBesuchsberichte.ReadOnly = True Me.dgvBesuchsberichte.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvBesuchsberichte.Size = New System.Drawing.Size(1072, 530) + Me.dgvBesuchsberichte.Size = New System.Drawing.Size(1072, 528) Me.dgvBesuchsberichte.TabIndex = 15 ' + 'lblEinträge + ' + Me.lblEinträge.AutoSize = True + Me.lblEinträge.BackColor = System.Drawing.Color.White + Me.lblEinträge.Location = New System.Drawing.Point(817, 29) + Me.lblEinträge.Name = "lblEinträge" + Me.lblEinträge.Size = New System.Drawing.Size(58, 13) + Me.lblEinträge.TabIndex = 41 + Me.lblEinträge.Text = "0 Einträge " + ' 'usrCntlBesuchsberichte ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -123,16 +143,18 @@ Partial Class usrCntlBesuchsberichte Me.Controls.Add(Me.Panel1) Me.Name = "usrCntlBesuchsberichte" Me.Size = New System.Drawing.Size(1072, 607) + CType(Me.dgvFILTER, System.ComponentModel.ISupportInitialize).EndInit() Me.Panel1.ResumeLayout(False) Me.Panel1.PerformLayout() CType(Me.dgvBesuchsberichte, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) End Sub - Friend WithEvents pnlFilter As System.Windows.Forms.Panel Friend WithEvents Label1 As System.Windows.Forms.Label - Friend WithEvents Panel1 As System.Windows.Forms.Panel Friend WithEvents dgvBesuchsberichte As VERAG_PROG_ALLGEMEIN.MyDatagridview Friend WithEvents btnNew As Button Friend WithEvents btnDelete As Button + Friend WithEvents dgvFILTER As VERAG_PROG_ALLGEMEIN.MyDatagridview + Friend WithEvents Panel1 As Panel + Friend WithEvents lblEinträge As Label End Class diff --git a/SDL/mdm/Besuchsberichte/usrCntlBesuchsberichte.vb b/SDL/mdm/Besuchsberichte/usrCntlBesuchsberichte.vb index 898bdbc2..741ba901 100644 --- a/SDL/mdm/Besuchsberichte/usrCntlBesuchsberichte.vb +++ b/SDL/mdm/Besuchsberichte/usrCntlBesuchsberichte.vb @@ -4,20 +4,37 @@ Public Class usrCntlBesuchsberichte Public kdnr As Integer = -1 Dim SQL As New SQL + Dim dgvInitWait As Boolean = False + Public kdNr_filter As Boolean = False + Dim txtchanged As Boolean = False + Dim fullyPainted = False Private Sub usrCntlBesuchsberichte_Load(sender As Object, e As EventArgs) Handles Me.Load + initDGV() + End Sub - Sub initDGV() + Sub initDGV(Optional doFilter = False) + + Dim SQLCmd = "SELECT TOP (200) [bb_Id],[bb_DatumBesuch],[bb_KundenNr],[bb_Kunde] ,[bb_Anpsprechpartner] ,[bb_Vermerk],[bb_Sachbearbeiter] FROM [VERAG].[dbo].[tblBesuchsberichte] WHERE bb_Firma='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' " & If(kdnr > 0, " AND bb_KundenNr='" & kdnr & "'", "") + + If doFilter Then + newBinding(SQLCmd, doFilter) + Else + initFilter() + With dgvBesuchsberichte + + .SET_SQL(SQLCmd, "FMZOLL") + + .LOAD() + + End With + End If With dgvBesuchsberichte - .SET_SQL("SELECT TOP (1000) [bb_Id],[bb_DatumBesuch],[bb_KundenNr],[bb_Kunde] ,[bb_Anpsprechpartner] ,[bb_Vermerk],[bb_Sachbearbeiter] FROM [VERAG].[dbo].[tblBesuchsberichte] WHERE bb_Firma='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' " & If(kdnr > 0, " AND bb_KundenNr='" & kdnr & "'", ""), "FMZOLL") - - .LOAD() - If .Columns.Count > 0 Then .Columns("bb_DatumBesuch").Width = 150 .Columns("bb_DatumBesuch").HeaderText = "Datum" @@ -45,6 +62,8 @@ Public Class usrCntlBesuchsberichte btnDelete.Enabled = False + lblEinträge.Text = dgvBesuchsberichte.RowCount & " Einträge" + End Sub Private Sub dgvBesuchsberichteDoubleClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvBesuchsberichte.CellDoubleClick @@ -55,6 +74,7 @@ Public Class usrCntlBesuchsberichte initDGV() Catch ex As Exception MsgBox(ex.Message) + 'MsgBox(ex.StackTrace) End Try End Sub @@ -62,6 +82,8 @@ Public Class usrCntlBesuchsberichte Private Sub btnNew_Click(sender As Object, e As EventArgs) Handles btnNew.Click Dim f As New frmBesuchsberichte(-1, kdnr) f.ShowDialog(Me) + initDGV() + End Sub Private Sub btnDelete_Click(sender As Object, e As EventArgs) Handles btnDelete.Click @@ -80,4 +102,170 @@ Public Class usrCntlBesuchsberichte End If End Sub + + + Private Sub dgvBesuchsberichte_SelectionChanged(sender As Object, e As EventArgs) Handles dgvBesuchsberichte.SelectionChanged + + End Sub + + Private Sub dgvFILTER_SelectionChanged(sender As Object, e As EventArgs) Handles dgvFILTER.SelectionChanged + dgvFILTER.ClearSelection() + End Sub + + Private Sub dgvFILTER_CellContentClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvFILTER.CellContentClick + If dgvFILTER.Columns(e.ColumnIndex).GetType Is GetType(DataGridViewCheckBoxColumn) Then + dgvBesuchsberichte.Focus() + End If + End Sub + + + Private Sub dgvFILTER_CellValueChanged(sender As Object, e As DataGridViewCellEventArgs) Handles dgvFILTER.CellValueChanged + initDGV(True) + + End Sub + + Sub initFilter() + dgvInitWait = True + + dgvFILTER.RowTemplate.Height = dgvFILTER.Height + If Not Me.fullyPainted Then Exit Sub ' nur wenn die usrcntl komplett gelden wurde... + Try + dgvFILTER.Columns.Clear() + Catch ex As Exception + + End Try + For Each c As DataGridViewColumn In dgvBesuchsberichte.Columns + Dim cNew As DataGridViewColumn = c.Clone + 'MsgBox("Create Filter Column " & cNew.HeaderText) + + cNew.MinimumWidth = c.Width + dgvFILTER.Columns.Add(cNew) + If cNew.GetType Is GetType(DataGridViewCheckBoxColumn) Then + DirectCast(cNew, DataGridViewCheckBoxColumn).ThreeState = True + DirectCast(cNew, DataGridViewCheckBoxColumn).DefaultCellStyle.NullValue = CheckState.Indeterminate + End If + Next + + If dgvFILTER IsNot Nothing AndAlso dgvFILTER.ColumnCount > 0 Then + dgvFILTER.Rows.Add() + dgvFILTER.Width = dgvBesuchsberichte.Width + End If + + dgvInitWait = False + + End Sub + + Function getSqlText(t) As String + Try + Return t.Replace("'", "") + Catch ex As Exception + Return "" + End Try + End Function + + + Function getFilter() As String + + Dim filter As String = "" + Dim andstr As String = "" + + If dgvFILTER.RowCount > 0 Then + For Each c As DataGridViewCell In dgvFILTER.Rows(0).Cells + If c.Value IsNot DBNull.Value Then + If c.GetType Is GetType(DataGridViewTextBoxCell) Then + If c.Value IsNot Nothing AndAlso c.Value <> "" Then + Dim srchstr = getSqlText(c.Value.ToString.Trim) + If c.OwningColumn.Name.Contains("SDLNr") Then + filter &= andstr & " SDL.[" & c.OwningColumn.Name & "] LIKE '%" & srchstr & "%' " + ElseIf c.OwningColumn.Name.Contains("IDS-KdNr") Then + filter &= andstr & " (SELECT TOP 1 [CustomerCode] FROM [VERAG].[dbo].[tbl_IDS_Kunden] WHERE [KdNrVERAG]=KundenNr AND KdNrAlt =0 ORDER BY Zeitstempel DESC) LIKE '%" & srchstr & "%' " + ElseIf IsDate(srchstr) Then + If srchstr.ToLower = "ist null" Then + filter &= andstr & "( [" & c.OwningColumn.Name & "] is null ) " + Else + filter &= andstr & " convert(varchar,[" & c.OwningColumn.Name & "] ,104) LIKE '%" & srchstr & "%' " + End If + Else + If srchstr.ToLower = "ist null" Then + filter &= andstr & "( [" & c.OwningColumn.Name & "] LIKE '' OR [" & c.OwningColumn.Name & "] is null ) " + Else + filter &= andstr & " [" & c.OwningColumn.Name & "] LIKE '%" & srchstr & "%' " + End If + End If + andstr = " AND " + End If + ElseIf c.GetType Is GetType(DataGridViewCheckBoxCell) Then + If c.Value IsNot Nothing AndAlso c.Value.ToString <> "" Then + If c.Value = CheckState.Checked Then + filter &= andstr & " SDL.[" & c.OwningColumn.Name & "] =1 " + andstr = " AND " + ElseIf c.Value = CheckState.Unchecked Then + filter &= andstr & " SDL.[" & c.OwningColumn.Name & "] =0 " + andstr = " AND " + End If + End If + End If + + End If + Next + End If + + Return filter + End Function + + + Protected Overrides Sub WndProc(ByRef m As Message) + MyBase.WndProc(m) + If m.Msg = 15 AndAlso Not fullyPainted Then + fullyPainted = True + + initDGV() + initFilter() + End If + End Sub + + Sub newBinding(ByVal sql As String, doFilter As Boolean) + dgvInitWait = True + ' bindingSDL = Nothing + dgvBesuchsberichte.Columns.Clear() + dgvBesuchsberichte.VirtualMode = True + txtchanged = True + dgvInitWait = True + If doFilter Then + Dim filter As String = getFilter() + + If filter <> "" Then sql &= " AND " & filter + ' sql &= " ORDER BY sdl.[Erfassungsdatum] ASC" + Else + ' clearFilter() + End If + If kdNr_filter And kdnr > 0 Then sql &= " AND KundenNr=" & kdnr + + + + 'Sortierung der tabl-DS + 'sql &= " ORDER BY sdl.[Bestelldatum] , sdl.[Erfassungsdatum] ASC ,sdl.ts" + + + 'dgvBesuchsberichte.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells + ' dgvSDL.RowHeadersWidthSizeMode = DataGridViewRowHeadersWidthSizeMode.DisableResizing '; //or even better .DisableResizing. Most time consumption enum is DataGridViewRowHeadersWidthSizeMode.AutoSizeToAllHeaders + + 'dgvBesuchsberichte.SET_SQL(sql, "SDL", , {"KundenNr", "KfzKennzeichen", "SDLNr", "History"}) + + dgvBesuchsberichte.SET_SQL(sql, "FMZOLL") + + dgvBesuchsberichte.LOAD() + + dgvInitWait = False + txtchanged = False + dgvInitWait = False + dgvBesuchsberichte.ClearSelection() + + + If dgvBesuchsberichte.RowCount > 0 Then dgvBesuchsberichte.Rows(0).Cells(0).Selected = True + + dgvBesuchsberichte_SelectionChanged(Me, New EventArgs) + + End Sub + End Class diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cBesuchsbericht.vb b/VERAG_PROG_ALLGEMEIN/Classes/cBesuchsbericht.vb index b404bc49..c7272ffe 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cBesuchsbericht.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cBesuchsbericht.vb @@ -25,25 +25,25 @@ Public Class cBesuchsbericht Property bb_LKW_Kuehltranporte As Boolean = False Property bb_LKW_Sondertransporte As Boolean = False Property bb_LKW_Sprinter As Boolean = False - Property bb_LKW_SiloTank As Boolean = False - Property bb_Auftraggeber As Object = Nothing - Property bb_Route As Object = Nothing - Property bb_DerzeitigerLieferant As Object = Nothing - Property bb_Zufrieden As Boolean = Nothing + Property bb_LKW_SiloTank As Boolean = False + Property bb_Auftraggeber As Object = Nothing + Property bb_Route As Object = Nothing + Property bb_DerzeitigerLieferant As Object = Nothing + Property bb_Zufrieden As Object = Nothing Property bb_ZufriedenNEIN As Object = Nothing Property bb_Garantie As Object = Nothing Property bb_Interesse_Zollabfertigung As Boolean = False - Property bb_Interesse_Brexit As Boolean = False - Property bb_Interesse_Parkplatz As Boolean = False - Property bb_Interesse_LagerUmschlag As Boolean = False - Property bb_Interesse_Rola As Boolean = False - Property bb_Interesse_YesMoney As Boolean = False - Property bb_Interesse_Ferry As Boolean = False - Property bb_Vermerk As Object = Nothing + Property bb_Interesse_Brexit As Boolean = False + Property bb_Interesse_Parkplatz As Boolean = False + Property bb_Interesse_LagerUmschlag As Boolean = False + Property bb_Interesse_Rola As Boolean = False + Property bb_Interesse_YesMoney As Boolean = False + Property bb_Interesse_Ferry As Boolean = False + Property bb_Vermerk As Object = Nothing - Public hasEntry = False + Public hasEntry = False - Dim SQL As New SQL + Dim SQL As New SQL Sub New() bb_Garantie = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cKundenVollmachten.vb b/VERAG_PROG_ALLGEMEIN/Classes/cKundenVollmachten.vb index 9962c335..83e77cf2 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cKundenVollmachten.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cKundenVollmachten.vb @@ -15,6 +15,7 @@ Public Class cKundenVollmachten 'in Arbeit! Property kdvm_gueltig_ab As Object = Nothing Property kdvm_vermerk As Object = Nothing Property kdvm_geloescht As Boolean = False + Property kdvm_emailId As Object = Nothing Public hasEntry = False @@ -47,6 +48,7 @@ Public Class cKundenVollmachten 'in Arbeit! list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kdvm_gueltig_ab", kdvm_gueltig_ab)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kdvm_vermerk", kdvm_vermerk)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kdvm_geloescht", kdvm_geloescht)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kdvm_emailId", kdvm_emailId)) Return list End Function @@ -65,6 +67,19 @@ Public Class cKundenVollmachten 'in Arbeit! Return SQL.doSQLVarList(sqlstr, "FMZOLL", , list) End Function + Public Function SAVEVM() As Integer + Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList() + + Dim sqlstr = " BEGIN TRAN IF EXISTS(SELECT * FROM tblKundenVollmachten WHERE kdvm_Id=@kdvm_Id) " & + " BEGIN " & getUpdateCmd() & " END " & + " Else " & + " BEGIN " & getInsertCmd() & " END " & + " commit tran " + + kdvm_Id = SQL.doSQLVarListID(kdvm_Id, sqlstr, "FMZOLL", , list) + Return kdvm_Id + End Function + Public Sub LOAD() Try hasEntry = False diff --git a/VERAG_PROG_ALLGEMEIN/Resources/email_big_gray.jpg b/VERAG_PROG_ALLGEMEIN/Resources/email_big_gray.jpg new file mode 100644 index 00000000..bb359298 Binary files /dev/null and b/VERAG_PROG_ALLGEMEIN/Resources/email_big_gray.jpg differ