intelliwaketssveltekitv25 0.2.9 → 0.2.12

package/dist/Calendar.svelte

@@ -24,7 +24,8 @@
 		selectRange = 'Single',
 		minYear = 1970,
 		maxYear = new Date().getUTCFullYear() + 1,
-		maxWidth = '25em'
+		maxWidth = '25em',
+		fyMonthsAdjust
 	}: {
 		baseDate?: string
 		dateRangeString?: TDateRangeString | null
@@ -33,7 +34,8 @@
 		selectRange?: 'None' | 'Single' | 'Range' | 'Month' | 'Week'
 		minYear?: number
 		maxYear?: number
-		maxWidth?: string
+		maxWidth?: string,
+		fyMonthsAdjust?: number | null
 	} = $props()
 
 	let largeDateParameters: IDateParameters = $derived(GetMonthWeeks(baseDate, dateRangeString?.start, dateRangeString?.end))
@@ -55,20 +57,20 @@
 	function getDateRangeStringFromDate(date: string) {
 		switch (selectRange) {
 			case 'Week':
-				return CreateCustomDateRange(DateOnly(date, { week: 'StartOf' }), DateOnly(date, { week: 'EndOf' }))
+				return CreateCustomDateRange(DateOnly(date, { week: 'StartOf' }), DateOnly(date, { week: 'EndOf' }), fyMonthsAdjust)
 			case 'Month':
-				return CreateCustomDateRange(DateOnly(date, { month: 'StartOf' }), DateOnly(date, { month: 'EndOf' }))
+				return CreateCustomDateRange(DateOnly(date, { month: 'StartOf' }), DateOnly(date, { month: 'EndOf' }), fyMonthsAdjust)
 			case 'Range':
 				if (!applyRangeToSecondDate) {
 					applyRangeToSecondDate = true
 					let days = !!dateRangeString?.start && !!dateRangeString?.end ? DateDiff(dateRangeString.start, dateRangeString.end, 'day') ?? 0 : 0
-					return CreateCustomDateRange(date, DateOnly(date, { days: days }))
+					return CreateCustomDateRange(date, DateOnly(date, { days: days }), fyMonthsAdjust)
 				} else {
 					applyRangeToSecondDate = false
-					return CreateCustomDateRange(dateRangeString?.start ?? date, date)
+					return CreateCustomDateRange(dateRangeString?.start ?? date, date, fyMonthsAdjust)
 				}
 			default:
-				return CreateCustomDateRange(date, date)
+				return CreateCustomDateRange(date, date, fyMonthsAdjust)
 		}
 	}
 

package/dist/Calendar.svelte.d.ts

@@ -8,6 +8,7 @@ type $$ComponentProps = {
     minYear?: number;
     maxYear?: number;
     maxWidth?: string;
+    fyMonthsAdjust?: number | null;
 };
 declare const Calendar: import("svelte").Component<$$ComponentProps, {}, "baseDate" | "dateRangeString" | "applyRangeToSecondDate">;
 type Calendar = ReturnType<typeof Calendar>;

package/dist/DateRangeFunctions.d.ts

@@ -14,7 +14,7 @@ export type TDateRangeString = {
     start: string;
     end: string;
 };
-export declare function CreateCustomDateRange(dateStart: TDateAny, dateEnd: TDateAny): TDateRangeString;
+export declare function CreateCustomDateRange(dateStart: TDateAny, dateEnd: TDateAny, fyMonthsAdjust?: number | null): TDateRangeString;
 export declare function DefaultRangeStringsReport(fyMonthsAdjust?: number | null | undefined): TDateRangeString[];
 export declare function DefaultRangeStringsReportMonthly(fyMonthsAdjust?: number | null | undefined): TDateRangeString[];
 export declare function DefaultRangeStringsReportQuarterly(fyMonthsAdjust?: number | null | undefined): TDateRangeString[];
@@ -22,6 +22,7 @@ export declare function DefaultDateRangeStringThisMonth(): TDateRangeString;
 export declare function DefaultDateRangeStringLastMonth(): TDateRangeString;
 export declare function DefaultDateRangeStringToday(): TDateRangeString;
 export declare function DefaultDateRangeStringYesterday(): TDateRangeString;
+export declare function DefaultDateRangeStringPrevious7Days(): TDateRangeString;
 export declare function DefaultDateRangeStringThisWeek(): TDateRangeString;
 export declare function DefaultDateRangeStringLastWeek(): TDateRangeString;
 export declare function DefaultDateRangeStringLast4Weeks(): TDateRangeString;
@@ -31,8 +32,8 @@ export declare function DefaultDateRangeString3QuartersAgo(): TDateRangeString;
 export declare function DefaultDateRangeString4QuartersAgo(): TDateRangeString;
 export declare function DefaultDateRangeStringThisQuarter(): TDateRangeString;
 export declare function DefaultDateRangeStringYTD(): TDateRangeString;
-export declare function DefaultDateRangeStringThisFiscalYear(fyMonthsAdjust: number): TDateRangeString;
-export declare function DefaultDateRangeStringLastFiscalYear(fyMonthsAdjust: number): TDateRangeString;
+export declare function DefaultDateRangeStringThisFiscalYear(fyMonthsAdjust: number | null | undefined): TDateRangeString;
+export declare function DefaultDateRangeStringLastFiscalYear(fyMonthsAdjust: number | null | undefined): TDateRangeString;
 export declare function DefaultDateRangeStringThisYear(): TDateRangeString;
 export declare function DefaultDateRangeStringLastYear(): TDateRangeString;
 export type TTimeParams = {

package/dist/DateRangeFunctions.js

@@ -1,6 +1,6 @@
 import { DateCompare, DateComponent, DateDayOfWeek, DateDoWSundayZero, DateFormat, DateOnly } from '@solidbasisventures/intelliwaketsfoundation';
 export const CustomRangeName = 'Custom Range';
-export function CreateCustomDateRange(dateStart, dateEnd) {
+export function CreateCustomDateRange(dateStart, dateEnd, fyMonthsAdjust) {
     const useDateStart = DateOnly(dateStart);
     let useDateEnd = DateOnly(dateEnd);
     if (DateCompare(useDateEnd, 'IsBefore', useDateStart, 'day')) {
@@ -9,8 +9,15 @@ export function CreateCustomDateRange(dateStart, dateEnd) {
     const checks = [
         DefaultDateRangeStringToday(),
         DefaultDateRangeStringYesterday(),
+        DefaultDateRangeStringPrevious7Days(),
         DefaultDateRangeStringThisWeek(),
         DefaultDateRangeStringLastWeek(),
+        ...(!fyMonthsAdjust
+            ? []
+            : [
+                DefaultDateRangeStringThisFiscalYear(fyMonthsAdjust),
+                DefaultDateRangeStringLastFiscalYear(fyMonthsAdjust)
+            ]),
         DefaultDateRangeStringThisMonth(),
         DefaultDateRangeStringLastMonth(),
         DefaultDateRangeStringThisYear(),
@@ -123,6 +130,13 @@ export function DefaultDateRangeStringYesterday() {
         end: DateOnly('now', { days: -1 })
     };
 }
+export function DefaultDateRangeStringPrevious7Days() {
+    return {
+        name: 'Previous 7 Days',
+        start: DateOnly('now', { weeks: -1 }),
+        end: DateOnly('now')
+    };
+}
 export function DefaultDateRangeStringThisWeek() {
     return {
         name: 'This Week',
@@ -187,6 +201,8 @@ export function DefaultDateRangeStringYTD() {
     };
 }
 export function DefaultDateRangeStringThisFiscalYear(fyMonthsAdjust) {
+    if (!fyMonthsAdjust)
+        return DefaultDateRangeStringThisYear();
     return {
         name: 'This Fiscal Year',
         start: DateOnly('now', { month: fyMonthsAdjust * -1, year: 'StartOf', months: fyMonthsAdjust }),
@@ -194,6 +210,8 @@ export function DefaultDateRangeStringThisFiscalYear(fyMonthsAdjust) {
     };
 }
 export function DefaultDateRangeStringLastFiscalYear(fyMonthsAdjust) {
+    if (!fyMonthsAdjust)
+        return DefaultDateRangeStringLastYear();
     return {
         name: 'Last Fiscal Year',
         start: DateOnly('now', {

package/dist/DateRangePicker.svelte

@@ -14,7 +14,8 @@
 		setCookieName,
 		invalidate,
 		allowCustom = true,
-		show = $bindable(false)
+		show = $bindable(false),
+		fyMonthsAdjust
 	}: {
 		dateRange: TDateRangeString
 		dateRanges?: TDateRangeString[]
@@ -24,7 +25,8 @@
 		setCookieName?: string
 		invalidate?: string | string[] | 'All' | 'app:All' | null
 		allowCustom?: boolean
-		show?: boolean
+		show?: boolean,
+		fyMonthsAdjust?: number | null
 	} = $props()
 
 	let customDateRange = $state<TDateRangeString | null>(null)
@@ -105,6 +107,7 @@
 					<Calendar baseDate={baseDateNearToday}
 										bind:dateRangeString={customDateRange}
 										bind:applyRangeToSecondDate={applyRangeToSecondDate}
+										{fyMonthsAdjust}
 										selectRange="Range" />
 					<div class="grid grid-cols-2 mt-2">
 						<div class="text-center">

package/dist/DateRangePicker.svelte.d.ts

@@ -9,6 +9,7 @@ type $$ComponentProps = {
     invalidate?: string | string[] | 'All' | 'app:All' | null;
     allowCustom?: boolean;
     show?: boolean;
+    fyMonthsAdjust?: number | null;
 };
 declare const DateRangePicker: import("svelte").Component<$$ComponentProps, {}, "show" | "dateRange">;
 type DateRangePicker = ReturnType<typeof DateRangePicker>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "intelliwaketssveltekitv25",
-  "version": "0.2.9",
+  "version": "0.2.12",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",