AmineTMIRI/frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update halal stocks in screener

Browse Source
This commit is contained in:
MuslemRahimi 2024-10-14 09:49:20 +02:00
parent 3d538d4c6b
commit a4a2c469a1
2 changed files with 30 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/routes/stock-screener/+page.svelte
View File

@ -184,6 +184,7 @@ const allRules = {
piotroskiScore: { label: 'Piotroski F-Score', step: [9,8,7,6,5,4,3,2,1], category: 'fund', defaultCondition: 'over', defaultValue: 'any' }, piotroskiScore: { label: 'Piotroski F-Score', step: [9,8,7,6,5,4,3,2,1], category: 'fund', defaultCondition: 'over', defaultValue: 'any' },
analystRating: { label: 'Analyst Rating', step: ['Strong Buy', 'Buy', 'Hold', 'Sell', 'Strong Sell'], category: 'fund', defaultCondition: '', defaultValue: 'any' }, analystRating: { label: 'Analyst Rating', step: ['Strong Buy', 'Buy', 'Hold', 'Sell', 'Strong Sell'], category: 'fund', defaultCondition: '', defaultValue: 'any' },
halalStocks: { label: 'Halal Stocks', step: ['Compliant', 'Non-Compliant'], defaultCondition: '', defaultValue: 'any' },
score: { label: 'AI Score', step: ['Strong Buy', 'Buy', 'Hold', 'Sell', 'Strong Sell'], category: 'fund', defaultCondition: '', defaultValue: 'any' }, score: { label: 'AI Score', step: ['Strong Buy', 'Buy', 'Hold', 'Sell', 'Strong Sell'], category: 'fund', defaultCondition: '', defaultValue: 'any' },
sector: { label: 'Sector', step: sectorList, category: 'fund', defaultCondition: '', defaultValue: 'any' }, sector: { label: 'Sector', step: sectorList, category: 'fund', defaultCondition: '', defaultValue: 'any' },
industry: { label: 'Industry', step: industryList, category: 'fund', defaultCondition: '', defaultValue: 'any' }, industry: { label: 'Industry', step: industryList, category: 'fund', defaultCondition: '', defaultValue: 'any' },
@ -299,7 +300,7 @@ async function handleDeleteStrategy() {
await updateStockScreenerData(); await updateStockScreenerData();
checkedItems = new Map( checkedItems = new Map(
ruleOfList ruleOfList
?.filter(rule => ["analystRating", "sector","country","score","industry","grahamNumber"]?.includes(rule.name)) // Only include specific rules ?.filter(rule => ["analystRating", "halalStocks", "sector","country","score","industry","grahamNumber"]?.includes(rule.name)) // Only include specific rules
?.map(rule => [rule.name, new Set(rule.value)]) // Create Map from filtered rules ?.map(rule => [rule.name, new Set(rule.value)]) // Create Map from filtered rules
); );
} }
@ -391,7 +392,7 @@ async function switchStrategy(item) {
await updateStockScreenerData(); await updateStockScreenerData();
checkedItems = new Map( checkedItems = new Map(
ruleOfList ruleOfList
?.filter(rule => ["analystRating", "sector","country","score","industry","grahamNumber"]?.includes(rule.name)) // Only include specific rules ?.filter(rule => ["analystRating", "halalStocks","sector","country","score","industry","grahamNumber"]?.includes(rule.name)) // Only include specific rules
?.map(rule => [rule.name, new Set(rule.value)]) // Create Map from filtered rules ?.map(rule => [rule.name, new Set(rule.value)]) // Create Map from filtered rules
); );
@ -443,6 +444,7 @@ function handleAddRule() {
switch (ruleName) { switch (ruleName) {
case 'analystRating': case 'analystRating':
case 'halalStocks':
case 'score': case 'score':
case 'sector': case 'sector':
case 'industry': case 'industry':
@ -505,7 +507,7 @@ async function handleResetAll() {
displayResults = []; displayResults = [];
checkedItems = new Map( checkedItems = new Map(
ruleOfList ruleOfList
?.filter(rule => ["analystRating", "sector","country","score","industry","grahamNumber"]?.includes(rule.name)) // Only include specific rules ?.filter(rule => ["analystRating", "halalStocks","sector","country","score","industry","grahamNumber"]?.includes(rule.name)) // Only include specific rules
?.map(rule => [rule.name, new Set(rule.value)]) // Create Map from filtered rules ?.map(rule => [rule.name, new Set(rule.value)]) // Create Map from filtered rules
); );
Object.keys(allRules).forEach(ruleName => { Object.keys(allRules).forEach(ruleName => {
@ -718,7 +720,7 @@ function changeRuleCondition(name: string, state: string) {
let checkedItems = new Map( let checkedItems = new Map(
ruleOfList ruleOfList
?.filter(rule => ["analystRating", "sector","country","score","industry","grahamNumber"]?.includes(rule.name)) // Only include specific rules ?.filter(rule => ["analystRating", "halalStocks","sector","country","score","industry","grahamNumber"]?.includes(rule.name)) // Only include specific rules
?.map(rule => [rule.name, new Set(rule.value)]) // Create Map from filtered rules ?.map(rule => [rule.name, new Set(rule.value)]) // Create Map from filtered rules
); );
@ -741,7 +743,7 @@ async function handleChangeValue(value) {
checkedItems.set(ruleName, new Set([value])); checkedItems.set(ruleName, new Set([value]));
} }
if (['sma20','sma50','sma100','sma200','ema20', 'ema50', 'ema100', 'ema200','grahamNumber','analystRating','score','sector','industry','country']?.includes(ruleName)) { if (['sma20','sma50','sma100','sma200','ema20', 'ema50', 'ema100', 'ema200','grahamNumber','analystRating','halalStocks','score','sector','industry','country']?.includes(ruleName)) {
// Ensure valueMappings[ruleName] is initialized as an array // Ensure valueMappings[ruleName] is initialized as an array
searchQuery = ''; searchQuery = '';
if (!Array.isArray(valueMappings[ruleName])) { if (!Array.isArray(valueMappings[ruleName])) {
@ -839,14 +841,11 @@ async function popularStrategy(state: string) {
{ condition: "over", name: "freeCashFlowMargin", value: '50%' } { condition: "over", name: "freeCashFlowMargin", value: '50%' }
] ]
}, },
halalStocks: { // New Strategy Added bestHalalStocks: { // New Strategy Added
name: 'Halal Stocks', name: 'Top Halal Stocks',
rules: [ rules: [
{ condition: "under", name: "shortTermDebtToCapitalization", value: "30%" }, { condition: "", name: "halalStocks", value: 'Compliant' },
{ condition: "under", name: "interestIncomeToCapitalization", value: "30%" }, { condition: "over", name: "marketCap", value: '1B' },
{ condition: "under", name: "longTermDebtToCapitalization", value: "30%" },
{ condition: "under", name: "interestDebtPerShare", value: 1 },
{ condition: "under", name: "debtRatio", value: 0 }
] ]
} }
}; };
@ -874,7 +873,7 @@ function handleInput(event) {
if (searchQuery.length > 0) { if (searchQuery.length > 0) {
const rawList = ruleName === 'country' ? listOfRelevantCountries : ruleName === 'sector' ? sectorList : ruleName === 'industry' ? industryList : ruleName === 'analystRating' ? ['Strong Buy', 'Buy', 'Hold', 'Sell', 'Strong Sell'] : ['Strong Buy','Hold','Sell','Strong Sell']; const rawList = ruleName === 'country' ? listOfRelevantCountries : ruleName === 'sector' ? sectorList : ruleName === 'industry' ? industryList : (ruleName === 'analystRating' || ruleName === 'score') ? ['Strong Buy', 'Buy', 'Hold', 'Sell', 'Strong Sell'] : ['Compliant', 'Non-Compliant'];
testList = rawList?.filter(item => { testList = rawList?.filter(item => {
const index = item?.toLowerCase(); const index = item?.toLowerCase();
// Check if country starts with searchQuery // Check if country starts with searchQuery
@ -983,8 +982,8 @@ function handleInput(event) {
<DropdownMenu.Item on:click={() => popularStrategy('strongCashFlow')} class="cursor-pointer hover:bg-[#27272A]"> <DropdownMenu.Item on:click={() => popularStrategy('strongCashFlow')} class="cursor-pointer hover:bg-[#27272A]">
Strong Cash Flow Strong Cash Flow
</DropdownMenu.Item> </DropdownMenu.Item>
<DropdownMenu.Item on:click={() => popularStrategy('halalStocks')} class="cursor-pointer hover:bg-[#27272A]"> <DropdownMenu.Item on:click={() => popularStrategy('bestHalalStocks')} class="cursor-pointer hover:bg-[#27272A]">
Halal Stocks Top Halal Stocks
</DropdownMenu.Item> </DropdownMenu.Item>
</DropdownMenu.Group> </DropdownMenu.Group>
</DropdownMenu.Content> </DropdownMenu.Content>
@ -1162,7 +1161,7 @@ function handleInput(event) {
</Button> </Button>
</DropdownMenu.Trigger> </DropdownMenu.Trigger>
<DropdownMenu.Content class="w-56 h-fit max-h-72 overflow-y-auto scroller"> <DropdownMenu.Content class="w-56 h-fit max-h-72 overflow-y-auto scroller">
{#if !['sma20','sma50','sma100','sma200','ema20', 'ema50', 'ema100', 'ema200', 'grahamNumber','analystRating','score','sector','industry','country']?.includes(row?.rule)} {#if !['sma20','sma50','sma100','sma200','ema20', 'ema50', 'ema100', 'ema200', 'grahamNumber','analystRating','halalStocks','score','sector','industry','country']?.includes(row?.rule)}
<DropdownMenu.Label class="absolute mt-2 h-11 border-gray-800 border-b -top-1 z-20 fixed sticky bg-[#09090B]"> <DropdownMenu.Label class="absolute mt-2 h-11 border-gray-800 border-b -top-1 z-20 fixed sticky bg-[#09090B]">
<div class="flex items-center justify-start gap-x-1"> <div class="flex items-center justify-start gap-x-1">
<div class="relative inline-block flex flex-row items-center justify-center"> <div class="relative inline-block flex flex-row items-center justify-center">
@ -1185,14 +1184,14 @@ function handleInput(event) {
<input bind:value={searchQuery} <input bind:value={searchQuery}
on:input={handleInput} on:input={handleInput}
autocomplete="off" autocomplete="off"
class="{!['analystRating','score','sector','industry','country']?.includes(row?.rule) ? 'hidden' : ''} absolute fixed sticky w-full border-0 bg-[#09090B] border-b border-gray-200 class="{!['analystRating','halalStocks','score','sector','industry','country']?.includes(row?.rule) ? 'hidden' : ''} absolute fixed sticky w-full border-0 bg-[#09090B] border-b border-gray-200
focus:border-gray-200 focus:ring-0 text-white placeholder:text-gray-300" focus:border-gray-200 focus:ring-0 text-white placeholder:text-gray-300"
type="search" type="search"
placeholder="Search..."> placeholder="Search...">
</div> </div>
{/if} {/if}
<DropdownMenu.Group class="min-h-10 mt-2"> <DropdownMenu.Group class="min-h-10 mt-2">
{#if !['sma20','sma50','sma100','sma200','ema20', 'ema50', 'ema100', 'ema200', 'grahamNumber','analystRating','score','sector','industry','country']?.includes(row?.rule)} {#if !['sma20','sma50','sma100','sma200','ema20', 'ema50', 'ema100', 'ema200', 'grahamNumber','analystRating','halalStocks','score','sector','industry','country']?.includes(row?.rule)}
{#each row?.step as newValue} {#each row?.step as newValue}
<DropdownMenu.Item class="sm:hover:bg-[#27272A]"> <DropdownMenu.Item class="sm:hover:bg-[#27272A]">
@ -1213,7 +1212,7 @@ function handleInput(event) {
</DropdownMenu.Item> </DropdownMenu.Item>
{/each} {/each}
{:else} {:else}
{#each (testList.length > 0 && searchQuery?.length > 0 ? testList : searchQuery?.length > 0 && testList?.length === 0 ? [] : (row?.rule === 'country' ? listOfRelevantCountries : row?.rule === 'sector' ? sectorList : row?.rule === 'industry' ? industryList : ruleName === 'analystRating' ? ['Strong Buy', 'Buy', 'Hold', 'Sell', 'Strong Sell'] : ['Strong Buy','Buy','Hold','Sell','Strong Sell'])) as item} {#each (testList.length > 0 && searchQuery?.length > 0 ? testList : searchQuery?.length > 0 && testList?.length === 0 ? [] : (row?.rule === 'country' ? listOfRelevantCountries : row?.rule === 'sector' ? sectorList : row?.rule === 'industry' ? industryList : (ruleName === 'analystRating' || ruleName === 'score') ? ['Strong Buy', 'Buy', 'Hold', 'Sell', 'Strong Sell'] : ['Compliant', 'Non-Compliant'])) as item}
<DropdownMenu.Item class="sm:hover:bg-[#27272A]"> <DropdownMenu.Item class="sm:hover:bg-[#27272A]">
<div class="flex items-center" on:click|capture={(event) => event.preventDefault()}> <div class="flex items-center" on:click|capture={(event) => event.preventDefault()}>
<label on:click={() => {handleChangeValue(item)}} class="cursor-pointer text-white" for={item}> <label on:click={() => {handleChangeValue(item)}} class="cursor-pointer text-white" for={item}>
@ -1453,7 +1452,7 @@ function handleInput(event) {
{#each displayRules as row (row?.rule)} {#each displayRules as row (row?.rule)}
{#if row?.rule !== 'marketCap'} {#if row?.rule !== 'marketCap'}
<td class="whitespace-nowrap text-sm sm:text-[1rem] text-end text-white border-b-[#09090B]"> <td class="whitespace-nowrap text-sm sm:text-[1rem] text-end text-white border-b-[#09090B]">
{#if ['ema20', 'ema50', 'ema100', 'ema200', 'analystRating','score','sector','industry','country']?.includes(row?.rule)} {#if ['ema20', 'ema50', 'ema100', 'ema200', 'analystRating','halalStocks','score','sector','industry','country']?.includes(row?.rule)}
{item[row?.rule]} {item[row?.rule]}
{:else if ['fundamentalAnalysis','trendAnalysis']?.includes(row?.rule)} {:else if ['fundamentalAnalysis','trendAnalysis']?.includes(row?.rule)}
{item[row?.rule]?.accuracy}% {item[row?.rule]?.accuracy}%

15
src/routes/stock-screener/workers/filterWorker.ts
View File

@ -65,7 +65,9 @@ function convertUnitToValue(
"buy", "buy",
"strong buy", "strong buy",
"strong sell", "strong sell",
"stock price", // Add "stock price" to non-numeric values "compliant",
"non-compliant",
"stock price",
]); ]);
if (nonNumericValues.has(lowerInput)) return input; if (nonNumericValues.has(lowerInput)) return input;
@ -111,9 +113,14 @@ async function filterStockScreenerData(stockScreenerData, ruleOfList) {
// Handle categorical data like analyst ratings, sector, country // Handle categorical data like analyst ratings, sector, country
else if ( else if (
["analystRating", "score", "sector", "industry", "country"].includes( [
rule.name "analystRating",
) "halalStocks",
"score",
"sector",
"industry",
"country",
].includes(rule.name)
) { ) {
if (rule.value === "any") return true; if (rule.value === "any") return true;