From 93f2d10e132d9db8d16554f1e796b5d5cfb39227 Mon Sep 17 00:00:00 2001
From: MuslemRahimi <moslem_rahimi@hotmail.de>
Date: Fri, 6 Sep 2024 00:39:27 +0200
Subject: [PATCH] add select box for countries

---
 .../stock-screener/[strategyId]/+page.svelte  | 52 ++++++++++++++-----
 .../[strategyId]/workers/filterWorker.ts      | 18 +++++--
 2 files changed, 53 insertions(+), 17 deletions(-)

diff --git a/src/routes/stock-screener/[strategyId]/+page.svelte b/src/routes/stock-screener/[strategyId]/+page.svelte
index d5a0844c..e0ec9475 100644
--- a/src/routes/stock-screener/[strategyId]/+page.svelte
+++ b/src/routes/stock-screener/[strategyId]/+page.svelte
@@ -240,26 +240,22 @@ function handleAddRule() {
   
     let newRule;
   
-    switch (ruleName) {
+   switch (ruleName) {
       case 'analystRating':
-        newRule = { name: ruleName, value:  valueMappings[ruleName] }; //ruleTrend[ruleName]
-        break;
       case 'sector':
-        newRule = { name: ruleName, value:  valueMappings[ruleName] }; //ruleTrend[ruleName]
+        newRule = { name: ruleName, value: valueMappings[ruleName] };
         break;
       case 'country':
-        newRule = { name: ruleName, value:  valueMappings[ruleName] }; //ruleTrend[ruleName]
+        newRule = { name: ruleName, value: Array.isArray(valueMappings[ruleName]) ? valueMappings[ruleName] : [valueMappings[ruleName]] }; // Ensure value is an array
         break;
       default:
-        // Handle other cases if needed
-        newRule ={ 
+        newRule = { 
           name: ruleName, 
           condition: ruleCondition[ruleName], 
           value: valueMappings[ruleName] 
         };
         break;
     }
-
     handleRule(newRule);
 }
 
@@ -505,8 +501,31 @@ function changeRuleCondition(name: string, state: string) {
   ruleCondition[ruleName] = state;
 }
 
-function handleChangeValue(value) {
-  if (ruleName in valueMappings) {
+async function handleChangeValue(value) {
+  // Check if the current rule is "country"
+  if (ruleName === "country") {
+    // Ensure valueMappings[ruleName] is initialized as an array
+    if (!Array.isArray(valueMappings[ruleName])) {
+      valueMappings[ruleName] = []; // Initialize as an empty array if not already
+    }
+
+    const index = valueMappings[ruleName].indexOf(value);
+    if (index === -1) {
+      // Add the country if it's not already selected
+      valueMappings[ruleName].push(value);
+    } else {
+      // Remove the country if it's already selected (deselect)
+      valueMappings[ruleName].splice(index, 1);
+    }
+
+    // If no countries are selected, set value to "any"
+    if (valueMappings[ruleName].length === 0) {
+      valueMappings[ruleName] = "any";
+    }
+
+    await updateStockScreenerData();
+  } else if (ruleName in valueMappings) {
+    // Handle non-country rules as single values
     valueMappings[ruleName] = value;
   } else {
     console.warn(`Unhandled rule: ${ruleName}`);
@@ -514,6 +533,8 @@ function handleChangeValue(value) {
 }
 
 
+
+
 async function popularStrategy(state: string) {
   ruleOfList = [];
     const strategies = {
@@ -850,8 +871,15 @@ function handleInput(event) {
                                       {#each (testList.length > 0 && searchQuery?.length > 0 ? testList : searchQuery?.length > 0 && testList?.length === 0 ? [] : listOfRelevantCountries) as item}
                                         <DropdownMenu.Item class="sm:hover:bg-[#27272A]">
                                           <div class="flex items-center">
-                                            <label on:click={() => {handleChangeValue(item)}} class="text-white" for={item}>
-                                              <input type="checkbox" checked={ruleOfList?.some(rule => rule?.value === item)} class="h-4 w-4 rounded bg-dark-500 border border-gray-500 text-blue-600 focus:ring-blue-500" id={item}>
+                                            <label on:click={() => {handleChangeValue(item)}} class="cursor-pointer text-white" for={item}>
+                                              <input type="checkbox" checked={ruleOfList?.some(rule => 
+                                                rule?.name === 'country' && 
+                                                Array?.isArray(rule?.value) && 
+                                                rule?.value.includes(item))}
+                                                class="h-4 w-4 rounded bg-dark-500 border border-gray-500 text-blue-600 focus:ring-blue-500" id={ruleOfList?.some(rule => 
+                                                rule?.name === 'country' && 
+                                                Array?.isArray(rule?.value) && 
+                                                rule?.value.includes(item))}>
                                               <span class="ml-2">{item}</span>
                                             </label>
                                           </div>
diff --git a/src/routes/stock-screener/[strategyId]/workers/filterWorker.ts b/src/routes/stock-screener/[strategyId]/workers/filterWorker.ts
index f3a3e6b6..6b0b53a8 100644
--- a/src/routes/stock-screener/[strategyId]/workers/filterWorker.ts
+++ b/src/routes/stock-screener/[strategyId]/workers/filterWorker.ts
@@ -1,6 +1,13 @@
 import { sectorList, listOfRelevantCountries } from "$lib/utils";
 
-function convertUnitToValue(input: string | number): number {
+function convertUnitToValue(
+  input: string | number | string[]
+): number | string[] {
+  // Handle arrays directly
+  if (Array.isArray(input)) {
+    return input; // Return the array as-is, conversion not needed
+  }
+
   if (typeof input === "number") {
     return input; // If it's already a number, return it directly.
   }
@@ -68,6 +75,7 @@ async function filterStockScreenerData(stockScreenerData, ruleOfList) {
     for (const rule of ruleOfList) {
       const itemValue = item[rule.name];
       const ruleValue = convertUnitToValue(rule.value);
+
       if (["trendAnalysis", "fundamentalAnalysis"].includes(rule.name)) {
         const accuracy = item[rule.name]?.accuracy;
         if (rule.condition === "over" && accuracy <= ruleValue) {
@@ -87,10 +95,10 @@ async function filterStockScreenerData(stockScreenerData, ruleOfList) {
           return false;
         }
       } else if (rule.name === "country") {
-        if (
-          listOfRelevantCountries?.includes(rule.value) &&
-          itemValue !== rule.value
-        ) {
+        // Handle the case where rule.value can be a list of countries
+        if (Array.isArray(ruleValue) && !ruleValue.includes(itemValue)) {
+          return false;
+        } else if (!Array.isArray(ruleValue) && itemValue !== ruleValue) {
           return false;
         }
       } else {