aclindsa/moneygo
1
0
Fork 0
mirror of https://github.com/aclindsa/moneygo.git synced 2025-10-29 17:13:26 -04:00
Code Issues Releases Wiki Activity

Add symbols for securities

Browse Source
This commit is contained in:
Aaron Lindsay
2015-08-26 07:38:13 -04:00
parent 01f0f9e68f
commit 099f42e4fe
3 changed files with 34 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
static/account_register.js
View File

@@ -49,13 +49,13 @@ const TransactionRow = React.createClass({
accountName = "--Split Transaction--";
}
var amount = "$" + thisAccountSplit.Amount.toFixed(security.Precision);
var balance = "$" + this.props.transaction.Balance.toFixed(security.Precision);
var amount = security.Symbol + " " + thisAccountSplit.Amount.toFixed(security.Precision);
var balance = security.Symbol + " " + this.props.transaction.Balance.toFixed(security.Precision);
status = TransactionStatusMap[this.props.transaction.Status];
number = thisAccountSplit.Number;
} else {
var amount = "$" + (new Big(0.0)).toFixed(security.Precision);
var balance = "$" + (new Big(0.0)).toFixed(security.Precision);
var amount = security.Symbol + " " + (new Big(0.0)).toFixed(security.Precision);
var balance = security.Symbol + " " + (new Big(0.0)).toFixed(security.Precision);
}
return (
@@ -74,7 +74,12 @@ const TransactionRow = React.createClass({
const AmountInput = React.createClass({
_getInitialState: function(props) {
// Ensure we can edit this without screwing up other copies of it
var a = props.value.toFixed(this.props.security.Precision);
var a;
if (props.security)
a = props.value.toFixed(props.security.Precision);
else
a = props.value.toString();
return {
LastGoodAmount: a,
Amount: a
@@ -84,7 +89,9 @@ const AmountInput = React.createClass({
return this._getInitialState(this.props);
},
componentWillReceiveProps: function(nextProps) {
if (!nextProps.value.eq(this.props.value) && !nextProps.value.eq(this.getValue())) {
if ((!nextProps.value.eq(this.props.value) &&
!nextProps.value.eq(this.getValue())) ||
nextProps.security !== this.props.security) {
this.setState(this._getInitialState(nextProps));
}
},
@@ -92,8 +99,13 @@ const AmountInput = React.createClass({
this.refs.amount.getInputDOMNode().onblur = this.onBlur;
},
onBlur: function() {
var a;
if (this.props.security)
a = (new Big(this.getValue())).toFixed(this.props.security.Precision);
else
a = (new Big(this.getValue())).toString();
this.setState({
Amount: (new Big(this.getValue())).toFixed(this.props.security.Precision)
Amount: a
});
},
onChange: function() {
@@ -112,10 +124,15 @@ const AmountInput = React.createClass({
}
},
render: function() {
var symbol = "?";
if (this.props.security)
symbol = this.props.security.Symbol;
return (
<Input type="text"
value={this.state.Amount}
onChange={this.onChange}
addonBefore={symbol}
ref="amount"/>
);
}
@@ -230,7 +247,9 @@ const AddEditTransactionModal = React.createClass({
for (var i = 0; i < this.state.transaction.Splits.length; i++) {
var self = this;
var s = this.state.transaction.Splits[i];
var security = this.props.security_map[this.props.account_map[s.AccountId].SecurityId];
var security = null;
if (this.props.account_map[s.AccountId])
security = this.props.security_map[this.props.account_map[s.AccountId].SecurityId];
// Define all closures for calling split-updating functions
var deleteSplitFn = (function() {

4
static/models.js
View File

@@ -92,6 +92,7 @@ for (var type in SecurityType) {
function Security() {
this.SecurityId = -1;
this.Name = "";
this.Symbol = "";
this.Precision = -1;
this.Type = -1;
}
@@ -100,6 +101,7 @@ Security.prototype.toJSON = function() {
var json_obj = {};
json_obj.SecurityId = this.SecurityId;
json_obj.Name = this.Name;
json_obj.Symbol = this.Symbol;
json_obj.Precision = this.Precision;
json_obj.Type = this.Type;
return JSON.stringify(json_obj);
@@ -112,6 +114,8 @@ Security.prototype.fromJSON = function(json_input) {
this.SecurityId = json_obj.SecurityId;
if (json_obj.hasOwnProperty("Name"))
this.Name = json_obj.Name;
if (json_obj.hasOwnProperty("Symbol"))
this.Symbol = json_obj.Symbol;
if (json_obj.hasOwnProperty("Precision"))
this.Precision = json_obj.Precision;
if (json_obj.hasOwnProperty("Type"))