Index: AAPClient/UI/BestaandePalletScherm.pas =================================================================== diff -u -r222 -r228 --- AAPClient/UI/BestaandePalletScherm.pas (.../BestaandePalletScherm.pas) (revision 222) +++ AAPClient/UI/BestaandePalletScherm.pas (.../BestaandePalletScherm.pas) (revision 228) @@ -9,29 +9,20 @@ type TfmBestaandePalletScherm = class(TfmDrieKnoppenScherm) - lblPalletCode: TLabel; - pnlAnnuleren: TPanel; - imgAnnuleren: TImage; - lblAnnuleren: TLabel; - pnlExtraToelevering: TPanel; - imgExtraToelevering: TImage; - lblExtraToelevering: TLabel; - pnlHuidigeToelevering: TPanel; - imgHuidigeToelevering: TImage; - lblHuidigeToelevering: TLabel; - pnlRework: TPanel; - imgRework: TImage; - lblRework: TLabel; lblBestaandePallet: TLabel; + btnHuidigeToelevering: TButton; + btnRework: TButton; + btnExtraToelevering: TButton; + btnTerug: TButton; procedure FormShow(Sender: TObject); - procedure actHomeExecute(Sender: TObject); - procedure actPalletExecute(Sender: TObject); procedure btnExtraToeleveringClick(Sender: TObject); procedure btnReworkClick(Sender: TObject); procedure imgHuidigeToeleveringClick(Sender: TObject); procedure imgReworkClick(Sender: TObject); procedure imgExtraToeleveringClick(Sender: TObject); procedure imgRechtsOnderClick(Sender: TObject); + procedure btnHuidigeToeleveringClick(Sender: TObject); + procedure btnTerugClick(Sender: TObject); private function BepaalAantalToeleveringenOpPallet(PalletCode: string): integer; public @@ -48,40 +39,35 @@ {$R *.dfm} -procedure TfmBestaandePalletScherm.actHomeExecute(Sender: TObject); +procedure TfmBestaandePalletScherm.btnExtraToeleveringClick(Sender: TObject); begin inherited; - Self.ModalResult := mrHome; + Self.ModalResult := mrDnaCode; end; -procedure TfmBestaandePalletScherm.actPalletExecute(Sender: TObject); +procedure TfmBestaandePalletScherm.btnHuidigeToeleveringClick(Sender: TObject); begin inherited; - Self.ModalResult := mrPallet; + Self.ModalResult := mrDnaCode; end; -procedure TfmBestaandePalletScherm.btnExtraToeleveringClick(Sender: TObject); +procedure TfmBestaandePalletScherm.btnReworkClick(Sender: TObject); begin inherited; Self.ModalResult := mrDnaCode; end; -procedure TfmBestaandePalletScherm.btnReworkClick(Sender: TObject); +procedure TfmBestaandePalletScherm.btnTerugClick(Sender: TObject); begin inherited; - Self.ModalResult := mrDnaCode; + Self.ModalResult := mrPallet; end; procedure TfmBestaandePalletScherm.FormShow(Sender: TObject); begin btnLinksOnder.Action := actPallet; btnCentraalOnder.Action := actHome; btnRechtsOnder.Action := nil; - lblPalletCode.Caption := UiContext.Pallet; - UiContext.ImagesScherm.ilAlgemeen128.GetIcon(7, imgHuidigeToelevering.Picture.Icon); - UiContext.ImagesScherm.ilAlgemeen128.GetIcon(10, imgRework.Picture.Icon); - UiContext.ImagesScherm.ilAlgemeen128.GetIcon(9, imgExtraToelevering.Picture.Icon); - UiContext.ImagesScherm.ilAlgemeen128.GetIcon(2, imgAnnuleren.Picture.Icon); lblBestaandePallet.Caption := 'Bestaande pallet: '+UiContext.Pallet; inherited; end;