feat: quiz doctypes

community/hooks.py

@@ -143,8 +143,7 @@ primary_rules = [
     {"from_route": "/courses/<course>/<batch>/members", "to_route": "batch/members"},
     {"from_route": "/courses/<course>/<batch>/discuss", "to_route": "batch/discuss"},
     {"from_route": "/courses/<course>/<batch>/about", "to_route": "batch/about"},
-    {"from_route": "/courses/<course>/<batch>/progress", "to_route": "batch/progress"},
+    {"from_route": "/courses/<course>/<batch>/progress", "to_route": "batch/progress"}
-    {"from_route": "/courses/<course>/<batch>/join", "to_route": "batch/join"}
 ]
 
 # Any frappe default URL is blocked by profile-rules, add it here to unblock it

community/lms/doctype/lms_quiz/lms_quiz.js

@@ -0,0 +1,8 @@
+// Copyright (c) 2021, FOSS United and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('LMS Quiz', {
+	// refresh: function(frm) {
+
+	// }
+});

community/lms/doctype/lms_quiz/lms_quiz.json

@@ -0,0 +1,54 @@
+{
+ "actions": [],
+ "creation": "2021-05-28 19:09:44.418823",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "title",
+  "maximum_attempts",
+  "questions"
+ ],
+ "fields": [
+  {
+   "fieldname": "title",
+   "fieldtype": "Data",
+   "label": "Title"
+  },
+  {
+   "fieldname": "maximum_attempts",
+   "fieldtype": "Int",
+   "label": "Maximum Attempts"
+  },
+  {
+   "fieldname": "questions",
+   "fieldtype": "Link",
+   "label": "Questions",
+   "options": "LMS Quiz Question"
+  }
+ ],
+ "index_web_pages_for_search": 1,
+ "links": [],
+ "modified": "2021-05-28 19:18:38.688885",
+ "modified_by": "Administrator",
+ "module": "LMS",
+ "name": "LMS Quiz",
+ "owner": "Administrator",
+ "permissions": [
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "System Manager",
+   "share": 1,
+   "write": 1
+  }
+ ],
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1
+}

community/lms/doctype/lms_quiz/lms_quiz.py

@@ -0,0 +1,8 @@
+# Copyright (c) 2021, FOSS United and contributors
+# For license information, please see license.txt
+
+# import frappe
+from frappe.model.document import Document
+
+class LMSQuiz(Document):
+	pass

community/lms/doctype/lms_quiz/test_lms_quiz.py

@@ -0,0 +1,8 @@
+# Copyright (c) 2021, FOSS United and Contributors
+# See license.txt
+
+# import frappe
+import unittest
+
+class TestLMSQuiz(unittest.TestCase):
+	pass

community/lms/doctype/lms_quiz_option/lms_quiz_option.json

@@ -0,0 +1,38 @@
+{
+ "actions": [],
+ "creation": "2021-05-28 19:04:49.312616",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "option",
+  "is_correct"
+ ],
+ "fields": [
+  {
+   "fieldname": "option",
+   "fieldtype": "Small Text",
+   "in_list_view": 1,
+   "label": "Option"
+  },
+  {
+   "default": "0",
+   "fieldname": "is_correct",
+   "fieldtype": "Check",
+   "in_list_view": 1,
+   "label": "Is Correct"
+  }
+ ],
+ "index_web_pages_for_search": 1,
+ "istable": 1,
+ "links": [],
+ "modified": "2021-05-28 19:13:48.869416",
+ "modified_by": "Administrator",
+ "module": "LMS",
+ "name": "LMS Quiz Option",
+ "owner": "Administrator",
+ "permissions": [],
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1
+}

community/lms/doctype/lms_quiz_option/lms_quiz_option.py

@@ -0,0 +1,8 @@
+# Copyright (c) 2021, FOSS United and contributors
+# For license information, please see license.txt
+
+# import frappe
+from frappe.model.document import Document
+
+class LMSQuizOption(Document):
+	pass

community/lms/doctype/lms_quiz_question/lms_quiz_question.js

@@ -0,0 +1,8 @@
+// Copyright (c) 2021, FOSS United and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('LMS Quiz Question', {
+	// refresh: function(frm) {
+
+	// }
+});

community/lms/doctype/lms_quiz_question/lms_quiz_question.json

@@ -0,0 +1,44 @@
+{
+ "actions": [],
+ "creation": "2021-05-28 19:07:17.347423",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "question",
+  "options",
+  "question_type"
+ ],
+ "fields": [
+  {
+   "fieldname": "question",
+   "fieldtype": "Markdown Editor",
+   "in_list_view": 1,
+   "label": "Question"
+  },
+  {
+   "fieldname": "options",
+   "fieldtype": "Table",
+   "label": "Options",
+   "options": "LMS Quiz Option"
+  },
+  {
+   "fieldname": "question_type",
+   "fieldtype": "Select",
+   "in_list_view": 1,
+   "label": "Question Type",
+   "options": "Single Correct Answer\nMultiple Correct Answers"
+  }
+ ],
+ "index_web_pages_for_search": 1,
+ "links": [],
+ "modified": "2021-05-28 19:18:04.939778",
+ "modified_by": "Administrator",
+ "module": "LMS",
+ "name": "LMS Quiz Question",
+ "owner": "Administrator",
+ "permissions": [],
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1
+}

community/lms/doctype/lms_quiz_question/lms_quiz_question.py

@@ -0,0 +1,8 @@
+# Copyright (c) 2021, FOSS United and contributors
+# For license information, please see license.txt
+
+# import frappe
+from frappe.model.document import Document
+
+class LMSQuizQuestion(Document):
+	pass

community/lms/doctype/lms_quiz_question/test_lms_quiz_question.py

@@ -0,0 +1,8 @@
+# Copyright (c) 2021, FOSS United and Contributors
+# See license.txt
+
+# import frappe
+import unittest
+
+class TestLMSQuizQuestion(unittest.TestCase):
+	pass

community/lms/widgets/RenderBatch.html

@@ -1,29 +0,0 @@
-<div class="batch">
-  <div class="batch-details">
-    <div>Session every {{batch.sessions_on}}</div>
-    <div>{{frappe.utils.format_time(batch.start_time, "short")}} -
-      {{frappe.utils.format_time(batch.end_time, "short")}}
-    </div>
-    <div>Starting {{frappe.utils.format_date(batch.start_date, "medium")}}</div>
-    <div class="course-type" style="color: #888; padding: 10px 0px;">mentors</div>
-
-    {% for m in batch.get_mentors() %}
-    <div>
-      {{ widgets.Avatar(member=m, avatar_class="avatar-medium" ) }}
-      <span class="instructor-title">{{m.full_name}}</span>
-    </div>
-    {% endfor %}
-  </div>
-  {% if can_manage or can_join %}
-  <div class="cta">
-    <div class="">
-      {% if can_manage %}
-      <a href="/courses/{{course.name}}/{{batch.name}}/home" class="btn btn-primary">Manage</a>
-      {% elif can_join %}
-      <button class="join-batch btn btn-primary" data-batch="{{ batch.name | urlencode }}"
-        data-course="{{ course.name | urlencode }}">Join this Batch</button>
-      {% endif %}
-    </div>
-  </div>
-  {% endif %}
-</div>

community/public/css/style.css

@@ -211,30 +211,3 @@ section {
   background: #eee;
   border: 2px solid #ddd;
 }
-
-
-.page-card {
-	max-width: 360px;
-	padding: 15px;
-	margin: 70px auto;
-	border: 1px solid #d1d8dd;
-	border-radius: 4px;
-	background-color: #fff;
-	box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.1);
-}
-.page-card .page-card-head {
-	padding: 10px 15px;
-	margin: -15px;
-	margin-bottom: 15px;
-	border-bottom: 1px solid #d1d8dd;
-}
-.page-card .page-card-head .indicator {
-	color: #36414C;
-	font-size: 14px;
-}
-.page-card .page-card-head .indicator::before {
-	margin: 0 6px 0.5px 0px;
-}
-.page-card .btn {
-	margin-top: 30px;
-}

community/www/batch/home.html

@@ -1,60 +1,46 @@
 {% extends "templates/base.html" %}
 {% block title %}Batch{% endblock %}
-
 {% block head_include %}
 <meta name="description" content="Courses" />
 <meta name="keywords" content="" />
+
 <link rel="stylesheet" href="/assets/frappe/css/font-awesome.css">
 {% endblock %}
 
 {% block content %}
-{% set invite_link = frappe.utils.get_url() + "/courses/" + course.name + "/" + batch.name + "/join" %}
 <div class="container mt-5">
   {{ widgets.BatchTabs(course=course, batch=batch) }}
-  <div>
   <h1 class="mt-5">{{ batch.title }}</h1>
-  </div>
   <div class="course-details">
     {{ widgets.CourseOutline(course=course, batch=batch, show_link=True) }}
   </div>
-  <div class="w-25">
+  <div class="col-lg-4 col-md-12">
     <h2>Batch Schedule</h2>
-    {{ widgets.RenderBatch(course=course, batch=batch) }}
+    {{ BatchDetails(batch) }}
   </div>
-
-  {% if batch.description %}
   <h2>Batch Details</h2>
   {{ frappe.utils.md_to_html(batch.description) }}
-  {% endif %}
 
-  {% if course.is_mentor(frappe.session.user) %}
-  <div class="">
-    <h2> Invite Members </h2>
-    <a href="" class="anchor_style mr-5" id="invite-link" data-link="{{ invite_link }}">Get Batch Invitation
-      Link</a>
-    <small id="copy-message" class="text-muted pull-right" style="display: none;">Copied to Clipboard.</small>
-  </div>
-  {% endif %}
 
 </div>
-
-<script>
-  frappe.ready(() => {
-    $("#invite-link").click((e) => {
-      e.preventDefault();
-      var link_element = $("#invite-link");
-      var input_element = document.createElement("input");
-      input_element.value = link_element.attr("data-link")
-      document.body.appendChild(input_element);
-      input_element.select();
-      document.execCommand("copy");
-      input_element.remove();
-      $("#copy-message").slideDown(function () {
-        setTimeout(function () {
-          $("#copy-message").slideUp();
-        }, 5000);
-      });
-    })
-  })
-</script>
 {% endblock %}
+
+{% macro BatchDetails(batch) %}
+<div class="batch">
+  <div class="batch-details">
+    <div>Session every {{batch.sessions_on}}</div>
+    <div>{{frappe.utils.format_time(batch.start_time, "short")}} -
+      {{frappe.utils.format_time(batch.end_time, "short")}}
+    </div>
+    <div>Starting {{frappe.utils.format_date(batch.start_date, "medium")}}</div>
+    <div class="course-type" style="color: #888; padding: 10px 0px;">mentors</div>
+
+    {% for m in batch.get_mentors() %}
+    <div>
+      {{ widgets.Avatar(member=m, avatar_class="avatar-medium" ) }}
+      <span class="instructor-title">{{m.full_name}}</span>
+    </div>
+    {% endfor %}
+  </div>
+</div>
+{% endmacro %}

community/www/batch/join.html

@@ -1,74 +0,0 @@
-% extends "templates/base.html" %}
-{% block title %}Join a Course{% endblock %}
-
-{% block head_include %}
-<meta name="description" content="Join a Course"/>
-<meta name="keywords" content="" />
-{% endblock %}
-
-{% block content %}
-{% if frappe.session.user == "Guest" %}
-
-<div class="page-card">
-  <div class='page-card-head'>
-    <span class='indicator blue password-box'>Login Required</span>
-  </div>
-  <div class=''>Please log in to confirm to join the course {{ batch.course_title }}.</div>
-  <a type="submit" id="login" class="btn btn-primary w-100"
-    href="/login?redirect-to=/courses/{{ batch.course }}/{{ batch.name }}/join">{{_("Login")}}</a>
-</div>
-
-{% elif already_a_member %}
-
-<div class="page-card">
-  <div class='page-card-head'>
-    <span class='indicator blue password-box'>Already a member</span>
-  </div>
-  <div class=''>You are already a member of the batch {{ batch.title }} for the course {{ batch.course_title }}.
-  </div>
-  <a type="submit" id="batch-home" class="btn btn-primary w-100" href="/courses/{{batch.course}}/{{batch.name}}/home">{{_("Go to Batch Home")}}</a>
-</div>
-
-{% else %}
-
-<div class="page-card">
-  <div class='page-card-head'>
-    <span class='indicator blue password-box'>Confirm your membership</span>
-  </div>
-  <div>Please provide your confirmation to be a part of the batch {{ batch.title }} for the course
-    {{ batch.course_title }}.
-  </div>
-  <a type="submit" id="confirm" class="btn btn-primary w-100" data-batch="{{ batch.name | urlencode }}"
-    data-course="{{ batch.course | urlencode }}">{{_("Confirm")}}</a>
-</div>
-
-{% endif %}
-
-<script>
-  frappe.ready(() => {
-    var confirm_element = $("#confirm");
-    var batch = decodeURIComponent(confirm_element.attr("data-batch"));
-    var course = decodeURIComponent(confirm_element.attr("data-course"));
-
-    confirm_element.click((e) => {
-      frappe.call({
-        "method": "community.lms.doctype.lms_batch_membership.lms_batch_membership.create_membership",
-        "args": {
-          "batch": batch
-        },
-        "callback": (data) => {
-          if (data.message == "OK") {
-            frappe.msgprint({
-              message: __("You are now a member of this batch!"),
-              clear: true
-            });
-            setTimeout(function () {
-              window.location.href = "/courses/" + course + "/" + batch + "/home";
-            }, 2000);
-          }
-        }
-      })
-    })
-  })
-</script>
-{% endblock %}

community/www/batch/join.py

@@ -1,8 +0,0 @@
-import frappe
-
-def get_context(context):
-    context.no_cache = 1
-    batch_name = frappe.form_dict["batch"]
-    context.batch = frappe.get_doc("LMS Batch", batch_name)
-    context.already_a_member = context.batch.is_member(frappe.session.user)
-    context.batch.course_title = frappe.db.get_value("LMS Course", context.batch.course, "title")

community/www/courses/course.html

@@ -64,6 +64,36 @@
 {% endif %}
 {% endmacro %}
 
+{% macro RenderBatch(batch, can_manage=False) %}
+<div class="batch">
+  <div class="batch-details">
+    <div>Session every {{batch.sessions_on}}</div>
+    <div>{{frappe.utils.format_time(batch.start_time, "short")}} -
+      {{frappe.utils.format_time(batch.end_time, "short")}}
+    </div>
+    <div>Starting {{frappe.utils.format_date(batch.start_date, "medium")}}</div>
+    <div class="course-type" style="color: #888; padding: 10px 0px;">mentors</div>
+
+    {% for m in batch.get_mentors() %}
+    <div>
+      {{ widgets.Avatar(member=m, avatar_class="avatar-medium" ) }}
+      <span class="instructor-title">{{m.full_name}}</span>
+    </div>
+    {% endfor %}
+  </div>
+  <div class="cta">
+    <div class="">
+      {% if can_manage %}
+      <a href="/courses/{{course.name}}/{{batch.name}}/home" class="btn btn-primary">Manage</a>
+      {% else %}
+      <button class="join-batch btn btn-primary" data-batch="{{ batch.name | urlencode }}"
+        data-course="{{ course.name | urlencode }}">Join this Batch</button>
+      {% endif %}
+    </div>
+  </div>
+</div>
+{% endmacro %}
+
 {% macro BatchSectionForMentors(course, mentor_batches) %}
 <h2>Your Batches</h2>
 
@@ -75,7 +105,7 @@
 <div class="row">
   {% for batch in mentor_batches %}
   <div class="col-lg-4 col-md-6">
-    {{ widgets.RenderBatch(course=course, batch=batch, can_manage=True) }}
+    {{ RenderBatch(batch, can_manage=True) }}
   </div>
   {% endfor %}
 </div>
@@ -97,7 +127,7 @@
 <div class="row">
   {% for batch in upcoming_batches %}
   <div class="col-lg-4 col-md-6">
-    {{ widgets.RenderBatch(course=course, batch=batch, can_join=True) }}
+    {{ RenderBatch(batch, can_manage=False) }}
   </div>
   {% endfor %}
 </div>

community/www/courses/learn/index.js

@@ -0,0 +1,3 @@
+frappe.ready(() => {
+	
+})