[lmi-commits] [6332] Use new product-data fields added 20151003T0126Z

[Greg Chicares]

Revision: 6332
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=6332
Author:   chicares
Date:     2015-10-07 22:30:22 +0000 (Wed, 07 Oct 2015)
Log Message:
-----------
Use new product-data fields added 20151003T0126Z

Modified Paths:
--------------
    lmi/trunk/ChangeLog
    lmi/trunk/group_quote_pdf_gen_wx.cpp

Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2015-10-07 22:12:55 UTC (rev 6331)
+++ lmi/trunk/ChangeLog 2015-10-07 22:30:22 UTC (rev 6332)
@@ -37044,3 +37044,49 @@
   mec_server.cpp
 Use unique_filepath() for all PDF and spreadsheet output.
 
+20151006T1648Z <address@hidden> [474]
+
+  group_quote_pdf_gen_wx.cpp
+Treat escape_for_html_elem() argument as UTF-8 (VZ).
+
+20151007T0003Z <address@hidden> [474]
+
+  census_view.cpp
+Show newline as RETURN SYMBOL in census-manager text subcontrols (VZ).
+
+20151007T1238Z <address@hidden> [473]
+
+  ledger_xml_io.cpp
+Remove a duplicative defect marker.
+
+20151007T1243Z <address@hidden> [473]
+
+  ledger_xml_io.cpp
+Effect regulatory prohibitions.
+
+20151007T1947Z <address@hidden> [473]
+
+  ledger_xml_io.cpp
+  wx_test_validate_output.cpp
+Replace an idiosyncratic interface; remove its unit test.
+
+20151007T1948Z <address@hidden> [473]
+
+  ihs_acctval.cpp
+Replace an idiosyncratic interface that is no longer useful.
+
+20151007T2156Z <address@hidden> [473]
+
+  group_quote_pdf_gen_wx.cpp
+Use input effective date.
+
+20151007T2212Z <address@hidden> [473]
+
+  group_quote_pdf_gen_wx.cpp
+Write new "short" product name over graphic banner.
+
+20151007T2230Z <address@hidden> [473]
+
+  group_quote_pdf_gen_wx.cpp
+Use new product-data fields added 20151003T0126Z.
+

Modified: lmi/trunk/group_quote_pdf_gen_wx.cpp
===================================================================
--- lmi/trunk/group_quote_pdf_gen_wx.cpp        2015-10-07 22:12:55 UTC (rev 
6331)
+++ lmi/trunk/group_quote_pdf_gen_wx.cpp        2015-10-07 22:30:22 UTC (rev 
6332)
@@ -371,12 +371,22 @@
     prepared_by_      = ledger.ProducerName;
     product_          = ledger.ProductName;
     short_product_    = ledger.GroupQuoteShortProductName;
-    available_riders_ = "Waiver, ADB, ABR, Spouse or Child"; // FIXME
+    available_riders_ = ledger.GroupQuoteRidersHeader;
     premium_mode_     = ledger.InitErMode;
     contract_state_   = ledger.GetStatePostalAbbrev();
     jdn_t eff_date    = jdn_t(static_cast<int>(ledger.EffDateJdn));
     effective_date_   = ConvertDateToWx(eff_date).FormatDate().ToStdString();
-    footer_           = ledger.MarketingNameFootnote;
+    footer_           =
+                          escape_for_html_elem(ledger.GroupQuoteIsNotAnOffer   
)
+        + "<br><br>"    + escape_for_html_elem(ledger.GroupQuoteRidersFooter   
)
+        + "<br><br>"    + escape_for_html_elem(ledger.GroupQuotePolicyFormId   
)
+        + "<br><br>"    + 
escape_for_html_elem(ledger.GroupQuoteStateVariations)
+        + "<br><br>"    + escape_for_html_elem(ledger.MarketingNameFootnote    
)
+        + "<br><br><b>" + escape_for_html_elem(ledger.GroupQuoteProspectus     
) + "</b>"
+        + "<br><br>"    + escape_for_html_elem(ledger.GroupQuoteUnderwriter    
)
+        + "<br><br>"    + escape_for_html_elem(ledger.GroupQuoteBrokerDealer   
)
+        ;
+
     // Input::Comments will replace these two:
     guarantee_issue_max_ = "$500,000"; // FIXME
     plan_type_ = "Mandatory"; // FIXME
@@ -979,7 +989,7 @@
         *pos_y += logo_image.GetSize().y + vert_skip;
         }
 
-    wxString const footer_html = "<p>" + 
escape_for_html_elem(report_data_.footer_) + "</p>";
+    wxString const footer_html = "<p>" + report_data_.footer_ + "</p>";
 
     *pos_y += output_html
         (html_parser