Index: AAPClient/UI/InfoLogScherm.pas =================================================================== diff -u -r204 -r213 --- AAPClient/UI/InfoLogScherm.pas (.../InfoLogScherm.pas) (revision 204) +++ AAPClient/UI/InfoLogScherm.pas (.../InfoLogScherm.pas) (revision 213) @@ -31,7 +31,6 @@ procedure actSchermRechtsExecute(Sender: TObject); procedure actSchermLinksExecute(Sender: TObject); private - ToonGescand: boolean; function ToeleveringDataOphalen(): ZoekViaToeleveringResponse; procedure VulGridMetToeleveringData(DnaCodes: array of DnaCode); procedure GridLeegmaken(); @@ -120,7 +119,6 @@ inherited; sgToeleveringData.Cols[0].Text := 'DNA Code'; sgToeleveringData.Cols[1].Text := 'Pallet'; - ToonGescand := True; end; procedure TfmInfoLogScherm.FormShow(Sender: TObject); @@ -129,7 +127,7 @@ begin btnLinksOnder.Action := actSluiten; btnCentraalOnder.Action := actOngedaanMaken; - if ToonGescand then begin + if UiContext.InfoLogSchermToonGescand then begin btnRechtsOnder.Action := actSchermRechts; end else begin btnRechtsOnder.Action := actSchermLinks; @@ -149,7 +147,7 @@ if Response.Header.Status <> '200' then begin ToonPopupScherm(Response.Header.Omschrijving, 'Probeer opnieuw','') end else begin - if ToonGescand then begin + if UiContext.InfoLogSchermToonGescand then begin lblAantallen.Caption := 'Afgescand'; lblAantalGescand.Caption := IntToStr(Response.AantalReedsGescand); end else begin @@ -170,8 +168,8 @@ begin GridLeegMaken(); for DnaCodeTeller := 0 to length(DnaCodes)-1 do begin - if (ToonGescand and (DnaCodes[DnaCodeTeller].InitialenScanner <> '')) or - ((not ToonGescand) and (DnaCodes[DnaCodeTeller].InitialenScanner = '')) then begin + if (UiContext.InfoLogSchermToonGescand and (DnaCodes[DnaCodeTeller].InitialenScanner <> '')) or + ((not UiContext.InfoLogSchermToonGescand) and (DnaCodes[DnaCodeTeller].InitialenScanner = '')) then begin sgToeleveringData.Rows[sgToeleveringData.RowCount-1].Add(TCommonFunctions.VerkorteDnaCode(DnaCodes[DnaCodeTeller].DnaCode)); sgToeleveringData.Rows[sgToeleveringData.RowCount-1][1] := (DnaCodes[DnaCodeTeller].PalletCode); sgToeleveringData.Rows[sgToeleveringData.RowCount-1][2] := (DnaCodes[DnaCodeTeller].DnaCode); @@ -180,7 +178,7 @@ end; if sgToeleveringData.RowCount > 2 then sgToeleveringData.RowCount := sgToeleveringData.RowCount - 1; - VuilbakTonen := GridToontData and ToonGescand; + VuilbakTonen := GridToontData and UiContext.InfoLogSchermToonGescand; if VuilbakTonen then begin actOngedaanMaken.Enabled := true; imgCentraalOnder.Visible := true; @@ -216,14 +214,14 @@ begin inherited; Self.ModalResult := mrInfoLog; - if ToonGescand then begin + if UiContext.InfoLogSchermToonGescand then begin btnRechtsOnder.Action := actSchermRechts; end else begin btnRechtsOnder.Action := actSchermLinks; end; btnRechtsOnder.Visible := false; Repaint; - ToonGescand := not(ToonGescand); + UiContext.InfoLogSchermToonGescand := not(UiContext.InfoLogSchermToonGescand); Response := ToeleveringDataOphalen(); VulGridMetToeleveringData(Response.DnaCodes); end;