Merge pull request #1052 from pateljannat/issues-40

fix: misc quiz issues
This commit is contained in:
Jannat Patel
2024-10-09 19:17:01 +05:30
committed by GitHub
3 changed files with 16 additions and 1 deletions

View File

@@ -120,6 +120,7 @@
</div> </div>
<div <div
v-if=" v-if="
lesson.data.instructor_content &&
JSON.parse(lesson.data.instructor_content)?.blocks?.length > 1 && JSON.parse(lesson.data.instructor_content)?.blocks?.length > 1 &&
allowInstructorContent() allowInstructorContent()
" "

View File

@@ -4,6 +4,19 @@
> >
<Breadcrumbs :items="breadcrumbs" /> <Breadcrumbs :items="breadcrumbs" />
<div class="space-x-2"> <div class="space-x-2">
<router-link
v-if="quizDetails.data?.name"
:to="{
name: 'QuizPage',
params: {
quizID: quizDetails.data.name,
},
}"
>
<Button>
{{ __('Open') }}
</Button>
</router-link>
<router-link <router-link
v-if="quizDetails.data?.name" v-if="quizDetails.data?.name"
:to="{ :to="{

View File

@@ -17,6 +17,7 @@ from frappe.utils import (
add_months, add_months,
cint, cint,
cstr, cstr,
ceil,
flt, flt,
fmt_money, fmt_money,
format_date, format_date,
@@ -948,7 +949,7 @@ def check_multicurrency(amount, currency, country=None, amount_usd=None):
if apply_rounding and amount % 100 != 0: if apply_rounding and amount % 100 != 0:
amount = amount + 100 - amount % 100 amount = amount + 100 - amount % 100
return amount, currency return ceil(amount), currency
def apply_gst(amount, country=None): def apply_gst(amount, country=None):