diff --git a/src/lib/components/dashboard/DashboardDeviceCards.svelte b/src/lib/components/dashboard/DashboardDeviceCards.svelte index 3f0a6cfb..d03bef8f 100644 --- a/src/lib/components/dashboard/DashboardDeviceCards.svelte +++ b/src/lib/components/dashboard/DashboardDeviceCards.svelte @@ -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'; diff --git a/src/lib/components/displays/SoilDisplay/SoilDisplay.svelte b/src/lib/components/displays/SoilDisplay/SoilDisplay.svelte index 3469faee..1990f3bf 100644 --- a/src/lib/components/displays/SoilDisplay/SoilDisplay.svelte +++ b/src/lib/components/displays/SoilDisplay/SoilDisplay.svelte @@ -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 --------------------------------------------------------- @@ -147,17 +147,29 @@
- - - + + + -

{latest.ec.toFixed(0)}µS/cm

+

{latest.ec.toFixed(2)}dS/cm

- -

{latest.ph.toFixed(1)}

-
+ {#if latest.ph > 0} + +

{latest.ph.toFixed(1)}

+
+ {/if}
{#if !loading && rows.length > 0} @@ -169,10 +181,10 @@ @@ -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}