Merge branch 'main' of https://github.com/frappe/community into community-member-to-user-refactor

community/www/batch/about.html

@@ -11,7 +11,8 @@
 {% endblock %}
 
 {% block content %}
-{{ Sidebar(course.name, batch.name) }}
+{{ Sidebar(course, batch) }}
+
 <div class="container">
 	{{ CourseBasicDetail(course)}}
 	{{ InstructorsSection(course.get_instructor()) }}

community/www/batch/about.py

@@ -0,0 +1,7 @@
+import frappe
+from . import utils
+
+def get_context(context):
+    utils.get_common_context(context)
+
+    print("context", context)

community/www/batch/discuss.html

@@ -11,10 +11,11 @@
 {% endblock %}
 
 {% block content %}
-{{ Sidebar(course_slug, batch_code) }}
+{{ Sidebar(course, batch) }}
+
 <div class="">
   <div class="batch-header">
-    {{ BatchHearder(course.name, member_count) }}
+    {{ BatchHearder(course.title, member_count) }}
   </div>
   <div class="messages">
     <div class="message-section">

community/www/batch/discuss.py

@@ -0,0 +1,9 @@
+import frappe
+from . import utils
+from community.lms.doctype.lms_batch.lms_batch import get_messages
+
+def get_context(context):
+    utils.get_common_context(context)
+
+    context.members = utils.get_batch_members(context.batch.name)
+    context.member_count = len(context.members)

community/www/batch/learn.html

@@ -23,7 +23,7 @@
 
 
 {% block content %}
-{{ Sidebar(course.name, batch.name) }}
+{{ Sidebar(course, batch) }}
 
 <div class="container">
   <div class="lesson-page">

community/www/batch/learn.py

@@ -1,37 +1,25 @@
 import frappe
-from community.lms.models import Course
+from . import utils
 
 def get_context(context):
-    context.no_cache = 1
+    utils.get_common_context(context)
 
-    course_name = frappe.form_dict["course"]
-    batch_name = frappe.form_dict["batch"]
     chapter_index = frappe.form_dict.get("chapter")
     lesson_index = frappe.form_dict.get("lesson")
     lesson_number = f"{chapter_index}.{lesson_index}"
 
-    course = Course.find(course_name)
-    if not course:
-        context.template = "www/404.html"
-        return
-
-    batch = course.get_batch(batch_name)
-    if not batch:
-        frappe.local.flags.redirect_location = "/courses/" + course_name
-        raise frappe.Redirect
+    course_name = context.course.name
+    batch_name = context.batch.name
 
     if not chapter_index or not lesson_index:
         frappe.local.flags.redirect_location = f"/courses/{course_name}/{batch_name}/learn/1.1"
         raise frappe.Redirect
 
-    context.course = course
-    context.batch = batch
-    context.lesson = course.get_lesson(chapter_index, lesson_index)
+    context.lesson = context.course.get_lesson(chapter_index, lesson_index)
     context.lesson_index = lesson_index
     context.chapter_index = chapter_index
-    context.livecode_url = get_livecode_url()
 
-    outline = course.get_outline()
+    outline = context.course.get_outline()
     next_ = outline.get_next(lesson_number)
     prev_ = outline.get_prev(lesson_number)
     context.next_url = get_learn_url(course_name, batch_name, next_)
@@ -41,6 +29,3 @@ def get_learn_url(course_name, batch_name, lesson_number):
     if not lesson_number:
         return
     return f"/courses/{course_name}/{batch_name}/learn/{lesson_number}"
-
-def get_livecode_url():
-    return frappe.db.get_single_value("LMS Settings", "livecode_url")

community/www/batch/members.html

@@ -11,9 +11,10 @@
 {% endblock %}
 
 {% block content %}
-{{ Sidebar(course_slug, batch_code) }}
+{{ Sidebar(course, batch) }}
+
 <div class="container">
-	{{ BatchHearder(course.name, member_count)}}
+	{{ BatchHearder(course.title, member_count)}}
 	{{ MembersList(members)}}
 </div>
 {% endblock %}
@@ -36,4 +37,4 @@
 	<hr>
 	{% endfor %}
 </div>
-{% endmacro %}
+{% endmacro %}

community/www/batch/members.py

@@ -0,0 +1,8 @@
+import frappe
+from . import utils
+
+def get_context(context):
+    utils.get_common_context(context)
+
+    context.members = utils.get_batch_members(context.batch.name)
+    context.member_count = len(context.members)

community/www/batch/progress.html

@@ -0,0 +1,52 @@
+{% extends "templates/base.html" %}
+{% from "www/macros/sidebar.html" import Sidebar %}
+{% from "www/macros/livecode.html" import LiveCodeEditorJS, LiveCodeEditor with context %}
+{% block title %}{{ course.title  }} - Batch Dashboard{% endblock %}
+
+{% block head_include %}
+	<meta name="description" content="{{course.title}} - Batch Dashboard" />
+	<meta name="keywords" content="{{course.title}} - Batch Dashboard" />
+	<style>
+	</style>
+
+<link rel="stylesheet" href="/assets/frappe/css/font-awesome.css">
+<link rel="stylesheet" href="{{ livecode_url }}/static/codemirror/lib/codemirror.css">
+<link rel="stylesheet" href="/assets/css/lms.css">
+
+<script src="{{ livecode_url }}/static/codemirror/lib/codemirror.js"></script>
+<script src="{{ livecode_url }}/static/codemirror/mode/python/python.js"></script>
+<script src="{{ livecode_url }}/static/codemirror/keymap/sublime.js"></script>
+
+<script src="{{ livecode_url }}/static/codemirror/addon/edit/matchbrackets.js"></script>
+<script src="{{ livecode_url }}/static/codemirror/addon/comment/comment.js"></script>
+{% endblock %}
+
+
+{% block content %}
+{{ Sidebar(course, batch) }}
+
+<div class="container">
+  <div class="mentor-dashboard">
+    <h1>Batch Progress</h1>
+    {% for exercise in report.exercises %}
+      <div class="exercise-submissions">
+        <h2>{{exercise.title}}</h2>
+        {% for s in report.get_submissions_of_exercise(exercise.name) %}
+          <div class="submission">
+            <h4><a href="/{{s.owner.username}}">{{s.owner.full_name}}</a></h4>
+            <div class="livecode-editor-small">
+              {{ LiveCodeEditor(name=s.name, code=s.solution, reset_code=s.solution) }}
+            </div>
+          </div>
+        {% endfor %}
+      </div>
+    {% endfor %}
+  </div>
+</div>
+{% endblock %}
+
+
+{%- block script %}
+  {{ super() }}
+  {{ LiveCodeEditorJS() }}
+{% endblock %}

community/www/batch/progress.py

@@ -0,0 +1,64 @@
+import frappe
+from community.lms.models import Course
+from collections import defaultdict
+from . import utils
+
+def get_context(context):
+    utils.get_common_context(context)
+
+    exercise_name = frappe.form_dict.get("exercise")
+    if exercise_name:
+        exercise = frappe.get_doc("Exercise", exercise_name)
+    else:
+        exercise = None
+
+    context.exercise = exercise
+    context.report = BatchReport(context.course, context.batch)
+
+class BatchReport:
+    def __init__(self, course, batch):
+        self.submissions = get_submissions(batch)
+        self.exercises = self.get_exercises(course.name)
+
+        self.submissions_by_exercise = defaultdict(list)
+        for s in self.submissions:
+            self.submissions_by_exercise[s.exercise].append(s)
+
+    def get_exercises(self, course_name):
+        return frappe.get_all("Exercise", {"course": course_name}, ["name", "title"])
+
+    def get_submissions_of_exercise(self, exercise_name):
+        return self.submissions_by_exercise[exercise_name]
+
+def get_submissions(batch):
+    students = batch.get_students()
+    students_map = {s['email']: s for s in students}
+
+    names, values = nparams("s", students_map.keys())
+
+    sql = """
+    select owner, exercise, name, solution, creation, image
+    from (
+        select owner, exercise, name, solution, creation, image,
+            row_number() over (partition by owner, exercise order by creation desc) as ix
+        from `tabExercise Submission`) as t
+    where t.ix=1 and owner IN {}
+    """.format(names)
+
+    data = frappe.db.sql(sql, values=values, as_dict=True)
+
+    for row in data:
+        row['owner'] = students_map[row['owner']]
+    return data
+
+def nparams(name, values):
+    """Creates n paramters from a list of values for a db query.
+
+    >>> nparams("name", ["a", "b])
+    ("(%(name_1)s, %(name_2)s)", {"name_1": "a", "name_2": "b"})
+    """
+    keys = [f"{name}_{i}" for i, _ in enumerate(values, start=1)]
+    param_names = [f"%({k})s" for k in keys]
+    param_values = dict(zip(keys, values))
+    joined_names = "(" + ", ".join(param_names) + ")"
+    return joined_names, param_values

community/www/batch/schedule.html

@@ -8,7 +8,7 @@
 {% endblock %}
 
 {% block content %}
-{{ Sidebar(course, batch_code) }}
+{{ Sidebar(course, batch) }}
 <div class="container">
 </div>
 {% endblock %}

community/www/batch/schedule.py

@@ -3,7 +3,6 @@ from community.lms.models import Course
 
 def get_context(context):
     context.no_cache = 1
-
     course_name = frappe.form_dict["course"]
     batch_name = frappe.form_dict["batch"]
 

community/www/batch/utils.py

@@ -0,0 +1,43 @@
+import frappe
+from community.lms.models import Course
+
+def get_common_context(context):
+    context.no_cache = 1
+
+    course_name = frappe.form_dict["course"]
+    batch_name = frappe.form_dict["batch"]
+
+    course = Course.find(course_name)
+    if not course:
+        context.template = "www/404.html"
+        return
+
+    batch = course.get_batch(batch_name)
+    if not batch:
+        frappe.local.flags.redirect_location = "/courses/" + course_name
+        raise frappe.Redirect
+
+    context.course = course
+    context.batch = batch
+    context.livecode_url = get_livecode_url()
+
+def get_livecode_url():
+    return frappe.db.get_single_value("LMS Settings", "livecode_url")
+
+def get_batch_members(batch_name):
+    members = []
+    memberships = frappe.get_all("LMS Batch Membership", {"batch": batch_name}, ["member", "member_type"])
+
+    for membership in memberships:
+        member = get_member_with_name(membership.member)
+        if membership.member_type == "Mentor":
+            member.is_mentor = True
+        members.append(member)
+    return members
+
+def get_member_with_name(name):
+    try:
+        return frappe.get_doc("Community Member", name)
+    except frappe.DoesNotExistError:
+        return
+

community/www/courses/discuss/index.py

@@ -1,15 +0,0 @@
-import frappe
-from community.www.courses.utils import redirect_if_not_a_member, get_course, get_batch_members, get_batch
-from community.lms.doctype.lms_batch.lms_batch import get_messages
-
-def get_context(context):
-    context.no_cache = 1
-    context.course_slug = frappe.form_dict["course"]
-    context.course = get_course(context.course_slug)
-    context.batch_code = frappe.form_dict["batch"]
-    redirect_if_not_a_member(context.course_slug, context.batch_code)
-    
-    context.batch = get_batch(context.batch_code)
-    context.members = get_batch_members(context.batch.name)
-    context.member_count = len(context.members)
-    context.messages = get_messages(context.batch.name)

community/www/courses/members/index.py

@@ -1,12 +0,0 @@
-import frappe
-from community.www.courses.utils import redirect_if_not_a_member, get_batch, get_member_with_name, get_course, get_batch_members
-
-def get_context(context):
-    context.no_cache = 1
-    context.course_slug = frappe.form_dict["course"]
-    context.course = get_course(context.course_slug)
-    context.batch_code = frappe.form_dict["batch"]
-    redirect_if_not_a_member(context.course_slug, context.batch_code)
-    context.batch = get_batch(context.batch_code)
-    context.members = get_batch_members(context.batch.name)
-    context.member_count = len(context.members)

community/www/courses/schedule/index.py

@@ -1,8 +0,0 @@
-import frappe
-from community.www.courses.utils import redirect_if_not_a_member
-
-def get_context(context):
-    context.no_cache = 1
-    context.course = frappe.form_dict["course"]
-    context.batch_code = frappe.form_dict["batch"]
-    redirect_if_not_a_member(context.course, context.batch_code)

community/www/courses/topic.html

@@ -1,108 +0,0 @@
-{% extends "templates/base.html" %}
-{% from "www/macros/livecode.html" import LiveCodeEditor with context %}
-{% block title %}{{topic.title}} ({{course.title}}){% endblock %}
-{% block head_include %}
-	<meta name="description" content="Topic {{topic.title}} of the course {{course.title}}" />
-	<meta name="keywords" content="course {{course.title}} {{topic.title}}" />
-	<style>
-	</style>
-
-<link rel="stylesheet" href="{{ livecode_url }}/static/codemirror/lib/codemirror.css">
-<link rel="stylesheet" href="/assets/css/lms.css">
-
-<script src="{{ livecode_url }}/static/codemirror/lib/codemirror.js"></script>
-<script src="{{ livecode_url }}/static/codemirror/mode/python/python.js"></script>
-<script src="{{ livecode_url }}/static/codemirror/keymap/sublime.js"></script>
-
-<script src="{{ livecode_url }}/static/codemirror/addon/edit/matchbrackets.js"></script>
-<script src="{{ livecode_url }}/static/codemirror/addon/comment/comment.js"></script>
-{% endblock %}
-
-{% block content %}
-<section class="top-section" style="padding: 1rem 0rem;">
-	<div class='container pb-5'>
-		<nav aria-label="breadcrumb">
-			<ol class="breadcrumb">
-				<li class="breadcrumb-item" aria-current="page"><a href="/courses">Courses</a></li>
-				<li class="breadcrumb-item" aria-current="page"><a href="/courses/{{course.slug}}">{{course.title}}</a></li>
-			</ol>
-		</nav>
-
-		<h1>{{ topic.title }}</h1>
-
-    {% for s in topic.get_sections() %}
-    <div class="section section-{{ s.type }}">
-      {{ render_section(s) }}
-    </div>
-    {% endfor %}
-
-	</div>
-</section>
-{% endblock %}
-
-{% macro render_section(s) %}
-  {% if s.type == "text" %}
-    {{ render_section_text(s) }}
-  {% elif s.type == "example" or s.type == "code" %}
-    {{ LiveCodeEditor(s.name, s.get_latest_code_for_user()) }}
-  {% else %}
-    <div>Unknown section type: {{s.type}}</div>
-  {% endif %}
-{% endmacro %}
-
-{% macro render_section_text(s) %}
-  <div class="row">
-    <div class="col-md-9">
-      {{ frappe.utils.md_to_html(s.contents) }}
-    </div>
-  </div>
-{% endmacro %}
-
-{%- block script %}
-  {{ super() }}
-  <script type="text/javascript" src="{{ livecode_url }}/static/livecode.js"></script>
-  <script type="text/javascript">
-    $(function() {
-      var editorLookup = {};
-
-      $(".canvas-editor").each((i, e) => {
-        var data = $(e).data();
-        var editor = new LiveCodeEditor(e, {
-          runtime: "python-canvas",
-          base_url: "{{ livecode_url }}",
-          codemirror: true,
-          userdata: data,
-          autosave: function(editor, code) {
-            // can't autosave when user is Guest
-            if (frappe.session.user == "Guest") {
-              return;
-            }
-            var data = editor.options.userdata;
-            var code = editor.codemirror.doc.getValue();
-            // console.log("autosaving...")
-            frappe.call("community.lms.api.autosave_section", {
-              section: data.section,
-              code: code
-            }).then((r) => {
-              // TODO: verify
-            })
-          }
-        })
-        editorLookup[data.section] = editor;
-      })
-
-      $(".canvas-editor .reset").each((i, e) => {
-        $(e).on("click", function(event) {
-          var data = $(this).parents(".canvas-editor").data();
-          var section = data.section;
-          frappe.call("community.lms.api.get_section", {
-            name: section
-          }).then(r => {
-            var editor = editorLookup[data.section];
-            editor.codemirror.doc.setValue(r.message.contents);
-          })
-        })
-      })
-    })
-  </script>
-{%- endblock %}

community/www/courses/topic.py

@@ -1,33 +0,0 @@
-import frappe
-
-def get_context(context):
-    context.no_cache = 1
-
-    try:
-        course_slug = frappe.form_dict['course']
-        topic_slug = frappe.form_dict['topic']
-    except KeyError:
-        context.template = 'www/404.html'
-        return
-
-    course = get_course(course_slug)
-    topic = course and course.get_topic(topic_slug)
-
-    if not topic:
-        context.template = 'www/404.html'
-        return
-
-    context.course = course
-    context.topic = topic
-    context.livecode_url = get_livecode_url()
-
-def notfound(context):
-    context.template = 'www/404.html'
-
-def get_livecode_url():
-    doc = frappe.get_doc("LMS Settings")
-    return doc.livecode_url
-
-def get_course(slug):
-    course = frappe.db.get_value('LMS Course', {"slug": slug}, ["name"], as_dict=1)
-    return course and frappe.get_doc('LMS Course', course['name'])

community/www/macros/sidebar.html

@@ -1,12 +1,14 @@
-{% macro Sidebar(course, batch_code) %}
+{% macro Sidebar(course, batch, is_mentor=False) %}
 <div class="sidebar-batch">
     <a href=""><i class="fa fa-bars fa-lg"></i></a>
     <br>
-    <a href="/courses/{{course}}/{{batch_code}}/learn"><i class="fa fa-book fa-lg"></i></a>
-    <a href="/courses/{{course}}/{{batch_code}}/schedule"><i class="fa fa-calendar fa-lg"></i></a>
-    <a href="/courses/{{course}}/{{batch_code}}/members"><i class="fa fa-users fa-lg"></i></a>
-    <a href="/courses/{{course}}/{{batch_code}}/discuss"><i class="fa fa-comments fa-lg"></i></a>
-    <a href="/courses/{{course}}/{{batch_code}}/about"><i class="fa fa-info-circle fa-lg"></i></a>
-    <!-- <a href="#contact"><i class="fas fa-home fa-lg"></i></a> -->
+    <a href="/courses/{{course.name}}/{{batch.name}}/learn"><i class="fa fa-book fa-lg"></i></a>
+    <a href="/courses/{{course.name}}/{{batch.name}}/schedule"><i class="fa fa-calendar fa-lg"></i></a>
+    <a href="/courses/{{course.name}}/{{batch.name}}/members"><i class="fa fa-users fa-lg"></i></a>
+    <a href="/courses/{{course.name}}/{{batch.name}}/discuss"><i class="fa fa-comments fa-lg"></i></a>
+    <a href="/courses/{{course.name}}/{{batch.name}}/about"><i class="fa fa-info-circle fa-lg"></i></a>
+    {% if batch.is_member(frappe.session.user, member_type="Mentor") %}
+      <a href="/courses/{{course.name}}/{{batch.name}}/progress"><i class="fa fa-flag-checkered fa-lg"></i></a>
+    {% endif %}
 </div>
 {% endmacro %}