From 86897b3cc8824f207f35337587f2207e138c0952 Mon Sep 17 00:00:00 2001 From: scmmishra Date: Mon, 5 Nov 2018 14:54:40 +0530 Subject: [PATCH] UI: Kinda fixed "Completed" button render issue --- .../web-academy/components/AcademyCourseCardButton.vue | 3 --- .../education/web-academy/components/ContentNavigation.vue | 2 ++ .../js/education/web-academy/pages/AcademyProgramPage.vue | 5 ++++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/erpnext/public/js/education/web-academy/components/AcademyCourseCardButton.vue b/erpnext/public/js/education/web-academy/components/AcademyCourseCardButton.vue index 7ff7a6e33c..b0d8859b6e 100644 --- a/erpnext/public/js/education/web-academy/components/AcademyCourseCardButton.vue +++ b/erpnext/public/js/education/web-academy/components/AcademyCourseCardButton.vue @@ -11,9 +11,6 @@ export default { className: 'btn-primary' } }, - mounted() { - this.$root.$data.updateCompletedCourses() - } computed: { getButtonName: function() { if(this.$root.$data.checkCourseCompletion(this.course)){ diff --git a/erpnext/public/js/education/web-academy/components/ContentNavigation.vue b/erpnext/public/js/education/web-academy/components/ContentNavigation.vue index 1ea5fca150..28f5a70b76 100644 --- a/erpnext/public/js/education/web-academy/components/ContentNavigation.vue +++ b/erpnext/public/js/education/web-academy/components/ContentNavigation.vue @@ -41,6 +41,8 @@ export default { enrollment: this.$root.$data.enrolledCourses[this.$route.params.course] } }) + this.$root.$data.addCompletedCourses(this.$route.params.course) + this.$root.$data.updateCompletedCourses() this.$router.push({ name: 'program', params: { code: this.$route.params.code}}) } } diff --git a/erpnext/public/js/education/web-academy/pages/AcademyProgramPage.vue b/erpnext/public/js/education/web-academy/pages/AcademyProgramPage.vue index b357302146..ef4545936e 100644 --- a/erpnext/public/js/education/web-academy/pages/AcademyProgramPage.vue +++ b/erpnext/public/js/education/web-academy/pages/AcademyProgramPage.vue @@ -29,8 +29,11 @@ export default { course_list: [] } }, - mounted() { + beforeMount(){ + console.log("Before Mount") if(this.$root.$data.isLogin) this.$root.$data.updateCompletedCourses() + }, + mounted() { frappe.call({ method: "erpnext.www.academy.get_program_details", args: {