[lmi-commits] [lmi] master 44b7f5c 2/2: Format "date prepared" all in one place

[Greg Chicares]

branch: master
commit 44b7f5cca22d84e943a1d94a2ecf30d1977b89b2
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Format "date prepared" all in one place
---
 cover.mst                    |  2 +-
 finra_footer_lower.mst       |  2 +-
 ill_reg_footer.mst           |  2 +-
 ledger_evaluator.cpp         | 18 ++++++++----------
 pdf_command_wx.cpp           |  9 ---------
 reg_d_group_footer_lower.mst |  2 +-
 reg_d_indiv_cover_page.mst   |  2 +-
 reg_d_indiv_footer_lower.mst |  2 +-
 reg_d_indiv_header.mst       |  2 +-
 9 files changed, 15 insertions(+), 26 deletions(-)

diff --git a/cover.mst b/cover.mst
index cd6d335..e1b759c 100644
--- a/cover.mst
+++ b/cover.mst
@@ -111,7 +111,7 @@
     <tr>
         <td align="center">
             <font size="+2">
-                {{date_prepared}}
+                {{DatePrepared}}
             </font>
         </td>
     </tr>
diff --git a/finra_footer_lower.mst b/finra_footer_lower.mst
index 85509ca..e8f3eb5 100644
--- a/finra_footer_lower.mst
+++ b/finra_footer_lower.mst
@@ -27,7 +27,7 @@
     </tr>
     <tr>
         <td>{{InsCoName}}</td>
-        <td align="center">Date Prepared: {{date_prepared}}</td>
+        <td align="center">Date Prepared: {{DatePrepared}}</td>
         <td align="right">Policy Form: {{PolicyForm}}</td>
     </tr>
     <tr>
diff --git a/ill_reg_footer.mst b/ill_reg_footer.mst
index 3c611ed..a00a48f 100644
--- a/ill_reg_footer.mst
+++ b/ill_reg_footer.mst
@@ -26,7 +26,7 @@
         <td colspan="3">&nbsp;</td>
     </tr>
     <tr>
-        <td>Date Prepared: {{date_prepared}}</td>
+        <td>Date Prepared: {{DatePrepared}}</td>
         <td align="center">{{page_number}}</td>
         <td align="right">{{InsCoName}}</td>
     </tr>
diff --git a/ledger_evaluator.cpp b/ledger_evaluator.cpp
index 336e812..5564c4f 100644
--- a/ledger_evaluator.cpp
+++ b/ledger_evaluator.cpp
@@ -827,13 +827,14 @@ ledger_evaluator Ledger::make_evaluator() const
 
     strings["LmiVersion"] = &LmiVersion;
 
-    std::string PrepYear  = value_cast<std::string>(prep_date.year());
-    std::string PrepMonth = month_name(prep_date.month());
-    std::string PrepDay   = value_cast<std::string>(prep_date.day());
-
-    strings["PrepYear" ] = &PrepYear;
-    strings["PrepMonth"] = &PrepMonth;
-    strings["PrepDay"  ] = &PrepDay;
+    std::string DatePrepared =
+          month_name(prep_date.month())
+        + " "
+        + value_cast<std::string>(prep_date.day())
+        + ", "
+        + value_cast<std::string>(prep_date.year())
+        ;
+    strings["DatePrepared" ] = &DatePrepared;
 
     // PDF !! Sales-load refunds are mentioned on 'mce_ill_reg' PDFs
     // only. Other formats defectively ignore them.
@@ -946,9 +947,6 @@ ledger_evaluator Ledger::make_evaluator() const
 //
 //    std::vector<double> InforceLives;
 //
-//    // Special-case strings.
-//    std::string     EffDate; [furnished as PrepYear, PrepMonth, PrepDay]
-//
 // Variant
 //
 // [None of these are stored, and I think none is wanted.]
diff --git a/pdf_command_wx.cpp b/pdf_command_wx.cpp
index 62e62d3..898e8c5 100644
--- a/pdf_command_wx.cpp
+++ b/pdf_command_wx.cpp
@@ -891,15 +891,6 @@ class pdf_illustration : protected html_interpolator, 
protected pdf_writer_wx
         // single illustration type should be defined in the corresponding
         // derived pdf_illustration_xxx class instead.
 
-        add_variable
-            ("date_prepared"
-            , html::text::from(evaluate("PrepMonth"))
-            + html::text::nbsp()
-            + html::text::from(evaluate("PrepDay"))
-            + html::text::from(", ")
-            + html::text::from(evaluate("PrepYear"))
-            );
-
         auto indent = html::text::nbsp();
         add_variable("Space1", indent);
 
diff --git a/reg_d_group_footer_lower.mst b/reg_d_group_footer_lower.mst
index 85509ca..e8f3eb5 100644
--- a/reg_d_group_footer_lower.mst
+++ b/reg_d_group_footer_lower.mst
@@ -27,7 +27,7 @@
     </tr>
     <tr>
         <td>{{InsCoName}}</td>
-        <td align="center">Date Prepared: {{date_prepared}}</td>
+        <td align="center">Date Prepared: {{DatePrepared}}</td>
         <td align="right">Policy Form: {{PolicyForm}}</td>
     </tr>
     <tr>
diff --git a/reg_d_indiv_cover_page.mst b/reg_d_indiv_cover_page.mst
index cb982a0..2be6150 100644
--- a/reg_d_indiv_cover_page.mst
+++ b/reg_d_indiv_cover_page.mst
@@ -67,7 +67,7 @@ Prepared for:
 <br></br>
 <br></br>
 
-Date Prepared: {{date_prepared}}
+Date Prepared: {{DatePrepared}}
 
 </font>
 </b>
diff --git a/reg_d_indiv_footer_lower.mst b/reg_d_indiv_footer_lower.mst
index 75301e3..3c38ccf 100644
--- a/reg_d_indiv_footer_lower.mst
+++ b/reg_d_indiv_footer_lower.mst
@@ -21,7 +21,7 @@
 
 {{!
     PDF !! This is almost the same as 'reg_d_group_footer_lower.mst',
-    which is better because it includes 'date_prepared'. It appears
+    which is better because it includes 'DatePrepared'. It appears
     that one universal MST file could serve this purpose for all
     illustration formats.
 }}
diff --git a/reg_d_indiv_header.mst b/reg_d_indiv_header.mst
index 06dd31c..b8381d7 100644
--- a/reg_d_indiv_header.mst
+++ b/reg_d_indiv_header.mst
@@ -48,7 +48,7 @@ and may not be used to project or predict investment results.
 <table width="100%" cellspacing="0" cellpadding="0" valign="top">
     <tr>
         <td width="60%">
-            Date Prepared: {{date_prepared}}<br>
+            Date Prepared: {{DatePrepared}}<br>
             {{#Composite}}
                 Composite of individuals<br>
             {{/Composite}}