Index: AAPClient/Win32/Debug/ProScanMain.dcu =================================================================== diff -u -r61 -r63 Binary files differ Index: AAPClient/UI/InfoLogScherm.pas =================================================================== diff -u -r62 -r63 --- AAPClient/UI/InfoLogScherm.pas (.../InfoLogScherm.pas) (revision 62) +++ AAPClient/UI/InfoLogScherm.pas (.../InfoLogScherm.pas) (revision 63) @@ -49,32 +49,37 @@ Request: DnaCodeAfmeldenRequest; Response: DnaCodeAfmeldenResponse; Header: RequestHeader; + fWaarschuwingModalResult: TModalResult; begin - Service := DnaCodeService.GetDnaCodeServiceSoap(); - // request opbouwen - Request := DnaCodeAfmeldenRequest.Create; - Header := RequestHeader.Create; - try - Header.Initialen := lblGebruiker.Caption; - Header.ComputerNaam := ComputerName(); - Request.Header := Header; - Request.DnaCode := sgToeleveringData.Rows[sgToeleveringData.Row][0]; - Request.Aantal := -1; - Request.Toelevering := lblToelevering.Caption; - Request.PalletCode := sgToeleveringData.Rows[sgToeleveringData.Row][1]; + fWaarschuwingModalResult := ToonPopupScherm('Scan ongedaan maken?'+sgToeleveringData.Rows[sgToeleveringData.Row][0],'Ja','Nee'); - Response := Service.DnaCodeAfmelden(Request); + if fWaarschuwingModalResult = mrOk then begin + Service := DnaCodeService.GetDnaCodeServiceSoap(); + // request opbouwen + Request := DnaCodeAfmeldenRequest.Create; + Header := RequestHeader.Create; try - if Response.Header.Status <> '200' then begin - ToonPopupScherm(Response.Header.Omschrijving, 'Probeer opnieuw') - end else begin - VulGridMetToeleveringData(Response.DnaCodes); + Header.Initialen := lblGebruiker.Caption; + Header.ComputerNaam := ComputerName(); + Request.Header := Header; + Request.DnaCode := sgToeleveringData.Rows[sgToeleveringData.Row][0]; + Request.Aantal := -1; + Request.Toelevering := lblToelevering.Caption; + Request.PalletCode := sgToeleveringData.Rows[sgToeleveringData.Row][1]; + + Response := Service.DnaCodeAfmelden(Request); + try + if Response.Header.Status <> '200' then begin + ToonPopupScherm(Response.Header.Omschrijving, 'Probeer opnieuw') + end else begin + VulGridMetToeleveringData(Response.DnaCodes); + end; + finally + Response.Free; end; finally - Response.Free; + Request.Free; end; - finally - Request.Free; end; end; Index: AAPClient/UI/PopupScherm.pas =================================================================== diff -u -r13 -r63 --- AAPClient/UI/PopupScherm.pas (.../PopupScherm.pas) (revision 13) +++ AAPClient/UI/PopupScherm.pas (.../PopupScherm.pas) (revision 63) @@ -10,6 +10,7 @@ TfmPopupScherm = class(TForm) btnPopupActie: TButton; lblWaarschuwing: TLabel; + btnPopupActie2: TButton; private { Private declarations } public Index: AAPClient/UI/PopupScherm.dfm =================================================================== diff -u -r13 -r63 --- AAPClient/UI/PopupScherm.dfm (.../PopupScherm.dfm) (revision 13) +++ AAPClient/UI/PopupScherm.dfm (.../PopupScherm.dfm) (revision 63) @@ -34,4 +34,14 @@ TabOrder = 0 WordWrap = True end + object btnPopupActie2: TButton + Left = 94 + Top = 115 + Width = 78 + Height = 57 + ModalResult = 2 + TabOrder = 1 + Visible = False + WordWrap = True + end end Index: AAPClient/Win32/Debug/DrieKnoppenScherm.dcu =================================================================== diff -u -r55 -r63 Binary files differ Index: AAPClient/ProScan.dproj.local =================================================================== diff -u -r52 -r63 --- AAPClient/ProScan.dproj.local (.../ProScan.dproj.local) (revision 52) +++ AAPClient/ProScan.dproj.local (.../ProScan.dproj.local) (revision 63) @@ -2,62 +2,62 @@ 2019/03/01 14:25:16.000.954,=C:\Users\TomV\Documents\RAD Studio\Projects\Unit2.pas - 2019/03/01 14:25:57.000.930,C:\Users\TomV\Documents\RAD Studio\Projects\Unit2.pas=E:\svn\Delphi\AAPClient\ProScanMain.pas - 2019/03/01 14:25:57.000.930,C:\Users\TomV\Documents\RAD Studio\Projects\Unit2.dfm=E:\svn\Delphi\AAPClient\ProScanMain.dfm - 2019/03/01 14:26:05.000.981,C:\Users\TomV\Documents\RAD Studio\Projects\Project2.dproj=E:\svn\Delphi\AAPClient\ProScan.dproj + 2019/03/01 14:25:57.000.930,E:\svn\Delphi\AAPClient\ProScanMain.pas=C:\Users\TomV\Documents\RAD Studio\Projects\Unit2.pas + 2019/03/01 14:25:57.000.930,E:\svn\Delphi\AAPClient\ProScanMain.dfm=C:\Users\TomV\Documents\RAD Studio\Projects\Unit2.dfm + 2019/03/01 14:26:05.000.981,E:\svn\Delphi\AAPClient\ProScan.dproj=C:\Users\TomV\Documents\RAD Studio\Projects\Project2.dproj 2019/03/01 14:28:35.000.977,=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/03/01 14:34:33.000.220,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\DrieKnoppenScherm.dfm - 2019/03/01 14:34:33.000.220,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\DrieKnoppenScherm.pas + 2019/03/01 14:34:33.000.220,E:\svn\Delphi\AAPClient\UI\DrieKnoppenScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas + 2019/03/01 14:34:33.000.220,E:\svn\Delphi\AAPClient\UI\DrieKnoppenScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm 2019/03/01 15:26:22.000.761,=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/03/01 15:27:42.000.618,E:\svn\Delphi\AAPClient\UI\LoginScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm - 2019/03/01 15:27:42.000.618,E:\svn\Delphi\AAPClient\UI\LoginScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas + 2019/03/01 15:27:42.000.618,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\LoginScherm.pas + 2019/03/01 15:27:42.000.618,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\LoginScherm.dfm 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.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/04 07:49:00.000.838,E:\svn\Delphi\AAPClient\UI\LoginScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas + 2019/03/04 07:49:00.000.838,E:\svn\Delphi\AAPClient\UI\LoginScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm 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 + 2019/03/05 10:56:57.000.976,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\GebruikerService.pas 2019/03/05 11:54:27.000.053,=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/03/05 11:57:08.000.016,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\PopupScherm.pas - 2019/03/05 11:57:08.000.016,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\PopupScherm.dfm + 2019/03/05 11:57:08.000.016,E:\svn\Delphi\AAPClient\UI\PopupScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm + 2019/03/05 11:57:08.000.016,E:\svn\Delphi\AAPClient\UI\PopupScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas 2019/03/06 07:41:24.000.503,=E:\svn\Delphi\AAPClient\Unit1.pas - 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/06 07:41:41.000.580,E:\svn\Delphi\AAPClient\UI\Images.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm + 2019/03/06 07:41:41.000.580,E:\svn\Delphi\AAPClient\UI\Images.pas=E:\svn\Delphi\AAPClient\Unit1.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\UI\HomeScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm + 2019/03/07 08:39:29.000.118,E:\svn\Delphi\AAPClient\UI\HomeScherm.pas=E:\svn\Delphi\AAPClient\Unit1.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\UI\PalletScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm + 2019/03/07 11:29:09.000.427,E:\svn\Delphi\AAPClient\UI\PalletScherm.pas=E:\svn\Delphi\AAPClient\Unit1.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/07 15:19:13.000.507,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.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:45.000.805,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\UI\PalletScherm.pas - 2019/03/08 10:28:02.000.451,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas + 2019/03/08 10:27:08.000.419,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\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\UI\PalletScherm.pas + 2019/03/08 10:27:45.000.805,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\UI\PalletScherm.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas + 2019/03/08 10:28:02.000.451,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.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.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 11:15:19.000.292,E:\svn\Delphi\AAPClient\UI\BestaandePalletScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas + 2019/03/08 11:15:19.000.292,E:\svn\Delphi\AAPClient\UI\BestaandePalletScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm 2019/03/08 13:41:42.000.692,=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/03/08 13:43:18.000.168,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\DnaCodeScherm.dfm - 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\UI\DnaCodeScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm + 2019/03/08 13:43:18.000.167,E:\svn\Delphi\AAPClient\UI\DnaCodeScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas 2019/03/08 16:42:04.000.691,=E:\svn\Delphi\AAPClient\WS.pas 2019/03/08 16:42:12.000.086,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= - 2019/03/08 16:42:32.000.114,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas - 2019/03/12 11:42:34.194,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= - 2019/03/12 11:42:41.845,=E:\svn\Delphi\AAPClient\WS.pas - 2019/03/12 11:42:52.715,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas - 2019/03/18 09:44:48.103,=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/03/18 09:46:03.084,E:\svn\Delphi\AAPClient\UI\InfoLogScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/03/18 09:46:03.084,E:\svn\Delphi\AAPClient\UI\InfoLogScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm - 2019/03/18 11:06:46.842,=E:\svn\Delphi\AAPClient\WS.pas - 2019/03/18 11:07:10.880,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= - 2019/03/18 11:07:23.750,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas + 2019/03/08 16:42:32.000.114,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas + 2019/03/12 11:42:34.000.194,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= + 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.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.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\Unit1.pas=E:\svn\Delphi\AAPClient\UI\InfoLogScherm.pas + 2019/03/18 09:46:03.000.084,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\InfoLogScherm.dfm + 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.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas Index: AAPClient/UI/InfoLogScherm.dfm =================================================================== diff -u -r55 -r63 --- AAPClient/UI/InfoLogScherm.dfm (.../InfoLogScherm.dfm) (revision 55) +++ AAPClient/UI/InfoLogScherm.dfm (.../InfoLogScherm.dfm) (revision 63) @@ -1,5 +1,7 @@ inherited fmInfoLogScherm: TfmInfoLogScherm Caption = 'fmInfoLogScherm' + ExplicitWidth = 320 + ExplicitHeight = 240 PixelsPerInch = 96 TextHeight = 19 object lblToelevering: TLabel [1] Index: AAPClient/ProScan.identcache =================================================================== diff -u -r58 -r63 Binary files differ Index: AAPClient/Win32/Debug/ProScan.exe =================================================================== diff -u -r61 -r63 Binary files differ Index: AAPClient/UI/DrieKnoppenScherm.pas =================================================================== diff -u -r55 -r63 --- AAPClient/UI/DrieKnoppenScherm.pas (.../DrieKnoppenScherm.pas) (revision 55) +++ AAPClient/UI/DrieKnoppenScherm.pas (.../DrieKnoppenScherm.pas) (revision 63) @@ -30,7 +30,7 @@ fImagesScherm: TImagesScherm; protected function ComputerName: String; - procedure ToonPopupScherm(Melding, Actie: String); + function ToonPopupScherm(Melding, Actie1: String; Actie2: String = ''): TModalResult; public { Public declarations } end; @@ -80,14 +80,19 @@ end; -procedure TfmDrieKnoppenScherm.ToonPopupScherm(Melding, Actie: String); +function TfmDrieKnoppenScherm.ToonPopupScherm(Melding, Actie1: String; Actie2: String = ''): TModalResult; var PopupScherm: TfmPopupScherm; begin PopupScherm := TfmPopupScherm.Create(self); PopupScherm.lblWaarschuwing.Caption := Melding; - PopupScherm.btnPopupActie.Caption := Actie; - PopupScherm.ShowModal; + PopupScherm.btnPopupActie.Caption := Actie1; + if Actie2 <> '' then begin + PopupScherm.btnPopupActie.Width := 78; + PopupScherm.btnPopupActie2.Visible := True; + PopupScherm.btnPopupActie2.Caption := Actie2; + end; + result := PopupScherm.ShowModal; end; function TfmDrieKnoppenScherm.ComputerName: String; Index: AAPClient/Win32/Debug/LoginScherm.dcu =================================================================== diff -u -r55 -r63 Binary files differ