brian/wanderer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

adds totals when auto-adding summit log

Browse Source
This commit is contained in:
Christian Beutel
2024-11-09 12:37:08 +01:00
parent e9e52c13a1
commit 0ab0eda612
2 changed files with 41 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
web/src/routes/api/v1/trail/upload/+server.ts
View File

@@ -39,9 +39,14 @@ export async function PUT(event: RequestEvent) {
try { try {
trail = (await gpx2trail(gpxData, data.get("name") as string | undefined)).trail; trail = (await gpx2trail(gpxData, data.get("name") as string | undefined)).trail;
const log = new SummitLog(trail.date as string, {}) const log = new SummitLog(trail.date as string, {
distance: trail.distance,
elevation_gain: trail.elevation_gain,
elevation_loss: trail.elevation_loss,
duration: trail.duration ? trail.duration * 60 : undefined,
})
log.expand.gpx_data = gpxData; log.expand.gpx_data = gpxData;
log._gpx = gpxFile; log._gpx = new File([gpxFile], (data.get("name") as string | null) ?? "file");
trail.expand.summit_logs.push(log); trail.expand.summit_logs.push(log);
} catch (e: any) { } catch (e: any) {

48
web/src/routes/trail/edit/[id]/+page.svelte
View File

@@ -290,7 +290,12 @@
$form.expand.gpx_data = gpxData; $form.expand.gpx_data = gpxData;
$form.category = $page.data.settings.category || $categories[0].id; $form.category = $page.data.settings.category || $categories[0].id;
const log = new SummitLog(parseResult.trail.date as string, {}) const log = new SummitLog(parseResult.trail.date as string, {
distance: $form.distance,
elevation_gain: $form.elevation_gain,
elevation_loss: $form.elevation_loss,
duration: $form.duration ? $form.duration * 60 : undefined,
});
log.expand.gpx_data = gpxData; log.expand.gpx_data = gpxData;
log._gpx = selectedFile; log._gpx = selectedFile;
@@ -694,7 +699,7 @@
> >
</div> </div>
<div class="flex gap-4 justify-around"> <div class="grid grid-cols-2 gap-4 justify-around">
{#if editingBasicInfo} {#if editingBasicInfo}
<TextField <TextField
bind:value={$form.distance} bind:value={$form.distance}
@@ -702,18 +707,22 @@
label={$_("distance")} label={$_("distance")}
></TextField> ></TextField>
<TextField <TextField
bind:value={$form.duration}
name="duration"
label={$_("est-duration")}
></TextField><TextField
bind:value={$form.elevation_gain} bind:value={$form.elevation_gain}
name="elevation_gain" name="elevation_gain"
label={$_("elevation-gain")} label={$_("elevation-gain")}
></TextField> ></TextField>
<TextField <TextField
bind:value={$form.duration} bind:value={$form.elevation_loss}
name="duration" name="elevation_loss"
label={$_("est-duration")} label={$_("elevation-loss")}
></TextField> ></TextField>
{:else} {:else}
<div class="flex flex-col"> <div>
<span>{$_("distance")}</span> <p>{$_("distance")}</p>
<span class="font-medium" <span class="font-medium"
>{formatDistance($form.distance)}</span >{formatDistance($form.distance)}</span
> >
@@ -723,8 +732,19 @@
value={$form.distance} value={$form.distance}
/> />
</div> </div>
<div class="flex flex-col"> <div>
<span>{$_("elevation-gain")}</span> <p>{$_("est-duration")}</p>
<span class="font-medium"
>{formatTimeHHMM($form.duration)}</span
>
<input
type="hidden"
name="duration"
value={$form.duration}
/>
</div>
<div>
<p>{$_("elevation-gain")}</p>
<span class="font-medium" <span class="font-medium"
>{formatElevation($form.elevation_gain)}</span >{formatElevation($form.elevation_gain)}</span
> >
@@ -734,15 +754,15 @@
value={$form.elevation_gain} value={$form.elevation_gain}
/> />
</div> </div>
<div class="flex flex-col"> <div>
<span>{$_("est-duration")}</span> <p>{$_("elevation-loss")}</p>
<span class="font-medium" <span class="font-medium"
>{formatTimeHHMM($form.duration)}</span >{formatElevation($form.elevation_loss)}</span
> >
<input <input
type="hidden" type="hidden"
name="duration" name="elevation_gain"
value={$form.duration} value={$form.elevation_gain}
/> />
</div> </div>
{/if} {/if}