@@ -1280,7 +1280,7 @@ class ETFTradeTracker {
if (etf) {
const changeAmount = currentPrice - etf.avgPrice;
const changePercent = ((changeAmount / etf.avgPrice) * 100);
- const currencySymbol = etf.currency === 'EUR' ? '€' : '$';
+ const currencySymbol = this.getCurrencySymbol(etf.currency);
const changeElement = document.querySelector(`[data-symbol="${symbol}"].price-change`);
if (changeElement) {
@@ -1379,7 +1379,7 @@ class ETFTradeTracker {
const currentValue = etf.shares * currentPrice;
const gainLoss = currentValue - etf.totalValue;
const percentage = etf.totalValue > 0 ? ((gainLoss / etf.totalValue) * 100) : 0;
- const currencySymbol = etf.currency === 'EUR' ? '€' : '$';
+ const currencySymbol = this.getCurrencySymbol(etf.currency);
const performanceClass = gainLoss >= 0 ? 'positive' : 'negative';
const hasRealPrice = this.currentPrices.has(symbol);
@@ -1611,7 +1611,7 @@ class ETFTradeTracker {
}
const breakdownHTML = eligiblePositions.map(position => {
- const currencySymbol = position.currency === 'EUR' ? '€' : '$';
+ const currencySymbol = this.getCurrencySymbol(position.currency);
const gainsClass = position.gains >= 0 ? 'positive' : 'negative';
const performanceClass = position.gains >= 0 ? 'positive' : 'negative';
const gainsPercentage = position.cost > 0 ? ((position.gains / position.cost) * 100) : 0;
@@ -1993,7 +1993,7 @@ class ETFTradeTracker {
accountsList.innerHTML = accounts.map(account => {
const createdDate = new Date(account.created_at).toLocaleDateString();
const balance = parseFloat(account.balance);
- const currencySymbol = account.currency === 'EUR' ? '€' : '$';
+ const currencySymbol = this.getCurrencySymbol(account.currency);
const formattedBalance = `${currencySymbol}${balance.toLocaleString('en-US', {minimumFractionDigits: 2, maximumFractionDigits: 2})}`;
const accountTypeMap = {
@@ -2267,7 +2267,7 @@ class ETFTradeTracker {
transfersList.innerHTML = transfers.map(transfer => {
const transferDate = new Date(transfer.transfer_date).toLocaleDateString();
const amount = parseFloat(transfer.amount);
- const currencySymbol = transfer.currency === 'USD' ? '$' : '€';
+ const currencySymbol = this.getCurrencySymbol(transfer.currency);
return `
@@ -2305,7 +2305,7 @@ class ETFTradeTracker {
// Add active accounts
const activeAccounts = accounts.filter(account => account.is_active);
activeAccounts.forEach(account => {
- const currencySymbol = account.currency === 'USD' ? '$' : '€';
+ const currencySymbol = this.getCurrencySymbol(account.currency);
const option = document.createElement('option');
option.value = account.id;
option.textContent = `${account.account_name} (${currencySymbol}${parseFloat(account.balance).toFixed(2)})`;
@@ -2422,7 +2422,7 @@ class ETFTradeTracker {
// Add active accounts
const activeAccounts = accounts.filter(account => account.is_active);
activeAccounts.forEach(account => {
- const currencySymbol = account.currency === 'USD' ? '$' : '€';
+ const currencySymbol = this.getCurrencySymbol(account.currency);
const option = document.createElement('option');
option.value = account.id;
option.textContent = `${account.account_name} (${currencySymbol}${parseFloat(account.balance).toFixed(2)})`;
@@ -2466,7 +2466,7 @@ class ETFTradeTracker {
transfersList.innerHTML = recentTransfers.map(transfer => {
const transferDate = new Date(transfer.transfer_date).toLocaleDateString();
const amount = parseFloat(transfer.amount);
- const currencySymbol = transfer.currency === 'USD' ? '$' : '€';
+ const currencySymbol = this.getCurrencySymbol(transfer.currency);
return `
@@ -2804,7 +2804,7 @@ class ETFTradeTracker {
existingModal.remove();
}
- const currencySymbol = history[0]?.currency === 'EUR' ? '€' : '$';
+ const currencySymbol = this.getCurrencySymbol(history[0]?.currency);
const modal = document.createElement('div');
modal.id = 'price-history-modal';
@@ -2856,6 +2856,15 @@ class ETFTradeTracker {
}
}
+ getCurrencySymbol(currency) {
+ switch(currency) {
+ case 'EUR': return '€';
+ case 'USD': return '$';
+ case 'GBP': return '£';
+ default: return currency;
+ }
+ }
+
escapeHtml(text) {
const div = document.createElement('div');
div.textContent = text;
diff --git a/server.js b/server.js
index 7f41229..d24053f 100644
--- a/server.js
+++ b/server.js
@@ -65,7 +65,7 @@ function initializeDatabase() {
trade_type TEXT NOT NULL CHECK (trade_type IN ('buy', 'sell')),
shares REAL NOT NULL CHECK (shares > 0),
price REAL NOT NULL CHECK (price > 0),
- currency TEXT NOT NULL CHECK (currency IN ('EUR', 'USD')),
+ currency TEXT NOT NULL CHECK (currency IN ('EUR', 'USD', 'GBP')),
trade_datetime TEXT NOT NULL,
fees REAL DEFAULT 0 CHECK (fees >= 0),
notes TEXT,
@@ -180,7 +180,7 @@ function initializeDatabase() {
account_name TEXT NOT NULL,
account_type TEXT DEFAULT 'savings' CHECK (account_type IN ('savings', 'checking', 'money_market', 'cd', 'other')),
balance REAL NOT NULL DEFAULT 0 CHECK (balance >= 0),
- currency TEXT NOT NULL DEFAULT 'EUR' CHECK (currency IN ('EUR', 'USD')),
+ currency TEXT NOT NULL DEFAULT 'EUR' CHECK (currency IN ('EUR', 'USD', 'GBP')),
institution_name TEXT,
interest_rate REAL DEFAULT 0 CHECK (interest_rate >= 0),
notes TEXT,
@@ -230,7 +230,7 @@ function initializeDatabase() {
user_id INTEGER NOT NULL,
etf_symbol TEXT NOT NULL,
price REAL NOT NULL CHECK (price > 0),
- currency TEXT NOT NULL CHECK (currency IN ('EUR', 'USD')),
+ currency TEXT NOT NULL CHECK (currency IN ('EUR', 'USD', 'GBP')),
updated_at DATETIME DEFAULT CURRENT_TIMESTAMP,
FOREIGN KEY (user_id) REFERENCES users (id) ON DELETE CASCADE
)
@@ -990,7 +990,7 @@ app.post('/api/trades', requireAuthOrToken, (req, res) => {
return res.status(400).json({ error: 'Invalid trade type' });
}
- if (!['EUR', 'USD'].includes(currency)) {
+ if (!['EUR', 'USD', 'GBP'].includes(currency)) {
return res.status(400).json({ error: 'Invalid currency' });
}
@@ -1232,8 +1232,8 @@ app.post('/api/price-history', requireAuthOrToken, (req, res) => {
return res.status(400).json({ error: 'Price must be greater than 0' });
}
- if (!['EUR', 'USD'].includes(currency)) {
- return res.status(400).json({ error: 'Currency must be EUR or USD' });
+ if (!['EUR', 'USD', 'GBP'].includes(currency)) {
+ return res.status(400).json({ error: 'Currency must be EUR, USD, or GBP' });
}
const sql = `