Index: AAPClient/UI/InfoLogScherm.pas =================================================================== diff -u -r54 -r55 --- AAPClient/UI/InfoLogScherm.pas (.../InfoLogScherm.pas) (revision 54) +++ AAPClient/UI/InfoLogScherm.pas (.../InfoLogScherm.pas) (revision 55) @@ -18,9 +18,14 @@ sgToeleveringData: TStringGrid; procedure FormCreate(Sender: TObject); procedure FormShow(Sender: TObject); + procedure actHomeExecute(Sender: TObject); + procedure actOngedaanMakenExecute(Sender: TObject); + procedure actVolgendeExecute(Sender: TObject); private + ToonGescand: boolean; function ToeleveringDataOphalen(): ZoekViaToeleveringResponse; - procedure VulGridMetToeleveringData(Response: ZoekViaToeleveringResponse; ToonGescand: boolean); + procedure VulGridMetToeleveringData(Response: ZoekViaToeleveringResponse); + procedure GridLeegmaken(); public { Public declarations } end; @@ -32,20 +37,46 @@ {$R *.dfm} +procedure TfmInfoLogScherm.actHomeExecute(Sender: TObject); +begin + inherited; + Self.ModalResult := mrOk; +end; + +procedure TfmInfoLogScherm.actOngedaanMakenExecute(Sender: TObject); +begin + inherited; + // +end; + +procedure TfmInfoLogScherm.actVolgendeExecute(Sender: TObject); +var + Response: ZoekViaToeleveringResponse; +begin + inherited; + ToonGescand := not(ToonGescand); + Response := ToeleveringDataOphalen(); + VulGridMetToeleveringData(Response); +end; + procedure TfmInfoLogScherm.FormCreate(Sender: TObject); begin inherited; sgToeleveringData.Cols[0].Text := 'DNA Code'; sgToeleveringData.Cols[1].Text := 'Pallet'; + ToonGescand := True; end; procedure TfmInfoLogScherm.FormShow(Sender: TObject); var Response: ZoekViaToeleveringResponse; begin inherited; + btnLinksOnder.Action := actHome; + btnCentraalOnder.Action := actOngedaanMaken; + btnRechtsOnder.Action := actVolgende; Response := ToeleveringDataOphalen(); - VulGridMetToeleveringData(Response,True); + VulGridMetToeleveringData(Response); end; function TfmInfoLogScherm.ToeleveringDataOphalen: ZoekViaToeleveringResponse; @@ -70,7 +101,13 @@ if Response.Header.Status <> '200' then begin ToonPopupScherm(Response.Header.Omschrijving, 'Probeer opnieuw') end else begin - lblAantalGescand.Caption := IntToStr(Response.AantalReedsGescand); + if ToonGescand then begin + lblAantallen.Caption := 'Afgescand'; + lblAantalGescand.Caption := IntToStr(Response.AantalReedsGescand); + end else begin + lblAantallen.Caption := 'Te scannen'; + lblAantalGescand.Caption := IntToStr(Response.AantalInToelevering - Response.AantalReedsGescand); + end; lblTotaalAantal.Caption := IntToStr(Response.AantalInToelevering); end; finally @@ -82,20 +119,29 @@ end; end; -procedure TfmInfoLogScherm.VulGridMetToeleveringData(Response: ZoekViaToeleveringResponse; ToonGescand: boolean); +procedure TfmInfoLogScherm.VulGridMetToeleveringData(Response: ZoekViaToeleveringResponse); var DnaCodeTeller: Integer; - StringListTeller: Integer; begin - StringListTeller := 1; + GridLeegMaken(); for DnaCodeTeller := 0 to length(Response.DnaCodes)-1 do begin if (ToonGescand and (Response.DnaCodes[DnaCodeTeller].InitialenScanner <> '')) or ((not ToonGescand) and (Response.DnaCodes[DnaCodeTeller].InitialenScanner = '')) then begin - sgToeleveringData.Rows[StringListTeller].Add(Response.DnaCodes[DnaCodeTeller].DnaCode); - sgToeleveringData.Rows[StringListTeller].Append(Response.DnaCodes[DnaCodeTeller].PalletCode); - StringListTeller := StringListTeller + 1; + sgToeleveringData.Rows[sgToeleveringData.RowCount-1].Add(Response.DnaCodes[DnaCodeTeller].DnaCode); + sgToeleveringData.Rows[sgToeleveringData.RowCount-1].Append(Response.DnaCodes[DnaCodeTeller].PalletCode); + sgToeleveringData.RowCount := sgToeleveringData.RowCount + 1; end; end; + sgToeleveringData.RowCount := sgToeleveringData.RowCount - 1; end; +procedure TfmInfoLogScherm.GridLeegmaken; +var + i: Integer; +begin + for i := 1 to sgToeleveringData.RowCount do + sgToeleveringData.Rows[i].Clear; + sgToeleveringData.RowCount := 2; +end; + end.