ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-06-01 07:00:54 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

IRS Fixes to bring UI closer to declared financial types

Browse Source
This commit is contained in:
Maksymilian Pawlak 2017-09-26 16:43:32 +01:00
parent c6c4c13bee
commit c8739e83a9
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
finance/src/main/kotlin/net/corda/finance/contracts/FinanceTypes.kt
View File

@ -160,7 +160,7 @@ enum class DayCountBasisDay {
enum class DayCountBasisYear { enum class DayCountBasisYear {
// Ditto above comment for years. // Ditto above comment for years.
Y360, 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 { override fun toString(): String {
return super.toString().drop(1) return super.toString().drop(1)

15
samples/irs-demo/src/main/resources/irsweb/view/create-deal.html
View File

@ -64,10 +64,9 @@
<label>Roll Convention</label> <label>Roll Convention</label>
<select class="ui selection" ng-model="deal.fixedLeg.rollConvention"> <select class="ui selection" ng-model="deal.fixedLeg.rollConvention">
<option value="Following">Following</option> <option value="Following">Following</option>
<option value="Preceding">Preceding</option> <option value="Previous">Previous</option>
<option value="ModifiedFollowing">Modified following</option> <option value="ModifiedFollowing">Modified following</option>
<option value="ModifiedFollowingBimonthly">Modified following bimonthly</option> <option value="ModifiedPrevious">Modified previous</option>
<option value="EndOfMonth">End of month</option>
</select> </select>
</div> </div>
<div class="field"> <div class="field">
@ -120,20 +119,18 @@
<label>Roll Convention</label> <label>Roll Convention</label>
<select class="ui selection" ng-model="deal.floatingLeg.rollConvention"> <select class="ui selection" ng-model="deal.floatingLeg.rollConvention">
<option value="Following">Following</option> <option value="Following">Following</option>
<option value="Preceding">Preceding</option> <option value="Previous">Previous</option>
<option value="ModifiedFollowing">Modified following</option> <option value="ModifiedFollowing">Modified following</option>
<option value="ModifiedFollowingBimonthly">Modified following bimonthly</option> <option value="ModifiedPrevious">Modified previous</option>
<option value="EndOfMonth">End of month</option>
</select> </select>
</div> </div>
<div class="field"> <div class="field">
<label>Fixing Roll Convention</label> <label>Fixing Roll Convention</label>
<select class="ui selection" ng-model="deal.floatingLeg.fixingRollConvention"> <select class="ui selection" ng-model="deal.floatingLeg.fixingRollConvention">
<option value="Following">Following</option> <option value="Following">Following</option>
<option value="Preceding">Preceding</option> <option value="Previous">Previous</option>
<option value="ModifiedFollowing">Modified following</option> <option value="ModifiedFollowing">Modified following</option>
<option value="ModifiedFollowingBimonthly">Modified following bimonthly</option> <option value="ModifiedPrevious">Modified previous</option>
<option value="EndOfMonth">End of month</option>
</select> </select>
</div> </div>
<div class="field"> <div class="field">