Fixed #955 Incorrect record no for load all pages type

rappen · rappen · commit ad9b64bc8500 · 2023-08-20T14:01:08.000+02:00
diff --git a/FetchXmlBuilder/DockControls/ResultGrid.cs b/FetchXmlBuilder/DockControls/ResultGrid.cs
@@ -57,7 +57,7 @@ internal void SetData(QueryInfo queryinfo)
             }
             if (queryinfo.RecordFrom > -1 && queryinfo.RecordTo > -1)
             {
-                if (queryinfo.RecordFrom > 1 || queryinfo.Results.MoreRecords)
+                if (!form.settings.Results.RetrieveAllPages && (queryinfo.RecordFrom > 1 || queryinfo.Results.MoreRecords))
                 {
                     mnuRecordsNumbers.Text = $"Records: {queryinfo.RecordFrom}-{queryinfo.RecordTo}";
                     if (queryinfo.Results.TotalRecordCount > 0 && queryinfo.Results.TotalRecordCount < 5000)
@@ -67,7 +67,7 @@ internal void SetData(QueryInfo queryinfo)
                 }
                 else
                 {
-                    mnuRecordsNumbers.Text = $"Records: {queryinfo.RecordTo}";
+                    mnuRecordsNumbers.Text = $"Records: {queryinfo.Results.Entities.Count}";
                 }
                 mnuRecordsNumbers.Visible = true;
             }

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ internal void SetData(QueryInfo queryinfo)`
`57`	`57`	`}`
`58`	`58`	`if (queryinfo.RecordFrom > -1 && queryinfo.RecordTo > -1)`
`59`	`59`	`{`
`60`		`- if (queryinfo.RecordFrom > 1 \|\| queryinfo.Results.MoreRecords)`
	`60`	`+ if (!form.settings.Results.RetrieveAllPages && (queryinfo.RecordFrom > 1 \|\| queryinfo.Results.MoreRecords))`
`61`	`61`	`{`
`62`	`62`	`mnuRecordsNumbers.Text = $"Records: {queryinfo.RecordFrom}-{queryinfo.RecordTo}";`
`63`	`63`	`if (queryinfo.Results.TotalRecordCount > 0 && queryinfo.Results.TotalRecordCount < 5000)`
`@@ -67,7 +67,7 @@ internal void SetData(QueryInfo queryinfo)`
`67`	`67`	`}`
`68`	`68`	`else`
`69`	`69`	`{`
`70`		`- mnuRecordsNumbers.Text = $"Records: {queryinfo.RecordTo}";`
	`70`	`+ mnuRecordsNumbers.Text = $"Records: {queryinfo.Results.Entities.Count}";`
`71`	`71`	`}`
`72`	`72`	`mnuRecordsNumbers.Visible = true;`
`73`	`73`	`}`