Aha dev

src/lib/components/dashboard/funnel.card.svelte

@@ -1,21 +1,25 @@
 <script lang="ts">
     import Funnel from '$lib/components/users-stats/charts/funnel.svelte';
+    import { getChartColors } from '$lib/themes/theme.selector';
     import { afterUpdate, onMount } from 'svelte';
 
     export let labels: string[];
     export let dataSource: number[];
 
+    const chartColors = getChartColors();
     interface FunnelDataPoint {
         label: string;
         count: number;
+        color: string;
     }
 
     let dataPoints : FunnelDataPoint[] = []
     onMount (() => {
         dataPoints = labels.map((label, index) => {
             return {
                 label,
-                count: dataSource[index]
+                count: dataSource[index],
+                color: chartColors[index % chartColors.length]
             }
         })
     });
@@ -32,7 +36,8 @@
     <div class="mt-10 px-4 w-1/2">
         { #each dataPoints as dp}
             <div class="flex gap-4 w-full py-1">
-                <div class="h-3 w-3 mt-1 border bg-primary-700" />
+                <!-- <div class="h-3 w-3 mt-1 border bg-primary-700" /> -->
+                <div class="h-3 w-3 mt-1 border" style="background-color: {dp.color};"></div>
                 <div class="text-sm w-2/3 font-normal text-primary-500 dark:text-primary-100">{dp.label}</div>
                 <div class="text-sm w-1/3 font-normal text-primary-500 dark:text-primary-100">{dp.count}</div>
             </div>

src/lib/components/dashboard/super.admin.dashboard.svelte

@@ -10,8 +10,8 @@
 
     let labels = [
         'Onboarded',
-        'Not-Deleted ',
-        'Users With Active Session',
+        'Not Deleted ',
+        'Current Active',
     ];
 
     $: funnelChartData = [

src/lib/components/navbar/sidebar/sidebar.menus.ts

@@ -545,7 +545,7 @@ function addClinicalMenus(
 
         const labRecordType: SidebarMenu = {
             name    : 'Lab-Records',
-            title   : 'Lab-Records',
+            title   : 'Lab Records',
             icon    : 'material-symbols:lab-research-outline-rounded',
             link    : `/users/${userId}/lab-record-types`,
             children: []

src/lib/components/users-stats/users-stats.svelte

@@ -439,7 +439,7 @@
 			</div>
 		</div>
 
-		<div
+		<!-- <div
 			class="grid grid-cols-3 overflow-x-auto justify-center rounded-lg  shadow-xl border border-secondary-100 dark:border-surface-700 sm:px-4 w-full h-full gap-3 "
 		>
 			<div class="px-4 sm:px-6 lg:px-8 col-span-2">
@@ -456,7 +456,7 @@
 										>
 									</tr>
 								</thead>
-								<tbody>
+								<tbody> -->
 									<!-- {#each countryWiseUsers as data}
 										<tr class="hover:bg-secondary-50 dark:hover:bg-surface-800 transition">
 											<td
@@ -486,7 +486,7 @@
 											</td>
 										</tr>
 									{/each} -->
-								</tbody>
+								<!-- </tbody>
 							</table>
 						</div>
 					</div>
@@ -514,8 +514,8 @@
 					{/if}
 				</div>
 			</div>
-		</div>
-	</div>
+		</div>-->
+	</div> 
 
 	<div class="flex justify-center items-center h-full gap-10 w-full">
 		<div

src/lib/constants.ts

@@ -1 +1 @@
-export const SYSTEM_ID = 'REAN';
+export const SYSTEM_ID = 'AHA';

src/lib/options/aha.options.ts

@@ -16,7 +16,7 @@ export const Options: FeatureOptions[] = [
     },
     {
         Name: 'Clients',
-        Enabled: true
+        Enabled: false
     },
     {
         Name: 'Tenants',
@@ -29,11 +29,11 @@ export const Options: FeatureOptions[] = [
     //..............................
     {
         Name: 'Analysis',
-        Enabled: true
+        Enabled: false
     },
     {
         Name: 'Custom-Queries',
-        Enabled: true
+        Enabled: false
     },
     //..............................
     {
@@ -97,11 +97,11 @@ export const Options: FeatureOptions[] = [
     },
     {
         Name: 'Courses',
-        Enabled: true
+        Enabled: false
     },
     {
         Name: 'Learning-Journeys',
-        Enabled: true
+        Enabled: false
     },
     {
         Name: 'Knowledge-Nuggets',

src/routes/+page.svelte

@@ -64,23 +64,23 @@
 						<div class="justify-center w-full mt-5 h-50">
 							<!-- svelte-ignore a11y-label-has-associated-control -->
 							<label class="mb-2" for="username">
-								<span class="text-primary-500">Username / Email</span>
+								<span class="text-primary-500">Username</span>
 								<span class="label-text-alt" />
 							</label>
 							<input type="text" name="username" required class="input mb-4" />
 							<!-- svelte-ignore a11y-label-has-associated-control -->
 							<label class="mb-2" for="password">
 								<div class="grid grid-flow-col">
-									<span class="text-left text-primary-500">Password / OTP</span>
-									<span class="text-right text-primary-500 ml-4 sm:ml-12">
+									<span class="text-left text-primary-500">Password</span>
+									<span class="text-right text-primary-500 ml-4 sm:ml-12 invisible">
 										<b>Generate OTP</b>
 									</span>
 								</div>
 							</label>
 							<input type="password" name="password" required class=" input" />
 							<!-- svelte-ignore a11y-label-has-associated-control -->
 							<label class="lable">
-								<span class=" text-primary-500">
+								<span class=" text-primary-500 hidden">
 									<b>Forgot Password?</b>
 								</span>
 							</label>

src/routes/api/server/assessments/assessment-nodes/+server.ts

@@ -6,9 +6,10 @@ import { deleteAssessmentNode } from '../../../services/reancare/assessments/ass
 export const DELETE = async (event: RequestEvent) => {
 	const request = event.request;
 	const data = await request.json();
+    let response;
 	try {
 		console.log('Inside assessment node server endpoints');
-		const response = await deleteAssessmentNode(
+		response = await deleteAssessmentNode(
 			data.sessionId,
 			data.assessmentTemplateId,
 			data.assessmentNodeId
@@ -18,10 +19,10 @@ export const DELETE = async (event: RequestEvent) => {
             Message : response.Message
         }));
 	} catch (err) {
-		console.error(`Error deleting assessment node: ${err.message}`);
+		console.error(`Error deleting assessment node: ${JSON.parse(err).message}`);
 		return new Response(JSON.stringify({
             Status: "failure",
-            Message : 'Error deleting assessment node'
+            Message : JSON.parse(err).message ? JSON.parse(err).message : 'Error deleting assessment node'
         }));
 	}
 };

src/routes/api/server/assessments/assessment-templates/+server.ts

@@ -22,7 +22,7 @@ export const DELETE = async (event: RequestEvent) => {
 			);
 	}
 	throw redirect(
-		successMessage(response.Message),
+		successMessage('Assessment deleted successfully!'),
 		event
 		);
 };

src/routes/api/server/drugs/+server.ts

@@ -19,7 +19,7 @@ export const DELETE = async (event: RequestEvent) => {
 			);
 	}
 	throw redirect(
-		successMessage(response.Message),
+		successMessage('Drug deleted successfully!'),
 		event
 		);	
 };

src/routes/api/server/gamification/badges/search/+server.ts

@@ -12,7 +12,7 @@ export const GET = async (event: RequestEvent) => {
 	const categoryId = searchParams.get('categoryId') ?? undefined;
 	const sortBy = searchParams.get('sortBy') ?? 'CreatedAt';
 	const sortOrder = searchParams.get('sortOrder') ?? 'ascending';
-	const itemsPerPage_ = searchParams.get('pageIndex');
+	const itemsPerPage_ = searchParams.get('itemsPerPage');
 	const itemsPerPage = itemsPerPage_ ? parseInt(itemsPerPage_) : 10;
 	const pageIndex_ = searchParams.get('pageIndex');
 	const pageIndex = pageIndex_ ? parseInt(pageIndex_) : 0;

src/routes/api/server/health-systems/+server.ts

@@ -23,7 +23,7 @@ export const DELETE = async (event: RequestEvent) => {
 			);
 	}
 	throw redirect(
-		successMessage(response.Message),
+		successMessage('Health system deleted successfully!'),
 		event
 		);	
 };

src/routes/api/server/lab-record-types/+server.ts

@@ -19,7 +19,7 @@ export const DELETE = async (event: RequestEvent) => {
 			);
 	}
 	throw redirect(
-		successMessage(response.Message),
+		successMessage('Lab record deleted successfully!'),
 		event
 		);	
 };

src/routes/api/server/person-role-types/+server.ts

@@ -19,7 +19,7 @@ export const DELETE = async (event: RequestEvent) => {
 			);
 	}
 	throw redirect(
-		successMessage(response.Message),
+		successMessage('User role deleted successfully!'),
 		event
 		);	
 };

src/routes/api/server/priorities/+server.ts

@@ -19,7 +19,7 @@ export const DELETE = async (event: RequestEvent) => {
 			);
 	}
 	throw redirect(
-		successMessage(response.Message),
+		successMessage('Priorite deleted successfully!'),
 		event
 		);	
 };

src/routes/users/[userId]/assessment-templates/+page.server.ts

@@ -7,7 +7,10 @@ import { searchAssessmentTemplates } from '../../../api/services/reancare/assess
 export const load: PageServerLoad = async ({cookies,depends}) => {
 	const sessionId = cookies.get('sessionId');
 	depends('app:assessmentTemplate')
-    const response = await searchAssessmentTemplates(sessionId);
+    const response = await searchAssessmentTemplates(sessionId,{
+        orderBy: "Title",
+        order: "ascending"
+    });
     if (response.Status === 'failure' || response.HttpCode !== 200) {
         throw error(response.HttpCode, response.Message);
     }

src/routes/users/[userId]/assessment-templates/+page.svelte

@@ -202,7 +202,7 @@
 								</button>
 								<span slot="title">Delete</span>
 								<span slot="description">
-									Are you sure you want to delete a assessment template?
+									Are you sure you want to delete a assessment?
 								</span>
 							</Confirm>
 						</td>

src/routes/users/[userId]/assessment-templates/[templateId]/assessment-nodes/[nodeId]/edit/+page.svelte

@@ -164,22 +164,23 @@
 						<select
 							id="mySelect"
 							name="queryType"
+							disabled
 							class="select select-info w-full"
 							placeholder="Select query type here..."
 							bind:value={queryType}
 							on:change={(val) => onSelectQueryResponseType(val)}
 						>
 							<option selected value={queryType}>{queryType}</option>
-							{#each queryResponseTypes as responseType}
-								<option value={responseType}>{responseType}</option>
-							{/each}
+							<!-- {#each queryResponseTypes as responseType}
+								<option disabled value={responseType}>{responseType}</option>
+							{/each} -->
 						</select>
 					</td>
 				</tr>
 				{#if selectedQueryType === 'Single Choice Selection' || selectedQueryType === 'Multi Choice Selection'}
 					<tr class="!border-b !border-b-secondary-100 dark:!border-b-surface-700">
 						<td class="align-top">Options</td>
-						<td><Choice {optionValueStore} /></td>
+						<td><Choice {optionValueStore} readonly={true}/></td>
 					</tr>
 				{/if}
 			{:else if selectedNodeType === 'Message'}

src/routes/users/[userId]/assessment-templates/[templateId]/assessment-nodes/create/+page.server.ts

@@ -43,7 +43,7 @@ export const load: PageServerLoad = async (event: RequestEvent) => {
 const createAssessmentNodeSchema = zfd.formData({
 	nodeType: z.string(),
 	parentNodeId: z.string().uuid(),
-	title: z.string().min(8).max(256),
+	title: z.string().min(4).max(256),
 	description: z.string().optional(),
 	sequence: zfd.numeric(z.number().optional()),
 	queryType: z.string().optional(),

src/routes/users/[userId]/assessment-templates/[templateId]/assessment-nodes/create/+page.svelte

@@ -5,7 +5,7 @@
 	import Icon from '@iconify/svelte';
 	import type { PageServerData } from './$types';
 	import Choice from './choice.svelte';
-    import { enhance } from '$app/forms';
+  import { enhance } from '$app/forms';
 
 	/////////////////////////////////////////////////////////////////////////////////////
 
@@ -64,7 +64,7 @@
 	<table class="table">
 		<thead class="!variant-soft-secondary">
 			<tr>
-				<th>Create Assessment Node</th>
+				<th class="whitespace-nowrap" >Create Assessment Node</th>
 				<th class="text-end">
 					<a href={assessmentNodeRoutes} class="btn p-2 -my-2 variant-soft-secondary">
 						<Icon icon="material-symbols:close-rounded" class="text-lg" />
@@ -190,7 +190,7 @@
 					<tr>
 						<td class="align-top">Options</td>
 						<td>
-							<Choice />
+							<Choice/>
 						</td>
 					</tr>
 				{/if}

src/routes/users/[userId]/assessment-templates/[templateId]/assessment-nodes/create/choice.svelte

@@ -2,10 +2,11 @@
 	import Icon from '@iconify/svelte';
 
 	export let optionValueStore = [{ Text: '' }];
+	export let readonly = false;
 
-	// const addOptionField = () => (optionValueStore = [...optionValueStore, { Text: '' }]);
-	// const removeOptionField = () =>
-	// 	(optionValueStore = optionValueStore.slice(0, optionValueStore.length - 1));
+	const addOptionField = () => (optionValueStore = [...optionValueStore, { Text: '' }]);
+	const removeOptionField = () =>
+		(optionValueStore = optionValueStore.slice(0, optionValueStore.length - 1));
 </script>
 
 <div class="border dark:border-surface-700 flex flex-col rounded my-2 p-2 gap-2">
@@ -15,17 +16,22 @@
 				type="text"
 				class="input"
 				name="options"
-				disabled
 				bind:value={optionValueStore[i].Text}
 				placeholder="Add option here..."
+				disabled={readonly}
 			/>
-			<!-- <button class="btn p-2 variant-soft-error" on:click={removeOptionField}>
-				<Icon icon="material-symbols:close-rounded" />
-			</button> -->
+			{#if !readonly} 
+				<button class="btn p-2 variant-soft-error" on:click={removeOptionField}>
+					<Icon icon="material-symbols:close-rounded" />
+				</button>
+			{/if}
 		</div>
 	{/each}
-
-	<!-- <button class="btn btn-sm variant-soft-secondary" on:click|preventDefault={addOptionField}>
-		Add Option
-	</button> -->
+
+<!-- Only show the add button if not readonly -->
+	{#if !readonly} 
+		<button class="btn btn-sm variant-soft-secondary" on:click|preventDefault={addOptionField}>
+			Add Option
+		</button>
+	{/if}
 </div>

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
 		);
 	}

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
 		);
 	}