Index: AAPClient/ProScanMain.pas
===================================================================
diff -u -r39 -r41
--- AAPClient/ProScanMain.pas (.../ProScanMain.pas) (revision 39)
+++ AAPClient/ProScanMain.pas (.../ProScanMain.pas) (revision 41)
@@ -128,11 +128,11 @@
else if fHuidigScherm.ModalResult = mrOk then begin
fHuidigScherm := fPalletScherm;
end
- else if fHuidigScherm.ModalResult = mrOk then begin
- ShowMessage('DnaCodeLeeg scherm');
- end
- else if fHuidigScherm.ModalResult = mrOk then begin
+ else if fHuidigScherm.ModalResult = mrRetry then begin
ShowMessage('DnaCodeGevuld scherm');
+ end
+ else if fHuidigScherm.ModalResult = mrCancel then begin
+ ShowMessage('DnaCodeLeeg scherm');
end;
continue;
end;
Index: AAPClient/Win32/Debug/ProScanMain.dcu
===================================================================
diff -u -r39 -r41
Binary files differ
Index: AAPClient/ProScan.dproj
===================================================================
diff -u -r37 -r41
--- AAPClient/ProScan.dproj (.../ProScan.dproj) (revision 37)
+++ AAPClient/ProScan.dproj (.../ProScan.dproj) (revision 41)
@@ -116,6 +116,10 @@
dfm
+
+
+ dfm
+
Cfg_2
Base
Index: AAPClient/ProScan.dproj.local
===================================================================
diff -u -r37 -r41
--- AAPClient/ProScan.dproj.local (.../ProScan.dproj.local) (revision 37)
+++ AAPClient/ProScan.dproj.local (.../ProScan.dproj.local) (revision 41)
@@ -2,35 +2,35 @@
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.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: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: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\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\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\LoginScherm.dfm
2019/03/01 15:27:42.000.618,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\LoginScherm.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.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/04 07:49:00.000.838,E:\svn\Delphi\AAPClient\UI\LoginScherm.pas=E:\svn\Delphi\AAPClient\Unit1.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 11:54:27.053,=E:\svn\Delphi\AAPClient\Unit1.pas
- 2019/03/05 11:57:08.016,E:\svn\Delphi\AAPClient\UI\PopupScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas
2019/03/05 11:57:08.016,E:\svn\Delphi\AAPClient\UI\PopupScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm
+ 2019/03/05 11:57:08.016,E:\svn\Delphi\AAPClient\UI\PopupScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas
2019/03/06 07:41:24.503,=E:\svn\Delphi\AAPClient\Unit1.pas
- 2019/03/06 07:41:41.580,E:\svn\Delphi\AAPClient\UI\Images.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm
2019/03/06 07:41:41.580,E:\svn\Delphi\AAPClient\UI\Images.pas=E:\svn\Delphi\AAPClient\Unit1.pas
+ 2019/03/06 07:41:41.580,E:\svn\Delphi\AAPClient\UI\Images.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm
2019/03/07 08:39:12.150,=E:\svn\Delphi\AAPClient\Unit1.pas
- 2019/03/07 08:39:29.118,E:\svn\Delphi\AAPClient\UI\HomeScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas
2019/03/07 08:39:29.118,E:\svn\Delphi\AAPClient\UI\HomeScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm
+ 2019/03/07 08:39:29.118,E:\svn\Delphi\AAPClient\UI\HomeScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas
2019/03/07 11:22:02.536,=E:\svn\Delphi\AAPClient\Unit1.pas
- 2019/03/07 11:29:09.427,E:\svn\Delphi\AAPClient\UI\PalletScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm
2019/03/07 11:29:09.427,E:\svn\Delphi\AAPClient\UI\PalletScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas
+ 2019/03/07 11:29:09.427,E:\svn\Delphi\AAPClient\UI\PalletScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm
2019/03/07 15:18:54.922,=E:\svn\Delphi\AAPClient\WS.pas
2019/03/07 15:19:13.507,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas
2019/03/08 10:21:18.208,=E:\svn\Delphi\AAPClient\WS.pas
@@ -43,6 +43,9 @@
2019/03/08 11:14:25.860,=E:\svn\Delphi\AAPClient\Unit1.pas
2019/03/08 11:15:19.292,E:\svn\Delphi\AAPClient\UI\BestaandePalletScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas
2019/03/08 11:15:19.292,E:\svn\Delphi\AAPClient\UI\BestaandePalletScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm
+ 2019/03/08 13:41:42.692,=E:\svn\Delphi\AAPClient\Unit1.pas
+ 2019/03/08 13:43:18.167,E:\svn\Delphi\AAPClient\UI\DnaCodeScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas
+ 2019/03/08 13:43:18.168,E:\svn\Delphi\AAPClient\UI\DnaCodeScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm
@@ -60,6 +63,8 @@
+
+
Index: AAPClient/UI/DnaCodeScherm.pas
===================================================================
diff -u -r40 -r41
--- AAPClient/UI/DnaCodeScherm.pas (.../DnaCodeScherm.pas) (revision 40)
+++ AAPClient/UI/DnaCodeScherm.pas (.../DnaCodeScherm.pas) (revision 41)
@@ -9,6 +9,15 @@
type
TfmDnaCodeScherm = class(TfmDrieKnoppenScherm)
+ lblToelevering: TLabel;
+ lblScancode: TLabel;
+ edtDnaCode: TEdit;
+ lblPalletCode: TLabel;
+ lblLaatstGescand: TLabel;
+ lblLaatstGescandData: TLabel;
+ lblAantalGescand: TLabel;
+ lblTotaalAantal: TLabel;
+ lblSlash: TLabel;
procedure FormShow(Sender: TObject);
private
{ Private declarations }
@@ -28,8 +37,8 @@
btnLinksOnder.Action := actPallet;
btnCentraalOnder.Action := actHome;
btnRechtsOnder.Action := actVolgende;
- //edtPallet.Text := '';
- //ActiveControl := edtPallet;
+ edtDnaCode.Text := '';
+ ActiveControl := edtDnaCode;
inherited;
end;
Index: AAPClient/UI/DnaCodeScherm.dfm
===================================================================
diff -u -r40 -r41
--- AAPClient/UI/DnaCodeScherm.dfm (.../DnaCodeScherm.dfm) (revision 40)
+++ AAPClient/UI/DnaCodeScherm.dfm (.../DnaCodeScherm.dfm) (revision 41)
@@ -2,4 +2,74 @@
Caption = 'fmDnaCodeScherm'
PixelsPerInch = 96
TextHeight = 19
+ object lblToelevering: TLabel [1]
+ Left = 144
+ Top = 8
+ Width = 73
+ Height = 19
+ AutoSize = False
+ end
+ object lblScancode: TLabel [2]
+ Left = 108
+ Top = 40
+ Width = 109
+ Height = 19
+ Caption = 'Scan DNA code'
+ end
+ object lblPalletCode: TLabel [3]
+ Left = 8
+ Top = 100
+ Width = 73
+ Height = 19
+ AutoSize = False
+ end
+ object lblLaatstGescand: TLabel [4]
+ Left = 8
+ Top = 140
+ Width = 113
+ Height = 19
+ AutoSize = False
+ Caption = 'Laatst gescand:'
+ end
+ object lblLaatstGescandData: TLabel [5]
+ Left = 144
+ Top = 140
+ Width = 73
+ Height = 19
+ AutoSize = False
+ end
+ object lblAantalGescand: TLabel [6]
+ Left = 8
+ Top = 68
+ Width = 33
+ Height = 19
+ Alignment = taRightJustify
+ AutoSize = False
+ end
+ object lblTotaalAantal: TLabel [7]
+ Left = 56
+ Top = 68
+ Width = 33
+ Height = 19
+ AutoSize = False
+ end
+ object lblSlash: TLabel [8]
+ Left = 41
+ Top = 68
+ Width = 9
+ Height = 19
+ AutoSize = False
+ Caption = '/'
+ end
+ object edtDnaCode: TEdit [12]
+ Left = 108
+ Top = 65
+ Width = 109
+ Height = 27
+ TabOrder = 3
+ end
+ inherited alAlgemeen: TActionList
+ Left = 16
+ Top = 160
+ end
end
Index: AAPClient/ProScan.dpr
===================================================================
diff -u -r37 -r41
--- AAPClient/ProScan.dpr (.../ProScan.dpr) (revision 37)
+++ AAPClient/ProScan.dpr (.../ProScan.dpr) (revision 41)
@@ -11,7 +11,8 @@
HomeScherm in 'UI\HomeScherm.pas' {fmHomeScherm},
PalletScherm in 'UI\PalletScherm.pas' {fmPalletScherm},
DnaCodeService in 'WS\DnaCodeService.pas',
- BestaandePalletScherm in 'UI\BestaandePalletScherm.pas' {fmBestaandePalletScherm};
+ BestaandePalletScherm in 'UI\BestaandePalletScherm.pas' {fmBestaandePalletScherm},
+ DnaCodeScherm in 'UI\DnaCodeScherm.pas' {fmDnaCodeScherm};
{$R *.res}
@@ -27,5 +28,6 @@
Application.CreateForm(TfmHomeScherm, fmHomeScherm);
Application.CreateForm(TfmPalletScherm, fmPalletScherm);
Application.CreateForm(TfmBestaandePalletScherm, fmBestaandePalletScherm);
+ Application.CreateForm(TfmDnaCodeScherm, fmDnaCodeScherm);
Application.Run;
end.
Index: AAPClient/Win32/Debug/ProScan.exe
===================================================================
diff -u -r39 -r41
Binary files differ