accomadesc 0.3.31 → 0.3.33

package/dist/BookingRequest.svelte

@@ -5,11 +5,12 @@
   import Notes from './basic/Notes.svelte';
   import Spinner from './basic/Spinner.svelte';
   import TextInput from './basic/TextInput.svelte';
-  import { OCCUPATION_STATE, OccupationState } from './occuplan/state.svelte.js';
+  import { getOccupationState, OccupationState } from './occuplan/state.svelte.js';
   import OccuPlanPicker from './occuplan/OccuPlanPicker.svelte';
-  import { slide } from 'svelte/transition';
+  import { fade } from 'svelte/transition';
   import type { DateTime } from 'luxon';
   import { randomID } from './names/gen.js';
+  import { format } from './helpers/format.ts';
 
   const {
     endpoint,
@@ -55,9 +56,7 @@
   let sending = $state(false);
   let disabled = $derived(preview || errored || successfullySent);
 
-  const url = calUrl;
-  const oStateID = `i-${url}-${OCCUPATION_STATE}`;
-  let occupationState: OccupationState = $state(getContext(oStateID));
+  let occupationState: OccupationState = getOccupationState(calUrl);
   let invalid = $derived(
     occupationState && arrival && leave ? occupationState.validRequest(arrival, leave) : false,
   );
@@ -83,6 +82,20 @@
     inputDatesEngaged = false;
   };
 
+  let travelDates = $derived.by(() => {
+    if (arrival && leave) {
+      if (formatDateFunc) {
+        return `${formatDateFunc(arrival)} - ${formatDateFunc(leave)}`;
+      } else {
+        const formattedArrival = arrival.toFormat('yyyy-MM-dd');
+        const formattedLeave = leave.toFormat('yyyy-MM-dd');
+        return `${formattedArrival} - ${formattedLeave}`;
+      }
+    } else {
+      return '';
+    }
+  });
+
   const createRequest = async (e: SubmitEvent) => {
     sending = true;
     e.preventDefault();
@@ -113,7 +126,11 @@
       console.log('Error sending request', e);
     }
 
+    arrival = undefined;
+    leave = undefined;
+    inputDatesEngaged = false;
     sending = false;
+
     setTimeout(() => {
       errored = false;
       successfullySent = false;
@@ -161,8 +178,8 @@
     </label>
     <div class="input-wrapper" class:disabled>
       {#if inputDatesEngaged}
-        <div transition:slide style="min-width: 32rem;" class="picker-wrapper">
-          <OccuPlanPicker {arrival} {leave} {url} aborted={abortDateInput} {dateSelected} />
+        <div transition:fade style="min-width: 32rem;" class="picker-wrapper">
+          <OccuPlanPicker {arrival} {leave} url={calUrl} aborted={abortDateInput} {dateSelected} />
         </div>
       {/if}
       <div class="date-input-wrapper" id="engage-date-buttons">
@@ -172,9 +189,7 @@
           iconName="edit"
           size={1.8}
           clicked={engageDateInput}
-          text={arrival && leave && formatDateFunc
-            ? `${formatDateFunc(arrival)} - ${formatDateFunc(leave)}`
-            : ''}
+          text={travelDates}
         />
         {#if arrival && leave}
           <Button iconName="delete" size={1.8} clicked={dateDeleted} />
@@ -243,9 +258,10 @@
     }
   }
   form {
+    position: relative;
     display: grid;
     grid-template-columns: [start] 1fr [gap-start] 0.5fr [gap-end] 3fr [end];
-    row-gap: 0.5rem;
+    row-gap: 1rem;
 
     label {
       align-content: center;
@@ -272,6 +288,8 @@
       justify-content: flex-start;
     }
     div.picker-wrapper {
+      bottom: 2rem;
+      right: -3rem;
       position: absolute;
       z-index: 9999;
       background-color: var(--main-bg-color);

package/dist/basic/Notes.svelte

@@ -40,7 +40,7 @@
 
     width: 100%;
     max-width: 800px;
-    min-height: 5rem;
+    min-height: 8rem;
     height: 100%;
 
     border: none;

package/dist/occuplan/OccuPlanGrid.svelte

@@ -62,7 +62,9 @@
   };
 
   let page: number = $state(0);
-  let rfMonth: DateTime = $derived(realFirstMonth(firstMonth, numberOfMonth, page));
+  let rfMonth: DateTime = $derived(
+    realFirstMonth(firstMonth, DateTime.utc().get('year'), numberOfMonth, page),
+  );
 
   let currentMaxDate = $derived(rfMonth.plus({ month: numberOfMonth }));
 

package/dist/occuplan/OccuPlanPicker.svelte

@@ -74,6 +74,7 @@
   let rfMonth: DateTime = $derived(
     realFirstMonth(
       (arrival?.month ? arrival.month : minDate.month) as MonthNumbers,
+      arrival?.year ? arrival.year : minDate.year,
       numberOfMonth,
       page,
     ),

package/dist/occuplan/OccuPlanRows.svelte

@@ -50,7 +50,9 @@
   let occupationState: OccupationState = getOccupationState(url, debug);
 
   let page: number = $state(0);
-  let rfMonth: number | DateTime = $derived(realFirstMonth(firstMonth, numberOfMonth, page));
+  let rfMonth: number | DateTime = $derived(
+    realFirstMonth(firstMonth, DateTime.utc().get('year'), numberOfMonth, page),
+  );
 
   let currentMaxDate = $derived(rfMonth.plus({ month: numberOfMonth }));
 

package/dist/occuplan/state.svelte.d.ts

@@ -30,7 +30,7 @@ export interface DayHelper {
     year: number;
 }
 export declare const firstMonthValid: (value: string | number) => boolean;
-export declare const realFirstMonth: (firstMonth: FirstMonth, numberOfMonth: number, page: number) => DateTime;
+export declare const realFirstMonth: (firstMonth: FirstMonth, firstMonthYear: number, numberOfMonth: number, page: number) => DateTime;
 export interface OccuplanTranslations {
     arrivalLabel?: string;
     leaveLabel?: string;

package/dist/occuplan/state.svelte.js

@@ -75,16 +75,19 @@ export const firstMonthValid = (value) => {
     }
     return false;
 };
-export const realFirstMonth = (firstMonth, numberOfMonth, page) => {
+export const realFirstMonth = (firstMonth, firstMonthYear, numberOfMonth, page) => {
     const monthToAdd = page * numberOfMonth;
     if (typeof firstMonth === 'number') {
         const intValue = firstMonth;
         if (intValue >= 1 && intValue <= 12) {
             const tDate = normalizeDate(DateTime.utc())
-                .set({ month: intValue })
+                .set({ month: intValue, year: firstMonthYear })
                 .plus({ month: monthToAdd });
             return tDate;
         }
+        else {
+            return normalizeDate(DateTime.utc()).plus(monthToAdd);
+        }
     }
     else if (typeof firstMonth === 'string' && firstMonth.length > 1) {
         //check + sign
@@ -94,10 +97,14 @@ export const realFirstMonth = (firstMonth, numberOfMonth, page) => {
                 const intValue = parseInt(toParse);
                 if (intValue >= 1 && intValue <= 12) {
                     const tDate = normalizeDate(DateTime.utc())
+                        .set({ year: firstMonthYear })
                         .plus({ month: intValue })
                         .plus({ month: monthToAdd });
                     return tDate;
                 }
+                else {
+                    return normalizeDate(DateTime.utc()).plus(monthToAdd);
+                }
             }
             catch (e) {
                 console.log('casting error', e);
@@ -110,10 +117,14 @@ export const realFirstMonth = (firstMonth, numberOfMonth, page) => {
                 const intValue = parseInt(toParse);
                 if (intValue >= 0 && intValue <= 12) {
                     const tDate = normalizeDate(DateTime.utc())
+                        .set({ year: firstMonthYear })
                         .minus({ month: intValue })
                         .plus({ month: monthToAdd });
                     return tDate;
                 }
+                else {
+                    return normalizeDate(DateTime.utc()).plus(monthToAdd);
+                }
             }
             catch (e) {
                 console.log('casting error', e);
@@ -125,7 +136,7 @@ export const realFirstMonth = (firstMonth, numberOfMonth, page) => {
             const intValue = parseInt(firstMonth);
             //current dynamic month
             if (intValue == 0) {
-                return normalizeDate(DateTime.utc()).plus({ month: monthToAdd });
+                return normalizeDate(DateTime.utc()).set({ year: firstMonthYear }).plus({ month: monthToAdd });
             }
             //static month of current year
             if (intValue >= 1 && intValue <= 12) {
@@ -134,13 +145,16 @@ export const realFirstMonth = (firstMonth, numberOfMonth, page) => {
                     .plus({ month: monthToAdd });
                 return tDate;
             }
+            else {
+                return normalizeDate(DateTime.utc()).set({ year: firstMonthYear }).plus(monthToAdd);
+            }
         }
         catch (e) {
             console.log('casting error', e);
         }
     }
     //first month of current year ... default
-    return normalizeDate(DateTime.utc()).set({ month: 1 }).plus({ month: monthToAdd });
+    return normalizeDate(DateTime.utc()).set({ month: 1, year: firstMonthYear }).plus({ month: monthToAdd });
 };
 const validDay = (d) => {
     const today = luxon.utc();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "accomadesc",
-  "version": "0.3.31",
+  "version": "0.3.33",
   "files": [
     "dist",
     "!dist/**/*.test.*",
@@ -26,16 +26,16 @@
   "devDependencies": {
     "@sveltejs/adapter-auto": "^3.3.1",
     "@sveltejs/adapter-static": "^3.0.10",
-    "@sveltejs/kit": "^2.47.3",
-    "@sveltejs/package": "^2.5.4",
+    "@sveltejs/kit": "^2.49.0",
+    "@sveltejs/package": "^2.5.6",
     "@sveltejs/vite-plugin-svelte": "^5.1.1",
     "@types/luxon": "^3.7.1",
     "gdpr-cooco-banner": "^0.0.11",
     "prettier": "^3.6.2",
     "prettier-plugin-svelte": "^3.4.0",
     "publint": "^0.3.15",
-    "svelte": "^5.41.4",
-    "svelte-check": "^4.3.3",
+    "svelte": "^5.43.14",
+    "svelte-check": "^4.3.4",
     "typescript": "^5.9.3",
     "vite": "^6.4.1"
   },