From 60f570c947303258e71adb1137ffe2d1861bd50e Mon Sep 17 00:00:00 2001 From: Steve Date: Sun, 5 Jan 2025 18:33:39 +0000 Subject: [PATCH] 2024-02-24 --- Websites/SharePrices/.vs/SharePrices/v16/.suo | Bin 0 -> 59904 bytes Websites/SharePrices/.vs/SharePrices/v17/.suo | Bin 58368 -> 108032 bytes Websites/SharePrices/SharePrices.v12.suo | Bin 69120 -> 70656 bytes .../SharePrices/App_Code/DataAccessLayer.vb | 26 +- .../SharePrices/CreateDBSchema.sql | 278 +- .../SharePrices/SharePrices/SharePrices.aspx | 21 +- .../SharePrices/SharePrices.aspx.vb | 28 +- .../SharePrices/SharePricesStyles.css | 28 +- .../SharePrices/bin/SharePrices.dll | Bin 44032 -> 45056 bytes .../SharePrices/bin/SharePrices.pdb | Bin 73216 -> 75264 bytes .../SharePrices/obj/Debug/SharePrices.dll | Bin 44032 -> 45056 bytes .../SharePrices/obj/Debug/SharePrices.pdb | Bin 73216 -> 75264 bytes .../SharePrices/scripts/SharePrices.js | 2957 +++++++++-------- 13 files changed, 2004 insertions(+), 1334 deletions(-) create mode 100644 Websites/SharePrices/.vs/SharePrices/v16/.suo diff --git a/Websites/SharePrices/.vs/SharePrices/v16/.suo b/Websites/SharePrices/.vs/SharePrices/v16/.suo new file mode 100644 index 0000000000000000000000000000000000000000..df1a7c163f86d7a7afd616a071e9b935ce348211 GIT binary patch literal 59904 zcmeHQ34Bz={hxiP^%m4B^}vXLc73$T?dSI

}Xa0md8TU?IR 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 U3)VrkDvx|N*WlG*=Rt$`e_7{PcmMzZ literal 0 HcmV?d00001 diff --git a/Websites/SharePrices/.vs/SharePrices/v17/.suo b/Websites/SharePrices/.vs/SharePrices/v17/.suo index 029dbbf7d6c7dd928e412c418181fefe22677c86..a35604e32bb9512d1d9096c9a33a64e44a5d5784 100644 GIT binary patch delta 2095 zcmeIy$4^v29Ki8?!xI*KR#rf4i()TX6;Y8y4EAW;H5|}jOuR~rWo?Ko_J-*0*t^f( z#ZfG%SWvOA<)#Nu{snvBV)>3?%^FLL@un~NWPb1WCX=1t%x}x<^MlZIGMeGdAk z%T{eNr9UNXH6zg{CaL_X6~bsvDf~&ZO8eGQ>+(a#IImS2~w+ZgxF6wX(_wfMrcnEz}A2U9|Q#`|Sgz*B& zLEl~F?AMU+zn*`kp3Q^48arFqIq`Nc@zZ|#rY9mJ3Vx?w^TR*tx=|JOSTi&_q9WtN z;=4AIk%{HX@2xbH@P0Jx0%1=!Ln&_Mp877)E^^v)g}p$?w}Et(Uh>}1ucc&W*=6o8 z*Fpaw{-fF>1HOIqv|Qi48Z?{mq*svMP5eZPr1e>TfdS+&J3W}c klI}L{ue`54@>W-u%6o0LkSphu%G}{;vaDOY967V|XUFX^1ONa4 delta 1367 zcmdUvO-vI(6vsQ;ZCUDqAQcMMQlvs96&n#jP$&X{2tq3#%9kMGH)0RPgCSv~#uFjZ zr*bqdnwWUfJ?KSKl>-M8h(RD)@an~bNe^-m{0}M87!O?C6&?uW*(9NUnkba1Hpu_Ay_1Q0U*R&vB#hIbO=m;{I}Z{E0`t z?yniS6Qq()Ol#W`U9}VO6tG0c>!-wb|I1;1YOxO6G5%j2-Uf$BG+8OhBx-h(Qi*3S@i5Vw7lf$)!cIWr0FV zedBMQFuQi!=@DcX=Js#&a%hn}nW^sBWws%v=1Xd^5UjG3J<%bu^?rfG5vGwuBf!O;u zLv-^#dMvrvQF=Q!%yd*SUrwI+2b8*yr!EK+p3ed+q>6C4p0~OcK0->^N#DX23WY-x op+!c@qKA6E_KmxXn1%c{>1EX;HYBS3IGW5dt<3$7sn-X7119sTW&i*H diff --git a/Websites/SharePrices/SharePrices.v12.suo b/Websites/SharePrices/SharePrices.v12.suo index 6d2302ef1b4df577729325f45c2a38bc770c3bff..01a015430b0484672b48f6d964e30b220f1ad449 100644 GIT binary patch delta 7783 zcmd^E3s{v^y8hO`H;8f(5FrHx6mKZFK@>2Nt(&VN!bmommk`jlA`tBDs976tjf#`H zm-kbqWL|18PrK4imV1_i{$g`~7QM9LHv=bIvnop0oDz@~!*& z*Y~aOT^DMfGS+T3E-^)GzWz}u7NJPw_Z4hN!vY#^|B1_EYJfyE=aMF!%TKo-yu;7R5JLx7>cFo5d~_sIK~ z7DoC%;7N>vY%8r^$sMeSO#&tZ<-io60;mLLEiJS-wLF+0T8j)YjoR|lY~W~a1O6lq z!RVhYz~QzX}VVlbY^kHBVua zf3pq(JnU2ec+D(ckm(Pao{81W8egE68Ho-1$+ve2L1$m2Alyt2hIXt0Ox?) zAA;^=cto!A|LMHD6jBkKwh~TULj_b!C2;9tnn-1o0cit>;n=NC$v5Gd~sFd=&lLc|9}z2(W|2-%oC;9vL4y|Ct*<}WP_7q?tN z5hsMRQ-)7pOpm!u-;Z9A_D&A*vb@>}I~8vg%w&2=hO~FimwWCTBcpx%_DC7kHo{oIEzE6Wj9elgZd)pTFAubx+EOq> zGQaRx(iVEy$A|<|r9Sv!X%DOWJ0CmT=WgGckmelRC>vXwq)9W%8-w$Fc>2-bj$*0x z+K)t#{5q^*)c*d_DTP~C*+21lqGa{c4Sz+!w=^ArkBPvV7z=)ngk0-Q^b+I*Y@jB{ zMsPl}!S8$#$3ega#{3HM0QQ7h&DpM2K2q0JMm^bHER*7%bZLJ638_tvmD{!j`k*;w z4$CT%QDagZMANXJe~i4vnEO*2(F54S12Oyx?Dx}=KPH;!L&&k6iMpV?05&in)jA0bF-PnayUcm{`Ll z11FCgHy9s^be6TOyj1W!9j#zM+Lj8H!Ft-gYU4Nq$(zkL1Hc2Q7MYII5iDPsgE~;% ztumreG)#Vk$ccJiLcRcbq#E_HQr@Y7Ibp)4X=+ahm_c+Noy~L`NZumtmuUd}JljO2}zzuohs)G4-g2 zepYNE+7EfejiriyCcj0r3KP3{1V_Do*xazIalOD3s$P-2^WOVbIgB3Hk-nA#VzL9eTaIOOSs)QIcCwfArVw zkf6ON4>~O98_4Q+ReJPMq%l5SJ|n0BdiwOd(48~=&w`#sM?G3<^fbz+!0ULx;sA{{ z;E4BTM@{c=bEHPOsQ2?uDm}QfrVp?nU84|u*o6#@V0&`ISf9W?U*)Lu>0C`8$DF5; zg9kF?Yx-e+o=u}wXeef?f#*5Yz^St|%I->ZALOYPQ0;6@Un!FoYV;@uShq=|%FbXS zNGO3m+@jF|$P+JUG!hGC_*RYDgA^T*8<0O|helno()PWfIS8wgb|2En3mKpPUZWkT zaP*i)lVQ6nkloP1@{ctAznyVKzDHiHBU$M}bI>kbzzfvp|0ybh6vMf<7lqMAm z4O^jDD0RJJmFkU(RT_3F_Q}R9!9EUhy{{^q|43Cx3{vd!a&IMX3{Why#-dnbXtrXF z?nR1CUYw$&_LwSn)vEI7*@{(;LNcrTdah!X&Wo8;z|TwB?Vvet!;fUpJT&Jiz{MIH>&n0wnu? z{t=Z<0T1Z@f9Nyi|GUm9{}2CC`M(zo&;Fn5tK9G};DKYX-I5cz_Q9-wg5i{~I8JKB$;pqx}E%8EWA4$JM}> z;U(<GdFB5t8as@D@lkQtGztpFkq{DVnJ!<~^fTN{>{vXhEMcH>*QdBfmR{^y^aRji-rDbq=BZw+qXw*GwfYf#vK)#(H9e8IQ z+_PeYe%$}|uHp)bI4R(^Z$X``#xqxx8v9>WYHWZyyCA<`ld?G<09cLBdeoU?P-^Vy zrPNmEkrzC&z@ydI3{hbvD;#^nX{K⪙fDzx(tyJ-#H!$+>~y*Byn=UD?BoLM%n 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 DhH7rF 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 0ec9786c64eb7fcabbb5596d2841aa0412f4a3bc..085324979e337ee0daddd4fe317a789c7cc68265 100644 GIT binary patch literal 45056 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 z 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 pX}PaE;83RJu5Rah;+NW4u74BZ?q1w$FaLG;>7^ literal 44032 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 diff --git a/Websites/SharePrices/SharePrices/bin/SharePrices.pdb b/Websites/SharePrices/SharePrices/bin/SharePrices.pdb index cecc6604f40685880bc98aa06b71d31fb7b4865a..da61e0fc76809ec7702999128d17e60f6d94aa5a 100644 GIT binary patch delta 14240 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 UxnqT4Ig-!vzZZOKs4cMkACT!&B>(^b diff --git a/Websites/SharePrices/SharePrices/obj/Debug/SharePrices.dll b/Websites/SharePrices/SharePrices/obj/Debug/SharePrices.dll index 0ec9786c64eb7fcabbb5596d2841aa0412f4a3bc..085324979e337ee0daddd4fe317a789c7cc68265 100644 GIT binary patch literal 45056 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 z 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 pX}PaE;83RJu5Rah;+NW4u74BZ?q1w$FaLG;>7^ literal 44032 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 diff --git a/Websites/SharePrices/SharePrices/obj/Debug/SharePrices.pdb b/Websites/SharePrices/SharePrices/obj/Debug/SharePrices.pdb index cecc6604f40685880bc98aa06b71d31fb7b4865a..da61e0fc76809ec7702999128d17e60f6d94aa5a 100644 GIT binary patch delta 14240 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 UxnqT4Ig-!vzZZOKs4cMkACT!&B>(^b 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