collection days

backend/server/adventures/migrations/0012_collection_end_date_collection_start_date.py

@@ -0,0 +1,23 @@
+# Generated by Django 5.0.7 on 2024-07-27 18:18
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('adventures', '0011_adventure_updated_at'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='collection',
+            name='end_date',
+            field=models.DateField(blank=True, null=True),
+        ),
+        migrations.AddField(
+            model_name='collection',
+            name='start_date',
+            field=models.DateField(blank=True, null=True),
+        ),
+    ]

backend/server/adventures/models.py

@@ -56,6 +56,8 @@ class Collection(models.Model):
     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)
 
     # if connected adventures are private and collection is public, raise an error
     def clean(self):

backend/server/adventures/serializers.py

@@ -29,7 +29,7 @@ class CollectionSerializer(serializers.ModelSerializer):
     class Meta:
         model = Collection
         # fields are all plus the adventures field
-        fields = ['id', 'description', 'user_id', 'name', 'is_public', 'adventures']
+        fields = ['id', 'description', 'user_id', 'name', 'is_public', 'adventures', 'created_at', 'start_date', 'end_date']
 
 
    

frontend/src/lib/components/CollectionCard.svelte

@@ -47,6 +47,20 @@
 	<div class="card-body">
 		<h2 class="card-title overflow-ellipsis">{collection.name}</h2>
 		<p>{collection.adventures.length} Adventures</p>
+		{#if collection.start_date && collection.end_date}
+			<p>
+				Dates: {new Date(collection.start_date).toLocaleDateString()} - {new Date(
+					collection.end_date
+				).toLocaleDateString()}
+			</p>
+			<!-- display the duration in days -->
+			<p>
+				Duration: {Math.floor(
+					(new Date(collection.end_date).getTime() - new Date(collection.start_date).getTime()) /
+						(1000 * 60 * 60 * 24)
+				)}{' '}
+				days
+			</p>{/if}
 		<div class="card-actions justify-end">
 			{#if type != 'link'}
 				<button on:click={deleteCollection} class="btn btn-secondary"

frontend/src/lib/components/EditCollection.svelte

@@ -109,6 +109,7 @@
 							bind:value={collectionToEdit.description}
 							class="input input-bordered w-full max-w-xs mt-1 mb-2"
 						/>
+
 						<!-- <button
                 class="btn btn-neutral ml-2"
                 type="button"
@@ -117,6 +118,28 @@
                 ></iconify-icon>Generate Description</button
               > -->
 					</div>
+					<div class="mb-2">
+						<label for="start_date">Start Date <Calendar class="inline-block mb-1 w-6 h-6" /></label
+						><br />
+						<input
+							type="date"
+							id="start_date"
+							name="start_date"
+							bind:value={collectionToEdit.start_date}
+							class="input input-bordered w-full max-w-xs mt-1"
+						/>
+					</div>
+					<div class="mb-2">
+						<label for="end_date">End Date <Calendar class="inline-block mb-1 w-6 h-6" /></label><br
+						/>
+						<input
+							type="date"
+							id="end_date"
+							name="end_date"
+							bind:value={collectionToEdit.end_date}
+							class="input input-bordered w-full max-w-xs mt-1"
+						/>
+					</div>
 				</div>
 				<div class="mb-2">
 					<label for="is_public">Public <Earth class="inline-block -mt-1 mb-1 w-6 h-6" /></label><br

frontend/src/lib/components/NewCollection.svelte

@@ -5,6 +5,8 @@
 	import { enhance } from '$app/forms';
 	import { addToast } from '$lib/toasts';
 
+	import Calendar from '~icons/mdi/calendar';
+
 	let newCollection: Collection = {
 		user_id: NaN,
 		id: NaN,
@@ -104,10 +106,32 @@
 							class="input input-bordered w-full max-w-xs mt-1 mb-2"
 						/>
 					</div>
-				</div>
+					<div class="mb-2">
-				<div class="mb-2">
+						<label for="start_date">Start Date <Calendar class="inline-block mb-1 w-6 h-6" /></label
-					<button type="submit" class="btn btn-primary mr-4 mt-4">Create</button>
+						><br />
-					<button type="button" class="btn mt-4" on:click={close}>Close</button>
+						<input
+							type="date"
+							id="start_date"
+							name="start_date"
+							bind:value={newCollection.start_date}
+							class="input input-bordered w-full max-w-xs mt-1"
+						/>
+					</div>
+					<div class="mb-2">
+						<label for="end_date">End Date <Calendar class="inline-block mb-1 w-6 h-6" /></label><br
+						/>
+						<input
+							type="date"
+							id="end_date"
+							name="end_date"
+							bind:value={newCollection.end_date}
+							class="input input-bordered w-full max-w-xs mt-1"
+						/>
+					</div>
+					<div class="mb-2">
+						<button type="submit" class="btn btn-primary mr-4 mt-4">Create</button>
+						<button type="button" class="btn mt-4" on:click={close}>Close</button>
+					</div>
 				</div>
 			</form>
 		</div>

frontend/src/lib/types.ts

@@ -64,6 +64,8 @@ export type Collection = {
 	is_public: boolean;
 	adventures: Adventure[];
 	created_at?: string;
+	start_date?: string;
+	end_date?: string;
 };
 
 export type OpenStreetMapPlace = {

frontend/src/routes/collections/+page.server.ts

@@ -51,6 +51,8 @@ export const actions: Actions = {
 
 		const name = formData.get('name') as string;
 		const description = formData.get('description') as string | null;
+		const start_date = formData.get('start_date') as string | null;
+		const end_date = formData.get('end_date') as string | null;
 
 		if (!name) {
 			return {
@@ -62,6 +64,8 @@ export const actions: Actions = {
 		const formDataToSend = new FormData();
 		formDataToSend.append('name', name);
 		formDataToSend.append('description', description || '');
+		formDataToSend.append('start_date', start_date || '');
+		formDataToSend.append('end_date', end_date || '');
 		let auth = event.cookies.get('auth');
 
 		if (!auth) {
@@ -136,6 +140,8 @@ export const actions: Actions = {
 		const name = formData.get('name') as string;
 		const description = formData.get('description') as string | null;
 		let is_public = formData.get('is_public') as string | null | boolean;
+		const start_date = formData.get('start_date') as string | null;
+		const end_date = formData.get('end_date') as string | null;
 
 		if (is_public) {
 			is_public = true;
@@ -154,6 +160,8 @@ export const actions: Actions = {
 		formDataToSend.append('name', name);
 		formDataToSend.append('description', description || '');
 		formDataToSend.append('is_public', is_public.toString());
+		formDataToSend.append('start_date', start_date || '');
+		formDataToSend.append('end_date', end_date || '');
 
 		let auth = event.cookies.get('auth');