diff --git a/Websites/SharePrices/.vs/SharePrices/v16/.suo b/Websites/SharePrices/.vs/SharePrices/v16/.suo new file mode 100644 index 0000000..df1a7c1 Binary files /dev/null and b/Websites/SharePrices/.vs/SharePrices/v16/.suo differ diff --git a/Websites/SharePrices/.vs/SharePrices/v17/.suo b/Websites/SharePrices/.vs/SharePrices/v17/.suo index 029dbbf..a35604e 100644 Binary files a/Websites/SharePrices/.vs/SharePrices/v17/.suo and b/Websites/SharePrices/.vs/SharePrices/v17/.suo differ diff --git a/Websites/SharePrices/SharePrices.v12.suo b/Websites/SharePrices/SharePrices.v12.suo index 6d2302e..01a0154 100644 Binary files a/Websites/SharePrices/SharePrices.v12.suo and b/Websites/SharePrices/SharePrices.v12.suo differ diff --git a/Websites/SharePrices/SharePrices/App_Code/DataAccessLayer.vb b/Websites/SharePrices/SharePrices/App_Code/DataAccessLayer.vb index fb2a1d7..6394bb4 100644 --- a/Websites/SharePrices/SharePrices/App_Code/DataAccessLayer.vb +++ b/Websites/SharePrices/SharePrices/App_Code/DataAccessLayer.vb @@ -180,14 +180,25 @@ Public Class DataAccessLayer ' DeleteHolding = DataReaderToJSONString(c.ExecuteReader()) ' DisposeSQLCommand(c) 'End Function - Public Shared Function SoldHolding(HoldingID As Integer, SoldDate As DateTime) As String + Public Shared Function SoldHolding(HoldingID As Integer, SoldDate As DateTime, SoldCurrency As String, SoldProceeds As Double) As String Dim c As SqlCommand = GetSQLCommand("usp_SoldHolding") c.Parameters.AddWithValue("HoldingID", HoldingID) c.Parameters.AddWithValue("SoldDate", SoldDate) + c.Parameters.AddWithValue("SoldCurrency", SoldCurrency) + c.Parameters.AddWithValue("SoldProceeds", SoldProceeds) SoldHolding = DataReaderToJSONString(c.ExecuteReader()) DisposeSQLCommand(c) End Function + Public Shared Function SetAccountCashValue(AccountName As String, Currency As String, Value As Double) As String + Dim c As SqlCommand = GetSQLCommand("usp_SetAccountCashValue") + c.Parameters.AddWithValue("AccountName", AccountName) + c.Parameters.AddWithValue("Currency", Currency) + c.Parameters.AddWithValue("Value", Value) + SetAccountCashValue = DataReaderToJSONString(c.ExecuteReader()) + DisposeSQLCommand(c) + End Function + Public Shared Function SwapInstrumentDisplayOrders(Symbol1 As String, Symbol2 As String) As String Dim c As SqlCommand = GetSQLCommand("usp_SwapDisplayOrder") c.Parameters.AddWithValue("Symbol1", Symbol1) @@ -196,6 +207,19 @@ Public Class DataAccessLayer DisposeSQLCommand(c) End Function + Public Shared Function SetTotalHoldingsValues(TotalValue As Double) As String + Dim c As SqlCommand = GetSQLCommand("usp_SetTotalHoldingsValue") + c.Parameters.AddWithValue("TotalValueGBP", TotalValue) + SetTotalHoldingsValues = DataReaderToJSONString(c.ExecuteReader()) + DisposeSQLCommand(c) + End Function + + Public Shared Function GetTotalHoldingsHistory() As String + Dim c As SqlCommand = GetSQLCommand("usp_GetTotalHoldingsHistory") + GetTotalHoldingsHistory = DataReaderToJSONString(c.ExecuteReader()) + DisposeSQLCommand(c) + End Function + Private Shared Function GetSQLConnection() As SqlConnection Dim c As New SqlConnection("Server=OZHOST1\SQL2008;Database=SharePrices;Trusted_Connection=True;Application Name=Share Prices Web;") c.Open() diff --git a/Websites/SharePrices/SharePrices/CreateDBSchema.sql b/Websites/SharePrices/SharePrices/CreateDBSchema.sql index 7ebfc46..bb0e965 100644 --- a/Websites/SharePrices/SharePrices/CreateDBSchema.sql +++ b/Websites/SharePrices/SharePrices/CreateDBSchema.sql @@ -5,6 +5,8 @@ GO DROP VIEW vErroneousPrices_Intraday DROP VIEW vErroneousPrices_Daily DROP VIEW vHolding +DROP FUNCTION dbo.fn_GetExchangeRate +DROP FUNCTION dbo.fn_GetPriceAtDate DROP PROCEDURE usp_SwapDisplayOrder DROP PROCEDURE usp_GetHoldingsHistory --DROP PROCEDURE usp_DeleteHolding @@ -25,6 +27,7 @@ DROP TABLE Account DROP TABLE InstrumentHistory_Daily DROP TABLE InstrumentHistory_Intraday DROP TABLE Instrument +DROP TABLE TotalHoldingsHistory_Daily --DROP TABLE Exchange */ GO @@ -67,6 +70,7 @@ CREATE TABLE Instrument ( CurrentPrice real NULL, InstrumentType VARCHAR(15) NULL, ShowInMarquee CHAR(1) NULL, -- A = Always, O = Only when open, NULL = Never + WatchlistID tinyint NULL, --Not a real ID yet TradeDayStart datetime NULL, TradeDayEnd datetime NULL, LastUpdated datetime NULL, @@ -139,15 +143,31 @@ CREATE TABLE Holding ( AccountID tinyint NOT NULL, InstrumentID smallint NOT NULL, --NoUnits int NOT NULL, - NoUnits real NOT NULL, + --NoUnits real NOT NULL, + NoUnits numeric(36, 12) NOT NULL, --PurchasePricePerUnit money NOT NULL, - PurchasePricePerUnit real NOT NULL, - ActualExchangeRate real NULL, + --PurchasePricePerUnit real NOT NULL, + PurchasePricePerUnit numeric(36, 12) NOT NULL, + --ActualExchangeRate real NULL, + ActualExchangeRate numeric(36, 12) NULL, PurchaseDate datetime NOT NULL, SoldDate datetime NULL, + SoldCurrencyID smallint NULL, + SoldProceeds numeric(36, 12) NULL, CONSTRAINT PK_Holding PRIMARY KEY CLUSTERED (HoldingID), CONSTRAINT FK_Holding_Account FOREIGN KEY (AccountID) REFERENCES Account (AccountID), - CONSTRAINT FK_Holding_Instrument FOREIGN KEY (InstrumentID) REFERENCES Instrument (InstrumentID) + CONSTRAINT FK_Holding_Instrument FOREIGN KEY (InstrumentID) REFERENCES Instrument (InstrumentID), + CONSTRAINT FK_Holding_SoldCurrencyInstrument FOREIGN KEY (SoldCurrencyID) REFERENCES Instrument (InstrumentID) +) +GO + +CREATE TABLE TotalHoldingsHistory_Daily ( + HistoryDate date NOT NULL, + [Open] int NOT NULL, + Low int NOT NULL, + High int NOT NULL, + [Close] int NOT NULL, + CONSTRAINT PK_TotalHoldingsHistory_Daily PRIMARY KEY CLUSTERED (HistoryDate) ) GO @@ -227,6 +247,47 @@ BEGIN END GO +CREATE FUNCTION dbo.fn_GetPriceAtDate(@InstrumentID INT, @DT DATETIME) +RETURNS REAL +AS +BEGIN + DECLARE @Rate REAL + + IF @InstrumentID IS NULL OR @DT IS NULL + BEGIN + RETURN 0.0 + END + + --Is there a rate for this exact datetime? + SELECT @Rate = ClosePrice FROM InstrumentHistory_Intraday WHERE InstrumentID = @InstrumentID AND HistoryDT = @DT + IF @Rate IS NULL + BEGIN + --No exect match + DECLARE @StartDT DATETIME, @EndDT DATETIME, @StartRate REAL, @EndRate REAL + --@StartID INT, @EndID INT, + SELECT TOP 1 @StartDT = HistoryDT, @StartRate = ClosePrice FROM InstrumentHistory_Intraday WHERE InstrumentID = @InstrumentID AND HistoryDT < @DT ORDER BY HistoryDT DESC + SELECT TOP 1 @EndDT = HistoryDT, @EndRate = OpenPrice FROM InstrumentHistory_Intraday WHERE InstrumentID = @InstrumentID AND HistoryDT > @DT ORDER BY HistoryDT + IF @StartDT IS NOT NULL AND @EndDT IS NOT NULL + BEGIN + --Work out how far between the 2 dates our DT is, and calculate rate accordingly + DECLARE @TotalSeconds BIGINT + DECLARE @Percent REAL + SELECT @TotalSeconds = DATEDIFF(second, @StartDT, @EndDT) + SET @Percent = CONVERT(REAL, DATEDIFF(second, @StartDT, @DT)) / @TotalSeconds * 100 + SET @Rate = @StartRate + ((@EndRate - @StartRate) / 100 * @Percent) + END + ELSE + BEGIN + --We don't have BOTH a start AND end price + --Return the non-NULL rate if we have one, zero otherwise + SET @Rate = COALESCE(@StartRate, @EndRate, 0) + END + END + + RETURN @Rate +END +GO + --CREATE PROCEDURE usp_InsertInstrument (@ExchangeShortName varchar(10), @Symbol varchar(7), @FullName varchar(100)) CREATE PROCEDURE usp_InsertInstrument (@Symbol varchar(8), @FullName varchar(100)) AS @@ -350,29 +411,50 @@ BEGIN SET NOCOUNT ON SELECT - i.DisplayOrder, - --e.ShortName as [Exchange], - i.FullName as [InstrumentName], - ISNULL(i.DisplayName, LEFT(i.FullName, 30)) as [DisplayName], - i.Symbol as [Symbol], - i.PostPandemicDilution as [PostPandemicDilution], - i.GMTOffset as [GMTOffset], - i.Currency as [Currency], - i.CurrentPrice as [CurrentPrice], - i.InstrumentType as [InstrumentType], - i.ShowInMarquee as [ShowInMarquee], - i.TradeDayStart as [SingleDayStartDate], - i.TradeDayEnd as [SingleDayEndDate], - ISNULL((SELECT MIN(dd.HistoryDT) FROM InstrumentHistory_Daily dd WHERE dd.InstrumentID = i.InstrumentID), CONVERT(DATETIME, '2030-12-31')) as [MinDailyDate], - ISNULL((SELECT MAX(dd.HistoryDT) FROM InstrumentHistory_Daily dd WHERE dd.InstrumentID = i.InstrumentID), CONVERT(DATETIME, '1970-01-01')) as [MaxDailyDate], - ISNULL((SELECT MIN(id.HistoryDT) FROM InstrumentHistory_Intraday id WHERE id.InstrumentID = i.InstrumentID), CONVERT(DATETIME, '2030-12-31')) as [MinIntradayDate], - ISNULL((SELECT MAX(id.HistoryDT) FROM InstrumentHistory_Intraday id WHERE id.InstrumentID = i.InstrumentID), CONVERT(DATETIME, '1970-01-01')) as [MaxIntradayDate] + DisplayOrder, + [InstrumentName], + [DisplayName], + [Symbol], + [PostPandemicDilution], + [GMTOffset], + [Currency], + [CurrentPrice], + [InstrumentType], + [ShowInMarquee], + [WatchlistID], + [SingleDayStartDate], + [SingleDayEndDate], + [MinDailyDate], + [MaxDailyDate], + [MinIntradayDate], + [MaxIntradayDate], + [LastSoldDate], + dbo.fn_GetPriceAtDate(dt.InstrumentID, LastSoldDate) as [LastSoldPrice] FROM - Instrument i - /*INNER JOIN Exchange e - ON e.ExchangeID = i.ExchangeID*/ + (SELECT + i.InstrumentID, + i.DisplayOrder, + i.FullName as [InstrumentName], + ISNULL(i.DisplayName, LEFT(i.FullName, 30)) as [DisplayName], + i.Symbol as [Symbol], + i.PostPandemicDilution as [PostPandemicDilution], + i.GMTOffset as [GMTOffset], + i.Currency as [Currency], + i.CurrentPrice as [CurrentPrice], + i.InstrumentType as [InstrumentType], + i.ShowInMarquee as [ShowInMarquee], + i.WatchlistID as [WatchlistID], + i.TradeDayStart as [SingleDayStartDate], + i.TradeDayEnd as [SingleDayEndDate], + ISNULL((SELECT MIN(dd.HistoryDT) FROM InstrumentHistory_Daily dd WHERE dd.InstrumentID = i.InstrumentID), CONVERT(DATETIME, '2030-12-31')) as [MinDailyDate], + ISNULL((SELECT MAX(dd.HistoryDT) FROM InstrumentHistory_Daily dd WHERE dd.InstrumentID = i.InstrumentID), CONVERT(DATETIME, '1970-01-01')) as [MaxDailyDate], + ISNULL((SELECT MIN(id.HistoryDT) FROM InstrumentHistory_Intraday id WHERE id.InstrumentID = i.InstrumentID), CONVERT(DATETIME, '2030-12-31')) as [MinIntradayDate], + ISNULL((SELECT MAX(id.HistoryDT) FROM InstrumentHistory_Intraday id WHERE id.InstrumentID = i.InstrumentID), CONVERT(DATETIME, '1970-01-01')) as [MaxIntradayDate], + (SELECT MAX(h.SoldDate) FROM Holding h WHERE h.InstrumentID = i.InstrumentID AND h.SoldDate IS NOT NULL) as [LastSoldDate] + FROM + Instrument i) as dt ORDER BY - i.DisplayOrder + DisplayOrder END GO GRANT EXECUTE ON usp_GetInstruments TO WebApp_Role @@ -406,7 +488,7 @@ GO CREATE PROCEDURE usp_GetIntradayData (@Symbol varchar(8), @StartDate datetime, @EndDate datetime) AS BEGIN - DECLARE @MAX_DAYS INT = 90 + DECLARE @MAX_DAYS INT = 30 IF DATEDIFF(dd, @StartDate, @EndDate) > @MAX_DAYS BEGIN @@ -761,16 +843,84 @@ GO GRANT EXECUTE ON usp_DeleteHolding TO WebApp_Role GO */ -CREATE PROCEDURE usp_SoldHolding (@HoldingID int, @SoldDate datetime) +CREATE PROCEDURE usp_SoldHolding (@HoldingID int, @SoldDate datetime, @SoldCurrency varchar(8), @SoldProceeds numeric(36, 12)) AS BEGIN - UPDATE Holding SET SoldDate = @SoldDate WHERE HoldingID = @HoldingID + UPDATE + Holding + SET + SoldDate = @SoldDate, + SoldCurrencyID = (SELECT InstrumentID FROM Instrument WHERE Symbol = @SoldCurrency), + SoldProceeds = @SoldProceeds + WHERE + HoldingID = @HoldingID + SELECT @@ROWCOUNT AS [RecordsUpdated] END GO GRANT EXECUTE ON usp_SoldHolding TO WebApp_Role GO +CREATE PROCEDURE usp_SetAccountCashValue (@AccountName varchar(20), @Currency varchar(8), @Value numeric(36, 12)) +AS +BEGIN + DECLARE @AccountID int + DECLARE @CurrencyID int + + SELECT @AccountID = AccountID FROM Account WHERE ShortName = @AccountName + SELECT @CurrencyID = InstrumentID FROM Instrument WHERE Symbol = @Currency + + + IF EXISTS (SELECT NULL FROM Holding WHERE AccountID = @AccountID AND InstrumentID = @CurrencyID) + BEGIN + UPDATE + Holding + SET + NoUnits = @Value + WHERE + AccountID = @AccountID + AND InstrumentID = @CurrencyID + END + ELSE + BEGIN + INSERT Holding ( + AccountID, + InstrumentID, + NoUnits, + PurchasePricePerUnit, + PurchaseDate) + VALUES ( + @AccountID, + @CurrencyID, + @Value, + 1.0, + '2020-01-01') + END + + SELECT + h.HoldingID, + a.ShortName as [AccountName], + i.Symbol as [Symbol], + h.PurchaseDate, + h.NoUnits, + h.PurchasePricePerUnit, + ISNULL(h.ActualExchangeRate, dbo.fn_GetExchangeRate(i.Currency, h.PurchaseDate)) as [PurchaseExchangeRate], + h.NoUnits * h.PurchasePricePerUnit / ISNULL(h.ActualExchangeRate, dbo.fn_GetExchangeRate(i.Currency, h.PurchaseDate)) as [BookCostGBP], + h.SoldDate + FROM + Holding h + INNER JOIN Instrument i + ON h.InstrumentID = i.InstrumentID + INNER JOIN Account a + ON a.AccountID = h.AccountID + WHERE + a.AccountID = @AccountID + AND h.InstrumentID = @CurrencyID +END +GO +GRANT EXECUTE ON usp_SetAccountCashValue TO WebApp_Role +GO + CREATE PROCEDURE usp_SwapDisplayOrder (@Symbol1 varchar(8), @Symbol2 varchar(8)) AS BEGIN @@ -800,10 +950,82 @@ GO GRANT EXECUTE ON usp_SwapDisplayOrder TO WebApp_Role GO +CREATE PROCEDURE usp_SetTotalHoldingsValue (@TotalValueGBP money) +AS +BEGIN + DECLARE @Rounded INT = CONVERT(int, FLOOR(@TotalValueGBP)) + DECLARE @EndOfPreviousWeek DATE = DATEADD(day, 1 - DATEPART(weekday, CURRENT_TIMESTAMP), convert(date, CURRENT_TIMESTAMP)) + DECLARE @PreviousDay DATE = DATEADD(day, -1, CONVERT(DATE, CURRENT_TIMESTAMP)) + + IF DATENAME(WEEKDAY, CURRENT_TIMESTAMP) NOT IN ('Saturday', 'Sunday') + BEGIN + IF EXISTS (SELECT NULL FROM TotalHoldingsHistory_Daily WHERE HistoryDate = CONVERT(date, CURRENT_TIMESTAMP)) + BEGIN + UPDATE + TotalHoldingsHistory_Daily + SET + Low = CASE WHEN @Rounded < Low THEN @Rounded ELSE Low END, + High = CASE WHEN @Rounded > High THEN @Rounded ELSE High END, + [Close] = @Rounded + WHERE + HistoryDate = CONVERT(date, CURRENT_TIMESTAMP) + END + ELSE + BEGIN + INSERT TotalHoldingsHistory_Daily (HistoryDate, [Open], Low, High, [Close]) VALUES (CONVERT(date, CURRENT_TIMESTAMP), @Rounded, @Rounded, @Rounded, @Rounded) + END + END + + SELECT + pw.HistoryDate as [PreviousWeekDate], + pw.[Close] as [PreviousWeekClose], + pd.HistoryDate as [PreviousDay], + pd.[Close] as [PreviousClose] + FROM + (SELECT TOP 1 + * + FROM + TotalHoldingsHistory_Daily + WHERE + HistoryDate <= @EndOfPreviousWeek + ORDER BY + HistoryDate DESC) as [pw], + (SELECT TOP 1 + * + FROM + TotalHoldingsHistory_Daily + WHERE + HistoryDate <= @PreviousDay + ORDER BY + HistoryDate DESC) as [pd] +END +GO +GRANT EXECUTE ON usp_SetTotalHoldingsValue TO WebApp_Role +GO + +CREATE PROCEDURE usp_GetTotalHoldingsHistory +AS +BEGIN + SELECT + h.HistoryDate, + h.[Open], + h.[High], + h.[Low], + h.[Close] + FROM + TotalHoldingsHistory_Daily h + ORDER BY + HistoryDate +END +GO +GRANT EXECUTE ON usp_GetTotalHoldingsHistory TO WebApp_Role +GO + CREATE VIEW vHolding AS SELECT h.HoldingID, + i.InstrumentID, a.ShortName as [AccountName], i.Symbol, i.FullName as [InstrumentName], diff --git a/Websites/SharePrices/SharePrices/SharePrices.aspx b/Websites/SharePrices/SharePrices/SharePrices.aspx index 03bf482..5639bd9 100644 --- a/Websites/SharePrices/SharePrices/SharePrices.aspx +++ b/Websites/SharePrices/SharePrices/SharePrices.aspx @@ -26,24 +26,28 @@ - - + + + +
- - - @@ -74,6 +78,8 @@
Holdings table

+
Watchlist table
+
+ Charts Holdings Accounts Analysis + History Log + +
@@ -95,6 +101,10 @@
Analysis
+
+
History Chart
+ +
Log
@@ -109,6 +119,7 @@
Book Cost currencies
diff --git a/Websites/SharePrices/SharePrices/SharePrices.aspx.vb b/Websites/SharePrices/SharePrices/SharePrices.aspx.vb index cb68161..b866619 100644 --- a/Websites/SharePrices/SharePrices/SharePrices.aspx.vb +++ b/Websites/SharePrices/SharePrices/SharePrices.aspx.vb @@ -133,10 +133,16 @@ Public Class SharePrices ' SetResponseAndCompleteRequest(HttpContext.Current, "application/json", responseText) 'End Sub - Public Shared Sub SoldHolding(HoldingID As Integer, SoldDate As Int64) + Public Shared Sub SoldHolding(HoldingID As Integer, SoldDate As Int64, SoldCurrency As String, SoldProceeds As Double) 'Debug.Print(Now().ToString("yyyy-MM-dd HH:mm:ss") + " - SharePrices.SoldHolding webmethod: " + HoldingID.ToString() + ". " + SoldDate.TYoString()) - Dim responseText As String = DataAccessLayer.SoldHolding(HoldingID, FromEpochTime(SoldDate)) + Dim responseText As String = DataAccessLayer.SoldHolding(HoldingID, FromEpochTime(SoldDate), SoldCurrency, SoldProceeds) + SetResponseAndCompleteRequest(HttpContext.Current, "application/json", responseText) + End Sub + + + Public Shared Sub SetAccountCashValue(AccountName As String, Currency As String, Value As Double) + Dim responseText As String = DataAccessLayer.SetAccountCashValue(AccountName, Currency, Value) SetResponseAndCompleteRequest(HttpContext.Current, "application/json", responseText) End Sub @@ -262,6 +268,24 @@ Public Class SharePrices SetResponseAndCompleteRequest(HttpContext.Current, "application/json", responseText) End Sub + + Public Shared Sub SetTotalHoldingsValue(TotalValue As Double) + Debug.Print(Now().ToString("yyyy-MM-dd HH:mm:ss") + " - SharePrices.SetTotalHoldingsValue webmethod: " + CStr(TotalValue)) + + Dim responseText As String = DataAccessLayer.SetTotalHoldingsValues(TotalValue) + SetResponseAndCompleteRequest(HttpContext.Current, "application/json", responseText) + End Sub + + + Public Shared Sub GetTotalHoldingsHistory() + Debug.Print(Now().ToString("yyyy-MM-dd HH:mm:ss") + " - SharePrices.GetTotalHoldingsHistory") + + Dim responseText As String = DataAccessLayer.GetTotalHoldingsHistory() + SetResponseAndCompleteRequest(HttpContext.Current, "application/json", responseText) + End Sub + + + diff --git a/Websites/SharePrices/SharePrices/SharePricesStyles.css b/Websites/SharePrices/SharePrices/SharePricesStyles.css index 39d3bd9..8b19179 100644 --- a/Websites/SharePrices/SharePrices/SharePricesStyles.css +++ b/Websites/SharePrices/SharePrices/SharePricesStyles.css @@ -10,8 +10,10 @@ body { font-family: Verdana, Arial, Helvetica, sans-serif; margin: 0px; /*margin .navbar { /*overflow: hidden; */background-color: #333; position: fixed; top: 0; /*height: 28px;*/ width: 100%; z-index: 100; /*padding-top: 6px;*/ } .navbar table { border-collapse: collapse; width: 100%; } .navbar td { padding: 4px 0px 4px 0px } /*.navbar td { padding: 7px 0px 7px 0px }*/ -.navbar a { /*float: left; display: block;*/ color: #f2f2f2; text-align: center; padding: 7px 12px 7px 12px; text-decoration: none; } -.navbar a:hover { background: #ddd; color: white; } +/*.navbar a { color: #f2f2f2; text-align: center; padding: 7px 12px 7px 12px; text-decoration: none; } +.navbar a:hover { background: #ddd; color: white; }*/ +.navbarlink a { color: #f2f2f2; text-align: center; padding: 7px 12px 7px 12px; text-decoration: none; } +.navbarlink a:hover { background: #ddd; color: white; } .navbar label { color: #f2f2f2; } .activenav { /*float: left; display: block;*/ color: #f2f2f2 !important; background-color: #307D30 !important; text-align: center; /*padding: 7px 16px;*/ text-decoration: none; } .main { height: 100%; width: 100%; /*margin-top: 34px;*/ /* Add a top margin to avoid content overlay */ } @@ -34,6 +36,8 @@ td {vertical-align: top;} .instrumentName { color: white; } #spnTotalHoldings { color: white; /*padding-left: 50px;*/ } #spnCurrencies { color: white; font-size: small; padding-right: 10px; } +#spnCurrencies a { color: white; } +#spnCurrencies a:visited { color: white; } a:link { color: #f473ff; } a:visited { color: #9a34b7; } @@ -51,6 +55,11 @@ table.mainHoldings { width: 100%; } table.mainHoldings th, table.mainHoldings td { padding-left: 5px; padding-right: 5px; } table.mainHoldings tr:hover { background-color: #404090; } +.watchlist { font-size: small; } +/*table.watchlist { width: 100%; }*/ +table.watchlist th, table.watchlist td { padding-left: 5px; padding-right: 5px; } +table.watchlist tr:hover { background-color: #404090; } + .accounts { font-size: small; } /*table.accounts { width: 100%; }*/ table.accounts th, table.accounts td { padding-left: 5px; padding-right: 5px; } @@ -140,8 +149,21 @@ span.addHolding { cursor: pointer; } .marquee div { padding: 1px 0px 1px 0px; } +/* +.highcharts-hollowcandlestick-series .highcharts-point-down { + fill: #ff4141; + stroke: #ff4141; +}*/ - +/*.highcharts-hollowcandlestick-series .highcharts-point-down-bearish-up { + fill: #35bd00; + stroke: #35bd00; +}*/ +/* +.highcharts-hollowcandlestick-series .highcharts-point-up { + fill: #07b200; + stroke: #07b200; +}*/ /* diff --git a/Websites/SharePrices/SharePrices/bin/SharePrices.dll b/Websites/SharePrices/SharePrices/bin/SharePrices.dll index 0ec9786..0853249 100644 Binary files a/Websites/SharePrices/SharePrices/bin/SharePrices.dll and b/Websites/SharePrices/SharePrices/bin/SharePrices.dll differ diff --git a/Websites/SharePrices/SharePrices/bin/SharePrices.pdb b/Websites/SharePrices/SharePrices/bin/SharePrices.pdb index cecc660..da61e0f 100644 Binary files a/Websites/SharePrices/SharePrices/bin/SharePrices.pdb and b/Websites/SharePrices/SharePrices/bin/SharePrices.pdb differ diff --git a/Websites/SharePrices/SharePrices/obj/Debug/SharePrices.dll b/Websites/SharePrices/SharePrices/obj/Debug/SharePrices.dll index 0ec9786..0853249 100644 Binary files a/Websites/SharePrices/SharePrices/obj/Debug/SharePrices.dll and b/Websites/SharePrices/SharePrices/obj/Debug/SharePrices.dll differ diff --git a/Websites/SharePrices/SharePrices/obj/Debug/SharePrices.pdb b/Websites/SharePrices/SharePrices/obj/Debug/SharePrices.pdb index cecc660..da61e0f 100644 Binary files a/Websites/SharePrices/SharePrices/obj/Debug/SharePrices.pdb and b/Websites/SharePrices/SharePrices/obj/Debug/SharePrices.pdb differ diff --git a/Websites/SharePrices/SharePrices/scripts/SharePrices.js b/Websites/SharePrices/SharePrices/scripts/SharePrices.js index a4ab09a..48ec687 100644 --- a/Websites/SharePrices/SharePrices/scripts/SharePrices.js +++ b/Websites/SharePrices/SharePrices/scripts/SharePrices.js @@ -9,6 +9,7 @@ var fetchIntervalSingleDay = 2 * timespans.oneMinute; //var fetchInterval = 500; var initialPageTitle; var fetchTimer = 0; +var lastSuccessfulFetch; var currencyFormatter = new Intl.NumberFormat('en-GB', { style: 'currency', currency: 'GBP' }); var instrumentSearchResults = []; var tablesUpdateTimings = { lastUpdate: 0, timeBetweenUpdates: 10000, timer: 0, updateNeeded: true }; @@ -71,19 +72,32 @@ var Instruments = { } return result; }, + GetAccountCurrencyHolding: function (AccountName, CurrencyInstrument) { + if (CurrencyInstrument.Holdings) { + for (let x = 0; x < CurrencyInstrument.Holdings.length; x++) { + let h = CurrencyInstrument.Holdings[x]; + if (h.SoldDate == null && h.AccountName == AccountName) { + return (h); + } + } + } + }, GetLastFetchedDaily: function () { //if (!this.Data[0].lastFetchedDaily) { this.Data[0].lastFetchedDaily = this.Data[0].MaxDailyDate }; if (!this.Data[0].lastFetchedDaily) { this.Data[0].lastFetchedDaily = new Date().getTime() - fetchIntervalDaily + (4 * timespans.oneMinute) }; let lastFetchedDate = this.Data[0].lastFetchedDaily; let lastFetchedIndex = 0; for (let i = 1; i < this.Data.length; i++) { - //if (!this.Data[i].lastFetchedDaily) { this.Data[i].lastFetchedDaily = this.Data[i].MaxDailyDate }; - if (!this.Data[i].lastFetchedDaily) { this.Data[i].lastFetchedDaily = new Date().getTime() - fetchIntervalDaily + (4 * timespans.oneMinute) }; - if (lastFetchedDate > this.Data[i].lastFetchedDaily) { - lastFetchedDate > this.Data[i].lastFetchedDaily; - lastFetchedIndex = i; + if (this.Data[i].Symbol != 'GBP' && this.Data[i].Symbol != 'GBp') { + //if (!this.Data[i].lastFetchedDaily) { this.Data[i].lastFetchedDaily = this.Data[i].MaxDailyDate }; + if (!this.Data[i].lastFetchedDaily) { this.Data[i].lastFetchedDaily = new Date().getTime() - fetchIntervalDaily + (4 * timespans.oneMinute) }; + if (lastFetchedDate > this.Data[i].lastFetchedDaily) { + lastFetchedDate = this.Data[i].lastFetchedDaily; + lastFetchedIndex = i; + } } } + //console.info({ lastFetchedType: 'Daily', Date: new Date(lastFetchedDate).yyyymmddhhmmss(), Index: lastFetchedIndex, Symbol: Instruments.Data[lastFetchedIndex].Symbol }); return this.Data[lastFetchedIndex]; }, GetLastFetchedIntraday: function () { @@ -92,13 +106,16 @@ var Instruments = { let lastFetchedDate = this.Data[0].lastFetchedIntraday; let lastFetchedIndex = 0; for (let i = 1; i < this.Data.length; i++) { - //if (!this.Data[i].lastFetchedIntraday) { this.Data[i].lastFetchedIntraday = this.Data[i].MaxIntradayDate }; - if (!this.Data[i].lastFetchedIntraday) { this.Data[i].lastFetchedIntraday = new Date().getTime() - fetchIntervalIntraday + (2 * timespans.oneMinute) }; - if (lastFetchedDate > this.Data[i].lastFetchedIntraday) { - lastFetchedDate > this.Data[i].lastFetchedIntraday; - lastFetchedIndex = i; + if (this.Data[i].Symbol != 'GBP' && this.Data[i].Symbol != 'GBp') { + //if (!this.Data[i].lastFetchedIntraday) { this.Data[i].lastFetchedIntraday = this.Data[i].MaxIntradayDate }; + if (!this.Data[i].lastFetchedIntraday) { this.Data[i].lastFetchedIntraday = new Date().getTime() - fetchIntervalIntraday + (2 * timespans.oneMinute) }; + if (lastFetchedDate > this.Data[i].lastFetchedIntraday) { + lastFetchedDate = this.Data[i].lastFetchedIntraday; + lastFetchedIndex = i; + } } } + //console.info({ lastFetchedType: 'Intraday', Date: new Date(lastFetchedDate).yyyymmddhhmmss(), Index: lastFetchedIndex, Symbol: Instruments.Data[lastFetchedIndex].Symbol }); return this.Data[lastFetchedIndex]; }, GetLastFetchedSingleDay: function () { @@ -106,12 +123,15 @@ var Instruments = { let lastFetchedDate = this.Data[0].lastFetchedSingleDay; let lastFetchedIndex = 0; for (let i = 1; i < this.Data.length; i++) { - if (!this.Data[i].lastFetchedSingleDay) { this.Data[i].lastFetchedSingleDay = 0 }; - if (lastFetchedDate > this.Data[i].lastFetchedSingleDay) { - lastFetchedDate > this.Data[i].lastFetchedSingleDay; - lastFetchedIndex = i; + if (this.Data[i].Symbol != 'GBP' && this.Data[i].Symbol != 'GBp') { + if (!this.Data[i].lastFetchedSingleDay) { this.Data[i].lastFetchedSingleDay = 0 }; + if (lastFetchedDate > this.Data[i].lastFetchedSingleDay) { + lastFetchedDate = this.Data[i].lastFetchedSingleDay; + lastFetchedIndex = i; + } } } + //console.info({ lastFetchedType: 'SingleDay', Date: new Date(lastFetchedDate).yyyymmddhhmmss(), Index: lastFetchedIndex, Symbol: Instruments.Data[lastFetchedIndex].Symbol }); return this.Data[lastFetchedIndex]; }, GetCurrentPrice: function (Instrument) { @@ -221,8 +241,8 @@ var Instruments = { var Currencies = { Data: [], indexOfName: function (Name) { return this.Data.map(function (item) { return item.Name; }).indexOf(Name); }, - updateSymbol: function (Name, CurrentPrice) { - var newObject = { Name: Name, CurrentPrice: CurrentPrice }; + updateSymbol: function (Symbol, Name, CurrentPrice) { + var newObject = { Name: Name, CurrentPrice: CurrentPrice, URL: 'https://uk.finance.yahoo.com/quote/' + Symbol }; var i = this.indexOfName(Name); if (i >= 0) { this.Data[i] = newObject; @@ -231,6 +251,7 @@ var Currencies = { } } } +var previousDay, previousClose, previousWeek, previousWeekClose; Date.prototype.yyyymmddhhmmss = function () { var yyyy = this.getFullYear().toString(); @@ -321,6 +342,9 @@ function formatAmount(amount, currency, decimals) { if (amount) { let isNegative = (amount < 0); let s = Math.abs(amount).toFixed(decimals); + if (Math.abs(amount) < 0.01) { + s = Math.abs(amount).toPrecision(2); + } let pos = s.indexOf('.'); let wholeNumber = (pos >= 0) ? s.substring(0, pos) : s; let decimal = (pos >= 0) ? s.substring(pos) : ''; @@ -482,9 +506,9 @@ function createSharesTable() { let excludeNoHoldings = $('#excludeNoHoldings').prop('checked'); //logInfo('createSharesTable()'); var tbl = '
' + - '' + - '' + - '' + + '' + + '' + + '' + ''; for (var rowNo = 0; rowNo < Instruments.Data.length; rowNo++) { let i = Instruments.Data[rowNo]; @@ -564,8 +588,8 @@ function createSharesTableRow(instrument) { } let dispOrder = instrument.DisplayOrder.toString(); - let breakevenIcon = instrument.ShowBreakevenLine | 0 == 1 ? 'icons/Breakeven.png' : 'icons/Breakeven_Off.png'; - let previousHoldingsIcon = instrument.ShowPreviousHoldings | 0 == 1 ? 'icons/History.png' : 'icons/History_Off.png'; + let breakevenIcon = (instrument.ShowBreakevenLine | 0) == 1 ? 'icons/Breakeven.png' : 'icons/Breakeven_Off.png'; + let previousHoldingsIcon = (instrument.ShowPreviousHoldings | 0) == 1 ? 'icons/History.png' : 'icons/History_Off.png'; return ''; + } + function profitOrLoss(value) { + return value >= 0 ? "profit" : "loss"; + } + + let t = getHoldings(); + let totalBookCostGBP = t.totalBookCostGBP; + let totalValueGBP = t.totalValueGBP; + let totalGainGBP = t.totalGainGBP; + let todaysGainGBP = t.todaysGainGBP; + let maxCurrentValueGBP = t.maxCurrentValueGBP; + let holdings = t.holdings; + let watchlist = t.watchlist; + let holdingCurrencies = t.holdingCurrencies; + let holdingCurrenciesCurrentValue = t.holdingCurrenciesCurrentValue; + let bookCostPerAccount = t.bookCostPerAccount; + let currentValuePerAccount = t.currentValuePerAccount; + + let maxAllocationPercent = (maxCurrentValueGBP / totalValueGBP) * 100; + let allocationScaleFactor = 100 / maxAllocationPercent; + + let altRow = 1; + + createTable(); + for (let n = 0; n < holdings.length; n++) { + try { + altRow = !altRow; + + let h = holdings[n]; + let type = h.instrumentType == 'CURRENCY' ? '$' : h.instrumentType.substring(0, 1); + //let profitOrLoss = h.currentPrice < h.purchasePricePerUnit ? 'loss' : 'profit'; //let profitOrLoss = i.CurrentPrice < h.PurchasePricePerUnit ? 'loss' : 'profit'; + let openOrClosed = h.marketIsOpen == 1 ? 'open' : 'closed'; + let allocationPercent = h.currentValueGBP / totalValueGBP * 100; + let scaledAllocation = allocationScaleFactor * allocationPercent; + + let rowID = "holdingRow_" + h.displayOrder + "_" + h.holdingNumber; + let row = '' + + '' + + '' + + '' + + '' + + '' + + '' + + //'' + + '' + + '' + //Buy Price + '' + //Current Price + '' + //Book Cost + '' + //Current Value + '' + //Gain + '' + //Gain £ + '' + //Gain % + '' + //Current Value £ + (h.currentExchangeRate ? getPercentCell('#3f2d95', 70, scaledAllocation, allocationPercent.toFixed(1) + '%') : '') + //Allocation + (h.currentExchangeRate ? (h.marketIsOpen == 0 ? '') : '') + //Today's Gain £ + (h.singleDayGainPercent ? (h.marketIsOpen == 0 ? '') : ''; + addTableRow(rowID, row, "tbMainHoldings", true); + } + catch (err) { + logError("Error adding " + holdings[n].symbol + " to main holdings table: " + err.message); + } + } + + //Add the totals line at the bottom of the table + //let profitOrLoss = totalValueGBP < totalBookCostGBP ? 'loss' : 'profit'; + let todaysProfitOrLoss = todaysGainGBP < 0 ? 'loss' : 'profit'; + let lSF = ''; + if (lastSuccessfulFetch) { + let lastFetchAge = ((new Date()) - lastSuccessfulFetch); + let staleFetch = ((new Date()) - lastSuccessfulFetch) > (timespans.oneMinute * 3); + lSF = (lastSuccessfulFetch ? ' - Last Successful Fetch: ' + (staleFetch ? '' : '') + lastSuccessfulFetch.yyyymmddhhmmss() + (staleFetch ? '' : '') : ''); + } + let row = '' + + '' + //Book Cost + '' + + '' + //Gain GBP + '' + //Gain % + '' + //Current Value + '' + //Allocation + '' + //Today's Gain GBP + '' + //Today's Gain % + ''; + addTableRow("tfHoldingsTotals", row, "tfMainHoldings", false); + + //Create the watchlist table + createWatchlistTable(); + altRow = 1; + for (let n = 0; n < watchlist.length; n++) { + altRow = !altRow; + let wi = watchlist[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 = ''; + } + + //Type, Name, Symbol, Ccy, Current Price, Today's Gain, Today's Gain % + let row = '' + + '' + + '' + + '' + + '' + + '' + //Current Price + (Instruments.marketIsOpen == 0 ? '') + //Today's Gain + (Instruments.marketIsOpen == 0 ? '') + //Today's Gain % + //'' + + sinceLastSold + + ''; + addTableRow(rowID, row, "tbWatchlist", true); + } + catch (err) { + logError("Error adding " + wi.symbol + " to watchlist table: " + err.message); + } + } + + //Flash the last updated cell + $("#holdingsLastUpdated").addClass("highlighted"); + //Remove the highlight from all rows/cells + $("#tblMainHoldings").find(".highlighted").removeClass("highlighted", 1200); + $("#tblWatchlist").find(".highlighted").removeClass("highlighted", 1200); + + //Tell tablesorter that the table has been updated + var resort = true; + $("#tblMainHoldings").trigger("update", [resort]); + + /* + //Update the total holdings span in the site banner + let formattedAmount = formatAmount(totalValueGBP, "GBP", 0); + $("#spnTotalHoldings").html("Total holdings: " + formattedAmount); + //Set the page title + document.title = formattedAmount + ' - ' + initialPageTitle; + */ + + + //Update the daily holdings value table in the DB + $.ajax({ + type: "POST", + contentType: "application/json", + url: "SharePrices.aspx/SetTotalHoldingsValue", + dataType: "json", + data: JSON.stringify({ TotalValue: totalValueGBP }), + success: function (response) { + previousDay = response.PreviousDay; + previousClose = response.PreviousClose; + previousWeek = response.PreviousWeekDate; + previousWeekClose = response.PreviousWeekClose; + + //Update the total holdings span in the site banner + let formattedAmount = formatAmount(totalValueGBP, "GBP", 0); + /*let holdingsHTML = '
InstrumentYTD1 Month1 WeekAll3 Month2 Week1 Day
' + instrument.DisplayName + '
' + //'		' + instrument.InstrumentName + '
' + '' + instrument.Symbol + '  ' + //'+
' + @@ -816,19 +840,29 @@ function createLongChart(Instrument) { } function createMidChart(Instrument) { let rowNo = Instrument.DisplayOrder; + /* let monthStartDate = new Date().setHours(0, 0, 0) - timespans.oneMonth; let monthEndDate = new Date().getTime(); - //if (Instrument.MidChart) { try { Instrument.MidChart.destroy(); } catch (ex) { } Instrument.MidChart = createChart(Instrument, monthStartDate, monthEndDate, 'divMidChart' + rowNo.toString(), 'divMidSummary' + rowNo.toString()); + */ + let quarterStartDate = new Date().setHours(0, 0, 0) - (timespans.oneMonth * 3); + let quarterEndDate = new Date().getTime(); + try { Instrument.MidChart.destroy(); } catch (ex) { } + Instrument.MidChart = createChart(Instrument, quarterStartDate, quarterEndDate, 'divMidChart' + rowNo.toString(), 'divMidSummary' + rowNo.toString()); } function createShortChart(Instrument) { let rowNo = Instrument.DisplayOrder; + /* let weekStartDate = new Date().setHours(0, 0, 0) - timespans.oneWeek; let weekEndDate = new Date().getTime(); - //if (Instrument.ShortChart) { try { Instrument.ShortChart.destroy(); } catch (ex) { } Instrument.ShortChart = createChart(Instrument, weekStartDate, weekEndDate, 'divShortChart' + rowNo.toString(), 'divShortSummary' + rowNo.toString()); + */ + let fortnightStartDate = new Date().setHours(0, 0, 0) - (timespans.oneWeek * 2); + let fortnightEndDate = new Date().getTime(); + try { Instrument.ShortChart.destroy(); } catch (ex) { } + Instrument.ShortChart = createChart(Instrument, fortnightStartDate, fortnightEndDate, 'divShortChart' + rowNo.toString(), 'divShortSummary' + rowNo.toString()); } function createSingleDayChart(Instrument) { let rowNo = Instrument.DisplayOrder; @@ -862,7 +896,7 @@ function createChart_Flot(Instrument, startDate, endDate, chartContainerID, summ } } else { //Get all in-date-range intraday data - let foundDates = { min: new Date().getTime, max: 0 } + let foundDates = { min: new Date().getTime(), max: 0 } for (let i = 0; i < Instrument.IntradayData.length; i++) { let quote = Instrument.IntradayData[i]; if (quote.DT >= dateFrom && quote.DT <= dateTo) { @@ -874,13 +908,19 @@ function createChart_Flot(Instrument, startDate, endDate, chartContainerID, summ //Back-fill with daily data if the intraday data doesn't cover the whole date range let minFoundDate = new Date(foundDates.min).setHours(0, 0, 0); if (minFoundDate > dateFrom) { - for (let i = 0; i < Instrument.DailyData.length; i++) { + /*for (let i = 0; i < Instrument.DailyData.length; i++) { let quote = Instrument.DailyData[i]; if (quote.DT >= dateFrom && quote.DT < minFoundDate) { result.push(quote); } else { break; } + }*/ + for (let i = Instrument.DailyData.length - 1; i > 0; i--) { + let quote = Instrument.DailyData[i]; + if (quote.DT >= dateFrom && quote.DT < minFoundDate) { + result.unshift(quote); + } } } } @@ -1030,7 +1070,7 @@ function createChart_Flot(Instrument, startDate, endDate, chartContainerID, summ //Add the breakeven price line //if ($('#showBreakevenLine').prop('checked')) { - if (Instrument.ShowBreakevenLine | 0 == 1) { + if ((Instrument.ShowBreakevenLine | 0) == 1) { if (priceType == 'percent') { series.unshift({ data: [[startDate, ((Instrument.BreakevenPrice / basePrice) - 1) * 100], [endDate, ((Instrument.BreakevenPrice / basePrice) - 1) * 100]], color: '#24BCC7', shadowSize: 0, lines: { lineWidth: 1 } }); } else { @@ -1173,7 +1213,7 @@ function createChart(Instrument, startDate, endDate, chartContainerID, summaryCo } } else { //Get all in-date-range intraday data - let foundDates = { min: new Date().getTime, max: 0 } + let foundDates = { min: new Date().getTime(), max: 0 } for (let i = 0; i < Instrument.IntradayData.length; i++) { let quote = Instrument.IntradayData[i]; if (quote.DT >= dateFrom && quote.DT <= dateTo) { @@ -1185,13 +1225,19 @@ function createChart(Instrument, startDate, endDate, chartContainerID, summaryCo //Back-fill with daily data if the intraday data doesn't cover the whole date range let minFoundDate = new Date(foundDates.min).setHours(0, 0, 0); if (minFoundDate > dateFrom) { - for (let i = 0; i < Instrument.DailyData.length; i++) { + /*for (let i = 0; i < Instrument.DailyData.length; i++) { let quote = Instrument.DailyData[i]; if (quote.DT >= dateFrom && quote.DT < minFoundDate) { result.push(quote); } else { break; } + }*/ + for (let i = Instrument.DailyData.length - 1; i > 0; i--) { + let quote = Instrument.DailyData[i]; + if (quote.DT >= dateFrom && quote.DT < minFoundDate) { + result.unshift(quote); + } } } } @@ -1340,7 +1386,7 @@ function createChart(Instrument, startDate, endDate, chartContainerID, summaryCo let series = [{ name: 'Volume', type: 'column', yAxis: 1, color: "#304e57", borderColor: "#304e57", data: volumeData }]; //Add the breakeven price line - if (Instrument.ShowBreakevenLine | 0 == 1) { + if ((Instrument.ShowBreakevenLine | 0) == 1) { if (priceType == 'percent') { series.unshift({ name: 'Breakeven', type: 'line', color: '#24BCC7', lineWidth: 1, marker: { enabled: false }, data: [[startDate, ((Instrument.BreakevenPrice / basePrice) - 1) * 100], [endDate, ((Instrument.BreakevenPrice / basePrice) - 1) * 100]] /* shadowSize: 0 */ }); } else { @@ -1448,7 +1494,7 @@ function createChart(Instrument, startDate, endDate, chartContainerID, summaryCo //Create the summary table let summaryTable = ''; if ((endDate - startDate) <= timespans.oneDay) { - //Add market times and previous close info for Single Dat chart + //Add market times and previous close info for Single Day chart let dt = new Date().getTime(); let marketHours = (new Date(Instrument.SingleDayStartDate)).hhmm() + ' - ' + (new Date(Instrument.SingleDayEndDate)).hhmm(); summaryTable += ''; @@ -1481,16 +1527,16 @@ function createFullScreenChart(Instrument, startDate, endDate) { result = Instrument.SingleDayData; } else { //Anything over 3 months should only use daily data - if (dateTo - dateFrom > ((3 * timespans.oneMonth) + (timespans.oneDay * 4))) { + /*if (dateTo - dateFrom > ((3 * timespans.oneMonth) + (timespans.oneDay * 4))) { for (let i = 0; i < Instrument.DailyData.length; i++) { let quote = Instrument.DailyData[i]; if (quote.DT >= dateFrom && quote.DT <= dateTo) { result.push(quote); } } - } else { + } else {*/ //Get all in-date-range intraday data - let foundDates = { min: new Date().getTime, max: 0 } + let foundDates = { min: new Date().getTime(), max: 0 } for (let i = 0; i < Instrument.IntradayData.length; i++) { let quote = Instrument.IntradayData[i]; if (quote.DT >= dateFrom && quote.DT <= dateTo) { @@ -1501,17 +1547,16 @@ function createFullScreenChart(Instrument, startDate, endDate) { } //Back-fill with daily data if the intraday data doesn't cover the whole date range let minFoundDate = new Date(foundDates.min).setHours(0, 0, 0); + if (minFoundDate > dateFrom) { - for (let i = 0; i < Instrument.DailyData.length; i++) { + for (let i = Instrument.DailyData.length - 1; i > 0; i--) { let quote = Instrument.DailyData[i]; if (quote.DT >= dateFrom && quote.DT < minFoundDate) { - result.push(quote); - } else { - break; + result.unshift(quote); } } } - } + /*}*/ } /* //Add an entry for today's latest data from SingleDayData @@ -1686,7 +1731,7 @@ function createFullScreenChart_Flot(Instrument, startDate, endDate) { } } else { //Get all in-date-range intraday data - let foundDates = { min: new Date().getTime, max: 0 } + let foundDates = { min: new Date().getTime(), max: 0 } for (let i = 0; i < Instrument.IntradayData.length; i++) { let quote = Instrument.IntradayData[i]; if (quote.DT >= dateFrom && quote.DT <= dateTo) { @@ -1698,13 +1743,19 @@ function createFullScreenChart_Flot(Instrument, startDate, endDate) { //Back-fill with daily data if the intraday data doesn't cover the whole date range let minFoundDate = new Date(foundDates.min).setHours(0, 0, 0); if (minFoundDate > dateFrom) { - for (let i = 0; i < Instrument.DailyData.length; i++) { + /*for (let i = 0; i < Instrument.DailyData.length; i++) { let quote = Instrument.DailyData[i]; if (quote.DT >= dateFrom && quote.DT < minFoundDate) { result.push(quote); } else { break; } + }*/ + for (let i = Instrument.DailyData.length - 1; i > 0; i--) { + let quote = Instrument.DailyData[i]; + if (quote.DT >= dateFrom && quote.DT < minFoundDate) { + result.unshift(quote); + } } } } @@ -1903,7 +1954,7 @@ function createFullScreenComparisonChart(Instrument1, Instrument2, startDate, en } } else { //Get all in-date-range intraday data - let foundDates = { min: new Date().getTime, max: 0 } + let foundDates = { min: new Date().getTime(), max: 0 } for (let i = 0; i < Instrument.IntradayData.length; i++) { let quote = Instrument.IntradayData[i]; if (quote.DT >= dateFrom && quote.DT <= dateTo) { @@ -1915,13 +1966,19 @@ function createFullScreenComparisonChart(Instrument1, Instrument2, startDate, en //Back-fill with daily data if the intraday data doesn't cover the whole date range let minFoundDate = new Date(foundDates.min).setHours(0, 0, 0); if (minFoundDate > dateFrom) { - for (let i = 0; i < Instrument.DailyData.length; i++) { + /*for (let i = 0; i < Instrument.DailyData.length; i++) { let quote = Instrument.DailyData[i]; if (quote.DT >= dateFrom && quote.DT < minFoundDate) { result.push(quote); } else { break; } + }*/ + for (let i = Instrument.DailyData.length - 1; i > 0; i--) { + let quote = Instrument.DailyData[i]; + if (quote.DT >= dateFrom && quote.DT < minFoundDate) { + result.unshift(quote); + } } } } @@ -2065,7 +2122,7 @@ function createFullScreenComparisonChart_Flot(Instrument1, Instrument2, startDat } } else { //Get all in-date-range intraday data - let foundDates = { min: new Date().getTime, max: 0 } + let foundDates = { min: new Date().getTime(), max: 0 } for (let i = 0; i < Instrument.IntradayData.length; i++) { let quote = Instrument.IntradayData[i]; if (quote.DT >= dateFrom && quote.DT <= dateTo) { @@ -2077,13 +2134,19 @@ function createFullScreenComparisonChart_Flot(Instrument1, Instrument2, startDat //Back-fill with daily data if the intraday data doesn't cover the whole date range let minFoundDate = new Date(foundDates.min).setHours(0, 0, 0); if (minFoundDate > dateFrom) { - for (let i = 0; i < Instrument.DailyData.length; i++) { + /*for (let i = 0; i < Instrument.DailyData.length; i++) { let quote = Instrument.DailyData[i]; if (quote.DT >= dateFrom && quote.DT < minFoundDate) { result.push(quote); } else { break; } + }*/ + for (let i = Instrument.DailyData.length - 1; i > 0; i--) { + let quote = Instrument.DailyData[i]; + if (quote.DT >= dateFrom && quote.DT < minFoundDate) { + result.unshift(quote); + } } } } @@ -2289,6 +2352,10 @@ function getYahooDailyData(Instrument) { //let d = new Date(newData[newData.length - 1].DT).yyyymmddhhmmss(); //console.info("getYahooDailyData: " + Instrument.Symbol + ', Last data point: ' + d); + if (newData.length > 0) { + lastSuccessfulFetch = new Date(); + } + submitNewDailyData(Instrument, newData); createMidChart(Instrument); createLongChart(Instrument); @@ -2367,6 +2434,7 @@ function getYahooIntradayData(Instrument) { //console.warn("Didn't submit " + nonSubmittedEntries.toString() + " entries (" + newData.length.toString() + " OK) with null values for " + Instrument.Symbol); } if (newData.length) { + lastSuccessfulFetch = new Date(); submitNewIntradayData(Instrument, newData); createMidChart(Instrument); createShortChart(Instrument); @@ -2421,6 +2489,9 @@ function getYahooSingleDayData(Instrument) { if (ignoredEntries > 0) { //console.warn("Ignored " + ignoredEntries.toString() + " entries (" + newData.length.toString() + " OK) with null values for " + Instrument.Symbol); } + if (newData.length > 0) { + lastSuccessfulFetch = new Date(); + } if (!Instrument.SingleDayData || Instrument.SingleDayData[0].DT != newData[0].DT || newData.length > Instrument.SingleDayData.length) { Instrument.SingleDayData = newData; @@ -2436,7 +2507,7 @@ function getYahooSingleDayData(Instrument) { $('#divCurrentValue' + Instrument.DisplayOrder).html(getCurrentValueContent(Instrument)); if (Instrument.InstrumentType == "CURRENCY") { - Currencies.updateSymbol(Instrument.InstrumentName, Instrument.CurrentPrice); + Currencies.updateSymbol(Instrument.Symbol, Instrument.InstrumentName, Instrument.CurrentPrice); } } else { //console.warn("No timestamp series received for symbol: " + Instrument.Symbol); @@ -2566,6 +2637,1548 @@ function updateTables() { updateCurrenciesSpan(); } } + +function createHoldingsTable() { + function getHoldings() { + function aggregateHoldings(i) { + let aggUnits = 0; + let aggBookCost = 0; + let aggBookCostGBP = 0; + let minPurchaseData = new Date().getTime(); + let maxPurchaseDate = 0; + let marketIsOpen = Instruments.MarketIsOpen(i); + let exchangeRate = Instruments.GetExchangeRate(i.Currency, 'GBP'); + let accountNames = []; + let aggSingleDayGainGBP = 0; + + for (let hn = 0; hn < i.Holdings.length; hn++) { + let h = i.Holdings[hn]; + + if (h.SoldDate == null) { + aggUnits += h.NoUnits; + aggBookCost += h.NoUnits * h.PurchasePricePerUnit; + //aggBookCostGBP += h.NoUnits * h.PurchasePricePerUnit / exchangeRate; + aggBookCostGBP += h.BookCostGBP; + //bookCostPerAccount.addCategoryAmount(h.AccountName, (h.NoUnits * h.PurchasePricePerUnit) / exchangeRate); + bookCostPerAccount.addCategoryAmount(h.AccountName, h.BookCostGBP); + + if (h.PurchaseDate < minPurchaseData) { minPurchaseData = h.PurchaseDate; } + if (h.PurchaseDate > maxPurchaseDate) { maxPurchaseDate = h.PurchaseDate; } + if (!accountNames.includes(h.AccountName)) { accountNames.push(h.AccountName); } + + if (i.CurrentPrice && exchangeRate) { + aggSingleDayGainGBP += ((i.CurrentPrice - (h.PurchaseDate > i.SingleDayStartDate ? h.PurchasePricePerUnit : i.SingleDayPreviousClose)) * h.NoUnits) / exchangeRate; + currentValuePerAccount.addCategoryAmount(h.AccountName, (h.NoUnits * i.CurrentPrice) / exchangeRate); + } + } + } + + let aggPurchasePricePerUnit = aggBookCost / aggUnits; + let aggCurrentValue = 0, + aggCurrentValueGBP = 0, + aggGainGBP = 0, + aggSingleDayGainPercent = 0, + aggSingleDayProfitOrLoss = 0; + if (i.CurrentPrice) { + aggCurrentValue = aggUnits * (i.Currency == 'GBp' ? i.CurrentPrice / 100 : i.CurrentPrice); + if (exchangeRate) { + aggCurrentValueGBP = (aggUnits * i.CurrentPrice) / exchangeRate; + //aggGainGBP = ((i.CurrentPrice - aggPurchasePricePerUnit) * aggUnits) / exchangeRate; + aggGainGBP = aggCurrentValueGBP - aggBookCostGBP; + aggSingleDayGainPercent = ((i.CurrentPrice / i.SingleDayPreviousClose) - 1) * 100; + aggSingleDayProfitOrLoss = aggSingleDayGainGBP < 0 ? 'loss' : 'profit'; + } + } + + return { + displayOrder: i.DisplayOrder, + holdingNumber: 0, + instrumentType: i.InstrumentType, + instrumentName: i.InstrumentName, + symbol: i.Symbol, + currency: i.Currency, + accountName: accountNames.length > 1 ? 'Multiple (' + accountNames.length + ')' : accountNames[0], + accountNames: accountNames.length > 1 ? accountNames.join(', ') : '', + purchaseDateMin: minPurchaseData, + purchaseDateMax: maxPurchaseDate, + noUnits: aggUnits, + purchasePricePerUnit: aggPurchasePricePerUnit, + bookCost: aggBookCost, + bookCostGBP: aggBookCostGBP, + currentValue: aggCurrentValue, + gain: (i.Currency == 'GBp' ? (i.CurrentPrice - aggPurchasePricePerUnit) / 100 : (i.CurrentPrice - aggPurchasePricePerUnit)) * aggUnits, + //gainPercent: (i.CurrentPrice - aggPurchasePricePerUnit) / aggPurchasePricePerUnit * 100, + gainPercent: aggGainGBP / aggBookCostGBP * 100, + currentValueGBP: aggCurrentValueGBP, + gainGBP: aggGainGBP, + singleDayGainGBP: aggSingleDayGainGBP, + singleDayGainPercent: aggSingleDayGainPercent, + singleDayProfitOrLoss: aggSingleDayProfitOrLoss, + currentPrice: i.CurrentPrice, + currentExchangeRate: exchangeRate, + marketIsOpen: marketIsOpen + }; + } + + //Create a structure to summarise total holdings in each currency, to be used in the pie chart + let holdingCurrencies = { + data: [], + indexOfHoldingCurrency: function (symbol) { return this.data.map(function (item) { return item.symbol; }).indexOf(symbol); }, + getHoldingCurrency: function (symbol) { return this.data[this.indexOfHoldingCurrency(symbol)]; }, + addHoldingCurrency: function (symbol, amount) { + let c = this.getHoldingCurrency(symbol); + if (c) { + c.total += amount; + } else { + this.data.push({ symbol: symbol, total: amount }); + } + }, + getChartData: function () { + let d = [] + for (let i = 0; i < this.data.length; i++) { + //d.push({ label: this.data[i].symbol, data: this.data[i].total / Instruments.GetExchangeRate(this.data[i].symbol, 'GBP') }); + d.push({ label: this.data[i].symbol, data: this.data[i].total }); + } + return d; + } + }; + let holdingCurrenciesCurrentValue = { + data: [], + indexOfHoldingCurrency: function (symbol) { return this.data.map(function (item) { return item.symbol; }).indexOf(symbol); }, + getHoldingCurrency: function (symbol) { return this.data[this.indexOfHoldingCurrency(symbol)]; }, + addHoldingCurrency: function (symbol, amount) { + let c = this.getHoldingCurrency(symbol); + if (c) { + c.total += amount; + } else { + this.data.push({ symbol: symbol, total: amount }); + } + }, + getChartData: function () { + let d = [] + for (let i = 0; i < this.data.length; i++) { + d.push({ label: this.data[i].symbol, data: this.data[i].total / Instruments.GetExchangeRate(this.data[i].symbol, 'GBP') }); + } + return d; + } + }; + let bookCostPerAccount = createCategoryAggregator(); + let currentValuePerAccount = createCategoryAggregator(); + let totalHoldingsValueGBP = 0; + let totalBookCostGBP = 0; + let totalValueGBP = 0; + let totalGainGBP = 0; + let todaysGainGBP = 0; + let maxCurrentValueGBP = 0; + let groupHoldings = $('#groupBySymbol').prop('checked'); + let r = []; + let w = []; //Watchlist (instruments with no current holdings) + + for (let n = 0; n < Instruments.Data.length; n++) { + let i = Instruments.Data[n]; + //if (i.InstrumentType == 'EQUITY') { + if (i.InstrumentType == 'EQUITY' || i.InstrumentType == 'CRYPTOCURRENCY' || i.InstrumentType == 'CURRENCY') { + //if (i.CurrentPrice) { + if (groupHoldings) { + let agg = aggregateHoldings(i); + if (agg.noUnits > 0) { + r.push(agg); + + //holdingCurrencies.addHoldingCurrency(i.Currency, agg.noUnits * agg.purchasePricePerUnit); + //holdingCurrencies.addHoldingCurrency(i.Currency.toUpperCase(), agg.noUnits * agg.purchasePricePerUnit / (i.Currency == "GBp" ? 100 : 1)); + holdingCurrencies.addHoldingCurrency(i.Currency.toUpperCase(), agg.bookCostGBP); + if (i.CurrentPrice) { + if (agg.currentValueGBP > maxCurrentValueGBP) { maxCurrentValueGBP = agg.currentValueGBP }; + //holdingCurrenciesCurrentValue.addHoldingCurrency(i.Currency, agg.noUnits * i.CurrentPrice); + holdingCurrenciesCurrentValue.addHoldingCurrency(i.Currency.toUpperCase(), agg.noUnits * i.CurrentPrice / (i.Currency == "GBp" ? 100 : 1)); + if (agg.currentExchangeRate) { + totalBookCostGBP += agg.bookCostGBP; + totalValueGBP += agg.currentValueGBP; + totalGainGBP += agg.gainGBP; + todaysGainGBP += (agg.marketIsOpen == 0 ? 0 : agg.singleDayGainGBP); + } + } + } else { + //No current holdings for this instrument - add it to the watchlist + if (i.WatchlistID) { + w.push(i); + } + } + } else { + let marketIsOpen = Instruments.MarketIsOpen(i); + let exchangeRate = Instruments.GetExchangeRate(i.Currency, 'GBP'); + + let noCurrentHoldings = 0; + for (let hn = 0; hn < i.Holdings.length; hn++) { + let h = i.Holdings[hn]; + if (h.SoldDate == null) { + noCurrentHoldings++; + let holdingBookCost = h.NoUnits * h.PurchasePricePerUnit; + + let currentHoldingValue = h.NoUnits * (i.Currency == 'GBp' ? i.CurrentPrice / 100 : i.CurrentPrice); + + let holdingCurrentValueGBP = 0, + holdingGainGBP = 0, + singleDayGainGBP = 0, + singleDayGainPercent = 0, + singleDayProfitOrLoss = 0; + if (i.CurrentPrice) { + let currentHoldingValue = h.NoUnits * (i.Currency == 'GBp' ? i.CurrentPrice / 100 : i.CurrentPrice); + + if (exchangeRate) { + let holdingCurrentValueGBP = (h.NoUnits * i.CurrentPrice) / exchangeRate; + //let holdingGainGBP = ((i.CurrentPrice - h.PurchasePricePerUnit) * h.NoUnits) / exchangeRate; + let holdingGainGBP = holdingCurrentValueGBP - h.BookCostGBP; + + let singleDayGainGBP = ((i.CurrentPrice - (h.PurchaseDate > i.SingleDayStartDate ? h.PurchasePricePerUnit : i.SingleDayPreviousClose)) * h.NoUnits) / exchangeRate; + let singleDayGainPercent = ((i.CurrentPrice / i.SingleDayPreviousClose) - 1) * 100; + let singleDayProfitOrLoss = singleDayGainGBP < 0 ? 'loss' : 'profit'; + + if (holdingCurrentValueGBP > maxCurrentValueGBP) { maxCurrentValueGBP = holdingCurrentValueGBP }; + } + } + + r.push({ + displayOrder: i.DisplayOrder, + holdingNumber: hn, + instrumentType: i.InstrumentType, + instrumentName: i.InstrumentName, + symbol: i.Symbol, + currency: i.Currency, + accountName: h.AccountName, + purchaseDateMin: h.PurchaseDate, + purchaseDateMax: h.PurchaseDate, + noUnits: h.NoUnits, + purchasePricePerUnit: h.PurchasePricePerUnit, + bookCost: holdingBookCost, + currentValue: currentHoldingValue, + gain: (i.Currency == 'GBp' ? (i.CurrentPrice - h.PurchasePricePerUnit) / 100 : (i.CurrentPrice - h.PurchasePricePerUnit)) * h.NoUnits, + //gainPercent: (i.CurrentPrice - h.PurchasePricePerUnit) / h.PurchasePricePerUnit * 100, + gainPercent: holdingGainGBP / h.BookCostGBP * 100, + currentValueGBP: holdingCurrentValueGBP, + gainGBP: holdingGainGBP, + singleDayGainGBP: singleDayGainGBP, + singleDayGainPercent: singleDayGainPercent, + singleDayProfitOrLoss: singleDayProfitOrLoss, + currentPrice: i.CurrentPrice, + currentExchangeRate: exchangeRate, + marketIsOpen: marketIsOpen + }); + + holdingCurrencies.addHoldingCurrency(i.Currency, h.NoUnits * h.PurchasePricePerUnit); + if (i.CurrentPrice) { + holdingCurrenciesCurrentValue.addHoldingCurrency(i.Currency, h.NoUnits * i.CurrentPrice); + if (exchangeRate) { + currentValuePerAccount.addCategoryAmount(h.AccountName, holdingCurrentValueGBP); + bookCostPerAccount.addCategoryAmount(h.AccountName, holdingBookCost / exchangeRate); + + //totalBookCostGBP += holdingBookCost / exchangeRate; + totalBookCostGBP += h.BookCostGBP; + totalValueGBP += holdingCurrentValueGBP; + totalGainGBP += holdingGainGBP; + todaysGainGBP += (marketIsOpen == 0 ? 0 : singleDayGainGBP); + } + } + } + if (noCurrentHoldings == 0) { + //No current holdings for this instrument - add it to the watchlist + if (i.WatchlistID) { + w.push(i); + } + } + } + } + //} //if (i.CurrentPrice) + } + } + + return { + totalBookCostGBP: totalBookCostGBP, + totalValueGBP: totalValueGBP, + totalGainGBP: totalGainGBP, + todaysGainGBP: todaysGainGBP, + maxCurrentValueGBP: maxCurrentValueGBP, + holdings: r, + watchlist: w, + holdingCurrencies: holdingCurrencies, + holdingCurrenciesCurrentValue: holdingCurrenciesCurrentValue, + bookCostPerAccount: bookCostPerAccount, + currentValuePerAccount: currentValuePerAccount + }; + } + function createTable() { + let t = $("#tblMainHoldings"); + if (t.length) { + return; + } else { + let tbl = '
' + ((dt >= Instrument.SingleDayStartDate && dt <= Instrument.SingleDayEndDate) ? 'Market Open' : 'Market Closed') + ' (' + marketHours + ')
' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '
TypeNameSymbolCcyAccountBuy DateNo UnitsBuy
Price		Current
Price		Book
Cost		Current
Value		GainGain £Gain %Current
Value £		AllocationToday's
Gain £		Today's
Gain %
 
'; + + //$('#holdingsDiv').html(tbl); + $('#holdingsTableDiv').html(tbl); + + $("#tblMainHoldings").tablesorter({ ignoreCase: false }); + $("#tblMainHoldings").trigger("sorton", Cookies.get('sortHoldings')); + $('#tblMainHoldings').on('sortEnd', function (event) { + // Prints the current sort order to the console + Cookies.set('sortHoldings', event.target.config.sortList, { 'sameSite': 'strict' }); + }); + } + } + function createWatchlistTable() { + let t = $("#tblWatchlist"); + if (t.length) { + return; + } else { + let tbl = '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '
TypeNameSymbolCcyCurrent PriceToday's GainToday'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' }); + }); + } + } + 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"); + } + } + function getPercentCell(backgroundColor, cellWidth, valuePercent, label) { + let labelText = label ? label : (valuePercent.toFixed(1) + '%'); + let barWidth = ((valuePercent / 100) * cellWidth); + return '		' + + '
 
' + + '
' + labelText + '
' + + '		' + type + '' + h.instrumentName + '' + h.symbol + '' + '' + h.currency + '' + h.accountName + '' + new Date(h.purchaseDateMin).yyyymmdd()) : (' title="' + new Date(h.purchaseDateMax).yyyymmdd() + ' - ' + new Date(h.purchaseDateMin).yyyymmdd() + '">' + new Date(h.purchaseDateMin).yyyymmdd()) + '+') + '' + formatAmount(h.noUnits, '', 0) + '' + h.noUnits.autoScale() + '' + formatAmount(h.purchasePricePerUnit, h.currency, 2) + '' + (h.currentPrice ? formatAmount(h.currentPrice, h.currency, 2) : '') + '' + formatAmount(h.currency == 'GBp' ? h.bookCost / 100 : h.bookCost, h.currency == 'GBp' ? 'GBP' : h.currency, 0) + '' + (h.currentExchangeRate ? formatAmount(h.currentValue, h.currency == 'GBp' ? 'GBP' : h.currency, 0) : '') + '' + (h.currentPrice ? formatAmount(h.gain, h.currency == 'GBp' ? 'GBP' : h.currency, 0) : '') + '' + (h.currentExchangeRate ? formatAmount(h.gainGBP, 'GBP', 0) : '') + '' + (h.currentExchangeRate ? h.gainPercent.toFixed(1) + '%' : '') + '' + (h.currentExchangeRate ? formatAmount(h.currentValueGBP, 'GBP', 0) : '') + '' : '' + formatAmount(h.singleDayGainGBP, 'GBP', 0) + '' : '' + h.singleDayGainPercent.toFixed(1) + '%') + //Today's Gain % + '
Updated: ' + new Date().yyyymmddhhmmss() + lSF + '' + formatAmount(totalBookCostGBP, 'GBP', 0) + '' + formatAmount(totalGainGBP, 'GBP', 0) + '' + formatAmount((((totalValueGBP / totalBookCostGBP) - 1) * 100), '', 1) + '%' + formatAmount(totalValueGBP, 'GBP', 0) + ' ' + formatAmount(todaysGainGBP, 'GBP', 0) + '' + formatAmount(((todaysGainGBP / totalBookCostGBP) * 100), '', 1) + '%
' + (delta).toFixed(1) + '%' + type + '' + wi.InstrumentName + '' + wi.Symbol + '' + '' + wi.Currency + '' + (wi.CurrentPrice ? formatAmount(wi.CurrentPrice, wi.Currency, 2) : '') + '' : '' + (wi.CurrentPrice ? formatAmount(wi.CurrentPrice - wi.SingleDayPreviousClose, wi.Currency, 2) : '') + '' : '' + (wi.CurrentPrice ? ((wi.CurrentPrice - wi.SingleDayPreviousClose) / wi.SingleDayPreviousClose * 100).toFixed(1) : '') + '' + (new Date(wi.LastSoldDate)).yyyymmdd() + '
'; + holdingsHTML += ''; + holdingsHTML += '
Total holdings: ' + '' + formattedAmount + '+' : 'loss">') + formatAmount(totalValueGBP - previousClose, "GBP", 0) + ' (d)'; + holdingsHTML += ' / +' : 'loss">') + formatAmount(totalValueGBP - previousWeekClose, "GBP", 0) + ' (w)
'; + */ + let holdingsHTML = 'Total holdings: ' + '' + formattedAmount + ' '; + holdingsHTML += '+' : 'loss">') + formatAmount(totalValueGBP - previousClose, "GBP", 0) + ' (d)'; + holdingsHTML += ' / +' : 'loss">') + formatAmount(totalValueGBP - previousWeekClose, "GBP", 0) + ' (w)'; + $("#spnTotalHoldings").html(holdingsHTML); + //Set the page title + document.title = formattedAmount + ' - ' + initialPageTitle; + }, + 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) + "
"; + } + let ops = { + series: { + downsample: { threshold: 0 }, + pie: { show: true, radius: 1, label: { show: true, radius: 0.7, formatter: labelFormatter } } + }, + legend: { show: false }, + grid: { hoverable: true }, + tooltip: { + show: true, + content: "%p.0%, %s, n=%n", // show percentages, rounding to 2 decimal places + shifts: { x: 20, y: 0 }, + defaultTheme: false + } + }; + let cd = holdingCurrencies.getChartData(); + if (cd.length) { + $.plot('#divHoldingCurrenciesChart', cd, ops); + } + + cd = holdingCurrenciesCurrentValue.getChartData(); + if (cd.length) { + $.plot('#divHoldingCurrenciesChartCurrentValue', cd, ops); + } + + function labelFormatter2(label, series) { + return "
" + label + "
" + formatAmount(series.data[0][1], 'GBP', 0) + "
"; + } + ops.series.pie.label.formatter = labelFormatter2; + cd = bookCostPerAccount.getChartData(); + if (cd.length) { + $.plot('#divAccountBookCost', cd, ops); + } + + cd = currentValuePerAccount.getChartData(); + if (cd.length) { + $.plot('#divAccountValue', cd, ops); + } +} +function createAccountsTables() { + function getAccounts() { + let accounts = []; + function indexOfAccount(accountName) { return accounts.map(function (item) { return item.accountName; }).indexOf(accountName); }; + function getAccount(accountName) { return accounts[indexOfAccount(accountName)]; }; + function addAccountHolding(instrument, exchangeRate, holding) { + let a = getAccount(holding.AccountName); + if (!a) { + a = { accountName: holding.AccountName, holdings: [], totalCostGBP: 0, totalValueGBP: 0, totalGainGBP: 0 }; + accounts.push(a); + } + let h = { + instrumentName: instrument.InstrumentName, + symbol: instrument.Symbol, + currency: instrument.Currency, + purchaseDate: holding.PurchaseDate, + purchasePricePerUnit: holding.PurchasePricePerUnit, + noUnits: holding.NoUnits, + cost: holding.NoUnits * holding.PurchasePricePerUnit + } + //if (exchangeRate) { + //h.costGBP = h.cost / exchangeRate; + h.costGBP = holding.BookCostGBP; + a.totalCostGBP += holding.BookCostGBP; + //} + if (instrument.CurrentPrice) { + h.currentPrice = instrument.CurrentPrice; + h.currentValue = holding.NoUnits * instrument.CurrentPrice; + h.gain = h.currentValue - h.cost; + if (exchangeRate) { + h.currentValueGBP = h.currentValue / exchangeRate; + //h.gainGBP = h.gain / exchangeRate; + h.gainGBP = h.currentValueGBP - h.costGBP; + a.totalGainGBP += h.gainGBP; + a.totalValueGBP += h.currentValueGBP; + } + } + a.holdings.push(h); + } + + for (let ix = 0; ix < Instruments.Data.length; ix++) { + let i = Instruments.Data[ix]; + let exchangegRate = Instruments.GetExchangeRate(i.Currency, 'GBP'); + for (let hx = 0; hx < i.Holdings.length; hx++) { + let h = i.Holdings[hx]; + if (h.SoldDate == null) { + addAccountHolding(i, exchangegRate, h); + } + } + } + + return accounts; + } + + let accounts = getAccounts(); + + //let eDT = new Date(); + //console.info('createAccountsTable after getAccounts: ' + (eDT.getTime() - sDT.getTime()) + ' (' + sDT.yyyymmddhhmmss() + ' -> ' + eDT.yyyymmddhhmmss() + ')'); + + //Sort the accounts array by accountName + accounts.sort(function (a, b) { + if (a.accountName < b.accountName) return -1; + if (a.accountName > b.accountName) return 1; + return 0; + }); + + //eDT = new Date(); + //console.info('createAccountsTable after array sort: ' + (eDT.getTime() - sDT.getTime()) + ' (' + sDT.yyyymmddhhmmss() + ' -> ' + eDT.yyyymmddhhmmss() + ')'); + + //let summaryTable = ""; + let summaryTable = "
Account NameNo. HoldingsTotal Cost (GBP)Current ValueTotal Gain
"; + let accountsTables = '' + let tableIDs = ['accountsSummaryTable']; + let altRow = 1; + for (let ax = 0; ax < accounts.length; ax++) { + let a = accounts[ax]; + altRow = !altRow; + let profitOrLoss = a.totalGainGBP < 0 ? 'loss' : 'profit'; + /*summaryTable += "" + + "" + + "" + + "" + + "" + + ""; + */ + + accountsTables += '
' + a.accountName + '
' + let tableID = 'accountTable' + ax; + tableIDs.push(tableID); + accountsTables += '
Account NameNo. HoldingsTotal Cost (GBP)Total Gains (GBP)Total Losses (GBP)Current ValueNET Gain
" + a.accountName + "" + a.holdings.length + "" + formatAmount(a.totalCostGBP || 0, 'GBP', 2) + "" + formatAmount(a.totalValueGBP || 0, 'GBP', 2) + "" + formatAmount(a.totalGainGBP || 0, 'GBP', 2) + "
' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + ''; + let accountGainsGBP = 0; + let accountLossesGBP = 0; + let accountValueGBP = 0; + 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 += '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + //'' + + '' + + ''; + } + //Add the Total Gains + accountAltRow = !accountAltRow; + accountsTables += '' + + '' + + '' + + '' + + ''; + //Add the Total Losses + accountAltRow = !accountAltRow; + accountsTables += '' + + '' + + '' + + '' + + ''; + //Add the NET Gains summary line + accountAltRow = !accountAltRow; + accountsTables += '' + + '' + + '' + + '' + + '' + + '' + + ''; + accountsTables += '
NameSymbolBuy DateNo UnitsBuy PriceCurrent PriceBook CostApprox Book Cost £Current ValueCurrent Value £GainGain £Gain %
' + 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) + '%
Total Gains' + formatAmount(accountGainsGBP, 'GBP', 2) + ' 
Total Losses' + formatAmount(accountLossesGBP, 'GBP', 2) + ' 
Account Value:' + formatAmount(accountValueGBP, 'GBP', 2) + 'NET Gain' + formatAmount(accountGainsGBP + accountLossesGBP, 'GBP', 2) + ' 
'; + + //Add an entry to the summary table + 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) + "" + + ""; + } + summaryTable += ""; + $("#accoountsDiv").html(summaryTable + '
' + accountsTables); +} +function createAnalysisTable() { + function getHighestPriceBeforeDate(Instrument, maxDT) { + if (Instrument.DailyData) { + let r = { Price: 0, DT: 0 }; + let dt = 0; + for (let i = 0; i < Instrument.DailyData.length && dt < maxDT; i++) { + let price = Instrument.DailyData[i]; + dt = price.DT; + if (dt <= maxDT && price.high > r.Price) { + r.Price = price.high; + r.DT = dt; + } + } + return r; + } else { + return { Price: NaN, DT: NaN }; + } + } + function getHighestPriceBetweenDates(Instrument, minDT, maxDT) { + if (Instrument.DailyData) { + let r = { Price: 0, DT: 0 }; + let dt = 0; + for (let i = 0; i < Instrument.DailyData.length && dt < maxDT; i++) { + let price = Instrument.DailyData[i]; + dt = price.DT; + if (dt >= minDT && dt <= maxDT && price.high > r.Price) { + r.Price = price.high; + r.DT = dt; + } + } + return r; + } else { + return { Price: NaN, DT: NaN }; + } + } + function getLowestPriceAfterDate(Instrument, minDT) { + if (Instrument.DailyData) { + let r = { Price: 0, DT: 0 }; + let dt = 0; + let i = 0; + let DD = Instrument.DailyData; + while (dt < minDT && i < DD.length - 1) { + i++; + dt = DD[i].DT; + } + if (i < DD.length) { + r.Price = DD[i].low; + r.DT = DD[i].DT; + + while (i < DD.length - 1) { + i++; + if (DD[i].low < r.Price) { + r.Price = DD[i].low; + r.DT = DD[i].DT; + } + } + } + return r; + } else { + return { Price: NaN, DT: NaN }; + } + } + function getEquities() { + function getHoldingsValueGBP(Instrument) { + let noUnits = 0; + if (Instrument.CurrentPrice) { + let c = Instruments.GetCurrentHoldings(Instrument); + for (let x = 0; x < c.length; x++) { + noUnits += c[x].NoUnits; + } + let exchangeRate = Instruments.GetExchangeRate(Instrument.Currency, 'GBP'); + return noUnits * Instrument.CurrentPrice / exchangeRate; + } else { + return 0; + } + } + + let totalHoldingsValueGBP = 0; + let r = []; + for (let n = 0; n < Instruments.Data.length; n++) { + let i = Instruments.Data[n]; + try { + if (i.InstrumentType == 'EQUITY') { + let prePandemicHigh = getHighestPriceBetweenDates(i, new Date('2020-01-01'), pandemicCrashStartDate); + let postPandemicLow = getLowestPriceAfterDate(i, pandemicCrashStartDate); + let dilutedTarget = prePandemicHigh.Price * i.PostPandemicDilution; + let currentHoldingsValueGBP = getHoldingsValueGBP(i); + let remainingDilutedPotential = ((dilutedTarget - i.CurrentPrice) / i.CurrentPrice) * 100; + totalHoldingsValueGBP += currentHoldingsValueGBP; + + r.push({ + prePandemicHigh: prePandemicHigh, + postPandemicLow: postPandemicLow, + displayOrder: i.DisplayOrder, + instrumentName: i.InstrumentName, + symbol: i.Symbol, + currency: i.Currency, + currentPrice: i.CurrentPrice, + fallPercent: ((postPandemicLow.Price / prePandemicHigh.Price) - 1) * 100, + postPandemicDilution: i.PostPandemicDilution * 100, + dilutedTarget: dilutedTarget, + currentDiscount: ((i.CurrentPrice / prePandemicHigh.Price) - 1) * 100, + potentialDilutedRebound: (((prePandemicHigh.Price * i.PostPandemicDilution) / postPandemicLow.Price) - 1) * 100, + retracementPercent: ((i.CurrentPrice - postPandemicLow.Price) / (prePandemicHigh.Price - postPandemicLow.Price)) * 100, + remainingPotential: ((prePandemicHigh.Price - i.CurrentPrice) / i.CurrentPrice) * 100, + remainingDilutedPotential: remainingDilutedPotential, + currentHoldingsValueGBP: currentHoldingsValueGBP, + possibleRemainingProfit: currentHoldingsValueGBP * remainingDilutedPotential / 100 + }); + } + } + catch (err) { + console.error("Error analysing " + i.Symbol + ": " + err.message); + } + } + return { totalHoldingsValueGBP: totalHoldingsValueGBP, equities: r }; + } + function createTable() { + let t = $("#tblAnalysis"); + if (t.length) { + return t; + } else { + let tbl = '' + + '' + + '' + + /*'' +*/ + /*'' +*/ + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '
#NameSymbolCurrencyPre-pandemic peakBottom% FallCurrent PriceDiluted Value %Diluted TargetCurrent DiscountPotential
Diluted
Rebound		Retracement %Remaining PotentialRemaining
Diluted
Potential		Current HoldingCurrent Allocation %Possible Remaining Profit
 
 
'; + + $('#analDiv').html(tbl); + $("#tblAnalysis").tablesorter(); + } + } + function addTableRow(id, row) { + let r = $("#" + id); + if (r.length) { + $("#" + id).replaceWith(row); //Update existing row + } else { + $("#tbAnal").append(row); + } + } + + //analysisTableTimings.LastUpdateTime = new Date().getTime(); + + let pandemicCrashStartDate = new Date("2020-02-23").getTime(); + + //Calculate values for all equities + let tmp = getEquities(); + let equities = tmp.equities; + let totalHoldingsValueGBP = tmp.totalHoldingsValueGBP; + + createTable(); + + let altRow = 1; + let totalPossibleRemainingProfit = 0; + for (let n = 0; n < equities.length; n++) { + altRow = !altRow; + let e = equities[n]; + totalPossibleRemainingProfit += e.possibleRemainingProfit > 0 ? e.possibleRemainingProfit : 0; + try { + let rowID = "analRow" + e.displayOrder + let row = '' + + '' + e.displayOrder + '' + + '' + e.instrumentName + '' + + /*'' + e.symbol + '' + '' +*/ + /*'' + e.currency + '' +*/ + '' + formatAmount(e.prePandemicHigh.Price, e.currency, 2) + '' + //Pre-pandemic peak + '' + formatAmount(e.postPandemicLow.Price, e.currency, 2) + '' + //Bottom + '' + e.fallPercent.toFixed(2) + '%' + //% Fall + '' + formatAmount(e.currentPrice, e.currency, 2) + '' + //Current Price + '' + e.postPandemicDilution + '%' + //Diluted Value + '' + formatAmount(e.dilutedTarget, e.currency, 2) + '' + //Diluted target + '' + e.currentDiscount.toFixed(2) + '%' + //Current Discount + '' + e.potentialDilutedRebound.toFixed(0) + '%' + //Potential Diluted Rebound + '' + e.retracementPercent.toFixed(1) + '%' + //Retracement % + '' + e.remainingPotential.toFixed(1) + '%' + //Remaining Potential + '' + e.remainingDilutedPotential.toFixed(1) + '%' + //Remaining Diluted Potential + '' + (e.currentHoldingsValueGBP > 0 ? formatAmount(e.currentHoldingsValueGBP, 'GBP', 2) : '') + '' + //Current Holding + '' + (e.currentHoldingsValueGBP > 0 ? ((e.currentHoldingsValueGBP / totalHoldingsValueGBP) * 100).toFixed(2) + '%' : '') + '' + //Current Allocation % + '' + (e.possibleRemainingProfit > 0 ? formatAmount(e.possibleRemainingProfit, 'GBP', 2) : '') + '' + //Possible Remaining Profit + ''; + addTableRow(rowID, row); + } + catch (err) { + console.error("Error adding " + e.symbol + " to analysis table: " + err.message); + } + } + $("#tdPossibleRemainingProfit").html(formatAmount(totalPossibleRemainingProfit, 'GBP', 2)); + + var resort = true; + $("#tblAnalysis").trigger("update", [resort]); +} + +function createIndexMarquee() { + let t = []; + for (var ix = 0; ix < Instruments.Data.length; ix++) { + let i = Instruments.Data[ix]; + //if (i.InstrumentType == 'INDEX' || i.InstrumentType == 'FUTURE') { + if (i.ShowInMarquee == 'A') { + let openOrClosed = Instruments.MarketIsOpen(i) == 1 ? 'open' : 'closed'; + if (i.SingleDayPreviousClose) { + let percentChange = ((i.CurrentPrice / i.SingleDayPreviousClose) - 1) * 100; + if (percentChange < 0) { + t.push('' + i.DisplayName + '
' + i.CurrentPrice + ' ' + percentChange.toFixed(1) + '%'); + } else { + t.push('' + i.DisplayName + '
' + i.CurrentPrice + ' +' + percentChange.toFixed(1) + '%'); + } + } else { + t.push('' + i.DisplayName + '
' + i.CurrentPrice + ''); + } + } + } + if (t.length > 0) { + //t.push(new Date().yyyymmddhhmmss()); + let newContent = "
" + t.join("") + "
"; + indexMarquee.container.html(newContent); + } +} +function updateCurrenciesSpan() { + var c = []; + for (var i = 0; i < Currencies.Data.length; i++) { + //c.push(Currencies.Data[i].Name + ": " + Currencies.Data[i].CurrentPrice.toFixed(4)); + c.push("" + Currencies.Data[i].Name + ": " + Currencies.Data[i].CurrentPrice.toFixed(4)); + } + if (c.length > 0) { + $("#spnCurrencies").html('' + c.join(' ') + ''); + } +} + +function showModalDialog_AddInstrument() { + let modal = document.getElementById("modalDialog"); + + $("#modalTitle").html("Add Instrument"); + + let content = '
Search text:

' + + '
'; + $("#modalContentDiv").html(content); + + $("#modalDialog .close").click(function () { modal.style.display = "none"; }); + + window.onclick = function (event) { // When the user clicks anywhere outside of the modal, close it + if (event.target == modal) { + modal.style.display = "none"; + } + } + + //$("#modalDialog .ok-button").click(function () { modal.style.display = "none"; }); + + //Display the dialog + modal.style.display = "block"; +} +function searchForYahooInstrument(searchString) { + if (searchString.length > 1) { + $.ajax({ + type: "POST", + contentType: "application/json", + url: "SharePrices.aspx/SearchYahooFinanceShares", + dataType: "json", + data: JSON.stringify({ SearchString: searchString }), + success: function (response) { + let results = ''; + if (response.quotes) { + instrumentSearchResults = response.quotes; + results = ''; + for (let x = 0; x < instrumentSearchResults.length; x++) { + let q = instrumentSearchResults[x]; + results += '' + + '' + + '' + + '' + + ''; + } + results += '
SymbolNameExchangeType
' + q.symbol + '' + (q.longname ? q.longname : q.shortname) + '' + q.exchange + '' + q.typeDisp + '

Add Instrument
'; + } + $("#addInstrumentSearchResults").html(results); + }, + failure: function (response) { console.error("searchForYahooInstrument error: " + JSON.stringify(response)); } + }); + } +} +function selectSearchResult(index) { + for (let x = 0; x < instrumentSearchResults.length; x++) { + if (x == index) { + $("#searchResult" + x.toString()).addClass('selectedSearchResult'); + } else { + $("#searchResult" + x.toString()).removeClass('selectedSearchResult'); + } + } + $("#addInstrumentOKButton").removeClass("ok-button-disabled").addClass("ok-button").unbind().click(function () { $("#modalDialog").css("display", "none"); addInstrument(index) }); +} +function addInstrument(index) { + let i = instrumentSearchResults[index]; + console.info("Add instrument: " + JSON.stringify(i)); + $.ajax({ + type: "POST", + contentType: "application/json", + url: "SharePrices.aspx/AddInstrument", + dataType: "json", + data: JSON.stringify({ Symbol: i.symbol, FullName: (i.longname ? i.longname : i.shortname) }), + success: function (response) { + if (response.Symbol) { + Instruments.Data.push(response); + let i = Instruments.Data[Instruments.Data.length - 1]; + i.Holdings = []; + i.DailyData = []; + i.IntradayData = []; + let lastTR = $('#tblInstruments>tbody>tr').last(); + let cls = (lastTR.hasClass('shareRow')) ? 'altShareRow' : 'shareRow'; + let tr = '' + createSharesTableRow(i) + ''; + lastTR.after(tr); + } else { + console.error("addInstrument response error: " + JSON.stringify(response)); + } + }, + failure: function (response) { console.error("addInstrument AJAX error: " + JSON.stringify(response)); } + }); +} + +function showModalDialog_AddHolding(symbol) { +//function showModalDialog_AddHolding(span) { + function GetAccountsDropdown() { + let dd = ''; + return dd; + } + function GetTimeDropdowns() { + let dd = ''; + dd += ''; + return dd; + } + + //let symbol = $(span).attr('data-symbol'); + let i = Instruments.GetSymbol(symbol); + + let modal = document.getElementById("modalDialog"); + $("#modalTitle").html("Add Holding"); + + let content = '
' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '
Instrument Name' + i.InstrumentName + '
Symbol' + symbol + '
Account' + GetAccountsDropdown() + '
Current price' + (i.CurrentPrice ? formatAmount(i.CurrentPrice, i.Currency, 2) : '') + '
Purchase price / unit
No units
Total cost
Purchase date' + GetTimeDropdowns() + '

' + + '
OK
'; + $("#modalContentDiv").html(content); + $("#newHoldingDate").datepicker({ dateFormat: 'yy-mm-dd', onSelect: function () { ValidateNewHolding(symbol) }}); + $("#modalDialog .close").click(function () { modal.style.display = "none"; }); + window.onclick = function (event) { // When the user clicks anywhere outside of the modal, close it + if (event.target == modal) { + modal.style.display = "none"; + } + } + + $("#newHoldingPrice").bind('input', function () { + $("#newHoldingOKButton").removeClass("ok-button").addClass("ok-button-disabled").unbind(); + try { + let noUnits = parseFloat($("#newHoldingNoUnits").val()); + let price = parseFloat($("#newHoldingPrice").val()); + $("#newHoldingTotalCost").val((noUnits * price).toFixed(2)); + ValidateNewHolding(symbol); + } catch (err) { } + }); + $("#newHoldingNoUnits").bind('input', function () { + $("#newHoldingOKButton").removeClass("ok-button").addClass("ok-button-disabled").unbind(); + try { + let noUnits = parseFloat($("#newHoldingNoUnits").val()); + let price = parseFloat($("#newHoldingPrice").val()); + $("#newHoldingTotalCost").val((noUnits * price).toFixed(2)); + ValidateNewHolding(symbol); + } catch (err) { } + }); + $("#newHoldingTotalCost").bind('input', function () { + $("#newHoldingOKButton").removeClass("ok-button").addClass("ok-button-disabled").unbind(); + try { + let noUnits = parseFloat($("#newHoldingNoUnits").val()); + let totalCost = parseFloat($("#newHoldingTotalCost").val()); + //$("#newHoldingPrice").val((totalCost / noUnits).toFixed(4)); + $("#newHoldingPrice").val((totalCost / noUnits)); + ValidateNewHolding(symbol); + } catch (err) { } + }); + $("#newHoldingDate").bind('input', function () { + ValidateNewHolding(symbol); + }); + $("#addHoldingTimeHour").bind('input', function () { + ValidateNewHolding(symbol); + }); + $("#addHoldingTimeMinute").bind('input', function () { + ValidateNewHolding(symbol); + }); + $("#addHoldingAccountName").bind('input', function () { + ValidateNewHolding(symbol); + }); + + //Display the dialog + modal.style.display = "block"; + + return false; //Prevent click event propogating to parent +} +function ValidateNewHolding(symbol) { + $("#newHoldingOKButton").removeClass("ok-button").addClass("ok-button-disabled").unbind(); + try { + let accountName = $("#addHoldingAccountName").val(); + let noUnits = parseFloat($("#newHoldingNoUnits").val()); + let price = parseFloat($("#newHoldingPrice").val()); + let purchaseDate = $("#newHoldingDate").val(); + let purchaseHour = $("#addHoldingTimeHour").val(); + let purchaseMinute = $("#addHoldingTimeMinute").val(); + + if (accountName != '' && accountName != 'Select account...' && noUnits > 0 && price > 0 && purchaseDate != '' && purchaseHour != '' && purchaseHour != 'Hour' && purchaseMinute != '' && purchaseMinute != 'Min') { + let purchaseDT = new Date(purchaseDate + ' ' + purchaseHour + ':' + purchaseMinute); + if (purchaseDT <= new Date()) { + $("#newHoldingOKButton").removeClass("ok-button-disabled").addClass("ok-button").unbind().bind('click', function () { $("#modalDialog").css("display", "none"); AddHolding(accountName, symbol, noUnits, price, purchaseDT) }); + } + } + } catch (err) { } +} +function AddHolding (accountName, symbol, noUnits, purchasePricePerUnit, purchaseDate) { + console.info("AddHolding: " + accountName + ", " + symbol + ", " + noUnits.toString() + ", " + purchasePricePerUnit.toFixed(4) + ", " + new Date(purchaseDate).yyyymmdd()); + + $.ajax({ + type: "POST", + contentType: "application/json", + url: "SharePrices.aspx/AddHolding", + dataType: "json", + data: JSON.stringify({ AccountName: accountName, Symbol: symbol, NoUnits: noUnits, PurchasePricePerUnit: purchasePricePerUnit, PurchaseDate: new Date(purchaseDate).getTime() }), + success: function (response) { + if (response.HoldingID) { + let i = Instruments.GetSymbol(symbol); + if (!i.Holdings) i.Holdings = []; + i.Holdings.push(response); + let tr = $("#shareRow" + i.DisplayOrder.toString()); + tr.html(createSharesTableRow(i)); + createLongChart(i); + createMidChart(i); + createShortChart(i); + createSingleDayChart(i); + } else { + console.error("addInstrument response error: " + JSON.stringify(response)); + } + }, + failure: function (response) { console.error("addInstrument AJAX error: " + JSON.stringify(response)); } + }); +} + +function showModalDialog_SoldHolding(holdingID) { + function GetTimeDropdowns() { + let dd = ''; + dd += ''; + return dd; + } + function GetCurrencyDropdown() { + let dd = ''; + return dd; + } + + let modal = document.getElementById("modalDialog"); + $("#modalTitle").html("Sold Holding"); + + let o = Instruments.GetHolding(holdingID); + let h = o.holding; + let i = o.instrument; + let content = 'Symbol: ' + i.Symbol + + '
Name: ' + i.InstrumentName + + '
Account: ' + h.AccountName + '' + + '
Purchase Date: ' + new Date(h.PurchaseDate).yyyymmddhhmmss() + + '
Purchase Price: ' + formatAmount(h.PurchasePricePerUnit, i.Currency, 2) + + '
No Units: ' + formatAmount(h.NoUnits, '', 0) + + '
Cost: ' + formatAmount(h.NoUnits * h.PurchasePricePerUnit, i.Currency, 2) + + '

Mark holding as sold?' + + '

Sold date: ' + GetTimeDropdowns() + + '
Currency: ' + GetCurrencyDropdown() + ' Proceeds: ' + + '

OK'; + $("#modalContentDiv").html(content); + + $("#soldHoldingDate").datepicker({ dateFormat: 'yy-mm-dd', onSelect: function () { ValidateSoldHolding(h) } }); + $("#soldHoldingDate").bind('input', function () { ValidateSoldHolding(h); }); + $("#soldHoldingTimeHour").bind('input', function () { ValidateSoldHolding(h); }); + $("#soldHoldingTimeMinute").bind('input', function () { ValidateSoldHolding(h); }); + $("#soldHoldingCurrency").bind('input', function () { ValidateSoldHolding(h); }); + $("#soldHoldingProceeds").bind('input', function () { ValidateSoldHolding(h); }); + + $("#modalDialog .close").click(function () { modal.style.display = "none"; }); + + window.onclick = function (event) { // When the user clicks anywhere outside of the modal, close it + if (event.target == modal) { + modal.style.display = "none"; + } + } + + //$("#modalDialog .ok-button").click(function () { modal.style.display = "none"; deleteHolding(holdingID); }); + + //Display the dialog + modal.style.display = "block"; +} +function ValidateSoldHolding(holding) { + $("#soldHoldingOKButton").removeClass("ok-button").addClass("ok-button-disabled").unbind(); + try { + let holdingID = holding.HoldingID; + let purchaseDT = holding.PurchaseDate; + let soldDate = $("#soldHoldingDate").val(); + let soldHour = $("#soldHoldingTimeHour").val(); + let soldMinute = $("#soldHoldingTimeMinute").val(); + let accountName = $("#soldHoldingsAccountName").val(); + let soldCurrency = $("#soldHoldingCurrency").val(); + let soldProceeds = parseFloat($("#soldHoldingProceeds").val()); + + if (soldDate != '' && soldHour != '' && soldHour != 'Hour' && soldMinute != '' && soldMinute != 'Min' && soldCurrency != 'Currency' && soldProceeds > 0) { + let soldDT = new Date(soldDate + ' ' + soldHour + ':' + soldMinute).getTime(); + if (soldDT <= new Date().getTime() && soldDT > purchaseDT) { + $("#soldHoldingOKButton").removeClass("ok-button-disabled").addClass("ok-button").unbind().bind('click', function () { $("#modalDialog").css("display", "none"); soldHolding(holdingID, soldDT, accountName, soldCurrency, soldProceeds) }); + } + } + } catch (err) { } +} +function soldHolding(holdingID, soldDate, accountName, soldCurrency, soldProceeds) { + //console.info("Sold holding: " + holdingID.toString()); + + let o = Instruments.GetHolding(holdingID); + let h = o.holding; + let i = o.instrument; + + h.SoldDate = soldDate; + + $.ajax({ + type: "POST", + contentType: "application/json", + url: "SharePrices.aspx/SoldHolding", + dataType: "json", + data: JSON.stringify({ HoldingID: holdingID, SoldDate: soldDate, SoldCurrency: soldCurrency, SoldProceeds: soldProceeds }), + success: function (response) { + $("#shareRow" + i.DisplayOrder).html(createSharesTableRow(i)); + createLongChart(i); + createMidChart(i); + createShortChart(i); + createSingleDayChart(i); + }, + failure: function (response) { console.error("SoldHolding error: " + JSON.stringify(response)); } + }); + + let balance = soldProceeds; + let curr = Instruments.GetAccountCurrencyHolding(accountName, Instruments.GetSymbol(soldCurrency)); + if (curr) { + balance += curr.NoUnits; + } + + $.ajax({ + type: "POST", + contentType: "application/json", + url: "SharePrices.aspx/SetAccountCashValue", + dataType: "json", + data: JSON.stringify({ AccountName: accountName, Currency: soldCurrency, Value: balance }), + success: function (response) { + console.info("SetAccountCashValue success: " + JSON.stringify(response)); + + let c = Instruments.GetSymbol(response.Symbol); + + let ch = Instruments.GetAccountCurrencyHolding(response.AccountName, c); + if (ch) { + ch.NoUnits = response.NoUnits; + } else { + c.Holdings.push(response); + } + }, + failure: function (response) { console.error("SetAccountCashValue error: " + JSON.stringify(response)); } + }); +} + +function showModalDialog_FullScreenChart(Symbol) { + let i = Instruments.GetSymbol(Symbol); + + let modal = document.getElementById("modalChart"); + + $("#modalChartTitle").html("Detailed Chart: " + i.InstrumentName + " (" + i.Symbol + ")"); + + $("#modalChart .close").click(function () { modal.style.display = "none"; }); + $('#spnCompareInstruments').click(function () { compareInstruments(i) }); + + window.onclick = function (event) { // When the user clicks anywhere outside of the modal, close it + if (event.target == modal) { + modal.style.display = "none"; + } + } + + //$("#modalDialog .ok-button").click(function () { modal.style.display = "none"; }); + + $(document).on('keypress', function (event) { console.info("Keypress: " + event.keyCode.toString()); if (event.keyCode == 27 /*Escape key*/) modal.style.display = "none"; }); + + //Display the dialog + modal.style.display = "block"; + + let chartDiv = $("#divFullScreenChart"); + let height = chartDiv.parent().height(); + let width = chartDiv.parent().width(); + chartDiv.height(height).width(width); + + let startDate = i.DailyData[0].DT; + let endDate = new Date().getTime(); + createFullScreenChart(i, startDate, endDate); + //createFullScreenComparisonChart(i, Instruments.GetSymbol('BTC-USD'), startDate, endDate); +} +function compareInstruments(Instrument1) { + function GetAccountsDropdown() { + let dd = ''; + return dd; + } + + let modal = document.getElementById("modalDialog"); + $("#modalTitle").html("Compare Instruments"); + + let content = '
Select instrument to compare against ' + Instrument1.Symbol + '
' + GetAccountsDropdown() + '

' + + '
OK
'; + $("#modalContentDiv").html(content); + $("#modalDialog .close").click(function () { modal.style.display = "none"; }); + window.onclick = function (event) { // When the user clicks anywhere outside of the modal, close it + if (event.target == modal) { + modal.style.display = "none"; + } + } + + $("#selectInstrument2").bind('input', function () { + $("#compareInstrumentsOKButton").removeClass("ok-button").addClass("ok-button-disabled").unbind(); + let instrument2Symbol = $("#selectInstrument2").val(); + if (instrument2Symbol != '' && instrument2Symbol != 'Select 2nd instrument...') { + $("#compareInstrumentsOKButton").removeClass("ok-button-disabled").addClass("ok-button").bind('click', function () { + $("#modalDialog").css("display", "none"); + let Instrument2 = Instruments.GetSymbol(instrument2Symbol); + let startDate = Instrument1.DailyData[0].DT > Instrument2.DailyData[0].DT ? Instrument1.DailyData[0].DT : Instrument2.DailyData[0].DT; + let endDate = new Date().getTime(); + createFullScreenComparisonChart(Instrument1, Instrument2, startDate, endDate); + }); + } + }); + + //Display the dialog + modal.style.display = "block"; +} + +function refreshHistoryChart() { + let chartContainer = $('#histDiv'); + + $.ajax({ + type: "POST", + contentType: "application/json", + url: "SharePrices.aspx/GetTotalHoldingsHistory", + dataType: "json", + success: function (response) { + let seriesData = []; + + for (let i = 0; i < response.length; i++) { + let d = response[i]; + seriesData.push([d.HistoryDate, d.Open, d.High, d.Low, d.Close]); + } + + chartContainer.html(response); + + /* + Highcharts.stockChart('histDiv', { + title: { + text: 'Total Holdings History' + }, + + series: [{ + type: 'ohlc', + name: 'Total Holdings', + data: seriesData, + lineWidth: 4 + }], + + plotOptions: { + ohlc: { + color: 'red', + upColor: 'green' + } + } + + }); + */ + + Highcharts.stockChart('histDiv', { + chart: { + backgroundColor: 'rgba(0,0,0,0)'/*, + spacingTop: 5, + spacingBottom: 0, + spacingLeft: 2, + spacingRight: 0*/ + }, + + title: { + text: 'Total Holdings History' + }, + + series: [{ + type: 'candlestick', + name: 'Total Holdings', + color: '#ff4141', + lineColor: '#ff4141', + upColor: '#07b200', + upLineColor: '#07b200', + data: seriesData/*, + lineWidth: 4*/ + }], + + plotOptions: { + ohlc: { + color: '#ff4141', + upColor: '#07b200' + } + } + + }); + + }, + failure: function (response) { console.error("GetTotalHoldingsHistory error: " + response.d) } + }); + +} + +/*function createIndexMarquee() { + let t = []; + for (var ix = 0; ix < Instruments.Data.length; ix++) { + let i = Instruments.Data[ix]; + //if (i.InstrumentType == 'INDEX' || i.InstrumentType == 'FUTURE') { + if (i.ShowInMarquee == 'A') { + let openOrClosed = Instruments.MarketIsOpen(i) == 1 ? 'open' : 'closed'; + if (i.SingleDayPreviousClose) { + let percentChange = ((i.CurrentPrice / i.SingleDayPreviousClose) - 1) * 100; + if (percentChange < 0) { + t.push('' + i.DisplayName + ': ' + i.CurrentPrice + ' ' + percentChange.toFixed(1) + '%'); + } else { + t.push('' + i.DisplayName + ': ' + i.CurrentPrice + ' +' + percentChange.toFixed(1) + '%'); + } + } else { + t.push('' + i.DisplayName + ': ' + i.CurrentPrice + ''); + } + } + } + if (t.length > 0) { + t.push(new Date().yyyymmddhhmmss()); + let newContent = t.join("  "); + indexMarquee.setContent(newContent); + } +}*/ + +/* function zzz_createHoldingsTable() { function getHoldings() { function aggregateHoldings(i) { @@ -2602,9 +4215,8 @@ function zzz_createHoldingsTable() { let aggCurrentValueGBP = (aggUnits * i.CurrentPrice) / exchangeRate; let aggGainGBP = ((i.CurrentPrice - aggPurchasePricePerUnit) * aggUnits) / exchangeRate; - /* - let aggSingleDayGainGBP = ((i.CurrentPrice - i.SingleDayPreviousClose) * aggUnits) / exchangeRate; - */ + //let aggSingleDayGainGBP = ((i.CurrentPrice - i.SingleDayPreviousClose) * aggUnits) / exchangeRate; + let aggSingleDayGainPercent = ((i.CurrentPrice / i.SingleDayPreviousClose) - 1) * 100; //let aggSingleDayProfitOrLoss = i.CurrentPrice < i.SingleDayPreviousClose ? 'loss' : 'profit'; let aggSingleDayProfitOrLoss = aggSingleDayGainGBP < 0 ? 'loss' : 'profit'; @@ -2896,7 +4508,7 @@ function zzz_createHoldingsTable() { //Add the totals line at the bottom of the table let profitOrLoss = totalValueGBP < totalBookCostGBP ? 'loss' : 'profit'; let todaysProfitOrLoss = todaysGainGBP < 0 ? 'loss' : 'profit'; - let row = 'Updated: ' + new Date().yyyymmddhhmmss() + '' + + let row = 'Updated: ' + new Date().yyyymmddhhmmss() + (lastSuccessfulFetch ? ' - Last Successful Fetch: ' + lastSuccessfulFetch.yyyymmddhhmmss() : '') + '' + '' + formatAmount(totalBookCostGBP, 'GBP', 2) + '' + '' + '' + formatAmount(totalGainGBP, 'GBP', 2) + '' + @@ -2956,1249 +4568,4 @@ function zzz_createHoldingsTable() { $.plot('#divAccountValue', cd, ops); } } -function createHoldingsTable() { - function getHoldings() { - function aggregateHoldings(i) { - let aggUnits = 0; - let aggBookCost = 0; - let aggBookCostGBP = 0; - let minPurchaseData = new Date().getTime(); - let maxPurchaseDate = 0; - let marketIsOpen = Instruments.MarketIsOpen(i); - let exchangeRate = Instruments.GetExchangeRate(i.Currency, 'GBP'); - let accountNames = []; - let aggSingleDayGainGBP = 0; - - for (let hn = 0; hn < i.Holdings.length; hn++) { - let h = i.Holdings[hn]; - - if (h.SoldDate == null) { - aggUnits += h.NoUnits; - aggBookCost += h.NoUnits * h.PurchasePricePerUnit; - //aggBookCostGBP += h.NoUnits * h.PurchasePricePerUnit / exchangeRate; - aggBookCostGBP += h.BookCostGBP; - //bookCostPerAccount.addCategoryAmount(h.AccountName, (h.NoUnits * h.PurchasePricePerUnit) / exchangeRate); - bookCostPerAccount.addCategoryAmount(h.AccountName, h.BookCostGBP); - - if (h.PurchaseDate < minPurchaseData) { minPurchaseData = h.PurchaseDate; } - if (h.PurchaseDate > maxPurchaseDate) { maxPurchaseDate = h.PurchaseDate; } - if (!accountNames.includes(h.AccountName)) { accountNames.push(h.AccountName); } - - if (i.CurrentPrice && exchangeRate) { - aggSingleDayGainGBP += ((i.CurrentPrice - (h.PurchaseDate > i.SingleDayStartDate ? h.PurchasePricePerUnit : i.SingleDayPreviousClose)) * h.NoUnits) / exchangeRate; - currentValuePerAccount.addCategoryAmount(h.AccountName, (h.NoUnits * i.CurrentPrice) / exchangeRate); - } - } - } - - let aggPurchasePricePerUnit = aggBookCost / aggUnits; - let aggCurrentValue = 0, - aggCurrentValueGBP = 0, - aggGainGBP = 0, - aggSingleDayGainPercent = 0, - aggSingleDayProfitOrLoss = 0; - if (i.CurrentPrice) { - aggCurrentValue = aggUnits * (i.Currency == 'GBp' ? i.CurrentPrice / 100 : i.CurrentPrice); - if (exchangeRate) { - aggCurrentValueGBP = (aggUnits * i.CurrentPrice) / exchangeRate; - //aggGainGBP = ((i.CurrentPrice - aggPurchasePricePerUnit) * aggUnits) / exchangeRate; - aggGainGBP = aggCurrentValueGBP - aggBookCostGBP; - aggSingleDayGainPercent = ((i.CurrentPrice / i.SingleDayPreviousClose) - 1) * 100; - aggSingleDayProfitOrLoss = aggSingleDayGainGBP < 0 ? 'loss' : 'profit'; - } - } - - return { - displayOrder: i.DisplayOrder, - holdingNumber: 0, - instrumentType: i.InstrumentType, - instrumentName: i.InstrumentName, - symbol: i.Symbol, - currency: i.Currency, - accountName: accountNames.length > 1 ? 'Multiple (' + accountNames.length + ')' : accountNames[0], - accountNames: accountNames.length > 1 ? accountNames.join(', ') : '', - purchaseDateMin: minPurchaseData, - purchaseDateMax: maxPurchaseDate, - noUnits: aggUnits, - purchasePricePerUnit: aggPurchasePricePerUnit, - bookCost: aggBookCost, - bookCostGBP: aggBookCostGBP, - currentValue: aggCurrentValue, - gain: (i.Currency == 'GBp' ? (i.CurrentPrice - aggPurchasePricePerUnit) / 100 : (i.CurrentPrice - aggPurchasePricePerUnit)) * aggUnits, - //gainPercent: (i.CurrentPrice - aggPurchasePricePerUnit) / aggPurchasePricePerUnit * 100, - gainPercent: aggGainGBP / aggBookCostGBP * 100, - currentValueGBP: aggCurrentValueGBP, - gainGBP: aggGainGBP, - singleDayGainGBP: aggSingleDayGainGBP, - singleDayGainPercent: aggSingleDayGainPercent, - singleDayProfitOrLoss: aggSingleDayProfitOrLoss, - currentPrice: i.CurrentPrice, - currentExchangeRate: exchangeRate, - marketIsOpen: marketIsOpen - }; - } - - //Create a structure to summarise total holdings in each currency, to be used in the pie chart - let holdingCurrencies = { - data: [], - indexOfHoldingCurrency: function (symbol) { return this.data.map(function (item) { return item.symbol; }).indexOf(symbol); }, - getHoldingCurrency: function (symbol) { return this.data[this.indexOfHoldingCurrency(symbol)]; }, - addHoldingCurrency: function (symbol, amount) { - let c = this.getHoldingCurrency(symbol); - if (c) { - c.total += amount; - } else { - this.data.push({ symbol: symbol, total: amount }); - } - }, - getChartData: function () { - let d = [] - for (let i = 0; i < this.data.length; i++) { - d.push({ label: this.data[i].symbol, data: this.data[i].total / Instruments.GetExchangeRate(this.data[i].symbol, 'GBP') }); - } - return d; - } - }; - let holdingCurrenciesCurrentValue = { - data: [], - indexOfHoldingCurrency: function (symbol) { return this.data.map(function (item) { return item.symbol; }).indexOf(symbol); }, - getHoldingCurrency: function (symbol) { return this.data[this.indexOfHoldingCurrency(symbol)]; }, - addHoldingCurrency: function (symbol, amount) { - let c = this.getHoldingCurrency(symbol); - if (c) { - c.total += amount; - } else { - this.data.push({ symbol: symbol, total: amount }); - } - }, - getChartData: function () { - let d = [] - for (let i = 0; i < this.data.length; i++) { - d.push({ label: this.data[i].symbol, data: this.data[i].total / Instruments.GetExchangeRate(this.data[i].symbol, 'GBP') }); - } - return d; - } - }; - let bookCostPerAccount = createCategoryAggregator(); - let currentValuePerAccount = createCategoryAggregator(); - let totalHoldingsValueGBP = 0; - let totalBookCostGBP = 0; - let totalValueGBP = 0; - let totalGainGBP = 0; - let todaysGainGBP = 0; - let maxCurrentValueGBP = 0; - let groupHoldings = $('#groupBySymbol').prop('checked'); - let r = []; - - for (let n = 0; n < Instruments.Data.length; n++) { - let i = Instruments.Data[n]; - //if (i.InstrumentType == 'EQUITY') { - if (i.InstrumentType == 'EQUITY' || i.InstrumentType == 'CRYPTOCURRENCY') { - //if (i.CurrentPrice) { - if (groupHoldings) { - let agg = aggregateHoldings(i); - if (agg.noUnits > 0) { - r.push(agg); - - //holdingCurrencies.addHoldingCurrency(i.Currency, agg.noUnits * agg.purchasePricePerUnit); - holdingCurrencies.addHoldingCurrency(i.Currency.toUpperCase(), agg.noUnits * agg.purchasePricePerUnit / (i.Currency == "GBp" ? 100 : 1)); - if (i.CurrentPrice) { - if (agg.currentValueGBP > maxCurrentValueGBP) { maxCurrentValueGBP = agg.currentValueGBP }; - //holdingCurrenciesCurrentValue.addHoldingCurrency(i.Currency, agg.noUnits * i.CurrentPrice); - holdingCurrenciesCurrentValue.addHoldingCurrency(i.Currency.toUpperCase(), agg.noUnits * i.CurrentPrice / (i.Currency == "GBp" ? 100 : 1)); - if (agg.currentExchangeRate) { - totalBookCostGBP += agg.bookCostGBP; - totalValueGBP += agg.currentValueGBP; - totalGainGBP += agg.gainGBP; - todaysGainGBP += (agg.marketIsOpen == 0 ? 0 : agg.singleDayGainGBP); - } - } - } - } else { - let marketIsOpen = Instruments.MarketIsOpen(i); - let exchangeRate = Instruments.GetExchangeRate(i.Currency, 'GBP'); - - for (let hn = 0; hn < i.Holdings.length; hn++) { - let h = i.Holdings[hn]; - if (h.SoldDate == null) { - let holdingBookCost = h.NoUnits * h.PurchasePricePerUnit; - - let currentHoldingValue = h.NoUnits * (i.Currency == 'GBp' ? i.CurrentPrice / 100 : i.CurrentPrice); - - let holdingCurrentValueGBP = 0, - holdingGainGBP = 0, - singleDayGainGBP = 0, - singleDayGainPercent = 0, - singleDayProfitOrLoss = 0; - if (i.CurrentPrice) { - let currentHoldingValue = h.NoUnits * (i.Currency == 'GBp' ? i.CurrentPrice / 100 : i.CurrentPrice); - - if (exchangeRate) { - let holdingCurrentValueGBP = (h.NoUnits * i.CurrentPrice) / exchangeRate; - //let holdingGainGBP = ((i.CurrentPrice - h.PurchasePricePerUnit) * h.NoUnits) / exchangeRate; - let holdingGainGBP = holdingCurrentValueGBP - h.BookCostGBP; - - let singleDayGainGBP = ((i.CurrentPrice - (h.PurchaseDate > i.SingleDayStartDate ? h.PurchasePricePerUnit : i.SingleDayPreviousClose)) * h.NoUnits) / exchangeRate; - let singleDayGainPercent = ((i.CurrentPrice / i.SingleDayPreviousClose) - 1) * 100; - let singleDayProfitOrLoss = singleDayGainGBP < 0 ? 'loss' : 'profit'; - - if (holdingCurrentValueGBP > maxCurrentValueGBP) { maxCurrentValueGBP = holdingCurrentValueGBP }; - } - } - - r.push({ - displayOrder: i.DisplayOrder, - holdingNumber: hn, - instrumentType: i.InstrumentType, - instrumentName: i.InstrumentName, - symbol: i.Symbol, - currency: i.Currency, - accountName: h.AccountName, - purchaseDateMin: h.PurchaseDate, - purchaseDateMax: h.PurchaseDate, - noUnits: h.NoUnits, - purchasePricePerUnit: h.PurchasePricePerUnit, - bookCost: holdingBookCost, - currentValue: currentHoldingValue, - gain: (i.Currency == 'GBp' ? (i.CurrentPrice - h.PurchasePricePerUnit) / 100 : (i.CurrentPrice - h.PurchasePricePerUnit)) * h.NoUnits, - //gainPercent: (i.CurrentPrice - h.PurchasePricePerUnit) / h.PurchasePricePerUnit * 100, - gainPercent: holdingGainGBP / h.BookCostGBP * 100, - currentValueGBP: holdingCurrentValueGBP, - gainGBP: holdingGainGBP, - singleDayGainGBP: singleDayGainGBP, - singleDayGainPercent: singleDayGainPercent, - singleDayProfitOrLoss: singleDayProfitOrLoss, - currentPrice: i.CurrentPrice, - currentExchangeRate: exchangeRate, - marketIsOpen: marketIsOpen - }); - - holdingCurrencies.addHoldingCurrency(i.Currency, h.NoUnits * h.PurchasePricePerUnit); - if (i.CurrentPrice) { - holdingCurrenciesCurrentValue.addHoldingCurrency(i.Currency, h.NoUnits * i.CurrentPrice); - if (exchangeRate) { - currentValuePerAccount.addCategoryAmount(h.AccountName, holdingCurrentValueGBP); - bookCostPerAccount.addCategoryAmount(h.AccountName, holdingBookCost / exchangeRate); - - //totalBookCostGBP += holdingBookCost / exchangeRate; - totalBookCostGBP += holdingBookCostGBP; - totalValueGBP += holdingCurrentValueGBP; - totalGainGBP += holdingGainGBP; - todaysGainGBP += (marketIsOpen == 0 ? 0 : singleDayGainGBP); - } - } - } - } - } - //} //if (i.CurrentPrice) - } - } - - return { - totalBookCostGBP: totalBookCostGBP, - totalValueGBP: totalValueGBP, - totalGainGBP: totalGainGBP, - todaysGainGBP: todaysGainGBP, - maxCurrentValueGBP: maxCurrentValueGBP, - holdings: r, - holdingCurrencies: holdingCurrencies, - holdingCurrenciesCurrentValue: holdingCurrenciesCurrentValue, - bookCostPerAccount: bookCostPerAccount, - currentValuePerAccount: currentValuePerAccount - }; - } - function createTable() { - let t = $("#tblMainHoldings"); - if (t.length) { - return; - } else { - let tbl = '' + - '' + - '' + - '' + - '' + - '' + - '' + - '' + - '' + - '' + - '' + - '' + - '' + - '' + - '' + - '' + - '' + - '' + - '' + - '
TypeNameSymbolCcyAccountBuy DateNo UnitsBuy
Price		Current
Price		Book
Cost		Current
Value		GainGain £Gain %Current
Value £		AllocationToday's
Gain £		Today's
Gain %
 
'; - - //$('#holdingsDiv').html(tbl); - $('#holdingsTableDiv').html(tbl); - - $("#tblMainHoldings").tablesorter({ ignoreCase: false }); - $("#tblMainHoldings").trigger("sorton", Cookies.get('sortHoldings')); - $('#tblMainHoldings').on('sortEnd', function (event) { - // Prints the current sort order to the console - Cookies.set('sortHoldings', event.target.config.sortList, { 'sameSite': 'strict' }); - }); - } - } - 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"); - } - } - function getPercentCell(backgroundColor, cellWidth, valuePercent, label) { - let labelText = label ? label : (valuePercent.toFixed(1) + '%'); - let barWidth = ((valuePercent / 100) * cellWidth); - return '' + - '
 
' + - '
' + labelText + '
' + - ''; - } - - let t = getHoldings(); - let totalBookCostGBP = t.totalBookCostGBP; - let totalValueGBP = t.totalValueGBP; - let totalGainGBP = t.totalGainGBP; - let todaysGainGBP = t.todaysGainGBP; - let maxCurrentValueGBP = t.maxCurrentValueGBP; - let holdings = t.holdings; - let holdingCurrencies = t.holdingCurrencies; - let holdingCurrenciesCurrentValue = t.holdingCurrenciesCurrentValue; - let bookCostPerAccount = t.bookCostPerAccount; - let currentValuePerAccount = t.currentValuePerAccount; - - let maxAllocationPercent = (maxCurrentValueGBP / totalValueGBP) * 100; - let allocationScaleFactor = 100 / maxAllocationPercent; - - let altRow = 1; - - createTable(); - for (let n = 0; n < holdings.length; n++) { - try { - altRow = !altRow; - - let h = holdings[n]; - let type = h.instrumentType == 'CURRENCY' ? '$' : h.instrumentType.substring(0, 1); - let profitOrLoss = h.currentPrice < h.purchasePricePerUnit ? 'loss' : 'profit'; //let profitOrLoss = i.CurrentPrice < h.PurchasePricePerUnit ? 'loss' : 'profit'; - let openOrClosed = h.marketIsOpen == 1 ? 'open' : 'closed'; - let allocationPercent = h.currentValueGBP / totalValueGBP * 100; - let scaledAllocation = allocationScaleFactor * allocationPercent; - - let rowID = "holdingRow_" + h.displayOrder + "_" + h.holdingNumber; - let row = '' + - '' + type + '' + - '' + h.instrumentName + '' + - '' + h.symbol + '' + '' + - '' + h.currency + '' + - '' + h.accountName + '' + - '' + new Date(h.purchaseDateMin).yyyymmdd()) : (' title="' + new Date(h.purchaseDateMax).yyyymmdd() + ' - ' + new Date(h.purchaseDateMin).yyyymmdd() + '">' + new Date(h.purchaseDateMin).yyyymmdd()) + '+') + '' + - //'' + formatAmount(h.noUnits, '', 0) + '' + - '' + h.noUnits.autoScale() + '' + - '' + formatAmount(h.purchasePricePerUnit, h.currency, 2) + '' + //Buy Price - '' + (h.currentPrice ? formatAmount(h.currentPrice, h.currency, 2) : '') + '' + //Current Price - '' + formatAmount(h.currency == 'GBp' ? h.bookCost / 100 : h.bookCost, h.currency == 'GBp' ? 'GBP' : h.currency, 0) + '' + //Book Cost - '' + (h.currentExchangeRate ? formatAmount(h.currentValue, h.currency == 'GBp' ? 'GBP' : h.currency, 0) : '') + '' + //Current Value - '' + (h.currentPrice ? formatAmount(h.gain, h.currency == 'GBp' ? 'GBP' : h.currency, 0) : '') + '' + //Gain - '' + (h.currentExchangeRate ? formatAmount(h.gainGBP, 'GBP', 0) : '') + '' + //Gain £ - '' + (h.currentExchangeRate ? h.gainPercent.toFixed(1) + '%' : '') + '' + //Gain % - '' + (h.currentExchangeRate ? formatAmount(h.currentValueGBP, 'GBP', 0) : '') + '' + //Current Value £ - (h.currentExchangeRate ? getPercentCell('#3f2d95', 70, scaledAllocation, allocationPercent.toFixed(1) + '%') : '') + //Allocation - (h.currentExchangeRate ? (h.marketIsOpen == 0 ? '' : '' + formatAmount(h.singleDayGainGBP, 'GBP', 0) + '') : '') + //Today's Gain £ - (h.singleDayGainPercent ? (h.marketIsOpen == 0 ? '' : '' + h.singleDayGainPercent.toFixed(1) + '%') : '') + //Today's Gain % - ''; - addTableRow(rowID, row, "tbMainHoldings", true); - } - catch (err) { - logError("Error adding " + holdings[n].symbol + " to main holdings table: " + err.message); - } - } - - //Add the totals line at the bottom of the table - let profitOrLoss = totalValueGBP < totalBookCostGBP ? 'loss' : 'profit'; - let todaysProfitOrLoss = todaysGainGBP < 0 ? 'loss' : 'profit'; - let row = 'Updated: ' + new Date().yyyymmddhhmmss() + '' + - '' + formatAmount(totalBookCostGBP, 'GBP', 0) + '' + //Book Cost - '' + - '' + formatAmount(totalGainGBP, 'GBP', 0) + '' + //Gain GBP - '' + formatAmount((((totalValueGBP / totalBookCostGBP) - 1) * 100), '', 1) + '%' + //Gain % - '' + formatAmount(totalValueGBP, 'GBP', 0) + '' + //Current Value - ' ' + //Allocation - '' + formatAmount(todaysGainGBP, 'GBP', 0) + '' + //Today's Gain GBP - '' + formatAmount(((todaysGainGBP / totalBookCostGBP) * 100), '', 1) + '%' + //Today's Gain % - ''; - addTableRow("tfHoldingsTotals", row, "tfMainHoldings", false); - - //Flash the last updated cell - $("#holdingsLastUpdated").addClass("highlighted"); - //Remove the highlight from all rows/cells - $("#tblMainHoldings").find(".highlighted").removeClass("highlighted", 1200); - - //Tell tablesorter that the table has been updated - var resort = true; - $("#tblMainHoldings").trigger("update", [resort]); - - //Update the total holdings span in the site banner - let formattedAmount = formatAmount(totalValueGBP, "GBP", 0); - $("#spnTotalHoldings").html("Total holdings: " + formattedAmount); - //Set the page title - document.title = formattedAmount + ' - ' + initialPageTitle; - - //Create / update the currency allocation pie chart - function labelFormatter(label, series) { - return "
" + label + "
" + Math.round(series.percent) + "%
" + formatAmount(series.data[0][1], 'GBP', 0) + "
"; - } - let ops = { - series: { - downsample : { threshold: 0 }, - pie: { show: true, radius: 1, label: { show: true, radius: 0.7, formatter: labelFormatter } } - }, - legend: { show: false }, - grid: { hoverable: true }, - tooltip: { - show: true, - content: "%p.0%, %s, n=%n", // show percentages, rounding to 2 decimal places - shifts: { x: 20, y: 0 }, - defaultTheme: false - } - }; - let cd = holdingCurrencies.getChartData(); - if (cd.length) { - $.plot('#divHoldingCurrenciesChart', cd, ops); - } - - cd = holdingCurrenciesCurrentValue.getChartData(); - if (cd.length) { - $.plot('#divHoldingCurrenciesChartCurrentValue', cd, ops); - } - - function labelFormatter2(label, series) { - return "
" + label + "
" + formatAmount(series.data[0][1], 'GBP', 0) + "
"; - } - ops.series.pie.label.formatter = labelFormatter2; - cd = bookCostPerAccount.getChartData(); - if (cd.length) { - $.plot('#divAccountBookCost', cd, ops); - } - - cd = currentValuePerAccount.getChartData(); - if (cd.length) { - $.plot('#divAccountValue', cd, ops); - } -} -function createAccountsTables() { - function getAccounts() { - let accounts = []; - function indexOfAccount(accountName) { return accounts.map(function (item) { return item.accountName; }).indexOf(accountName); }; - function getAccount(accountName) { return accounts[indexOfAccount(accountName)]; }; - function addAccountHolding(instrument, exchangeRate, holding) { - let a = getAccount(holding.AccountName); - if (!a) { - a = { accountName: holding.AccountName, holdings: [], totalCostGBP: 0, totalValueGBP: 0, totalGainGBP: 0 }; - accounts.push(a); - } - let h = { - instrumentName: instrument.InstrumentName, - symbol: instrument.Symbol, - currency: instrument.Currency, - purchaseDate: holding.PurchaseDate, - purchasePricePerUnit: holding.PurchasePricePerUnit, - noUnits: holding.NoUnits, - cost: holding.NoUnits * holding.PurchasePricePerUnit - } - //if (exchangeRate) { - //h.costGBP = h.cost / exchangeRate; - h.costGBP = holding.BookCostGBP; - a.totalCostGBP += holding.BookCostGBP; - //} - if (instrument.CurrentPrice) { - h.currentPrice = instrument.CurrentPrice; - h.currentValue = holding.NoUnits * instrument.CurrentPrice; - h.gain = h.currentValue - h.cost; - if (exchangeRate) { - h.currentValueGBP = h.currentValue / exchangeRate; - //h.gainGBP = h.gain / exchangeRate; - h.gainGBP = h.currentValueGBP - h.costGBP; - a.totalGainGBP += h.gainGBP; - a.totalValueGBP += h.currentValueGBP; - } - } - a.holdings.push(h); - } - - for (let ix = 0; ix < Instruments.Data.length; ix++) { - let i = Instruments.Data[ix]; - let exchangegRate = Instruments.GetExchangeRate(i.Currency, 'GBP'); - for (let hx = 0; hx < i.Holdings.length; hx++) { - let h = i.Holdings[hx]; - if (h.SoldDate == null) { - addAccountHolding(i, exchangegRate, h); - } - } - } - - return accounts; - } - - let accounts = getAccounts(); - - //let eDT = new Date(); - //console.info('createAccountsTable after getAccounts: ' + (eDT.getTime() - sDT.getTime()) + ' (' + sDT.yyyymmddhhmmss() + ' -> ' + eDT.yyyymmddhhmmss() + ')'); - - //Sort the accounts array by accountName - accounts.sort(function (a, b) { - if (a.accountName < b.accountName) return -1; - if (a.accountName > b.accountName) return 1; - return 0; - }); - - //eDT = new Date(); - //console.info('createAccountsTable after array sort: ' + (eDT.getTime() - sDT.getTime()) + ' (' + sDT.yyyymmddhhmmss() + ' -> ' + eDT.yyyymmddhhmmss() + ')'); - - let summaryTable = ""; - let accountsTables = '' - let tableIDs = ['accountsSummaryTable']; - let altRow = 1; - for (let ax = 0; ax < accounts.length; ax++) { - let a = accounts[ax]; - altRow = !altRow; - let profitOrLoss = a.totalGainGBP < 0 ? 'loss' : 'profit'; - summaryTable += "" + - "" + - "" + - "" + - "" + - ""; - - accountsTables += '
' + a.accountName + '
' - let tableID = 'accountTable' + ax; - tableIDs.push(tableID); - accountsTables += '
Account NameNo. HoldingsTotal Cost (GBP)Current ValueTotal Gain
" + a.accountName + "" + a.holdings.length + "" + formatAmount(a.totalCostGBP || 0, 'GBP', 2) + "" + formatAmount(a.totalValueGBP || 0, 'GBP', 2) + "" + formatAmount(a.totalGainGBP || 0, 'GBP', 2) + "
' + - '' + - '' + - '' + - '' + - '' + - '' + - '' + - '' + - '' + - '' + - '' + - '' + - '' + - '' + - ''; - 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'; - accountsTables += '' + - '' + - '' + - '' + - '' + - '' + - '' + - '' + - '' + - '' + - '' + - '' + - '' + - //'' + - '' + - ''; - } - accountsTables += '
NameSymbolBuy DateNo UnitsBuy PriceCurrent PriceBook CostApprox Book Cost £Current ValueCurrent Value £GainGain £Gain %
' + 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) + '%
'; - } - summaryTable += ""; - $("#accoountsDiv").html(summaryTable + '
' + accountsTables); -} -function createAnalysisTable() { - function getHighestPriceBeforeDate(Instrument, maxDT) { - if (Instrument.DailyData) { - let r = { Price: 0, DT: 0 }; - let dt = 0; - for (let i = 0; i < Instrument.DailyData.length && dt < maxDT; i++) { - let price = Instrument.DailyData[i]; - dt = price.DT; - if (dt <= maxDT && price.high > r.Price) { - r.Price = price.high; - r.DT = dt; - } - } - return r; - } else { - return { Price: NaN, DT: NaN }; - } - } - function getHighestPriceBetweenDates(Instrument, minDT, maxDT) { - if (Instrument.DailyData) { - let r = { Price: 0, DT: 0 }; - let dt = 0; - for (let i = 0; i < Instrument.DailyData.length && dt < maxDT; i++) { - let price = Instrument.DailyData[i]; - dt = price.DT; - if (dt >= minDT && dt <= maxDT && price.high > r.Price) { - r.Price = price.high; - r.DT = dt; - } - } - return r; - } else { - return { Price: NaN, DT: NaN }; - } - } - function getLowestPriceAfterDate(Instrument, minDT) { - if (Instrument.DailyData) { - let r = { Price: 0, DT: 0 }; - let dt = 0; - let i = 0; - let DD = Instrument.DailyData; - while (dt < minDT && i < DD.length - 1) { - i++; - dt = DD[i].DT; - } - if (i < DD.length) { - r.Price = DD[i].low; - r.DT = DD[i].DT; - - while (i < DD.length - 1) { - i++; - if (DD[i].low < r.Price) { - r.Price = DD[i].low; - r.DT = DD[i].DT; - } - } - } - return r; - } else { - return { Price: NaN, DT: NaN }; - } - } - function getEquities() { - function getHoldingsValueGBP(Instrument) { - let noUnits = 0; - if (Instrument.CurrentPrice) { - let c = Instruments.GetCurrentHoldings(Instrument); - for (let x = 0; x < c.length; x++) { - noUnits += c[x].NoUnits; - } - let exchangeRate = Instruments.GetExchangeRate(Instrument.Currency, 'GBP'); - return noUnits * Instrument.CurrentPrice / exchangeRate; - } else { - return 0; - } - } - - let totalHoldingsValueGBP = 0; - let r = []; - for (let n = 0; n < Instruments.Data.length; n++) { - let i = Instruments.Data[n]; - try { - if (i.InstrumentType == 'EQUITY') { - let prePandemicHigh = getHighestPriceBetweenDates(i, new Date('2020-01-01'), pandemicCrashStartDate); - let postPandemicLow = getLowestPriceAfterDate(i, pandemicCrashStartDate); - let dilutedTarget = prePandemicHigh.Price * i.PostPandemicDilution; - let currentHoldingsValueGBP = getHoldingsValueGBP(i); - let remainingDilutedPotential = ((dilutedTarget - i.CurrentPrice) / i.CurrentPrice) * 100; - totalHoldingsValueGBP += currentHoldingsValueGBP; - - r.push({ - prePandemicHigh: prePandemicHigh, - postPandemicLow: postPandemicLow, - displayOrder: i.DisplayOrder, - instrumentName: i.InstrumentName, - symbol: i.Symbol, - currency: i.Currency, - currentPrice: i.CurrentPrice, - fallPercent: ((postPandemicLow.Price / prePandemicHigh.Price) - 1) * 100, - postPandemicDilution: i.PostPandemicDilution * 100, - dilutedTarget: dilutedTarget, - currentDiscount: ((i.CurrentPrice / prePandemicHigh.Price) - 1) * 100, - potentialDilutedRebound: (((prePandemicHigh.Price * i.PostPandemicDilution) / postPandemicLow.Price) - 1) * 100, - retracementPercent: ((i.CurrentPrice - postPandemicLow.Price) / (prePandemicHigh.Price - postPandemicLow.Price)) * 100, - remainingPotential: ((prePandemicHigh.Price - i.CurrentPrice) / i.CurrentPrice) * 100, - remainingDilutedPotential: remainingDilutedPotential, - currentHoldingsValueGBP: currentHoldingsValueGBP, - possibleRemainingProfit: currentHoldingsValueGBP * remainingDilutedPotential / 100 - }); - } - } - catch (err) { - console.error("Error analysing " + i.Symbol + ": " + err.message); - } - } - return { totalHoldingsValueGBP: totalHoldingsValueGBP, equities: r }; - } - function createTable() { - let t = $("#tblAnalysis"); - if (t.length) { - return t; - } else { - let tbl = '' + - '' + - '' + - /*'' +*/ - /*'' +*/ - '' + - '' + - '' + - '' + - '' + - '' + - '' + - '' + - '' + - '' + - '' + - '' + - '' + - '' + - '
#NameSymbolCurrencyPre-pandemic peakBottom% FallCurrent PriceDiluted Value %Diluted TargetCurrent DiscountPotential
Diluted
Rebound		Retracement %Remaining PotentialRemaining
Diluted
Potential		Current HoldingCurrent Allocation %Possible Remaining Profit
 
 
'; - - $('#analDiv').html(tbl); - $("#tblAnalysis").tablesorter(); - } - } - function addTableRow(id, row) { - let r = $("#" + id); - if (r.length) { - $("#" + id).replaceWith(row); //Update existing row - } else { - $("#tbAnal").append(row); - } - } - - //analysisTableTimings.LastUpdateTime = new Date().getTime(); - - let pandemicCrashStartDate = new Date("2020-02-23").getTime(); - - //Calculate values for all equities - let tmp = getEquities(); - let equities = tmp.equities; - let totalHoldingsValueGBP = tmp.totalHoldingsValueGBP; - - createTable(); - - let altRow = 1; - let totalPossibleRemainingProfit = 0; - for (let n = 0; n < equities.length; n++) { - altRow = !altRow; - let e = equities[n]; - totalPossibleRemainingProfit += e.possibleRemainingProfit > 0 ? e.possibleRemainingProfit : 0; - try { - let rowID = "analRow" + e.displayOrder - let row = '' + - '' + e.displayOrder + '' + - '' + e.instrumentName + '' + - /*'' + e.symbol + '' + '' +*/ - /*'' + e.currency + '' +*/ - '' + formatAmount(e.prePandemicHigh.Price, e.currency, 2) + '' + //Pre-pandemic peak - '' + formatAmount(e.postPandemicLow.Price, e.currency, 2) + '' + //Bottom - '' + e.fallPercent.toFixed(2) + '%' + //% Fall - '' + formatAmount(e.currentPrice, e.currency, 2) + '' + //Current Price - '' + e.postPandemicDilution + '%' + //Diluted Value - '' + formatAmount(e.dilutedTarget, e.currency, 2) + '' + //Diluted target - '' + e.currentDiscount.toFixed(2) + '%' + //Current Discount - '' + e.potentialDilutedRebound.toFixed(0) + '%' + //Potential Diluted Rebound - '' + e.retracementPercent.toFixed(1) + '%' + //Retracement % - '' + e.remainingPotential.toFixed(1) + '%' + //Remaining Potential - '' + e.remainingDilutedPotential.toFixed(1) + '%' + //Remaining Diluted Potential - '' + (e.currentHoldingsValueGBP > 0 ? formatAmount(e.currentHoldingsValueGBP, 'GBP', 2) : '') + '' + //Current Holding - '' + (e.currentHoldingsValueGBP > 0 ? ((e.currentHoldingsValueGBP / totalHoldingsValueGBP) * 100).toFixed(2) + '%' : '') + '' + //Current Allocation % - '' + (e.possibleRemainingProfit > 0 ? formatAmount(e.possibleRemainingProfit, 'GBP', 2) : '') + '' + //Possible Remaining Profit - ''; - addTableRow(rowID, row); - } - catch (err) { - console.error("Error adding " + e.symbol + " to analysis table: " + err.message); - } - } - $("#tdPossibleRemainingProfit").html(formatAmount(totalPossibleRemainingProfit, 'GBP', 2)); - - var resort = true; - $("#tblAnalysis").trigger("update", [resort]); -} -/*function createIndexMarquee() { - let t = []; - for (var ix = 0; ix < Instruments.Data.length; ix++) { - let i = Instruments.Data[ix]; - //if (i.InstrumentType == 'INDEX' || i.InstrumentType == 'FUTURE') { - if (i.ShowInMarquee == 'A') { - let openOrClosed = Instruments.MarketIsOpen(i) == 1 ? 'open' : 'closed'; - if (i.SingleDayPreviousClose) { - let percentChange = ((i.CurrentPrice / i.SingleDayPreviousClose) - 1) * 100; - if (percentChange < 0) { - t.push('' + i.DisplayName + ': ' + i.CurrentPrice + ' ' + percentChange.toFixed(1) + '%'); - } else { - t.push('' + i.DisplayName + ': ' + i.CurrentPrice + ' +' + percentChange.toFixed(1) + '%'); - } - } else { - t.push('' + i.DisplayName + ': ' + i.CurrentPrice + ''); - } - } - } - if (t.length > 0) { - t.push(new Date().yyyymmddhhmmss()); - let newContent = t.join("  "); - indexMarquee.setContent(newContent); - } -}*/ -function createIndexMarquee() { - let t = []; - for (var ix = 0; ix < Instruments.Data.length; ix++) { - let i = Instruments.Data[ix]; - //if (i.InstrumentType == 'INDEX' || i.InstrumentType == 'FUTURE') { - if (i.ShowInMarquee == 'A') { - let openOrClosed = Instruments.MarketIsOpen(i) == 1 ? 'open' : 'closed'; - if (i.SingleDayPreviousClose) { - let percentChange = ((i.CurrentPrice / i.SingleDayPreviousClose) - 1) * 100; - if (percentChange < 0) { - t.push('' + i.DisplayName + '
' + i.CurrentPrice + ' ' + percentChange.toFixed(1) + '%'); - } else { - t.push('' + i.DisplayName + '
' + i.CurrentPrice + ' +' + percentChange.toFixed(1) + '%'); - } - } else { - t.push('' + i.DisplayName + '
' + i.CurrentPrice + ''); - } - } - } - if (t.length > 0) { - //t.push(new Date().yyyymmddhhmmss()); - let newContent = "
" + t.join("") + "
"; - indexMarquee.container.html(newContent); - } -} -function updateCurrenciesSpan() { - var c = []; - for (var i = 0; i < Currencies.Data.length; i++) { - c.push(Currencies.Data[i].Name + ": " + Currencies.Data[i].CurrentPrice.toFixed(4)); - } - if (c.length > 0) { - $("#spnCurrencies").html('' + c.join(' ') + ''); - } -} - -function showModalDialog_SoldHolding(holdingID) { - function GetTimeDropdowns() { - let dd = ''; - dd += ''; - return dd; - } - - let modal = document.getElementById("modalDialog"); - $("#modalTitle").html("Sold Holding"); - - let o = Instruments.GetHolding(holdingID); - let h = o.holding; - let i = o.instrument; - let content = 'Symbol: ' + i.Symbol + - '
Name: ' + i.InstrumentName + - '
Account: ' + h.AccountName + - '
Purchase Date: ' + new Date(h.PurchaseDate).yyyymmddhhmmss() + - '
Purchase Price: ' + formatAmount(h.PurchasePricePerUnit, i.Currency, 2) + - '
No Units: ' + formatAmount(h.NoUnits, '', 0) + - '
Cost: ' + formatAmount(h.NoUnits * h.PurchasePricePerUnit, i.Currency, 2) + - '

Mark holding as sold?' + - '

Sold date: ' + GetTimeDropdowns() + - '

OK'; - $("#modalContentDiv").html(content); - - $("#soldHoldingDate").datepicker({ dateFormat: 'yy-mm-dd', onSelect: function () { ValidateSoldHolding(h) } }); - $("#soldHoldingDate").bind('input', function () { - ValidateSoldHolding(h); - }); - $("#soldHoldingTimeHour").bind('input', function () { - ValidateSoldHolding(h); - }); - $("#soldHoldingTimeMinute").bind('input', function () { - ValidateSoldHolding(h); - }); - - $("#modalDialog .close").click(function () { modal.style.display = "none"; }); - - window.onclick = function (event) { // When the user clicks anywhere outside of the modal, close it - if (event.target == modal) { - modal.style.display = "none"; - } - } - - //$("#modalDialog .ok-button").click(function () { modal.style.display = "none"; deleteHolding(holdingID); }); - - //Display the dialog - modal.style.display = "block"; -} -function ValidateSoldHolding(holding) { - $("#soldHoldingOKButton").removeClass("ok-button").addClass("ok-button-disabled").unbind(); - try { - let holdingID = holding.HoldingID; - let purchaseDT = holding.PurchaseDate; - let soldDate = $("#soldHoldingDate").val(); - let soldHour = $("#soldHoldingTimeHour").val(); - let soldMinute = $("#soldHoldingTimeMinute").val(); - - if (soldDate != '' && soldHour != '' && soldHour != 'Hour' && soldMinute != '' && soldMinute != 'Min') { - let soldDT = new Date(soldDate + ' ' + soldHour + ':' + soldMinute).getTime(); - if (soldDT <= new Date().getTime() && soldDT > purchaseDT) { - $("#soldHoldingOKButton").removeClass("ok-button-disabled").addClass("ok-button").unbind().bind('click', function () { $("#modalDialog").css("display", "none"); soldHolding(holdingID, soldDT) }); - } - } - } catch (err) { } -} -function soldHolding(holdingID, soldDate) { - //console.info("Sold holding: " + holdingID.toString()); - - let o = Instruments.GetHolding(holdingID); - let h = o.holding; - let i = o.instrument; - - h.SoldDate = soldDate; - - $.ajax({ - type: "POST", - contentType: "application/json", - url: "SharePrices.aspx/SoldHolding", - dataType: "json", - data: JSON.stringify({ HoldingID: holdingID, SoldDate: soldDate }), - success: function (response) { - $("#shareRow" + i.DisplayOrder).html(createSharesTableRow(i)); - createLongChart(i); - createMidChart(i); - createShortChart(i); - createSingleDayChart(i); - }, - failure: function (response) { console.error("SoldHolding error: " + JSON.stringify(response)); } - }); -} - -function showModalDialog_AddInstrument() { - let modal = document.getElementById("modalDialog"); - - $("#modalTitle").html("Add Instrument"); - - let content = '
Search text:

' + - '
'; - $("#modalContentDiv").html(content); - - $("#modalDialog .close").click(function () { modal.style.display = "none"; }); - - window.onclick = function (event) { // When the user clicks anywhere outside of the modal, close it - if (event.target == modal) { - modal.style.display = "none"; - } - } - - //$("#modalDialog .ok-button").click(function () { modal.style.display = "none"; }); - - //Display the dialog - modal.style.display = "block"; -} -function searchForYahooInstrument(searchString) { - if (searchString.length > 1) { - $.ajax({ - type: "POST", - contentType: "application/json", - url: "SharePrices.aspx/SearchYahooFinanceShares", - dataType: "json", - data: JSON.stringify({ SearchString: searchString }), - success: function (response) { - let results = ''; - if (response.quotes) { - instrumentSearchResults = response.quotes; - results = ''; - for (let x = 0; x < instrumentSearchResults.length; x++) { - let q = instrumentSearchResults[x]; - results += '' + - '' + - '' + - '' + - ''; - } - results += '
SymbolNameExchangeType
' + q.symbol + '' + (q.longname ? q.longname : q.shortname) + '' + q.exchange + '' + q.typeDisp + '

Add Instrument
'; - } - $("#addInstrumentSearchResults").html(results); - }, - failure: function (response) { console.error("searchForYahooInstrument error: " + JSON.stringify(response)); } - }); - } -} -function selectSearchResult(index) { - for (let x = 0; x < instrumentSearchResults.length; x++) { - if (x == index) { - $("#searchResult" + x.toString()).addClass('selectedSearchResult'); - } else { - $("#searchResult" + x.toString()).removeClass('selectedSearchResult'); - } - } - $("#addInstrumentOKButton").removeClass("ok-button-disabled").addClass("ok-button").unbind().click(function () { $("#modalDialog").css("display", "none"); addInstrument(index) }); -} -function addInstrument(index) { - let i = instrumentSearchResults[index]; - console.info("Add instrument: " + JSON.stringify(i)); - $.ajax({ - type: "POST", - contentType: "application/json", - url: "SharePrices.aspx/AddInstrument", - dataType: "json", - data: JSON.stringify({ Symbol: i.symbol, FullName: (i.longname ? i.longname : i.shortname) }), - success: function (response) { - if (response.Symbol) { - Instruments.Data.push(response); - let i = Instruments.Data[Instruments.Data.length - 1]; - i.Holdings = []; - i.DailyData = []; - i.IntradayData = []; - let lastTR = $('#tblInstruments>tbody>tr').last(); - let cls = (lastTR.hasClass('shareRow')) ? 'altShareRow' : 'shareRow'; - let tr = '' + createSharesTableRow(i) + ''; - lastTR.after(tr); - } else { - console.error("addInstrument response error: " + JSON.stringify(response)); - } - }, - failure: function (response) { console.error("addInstrument AJAX error: " + JSON.stringify(response)); } - }); -} - -function showModalDialog_AddHolding(symbol) { -//function showModalDialog_AddHolding(span) { - function GetAccountsDropdown() { - let dd = ''; - return dd; - } - function GetTimeDropdowns() { - let dd = ''; - dd += ''; - return dd; - } - - //let symbol = $(span).attr('data-symbol'); - let i = Instruments.GetSymbol(symbol); - - let modal = document.getElementById("modalDialog"); - $("#modalTitle").html("Add Holding"); - - let content = '
' + - '' + - '' + - '' + - '' + - '' + - '' + - '' + - '
Instrument Name' + i.InstrumentName + '
Symbol' + symbol + '
Account' + GetAccountsDropdown() + '
Current price' + (i.CurrentPrice ? formatAmount(i.CurrentPrice, i.Currency, 2) : '') + '
Purchase price / unit
No units
Total cost
Purchase date' + GetTimeDropdowns() + '

' + - '
OK
'; - $("#modalContentDiv").html(content); - $("#newHoldingDate").datepicker({ dateFormat: 'yy-mm-dd', onSelect: function () { ValidateNewHolding(symbol) }}); - $("#modalDialog .close").click(function () { modal.style.display = "none"; }); - window.onclick = function (event) { // When the user clicks anywhere outside of the modal, close it - if (event.target == modal) { - modal.style.display = "none"; - } - } - - $("#newHoldingPrice").bind('input', function () { - $("#newHoldingOKButton").removeClass("ok-button").addClass("ok-button-disabled").unbind(); - try { - let noUnits = parseFloat($("#newHoldingNoUnits").val()); - let price = parseFloat($("#newHoldingPrice").val()); - $("#newHoldingTotalCost").val((noUnits * price).toFixed(2)); - ValidateNewHolding(symbol); - } catch (err) { } - }); - $("#newHoldingNoUnits").bind('input', function () { - $("#newHoldingOKButton").removeClass("ok-button").addClass("ok-button-disabled").unbind(); - try { - let noUnits = parseFloat($("#newHoldingNoUnits").val()); - let price = parseFloat($("#newHoldingPrice").val()); - $("#newHoldingTotalCost").val((noUnits * price).toFixed(2)); - ValidateNewHolding(symbol); - } catch (err) { } - }); - $("#newHoldingTotalCost").bind('input', function () { - $("#newHoldingOKButton").removeClass("ok-button").addClass("ok-button-disabled").unbind(); - try { - let noUnits = parseFloat($("#newHoldingNoUnits").val()); - let totalCost = parseFloat($("#newHoldingTotalCost").val()); - //$("#newHoldingPrice").val((totalCost / noUnits).toFixed(4)); - $("#newHoldingPrice").val((totalCost / noUnits)); - ValidateNewHolding(symbol); - } catch (err) { } - }); - $("#newHoldingDate").bind('input', function () { - ValidateNewHolding(symbol); - }); - $("#addHoldingTimeHour").bind('input', function () { - ValidateNewHolding(symbol); - }); - $("#addHoldingTimeMinute").bind('input', function () { - ValidateNewHolding(symbol); - }); - $("#addHoldingAccountName").bind('input', function () { - ValidateNewHolding(symbol); - }); - - //Display the dialog - modal.style.display = "block"; - - return false; //Prevent click event propogating to parent -} -function ValidateNewHolding(symbol) { - $("#newHoldingOKButton").removeClass("ok-button").addClass("ok-button-disabled").unbind(); - try { - let accountName = $("#addHoldingAccountName").val(); - let noUnits = parseFloat($("#newHoldingNoUnits").val()); - let price = parseFloat($("#newHoldingPrice").val()); - let purchaseDate = $("#newHoldingDate").val(); - let purchaseHour = $("#addHoldingTimeHour").val(); - let purchaseMinute = $("#addHoldingTimeMinute").val(); - - if (accountName != '' && accountName != 'Select account...' && noUnits > 0 && price > 0 && purchaseDate != '' && purchaseHour != '' && purchaseHour != 'Hour' && purchaseMinute != '' && purchaseMinute != 'Min') { - let purchaseDT = new Date(purchaseDate + ' ' + purchaseHour + ':' + purchaseMinute); - if (purchaseDT <= new Date()) { - $("#newHoldingOKButton").removeClass("ok-button-disabled").addClass("ok-button").unbind().bind('click', function () { $("#modalDialog").css("display", "none"); AddHolding(accountName, symbol, noUnits, price, purchaseDT) }); - } - } - } catch (err) { } -} -function AddHolding (accountName, symbol, noUnits, purchasePricePerUnit, purchaseDate) { - console.info("AddHolding: " + accountName + ", " + symbol + ", " + noUnits.toString() + ", " + purchasePricePerUnit.toFixed(4) + ", " + new Date(purchaseDate).yyyymmdd()); - - $.ajax({ - type: "POST", - contentType: "application/json", - url: "SharePrices.aspx/AddHolding", - dataType: "json", - data: JSON.stringify({ AccountName: accountName, Symbol: symbol, NoUnits: noUnits, PurchasePricePerUnit: purchasePricePerUnit, PurchaseDate: new Date(purchaseDate).getTime() }), - success: function (response) { - if (response.HoldingID) { - let i = Instruments.GetSymbol(symbol); - if (!i.Holdings) i.Holdings = []; - i.Holdings.push(response); - let tr = $("#shareRow" + i.DisplayOrder.toString()); - tr.html(createSharesTableRow(i)); - createLongChart(i); - createMidChart(i); - createShortChart(i); - createSingleDayChart(i); - } else { - console.error("addInstrument response error: " + JSON.stringify(response)); - } - }, - failure: function (response) { console.error("addInstrument AJAX error: " + JSON.stringify(response)); } - }); -} - -function showModalDialog_FullScreenChart(Symbol) { - let i = Instruments.GetSymbol(Symbol); - - let modal = document.getElementById("modalChart"); - - $("#modalChartTitle").html("Detailed Chart: " + i.InstrumentName + " (" + i.Symbol + ")"); - - $("#modalChart .close").click(function () { modal.style.display = "none"; }); - $('#spnCompareInstruments').click(function () { compareInstruments(i) }); - - window.onclick = function (event) { // When the user clicks anywhere outside of the modal, close it - if (event.target == modal) { - modal.style.display = "none"; - } - } - - //$("#modalDialog .ok-button").click(function () { modal.style.display = "none"; }); - - $(document).on('keypress', function (event) { if (event.keyCode == 27 /*Escape key*/) modal.style.display = "none"; }); - - //Display the dialog - modal.style.display = "block"; - - let chartDiv = $("#divFullScreenChart"); - let height = chartDiv.parent().height(); - let width = chartDiv.parent().width(); - chartDiv.height(height).width(width); - - let startDate = i.DailyData[0].DT; - let endDate = new Date().getTime(); - createFullScreenChart(i, startDate, endDate); - //createFullScreenComparisonChart(i, Instruments.GetSymbol('BTC-USD'), startDate, endDate); -} -function compareInstruments(Instrument1) { - function GetAccountsDropdown() { - let dd = ''; - return dd; - } - - let modal = document.getElementById("modalDialog"); - $("#modalTitle").html("Compare Instruments"); - - let content = '
Select instrument to compare against ' + Instrument1.Symbol + '
' + GetAccountsDropdown() + '

' + - '
OK
'; - $("#modalContentDiv").html(content); - $("#modalDialog .close").click(function () { modal.style.display = "none"; }); - window.onclick = function (event) { // When the user clicks anywhere outside of the modal, close it - if (event.target == modal) { - modal.style.display = "none"; - } - } - - $("#selectInstrument2").bind('input', function () { - $("#compareInstrumentsOKButton").removeClass("ok-button").addClass("ok-button-disabled").unbind(); - let instrument2Symbol = $("#selectInstrument2").val(); - if (instrument2Symbol != '' && instrument2Symbol != 'Select 2nd instrument...') { - $("#compareInstrumentsOKButton").removeClass("ok-button-disabled").addClass("ok-button").bind('click', function () { - $("#modalDialog").css("display", "none"); - let Instrument2 = Instruments.GetSymbol(instrument2Symbol); - let startDate = Instrument1.DailyData[0].DT > Instrument2.DailyData[0].DT ? Instrument1.DailyData[0].DT : Instrument2.DailyData[0].DT; - let endDate = new Date().getTime(); - createFullScreenComparisonChart(Instrument1, Instrument2, startDate, endDate); - }); - } - }); - - //Display the dialog - modal.style.display = "block"; -} +*/ \ No newline at end of file