Index: AAPClient/UI/DrieKnoppenScherm.dfm =================================================================== diff -u -r5 -r10 --- AAPClient/UI/DrieKnoppenScherm.dfm (.../DrieKnoppenScherm.dfm) (revision 5) +++ AAPClient/UI/DrieKnoppenScherm.dfm (.../DrieKnoppenScherm.dfm) (revision 10) @@ -51,7 +51,6 @@ Top = 184 Width = 75 Height = 57 - ModalResult = 7 TabOrder = 2 Visible = False end Index: AAPClient/UI/LoginScherm.pas =================================================================== diff -u -r9 -r10 --- AAPClient/UI/LoginScherm.pas (.../LoginScherm.pas) (revision 9) +++ AAPClient/UI/LoginScherm.pas (.../LoginScherm.pas) (revision 10) @@ -27,7 +27,8 @@ private procedure SetStatusButtonRechtsOnderaan; public - { Public declarations } + function GeefInitialen: string; + function GeefLoginCode: string; end; var @@ -62,7 +63,7 @@ Request.Free; end; - Application.Terminate; + ShowMessage('oink'); end; procedure TfmLoginScherm.btnRechtsOnderClick(Sender: TObject); @@ -96,6 +97,7 @@ finally Request.Free; end; + end; procedure TfmLoginScherm.edtInitialenKeyPress(Sender: TObject; var Key: Char); @@ -131,6 +133,16 @@ btnRechtsOnder.Enabled := false; end; +function TfmLoginScherm.GeefInitialen: string; +begin + result := edtInitialen.Text; +end; + +function TfmLoginScherm.GeefLoginCode: string; +begin + result := edtPinCode.Text; +end; + procedure TfmLoginScherm.SetStatusButtonRechtsOnderaan; begin btnRechtsOnder.Enabled := ((edtPincode.Text <> '') and (edtInitialen.Text <> '')); Index: AAPClient/UI/LoginScherm.dfm =================================================================== diff -u -r7 -r10 --- AAPClient/UI/LoginScherm.dfm (.../LoginScherm.dfm) (revision 7) +++ AAPClient/UI/LoginScherm.dfm (.../LoginScherm.dfm) (revision 10) @@ -32,6 +32,7 @@ end inherited btnRechtsOnder: TButton Default = True + ModalResult = 11 TabOrder = 4 OnClick = btnRechtsOnderClick end Index: AAPClient/Win32/Debug/ProScanMain.dcu =================================================================== diff -u -r7 -r10 Binary files differ Index: AAPClient/Win32/Debug/ProScan.exe =================================================================== diff -u -r8 -r10 Binary files differ Index: AAPClient/ProScanMain.pas =================================================================== diff -u -r1 -r10 --- AAPClient/ProScanMain.pas (.../ProScanMain.pas) (revision 1) +++ AAPClient/ProScanMain.pas (.../ProScanMain.pas) (revision 10) @@ -9,10 +9,11 @@ type TfmProScanHoofdscherm = class(TForm) procedure FormCreate(Sender: TObject); + procedure FormClose(Sender: TObject; var Action: TCloseAction); private - { Private declarations } + fInitialen: string; + fLoginCode: string; public - { Public declarations } end; var @@ -21,17 +22,46 @@ implementation uses - LoginScherm; + LoginScherm, GebruikerService; {$R *.dfm} +procedure TfmProScanHoofdscherm.FormClose(Sender: TObject; + var Action: TCloseAction); +var + Service: GebruikerServiceSoap; + Request: GebruikerAfmeldenRequest; + Header: RequestHeader; +begin + inherited; + Service := GebruikerService.GetGebruikerServiceSoap(); + + Request := GebruikerAfmeldenRequest.Create; + Header := RequestHeader.Create; + ShowMessage('afgemeld'); + try + Request.Initialen := fInitialen; + Request.LoginCode := fLoginCode; + Header.Initialen := fInitialen; + Request.Header := Header; + + Service.GebruikerAfmelden(Request); + finally + Request.Free; + end; +end; + procedure TfmProScanHoofdscherm.FormCreate(Sender: TObject); var LoginScherm: TfmLoginScherm; - MyAction: TAction; begin LoginScherm := TfmLoginScherm.Create(Self); - LoginScherm.Show(); + If LoginScherm.ShowModal = mrNone then begin + fInitialen := LoginScherm.GeefInitialen; + fLoginCode := LoginScherm.GeefLoginCode; + end else begin + self.Close; + end; end; end. Index: AAPClient/ProScanMain.dfm =================================================================== diff -u -r1 -r10 --- AAPClient/ProScanMain.dfm (.../ProScanMain.dfm) (revision 1) +++ AAPClient/ProScanMain.dfm (.../ProScanMain.dfm) (revision 10) @@ -11,6 +11,7 @@ Font.Name = 'Tahoma' Font.Style = [] OldCreateOrder = False + OnClose = FormClose OnCreate = FormCreate PixelsPerInch = 96 TextHeight = 13 Index: AAPClient/Win32/Debug/LoginScherm.dcu =================================================================== diff -u -r8 -r10 Binary files differ Index: AAPClient/Win32/Debug/DrieKnoppenScherm.dcu =================================================================== diff -u -r5 -r10 Binary files differ