From 9d1d1b4f2c3cceab99c1bec4591af87e2c5d36b9 Mon Sep 17 00:00:00 2001
From: Clinton Alexander <clinton.alexander@r3cev.com>
Date: Mon, 18 Jul 2016 17:34:40 +0100
Subject: [PATCH] Defaults for models now more sensible.

---
 .../com/r3corda/demos/api/irswebdemo/js/viewmodel/Common.js | 4 ++--
 .../r3corda/demos/api/irswebdemo/js/viewmodel/FixedLeg.js   | 4 ++--
 .../demos/api/irswebdemo/js/viewmodel/FloatingLeg.js        | 6 ++----
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/main/resources/com/r3corda/demos/api/irswebdemo/js/viewmodel/Common.js b/src/main/resources/com/r3corda/demos/api/irswebdemo/js/viewmodel/Common.js
index 624b9ab98e..174105ff62 100644
--- a/src/main/resources/com/r3corda/demos/api/irswebdemo/js/viewmodel/Common.js
+++ b/src/main/resources/com/r3corda/demos/api/irswebdemo/js/viewmodel/Common.js
@@ -3,8 +3,8 @@
 define([], () => {
     return {
         baseCurrency: "EUR",
-        effectiveDate: new Date(2016, 3, 11),
-        terminationDate: new Date(2026, 3, 11),
+        effectiveDate: new Date(2016, 2, 11),
+        terminationDate: new Date(2026, 2, 11),
         eligibleCreditSupport: "Cash in an Eligible Currency",
         independentAmounts: {
             quantity: 0
diff --git a/src/main/resources/com/r3corda/demos/api/irswebdemo/js/viewmodel/FixedLeg.js b/src/main/resources/com/r3corda/demos/api/irswebdemo/js/viewmodel/FixedLeg.js
index d0f409fa62..7773d85568 100644
--- a/src/main/resources/com/r3corda/demos/api/irswebdemo/js/viewmodel/FixedLeg.js
+++ b/src/main/resources/com/r3corda/demos/api/irswebdemo/js/viewmodel/FixedLeg.js
@@ -6,12 +6,12 @@ define(['utils/dayCountBasisLookup'], (dayCountBasisLookup) => {
         notional: {
             quantity: 2500000000
         },
-        paymentFrequency: "Annual",
+        paymentFrequency: "SemiAnnual",
         effectiveDateAdjustment: null,
         terminationDateAdjustment: null,
         fixedRate: "1.676",
         dayCountBasis: dayCountBasisLookup["ACT/360"],
-        rollConvention: "Following",
+        rollConvention: "ModifiedFollowing",
         dayInMonth: 10,
         paymentRule: "InArrears",
         paymentDelay: "0",
diff --git a/src/main/resources/com/r3corda/demos/api/irswebdemo/js/viewmodel/FloatingLeg.js b/src/main/resources/com/r3corda/demos/api/irswebdemo/js/viewmodel/FloatingLeg.js
index b4d8467e66..2489b83cab 100644
--- a/src/main/resources/com/r3corda/demos/api/irswebdemo/js/viewmodel/FloatingLeg.js
+++ b/src/main/resources/com/r3corda/demos/api/irswebdemo/js/viewmodel/FloatingLeg.js
@@ -7,13 +7,11 @@ define(['utils/dayCountBasisLookup'], (dayCountBasisLookup) => {
            quantity: 2500000000
         },
         paymentFrequency: "Quarterly",
-        effectiveDate: new Date(2016, 3, 11),
         effectiveDateAdjustment: null,
-        terminationDate: new Date(2026, 3, 11),
         terminationDateAdjustment: null,
         dayCountBasis: dayCountBasisLookup["ACT/360"],
-        rollConvention: "Following",
-        fixingRollConvention: "Following",
+        rollConvention: "ModifiedFollowing",
+        fixingRollConvention: "ModifiedFollowing",
         dayInMonth: 10,
         resetDayInMonth: 10,
         paymentRule: "InArrears",