From 1757d84907cbcdacbd043bc37d8698b650a44ef0 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Mon, 24 Aug 2020 23:54:37 +0000 Subject: [PATCH] --- server/AyaNova/Controllers/ReportController.cs | 10 ++++++++-- server/AyaNova/resource/reportjs/ay-hb-helpers.js | 4 ++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/server/AyaNova/Controllers/ReportController.cs b/server/AyaNova/Controllers/ReportController.cs index 429cb597..aa2f4b15 100644 --- a/server/AyaNova/Controllers/ReportController.cs +++ b/server/AyaNova/Controllers/ReportController.cs @@ -113,17 +113,23 @@ namespace AyaNova.Api.Controllers //sample template //var reportTemplate = "'
{{#with person}}{{firstname}} {{aycaps lastname}}{{/with}}
'"; - var reportTemplate = "'test title

Test page top

A blue paragraph

{{#with person}}{{firstname}} {{aycaps lastname}}{{/with}}
'"; + var reportTemplate = "'test title "+ + "

Test page top

A blue paragraph

{{#with person}}{{firstname}} {{aycaps lastname}}{{/with}}
"+ + "

Some markdown

{{{aymarkdown mdtest}}}
'"; //data object - var reportData = "{ person: { firstname: 'Tyler', lastname: 'Mott' } }"; + var reportData = "{ person: { firstname: 'Tyler', lastname: 'Mott' }, mdtest:'| CODE | MEANING |\\n| ----- | ------------------------------ |\\n| E1000 | Could not connect to the database specified in the [connection string](ops-config-db.md). |\\n| E1050 | XXXXXXXX |\\n| E1012 | Missing resource folder. AyaNova was started from the wrong location or was not installed properly. |\\n' }"; using (var browser = await Puppeteer.LaunchAsync(new LaunchOptions { Headless = true })) using (var page = await browser.NewPageAsync()) { + //Add handlebars JS for compiling and presenting await page.AddScriptTagAsync(new AddTagOptions() { Path = hbspath }); + //add marked for markdown processing + await page.AddScriptTagAsync(new AddTagOptions() { Path = Path.Combine(ReportJSFolderPath, "marked.js") }); + //test add helpers await page.AddScriptTagAsync(new AddTagOptions() { Path = Path.Combine(ReportJSFolderPath, "ay-hb-helpers.js") }); diff --git a/server/AyaNova/resource/reportjs/ay-hb-helpers.js b/server/AyaNova/resource/reportjs/ay-hb-helpers.js index 68b4f268..c11df28d 100644 --- a/server/AyaNova/resource/reportjs/ay-hb-helpers.js +++ b/server/AyaNova/resource/reportjs/ay-hb-helpers.js @@ -2,4 +2,8 @@ function ayRegisterHelpers() { Handlebars.registerHelper("aycaps", function (aString) { return aString.toUpperCase(); }); + + Handlebars.registerHelper("aymarkdown",function(astring){ + return marked(astring, { breaks: true }) + }) }