Merged in clint-demofixes (pull request #577)

Improvements to SIMM demo
This commit is contained in:
Clinton Alexander 2016-11-29 19:07:18 +00:00
commit 82745bbbc9
5 changed files with 10 additions and 12 deletions

View File

@ -8,7 +8,7 @@
<select class="form-control" name="token" [(ngModel)]="deal.convention">
<option value="EUR_FIXED_1Y_EURIBOR_3M" selected>EUR fixed 1Y EURIBOR 3M</option>
<option value="EUR_FIXED_1Y_EURIBOR_6M">EUR fixed 1Y EURIBOR 6M</option>
<option value="USD_FIXED_6M_LIBOR_3M">USD fixed 6M LIBOR 3M</option>
<!--<option value="USD_FIXED_6M_LIBOR_3M">USD fixed 6M LIBOR 3M</option>
<option value="USD_FIXED_1Y_LIBOR_3M">USD fixed 1Y LIBOR 3M</option>
<option value="GBP_FIXED_1Y_LIBOR_3M">GBP fixed 1Y LIBOR 3M</option>
<option value="GBP_FIXED_6M_LIBOR_6M">GBP fixed 6M LIBOR 6M</option>
@ -16,7 +16,7 @@
<option value="CHF_FIXED_1Y_LIBOR_3M">CHF fixed 1Y LIBOR 3M</option>
<option value="CHF_FIXED_1Y_LIBOR_6M">CHF fixed 1Y LIBOR 6M</option>
<option value="JPY_FIXED_6M_TIBORJ_3M">JPY fixed 6M TIBORJ 3M</option>
<option value="JPY_FIXED_6M_LIBOR_6M">JPY fixed 6M LIBOR 6M</option>
<option value="JPY_FIXED_6M_LIBOR_6M">JPY fixed 6M LIBOR 6M</option>-->
</select>
</div>
<div class="form-group">

View File

@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<title>Vega</title>
<title>Simm Valuation Demo</title>
<!-- <base href="/"> -->
<base href="/web/simmvaluationdemo/">

View File

@ -1,22 +1,20 @@
# Vega
# Simm Valuation Demo Web UI
This project was generated with [angular-cli](https://github.com/angular/angular-cli) version 1.0.0-beta.10.
## How to build for production
`npm install -g angular-cli@1.0.0-beta.10`
`npm install`
in src/app/index.html replace `<base href="/">` with `<base href="/web/vega/">` (TODO: fix this)
in src/app/system-config.ts uncomment `//baseURL: "/web/vega",` (TODO: fix this)
`ng build -prod`
the dist build will be generated in `dist` folder
## Troubleshooting
On a mac, when doing ng serve you may get an error like:
`The Broccoli Plugin: [BroccoliMergeTrees] failed with:
Error: Merge error: file .DS_Store exists in /Users/Paolo/Dropbox/Code/R3/vega-main/vega/src/main/web/tmp/broccoli_merge_trees-input_base_path-0r7SyUJT.tmp/0 and /Users/Paolo/Dropbox/Code/R3/vega-main/vega/src/main/web/tmp/broccoli_merge_trees-input_base_path-0r7SyUJT.tmp/1
Error: Merge error: file .DS_Store exists in ... and ...
Pass option { overwrite: true } to mergeTrees in order to have the latter file win.
at BroccoliMergeTrees._mergeRelativePath (/Users/Paolo/Dropbox/Code/R3/vega-main/vega/src/main/web/node_modules/angular-cli/node_modules/broccoli-merge-trees/index.js:266:17)
at BroccoliMergeTrees.build (/Users/Paolo/Dropbox/Code/R3/vega-main/vega/src/main/web/node_modules/angular-cli/node_modules/broccoli-merge-trees/index.js:70:24)
at BroccoliMergeTrees._mergeRelativePath (...)
at BroccoliMergeTrees.build (...)
...`
[see here](http://stackoverflow.com/questions/38549080/broccoli-mergeerror-for-ds-store-file-in-angular-cli)

View File

@ -8,7 +8,7 @@
<select class="form-control" name="token" [(ngModel)]="deal.convention">
<option value="EUR_FIXED_1Y_EURIBOR_3M" selected>EUR fixed 1Y EURIBOR 3M</option>
<option value="EUR_FIXED_1Y_EURIBOR_6M">EUR fixed 1Y EURIBOR 6M</option>
<option value="USD_FIXED_6M_LIBOR_3M">USD fixed 6M LIBOR 3M</option>
<!--<option value="USD_FIXED_6M_LIBOR_3M">USD fixed 6M LIBOR 3M</option>
<option value="USD_FIXED_1Y_LIBOR_3M">USD fixed 1Y LIBOR 3M</option>
<option value="GBP_FIXED_1Y_LIBOR_3M">GBP fixed 1Y LIBOR 3M</option>
<option value="GBP_FIXED_6M_LIBOR_6M">GBP fixed 6M LIBOR 6M</option>
@ -16,7 +16,7 @@
<option value="CHF_FIXED_1Y_LIBOR_3M">CHF fixed 1Y LIBOR 3M</option>
<option value="CHF_FIXED_1Y_LIBOR_6M">CHF fixed 1Y LIBOR 6M</option>
<option value="JPY_FIXED_6M_TIBORJ_3M">JPY fixed 6M TIBORJ 3M</option>
<option value="JPY_FIXED_6M_LIBOR_6M">JPY fixed 6M LIBOR 6M</option>
<option value="JPY_FIXED_6M_LIBOR_6M">JPY fixed 6M LIBOR 6M</option>-->
</select>
</div>
<div class="form-group">

View File

@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<title>Vega</title>
<title>Simm Valuation Demo</title>
<!-- <base href="/"> -->
<base href="/web/simmvaluationdemo/">