Index: AAPClient/UI/DnaCodeScherm.pas =================================================================== diff -u -r95 -r126 --- AAPClient/UI/DnaCodeScherm.pas (.../DnaCodeScherm.pas) (revision 95) +++ AAPClient/UI/DnaCodeScherm.pas (.../DnaCodeScherm.pas) (revision 126) @@ -9,24 +9,29 @@ type TfmDnaCodeScherm = class(TfmDrieKnoppenScherm) - lblToelevering: TLabel; + lblToeleveringData: TLabel; lblScancode: TLabel; edtDnaCode: TEdit; - lblPalletCode: TLabel; + lblHuidigePalletData: TLabel; lblLaatstGescand: TLabel; lblLaatstGescandData: TLabel; lblAantalGescand: TLabel; lblTotaalAantal: TLabel; lblSlash: TLabel; imgGls: TImage; - btnInfo: TButton; + lblHuidigePallet: TLabel; + lblScanPallet: TLabel; + lblToelevering: TLabel; + imgInfo: TImage; procedure FormShow(Sender: TObject); procedure actPalletExecute(Sender: TObject); procedure actHomeExecute(Sender: TObject); procedure btnInfoClick(Sender: TObject); procedure actVolgendeExecute(Sender: TObject); procedure edtDnaCodeKeyPress(Sender: TObject; var Key: Char); + procedure FormCreate(Sender: TObject); private + fImagesScherm: TImagesScherm; procedure MeldDnaCodeAf(); procedure ZetToeleveringStatus(Status: DnaCodeStatus); procedure ToeleveringDataOphalen(); @@ -96,15 +101,21 @@ end; end; +procedure TfmDnaCodeScherm.FormCreate(Sender: TObject); +begin + inherited; + fImagesScherm := TImagesScherm.Create(self); +end; + procedure TfmDnaCodeScherm.FormShow(Sender: TObject); begin btnLinksOnder.Action := actPallet; btnCentraalOnder.Action := actHome; btnRechtsOnder.Action := actVolgende; edtDnaCode.Text := ''; ActiveControl := edtDnaCode; - lblPalletCode.Caption := UiContext.Pallet; - + lblHuidigePalletData.Caption := UiContext.Pallet; + fImagesScherm.ilAlgemeen64.GetIcon(1, imgInfo.Picture.Icon); if not (UiContext.Toelevering = '') then ToeleveringDataOphalen(); @@ -138,7 +149,7 @@ ToonPopupScherm(Response.Header.Omschrijving, 'Probeer opnieuw') end else begin UiContext.Toelevering := Response.DnaCodes[0].Toelevering; - lblToelevering.Caption := UiContext.Toelevering; + lblToeleveringData.Caption := UiContext.Toelevering; lblAantalGescand.Caption := IntToStr(Response.AantalReedsGescand); lblTotaalAantal.Caption := IntToStr(Response.AantalInToelevering); if Response.DnaCodes[0].IsGlsDirect then begin @@ -179,7 +190,7 @@ ToonPopupScherm(Response.Header.Omschrijving, 'Probeer opnieuw') end else begin UiContext.Toelevering := Response.DnaCodes[0].Toelevering; - lblToelevering.Caption := UiContext.Toelevering; + lblToeleveringData.Caption := UiContext.Toelevering; lblAantalGescand.Caption := IntToStr(Response.AantalReedsGescand); lblTotaalAantal.Caption := IntToStr(Response.AantalInToelevering); if Response.DnaCodes[0].IsGlsDirect then begin