Index: PlanScan/Main.dfm =================================================================== diff -u -r263 -r264 --- PlanScan/Main.dfm (.../Main.dfm) (revision 263) +++ PlanScan/Main.dfm (.../Main.dfm) (revision 264) @@ -41,7 +41,7 @@ Width = 500 Height = 267 Align = alClient - DataSource = DataSource1 + DataSource = dsDnaCodes Options = [dgTitles, dgIndicator, dgColumnResize, dgColLines, dgRowLines, dgTabs, dgRowSelect, dgConfirmDelete, dgCancelOnExit, dgMultiSelect, dgTitleClick, dgTitleHotTrack] TabOrder = 0 TitleFont.Charset = DEFAULT_CHARSET @@ -56,38 +56,58 @@ Width = 627 Height = 41 Align = alTop + BevelEdges = [] + BevelOuter = bvNone TabOrder = 1 ExplicitLeft = 24 ExplicitTop = 32 ExplicitWidth = 185 - object Button1: TButton - Left = 0 - Top = 8 + object btnZoekViaToelevering: TButton + Left = 135 + Top = 9 Width = 75 Height = 25 - Caption = 'Button1' + Caption = 'Toelevering' TabOrder = 0 - OnClick = Button1Click + OnClick = btnZoekViaToeleveringClick end + object edtZoekInput: TEdit + Left = 8 + Top = 10 + Width = 121 + Height = 21 + TabOrder = 1 + end + object btnZoekViaPallet: TButton + Left = 216 + Top = 9 + Width = 75 + Height = 25 + Caption = 'Pallet' + TabOrder = 2 + OnClick = btnZoekViaToeleveringClick + end end object pnlActies: TPanel Left = 504 Top = 65 Width = 127 Height = 267 Align = alRight + BevelEdges = [] + BevelOuter = bvNone TabOrder = 2 end end - object DataSource1: TDataSource - DataSet = ClientDataSet1 - Left = 248 - Top = 160 + object dsDnaCodes: TDataSource + DataSet = cdsDnaCodes + Left = 144 + Top = 184 end - object ClientDataSet1: TClientDataSet + object cdsDnaCodes: TClientDataSet Aggregates = <> Params = <> - Left = 248 - Top = 24 + Left = 64 + Top = 184 end end 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)),