Index: AAPClient/ProScan.dproj.local =================================================================== diff -u -r358 -r377 --- AAPClient/ProScan.dproj.local (.../ProScan.dproj.local) (revision 358) +++ AAPClient/ProScan.dproj.local (.../ProScan.dproj.local) (revision 377) @@ -2,143 +2,144 @@ 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,E:\svn\Delphi\AAPClient\ProScanMain.dfm=C:\Users\TomV\Documents\RAD Studio\Projects\Unit2.dfm - 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:26:05.000.981,E:\svn\Delphi\AAPClient\ProScan.dproj=C:\Users\TomV\Documents\RAD Studio\Projects\Project2.dproj + 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:25:57.000.930,C:\Users\TomV\Documents\RAD Studio\Projects\Unit2.pas=E:\svn\Delphi\AAPClient\ProScanMain.pas + 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:28:35.000.977,=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 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\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 15:26:22.000.761,=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/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/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\UI\LoginScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm - 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\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.pas=E:\svn\Delphi\AAPClient\WS\GebruikerService.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 11:54:27.000.053,=E:\svn\Delphi\AAPClient\Unit1.pas - 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/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/06 07:41:24.000.503,=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/03/06 07:41:41.000.580,E:\svn\Delphi\AAPClient\UI\Images.pas=E:\svn\Delphi\AAPClient\Unit1.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\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\UI\HomeScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas - 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\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 11:22:02.000.536,=E:\svn\Delphi\AAPClient\Unit1.pas - 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 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 15:18:54.000.922,=E:\svn\Delphi\AAPClient\WS.pas - 2019/03/07 15:19:13.000.507,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=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\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\UI\PalletScherm.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:45.000.805,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\UI\PalletScherm.dfm=E:\svn\Delphi\AAPClient\WS\DnaCodeService.dfm - 2019/03/08 10:28:02.000.451,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.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.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\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 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\UI\DnaCodeScherm.pas=E:\svn\Delphi\AAPClient\Unit1.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\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 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\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.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.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/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\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 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.pas=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 2019/03/19 14:36:29.000.587,=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/03/19 14:42:58.000.764,E:\svn\Delphi\AAPClient\UI\UiContext.pas=E:\svn\Delphi\AAPClient\Unit1.pas + 2019/03/19 14:42:58.000.764,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\UiContext.pas 2019/03/20 14:52:28.000.434,=E:\svn\Delphi\AAPClient\WS.pas 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\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.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\UI\HernoemPalletScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/03/22 12:42:12.000.397,E:\svn\Delphi\AAPClient\UI\HernoemPalletScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm + 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.pas=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 2019/05/02 15:08:14.000.961,=E:\svn\Delphi\AAPClient\WS.pas 2019/05/02 15:08:28.000.270,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= - 2019/05/02 15:08:38.000.127,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas + 2019/05/02 15:08:38.000.127,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas 2019/09/03 15:55:43.000.155,=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/09/03 15:56:30.000.060,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\LoginScherm2.pas - 2019/09/03 15:56:30.000.060,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\LoginScherm2.dfm + 2019/09/03 15:56:30.000.060,E:\svn\Delphi\AAPClient\UI\LoginScherm2.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm + 2019/09/03 15:56:30.000.060,E:\svn\Delphi\AAPClient\UI\LoginScherm2.pas=E:\svn\Delphi\AAPClient\Unit1.pas 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\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\DimmerForm.dfm - 2019/09/04 13:17:21.000.462,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\DimmerForm.pas + 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\UI\DnaCodeScherm.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas - 2019/09/06 07:40:00.000.929,E:\svn\Delphi\AAPClient\UI\DnaCodeScherm.dfm=E:\svn\Delphi\AAPClient\WS\DnaCodeService.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.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas + 2019/09/06 07:46:50.000.159,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas 2019/09/09 10:12:07.000.120,E:\svn\Delphi\AAPClient\UI\LoginScherm.pas= 2019/09/25 09:00:58.000.441,=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/09/25 09:40:05.000.670,E:\svn\Delphi\AAPClient\UI\DnaCodeReedsGescandScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm - 2019/09/25 09:40:05.000.670,E:\svn\Delphi\AAPClient\UI\DnaCodeReedsGescandScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas + 2019/09/25 09:40:05.000.670,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\DnaCodeReedsGescandScherm.pas + 2019/09/25 09:40:05.000.670,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\DnaCodeReedsGescandScherm.dfm 2019/10/01 13:49:36.000.449,=E:\svn\Delphi\AAPClient\WS.pas 2019/10/01 13:49:56.000.314,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= - 2019/10/01 13:50:07.000.220,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas + 2019/10/01 13:50:07.000.220,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas 2019/10/02 13:33:49.000.729,=E:\svn\Delphi\AAPClient\WS.pas 2019/10/02 13:33:55.000.547,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= - 2019/10/02 13:34:08.000.237,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas + 2019/10/02 13:34:08.000.237,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas 2019/10/02 15:42:02.000.588,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= 2019/10/02 15:42:14.000.814,=E:\svn\Delphi\AAPClient\WS.pas - 2019/10/02 15:42:25.000.143,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas + 2019/10/02 15:42:25.000.143,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas 2019/10/03 11:18:12.000.484,=E:\svn\Delphi\AAPClient\WS.pas 2019/10/03 15:21:13.000.953,=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/10/03 15:21:30.000.855,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\WS\Agent.pas + 2019/10/03 15:21:30.000.855,E:\svn\Delphi\AAPClient\WS\Agent.pas=E:\svn\Delphi\AAPClient\Unit1.pas 2019/10/07 09:39:36.000.456,=E:\svn\Delphi\AAPClient\WS.pas 2019/10/07 09:39:44.000.760,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= - 2019/10/07 09:40:00.000.589,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas + 2019/10/07 09:40:00.000.589,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas 2019/10/07 09:43:00.000.939,=E:\svn\Delphi\AAPClient\WS.pas 2019/10/07 09:43:11.000.201,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= - 2019/10/07 09:43:28.000.012,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas + 2019/10/07 09:43:28.000.012,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas 2019/10/07 10:02:08.000.507,=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/10/07 10:02:34.000.480,E:\svn\Delphi\AAPClient\UI\CommonFunctions.pas=E:\svn\Delphi\AAPClient\Unit1.pas + 2019/10/07 10:02:34.000.480,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\CommonFunctions.pas 2019/10/15 10:29:07.000.266,=E:\svn\Delphi\AAPClient\WS.pas 2019/10/15 10:29:23.000.010,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= - 2019/10/15 10:29:44.000.142,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas + 2019/10/15 10:29:44.000.142,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas 2019/10/21 13:21:40.000.148,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= 2019/10/21 13:21:55.000.323,=E:\svn\Delphi\AAPClient\WS.pas - 2019/10/21 13:22:13.000.787,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas + 2019/10/21 13:22:13.000.787,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas 2020/02/13 14:45:20.000.233,=E:\svn\Delphi\AAPClient\WS.pas 2020/02/13 14:45:36.000.322,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= - 2020/02/13 14:45:56.000.560,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas + 2020/02/13 14:45:56.000.560,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas 2020/03/16 11:37:39.000.897,=E:\svn\Delphi\AAPClient\WS.pas 2020/03/16 11:37:49.000.784,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= - 2020/03/16 11:38:05.000.598,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas + 2020/03/16 11:38:05.000.598,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas 2020/03/20 17:13:18.000.846,=E:\svn\Delphi\AAPClient\WS.pas 2020/03/20 17:13:25.000.428,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= - 2020/03/20 17:13:40.000.466,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas + 2020/03/20 17:13:40.000.466,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas 2020/03/23 12:12:38.000.123,=E:\svn\Delphi\AAPClient\WS.pas 2020/03/23 12:12:48.000.665,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= - 2020/03/23 12:13:04.000.234,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas + 2020/03/23 12:13:04.000.234,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas 2020/04/03 10:30:15.000.465,=E:\svn\Delphi\AAPClient\WS.pas 2020/04/03 10:30:37.000.131,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= - 2020/04/03 10:31:50.000.819,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas - 2020/04/21 13:48:23.846,=E:\svn\Delphi\AAPClient\WS.pas - 2020/04/21 13:48:39.235,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= - 2020/04/21 13:48:57.462,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas + 2020/04/03 10:31:50.000.819,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas + 2020/04/21 13:48:23.000.846,=E:\svn\Delphi\AAPClient\WS.pas + 2020/04/21 13:48:39.000.235,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= + 2020/04/21 13:48:57.000.462,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas + @@ -162,11 +163,10 @@ - - + Index: AAPClient/UI/DnaCodeScherm.pas =================================================================== diff -u -r359 -r377 --- AAPClient/UI/DnaCodeScherm.pas (.../DnaCodeScherm.pas) (revision 359) +++ AAPClient/UI/DnaCodeScherm.pas (.../DnaCodeScherm.pas) (revision 377) @@ -133,22 +133,24 @@ procedure TfmDnaCodeScherm.actAfrondenExecute(Sender: TObject); var fWaarschuwingModalResult: TModalResult; + fIsDirecteLevering: boolean; begin inherited; if UiContext.Toelevering = '' then exit; - if UiContext.Modus = modusKAD then begin + if (UiContext.Modus = modusKAD) then begin RondAfKaderdeurDag(); UiContext.Toelevering := ''; UiContext.Pallet := ''; end else begin if lblAantalGescand.Caption = lblTotaalAantal.Caption then begin - if BepaalDirecteLevering then begin + fIsDirecteLevering := (UiContext.Modus = modusDefault) and BepaalDirecteLevering; + if fIsDirecteLevering then begin ToonPopupScherm('Directe levering', 'OK','',15,-1,-1,clBlue); imgDirecteLevering.Visible := true; end; - ZetToeleveringStatus(DnaCodeStatus.InBuffer, BepaalDirecteLevering); + ZetToeleveringStatus(DnaCodeStatus.InBuffer, fIsDirecteLevering); if Self.ModalResult = mrPallet then begin ToonPopupScherm('Toelevering succesvol afgerond','OK','',19,-1,-1,clGreen); UiContext.Toelevering := ''; @@ -241,7 +243,7 @@ UiContext.LaatsteDnaCode := edtDnaCode.Text; lblLaatstGescandData.Caption := edtDnaCode.Text; - if UiContext.Modus = modusKAD then begin + if (UiContext.Modus = modusKAD) then begin Locatie := UiContext.Pallet; end else begin Locatie := '' @@ -256,13 +258,15 @@ UiContext.Toelevering := Response.DnaCodes[0].Toelevering; lblAantalGescand.Caption := IntToStr(Response.AantalReedsGescand); lblTotaalAantal.Caption := IntToStr(Response.AantalInToelevering); - if not UiContext.Modus = modusKAD then + if not (UiContext.Modus = modusKAD) then btnInfo.Visible := true; ZetIcoontjesBovenaan; VerwerkMogelijkePopups(Response.DnaCodes[0]); Self.ModalResult := mrDnaCode; end; 1005: begin //reeds gescand + if not (UiContext.Modus = modusKAD) then + btnInfo.Visible := true; Self.ModalResult := mrDnaCodeReedsGescand; end; else begin @@ -311,7 +315,7 @@ UiContext.Toelevering := Response.DnaCodes[0].Toelevering; lblAantalGescand.Caption := IntToStr(Response.AantalReedsGescand); lblTotaalAantal.Caption := IntToStr(Response.AantalInToelevering); - if not UiContext.Modus = modusKAD then + if not (UiContext.Modus = modusKAD) then btnInfo.Visible := true; ZetIcoontjesBovenaan; VerwerkMogelijkePopups(Response.DnaCodes[0]); @@ -324,22 +328,24 @@ procedure TfmDnaCodeScherm.VerwerkMogelijkePopups(EersteDnaCode: DnaCode); begin - if EersteDnaCode.IsDirecteLevering then begin - if not UiContext.IsDirecteLeveringPopupGetoond then begin - ToonPopupScherm('Directe levering', 'OK','',15,-1,-1,clBlue); - UiContext.IsDirecteLeveringPopupGetoond := true; + if UiContext.Modus = modusDefault then begin + if EersteDnaCode.IsDirecteLevering then begin + if not UiContext.IsDirecteLeveringPopupGetoond then begin + ToonPopupScherm('Directe levering', 'OK','',15,-1,-1,clBlue); + UiContext.IsDirecteLeveringPopupGetoond := true; + end; end; - end; - imgDirecteLevering.Visible := EersteDnaCode.IsDirecteLevering; + imgDirecteLevering.Visible := EersteDnaCode.IsDirecteLevering; - if EersteDnaCode.IsWegwerpPallet then begin - if not UiContext.IsWegwerpPalletPopupGetoond then begin - ToonPopupScherm('Wegwerppallet', 'OK','',16,-1,-1,clYellow); - UiContext.IsWegwerpPalletPopupGetoond := true; + if EersteDnaCode.IsWegwerpPallet then begin + if not UiContext.IsWegwerpPalletPopupGetoond then begin + ToonPopupScherm('Wegwerppallet', 'OK','',16,-1,-1,clYellow); + UiContext.IsWegwerpPalletPopupGetoond := true; + end; end; + imgWegwerpPallet.Visible := EersteDnaCode.IsWegwerpPallet; + Repaint; end; - imgWegwerpPallet.Visible := EersteDnaCode.IsWegwerpPallet; - Repaint; end; procedure TfmDnaCodeScherm.ZetIcoontjesBovenaan; @@ -421,7 +427,7 @@ DnaCodes: ArrayOfDnaCodeDnaCode; ii: integer; begin - fZoekViaPalletCodeResponse := TAgent.Create(UiContext).ZoekViaPalletCode(UiContext.Pallet); + {fZoekViaPalletCodeResponse := TAgent.Create(UiContext).ZoekViaPalletCode(UiContext.Pallet); try if fZoekViaPalletCodeResponse.Header.Status = '200' then begin DnaCodes := fZoekViaPalletCodeResponse.DnaCodes; @@ -435,7 +441,7 @@ DnaCodesStringList := TStringList.Create(); ii := 0; while ii < length(DnaCodes)-1 do begin - DnaCodesStringList.Add(DnaCodes[ii].DnaCode) + DnaCodesStringList.Add(DnaCodes[ii].DnaCode) <-- geeft AV in test6 end; fProboxAfdrukkenResponse := TAgent.Create(UiContext).ProboxEtiketAfdrukken(DnaCodesStringList); @@ -448,7 +454,7 @@ end; finally fProboxAfdrukkenResponse.Free; - end; + end;} end; end. Index: AAPClient/ProScan.dproj =================================================================== diff -u -r358 -r377 --- AAPClient/ProScan.dproj (.../ProScan.dproj) (revision 358) +++ AAPClient/ProScan.dproj (.../ProScan.dproj) (revision 377) @@ -70,7 +70,7 @@ true - displaymode=desktop server=cacheaccept2010 + displaymode=desktop server=tve-w10 ProScan_Icon.ico true 1033