Skip to content

Commit

Permalink
fix: #tno-2207 - fix math and chart (#1407)
Browse files Browse the repository at this point in the history 
- percentages no longer rounded down
- chart section now set correctly
  • Loading branch information
@kylgarmor
kylgarmor authored Jan 12, 2024
1 parent 12c3616 commit ea05557
Show file tree
Hide file tree
Showing 3 changed files with 7,206 additions and 0 deletions.
351 changes: 351 additions & 0 deletions libs/net/dal/Migrations/1.0.108/Up/PostUp/00-Report.sql
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,351 @@
DO $$
DECLARE ReportId INT;
DECLARE ReportTemplateId INT;
DECLARE FolderFilterId INT;
DECLARE ReportSectionId INT;
DECLARE ChartTemplateId INT;
BEGIN

-- get the Report Id
SELECT INTO ReportId id FROM public."report" where "name" = 'Event of the Day' and owner_id = 1;

-- get the Report Template Id
SELECT INTO ReportTemplateId report_template_id FROM public."report" where "name" = 'Event of the Day' and owner_id = 1;

-- get the Folder Filter Id
SELECT INTO FolderFilterId id FROM public."filter" where "name" = 'Event of the Day - 24hr Aggregate' and owner_id = 1;

-- get the Report Section Id
SELECT INTO ReportSectionId id FROM public.report_section WHERE report_id=ReportId and filter_id=FolderFilterId and settings ->> 'sectionType' = 'MediaAnalytics';

-- get the Chart Template Id
SELECT INTO ChartTemplateId chart_template_id
FROM public."report_template_chart_template" rtct
JOIN public."chart_template" ct on rtct."chart_template_id" = ct."id"
WHERE rtct.report_template_id = ReportTemplateId
AND ct.name = 'Topic Analysis';

-- delete any existing record so we can insert a fresh one
DELETE FROM public."report_section_chart_template" where report_section_id = ReportSectionId and chart_template_id=ChartTemplateId;

-- insert the new report section chart template reference
INSERT INTO public."report_section_chart_template" (
"report_section_id",
"chart_template_id",
"settings",
"sort_order",
"created_by",
"updated_by")
VALUES (
ReportSectionId -- report_section_id
, ChartTemplateId -- chart_template_id
, '{
"title": "",
"width": 400,
"height": 400,
"altText": "Image",
"groupBy": "topicType",
"options": {
"plugins": {
"legend": {
"align": "center",
"labels": {
"font": {
"size": 18
}
},
"display": true,
"position": "bottom"
},
"datalabels": {
"font": {
"size": 18
},
"color": "#fff",
"anchor": "center",
"labels": {
"font": {
"size": 24
},
"title": {
"display": true
}
}
}
}
},
"chartType": "pie",
"isHorizontal": false,
"showDataValues": false
}'
, 0 -- sort_order
, '' -- created_by
, '' -- updated_by
);

-- Update report template
UPDATE public."report_template"
SET "body" = '@inherits RazorEngineCore.RazorEngineTemplateBase<TNO.TemplateEngine.Models.Reports.ReportEngineContentModel>
@using System
@using System.Linq
@using TNO.Entities
@using TNO.TemplateEngine
@{
var pageBreak = Settings.Sections.UsePageBreaks ? "page-break-after: always;" : "";
var utcOffset = ReportExtensions.GetUtcOffset(System.DateTime.Now, "Pacific Standard Time");
}
<h1 id="top" style="margin: 0; padding: 0;">@Settings.Subject.Text</h1>
<a name="top"></a>
<div style="color:red;">DO NOT FORWARD THIS EMAIL TO ANYONE</div>
<br/>
@if (Content.Count() == 0)
{
<p>There is no content in this report.</p>
}
@if (ViewOnWebOnly)
{
<a href="@SubscriberAppUrl" target="_blank">Click to view this report online</a>
}
else
{
var contentCount = 0;
var allContent = Content.ToArray();
foreach (var section in Sections)
{
var sectionContent = section.Value.Content.ToArray();
if (!section.Value.IsEnabled) continue;
if (sectionContent.Length == 0 && section.Value.Settings.HideEmpty) continue;
<hr style="width: 100%; display: inline-block;" />
<div style="@pageBreak">
@if (!String.IsNullOrEmpty(section.Value.Settings.Label))
{
<h2 id="section-@section.Value.Id" styled="margin: 0; padding: 0;">@section.Value.Settings.Label<a name="section-@section.Value.Id"></a></h2>
}
@if (!String.IsNullOrEmpty(section.Value.Description))
{
<p>@section.Value.Description</p>
}
@if (section.Value.Settings.SectionType == ReportSectionType.TableOfContents)
{
@* Table of Contents Section *@
var tocCount = 0;
@foreach (var tableSection in Sections.Where(s => s.Value.Settings.SectionType != ReportSectionType.TableOfContents))
{
if (!tableSection.Value.Settings.HideEmpty || tableSection.Value.Content.Any())
{
<a href="#@($"section-{tableSection.Value.Id}")"><h3 style="margin: 0; padding: 0;">@tableSection.Value.Settings.Label</h3></a>
@if (section.Value.Settings.ShowHeadlines && tableSection.Value.Content.Any())
{
<ul style="margin:0; margin-left: 25px; padding:0;">
@foreach (var content in tableSection.Value.Content)
{
<li>@ReportExtensions.GetFullHeadline(content, Model, utcOffset, true, $"#item-{tocCount}")</li>
tocCount++;
}
</ul>
}
}
}
}
else if (section.Value.Settings.SectionType == ReportSectionType.Text)
{
@* Text Section *@
}
else if (section.Value.Settings.SectionType == ReportSectionType.Content)
{
@* Content Section *@
var positionInTOC = 0;
if (section.Value.Settings.ShowHeadlines)
{
@if (section.Value.Settings.GroupBy != "")
{
var contentGroupings = sectionContent.GetContentGroupings(section.Value.Settings.GroupBy);
<ul style="margin:0; margin-left: 25px; padding:0;">
@foreach(KeyValuePair<string, List<long>> contentGroup in contentGroupings)
{
<li>@section.Value.Settings.GroupBy = @contentGroup.Key</li>
<ul style="margin:0; margin-left: 25px; padding:0;">
@foreach(long contentId in contentGroup.Value)
{
var content = sectionContent.FirstOrDefault(c => c.Id == contentId);
var headlineLink = contentCount + positionInTOC;
positionInTOC++;
if (section.Value.Settings.ShowFullStory)
{
<li>@ReportExtensions.GetFullHeadline(content, Model, utcOffset, true, $"#item-{headlineLink}")</li>
}
else
{
<li>@ReportExtensions.GetFullHeadline(content, Model, utcOffset, true, "", "_blank")</li>
}
}
</ul>
}
</ul>
}
else
{
<ul style="margin:0; margin-left: 25px; padding:0;">
@foreach (var content in sectionContent)
{
var headlineLink= contentCount + positionInTOC;
positionInTOC++;
@if (section.Value.Settings.ShowFullStory)
{
<li>@ReportExtensions.GetFullHeadline(content, Model, utcOffset, true, $"#item-{headlineLink}")</li>
}
else
{
<li>@ReportExtensions.GetFullHeadline(content, Model, utcOffset, true, "", "_blank")</li>
}
}
</ul>
}
}
@* Show Aggregate detail if returned *@
@if (section.Value.Settings.SectionType == ReportSectionType.Content)
{
if (section.Value.Aggregations != null)
{
var showAggregateCountsAsPercentOfTotal = true;
@foreach (var rootAggregation in section.Value.Aggregations)
{
var totalDocCount = rootAggregation.Value.DocCount;
var rootAggregationChild = rootAggregation.Value.ChildAggregation;
<ul>
@foreach (var rootAggregationBucket in rootAggregationChild.Buckets)
{
var listItemColorStyle = ReportExtensions.GetColorFromName(rootAggregationBucket.Key, new string[] {"Issues","Proactive"}, new string[] {"#BB1111", "#006600"});
if (showAggregateCountsAsPercentOfTotal)
{
var rootAggregationAsPercentage = ((decimal)rootAggregationBucket.DocCount/totalDocCount * 100);
<li style="font-weight:bold; @listItemColorStyle" >@rootAggregationBucket.Key (@String.Format("{0:F0}", @rootAggregationAsPercentage)%)</li>
} else {
<li style="font-weight:bold; @listItemColorStyle" >@rootAggregationBucket.Key (@rootAggregationBucket.DocCount hits)</li>
}
if (rootAggregationBucket.ChildAggregation != null) {
<ul>
@foreach (var childAggregationBucket in rootAggregationBucket.ChildAggregation.Buckets)
{
if (showAggregateCountsAsPercentOfTotal)
{
var childAggregationAsPercentage = ((decimal)childAggregationBucket.DocCount/totalDocCount * 100);
<li style="@listItemColorStyle">@childAggregationBucket.Key (@String.Format("{0:F0}", @childAggregationAsPercentage)%)</li>
} else {
<li style="@listItemColorStyle">@childAggregationBucket.Key (@childAggregationBucket.DocCount)</li>
}
}
</ul>
}
}
</ul>
}
}
}
@* Full Stories *@
@if (section.Value.Settings.ShowFullStory)
{
for (var i = 0; i < sectionContent.Length; i++)
{
var content = sectionContent[i];
var rawHeadline = ReportExtensions.GetHeadline(content, Model);
var headline = Settings.Content.HighlightKeywords ? ReportExtensions.HighlightKeyWords(section.Value.Filter, rawHeadline, "headline") : rawHeadline;
var rawBody = ReportExtensions.GetBody(content, Model);
var body = Settings.Content.HighlightKeywords ? ReportExtensions.HighlightKeyWords(section.Value.Filter, rawBody, "body") : rawBody;
var rawByline = ReportExtensions.GetByline(content, Model);
var byline= Settings.Content.HighlightKeywords ? ReportExtensions.HighlightKeyWords(section.Value.Filter, rawByline, "byline") : rawByline;
var hasPrev = contentCount > 0;
var prev = hasPrev ? contentCount - 1 : 0;
var hasNext = (contentCount + 1) < allContent.Length;
var next = hasNext ? contentCount + 1 : 0;
var itemPosition = contentCount;
contentCount++;
<div>
<div id="item-@itemPosition" style="display: flex; align-items: center;">
<a name="item-@content.Id"></a>
</div>
<div>
<a href="#top">top</a>
@if (hasPrev )
{
<a href="#item-@prev">previous</a>
}
@if (hasNext )
{
<a href="#item-@next">next</a>
}
</div>
<h3>@headline</h3>
<div>@content.Source?.Name</div>
<div>@content.PublishedOn?.AddHours(utcOffset).ToString("dddd, MMMM d, yyyy")</div>
@if (!string.IsNullOrWhiteSpace(content.Page))
{
<div>Page @content.Page</div>
}
@if (!string.IsNullOrWhiteSpace(byline) && Settings.Headline.ShowByline)
{
<div>By @byline</div>
}
<br />
@if (!String.IsNullOrEmpty(body))
{
<div>@body</div>
}
@if (!string.IsNullOrEmpty(content.ImageContent) && section.Value.Settings.ShowImage)
{
var src = $"data:{content.ContentType};base64," + content.ImageContent;
<div><img src="@src" alt="@content.FileReferences.FirstOrDefault()?.FileName" /></div>
}
@if (Settings.Content.ShowLinkToStory)
{
<a href="@($"{ViewContentUrl}{content.Id}")" target="_blank">View Article</a>
}
<hr style="width: 100%; display: inline-block; border-top: 1px solid lightGrey;" />
</div>
}
}
}
else if (section.Value.Settings.SectionType == ReportSectionType.MediaAnalytics)
{
@* Media Analytics Section *@
foreach (var chart in section.Value.ChartTemplates)
{
<img alt="@chart.SectionSettings.AltText" src="@chart.Uid" />
}
}
else if (section.Value.Settings.SectionType == ReportSectionType.Gallery)
{
@* Gallery Section *@
for (var i = 0; i < sectionContent.Length; i++)
{
var content = sectionContent[i];
@if (!string.IsNullOrEmpty(content.ImageContent))
{
var src = $"data:{content.ContentType};base64," + content.ImageContent;
if (section.Value.Settings.Direction == "row") {
<img src="@src" alt="@content.FileReferences.FirstOrDefault()?.FileName" />
} else {
<div>
<img src="@src" alt="@content.FileReferences.FirstOrDefault()?.FileName" />
</div>
}
}
}
}
</div>
}
}
<p style="font-size: 9pt; margin-top: 0.5rem;">
Terms of Use - This summary is a service provided by Government Communications and Public Engagement and is only intended for original addressee. All content is the copyrighted property of a third party creator of the material.
Copying, retransmitting, archiving, redistributing, selling, licensing, or emailing the material to any third party or any employee of the Province who is not authorized to access the material is prohibited.
</p>
'
WHERE id = ReportTemplateId;

END $$;
Loading

0 comments on commit ea05557

Please sign in to comment.