eduvia/lms
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1118 from pateljannat/issues-49

Browse Source 
fix: misc issues
This commit is contained in:
Jannat Patel
2024-11-12 12:12:24 +05:30
committed by GitHub
parent a643e9ae83 3473bdb527
commit 0c6029cbe8
18 changed files with 12 additions and 842 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
frontend/src/components/LiveClass.vue
View File

@@ -46,6 +46,7 @@
{{ __('Start') }}
</a>
<a
v-if="cls.date <= dayjs().format('YYYY-MM-DD')"
:href="cls.join_url"
target="_blank"
class="w-full cursor-pointer inline-flex items-center justify-center gap-2 transition-colors focus:outline-none text-gray-800 bg-gray-100 hover:bg-gray-200 active:bg-gray-300 focus-visible:ring focus-visible:ring-gray-400 h-7 text-base px-2 rounded"

1
frontend/src/components/VideoBlock.vue
View File

@@ -4,6 +4,7 @@
@timeupdate="updateTime"
@ended="videoEnded"
@click="togglePlay"
oncontextmenu="return false"
class="rounded-lg border border-gray-100 group cursor-pointer"
ref="videoRef"
>

22
frontend/src/pages/CourseDetail.vue
View File

@@ -67,7 +67,7 @@
<CourseCardOverlay :course="course" class="md:hidden mb-4" />
<div
v-html="course.data.description"
class="course-description"
class="ProseMirror prose prose-table:table-fixed prose-td:p-2 prose-th:p-2 prose-td:border prose-th:border prose-td:border-gray-300 prose-th:border-gray-300 prose-td:relative prose-th:relative prose-th:bg-gray-100 prose-sm max-w-none !whitespace-normal"
></div>
<div class="mt-10">
<CourseOutline :courseName="course.data.name" :showOutline="true" />
@@ -131,26 +131,6 @@ const pageMeta = computed(() => {
updateDocumentTitle(pageMeta)
</script>
<style>
.course-description p {
margin-bottom: 1rem;
line-height: 1.7;
}
.course-description li {
line-height: 1.7;
}
.course-description ol {
list-style: auto;
margin: revert;
padding: revert;
}
.course-description ul {
list-style: disc;
margin: revert;
padding: revert;
}
.avatar-group {
display: inline-flex;
align-items: center;

3
lms/lms/doctype/lms_live_class/lms_live_class.json
View File

@@ -132,9 +132,10 @@
"read_only": 1
}
],
"in_create": 1,
"index_web_pages_for_search": 1,
"links": [],
"modified": "2024-10-31 15:41:35.540856",
"modified": "2024-11-11 18:59:26.396111",
"modified_by": "Administrator",
"module": "LMS",
"name": "LMS Live Class",

0
lms/lms/web_form/add_a_new_batch/__init__.py
View File

49
lms/lms/web_form/add_a_new_batch/add_a_new_batch.js
View File

@@ -1,49 +0,0 @@
frappe.ready(function () {
frappe.web_form.after_save = () => {
let data = frappe.web_form.get_values();
let slug = new URLSearchParams(window.location.search).get("slug");
frappe.msgprint({
message: __("Batch {0} has been successfully created!", [
data.title,
]),
clear: true,
});
setTimeout(function () {
window.location.href = `courses/${slug}`;
}, 2000);
};
frappe.web_form.validate = () => {
let sysdefaults = frappe.boot.sysdefaults;
let time_format =
sysdefaults && sysdefaults.time_format
? sysdefaults.time_format
: "HH:mm:ss";
let data = frappe.web_form.get_values();
data.start_time = moment(data.start_time, time_format).format(
time_format
);
data.end_time = moment(data.end_time, time_format).format(time_format);
if (data.start_date < frappe.datetime.nowdate()) {
frappe.msgprint(__("Start date cannot be a past date."));
return false;
}
if (
!frappe.datetime.validate(data.start_time) ||
!frappe.datetime.validate(data.end_time)
) {
frappe.msgprint(__("Invalid Start or End Time."));
return false;
}
if (data.start_time > data.end_time) {
frappe.msgprint(__("Start Time should be less than End Time."));
return false;
}
return true;
};
});

114
lms/lms/web_form/add_a_new_batch/add_a_new_batch.json
View File

@@ -1,114 +0,0 @@
{
"accept_payment": 0,
"allow_comments": 0,
"allow_delete": 0,
"allow_edit": 0,
"allow_incomplete": 0,
"allow_multiple": 0,
"allow_print": 0,
"amount": 0.0,
"amount_based_on_field": 0,
"apply_document_permissions": 0,
"button_label": "Save",
"creation": "2021-04-20 11:37:49.135114",
"custom_css": ".datepicker.active {\n background-color: white;\n}\n\n[data-doctype=\"Web Form\"] {\n max-width: 720px;\n margin: 6rem auto;\n}",
"doc_type": "LMS Batch Old",
"docstatus": 0,
"doctype": "Web Form",
"idx": 0,
"is_standard": 1,
"login_required": 1,
"max_attachment_size": 0,
"modified": "2021-06-15 18:49:50.530002",
"modified_by": "Administrator",
"module": "LMS",
"name": "add-a-new-batch",
"owner": "Administrator",
"payment_button_label": "Buy Now",
"published": 1,
"route": "add-a-new-batch",
"route_to_success_link": 0,
"show_attachments": 0,
"show_in_grid": 0,
"show_sidebar": 0,
"sidebar_items": [],
"success_url": "/add-a-new-batch",
"title": "Add a new batch",
"web_form_fields": [
{
"allow_read_on_all_link_options": 0,
"fieldname": "course",
"fieldtype": "Data",
"hidden": 1,
"label": "Course",
"max_length": 0,
"max_value": 0,
"options": "LMS Course",
"read_only": 0,
"reqd": 0,
"show_in_filter": 0
},
{
"allow_read_on_all_link_options": 0,
"fieldname": "title",
"fieldtype": "Data",
"hidden": 0,
"label": "Title",
"max_length": 0,
"max_value": 0,
"read_only": 0,
"reqd": 1,
"show_in_filter": 0
},
{
"allow_read_on_all_link_options": 0,
"fieldname": "start_date",
"fieldtype": "Date",
"hidden": 0,
"label": "Start Date",
"max_length": 0,
"max_value": 0,
"read_only": 0,
"reqd": 1,
"show_in_filter": 0
},
{
"allow_read_on_all_link_options": 0,
"description": "",
"fieldname": "sessions_on",
"fieldtype": "Data",
"hidden": 0,
"label": "Sessions On Days",
"max_length": 0,
"max_value": 0,
"options": "",
"read_only": 0,
"reqd": 1,
"show_in_filter": 0
},
{
"allow_read_on_all_link_options": 0,
"fieldname": "start_time",
"fieldtype": "Data",
"hidden": 0,
"label": "Start Time",
"max_length": 0,
"max_value": 0,
"read_only": 0,
"reqd": 1,
"show_in_filter": 0
},
{
"allow_read_on_all_link_options": 0,
"fieldname": "end_time",
"fieldtype": "Data",
"hidden": 0,
"label": "End Time",
"max_length": 0,
"max_value": 0,
"read_only": 0,
"reqd": 1,
"show_in_filter": 0
}
]
}

6
lms/lms/web_form/add_a_new_batch/add_a_new_batch.py
View File

@@ -1,6 +0,0 @@
import frappe
def get_context(context):
# do your magic here
pass

0
lms/lms/web_form/evaluation/__init__.py
View File

10
lms/lms/web_form/evaluation/evaluation.js
View File

@@ -1,10 +0,0 @@
frappe.ready(function () {
frappe.web_form.after_save = () => {
let data = frappe.web_form.get_values();
if (data.class) {
setTimeout(() => {
window.location.href = `/batches/${data.class}`;
}, 2000);
}
};
});

189
lms/lms/web_form/evaluation/evaluation.json
View File

@@ -1,189 +0,0 @@
{
"accept_payment": 0,
"allow_comments": 0,
"allow_delete": 0,
"allow_edit": 0,
"allow_incomplete": 0,
"allow_multiple": 1,
"allow_print": 0,
"amount": 0.0,
"amount_based_on_field": 0,
"anonymous": 0,
"apply_document_permissions": 0,
"button_label": "Save",
"creation": "2022-11-23 11:59:33.533053",
"doc_type": "LMS Certificate Evaluation",
"docstatus": 0,
"doctype": "Web Form",
"idx": 1,
"introduction_text": "",
"is_standard": 1,
"list_columns": [],
"login_required": 1,
"max_attachment_size": 0,
"modified": "2023-08-23 14:37:03.086305",
"modified_by": "Administrator",
"module": "LMS",
"name": "evaluation",
"owner": "Administrator",
"payment_button_label": "Buy Now",
"published": 1,
"route": "evaluation",
"show_attachments": 0,
"show_list": 1,
"show_sidebar": 0,
"title": "Evaluation",
"web_form_fields": [
{
"allow_read_on_all_link_options": 1,
"fieldname": "member",
"fieldtype": "Link",
"hidden": 0,
"label": "Member",
"max_length": 0,
"max_value": 0,
"options": "User",
"read_only": 0,
"reqd": 1,
"show_in_filter": 0
},
{
"allow_read_on_all_link_options": 1,
"fieldname": "course",
"fieldtype": "Link",
"hidden": 0,
"label": "Course",
"max_length": 0,
"max_value": 0,
"options": "LMS Course",
"read_only": 0,
"reqd": 1,
"show_in_filter": 0
},
{
"allow_read_on_all_link_options": 0,
"fieldname": "batch_name",
"fieldtype": "Link",
"hidden": 0,
"label": "Batch Name",
"max_length": 0,
"max_value": 0,
"options": "LMS Batch",
"read_only": 0,
"reqd": 0,
"show_in_filter": 0
},
{
"allow_read_on_all_link_options": 0,
"fieldname": "",
"fieldtype": "Column Break",
"hidden": 0,
"label": "",
"max_length": 0,
"max_value": 0,
"options": "",
"read_only": 0,
"reqd": 0,
"show_in_filter": 0
},
{
"allow_read_on_all_link_options": 0,
"fieldname": "date",
"fieldtype": "Date",
"hidden": 0,
"label": "Date",
"max_length": 0,
"max_value": 0,
"read_only": 0,
"reqd": 1,
"show_in_filter": 0
},
{
"allow_read_on_all_link_options": 0,
"fieldname": "start_time",
"fieldtype": "Time",
"hidden": 0,
"label": "Start Time",
"max_length": 0,
"max_value": 0,
"read_only": 0,
"reqd": 1,
"show_in_filter": 0
},
{
"allow_read_on_all_link_options": 0,
"fieldname": "end_time",
"fieldtype": "Time",
"hidden": 0,
"label": "End Time",
"max_length": 0,
"max_value": 0,
"read_only": 0,
"reqd": 0,
"show_in_filter": 0
},
{
"allow_read_on_all_link_options": 0,
"fieldname": "",
"fieldtype": "Section Break",
"hidden": 0,
"label": "Evaluation Details",
"max_length": 0,
"max_value": 0,
"options": "",
"read_only": 0,
"reqd": 0,
"show_in_filter": 0
},
{
"allow_read_on_all_link_options": 0,
"fieldname": "rating",
"fieldtype": "Rating",
"hidden": 0,
"label": "Rating",
"max_length": 0,
"max_value": 0,
"read_only": 0,
"reqd": 1,
"show_in_filter": 0
},
{
"allow_read_on_all_link_options": 0,
"fieldname": "status",
"fieldtype": "Select",
"hidden": 0,
"label": "Status",
"max_length": 0,
"max_value": 0,
"options": "Pass\nFail",
"read_only": 0,
"reqd": 1,
"show_in_filter": 0
},
{
"allow_read_on_all_link_options": 0,
"fieldname": "",
"fieldtype": "Column Break",
"hidden": 0,
"label": "",
"max_length": 0,
"max_value": 0,
"options": "",
"read_only": 0,
"reqd": 0,
"show_in_filter": 0
},
{
"allow_read_on_all_link_options": 0,
"fieldname": "summary",
"fieldtype": "Small Text",
"hidden": 0,
"label": "Summary",
"max_length": 0,
"max_value": 0,
"read_only": 0,
"reqd": 0,
"show_in_filter": 0
}
]
}

6
lms/lms/web_form/evaluation/evaluation.py
View File

@@ -1,6 +0,0 @@
import frappe
from frappe import _
def get_context(context):
pass

0
lms/lms/web_form/profile/__init__.py
View File

98
lms/lms/web_form/profile/profile.js
View File

@@ -1,98 +0,0 @@
frappe.ready(function () {
frappe.web_form.after_load = () => {
redirect_to_user_profile_form();
add_listener_for_current_company();
add_listener_for_certificate_expiry();
add_listener_for_skill_add_rows();
add_listener_for_functions_add_rows();
add_listener_for_industries_add_rows();
};
frappe.web_form.validate = () => {
let information_missing;
const data = frappe.web_form.get_values();
if (data && data.work_experience && data.work_experience.length) {
data.work_experience.forEach((exp) => {
if (!exp.current && !exp.to_date) {
information_missing = true;
frappe.msgprint(
__("To Date is mandatory in Work Experience.")
);
}
});
}
if (information_missing) return false;
return true;
};
frappe.web_form.after_save = () => {
setTimeout(() => {
window.location.href = `/profile_/${frappe.web_form.get_value([
"username",
])}`;
});
};
});
const redirect_to_user_profile_form = () => {
if (!frappe.utils.get_url_arg("name")) {
window.location.href = `/edit-profile?name=${frappe.session.user}`;
}
};
const add_listener_for_current_company = () => {
$(document).on("click", "input[data-fieldname='current']", (e) => {
if ($(e.currentTarget).prop("checked"))
$("div[data-fieldname='to_date']").addClass("hide");
else $("div[data-fieldname='to_date']").removeClass("hide");
});
};
const add_listener_for_certificate_expiry = () => {
$(document).on("click", "input[data-fieldname='expire']", (e) => {
if ($(e.currentTarget).prop("checked"))
$("div[data-fieldname='expiration_date']").addClass("hide");
else $("div[data-fieldname='expiration_date']").removeClass("hide");
});
};
const add_listener_for_skill_add_rows = () => {
$('[data-fieldname="skill"]')
.find(".grid-add-row")
.click((e) => {
if ($('[data-fieldname="skill"]').find(".grid-row").length > 5) {
$('[data-fieldname="skill"]').find(".grid-add-row").hide();
}
});
};
const add_listener_for_functions_add_rows = () => {
$('[data-fieldname="preferred_functions"]')
.find(".grid-add-row")
.click((e) => {
if (
$('[data-fieldname="preferred_functions"]').find(".grid-row")
.length > 3
) {
$('[data-fieldname="preferred_functions"]')
.find(".grid-add-row")
.hide();
}
});
};
const add_listener_for_industries_add_rows = () => {
$('[data-fieldname="preferred_industries"]')
.find(".grid-add-row")
.click((e) => {
if (
$('[data-fieldname="preferred_industries"]').find(".grid-row")
.length > 3
) {
$('[data-fieldname="preferred_industries"]')
.find(".grid-add-row")
.hide();
}
});
};

341
lms/lms/web_form/profile/profile.json
View File

@@ -1,341 +0,0 @@
{
"accept_payment": 0,
"allow_comments": 0,
"allow_delete": 0,
"allow_edit": 1,
"allow_incomplete": 0,
"allow_multiple": 0,
"allow_print": 0,
"amount": 0.0,
"amount_based_on_field": 0,
"apply_document_permissions": 0,
"breadcrumbs": "",
"button_label": "Save",
"client_script": "",
"creation": "2021-06-30 13:48:13.682851",
"custom_css": "",
"doc_type": "User",
"docstatus": 0,
"doctype": "Web Form",
"idx": 0,
"is_standard": 1,
"list_columns": [],
"login_required": 1,
"max_attachment_size": 0,
"modified": "2023-01-09 15:45:11.411692",
"modified_by": "Administrator",
"module": "LMS",
"name": "profile",
"owner": "Administrator",
"payment_button_label": "Buy Now",
"published": 1,
"route": "edit-profile",
"show_attachments": 0,
"show_list": 0,
"show_sidebar": 0,
"success_url": "/profile",
"title": "Profile",
"web_form_fields": [
{
"allow_read_on_all_link_options": 0,
"fieldname": "first_name",
"fieldtype": "Data",
"hidden": 0,
"label": "First Name",
"max_length": 0,
"max_value": 0,
"read_only": 0,
"reqd": 1,
"show_in_filter": 0
},
{
"allow_read_on_all_link_options": 0,
"fieldname": "last_name",
"fieldtype": "Data",
"hidden": 0,
"label": "Last Name",
"max_length": 0,
"max_value": 0,
"read_only": 0,
"reqd": 0,
"show_in_filter": 0
},
{
"allow_read_on_all_link_options": 0,
"fieldname": "username",
"fieldtype": "Data",
"hidden": 0,
"label": "Username",
"max_length": 0,
"max_value": 0,
"read_only": 0,
"reqd": 1,
"show_in_filter": 0
},
{
"allow_read_on_all_link_options": 0,
"description": "Get your globally recognized avatar from Gravatar.com",
"fieldname": "user_image",
"fieldtype": "Attach Image",
"hidden": 0,
"label": "User Image",
"max_length": 0,
"max_value": 0,
"read_only": 0,
"reqd": 0,
"show_in_filter": 0
},
{
"allow_read_on_all_link_options": 0,
"description": "",
"fieldname": "cover_image",
"fieldtype": "Attach Image",
"hidden": 0,
"label": "Cover Image",
"max_length": 0,
"max_value": 0,
"read_only": 0,
"reqd": 0,
"show_in_filter": 0
},
{
"allow_read_on_all_link_options": 0,
"fieldname": "city",
"fieldtype": "Data",
"hidden": 0,
"label": "City",
"max_length": 0,
"max_value": 0,
"read_only": 0,
"reqd": 0,
"show_in_filter": 0
},
{
"allow_read_on_all_link_options": 0,
"fieldname": "mobile_no",
"fieldtype": "Data",
"hidden": 0,
"label": "Mobile No",
"max_length": 0,
"max_value": 0,
"options": "Phone",
"read_only": 0,
"reqd": 0,
"show_in_filter": 0
},
{
"allow_read_on_all_link_options": 0,
"fieldname": "",
"fieldtype": "Column Break",
"hidden": 0,
"label": "",
"max_length": 0,
"max_value": 0,
"options": "",
"read_only": 0,
"reqd": 0,
"show_in_filter": 0
},
{
"allow_read_on_all_link_options": 0,
"fieldname": "headline",
"fieldtype": "Data",
"hidden": 0,
"label": "Headline",
"max_length": 0,
"max_value": 0,
"read_only": 0,
"reqd": 0,
"show_in_filter": 0
},
{
"allow_read_on_all_link_options": 0,
"fieldname": "linkedin",
"fieldtype": "Data",
"hidden": 0,
"label": "LinkedIn ID",
"max_length": 0,
"max_value": 0,
"read_only": 0,
"reqd": 0,
"show_in_filter": 0
},
{
"allow_read_on_all_link_options": 0,
"fieldname": "github",
"fieldtype": "Data",
"hidden": 0,
"label": "Github ID",
"max_length": 0,
"max_value": 0,
"read_only": 0,
"reqd": 0,
"show_in_filter": 0
},
{
"allow_read_on_all_link_options": 0,
"fieldname": "medium",
"fieldtype": "Data",
"hidden": 0,
"label": "Medium ID",
"max_length": 0,
"max_value": 0,
"read_only": 0,
"reqd": 0,
"show_in_filter": 0
},
{
"allow_read_on_all_link_options": 0,
"fieldname": "looking_for_job",
"fieldtype": "Check",
"hidden": 0,
"label": "I am looking for a job",
"max_length": 0,
"max_value": 0,
"read_only": 0,
"reqd": 0,
"show_in_filter": 0
},
{
"allow_read_on_all_link_options": 0,
"fieldname": "bio",
"fieldtype": "Small Text",
"hidden": 0,
"label": "Bio",
"max_length": 0,
"max_value": 0,
"read_only": 0,
"reqd": 0,
"show_in_filter": 0
},
{
"allow_read_on_all_link_options": 0,
"fieldname": "",
"fieldtype": "Page Break",
"hidden": 0,
"label": "",
"max_length": 0,
"max_value": 0,
"options": "",
"read_only": 0,
"reqd": 0,
"show_in_filter": 0
},
{
"allow_read_on_all_link_options": 0,
"fieldname": "",
"fieldtype": "Section Break",
"hidden": 0,
"label": "",
"max_length": 0,
"max_value": 0,
"options": "",
"read_only": 0,
"reqd": 0,
"show_in_filter": 0
},
{
"allow_read_on_all_link_options": 0,
"fieldname": "education",
"fieldtype": "Table",
"hidden": 0,
"label": "Education",
"max_length": 0,
"max_value": 0,
"options": "Education Detail",
"read_only": 0,
"reqd": 0,
"show_in_filter": 0
},
{
"allow_read_on_all_link_options": 0,
"fieldname": "work_experience_details",
"fieldtype": "Section Break",
"hidden": 0,
"label": "Work Experience",
"max_length": 0,
"max_value": 0,
"read_only": 0,
"reqd": 0,
"show_in_filter": 0
},
{
"allow_read_on_all_link_options": 0,
"fieldname": "work_experience",
"fieldtype": "Table",
"hidden": 0,
"label": "Work Experience",
"max_length": 0,
"max_value": 0,
"options": "Work Experience",
"read_only": 0,
"reqd": 0,
"show_in_filter": 0
},
{
"allow_read_on_all_link_options": 0,
"fieldname": "internship",
"fieldtype": "Table",
"hidden": 0,
"label": "Volunteering or Internship",
"max_length": 0,
"max_value": 0,
"options": "Work Experience",
"read_only": 0,
"reqd": 0,
"show_in_filter": 0
},
{
"allow_read_on_all_link_options": 0,
"fieldname": "certification_details",
"fieldtype": "Section Break",
"hidden": 0,
"label": "Certification Details",
"max_length": 0,
"max_value": 0,
"options": "",
"read_only": 0,
"reqd": 0,
"show_in_filter": 0
},
{
"allow_read_on_all_link_options": 0,
"fieldname": "certification",
"fieldtype": "Table",
"hidden": 0,
"label": "Certification",
"max_length": 0,
"max_value": 0,
"options": "Certification",
"read_only": 0,
"reqd": 0,
"show_in_filter": 0
},
{
"allow_read_on_all_link_options": 0,
"fieldname": "skill_details",
"fieldtype": "Section Break",
"hidden": 0,
"label": "Skill Details",
"max_length": 0,
"max_value": 0,
"options": "",
"read_only": 0,
"reqd": 0,
"show_in_filter": 0
},
{
"allow_read_on_all_link_options": 0,
"fieldname": "skill",
"fieldtype": "Table",
"hidden": 0,
"label": "Skill",
"max_length": 0,
"max_value": 0,
"options": "Skills",
"read_only": 0,
"reqd": 0,
"show_in_filter": 0
}
]
}

6
lms/lms/web_form/profile/profile.py
View File

@@ -1,6 +0,0 @@
import frappe
def get_context(context):
# do your magic here
pass

3
lms/patches.txt
View File

@@ -92,4 +92,5 @@ lms.patches.v2_0.add_discussion_topic_titles
lms.patches.v2_0.sidebar_settings
lms.patches.v2_0.delete_certificate_request_notification #18-09-2024
lms.patches.v2_0.add_course_statistics #21-10-2024
lms.patches.v2_0.give_discussions_permissions
lms.patches.v2_0.give_discussions_permissions
lms.patches.v2_0.delete_web_forms

5
lms/patches/v2_0/delete_web_forms.py Normal file
View File

@@ -0,0 +1,5 @@
import frappe
def execute():
frappe.db.delete("Web Form", {"module": "LMS"})