Index: AAPClient/ProScan.dpr
===================================================================
diff -u -r199 -r201
--- AAPClient/ProScan.dpr (.../ProScan.dpr) (revision 199)
+++ AAPClient/ProScan.dpr (.../ProScan.dpr) (revision 201)
@@ -18,7 +18,8 @@
DimmerForm in 'UI\DimmerForm.pas' {fmDimmerForm},
DnaCodeReedsGescandScherm in 'UI\DnaCodeReedsGescandScherm.pas' {fmDnaCodeReedsGescandScherm},
Agent in 'WS\Agent.pas',
- DnaCodeService in 'WS\DnaCodeService.pas';
+ DnaCodeService in 'WS\DnaCodeService.pas',
+ CommonFunctions in 'UI\CommonFunctions.pas';
{$R *.res}
Index: AAPClient/UI/HernoemPalletScherm.dfm
===================================================================
diff -u -r196 -r201
--- AAPClient/UI/HernoemPalletScherm.dfm (.../HernoemPalletScherm.dfm) (revision 196)
+++ AAPClient/UI/HernoemPalletScherm.dfm (.../HernoemPalletScherm.dfm) (revision 201)
@@ -34,7 +34,7 @@
Top = 57
Width = 480
Height = 451
- ActivePage = tsNieuweCode
+ ActivePage = tsResultaat
Align = alClient
Style = tsFlatButtons
TabOrder = 2
@@ -81,26 +81,23 @@
Caption = 'tsResultaat'
ImageIndex = 1
TabVisible = False
- ExplicitLeft = 0
- ExplicitTop = 0
- ExplicitWidth = 0
- ExplicitHeight = 140
object sgToeleveringData: TStringGrid
Left = 4
Top = 18
Width = 379
Height = 399
ColCount = 1
DefaultColWidth = 93
+ DefaultRowHeight = 30
DrawingStyle = gdsGradient
FixedCols = 0
RowCount = 2
Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText
- Font.Height = -27
+ Font.Height = -24
Font.Name = 'Tahoma'
Font.Style = []
- Options = [goFixedVertLine, goFixedHorzLine, goVertLine, goHorzLine, goRangeSelect, goRowSelect]
+ Options = [goFixedVertLine, goFixedHorzLine, goVertLine, goHorzLine, goRowSelect]
ParentFont = False
ScrollBars = ssNone
TabOrder = 0
Index: AAPClient/UI/InfoLogScherm.pas
===================================================================
diff -u -r195 -r201
--- AAPClient/UI/InfoLogScherm.pas (.../InfoLogScherm.pas) (revision 195)
+++ AAPClient/UI/InfoLogScherm.pas (.../InfoLogScherm.pas) (revision 201)
@@ -47,7 +47,7 @@
implementation
uses
- Agent;
+ Agent, CommonFunctions;
{$R *.dfm}
@@ -172,7 +172,7 @@
for DnaCodeTeller := 0 to length(DnaCodes)-1 do begin
if (ToonGescand and (DnaCodes[DnaCodeTeller].InitialenScanner <> '')) or
((not ToonGescand) and (DnaCodes[DnaCodeTeller].InitialenScanner = '')) then begin
- sgToeleveringData.Rows[sgToeleveringData.RowCount-1].Add(DnaCodes[DnaCodeTeller].DnaCode);
+ sgToeleveringData.Rows[sgToeleveringData.RowCount-1].Add(TCommonFunctions.VerkorteDnaCode(DnaCodes[DnaCodeTeller].DnaCode));
sgToeleveringData.Rows[sgToeleveringData.RowCount-1].Append(DnaCodes[DnaCodeTeller].PalletCode);
sgToeleveringData.RowCount := sgToeleveringData.RowCount + 1;
end;
Index: AAPClient/UI/HernoemPalletScherm.pas
===================================================================
diff -u -r196 -r201
--- AAPClient/UI/HernoemPalletScherm.pas (.../HernoemPalletScherm.pas) (revision 196)
+++ AAPClient/UI/HernoemPalletScherm.pas (.../HernoemPalletScherm.pas) (revision 201)
@@ -51,7 +51,7 @@
implementation
uses
- UiContext, Agent;
+ UiContext, Agent, CommonFunctions;
{$R *.dfm}
@@ -167,7 +167,7 @@
begin
GridLeegMaken();
for DnaCodeTeller := 0 to length(DnaCodes)-1 do begin
- sgToeleveringData.Rows[sgToeleveringData.RowCount-1].Add(DnaCodes[DnaCodeTeller].DnaCode);
+ sgToeleveringData.Rows[sgToeleveringData.RowCount-1].Add(TCommonFunctions.VerkorteDnaCode(DnaCodes[DnaCodeTeller].DnaCode));
sgToeleveringData.RowCount := sgToeleveringData.RowCount + 1;
end;
if sgToeleveringData.RowCount > 2 then
Index: AAPClient/UI/CommonFunctions.pas
===================================================================
diff -u
--- AAPClient/UI/CommonFunctions.pas (revision 0)
+++ AAPClient/UI/CommonFunctions.pas (revision 201)
@@ -0,0 +1,22 @@
+unit CommonFunctions;
+
+interface
+
+type
+ TCommonFunctions = class
+ private
+ public
+ class function VerkorteDnaCode(DnaCode: string): string;
+ end;
+
+
+implementation
+
+{ TCommonFunctions }
+
+class function TCommonFunctions.VerkorteDnaCode(DnaCode: string): string;
+begin
+ result := Copy(DnaCode,2,5);
+end;
+
+end.
Index: AAPClient/ProScan.dproj
===================================================================
diff -u -r199 -r201
--- AAPClient/ProScan.dproj (.../ProScan.dproj) (revision 199)
+++ AAPClient/ProScan.dproj (.../ProScan.dproj) (revision 201)
@@ -130,6 +130,7 @@
+
Cfg_2
Base
Index: AAPClient/ProScan.dproj.local
===================================================================
diff -u -r199 -r201
--- AAPClient/ProScan.dproj.local (.../ProScan.dproj.local) (revision 199)
+++ AAPClient/ProScan.dproj.local (.../ProScan.dproj.local) (revision 201)
@@ -2,12 +2,12 @@
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: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\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.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
@@ -20,17 +20,17 @@
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.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\UI\PopupScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.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\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\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 08:39:29.000.118,E:\svn\Delphi\AAPClient\UI\HomeScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.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.pas=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 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/08 10:21:18.000.208,=E:\svn\Delphi\AAPClient\WS.pas
@@ -44,8 +44,8 @@
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\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 13:43:18.000.168,E:\svn\Delphi\AAPClient\UI\DnaCodeScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.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
@@ -73,11 +73,11 @@
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/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\Unit1.pas=E:\svn\Delphi\AAPClient\UI\LoginScherm2.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.pas=E:\svn\Delphi\AAPClient\UI\DimmerForm.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 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=
@@ -88,8 +88,8 @@
2019/09/06 07:46:50.000.159,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.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\UI\DnaCodeReedsGescandScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.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
@@ -108,6 +108,8 @@
2019/10/07 09:43:00.939,=E:\svn\Delphi\AAPClient\WS.pas
2019/10/07 09:43:11.201,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=
2019/10/07 09:43:28.012,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas
+ 2019/10/07 10:02:08.507,=E:\svn\Delphi\AAPClient\Unit1.pas
+ 2019/10/07 10:02:34.480,E:\svn\Delphi\AAPClient\UI\CommonFunctions.pas=E:\svn\Delphi\AAPClient\Unit1.pas
@@ -136,6 +138,7 @@
+