Index: AAPClient/UI/LoginScherm2.pas =================================================================== diff -u -r150 -r191 --- AAPClient/UI/LoginScherm2.pas (.../LoginScherm2.pas) (revision 150) +++ AAPClient/UI/LoginScherm2.pas (.../LoginScherm2.pas) (revision 191) @@ -5,7 +5,7 @@ uses Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants, System.Classes, Vcl.Graphics, Vcl.Controls, Vcl.Forms, Vcl.Dialogs, Vcl.Imaging.pngimage, Vcl.ExtCtrls, - DrieKnoppenScherm, Images, Vcl.StdCtrls, Vcl.ActnList; + DrieKnoppenScherm, Images, Vcl.StdCtrls, Vcl.ActnList, Agent; type TfmLoginScherm2 = class(TfmDrieKnoppenScherm) @@ -41,38 +41,21 @@ procedure TfmLoginScherm2.actVolgendeExecute(Sender: TObject); var - Service: GebruikerServiceSoap; - Request: GebruikerAanmeldenRequest; Response: GebruikerAanmeldenResponse; - Header: RequestHeader; begin - Service := GebruikerService.GetGebruikerServiceSoap(); - // request opbouwen - Request := GebruikerAanmeldenRequest.Create; - Header := RequestHeader.Create; + Response := fAgent.GebruikerAanmelden(edtInitialen.Text,edtPinCode.Text); try - Request.Initialen := edtInitialen.Text; - Request.LoginCode := edtPinCode.Text; - Header.Initialen := edtInitialen.Text; - Header.ComputerNaam := FullName(); - Request.Header := Header; - - Response := Service.GebruikerAanmelden(Request); - try - if Response.Header.Status <> '200' then begin - Self.ModalResult := mrLogin; - ToonPopupScherm(Response.Header.Omschrijving, 'Probeer opnieuw') - end else begin - SetContext; - lblGebruiker.Caption := UiContext.Initialen; - lblGebruiker.Visible := true; - Self.ModalResult := mrHome; - end; - finally - Response.Free; + if Response.Header.Status <> '200' then begin + Self.ModalResult := mrLogin; + ToonPopupScherm(Response.Header.Omschrijving, 'Probeer opnieuw') + end else begin + SetContext; + lblGebruiker.Caption := UiContext.Initialen; + lblGebruiker.Visible := true; + Self.ModalResult := mrHome; end; finally - Request.Free; + Response.Free; end; end; @@ -111,25 +94,8 @@ end; procedure TfmLoginScherm2.HuidigeGebruikerAfmelden; -var - Service: GebruikerServiceSoap; - Request: GebruikerAfmeldenRequest; - Header: RequestHeader; begin - Service := GebruikerService.GetGebruikerServiceSoap(); - - Request := GebruikerAfmeldenRequest.Create; - Header := RequestHeader.Create; - try - Request.Initialen := UiContext.Initialen; - Request.LoginCode := UiContext.LoginCode; - Header.Initialen := UiContext.Initialen; - Request.Header := Header; - - Service.GebruikerAfmelden(Request); - finally - Request.Free; - end; + fAgent.GebruikerAfmelden(UiContext.Initialen, UiContext.LoginCode); end; procedure TfmLoginScherm2.SetContext; Index: AAPClient/ProScanMain.pas =================================================================== diff -u -r168 -r191 --- AAPClient/ProScanMain.pas (.../ProScanMain.pas) (revision 168) +++ AAPClient/ProScanMain.pas (.../ProScanMain.pas) (revision 191) @@ -33,7 +33,7 @@ uses LoginScherm2, GebruikerService, HomeScherm, DrieKnoppenScherm, PalletScherm, BestaandePalletscherm, DnaCodeScherm, InfoLogScherm, Images, HernoemPalletScherm, - DimmerForm, DnaCodeReedsGescandScherm; + DimmerForm, DnaCodeReedsGescandScherm, Agent; {$R *.dfm} @@ -81,24 +81,10 @@ procedure TfmProScanHoofdscherm.HuidigeGebruikerAfmelden; var - Service: GebruikerServiceSoap; - Request: GebruikerAfmeldenRequest; - Header: RequestHeader; + fAgent: TAgent; begin - Service := GebruikerService.GetGebruikerServiceSoap(); - - Request := GebruikerAfmeldenRequest.Create; - Header := RequestHeader.Create; - try - Request.Initialen := fUiContext.Initialen; - Request.LoginCode := fUiContext.LoginCode; - Header.Initialen := fUiContext.Initialen; - Request.Header := Header; - - Service.GebruikerAfmelden(Request); - finally - Request.Free; - end; + fAgent := TAgent.Create(); + fAgent.GebruikerAfmelden(fUiContext.Initialen, fUiContext.LoginCode); end; end. Index: AAPClient/ProScan.dpr =================================================================== diff -u -r176 -r191 --- AAPClient/ProScan.dpr (.../ProScan.dpr) (revision 176) +++ AAPClient/ProScan.dpr (.../ProScan.dpr) (revision 191) @@ -17,7 +17,8 @@ LoginScherm2 in 'UI\LoginScherm2.pas' {fmLoginScherm2}, DimmerForm in 'UI\DimmerForm.pas' {fmDimmerForm}, DnaCodeReedsGescandScherm in 'UI\DnaCodeReedsGescandScherm.pas' {fmDnaCodeReedsGescandScherm}, - DnaCodeService in 'WS\DnaCodeService.pas'; + DnaCodeService in 'WS\DnaCodeService.pas', + Agent in 'WS\Agent.pas'; {$R *.res} Index: AAPClient/UI/DrieKnoppenScherm.pas =================================================================== diff -u -r184 -r191 --- AAPClient/UI/DrieKnoppenScherm.pas (.../DrieKnoppenScherm.pas) (revision 184) +++ AAPClient/UI/DrieKnoppenScherm.pas (.../DrieKnoppenScherm.pas) (revision 191) @@ -6,7 +6,7 @@ Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants, System.Classes, Vcl.Graphics, Vcl.Controls, Vcl.Forms, Vcl.Dialogs, Vcl.StdCtrls, Vcl.ActnList, Images, Vcl.ImgList, UiContext, Vcl.ExtCtrls, Soap.InvokeRegistry, Soap.Rio, - Soap.SOAPHTTPClient, Data.DB, Datasnap.DBClient, Soap.SOAPConn; + Soap.SOAPHTTPClient, Data.DB, Datasnap.DBClient, Soap.SOAPConn, Agent; type TfmDrieKnoppenScherm = class(TForm) @@ -46,6 +46,7 @@ fUiContext: TUiContext; protected fImagesScherm: TImagesScherm; + fAgent: TAgent; function ComputerName: String; function WUserName: String; function FullName: String; @@ -71,6 +72,7 @@ actRechtsOnder := nil; lblGebruiker.Visible := false; fImagesScherm := TImagesScherm.Create(self); + fAgent := TAgent.Create(); end; procedure TfmDrieKnoppenScherm.FormShow(Sender: TObject); Index: AAPClient/WS/Agent.pas =================================================================== diff -u --- AAPClient/WS/Agent.pas (revision 0) +++ AAPClient/WS/Agent.pas (revision 191) @@ -0,0 +1,102 @@ +unit Agent; + +interface + +uses + DnaCodeService, GebruikerService, System.SysUtils; + +type + TAgent = class + private + function ComputerName: String; + function WUserName: String; + public + function FullName: String; + function GebruikerAanmelden(Initialen: string; LoginCode: string): GebruikerAanmeldenResponse; + function GebruikerAfmelden(Initialen: string; LoginCode: string): boolean; + end; + +implementation + +uses + Winapi.Windows; + +{ TAgent } + +function TAgent.GebruikerAanmelden(Initialen, + LoginCode: string): GebruikerAanmeldenResponse; +var + Service: GebruikerServiceSoap; + Request: GebruikerAanmeldenRequest; + Header: RequestHeader; +begin + Service := GebruikerService.GetGebruikerServiceSoap(); + Request := GebruikerAanmeldenRequest.Create; + Header := RequestHeader.Create; + try + Request.Initialen := Initialen; + Request.LoginCode := LoginCode; + Header.Initialen := Initialen; + Header.ComputerNaam := FullName(); + Request.Header := Header; + + Result := Service.GebruikerAanmelden(Request); + + finally + Request.Free; + end; +end; + +function TAgent.GebruikerAfmelden(Initialen, LoginCode: string): boolean; +var + Service: GebruikerServiceSoap; + Request: GebruikerAfmeldenRequest; + Header: RequestHeader; +begin + Service := GebruikerService.GetGebruikerServiceSoap(); + + Request := GebruikerAfmeldenRequest.Create; + Header := RequestHeader.Create; + try + Request.Initialen := Initialen; + Request.LoginCode := LoginCode; + Header.Initialen := Initialen; + Request.Header := Header; + + Service.GebruikerAfmelden(Request); + Result := true; + finally + Request.Free; + end; +end; + +function TAgent.ComputerName: String; +var + buffer: array[0..255] of char; + size: dword; +begin + size := 256; + if GetComputerName(buffer, size) then + Result := buffer + else + Result := '' +end; + +function TAgent.WUserName: String; +var + nSize: DWord; +begin + nSize := 1024; + SetLength(Result, nSize); + if GetUserName(PChar(Result), nSize) then + SetLength(Result, nSize-1) + else + RaiseLastOSError; +end; + +function TAgent.FullName: String; +begin + Result := ComputerName + ' / ' + WUserName; +end; + +end. Index: AAPClient/ProScan.dproj.local =================================================================== diff -u -r188 -r191 --- AAPClient/ProScan.dproj.local (.../ProScan.dproj.local) (revision 188) +++ AAPClient/ProScan.dproj.local (.../ProScan.dproj.local) (revision 191) @@ -14,8 +14,8 @@ 2019/03/04 07:46:54.000.107,=E:\svn\Delphi\AAPClient\Unit1.pas 2019/03/04 07:48:44.000.257,=E:\svn\Delphi\AAPClient\Unit1.pas 2019/03/04 07:48:53.000.280,E:\svn\Delphi\AAPClient\UI\LoginScherm.pas= - 2019/03/04 07:49:00.000.838,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\LoginScherm.pas 2019/03/04 07:49:00.000.838,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\LoginScherm.dfm + 2019/03/04 07:49:00.000.838,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\LoginScherm.pas 2019/03/05 10:51:12.000.820,=E:\svn\Delphi\AAPClient\WS.pas 2019/03/05 10:53:16.000.806,=E:\svn\Delphi\AAPClient\WS.pas 2019/03/05 10:56:57.000.976,E:\svn\Delphi\AAPClient\WS\GebruikerService.pas=E:\svn\Delphi\AAPClient\WS.pas @@ -26,23 +26,23 @@ 2019/03/06 07:41:41.000.580,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\Images.dfm 2019/03/06 07:41:41.000.580,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\Images.pas 2019/03/07 08:39:12.000.150,=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/03/07 08:39:29.000.118,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\HomeScherm.pas 2019/03/07 08:39:29.000.118,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\HomeScherm.dfm + 2019/03/07 08:39:29.000.118,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\HomeScherm.pas 2019/03/07 11:22:02.000.536,=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/03/07 11:29:09.000.427,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\PalletScherm.pas 2019/03/07 11:29:09.000.427,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\PalletScherm.dfm + 2019/03/07 11:29:09.000.427,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\PalletScherm.pas 2019/03/07 15:18:54.000.922,=E:\svn\Delphi\AAPClient\WS.pas 2019/03/07 15:19:13.000.507,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas 2019/03/08 10:21:18.000.208,=E:\svn\Delphi\AAPClient\WS.pas 2019/03/08 10:26:55.000.996,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= - 2019/03/08 10:27:08.000.419,E:\svn\Delphi\AAPClient\UI\PalletScherm.dfm=E:\svn\Delphi\AAPClient\WS\DnaCodeService.dfm 2019/03/08 10:27:08.000.419,E:\svn\Delphi\AAPClient\UI\PalletScherm.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas - 2019/03/08 10:27:45.000.805,E:\svn\Delphi\AAPClient\WS\DnaCodeService.dfm=E:\svn\Delphi\AAPClient\UI\PalletScherm.dfm + 2019/03/08 10:27:08.000.419,E:\svn\Delphi\AAPClient\UI\PalletScherm.dfm=E:\svn\Delphi\AAPClient\WS\DnaCodeService.dfm 2019/03/08 10:27:45.000.805,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\UI\PalletScherm.pas + 2019/03/08 10:27:45.000.805,E:\svn\Delphi\AAPClient\WS\DnaCodeService.dfm=E:\svn\Delphi\AAPClient\UI\PalletScherm.dfm 2019/03/08 10:28:02.000.451,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas 2019/03/08 11:14:25.000.860,=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/03/08 11:15:19.000.292,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\BestaandePalletScherm.dfm 2019/03/08 11:15:19.000.292,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\BestaandePalletScherm.pas + 2019/03/08 11:15:19.000.292,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\BestaandePalletScherm.dfm 2019/03/08 13:41:42.000.692,=E:\svn\Delphi\AAPClient\Unit1.pas 2019/03/08 13:43:18.000.167,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\DnaCodeScherm.pas 2019/03/08 13:43:18.000.168,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\DnaCodeScherm.dfm @@ -53,8 +53,8 @@ 2019/03/12 11:42:41.000.845,=E:\svn\Delphi\AAPClient\WS.pas 2019/03/12 11:42:52.000.715,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas 2019/03/18 09:44:48.000.103,=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/03/18 09:46:03.000.084,E:\svn\Delphi\AAPClient\UI\InfoLogScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas 2019/03/18 09:46:03.000.084,E:\svn\Delphi\AAPClient\UI\InfoLogScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm + 2019/03/18 09:46:03.000.084,E:\svn\Delphi\AAPClient\UI\InfoLogScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas 2019/03/18 11:06:46.000.842,=E:\svn\Delphi\AAPClient\WS.pas 2019/03/18 11:07:10.000.880,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= 2019/03/18 11:07:23.000.750,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas @@ -64,8 +64,8 @@ 2019/03/20 14:52:34.000.233,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= 2019/03/20 14:52:47.000.492,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas 2019/03/22 12:38:06.000.040,=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/03/22 12:42:12.000.397,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\HernoemPalletScherm.pas 2019/03/22 12:42:12.000.397,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\HernoemPalletScherm.dfm + 2019/03/22 12:42:12.000.397,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\HernoemPalletScherm.pas 2019/04/10 07:45:17.000.841,=E:\svn\Delphi\AAPClient\WS.pas 2019/04/10 07:45:55.000.611,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= 2019/04/10 07:46:07.000.445,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas @@ -76,13 +76,13 @@ 2019/09/03 15:56:30.000.060,E:\svn\Delphi\AAPClient\UI\LoginScherm2.pas=E:\svn\Delphi\AAPClient\Unit1.pas 2019/09/03 15:56:30.000.060,E:\svn\Delphi\AAPClient\UI\LoginScherm2.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm 2019/09/04 13:14:25.000.076,=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/09/04 13:17:21.000.462,E:\svn\Delphi\AAPClient\UI\DimmerForm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm 2019/09/04 13:17:21.000.462,E:\svn\Delphi\AAPClient\UI\DimmerForm.pas=E:\svn\Delphi\AAPClient\Unit1.pas + 2019/09/04 13:17:21.000.462,E:\svn\Delphi\AAPClient\UI\DimmerForm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm 2019/09/04 14:42:49.000.071,=E:\svn\Delphi\AAPClient\Unit1.pas 2019/09/06 07:39:37.000.990,=E:\svn\Delphi\AAPClient\WS.pas 2019/09/06 07:39:48.000.040,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= - 2019/09/06 07:40:00.000.929,E:\svn\Delphi\AAPClient\WS\DnaCodeService.dfm=E:\svn\Delphi\AAPClient\UI\DnaCodeScherm.dfm 2019/09/06 07:40:00.000.929,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\UI\DnaCodeScherm.pas + 2019/09/06 07:40:00.000.929,E:\svn\Delphi\AAPClient\WS\DnaCodeService.dfm=E:\svn\Delphi\AAPClient\UI\DnaCodeScherm.dfm 2019/09/06 07:44:11.000.442,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= 2019/09/06 07:45:06.000.602,=E:\svn\Delphi\AAPClient\UI\DnaCodeScherm.pas 2019/09/06 07:46:50.000.159,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas @@ -99,6 +99,9 @@ 2019/10/02 15:42:02.588,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= 2019/10/02 15:42:14.814,=E:\svn\Delphi\AAPClient\WS.pas 2019/10/02 15:42:25.143,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas + 2019/10/03 11:18:12.484,=E:\svn\Delphi\AAPClient\WS.pas + 2019/10/03 15:21:13.953,=E:\svn\Delphi\AAPClient\Unit1.pas + 2019/10/03 15:21:30.855,E:\svn\Delphi\AAPClient\WS\Agent.pas=E:\svn\Delphi\AAPClient\Unit1.pas @@ -128,6 +131,7 @@ + Index: AAPClient/ProScan.dproj =================================================================== diff -u -r176 -r191 --- AAPClient/ProScan.dproj (.../ProScan.dproj) (revision 176) +++ AAPClient/ProScan.dproj (.../ProScan.dproj) (revision 191) @@ -129,6 +129,7 @@ dfm + Cfg_2 Base