Index: AAPClient/UI/PalletScherm.pas =================================================================== diff -u -r327 -r334 --- AAPClient/UI/PalletScherm.pas (.../PalletScherm.pas) (revision 327) +++ AAPClient/UI/PalletScherm.pas (.../PalletScherm.pas) (revision 334) @@ -24,7 +24,6 @@ procedure SetContext; procedure SetModus(GescandeInput: string); function ValideerPalletCode(GescandeInput: string): boolean; - function IsKaderdeurLocatie(GescandeInput: string): boolean; public { Public declarations } end; @@ -35,7 +34,7 @@ implementation uses - DnaCodeService, UiContext, Agent, ProScanMain, StrUtils, System.RegularExpressions; + DnaCodeService, UiContext, Agent, ProScanMain, StrUtils, CommonFunctions; {$R *.dfm} @@ -163,27 +162,20 @@ procedure TfmPalletScherm.SetContext; begin - if IsKaderdeurLocatie(edtPallet.Text) then + if TCommonFunctions.IsKaderdeurLocatie(edtPallet.Text) then UiContext.Pallet := edtPallet.Text else UiContext.Pallet := UpperCase(edtPallet.Text); end; procedure TfmPalletScherm.SetModus(GescandeInput: string); begin - if IsKaderdeurLocatie(GescandeInput) then + if TCommonFunctions.IsKaderdeurLocatie(GescandeInput) then UiContext.Modus := modusKAD else if (Length(GescandeInput)=10) and StartsText('O1',GescandeInput) then UiContext.Modus := modusVHOSS else Uicontext.Modus := modusDefault; end; -function TfmPalletScherm.IsKaderdeurLocatie(GescandeInput: string): boolean; -begin - result := false; - if TRegEx.IsMatch(UpperCase(GescandeInput),'10[kK]..[tT]0.') then - result := true; -end; - end.