feat: assignment comments display

This commit is contained in:
Jannat Patel
2022-11-21 12:08:17 +05:30
parent 74210245cf
commit ed2fababff
8 changed files with 569 additions and 523 deletions
+14
View File
@@ -412,10 +412,24 @@ const fetch_assignments = () => {
callback: (data) => {
if (data.message) {
const assignment = data.message;
const status = assignment.status
let target = $(".attach-file");
target.addClass("hide");
target.siblings(".submit-work").addClass("hide");
target.siblings(".preview-work").removeClass("hide");
if(status != "Not Graded") {
let color = status == "Pass" ? "green": "red";
$(".assignment-status")
.removeClass("hide")
.addClass(color)
.text(data.message.status)
target.siblings(".alert").addClass("hide");
$(".clear-work").addClass("hide");
if (assignment.comments) {
$(".comments").removeClass("hide");
$(".comment").text(assignment.comments)
}
}
target
.siblings(".preview-work")
.find("a")
+41 -22
View File
@@ -11,28 +11,7 @@
</a>
<div class="course-home-headings"> {{ _("All Classes") }} </div>
{% if classes %}
<div class="cards-parent">
{% for class in classes %}
<div class="common-card-style column-card">
<div class="course-card-title">
{{ class.title }}
</div>
<div class="medium">
{% if class.start_date %}
<span>
{{ frappe.utils.format_date(class.start_date, "medium") }} -
</span>
{% endif %}
{% if class.end_date %}
<span>
{{ frappe.utils.format_date(class.end_date, "medium") }}
</span>
{% endif %}
</div>
<a class="stretched-link" href="/classes/{{ class.name }}"></a>
</div>
{% endfor %}
</div>
{{ ClassCards(classes) }}
{% else %}
<div class="empty-state">
<img class="icon icon-xl" src="/assets/lms/icons/comment.svg">
@@ -45,3 +24,43 @@
</div>
</div>
{% endblock %}
{% macro ClassCards(classes) %}
<div class="cards-parent">
{% for class in classes %}
{% set course_count = frappe.db.count("Class Course", {"parent": class.name}) %}
{% set student_count = frappe.db.count("Class Student", {"parent": class.name}) %}
<div class="common-card-style column-card">
<div class="text-muted small">
{% if course_count %}
<span>
{{ course_count }} {{ _("Courses") }}
</span>
{% endif %}
{% if student_count %}
<span class="ml-3">
{{ student_count }} {{ _("Students") }}
</span>
{% endif %}
</div>
<div class="course-card-title mb-4">
{{ class.title }}
</div>
<div class="">
<span>
{{ frappe.utils.format_date(class.start_date, "medium") }} -
</span>
<span>
{{ frappe.utils.format_date(class.end_date, "medium") }}
</span>
</div>
<a class="stretched-link" href="/classes/{{ class.name }}"></a>
</div>
{% endfor %}
</div>
{% endmacro %}