- {% if not course_enrolled %}
+ {% if not course_enrolled and frappe.session.user != "Guest" %}
{% endif %}
{{ course.title }}
diff --git a/community/www/courses/course.js b/community/www/courses/course.js
index 87c7c869..9a3923b7 100644
--- a/community/www/courses/course.js
+++ b/community/www/courses/course.js
@@ -1,17 +1,22 @@
-/* frappe.ready(() => {
- var url_params = new URLSearchParams(window.location.search);
- frappe.call('community.www.courses.course.has_enrolled', { course: url_params.get("course") }, (data) => {
- if (data.message) {
- $(".btn-enroll").addClass("hide");
- $(".enrollment-details").removeClass("hide");
- }
- })
-}) */
+frappe.ready(() => {
+ if(frappe.session.user != "Guest"){
+ var url_params = new URLSearchParams(window.location.search);
+ frappe.call('community.www.courses.course.has_enrolled', { course: url_params.get("course") }, (data) => {
+ if (data.message) {
+ show_enrollment_badge()
+ }
+ })
+ }
+})
+
+var show_enrollment_badge = () => {
+ $(".btn-enroll").addClass("hide");
+ $(".enrollment-badge").removeClass("hide");
+}
$('.btn-enroll').on('click', (e) => {
- frappe.call('community.www.courses.course.enroll', { course: $(e.target).attr("data-course") }, (data) => {
- $(".btn-enroll").addClass("hide");
- $(".enrollment-details").removeClass("hide");
- });
+ frappe.call('community.www.courses.course.enroll', { course: $(e.target).attr("data-course") }, (data) => {
+ show_enrollment_badge()
+ });
});
diff --git a/community/www/courses/course.py b/community/www/courses/course.py
index 6c470002..3a2a19df 100644
--- a/community/www/courses/course.py
+++ b/community/www/courses/course.py
@@ -22,6 +22,7 @@ def get_course(name):
)
return course
+@frappe.whitelist()
def has_enrolled(course):
return frappe.db.get_value("Community Course Enrollment", {"course": course, "owner": frappe.session.user})
@@ -29,7 +30,8 @@ def has_enrolled(course):
def enroll(course):
return frappe.get_doc({
"doctype": "Community Course Enrollment",
- "course": course
+ "course": course,
+ "user": frappe.session.user
}).save()
\ No newline at end of file
diff --git a/community/www/courses/index.py b/community/www/courses/index.py
index 487b8f60..4ab1e92f 100644
--- a/community/www/courses/index.py
+++ b/community/www/courses/index.py
@@ -9,5 +9,4 @@ def get_courses():
"Community Course",
fields=['name', 'title', 'description']
)
- print(courses)
return courses
\ No newline at end of file
diff --git a/community/www/courses/topic.py b/community/www/courses/topic.py
index 3ae6a6c7..7b2b6cd4 100644
--- a/community/www/courses/topic.py
+++ b/community/www/courses/topic.py
@@ -8,8 +8,6 @@ def get_context(context):
topic_name = get_queryparam("topic", '/courses?course=' + course_name)
context.topic = get_topic(course_name, topic_name)
- print("topic", context.topic)
-
def get_queryparam(name, redirect_when_not_found):
try:
return frappe.form_dict[name]
diff --git a/community/www/my-courses/index.html b/community/www/my-courses/index.html
index 22f194d2..24db031a 100644
--- a/community/www/my-courses/index.html
+++ b/community/www/my-courses/index.html
@@ -31,6 +31,13 @@
padding: 20px;
}
+ .no-courses {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ flex-direction: column;
+ }
+
section {
padding: 5rem 0 5rem 0;
}
@@ -40,11 +47,11 @@
{% macro card(course) %}