Merge pull request corda#1684 from corda/m4ksio_irs_demo_fixes

IRS Demo UI Fixes
Taburu · Sep 27, 2017 · 06cf741 · 06cf741
2 parents d1891fa + c8739e8
commit 06cf741
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/finance/src/main/kotlin/net/corda/finance/contracts/FinanceTypes.kt b/finance/src/main/kotlin/net/corda/finance/contracts/FinanceTypes.kt
@@ -160,7 +160,7 @@ enum class DayCountBasisDay {
 enum class DayCountBasisYear {
     // Ditto above comment for years.
     Y360,
-    Y365F, Y365L, Y365Q, Y366, YActual, YActualA, Y365B, Y365, YISMA, YICMA, Y252;
+    Y365F, Y365L, Y365Q, Y366, YActual, YActualA, Y365B, Y365, YISMA, YISDA, YICMA, Y252;
 
     override fun toString(): String {
         return super.toString().drop(1)

diff --git a/samples/irs-demo/src/main/resources/irsweb/view/create-deal.html b/samples/irs-demo/src/main/resources/irsweb/view/create-deal.html
@@ -64,10 +64,9 @@ <h3>Fixed Leg</h3>
                     <label>Roll Convention</label>
                     <select class="ui selection" ng-model="deal.fixedLeg.rollConvention">
                         <option value="Following">Following</option>
-                        <option value="Preceding">Preceding</option>
+                        <option value="Previous">Previous</option>
                         <option value="ModifiedFollowing">Modified following</option>
-                        <option value="ModifiedFollowingBimonthly">Modified following bimonthly</option>
-                        <option value="EndOfMonth">End of month</option>
+                        <option value="ModifiedPrevious">Modified previous</option>
                     </select>
                 </div>
                 <div class="field">
@@ -120,20 +119,18 @@ <h3>Floating Leg</h3>
                     <label>Roll Convention</label>
                     <select class="ui selection" ng-model="deal.floatingLeg.rollConvention">
                         <option value="Following">Following</option>
-                        <option value="Preceding">Preceding</option>
+                        <option value="Previous">Previous</option>
                         <option value="ModifiedFollowing">Modified following</option>
-                        <option value="ModifiedFollowingBimonthly">Modified following bimonthly</option>
-                        <option value="EndOfMonth">End of month</option>
+                        <option value="ModifiedPrevious">Modified previous</option>
                     </select>
                 </div>
                 <div class="field">
                     <label>Fixing Roll Convention</label>
                     <select class="ui selection" ng-model="deal.floatingLeg.fixingRollConvention">
                         <option value="Following">Following</option>
-                        <option value="Preceding">Preceding</option>
+                        <option value="Previous">Previous</option>
                         <option value="ModifiedFollowing">Modified following</option>
-                        <option value="ModifiedFollowingBimonthly">Modified following bimonthly</option>
-                        <option value="EndOfMonth">End of month</option>
+                        <option value="ModifiedPrevious">Modified previous</option>
                     </select>
                 </div>
                 <div class="field">