[lmi-commits] [lmi] master 29865fc 133/156: Add supplemental report to NASD illustrations too

[Greg Chicares]

branch: master
commit 29865fcce5b6115a0e3eb189f0f5a9fd73a9d45b
Author: Vadim Zeitlin <address@hidden>
Commit: Vadim Zeitlin <address@hidden>

    Add supplemental report to NASD illustrations too
    
    Factor out supplemental_report_base class from supplemental_report and
    reuse it for nasd_supplemental_report page.
---
 ledger_pdf_generator_wx.cpp       | 41 ++++++++++++++++++++++++++++++---------
 nasd_supplemental_report.mustache |  7 +++++++
 2 files changed, 39 insertions(+), 9 deletions(-)

diff --git a/ledger_pdf_generator_wx.cpp b/ledger_pdf_generator_wx.cpp
index 0898470..ae480e8 100644
--- a/ledger_pdf_generator_wx.cpp
+++ b/ledger_pdf_generator_wx.cpp
@@ -1838,10 +1838,10 @@ class tabular_detail2_page : public 
page_with_tabular_report
     }
 };
 
-class supplemental_report : public page_with_tabular_report
+class supplemental_report_base : public page_with_tabular_report
 {
   public:
-    explicit supplemental_report(html_interpolator const& interpolate_html)
+    explicit supplemental_report_base(html_interpolator const& 
interpolate_html)
     {
         constexpr std::size_t max_columns = 12;
         std::string const empty_column_name("[none]");
@@ -1866,6 +1866,20 @@ class supplemental_report : public 
page_with_tabular_report
     }
 
   private:
+    illustration_table_columns const& get_table_columns() const override
+    {
+        return columns_;
+    }
+
+    illustration_table_columns columns_;
+};
+
+class supplemental_report : public supplemental_report_base
+{
+  public:
+    using supplemental_report_base::supplemental_report_base;
+
+  private:
     std::string get_fixed_page_contents() const override
     {
         return "{{>supplemental_report}}";
@@ -1875,13 +1889,6 @@ class supplemental_report : public 
page_with_tabular_report
     {
         return "footer_disclaimer";
     }
-
-    illustration_table_columns const& get_table_columns() const override
-    {
-        return columns_;
-    }
-
-    illustration_table_columns columns_;
 };
 
 // Regular illustration.
@@ -2374,6 +2381,18 @@ class nasd_assumption_detail : public 
page_with_tabular_report
     // all of its columns, including the "AttainedAge" one, are always shown.
 };
 
+class nasd_supplemental_report : public supplemental_report_base
+{
+  public:
+    using supplemental_report_base::supplemental_report_base;
+
+  private:
+    std::string get_fixed_page_contents() const override
+    {
+        return "{{>nasd_supplemental_report}}";
+    }
+};
+
 // NASD illustration.
 class pdf_illustration_nasd : public pdf_illustration
 {
@@ -2426,6 +2445,10 @@ class pdf_illustration_nasd : public pdf_illustration
             {
             add<nasd_assumption_detail>();
             }
+        if(invar.SupplementalReport)
+            {
+            add<nasd_supplemental_report>(get_interpolator());
+            }
     }
 
     std::string get_upper_footer_template_name() const override
diff --git a/nasd_supplemental_report.mustache 
b/nasd_supplemental_report.mustache
new file mode 100644
index 0000000..0c4bf77
--- /dev/null
+++ b/nasd_supplemental_report.mustache
@@ -0,0 +1,7 @@
+{{>nasd_header_upper}}
+<p align="center">{{SupplementalReportTitle}}</p>
+{{>nasd_header_lower}}
+
+{{>dollar_units}}
+
+{{! The supplemental report table itself is generated from C++ code }}