Index: PlanScan/Main.pas =================================================================== diff -u -r263 -r264 --- PlanScan/Main.pas (.../Main.pas) (revision 263) +++ PlanScan/Main.pas (.../Main.pas) (revision 264) @@ -11,15 +11,17 @@ type TfmMain = class(TForm) - DataSource1: TDataSource; + dsDnaCodes: TDataSource; CacheQuery1: TCacheQuery; - ClientDataSet1: TClientDataSet; + cdsDnaCodes: TClientDataSet; tcMain: TTabControl; DBGrid1: TDBGrid; pnlZoekKnoppen: TPanel; pnlActies: TPanel; - Button1: TButton; - procedure Button1Click(Sender: TObject); + btnZoekViaToelevering: TButton; + edtZoekInput: TEdit; + btnZoekViaPallet: TButton; + procedure btnZoekViaToeleveringClick(Sender: TObject); private fUiContext: TUiContext; public @@ -36,7 +38,7 @@ {$R *.dfm} -procedure TfmMain.Button1Click(Sender: TObject); +procedure TfmMain.btnZoekViaToeleveringClick(Sender: TObject); var fZoekViaToeleveringResponse: ZoekViaToeleveringResponse; DnaCodesStringList: TStringList; @@ -55,18 +57,18 @@ if fZoekViaToeleveringResponse.Header.Status = '200' then begin DnaCodes := fZoekViaToeleveringResponse.DnaCodes; - ClientDataSet1.FieldDefs.Add('DnaCode',ftString,10); - ClientDataSet1.FieldDefs.Add('Pallet',ftString,10); - ClientDataSet1.FieldDefs.Add('Toelevering',ftString,10); - ClientDataSet1.FieldDefs.Add('Status',ftString,10); - ClientDataSet1.FieldDefs.Add('Batch',ftString,10); - ClientDataSet1.FieldDefs.Add('Tijdstip',ftString,20); - ClientDataSet1.FieldDefs.Add('Initialen',ftString,3); - ClientDataSet1.CreateDataSet; + cdsDnaCodes.FieldDefs.Add('DnaCode',ftString,10); + cdsDnaCodes.FieldDefs.Add('Pallet',ftString,10); + cdsDnaCodes.FieldDefs.Add('Toelevering',ftString,10); + cdsDnaCodes.FieldDefs.Add('Status',ftString,10); + cdsDnaCodes.FieldDefs.Add('Batch',ftString,10); + cdsDnaCodes.FieldDefs.Add('Tijdstip',ftString,20); + cdsDnaCodes.FieldDefs.Add('Initialen',ftString,3); + cdsDnaCodes.CreateDataSet; ii := 0; while ii <= length(DnaCodes)-1 do begin - ClientDataSet1.InsertRecord([ DnaCodes[ii].DnaCode, + cdsDnaCodes.InsertRecord([ DnaCodes[ii].DnaCode, DnaCodes[ii].PalletCode, DnaCodes[ii].Toelevering, GetEnumName(typeInfo(DnaCodeStatus),Ord(DnaCodes[ii].Status)),