* Show timezone information on visits list (#865)
* Initial plan
* Initial investigation: Show timezone on visits list - planning implementation
Co-authored-by: seanmorley15 <98704938+seanmorley15@users.noreply.github.com>
* Show timezone on visits list - add timezone badge display
Co-authored-by: seanmorley15 <98704938+seanmorley15@users.noreply.github.com>
---------
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: seanmorley15 <98704938+seanmorley15@users.noreply.github.com>
* fix: add additional timezones (#852)
* [BUG] Transportation node does not accept complex links in link parameter
Fixes #856
* Squashed commit of the following:
commit 59d5128cc642d133b0c166fbaf2d41a88c237d92
Merge: 0f9d31f4 7b8961e0
Author: Hosted Weblate <hosted@weblate.org>
Date: Fri Sep 19 04:22:36 2025 +0200
Merge branch 'origin/development' into Weblate.
commit 7b8961e02430b9b6fab7b22a7a8c1f7b06ff950b
Author: Orhun <orhunavcu@gmail.com>
Date: Fri Sep 19 00:30:25 2025 +0200
Translated using Weblate (Turkish)
Currently translated at 16.7% (160 of 958 strings)
Translation: AdventureLog/Web App
Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/tr/
commit a8134bdbda318d00175c984785d150e38a1e24bf
Author: Orhun <orhunavcu@gmail.com>
Date: Thu Sep 18 22:52:56 2025 +0200
Added translation using Weblate (Turkish)
commit ac8a8ee8c9fc55da2d4ded1c4beac04a1ea66bb8
Merge: 2527e345 3fca3872
Author: Hosted Weblate <hosted@weblate.org>
Date: Thu Sep 18 14:11:58 2025 +0200
Merge branch 'origin/development' into Weblate.
commit 3fca387272d52dfcb634751a74e4a4b4fcf7ac6b
Merge: 4907ba87 85d8b45c
Author: Hosted Weblate <hosted@weblate.org>
Date: Thu Sep 18 05:13:16 2025 +0200
Merge branch 'origin/development' into Weblate.
commit 85d8b45c4eff77bcc9d5708f7fd8a4fcea91890b
Merge: 9f5cc9cc ae07c440
Author: Sean Morley <mail@seanmorley.com>
Date: Wed Sep 17 19:25:35 2025 -0400
Merge branch 'development' of github.com:seanmorley15/AdventureLog into development
commit 9f5cc9ccb8809cd5ae0c01e979dae271e9197987
Author: Sean Morley <mail@seanmorley.com>
Date: Wed Sep 17 19:23:47 2025 -0400
Remove duplicate comment for syncing development branch with main in .env.example
commit 77c1f516266b2db5e1c97c5cbc8a3fb9e08d40cd
Author: Sean Morley <mail@seanmorley.com>
Date: Wed Sep 17 19:22:36 2025 -0400
Squashed commit of the following:
commit 9d4f1b8f534a3cdfb22812f2a25ababd7a236a87
Author: Jacob <jacob.aulin@proton.me>
Date: Sat Sep 13 15:17:22 2025 +0200
Translated using Weblate (Swedish)
Currently translated at 99.8% (957 of 958 strings)
Translation: AdventureLog/Web App
Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/sv/
commit 8fac40cfde425c989521c891b3ba9c75ab32e57e
Author: Christian S <schuld.christian@gmail.com>
Date: Sat Sep 13 12:54:52 2025 +0200
Translated using Weblate (German)
Currently translated at 100.0% (958 of 958 strings)
Translation: AdventureLog/Web App
Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/de/
commit 8e8c42396ec77b763983155e8b1e89cabf38ce17
Author: Patricio Carrau <duckycb@proton.me>
Date: Tue Sep 9 21:59:48 2025 +0200
Translated using Weblate (Spanish)
Currently translated at 100.0% (958 of 958 strings)
Translation: AdventureLog/Web App
Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/es/
commit be818ab408d00c5c26dfb3b25632604a415d3570
Author: pplulee <hi@pplulee.me>
Date: Mon Sep 8 04:06:54 2025 +0100
fix(i18n): update Chinese translations for location-related terms (#829)
Co-authored-by: Sean Morley <98704938+seanmorley15@users.noreply.github.com>
commit 9e40dcf6a1dc194d4694a114b3c7e88135121016
Merge: af2f2809 733eefce
Author: Sean Morley <mail@seanmorley.com>
Date: Sun Sep 7 23:03:57 2025 -0400
Merge remote-tracking branch 'weblate/development' into development
commit af2f28090b9242fb7ab263fa5bbb95a5bcc1b27f
Author: Sean Morley <mail@seanmorley.com>
Date: Sun Sep 7 23:00:33 2025 -0400
[BUG] Location Visit End Date not affected by Location Timezone
Fixes #843
commit 733eefceddbdad01726364e5d4523605f095fde2
Author: Alex <div@alexe.at>
Date: Sun Sep 7 23:28:20 2025 +0200
Translated using Weblate (German)
Currently translated at 100.0% (958 of 958 strings)
Translation: AdventureLog/Web App
Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/de/
commit 6c750d1c8f95b42418893e15ad46c3d4ed86d053
Author: fantastron27 <fantastron27@gmail.com>
Date: Sun Sep 7 09:17:16 2025 +0200
Translated using Weblate (Slovak)
Currently translated at 100.0% (958 of 958 strings)
Translation: AdventureLog/Web App
Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/sk/
commit f733b3b96bbddc71d426f2e60320a5ad2f6755af
Merge: 769ea6ad af4e541c
Author: Sean Morley <mail@seanmorley.com>
Date: Sat Sep 6 21:36:35 2025 -0400
Merge branch 'development' of github.com:seanmorley15/AdventureLog into development
commit 769ea6ad710890e931aabace2c00dc37436f869f
Author: Sean Morley <mail@seanmorley.com>
Date: Sat Sep 6 21:36:33 2025 -0400
Implement code changes to enhance functionality and improve performance
commit af4e541c1c9e7309857102287199279aec339387
Author: fantastron27 <fantastron27@gmail.com>
Date: Sun Sep 7 03:36:23 2025 +0200
Added Slovak translations (#815)
* Created sk.json
* Update Navbar.svelte
* Update +layout.svelte
---------
Co-authored-by: Sean Morley <98704938+seanmorley15@users.noreply.github.com>
commit 904474d757577229b47441d1378a6fd6788fbe40
Merge: d4709434 f87a5fe3
Author: Sean Morley <mail@seanmorley.com>
Date: Sat Sep 6 21:31:58 2025 -0400
Merge remote-tracking branch 'weblate/development' into development
commit d47094346c0b63ea753294a0786414e5e070ae7f
Merge: 4a5f59bf 6366a3eb
Author: Sean Morley <mail@seanmorley.com>
Date: Sat Sep 6 21:29:39 2025 -0400
Merge remote-tracking branch 'weblate/development' into development
commit f87a5fe3bcc2fe28cfc206fb5cba517bbffa8df6
Author: Sergio <garcia.sergio@me.com>
Date: Sun Sep 7 01:12:50 2025 +0200
Translated using Weblate (Spanish)
Currently translated at 100.0% (956 of 956 strings)
Translation: AdventureLog/Web App
Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/es/
commit 4a5f59bfd24e32fdf3558b009a8f636636cb3663
Author: Sean Morley <mail@seanmorley.com>
Date: Sat Sep 6 21:06:17 2025 -0400
Fixes #654
commit c1302bb54ab272c2a98c53ce0d508b7d39e9674b
Author: Sean Morley <mail@seanmorley.com>
Date: Sat Sep 6 20:52:05 2025 -0400
[BUG] Single day Collections will think location visits are out of date range
Fixes #827
commit 773f2d65bbfb2a9591b31fabfd6844612b840f1a
Author: Sean Morley <mail@seanmorley.com>
Date: Sat Sep 6 19:52:28 2025 -0400
[BUG] Server Error (500) when trying to access the API docs
Fixes #712
commit 4228db249ed5e3261931a1cdb3895d0ddd3ac4ac
Author: Sean Morley <mail@seanmorley.com>
Date: Sat Sep 6 19:44:00 2025 -0400
[BUG]Ordered Itinerary includes visits that are outside itinerary date range
Fixes #746
commit 26f36cabb0a860f10d7ba62b5279ddd1e282c78e
Author: Sean Morley <mail@seanmorley.com>
Date: Sat Sep 6 18:36:50 2025 +0200
Translated using Weblate (Spanish)
Currently translated at 100.0% (956 of 956 strings)
Translation: AdventureLog/Web App
Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/es/
commit 3bfd2dd5615afdbd04e3451c2ef728f1d7caf466
Author: Sean Morley <mail@seanmorley.com>
Date: Sat Sep 6 12:33:23 2025 -0400
Remove empty English (United States) locale file
commit 6366a3eba6ab72090e52be474212a663799dfe19
Author: Nikolai Eidsheim <nikolai.eidsheim@gmail.com>
Date: Sat Sep 6 18:10:15 2025 +0200
Translated using Weblate (Norwegian Bokmål)
Currently translated at 100.0% (956 of 956 strings)
Translation: AdventureLog/Web App
Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/nb_NO/
commit 671cd3701fc5a601f2f1bad9aef93106f91eec0b
Author: Sean Morley <mail@seanmorley.com>
Date: Sat Sep 6 16:58:04 2025 +0200
Added translation using Weblate (English (United States))
commit bdbbe5f4978f041f620f0503da69fa870cb1997c
Author: Sean Morley <mail@seanmorley.com>
Date: Sat Sep 6 16:54:43 2025 +0200
Translated using Weblate (Spanish)
Currently translated at 100.0% (956 of 956 strings)
Translation: AdventureLog/Web App
Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/es/
commit f310771702291be93e1c6b3bdb5a76e02fb8cae8
Author: Sean Morley <98704938+seanmorley15@users.noreply.github.com>
Date: Mon Sep 8 22:38:08 2025 -0400
Update issue templates for bug reports, deployment issues, and feature requests (#849)
commit 02ed89fa46fa22f8c5d96b0e7f0948204dec9306
Author: Sean Morley <98704938+seanmorley15@users.noreply.github.com>
Date: Sun Sep 7 23:16:12 2025 -0400
Timezone fixes, Translations, and Misc Fixes (#844)
* Translated using Weblate (Spanish)
Currently translated at 100.0% (956 of 956 strings)
Translation: AdventureLog/Web App
Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/es/
* Added translation using Weblate (English (United States))
* Translated using Weblate (Norwegian Bokmål)
Currently translated at 100.0% (956 of 956 strings)
Translation: AdventureLog/Web App
Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/nb_NO/
* Remove empty English (United States) locale file
* Translated using Weblate (Spanish)
Currently translated at 100.0% (956 of 956 strings)
Translation: AdventureLog/Web App
Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/es/
* [BUG]Ordered Itinerary includes visits that are outside itinerary date range
Fixes #746
* [BUG] Server Error (500) when trying to access the API docs
Fixes #712
* [BUG] Single day Collections will think location visits are out of date range
Fixes #827
* Fixes #654
* Translated using Weblate (Spanish)
Currently translated at 100.0% (956 of 956 strings)
Translation: AdventureLog/Web App
Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/es/
* Added Slovak translations (#815)
* Created sk.json
* Update Navbar.svelte
* Update +layout.svelte
---------
Co-authored-by: Sean Morley <98704938+seanmorley15@users.noreply.github.com>
* Implement code changes to enhance functionality and improve performance
* Translated using Weblate (Slovak)
Currently translated at 100.0% (958 of 958 strings)
Translation: AdventureLog/Web App
Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/sk/
* Translated using Weblate (German)
Currently translated at 100.0% (958 of 958 strings)
Translation: AdventureLog/Web App
Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/de/
* [BUG] Location Visit End Date not affected by Location Timezone
Fixes #843
* fix(i18n): update Chinese translations for location-related terms (#829)
Co-authored-by: Sean Morley <98704938+seanmorley15@users.noreply.github.com>
---------
Co-authored-by: Nikolai Eidsheim <nikolai.eidsheim@gmail.com>
Co-authored-by: Sergio <garcia.sergio@me.com>
Co-authored-by: fantastron27 <fantastron27@gmail.com>
Co-authored-by: Alex <div@alexe.at>
Co-authored-by: pplulee <hi@pplulee.me>
commit ae07c44030ff597be80988b63460595e8bea132f
Author: Sean Morley <mail@seanmorley.com>
Date: Wed Sep 17 19:23:47 2025 -0400
Remove duplicate comment for syncing development branch with main in .env.example
commit 94964f1fb16583f1ff63ddf4aee2469a532b0c6c
Author: Sean Morley <mail@seanmorley.com>
Date: Wed Sep 17 19:22:36 2025 -0400
Squashed commit of the following:
commit 9d4f1b8f534a3cdfb22812f2a25ababd7a236a87
Author: Jacob <jacob.aulin@proton.me>
Date: Sat Sep 13 15:17:22 2025 +0200
Translated using Weblate (Swedish)
Currently translated at 99.8% (957 of 958 strings)
Translation: AdventureLog/Web App
Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/sv/
commit 8fac40cfde425c989521c891b3ba9c75ab32e57e
Author: Christian S <schuld.christian@gmail.com>
Date: Sat Sep 13 12:54:52 2025 +0200
Translated using Weblate (German)
Currently translated at 100.0% (958 of 958 strings)
Translation: AdventureLog/Web App
Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/de/
commit 8e8c42396ec77b763983155e8b1e89cabf38ce17
Author: Patricio Carrau <duckycb@proton.me>
Date: Tue Sep 9 21:59:48 2025 +0200
Translated using Weblate (Spanish)
Currently translated at 100.0% (958 of 958 strings)
Translation: AdventureLog/Web App
Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/es/
commit be818ab408d00c5c26dfb3b25632604a415d3570
Author: pplulee <hi@pplulee.me>
Date: Mon Sep 8 04:06:54 2025 +0100
fix(i18n): update Chinese translations for location-related terms (#829)
Co-authored-by: Sean Morley <98704938+seanmorley15@users.noreply.github.com>
commit 9e40dcf6a1dc194d4694a114b3c7e88135121016
Merge: af2f2809 733eefce
Author: Sean Morley <mail@seanmorley.com>
Date: Sun Sep 7 23:03:57 2025 -0400
Merge remote-tracking branch 'weblate/development' into development
commit af2f28090b9242fb7ab263fa5bbb95a5bcc1b27f
Author: Sean Morley <mail@seanmorley.com>
Date: Sun Sep 7 23:00:33 2025 -0400
[BUG] Location Visit End Date not affected by Location Timezone
Fixes #843
commit 733eefceddbdad01726364e5d4523605f095fde2
Author: Alex <div@alexe.at>
Date: Sun Sep 7 23:28:20 2025 +0200
Translated using Weblate (German)
Currently translated at 100.0% (958 of 958 strings)
Translation: AdventureLog/Web App
Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/de/
commit 6c750d1c8f95b42418893e15ad46c3d4ed86d053
Author: fantastron27 <fantastron27@gmail.com>
Date: Sun Sep 7 09:17:16 2025 +0200
Translated using Weblate (Slovak)
Currently translated at 100.0% (958 of 958 strings)
Translation: AdventureLog/Web App
Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/sk/
commit f733b3b96bbddc71d426f2e60320a5ad2f6755af
Merge: 769ea6ad af4e541c
Author: Sean Morley <mail@seanmorley.com>
Date: Sat Sep 6 21:36:35 2025 -0400
Merge branch 'development' of github.com:seanmorley15/AdventureLog into development
commit 769ea6ad710890e931aabace2c00dc37436f869f
Author: Sean Morley <mail@seanmorley.com>
Date: Sat Sep 6 21:36:33 2025 -0400
Implement code changes to enhance functionality and improve performance
commit af4e541c1c9e7309857102287199279aec339387
Author: fantastron27 <fantastron27@gmail.com>
Date: Sun Sep 7 03:36:23 2025 +0200
Added Slovak translations (#815)
* Created sk.json
* Update Navbar.svelte
* Update +layout.svelte
---------
Co-authored-by: Sean Morley <98704938+seanmorley15@users.noreply.github.com>
commit 904474d757577229b47441d1378a6fd6788fbe40
Merge: d4709434 f87a5fe3
Author: Sean Morley <mail@seanmorley.com>
Date: Sat Sep 6 21:31:58 2025 -0400
Merge remote-tracking branch 'weblate/development' into development
commit d47094346c0b63ea753294a0786414e5e070ae7f
Merge: 4a5f59bf 6366a3eb
Author: Sean Morley <mail@seanmorley.com>
Date: Sat Sep 6 21:29:39 2025 -0400
Merge remote-tracking branch 'weblate/development' into development
commit f87a5fe3bcc2fe28cfc206fb5cba517bbffa8df6
Author: Sergio <garcia.sergio@me.com>
Date: Sun Sep 7 01:12:50 2025 +0200
Translated using Weblate (Spanish)
Currently translated at 100.0% (956 of 956 strings)
Translation: AdventureLog/Web App
Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/es/
commit 4a5f59bfd24e32fdf3558b009a8f636636cb3663
Author: Sean Morley <mail@seanmorley.com>
Date: Sat Sep 6 21:06:17 2025 -0400
Fixes #654
commit c1302bb54ab272c2a98c53ce0d508b7d39e9674b
Author: Sean Morley <mail@seanmorley.com>
Date: Sat Sep 6 20:52:05 2025 -0400
[BUG] Single day Collections will think location visits are out of date range
Fixes #827
commit 773f2d65bbfb2a9591b31fabfd6844612b840f1a
Author: Sean Morley <mail@seanmorley.com>
Date: Sat Sep 6 19:52:28 2025 -0400
[BUG] Server Error (500) when trying to access the API docs
Fixes #712
commit 4228db249ed5e3261931a1cdb3895d0ddd3ac4ac
Author: Sean Morley <mail@seanmorley.com>
Date: Sat Sep 6 19:44:00 2025 -0400
[BUG]Ordered Itinerary includes visits that are outside itinerary date range
Fixes #746
commit 26f36cabb0a860f10d7ba62b5279ddd1e282c78e
Author: Sean Morley <mail@seanmorley.com>
Date: Sat Sep 6 18:36:50 2025 +0200
Translated using Weblate (Spanish)
Currently translated at 100.0% (956 of 956 strings)
Translation: AdventureLog/Web App
Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/es/
commit 3bfd2dd5615afdbd04e3451c2ef728f1d7caf466
Author: Sean Morley <mail@seanmorley.com>
Date: Sat Sep 6 12:33:23 2025 -0400
Remove empty English (United States) locale file
commit 6366a3eba6ab72090e52be474212a663799dfe19
Author: Nikolai Eidsheim <nikolai.eidsheim@gmail.com>
Date: Sat Sep 6 18:10:15 2025 +0200
Translated using Weblate (Norwegian Bokmål)
Currently translated at 100.0% (956 of 956 strings)
Translation: AdventureLog/Web App
Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/nb_NO/
commit 671cd3701fc5a601f2f1bad9aef93106f91eec0b
Author: Sean Morley <mail@seanmorley.com>
Date: Sat Sep 6 16:58:04 2025 +0200
Added translation using Weblate (English (United States))
commit bdbbe5f4978f041f620f0503da69fa870cb1997c
Author: Sean Morley <mail@seanmorley.com>
Date: Sat Sep 6 16:54:43 2025 +0200
Translated using Weblate (Spanish)
Currently translated at 100.0% (956 of 956 strings)
Translation: AdventureLog/Web App
Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/es/
commit 9d4f1b8f534a3cdfb22812f2a25ababd7a236a87
Author: Jacob <jacob.aulin@proton.me>
Date: Sat Sep 13 15:17:22 2025 +0200
Translated using Weblate (Swedish)
Currently translated at 99.8% (957 of 958 strings)
Translation: AdventureLog/Web App
Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/sv/
commit 8fac40cfde425c989521c891b3ba9c75ab32e57e
Author: Christian S <schuld.christian@gmail.com>
Date: Sat Sep 13 12:54:52 2025 +0200
Translated using Weblate (German)
Currently translated at 100.0% (958 of 958 strings)
Translation: AdventureLog/Web App
Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/de/
commit 8e8c42396ec77b763983155e8b1e89cabf38ce17
Author: Patricio Carrau <duckycb@proton.me>
Date: Tue Sep 9 21:59:48 2025 +0200
Translated using Weblate (Spanish)
Currently translated at 100.0% (958 of 958 strings)
Translation: AdventureLog/Web App
Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/es/
commit be818ab408d00c5c26dfb3b25632604a415d3570
Author: pplulee <hi@pplulee.me>
Date: Mon Sep 8 04:06:54 2025 +0100
fix(i18n): update Chinese translations for location-related terms (#829)
Co-authored-by: Sean Morley <98704938+seanmorley15@users.noreply.github.com>
commit 9e40dcf6a1dc194d4694a114b3c7e88135121016
Merge: af2f2809 733eefce
Author: Sean Morley <mail@seanmorley.com>
Date: Sun Sep 7 23:03:57 2025 -0400
Merge remote-tracking branch 'weblate/development' into development
commit af2f28090b9242fb7ab263fa5bbb95a5bcc1b27f
Author: Sean Morley <mail@seanmorley.com>
Date: Sun Sep 7 23:00:33 2025 -0400
[BUG] Location Visit End Date not affected by Location Timezone
Fixes #843
commit 733eefceddbdad01726364e5d4523605f095fde2
Author: Alex <div@alexe.at>
Date: Sun Sep 7 23:28:20 2025 +0200
Translated using Weblate (German)
Currently translated at 100.0% (958 of 958 strings)
Translation: AdventureLog/Web App
Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/de/
commit 6c750d1c8f95b42418893e15ad46c3d4ed86d053
Author: fantastron27 <fantastron27@gmail.com>
Date: Sun Sep 7 09:17:16 2025 +0200
Translated using Weblate (Slovak)
Currently translated at 100.0% (958 of 958 strings)
Translation: AdventureLog/Web App
Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/sk/
commit f733b3b96bbddc71d426f2e60320a5ad2f6755af
Merge: 769ea6ad af4e541c
Author: Sean Morley <mail@seanmorley.com>
Date: Sat Sep 6 21:36:35 2025 -0400
Merge branch 'development' of github.com:seanmorley15/AdventureLog into development
commit 769ea6ad710890e931aabace2c00dc37436f869f
Author: Sean Morley <mail@seanmorley.com>
Date: Sat Sep 6 21:36:33 2025 -0400
Implement code changes to enhance functionality and improve performance
commit af4e541c1c9e7309857102287199279aec339387
Author: fantastron27 <fantastron27@gmail.com>
Date: Sun Sep 7 03:36:23 2025 +0200
Added Slovak translations (#815)
* Created sk.json
* Update Navbar.svelte
* Update +layout.svelte
---------
Co-authored-by: Sean Morley <98704938+seanmorley15@users.noreply.github.com>
commit 904474d757577229b47441d1378a6fd6788fbe40
Merge: d4709434 f87a5fe3
Author: Sean Morley <mail@seanmorley.com>
Date: Sat Sep 6 21:31:58 2025 -0400
Merge remote-tracking branch 'weblate/development' into development
commit d47094346c0b63ea753294a0786414e5e070ae7f
Merge: 4a5f59bf 6366a3eb
Author: Sean Morley <mail@seanmorley.com>
Date: Sat Sep 6 21:29:39 2025 -0400
Merge remote-tracking branch 'weblate/development' into development
commit f87a5fe3bcc2fe28cfc206fb5cba517bbffa8df6
Author: Sergio <garcia.sergio@me.com>
Date: Sun Sep 7 01:12:50 2025 +0200
Translated using Weblate (Spanish)
Currently translated at 100.0% (956 of 956 strings)
Translation: AdventureLog/Web App
Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/es/
commit 4a5f59bfd24e32fdf3558b009a8f636636cb3663
Author: Sean Morley <mail@seanmorley.com>
Date: Sat Sep 6 21:06:17 2025 -0400
Fixes #654
commit c1302bb54ab272c2a98c53ce0d508b7d39e9674b
Author: Sean Morley <mail@seanmorley.com>
Date: Sat Sep 6 20:52:05 2025 -0400
[BUG] Single day Collections will think location visits are out of date range
Fixes #827
commit 773f2d65bbfb2a9591b31fabfd6844612b840f1a
Author: Sean Morley <mail@seanmorley.com>
Date: Sat Sep 6 19:52:28 2025 -0400
[BUG] Server Error (500) when trying to access the API docs
Fixes #712
commit 4228db249ed5e3261931a1cdb3895d0ddd3ac4ac
Author: Sean Morley <mail@seanmorley.com>
Date: Sat Sep 6 19:44:00 2025 -0400
[BUG]Ordered Itinerary includes visits that are outside itinerary date range
Fixes #746
commit 26f36cabb0a860f10d7ba62b5279ddd1e282c78e
Author: Sean Morley <mail@seanmorley.com>
Date: Sat Sep 6 18:36:50 2025 +0200
Translated using Weblate (Spanish)
Currently translated at 100.0% (956 of 956 strings)
Translation: AdventureLog/Web App
Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/es/
commit 3bfd2dd5615afdbd04e3451c2ef728f1d7caf466
Author: Sean Morley <mail@seanmorley.com>
Date: Sat Sep 6 12:33:23 2025 -0400
Remove empty English (United States) locale file
commit 6366a3eba6ab72090e52be474212a663799dfe19
Author: Nikolai Eidsheim <nikolai.eidsheim@gmail.com>
Date: Sat Sep 6 18:10:15 2025 +0200
Translated using Weblate (Norwegian Bokmål)
Currently translated at 100.0% (956 of 956 strings)
Translation: AdventureLog/Web App
Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/nb_NO/
commit 671cd3701fc5a601f2f1bad9aef93106f91eec0b
Author: Sean Morley <mail@seanmorley.com>
Date: Sat Sep 6 16:58:04 2025 +0200
Added translation using Weblate (English (United States))
commit bdbbe5f4978f041f620f0503da69fa870cb1997c
Author: Sean Morley <mail@seanmorley.com>
Date: Sat Sep 6 16:54:43 2025 +0200
Translated using Weblate (Spanish)
Currently translated at 100.0% (956 of 956 strings)
Translation: AdventureLog/Web App
Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/es/
* Translated using Weblate (French)
Currently translated at 100.0% (958 of 958 strings)
Translation: AdventureLog/Web App
Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/fr/
* Translated using Weblate (Turkish)
Currently translated at 100.0% (958 of 958 strings)
Translation: AdventureLog/Web App
Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/tr/
* feat: enhance serializers and views for nested representations and lightweight data fetching
* feat: implement caching for visits by country and region endpoints
* feat: update LocationSerializer to include debug logging and adjust nested context handling in CollectionSerializer
* feat: enhance CollectionSerializer and CollectionViewSet to support nested context handling
* feat(worldtravel): add globe spin feature with loading and result display
- Introduced a toggle button for the globe spin feature.
- Implemented fetch logic for globe spin data from the API.
- Added loading state with a spinning globe animation.
- Displayed country information, including flag, subregion, and visit statistics.
- Enhanced UI with animations for loading and displaying results.
- Included error handling for API fetch failures.
* Add Turkish language support to the application
* feat(map): enhance pin styling with gradient backgrounds and improved hover effects
* Squashed commit of the following:
commit 990b0645059421c4a293fbf64830a6d864ceb40e
Author: Henrique Fonseca Veloso <henriquefv@tutamail.com>
Date: Sun Sep 21 00:27:59 2025 +0200
Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (958 of 958 strings)
Translation: AdventureLog/Web App
Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/pt_BR/
commit 03a4b9235faa849fb817348a2774e834a6851dc3
Author: Orhun <orhunavcu@gmail.com>
Date: Fri Sep 19 19:38:12 2025 +0200
Translated using Weblate (Turkish)
Currently translated at 100.0% (958 of 958 strings)
Translation: AdventureLog/Web App
Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/tr/
commit 1ccdc678627eb5915b56a8bfb3465928c80a524f
Author: Henrique Fonseca Veloso <henriquefv@tutamail.com>
Date: Sat Sep 20 20:01:36 2025 +0200
Translated using Weblate (Portuguese (Brazil))
Currently translated at 97.0% (930 of 958 strings)
Translation: AdventureLog/Web App
Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/pt_BR/
* fix(config): update appVersion to v0.11.0-main-09212025
* fix duration calculation on ordered collection view (#867)
Co-authored-by: Sean Morley <98704938+seanmorley15@users.noreply.github.com>
* Update frontend/src/routes/worldtravel/+page.svelte
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* Update backend/server/worldtravel/views.py
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* Update frontend/src/routes/map/+page.svelte
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---------
Co-authored-by: Copilot <198982749+Copilot@users.noreply.github.com>
Co-authored-by: Rohan <Alchez@users.noreply.github.com>
Co-authored-by: Orhun <orhunavcu@gmail.com>
Co-authored-by: vorbeiei <vorbeiei@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
676 lines
32 KiB
Python
676 lines
32 KiB
Python
from django.core.exceptions import ValidationError
|
|
import os
|
|
import uuid
|
|
from django.db import models
|
|
from django.utils.deconstruct import deconstructible
|
|
from adventures.managers import LocationManager
|
|
import threading
|
|
from django.contrib.auth import get_user_model
|
|
from django.contrib.postgres.fields import ArrayField
|
|
from django.forms import ValidationError
|
|
from django_resized import ResizedImageField
|
|
from worldtravel.models import City, Country, Region, VisitedCity, VisitedRegion
|
|
from django.core.exceptions import ValidationError
|
|
from django.utils import timezone
|
|
from adventures.utils.timezones import TIMEZONES
|
|
from adventures.utils.sports_types import SPORT_TYPE_CHOICES
|
|
from adventures.utils.get_is_visited import is_location_visited
|
|
from django.contrib.contenttypes.fields import GenericForeignKey
|
|
from django.contrib.contenttypes.models import ContentType
|
|
from django.contrib.contenttypes.fields import GenericRelation
|
|
|
|
def background_geocode_and_assign(location_id: str):
|
|
print(f"[Location Geocode Thread] Starting geocode for location {location_id}")
|
|
try:
|
|
location = Location.objects.get(id=location_id)
|
|
if not (location.latitude and location.longitude):
|
|
return
|
|
|
|
from adventures.geocoding import reverse_geocode # or wherever you defined it
|
|
is_visited = location.is_visited_status()
|
|
result = reverse_geocode(location.latitude, location.longitude, location.user)
|
|
|
|
if 'region_id' in result:
|
|
region = Region.objects.filter(id=result['region_id']).first()
|
|
if region:
|
|
location.region = region
|
|
if is_visited:
|
|
VisitedRegion.objects.get_or_create(user=location.user, region=region)
|
|
|
|
if 'city_id' in result:
|
|
city = City.objects.filter(id=result['city_id']).first()
|
|
if city:
|
|
location.city = city
|
|
if is_visited:
|
|
VisitedCity.objects.get_or_create(user=location.user, city=city)
|
|
|
|
if 'country_id' in result:
|
|
country = Country.objects.filter(country_code=result['country_id']).first()
|
|
if country:
|
|
location.country = country
|
|
|
|
# Save updated location info
|
|
# Save updated location info, skip geocode threading
|
|
location.save(update_fields=["region", "city", "country"], _skip_geocode=True)
|
|
|
|
except Exception as e:
|
|
# Optional: log or print the error
|
|
print(f"[Location Geocode Thread] Error processing {location_id}: {e}")
|
|
|
|
def validate_file_extension(value):
|
|
import os
|
|
from django.core.exceptions import ValidationError
|
|
ext = os.path.splitext(value.name)[1] # [0] returns path+filename
|
|
valid_extensions = ['.pdf', '.doc', '.docx', '.xls', '.xlsx', '.ppt', '.pptx', '.txt', '.png', '.jpg', '.jpeg', '.gif', '.webp', '.mp4', '.mov', '.avi', '.mkv', '.mp3', '.wav', '.flac', '.ogg', '.m4a', '.wma', '.aac', '.opus', '.zip', '.rar', '.7z', '.tar', '.gz', '.bz2', '.xz', '.zst', '.lz4', '.lzma', '.lzo', '.z', '.tar.gz', '.tar.bz2', '.tar.xz', '.tar.zst', '.tar.lz4', '.tar.lzma', '.tar.lzo', '.tar.z', '.gpx', '.md']
|
|
if not ext.lower() in valid_extensions:
|
|
raise ValidationError('Unsupported file extension.')
|
|
|
|
# Legacy support for old adventure types, not used in newer versions since custom categories are now used
|
|
ADVENTURE_TYPES = [
|
|
('general', 'General 🌍'),
|
|
('outdoor', 'Outdoor 🏞️'),
|
|
('lodging', 'Lodging 🛌'),
|
|
('dining', 'Dining 🍽️'),
|
|
('activity', 'Activity 🏄'),
|
|
('attraction', 'Attraction 🎢'),
|
|
('shopping', 'Shopping 🛍️'),
|
|
('nightlife', 'Nightlife 🌃'),
|
|
('event', 'Event 🎉'),
|
|
('transportation', 'Transportation 🚗'),
|
|
('culture', 'Culture 🎭'),
|
|
('water_sports', 'Water Sports 🚤'),
|
|
('hiking', 'Hiking 🥾'),
|
|
('wildlife', 'Wildlife 🦒'),
|
|
('historical_sites', 'Historical Sites 🏛️'),
|
|
('music_concerts', 'Music & Concerts 🎶'),
|
|
('fitness', 'Fitness 🏋️'),
|
|
('art_museums', 'Art & Museums 🎨'),
|
|
('festivals', 'Festivals 🎪'),
|
|
('spiritual_journeys', 'Spiritual Journeys 🧘♀️'),
|
|
('volunteer_work', 'Volunteer Work 🤝'),
|
|
('other', 'Other')
|
|
]
|
|
|
|
LODGING_TYPES = [
|
|
('hotel', 'Hotel'),
|
|
('hostel', 'Hostel'),
|
|
('resort', 'Resort'),
|
|
('bnb', 'Bed & Breakfast'),
|
|
('campground', 'Campground'),
|
|
('cabin', 'Cabin'),
|
|
('apartment', 'Apartment'),
|
|
('house', 'House'),
|
|
('villa', 'Villa'),
|
|
('motel', 'Motel'),
|
|
('other', 'Other')
|
|
]
|
|
|
|
TRANSPORTATION_TYPES = [
|
|
('car', 'Car'),
|
|
('plane', 'Plane'),
|
|
('train', 'Train'),
|
|
('bus', 'Bus'),
|
|
('boat', 'Boat'),
|
|
('bike', 'Bike'),
|
|
('walking', 'Walking'),
|
|
('other', 'Other')
|
|
]
|
|
|
|
# Assuming you have a default user ID you want to use
|
|
default_user = 1 # Replace with an actual user ID
|
|
|
|
User = get_user_model()
|
|
|
|
class Visit(models.Model):
|
|
id = models.UUIDField(default=uuid.uuid4, editable=False, unique=True, primary_key=True)
|
|
location = models.ForeignKey('Location', on_delete=models.CASCADE, related_name='visits')
|
|
start_date = models.DateTimeField(null=True, blank=True)
|
|
end_date = models.DateTimeField(null=True, blank=True)
|
|
timezone = models.CharField(max_length=50, choices=[(tz, tz) for tz in TIMEZONES], null=True, blank=True)
|
|
notes = models.TextField(blank=True, null=True)
|
|
created_at = models.DateTimeField(auto_now_add=True)
|
|
updated_at = models.DateTimeField(auto_now=True)
|
|
|
|
# Generic relations for images and attachments
|
|
images = GenericRelation('ContentImage', related_query_name='visit')
|
|
attachments = GenericRelation('ContentAttachment', related_query_name='visit')
|
|
|
|
def clean(self):
|
|
if self.start_date > self.end_date:
|
|
raise ValidationError('The start date must be before or equal to the end date.')
|
|
|
|
def delete(self, *args, **kwargs):
|
|
# Delete all associated images and attachments
|
|
for image in self.images.all():
|
|
image.delete()
|
|
for attachment in self.attachments.all():
|
|
attachment.delete()
|
|
super().delete(*args, **kwargs)
|
|
|
|
def __str__(self):
|
|
return f"{self.location.name} - {self.start_date} to {self.end_date}"
|
|
|
|
class Location(models.Model):
|
|
id = models.UUIDField(default=uuid.uuid4, editable=False, unique=True, primary_key=True)
|
|
user = models.ForeignKey(User, on_delete=models.CASCADE, default=default_user)
|
|
category = models.ForeignKey('Category', on_delete=models.SET_NULL, blank=True, null=True)
|
|
name = models.CharField(max_length=200)
|
|
location = models.CharField(max_length=200, blank=True, null=True)
|
|
tags = ArrayField(models.CharField(max_length=100), blank=True, null=True)
|
|
description = models.TextField(blank=True, null=True)
|
|
rating = models.FloatField(blank=True, null=True)
|
|
link = models.URLField(blank=True, null=True, max_length=2083)
|
|
is_public = models.BooleanField(default=False)
|
|
longitude = models.DecimalField(max_digits=9, decimal_places=6, null=True, blank=True)
|
|
latitude = models.DecimalField(max_digits=9, decimal_places=6, null=True, blank=True)
|
|
city = models.ForeignKey(City, on_delete=models.SET_NULL, blank=True, null=True)
|
|
region = models.ForeignKey(Region, on_delete=models.SET_NULL, blank=True, null=True)
|
|
country = models.ForeignKey(Country, on_delete=models.SET_NULL, blank=True, null=True)
|
|
collections = models.ManyToManyField('Collection', blank=True, related_name='locations')
|
|
created_at = models.DateTimeField(auto_now_add=True)
|
|
updated_at = models.DateTimeField(auto_now=True)
|
|
|
|
# Generic relations for images and attachments
|
|
images = GenericRelation('ContentImage', related_query_name='location')
|
|
attachments = GenericRelation('ContentAttachment', related_query_name='location')
|
|
|
|
objects = LocationManager()
|
|
|
|
def is_visited_status(self):
|
|
return is_location_visited(self)
|
|
|
|
def clean(self, skip_shared_validation=False):
|
|
"""
|
|
Validate model constraints.
|
|
skip_shared_validation: Skip validation when called by shared users
|
|
"""
|
|
# Skip validation if this is a shared user update
|
|
if skip_shared_validation:
|
|
return
|
|
|
|
# Check collections after the instance is saved (in save method or separate validation)
|
|
if self.pk: # Only check if the instance has been saved
|
|
for collection in self.collections.all():
|
|
if collection.is_public and not self.is_public:
|
|
raise ValidationError(f'Locations associated with a public collection must be public. Collection: {collection.name} Location: {self.name}')
|
|
|
|
# Only enforce same-user constraint for non-shared collections
|
|
if self.user != collection.user:
|
|
# Check if this is a shared collection scenario
|
|
# Allow if the location owner has access to the collection through sharing
|
|
if not collection.shared_with.filter(uuid=self.user.uuid).exists():
|
|
raise ValidationError(f'Locations must be associated with collections owned by the same user or shared collections. Collection owner: {collection.user.username} Location owner: {self.user.username}')
|
|
|
|
if self.category:
|
|
if self.user != self.category.user:
|
|
raise ValidationError(f'Locations must be associated with categories owned by the same user. Category owner: {self.category.user.username} Location owner: {self.user.username}')
|
|
|
|
def save(self, force_insert=False, force_update=False, using=None, update_fields=None, _skip_geocode=False, _skip_shared_validation=False):
|
|
if force_insert and force_update:
|
|
raise ValueError("Cannot force both insert and updating in model saving.")
|
|
|
|
if not self.category:
|
|
category, _ = Category.objects.get_or_create(
|
|
user=self.user,
|
|
name='general',
|
|
defaults={'display_name': 'General', 'icon': '🌍'}
|
|
)
|
|
self.category = category
|
|
|
|
result = super().save(force_insert, force_update, using, update_fields)
|
|
|
|
# Validate collections after saving (since M2M relationships require saved instance)
|
|
if self.pk:
|
|
try:
|
|
self.clean(skip_shared_validation=_skip_shared_validation)
|
|
except ValidationError as e:
|
|
# If validation fails, you might want to handle this differently
|
|
# For now, we'll re-raise the error
|
|
raise e
|
|
|
|
# ⛔ Skip threading if called from geocode background thread
|
|
if _skip_geocode:
|
|
return result
|
|
|
|
if self.latitude and self.longitude:
|
|
thread = threading.Thread(target=background_geocode_and_assign, args=(str(self.id),))
|
|
thread.daemon = True # Allows the thread to exit when the main program ends
|
|
thread.start()
|
|
|
|
return result
|
|
|
|
def delete(self, *args, **kwargs):
|
|
# Delete all associated images and attachments (handled by GenericRelation)
|
|
for image in self.images.all():
|
|
image.delete()
|
|
for attachment in self.attachments.all():
|
|
attachment.delete()
|
|
super().delete(*args, **kwargs)
|
|
|
|
def __str__(self):
|
|
return self.name
|
|
|
|
class CollectionInvite(models.Model):
|
|
id = models.UUIDField(default=uuid.uuid4, editable=False, unique=True, primary_key=True)
|
|
collection = models.ForeignKey('Collection', on_delete=models.CASCADE, related_name='invites')
|
|
invited_user = models.ForeignKey(User, on_delete=models.CASCADE, related_name='collection_invites')
|
|
created_at = models.DateTimeField(auto_now_add=True)
|
|
updated_at = models.DateTimeField(auto_now=True)
|
|
|
|
def __str__(self):
|
|
return f"Invite for {self.invited_user.username} to {self.collection.name}"
|
|
|
|
def clean(self):
|
|
if self.collection.user == self.invited_user:
|
|
raise ValidationError("You cannot invite yourself to your own collection.")
|
|
# dont allow if the user is already shared with the collection
|
|
if self.invited_user in self.collection.shared_with.all():
|
|
raise ValidationError("This user is already shared with the collection.")
|
|
|
|
class Meta:
|
|
verbose_name = "Collection Invite"
|
|
unique_together = ('collection', 'invited_user')
|
|
|
|
class Collection(models.Model):
|
|
#id = models.AutoField(primary_key=True)
|
|
id = models.UUIDField(default=uuid.uuid4, editable=False, unique=True, primary_key=True)
|
|
user = models.ForeignKey(
|
|
User, on_delete=models.CASCADE, default=default_user)
|
|
name = models.CharField(max_length=200)
|
|
description = models.TextField(blank=True, null=True)
|
|
is_public = models.BooleanField(default=False)
|
|
created_at = models.DateTimeField(auto_now_add=True)
|
|
start_date = models.DateField(blank=True, null=True)
|
|
end_date = models.DateField(blank=True, null=True)
|
|
updated_at = models.DateTimeField(auto_now=True)
|
|
is_archived = models.BooleanField(default=False)
|
|
shared_with = models.ManyToManyField(User, related_name='shared_with', blank=True)
|
|
link = models.URLField(blank=True, null=True, max_length=2083)
|
|
|
|
# if connected locations are private and collection is public, raise an error
|
|
def clean(self):
|
|
if self.is_public and self.pk: # Only check if the instance has a primary key
|
|
# Updated to use the new related_name 'locations'
|
|
for location in self.locations.all():
|
|
if not location.is_public:
|
|
raise ValidationError(f'Public collections cannot be associated with private locations. Collection: {self.name} Location: {location.name}')
|
|
|
|
def __str__(self):
|
|
return self.name
|
|
|
|
class Transportation(models.Model):
|
|
id = models.UUIDField(default=uuid.uuid4, editable=False, unique=True, primary_key=True)
|
|
user = models.ForeignKey(User, on_delete=models.CASCADE, default=default_user)
|
|
type = models.CharField(max_length=100, choices=TRANSPORTATION_TYPES)
|
|
name = models.CharField(max_length=200)
|
|
description = models.TextField(blank=True, null=True)
|
|
rating = models.FloatField(blank=True, null=True)
|
|
link = models.URLField(blank=True, null=True, max_length=2083)
|
|
date = models.DateTimeField(blank=True, null=True)
|
|
end_date = models.DateTimeField(blank=True, null=True)
|
|
start_timezone = models.CharField(max_length=50, choices=[(tz, tz) for tz in TIMEZONES], null=True, blank=True)
|
|
end_timezone = models.CharField(max_length=50, choices=[(tz, tz) for tz in TIMEZONES], null=True, blank=True)
|
|
flight_number = models.CharField(max_length=100, blank=True, null=True)
|
|
from_location = models.CharField(max_length=200, blank=True, null=True)
|
|
origin_latitude = models.DecimalField(max_digits=9, decimal_places=6, null=True, blank=True)
|
|
origin_longitude = models.DecimalField(max_digits=9, decimal_places=6, null=True, blank=True)
|
|
destination_latitude = models.DecimalField(max_digits=9, decimal_places=6, null=True, blank=True)
|
|
destination_longitude = models.DecimalField(max_digits=9, decimal_places=6, null=True, blank=True)
|
|
to_location = models.CharField(max_length=200, blank=True, null=True)
|
|
is_public = models.BooleanField(default=False)
|
|
collection = models.ForeignKey('Collection', on_delete=models.CASCADE, blank=True, null=True)
|
|
created_at = models.DateTimeField(auto_now_add=True)
|
|
updated_at = models.DateTimeField(auto_now=True)
|
|
|
|
# Generic relations for images and attachments
|
|
images = GenericRelation('ContentImage', related_query_name='transportation')
|
|
attachments = GenericRelation('ContentAttachment', related_query_name='transportation')
|
|
|
|
def clean(self):
|
|
if self.date and self.end_date and self.date > self.end_date:
|
|
raise ValidationError('The start date must be before the end date. Start date: ' + str(self.date) + ' End date: ' + str(self.end_date))
|
|
|
|
if self.collection:
|
|
if self.collection.is_public and not self.is_public:
|
|
raise ValidationError('Transportations associated with a public collection must be public. Collection: ' + self.collection.name + ' Transportation: ' + self.name)
|
|
if self.user != self.collection.user:
|
|
raise ValidationError('Transportations must be associated with collections owned by the same user. Collection owner: ' + self.collection.user.username + ' Transportation owner: ' + self.user.username)
|
|
|
|
def delete(self, *args, **kwargs):
|
|
# Delete all associated images and attachments
|
|
for image in self.images.all():
|
|
image.delete()
|
|
for attachment in self.attachments.all():
|
|
attachment.delete()
|
|
super().delete(*args, **kwargs)
|
|
|
|
def __str__(self):
|
|
return self.name
|
|
|
|
class Note(models.Model):
|
|
id = models.UUIDField(default=uuid.uuid4, editable=False, unique=True, primary_key=True)
|
|
user = models.ForeignKey(User, on_delete=models.CASCADE, default=default_user)
|
|
name = models.CharField(max_length=200)
|
|
content = models.TextField(blank=True, null=True)
|
|
links = ArrayField(models.URLField(), blank=True, null=True)
|
|
date = models.DateField(blank=True, null=True)
|
|
is_public = models.BooleanField(default=False)
|
|
collection = models.ForeignKey('Collection', on_delete=models.CASCADE, blank=True, null=True)
|
|
created_at = models.DateTimeField(auto_now_add=True)
|
|
updated_at = models.DateTimeField(auto_now=True)
|
|
|
|
# Generic relations for images and attachments
|
|
images = GenericRelation('ContentImage', related_query_name='note')
|
|
attachments = GenericRelation('ContentAttachment', related_query_name='note')
|
|
|
|
def clean(self):
|
|
if self.collection:
|
|
if self.collection.is_public and not self.is_public:
|
|
raise ValidationError('Notes associated with a public collection must be public. Collection: ' + self.collection.name + ' Note: ' + self.name)
|
|
if self.user != self.collection.user:
|
|
raise ValidationError('Notes must be associated with collections owned by the same user. Collection owner: ' + self.collection.user.username + ' Note owner: ' + self.user.username)
|
|
|
|
def delete(self, *args, **kwargs):
|
|
# Delete all associated images and attachments
|
|
for image in self.images.all():
|
|
image.delete()
|
|
for attachment in self.attachments.all():
|
|
attachment.delete()
|
|
super().delete(*args, **kwargs)
|
|
|
|
def __str__(self):
|
|
return self.name
|
|
|
|
class Checklist(models.Model):
|
|
# id = models.AutoField(primary_key=True)
|
|
id = models.UUIDField(default=uuid.uuid4, editable=False, unique=True, primary_key=True)
|
|
user = models.ForeignKey(
|
|
User, on_delete=models.CASCADE, default=default_user)
|
|
name = models.CharField(max_length=200)
|
|
date = models.DateField(blank=True, null=True)
|
|
is_public = models.BooleanField(default=False)
|
|
collection = models.ForeignKey('Collection', on_delete=models.CASCADE, blank=True, null=True)
|
|
created_at = models.DateTimeField(auto_now_add=True)
|
|
updated_at = models.DateTimeField(auto_now=True)
|
|
|
|
def clean(self):
|
|
if self.collection:
|
|
if self.collection.is_public and not self.is_public:
|
|
raise ValidationError('Checklists associated with a public collection must be public. Collection: ' + self.collection.name + ' Checklist: ' + self.name)
|
|
if self.user != self.collection.user:
|
|
raise ValidationError('Checklists must be associated with collections owned by the same user. Collection owner: ' + self.collection.user.username + ' Checklist owner: ' + self.user.username)
|
|
|
|
def __str__(self):
|
|
return self.name
|
|
|
|
class ChecklistItem(models.Model):
|
|
#id = models.AutoField(primary_key=True)
|
|
id = models.UUIDField(default=uuid.uuid4, editable=False, unique=True, primary_key=True)
|
|
user = models.ForeignKey(
|
|
User, on_delete=models.CASCADE, default=default_user)
|
|
name = models.CharField(max_length=200)
|
|
is_checked = models.BooleanField(default=False)
|
|
checklist = models.ForeignKey('Checklist', on_delete=models.CASCADE)
|
|
created_at = models.DateTimeField(auto_now_add=True)
|
|
updated_at = models.DateTimeField(auto_now=True)
|
|
|
|
def clean(self):
|
|
if self.checklist.is_public and not self.checklist.is_public:
|
|
raise ValidationError('Checklist items associated with a public checklist must be public. Checklist: ' + self.checklist.name + ' Checklist item: ' + self.name)
|
|
if self.user != self.checklist.user:
|
|
raise ValidationError('Checklist items must be associated with checklists owned by the same user. Checklist owner: ' + self.checklist.user.username + ' Checklist item owner: ' + self.user.username)
|
|
|
|
def __str__(self):
|
|
return self.name
|
|
|
|
@deconstructible
|
|
class PathAndRename:
|
|
def __init__(self, path):
|
|
self.path = path
|
|
|
|
def __call__(self, instance, filename):
|
|
ext = filename.split('.')[-1]
|
|
# Generate a new UUID for the filename
|
|
filename = f"{uuid.uuid4()}.{ext}"
|
|
return os.path.join(self.path, filename)
|
|
|
|
class ContentImage(models.Model):
|
|
"""Generic image model that can be attached to any content type"""
|
|
id = models.UUIDField(default=uuid.uuid4, editable=False, unique=True, primary_key=True)
|
|
user = models.ForeignKey(User, on_delete=models.CASCADE, default=default_user)
|
|
image = ResizedImageField(
|
|
force_format="WEBP",
|
|
quality=75,
|
|
upload_to=PathAndRename('images/'),
|
|
blank=True,
|
|
null=True,
|
|
)
|
|
immich_id = models.CharField(max_length=200, null=True, blank=True)
|
|
is_primary = models.BooleanField(default=False)
|
|
|
|
# Generic foreign key fields
|
|
content_type = models.ForeignKey(ContentType, on_delete=models.CASCADE, related_name='content_images')
|
|
object_id = models.UUIDField()
|
|
content_object = GenericForeignKey('content_type', 'object_id')
|
|
|
|
class Meta:
|
|
verbose_name = "Content Image"
|
|
verbose_name_plural = "Content Images"
|
|
indexes = [
|
|
models.Index(fields=["content_type", "object_id"]),
|
|
]
|
|
|
|
def clean(self):
|
|
# One of image or immich_id must be set, but not both
|
|
has_image = bool(self.image and str(self.image).strip())
|
|
has_immich_id = bool(self.immich_id and str(self.immich_id).strip())
|
|
|
|
if has_image and has_immich_id:
|
|
raise ValidationError("Cannot have both image file and Immich ID. Please provide only one.")
|
|
if not has_image and not has_immich_id:
|
|
raise ValidationError("Must provide either an image file or an Immich ID.")
|
|
|
|
def save(self, *args, **kwargs):
|
|
# Clean empty strings to None for proper database storage
|
|
if not self.image:
|
|
self.image = None
|
|
if not self.immich_id or not str(self.immich_id).strip():
|
|
self.immich_id = None
|
|
|
|
self.full_clean()
|
|
super().save(*args, **kwargs)
|
|
|
|
def delete(self, *args, **kwargs):
|
|
# Remove file from disk when deleting image
|
|
if self.image and os.path.isfile(self.image.path):
|
|
os.remove(self.image.path)
|
|
super().delete(*args, **kwargs)
|
|
|
|
def __str__(self):
|
|
content_name = getattr(self.content_object, 'name', 'Unknown')
|
|
return f"Image for {self.content_type.model}: {content_name}"
|
|
|
|
class ContentAttachment(models.Model):
|
|
"""Generic attachment model that can be attached to any content type"""
|
|
id = models.UUIDField(default=uuid.uuid4, editable=False, unique=True, primary_key=True)
|
|
user = models.ForeignKey(User, on_delete=models.CASCADE, default=default_user)
|
|
file = models.FileField(upload_to=PathAndRename('attachments/'), validators=[validate_file_extension])
|
|
name = models.CharField(max_length=200, null=True, blank=True)
|
|
|
|
# Generic foreign key fields
|
|
content_type = models.ForeignKey(ContentType, on_delete=models.CASCADE, related_name='content_attachments')
|
|
object_id = models.UUIDField()
|
|
content_object = GenericForeignKey('content_type', 'object_id')
|
|
|
|
class Meta:
|
|
verbose_name = "Content Attachment"
|
|
verbose_name_plural = "Content Attachments"
|
|
indexes = [
|
|
models.Index(fields=["content_type", "object_id"]),
|
|
]
|
|
|
|
def delete(self, *args, **kwargs):
|
|
if self.file and os.path.isfile(self.file.path):
|
|
os.remove(self.file.path)
|
|
super().delete(*args, **kwargs)
|
|
|
|
def __str__(self):
|
|
content_name = getattr(self.content_object, 'name', 'Unknown')
|
|
return f"Attachment for {self.content_type.model}: {content_name}"
|
|
|
|
class Category(models.Model):
|
|
id = models.UUIDField(default=uuid.uuid4, editable=False, unique=True, primary_key=True)
|
|
user = models.ForeignKey(
|
|
User, on_delete=models.CASCADE, default=default_user)
|
|
name = models.CharField(max_length=200)
|
|
display_name = models.CharField(max_length=200)
|
|
icon = models.CharField(max_length=200, default='🌍')
|
|
|
|
class Meta:
|
|
verbose_name_plural = 'Categories'
|
|
unique_together = ['name', 'user']
|
|
|
|
def clean(self) -> None:
|
|
self.name = self.name.lower().strip()
|
|
|
|
return super().clean()
|
|
|
|
|
|
def __str__(self):
|
|
return self.name + ' - ' + self.display_name + ' - ' + self.icon
|
|
|
|
class Lodging(models.Model):
|
|
id = models.UUIDField(default=uuid.uuid4, editable=False, unique=True, primary_key=True)
|
|
user = models.ForeignKey(User, on_delete=models.CASCADE, default=default_user)
|
|
name = models.CharField(max_length=200)
|
|
type = models.CharField(max_length=100, choices=LODGING_TYPES, default='other')
|
|
description = models.TextField(blank=True, null=True)
|
|
rating = models.FloatField(blank=True, null=True)
|
|
link = models.URLField(blank=True, null=True, max_length=2083)
|
|
check_in = models.DateTimeField(blank=True, null=True)
|
|
check_out = models.DateTimeField(blank=True, null=True)
|
|
timezone = models.CharField(max_length=50, choices=[(tz, tz) for tz in TIMEZONES], null=True, blank=True)
|
|
reservation_number = models.CharField(max_length=100, blank=True, null=True)
|
|
price = models.DecimalField(max_digits=9, decimal_places=2, blank=True, null=True)
|
|
latitude = models.DecimalField(max_digits=9, decimal_places=6, null=True, blank=True)
|
|
longitude = models.DecimalField(max_digits=9, decimal_places=6, null=True, blank=True)
|
|
location = models.CharField(max_length=200, blank=True, null=True)
|
|
is_public = models.BooleanField(default=False)
|
|
collection = models.ForeignKey('Collection', on_delete=models.CASCADE, blank=True, null=True)
|
|
created_at = models.DateTimeField(auto_now_add=True)
|
|
updated_at = models.DateTimeField(auto_now=True)
|
|
|
|
# Generic relations for images and attachments
|
|
images = GenericRelation('ContentImage', related_query_name='lodging')
|
|
attachments = GenericRelation('ContentAttachment', related_query_name='lodging')
|
|
|
|
def clean(self):
|
|
if self.check_in and self.check_out and self.check_in > self.check_out:
|
|
raise ValidationError('The start date must be before the end date. Start date: ' + str(self.check_in) + ' End date: ' + str(self.check_out))
|
|
|
|
if self.collection:
|
|
if self.collection.is_public and not self.is_public:
|
|
raise ValidationError('Lodging associated with a public collection must be public. Collection: ' + self.collection.name + ' Lodging: ' + self.name)
|
|
if self.user != self.collection.user:
|
|
raise ValidationError('Lodging must be associated with collections owned by the same user. Collection owner: ' + self.collection.user.username + ' Lodging owner: ' + self.user.username)
|
|
|
|
def delete(self, *args, **kwargs):
|
|
# Delete all associated images and attachments
|
|
for image in self.images.all():
|
|
image.delete()
|
|
for attachment in self.attachments.all():
|
|
attachment.delete()
|
|
super().delete(*args, **kwargs)
|
|
|
|
def __str__(self):
|
|
return self.name
|
|
|
|
class Trail(models.Model):
|
|
"""
|
|
Represents a trail associated with a user.
|
|
Supports referencing either a Wanderer trail ID or an external link (e.g., AllTrails).
|
|
"""
|
|
id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False, unique=True)
|
|
user = models.ForeignKey(User, on_delete=models.CASCADE)
|
|
location = models.ForeignKey(Location, on_delete=models.CASCADE, related_name='trails')
|
|
name = models.CharField(max_length=200)
|
|
|
|
# Either an external link (e.g., AllTrails, Trailforks) or a Wanderer ID
|
|
link = models.URLField("External Trail Link", max_length=2083, blank=True, null=True)
|
|
wanderer_id = models.CharField("Wanderer Trail ID", max_length=100, blank=True, null=True)
|
|
|
|
created_at = models.DateTimeField(auto_now_add=True)
|
|
|
|
class Meta:
|
|
verbose_name = "Trail"
|
|
verbose_name_plural = "Trails"
|
|
|
|
def clean(self):
|
|
has_link = bool(self.link and str(self.link).strip())
|
|
has_wanderer_id = bool(self.wanderer_id and str(self.wanderer_id).strip())
|
|
|
|
if has_link and has_wanderer_id:
|
|
raise ValidationError("Cannot have both a link and a Wanderer ID. Provide only one.")
|
|
if not has_link and not has_wanderer_id:
|
|
raise ValidationError("You must provide either a link or a Wanderer ID.")
|
|
|
|
def save(self, *args, **kwargs):
|
|
self.full_clean() # Ensure clean() is called on save
|
|
super().save(*args, **kwargs)
|
|
|
|
def __str__(self):
|
|
return f"{self.name} ({'Wanderer' if self.wanderer_id else 'External'})"
|
|
|
|
class Activity(models.Model):
|
|
id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False, unique=True)
|
|
user = models.ForeignKey(User, on_delete=models.CASCADE, default=default_user)
|
|
visit = models.ForeignKey(Visit, on_delete=models.CASCADE, related_name='activities')
|
|
trail = models.ForeignKey(Trail, on_delete=models.CASCADE, related_name='activities', blank=True, null=True)
|
|
|
|
# GPX File
|
|
gpx_file = models.FileField(upload_to=PathAndRename('activities/'), validators=[validate_file_extension], blank=True, null=True)
|
|
|
|
# Descriptive
|
|
name = models.CharField(max_length=200)
|
|
sport_type = models.CharField(max_length=100, choices=SPORT_TYPE_CHOICES, default='General') # Optional detailed type
|
|
|
|
# Time & Distance
|
|
distance = models.FloatField(blank=True, null=True) # in meters
|
|
moving_time = models.DurationField(blank=True, null=True)
|
|
elapsed_time = models.DurationField(blank=True, null=True)
|
|
rest_time = models.DurationField(blank=True, null=True)
|
|
|
|
# Elevation
|
|
elevation_gain = models.FloatField(blank=True, null=True) # in meters
|
|
elevation_loss = models.FloatField(blank=True, null=True) # estimated
|
|
elev_high = models.FloatField(blank=True, null=True)
|
|
elev_low = models.FloatField(blank=True, null=True)
|
|
|
|
# Timing
|
|
start_date = models.DateTimeField(blank=True, null=True)
|
|
start_date_local = models.DateTimeField(blank=True, null=True)
|
|
timezone = models.CharField(max_length=50, choices=[(tz, tz) for tz in TIMEZONES], blank=True, null=True)
|
|
|
|
# Speed
|
|
average_speed = models.FloatField(blank=True, null=True) # in m/s
|
|
max_speed = models.FloatField(blank=True, null=True) # in m/s
|
|
|
|
# Optional metrics
|
|
average_cadence = models.FloatField(blank=True, null=True)
|
|
calories = models.FloatField(blank=True, null=True)
|
|
|
|
# Coordinates
|
|
start_lat = models.FloatField(blank=True, null=True)
|
|
start_lng = models.FloatField(blank=True, null=True)
|
|
end_lat = models.FloatField(blank=True, null=True)
|
|
end_lng = models.FloatField(blank=True, null=True)
|
|
|
|
# Optional links
|
|
external_service_id = models.CharField(max_length=100, blank=True, null=True) # E.g., Strava ID
|
|
|
|
def __str__(self):
|
|
return f"{self.name} ({self.sport_type})"
|
|
|
|
class Meta:
|
|
verbose_name = "Activity"
|
|
verbose_name_plural = "Activities" |