[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master e565bb9 4/4: Rework date and age controls
|
From: |
Greg Chicares |
|
Subject: |
[lmi-commits] [lmi] master e565bb9 4/4: Rework date and age controls |
|
Date: |
Thu, 3 May 2018 18:47:43 -0400 (EDT) |
branch: master
commit e565bb9ba0fae85bc1cfabfb1e159beaf8c1c764
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>
Rework date and age controls
Copied the recent 'skin.xrc' changes to all other skins.
---
skin_coli_boli.xrc | 187 +++++++++++++++++++++---------------------------
skin_group_carveout.xrc | 144 ++++++++++++++-----------------------
skin_single_premium.xrc | 94 ++++++++++--------------
3 files changed, 173 insertions(+), 252 deletions(-)
diff --git a/skin_coli_boli.xrc b/skin_coli_boli.xrc
index 32ea768..6fd72ed 100644
--- a/skin_coli_boli.xrc
+++ b/skin_coli_boli.xrc
@@ -881,131 +881,50 @@
<flag>wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL</flag>
<border>4</border>
<object class="wxFlexGridSizer">
- <cols>3</cols>
<rows>1</rows>
- <growablecols>1</growablecols>
- <growablerows>0</growablerows>
<object class="sizeritem">
<flag>wxGROW|wxALL</flag>
- <border>0</border>
- <object class="wxStaticBoxSizer">
- <orient>wxVERTICAL</orient>
- <label>Issue age</label>
- <object class="sizeritem">
- <flag>wxALIGN_LEFT|wxBOTTOM</flag>
- <border>0</border>
- <object class="wxFlexGridSizer">
- <cols>0</cols>
- <rows>2</rows>
- <growablecols>0</growablecols>
- <growablerows>0,1</growablerows>
- <object class="sizeritem">
- <flag>wxALIGN_LEFT|wxALIGN_TOP|wxALL</flag>
- <border>10</border>
- <object class="wxSpinCtrl" name="IssueAge">
- <help>Insurance age on date of
issue</help>
- <size>50,-1</size>
- </object>
- </object>
- <object class="sizeritem">
- <flag>wxGROW|wxLEFT|wxBOTTOM</flag>
- <border>2</border>
- <object class="wxRadioBox" name="UseDOB">
- <help>Calculate issue age based on
date of birth and effective date, automatically reflecting changes in effective
date</help>
- <style>wxRA_SPECIFY_COLS</style>
- <label>Use date</label>
- <content>
- <item>No</item>
- <item>Yes</item>
- </content>
- </object>
- </object>
- <object class="sizeritem">
-
<flag>wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxBOTTOM</flag>
- <border>2</border>
- <object class="wxDatePickerCtrl"
name="DateOfBirth">
- <help>Date of birth</help>
- </object>
- </object>
- </object>
- </object>
- </object>
- </object>
- <object class="sizeritem">
- <flag>wxGROW|wxLEFT|wxTOP|wxBOTTOM</flag>
<border>2</border>
- <object class="wxFlexGridSizer">
- <cols>0</cols>
- <rows>1</rows>
- <growablecols>0</growablecols>
- <growablerows>0</growablerows>
+ <object class="wxStaticBoxSizer">
+ <orient>wxHORIZONTAL</orient>
+ <label>Country COI multiplier</label>
<object class="sizeritem">
- <flag>wxALIGN_RIGHT|wxALIGN_TOP|wxALL</flag>
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
<border>2</border>
- <object class="wxStaticText">
- <label>Retirement Age</label>
+ <object class="wxCheckBox"
name="OverrideCoiMultiplier">
+ <help>Override default country COI multiplier
for current COI rates</help>
+ <label>Override</label>
</object>
</object>
<object class="sizeritem">
- <flag>wxALIGN_LEFT|wxALIGN_TOP|wxALL</flag>
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
<border>2</border>
- <object class="wxSpinCtrl" name="RetirementAge">
- <help>Insurance age on date of
retirement</help>
- <size>50,-1</size>
+ <object class="wxTextCtrl"
name="CountryCoiMultiplier">
+ <help>Country multiplier for current COI
rates</help>
</object>
</object>
</object>
</object>
<object class="sizeritem">
<flag>wxGROW|wxALL</flag>
- <object class="wxFlexGridSizer">
- <cols>1</cols>
- <rows>0</rows>
+ <border>2</border>
+ <object class="wxStaticBoxSizer">
+ <orient>wxHORIZONTAL</orient>
+ <label>Substandard</label>
<object class="sizeritem">
- <flag>wxGROW|wxALL</flag>
- <object class="wxStaticBoxSizer">
- <orient>wxHORIZONTAL</orient>
- <label>Country COI multiplier</label>
- <object class="sizeritem">
- <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
- <border>2</border>
- <object class="wxCheckBox"
name="OverrideCoiMultiplier">
- <help>Override default country COI
multiplier for current COI rates</help>
- <label>Override</label>
- <checked>0</checked>
- </object>
- </object>
- <object class="sizeritem">
- <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
- <border>2</border>
- <object class="wxTextCtrl"
name="CountryCoiMultiplier">
- <help>Country multiplier for current
COI rates</help>
- </object>
- </object>
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>2</border>
+ <object class="wxStaticText">
+ <label>Table rating</label>
</object>
</object>
<object class="sizeritem">
- <flag>wxGROW|wxTOP</flag>
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
<border>2</border>
- <object class="wxStaticBoxSizer">
- <orient>wxHORIZONTAL</orient>
- <label>Substandard</label>
- <object class="sizeritem">
- <flag>wxALIGN_TOP|wxALL</flag>
- <border>2</border>
- <object class="wxStaticText">
- <label>Table rating</label>
- </object>
- </object>
- <object class="sizeritem">
- <flag>wxALIGN_TOP|wxALL</flag>
- <border>2</border>
- <object class="wxComboBox"
name="SubstandardTable">
- <help>Substandard table rating</help>
- <size>-1,20</size>
-
<style>wxCB_DROPDOWN|wxCB_READONLY</style>
- </object>
- </object>
+ <object class="wxComboBox" name="SubstandardTable">
+ <help>Substandard table rating</help>
+ <size>-1,20</size>
+ <style>wxCB_DROPDOWN|wxCB_READONLY</style>
</object>
</object>
</object>
@@ -1061,6 +980,66 @@
</content>
</object>
</object>
+ <object class="sizeritem">
+ <flag>wxGROW|wxALL</flag>
+ <border>2</border>
+ <object class="wxFlexGridSizer">
+ <cols>1</cols>
+ <growablecols>0</growablecols>
+ <growablerows>0,1</growablerows>
+ <object class="sizeritem">
+ <flag>wxGROW|wxALL</flag>
+ <object class="wxCheckBox" name="UseDOB">
+ <help>Calculate issue age based on date of
birth and effective date, automatically reflecting changes in effective
date</help>
+ <label>Birthdate overrides issue age</label>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <flag>wxGROW|wxALL</flag>
+ <object class="wxFlexGridSizer">
+ <cols>2</cols>
+ <growablecols>0</growablecols>
+ <growablerows>0,1,2</growablerows>
+ <object class="sizeritem">
+
<flag>wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxRIGHT</flag>
+ <object class="wxStaticText">
+ <label>Birthdate </label>
+ </object>
+ </object>
+ <object class="sizeritem">
+
<flag>wxGROW|wxALIGN_CENTER_VERTICAL|wxRIGHT</flag>
+ <object class="wxDatePickerCtrl"
name="DateOfBirth">
+ <help>Date of birth</help>
+ </object>
+ </object>
+ <object class="sizeritem">
+
<flag>wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxRIGHT</flag>
+ <object class="wxStaticText">
+ <label>Issue age </label>
+ </object>
+ </object>
+ <object class="sizeritem">
+
<flag>wxGROW|wxALIGN_CENTER_VERTICAL|wxRIGHT</flag>
+ <object class="wxSpinCtrl" name="IssueAge">
+ <help>Insurance age on date of
issue</help>
+ </object>
+ </object>
+ <object class="sizeritem">
+
<flag>wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxRIGHT</flag>
+ <object class="wxStaticText">
+ <label>Retirement age </label>
+ </object>
+ </object>
+ <object class="sizeritem">
+
<flag>wxGROW|wxALIGN_CENTER_VERTICAL|wxRIGHT</flag>
+ <object class="wxSpinCtrl"
name="RetirementAge">
+ <help>Insurance age on date of
retirement</help>
+ </object>
+ </object>
+ </object>
+ </object>
+ </object>
+ </object>
</object>
</object>
<object class="sizeritem">
diff --git a/skin_group_carveout.xrc b/skin_group_carveout.xrc
index 3391c3c..31f3a5a 100644
--- a/skin_group_carveout.xrc
+++ b/skin_group_carveout.xrc
@@ -408,123 +408,87 @@
</content>
</object>
</object>
- </object>
- </object>
- <object class="sizeritem">
- <flag>wxGROW|wxALL</flag>
- <object class="wxFlexGridSizer">
- <rows>1</rows>
- <cols>3</cols>
- <growablecols>0,1,2</growablecols>
<object class="sizeritem">
<flag>wxGROW|wxALL</flag>
+ <border>2</border>
<object class="wxFlexGridSizer">
<cols>1</cols>
+ <growablecols>0</growablecols>
+ <growablerows>0,1</growablerows>
<object class="sizeritem">
<flag>wxGROW|wxALL</flag>
- <border>2</border>
- <object class="wxStaticBoxSizer">
- <orient>wxVERTICAL</orient>
- <label>Issue age</label>
- <object class="sizeritem">
- <flag>wxGROW|wxALL</flag>
- <border>2</border>
- <object class="wxFlexGridSizer">
- <cols>0</cols>
- <rows>2</rows>
- <growablecols>0</growablecols>
- <growablerows>0,1</growablerows>
- <object class="sizeritem">
-
<flag>wxALIGN_LEFT|wxALIGN_TOP|wxALL</flag>
- <border>10</border>
- <object class="wxSpinCtrl"
name="IssueAge">
- <help>Insurance age on date of
issue</help>
- <size>50,-1</size>
- </object>
- </object>
- <object class="sizeritem">
- <flag>wxGROW|wxLEFT|wxBOTTOM</flag>
- <border>2</border>
- <object class="wxRadioBox"
name="UseDOB">
- <help>Calculate issue age
based on date of birth and effective date, automatically reflecting changes in
effective date</help>
-
<style>wxRA_SPECIFY_COLS</style>
- <label>Use date</label>
- <content>
- <item>No</item>
- <item>Yes</item>
- </content>
- </object>
- </object>
- <object class="sizeritem">
-
<flag>wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL</flag>
- <border>2</border>
- <object class="wxGridSizer">
- <cols>2</cols>
- <rows>2</rows>
- </object>
- </object>
- <object class="sizeritem">
-
<flag>wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxBOTTOM</flag>
- <border>4</border>
- <object class="wxDatePickerCtrl"
name="DateOfBirth">
- <help>Date of birth</help>
- </object>
- </object>
- </object>
- </object>
+ <object class="wxCheckBox" name="UseDOB">
+ <help>Calculate issue age based on date of
birth and effective date, automatically reflecting changes in effective
date</help>
+ <label>Birthdate overrides issue age</label>
</object>
</object>
- </object>
- </object>
- <object class="sizeritem">
- <flag>wxGROW|wxALL</flag>
- <border>2</border>
- <object class="wxFlexGridSizer">
- <rows>1</rows>
- <growablecols>0</growablecols>
<object class="sizeritem">
- <border>4</border>
<flag>wxGROW|wxALL</flag>
<object class="wxFlexGridSizer">
- <rows>1</rows>
+ <cols>2</cols>
+ <growablecols>0</growablecols>
+ <growablerows>0,1,2</growablerows>
+ <object class="sizeritem">
+
<flag>wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxRIGHT</flag>
+ <object class="wxStaticText">
+ <label>Birthdate </label>
+ </object>
+ </object>
+ <object class="sizeritem">
+
<flag>wxGROW|wxALIGN_CENTER_VERTICAL|wxRIGHT</flag>
+ <object class="wxDatePickerCtrl"
name="DateOfBirth">
+ <help>Date of birth</help>
+ </object>
+ </object>
<object class="sizeritem">
- <flag>wxALIGN_RIGHT|wxALL</flag>
+
<flag>wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxRIGHT</flag>
+ <object class="wxStaticText">
+ <label>Issue age </label>
+ </object>
+ </object>
+ <object class="sizeritem">
+
<flag>wxGROW|wxALIGN_CENTER_VERTICAL|wxRIGHT</flag>
+ <object class="wxSpinCtrl" name="IssueAge">
+ <help>Insurance age on date of
issue</help>
+ </object>
+ </object>
+ <object class="sizeritem">
+
<flag>wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxRIGHT</flag>
<object class="wxStaticText">
<label>Retirement age </label>
</object>
</object>
<object class="sizeritem">
- <flag>wxALIGN_RIGHT</flag>
+
<flag>wxGROW|wxALIGN_CENTER_VERTICAL|wxRIGHT</flag>
<object class="wxSpinCtrl"
name="RetirementAge">
<help>Insurance age on date of
retirement</help>
- <size>50,-1</size>
</object>
</object>
</object>
</object>
</object>
</object>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <flag>wxGROW|wxALL</flag>
+ <border>2</border>
+ <object class="wxFlexGridSizer">
+ <rows>1</rows>
+ <growablecols>1</growablecols>
<object class="sizeritem">
- <flag>wxGROW|wxALL</flag>
+ <flag>wxALIGN_RIGHT|wxALL</flag>
+ <border>4</border>
+ <object class="wxStaticText">
+ <label>Substandard table</label>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <flag>wxGROW|wxALIGN_CENTER_VERTICAL|wxALL</flag>
<border>2</border>
- <object class="wxFlexGridSizer">
- <rows>1</rows>
- <growablecols>1</growablecols>
- <object class="sizeritem">
-
<flag>wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL</flag>
- <border>4</border>
- <object class="wxStaticText">
- <label>Substandard table</label>
- </object>
- </object>
- <object class="sizeritem">
-
<flag>wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL</flag>
- <border>2</border>
- <object class="wxComboBox" name="SubstandardTable">
- <help>Substandard table rating</help>
- <style>wxCB_DROPDOWN|wxCB_READONLY</style>
- </object>
- </object>
+ <object class="wxComboBox" name="SubstandardTable">
+ <help>Substandard table rating</help>
+ <style>wxCB_DROPDOWN|wxCB_READONLY</style>
</object>
</object>
</object>
diff --git a/skin_single_premium.xrc b/skin_single_premium.xrc
index d074a58..167a3d9 100644
--- a/skin_single_premium.xrc
+++ b/skin_single_premium.xrc
@@ -730,80 +730,58 @@ appropriate input.
</object>
<object class="sizeritem">
<flag>wxGROW|wxALL</flag>
+ <border>2</border>
<object class="wxFlexGridSizer">
<cols>1</cols>
<growablecols>0</growablecols>
- <growablerows>0</growablerows>
+ <growablerows>0,1</growablerows>
<object class="sizeritem">
<flag>wxGROW|wxALL</flag>
- <border>2</border>
- <object class="wxStaticBoxSizer">
- <orient>wxVERTICAL</orient>
- <label>Issue age</label>
- <object class="sizeritem">
- <flag>wxALIGN_LEFT|wxALL</flag>
- <border>2</border>
- <object class="wxFlexGridSizer">
- <cols>0</cols>
- <rows>2</rows>
- <growablecols>0</growablecols>
- <growablerows>0,1</growablerows>
- <object class="sizeritem">
-
<flag>wxALIGN_LEFT|wxALIGN_TOP|wxALL</flag>
- <border>10</border>
- <object class="wxSpinCtrl"
name="IssueAge">
- <help>Insurance age on date of
issue</help>
- <size>50,-1</size>
- </object>
- </object>
- <object class="sizeritem">
- <flag>wxGROW|wxLEFT|wxBOTTOM</flag>
- <border>2</border>
- <object class="wxRadioBox"
name="UseDOB">
- <help>Calculate issue age
based on date of birth and effective date, automatically reflecting changes in
effective date</help>
-
<style>wxRA_SPECIFY_COLS</style>
- <label>Use date</label>
- <content>
- <item>No</item>
- <item>Yes</item>
- </content>
- </object>
- </object>
- <object class="sizeritem">
-
<flag>wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL</flag>
- <border>2</border>
- <object class="wxGridSizer">
- <cols>2</cols>
- <rows>2</rows>
- </object>
- </object>
- <object class="sizeritem">
-
<flag>wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxBOTTOM</flag>
- <border>4</border>
- <object class="wxDatePickerCtrl"
name="DateOfBirth">
- <help>Date of birth</help>
- </object>
- </object>
- </object>
- </object>
+ <object class="wxCheckBox" name="UseDOB">
+ <help>Calculate issue age based on date of
birth and effective date, automatically reflecting changes in effective
date</help>
+ <label>Birthdate overrides issue age</label>
</object>
</object>
<object class="sizeritem">
- <border>4</border>
- <flag>wxALIGN_RIGHT|wxALL</flag>
+ <flag>wxGROW|wxALL</flag>
<object class="wxFlexGridSizer">
- <rows>1</rows>
+ <cols>2</cols>
+ <growablecols>0</growablecols>
+ <growablerows>0,1,2</growablerows>
+ <object class="sizeritem">
+
<flag>wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxRIGHT</flag>
+ <object class="wxStaticText">
+ <label>Birthdate </label>
+ </object>
+ </object>
+ <object class="sizeritem">
+
<flag>wxGROW|wxALIGN_CENTER_VERTICAL|wxRIGHT</flag>
+ <object class="wxDatePickerCtrl"
name="DateOfBirth">
+ <help>Date of birth</help>
+ </object>
+ </object>
<object class="sizeritem">
- <flag>wxALIGN_RIGHT|wxALL</flag>
+
<flag>wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxRIGHT</flag>
+ <object class="wxStaticText">
+ <label>Issue age </label>
+ </object>
+ </object>
+ <object class="sizeritem">
+
<flag>wxGROW|wxALIGN_CENTER_VERTICAL|wxRIGHT</flag>
+ <object class="wxSpinCtrl" name="IssueAge">
+ <help>Insurance age on date of
issue</help>
+ </object>
+ </object>
+ <object class="sizeritem">
+
<flag>wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxRIGHT</flag>
<object class="wxStaticText">
<label>Retirement age </label>
</object>
</object>
<object class="sizeritem">
- <flag>wxALIGN_RIGHT</flag>
+
<flag>wxGROW|wxALIGN_CENTER_VERTICAL|wxRIGHT</flag>
<object class="wxSpinCtrl"
name="RetirementAge">
<help>Insurance age on date of
retirement</help>
- <size>50,-1</size>
</object>
</object>
</object>
@@ -825,7 +803,7 @@ appropriate input.
</object>
</object>
<object class="sizeritem">
- <flag>wxALIGN_RIGHT|wxALL</flag>
+ <flag>wxGROW|wxALIGN_CENTER_VERTICAL|wxALL</flag>
<border>2</border>
<object class="wxComboBox" name="SubstandardTable">
<help>Substandard table rating</help>