From c8739e83a9908ee1e42485ce8a5813cd699b7777 Mon Sep 17 00:00:00 2001
From: Maksymilian Pawlak <120831+m4ksio@users.noreply.github.com>
Date: Tue, 26 Sep 2017 16:43:32 +0100
Subject: [PATCH] IRS Fixes to bring UI closer to declared financial types

---
 .../net/corda/finance/contracts/FinanceTypes.kt   |  2 +-
 .../main/resources/irsweb/view/create-deal.html   | 15 ++++++---------
 2 files changed, 7 insertions(+), 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
index 2a1c02a11e..b79c9d01a6 100644
--- 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
index 7ea4e8d3b9..53ea8d4c8e 100644
--- 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 @@
                     <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 @@
                     <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">