Skip to content

Develop #388

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
CropWatchDevelopment merged 2 commits into from
Apr 8, 2026
Merged

Develop #388

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
678c44e
fixed bug where soil ec was getting fixed to no decimal points making…
CropWatchDevelopment Apr 8, 2026
b0fe416
adding in 2 decimal places for ec display
CropWatchDevelopment Apr 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/lib/components/dashboard/DashboardDeviceCards.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@
filters: DashboardDeviceFilters;
cardLayout?: CardLayout;
}

const PHONE_BREAKPOINT_PX = 768;

const SCROLL_CONTAINER_SELECTOR = '[data-dashboard-device-card-scroll="true"]';
const PREFETCH_ROOT_MARGIN = '0px 0px 45% 0px';

Expand Down
40 changes: 26 additions & 14 deletions src/lib/components/displays/SoilDisplay/SoilDisplay.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@
{ key: 'created_at', header: m.display_timestamp(), sortable: true, width: '13.5rem' },
{ key: 'temperature_c', header: m.rule_subject_temperature(), sortable: true, width: '8rem' },
{ key: 'moisture', header: m.rule_subject_soil_moisture(), sortable: true, width: '9rem' },
{ key: 'ec', header: 'EC (µS/cm)', sortable: true, width: '9rem' },
{ key: 'ph', header: m.rule_subject_ph(), sortable: true, width: '6rem' }
{ key: 'ec', header: 'EC (dS/cm)', sortable: true, width: '9rem' },
// { key: 'ph', header: m.rule_subject_ph(), sortable: true, width: '6rem' }
];

// ---- Derived state ---------------------------------------------------------
Expand Down Expand Up @@ -147,17 +147,29 @@
<div class="soil-display">
<!-- KPI cards -->
<div class="kpi-grid">
<CwStatCard title={m.rule_subject_temperature()} stats={temperatureStats} unit="°C" labels={{ clickToExpand: m.stat_expand(), clickToCollapse: m.stat_collapse() }} />

<CwStatCard title={m.rule_subject_soil_moisture()} stats={soilMoistureStats} unit="%" labels={{ clickToExpand: m.stat_expand(), clickToCollapse: m.stat_collapse() }} />
<CwStatCard
title={m.rule_subject_temperature()}
stats={temperatureStats}
unit="°C"
labels={{ clickToExpand: m.stat_expand(), clickToCollapse: m.stat_collapse() }}
/>

<CwStatCard
title={m.rule_subject_soil_moisture()}
stats={soilMoistureStats}
unit="%"
labels={{ clickToExpand: m.stat_expand(), clickToCollapse: m.stat_collapse() }}
/>

<CwCard title="EC" subtitle={m.display_latest_reading()} elevated>
<p class="kpi-value">{latest.ec.toFixed(0)}<span>µS/cm</span></p>
<p class="kpi-value">{latest.ec.toFixed(2)}<span>dS/cm</span></p>
</CwCard>

<CwCard title={m.rule_subject_ph()} subtitle={m.display_latest_reading()} elevated>
<p class="kpi-value">{latest.ph.toFixed(1)}</p>
</CwCard>
{#if latest.ph > 0}
<CwCard title={m.rule_subject_ph()} subtitle={m.display_latest_reading()} elevated>
<p class="kpi-value">{latest.ph.toFixed(1)}</p>
</CwCard>
{/if}
</div>

{#if !loading && rows.length > 0}
Expand All @@ -169,10 +181,10 @@
<CwLineChart
data={moistureSeries}
secondaryData={temperatureSeries}
primaryLabel={m.rule_subject_soil_moisture()}
primaryUnit="%"
secondaryLabel={m.rule_subject_temperature()}
secondaryUnit="°C"
secondaryLabel={m.rule_subject_soil_moisture()}
secondaryUnit="%"
primaryLabel={m.rule_subject_temperature()}
primaryUnit="°C"
height={400}
/>
</CwCard>
Expand All @@ -187,7 +199,7 @@
{:else if col.key === 'moisture'}
{row.moisture.toFixed(2)} %
{:else if col.key === 'ec'}
{row.ec.toFixed(0)} µS/cm
{row.ec.toFixed(2)} dS/cm
{:else if col.key === 'ph'}
{row.ph.toFixed(2)}
{:else}
Expand Down
Loading