Index: AAPClient/UI/DnaCodeScherm.pas =================================================================== diff -u -r69 -r77 --- AAPClient/UI/DnaCodeScherm.pas (.../DnaCodeScherm.pas) (revision 69) +++ AAPClient/UI/DnaCodeScherm.pas (.../DnaCodeScherm.pas) (revision 77) @@ -24,6 +24,7 @@ procedure actPalletExecute(Sender: TObject); procedure actHomeExecute(Sender: TObject); procedure actVolgendeExecute(Sender: TObject); + procedure btnInfoClick(Sender: TObject); private { Private declarations } public @@ -36,20 +37,20 @@ implementation uses - DnaCodeService; + DnaCodeService, UiContext; {$R *.dfm} procedure TfmDnaCodeScherm.actHomeExecute(Sender: TObject); begin inherited; - // + Self.ModalResult := mrHome; end; procedure TfmDnaCodeScherm.actPalletExecute(Sender: TObject); begin inherited; - // + Self.ModalResult := mrPallet; end; procedure TfmDnaCodeScherm.actVolgendeExecute(Sender: TObject); @@ -75,7 +76,7 @@ Response := Service.DnaCodeAfmelden(Request); try if Response.Header.Status <> '200' then begin - Self.ModalResult := mrRetry; + Self.ModalResult := mrDnaCode; ToonPopupScherm(Response.Header.Omschrijving, 'Probeer opnieuw') end else begin UiContext.Toelevering := Response.DnaCodes[0].Toelevering; @@ -87,7 +88,7 @@ imgGls.Visible := Response.DnaCodes[0].IsGlsDirect; end; lblLaatstGescandData.Caption := Request.DnaCode; - Self.ModalResult := mrIgnore; + Self.ModalResult := mrDnaCode; end; finally Response.Free; @@ -97,6 +98,12 @@ end; end; +procedure TfmDnaCodeScherm.btnInfoClick(Sender: TObject); +begin + inherited; + Self.ModalResult := mrInfoLog; +end; + procedure TfmDnaCodeScherm.FormShow(Sender: TObject); begin btnLinksOnder.Action := actPallet;