Compare commits

...

7 Commits

Author SHA1 Message Date
frappe-pr-bot
7fac29e3e4 chore: update POT file 2024-10-25 10:37:03 +00:00
Jannat Patel
224bb18d3e Merge pull request #1077 from pateljannat/issues-45
fix: show live class start button only to moderators and evaluators
2024-10-23 12:53:42 +05:30
Jannat Patel
aab7bdcc20 fix: show live class start button only to moderators and evaluators 2024-10-23 11:02:16 +05:30
Jannat Patel
c5ca428d98 Merge pull request #1076 from pateljannat/issues-44
fix: misc issues
2024-10-23 10:55:42 +05:30
Jannat Patel
a085050d27 build: removed frappe-ui package 2024-10-23 10:36:26 +05:30
Jannat Patel
2442f35f56 fix: added is_instructor to jinja 2024-10-23 10:35:26 +05:30
Jannat Patel
53285a0d19 fix: misc issues 2024-10-14 19:17:32 +05:30
5 changed files with 9 additions and 20 deletions

View File

@@ -152,24 +152,11 @@ const filterOptions = createResource({
url: 'frappe.desk.search.search_link',
method: 'POST',
cache: [text.value, props.doctype],
auto: true,
params: {
txt: text.value,
doctype: props.doctype,
},
/* transform: (data) => {
let allData = data
.filter((c) => {
return c.description.split(', ')[1]
})
.map((option) => {
let email = option.description.split(', ')[1]
return {
label: option.label || email,
value: email,
}
})
return allData
}, */
})
const options = computed(() => {

View File

@@ -37,6 +37,7 @@
</div>
<div class="flex items-center space-x-2 text-gray-900 mt-auto">
<a
v-if="user.data?.is_moderator || user.data?.is_evaluator"
:href="cls.start_url"
target="_blank"
class="w-1/2 cursor-pointer inline-flex items-center justify-center gap-2 transition-colors focus:outline-none text-gray-800 bg-gray-100 hover:bg-gray-200 active:bg-gray-300 focus-visible:ring focus-visible:ring-gray-400 h-7 text-base px-2 rounded"

View File

@@ -279,7 +279,7 @@ const renderEditor = (holder, content) => {
}
const markProgress = () => {
if (user.data && !lesson.data?.progress) {
if (user.data && lesson.data && !lesson.data.progress) {
progress.submit()
}
}

View File

@@ -185,6 +185,7 @@ jinja = {
"lms.lms.utils.get_lesson_url",
"lms.page_renderers.get_profile_url",
"lms.overrides.user.get_palette",
"lms.lms.utils.is_instructor",
],
"filters": [],
}

View File

@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Frappe LMS VERSION\n"
"Report-Msgid-Bugs-To: jannat@frappe.io\n"
"POT-Creation-Date: 2024-10-18 16:04+0000\n"
"PO-Revision-Date: 2024-10-18 16:04+0000\n"
"POT-Creation-Date: 2024-10-25 10:37+0000\n"
"PO-Revision-Date: 2024-10-25 10:37+0000\n"
"Last-Translator: jannat@frappe.io\n"
"Language-Team: jannat@frappe.io\n"
"MIME-Version: 1.0\n"
@@ -2309,7 +2309,7 @@ msgstr ""
msgid "Jobs"
msgstr ""
#: frontend/src/components/LiveClass.vue:53
#: frontend/src/components/LiveClass.vue:54
#: lms/templates/upcoming_evals.html:15
msgid "Join"
msgstr ""
@@ -3068,7 +3068,7 @@ msgstr ""
msgid "No jobs posted"
msgstr ""
#: frontend/src/components/LiveClass.vue:59
#: frontend/src/components/LiveClass.vue:60
msgid "No live classes scheduled"
msgstr ""
@@ -4233,7 +4233,7 @@ msgstr ""
msgid "Stage"
msgstr ""
#: frontend/src/components/LiveClass.vue:45 frontend/src/components/Quiz.vue:65
#: frontend/src/components/LiveClass.vue:46 frontend/src/components/Quiz.vue:65
#: lms/templates/quiz/quiz.html:39
msgid "Start"
msgstr ""