";
+ let summaryTable = "" +
+ "| Account Name | " +
+ "No. Holdings | " +
+ "Total Cost (GBP) | " +
+ "Total Gains (GBP) | " +
+ "Total Losses (GBP) | " +
+ "Current Investements Value | " +
+ "NET Gain | " +
+ "Cash Balance GBP | " +
+ "Total Value GBP | " +
+ "
";
+ let accountsTables = ''
+ let tableIDs = ['accountsSummaryTable'];
+ let hideEmptyAccounts = $('#hideEmptyAccounts').prop('checked');
+ let altRow = 1;
+ for (let ax = 0; ax < accounts.length; ax++) {
+ let a = accounts[ax];
+ let accountGainsGBP = 0;
+ let accountLossesGBP = 0;
+ let accountValueGBP = 0;
+ let profitOrLoss = a.totalGainGBP < 0 ? 'loss' : 'profit';
+ if (a.holdings.length > 0) {
+ altRow = !altRow;
+
+ accountsTables += '
' + a.accountName + '
'
+ let tableID = 'accountTable' + ax;
+ tableIDs.push(tableID);
+ accountsTables += '' +
+ '' +
+ '| Name | ' +
+ 'Symbol | ' +
+ 'Buy Date | ' +
+ 'No Units | ' +
+ 'Buy Price | ' +
+ 'Current Price | ' +
+ 'Book Cost | ' +
+ 'Approx Book Cost £ | ' +
+ 'Current Value | ' +
+ 'Current Value £ | ' +
+ 'Gain | ' +
+ 'Gain £ | ' +
+ 'Gain % | ' +
+ '
';
+ let accountAltRow = 1;
+ for (let hx = 0; hx < a.holdings.length; hx++) {
+ let h = a.holdings[hx];
+ accountAltRow = !accountAltRow;
+ let holdingProfitOrLoss = h.gain < 0 ? 'loss' : 'profit';
+ let holdingGBPProfitOrLoss = h.gainGBP < 0 ? 'loss' : 'profit';
+ if (h.gainGBP > 0) {
+ accountGainsGBP += h.gainGBP;
+ } else {
+ accountLossesGBP += h.gainGBP;
+ }
+ accountValueGBP += h.currentValueGBP;
+ accountsTables += '' +
+ '' + h.instrumentName + ' | ' +
+ '' + h.symbol + ' | ' +
+ '' + new Date(h.purchaseDate).yyyymmdd() + ' | ' +
+ '' + h.noUnits + ' | ' +
+ '' + formatAmount(h.purchasePricePerUnit, h.currency, 2) + ' | ' +
+ '' + formatAmount(h.currentPrice, h.currency, 2) + ' | ' +
+ '' + (h.currency == 'GBp' ? formatAmount(h.cost / 100, 'GBP', 2) : formatAmount(h.cost, h.currency, 2)) + ' | ' +
+ '' + formatAmount(h.costGBP, 'GBP', 2) + ' | ' +
+ '' + (h.currency == 'GBp' ? formatAmount(h.currentValue / 100, 'GBP', 2) : formatAmount(h.currentValue, h.currency, 2)) + ' | ' +
+ '' + formatAmount(h.currentValueGBP, 'GBP', 2) + ' | ' +
+ '' + formatAmount(h.gain, h.currency, 2) + ' | ' +
+ '' + formatAmount(h.gainGBP, 'GBP', 2) + ' | ' +
+ //'' + ((h.gain / h.cost) * 100).toFixed(1) + '% | ' +
+ '' + ((h.gainGBP / h.costGBP) * 100).toFixed(1) + '% | ' +
+ '';
+ }
+ //Add the Total Gains
+ accountAltRow = !accountAltRow;
+ accountsTables += '' +
+ 'Total Gains | ' +
+ '' + formatAmount(accountGainsGBP, 'GBP', 2) + ' | ' +
+ ' | ' +
+ '';
+ //Add the Total Losses
+ accountAltRow = !accountAltRow;
+ accountsTables += '' +
+ 'Total Losses | ' +
+ '' + formatAmount(accountLossesGBP, 'GBP', 2) + ' | ' +
+ ' | ' +
+ '';
+ //Add the NET Gains summary line
+ accountAltRow = !accountAltRow;
+ accountsTables += '' +
+ 'Account Value: | ' +
+ '' + formatAmount(accountValueGBP, 'GBP', 2) + ' | ' +
+ 'NET Gain | ' +
+ '' + formatAmount(accountGainsGBP + accountLossesGBP, 'GBP', 2) + ' | ' +
+ ' | ' +
+ '';
+ accountsTables += '
';
+ }
+
+ //Add an entry to the summary table
+ if (a.totalValueGBP + a.totalCashGBP > 0 || !hideEmptyAccounts) {
+ summaryTable += "" + a.accountName + " | " +
+ "" + a.holdings.length + " | " +
+ "" + formatAmount(a.totalCostGBP || 0, 'GBP', 2) + " | " +
+ "" + formatAmount(accountGainsGBP, 'GBP', 2) + " | " +
+ "" + formatAmount(accountLossesGBP, 'GBP', 2) + " | " +
+ "" + formatAmount(a.totalValueGBP || 0, 'GBP', 2) + " | " +
+ "" + formatAmount(a.totalGainGBP || 0, 'GBP', 2) + " | " +
+ "" + formatAmount(a.totalCashGBP || 0, 'GBP', 2) + " | " +
+ "" + formatAmount(a.totalValueGBP + a.totalCashGBP || 0, 'GBP', 2) + " | " +
+ "";
+ }
+ }
+ summaryTable += "
";
+ $("#accountsSummaryDiv").html(summaryTable + '
' + accountsTables);
+}
diff --git a/Websites/SharePrices/SharePrices/scripts/SharePrices_Common.js b/Websites/SharePrices/SharePrices/scripts/SharePrices_Common.js
index 0aea3eb..0252f2d 100644
--- a/Websites/SharePrices/SharePrices/scripts/SharePrices_Common.js
+++ b/Websites/SharePrices/SharePrices/scripts/SharePrices_Common.js
@@ -84,4 +84,13 @@ export function generateAxisBreaks(data, maxGapSize, breakSize) {
}
}
return breaks;
-}
\ No newline at end of file
+}
+
+export function getPercentCell(backgroundColor, cellWidth, valuePercent, label) {
+ let labelText = label ? label : (valuePercent.toFixed(1) + '%');
+ let barWidth = ((valuePercent / 100) * cellWidth);
+ return '' +
+ ' ' +
+ '' + labelText + ' ' +
+ ' | ';
+}
diff --git a/Websites/SharePrices/SharePrices/scripts/SharePrices_Holdings.js b/Websites/SharePrices/SharePrices/scripts/SharePrices_Holdings.js
index 694603a..dc08e44 100644
--- a/Websites/SharePrices/SharePrices/scripts/SharePrices_Holdings.js
+++ b/Websites/SharePrices/SharePrices/scripts/SharePrices_Holdings.js
@@ -1,7 +1,7 @@
'use strict';
-import { formatAmount } from "./SharePrices_Common.js";
-
+import { formatAmount, getPercentCell } from "./SharePrices_Common.js";
+/*
export function createHoldingsTable(Instruments, vars) {
function getHoldings() {
function aggregateHoldings(i) {
@@ -302,12 +302,17 @@ export function createHoldingsTable(Instruments, vars) {
$('#holdingsTableDiv').html(tbl);
$("#tblMainHoldings").tablesorter({ ignoreCase: false });
- $("#tblMainHoldings").trigger("sorton", Cookies.get('sortHoldings'));
+
+ //let sortOrder = Cookies.get('sortHoldings');
+ let sortOrder = JSON.parse(Cookies.get('sortHoldings'));
+ $("#tblMainHoldings").trigger("sorton", [sortOrder]);
+
$('#tblMainHoldings').on('sortEnd', function (event) {
// Prints the current sort order to the console
if (event.target.config.sortList.length > 3) {
console.info({ "Setting sortHoldings Cookie (array too long?)": event.target.config.sortList });
}
+ //console.info({MSG: "Saving sortHolding cookie", Cookie: event.target.config.sortList});
Cookies.set('sortHoldings', event.target.config.sortList, { 'sameSite': 'strict' });
});
}
@@ -354,14 +359,16 @@ export function createHoldingsTable(Instruments, vars) {
//$("#" + rowID).addClass("highlighted");
}
}
- function getPercentCell(backgroundColor, cellWidth, valuePercent, label) {
- let labelText = label ? label : (valuePercent.toFixed(1) + '%');
- let barWidth = ((valuePercent / 100) * cellWidth);
- return '' +
- ' ' +
- '' + labelText + ' ' +
- ' | ';
- }
+
+ //function getPercentCell(backgroundColor, cellWidth, valuePercent, label) {
+ // let labelText = label ? label : (valuePercent.toFixed(1) + '%');
+ // let barWidth = ((valuePercent / 100) * cellWidth);
+ // return '' +
+ // ' ' +
+ // '' + labelText + ' ' +
+ // ' | ';
+ //}
+
function profitOrLoss(value) {
return value >= 0 ? "profit" : "loss";
}
@@ -495,35 +502,6 @@ export function createHoldingsTable(Instruments, vars) {
var resort = true;
$("#tblMainHoldings").trigger("update", [resort]);
- //Update the daily holdings value table in the DB
- if (totalValueGBP != vars.lastTotalHoldingsValue) {
- $.ajax({
- type: "POST",
- contentType: "application/json",
- url: "SharePrices.aspx/SetTotalHoldingsValue",
- dataType: "json",
- data: JSON.stringify({ TotalValue: totalValueGBP }),
- success: function (response) {
- vars.previousDay = response.PreviousDay;
- vars.previousClose = response.PreviousClose;
- vars.previousWeek = response.PreviousWeekDate;
- vars.previousWeekClose = response.PreviousWeekClose;
-
- //Update the total holdings span in the site banner
- let formattedAmount = formatAmount(totalValueGBP, "GBP", 0);
- let holdingsHTML = 'Total holdings: ' + '' + formattedAmount + ' ';
- holdingsHTML += '+' : 'loss">') + formatAmount(totalValueGBP - vars.previousClose, "GBP", 0) + ' (d)';
- holdingsHTML += ' / +' : 'loss">') + formatAmount(totalValueGBP - vars.previousWeekClose, "GBP", 0) + ' (w)';
- $("#spnTotalHoldings").html(holdingsHTML);
- //Set the page title
- document.title = formattedAmount + ' - ' + vars.initialPageTitle;
-
- vars.lastTotalHoldingsValue = totalValueGBP;
- },
- failure: function (response) { console.error("SetTotalHoldingsValue error: " + JSON.stringify(response)); }
- });
- }
-
//Create / update the currency allocation pie chart
function labelFormatter(label, series) {
return "" + label + "
" + Math.round(series.percent) + "%
" + formatAmount(series.data[0][1], 'GBP', 0) + "
";
@@ -589,3 +567,645 @@ function createCategoryAggregator() {
};
return aggregator;
}
+*/
+
+export async function updateHoldingsTables(instruments, vars) {
+ createNewHoldingsTable(instruments, vars);
+ createAggregatedHoldingsTable(instruments, vars);
+ createWatchlistTable(instruments);
+}
+async function createNewHoldingsTable(instruments, vars) {
+ const noColumns = 16;
+
+ function createNewHoldingsTable() {
+ let table = $('#newHoldingsTable');
+ if (table.length == 0) {
+ let tblDef = '' +
+ getHeaderRow() +
+ '| |
' +
+ '| New Holdings Table Grand Totals Row |
' +
+ '| New Holdings Cash Total Row |
' +
+ '| New Holdings Grand Total Row |
' +
+ '
';
+ $('#newHoldingsTableDiv').html(tblDef);
+ }
+ }
+ function createTaxBucketSubTable(taxBucket) {
+ let subtableID = 'taxBucket_' + taxBucket.replaceAll(' ', '_');
+ //let subtable = $('#' + subtableID);
+ let subtable = $('#' + subtableID + '_Summary');
+ if (subtable.length == 0) {
+ //let rowsDef = '| ' + taxBucket + ' |
\n' +
+ //let rowsDef = getHeaderRow() +
+ //let dt = (new Date()).yyyymmddhhmmss();
+ //let rowsDef = '| ' + dt + ' |
\n' + //Spacer row
+ let rowsDef = '| |
'; //Sub Table Summary Row
+ //$(rowsDef).insertBefore('#newHoldingsTable_InvestmentsGrandTotals');
+ $(rowsDef).insertBefore('#newHoldingsTable_EndSpacer');
+ }
+ }
+ function getHeaderRow() {
+ return '' +
+ '| Account | ' +
+ 'Type | ' +
+ 'Name | ' +
+ 'Symbol | ' +
+ 'Ccy | ' +
+ 'No Units | ' +
+ 'Avg Buy
Price | ' +
+ 'Previous
Close | ' +
+ 'Current
Price | ' +
+ 'Base Cost | ' +
+ 'Current Value | ' +
+ 'Gain | ' +
+ 'Gain % | ' +
+ 'Allocation | ' +
+ 'Today's
Gain £ | ' +
+ 'Today's
Gain % | ' +
+ '
'
+ }
+ function getContentRow(row, instrument, scaledAllocation, allocationPercent) {
+ let openOrClosed = instruments.MarketIsOpen(instrument) == 1 ? 'open' : 'closed';
+ let rowID = 'newHoldingsRow_' + vars.currentHoldingsRows.rowID(row);
+
+ let type = row.InstrumentType == 'CURRENCY' ? '$' : row.InstrumentType.substring(0, 1);
+ let totalProfitOrLoss = row.UnrealisedGainGBP < 0 ? 'loss' : 'profit';
+
+ let todaysGainGBP = 0;
+ let todaysGainPct = 0;
+ let todaysProfitOrLoss = 'profit';
+ if (instrument.SingleDayPreviousClose) {
+ todaysGainGBP = (row.CurrentPriceGBP - (instrument.SingleDayPreviousClose / row.CurrentExchangeRate)) * row.NoUnits;
+ todaysGainPct = ((row.CurrentPriceGBP / (instrument.SingleDayPreviousClose / row.CurrentExchangeRate)) - 1) * 100;
+ todaysProfitOrLoss = todaysGainGBP < 0 ? 'loss' : 'profit';
+ }
+
+ let cryptoHoldingClass = instrument.InstrumentType == 'CRYPTOCURRENCY' ? ' cryptoHoldingRow' : '';
+
+ return '' +
+ '| ' + row.AccountName + ' | ' +
+ '' + type + ' | ' +
+ '' + row.InstrumentName + ' | ' +
+ //'' + row.Symbol + ' | ' +
+ '' + instrument.Symbol + '' + ' | ' +
+ '' + row.InstrumentCurrency + ' | ' +
+ '' + row.NoUnits.autoScale() + ' | ' +
+ '' + formatAmount(row.AvgPriceGBP, 'GBP', 2) + ' | ' +
+ '' + formatAmount(instrument.SingleDayPreviousClose / row.CurrentExchangeRate, 'GBP', 2) + ' | ' +
+ '' + formatAmount(row.CurrentPriceGBP, 'GBP', 2) + ' | ' +
+ '' + formatAmount(row.BaseCostGBP, 'GBP', 0) + ' | ' +
+ '' + formatAmount(row.CurrentValueGBP, 'GBP', 0) + ' | ' +
+ '' + formatAmount(row.UnrealisedGainGBP, 'GBP', 0) + ' | ' +
+ '' + formatAmount(row.UnrealisedGainPct, '', 1) + '% | ' + //Gain %
+ //'' + ' ' + ' | ' + //Allocation
+ getPercentCell('#280ea6' /*'#3f2d95'*/, 70, scaledAllocation, allocationPercent.toFixed(1) + '%') + //Allocation
+ '' + ((todaysGainGBP == 0) ? ' ' : formatAmount(todaysGainGBP, 'GBP', 0)) + ' | ' + //Today's Gain £
+ '' + ((todaysGainPct == 0) ? ' ' : formatAmount(todaysGainPct, '', 1) + '%') + ' | ' + //Today's Gain %
+ '
'
+ }
+ function updateTaxBucketSubtotals(taxBucket, baseCostGBP, currentValueGBP, todaysGain) {
+ let subtableID = 'taxBucket_' + taxBucket.replaceAll(' ', '_');
+ let rowID = subtableID + '_Summary';
+ let profitOrLoss = currentValueGBP < baseCostGBP ? 'loss' : 'profit';
+ let rowDef = '' +
+ '| ' + taxBucket + ' Sutotal | ' +
+ '' + formatAmount(baseCostGBP, 'GBP', 2) + ' | ' + //BaseCost
+ '' + formatAmount(currentValueGBP, 'GBP', 2) + ' | ' + //CurrentValue
+ '' + formatAmount(currentValueGBP - baseCostGBP, 'GBP', 0) + ' | ' + //GainGBP
+ '' + formatAmount((currentValueGBP - baseCostGBP) / baseCostGBP * 100, '', 1) + '% | ' + //Gain%
+ ' | ' +
+ '' + (todaysGain == 0 ? ' ' : formatAmount(todaysGain, 'GBP', 0)) + ' | ' +
+ ' | ' +
+ '
';
+
+ $('#' + rowID).replaceWith(rowDef);
+ }
+ function updateInvestmentsGrandTotals(totalBaseCostGBP, totalCurrentValueGBP, todaysGain) {
+ let profitOrLoss = totalCurrentValueGBP < totalBaseCostGBP ? 'loss' : 'profit';
+ let rowID = 'newHoldingsTable_InvestmentsGrandTotals';
+ let rowDef = '' +
+ '| Investments Total | ' +
+ '' + formatAmount(totalBaseCostGBP, 'GBP', 0) + ' | ' + //BaseCost
+ '' + formatAmount(totalCurrentValueGBP, 'GBP', 0) + ' | ' + //CurrentValue
+ '' + formatAmount(totalCurrentValueGBP - totalBaseCostGBP, 'GBP', 0) + ' | ' + //GainGBP
+ '' + formatAmount((totalCurrentValueGBP - totalBaseCostGBP) / totalBaseCostGBP * 100, '', 1) + '% | ' + //Gain%
+ ' | ' +
+ '' + (todaysGain == 0 ? ' ' : formatAmount(todaysGain, 'GBP', 0)) + ' | ' +
+ ' | ' +
+ '
';
+ $('#' + rowID).replaceWith(rowDef);
+ }
+ function updateCashTotal(totalCashGBP) {
+ let rowID = 'newHoldingsTable_CashTotal';
+ //let rowDef = '' +
+ let rowDef = '
' +
+ '| Cash Total | ' +
+ ' | ' +
+ '' + formatAmount(totalCashGBP, 'GBP', 0) + ' | ' +
+ ' | ' +
+ ' | ' +
+ ' | ' +
+ ' | ' +
+ ' | ' +
+ '
';
+ $('#' + rowID).replaceWith(rowDef);
+ }
+ function updateGrandTotal(grandTotalGBP) {
+ let rowID = 'newHoldingsTable_GrandTotal';
+ let rowDef = '' +
+ '| Grand Total | ' +
+ ' | ' +
+ '' + formatAmount(grandTotalGBP, 'GBP', 0) + ' | ' +
+ ' | ' +
+ ' | ' +
+ ' | ' +
+ ' | ' +
+ ' | ' +
+ '
';
+ $('#' + rowID).replaceWith(rowDef);
+ }
+ function updateTableRow(row, newContent) {
+ let rowID = 'newHoldingsRow_' + vars.currentHoldingsRows.rowID(row).replaceAll('.', '\\.');
+ let tr = $('#' + rowID);
+ if (tr.length > 0) {
+ //Row exists... update content
+ $(tr).replaceWith(newContent);
+ } else {
+ //Need to add row
+ createNewHoldingsTable();
+ createTaxBucketSubTable(row.TaxBucket);
+ $(newContent).insertBefore('#taxBucket_' + row.TaxBucket.replaceAll(' ', '_') + '_Summary');
+ }
+ //Add the highlighted class so the updated row will flash
+ $('#' + rowID).addClass("highlighted");
+ }
+
+ let holdings = {};
+ try {
+ holdings = await $.ajax({
+ type: "POST",
+ contentType: "application/json",
+ url: "SharePrices.aspx/GetCurrentHoldings"
+ });
+ }
+ catch (error) {
+ console.error({ MSG: "Error getting current holdings", Error: error });
+ }
+
+ //Save the current holdings for use elsewehere
+ vars.currentHoldings = holdings;
+
+ //Calculate totals before creating table rows
+ let totalCashGBP = 0;
+ let totalBaseCost = 0;
+ let totalCurrentValue = 0;
+ let maxCurrentValue = 0;
+ for (let rowNo = 0; rowNo < holdings.length; rowNo++) {
+ let r = holdings[rowNo];
+
+ if(r.InstrumentType == 'CURRENCY') {
+ totalCashGBP += r.CurrentValueGBP;
+ } else {
+ totalBaseCost += r.BaseCostGBP;
+ totalCurrentValue += r.CurrentValueGBP;
+ if (r.CurrentValueGBP > maxCurrentValue) maxCurrentValue = r.CurrentValueGBP;
+ }
+ }
+ let maxAllocationPercent = (maxCurrentValue / totalCurrentValue) * 100;
+ let allocationScaleFactor = 100 / maxAllocationPercent;
+
+ //Create the holdings table rows
+ let currentTaxBucket = '';
+ let bucketBaseCost = 0;
+ let bucketCurrentValue = 0;
+ let bucketTodaysGain = 0;
+ let totalTodaysGain = 0;
+ for (let rowNo = 0; rowNo < holdings.length; rowNo++) {
+ let r = holdings[rowNo];
+ if(r.InstrumentType != 'CURRENCY') {
+ let instrument = instruments.GetSymbol(r.Symbol);
+
+ let allocationPercent = r.CurrentValueGBP / totalCurrentValue * 100;
+ let scaledAllocation = allocationScaleFactor * allocationPercent;
+
+ if (r.TaxBucket != currentTaxBucket) {
+ if (currentTaxBucket != '') {
+ //Update the subtotal row for the previous tax bucket
+ updateTaxBucketSubtotals(currentTaxBucket, bucketBaseCost, bucketCurrentValue, bucketTodaysGain);
+ }
+
+ currentTaxBucket = r.TaxBucket;
+ bucketBaseCost = 0;
+ bucketCurrentValue = 0;
+ bucketTodaysGain = 0;
+ }
+ bucketBaseCost += r.BaseCostGBP;
+ bucketCurrentValue += r.CurrentValueGBP;
+ let todaysGain = instrument.SingleDayPreviousClose ? (r.CurrentPriceGBP - (instrument.SingleDayPreviousClose / r.CurrentExchangeRate)) * r.NoUnits : 0;
+ bucketTodaysGain += todaysGain;
+
+ totalTodaysGain += todaysGain;
+
+ //Has this row changed?
+ let currentRow = vars.currentHoldingsRows.GetRow(r);
+ let newContent = getContentRow(r, instrument, scaledAllocation, allocationPercent);
+ if (!currentRow) {
+ vars.currentHoldingsRows.Data.push({ attributes: r, content: newContent });
+ updateTableRow(r, newContent);
+ } else if (currentRow.content != newContent) {
+ currentRow.attributes = r;
+ currentRow.content = newContent;
+ updateTableRow(r, newContent);
+ }
+ }
+
+ /*
+ TaxBucket
+ AccountName
+ IsTaxable
+ InstrumentType
+ Symbol
+ InstrumentName
+ InstrumentCurrency
+ NoUnits
+ BaseCostGBP
+ AvgPriceGBP
+ CurrentPriceGBP
+ CurrentValueGBP
+ UnrealisedGainGBP
+ */
+ }
+
+ let totalValueGBP = totalCurrentValue + totalCashGBP;
+ updateTaxBucketSubtotals(currentTaxBucket, bucketBaseCost, bucketCurrentValue, bucketTodaysGain);
+ updateInvestmentsGrandTotals(totalBaseCost, totalCurrentValue, totalTodaysGain);
+ updateCashTotal(totalCashGBP);
+ updateGrandTotal(totalValueGBP);
+
+ //Show or hide the Tax Bucket subtotals
+ let subtotalsDisplay = Cookies.get('showSubtotals');
+ if (subtotalsDisplay == 'true') {
+ $("#newHoldingsTable tr.holdingsSubtotal").show();
+ } else {
+ $("#newHoldingsTable tr.holdingsSubtotal").hide();
+ }
+
+ //Show or hide cryptocurrency holdings
+ let cryptoDisplay = Cookies.get('showCryptoHoldings');
+ if (cryptoDisplay == 'true') {
+ $("#newHoldingsTable tr.cryptoHoldingRow").show();
+ } else {
+ $("#newHoldingsTable tr.cryptoHoldingRow").hide();
+ }
+
+ //Remove the highlight from all rows/cells
+ $("#newHoldingsTable").find(".highlighted").removeClass("highlighted", 1200);
+
+ //Update the daily holdings value table in the DB
+ if (totalValueGBP > 0 && totalValueGBP != vars.lastTotalHoldingsValue) {
+ $.ajax({
+ type: "POST",
+ contentType: "application/json",
+ url: "SharePrices.aspx/SetTotalHoldingsValue",
+ dataType: "json",
+ data: JSON.stringify({ TotalValue: totalValueGBP }),
+ success: function (response) {
+ vars.previousDay = response.PreviousDay;
+ vars.previousClose = response.PreviousClose;
+ vars.previousWeek = response.PreviousWeekDate;
+ vars.previousWeekClose = response.PreviousWeekClose;
+
+ //Update the total holdings span in the site banner
+ let formattedAmount = formatAmount(totalValueGBP, "GBP", 0);
+ let holdingsHTML = 'Total holdings: ' + '' + formattedAmount + ' ';
+ holdingsHTML += '+' : 'loss">') + formatAmount(totalValueGBP - vars.previousClose, "GBP", 0) + ' (d)';
+ holdingsHTML += ' / +' : 'loss">') + formatAmount(totalValueGBP - vars.previousWeekClose, "GBP", 0) + ' (w)';
+ $("#spnTotalHoldings").html(holdingsHTML);
+ //Set the page title
+ document.title = formattedAmount + ' - ' + vars.initialPageTitle;
+
+ vars.lastTotalHoldingsValue = totalValueGBP;
+ },
+ failure: function (response) { console.error("SetTotalHoldingsValue error: " + JSON.stringify(response)); }
+ });
+ }
+
+}
+async function createAggregatedHoldingsTable(instruments, vars) {
+ const noColumns = 15;
+
+ function createAggHoldingsTable() {
+ let table = $('#aggHoldingsTable');
+ if (table.length == 0) {
+ let tblDef = '' +
+ getHeaderRow() +
+ '| |
' +
+ '| Aggregated Holdings Table Grand Totals Row |
' +
+ '| Aggregated Holdings Cash Total Row |
' +
+ '| Aggregated Holdings Grand Total Row | ' +
+ '
' +
+ '
';
+ $('#aggHoldingsTableDiv').html(tblDef);
+ }
+ }
+ function getHeaderRow() {
+ return '' +
+ '| Type | ' +
+ 'Name | ' +
+ 'Symbol | ' +
+ 'Ccy | ' +
+ 'No Units | ' +
+ 'Avg Buy
Price | ' +
+ 'Previous
Close | ' +
+ 'Current
Price | ' +
+ 'Base Cost | ' +
+ 'Current Value | ' +
+ 'Gain | ' +
+ 'Gain % | ' +
+ 'Allocation | ' +
+ 'Today's
Gain £ | ' +
+ 'Today's
Gain % | ' +
+ '
'
+ }
+ function getContentRow(row, instrument, scaledAllocation, allocationPercent) {
+ let openOrClosed = instruments.MarketIsOpen(instrument) == 1 ? 'open' : 'closed';
+ let rowID = 'aggHoldingsRow_' + vars.currentAggHoldingsRows.rowID(row);
+
+ let type = row.InstrumentType == 'CURRENCY' ? '$' : row.InstrumentType.substring(0, 1);
+ let totalProfitOrLoss = row.UnrealisedGainGBP < 0 ? 'loss' : 'profit';
+
+ let todaysGainGBP = 0;
+ let todaysGainPct = 0;
+ let todaysProfitOrLoss = 'profit';
+ if (instrument.SingleDayPreviousClose) {
+ todaysGainGBP = (row.CurrentPriceGBP - (instrument.SingleDayPreviousClose / row.CurrentExchangeRate)) * row.NoUnits;
+ todaysGainPct = ((row.CurrentPriceGBP / (instrument.SingleDayPreviousClose / row.CurrentExchangeRate)) - 1) * 100;
+ todaysProfitOrLoss = todaysGainGBP < 0 ? 'loss' : 'profit';
+ }
+
+ return '' +
+ '| ' + type + ' | ' +
+ '' + row.InstrumentName + ' | ' +
+ //'' + row.Symbol + ' | ' +
+ '' + instrument.Symbol + '' + ' | ' +
+ '' + row.InstrumentCurrency + ' | ' +
+ '' + row.NoUnits.autoScale() + ' | ' +
+ '' + formatAmount(row.AvgPriceGBP, 'GBP', 2) + ' | ' +
+ '' + formatAmount(instrument.SingleDayPreviousClose / row.CurrentExchangeRate, 'GBP', 2) + ' | ' +
+ '' + formatAmount(row.CurrentPriceGBP, 'GBP', 2) + ' | ' +
+ '' + formatAmount(row.BaseCostGBP, 'GBP', 0) + ' | ' +
+ '' + formatAmount(row.CurrentValueGBP, 'GBP', 0) + ' | ' +
+ '' + formatAmount(row.UnrealisedGainGBP, 'GBP', 0) + ' | ' +
+ '' + formatAmount(row.UnrealisedGainPct, '', 1) + '% | ' + //Gain %
+ //'' + ' ' + ' | ' + //Allocation
+ getPercentCell('#280ea6' /*'#3f2d95'*/, 70, scaledAllocation, allocationPercent.toFixed(1) + '%') + //Allocation
+ '' + ((todaysGainGBP == 0) ? ' ' : formatAmount(todaysGainGBP, 'GBP', 0)) + ' | ' + //Today's Gain £
+ '' + ((todaysGainPct == 0) ? ' ' : formatAmount(todaysGainPct, '', 1) + '%') + ' | ' + //Today's Gain %
+ '
'
+ }
+ function updateInvestmentsGrandTotals(totalBaseCostGBP, totalCurrentValueGBP, todaysGain) {
+ let profitOrLoss = totalCurrentValueGBP < totalBaseCostGBP ? 'loss' : 'profit';
+ let rowID = 'aggHoldingsTable_InvestmentsGrandTotals';
+ let rowDef = '' +
+ '| Investments Total | ' +
+ '' + formatAmount(totalBaseCostGBP, 'GBP', 0) + ' | ' + //BaseCost
+ '' + formatAmount(totalCurrentValueGBP, 'GBP', 0) + ' | ' + //CurrentValue
+ '' + formatAmount(totalCurrentValueGBP - totalBaseCostGBP, 'GBP', 0) + ' | ' + //GainGBP
+ '' + formatAmount((totalCurrentValueGBP - totalBaseCostGBP) / totalBaseCostGBP * 100, '', 1) + '% | ' + //Gain%
+ ' | ' +
+ '' + (todaysGain == 0 ? ' ' : formatAmount(todaysGain, 'GBP', 0)) + ' | ' +
+ ' | ' +
+ '
';
+ $('#' + rowID).replaceWith(rowDef);
+ }
+ function updateCashTotal(totalCashGBP) {
+ let rowID = 'aggHoldingsTable_CashTotal';
+ let rowDef = '' +
+ '| Cash Total | ' +
+ ' | ' +
+ '' + formatAmount(totalCashGBP, 'GBP', 0) + ' | ' +
+ ' | ' +
+ ' | ' +
+ ' | ' +
+ ' | ' +
+ ' | ' +
+ '
';
+ $('#' + rowID).replaceWith(rowDef);
+ }
+ function updateGrandTotal(grandTotalGBP) {
+ let rowID = 'aggHoldingsTable_GrandTotal';
+
+ let lSF = '';
+ if (vars.fetchTiming.lastSuccessfulFetch) {
+ let lastFetchAge = ((new Date()) - vars.fetchTiming.lastSuccessfulFetch);
+ let staleFetch = ((new Date()) - vars.fetchTiming.lastSuccessfulFetch) > (vars.fetchTiming.fetchIntervalSingleDay * 1.5);
+ lSF = (vars.fetchTiming.lastSuccessfulFetch ? ' - Last Successful Fetch: ' + (staleFetch ? '' : '') + vars.fetchTiming.lastSuccessfulFetch.yyyymmddhhmmss() + (staleFetch ? '' : '') : '');
+ }
+ //let lastUpdatedCell = 'Updated: ' + new Date().yyyymmddhhmmss() + lSF + ' | ';
+
+
+ let rowDef = '' +
+ //'| Grand Total | ' +
+ 'Updated: ' + new Date().yyyymmddhhmmss() + lSF + ' | ' +
+ 'Grand Total | ' +
+ ' | ' +
+ '' + formatAmount(grandTotalGBP, 'GBP', 0) + ' | ' +
+ ' | ' +
+ ' | ' +
+ ' | ' +
+ ' | ' +
+ ' | ' +
+ '
';
+ $('#' + rowID).replaceWith(rowDef);
+ }
+ function updateTableRow(row, newContent) {
+ let rowID = 'aggHoldingsRow_' + vars.currentAggHoldingsRows.rowID(row).replaceAll('.', '\\.');
+ let tr = $('#' + rowID);
+ if (tr.length > 0) {
+ //Row exists... update content
+ $(tr).replaceWith(newContent);
+ } else {
+ //Need to add row
+ createAggHoldingsTable();
+ //$(newContent).insertBefore('#aggHoldingsTable_InvestmentsGrandTotals');
+ $(newContent).insertBefore('#aggHoldingsTable_EndSpacer');
+ }
+ //Add the highlighted class so the updated row will flash
+ $('#' + rowID).addClass("highlighted");
+ }
+
+ let holdings = {};
+ try {
+ holdings = await $.ajax({
+ type: "POST",
+ contentType: "application/json",
+ url: "SharePrices.aspx/GetAggregatedCurrentHoldings"
+ });
+ }
+ catch (error) {
+ console.error({ MSG: "Error getting aggregated current holdings", Error: error });
+ }
+
+ //Calculate totals before creating table rows
+ let totalCashGBP = 0;
+ let totalBaseCost = 0;
+ let totalCurrentValue = 0;
+ let maxCurrentValue = 0;
+ for (let rowNo = 0; rowNo < holdings.length; rowNo++) {
+ let r = holdings[rowNo];
+
+ if (r.InstrumentType == 'CURRENCY') {
+ totalCashGBP += r.CurrentValueGBP;
+ } else {
+ totalBaseCost += r.BaseCostGBP;
+ totalCurrentValue += r.CurrentValueGBP;
+ if (r.CurrentValueGBP > maxCurrentValue) maxCurrentValue = r.CurrentValueGBP;
+ }
+ }
+ let maxAllocationPercent = (maxCurrentValue / totalCurrentValue) * 100;
+ let allocationScaleFactor = 100 / maxAllocationPercent;
+
+ //Create the holdings table rows
+ let totalTodaysGain = 0;
+ for (let rowNo = 0; rowNo < holdings.length; rowNo++) {
+ let r = holdings[rowNo];
+ if (r.InstrumentType != 'CURRENCY') {
+ let instrument = instruments.GetSymbol(r.Symbol);
+
+ let allocationPercent = r.CurrentValueGBP / totalCurrentValue * 100;
+ let scaledAllocation = allocationScaleFactor * allocationPercent;
+
+ let todaysGain = instrument.SingleDayPreviousClose ? (r.CurrentPriceGBP - (instrument.SingleDayPreviousClose / r.CurrentExchangeRate)) * r.NoUnits : 0;
+ totalTodaysGain += todaysGain;
+
+ //Has this row changed?
+ let currentRow = vars.currentAggHoldingsRows.GetRow(r);
+ let newContent = getContentRow(r, instrument, scaledAllocation, allocationPercent);
+ if (!currentRow) {
+ vars.currentAggHoldingsRows.Data.push({ attributes: r, content: newContent });
+ updateTableRow(r, newContent);
+ } else if (currentRow.content != newContent) {
+ currentRow.attributes = r;
+ currentRow.content = newContent;
+ updateTableRow(r, newContent);
+ }
+ }
+
+ /*
+ InstrumentType
+ Symbol
+ InstrumentName
+ InstrumentCurrency
+ NoUnits
+ BaseCostGBP
+ AvgPriceGBP
+ CurrentPriceGBP
+ CurrentValueGBP
+ UnrealisedGainGBP
+ */
+ }
+
+ let totalValueGBP = totalCurrentValue + totalCashGBP;
+ updateInvestmentsGrandTotals(totalBaseCost, totalCurrentValue, totalTodaysGain);
+ updateCashTotal(totalCashGBP);
+ updateGrandTotal(totalValueGBP);
+
+ /*
+ //Show or hide the Tax Bucket subtotals
+ let subtotalsDisplay = Cookies.get('showSubtotals');
+ if (subtotalsDisplay == 'true') {
+ $("#newHoldingsTable tr.holdingsSubtotal").show();
+ } else {
+ $("#newHoldingsTable tr.holdingsSubtotal").hide();
+ }
+ */
+
+ //Remove the highlight from all rows/cells
+ $("#aggHoldingsTable").find(".highlighted").removeClass("highlighted", 1200);
+
+}
+function createWatchlistTable(Instruments) {
+ function addTableRow(rowID, content, tbodyID, highlightUpdates) {
+ let r = $("#" + rowID);
+ let newText = $(content).text(); //$(content).text();
+ if (r.length) {
+ let currentContent = r.text();
+ if (currentContent != newText) { //Only update row if the content has changed
+ $("#" + rowID).replaceWith(content);
+ if (highlightUpdates) {
+ $("#" + rowID).addClass("highlighted");
+ }
+ }
+ } else {
+ $("#" + tbodyID).append(content); //.addClass("highlighted");
+ //$("#" + rowID).addClass("highlighted");
+ }
+ }
+
+ let t = $("#tblWatchlist");
+ if (!t.length) /*
+ return;
+ } else */{
+ let tbl = '' +
+ '| Type | ' +
+ 'Name | ' +
+ 'Symbol | ' +
+ 'Ccy | ' +
+ 'Current Price | ' +
+ 'Today's Gain | ' +
+ 'Today's Gain % | ' +
+ 'Since Last Sold | ' +
+ ' |
|---|
';
+
+ $('#watchlistTableDiv').html(tbl);
+
+ $("#tblWatchlist").tablesorter({ ignoreCase: false });
+ $("#tblWatchlist").trigger("sorton", Cookies.get('sortWatchlist'));
+ $('#tblWatchlist').on('sortEnd', function (event) {
+ // Prints the current sort order to the console
+ Cookies.set('sorWatchlist', event.target.config.sortList, { 'sameSite': 'strict' });
+ });
+ }
+
+ let altRow = 1;
+ for (let n = 0; n < Instruments.Data.length; n++) {
+ if (Instruments.Data[n].WatchlistID) {
+ altRow = !altRow;
+ let wi = Instruments.Data[n];
+ try {
+ let type = wi.InstrumentType == 'CURRENCY' ? '$' : wi.InstrumentType.substring(0, 1);
+ let openOrClosed = Instruments.MarketIsOpen(wi) == 1 ? 'open' : 'closed';
+ let profitOrLoss = wi.CurrentPrice < wi.SingleDayPreviousClose ? 'loss' : 'profit';
+ let rowID = "watchlistRow_" + wi.DisplayOrder;
+
+ let sinceLastSold = ' | ';
+ if (wi.LastSoldPrice) {
+ let delta = (wi.CurrentPrice - wi.LastSoldPrice) / wi.LastSoldPrice * 100;
+ let tooltip = new Date(wi.LastSoldDate).yyyymmdd() + ' @ ' + wi.LastSoldPrice.toFixed(2);
+ sinceLastSold = '' + (delta).toFixed(1) + '% | ';
+ }
+
+ //Type, Name, Symbol, Ccy, Current Price, Today's Gain, Today's Gain %
+ let row = '' +
+ '' + type + ' | ' +
+ //'' + wi.InstrumentName + ' | ' +
+ '' + wi.DisplayName + ' | ' +
+ '' + wi.Symbol + '' + ' | ' +
+ '' + wi.Currency + ' | ' +
+ '' + (wi.CurrentPrice ? formatAmount(wi.CurrentPrice, wi.Currency, 2) : '') + ' | ' + //Current Price
+ (Instruments.marketIsOpen == 0 ? ' | ' : '' + (wi.CurrentPrice ? formatAmount(wi.CurrentPrice - wi.SingleDayPreviousClose, wi.Currency, 2) : '') + ' | ') + //Today's Gain
+ (Instruments.marketIsOpen == 0 ? ' | ' : '' + (wi.CurrentPrice ? ((wi.CurrentPrice - wi.SingleDayPreviousClose) / wi.SingleDayPreviousClose * 100).toFixed(1) : '') + ' | ') + //Today's Gain %
+ //'' + (new Date(wi.LastSoldDate)).yyyymmdd() + ' | ' +
+ sinceLastSold +
+ '';
+ addTableRow(rowID, row, "tbWatchlist", true);
+ }
+ catch (err) {
+ logError("Error adding " + wi.symbol + " to watchlist table: " + err.message);
+ }
+ }
+ }
+
+ //Remove the highlight from all rows/cells
+ $("#tbWatchlist").find(".highlighted").removeClass("highlighted", 1200);
+}
\ No newline at end of file
diff --git a/Websites/SharePrices/SharePrices/scripts/SharePrices_Ledger.js b/Websites/SharePrices/SharePrices/scripts/SharePrices_Ledger.js
new file mode 100644
index 0000000..d6206be
--- /dev/null
+++ b/Websites/SharePrices/SharePrices/scripts/SharePrices_Ledger.js
@@ -0,0 +1,117 @@
+'use strict';
+
+import { formatAmount, getPercentCell } from "./SharePrices_Common.js";
+
+export async function updateLedgerTable(instruments, vars) {
+ const noColumns = 15;
+
+ function createLedgerTable() {
+ let table = $('#ledgerTable');
+ //if (table.length == 0) {
+ let tblDef = '' +
+ '' + getHeaderRow() + '' +
+ '' +
+ '
';
+ $('#ledgerDiv').html(tblDef);
+ //}
+ }
+ function getHeaderRow() {
+ return '' +
+ '| Trade DT | ' +
+ 'Tax Bucket | ' +
+ 'Account | ' +
+ 'Symbol | ' +
+ 'Instrument Name | ' +
+ //'Instrument Currency | ' +
+ 'Action
Type | ' +
+ //'No Units | ' +
+ //'Price Per Unit GBP | ' +
+ 'Units | ' +
+ 'Trade
Value | ' +
+ 'New Pool
Total Units | ' +
+ 'New Pool
Base Cost | ' +
+ 'Realised
Gain | ' +
+ 'Is Final
Position | ' +
+ 'Notes | ' +
+ '
'
+ }
+ function getContentRow(row) {
+ let rowID = 'ledgerRow_' + row.TradeLedgerID.toString();
+
+ return '' +
+ '| ' + (new Date(row.TradeDT)).yyyymmddhhmm() + ' | ' +
+ '' + row.TaxBucket + ' | ' +
+ '' + row.AccountName + ' | ' +
+ '' + row.Symbol + ' | ' +
+ '' + row.InstrumentName + ' | ' +
+ //'' + row.InstrumentCurrency + ' | ' +
+ '' + row.ActionType + ' | ' +
+ //'' + row.NoUnits.autoScale() + ' | ' +
+ //'' + formatAmount(row.PricePerUnitGBP, 'GBP', 2) + ' | ' +
+ '' + row.NoUnits.autoScale() + ' @ ' + formatAmount(row.PricePerUnitGBP, 'GBP', 2) + ' | ' +
+ '' + formatAmount(row.TradeValueGBP, 'GBP', 2) + ' | ' +
+ '' + row.NewPoolTotalUnits.autoScale() + ' | ' +
+ '' + formatAmount(row.NewPoolBaseCostGBP, 'GBP', 2) + ' | ' +
+ '' + formatAmount(row.RealisedGainGBP, 'GBP', 2) + ' | ' +
+ '' + row.IsFinalPosition.toString() + ' | ' +
+ '' + (row.Notes == null ? '' : row.Notes) + ' | ' +
+ '
'
+ }
+
+ //Fetch the ledger data
+ let ledger = {};
+ try {
+ ledger = await $.ajax({
+ type: "POST",
+ contentType: "application/json",
+ url: "SharePrices.aspx/GetTradeHistory"
+ });
+ }
+ catch (error) {
+ console.error({ MSG: "Error getting trade history", Error: error });
+ }
+
+ createLedgerTable();
+
+ //Create the ledger table rows
+ for (let rowNo = 0; rowNo < ledger.length; rowNo++) {
+ let r = ledger[rowNo];
+ let newContent = getContentRow(r);
+ $("#ledgerTable tbody").append(newContent);
+ }
+
+ //Add the tableSorter filter widget
+ let $table = $("#ledgerTable").tablesorter({
+ //theme: 'blue',
+ // this is the default setting
+ //cssChildRow: "tablesorter-childRow",
+
+ // initialize zebra and filter widgets
+ widgets: ["zebra", "filter", "stickyHeaders"],
+
+ widgetOptions: {
+ // output default: '{page}/{totalPages}'
+ // possible variables: {page}, {totalPages}, {filteredPages}, {startRow}, {endRow}, {filteredRows} and {totalRows}
+ //pager_output: '{startRow} - {endRow} / {filteredRows} ({totalRows})',
+ //pager_removeRows: false,
+
+ // include child row content while filtering, if true
+ //filter_childRows: true,
+ // class name applied to filter row and each input
+ /*filter_cssFilter: 'tablesorter-filter',
+
+ filter_filteredRow: 'filtered',
+
+ // search from beginning
+ filter_startsWith: false,
+ // Set this option to false to make the searches case sensitive
+ filter_ignoreCase: true,
+ */
+ stickyHeaders_attachTo: '#ledgerDiv',
+ //stickyHeaders_zIndex: 2,
+ zebra: [ 'odd', 'even']
+ }
+
+ });
+
+}