[lmi-commits] [lmi] master 8013537: Add 'DboName*' to ledger, at least for now

[Greg Chicares]

branch: master
commit 8013537036b4691c4208084dc399c1c959bbfbb0
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Add 'DboName*' to ledger, at least for now
---
 ill_reg_column_headings.mst | 22 +++++++++++-----------
 ledger_invariant.cpp        |  6 ++++++
 ledger_invariant.hpp        | 11 +++++++++++
 ledger_invariant_init.cpp   |  5 +++++
 4 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/ill_reg_column_headings.mst b/ill_reg_column_headings.mst
index dc5c5fc..333398f 100644
--- a/ill_reg_column_headings.mst
+++ b/ill_reg_column_headings.mst
@@ -41,7 +41,7 @@ less any monthly charges deducted.
 </p>
 <p>
 <b>{{CsvName}} Value:</b>
-{{AvName}} Value less policy debt.
+{{AvName}} Value less {{ContractName}} debt.
 {{#Has1035ExchCharge}}
 {{CashSurrValueFootnote}}
 {{/Has1035ExchCharge}}
@@ -70,16 +70,16 @@ Presumably the description of death benefit options should 
be moved into
 -->
 </p>
 <p>
-<b>Death Benefit Option 1:</b>
+<b>Death Benefit Option {{DboNameLevel}}:</b>
 Option in which the death benefit is equal to the selected
-face amount of the contract on the date of death of the insured,
+face amount of the {{ContractName}} on the date of death of the insured,
 or if greater the {{AvName}} Value
 {{#SalesLoadRefundAvailable}}
 plus the refund of sales loads (if applicable)
 {{/SalesLoadRefundAvailable}}
 on the insured's date of death multiplied by the minimum face
 amount percentage for the insured's attained age at death
-(minimum face amount). Please refer to the contract
+(minimum face amount). Please refer to the {{ContractName}}
 for a detailed schedule of death benefit factors.
 </p>
 <!-- Group Experience Rating Logic -->
@@ -89,9 +89,9 @@ for a detailed schedule of death benefit factors.
 }}
 {{^AllowExperienceRating}}
 <p>
-<b>Death Benefit Option 2:</b>
+<b>Death Benefit Option {{DboNameIncreasing}}:</b>
 Option in which the death benefit is equal to the selected
-face amount of the contract
+face amount of the {{ContractName}}
 plus the {{AvName}} Value
 on the date of death of the insured, or if greater,
 the {{AvName}} Value
@@ -100,7 +100,7 @@ plus the refund of sales loads (if applicable)
 {{/SalesLoadRefundAvailable}}
 on the insured's date of death multiplied
 by the death benefit factor for the insured's attained age
-at death (minimum face amount). Please refer to the contract
+at death (minimum face amount). Please refer to the {{ContractName}}
 for a detailed schedule of death benefit factors.
 {{/AllowExperienceRating}}
 <!-- Group Experience Rating Logic -->
@@ -142,10 +142,10 @@ are based on the assumption that premium is paid as 
illustrated.
 <p>
 <b>MEC:</b>
 Modified Endowment Contract - this classification is given
-to a contract in violation of TAMRA
+to a {{ContractName}} in violation of TAMRA
 (Technical and Miscellaneous Revenue Act), which limits
 the amount of premium that can be paid into a life
-insurance contract. To the extent of gain in the contract, loans,
+insurance {{ContractName}}. To the extent of gain in the {{ContractName}}, 
loans,
 distributions and withdrawals from a MEC are subject
 to income tax and may also trigger a tax penalty.
 </p>
@@ -176,11 +176,11 @@ from lapsing, or payment required to reinstate the policy.
 The monthly charges for the following month which include:
 cost of insurance, plus face amount charges (if applicable),
 plus the administrative charge shown
-on the contract schedule page.
+on the {{ContractName}} schedule page.
 </p>
 <p>
 <b>Premium Outlay:</b>
-The amount of premium assumed to be paid by the contract owner
+The amount of premium assumed to be paid by the {{ContractName}} owner
 or other premium payor.
 </p>
 <p>
diff --git a/ledger_invariant.cpp b/ledger_invariant.cpp
index f156f02..6fd008a 100644
--- a/ledger_invariant.cpp
+++ b/ledger_invariant.cpp
@@ -201,6 +201,9 @@ void LedgerInvariant::Alloc(int len)
     Strings["CsvHeaderName"                 ] = &CsvHeaderName                 
;
     Strings["NoLapseProvisionName"          ] = &NoLapseProvisionName          
;
     Strings["ContractName"                  ] = &ContractName                  
;
+    Strings["DboNameLevel"                  ] = &DboNameLevel                  
;
+    Strings["DboNameIncreasing"             ] = &DboNameIncreasing             
;
+    Strings["DboNameMinDeathBenefit"        ] = &DboNameMinDeathBenefit        
;
 
     Strings["AccountValueFootnote"          ] = &AccountValueFootnote          
;
     Strings["AttainedAgeFootnote"           ] = &AttainedAgeFootnote           
;
@@ -553,6 +556,9 @@ LedgerInvariant& LedgerInvariant::PlusEq(LedgerInvariant 
const& a_Addend)
     CsvHeaderName                 = a_Addend.CsvHeaderName;
     NoLapseProvisionName          = a_Addend.NoLapseProvisionName;
     ContractName                  = a_Addend.ContractName;
+    DboNameLevel                  = a_Addend.DboNameLevel;
+    DboNameIncreasing             = a_Addend.DboNameIncreasing;
+    DboNameMinDeathBenefit        = a_Addend.DboNameMinDeathBenefit;
 
     AccountValueFootnote          = a_Addend.AccountValueFootnote;
     AttainedAgeFootnote           = a_Addend.AttainedAgeFootnote;
diff --git a/ledger_invariant.hpp b/ledger_invariant.hpp
index 83f506d..629d16a 100644
--- a/ledger_invariant.hpp
+++ b/ledger_invariant.hpp
@@ -230,6 +230,17 @@ class LMI_SO LedgerInvariant final
     std::string     CsvHeaderName;
     std::string     NoLapseProvisionName;
     std::string     ContractName;
+    // PDF !! 'DboName*' variables are used only to assemble DBO
+    // definitions for mce_ill_reg PDFs. Probably those definitions
+    // should be moved into '.policy' files instead, in which case
+    // the 'DboName*' variables here can be expunged. Incidentally,
+    // 'DboNameReturnOfPremium' is omitted here only because the
+    // mce_ill_reg products that lmi supports happen not to use a
+    // definition for it today.
+    std::string     DboNameLevel;
+    std::string     DboNameIncreasing;
+//  std::string     DboNameReturnOfPremium;
+    std::string     DboNameMinDeathBenefit;
 
     // Ledger column definitions.
     std::string     AccountValueFootnote;
diff --git a/ledger_invariant_init.cpp b/ledger_invariant_init.cpp
index f2955e5..3b600fe 100644
--- a/ledger_invariant_init.cpp
+++ b/ledger_invariant_init.cpp
@@ -313,6 +313,11 @@ void LedgerInvariant::Init(BasicValues const* b)
         CsvHeaderName                  = p.datum("CsvHeaderName"               
   );
         NoLapseProvisionName           = p.datum("NoLapseProvisionName"        
   );
         ContractName                   = p.datum("ContractName"                
   );
+        // PDF !! It is hoped that these local variables (which
+        // duplicate 'dbo_name_option1' etc. above) can be expunged.
+        DboNameLevel                   = p.datum("DboNameLevel"                
   );
+        DboNameIncreasing              = p.datum("DboNameIncreasing"           
   );
+        DboNameMinDeathBenefit         = p.datum("DboNameMinDeathBenefit"      
   );
 
         AccountValueFootnote           = p.datum("AccountValueFootnote"        
   );
         AttainedAgeFootnote            = p.datum("AttainedAgeFootnote"         
   );