diff --git a/src/lib/components/dashboard/funnel.card.svelte b/src/lib/components/dashboard/funnel.card.svelte index 86da8f86..24fa307d 100644 --- a/src/lib/components/dashboard/funnel.card.svelte +++ b/src/lib/components/dashboard/funnel.card.svelte @@ -1,13 +1,16 @@
@@ -15,17 +16,22 @@ type="text" class="input" name="options" - disabled bind:value={optionValueStore[i].Text} placeholder="Add option here..." + disabled={readonly} /> - + {#if !readonly} + + {/if}
{/each} - - + + + {#if !readonly} + + {/if} diff --git a/src/routes/users/[userId]/assessment-templates/[templateId]/edit/+page.server.ts b/src/routes/users/[userId]/assessment-templates/[templateId]/edit/+page.server.ts index e4d9f8c7..597bf3a3 100755 --- a/src/routes/users/[userId]/assessment-templates/[templateId]/edit/+page.server.ts +++ b/src/routes/users/[userId]/assessment-templates/[templateId]/edit/+page.server.ts @@ -93,7 +93,7 @@ export const actions = { throw redirect( 303, `/users/${userId}/assessment-templates/${id}/view`, - successMessage(`Assessment template updated successfully!`), + successMessage(`Assessment updated successfully!`), event ); } diff --git a/src/routes/users/[userId]/assessment-templates/create/+page.server.ts b/src/routes/users/[userId]/assessment-templates/create/+page.server.ts index 1044283a..d1afaa2a 100755 --- a/src/routes/users/[userId]/assessment-templates/create/+page.server.ts +++ b/src/routes/users/[userId]/assessment-templates/create/+page.server.ts @@ -64,7 +64,7 @@ export const actions = { throw redirect( 303, `/users/${userId}/assessment-templates/${id}/view`, - successMessage(`Assessment template created successfully!`), + successMessage(`Assessment created successfully!`), event ); } diff --git a/src/routes/users/[userId]/assessment-templates/create/+page.svelte b/src/routes/users/[userId]/assessment-templates/create/+page.svelte index 5b7b9a6d..6e5c68f7 100755 --- a/src/routes/users/[userId]/assessment-templates/create/+page.svelte +++ b/src/routes/users/[userId]/assessment-templates/create/+page.svelte @@ -61,7 +61,7 @@ Type * - diff --git a/src/routes/users/[userId]/custom-queries/[id]/edit/+page.svelte b/src/routes/users/[userId]/custom-queries/[id]/edit/+page.svelte index 010f4f0e..fc5adf6d 100755 --- a/src/routes/users/[userId]/custom-queries/[id]/edit/+page.svelte +++ b/src/routes/users/[userId]/custom-queries/[id]/edit/+page.svelte @@ -124,7 +124,7 @@ on:submit={async () => await onUpdate(name, description, format, query, tags)} type="text" name="name" bind:value={name} - placeholder="Enter query here..." + placeholder="Enter query name here" class="input w-full" /> diff --git a/src/routes/users/[userId]/custom-queries/create/+page.svelte b/src/routes/users/[userId]/custom-queries/create/+page.svelte index ed04c18d..a4502296 100755 --- a/src/routes/users/[userId]/custom-queries/create/+page.svelte +++ b/src/routes/users/[userId]/custom-queries/create/+page.svelte @@ -99,7 +99,7 @@ function downloadFile(response) { type="text" name="name" bind:value={name} - placeholder="Enter query here..." + placeholder="Enter query name here..." class="input w-full {form?.errors?.name ? 'border-error-300' : 'border-primary-200'}" /> {#if form?.errors?.name} diff --git a/src/routes/users/[userId]/drugs/+page.server.ts b/src/routes/users/[userId]/drugs/+page.server.ts index b88c464f..3e9d5fdc 100755 --- a/src/routes/users/[userId]/drugs/+page.server.ts +++ b/src/routes/users/[userId]/drugs/+page.server.ts @@ -7,7 +7,10 @@ import { searchDrugs } from '../../../api/services/reancare/drugs'; export const load: PageServerLoad = async ({cookies,depends}) => { const sessionId = cookies.get('sessionId'); depends('app:drugs') - const response = await searchDrugs(sessionId); + const response = await searchDrugs(sessionId, { + orderBy : 'DrugName', + order : 'ascending' + }); if (response.Status === 'failure' || response.HttpCode !== 200) { throw error(response.HttpCode, response.Message); } diff --git a/src/routes/users/[userId]/drugs/+page.svelte b/src/routes/users/[userId]/drugs/+page.svelte index 7d5d0105..83dcc1c1 100755 --- a/src/routes/users/[userId]/drugs/+page.svelte +++ b/src/routes/users/[userId]/drugs/+page.svelte @@ -56,7 +56,7 @@ headers: { 'content-type': 'application/json' } }); const response = await res.json(); - drugs = response.map((item, index) => ({ ...item, index: index + 1 })); + drugs = response.map((item, index) => ({ ...item, index: index + 1 })); } $:{ @@ -123,7 +123,7 @@ @@ -144,7 +144,7 @@ Id diff --git a/src/routes/users/[userId]/gamification/badges/+page.svelte b/src/routes/users/[userId]/gamification/badges/+page.svelte index b88df53b..73115fea 100755 --- a/src/routes/users/[userId]/gamification/badges/+page.svelte +++ b/src/routes/users/[userId]/gamification/badges/+page.svelte @@ -14,8 +14,8 @@ ////////////////////////////////////////////////////////////////////////////////////////////////////////////////// export let data: PageServerData; - let badges = data.badges.Items; - $: badgeCategories = data.badgeCategories; + $: badges = data.badges.Items; + let badgeCategories = data.badgeCategories; let retrivedBadges; const userId = $page.params.userId; const createRoute = `/users/${userId}/gamification/badges/create`; @@ -52,7 +52,6 @@ if (itemsPerPage) url += `&itemsPerPage=${itemsPerPage}`; if (offset) url += `&pageIndex=${offset}`; if (name) url += `&name=${model.name}`; - console.log('url', url); if (categoryId == 'Category') { url; } else { diff --git a/src/routes/users/[userId]/goals/+page.svelte b/src/routes/users/[userId]/goals/+page.svelte index 3ca2f21c..37394f39 100755 --- a/src/routes/users/[userId]/goals/+page.svelte +++ b/src/routes/users/[userId]/goals/+page.svelte @@ -1,5 +1,4 @@ @@ -112,7 +104,11 @@ Id - Type + + + Tags Created Date diff --git a/src/routes/users/[userId]/health-systems/+page.server.ts b/src/routes/users/[userId]/health-systems/+page.server.ts index 74c3955c..e9515b16 100755 --- a/src/routes/users/[userId]/health-systems/+page.server.ts +++ b/src/routes/users/[userId]/health-systems/+page.server.ts @@ -10,11 +10,18 @@ export const load: PageServerLoad = async ({cookies,depends}) => { depends('app:healthSystem'); try { - const response = await searchHealthSystems(sessionId); + const response = await searchHealthSystems(sessionId, + { + orderBy: "Name", + order: "ascending" + } + ); if (response.Status === 'failure' || response.HttpCode !== 200) { throw error(response.HttpCode, response.Message); } const healthSystems = response.Data.HealthSystems; + console.log("%%%",healthSystems); + // healthSystems = healthSystems.map((item, index) => ({ ...item, index: index + 1 })); return { healthSystems, sessionId, diff --git a/src/routes/users/[userId]/health-systems/+page.svelte b/src/routes/users/[userId]/health-systems/+page.svelte index b3f2da50..32c1b400 100755 --- a/src/routes/users/[userId]/health-systems/+page.svelte +++ b/src/routes/users/[userId]/health-systems/+page.svelte @@ -45,7 +45,7 @@ if (sortOrder) url += `sortOrder=${model.sortOrder}`; else url += `sortOrder=ascending`; - if (sortBy) url += `&sortBy=${model.sortBy}`; + if (sortBy) url += `&sortBy=${sortBy}`; if (itemsPerPage) url += `&itemsPerPage=${model.itemsPerPage}`; if (offset) url += `&pageIndex=${model.pageIndex}`; if (healthSystemName) url += `&name=${model.healthSystemName}`; @@ -61,7 +61,8 @@ const items = response.Items; console.log('items', JSON.stringify(items, null, 2)); paginationSettings.size = items.length; - healthSystems = items.map((item, index) => ({ ...item, index: index + 1 })); + healthSystems = items; + // healthSystems = items.map((item, index) => ({ ...item, index: index + 1 })); } $: { @@ -84,6 +85,7 @@ sortBy: sortBy }); + function onPageChange(e: CustomEvent): void { let pageIndex = e.detail; itemsPerPage = items * (pageIndex + 1); @@ -97,7 +99,7 @@ function sortTable(columnName) { isSortingName = false; sortOrder = sortOrder === 'ascending' ? 'descending' : 'ascending'; - if (columnName === 'HealthSystemName') { + if (columnName === 'Name') { isSortingName = true; } sortBy = columnName; @@ -128,7 +130,7 @@ @@ -147,7 +149,7 @@ Id - diff --git a/src/routes/users/[userId]/health-systems/[id]/edit/+page.svelte b/src/routes/users/[userId]/health-systems/[id]/edit/+page.svelte index 36826ba0..1a227311 100755 --- a/src/routes/users/[userId]/health-systems/[id]/edit/+page.svelte +++ b/src/routes/users/[userId]/health-systems/[id]/edit/+page.svelte @@ -52,7 +52,7 @@ - + - + - + diff --git a/src/routes/users/[userId]/hospitals/create/+page.svelte b/src/routes/users/[userId]/hospitals/create/+page.svelte index ddf11132..37aef5f5 100755 --- a/src/routes/users/[userId]/hospitals/create/+page.svelte +++ b/src/routes/users/[userId]/hospitals/create/+page.svelte @@ -62,7 +62,7 @@ @@ -152,7 +156,7 @@ Delete - Are you sure you want to delete a lab record type? + Are you sure you want to delete a lab record? {/each} diff --git a/src/routes/users/[userId]/lab-record-types/[id]/edit/+page.svelte b/src/routes/users/[userId]/lab-record-types/[id]/edit/+page.svelte index d88fb38f..ef1fe128 100755 --- a/src/routes/users/[userId]/lab-record-types/[id]/edit/+page.svelte +++ b/src/routes/users/[userId]/lab-record-types/[id]/edit/+page.svelte @@ -43,7 +43,7 @@ const breadCrumbs = [ { - name: 'Lab-Records', + name: 'Lab Records', path: labRecordTypesRoute }, { diff --git a/src/routes/users/[userId]/lab-record-types/[id]/view/+page.svelte b/src/routes/users/[userId]/lab-record-types/[id]/view/+page.svelte index 56cdc543..e8bfd69b 100755 --- a/src/routes/users/[userId]/lab-record-types/[id]/view/+page.svelte +++ b/src/routes/users/[userId]/lab-record-types/[id]/view/+page.svelte @@ -24,7 +24,7 @@ const breadCrumbs = [ { - name: 'Lab-Records', + name: 'Lab Records', path: labRecordTypesRoute }, { diff --git a/src/routes/users/[userId]/lab-record-types/create/+page.svelte b/src/routes/users/[userId]/lab-record-types/create/+page.svelte index 7ab5cc3a..9fc7a6b9 100755 --- a/src/routes/users/[userId]/lab-record-types/create/+page.svelte +++ b/src/routes/users/[userId]/lab-record-types/create/+page.svelte @@ -10,7 +10,7 @@ const labRecordTypesRoute = `/users/${userId}/lab-record-types`; const breadCrumbs = [ - { name: 'Lab-Records', path: labRecordTypesRoute }, + { name: 'Lab Records', path: labRecordTypesRoute }, { name: 'Create', path: createRoute } ]; diff --git a/src/routes/users/[userId]/person-role-types/+page.svelte b/src/routes/users/[userId]/person-role-types/+page.svelte index b28837bb..3c8949e1 100755 --- a/src/routes/users/[userId]/person-role-types/+page.svelte +++ b/src/routes/users/[userId]/person-role-types/+page.svelte @@ -9,26 +9,54 @@ } from '@skeletonlabs/skeleton'; import date from 'date-and-time'; import type { PageServerData } from './$types'; - import { invalidate } from '$app/navigation'; + import { invalidate } from '$app/navigation'; ////////////////////////////////////////////////////////////////////////////////////////////////////////////////// export let data: PageServerData; - $: personTypes = data.personRoleTypes; - console.log('PersonRoleTypes', personTypes); + let personTypes = data.personRoleTypes; + $: console.log('PersonRoleTypes', personTypes); let retrivedTypes; + $: console.log('retrivedTypes', retrivedTypes); + let roleName = "Role Name"; + let sortOrder = false; + const userId = $page.params.userId; const createRoute = `/users/${userId}/person-role-types/create`; const editRoute = (id) => `/users/${userId}/person-role-types/${id}/edit`; const viewRoute = (id) => `/users/${userId}/person-role-types/${id}/view`; const personRoleTypesRoute = `/users/${userId}/person-role-types`; - const breadCrumbs = [{ name: 'Person-Roles', path: personRoleTypesRoute }]; + const breadCrumbs = [{ name: 'User Roles', path: personRoleTypesRoute }]; let totalPersonRoleCount = data.personRoleTypes.length let items = 10; let itemsPerPage = 10; + sort(sortOrder) + $:{ + personTypes = data.personRoleTypes; + sort(sortOrder) + personTypes = personTypes.map((item, index) => ({ ...item, index: index + 1 })); + } + + function sort(sortOrder: boolean, isOrdeApplied: boolean = false){ + if (isOrdeApplied) { + roleName = `Role Name ${sortOrder ? '▲' : '▼'}` + } + personTypes = personTypes.sort((a, b) => { + let fa = a.RoleName.toLowerCase(), + fb = b.RoleName.toLowerCase(); + if (fa < fb) { + return !sortOrder ? -1 : 1; + } + if (fa > fb) { + return !sortOrder ? 1 : -1; + } + return 0; + }); + } + let paginationSettings = { page: 0, limit: 10, @@ -85,7 +113,11 @@ - + diff --git a/src/routes/users/[userId]/person-role-types/[id]/edit/+page.server.ts b/src/routes/users/[userId]/person-role-types/[id]/edit/+page.server.ts index d9402e70..c65f8d86 100755 --- a/src/routes/users/[userId]/person-role-types/[id]/edit/+page.server.ts +++ b/src/routes/users/[userId]/person-role-types/[id]/edit/+page.server.ts @@ -81,7 +81,7 @@ export const actions = { throw redirect( 303, `/users/${userId}/person-role-types/${id}/view`, - successMessage(`Person role type updated successfully!`), + successMessage(`User role updated successfully!`), event ); } diff --git a/src/routes/users/[userId]/person-role-types/[id]/edit/+page.svelte b/src/routes/users/[userId]/person-role-types/[id]/edit/+page.svelte index 0194cfc9..49afb07f 100755 --- a/src/routes/users/[userId]/person-role-types/[id]/edit/+page.svelte +++ b/src/routes/users/[userId]/person-role-types/[id]/edit/+page.svelte @@ -27,7 +27,7 @@ const breadCrumbs = [ { - name: 'Person-Roles', + name: 'User Roles', path: personRoleTypesRoute }, { @@ -48,7 +48,7 @@
Edit HealthSystemEdit Health System
View HealthSystemView Health System
Add Health SystemCreate Health System diff --git a/src/routes/users/[userId]/hospitals/+page.server.ts b/src/routes/users/[userId]/hospitals/+page.server.ts index 869810a4..03ed23d7 100755 --- a/src/routes/users/[userId]/hospitals/+page.server.ts +++ b/src/routes/users/[userId]/hospitals/+page.server.ts @@ -8,7 +8,10 @@ export const load: PageServerLoad = async ({cookies,depends}) => { const sessionId = cookies.get('sessionId'); depends('app:hospitals') try { - const response = await searchHospitals(sessionId); + const response = await searchHospitals(sessionId, { + orderBy: "Name", + order: "ascending" + }); if (response.Status === 'failure' || response.HttpCode !== 200) { throw error(response.HttpCode, response.Message); } diff --git a/src/routes/users/[userId]/hospitals/+page.svelte b/src/routes/users/[userId]/hospitals/+page.svelte index 4a15f314..0e6fd9de 100755 --- a/src/routes/users/[userId]/hospitals/+page.svelte +++ b/src/routes/users/[userId]/hospitals/+page.svelte @@ -42,10 +42,10 @@ async function searchHospital(model) { let url = `/api/server/hospitals/search?`; - if (sortOrder) url += `sortOrder=${model.sortOrder}`; + if (sortOrder) url += `sortOrder=${sortOrder}`; else url += `sortOrder=ascending`; - if (sortBy) url += `&sortBy=${model.sortBy}`; + if (sortBy) url += `&sortBy=${sortBy}`; if (itemsPerPage) url += `&itemsPerPage=${model.itemsPerPage}`; if (offset) url += `&pageIndex=${model.pageIndex}`; if (hospitalName) url += `&name=${model.hospitalName}`; @@ -96,7 +96,7 @@ isSortingName = false; isSortingHealthSystemName = false; sortOrder = sortOrder === 'ascending' ? 'descending' : 'ascending'; - if (columnName === 'HospitalName') { + if (columnName === 'Name') { isSortingName = true; } // else if (columnName === 'HealthSystemName') { @@ -129,7 +129,7 @@ @@ -155,7 +155,7 @@
Id - Health System Add New diff --git a/src/routes/users/[userId]/knowledge-nuggets/[id]/edit/+page.svelte b/src/routes/users/[userId]/knowledge-nuggets/[id]/edit/+page.svelte index 9a5216b8..54df60e6 100755 --- a/src/routes/users/[userId]/knowledge-nuggets/[id]/edit/+page.svelte +++ b/src/routes/users/[userId]/knowledge-nuggets/[id]/edit/+page.svelte @@ -4,7 +4,7 @@ import Icon from '@iconify/svelte'; import InputChip from '$lib/components/input-chips.svelte'; import type { PageServerData } from './$types'; - import { enhance } from '$app/forms'; + import { enhance } from '$app/forms'; /////////////////////////////////////////////////////////////////////////// @@ -46,7 +46,7 @@ const breadCrumbs = [ { - name: 'Knowledge-Nuggets', + name: 'Knowledge Nuggets', path: knowledgeNuggetsRoute }, { diff --git a/src/routes/users/[userId]/knowledge-nuggets/[id]/view/+page.svelte b/src/routes/users/[userId]/knowledge-nuggets/[id]/view/+page.svelte index 399ddcba..8483be31 100755 --- a/src/routes/users/[userId]/knowledge-nuggets/[id]/view/+page.svelte +++ b/src/routes/users/[userId]/knowledge-nuggets/[id]/view/+page.svelte @@ -22,7 +22,7 @@ const knowledgeNuggetsRoute = `/users/${userId}/knowledge-nuggets`; const breadCrumbs = [ - { name: 'Knowledge-Nuggets', path: knowledgeNuggetsRoute }, + { name: 'Knowledge Nuggets', path: knowledgeNuggetsRoute }, { name: 'View', path: viewRoute } ]; diff --git a/src/routes/users/[userId]/knowledge-nuggets/create/+page.svelte b/src/routes/users/[userId]/knowledge-nuggets/create/+page.svelte index 5f7229a1..bbac3151 100755 --- a/src/routes/users/[userId]/knowledge-nuggets/create/+page.svelte +++ b/src/routes/users/[userId]/knowledge-nuggets/create/+page.svelte @@ -3,7 +3,7 @@ import BreadCrumbs from '$lib/components/breadcrumbs/breadcrums.svelte'; import Icon from '@iconify/svelte'; import InputChip from '$lib/components/input-chips.svelte'; - import { enhance } from '$app/forms'; + import { enhance } from '$app/forms'; ///////////////////////////////////////////////////////////////////////////// @@ -14,7 +14,7 @@ const breadCrumbs = [ { - name: 'Knowledge-Nuggets', + name: 'Knowledge Nuggets', path: knowledgeNuggetsRoute, home: true }, diff --git a/src/routes/users/[userId]/lab-record-types/+page.svelte b/src/routes/users/[userId]/lab-record-types/+page.svelte index 26959459..f889a1af 100755 --- a/src/routes/users/[userId]/lab-record-types/+page.svelte +++ b/src/routes/users/[userId]/lab-record-types/+page.svelte @@ -6,14 +6,14 @@ import Icon from '@iconify/svelte'; import {Paginator, type PaginationSettings } from '@skeletonlabs/skeleton'; import type { PageServerData } from './$types'; - import { invalidate} from '$app/navigation'; - ////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + import { invalidate} from '$app/navigation'; + /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// export let data: PageServerData; let labRecordTypes=data.labRecordTypes; - let selectedLabRecordTypes; + let selectedLabRecordTypes; let sortOrder = false; - + let typeName = "Type Name"; const userId = $page.params.userId; const createRoute = `/users/${userId}/lab-record-types/create`; const editRoute = (id) => `/users/${userId}/lab-record-types/${id}/edit`; @@ -26,7 +26,10 @@ sort(sortOrder) labRecordTypes = labRecordTypes.map((item, index) => ({ ...item, index: index + 1 })); } - function sort(sortOrder){ + function sort(sortOrder, isOrdeApplied: boolean = false){ + if (isOrdeApplied) { + typeName = `Type Name ${sortOrder ? '▲' : '▼'}` + } labRecordTypes = labRecordTypes.sort((a, b) => { let fa = a.TypeName.toLowerCase(), fb = b.TypeName.toLowerCase(); @@ -42,7 +45,7 @@ const breadCrumbs = [ { - name: 'Lab-Records', + name: 'Lab Records', path: labRecordTypesRoute } ]; @@ -65,9 +68,9 @@ }; $:{ - labRecordTypes = labRecordTypes.map((item, index) => ({ ...item, index: index + 1 })); + labRecordTypes = labRecordTypes.map((item, index) => ({ ...item, index: index + 1 })); paginationSettings.size = labRecordTypes.length; - selectedLabRecordTypes = labRecordTypes.slice( + selectedLabRecordTypes = labRecordTypes.slice( paginationSettings.page * paginationSettings.limit, paginationSettings.page * paginationSettings.limit + paginationSettings.limit ); @@ -101,8 +104,9 @@
Id -
IdRole Name + + Description Created Date @@ -124,7 +156,7 @@ Delete - Are you sure you want to delete a person role type? + Are you sure you want to delete a user role?
- +
Edit Person RoleEdit User Role diff --git a/src/routes/users/[userId]/person-role-types/[id]/view/+page.svelte b/src/routes/users/[userId]/person-role-types/[id]/view/+page.svelte index 9d0e72b1..960485c2 100755 --- a/src/routes/users/[userId]/person-role-types/[id]/view/+page.svelte +++ b/src/routes/users/[userId]/person-role-types/[id]/view/+page.svelte @@ -18,7 +18,7 @@ const breadCrumbs = [ { - name: 'Person-Roles', + name: 'User Roles', path: personRoleTypesRoute }, { @@ -41,7 +41,7 @@ - +
View Person RoleView User Role diff --git a/src/routes/users/[userId]/person-role-types/create/+page.server.ts b/src/routes/users/[userId]/person-role-types/create/+page.server.ts index 6c0f190c..67676cc5 100755 --- a/src/routes/users/[userId]/person-role-types/create/+page.server.ts +++ b/src/routes/users/[userId]/person-role-types/create/+page.server.ts @@ -49,7 +49,7 @@ export const actions = { throw redirect( 303, `/users/${userId}/person-role-types/${id}/view`, - successMessage(`Person role type created successfully!`), + successMessage(`User role created successfully!`), event ); } diff --git a/src/routes/users/[userId]/person-role-types/create/+page.svelte b/src/routes/users/[userId]/person-role-types/create/+page.svelte index e72b74ce..5a1fce87 100755 --- a/src/routes/users/[userId]/person-role-types/create/+page.svelte +++ b/src/routes/users/[userId]/person-role-types/create/+page.svelte @@ -11,7 +11,7 @@ const breadCrumbs = [ { - name: 'Person-Roles', + name: 'User Roles', path: personRoleTypesRoute, home: true }, @@ -33,7 +33,7 @@ - + - +
Create Person RoleCreate User Role diff --git a/src/routes/users/[userId]/priorities/+page.svelte b/src/routes/users/[userId]/priorities/+page.svelte index 15d861fa..7aa1962f 100755 --- a/src/routes/users/[userId]/priorities/+page.svelte +++ b/src/routes/users/[userId]/priorities/+page.svelte @@ -1,5 +1,4 @@ @@ -113,7 +104,11 @@
IdType + + Tags Created Date diff --git a/src/routes/users/[userId]/symptoms/+page.server.ts b/src/routes/users/[userId]/symptoms/+page.server.ts index 898d68f9..920176cf 100755 --- a/src/routes/users/[userId]/symptoms/+page.server.ts +++ b/src/routes/users/[userId]/symptoms/+page.server.ts @@ -8,14 +8,16 @@ import { searchSymptoms } from '../../../api/services/reancare/symptoms'; export const load: PageServerLoad = async ({cookies,depends}) => { const sessionId = cookies.get('sessionId'); depends('app:symptoms') - const response = await searchSymptoms(sessionId); + const response = await searchSymptoms(sessionId, { + orderBy: 'Symptom', + order : 'ascending' + }); if (response.Status === 'failure' || response.HttpCode !== 200) { throw error(response.HttpCode, response.Message); } const symptomsCount = response.Data.SymptomTypes.TotalCount; const symptoms = response.Data.SymptomTypes.Items; - // for (const symptom of symptoms) { // if (symptom.ImageResourceId) { // symptom['ImageUrl'] = diff --git a/src/routes/users/[userId]/symptoms/+page.svelte b/src/routes/users/[userId]/symptoms/+page.svelte index 1a48c162..1ae8c816 100755 --- a/src/routes/users/[userId]/symptoms/+page.svelte +++ b/src/routes/users/[userId]/symptoms/+page.svelte @@ -62,8 +62,7 @@ headers: { 'content-type': 'application/json' } }); const response = await res.json(); - - symptoms = response.map((item, index) => ({ ...item, index: index + 1 })); + symptoms = response; } $: { diff --git a/src/routes/users/[userId]/symptoms/[id]/edit/+page.svelte b/src/routes/users/[userId]/symptoms/[id]/edit/+page.svelte index eafcdc56..d71a2428 100755 --- a/src/routes/users/[userId]/symptoms/[id]/edit/+page.svelte +++ b/src/routes/users/[userId]/symptoms/[id]/edit/+page.svelte @@ -102,6 +102,7 @@
diff --git a/src/routes/users/[userId]/symptoms/create/+page.svelte b/src/routes/users/[userId]/symptoms/create/+page.svelte index 3591a060..5ec7d7dd 100755 --- a/src/routes/users/[userId]/symptoms/create/+page.svelte +++ b/src/routes/users/[userId]/symptoms/create/+page.svelte @@ -66,6 +66,7 @@