Merge pull request #2007 from pateljannat/issues-174

fix: misc issues

frontend/src/assets/Inter/inter.css

@@ -1,152 +0,0 @@
-@font-face {
-  font-family: 'Inter';
-  font-style:  normal;
-  font-weight: 100;
-  font-display: swap;
-  src: url("Inter-Thin.woff2?v=3.12") format("woff2"),
-       url("Inter-Thin.woff?v=3.12") format("woff");
-}
-@font-face {
-  font-family: 'Inter';
-  font-style:  italic;
-  font-weight: 100;
-  font-display: swap;
-  src: url("Inter-ThinItalic.woff2?v=3.12") format("woff2"),
-       url("Inter-ThinItalic.woff?v=3.12") format("woff");
-}
-
-@font-face {
-  font-family: 'Inter';
-  font-style:  normal;
-  font-weight: 200;
-  font-display: swap;
-  src: url("Inter-ExtraLight.woff2?v=3.12") format("woff2"),
-       url("Inter-ExtraLight.woff?v=3.12") format("woff");
-}
-@font-face {
-  font-family: 'Inter';
-  font-style:  italic;
-  font-weight: 200;
-  font-display: swap;
-  src: url("Inter-ExtraLightItalic.woff2?v=3.12") format("woff2"),
-       url("Inter-ExtraLightItalic.woff?v=3.12") format("woff");
-}
-
-@font-face {
-  font-family: 'Inter';
-  font-style:  normal;
-  font-weight: 300;
-  font-display: swap;
-  src: url("Inter-Light.woff2?v=3.12") format("woff2"),
-       url("Inter-Light.woff?v=3.12") format("woff");
-}
-@font-face {
-  font-family: 'Inter';
-  font-style:  italic;
-  font-weight: 300;
-  font-display: swap;
-  src: url("Inter-LightItalic.woff2?v=3.12") format("woff2"),
-       url("Inter-LightItalic.woff?v=3.12") format("woff");
-}
-
-@font-face {
-  font-family: 'Inter';
-  font-style:  normal;
-  font-weight: 400;
-  font-display: swap;
-  src: url("Inter-Regular.woff2?v=3.12") format("woff2"),
-       url("Inter-Regular.woff?v=3.12") format("woff");
-}
-@font-face {
-  font-family: 'Inter';
-  font-style:  italic;
-  font-weight: 400;
-  font-display: swap;
-  src: url("Inter-Italic.woff2?v=3.12") format("woff2"),
-       url("Inter-Italic.woff?v=3.12") format("woff");
-}
-
-@font-face {
-  font-family: 'Inter';
-  font-style:  normal;
-  font-weight: 500;
-  font-display: swap;
-  src: url("Inter-Medium.woff2?v=3.12") format("woff2"),
-       url("Inter-Medium.woff?v=3.12") format("woff");
-}
-@font-face {
-  font-family: 'Inter';
-  font-style:  italic;
-  font-weight: 500;
-  font-display: swap;
-  src: url("Inter-MediumItalic.woff2?v=3.12") format("woff2"),
-       url("Inter-MediumItalic.woff?v=3.12") format("woff");
-}
-
-@font-face {
-  font-family: 'Inter';
-  font-style:  normal;
-  font-weight: 600;
-  font-display: swap;
-  src: url("Inter-SemiBold.woff2?v=3.12") format("woff2"),
-       url("Inter-SemiBold.woff?v=3.12") format("woff");
-}
-@font-face {
-  font-family: 'Inter';
-  font-style:  italic;
-  font-weight: 600;
-  font-display: swap;
-  src: url("Inter-SemiBoldItalic.woff2?v=3.12") format("woff2"),
-       url("Inter-SemiBoldItalic.woff?v=3.12") format("woff");
-}
-
-@font-face {
-  font-family: 'Inter';
-  font-style:  normal;
-  font-weight: 700;
-  font-display: swap;
-  src: url("Inter-Bold.woff2?v=3.12") format("woff2"),
-       url("Inter-Bold.woff?v=3.12") format("woff");
-}
-@font-face {
-  font-family: 'Inter';
-  font-style:  italic;
-  font-weight: 700;
-  font-display: swap;
-  src: url("Inter-BoldItalic.woff2?v=3.12") format("woff2"),
-       url("Inter-BoldItalic.woff?v=3.12") format("woff");
-}
-
-@font-face {
-  font-family: 'Inter';
-  font-style:  normal;
-  font-weight: 800;
-  font-display: swap;
-  src: url("Inter-ExtraBold.woff2?v=3.12") format("woff2"),
-       url("Inter-ExtraBold.woff?v=3.12") format("woff");
-}
-@font-face {
-  font-family: 'Inter';
-  font-style:  italic;
-  font-weight: 800;
-  font-display: swap;
-  src: url("Inter-ExtraBoldItalic.woff2?v=3.12") format("woff2"),
-       url("Inter-ExtraBoldItalic.woff?v=3.12") format("woff");
-}
-
-@font-face {
-  font-family: 'Inter';
-  font-style:  normal;
-  font-weight: 900;
-  font-display: swap;
-  src: url("Inter-Black.woff2?v=3.12") format("woff2"),
-       url("Inter-Black.woff?v=3.12") format("woff");
-}
-@font-face {
-  font-family: 'Inter';
-  font-style:  italic;
-  font-weight: 900;
-  font-display: swap;
-  src: url("Inter-BlackItalic.woff2?v=3.12") format("woff2"),
-       url("Inter-BlackItalic.woff?v=3.12") format("woff");
-}

frontend/src/components/BatchStudents.vue

@@ -43,7 +43,7 @@
 					<ListRow
 						:row="row"
 						v-for="row in students.data"
-						class="group cursor-pointer"
+						class="group cursor-pointer hover:bg-surface-gray-2 rounded"
 						@click="openStudentProgressModal(row)"
 					>
 						<template #default="{ column, item }">
@@ -88,7 +88,7 @@
 						</div>
 					</template>
 				</ListSelectBanner>
-				<div class="mt-4" v-if="students.hasNextPage">
+				<div class="mt-4 flex justify-center" v-if="students.hasNextPage">
 					<Button @click="students.next()">
 						{{ __('Load More') }}
 					</Button>
@@ -170,7 +170,7 @@ const studentColumns = [
 	{
 		label: 'Full Name',
 		key: 'full_name',
-		width: '20rem',
+		width: '25rem',
 		icon: 'user',
 	},
 	{

frontend/src/components/Modals/EditProfile.vue

@@ -90,7 +90,7 @@
 						<FormControl
 							v-model="profile.open_to"
 							type="select"
-							:options="[' ', 'Opportunities', 'Hiring']"
+							:options="[' ', 'Work', 'Hiring']"
 							:label="__('Open to')"
 							:placeholder="__('Looking for new work or hiring talent?')"
 						/>

frontend/src/components/UserAvatar.vue

@@ -7,8 +7,8 @@
 		:size="size"
 		v-bind="$attrs"
 	>
-		<template v-if="user.open_to === 'Opportunities'" #indicator>
-			<Tooltip :text="__('Open to Opportunities')" placement="right">
+		<template v-if="user.open_to === 'Work'" #indicator>
+			<Tooltip :text="__('Open to Work')" placement="right">
 				<div class="rounded-full bg-surface-green-3 w-fit">
 					<BadgeCheckIcon :class="'text-ink-white ' + checkSize" />
 				</div>

frontend/src/index.css

@@ -1,3 +1,2 @@
-@import './assets/Inter/inter.css';
 @import 'frappe-ui/style.css';
 @import './styles/codemirror.css';

frontend/src/pages/CertifiedParticipants.vue

@@ -42,8 +42,8 @@
 				</div>
 				<div class="flex items-center space-x-4">
 					<FormControl
-						v-model="openToOpportunities"
-						:label="__('Open to Opportunities')"
+						v-model="openToWork"
+						:label="__('Open to Work')"
 						type="checkbox"
 						@change="updateParticipants()"
 					/>
@@ -140,7 +140,7 @@ import UserAvatar from '@/components/UserAvatar.vue'
 const filters = ref({})
 const currentCategory = ref('')
 const nameFilter = ref('')
-const openToOpportunities = ref(false)
+const openToWork = ref(false)
 const hiring = ref(false)
 const { brand } = sessionStore()
 const memberCount = ref(0)
@@ -197,8 +197,8 @@ const updateFilters = () => {
 		...(nameFilter.value && {
 			member_name: ['like', `%${nameFilter.value}%`],
 		}),
-		...(openToOpportunities.value && {
-			open_to_opportunities: true,
+		...(openToWork.value && {
+			open_to_work: true,
 		}),
 		...(hiring.value && {
 			hiring: true,
@@ -211,7 +211,7 @@ const setQueryParams = () => {
 	let filterKeys = {
 		category: currentCategory.value,
 		name: nameFilter.value,
-		'open-to-opportunities': openToOpportunities.value,
+		'open-to-work': openToWork.value,
 		hiring: hiring.value,
 	}
 
@@ -240,7 +240,7 @@ const setFiltersFromQuery = () => {
 	let queries = new URLSearchParams(location.search)
 	nameFilter.value = queries.get('name') || ''
 	currentCategory.value = queries.get('category') || ''
-	openToOpportunities.value = queries.get('open-to-opportunities') === 'true'
+	openToWork.value = queries.get('open-to-opportunities') === 'true'
 	hiring.value = queries.get('hiring') === 'true'
 }
 

frontend/src/pages/Profile.vue

@@ -65,8 +65,8 @@
 						<Tooltip
 							v-if="profile.data.open_to"
 							:text="
-								profile.data.open_to === 'Opportunities'
-									? __('Open to Opportunities')
+								profile.data.open_to === 'Work'
+									? __('Open to Work')
 									: __('Hiring')
 							"
 							placement="right"
@@ -77,7 +77,7 @@
 								<div
 									class="rounded-full w-fit"
 									:class="
-										profile.data.open_to === 'Opportunities'
+										profile.data.open_to === 'Work'
 											? 'bg-surface-green-3'
 											: 'bg-purple-500'
 									"

frontend/src/pages/SCORMChapter.vue

@@ -116,20 +116,30 @@ const debouncedSaveProgress = (scormDetails) => {
 }
 
 const saveDataToLMS = (key, value) => {
-	if (key === 'cmi.core.lesson_status') {
-		if (value === 'passed') {
-			isSuccessfullyCompleted.value = true
-			saveProgress({
-				is_complete: isSuccessfullyCompleted.value,
-				scorm_content: '',
-			})
-		} else if (value === 'failed' && courseRestartOnFailure) {
-			saveProgress({
-				is_complete: isSuccessfullyCompleted.value,
-				scorm_content: '',
-			})
-		}
-	} else if (key === 'cmi.suspend_data' && !isSuccessfullyCompleted.value) {
+	const isLessonStatus = key === 'cmi.core.lesson_status' && value === 'passed'
+	const isCompletionStatus =
+		key === 'cmi.completion_status' && value === 'completed'
+	const shouldRestart =
+		(key === 'cmi.core.lesson_status' && value === 'failed') ||
+		(key === 'cmi.completion_status' && value === 'incomplete')
+
+	if (isLessonStatus || isCompletionStatus) {
+		isSuccessfullyCompleted.value = true
+	}
+
+	if (
+		isLessonStatus ||
+		isCompletionStatus ||
+		(shouldRestart && courseRestartOnFailure)
+	) {
+		saveProgress({
+			is_complete: isSuccessfullyCompleted.value,
+			scorm_content: '',
+		})
+		return
+	}
+
+	if (key === 'cmi.suspend_data' && !isSuccessfullyCompleted.value) {
 		debouncedSaveProgress({
 			is_complete: false,
 			scorm_content: value,