TNO-2072 Charts can now pull content from another report #1458
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fosol
added
enhancement
Add DB migration 1.0.115 Publish tno-core:0.1.21 Update Reporting Service Update Editor app Update Subscriber app Update API
Fosol
commented
Jan 25, 2024
| content = content.AppendRange(await _reportHelper.FindContentAsync(model.Filter, model.Index)); | ||
|
|
||
| // If this chart pulls data from a linked report add this content. | ||
| var sections = model.LinkedReportId.HasValue ? _reportHelper.GetLinkedReportContent(model.LinkedReportId.Value, null).Result : new(); |
There was a problem hiding this comment.
Any section that references a linked report needs to fetch that report's content for the current instance.
| /// <param name="reportId"></param> | ||
| /// <param name="ownerId"></param> | ||
| /// <returns></returns> | ||
| public Task<Dictionary<string, ReportSectionModel>> GetLinkedReportContent(int reportId, int? ownerId = null) |
There was a problem hiding this comment.
The magic is mostly done here.
| [ProducesResponseType(typeof(ErrorResponseModel), (int)HttpStatusCode.BadRequest)] | ||
| [ProducesResponseType((int)HttpStatusCode.NoContent)] | ||
| [SwaggerOperation(Tags = new[] { "Report" })] | ||
| public IActionResult GetCurrentInstance(int id, int? requestorId) |
There was a problem hiding this comment.
Needed to add this endpoint so that the Reporting Service has a way to get the linked report content.
| @@ -316,9 +314,35 @@ public async Task<IActionResult> Generate(int id, [FromQuery] bool regenerate = | |||
|
|
|||
| var instances = _reportService.GetLatestInstances(id, user.Id); | |||
| var currentInstance = instances.FirstOrDefault(); | |||
| if (regenerate && currentInstance != null && currentInstance.SentOn.HasValue == false) | |||
| if (currentInstance == null) | |||
There was a problem hiding this comment.
Fixed a bug where a report would be stuck after it was accepted by CHES but the SentOn date wasn't updated correctly. I don't like this implementation.
| @@ -232,7 +232,7 @@ export const ReportEdit: React.FC = () => { | |||
| </Button> | |||
| ) : ( | |||
| <Button | |||
| onClick={() => handleRegenerate(values, false)} | |||
| onClick={() => handleRegenerate(values, true)} | |||
There was a problem hiding this comment.
Need to for a new generation
|
|
||
| // If the section has content add it to the chart request. | ||
| if (!settings.UseAllContent && sectionContent.TryGetValue(section.Name, out ReportSectionModel? sectionData) && sectionData != null) | ||
| { | ||
| content.AddRange(sectionData.Content); | ||
| } | ||
| if (section.LinkedReportId.HasValue) |
There was a problem hiding this comment.
Using a callback go get the linked report.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
We can now add Media Analytics sections to a report that reference another report and group the content by sections. This feature requires the report to have an active Report Instance, otherwise the chart will be empty.
Summary
Editor Report Admin
Editor Chart Template Admin
Subscriber Report Admin
Subscriber Report Preview