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

fix: checkbox for terms of use

Browse Source
This commit is contained in:
Jannat Patel
2021-12-21 15:41:32 +05:30
parent 7d9b60c16a
commit 6188c698e3
10 changed files with 170 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

130
school/fixtures/custom_field.json
View File

@@ -30,7 +30,7 @@
"label": "Country",
"length": 0,
"mandatory_depends_on": null,
"modified": "2021-12-18 19:14:11.571754",
"modified": "2021-12-21 19:14:11.571754",
"module": null,
"name": "User-country",
"no_copy": 0,
@@ -68,7 +68,7 @@
"dt": "User",
"fetch_from": null,
"fetch_if_empty": 0,
"fieldname": "verify_age",
"fieldname": "verify_terms",
"fieldtype": "Check",
"hidden": 0,
"hide_border": 0,
@@ -81,12 +81,12 @@
"in_preview": 0,
"in_standard_filter": 0,
"insert_after": "country",
"label": "Age is 18 years or over",
"label": "Acceptance for Terms of Use",
"length": 0,
"mandatory_depends_on": null,
"modified": "2021-12-18 19:15:34.932908",
"modified": "2021-12-21 19:15:34.932908",
"module": null,
"name": "User-verify_age",
"name": "User-verify_terms",
"no_copy": 0,
"non_negative": 0,
"options": null,
@@ -138,7 +138,7 @@
"label": "City",
"length": 0,
"mandatory_depends_on": null,
"modified": "2021-12-18 14:46:55.834145",
"modified": "2021-12-21 14:46:55.834145",
"module": null,
"name": "User-city",
"no_copy": 0,
@@ -192,7 +192,7 @@
"label": "College Name",
"length": 0,
"mandatory_depends_on": null,
"modified": "2021-12-18 14:46:55.834145",
"modified": "2021-12-21 14:46:55.834145",
"module": null,
"name": "User-college",
"no_copy": 0,
@@ -246,7 +246,7 @@
"label": "Branch",
"length": 0,
"mandatory_depends_on": null,
"modified": "2021-12-18 14:46:55.834145",
"modified": "2021-12-21 14:46:55.834145",
"module": null,
"name": "User-branch",
"no_copy": 0,
@@ -300,7 +300,7 @@
"label": "LinkedIn ID",
"length": 0,
"mandatory_depends_on": null,
"modified": "2021-12-18 14:46:55.834145",
"modified": "2021-12-21 14:46:55.834145",
"module": null,
"name": "User-linkedin",
"no_copy": 0,
@@ -354,7 +354,7 @@
"label": "Github ID",
"length": 0,
"mandatory_depends_on": null,
"modified": "2021-12-18 14:46:55.834145",
"modified": "2021-12-21 14:46:55.834145",
"module": null,
"name": "User-github",
"no_copy": 0,
@@ -408,7 +408,7 @@
"label": "Medium ID",
"length": 0,
"mandatory_depends_on": null,
"modified": "2021-12-18 14:46:55.834145",
"modified": "2021-12-21 14:46:55.834145",
"module": null,
"name": "User-medium",
"no_copy": 0,
@@ -462,7 +462,7 @@
"label": "Profession",
"length": 0,
"mandatory_depends_on": null,
"modified": "2021-12-18 14:46:55.834145",
"modified": "2021-12-21 14:46:55.834145",
"module": null,
"name": "User-profession",
"no_copy": 0,
@@ -516,7 +516,7 @@
"label": "Education Details",
"length": 0,
"mandatory_depends_on": null,
"modified": "2021-12-18 11:57:55.170625",
"modified": "2021-12-21 11:57:55.170625",
"module": null,
"name": "User-education_details",
"no_copy": 0,
@@ -570,7 +570,7 @@
"label": "Hide my Private Information from others",
"length": 0,
"mandatory_depends_on": null,
"modified": "2021-12-18 11:57:47.942967",
"modified": "2021-12-21 11:57:47.942967",
"module": null,
"name": "User-hide_my_private_information_from_others",
"no_copy": 0,
@@ -624,7 +624,7 @@
"label": "Profile Complete",
"length": 0,
"mandatory_depends_on": null,
"modified": "2021-12-18 11:00:13.792809",
"modified": "2021-12-21 11:00:13.792809",
"module": null,
"name": "User-profile_complete",
"no_copy": 0,
@@ -678,7 +678,7 @@
"label": "Cover Image",
"length": 0,
"mandatory_depends_on": null,
"modified": "2021-12-18 10:59:52.682112",
"modified": "2021-12-21 10:59:52.682112",
"module": null,
"name": "User-cover_image",
"no_copy": 0,
@@ -732,7 +732,7 @@
"label": "Education",
"length": 0,
"mandatory_depends_on": null,
"modified": "2021-12-18 11:58:56.052663",
"modified": "2021-12-21 11:58:56.052663",
"module": null,
"name": "User-education",
"no_copy": 0,
@@ -786,7 +786,7 @@
"label": "Work Experience Details",
"length": 0,
"mandatory_depends_on": null,
"modified": "2021-12-18 11:56:29.466560",
"modified": "2021-12-21 11:56:29.466560",
"module": null,
"name": "User-work_experience_details",
"no_copy": 0,
@@ -840,7 +840,7 @@
"label": "Work Experience",
"length": 0,
"mandatory_depends_on": null,
"modified": "2021-12-18 11:58:43.329371",
"modified": "2021-12-21 11:58:43.329371",
"module": null,
"name": "User-work_experience",
"no_copy": 0,
@@ -863,6 +863,60 @@
"unique": 0,
"width": null
},
{
"allow_in_quick_entry": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"collapsible_depends_on": null,
"columns": 0,
"default": null,
"depends_on": null,
"description": null,
"docstatus": 0,
"doctype": "Custom Field",
"dt": "User",
"fetch_from": null,
"fetch_if_empty": 0,
"fieldname": "volunteering_or_internship",
"fieldtype": "Table",
"hidden": 0,
"hide_border": 0,
"hide_days": 0,
"hide_seconds": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_preview": 0,
"in_standard_filter": 0,
"insert_after": "work_experience",
"label": "Volunteering or Internship",
"length": 0,
"mandatory_depends_on": null,
"modified": "2021-12-21 14:58:04.285835",
"module": null,
"name": "User-volunteering_or_internship",
"no_copy": 0,
"non_negative": 0,
"options": "Work Experience",
"parent": null,
"parentfield": null,
"parenttype": null,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"print_width": null,
"read_only": 0,
"read_only_depends_on": null,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"translatable": 0,
"unique": 0,
"width": null
},
{
"allow_in_quick_entry": 0,
"allow_on_submit": 0,
@@ -890,11 +944,11 @@
"in_list_view": 0,
"in_preview": 0,
"in_standard_filter": 0,
"insert_after": "work_experience",
"insert_after": "volunteering_or_internship",
"label": "Certification Details",
"length": 0,
"mandatory_depends_on": null,
"modified": "2021-12-18 11:59:36.478416",
"modified": "2021-12-21 14:58:29.975380",
"module": null,
"name": "User-certification_details",
"no_copy": 0,
@@ -948,7 +1002,7 @@
"label": "Certification",
"length": 0,
"mandatory_depends_on": null,
"modified": "2021-12-18 11:59:54.850517",
"modified": "2021-12-21 11:59:54.850517",
"module": null,
"name": "User-certification",
"no_copy": 0,
@@ -1002,7 +1056,7 @@
"label": "Skill Details",
"length": 0,
"mandatory_depends_on": null,
"modified": "2021-12-18 12:01:29.335323",
"modified": "2021-12-21 12:01:29.335323",
"module": null,
"name": "User-skill_details",
"no_copy": 0,
@@ -1056,7 +1110,7 @@
"label": "Skill",
"length": 0,
"mandatory_depends_on": null,
"modified": "2021-12-18 15:32:13.944672",
"modified": "2021-12-21 15:32:13.944672",
"module": null,
"name": "User-skill",
"no_copy": 0,
@@ -1110,7 +1164,7 @@
"label": "Career Preference Details",
"length": 0,
"mandatory_depends_on": null,
"modified": "2021-12-18 15:35:50.764368",
"modified": "2021-12-21 15:35:50.764368",
"module": null,
"name": "User-carrer_preference_details",
"no_copy": 0,
@@ -1164,7 +1218,7 @@
"label": "Preferred Functions",
"length": 0,
"mandatory_depends_on": null,
"modified": "2021-12-18 17:12:36.454519",
"modified": "2021-12-21 17:12:36.454519",
"module": null,
"name": "User-preferred_functions",
"no_copy": 0,
@@ -1218,7 +1272,7 @@
"label": "Preferred Location",
"length": 0,
"mandatory_depends_on": null,
"modified": "2021-12-18 17:12:40.105066",
"modified": "2021-12-21 17:12:40.105066",
"module": null,
"name": "User-preferred_location",
"no_copy": 0,
@@ -1272,7 +1326,7 @@
"label": "",
"length": 0,
"mandatory_depends_on": null,
"modified": "2021-12-18 12:47:32.673594",
"modified": "2021-12-21 12:47:32.673594",
"module": null,
"name": "User-career_preference_column",
"no_copy": 0,
@@ -1326,7 +1380,7 @@
"label": "Preferred Industries",
"length": 0,
"mandatory_depends_on": null,
"modified": "2021-12-18 17:12:31.604282",
"modified": "2021-12-21 17:12:31.604282",
"module": null,
"name": "User-preferred_industries",
"no_copy": 0,
@@ -1380,7 +1434,7 @@
"label": "Dream Companies",
"length": 0,
"mandatory_depends_on": null,
"modified": "2021-12-18 12:49:19.295124",
"modified": "2021-12-21 12:49:19.295124",
"module": null,
"name": "User-dream_companies",
"no_copy": 0,
@@ -1434,7 +1488,7 @@
"label": "Work Environment",
"length": 0,
"mandatory_depends_on": null,
"modified": "2021-12-18 12:49:46.685634",
"modified": "2021-12-21 12:49:46.685634",
"module": null,
"name": "User-work_environment",
"no_copy": 0,
@@ -1488,7 +1542,7 @@
"label": "Attire Preference",
"length": 0,
"mandatory_depends_on": null,
"modified": "2021-12-18 12:03:02.296214",
"modified": "2021-12-21 12:03:02.296214",
"module": null,
"name": "User-attire",
"no_copy": 0,
@@ -1542,7 +1596,7 @@
"label": "Collaboration Preference",
"length": 0,
"mandatory_depends_on": null,
"modified": "2021-12-18 12:02:49.680208",
"modified": "2021-12-21 12:02:49.680208",
"module": null,
"name": "User-collaboration",
"no_copy": 0,
@@ -1596,7 +1650,7 @@
"label": "Role Preference",
"length": 0,
"mandatory_depends_on": null,
"modified": "2021-12-18 16:10:37.349479",
"modified": "2021-12-21 16:10:37.349479",
"module": null,
"name": "User-role",
"no_copy": 0,
@@ -1650,7 +1704,7 @@
"label": "",
"length": 0,
"mandatory_depends_on": null,
"modified": "2021-12-18 16:45:46.776903",
"modified": "2021-12-21 16:45:46.776903",
"module": null,
"name": "User-work_environment_column",
"no_copy": 0,
@@ -1704,7 +1758,7 @@
"label": "Location Preference",
"length": 0,
"mandatory_depends_on": null,
"modified": "2021-12-18 12:02:04.328536",
"modified": "2021-12-21 12:02:04.328536",
"module": null,
"name": "User-location_preference",
"no_copy": 0,
@@ -1758,7 +1812,7 @@
"label": "Time Preference",
"length": 0,
"mandatory_depends_on": null,
"modified": "2021-12-18 16:16:37.885306",
"modified": "2021-12-21 16:16:37.885306",
"module": null,
"name": "User-time",
"no_copy": 0,
@@ -1812,7 +1866,7 @@
"label": "Company Type",
"length": 0,
"mandatory_depends_on": null,
"modified": "2021-12-18 12:01:41.342622",
"modified": "2021-12-21 12:01:41.342622",
"module": null,
"name": "User-company_type",
"no_copy": 0,

20
school/fixtures/function.json
View File

@@ -39,16 +39,6 @@
"parentfield": null,
"parenttype": null
},
{
"docstatus": 0,
"doctype": "Function",
"function": "Engineering (Software & IT)",
"modified": "2021-12-14 15:16:26.348864",
"name": "Engineering (Software & IT)",
"parent": null,
"parentfield": null,
"parenttype": null
},
{
"docstatus": 0,
"doctype": "Function",
@@ -158,5 +148,15 @@
"parent": null,
"parentfield": null,
"parenttype": null
},
{
"docstatus": 0,
"doctype": "Function",
"function": "Engineering (Software & IT)",
"modified": "2021-12-14 15:16:26.348864",
"name": "Engineering (Software & IT)",
"parent": null,
"parentfield": null,
"parenttype": null
}
]

40
school/fixtures/industry.json
View File

@@ -89,16 +89,6 @@
"parentfield": null,
"parenttype": null
},
{
"docstatus": 0,
"doctype": "Industry",
"industry": "Education & Training",
"modified": "2021-12-14 15:21:18.105864",
"name": "Education & Training",
"parent": null,
"parentfield": null,
"parenttype": null
},
{
"docstatus": 0,
"doctype": "Industry",
@@ -109,16 +99,6 @@
"parentfield": null,
"parenttype": null
},
{
"docstatus": 0,
"doctype": "Industry",
"industry": "Engineering",
"modified": "2021-12-14 15:21:18.119149",
"name": "Engineering",
"parent": null,
"parentfield": null,
"parenttype": null
},
{
"docstatus": 0,
"doctype": "Industry",
@@ -238,5 +218,25 @@
"parent": null,
"parentfield": null,
"parenttype": null
},
{
"docstatus": 0,
"doctype": "Industry",
"industry": "Education & Training",
"modified": "2021-12-14 15:21:18.105864",
"name": "Education & Training",
"parent": null,
"parentfield": null,
"parenttype": null
},
{
"docstatus": 0,
"doctype": "Industry",
"industry": "Engineering",
"modified": "2021-12-14 15:21:18.119149",
"name": "Engineering",
"parent": null,
"parentfield": null,
"parenttype": null
}
]

26
school/lms/doctype/lms_settings/lms_settings.json
View File

@@ -7,11 +7,12 @@
"field_order": [
"livecode_url",
"email_sender",
"verify_age",
"column_break_2",
"force_profile_completion",
"show_search",
"search_placeholder",
"terms_of_use",
"terms_page",
"mentor_request_section",
"mentor_request_creation",
"mentor_request_status_update"
@@ -62,23 +63,30 @@
"fieldtype": "Data",
"label": "Search Field Placeholder"
},
{
"default": "0",
"fieldname": "verify_age",
"fieldtype": "Check",
"label": "Verify Age during Signup"
},
{
"default": "0",
"fieldname": "force_profile_completion",
"fieldtype": "Check",
"label": "Force users to complete their Profile"
},
{
"default": "0",
"fieldname": "terms_of_use",
"fieldtype": "Check",
"label": "Show Terms of Use on Signup"
},
{
"depends_on": "terms_of_use",
"fieldname": "terms_page",
"fieldtype": "Link",
"label": "Terms of Use Page",
"options": "Web Page"
}
],
"index_web_pages_for_search": 1,
"issingle": 1,
"links": [],
"modified": "2021-12-21 11:32:28.196404",
"modified": "2021-12-21 12:17:07.734189",
"modified_by": "Administrator",
"module": "LMS",
"name": "LMS Settings",
@@ -98,4 +106,4 @@
"sort_field": "modified",
"sort_order": "DESC",
"track_changes": 1
}
}

15
school/lms/web_form/profile/profile.json
View File

@@ -21,7 +21,7 @@
"is_standard": 1,
"login_required": 1,
"max_attachment_size": 0,
"modified": "2021-12-21 11:05:56.505121",
"modified": "2021-12-21 14:58:56.943438",
"modified_by": "Administrator",
"module": "LMS",
"name": "profile",
@@ -231,6 +231,19 @@
"max_value": 0,
"options": "Work Experience",
"read_only": 0,
"reqd": 1,
"show_in_filter": 0
},
{
"allow_read_on_all_link_options": 0,
"fieldname": "volunteering_or_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
},

4
school/overrides/user.py
View File

@@ -174,7 +174,7 @@ class CustomUser(User):
}
@frappe.whitelist(allow_guest=True)
def sign_up(email, full_name, verify_age):
def sign_up(email, full_name, verify_terms):
if is_signup_disabled():
frappe.throw(_('Sign Up is disabled'), title='Not Allowed')
@@ -194,7 +194,7 @@ def sign_up(email, full_name, verify_age):
"doctype":"User",
"email": email,
"first_name": escape_html(full_name),
"verify_age": verify_age,
"verify_terms": verify_terms,
"country": "",
"enabled": 1,
"new_password": random_string(10),

1
school/patches.txt
View File

@@ -20,3 +20,4 @@ execute:frappe.delete_doc("DocType", "Lesson") #06-10-2021
execute:frappe.delete_doc("DocType", "LMS Topic") #06-10-2021
school.patches.v0_0.add_progress_to_membership #20-10-2021
execute:frappe.delete_doc("Workspace", "LMS", ignore_missing=True, force=True) #24-10-2021
execute:frappe.delete_doc("Custom Field", "User-verify_age", ignore_missing=True, force=True)

4
school/plugins.py
View File

@@ -122,6 +122,6 @@ def video_renderer(src):
return "<video controls width='100%'><source src={0} type='video/mp4'></video>".format(src)
def show_custom_signup():
if frappe.db.get_single_value("LMS Settings", "verify_age"):
if frappe.db.get_single_value("LMS Settings", "terms_of_use"):
return "school/templates/signup-form.html"
return None
return "frappe/templates/signup.html"

13
school/templates/signup-form.html
View File

@@ -10,18 +10,25 @@
<input type="email" id="signup_email" class="form-control"
placeholder="{{ _('jane@example.com') }}" required>
</div>
{% if frappe.db.get_single_value("LMS Settings", "terms_of_use") %}
<div class="form-group">
<div class="checkbox">
<label>
<span class="input-area">
<input type="checkbox" autocomplete="off" class="input-with-feedback"
data-fieldtype="Check" data-fieldname="age" id="signup-age" required>
data-fieldtype="Check" data-fieldname="terms" id="signup-terms" required>
</span>
<span class="label-area">{{ _("I confirm that I am 18 years old or above") }}</span>
<span class="label-area">
{% set terms_page = frappe.db.get_single_value("LMS Settings", "terms_page") %}
{% set terms_page_route = frappe.db.get_value("Web Page", terms_page, "route") %}
{% set terms_link = "<a href='/" + terms_page_route +"'> Terms of Use </a>" %}
{{ _("I have read and I agree to your {0}").format(terms_link) }}
</span>
</label>
<p class="help-box small text-muted"></p>
</div>
</div>
{% endif %}
</div>
<div class="page-card-actions">
<button class="btn btn-sm btn-primary btn-block btn-signup"
@@ -50,7 +57,7 @@
args: {
"email": ($("#signup_email").val() || "").trim(),
"full_name": frappe.utils.xss_sanitise(($("#signup_fullname").val() || "").trim()),
"verify_age": $("#signup-age").prop("checked") ? 1 : 0
"verify_terms": $("#signup-terms").prop("checked") ? 1 : 0
},
statusCode: login.login_handlers
})

4
school/www/courses/index.html
View File

@@ -10,10 +10,10 @@
<div class="common-page-style">
<div class="container">
{% if restriction.restrict %}
{% set site_link = "<a href='/edit-profile'> profile </a>" %}
{% set profile_link = "<a href='/edit-profile'> profile </a>" %}
<div class="empty-state">
<div class="course-home-headings text-center mb-0" style="color: inherit;">{{ _("You haven't completed your profile.") }}</div>
<p class="small text-center">{{ _("Complete your {0} to access the courses.").format(site_link) }}</p>
<p class="small text-center">{{ _("Complete your {0} to access the courses.").format(profile_link) }}</p>
</div>
{% else %}