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

ui fixes

Browse Source
This commit is contained in:
MuslemRahimi 2024-12-14 21:26:11 +01:00
parent 32db538ed9
commit 3882116ab6
3 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/routes/options-flow/+page.svelte
View File

@ -1873,7 +1873,7 @@
<div class="border-t border-gray-600 mt-2 w-full"> <div class="border-t border-gray-600 mt-2 w-full">
<label <label
for="mobileTooltip" for="mobileTooltip"
class="mt-4 font-semibold text-white text-xl m-auto flex justify-center" class="mt-4 font-semibold text-white text-xl m-auto flex justify-center cursor-pointer"
> >
Close Close
</label> </label>

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

@ -1848,7 +1848,7 @@ const handleKeyDown = (event) => {
ruleName = name; ruleName = name;
if ( if (
ruleCondition[ruleName] === "between" && ruleCondition[ruleName] === "between" &&
["over", "under"]?.includes(state?.toLowerCase()) ["over", "under", "exactly"]?.includes(state?.toLowerCase())
) { ) {
valueMappings[ruleName] = ""; valueMappings[ruleName] = "";
} }
@ -2733,7 +2733,8 @@ const handleKeyDown = (event) => {
{:else} {:else}
{ruleCondition[row?.rule] {ruleCondition[row?.rule]
?.replace("under", "Under") ?.replace("under", "Under")
?.replace("over", "Over") ?? ""} ?.replace("over", "Over")
?.replace("exactly", "Exactly") ?? ""}
{valueMappings[row?.rule]} {valueMappings[row?.rule]}
{/if} {/if}
</span> </span>
@ -2778,7 +2779,8 @@ const handleKeyDown = (event) => {
{ruleCondition[ruleName] {ruleCondition[ruleName]
?.replace("under", "Under") ?.replace("under", "Under")
?.replace("over", "Over") ?.replace("over", "Over")
?.replace("between", "Between")} ?.replace("between", "Between")
?.replace("exactly", "Exactly")}
</span> </span>
<svg <svg
class="mt-1 -mr-1 ml-1 h-5 w-5 xs:ml-2 !ml-0 sm:ml-0 inline-block" class="mt-1 -mr-1 ml-1 h-5 w-5 xs:ml-2 !ml-0 sm:ml-0 inline-block"
@ -2796,7 +2798,7 @@ const handleKeyDown = (event) => {
</DropdownMenu.Trigger> </DropdownMenu.Trigger>
<DropdownMenu.Content> <DropdownMenu.Content>
<DropdownMenu.Group> <DropdownMenu.Group>
{#each ["Over", "Under", "Between"] as item} {#each ["Over", "Under", "Between", "Exactly"] as item}
<DropdownMenu.Item <DropdownMenu.Item
on:click={() => on:click={() =>
changeRuleCondition( changeRuleCondition(
@ -2855,7 +2857,7 @@ const handleKeyDown = (event) => {
/> />
{/if} {/if}
{#if ["over", "under"]?.includes(ruleCondition[ruleName]?.toLowerCase())} {#if ["over", "under", "exactly"]?.includes(ruleCondition[ruleName]?.toLowerCase())}
<div <div
class="ml-2 flex touch-manipulation flex-row items-center gap-x-1.5" class="ml-2 flex touch-manipulation flex-row items-center gap-x-1.5"
> >
@ -2968,7 +2970,8 @@ const handleKeyDown = (event) => {
> >
{ruleCondition[row?.rule] {ruleCondition[row?.rule]
?.replace("under", "Under") ?.replace("under", "Under")
?.replace("over", "Over")} ?.replace("over", "Over")
?.replace("exactly", "Exactly")}
{newValue} {newValue}
</button> </button>
</DropdownMenu.Item> </DropdownMenu.Item>

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

@ -174,13 +174,11 @@ function createRuleCheck(rule, ruleName, ruleValue) {
if (itemValue === null) return false; if (itemValue === null) return false;
if (rule.condition === 'over') { if (rule.condition === 'exactly' && itemValue !== ruleValue) return false;
return itemValue > ruleValue; if (rule.condition === 'over' && itemValue <= ruleValue) return false;
} if (rule.condition === 'under' && itemValue >= ruleValue) return false;
if (rule.condition === 'under') {
return itemValue < ruleValue;
}
// Default comparison if no specific condition // Default comparison if no specific condition
return true; return true;