From a622108ef1393e7c54fe4f5ba0a8760d3022508b Mon Sep 17 00:00:00 2001
From: MuslemRahimi <moslem_rahimi@hotmail.de>
Date: Thu, 2 Jan 2025 16:48:06 +0100
Subject: [PATCH] add dte column

---
 .../options/hottest-contracts/+page.svelte    | 31 ++++++++++++-------
 .../stocks/[tickerID]/dark-pool/+page.svelte  |  3 +-
 .../options/hottest-contracts/+page.svelte    | 31 ++++++++++++-------
 3 files changed, 39 insertions(+), 26 deletions(-)

diff --git a/src/routes/etf/[tickerID]/options/hottest-contracts/+page.svelte b/src/routes/etf/[tickerID]/options/hottest-contracts/+page.svelte
index db74b7b5..d3c95f6e 100644
--- a/src/routes/etf/[tickerID]/options/hottest-contracts/+page.svelte
+++ b/src/routes/etf/[tickerID]/options/hottest-contracts/+page.svelte
@@ -7,11 +7,6 @@
   import Infobox from "$lib/components/Infobox.svelte";
   export let data;
 
-  let rawData = data?.getData;
-  let openInterestList = rawData?.sort(
-    (a, b) => b?.open_interest - a?.open_interest,
-  );
-
   const currentTime = new Date(
     new Date().toLocaleString("en-US", { timeZone: "America/New_York" }),
   )?.getTime();
@@ -26,8 +21,18 @@
     return daysLeft + "D";
   }
 
+  let rawData = data?.getData?.map((item) => ({
+    ...item,
+    dte: daysLeft(item?.date_expiration),
+  }));
+
+  let openInterestList = rawData?.sort(
+    (a, b) => b?.open_interest - a?.open_interest,
+  );
+
   $: columns = [
-    { key: "date_expiration", label: "Chain", align: "left" },
+    { key: "strike_price", label: "Chain", align: "left" },
+    { key: "dte", label: "DTE", align: "right" },
     { key: "last_price", label: "Last", align: "right" },
     { key: "high_price", label: "Low-High", align: "right" },
     { key: "volume", label: "Volume", align: "right" },
@@ -38,7 +43,8 @@
   ];
 
   $: sortOrders = {
-    date_expiration: { order: "none", type: "string" },
+    strike_price: { order: "none", type: "number" },
+    dte: { order: "none", type: "number" },
     last_price: { order: "none", type: "number" },
     high_price: { order: "none", type: "number" },
     volume: { order: "none", type: "number" },
@@ -150,12 +156,13 @@
                       >
                         {item?.option_type === "C" ? "Call" : "Put"}
                       </span>
-                      {" " +
-                        item?.date_expiration +
-                        " " +
-                        `(${daysLeft(item?.date_expiration)})`}
+                      {" " + item?.date_expiration}
+                    </td>
+                    <td
+                      class="text-white text-sm sm:text-[1rem] text-end whitespace-nowrap"
+                    >
+                      {item?.dte}
                     </td>
-
                     <td
                       class="text-white text-sm sm:text-[1rem] text-end whitespace-nowrap"
                     >
diff --git a/src/routes/stocks/[tickerID]/dark-pool/+page.svelte b/src/routes/stocks/[tickerID]/dark-pool/+page.svelte
index 7d706f54..105c7da6 100644
--- a/src/routes/stocks/[tickerID]/dark-pool/+page.svelte
+++ b/src/routes/stocks/[tickerID]/dark-pool/+page.svelte
@@ -17,7 +17,6 @@
   let priceLevel = data?.getPriceLevel?.priceLevel || [];
   let hottestTrades = data?.getPriceLevel?.hottestTrades || [];
   let isLoaded = false;
-
   onMount(() => {
     isLoaded = true;
   });
@@ -100,7 +99,7 @@
             {#if hottestTrades?.length > 0}
               <HottestTrades rawData={hottestTrades} />
             {/if}
-            {#if historicalDarkPool?.length > 0}
+            {#if historicalDarkPool?.length > 10}
               <HistoricalVolume rawData={historicalDarkPool} />
             {/if}
           {:else}
diff --git a/src/routes/stocks/[tickerID]/options/hottest-contracts/+page.svelte b/src/routes/stocks/[tickerID]/options/hottest-contracts/+page.svelte
index db74b7b5..d3c95f6e 100644
--- a/src/routes/stocks/[tickerID]/options/hottest-contracts/+page.svelte
+++ b/src/routes/stocks/[tickerID]/options/hottest-contracts/+page.svelte
@@ -7,11 +7,6 @@
   import Infobox from "$lib/components/Infobox.svelte";
   export let data;
 
-  let rawData = data?.getData;
-  let openInterestList = rawData?.sort(
-    (a, b) => b?.open_interest - a?.open_interest,
-  );
-
   const currentTime = new Date(
     new Date().toLocaleString("en-US", { timeZone: "America/New_York" }),
   )?.getTime();
@@ -26,8 +21,18 @@
     return daysLeft + "D";
   }
 
+  let rawData = data?.getData?.map((item) => ({
+    ...item,
+    dte: daysLeft(item?.date_expiration),
+  }));
+
+  let openInterestList = rawData?.sort(
+    (a, b) => b?.open_interest - a?.open_interest,
+  );
+
   $: columns = [
-    { key: "date_expiration", label: "Chain", align: "left" },
+    { key: "strike_price", label: "Chain", align: "left" },
+    { key: "dte", label: "DTE", align: "right" },
     { key: "last_price", label: "Last", align: "right" },
     { key: "high_price", label: "Low-High", align: "right" },
     { key: "volume", label: "Volume", align: "right" },
@@ -38,7 +43,8 @@
   ];
 
   $: sortOrders = {
-    date_expiration: { order: "none", type: "string" },
+    strike_price: { order: "none", type: "number" },
+    dte: { order: "none", type: "number" },
     last_price: { order: "none", type: "number" },
     high_price: { order: "none", type: "number" },
     volume: { order: "none", type: "number" },
@@ -150,12 +156,13 @@
                       >
                         {item?.option_type === "C" ? "Call" : "Put"}
                       </span>
-                      {" " +
-                        item?.date_expiration +
-                        " " +
-                        `(${daysLeft(item?.date_expiration)})`}
+                      {" " + item?.date_expiration}
+                    </td>
+                    <td
+                      class="text-white text-sm sm:text-[1rem] text-end whitespace-nowrap"
+                    >
+                      {item?.dte}
                     </td>
-
                     <td
                       class="text-white text-sm sm:text-[1rem] text-end whitespace-nowrap"
                     >