diff --git a/biome.jsonc b/biome.jsonc index 0a76511..c284c69 100644 --- a/biome.jsonc +++ b/biome.jsonc @@ -40,6 +40,13 @@ "a11y": { "useKeyWithClickEvents": "off", "noStaticElementInteractions": "off" + }, + "complexity": { + "noUselessFragments": "off" + }, + "suspicious": { + "noImplicitAnyLet": "off", + "noImplicitAny": "off" } } } diff --git a/src/pages/AssessorPage/Assessor.tsx b/src/pages/AssessorPage/Assessor.tsx index b7d674a..48282c7 100644 --- a/src/pages/AssessorPage/Assessor.tsx +++ b/src/pages/AssessorPage/Assessor.tsx @@ -6,7 +6,7 @@ import { FiLogOut } from 'solid-icons/fi' import { VsRefresh } from 'solid-icons/vs' import { createEffect, createSignal, onMount } from 'solid-js' import { Show } from 'solid-js/web' -import { Box, Button, Clickable, Column, Input, Link, Logo, Modal, ModalButton, Padding, Page, Row } from '../../components' +import { Box, Button, Clickable, Column, Combobox, Input, Link, Logo, Modal, ModalButton, Padding, Page, Row } from '../../components' import { _additional, _additionalAmountList, @@ -68,6 +68,9 @@ export default () => { const [filter, setFilter] = createSignal('') + const listType = ['Print', 'Manual Print', 'Reprint'] + const [selectedType, setSelectedType] = createSignal('Print') + let bldgadditional = false const checkAccess = async (access: string) => { @@ -266,7 +269,7 @@ export default () => { const checkLogged = async () => { const idStore = sessionStorage.getItem('id') const nameStore = sessionStorage.getItem('name') - setEmployeeId(parseInt(idStore!)) + setEmployeeId(parseInt(idStore!, 10)) setEmployeeName(nameStore!) if (employeeId() === 0 || employeeId().toString() === 'NaN') { @@ -315,7 +318,7 @@ export default () => { const updateOp = async (division: string) => { const post = await postApi(`update-opprinted-${division}`, { - data: parseInt(applicationId().toString()), + data: parseInt(applicationId().toString(), 10), }) return post } @@ -323,7 +326,7 @@ export default () => { const setNewStatus = async (division: string, status: string, tag: string, tagword: string, approved: number) => { const today = new Date() const formattedDate = dayjs(today).format('YYYY-MM-DD HH:mm:ss') - const statusid = parseInt(applicationId().toString()) + const statusid = parseInt(applicationId().toString(), 10) const post = await postApi(`post-newstatus-${division}`, { data: statusid, @@ -331,8 +334,8 @@ export default () => { data3: status, data4: tag, data5: tagword, - data6: parseInt(approved.toString()), - data7: parseInt(employeeId().toString()), + data6: parseInt(approved.toString(), 10), + data7: parseInt(employeeId().toString(), 10), }) return post } @@ -375,7 +378,7 @@ export default () => { const formatedDate = dayjs(today).format('YYYY-MM-DD HH:mm:ss') await postApi('post-esigntransaction', { - data: parseInt(id), + data: parseInt(id, 10), data2: application, data3: formatedDate, }) @@ -498,7 +501,10 @@ export default () => { - + + + + @@ -589,7 +595,10 @@ export default () => { - + + + + @@ -680,7 +689,10 @@ export default () => { - + + + + diff --git a/src/pages/IndexPage/Index.tsx b/src/pages/IndexPage/Index.tsx index 461a6a8..d4b18a1 100644 --- a/src/pages/IndexPage/Index.tsx +++ b/src/pages/IndexPage/Index.tsx @@ -1,13 +1,13 @@ -import './Index.sass' -import { Button, Page, Padding, Display, Row, Logo, Footer, Copyright, Column, Image, Box } from '../../components' -import { getApi } from '../../utils/functions' import { onMount } from 'solid-js' +import pageLogoAvif from '../../assets/images/optimized/esign.avif' +import pageLogoWebp from '../../assets/images/optimized/esign.webp' import ocboAvif from '../../assets/images/optimized/ocbologo.avif' import ocboWebp from '../../assets/images/optimized/ocbologo.webp' import patAvif from '../../assets/images/optimized/pat-alcala.avif' import patWebp from '../../assets/images/optimized/pat-alcala.webp' -import pageLogoAvif from '../../assets/images/optimized/esign.avif' -import pageLogoWebp from '../../assets/images/optimized/esign.webp' +import { Box, Button, Column, Copyright, Display, Footer, Image, Logo, Padding, Page, Row } from '../../components' +import { getApi } from '../../utils/functions' +import './Index.sass' let assessorsNameList: string[] let registeredNameList: string[] diff --git a/src/pages/MainPage/Main.tsx b/src/pages/MainPage/Main.tsx index a18044b..54bc7d0 100644 --- a/src/pages/MainPage/Main.tsx +++ b/src/pages/MainPage/Main.tsx @@ -1,16 +1,14 @@ -import './Main.sass' -import { Logo, Link, Page, Row, Padding, ModalButton, Box, Button, Modal, Column, Clickable } from '../../components/' -import { FiLogOut } from 'solid-icons/fi' import { Tabs } from '@kobalte/core/tabs' -import { onMount, createSignal } from 'solid-js' -import dayjs from 'dayjs' -import { checkConnection, getApi, getApiMulti, postApi } from '../../utils/functions' -import { FaSolidThumbsUp } from 'solid-icons/fa' -import { _employeeName } from '../../stores/employee' import { useNavigate } from '@solidjs/router' -import { _applicationNo, _date, _optn, _name, _location, _type, _assessor, _feeList, _codeList, _amountList, _signatureAssessor, _signatureApprover, _assessorid, _approvedDate, _assessedDate } from '../../stores/pdfinfo' -import { VsRefresh } from 'solid-icons/vs' +import dayjs from 'dayjs' import { BiRegularErrorAlt } from 'solid-icons/bi' +import { FaSolidThumbsUp } from 'solid-icons/fa' +import { FiLogOut } from 'solid-icons/fi' +import { VsRefresh } from 'solid-icons/vs' +import { createSignal, onMount } from 'solid-js' +import { Box, Button, Clickable, Column, Link, Logo, Modal, ModalButton, Padding, Page, Row } from '../../components/' +import { checkConnection, getApi, getApiMulti, postApi } from '../../utils/functions' +import './Main.sass' const PESO = import.meta.env.VITE_PESO const ID = import.meta.env.VITE_HEADID