@bexis2/bexis2-core-ui 0.2.11 → 0.2.12

package/src/lib/components/Table/filter.ts

@@ -1,141 +1,141 @@
-import type { ColumnFilterFn } from 'svelte-headless-table/lib/plugins';
-import type { TableFilterFn } from 'svelte-headless-table/lib/plugins/addTableFilter';
-
-const textFilter = (filterOption, filterValue, value) => {
-	switch (filterOption) {
-		case 'isequal':
-			return value.toLowerCase() === filterValue.toLowerCase();
-		case 'isnotequal':
-			return value.toLowerCase() !== filterValue.toLowerCase();
-		case 'starts':
-			return value.toLowerCase().startsWith(filterValue.toLowerCase());
-		case 'ends':
-			return value.toLowerCase().endsWith(filterValue.toLowerCase());
-		case 'contains':
-			return value.toLowerCase().includes(filterValue.toLowerCase());
-		case 'notcontains':
-			return !value.toLowerCase().includes(filterValue.toLowerCase());
-		default:
-			return false;
-	}
-};
-
-const numberFilter = (filterOption, filterValue, value) => {
-	switch (filterOption) {
-		case 'isequal':
-			return value === filterValue;
-		case 'isnotequal':
-			return value !== filterValue;
-		case 'isgreater':
-			return value > filterValue;
-		case 'isless':
-			return value < filterValue;
-		case 'isgreaterorequal':
-			return value >= filterValue;
-		case 'islessorequal':
-			return value <= filterValue;
-		default:
-			return false;
-	}
-};
-
-const dateFilter = (filterOption, filterValue, value) => {
-	const filter = new Date(filterValue);
-
-	switch (filterOption) {
-		case 'ison':
-			return value === filter;
-		case 'isstartingfrom':
-			return value >= filter;
-		case 'isafter':
-			return value > filter;
-		case 'isuntil':
-			return value <= filter;
-		case 'isbefore':
-			return value < filter;
-		case 'isnoton':
-			return value !== filter;
-		default:
-			return false;
-	}
-};
-
-const numericFilter: ColumnFilterFn = ({ filterValue, value }) => {
-	const [firstFilterOption, firstFilterValue, secondFilterOption, secondFilterValue] = filterValue;
-	if (firstFilterValue == null && secondFilterValue == null) {
-		return true;
-	} else if (
-		(firstFilterOption == null || firstFilterValue == null) &&
-		secondFilterOption != null &&
-		secondFilterValue != null
-	) {
-		return numberFilter(secondFilterOption, secondFilterValue, value);
-	} else if (
-		(secondFilterOption == null || secondFilterValue == null) &&
-		firstFilterOption != null &&
-		firstFilterValue != null
-	) {
-		return numberFilter(firstFilterOption, firstFilterValue, value);
-	}
-	return (
-		numberFilter(firstFilterOption, firstFilterValue, value) &&
-		numberFilter(secondFilterOption, secondFilterValue, value)
-	);
-};
-
-const stringFilter: ColumnFilterFn = ({ filterValue, value }) => {
-	const [firstFilterOption, firstFilterValue, secondFilterOption, secondFilterValue] = filterValue;
-	if (!firstFilterValue?.length && !secondFilterValue?.length) {
-		return true;
-	} else if (
-		(!firstFilterOption || !firstFilterValue) &&
-		secondFilterOption &&
-		secondFilterValue?.length
-	) {
-		return textFilter(secondFilterOption, secondFilterValue, value);
-	} else if (
-		(!secondFilterOption || !secondFilterValue?.length) &&
-		firstFilterOption &&
-		firstFilterValue?.length
-	) {
-		return textFilter(firstFilterOption, firstFilterValue, value);
-	}
-	return (
-		textFilter(firstFilterOption, firstFilterValue, value) &&
-		textFilter(secondFilterOption, secondFilterValue, value)
-	);
-};
-
-const dateTypeFilter: ColumnFilterFn = ({ filterValue, value }) => {
-	const [firstFilterOption, firstFilterValue, secondFilterOption, secondFilterValue] = filterValue;
-	if (!firstFilterValue && !secondFilterValue) {
-		return true;
-	} else if ((!firstFilterOption || !firstFilterValue) && secondFilterOption && secondFilterValue) {
-		return dateFilter(secondFilterOption, secondFilterValue, value);
-	} else if ((!secondFilterOption || !secondFilterValue) && firstFilterOption && firstFilterValue) {
-		return dateFilter(firstFilterOption, firstFilterValue, value);
-	}
-
-	return (
-		dateFilter(firstFilterOption, firstFilterValue, value) &&
-		dateFilter(secondFilterOption, secondFilterValue, value)
-	);
-};
-
-export const columnFilter: ColumnFilterFn = ({ filterValue, value }) => {
-	if (typeof value === 'string') {
-		return stringFilter({ filterValue, value });
-	} else if (typeof value === 'number') {
-		return numericFilter({ filterValue, value });
-	} else if (typeof value === 'object' && value instanceof Date) {
-		return dateTypeFilter({ filterValue, value });
-	}
-	return false;
-};
-
-export const searchFilter: TableFilterFn = ({ filterValue, value }) => {
-	if (value.toLowerCase().includes(filterValue.toLowerCase())) {
-		return true;
-	}
-	return false;
-};
+import type { ColumnFilterFn } from 'svelte-headless-table/lib/plugins';
+import type { TableFilterFn } from 'svelte-headless-table/lib/plugins/addTableFilter';
+
+const textFilter = (filterOption, filterValue, value) => {
+	switch (filterOption) {
+		case 'isequal':
+			return value.toLowerCase() === filterValue.toLowerCase();
+		case 'isnotequal':
+			return value.toLowerCase() !== filterValue.toLowerCase();
+		case 'starts':
+			return value.toLowerCase().startsWith(filterValue.toLowerCase());
+		case 'ends':
+			return value.toLowerCase().endsWith(filterValue.toLowerCase());
+		case 'contains':
+			return value.toLowerCase().includes(filterValue.toLowerCase());
+		case 'notcontains':
+			return !value.toLowerCase().includes(filterValue.toLowerCase());
+		default:
+			return false;
+	}
+};
+
+const numberFilter = (filterOption, filterValue, value) => {
+	switch (filterOption) {
+		case 'isequal':
+			return value === filterValue;
+		case 'isnotequal':
+			return value !== filterValue;
+		case 'isgreater':
+			return value > filterValue;
+		case 'isless':
+			return value < filterValue;
+		case 'isgreaterorequal':
+			return value >= filterValue;
+		case 'islessorequal':
+			return value <= filterValue;
+		default:
+			return false;
+	}
+};
+
+const dateFilter = (filterOption, filterValue, value) => {
+	const filter = new Date(filterValue);
+
+	switch (filterOption) {
+		case 'ison':
+			return value === filter;
+		case 'isstartingfrom':
+			return value >= filter;
+		case 'isafter':
+			return value > filter;
+		case 'isuntil':
+			return value <= filter;
+		case 'isbefore':
+			return value < filter;
+		case 'isnoton':
+			return value !== filter;
+		default:
+			return false;
+	}
+};
+
+const numericFilter: ColumnFilterFn = ({ filterValue, value }) => {
+	const [firstFilterOption, firstFilterValue, secondFilterOption, secondFilterValue] = filterValue;
+	if (firstFilterValue == null && secondFilterValue == null) {
+		return true;
+	} else if (
+		(firstFilterOption == null || firstFilterValue == null) &&
+		secondFilterOption != null &&
+		secondFilterValue != null
+	) {
+		return numberFilter(secondFilterOption, secondFilterValue, value);
+	} else if (
+		(secondFilterOption == null || secondFilterValue == null) &&
+		firstFilterOption != null &&
+		firstFilterValue != null
+	) {
+		return numberFilter(firstFilterOption, firstFilterValue, value);
+	}
+	return (
+		numberFilter(firstFilterOption, firstFilterValue, value) &&
+		numberFilter(secondFilterOption, secondFilterValue, value)
+	);
+};
+
+const stringFilter: ColumnFilterFn = ({ filterValue, value }) => {
+	const [firstFilterOption, firstFilterValue, secondFilterOption, secondFilterValue] = filterValue;
+	if (!firstFilterValue?.length && !secondFilterValue?.length) {
+		return true;
+	} else if (
+		(!firstFilterOption || !firstFilterValue) &&
+		secondFilterOption &&
+		secondFilterValue?.length
+	) {
+		return textFilter(secondFilterOption, secondFilterValue, value);
+	} else if (
+		(!secondFilterOption || !secondFilterValue?.length) &&
+		firstFilterOption &&
+		firstFilterValue?.length
+	) {
+		return textFilter(firstFilterOption, firstFilterValue, value);
+	}
+	return (
+		textFilter(firstFilterOption, firstFilterValue, value) &&
+		textFilter(secondFilterOption, secondFilterValue, value)
+	);
+};
+
+const dateTypeFilter: ColumnFilterFn = ({ filterValue, value }) => {
+	const [firstFilterOption, firstFilterValue, secondFilterOption, secondFilterValue] = filterValue;
+	if (!firstFilterValue && !secondFilterValue) {
+		return true;
+	} else if ((!firstFilterOption || !firstFilterValue) && secondFilterOption && secondFilterValue) {
+		return dateFilter(secondFilterOption, secondFilterValue, value);
+	} else if ((!secondFilterOption || !secondFilterValue) && firstFilterOption && firstFilterValue) {
+		return dateFilter(firstFilterOption, firstFilterValue, value);
+	}
+
+	return (
+		dateFilter(firstFilterOption, firstFilterValue, value) &&
+		dateFilter(secondFilterOption, secondFilterValue, value)
+	);
+};
+
+export const columnFilter: ColumnFilterFn = ({ filterValue, value }) => {
+	if (typeof value === 'string') {
+		return stringFilter({ filterValue, value });
+	} else if (typeof value === 'number') {
+		return numericFilter({ filterValue, value });
+	} else if (typeof value === 'object' && value instanceof Date) {
+		return dateTypeFilter({ filterValue, value });
+	}
+	return false;
+};
+
+export const searchFilter: TableFilterFn = ({ filterValue, value }) => {
+	if (value.toLowerCase().includes(filterValue.toLowerCase())) {
+		return true;
+	}
+	return false;
+};

package/src/lib/components/file/FileUploader.svelte

@@ -1,184 +1,184 @@
-<script lang="ts">
-	import type { fileUploaderModel, fileInfoType, filesType } from '../../models/Models.js';
-
-	import DropZone from 'svelte-file-dropzone/Dropzone.svelte';
-	import Fa from 'svelte-fa/src/fa.svelte';
-
-	import Spinner from '../page/Spinner.svelte';
-	import { createEventDispatcher } from 'svelte';
-	import { faTrash } from '@fortawesome/free-solid-svg-icons';
-	import { faSave } from '@fortawesome/free-regular-svg-icons';
-	import { faFileUpload } from '@fortawesome/free-solid-svg-icons';
-
-	import { Api } from '../../services/Api.js';
-
-	export let id = 0;
-	export let version = 1;
-
-	import { onMount } from 'svelte';
-
-	// export let description="";
-	// export let status=0;
-
-	//action to load fileupload model
-	export let start = '';
-	//action to save selected file
-	export let submit = '';
-
-	export let context = '';
-
-	export let data: fileUploaderModel | undefined;
-
-	$: model = data;
-	$: submitBt = 'submit';
-
-	let maxSize = 0;
-
-	const dispatch = createEventDispatcher();
-
-	let fx: fileInfoType[];
-
-	let files: filesType = { accepted: [], rejected: [] };
-	$: files;
-
-	onMount(async () => {
-		//console.log('fileupload - OnMount', data);
-
-		if (!data) {
-			load();
-		} else {
-			model = data;
-		}
-
-		if (model) {
-			submitBt += context;
-			maxSize = model.maxSize * 1024 * 1024;
-		}
-	});
-
-	// load modal from server
-	async function load() {
-		let url = start + '?id=' + id + '&version=' + version;
-
-		// load menu froms server
-		const res = await Api.get(url);
-		model = await res.data();
-
-		 console.log('fileupload', model);
-	}
-
-	function handleFilesSelect(e: any) {
-		//console.log('handleFilesSelect', e);
-		console.log('files', files);
-
-		const { acceptedFiles, fileRejections } = e.detail;
-
-		files.accepted = [...files.accepted, ...acceptedFiles];
-		files.rejected = [...files.rejected, ...fileRejections];
-
-		//console.log('acceptedFiles', acceptedFiles);
-		console.log('files.accepted', files.accepted);
-
-		if (fileRejections.length > 0) {
-			//alert("the dropped file is not supported");
-			//console.log('the dropped file is not supported.');
-			console.log(files.rejected);
-
-			let messages = [''];
-
-			for (let index = 0; index < fileRejections.length; index++) {
-				const element = fileRejections[index];
-				messages.push(getErrorMessage(element));
-			}
-
-			//console.log(messages);
-
-			dispatch('error', { messages });
-			//list up the errors somewhere
-			files.rejected = [];
-		}
-
-		if (acceptedFiles.length > 0) {
-			document.getElementById(submitBt)?.click();
-		}
-	}
-
-	function getErrorMessage(rejected) {
-		let message = '';
-		message = rejected.file.path + ' : ';
-		let errors = rejected.errors;
-		for (let index = 0; index < errors.length; index++) {
-			const error = errors[index];
-			message += error.message;
-		}
-
-		return message;
-	}
-
-	async function handleSubmit() {
-		//console.log('SUBMIT');
-
-		dispatch('submit');
-
-		let url = submit + '?id=' + id;
-
-		// //console.log(model);
-		// //console.log(url);
-		//console.log('SUBMIT');
-
-		if (files.accepted.length > 0) {
-			//console.log(files);
-
-			const formData = new FormData();
-			formData.append('files', '123');
-			// Looping over all files and add it to FormData object
-			for (var i = 0; i < files.accepted.length; i++) {
-				formData.append(files.accepted[i].name, files.accepted[i]);
-			}
-
-			const response = await Api.post(url, formData);
-
-			if (response.status == 200) {
-				dispatch('submited');
-
-				let message = files.accepted.length + ' is/are uploaded';
-				dispatch('success', { text: message });
-
-				files.accepted = [];
-			}
-		}
-	}
-</script>
-
-<form on:submit|preventDefault={handleSubmit}>
-	{#if model}
-		<!--if model exist  -->
-		<div>
-			<DropZone
-				on:drop={handleFilesSelect}
-				accept={model.accept}
-				multiple={model.multiple}
-				{maxSize}
-			>
-				<b style="font-size:xx-large"><Fa icon={faFileUpload} /></b>
-				<span
-					><b>Drag 'n' drop some files here, or click to select files</b>
-					<b>max file : {model.maxSize} mb</b></span
-				>
-				<p>
-					{#if model.accept}
-						{#each model.accept as ext}
-							{ext} ,
-						{/each}
-					{/if}
-				</p>
-			</DropZone>
-		</div>
-
-		<button id={submitBt} color="primary" style="display:none"><Fa icon={faSave} /></button>
-	{:else}
-		<!-- while data is not loaded show a loading information -->
-
-		<Spinner />
-	{/if}
-</form>
+<script lang="ts">
+	import type { fileUploaderModel, fileInfoType, filesType } from '../../models/Models.js';
+
+	import DropZone from 'svelte-file-dropzone/Dropzone.svelte';
+	import Fa from 'svelte-fa/src/fa.svelte';
+
+	import Spinner from '../page/Spinner.svelte';
+	import { createEventDispatcher } from 'svelte';
+	import { faTrash } from '@fortawesome/free-solid-svg-icons';
+	import { faSave } from '@fortawesome/free-regular-svg-icons';
+	import { faFileUpload } from '@fortawesome/free-solid-svg-icons';
+
+	import { Api } from '../../services/Api.js';
+
+	export let id = 0;
+	export let version = 1;
+
+	import { onMount } from 'svelte';
+
+	// export let description="";
+	// export let status=0;
+
+	//action to load fileupload model
+	export let start = '';
+	//action to save selected file
+	export let submit = '';
+
+	export let context = '';
+
+	export let data: fileUploaderModel | undefined;
+
+	$: model = data;
+	$: submitBt = 'submit';
+
+	let maxSize = 0;
+
+	const dispatch = createEventDispatcher();
+
+	let fx: fileInfoType[];
+
+	let files: filesType = { accepted: [], rejected: [] };
+	$: files;
+
+	onMount(async () => {
+		//console.log('fileupload - OnMount', data);
+
+		if (!data) {
+			load();
+		} else {
+			model = data;
+		}
+
+		if (model) {
+			submitBt += context;
+			maxSize = model.maxSize * 1024 * 1024;
+		}
+	});
+
+	// load modal from server
+	async function load() {
+		let url = start + '?id=' + id + '&version=' + version;
+
+		// load menu froms server
+		const res = await Api.get(url);
+		model = await res.data();
+
+		console.log('fileupload', model);
+	}
+
+	function handleFilesSelect(e: any) {
+		//console.log('handleFilesSelect', e);
+		console.log('files', files);
+
+		const { acceptedFiles, fileRejections } = e.detail;
+
+		files.accepted = [...files.accepted, ...acceptedFiles];
+		files.rejected = [...files.rejected, ...fileRejections];
+
+		//console.log('acceptedFiles', acceptedFiles);
+		console.log('files.accepted', files.accepted);
+
+		if (fileRejections.length > 0) {
+			//alert("the dropped file is not supported");
+			//console.log('the dropped file is not supported.');
+			console.log(files.rejected);
+
+			let messages = [''];
+
+			for (let index = 0; index < fileRejections.length; index++) {
+				const element = fileRejections[index];
+				messages.push(getErrorMessage(element));
+			}
+
+			//console.log(messages);
+
+			dispatch('error', { messages });
+			//list up the errors somewhere
+			files.rejected = [];
+		}
+
+		if (acceptedFiles.length > 0) {
+			document.getElementById(submitBt)?.click();
+		}
+	}
+
+	function getErrorMessage(rejected) {
+		let message = '';
+		message = rejected.file.path + ' : ';
+		let errors = rejected.errors;
+		for (let index = 0; index < errors.length; index++) {
+			const error = errors[index];
+			message += error.message;
+		}
+
+		return message;
+	}
+
+	async function handleSubmit() {
+		//console.log('SUBMIT');
+
+		dispatch('submit');
+
+		let url = submit + '?id=' + id;
+
+		// //console.log(model);
+		// //console.log(url);
+		//console.log('SUBMIT');
+
+		if (files.accepted.length > 0) {
+			//console.log(files);
+
+			const formData = new FormData();
+			formData.append('files', '123');
+			// Looping over all files and add it to FormData object
+			for (var i = 0; i < files.accepted.length; i++) {
+				formData.append(files.accepted[i].name, files.accepted[i]);
+			}
+
+			const response = await Api.post(url, formData);
+
+			if (response.status == 200) {
+				dispatch('submited');
+
+				let message = files.accepted.length + ' is/are uploaded';
+				dispatch('success', { text: message });
+
+				files.accepted = [];
+			}
+		}
+	}
+</script>
+
+<form on:submit|preventDefault={handleSubmit}>
+	{#if model}
+		<!--if model exist  -->
+		<div>
+			<DropZone
+				on:drop={handleFilesSelect}
+				accept={model.accept}
+				multiple={model.multiple}
+				{maxSize}
+			>
+				<b style="font-size:xx-large"><Fa icon={faFileUpload} /></b>
+				<span
+					><b>Drag 'n' drop some files here, or click to select files</b>
+					<b>max file : {model.maxSize} mb</b></span
+				>
+				<p>
+					{#if model.accept}
+						{#each model.accept as ext}
+							{ext} ,
+						{/each}
+					{/if}
+				</p>
+			</DropZone>
+		</div>
+
+		<button id={submitBt} color="primary" style="display:none"><Fa icon={faSave} /></button>
+	{:else}
+		<!-- while data is not loaded show a loading information -->
+
+		<Spinner />
+	{/if}
+</form>

package/src/lib/components/form/Checkbox.svelte

@@ -3,7 +3,7 @@
 
 	export let id: string = '';
 	export let label: string = '';
-	export let checked: bool = false;
+	export let checked: boolean = false;
 
 	export let valid: boolean;
 	export let invalid: boolean;

package/src/lib/components/form/DateInput.svelte

@@ -10,7 +10,6 @@
 	export let required: boolean = false;
 	export let feedback: string[] = [''];
 	export let help = false;
-	
 </script>
 
 <InputContainer {id} {label} {feedback} {required} {help}>