Index: PlanScan/Main.dfm =================================================================== diff -u -r271 -r279 --- PlanScan/Main.dfm (.../Main.dfm) (revision 271) +++ PlanScan/Main.dfm (.../Main.dfm) (revision 279) @@ -32,9 +32,6 @@ Tabs.Strings = ( 'DnaCodes') TabIndex = 0 - ExplicitTop = 8 - ExplicitWidth = 609 - ExplicitHeight = 193 object dbgDnaCodes: TDBGrid Left = 4 Top = 65 @@ -102,9 +99,6 @@ BevelEdges = [] BevelOuter = bvNone TabOrder = 1 - ExplicitLeft = 24 - ExplicitTop = 32 - ExplicitWidth = 185 object btnZoekViaToelevering: TButton Left = 135 Top = 9 Index: PlanScan/PlanScan.identcache =================================================================== diff -u -r259 -r279 Binary files differ Index: PlanScan/Main.pas =================================================================== diff -u -r275 -r279 --- PlanScan/Main.pas (.../Main.pas) (revision 275) +++ PlanScan/Main.pas (.../Main.pas) (revision 279) @@ -35,6 +35,7 @@ fUiContext: TUiContext; procedure VulDnaCodeGridMetData(DnaCodes: ArrayOfDnaCodeDnaCode); function BepaalGeselecteerdeDnaCodes(): TStringList; + function GeefAlleDnaCodesUitGrid(): TStringList; public property UiContext: TUiContext Read fUiContext Write fUiContext; end; @@ -49,21 +50,6 @@ {$R *.dfm} -function TfmMain.BepaalGeselecteerdeDnaCodes: TStringList; -var - DnaCodesStringList: TStringList; - RijTeller: integer; -begin - DnaCodesStringList := TStringList.Create(); - if dbgDnaCodes.SelectedRows.Count > 0 then begin - for rijteller := 0 to dbgDnaCodes.SelectedRows.Count - 1 do begin - dbgDnaCodes.DataSource.DataSet.GotoBookmark(Pointer(dbgDnaCodes.SelectedRows.Items[rijteller])); - DnaCodesStringList.Add(dbgDnaCodes.DataSource.DataSet.FieldByName('cdsDnaCodesDnaCode').AsString); - end; - end; - result := DnaCodesStringList; -end; - procedure TfmMain.btnKlantEtiketClick(Sender: TObject); var DnaCodesStringList: TStringList; @@ -85,7 +71,7 @@ DnaCodesStringList: TStringList; fProboxAfdrukkenResponse: ProboxEtiketAfdrukkenResponse; begin - DnaCodesStringList := BepaalGeselecteerdeDnaCodes(); + DnaCodesStringList := GeefAlleDnaCodesUitGrid(); fProboxAfdrukkenResponse := TAgent.Create(UiContext).ProboxEtiketAfdrukken(DnaCodesStringList); try if fProboxAfdrukkenResponse.Header.Status <> '200' then begin @@ -166,6 +152,35 @@ end; end; +function TfmMain.BepaalGeselecteerdeDnaCodes: TStringList; +var + DnaCodesStringList: TStringList; + RijTeller: integer; +begin + DnaCodesStringList := TStringList.Create(); + if dbgDnaCodes.SelectedRows.Count > 0 then begin + for rijteller := 0 to dbgDnaCodes.SelectedRows.Count - 1 do begin + dbgDnaCodes.DataSource.DataSet.GotoBookmark(Pointer(dbgDnaCodes.SelectedRows.Items[rijteller])); + DnaCodesStringList.Add(dbgDnaCodes.DataSource.DataSet.FieldByName('cdsDnaCodesDnaCode').AsString); + end; + end; + result := DnaCodesStringList; +end; + +function TfmMain.GeefAlleDnaCodesUitGrid: TStringList; +var + DnaCodesStringList: TStringList; + RijTeller: integer; +begin + DnaCodesStringList := TStringList.Create(); + dbgDnaCodes.DataSource.DataSet.First; + while not dbgDnaCodes.DataSource.DataSet.Eof do begin + DnaCodesStringList.Add(dbgDnaCodes.DataSource.DataSet.FieldByName('cdsDnaCodesDnaCode').AsString); + dbgDnaCodes.DataSource.DataSet.Next; + end; + result := DnaCodesStringList; +end; + procedure TfmMain.VulDnaCodeGridMetData(DnaCodes: ArrayOfDnaCodeDnaCode); var ii: integer;