diff --git a/.editorconfig b/.editorconfig index dd608df2..0984f25b 100644 --- a/.editorconfig +++ b/.editorconfig @@ -26,4 +26,4 @@ indent_style = tab # HTML, CSS, javascript, JSON and YAML [*.{html,css,js,json,yml,yaml}] -indent_size = 2 +indent_size = 4 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f0546b5a..94e28ca5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -57,15 +57,15 @@ jobs: mkdir -p ~/bench-cache (cd && tar czf ~/bench-cache/bench.tgz frappe-bench) fi - - name: add school app to bench + - name: add lms app to bench working-directory: /home/runner/frappe-bench - run: bench get-app school $GITHUB_WORKSPACE + run: bench get-app lms $GITHUB_WORKSPACE - name: create bench site working-directory: /home/runner/frappe-bench run: bench new-site --mariadb-root-password root --admin-password admin frappe.local - - name: install school app + - name: install lms app working-directory: /home/runner/frappe-bench - run: bench --site frappe.local install-app school + run: bench --site frappe.local install-app lms - name: setup requirements working-directory: /home/runner/frappe-bench run: bench setup requirements --dev @@ -77,5 +77,5 @@ jobs: run: bench --site frappe.local build - name: run tests working-directory: /home/runner/frappe-bench - run: bench --site frappe.local run-tests --app school + run: bench --site frappe.local run-tests --app lms diff --git a/.github/workflows/semantic.yml b/.github/workflows/semantic.yml new file mode 100644 index 00000000..3978a91f --- /dev/null +++ b/.github/workflows/semantic.yml @@ -0,0 +1,19 @@ +name: Semantic Pull Request + +on: + push: + branches: [ main ] + pull_request: {} + +jobs: + # This workflow contains a single job called "build" + semantic: + name: Validate PR title + runs-on: ubuntu-latest + + # Steps represent a sequence of tasks that will be executed as part of the job + steps: + # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it + - uses: actions/checkout@v2 + + - uses: zeke/semantic-pull-requests@main diff --git a/.gitignore b/.gitignore index 6b0bb2e7..ba820a93 100644 --- a/.gitignore +++ b/.gitignore @@ -3,8 +3,8 @@ *.egg-info *.swp tags -school/docs/current -school/public/dist +lms/docs/current +lms/public/dist __pycache__/ *.py[cod] *$py.class diff --git a/Contribution.md b/Contribution.md index ce403717..d61d1978 100644 --- a/Contribution.md +++ b/Contribution.md @@ -1,5 +1,5 @@ -1. Go to the apps/school directory of your installation and execute git pull --unshallow to ensure that you have the full git repository. Also fork the frappe/school repository on GitHub. +1. Go to the apps/lms directory of your installation and execute git pull --unshallow to ensure that you have the full git repository. Also fork the frappe/lms repository on GitHub. 1. Check out a working branch in git (e.g. git checkout -b my-new-branch). 1. Make your proposed changes to the source 1. Run your local version (e.g. bench start in your bench installation). Make sure that your changes work the way you want them to. diff --git a/MANIFEST.in b/MANIFEST.in index 75d82839..b85174db 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -4,15 +4,15 @@ include *.json include *.md include *.py include *.txt -recursive-include school *.css -recursive-include school *.csv -recursive-include school *.html -recursive-include school *.ico -recursive-include school *.js -recursive-include school *.json -recursive-include school *.md -recursive-include school *.png -recursive-include school *.py -recursive-include school *.svg -recursive-include school *.txt -recursive-exclude school *.pyc \ No newline at end of file +recursive-include lms *.css +recursive-include lms *.csv +recursive-include lms *.html +recursive-include lms *.ico +recursive-include lms *.js +recursive-include lms *.json +recursive-include lms *.md +recursive-include lms *.png +recursive-include lms *.py +recursive-include lms *.svg +recursive-include lms *.txt +recursive-exclude lms *.pyc diff --git a/README.md b/README.md index 12718f16..37c39ac8 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ -## School +## LMS Create online courses without much hassle. -![Course Home](/school/public/images/course-home.png) +![Course Home](/lms/public/images/course-home.png) ## Features diff --git a/bench-installation.md b/bench-installation.md index 25685c35..33b85670 100644 --- a/bench-installation.md +++ b/bench-installation.md @@ -2,9 +2,9 @@ To setup the repository locally follow the steps mentioned below: 1. Install bench and setup a frappe-bench directory by following the [Installation Steps](https://frappeframework.com/docs/user/en/installation). 1. Start the server by running bench start. -1. In a separate terminal window, create a new site by running bench new-site school.test. -1. Fork the school app +1. In a separate terminal window, create a new site by running bench new-site lms.test. +1. Fork the LMS app 1. Run bench get-app . -1. Run bench --site school.test install-app school. -1. Map your site to localhost with the command ```bench --site school.test add-to-hosts``` -1. Now open the URL http://school.test:8000/ in your browser, you should see the app running. +1. Run bench --site lms.test install-app lms. +1. Map your site to localhost with the command ```bench --site lms.test add-to-hosts``` +1. Now open the URL http://lms.test:8000/ in your browser, you should see the app running. diff --git a/docker-compose.yml b/docker-compose.yml index c2525759..90e9e0d3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,9 +11,9 @@ services: bench: image: anandology/frappe-bench:2021.10 volumes: - - .:/opt/frappe-bench/apps/school + - .:/opt/frappe-bench/apps/lms environment: - - FRAPPE_APPS=school + - FRAPPE_APPS=lms - FRAPPE_ALLOW_TESTS=true - FRAPPE_SITE_NAME=frappe.localhost depends_on: diff --git a/docker-installation.md b/docker-installation.md index f26d34ce..99a272f1 100644 --- a/docker-installation.md +++ b/docker-installation.md @@ -1,9 +1,9 @@ **Step 1:** Clone the repo ``` -$ git clone https://github.com/frappe/school.git +$ git clone https://github.com/frappe/lms.git -$ cd school +$ cd lms ``` **Step 2:** Run docker-compose diff --git a/school/__init__.py b/lms/__init__.py similarity index 100% rename from school/__init__.py rename to lms/__init__.py diff --git a/school/community/__init__.py b/lms/config/__init__.py similarity index 100% rename from school/community/__init__.py rename to lms/config/__init__.py diff --git a/school/config/desktop.py b/lms/config/desktop.py similarity index 100% rename from school/config/desktop.py rename to lms/config/desktop.py diff --git a/school/config/docs.py b/lms/config/docs.py similarity index 100% rename from school/config/docs.py rename to lms/config/docs.py diff --git a/school/fixtures/custom_field.json b/lms/fixtures/custom_field.json similarity index 99% rename from school/fixtures/custom_field.json rename to lms/fixtures/custom_field.json index 0eb474a6..c48b71f9 100644 --- a/school/fixtures/custom_field.json +++ b/lms/fixtures/custom_field.json @@ -80,10 +80,10 @@ "in_standard_filter": 0, "insert_after": "country", "is_virtual": 0, - "label": "Acceptance for Terms of Use and/or Privacy Policy", + "label": "Acceptance for Terms and/or Policies", "length": 0, "mandatory_depends_on": null, - "modified": "2021-12-31 19:15:34.932910", + "modified": "2021-12-31 19:15:34.932911", "module": null, "name": "User-verify_terms", "no_copy": 0, diff --git a/school/fixtures/function.json b/lms/fixtures/function.json similarity index 100% rename from school/fixtures/function.json rename to lms/fixtures/function.json diff --git a/school/fixtures/industry.json b/lms/fixtures/industry.json similarity index 100% rename from school/fixtures/industry.json rename to lms/fixtures/industry.json diff --git a/school/hooks.py b/lms/hooks.py similarity index 65% rename from school/hooks.py rename to lms/hooks.py index 63c792cb..81783b67 100644 --- a/school/hooks.py +++ b/lms/hooks.py @@ -2,10 +2,10 @@ from __future__ import unicode_literals from . import __version__ as app_version -app_name = "school" -app_title = "School" +app_name = "lms" +app_title = "LMS" app_publisher = "Frappe" -app_description = "School" +app_description = "LMS App" app_icon = "octicon octicon-file-directory" app_color = "grey" app_email = "school@frappe.io" @@ -15,16 +15,16 @@ app_license = "AGPL" # ------------------ # include js, css files in header of desk.html -# app_include_css = "/assets/school/css/school.css" -# app_include_js = "/assets/school/js/school.js" +# app_include_css = "/assets/lms/css/lms.css" +# app_include_js = "/assets/lms/js/lms.js" # include js, css files in header of web template -web_include_css = "school.bundle.css" -# web_include_css = "/assets/school/css/school.css" +web_include_css = "lms.bundle.css" +# web_include_css = "/assets/lms/css/lms.css" web_include_js = "website.bundle.js" # include custom scss in every website theme (without file extension ".scss") -# website_theme_scss = "school/public/scss/website" +# website_theme_scss = "lms/public/scss/website" # include js, css files in header of web form # webform_include_js = {"doctype": "public/js/doctype.js"} @@ -59,14 +59,14 @@ web_include_js = "website.bundle.js" # Installation # ------------ -# before_install = "school.install.before_install" -# after_install = "school.install.after_install" +# before_install = "lms.install.before_install" +# after_install = "lms.install.after_install" # Desk Notifications # ------------------ # See frappe.core.notifications.get_notification_config -# notification_config = "school.notifications.get_notification_config" +# notification_config = "lms.notifications.get_notification_config" # Permissions # ----------- @@ -85,8 +85,8 @@ web_include_js = "website.bundle.js" # Override standard doctype classes override_doctype_class = { - "User": "school.overrides.user.CustomUser", - "Web Template": "school.overrides.web_template.CustomWebTemplate" + "User": "lms.overrides.user.CustomUser", + "Web Template": "lms.overrides.web_template.CustomWebTemplate" } # Document Events @@ -110,20 +110,20 @@ fixtures = ["Custom Field", "Function", "Industry"] # Testing # ------- -# before_tests = "school.install.before_tests" +# before_tests = "lms.install.before_tests" # Overriding Methods # ------------------------------ # # override_whitelisted_methods = { -# "frappe.desk.doctype.event.event.get_events": "school.event.get_events" +# "frappe.desk.doctype.event.event.get_events": "lms.event.get_events" # } # # each overriding function accepts a `data` argument; # generated from the base implementation of the doctype dashboard, # along with any modifications made in other Frappe apps # override_doctype_dashboards = { -# "Task": "school.task.get_dashboard_data" +# "Task": "lms.task.get_dashboard_data" # } # exempt linked doctypes from being automatically cancelled @@ -156,50 +156,54 @@ website_redirects = [ ] update_website_context = [ - 'school.widgets.update_website_context', + 'lms.widgets.update_website_context', ] jinja = { "methods": [ - "school.page_renderers.get_profile_url", - "school.overrides.user.get_authored_courses", - "school.overrides.user.get_palette", - "school.lms.utils.get_membership", - "school.lms.utils.get_lessons", - "school.lms.utils.get_tags", - "school.lms.utils.get_instructors", - "school.lms.utils.get_students", - "school.lms.utils.get_average_rating", - "school.lms.utils.is_certified", - "school.lms.utils.get_lesson_index", - "school.lms.utils.get_lesson_url", - "school.lms.utils.get_chapters", - "school.lms.utils.get_slugified_chapter_title", - "school.lms.utils.get_progress", - "school.lms.utils.render_html", - "school.lms.utils.is_mentor", - "school.lms.utils.is_cohort_staff", - "school.lms.utils.get_mentors", - "school.lms.utils.get_reviews", - "school.lms.utils.is_eligible_to_review", - "school.lms.utils.get_initial_members", - "school.lms.utils.get_sorted_reviews", - "school.lms.utils.is_instructor", - "school.lms.utils.convert_number_to_character" + "lms.page_renderers.get_profile_url", + "lms.overrides.user.get_enrolled_courses", + "lms.overrides.user.get_course_membership", + "lms.overrides.user.get_authored_courses", + "lms.overrides.user.get_palette", + "lms.lms.utils.get_membership", + "lms.lms.utils.get_lessons", + "lms.lms.utils.get_tags", + "lms.lms.utils.get_instructors", + "lms.lms.utils.get_students", + "lms.lms.utils.get_average_rating", + "lms.lms.utils.is_certified", + "lms.lms.utils.get_lesson_index", + "lms.lms.utils.get_lesson_url", + "lms.lms.utils.get_chapters", + "lms.lms.utils.get_slugified_chapter_title", + "lms.lms.utils.get_progress", + "lms.lms.utils.render_html", + "lms.lms.utils.is_mentor", + "lms.lms.utils.is_cohort_staff", + "lms.lms.utils.get_mentors", + "lms.lms.utils.get_reviews", + "lms.lms.utils.is_eligible_to_review", + "lms.lms.utils.get_initial_members", + "lms.lms.utils.get_sorted_reviews", + "lms.lms.utils.is_instructor", + "lms.lms.utils.convert_number_to_character", + "lms.lms.utils.get_signup_optin_checks", + "lms.lms.utils.get_popular_courses" ], "filters": [] } ## Specify the additional tabs to be included in the user profile page. -## Each entry must be a subclass of school.school.plugins.ProfileTab +## Each entry must be a subclass of lms.lms.plugins.ProfileTab # profile_tabs = [] ## Specify the extension to be used to control what scripts and stylesheets ## to be included in lesson pages. The specified value must be be a -## subclass of school.plugins.PageExtension -# school_lesson_page_extension = None +## subclass of lms.plugins.PageExtension +# lms_lesson_page_extension = None -#school_lesson_page_extensions = [ -# "school.plugins.LiveCodeExtension" +#lms_lesson_page_extensions = [ +# "lms.plugins.LiveCodeExtension" #] profile_mandatory_fields = [ @@ -223,23 +227,23 @@ profile_mandatory_fields = [ ] ## Markdown Macros for Lessons -school_markdown_macro_renderers = { - "Exercise": "school.plugins.exercise_renderer", - "Quiz": "school.plugins.quiz_renderer", - "YouTubeVideo": "school.plugins.youtube_video_renderer", - "Video": "school.plugins.video_renderer", - "Assignment": "school.plugins.assignment_renderer" +lms_markdown_macro_renderers = { + "Exercise": "lms.plugins.exercise_renderer", + "Quiz": "lms.plugins.quiz_renderer", + "YouTubeVideo": "lms.plugins.youtube_video_renderer", + "Video": "lms.plugins.video_renderer", + "Assignment": "lms.plugins.assignment_renderer" } # page_renderer to manage profile pages page_renderer = [ - "school.page_renderers.ProfileRedirectPage", - "school.page_renderers.ProfilePage" + "lms.page_renderers.ProfileRedirectPage", + "lms.page_renderers.ProfilePage" ] # set this to "/" to have profiles on the top-level profile_url_prefix = "/users/" -signup_form_template = "school.plugins.show_custom_signup" +signup_form_template = "lms.plugins.show_custom_signup" -on_login = "school.overrides.user.set_country_from_ip" +on_login = "lms.overrides.user.set_country_from_ip" diff --git a/school/community/doctype/__init__.py b/lms/job/__init__.py similarity index 100% rename from school/community/doctype/__init__.py rename to lms/job/__init__.py diff --git a/school/community/doctype/community_event/__init__.py b/lms/job/doctype/__init__.py similarity index 100% rename from school/community/doctype/community_event/__init__.py rename to lms/job/doctype/__init__.py diff --git a/school/community/doctype/community_event_volunteer/__init__.py b/lms/job/doctype/job_opportunity/__init__.py similarity index 100% rename from school/community/doctype/community_event_volunteer/__init__.py rename to lms/job/doctype/job_opportunity/__init__.py diff --git a/school/job/doctype/job_opportunity/job_opportunity.js b/lms/job/doctype/job_opportunity/job_opportunity.js similarity index 100% rename from school/job/doctype/job_opportunity/job_opportunity.js rename to lms/job/doctype/job_opportunity/job_opportunity.js diff --git a/school/job/doctype/job_opportunity/job_opportunity.json b/lms/job/doctype/job_opportunity/job_opportunity.json similarity index 100% rename from school/job/doctype/job_opportunity/job_opportunity.json rename to lms/job/doctype/job_opportunity/job_opportunity.json diff --git a/school/job/doctype/job_opportunity/job_opportunity.py b/lms/job/doctype/job_opportunity/job_opportunity.py similarity index 100% rename from school/job/doctype/job_opportunity/job_opportunity.py rename to lms/job/doctype/job_opportunity/job_opportunity.py diff --git a/school/job/doctype/job_opportunity/test_job_opportunity.py b/lms/job/doctype/job_opportunity/test_job_opportunity.py similarity index 100% rename from school/job/doctype/job_opportunity/test_job_opportunity.py rename to lms/job/doctype/job_opportunity/test_job_opportunity.py diff --git a/school/community/doctype/community_participant/__init__.py b/lms/job/doctype/job_settings/__init__.py similarity index 100% rename from school/community/doctype/community_participant/__init__.py rename to lms/job/doctype/job_settings/__init__.py diff --git a/school/job/doctype/job_settings/job_settings.js b/lms/job/doctype/job_settings/job_settings.js similarity index 100% rename from school/job/doctype/job_settings/job_settings.js rename to lms/job/doctype/job_settings/job_settings.js diff --git a/school/job/doctype/job_settings/job_settings.json b/lms/job/doctype/job_settings/job_settings.json similarity index 100% rename from school/job/doctype/job_settings/job_settings.json rename to lms/job/doctype/job_settings/job_settings.json diff --git a/school/job/doctype/job_settings/job_settings.py b/lms/job/doctype/job_settings/job_settings.py similarity index 100% rename from school/job/doctype/job_settings/job_settings.py rename to lms/job/doctype/job_settings/job_settings.py diff --git a/school/job/doctype/job_settings/test_job_settings.py b/lms/job/doctype/job_settings/test_job_settings.py similarity index 100% rename from school/job/doctype/job_settings/test_job_settings.py rename to lms/job/doctype/job_settings/test_job_settings.py diff --git a/school/community/doctype/community_speaker/__init__.py b/lms/job/notification/__init__.py similarity index 100% rename from school/community/doctype/community_speaker/__init__.py rename to lms/job/notification/__init__.py diff --git a/school/community/doctype/community_sponsor/__init__.py b/lms/job/notification/new_job_alert/__init__.py similarity index 100% rename from school/community/doctype/community_sponsor/__init__.py rename to lms/job/notification/new_job_alert/__init__.py diff --git a/school/job/notification/new_job_alert/new_job_alert.json b/lms/job/notification/new_job_alert/new_job_alert.json similarity index 100% rename from school/job/notification/new_job_alert/new_job_alert.json rename to lms/job/notification/new_job_alert/new_job_alert.json diff --git a/school/job/notification/new_job_alert/new_job_alert.md b/lms/job/notification/new_job_alert/new_job_alert.md similarity index 100% rename from school/job/notification/new_job_alert/new_job_alert.md rename to lms/job/notification/new_job_alert/new_job_alert.md diff --git a/school/job/notification/new_job_alert/new_job_alert.py b/lms/job/notification/new_job_alert/new_job_alert.py similarity index 100% rename from school/job/notification/new_job_alert/new_job_alert.py rename to lms/job/notification/new_job_alert/new_job_alert.py diff --git a/school/community/doctype/community_talk/__init__.py b/lms/job/web_form/__init__.py similarity index 100% rename from school/community/doctype/community_talk/__init__.py rename to lms/job/web_form/__init__.py diff --git a/school/community/doctype/tshirt_sizes/__init__.py b/lms/job/web_form/job_opportunity/__init__.py similarity index 100% rename from school/community/doctype/tshirt_sizes/__init__.py rename to lms/job/web_form/job_opportunity/__init__.py diff --git a/school/job/web_form/job_opportunity/job_opportunity.js b/lms/job/web_form/job_opportunity/job_opportunity.js similarity index 100% rename from school/job/web_form/job_opportunity/job_opportunity.js rename to lms/job/web_form/job_opportunity/job_opportunity.js diff --git a/school/job/web_form/job_opportunity/job_opportunity.json b/lms/job/web_form/job_opportunity/job_opportunity.json similarity index 100% rename from school/job/web_form/job_opportunity/job_opportunity.json rename to lms/job/web_form/job_opportunity/job_opportunity.json diff --git a/school/job/web_form/job_opportunity/job_opportunity.py b/lms/job/web_form/job_opportunity/job_opportunity.py similarity index 100% rename from school/job/web_form/job_opportunity/job_opportunity.py rename to lms/job/web_form/job_opportunity/job_opportunity.py diff --git a/school/community/web_form/__init__.py b/lms/lms/__init__.py similarity index 100% rename from school/community/web_form/__init__.py rename to lms/lms/__init__.py diff --git a/school/lms/api.py b/lms/lms/api.py similarity index 100% rename from school/lms/api.py rename to lms/lms/api.py diff --git a/school/lms/dashboard_chart/course_enrollments/course_enrollments.json b/lms/lms/dashboard_chart/course_enrollments/course_enrollments.json similarity index 100% rename from school/lms/dashboard_chart/course_enrollments/course_enrollments.json rename to lms/lms/dashboard_chart/course_enrollments/course_enrollments.json diff --git a/school/community/web_form/join_request/__init__.py b/lms/lms/doctype/__init__.py similarity index 100% rename from school/community/web_form/join_request/__init__.py rename to lms/lms/doctype/__init__.py diff --git a/school/community/web_form/project_update/__init__.py b/lms/lms/doctype/certification/__init__.py similarity index 100% rename from school/community/web_form/project_update/__init__.py rename to lms/lms/doctype/certification/__init__.py diff --git a/school/lms/doctype/certification/certification.js b/lms/lms/doctype/certification/certification.js similarity index 100% rename from school/lms/doctype/certification/certification.js rename to lms/lms/doctype/certification/certification.js diff --git a/school/lms/doctype/certification/certification.json b/lms/lms/doctype/certification/certification.json similarity index 100% rename from school/lms/doctype/certification/certification.json rename to lms/lms/doctype/certification/certification.json diff --git a/school/lms/doctype/certification/certification.py b/lms/lms/doctype/certification/certification.py similarity index 100% rename from school/lms/doctype/certification/certification.py rename to lms/lms/doctype/certification/certification.py diff --git a/school/lms/doctype/certification/test_certification.py b/lms/lms/doctype/certification/test_certification.py similarity index 100% rename from school/lms/doctype/certification/test_certification.py rename to lms/lms/doctype/certification/test_certification.py diff --git a/school/community/web_template/__init__.py b/lms/lms/doctype/chapter_reference/__init__.py similarity index 100% rename from school/community/web_template/__init__.py rename to lms/lms/doctype/chapter_reference/__init__.py diff --git a/school/lms/doctype/chapter_reference/chapter_reference.json b/lms/lms/doctype/chapter_reference/chapter_reference.json similarity index 84% rename from school/lms/doctype/chapter_reference/chapter_reference.json rename to lms/lms/doctype/chapter_reference/chapter_reference.json index a251b1a4..0c67d748 100644 --- a/school/lms/doctype/chapter_reference/chapter_reference.json +++ b/lms/lms/doctype/chapter_reference/chapter_reference.json @@ -1,5 +1,6 @@ { "actions": [], + "autoname": "hash", "creation": "2021-07-27 16:25:02.903245", "doctype": "DocType", "editable_grid": 1, @@ -20,13 +21,15 @@ "index_web_pages_for_search": 1, "istable": 1, "links": [], - "modified": "2021-09-30 10:35:30.014950", + "modified": "2022-03-15 09:39:41.937565", "modified_by": "Administrator", "module": "LMS", "name": "Chapter Reference", + "naming_rule": "Random", "owner": "Administrator", "permissions": [], "sort_field": "modified", "sort_order": "DESC", + "states": [], "track_changes": 1 } \ No newline at end of file diff --git a/school/lms/doctype/chapter_reference/chapter_reference.py b/lms/lms/doctype/chapter_reference/chapter_reference.py similarity index 100% rename from school/lms/doctype/chapter_reference/chapter_reference.py rename to lms/lms/doctype/chapter_reference/chapter_reference.py diff --git a/school/community/web_template/multiple_testimonials/__init__.py b/lms/lms/doctype/cohort/__init__.py similarity index 100% rename from school/community/web_template/multiple_testimonials/__init__.py rename to lms/lms/doctype/cohort/__init__.py diff --git a/school/lms/doctype/cohort/cohort.js b/lms/lms/doctype/cohort/cohort.js similarity index 100% rename from school/lms/doctype/cohort/cohort.js rename to lms/lms/doctype/cohort/cohort.js diff --git a/school/lms/doctype/cohort/cohort.json b/lms/lms/doctype/cohort/cohort.json similarity index 100% rename from school/lms/doctype/cohort/cohort.json rename to lms/lms/doctype/cohort/cohort.json diff --git a/school/lms/doctype/cohort/cohort.py b/lms/lms/doctype/cohort/cohort.py similarity index 100% rename from school/lms/doctype/cohort/cohort.py rename to lms/lms/doctype/cohort/cohort.py diff --git a/school/lms/doctype/cohort/test_cohort.py b/lms/lms/doctype/cohort/test_cohort.py similarity index 100% rename from school/lms/doctype/cohort/test_cohort.py rename to lms/lms/doctype/cohort/test_cohort.py diff --git a/school/conference/__init__.py b/lms/lms/doctype/cohort_join_request/__init__.py similarity index 100% rename from school/conference/__init__.py rename to lms/lms/doctype/cohort_join_request/__init__.py diff --git a/school/lms/doctype/cohort_join_request/cohort_join_request.js b/lms/lms/doctype/cohort_join_request/cohort_join_request.js similarity index 100% rename from school/lms/doctype/cohort_join_request/cohort_join_request.js rename to lms/lms/doctype/cohort_join_request/cohort_join_request.js diff --git a/school/lms/doctype/cohort_join_request/cohort_join_request.json b/lms/lms/doctype/cohort_join_request/cohort_join_request.json similarity index 100% rename from school/lms/doctype/cohort_join_request/cohort_join_request.json rename to lms/lms/doctype/cohort_join_request/cohort_join_request.json diff --git a/school/lms/doctype/cohort_join_request/cohort_join_request.py b/lms/lms/doctype/cohort_join_request/cohort_join_request.py similarity index 100% rename from school/lms/doctype/cohort_join_request/cohort_join_request.py rename to lms/lms/doctype/cohort_join_request/cohort_join_request.py diff --git a/school/lms/doctype/cohort_join_request/test_cohort_join_request.py b/lms/lms/doctype/cohort_join_request/test_cohort_join_request.py similarity index 100% rename from school/lms/doctype/cohort_join_request/test_cohort_join_request.py rename to lms/lms/doctype/cohort_join_request/test_cohort_join_request.py diff --git a/school/conference/doctype/__init__.py b/lms/lms/doctype/cohort_mentor/__init__.py similarity index 100% rename from school/conference/doctype/__init__.py rename to lms/lms/doctype/cohort_mentor/__init__.py diff --git a/school/lms/doctype/cohort_mentor/cohort_mentor.js b/lms/lms/doctype/cohort_mentor/cohort_mentor.js similarity index 100% rename from school/lms/doctype/cohort_mentor/cohort_mentor.js rename to lms/lms/doctype/cohort_mentor/cohort_mentor.js diff --git a/school/lms/doctype/cohort_mentor/cohort_mentor.json b/lms/lms/doctype/cohort_mentor/cohort_mentor.json similarity index 100% rename from school/lms/doctype/cohort_mentor/cohort_mentor.json rename to lms/lms/doctype/cohort_mentor/cohort_mentor.json diff --git a/school/lms/doctype/cohort_mentor/cohort_mentor.py b/lms/lms/doctype/cohort_mentor/cohort_mentor.py similarity index 100% rename from school/lms/doctype/cohort_mentor/cohort_mentor.py rename to lms/lms/doctype/cohort_mentor/cohort_mentor.py diff --git a/school/lms/doctype/cohort_mentor/test_cohort_mentor.py b/lms/lms/doctype/cohort_mentor/test_cohort_mentor.py similarity index 100% rename from school/lms/doctype/cohort_mentor/test_cohort_mentor.py rename to lms/lms/doctype/cohort_mentor/test_cohort_mentor.py diff --git a/school/conference/doctype/community_conference/__init__.py b/lms/lms/doctype/cohort_staff/__init__.py similarity index 100% rename from school/conference/doctype/community_conference/__init__.py rename to lms/lms/doctype/cohort_staff/__init__.py diff --git a/school/lms/doctype/cohort_staff/cohort_staff.js b/lms/lms/doctype/cohort_staff/cohort_staff.js similarity index 100% rename from school/lms/doctype/cohort_staff/cohort_staff.js rename to lms/lms/doctype/cohort_staff/cohort_staff.js diff --git a/school/lms/doctype/cohort_staff/cohort_staff.json b/lms/lms/doctype/cohort_staff/cohort_staff.json similarity index 100% rename from school/lms/doctype/cohort_staff/cohort_staff.json rename to lms/lms/doctype/cohort_staff/cohort_staff.json diff --git a/school/lms/doctype/cohort_staff/cohort_staff.py b/lms/lms/doctype/cohort_staff/cohort_staff.py similarity index 100% rename from school/lms/doctype/cohort_staff/cohort_staff.py rename to lms/lms/doctype/cohort_staff/cohort_staff.py diff --git a/school/lms/doctype/cohort_staff/test_cohort_staff.py b/lms/lms/doctype/cohort_staff/test_cohort_staff.py similarity index 100% rename from school/lms/doctype/cohort_staff/test_cohort_staff.py rename to lms/lms/doctype/cohort_staff/test_cohort_staff.py diff --git a/school/conference/doctype/community_conference_participant/__init__.py b/lms/lms/doctype/cohort_subgroup/__init__.py similarity index 100% rename from school/conference/doctype/community_conference_participant/__init__.py rename to lms/lms/doctype/cohort_subgroup/__init__.py diff --git a/school/lms/doctype/cohort_subgroup/cohort_subgroup.js b/lms/lms/doctype/cohort_subgroup/cohort_subgroup.js similarity index 100% rename from school/lms/doctype/cohort_subgroup/cohort_subgroup.js rename to lms/lms/doctype/cohort_subgroup/cohort_subgroup.js diff --git a/school/lms/doctype/cohort_subgroup/cohort_subgroup.json b/lms/lms/doctype/cohort_subgroup/cohort_subgroup.json similarity index 100% rename from school/lms/doctype/cohort_subgroup/cohort_subgroup.json rename to lms/lms/doctype/cohort_subgroup/cohort_subgroup.json diff --git a/school/lms/doctype/cohort_subgroup/cohort_subgroup.py b/lms/lms/doctype/cohort_subgroup/cohort_subgroup.py similarity index 100% rename from school/lms/doctype/cohort_subgroup/cohort_subgroup.py rename to lms/lms/doctype/cohort_subgroup/cohort_subgroup.py diff --git a/school/lms/doctype/cohort_subgroup/test_cohort_subgroup.py b/lms/lms/doctype/cohort_subgroup/test_cohort_subgroup.py similarity index 100% rename from school/lms/doctype/cohort_subgroup/test_cohort_subgroup.py rename to lms/lms/doctype/cohort_subgroup/test_cohort_subgroup.py diff --git a/school/conference/doctype/community_conference_request/__init__.py b/lms/lms/doctype/cohort_web_page/__init__.py similarity index 100% rename from school/conference/doctype/community_conference_request/__init__.py rename to lms/lms/doctype/cohort_web_page/__init__.py diff --git a/school/lms/doctype/cohort_web_page/cohort_web_page.json b/lms/lms/doctype/cohort_web_page/cohort_web_page.json similarity index 100% rename from school/lms/doctype/cohort_web_page/cohort_web_page.json rename to lms/lms/doctype/cohort_web_page/cohort_web_page.json diff --git a/school/lms/doctype/cohort_web_page/cohort_web_page.py b/lms/lms/doctype/cohort_web_page/cohort_web_page.py similarity index 100% rename from school/lms/doctype/cohort_web_page/cohort_web_page.py rename to lms/lms/doctype/cohort_web_page/cohort_web_page.py diff --git a/school/config/__init__.py b/lms/lms/doctype/course_chapter/__init__.py similarity index 100% rename from school/config/__init__.py rename to lms/lms/doctype/course_chapter/__init__.py diff --git a/school/lms/doctype/course_chapter/course_chapter.js b/lms/lms/doctype/course_chapter/course_chapter.js similarity index 100% rename from school/lms/doctype/course_chapter/course_chapter.js rename to lms/lms/doctype/course_chapter/course_chapter.js diff --git a/school/lms/doctype/course_chapter/course_chapter.json b/lms/lms/doctype/course_chapter/course_chapter.json similarity index 85% rename from school/lms/doctype/course_chapter/course_chapter.json rename to lms/lms/doctype/course_chapter/course_chapter.json index 7dca741a..ee8544bf 100644 --- a/school/lms/doctype/course_chapter/course_chapter.json +++ b/lms/lms/doctype/course_chapter/course_chapter.json @@ -59,7 +59,7 @@ "link_fieldname": "chapter" } ], - "modified": "2021-09-29 15:33:44.611229", + "modified": "2022-03-14 17:57:00.707416", "modified_by": "Administrator", "module": "LMS", "name": "Course Chapter", @@ -77,11 +77,26 @@ "role": "System Manager", "share": 1, "write": 1 + }, + { + "create": 1, + "email": 1, + "export": 1, + "if_owner": 1, + "print": 1, + "read": 1, + "report": 1, + "role": "All", + "select": 1, + "share": 1, + "write": 1 } ], "search_fields": "title", + "show_title_field_in_link": 1, "sort_field": "modified", "sort_order": "DESC", + "states": [], "title_field": "title", "track_changes": 1 -} +} \ No newline at end of file diff --git a/school/lms/doctype/course_chapter/course_chapter.py b/lms/lms/doctype/course_chapter/course_chapter.py similarity index 100% rename from school/lms/doctype/course_chapter/course_chapter.py rename to lms/lms/doctype/course_chapter/course_chapter.py diff --git a/school/lms/doctype/course_chapter/test_course_chapter.py b/lms/lms/doctype/course_chapter/test_course_chapter.py similarity index 100% rename from school/lms/doctype/course_chapter/test_course_chapter.py rename to lms/lms/doctype/course_chapter/test_course_chapter.py diff --git a/school/event_management/__init__.py b/lms/lms/doctype/course_instructor/__init__.py similarity index 100% rename from school/event_management/__init__.py rename to lms/lms/doctype/course_instructor/__init__.py diff --git a/school/lms/doctype/course_instructor/course_instructor.json b/lms/lms/doctype/course_instructor/course_instructor.json similarity index 100% rename from school/lms/doctype/course_instructor/course_instructor.json rename to lms/lms/doctype/course_instructor/course_instructor.json diff --git a/school/lms/doctype/course_instructor/course_instructor.py b/lms/lms/doctype/course_instructor/course_instructor.py similarity index 100% rename from school/lms/doctype/course_instructor/course_instructor.py rename to lms/lms/doctype/course_instructor/course_instructor.py diff --git a/school/event_management/doctype/__init__.py b/lms/lms/doctype/course_lesson/__init__.py similarity index 100% rename from school/event_management/doctype/__init__.py rename to lms/lms/doctype/course_lesson/__init__.py diff --git a/school/lms/doctype/course_lesson/course_lesson.js b/lms/lms/doctype/course_lesson/course_lesson.js similarity index 100% rename from school/lms/doctype/course_lesson/course_lesson.js rename to lms/lms/doctype/course_lesson/course_lesson.js diff --git a/school/lms/doctype/course_lesson/course_lesson.json b/lms/lms/doctype/course_lesson/course_lesson.json similarity index 78% rename from school/lms/doctype/course_lesson/course_lesson.json rename to lms/lms/doctype/course_lesson/course_lesson.json index d63eb69b..c38059ac 100644 --- a/school/lms/doctype/course_lesson/course_lesson.json +++ b/lms/lms/doctype/course_lesson/course_lesson.json @@ -1,6 +1,6 @@ { "actions": [], - "allow_import": 1, + "allow_events_in_timeline": 1, "allow_rename": 1, "autoname": "format:{####} {title}", "creation": "2021-05-03 06:21:12.995984", @@ -9,6 +9,7 @@ "engine": "InnoDB", "field_order": [ "chapter", + "course", "include_in_preview", "column_break_4", "title", @@ -69,11 +70,20 @@ { "fieldname": "help", "fieldtype": "HTML" + }, + { + "fetch_from": "chapter.course", + "fieldname": "course", + "fieldtype": "Link", + "hidden": 1, + "label": "Course", + "options": "LMS Course", + "read_only": 1 } ], "index_web_pages_for_search": 1, "links": [], - "modified": "2021-10-11 15:07:38.134808", + "modified": "2022-03-14 18:56:31.969801", "modified_by": "Administrator", "module": "LMS", "name": "Course Lesson", @@ -89,11 +99,26 @@ "read": 1, "report": 1, "role": "System Manager", + "select": 1, + "share": 1, + "write": 1 + }, + { + "create": 1, + "email": 1, + "export": 1, + "if_owner": 1, + "print": 1, + "read": 1, + "report": 1, + "role": "All", + "select": 1, "share": 1, "write": 1 } ], "sort_field": "modified", "sort_order": "DESC", + "states": [], "track_changes": 1 -} +} \ No newline at end of file diff --git a/school/lms/doctype/course_lesson/course_lesson.py b/lms/lms/doctype/course_lesson/course_lesson.py similarity index 95% rename from school/lms/doctype/course_lesson/course_lesson.py rename to lms/lms/doctype/course_lesson/course_lesson.py index 38adb6a3..04504d5e 100644 --- a/school/lms/doctype/course_lesson/course_lesson.py +++ b/lms/lms/doctype/course_lesson/course_lesson.py @@ -6,7 +6,7 @@ from __future__ import unicode_literals import frappe from frappe.model.document import Document from ...md import find_macros -from school.lms.utils import get_course_progress +from lms.lms.utils import get_course_progress, get_lesson_url class CourseLesson(Document): def validate(self): @@ -108,3 +108,7 @@ def save_progress(lesson, course, status): progress = get_course_progress(course) frappe.db.set_value("LMS Batch Membership", membership, "progress", progress) return progress + +@frappe.whitelist() +def get_lesson_info(chapter): + return frappe.db.get_value("Course Chapter", chapter, "course") diff --git a/school/lms/doctype/course_lesson/test_course_lesson.py b/lms/lms/doctype/course_lesson/test_course_lesson.py similarity index 100% rename from school/lms/doctype/course_lesson/test_course_lesson.py rename to lms/lms/doctype/course_lesson/test_course_lesson.py diff --git a/school/event_management/doctype/attendee/__init__.py b/lms/lms/doctype/education_detail/__init__.py similarity index 100% rename from school/event_management/doctype/attendee/__init__.py rename to lms/lms/doctype/education_detail/__init__.py diff --git a/school/lms/doctype/education_detail/education_detail.json b/lms/lms/doctype/education_detail/education_detail.json similarity index 100% rename from school/lms/doctype/education_detail/education_detail.json rename to lms/lms/doctype/education_detail/education_detail.json diff --git a/school/lms/doctype/education_detail/education_detail.py b/lms/lms/doctype/education_detail/education_detail.py similarity index 100% rename from school/lms/doctype/education_detail/education_detail.py rename to lms/lms/doctype/education_detail/education_detail.py diff --git a/school/event_management/doctype/event_details/__init__.py b/lms/lms/doctype/exercise/__init__.py similarity index 100% rename from school/event_management/doctype/event_details/__init__.py rename to lms/lms/doctype/exercise/__init__.py diff --git a/school/lms/doctype/exercise/exercise.js b/lms/lms/doctype/exercise/exercise.js similarity index 100% rename from school/lms/doctype/exercise/exercise.js rename to lms/lms/doctype/exercise/exercise.js diff --git a/school/lms/doctype/exercise/exercise.json b/lms/lms/doctype/exercise/exercise.json similarity index 100% rename from school/lms/doctype/exercise/exercise.json rename to lms/lms/doctype/exercise/exercise.json diff --git a/school/lms/doctype/exercise/exercise.py b/lms/lms/doctype/exercise/exercise.py similarity index 97% rename from school/lms/doctype/exercise/exercise.py rename to lms/lms/doctype/exercise/exercise.py index eb6c7bcb..cf4b2667 100644 --- a/school/lms/doctype/exercise/exercise.py +++ b/lms/lms/doctype/exercise/exercise.py @@ -3,7 +3,7 @@ import frappe from frappe.model.document import Document -from school.lms.utils import get_membership +from lms.lms.utils import get_membership class Exercise(Document): def get_user_submission(self): diff --git a/school/lms/doctype/exercise/test_exercise.py b/lms/lms/doctype/exercise/test_exercise.py similarity index 100% rename from school/lms/doctype/exercise/test_exercise.py rename to lms/lms/doctype/exercise/test_exercise.py diff --git a/school/event_management/doctype/event_ticket/__init__.py b/lms/lms/doctype/exercise_latest_submission/__init__.py similarity index 100% rename from school/event_management/doctype/event_ticket/__init__.py rename to lms/lms/doctype/exercise_latest_submission/__init__.py diff --git a/school/lms/doctype/exercise_latest_submission/exercise_latest_submission.js b/lms/lms/doctype/exercise_latest_submission/exercise_latest_submission.js similarity index 100% rename from school/lms/doctype/exercise_latest_submission/exercise_latest_submission.js rename to lms/lms/doctype/exercise_latest_submission/exercise_latest_submission.js diff --git a/school/lms/doctype/exercise_latest_submission/exercise_latest_submission.json b/lms/lms/doctype/exercise_latest_submission/exercise_latest_submission.json similarity index 100% rename from school/lms/doctype/exercise_latest_submission/exercise_latest_submission.json rename to lms/lms/doctype/exercise_latest_submission/exercise_latest_submission.json diff --git a/school/lms/doctype/exercise_latest_submission/exercise_latest_submission.py b/lms/lms/doctype/exercise_latest_submission/exercise_latest_submission.py similarity index 100% rename from school/lms/doctype/exercise_latest_submission/exercise_latest_submission.py rename to lms/lms/doctype/exercise_latest_submission/exercise_latest_submission.py diff --git a/school/lms/doctype/exercise_latest_submission/test_exercise_latest_submission.py b/lms/lms/doctype/exercise_latest_submission/test_exercise_latest_submission.py similarity index 100% rename from school/lms/doctype/exercise_latest_submission/test_exercise_latest_submission.py rename to lms/lms/doctype/exercise_latest_submission/test_exercise_latest_submission.py diff --git a/school/event_management/doctype/exhibitor/__init__.py b/lms/lms/doctype/exercise_submission/__init__.py similarity index 100% rename from school/event_management/doctype/exhibitor/__init__.py rename to lms/lms/doctype/exercise_submission/__init__.py diff --git a/school/lms/doctype/exercise_submission/exercise_submission.js b/lms/lms/doctype/exercise_submission/exercise_submission.js similarity index 100% rename from school/lms/doctype/exercise_submission/exercise_submission.js rename to lms/lms/doctype/exercise_submission/exercise_submission.js diff --git a/school/lms/doctype/exercise_submission/exercise_submission.json b/lms/lms/doctype/exercise_submission/exercise_submission.json similarity index 100% rename from school/lms/doctype/exercise_submission/exercise_submission.json rename to lms/lms/doctype/exercise_submission/exercise_submission.json diff --git a/school/lms/doctype/exercise_submission/exercise_submission.py b/lms/lms/doctype/exercise_submission/exercise_submission.py similarity index 100% rename from school/lms/doctype/exercise_submission/exercise_submission.py rename to lms/lms/doctype/exercise_submission/exercise_submission.py diff --git a/school/lms/doctype/exercise_submission/test_exercise_submission.py b/lms/lms/doctype/exercise_submission/test_exercise_submission.py similarity index 100% rename from school/lms/doctype/exercise_submission/test_exercise_submission.py rename to lms/lms/doctype/exercise_submission/test_exercise_submission.py diff --git a/school/event_management/doctype/host/__init__.py b/lms/lms/doctype/function/__init__.py similarity index 100% rename from school/event_management/doctype/host/__init__.py rename to lms/lms/doctype/function/__init__.py diff --git a/school/lms/doctype/function/function.js b/lms/lms/doctype/function/function.js similarity index 100% rename from school/lms/doctype/function/function.js rename to lms/lms/doctype/function/function.js diff --git a/school/lms/doctype/function/function.json b/lms/lms/doctype/function/function.json similarity index 100% rename from school/lms/doctype/function/function.json rename to lms/lms/doctype/function/function.json diff --git a/school/lms/doctype/function/function.py b/lms/lms/doctype/function/function.py similarity index 100% rename from school/lms/doctype/function/function.py rename to lms/lms/doctype/function/function.py diff --git a/school/lms/doctype/function/test_function.py b/lms/lms/doctype/function/test_function.py similarity index 100% rename from school/lms/doctype/function/test_function.py rename to lms/lms/doctype/function/test_function.py diff --git a/school/event_management/doctype/speaker/__init__.py b/lms/lms/doctype/industry/__init__.py similarity index 100% rename from school/event_management/doctype/speaker/__init__.py rename to lms/lms/doctype/industry/__init__.py diff --git a/school/lms/doctype/industry/industry.js b/lms/lms/doctype/industry/industry.js similarity index 100% rename from school/lms/doctype/industry/industry.js rename to lms/lms/doctype/industry/industry.js diff --git a/school/lms/doctype/industry/industry.json b/lms/lms/doctype/industry/industry.json similarity index 100% rename from school/lms/doctype/industry/industry.json rename to lms/lms/doctype/industry/industry.json diff --git a/school/lms/doctype/industry/industry.py b/lms/lms/doctype/industry/industry.py similarity index 100% rename from school/lms/doctype/industry/industry.py rename to lms/lms/doctype/industry/industry.py diff --git a/school/lms/doctype/industry/test_industry.py b/lms/lms/doctype/industry/test_industry.py similarity index 100% rename from school/lms/doctype/industry/test_industry.py rename to lms/lms/doctype/industry/test_industry.py diff --git a/school/event_management/doctype/talk/__init__.py b/lms/lms/doctype/invite_request/__init__.py similarity index 100% rename from school/event_management/doctype/talk/__init__.py rename to lms/lms/doctype/invite_request/__init__.py diff --git a/school/lms/doctype/invite_request/invite_request.js b/lms/lms/doctype/invite_request/invite_request.js similarity index 100% rename from school/lms/doctype/invite_request/invite_request.js rename to lms/lms/doctype/invite_request/invite_request.js diff --git a/school/lms/doctype/invite_request/invite_request.json b/lms/lms/doctype/invite_request/invite_request.json similarity index 100% rename from school/lms/doctype/invite_request/invite_request.json rename to lms/lms/doctype/invite_request/invite_request.json diff --git a/school/lms/doctype/invite_request/invite_request.py b/lms/lms/doctype/invite_request/invite_request.py similarity index 100% rename from school/lms/doctype/invite_request/invite_request.py rename to lms/lms/doctype/invite_request/invite_request.py diff --git a/school/lms/doctype/invite_request/test_invite_request.py b/lms/lms/doctype/invite_request/test_invite_request.py similarity index 96% rename from school/lms/doctype/invite_request/test_invite_request.py rename to lms/lms/doctype/invite_request/test_invite_request.py index 16888eee..491bac17 100644 --- a/school/lms/doctype/invite_request/test_invite_request.py +++ b/lms/lms/doctype/invite_request/test_invite_request.py @@ -2,7 +2,7 @@ # Copyright (c) 2021, FOSS United and Contributors # See license.txt from __future__ import unicode_literals -from school.lms.doctype.invite_request.invite_request import create_invite_request, update_invite +from lms.lms.doctype.invite_request.invite_request import create_invite_request, update_invite import frappe import unittest diff --git a/school/event_management/web_form/__init__.py b/lms/lms/doctype/lesson_assignment/__init__.py similarity index 100% rename from school/event_management/web_form/__init__.py rename to lms/lms/doctype/lesson_assignment/__init__.py diff --git a/school/lms/doctype/lesson_assignment/lesson_assignment.js b/lms/lms/doctype/lesson_assignment/lesson_assignment.js similarity index 100% rename from school/lms/doctype/lesson_assignment/lesson_assignment.js rename to lms/lms/doctype/lesson_assignment/lesson_assignment.js diff --git a/school/lms/doctype/lesson_assignment/lesson_assignment.json b/lms/lms/doctype/lesson_assignment/lesson_assignment.json similarity index 100% rename from school/lms/doctype/lesson_assignment/lesson_assignment.json rename to lms/lms/doctype/lesson_assignment/lesson_assignment.json diff --git a/school/lms/doctype/lesson_assignment/lesson_assignment.py b/lms/lms/doctype/lesson_assignment/lesson_assignment.py similarity index 100% rename from school/lms/doctype/lesson_assignment/lesson_assignment.py rename to lms/lms/doctype/lesson_assignment/lesson_assignment.py diff --git a/school/lms/doctype/lesson_assignment/test_lesson_assignment.py b/lms/lms/doctype/lesson_assignment/test_lesson_assignment.py similarity index 100% rename from school/lms/doctype/lesson_assignment/test_lesson_assignment.py rename to lms/lms/doctype/lesson_assignment/test_lesson_assignment.py diff --git a/school/event_management/web_form/attendee_registration/__init__.py b/lms/lms/doctype/lesson_reference/__init__.py similarity index 100% rename from school/event_management/web_form/attendee_registration/__init__.py rename to lms/lms/doctype/lesson_reference/__init__.py diff --git a/school/lms/doctype/lesson_reference/lesson_reference.json b/lms/lms/doctype/lesson_reference/lesson_reference.json similarity index 84% rename from school/lms/doctype/lesson_reference/lesson_reference.json rename to lms/lms/doctype/lesson_reference/lesson_reference.json index a3e77ebb..86129694 100644 --- a/school/lms/doctype/lesson_reference/lesson_reference.json +++ b/lms/lms/doctype/lesson_reference/lesson_reference.json @@ -1,5 +1,6 @@ { "actions": [], + "autoname": "hash", "creation": "2021-07-27 16:25:48.269536", "doctype": "DocType", "editable_grid": 1, @@ -20,13 +21,15 @@ "index_web_pages_for_search": 1, "istable": 1, "links": [], - "modified": "2021-09-30 10:35:47.832547", + "modified": "2022-03-15 09:39:29.495991", "modified_by": "Administrator", "module": "LMS", "name": "Lesson Reference", + "naming_rule": "Random", "owner": "Administrator", "permissions": [], "sort_field": "modified", "sort_order": "DESC", + "states": [], "track_changes": 1 } \ No newline at end of file diff --git a/school/lms/doctype/lesson_reference/lesson_reference.py b/lms/lms/doctype/lesson_reference/lesson_reference.py similarity index 100% rename from school/lms/doctype/lesson_reference/lesson_reference.py rename to lms/lms/doctype/lesson_reference/lesson_reference.py diff --git a/school/event_management/web_form/exhibitor_registration/__init__.py b/lms/lms/doctype/lms_batch/__init__.py similarity index 100% rename from school/event_management/web_form/exhibitor_registration/__init__.py rename to lms/lms/doctype/lms_batch/__init__.py diff --git a/school/lms/doctype/lms_batch/lms_batch.js b/lms/lms/doctype/lms_batch/lms_batch.js similarity index 100% rename from school/lms/doctype/lms_batch/lms_batch.js rename to lms/lms/doctype/lms_batch/lms_batch.js diff --git a/school/lms/doctype/lms_batch/lms_batch.json b/lms/lms/doctype/lms_batch/lms_batch.json similarity index 100% rename from school/lms/doctype/lms_batch/lms_batch.json rename to lms/lms/doctype/lms_batch/lms_batch.json diff --git a/school/lms/doctype/lms_batch/lms_batch.py b/lms/lms/doctype/lms_batch/lms_batch.py similarity index 94% rename from school/lms/doctype/lms_batch/lms_batch.py rename to lms/lms/doctype/lms_batch/lms_batch.py index 9643ddf4..183079f0 100644 --- a/school/lms/doctype/lms_batch/lms_batch.py +++ b/lms/lms/doctype/lms_batch/lms_batch.py @@ -6,9 +6,9 @@ from __future__ import unicode_literals import frappe from frappe.model.document import Document from frappe import _ -from school.lms.doctype.lms_batch_membership.lms_batch_membership import create_membership -from school.query import find, find_all -from school.lms.utils import is_mentor +from lms.lms.doctype.lms_batch_membership.lms_batch_membership import create_membership +from lms.query import find, find_all +from lms.lms.utils import is_mentor class LMSBatch(Document): def validate(self): diff --git a/school/lms/doctype/lms_batch/test_lms_batch.py b/lms/lms/doctype/lms_batch/test_lms_batch.py similarity index 100% rename from school/lms/doctype/lms_batch/test_lms_batch.py rename to lms/lms/doctype/lms_batch/test_lms_batch.py diff --git a/school/event_management/web_form/purpose_a_talk/__init__.py b/lms/lms/doctype/lms_batch_membership/__init__.py similarity index 100% rename from school/event_management/web_form/purpose_a_talk/__init__.py rename to lms/lms/doctype/lms_batch_membership/__init__.py diff --git a/school/lms/doctype/lms_batch_membership/lms_batch_membership.js b/lms/lms/doctype/lms_batch_membership/lms_batch_membership.js similarity index 100% rename from school/lms/doctype/lms_batch_membership/lms_batch_membership.js rename to lms/lms/doctype/lms_batch_membership/lms_batch_membership.js diff --git a/school/lms/doctype/lms_batch_membership/lms_batch_membership.json b/lms/lms/doctype/lms_batch_membership/lms_batch_membership.json similarity index 94% rename from school/lms/doctype/lms_batch_membership/lms_batch_membership.json rename to lms/lms/doctype/lms_batch_membership/lms_batch_membership.json index 35f74e35..07061b24 100644 --- a/school/lms/doctype/lms_batch_membership/lms_batch_membership.json +++ b/lms/lms/doctype/lms_batch_membership/lms_batch_membership.json @@ -1,6 +1,6 @@ { "actions": [], - "creation": "2021-03-18 19:52:10.673835", + "creation": "2022-02-07 12:01:40.929633", "doctype": "DocType", "editable_grid": 1, "engine": "InnoDB", @@ -24,8 +24,6 @@ { "fieldname": "batch", "fieldtype": "Link", - "in_list_view": 1, - "in_standard_filter": 1, "label": "Batch", "options": "LMS Batch" }, @@ -117,7 +115,7 @@ ], "index_web_pages_for_search": 1, "links": [], - "modified": "2021-12-16 14:49:25.964853", + "modified": "2022-03-09 15:17:15.386067", "modified_by": "Administrator", "module": "LMS", "name": "LMS Batch Membership", @@ -138,5 +136,6 @@ ], "quick_entry": 1, "sort_field": "modified", - "sort_order": "DESC" + "sort_order": "DESC", + "states": [] } \ No newline at end of file diff --git a/school/lms/doctype/lms_batch_membership/lms_batch_membership.py b/lms/lms/doctype/lms_batch_membership/lms_batch_membership.py similarity index 100% rename from school/lms/doctype/lms_batch_membership/lms_batch_membership.py rename to lms/lms/doctype/lms_batch_membership/lms_batch_membership.py diff --git a/school/lms/doctype/lms_batch_membership/test_lms_batch_membership.py b/lms/lms/doctype/lms_batch_membership/test_lms_batch_membership.py similarity index 100% rename from school/lms/doctype/lms_batch_membership/test_lms_batch_membership.py rename to lms/lms/doctype/lms_batch_membership/test_lms_batch_membership.py diff --git a/school/event_management/web_form/speaker_registration/__init__.py b/lms/lms/doctype/lms_certification/__init__.py similarity index 100% rename from school/event_management/web_form/speaker_registration/__init__.py rename to lms/lms/doctype/lms_certification/__init__.py diff --git a/school/lms/doctype/lms_certification/lms_certification.js b/lms/lms/doctype/lms_certification/lms_certification.js similarity index 100% rename from school/lms/doctype/lms_certification/lms_certification.js rename to lms/lms/doctype/lms_certification/lms_certification.js diff --git a/school/lms/doctype/lms_certification/lms_certification.json b/lms/lms/doctype/lms_certification/lms_certification.json similarity index 100% rename from school/lms/doctype/lms_certification/lms_certification.json rename to lms/lms/doctype/lms_certification/lms_certification.json diff --git a/school/lms/doctype/lms_certification/lms_certification.py b/lms/lms/doctype/lms_certification/lms_certification.py similarity index 97% rename from school/lms/doctype/lms_certification/lms_certification.py rename to lms/lms/doctype/lms_certification/lms_certification.py index d633d13d..1c5d9f51 100644 --- a/school/lms/doctype/lms_certification/lms_certification.py +++ b/lms/lms/doctype/lms_certification/lms_certification.py @@ -6,7 +6,7 @@ from frappe.model.document import Document from frappe.utils import nowdate, add_years from frappe import _ from frappe.utils.pdf import get_pdf -from school.lms.utils import is_certified +from lms.lms.utils import is_certified class LMSCertification(Document): diff --git a/school/lms/doctype/lms_certification/test_lms_certification.py b/lms/lms/doctype/lms_certification/test_lms_certification.py similarity index 82% rename from school/lms/doctype/lms_certification/test_lms_certification.py rename to lms/lms/doctype/lms_certification/test_lms_certification.py index 1585c79f..7a757f01 100644 --- a/school/lms/doctype/lms_certification/test_lms_certification.py +++ b/lms/lms/doctype/lms_certification/test_lms_certification.py @@ -3,8 +3,8 @@ import frappe import unittest -from school.lms.doctype.lms_course.test_lms_course import new_course -from school.lms.doctype.lms_certification.lms_certification import create_certificate +from lms.lms.doctype.lms_course.test_lms_course import new_course +from lms.lms.doctype.lms_certification.lms_certification import create_certificate from frappe.utils import nowdate, add_years, cint class TestLMSCertification(unittest.TestCase): diff --git a/school/event_management/web_template/__init__.py b/lms/lms/doctype/lms_course/__init__.py similarity index 100% rename from school/event_management/web_template/__init__.py rename to lms/lms/doctype/lms_course/__init__.py diff --git a/school/lms/doctype/lms_course/lms_course.js b/lms/lms/doctype/lms_course/lms_course.js similarity index 100% rename from school/lms/doctype/lms_course/lms_course.js rename to lms/lms/doctype/lms_course/lms_course.js diff --git a/school/lms/doctype/lms_course/lms_course.json b/lms/lms/doctype/lms_course/lms_course.json similarity index 81% rename from school/lms/doctype/lms_course/lms_course.json rename to lms/lms/doctype/lms_course/lms_course.json index 84abccb2..b3429c05 100644 --- a/school/lms/doctype/lms_course/lms_course.json +++ b/lms/lms/doctype/lms_course/lms_course.json @@ -1,16 +1,15 @@ { "actions": [ { - "action": "school.lms.doctype.lms_course.lms_course.reindex_exercises", + "action": "lms.lms.doctype.lms_course.lms_course.reindex_exercises", "action_type": "Server Action", "group": "Reindex", "label": "Reindex Exercises" } ], - "allow_guest_to_view": 1, "allow_import": 1, "allow_rename": 1, - "creation": "2022-02-08 16:34:42.721203", + "creation": "2022-02-22 15:28:26.091549", "doctype": "DocType", "editable_grid": 1, "engine": "InnoDB", @@ -21,13 +20,14 @@ "column_break_3", "instructors", "tags", + "status", "section_break_7", "is_published", - "column_break_9", + "column_break_10", "upcoming", - "column_break_11", + "column_break_12", "disable_self_learning", - "section_break_5", + "section_break_18", "short_introduction", "description", "chapters", @@ -43,7 +43,8 @@ "in_list_view": 1, "label": "Title", "reqd": 1, - "unique": 1 + "unique": 1, + "width": "200" }, { "fieldname": "description", @@ -66,10 +67,6 @@ "fieldtype": "Data", "label": "Video Embed Link" }, - { - "fieldname": "section_break_5", - "fieldtype": "Section Break" - }, { "fieldname": "short_introduction", "fieldtype": "Small Text", @@ -109,6 +106,7 @@ "fieldtype": "Table MultiSelect", "in_standard_filter": 1, "label": "Instructors", + "max_height": "50px", "options": "Course Instructor" }, { @@ -116,14 +114,6 @@ "fieldtype": "Section Break", "label": "Course Settings" }, - { - "fieldname": "column_break_9", - "fieldtype": "Column Break" - }, - { - "fieldname": "column_break_11", - "fieldtype": "Column Break" - }, { "fieldname": "certification_section", "fieldtype": "Section Break", @@ -148,9 +138,31 @@ "fieldtype": "Table", "label": "Related Courses", "options": "Related Courses" + }, + { + "default": "In Progress", + "fieldname": "status", + "fieldtype": "Select", + "hidden": 1, + "in_list_view": 1, + "in_standard_filter": 1, + "label": "Status", + "options": "In Progress\nUnder Review\nApproved", + "read_only": 1 + }, + { + "fieldname": "section_break_18", + "fieldtype": "Section Break" + }, + { + "fieldname": "column_break_10", + "fieldtype": "Column Break" + }, + { + "fieldname": "column_break_12", + "fieldtype": "Column Break" } ], - "index_web_pages_for_search": 1, "is_published_field": "is_published", "links": [ { @@ -174,7 +186,7 @@ "link_fieldname": "course" } ], - "modified": "2022-02-16 11:50:20.661085", + "modified": "2022-03-15 10:16:53.796878", "modified_by": "Administrator", "module": "LMS", "name": "LMS Course", @@ -189,6 +201,20 @@ "read": 1, "report": 1, "role": "System Manager", + "select": 1, + "share": 1, + "write": 1 + }, + { + "create": 1, + "email": 1, + "export": 1, + "if_owner": 1, + "print": 1, + "read": 1, + "report": 1, + "role": "All", + "select": 1, "share": 1, "write": 1 } @@ -199,4 +225,4 @@ "states": [], "title_field": "title", "track_changes": 1 -} \ No newline at end of file +} diff --git a/school/lms/doctype/lms_course/lms_course.py b/lms/lms/doctype/lms_course/lms_course.py similarity index 86% rename from school/lms/doctype/lms_course/lms_course.py rename to lms/lms/doctype/lms_course/lms_course.py index 24b2c9c2..f814ce50 100644 --- a/school/lms/doctype/lms_course/lms_course.py +++ b/lms/lms/doctype/lms_course/lms_course.py @@ -6,12 +6,30 @@ import frappe from frappe.model.document import Document import json from ...utils import slugify -from school.query import find, find_all +from lms.query import find, find_all from frappe.utils import flt, cint -from school.lms.utils import get_chapters +from lms.lms.utils import get_chapters class LMSCourse(Document): + def validate(self): + self.validate_instructors() + self.validate_status() + + def validate_instructors(self): + if self.is_new() and not self.instructors: + frappe.get_doc({ + "doctype": "Course Instructor", + "instructor": self.owner, + "parent": self.name, + "parentfield": "instructors", + "parenttype": "LMS Course" + }).save(ignore_permissions=True) + + def validate_status(self): + if self.is_published: + self.status = "Approved" + def on_update(self): if not self.upcoming and self.has_value_changed("upcoming"): self.send_email_to_interested_users() @@ -177,10 +195,18 @@ def search_course(text): """ for course in courses: search_courses.append(frappe.get_doc("LMS Course", course)) """ - """ template = frappe.render_template("school/templates/course_list.html", { + """ template = frappe.render_template("lms/templates/course_list.html", { "title": _("Search Results"), "courses": search_courses, "widgets": Widgets() }) """ return courses + +@frappe.whitelist() +def submit_for_review(course): + chapters = frappe.get_all("Chapter Reference", {"parent": course}) + if not len(chapters): + return "No Chp" + frappe.db.set_value("LMS Course", course, "status", "Under Review") + return "OK" diff --git a/school/lms/doctype/lms_course/test_lms_course.py b/lms/lms/doctype/lms_course/test_lms_course.py similarity index 99% rename from school/lms/doctype/lms_course/test_lms_course.py rename to lms/lms/doctype/lms_course/test_lms_course.py index 64d27695..1dcefab0 100644 --- a/school/lms/doctype/lms_course/test_lms_course.py +++ b/lms/lms/doctype/lms_course/test_lms_course.py @@ -12,8 +12,6 @@ class TestLMSCourse(unittest.TestCase): frappe.db.sql('delete from `tabLMS Course Mentor Mapping`') frappe.db.sql('delete from `tabLMS Course`') - - def test_new_course(self): course = new_course("Test Course") assert course.title == "Test Course" diff --git a/school/event_management/web_template/exhibitor_section/__init__.py b/lms/lms/doctype/lms_course_enrollment/__init__.py similarity index 100% rename from school/event_management/web_template/exhibitor_section/__init__.py rename to lms/lms/doctype/lms_course_enrollment/__init__.py diff --git a/school/lms/doctype/lms_course_enrollment/lms_course_enrollment.js b/lms/lms/doctype/lms_course_enrollment/lms_course_enrollment.js similarity index 100% rename from school/lms/doctype/lms_course_enrollment/lms_course_enrollment.js rename to lms/lms/doctype/lms_course_enrollment/lms_course_enrollment.js diff --git a/school/lms/doctype/lms_course_enrollment/lms_course_enrollment.json b/lms/lms/doctype/lms_course_enrollment/lms_course_enrollment.json similarity index 100% rename from school/lms/doctype/lms_course_enrollment/lms_course_enrollment.json rename to lms/lms/doctype/lms_course_enrollment/lms_course_enrollment.json diff --git a/school/lms/doctype/lms_course_enrollment/lms_course_enrollment.py b/lms/lms/doctype/lms_course_enrollment/lms_course_enrollment.py similarity index 100% rename from school/lms/doctype/lms_course_enrollment/lms_course_enrollment.py rename to lms/lms/doctype/lms_course_enrollment/lms_course_enrollment.py diff --git a/school/lms/doctype/lms_course_enrollment/test_lms_course_enrollment.py b/lms/lms/doctype/lms_course_enrollment/test_lms_course_enrollment.py similarity index 100% rename from school/lms/doctype/lms_course_enrollment/test_lms_course_enrollment.py rename to lms/lms/doctype/lms_course_enrollment/test_lms_course_enrollment.py diff --git a/school/event_management/web_template/host_section/__init__.py b/lms/lms/doctype/lms_course_interest/__init__.py similarity index 100% rename from school/event_management/web_template/host_section/__init__.py rename to lms/lms/doctype/lms_course_interest/__init__.py diff --git a/school/lms/doctype/lms_course_interest/lms_course_interest.js b/lms/lms/doctype/lms_course_interest/lms_course_interest.js similarity index 100% rename from school/lms/doctype/lms_course_interest/lms_course_interest.js rename to lms/lms/doctype/lms_course_interest/lms_course_interest.js diff --git a/school/lms/doctype/lms_course_interest/lms_course_interest.json b/lms/lms/doctype/lms_course_interest/lms_course_interest.json similarity index 100% rename from school/lms/doctype/lms_course_interest/lms_course_interest.json rename to lms/lms/doctype/lms_course_interest/lms_course_interest.json diff --git a/school/lms/doctype/lms_course_interest/lms_course_interest.py b/lms/lms/doctype/lms_course_interest/lms_course_interest.py similarity index 100% rename from school/lms/doctype/lms_course_interest/lms_course_interest.py rename to lms/lms/doctype/lms_course_interest/lms_course_interest.py diff --git a/school/lms/doctype/lms_course_interest/test_lms_course_interest.py b/lms/lms/doctype/lms_course_interest/test_lms_course_interest.py similarity index 100% rename from school/lms/doctype/lms_course_interest/test_lms_course_interest.py rename to lms/lms/doctype/lms_course_interest/test_lms_course_interest.py diff --git a/school/event_management/web_template/speaker_section/__init__.py b/lms/lms/doctype/lms_course_mentor_mapping/__init__.py similarity index 100% rename from school/event_management/web_template/speaker_section/__init__.py rename to lms/lms/doctype/lms_course_mentor_mapping/__init__.py diff --git a/school/lms/doctype/lms_course_mentor_mapping/lms_course_mentor_mapping.js b/lms/lms/doctype/lms_course_mentor_mapping/lms_course_mentor_mapping.js similarity index 100% rename from school/lms/doctype/lms_course_mentor_mapping/lms_course_mentor_mapping.js rename to lms/lms/doctype/lms_course_mentor_mapping/lms_course_mentor_mapping.js diff --git a/school/lms/doctype/lms_course_mentor_mapping/lms_course_mentor_mapping.json b/lms/lms/doctype/lms_course_mentor_mapping/lms_course_mentor_mapping.json similarity index 100% rename from school/lms/doctype/lms_course_mentor_mapping/lms_course_mentor_mapping.json rename to lms/lms/doctype/lms_course_mentor_mapping/lms_course_mentor_mapping.json diff --git a/school/lms/doctype/lms_course_mentor_mapping/lms_course_mentor_mapping.py b/lms/lms/doctype/lms_course_mentor_mapping/lms_course_mentor_mapping.py similarity index 100% rename from school/lms/doctype/lms_course_mentor_mapping/lms_course_mentor_mapping.py rename to lms/lms/doctype/lms_course_mentor_mapping/lms_course_mentor_mapping.py diff --git a/school/lms/doctype/lms_course_mentor_mapping/test_lms_course_mentor_mapping.py b/lms/lms/doctype/lms_course_mentor_mapping/test_lms_course_mentor_mapping.py similarity index 100% rename from school/lms/doctype/lms_course_mentor_mapping/test_lms_course_mentor_mapping.py rename to lms/lms/doctype/lms_course_mentor_mapping/test_lms_course_mentor_mapping.py diff --git a/school/event_management/web_template/talk_section/__init__.py b/lms/lms/doctype/lms_course_progress/__init__.py similarity index 100% rename from school/event_management/web_template/talk_section/__init__.py rename to lms/lms/doctype/lms_course_progress/__init__.py diff --git a/school/lms/doctype/lms_course_progress/lms_course_progress.js b/lms/lms/doctype/lms_course_progress/lms_course_progress.js similarity index 100% rename from school/lms/doctype/lms_course_progress/lms_course_progress.js rename to lms/lms/doctype/lms_course_progress/lms_course_progress.js diff --git a/school/lms/doctype/lms_course_progress/lms_course_progress.json b/lms/lms/doctype/lms_course_progress/lms_course_progress.json similarity index 100% rename from school/lms/doctype/lms_course_progress/lms_course_progress.json rename to lms/lms/doctype/lms_course_progress/lms_course_progress.json diff --git a/school/lms/doctype/lms_course_progress/lms_course_progress.py b/lms/lms/doctype/lms_course_progress/lms_course_progress.py similarity index 100% rename from school/lms/doctype/lms_course_progress/lms_course_progress.py rename to lms/lms/doctype/lms_course_progress/lms_course_progress.py diff --git a/school/lms/doctype/lms_course_progress/test_lms_course_progress.py b/lms/lms/doctype/lms_course_progress/test_lms_course_progress.py similarity index 100% rename from school/lms/doctype/lms_course_progress/test_lms_course_progress.py rename to lms/lms/doctype/lms_course_progress/test_lms_course_progress.py diff --git a/school/hackathon/__init__.py b/lms/lms/doctype/lms_course_review/__init__.py similarity index 100% rename from school/hackathon/__init__.py rename to lms/lms/doctype/lms_course_review/__init__.py diff --git a/school/lms/doctype/lms_course_review/lms_course_review.js b/lms/lms/doctype/lms_course_review/lms_course_review.js similarity index 100% rename from school/lms/doctype/lms_course_review/lms_course_review.js rename to lms/lms/doctype/lms_course_review/lms_course_review.js diff --git a/school/lms/doctype/lms_course_review/lms_course_review.json b/lms/lms/doctype/lms_course_review/lms_course_review.json similarity index 100% rename from school/lms/doctype/lms_course_review/lms_course_review.json rename to lms/lms/doctype/lms_course_review/lms_course_review.json diff --git a/school/lms/doctype/lms_course_review/lms_course_review.py b/lms/lms/doctype/lms_course_review/lms_course_review.py similarity index 100% rename from school/lms/doctype/lms_course_review/lms_course_review.py rename to lms/lms/doctype/lms_course_review/lms_course_review.py diff --git a/school/lms/doctype/lms_course_review/test_lms_course_review.py b/lms/lms/doctype/lms_course_review/test_lms_course_review.py similarity index 100% rename from school/lms/doctype/lms_course_review/test_lms_course_review.py rename to lms/lms/doctype/lms_course_review/test_lms_course_review.py diff --git a/school/hackathon/doctype/__init__.py b/lms/lms/doctype/lms_mentor_request/__init__.py similarity index 100% rename from school/hackathon/doctype/__init__.py rename to lms/lms/doctype/lms_mentor_request/__init__.py diff --git a/school/lms/doctype/lms_mentor_request/lms_mentor_request.js b/lms/lms/doctype/lms_mentor_request/lms_mentor_request.js similarity index 100% rename from school/lms/doctype/lms_mentor_request/lms_mentor_request.js rename to lms/lms/doctype/lms_mentor_request/lms_mentor_request.js diff --git a/school/lms/doctype/lms_mentor_request/lms_mentor_request.json b/lms/lms/doctype/lms_mentor_request/lms_mentor_request.json similarity index 100% rename from school/lms/doctype/lms_mentor_request/lms_mentor_request.json rename to lms/lms/doctype/lms_mentor_request/lms_mentor_request.json diff --git a/school/lms/doctype/lms_mentor_request/lms_mentor_request.py b/lms/lms/doctype/lms_mentor_request/lms_mentor_request.py similarity index 100% rename from school/lms/doctype/lms_mentor_request/lms_mentor_request.py rename to lms/lms/doctype/lms_mentor_request/lms_mentor_request.py diff --git a/school/lms/doctype/lms_mentor_request/test_lms_mentor_request.py b/lms/lms/doctype/lms_mentor_request/test_lms_mentor_request.py similarity index 100% rename from school/lms/doctype/lms_mentor_request/test_lms_mentor_request.py rename to lms/lms/doctype/lms_mentor_request/test_lms_mentor_request.py diff --git a/school/hackathon/doctype/community_hackathon/__init__.py b/lms/lms/doctype/lms_option/__init__.py similarity index 100% rename from school/hackathon/doctype/community_hackathon/__init__.py rename to lms/lms/doctype/lms_option/__init__.py diff --git a/school/lms/doctype/lms_option/lms_option.json b/lms/lms/doctype/lms_option/lms_option.json similarity index 100% rename from school/lms/doctype/lms_option/lms_option.json rename to lms/lms/doctype/lms_option/lms_option.json diff --git a/school/lms/doctype/lms_option/lms_option.py b/lms/lms/doctype/lms_option/lms_option.py similarity index 100% rename from school/lms/doctype/lms_option/lms_option.py rename to lms/lms/doctype/lms_option/lms_option.py diff --git a/school/hackathon/doctype/community_project/__init__.py b/lms/lms/doctype/lms_quiz/__init__.py similarity index 100% rename from school/hackathon/doctype/community_project/__init__.py rename to lms/lms/doctype/lms_quiz/__init__.py diff --git a/school/lms/doctype/lms_quiz/lms_quiz.js b/lms/lms/doctype/lms_quiz/lms_quiz.js similarity index 100% rename from school/lms/doctype/lms_quiz/lms_quiz.js rename to lms/lms/doctype/lms_quiz/lms_quiz.js diff --git a/school/lms/doctype/lms_quiz/lms_quiz.json b/lms/lms/doctype/lms_quiz/lms_quiz.json similarity index 100% rename from school/lms/doctype/lms_quiz/lms_quiz.json rename to lms/lms/doctype/lms_quiz/lms_quiz.json diff --git a/school/lms/doctype/lms_quiz/lms_quiz.py b/lms/lms/doctype/lms_quiz/lms_quiz.py similarity index 100% rename from school/lms/doctype/lms_quiz/lms_quiz.py rename to lms/lms/doctype/lms_quiz/lms_quiz.py diff --git a/school/lms/doctype/lms_quiz/test_lms_quiz.py b/lms/lms/doctype/lms_quiz/test_lms_quiz.py similarity index 100% rename from school/lms/doctype/lms_quiz/test_lms_quiz.py rename to lms/lms/doctype/lms_quiz/test_lms_quiz.py diff --git a/school/hackathon/doctype/community_project_evaluation/__init__.py b/lms/lms/doctype/lms_quiz_question/__init__.py similarity index 100% rename from school/hackathon/doctype/community_project_evaluation/__init__.py rename to lms/lms/doctype/lms_quiz_question/__init__.py diff --git a/school/lms/doctype/lms_quiz_question/lms_quiz_question.json b/lms/lms/doctype/lms_quiz_question/lms_quiz_question.json similarity index 100% rename from school/lms/doctype/lms_quiz_question/lms_quiz_question.json rename to lms/lms/doctype/lms_quiz_question/lms_quiz_question.json diff --git a/school/lms/doctype/lms_quiz_question/lms_quiz_question.py b/lms/lms/doctype/lms_quiz_question/lms_quiz_question.py similarity index 100% rename from school/lms/doctype/lms_quiz_question/lms_quiz_question.py rename to lms/lms/doctype/lms_quiz_question/lms_quiz_question.py diff --git a/school/hackathon/doctype/community_project_like/__init__.py b/lms/lms/doctype/lms_quiz_result/__init__.py similarity index 100% rename from school/hackathon/doctype/community_project_like/__init__.py rename to lms/lms/doctype/lms_quiz_result/__init__.py diff --git a/school/lms/doctype/lms_quiz_result/lms_quiz_result.json b/lms/lms/doctype/lms_quiz_result/lms_quiz_result.json similarity index 100% rename from school/lms/doctype/lms_quiz_result/lms_quiz_result.json rename to lms/lms/doctype/lms_quiz_result/lms_quiz_result.json diff --git a/school/lms/doctype/lms_quiz_result/lms_quiz_result.py b/lms/lms/doctype/lms_quiz_result/lms_quiz_result.py similarity index 100% rename from school/lms/doctype/lms_quiz_result/lms_quiz_result.py rename to lms/lms/doctype/lms_quiz_result/lms_quiz_result.py diff --git a/school/hackathon/doctype/community_project_member/__init__.py b/lms/lms/doctype/lms_quiz_submission/__init__.py similarity index 100% rename from school/hackathon/doctype/community_project_member/__init__.py rename to lms/lms/doctype/lms_quiz_submission/__init__.py diff --git a/school/lms/doctype/lms_quiz_submission/lms_quiz_submission.js b/lms/lms/doctype/lms_quiz_submission/lms_quiz_submission.js similarity index 100% rename from school/lms/doctype/lms_quiz_submission/lms_quiz_submission.js rename to lms/lms/doctype/lms_quiz_submission/lms_quiz_submission.js diff --git a/school/lms/doctype/lms_quiz_submission/lms_quiz_submission.json b/lms/lms/doctype/lms_quiz_submission/lms_quiz_submission.json similarity index 100% rename from school/lms/doctype/lms_quiz_submission/lms_quiz_submission.json rename to lms/lms/doctype/lms_quiz_submission/lms_quiz_submission.json diff --git a/school/lms/doctype/lms_quiz_submission/lms_quiz_submission.py b/lms/lms/doctype/lms_quiz_submission/lms_quiz_submission.py similarity index 100% rename from school/lms/doctype/lms_quiz_submission/lms_quiz_submission.py rename to lms/lms/doctype/lms_quiz_submission/lms_quiz_submission.py diff --git a/school/lms/doctype/lms_quiz_submission/test_lms_quiz_submission.py b/lms/lms/doctype/lms_quiz_submission/test_lms_quiz_submission.py similarity index 100% rename from school/lms/doctype/lms_quiz_submission/test_lms_quiz_submission.py rename to lms/lms/doctype/lms_quiz_submission/test_lms_quiz_submission.py diff --git a/school/lms/doctype/lms_section/lms_section.py b/lms/lms/doctype/lms_section/lms_section.py similarity index 100% rename from school/lms/doctype/lms_section/lms_section.py rename to lms/lms/doctype/lms_section/lms_section.py diff --git a/school/hackathon/doctype/community_project_update/__init__.py b/lms/lms/doctype/lms_settings/__init__.py similarity index 100% rename from school/hackathon/doctype/community_project_update/__init__.py rename to lms/lms/doctype/lms_settings/__init__.py diff --git a/school/lms/doctype/lms_settings/lms_settings.js b/lms/lms/doctype/lms_settings/lms_settings.js similarity index 100% rename from school/lms/doctype/lms_settings/lms_settings.js rename to lms/lms/doctype/lms_settings/lms_settings.js diff --git a/school/lms/doctype/lms_settings/lms_settings.json b/lms/lms/doctype/lms_settings/lms_settings.json similarity index 79% rename from school/lms/doctype/lms_settings/lms_settings.json rename to lms/lms/doctype/lms_settings/lms_settings.json index 35c07925..bcd59c9b 100644 --- a/school/lms/doctype/lms_settings/lms_settings.json +++ b/lms/lms/doctype/lms_settings/lms_settings.json @@ -6,16 +6,20 @@ "engine": "InnoDB", "field_order": [ "show_search", - "search_placeholder", - "column_break_2", + "portal_course_creation", "force_profile_completion", + "column_break_2", + "search_placeholder", "livecode_url", "signup_settings_section", "terms_of_use", "terms_page", - "column_break_12", + "column_break_9", "privacy_policy", "privacy_policy_page", + "column_break_12", + "cookie_policy", + "cookie_policy_page", "mentor_request_section", "mentor_request_creation", "mentor_request_status_update" @@ -96,17 +100,42 @@ "fieldname": "privacy_policy_page", "fieldtype": "Link", "label": "Privacy Policy Page", + "mandatory_depends_on": "privacy_policy", "options": "Web Page" }, { "fieldname": "column_break_12", "fieldtype": "Column Break" + }, + { + "default": "0", + "fieldname": "portal_course_creation", + "fieldtype": "Check", + "label": "Enable Course Creation from Portal" + }, + { + "fieldname": "column_break_9", + "fieldtype": "Column Break" + }, + { + "default": "0", + "fieldname": "cookie_policy", + "fieldtype": "Check", + "label": "Show Cookie Policy on Signup" + }, + { + "depends_on": "cookie_policy", + "fieldname": "cookie_policy_page", + "fieldtype": "Link", + "label": "Cookie Policy Page", + "mandatory_depends_on": "cookie_policy", + "options": "Web Page" } ], "index_web_pages_for_search": 1, "issingle": 1, "links": [], - "modified": "2022-02-23 16:15:28.586903", + "modified": "2022-03-23 16:07:29.491432", "modified_by": "Administrator", "module": "LMS", "name": "LMS Settings", diff --git a/school/lms/doctype/lms_settings/lms_settings.py b/lms/lms/doctype/lms_settings/lms_settings.py similarity index 96% rename from school/lms/doctype/lms_settings/lms_settings.py rename to lms/lms/doctype/lms_settings/lms_settings.py index 0681a991..8d9ef1ed 100644 --- a/school/lms/doctype/lms_settings/lms_settings.py +++ b/lms/lms/doctype/lms_settings/lms_settings.py @@ -5,9 +5,10 @@ from __future__ import unicode_literals import frappe from frappe.model.document import Document +from frappe import _ class LMSSettings(Document): - pass + pass @frappe.whitelist() def check_profile_restriction(): diff --git a/school/lms/doctype/lms_settings/test_lms_settings.py b/lms/lms/doctype/lms_settings/test_lms_settings.py similarity index 100% rename from school/lms/doctype/lms_settings/test_lms_settings.py rename to lms/lms/doctype/lms_settings/test_lms_settings.py diff --git a/school/hackathon/web_form/__init__.py b/lms/lms/doctype/preferred_function/__init__.py similarity index 100% rename from school/hackathon/web_form/__init__.py rename to lms/lms/doctype/preferred_function/__init__.py diff --git a/school/lms/doctype/preferred_function/preferred_function.json b/lms/lms/doctype/preferred_function/preferred_function.json similarity index 100% rename from school/lms/doctype/preferred_function/preferred_function.json rename to lms/lms/doctype/preferred_function/preferred_function.json diff --git a/school/lms/doctype/preferred_function/preferred_function.py b/lms/lms/doctype/preferred_function/preferred_function.py similarity index 100% rename from school/lms/doctype/preferred_function/preferred_function.py rename to lms/lms/doctype/preferred_function/preferred_function.py diff --git a/school/hackathon/web_form/join_request/__init__.py b/lms/lms/doctype/preferred_industry/__init__.py similarity index 100% rename from school/hackathon/web_form/join_request/__init__.py rename to lms/lms/doctype/preferred_industry/__init__.py diff --git a/school/lms/doctype/preferred_industry/preferred_industry.js b/lms/lms/doctype/preferred_industry/preferred_industry.js similarity index 100% rename from school/lms/doctype/preferred_industry/preferred_industry.js rename to lms/lms/doctype/preferred_industry/preferred_industry.js diff --git a/school/lms/doctype/preferred_industry/preferred_industry.json b/lms/lms/doctype/preferred_industry/preferred_industry.json similarity index 100% rename from school/lms/doctype/preferred_industry/preferred_industry.json rename to lms/lms/doctype/preferred_industry/preferred_industry.json diff --git a/school/lms/doctype/preferred_industry/preferred_industry.py b/lms/lms/doctype/preferred_industry/preferred_industry.py similarity index 100% rename from school/lms/doctype/preferred_industry/preferred_industry.py rename to lms/lms/doctype/preferred_industry/preferred_industry.py diff --git a/school/lms/doctype/preferred_industry/test_preferred_industry.py b/lms/lms/doctype/preferred_industry/test_preferred_industry.py similarity index 100% rename from school/lms/doctype/preferred_industry/test_preferred_industry.py rename to lms/lms/doctype/preferred_industry/test_preferred_industry.py diff --git a/school/hackathon/web_form/project/__init__.py b/lms/lms/doctype/related_courses/__init__.py similarity index 100% rename from school/hackathon/web_form/project/__init__.py rename to lms/lms/doctype/related_courses/__init__.py diff --git a/school/lms/doctype/related_courses/related_courses.js b/lms/lms/doctype/related_courses/related_courses.js similarity index 100% rename from school/lms/doctype/related_courses/related_courses.js rename to lms/lms/doctype/related_courses/related_courses.js diff --git a/school/lms/doctype/related_courses/related_courses.json b/lms/lms/doctype/related_courses/related_courses.json similarity index 100% rename from school/lms/doctype/related_courses/related_courses.json rename to lms/lms/doctype/related_courses/related_courses.json diff --git a/school/lms/doctype/related_courses/related_courses.py b/lms/lms/doctype/related_courses/related_courses.py similarity index 100% rename from school/lms/doctype/related_courses/related_courses.py rename to lms/lms/doctype/related_courses/related_courses.py diff --git a/school/lms/doctype/related_courses/test_related_courses.py b/lms/lms/doctype/related_courses/test_related_courses.py similarity index 100% rename from school/lms/doctype/related_courses/test_related_courses.py rename to lms/lms/doctype/related_courses/test_related_courses.py diff --git a/school/hackathon/web_form/project_update/__init__.py b/lms/lms/doctype/skill/__init__.py similarity index 100% rename from school/hackathon/web_form/project_update/__init__.py rename to lms/lms/doctype/skill/__init__.py diff --git a/school/lms/doctype/skill/skill.js b/lms/lms/doctype/skill/skill.js similarity index 100% rename from school/lms/doctype/skill/skill.js rename to lms/lms/doctype/skill/skill.js diff --git a/school/lms/doctype/skill/skill.json b/lms/lms/doctype/skill/skill.json similarity index 100% rename from school/lms/doctype/skill/skill.json rename to lms/lms/doctype/skill/skill.json diff --git a/school/lms/doctype/skill/skill.py b/lms/lms/doctype/skill/skill.py similarity index 100% rename from school/lms/doctype/skill/skill.py rename to lms/lms/doctype/skill/skill.py diff --git a/school/lms/doctype/skill/test_skill.py b/lms/lms/doctype/skill/test_skill.py similarity index 100% rename from school/lms/doctype/skill/test_skill.py rename to lms/lms/doctype/skill/test_skill.py diff --git a/school/job/__init__.py b/lms/lms/doctype/skills/__init__.py similarity index 100% rename from school/job/__init__.py rename to lms/lms/doctype/skills/__init__.py diff --git a/school/lms/doctype/skills/skills.js b/lms/lms/doctype/skills/skills.js similarity index 100% rename from school/lms/doctype/skills/skills.js rename to lms/lms/doctype/skills/skills.js diff --git a/school/lms/doctype/skills/skills.json b/lms/lms/doctype/skills/skills.json similarity index 100% rename from school/lms/doctype/skills/skills.json rename to lms/lms/doctype/skills/skills.json diff --git a/school/lms/doctype/skills/skills.py b/lms/lms/doctype/skills/skills.py similarity index 100% rename from school/lms/doctype/skills/skills.py rename to lms/lms/doctype/skills/skills.py diff --git a/school/lms/doctype/skills/test_skills.py b/lms/lms/doctype/skills/test_skills.py similarity index 100% rename from school/lms/doctype/skills/test_skills.py rename to lms/lms/doctype/skills/test_skills.py diff --git a/school/job/doctype/__init__.py b/lms/lms/doctype/work_experience/__init__.py similarity index 100% rename from school/job/doctype/__init__.py rename to lms/lms/doctype/work_experience/__init__.py diff --git a/school/lms/doctype/work_experience/work_experience.json b/lms/lms/doctype/work_experience/work_experience.json similarity index 100% rename from school/lms/doctype/work_experience/work_experience.json rename to lms/lms/doctype/work_experience/work_experience.json diff --git a/school/lms/doctype/work_experience/work_experience.py b/lms/lms/doctype/work_experience/work_experience.py similarity index 100% rename from school/lms/doctype/work_experience/work_experience.py rename to lms/lms/doctype/work_experience/work_experience.py diff --git a/school/lms/md.py b/lms/lms/md.py similarity index 94% rename from school/lms/md.py rename to lms/lms/md.py index ce410d81..8105c72f 100644 --- a/school/lms/md.py +++ b/lms/lms/md.py @@ -7,7 +7,7 @@ Macros can be added to the markdown text in the following format. These macros will be rendered using a pluggable mechanism. -Apps can provide a hook school_markdown_macro_renderers, a +Apps can provide a hook lms_markdown_macro_renderers, a dictionary mapping the macro name to the function that to render that macro. The function will get the argument passed to the macro as argument. @@ -59,7 +59,7 @@ def _remove_quotes(value): def get_macro_registry(): - d = frappe.get_hooks("school_markdown_macro_renderers") or {} + d = frappe.get_hooks("lms_markdown_macro_renderers") or {} return {name: frappe.get_attr(klass[0]) for name, klass in d.items()} def render_macro(macro_name, macro_argument): @@ -105,7 +105,7 @@ def sanitize_html(html, macro): any broken tags. This makes sures that all those things are fixed before passing to the etree parser. """ - soup = BeautifulSoup(html, features="lxml") + soup = BeautifulSoup(html, features="html5lib") nodes = soup.body.children classname = "" if macro == "YouTubeVideo": diff --git a/school/lms/models.py b/lms/lms/models.py similarity index 100% rename from school/lms/models.py rename to lms/lms/models.py diff --git a/school/job/doctype/job_opportunity/__init__.py b/lms/lms/report/__init__.py similarity index 100% rename from school/job/doctype/job_opportunity/__init__.py rename to lms/lms/report/__init__.py diff --git a/school/job/doctype/job_settings/__init__.py b/lms/lms/report/course_progress_summary/__init__.py similarity index 100% rename from school/job/doctype/job_settings/__init__.py rename to lms/lms/report/course_progress_summary/__init__.py diff --git a/school/lms/report/course_progress_summary/course_progress_summary.js b/lms/lms/report/course_progress_summary/course_progress_summary.js similarity index 100% rename from school/lms/report/course_progress_summary/course_progress_summary.js rename to lms/lms/report/course_progress_summary/course_progress_summary.js diff --git a/school/lms/report/course_progress_summary/course_progress_summary.json b/lms/lms/report/course_progress_summary/course_progress_summary.json similarity index 100% rename from school/lms/report/course_progress_summary/course_progress_summary.json rename to lms/lms/report/course_progress_summary/course_progress_summary.json diff --git a/school/lms/report/course_progress_summary/course_progress_summary.py b/lms/lms/report/course_progress_summary/course_progress_summary.py similarity index 100% rename from school/lms/report/course_progress_summary/course_progress_summary.py rename to lms/lms/report/course_progress_summary/course_progress_summary.py diff --git a/school/lms/test_utils.py b/lms/lms/test_utils.py similarity index 100% rename from school/lms/test_utils.py rename to lms/lms/test_utils.py diff --git a/school/lms/utils.py b/lms/lms/utils.py similarity index 84% rename from school/lms/utils.py rename to lms/lms/utils.py index 1eae98e7..af175462 100644 --- a/school/lms/utils.py +++ b/lms/lms/utils.py @@ -1,8 +1,9 @@ import re import frappe from frappe.utils import flt, cint, cstr -from school.lms.md import markdown_to_html +from lms.lms.md import markdown_to_html, find_macros import string +from frappe import _ RE_SLUG_NOTALLOWED = re.compile("[^a-z0-9]+") @@ -84,6 +85,13 @@ def get_lesson_details(chapter): lesson_details = frappe.db.get_value("Course Lesson", row.lesson, ["name", "title", "include_in_preview", "body", "creation"], as_dict=True) lesson_details.number = flt("{}.{}".format(chapter.idx, row.idx)) + lesson_details.icon = "icon-list" + macros = find_macros(lesson_details.body) + for macro in macros: + if macro[0] == "YouTubeVideo": + lesson_details.icon = "icon-video" + elif macro[0] == "Quiz": + lesson_details.icon = "icon-quiz" lessons.append(lesson_details) return lessons @@ -296,3 +304,43 @@ def is_instructor(course): def convert_number_to_character(number): return string.ascii_uppercase[number] + +def get_signup_optin_checks(): + + mapper = frappe._dict({ + "terms_of_use": { + "page_name": "terms_page", + "title": _("Terms of Use") + }, + "privacy_policy": { + "page_name": "privacy_policy_page", + "title": _("Privacy Policy") + }, + "cookie_policy": { + "page_name": "cookie_policy_page", + "title": _("Cookie Policy") + } + }) + checks = ["terms_of_use", "privacy_policy", "cookie_policy"] + links = [] + + for check in checks: + if frappe.db.get_single_value("LMS Settings", check): + page = frappe.db.get_single_value("LMS Settings", mapper[check].get("page_name")) + route = frappe.db.get_value("Web Page", page, "route") + links.append("" + mapper[check].get("title") + "") + + return (", ").join(links) + +def get_popular_courses(): + courses = frappe.get_all("LMS Course", {"is_published": 1, "upcoming": 0}) + course_membership = [] + + for course in courses: + course_membership.append({ + "course": course.name, + "members": cint(frappe.db.count("LMS Batch Membership", {"course": course.name})) + }) + + course_membership = sorted(course_membership, key = lambda x: x.get("members"), reverse=True) + return course_membership[:3] diff --git a/school/job/notification/__init__.py b/lms/lms/web_form/__init__.py similarity index 100% rename from school/job/notification/__init__.py rename to lms/lms/web_form/__init__.py diff --git a/school/job/notification/new_job_alert/__init__.py b/lms/lms/web_form/add_a_new_batch/__init__.py similarity index 100% rename from school/job/notification/new_job_alert/__init__.py rename to lms/lms/web_form/add_a_new_batch/__init__.py diff --git a/school/lms/web_form/add_a_new_batch/add_a_new_batch.js b/lms/lms/web_form/add_a_new_batch/add_a_new_batch.js similarity index 100% rename from school/lms/web_form/add_a_new_batch/add_a_new_batch.js rename to lms/lms/web_form/add_a_new_batch/add_a_new_batch.js diff --git a/school/lms/web_form/add_a_new_batch/add_a_new_batch.json b/lms/lms/web_form/add_a_new_batch/add_a_new_batch.json similarity index 100% rename from school/lms/web_form/add_a_new_batch/add_a_new_batch.json rename to lms/lms/web_form/add_a_new_batch/add_a_new_batch.json diff --git a/school/lms/web_form/add_a_new_batch/add_a_new_batch.py b/lms/lms/web_form/add_a_new_batch/add_a_new_batch.py similarity index 100% rename from school/lms/web_form/add_a_new_batch/add_a_new_batch.py rename to lms/lms/web_form/add_a_new_batch/add_a_new_batch.py diff --git a/school/job/web_form/__init__.py b/lms/lms/web_form/chapter/__init__.py similarity index 100% rename from school/job/web_form/__init__.py rename to lms/lms/web_form/chapter/__init__.py diff --git a/lms/lms/web_form/chapter/chapter.js b/lms/lms/web_form/chapter/chapter.js new file mode 100644 index 00000000..6d710013 --- /dev/null +++ b/lms/lms/web_form/chapter/chapter.js @@ -0,0 +1,8 @@ +frappe.ready(function() { + frappe.web_form.after_save = () => { + frappe.msgprint(__("Chapter has been saved successfully. Go back to the course and add this chapter to the chapters table.")) + setTimeout(() => { + window.location.href = `/courses/${frappe.web_form.doc.course}`; + }, 3000); + } +}); diff --git a/school/event_management/web_form/exhibitor_registration/exhibitor_registration.json b/lms/lms/web_form/chapter/chapter.json similarity index 57% rename from school/event_management/web_form/exhibitor_registration/exhibitor_registration.json rename to lms/lms/web_form/chapter/chapter.json index cba14dfe..fc2b8afc 100644 --- a/school/event_management/web_form/exhibitor_registration/exhibitor_registration.json +++ b/lms/lms/web_form/chapter/chapter.json @@ -2,68 +2,68 @@ "accept_payment": 0, "allow_comments": 0, "allow_delete": 0, - "allow_edit": 0, + "allow_edit": 1, "allow_incomplete": 0, - "allow_multiple": 0, + "allow_multiple": 1, "allow_print": 0, "amount": 0.0, "amount_based_on_field": 0, - "apply_document_permissions": 0, + "apply_document_permissions": 1, "button_label": "Save", - "creation": "2021-08-16 16:27:06.566564", - "custom_css": "[data-doctype=\"Web Form\"] {\n max-width: 720px;\n margin: 6rem auto;\n}", - "doc_type": "Exhibitor", + "creation": "2022-03-07 18:41:07.058806", + "doc_type": "Course Chapter", "docstatus": 0, "doctype": "Web Form", "idx": 0, + "is_multi_step_form": 0, "is_standard": 1, "login_required": 1, "max_attachment_size": 0, - "modified": "2021-08-23 10:12:24.038572", + "modified": "2022-03-14 18:48:01.704325", "modified_by": "Administrator", - "module": "Event Management", - "name": "exhibitor-registration", + "module": "LMS", + "name": "chapter", "owner": "Administrator", "payment_button_label": "Buy Now", "published": 1, - "route": "exhibitor-registration", + "route": "chapter", "route_to_success_link": 0, "show_attachments": 0, "show_in_grid": 0, "show_sidebar": 0, "sidebar_items": [], - "success_url": "", - "title": "Exhibitor Registration", + "success_url": "/chapter", + "title": "Chapter", "web_form_fields": [ { "allow_read_on_all_link_options": 0, - "fieldname": "user", - "fieldtype": "Data", + "fieldname": "course", + "fieldtype": "Link", "hidden": 0, - "label": "User", + "label": "Course", "max_length": 0, "max_value": 0, - "options": "User", - "read_only": 1, - "reqd": 0, + "options": "LMS Course", + "read_only": 0, + "reqd": 1, "show_in_filter": 0 }, { "allow_read_on_all_link_options": 0, - "fieldname": "company", + "fieldname": "title", "fieldtype": "Data", "hidden": 0, - "label": "Company ", + "label": "Title", "max_length": 0, "max_value": 0, "read_only": 0, - "reqd": 0, + "reqd": 1, "show_in_filter": 0 }, { "allow_read_on_all_link_options": 0, "fieldname": "description", - "fieldtype": "Text Editor", + "fieldtype": "Small Text", "hidden": 0, "label": "Description", "max_length": 0, @@ -71,6 +71,19 @@ "read_only": 0, "reqd": 0, "show_in_filter": 0 + }, + { + "allow_read_on_all_link_options": 0, + "fieldname": "lessons", + "fieldtype": "Table", + "hidden": 0, + "label": "Lessons", + "max_length": 0, + "max_value": 0, + "options": "Lesson Reference", + "read_only": 0, + "reqd": 0, + "show_in_filter": 0 } ] } \ No newline at end of file diff --git a/school/event_management/web_form/attendee_registration/attendee_registration.py b/lms/lms/web_form/chapter/chapter.py similarity index 100% rename from school/event_management/web_form/attendee_registration/attendee_registration.py rename to lms/lms/web_form/chapter/chapter.py diff --git a/school/job/web_form/job_opportunity/__init__.py b/lms/lms/web_form/course/__init__.py similarity index 100% rename from school/job/web_form/job_opportunity/__init__.py rename to lms/lms/web_form/course/__init__.py diff --git a/lms/lms/web_form/course/course.js b/lms/lms/web_form/course/course.js new file mode 100644 index 00000000..ff539e0a --- /dev/null +++ b/lms/lms/web_form/course/course.js @@ -0,0 +1,6 @@ +frappe.ready(function() { + frappe.web_form.after_save = () => { + let route = frappe.web_form.doc.name ? `/courses/${frappe.web_form.doc.name}` : `/course`; + window.location.href = route; + } +}); diff --git a/lms/lms/web_form/course/course.json b/lms/lms/web_form/course/course.json new file mode 100644 index 00000000..f12d692e --- /dev/null +++ b/lms/lms/web_form/course/course.json @@ -0,0 +1,147 @@ +{ + "accept_payment": 0, + "allow_comments": 0, + "allow_delete": 0, + "allow_edit": 1, + "allow_incomplete": 0, + "allow_multiple": 1, + "allow_print": 0, + "amount": 0.0, + "amount_based_on_field": 0, + "apply_document_permissions": 1, + "button_label": "Save", + "creation": "2022-03-07 14:40:41.262163", + "custom_css": "", + "doc_type": "LMS Course", + "docstatus": 0, + "doctype": "Web Form", + "idx": 0, + "is_multi_step_form": 0, + "is_standard": 1, + "login_required": 1, + "max_attachment_size": 0, + "modified": "2022-03-11 12:32:22.512115", + "modified_by": "Administrator", + "module": "LMS", + "name": "course", + "owner": "Administrator", + "payment_button_label": "Buy Now", + "published": 1, + "route": "course", + "route_to_success_link": 0, + "show_attachments": 0, + "show_in_grid": 0, + "show_sidebar": 0, + "sidebar_items": [], + "success_url": "/course", + "title": "Course", + "web_form_fields": [ + { + "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": "tags", + "fieldtype": "Data", + "hidden": 0, + "label": "Tags", + "max_length": 0, + "max_value": 0, + "read_only": 0, + "reqd": 0, + "show_in_filter": 0 + }, + { + "allow_read_on_all_link_options": 0, + "fieldname": "", + "fieldtype": "Column Break", + "hidden": 0, + "max_length": 0, + "max_value": 0, + "read_only": 0, + "reqd": 0, + "show_in_filter": 0 + }, + { + "allow_read_on_all_link_options": 0, + "fieldname": "video_link", + "fieldtype": "Data", + "hidden": 0, + "label": "Video Embed Link", + "max_length": 0, + "max_value": 0, + "read_only": 0, + "reqd": 0, + "show_in_filter": 0 + }, + { + "allow_read_on_all_link_options": 0, + "fieldname": "image", + "fieldtype": "Attach Image", + "hidden": 0, + "label": "Preview Image", + "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, + "max_length": 0, + "max_value": 0, + "read_only": 0, + "reqd": 0, + "show_in_filter": 0 + }, + { + "allow_read_on_all_link_options": 0, + "fieldname": "short_introduction", + "fieldtype": "Small Text", + "hidden": 0, + "label": "Short Introduction", + "max_length": 0, + "max_value": 0, + "read_only": 0, + "reqd": 1, + "show_in_filter": 0 + }, + { + "allow_read_on_all_link_options": 0, + "fieldname": "description", + "fieldtype": "Text", + "hidden": 0, + "label": "Description", + "max_length": 0, + "max_value": 0, + "read_only": 0, + "reqd": 1, + "show_in_filter": 0 + }, + { + "allow_read_on_all_link_options": 0, + "fieldname": "chapters", + "fieldtype": "Table", + "hidden": 0, + "label": "Chapters", + "max_length": 0, + "max_value": 0, + "options": "Chapter Reference", + "read_only": 0, + "reqd": 0, + "show_in_filter": 0 + } + ] +} \ No newline at end of file diff --git a/school/event_management/web_form/exhibitor_registration/exhibitor_registration.py b/lms/lms/web_form/course/course.py similarity index 100% rename from school/event_management/web_form/exhibitor_registration/exhibitor_registration.py rename to lms/lms/web_form/course/course.py diff --git a/school/lms/__init__.py b/lms/lms/web_form/lesson/__init__.py similarity index 100% rename from school/lms/__init__.py rename to lms/lms/web_form/lesson/__init__.py diff --git a/lms/lms/web_form/lesson/lesson.js b/lms/lms/web_form/lesson/lesson.js new file mode 100644 index 00000000..4347f730 --- /dev/null +++ b/lms/lms/web_form/lesson/lesson.js @@ -0,0 +1,16 @@ +frappe.ready(function() { + frappe.web_form.after_save = () => { + frappe.call({ + method: "lms.lms.doctype.course_lesson.course_lesson.get_lesson_info", + args: { + "chapter": frappe.web_form.doc.chapter + }, + callback: (data) => { + frappe.msgprint(__(`Lesson has been saved successfully. Go back to the chapter and add this lesson to the lessons table.`)); + setTimeout(() => { + window.location.href = `/courses/${data.message}`; + }, 3000); + } + }); + }; +}); diff --git a/lms/lms/web_form/lesson/lesson.json b/lms/lms/web_form/lesson/lesson.json new file mode 100644 index 00000000..2c519587 --- /dev/null +++ b/lms/lms/web_form/lesson/lesson.json @@ -0,0 +1,91 @@ +{ + "accept_payment": 0, + "allow_comments": 0, + "allow_delete": 0, + "allow_edit": 1, + "allow_incomplete": 0, + "allow_multiple": 1, + "allow_print": 0, + "amount": 0.0, + "amount_based_on_field": 0, + "apply_document_permissions": 1, + "button_label": "Save", + "creation": "2022-03-07 18:41:42.549831", + "custom_css": "", + "doc_type": "Course Lesson", + "docstatus": 0, + "doctype": "Web Form", + "idx": 0, + "introduction_text": "



Create lessons for your course. You can add some additional content to the lesson using a special syntax. The table below mentions all types of dynamic content that you can add to the lessons and the syntax for the same.


Content TypeSyntax
Video{{ Video(\"url_of_source\") }}
YouTube Video{{ YouTubeVideo(\"unique_embed_id\") }}
Exercise{{ Exercise(\"exercise_name\") }}
Quiz{{ Quiz(\"lms_quiz_name\") }}
Assignment{{ Assignment(\"id-filetype\") }}
", + "is_multi_step_form": 0, + "is_standard": 1, + "login_required": 1, + "max_attachment_size": 0, + "modified": "2022-03-14 18:49:33.526455", + "modified_by": "Administrator", + "module": "LMS", + "name": "lesson", + "owner": "Administrator", + "payment_button_label": "Buy Now", + "published": 1, + "route": "lesson", + "route_to_success_link": 0, + "show_attachments": 0, + "show_in_grid": 0, + "show_sidebar": 0, + "sidebar_items": [], + "success_url": "/lesson", + "title": "Lesson", + "web_form_fields": [ + { + "allow_read_on_all_link_options": 0, + "fieldname": "chapter", + "fieldtype": "Link", + "hidden": 0, + "label": "Course Chapter", + "max_length": 0, + "max_value": 0, + "options": "Course Chapter", + "read_only": 0, + "reqd": 1, + "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, + "default": "0", + "fieldname": "include_in_preview", + "fieldtype": "Check", + "hidden": 0, + "label": "Include In Preview", + "max_length": 0, + "max_value": 0, + "read_only": 0, + "reqd": 0, + "show_in_filter": 0 + }, + { + "allow_read_on_all_link_options": 0, + "fieldname": "body", + "fieldtype": "Text", + "hidden": 0, + "label": "Body", + "max_length": 0, + "max_value": 0, + "read_only": 0, + "reqd": 1, + "show_in_filter": 0 + } + ] +} \ No newline at end of file diff --git a/school/event_management/web_form/purpose_a_talk/purpose_a_talk.py b/lms/lms/web_form/lesson/lesson.py similarity index 100% rename from school/event_management/web_form/purpose_a_talk/purpose_a_talk.py rename to lms/lms/web_form/lesson/lesson.py diff --git a/school/lms/doctype/__init__.py b/lms/lms/web_form/profile/__init__.py similarity index 100% rename from school/lms/doctype/__init__.py rename to lms/lms/web_form/profile/__init__.py diff --git a/school/lms/web_form/profile/profile.js b/lms/lms/web_form/profile/profile.js similarity index 100% rename from school/lms/web_form/profile/profile.js rename to lms/lms/web_form/profile/profile.js diff --git a/school/lms/web_form/profile/profile.json b/lms/lms/web_form/profile/profile.json similarity index 100% rename from school/lms/web_form/profile/profile.json rename to lms/lms/web_form/profile/profile.json diff --git a/school/lms/web_form/profile/profile.py b/lms/lms/web_form/profile/profile.py similarity index 100% rename from school/lms/web_form/profile/profile.py rename to lms/lms/web_form/profile/profile.py diff --git a/school/lms/doctype/certification/__init__.py b/lms/lms/web_template/__init__.py similarity index 100% rename from school/lms/doctype/certification/__init__.py rename to lms/lms/web_template/__init__.py diff --git a/school/lms/doctype/chapter_reference/__init__.py b/lms/lms/web_template/course_cards/__init__.py similarity index 100% rename from school/lms/doctype/chapter_reference/__init__.py rename to lms/lms/web_template/course_cards/__init__.py diff --git a/school/lms/web_template/course_cards/course_cards.html b/lms/lms/web_template/course_cards/course_cards.html similarity index 88% rename from school/lms/web_template/course_cards/course_cards.html rename to lms/lms/web_template/course_cards/course_cards.html index 405697e7..4c5b8a36 100644 --- a/school/lms/web_template/course_cards/course_cards.html +++ b/lms/lms/web_template/course_cards/course_cards.html @@ -9,6 +9,6 @@ {{ _("Explore More") }} - + diff --git a/school/lms/web_template/course_cards/course_cards.json b/lms/lms/web_template/course_cards/course_cards.json similarity index 100% rename from school/lms/web_template/course_cards/course_cards.json rename to lms/lms/web_template/course_cards/course_cards.json diff --git a/school/lms/doctype/cohort/__init__.py b/lms/lms/web_template/courses_enrolled/__init__.py similarity index 100% rename from school/lms/doctype/cohort/__init__.py rename to lms/lms/web_template/courses_enrolled/__init__.py diff --git a/lms/lms/web_template/courses_enrolled/courses_enrolled.html b/lms/lms/web_template/courses_enrolled/courses_enrolled.html new file mode 100644 index 00000000..f254a3ef --- /dev/null +++ b/lms/lms/web_template/courses_enrolled/courses_enrolled.html @@ -0,0 +1,27 @@ +{% set enrolled = get_enrolled_courses().in_progress + get_enrolled_courses().completed %} +{% if enrolled | length %} +
+ {% for course in enrolled %} + {{ widgets.CourseCard(course=course) }} + {% endfor %} +
+{% else %} +{% set site_name = frappe.db.get_single_value("System Settings", "app_name") %} +
+
+
+
{{ _("You haven't enrolled for any courses") }}
+
{{ _("Here are a few courses we recommend for you to get started with {0}").format(site_name) }}
+
+ {% set recommended_courses = get_popular_courses() %} +
+ {% for course in recommended_courses %} + {% if course %} + {% set course_details = frappe.get_doc("LMS Course", course.course) %} + {{ widgets.CourseCard(course=course_details) }} + {% endif %} + {% endfor %} +
+
+
+{% endif %} diff --git a/lms/lms/web_template/courses_enrolled/courses_enrolled.json b/lms/lms/web_template/courses_enrolled/courses_enrolled.json new file mode 100644 index 00000000..cf482cac --- /dev/null +++ b/lms/lms/web_template/courses_enrolled/courses_enrolled.json @@ -0,0 +1,16 @@ +{ + "__unsaved": 1, + "creation": "2021-10-21 11:29:50.424865", + "docstatus": 0, + "doctype": "Web Template", + "fields": [], + "idx": 0, + "modified": "2022-03-14 09:44:28.266320", + "modified_by": "Administrator", + "module": "LMS", + "name": "Courses Enrolled", + "owner": "Administrator", + "standard": 1, + "template": "", + "type": "Section" +} \ No newline at end of file diff --git a/school/lms/doctype/cohort_join_request/__init__.py b/lms/lms/web_template/courses_mentored/__init__.py similarity index 100% rename from school/lms/doctype/cohort_join_request/__init__.py rename to lms/lms/web_template/courses_mentored/__init__.py diff --git a/school/lms/web_template/courses_mentored/courses_mentored.html b/lms/lms/web_template/courses_mentored/courses_mentored.html similarity index 100% rename from school/lms/web_template/courses_mentored/courses_mentored.html rename to lms/lms/web_template/courses_mentored/courses_mentored.html diff --git a/school/lms/web_template/courses_mentored/courses_mentored.json b/lms/lms/web_template/courses_mentored/courses_mentored.json similarity index 100% rename from school/lms/web_template/courses_mentored/courses_mentored.json rename to lms/lms/web_template/courses_mentored/courses_mentored.json diff --git a/school/lms/doctype/cohort_mentor/__init__.py b/lms/lms/web_template/multiple_testimonials/__init__.py similarity index 100% rename from school/lms/doctype/cohort_mentor/__init__.py rename to lms/lms/web_template/multiple_testimonials/__init__.py diff --git a/school/community/web_template/multiple_testimonials/multiple_testimonials.html b/lms/lms/web_template/multiple_testimonials/multiple_testimonials.html similarity index 100% rename from school/community/web_template/multiple_testimonials/multiple_testimonials.html rename to lms/lms/web_template/multiple_testimonials/multiple_testimonials.html diff --git a/school/community/web_template/multiple_testimonials/multiple_testimonials.json b/lms/lms/web_template/multiple_testimonials/multiple_testimonials.json similarity index 76% rename from school/community/web_template/multiple_testimonials/multiple_testimonials.json rename to lms/lms/web_template/multiple_testimonials/multiple_testimonials.json index 5d4db8f0..a0ef204b 100644 --- a/school/community/web_template/multiple_testimonials/multiple_testimonials.json +++ b/lms/lms/web_template/multiple_testimonials/multiple_testimonials.json @@ -5,24 +5,18 @@ "doctype": "Web Template", "fields": [ { - "__islocal": 1, - "__unsaved": 1, "fieldname": "title", "fieldtype": "Data", "label": "Title", "reqd": 0 }, { - "__islocal": 1, - "__unsaved": 1, "fieldname": "testimonials_table", "fieldtype": "Table Break", "label": "Testimonials", "reqd": 0 }, { - "__islocal": 1, - "__unsaved": 1, "fieldname": "testimonials", "fieldtype": "Link", "label": "Testimonials", @@ -30,10 +24,10 @@ "reqd": 0 } ], - "idx": 0, - "modified": "2021-11-16 17:17:49.089989", + "idx": 1, + "modified": "2022-03-21 11:52:27.728610", "modified_by": "Administrator", - "module": "Community", + "module": "LMS", "name": "Multiple Testimonials", "owner": "Administrator", "standard": 1, diff --git a/school/community/widgets/Avatar.html b/lms/lms/widgets/Avatar.html similarity index 100% rename from school/community/widgets/Avatar.html rename to lms/lms/widgets/Avatar.html diff --git a/school/lms/widgets/BreadCrumb.html b/lms/lms/widgets/BreadCrumb.html similarity index 71% rename from school/lms/widgets/BreadCrumb.html rename to lms/lms/widgets/BreadCrumb.html index e9b849b6..ca7a4747 100644 --- a/school/lms/widgets/BreadCrumb.html +++ b/lms/lms/widgets/BreadCrumb.html @@ -1,10 +1,10 @@
{% if course %} All Courses - + {% if lesson %} {{ course.title }} - + {{ lesson.title }} {% else %} {{ course.title }} diff --git a/school/lms/widgets/CourseCard.html b/lms/lms/widgets/CourseCard.html similarity index 74% rename from school/lms/widgets/CourseCard.html rename to lms/lms/widgets/CourseCard.html index 52f613ed..28d7ee8f 100644 --- a/school/lms/widgets/CourseCard.html +++ b/lms/lms/widgets/CourseCard.html @@ -17,9 +17,41 @@
{% if get_lessons(course.name) | length %} - +
+ + + {{ get_lessons(course.name) | length }} {{ _("Lessons") }} - +
+ {% endif %} + + {% if course.status and course.status != "Approved"%} + {% set pill_color = "gray" if course.status == "In Progress" else "orange" %} +
{{ course.status }}
+ {% endif %} + + {% set student_count = get_students(course.name) | length %} + {% set avg_rating = get_average_rating(course.name) %} + {% if student_count and avg_rating %} +
+ {% if student_count %} +
+ + + + {{ student_count }} +
+ {% endif %} + + {% if avg_rating %} +
+ + + + {{ frappe.utils.flt(avg_rating, frappe.get_system_settings("float_precision") or 3) }} +
+ {% endif %} +
{% endif %}
{{ course.title }}
@@ -34,7 +66,7 @@
{{ progress }}% Completed
{% endif %} -
+
{% set instructors = get_instructors(course.name) %} {% set ins_len = instructors | length %} @@ -59,22 +91,6 @@ - {% set student_count = get_students(course.name) | length %} - - {% if student_count %} - - - {{ student_count }} - - {% endif %} - {% set avg_rating = get_average_rating(course.name) %} - {% if avg_rating %} - - - {{ frappe.utils.flt(avg_rating, frappe.get_system_settings("float_precision") or 3) }} - - {% endif %} -
{% if read_only %} diff --git a/school/lms/widgets/CourseOutline.html b/lms/lms/widgets/CourseOutline.html similarity index 66% rename from school/lms/widgets/CourseOutline.html rename to lms/lms/widgets/CourseOutline.html index e4144d62..c3149d9e 100644 --- a/school/lms/widgets/CourseOutline.html +++ b/lms/lms/widgets/CourseOutline.html @@ -7,7 +7,7 @@
@@ -19,21 +19,24 @@
{% endif %} - {% set is_instructor = frappe.session.user == course.instructor %} + {% set is_instructor = is_instructor(course.name) %}
{% for lesson in get_lessons(course.name, chapter) %} - -
+ {% set active = membership.current_lesson == lesson.name %} +
{% if membership or lesson.include_in_preview %} + + + {{ lesson.title }} {% if membership %} + src="/assets/lms/icons/check.svg"> {% endif %} @@ -41,16 +44,20 @@ {% elif is_instructor and not lesson.include_in_preview %} - + + +
{{ lesson.title }}
 {% else %}
- + + +
{{ lesson.title }}
@@ -83,7 +90,7 @@ frappe.ready(() => { }); const expand_the_first_chapter = () => { - var elements = $(".course-outline .collapse"); + let elements = $(".course-outline .collapse"); elements.each((i, element) => { if (i < 1) { show_section(element); @@ -95,13 +102,21 @@ const expand_the_first_chapter = () => { const expand_the_active_chapter = () => { /* Find anchor matching the URL for course details page */ - var selector = $(`a[href="${decodeURIComponent(window.location.pathname)}"]`).parent(); + let selector = $(`a[href="${decodeURIComponent(window.location.pathname)}"]`).parent(); if (!selector.length) { selector = $(`a[href^="${decodeURIComponent(window.location.pathname)}"]`).parent(); } if (selector.length && $(".course-details-page").length) { - $(".lesson-info").removeClass("active-lesson") + $(".lesson-info").removeClass("active-lesson"); + $(".lesson-info").each((i, elem) => { + let href = $(elem).find("use").attr("href"); + href.endsWith("blue") && $(elem).find("use").attr("href", href.substring(0, href.length - 5)); + }) + selector.addClass("active-lesson"); + let href = selector.find("use").attr("href"); + !href.endsWith("blue") && selector.find("use").attr("href", `${href}-blue`); + show_section(selector.parent().parent()); } @@ -124,7 +139,7 @@ const show_section = (element) => { }; const rotate_chapter_icon = (e) => { - var icon = $(e.currentTarget).children(".chapter-icon"); + let icon = $(e.currentTarget).children(".chapter-icon"); if (icon.css("transform") == "none") { icon.css("transform", "rotate(90deg)"); } else { @@ -133,12 +148,13 @@ const rotate_chapter_icon = (e) => { }; const show_no_preview_dialog = (e) => { - frappe.warn(__("Not available for preview"), - __("This lesson is not available for preview. Please join the course to access it."), - () => { - window.location.href = `/courses/${ $(e.currentTarget).data("course") }` - }, - __("Start Learning"), false); + const d = frappe.warn(__("Not available for preview"), + __("This lesson is not available for preview. Please join the course to access it."), + () => { + const route = `/courses/${ $(e.currentTarget).data("course") }`; + window.location.pathname == route ? d.hide() : window.location.href = route; + }, + __("Start Learning"), false); }; diff --git a/school/lms/widgets/Exercise.html b/lms/lms/widgets/Exercise.html similarity index 100% rename from school/lms/widgets/Exercise.html rename to lms/lms/widgets/Exercise.html diff --git a/school/lms/widgets/HelloWorld.html b/lms/lms/widgets/HelloWorld.html similarity index 100% rename from school/lms/widgets/HelloWorld.html rename to lms/lms/widgets/HelloWorld.html diff --git a/school/lms/widgets/MemberCard.html b/lms/lms/widgets/MemberCard.html similarity index 100% rename from school/lms/widgets/MemberCard.html rename to lms/lms/widgets/MemberCard.html diff --git a/school/lms/widgets/RequestInvite.html b/lms/lms/widgets/RequestInvite.html similarity index 96% rename from school/lms/widgets/RequestInvite.html rename to lms/lms/widgets/RequestInvite.html index 943dc75f..3da5c6f2 100644 --- a/school/lms/widgets/RequestInvite.html +++ b/lms/lms/widgets/RequestInvite.html @@ -14,7 +14,7 @@ $("#submit-invite-request").click(function () { var invite_email = $("#invite_email").val() frappe.call({ - method: "school.lms.doctype.invite_request.invite_request.create_invite_request", + method: "lms.lms.doctype.invite_request.invite_request.create_invite_request", args: { invite_email: invite_email }, diff --git a/school/lms/widgets/Reviews.html b/lms/lms/widgets/Reviews.html similarity index 79% rename from school/lms/widgets/Reviews.html rename to lms/lms/widgets/Reviews.html index 56c11e67..9106769c 100644 --- a/school/lms/widgets/Reviews.html +++ b/lms/lms/widgets/Reviews.html @@ -19,7 +19,7 @@
{% for i in [1, 2, 3, 4, 5] %} - + {% endfor %} @@ -49,14 +49,16 @@ {% if reviews | length %}
{% for review in reviews %} -
-
-
-
- {{ widgets.Avatar(member=review.owner_details, avatar_class="avatar-medium") }} -
- {% if loop.index != reviews | length %}
@@ -85,21 +87,23 @@ {% else %}
- +
{{ _("Review the course") }}
{{ _("Help us improve our course material.") }}
- {% if is_eligible_to_review(course.name, membership) %} - - {{ _("Write a review") }} - - {% elif frappe.session.user == "Guest" %} - {{ _("Login") }} - {% elif not membership %} -
{{ _("Start Learning") }}
+ {% if not is_instructor(course.name) %} + {% if is_eligible_to_review(course.name, membership) %} + + {{ _("Write a review") }} + + {% elif frappe.session.user == "Guest" %} + {{ _("Login") }} + {% elif not membership %} +
{{ _("Start Learning") }}
+ {% endif %} {% endif %}
diff --git a/school/lms/workspace/lms/lms.json b/lms/lms/workspace/lms/lms.json similarity index 100% rename from school/lms/workspace/lms/lms.json rename to lms/lms/workspace/lms/lms.json diff --git a/school/lms/workspace/school/school.json b/lms/lms/workspace/school/school.json similarity index 98% rename from school/lms/workspace/school/school.json rename to lms/lms/workspace/school/school.json index e4415c38..9efa29c6 100644 --- a/school/lms/workspace/school/school.json +++ b/lms/lms/workspace/school/school.json @@ -18,7 +18,7 @@ "idx": 0, "is_default": 0, "is_standard": 1, - "label": "School", + "label": "LMS", "links": [ { "hidden": 0, @@ -90,7 +90,7 @@ "modified": "2021-10-21 18:18:02.114827", "modified_by": "Administrator", "module": "LMS", - "name": "School", + "name": "LMS", "owner": "Administrator", "parent_page": "", "pin_to_bottom": 0, @@ -127,5 +127,5 @@ "type": "DocType" } ], - "title": "School" -} \ No newline at end of file + "title": "LMS" +} diff --git a/lms/modules.txt b/lms/modules.txt new file mode 100644 index 00000000..60cd0404 --- /dev/null +++ b/lms/modules.txt @@ -0,0 +1,2 @@ +LMS +Job diff --git a/school/overrides/test_user.py b/lms/overrides/test_user.py similarity index 96% rename from school/overrides/test_user.py rename to lms/overrides/test_user.py index 4a793e00..a950e470 100644 --- a/school/overrides/test_user.py +++ b/lms/overrides/test_user.py @@ -18,7 +18,7 @@ class TestCustomUser(unittest.TestCase): def test_without_username(self): """ The user in this test has the same first name as the user of the test test_with_basic_username. In such cases frappe makes the username of the second user empty. - The condition in school app should override this and save a username. """ + The condition in lms app should override this and save a username. """ new_user = frappe.get_doc({ "doctype": "User", "email": "test-without-username@example.com", diff --git a/school/overrides/user.py b/lms/overrides/user.py similarity index 87% rename from school/overrides/user.py rename to lms/overrides/user.py index d3b095ab..19d968bf 100644 --- a/school/overrides/user.py +++ b/lms/overrides/user.py @@ -8,7 +8,7 @@ from frappe import _ from frappe.website.utils import is_signup_disabled import requests from frappe.geo.country_info import get_all -from school.widgets import Widgets +from lms.widgets import Widgets class CustomUser(User): @@ -102,16 +102,6 @@ class CustomUser(User): "owner": self.name }) - def get_course_membership(self, member_type=None): - """ Returns all memberships of the user """ - filters = { - "member": self.name - } - if member_type: - filters["member_type"] = member_type - - return frappe.get_all("LMS Batch Membership", filters, ["name", "course", "progress"]) - def get_mentored_courses(self): """ Returns all courses mentored by this user """ mentored_courses = [] @@ -130,31 +120,53 @@ class CustomUser(User): return mentored_courses - def get_enrolled_courses(self): - in_progress = [] - completed = [] - memberships = self.get_course_membership("Student") - for membership in memberships: - course = frappe.db.get_value("LMS Course", membership.course, - ["name", "upcoming", "title", "image", "enable_certification"], as_dict=True) - progress = cint(membership.progress) - if progress < 100: - in_progress.append(course) - else: - completed.append(course) - return { - "in_progress": in_progress, - "completed": completed - } -def get_authored_courses(member): +def get_enrolled_courses(): + in_progress = [] + completed = [] + memberships = get_course_membership(frappe.session.user, member_type="Student") + for membership in memberships: + course = frappe.db.get_value("LMS Course", membership.course, + ["name", "upcoming", "title", "image", "enable_certification"], as_dict=True) + progress = cint(membership.progress) + if progress < 100: + in_progress.append(course) + else: + completed.append(course) + + return { + "in_progress": in_progress, + "completed": completed + } + +def get_course_membership(member, member_type=None): + """ Returns all memberships of the user """ + filters = { + "member": member + } + if member_type: + filters["member_type"] = member_type + + return frappe.get_all("LMS Batch Membership", filters, ["name", "course", "progress"]) + + +def get_authored_courses(member, only_published=True): """Returns the number of courses authored by this user. """ - return frappe.get_all( - 'LMS Course', { - 'instructor': member, - 'is_published': True - }) + course_details = [] + + filters = { + "instructor": member + } + if only_published: + filters["is_published"] = True + courses = frappe.get_all('LMS Course', filters) + + for course in courses: + course_details.append(frappe.db.get_value("LMS Course", course, + ["name", "upcoming", "title", "image", "enable_certification", "status"], as_dict=True)) + + return course_details def get_palette(full_name): """ diff --git a/school/overrides/web_template.py b/lms/overrides/web_template.py similarity index 92% rename from school/overrides/web_template.py rename to lms/overrides/web_template.py index 0904a212..83b3cae6 100644 --- a/school/overrides/web_template.py +++ b/lms/overrides/web_template.py @@ -1,6 +1,6 @@ import frappe from frappe.website.doctype.web_template.web_template import WebTemplate -from school.widgets import Widgets +from lms.widgets import Widgets import json class CustomWebTemplate(WebTemplate): diff --git a/school/page_renderers.py b/lms/page_renderers.py similarity index 98% rename from school/page_renderers.py rename to lms/page_renderers.py index 00eb00ef..f16df720 100644 --- a/school/page_renderers.py +++ b/lms/page_renderers.py @@ -1,4 +1,4 @@ -"""Custom page renderers for School app. +"""Custom page renderers for LMS app. Handles rendering of profile pages. """ diff --git a/school/patches.txt b/lms/patches.txt similarity index 93% rename from school/patches.txt rename to lms/patches.txt index 996ddade..01aa751c 100644 --- a/school/patches.txt +++ b/lms/patches.txt @@ -22,3 +22,5 @@ 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) school.patches.v0_0.multiple_instructors #11-02-2022 +school.patches.v0_0.set_course_in_lesson #21-03-2022 +school.patches.v0_0.set_status_in_course #21-03-2022 diff --git a/school/patches/change_name_for_community_members.py b/lms/patches/change_name_for_community_members.py similarity index 100% rename from school/patches/change_name_for_community_members.py rename to lms/patches/change_name_for_community_members.py diff --git a/school/patches/create_mentor_request_email_templates.py b/lms/patches/create_mentor_request_email_templates.py similarity index 95% rename from school/patches/create_mentor_request_email_templates.py rename to lms/patches/create_mentor_request_email_templates.py index 1ac72715..cfdc97af 100644 --- a/school/patches/create_mentor_request_email_templates.py +++ b/lms/patches/create_mentor_request_email_templates.py @@ -4,7 +4,7 @@ from frappe import _ def execute(): frappe.reload_doc("email", "doctype", "email_template") - base_path = frappe.get_app_path("school", "templates", "emails") + base_path = frappe.get_app_path("lms", "templates", "emails") if not frappe.db.exists("Email Template", _('Mentor Request Creation Template')): response = frappe.read_file(os.path.join(base_path, "mentor_request_creation_email.html")) diff --git a/school/patches/replace_member_with_user_in_batch_membership.py b/lms/patches/replace_member_with_user_in_batch_membership.py similarity index 100% rename from school/patches/replace_member_with_user_in_batch_membership.py rename to lms/patches/replace_member_with_user_in_batch_membership.py diff --git a/school/patches/replace_member_with_user_in_course_mentor_mapping.py b/lms/patches/replace_member_with_user_in_course_mentor_mapping.py similarity index 100% rename from school/patches/replace_member_with_user_in_course_mentor_mapping.py rename to lms/patches/replace_member_with_user_in_course_mentor_mapping.py diff --git a/school/patches/replace_member_with_user_in_lms_message.py b/lms/patches/replace_member_with_user_in_lms_message.py similarity index 100% rename from school/patches/replace_member_with_user_in_lms_message.py rename to lms/patches/replace_member_with_user_in_lms_message.py diff --git a/school/patches/replace_member_with_user_in_mentor_request.py b/lms/patches/replace_member_with_user_in_mentor_request.py similarity index 100% rename from school/patches/replace_member_with_user_in_mentor_request.py rename to lms/patches/replace_member_with_user_in_mentor_request.py diff --git a/school/patches/save_abbr_for_community_members.py b/lms/patches/save_abbr_for_community_members.py similarity index 100% rename from school/patches/save_abbr_for_community_members.py rename to lms/patches/save_abbr_for_community_members.py diff --git a/school/patches/set_email_preferences.py b/lms/patches/set_email_preferences.py similarity index 100% rename from school/patches/set_email_preferences.py rename to lms/patches/set_email_preferences.py diff --git a/school/patches/v0_0/add_progress_to_membership.py b/lms/patches/v0_0/add_progress_to_membership.py similarity index 94% rename from school/patches/v0_0/add_progress_to_membership.py rename to lms/patches/v0_0/add_progress_to_membership.py index fcf30641..868f63ee 100644 --- a/school/patches/v0_0/add_progress_to_membership.py +++ b/lms/patches/v0_0/add_progress_to_membership.py @@ -1,6 +1,6 @@ import frappe from frappe.utils import rounded -from school.lms.utils import get_course_progress +from lms.lms.utils import get_course_progress def execute(): frappe.reload_doc("lms", "doctype", "lms_batch_membership") diff --git a/school/patches/v0_0/chapter_lesson_index_table.py b/lms/patches/v0_0/chapter_lesson_index_table.py similarity index 100% rename from school/patches/v0_0/chapter_lesson_index_table.py rename to lms/patches/v0_0/chapter_lesson_index_table.py diff --git a/school/patches/v0_0/course_instructor_update.py b/lms/patches/v0_0/course_instructor_update.py similarity index 100% rename from school/patches/v0_0/course_instructor_update.py rename to lms/patches/v0_0/course_instructor_update.py diff --git a/school/patches/v0_0/modify_installed_apps_list.py b/lms/patches/v0_0/modify_installed_apps_list.py similarity index 98% rename from school/patches/v0_0/modify_installed_apps_list.py rename to lms/patches/v0_0/modify_installed_apps_list.py index 3fdeb2df..da673e90 100644 --- a/school/patches/v0_0/modify_installed_apps_list.py +++ b/lms/patches/v0_0/modify_installed_apps_list.py @@ -3,7 +3,7 @@ import frappe from frappe.installer import add_to_installed_apps, remove_from_installed_apps def execute(): - + if "community" in frappe.db.get_global("installed_apps"): remove_from_installed_apps("community") add_to_installed_apps("school") diff --git a/school/patches/v0_0/multiple_instructors.py b/lms/patches/v0_0/multiple_instructors.py similarity index 100% rename from school/patches/v0_0/multiple_instructors.py rename to lms/patches/v0_0/multiple_instructors.py diff --git a/school/patches/v0_0/rename_chapter_and_lesson_doctype.py b/lms/patches/v0_0/rename_chapter_and_lesson_doctype.py similarity index 100% rename from school/patches/v0_0/rename_chapter_and_lesson_doctype.py rename to lms/patches/v0_0/rename_chapter_and_lesson_doctype.py diff --git a/school/patches/v0_0/rename_chapters_and_lessons_doctype.py b/lms/patches/v0_0/rename_chapters_and_lessons_doctype.py similarity index 100% rename from school/patches/v0_0/rename_chapters_and_lessons_doctype.py rename to lms/patches/v0_0/rename_chapters_and_lessons_doctype.py diff --git a/lms/patches/v0_0/rename_school_to_lms.py b/lms/patches/v0_0/rename_school_to_lms.py new file mode 100644 index 00000000..a8fce72b --- /dev/null +++ b/lms/patches/v0_0/rename_school_to_lms.py @@ -0,0 +1,11 @@ +from __future__ import unicode_literals +import frappe +from frappe.installer import add_to_installed_apps, remove_from_installed_apps + +def execute(): + + if "school" in frappe.db.get_global("installed_apps"): + remove_from_installed_apps("school") + add_to_installed_apps("lms") + + diff --git a/lms/patches/v0_0/set_course_in_lesson.py b/lms/patches/v0_0/set_course_in_lesson.py new file mode 100644 index 00000000..7d0ccd1f --- /dev/null +++ b/lms/patches/v0_0/set_course_in_lesson.py @@ -0,0 +1,8 @@ +import frappe + +def execute(): + frappe.reload_doc("lms", "doctype", "course_lesson") + lessons = frappe.get_all("Course Lesson", fields=["name", "chapter"]) + for lesson in lessons: + course = frappe.db.get_value("Course Chapter", lesson.chapter, "course") + frappe.db.set_value("Course Lesson", lesson.name, "course", course) diff --git a/lms/patches/v0_0/set_status_in_course.py b/lms/patches/v0_0/set_status_in_course.py new file mode 100644 index 00000000..d123e073 --- /dev/null +++ b/lms/patches/v0_0/set_status_in_course.py @@ -0,0 +1,8 @@ +import frappe + +def execute(): + frappe.reload_doc("lms", "doctype", "lms_course") + courses = frappe.get_all("LMS Course", {"status": ("is", "not set")}, ["name", "is_published"]) + for course in courses: + status = "Approved" if course.is_published else "In Progress" + frappe.db.set_value("LMS Course", course.name, "status", status) diff --git a/school/plugins.py b/lms/plugins.py similarity index 98% rename from school/plugins.py rename to lms/plugins.py index c2889557..cd03d2a6 100644 --- a/school/plugins.py +++ b/lms/plugins.py @@ -1,6 +1,6 @@ """ The plugins module provides various plugins to change the default -behaviour some parts of the school app. +behaviour some parts of the lms app. A site specify what plugins to use using appropriate entries in the frappe hooks, written in the `hooks.py`. @@ -140,5 +140,5 @@ def assignment_renderer(detail): def show_custom_signup(): if (frappe.db.get_single_value("LMS Settings", "terms_of_use") or frappe.db.get_single_value("LMS Settings", "privacy_policy")): - return "school/templates/signup-form.html" + return "lms/templates/signup-form.html" return "frappe/templates/signup.html" diff --git a/school/public/css/school.bundle.less b/lms/public/css/lms.bundle.less similarity index 100% rename from school/public/css/school.bundle.less rename to lms/public/css/lms.bundle.less diff --git a/school/public/css/style.css b/lms/public/css/style.css similarity index 87% rename from school/public/css/style.css rename to lms/public/css/style.css index 327ad8f3..946bbca9 100644 --- a/school/public/css/style.css +++ b/lms/public/css/style.css @@ -58,7 +58,7 @@ input[type=checkbox] { letter-spacing: 0.011em; text-transform: uppercase; font-weight: 600; - box-shadow: var(--popover-box-shadow); + box-shadow: var(--shadow-sm); color: var(--gray-900); width: fit-content; } @@ -73,9 +73,10 @@ input[type=checkbox] { } .common-page-style { - padding-bottom: 5rem; + padding: 2rem 0 5rem; min-height: 60vh; padding-top: 3rem; + background-color: var(--bg-color); } .common-card-style { @@ -99,47 +100,36 @@ input[type=checkbox] { } .course-card-meta { - margin: 0.75rem 0 0.5rem; + display: flex; + align-items: center; + justify-content: space-between; font-size: var(--text-base); - color: var(--gray-600); + color: var(--gray-900); + margin-bottom: 0.5rem; } -.course-card-meta-2 { - color: var(--gray-700); +.icon { + margin: 0; + margin-right: 0.25rem; +} + +.lesson-links .icon { + stroke: none; } .course-card-content { - padding: 0 1.25rem 1.25rem; + padding: 1rem; display: flex; flex-direction: column; flex: 1 1 auto; } -@media (max-width: 400px) { - .course-card-content { - padding: 0 0.5rem 1.25rem; - } -} - -@media (max-width: 350px) { - .course-card-content { - padding: 0px 10px 10px; - } -} - .course-card-title { - font-size: 1.125rem; font-weight: 600; - color: var(--gray-800); + color: var(--gray-900); margin-bottom: 1.25rem; } -@media (max-width: 360px) { - .card-heading { - font-size: 0.875rem; - } -} - .card-divider { border-top: 1px solid var(--gray-300); margin-bottom: 1rem; @@ -151,9 +141,8 @@ input[type=checkbox] { } .course-instructor { - margin-left: 0.625rem; - font-size: 0.875rem; - color: var(--gray-700); + margin-left: 0.5rem; + font-size: var(--text-base); } @media (max-width: 400px) { @@ -164,9 +153,9 @@ input[type=checkbox] { .course-student-count { display: flex; - font-size: 12px; + font-size: var(--text-base); float: right; - font-weight: 500; + color: var(--gray-900); } .course-card-footer { @@ -222,12 +211,12 @@ input[type=checkbox] { } .button-links { - color: #4C5A67; + color: var(--gray-900); } .button-links:hover { text-decoration: none; - color: #4C5A67; + color: var(--gray-900); } .icon-background { @@ -243,14 +232,9 @@ input[type=checkbox] { height: 100%; } -.review-card-footer { - margin-top: 20px; - justify-content: space-between; -} - .review-content { - padding: 24px; - flex: 1; + margin: 1rem 0 0 3.5rem; + color: var(--gray-700); } .submit-review { @@ -273,7 +257,7 @@ input[type=checkbox] { } .custom-checkbox>label>input:checked+.empty-checkbox { - background: url(/assets/school/icons/tick.svg); + background: url(/assets/lms/icons/tick.svg); background-repeat: no-repeat; background-position: center center; } @@ -290,13 +274,25 @@ input[type=checkbox] { } .course-card-wide { - margin-top: 1rem; - width: 60%; + background-color: white; + padding: 0 1.25rem 1.25rem; + border-radius: var(--border-radius); + width: 50%; + box-shadow: var(--shadow-base); + font-size: var(--text-base); +} + +@media (max-width: 1000px) { + .course-card-wide { + width: 75%; + margin: 0 auto; + } } @media (max-width: 768px) { .course-card-wide { width: 100%; + margin: 0; } } @@ -309,10 +305,9 @@ input[type=checkbox] { .course-card-wide-title { font-weight: bold; - font-size: 36px; + font-size: var(--text-3xl); line-height: 44px; color: var(--gray-900); - margin-bottom: 0.75rem; } .button { @@ -347,17 +342,17 @@ input[type=checkbox] { .is-secondary { background: #FFFFFF; - color: inherit; + color: var(--gray-900); } .is-secondary:hover { text-decoration: none; - color: inherit; + color: var(--gray-900); } .is-default { background: var(--gray-100); - color: var(--gray-700); + color: var(--gray-900); } .is-default:disabled { @@ -378,18 +373,22 @@ input[type=checkbox] { margin: 5rem 0 4rem; } +.course-home-page { + background-color: #FFFFFF; + padding-top: 3.75rem; +} + .chapter-title { - font-weight: 500; cursor: pointer; border-radius: var(--border-radius-lg); - padding: 0.75rem 0; + padding: 0.5rem 0; color: var(--gray-900); display: flex; align-items: center; } .chapter-description { - margin: 0.75rem 3rem 1rem; + margin: 0 2rem 0.5rem; } .course-content-parent .chapter-description { @@ -397,25 +396,24 @@ input[type=checkbox] { } .chapter-icon { - margin-right: 1.25rem; + margin-right: 0.5rem; } .reviews-parent { - margin: 5rem 0; -} - -.course-description-section { - margin-top: 3.75rem; + padding-bottom: 5rem; + color: var(--gray-900); } .lesson-info { font-size: 16px; + color: var(--gray-900); letter-spacing: -0.011em; } .lesson-links { display: flex; - padding: 0.75rem 1rem; + align-items: center; + padding: 0.5rem; color: inherit; } @@ -426,14 +424,8 @@ input[type=checkbox] { border-radius: var(--border-radius-md); } -.course-content-parent .chapter-title { - font-size: var(--text-md); -} - .course-content-parent .lesson-links { - padding: 0.5rem 1rem; - font-size: var(--text-md); - line-height: 200%; + font-size: var(--text-base); } .course-outline { @@ -442,7 +434,7 @@ input[type=checkbox] { } .lessons { - margin-left: 2.5rem; + margin-left: 2rem; } .member-card { @@ -508,17 +500,17 @@ input[type=checkbox] { .member-parent { display: grid; grid-template-columns: repeat(auto-fill, minmax(250px, 1fr)); - -moz-column-gap: 1.25rem; - column-gap: 1.25rem; - row-gap: 1.25rem; + -moz-column-gap: 2rem; + column-gap: 2rem; + row-gap: 2rem; } @media (max-width: 600px) { .member-parent { grid-template-columns: repeat(auto-fill, minmax(125px, 1fr)); - -moz-column-gap: 1.25rem; - column-gap: 1.25rem; - row-gap: 1.25rem; + -moz-column-gap: 2rem; + column-gap: 2rem; + row-gap: 2rem; } } @@ -580,9 +572,10 @@ input[type=checkbox] { .breadcrumb { display: flex; align-items: center; - font-size: var(--text-md); + font-size: var(--text-base); line-height: 20px; color: var(--gray-900); + padding: 1rem 0; } .course-details-outline { @@ -590,7 +583,11 @@ input[type=checkbox] { } .lesson-content-card { - margin-top: 2rem; + margin-top: 1rem; +} + +.lesson-page { + background-color: #FFFFFF; } .lesson-content-card .alert-dismissible .close { @@ -663,7 +660,6 @@ input[type=checkbox] { .profile-banner { height: 248px; - border-radius: 0 0 var(--border-radius-lg) var(--border-radius-lg); background-size: cover; background-position: center; } @@ -675,21 +671,23 @@ input[type=checkbox] { } .profile-info { - height: 68px; + height: 90px; background: #ffffff; border-radius: 0px 0px 8px 8px; font-size: var(--text-sm); display: flex; - justify-content: space-between; - margin: 0 1rem 4rem 0; flex-direction: column; + margin-bottom: 4rem; padding-left: 200px; + padding-right: 1rem; + box-shadow: var(--shadow-sm); } @media (max-width: 550px) { .profile-info { align-items: flex-end; padding-left: 0; + height: 150px; } } @@ -741,10 +739,6 @@ input[type=checkbox] { } } -.profile-link { - margin-left: auto; -} - .creator-badge { background: #48BB74; padding: 4px 6px; @@ -817,8 +811,8 @@ input[type=checkbox] { } .progress-percent { - margin: 0.5rem 0 1.3rem; - font-size: 0.8rem; + margin: 0.5rem 0; + font-size: var(--text-base); font-weight: 500; } @@ -852,6 +846,10 @@ pre { font-size: 1rem; } +.markdown-source p:last-child { + margin-bottom: 0; +} + .avatar img { object-fit: cover; } @@ -955,15 +953,15 @@ pre { background-image: url(/assets/frappe/icons/timeless/search.svg); border: none; border-radius: var(--border-radius-md); - font-size: var(--text-sm); + font-size: var(--text-base); padding: 0.625rem 0.75rem; height: 36px; background-repeat: no-repeat; text-indent: 1.5rem; - background-position: 1rem 0.6rem; + background-position: 1rem 0.7rem; float: right; width: 25%; - background-color: var(--gray-100); + box-shadow: var(--shadow-sm); } .section-heading { @@ -1000,13 +998,13 @@ pre { } .carousel-control-prev-icon { - background-image: url("/assets/school/icons/slider-arrow-left.svg"); + background-image: url("/assets/lms/icons/slider-arrow-left.svg"); width: 40px; height: 40px; } .carousel-control-next-icon { - background-image: url("/assets/school/icons/slider-arrow-right.svg"); + background-image: url("/assets/lms/icons/slider-arrow-right.svg"); width: 40px; height: 40px; } @@ -1144,6 +1142,7 @@ pre { flex-direction: column; align-items: flex-end; justify-content: space-between; + margin-left: auto; } .job-detail-card { @@ -1151,11 +1150,6 @@ pre { flex-direction: column; } -.job-detail-card span::before { - content: "\00B7"; - margin: 0 8px; -} - .job-subtitle { font-size: var(--text-base); margin-bottom: 1.875rem; @@ -1171,51 +1165,16 @@ pre { color: var(--gray-900); } -.company-name { - font-size: var(--text-base); -} - -.job-meta { - display: flex; - align-items: center; - color: var(--gray-700); - font-size: var(--text-base); -} - -.job-type { - background-color: var(--dark-green-100); - color: var(--dark-green-500); - border-radius: var(--border-radius-md); - padding: 0.25rem 0.5rem; - font-weight: 600; - font-size: 11px; - text-transform: uppercase; - letter-spacing: 0.6px; - margin-bottom: 0.5rem; - width: fit-content; -} - -.job-description { - margin-top: 3.75rem; -} - .course-head-container { color: var(--gray-900); } -.course-intructor-rating-section { - display: flex; - align-items: center; - margin-top: 3.5rem; -} - -.course-intructor-rating-section .seperator::before { - content: "\00B7"; +.seperator { margin: 0 1rem; } .course-head-container .progress { - margin-top: 2.75rem; + margin-top: 1rem; } .course-overlay-card { @@ -1225,32 +1184,31 @@ pre { overflow: auto; width: fit-content; position: fixed; - top: 40%; + top: 50%; right: 7%; max-width: 400px; z-index: 4; } -@media (max-width: 768px) { +@media (max-width: 1000px) { .course-overlay-card { position: inherit; - margin-top: 1rem; + margin: 1rem auto; } - .course-intructor-rating-section .seperator::before { - content: "\00B7"; + .seperator { margin: 0 0.25rem; } } .video-in-overlay { - top: 30%; + top: 40%; } .course-overlay-content { padding: 1.25rem; font-size: var(--text-base); - color: var(--gray-700); + color: var(--gray-900); } .breadcrumb-destination { @@ -1267,7 +1225,7 @@ pre { width: 60%; } -@media (max-width: 768px) { +@media (max-width: 1000px) { .course-body-container { width: 100%; } @@ -1293,15 +1251,9 @@ pre { box-shadow: none; } -.course-creator-name { - font-size: var(--text-xl); - font-weight: 500; - color: var(--gray-900); -} - .course-meta { font-size: var(--text-base); - color: var(--gray-600); + color: var(--gray-900); } .avg-rating { @@ -1341,6 +1293,7 @@ pre { .star-click { --star-fill: var(--yellow-500); + margin-right: 0; } .rating { @@ -1360,6 +1313,7 @@ pre { .reviews-parent .progress { width: 200px; + color: var(--gray-900); } .reviews-parent .progress-bar { @@ -1426,3 +1380,33 @@ pre { .carousel-inner { overflow: inherit; } + +.dashboard .nav-link { + color: var(--text-muted); + padding: 0 0 var(--padding-md); + margin-right: var(--margin-xl); +} + +.dashboard .nav-link.active { + font-weight: 600; + border-bottom: 1px solid var(--primary); + color: var(--text-color); +} + +.dashboard .nav-link:hover { + color: inherit; +} + +.dashboard-button { + position: relative; + top: -50px; + margin-left: auto; +} + +.course-card-wide .breadcrumb { + margin-bottom: 0; +} + +.course-content-parent .course-details-outline .course-home-headings { + display: none; +} diff --git a/school/public/dist/css-rtl/community.bundle.IJYJLJRM.css b/lms/public/dist/css-rtl/community.bundle.IJYJLJRM.css similarity index 100% rename from school/public/dist/css-rtl/community.bundle.IJYJLJRM.css rename to lms/public/dist/css-rtl/community.bundle.IJYJLJRM.css diff --git a/school/public/dist/css/community.bundle.5K2BM4R4.css b/lms/public/dist/css/community.bundle.5K2BM4R4.css similarity index 100% rename from school/public/dist/css/community.bundle.5K2BM4R4.css rename to lms/public/dist/css/community.bundle.5K2BM4R4.css diff --git a/school/public/icons/arrow.svg b/lms/public/icons/arrow.svg similarity index 100% rename from school/public/icons/arrow.svg rename to lms/public/icons/arrow.svg diff --git a/school/public/icons/blue-arrow.svg b/lms/public/icons/blue-arrow.svg similarity index 100% rename from school/public/icons/blue-arrow.svg rename to lms/public/icons/blue-arrow.svg diff --git a/school/public/icons/book.svg b/lms/public/icons/book.svg similarity index 100% rename from school/public/icons/book.svg rename to lms/public/icons/book.svg diff --git a/school/public/icons/book_plain.svg b/lms/public/icons/book_plain.svg similarity index 100% rename from school/public/icons/book_plain.svg rename to lms/public/icons/book_plain.svg diff --git a/school/public/icons/calendar.svg b/lms/public/icons/calendar.svg similarity index 100% rename from school/public/icons/calendar.svg rename to lms/public/icons/calendar.svg diff --git a/school/public/icons/call.svg b/lms/public/icons/call.svg similarity index 100% rename from school/public/icons/call.svg rename to lms/public/icons/call.svg diff --git a/school/public/icons/check.svg b/lms/public/icons/check.svg similarity index 100% rename from school/public/icons/check.svg rename to lms/public/icons/check.svg diff --git a/school/public/icons/chevron-right.svg b/lms/public/icons/chevron-right.svg similarity index 67% rename from school/public/icons/chevron-right.svg rename to lms/public/icons/chevron-right.svg index 28890edf..e66ce425 100644 --- a/school/public/icons/chevron-right.svg +++ b/lms/public/icons/chevron-right.svg @@ -1,3 +1,3 @@ - + diff --git a/school/public/icons/chevron.svg b/lms/public/icons/chevron.svg similarity index 100% rename from school/public/icons/chevron.svg rename to lms/public/icons/chevron.svg diff --git a/school/public/icons/clock.svg b/lms/public/icons/clock.svg similarity index 100% rename from school/public/icons/clock.svg rename to lms/public/icons/clock.svg diff --git a/school/public/icons/comment.svg b/lms/public/icons/comment.svg similarity index 100% rename from school/public/icons/comment.svg rename to lms/public/icons/comment.svg diff --git a/school/public/icons/course.svg b/lms/public/icons/course.svg similarity index 100% rename from school/public/icons/course.svg rename to lms/public/icons/course.svg diff --git a/school/public/icons/down-arrow-white.svg b/lms/public/icons/down-arrow-white.svg similarity index 100% rename from school/public/icons/down-arrow-white.svg rename to lms/public/icons/down-arrow-white.svg diff --git a/school/public/icons/down-arrow.svg b/lms/public/icons/down-arrow.svg similarity index 100% rename from school/public/icons/down-arrow.svg rename to lms/public/icons/down-arrow.svg diff --git a/school/public/icons/github.svg b/lms/public/icons/github.svg similarity index 100% rename from school/public/icons/github.svg rename to lms/public/icons/github.svg diff --git a/school/public/icons/left-arrow.svg b/lms/public/icons/left-arrow.svg similarity index 100% rename from school/public/icons/left-arrow.svg rename to lms/public/icons/left-arrow.svg diff --git a/school/public/icons/like.svg b/lms/public/icons/like.svg similarity index 100% rename from school/public/icons/like.svg rename to lms/public/icons/like.svg diff --git a/school/public/icons/linkedin.svg b/lms/public/icons/linkedin.svg similarity index 100% rename from school/public/icons/linkedin.svg rename to lms/public/icons/linkedin.svg diff --git a/school/public/icons/mail.svg b/lms/public/icons/mail.svg similarity index 100% rename from school/public/icons/mail.svg rename to lms/public/icons/mail.svg diff --git a/school/public/icons/medium.svg b/lms/public/icons/medium.svg similarity index 100% rename from school/public/icons/medium.svg rename to lms/public/icons/medium.svg diff --git a/school/public/icons/message.svg b/lms/public/icons/message.svg similarity index 100% rename from school/public/icons/message.svg rename to lms/public/icons/message.svg diff --git a/school/public/icons/minus-circle-green.svg b/lms/public/icons/minus-circle-green.svg similarity index 100% rename from school/public/icons/minus-circle-green.svg rename to lms/public/icons/minus-circle-green.svg diff --git a/school/public/icons/minus-circle.svg b/lms/public/icons/minus-circle.svg similarity index 100% rename from school/public/icons/minus-circle.svg rename to lms/public/icons/minus-circle.svg diff --git a/school/public/icons/play.svg b/lms/public/icons/play.svg similarity index 100% rename from school/public/icons/play.svg rename to lms/public/icons/play.svg diff --git a/school/public/icons/rating-filled.svg b/lms/public/icons/rating-filled.svg similarity index 100% rename from school/public/icons/rating-filled.svg rename to lms/public/icons/rating-filled.svg diff --git a/school/public/icons/rating.svg b/lms/public/icons/rating.svg similarity index 100% rename from school/public/icons/rating.svg rename to lms/public/icons/rating.svg diff --git a/school/public/icons/search.svg b/lms/public/icons/search.svg similarity index 100% rename from school/public/icons/search.svg rename to lms/public/icons/search.svg diff --git a/school/public/icons/side-arrow-white.svg b/lms/public/icons/side-arrow-white.svg similarity index 100% rename from school/public/icons/side-arrow-white.svg rename to lms/public/icons/side-arrow-white.svg diff --git a/school/public/icons/slash.svg b/lms/public/icons/slash.svg similarity index 100% rename from school/public/icons/slash.svg rename to lms/public/icons/slash.svg diff --git a/school/public/icons/slider-arrow-left.svg b/lms/public/icons/slider-arrow-left.svg similarity index 100% rename from school/public/icons/slider-arrow-left.svg rename to lms/public/icons/slider-arrow-left.svg diff --git a/school/public/icons/slider-arrow-right.svg b/lms/public/icons/slider-arrow-right.svg similarity index 100% rename from school/public/icons/slider-arrow-right.svg rename to lms/public/icons/slider-arrow-right.svg diff --git a/school/public/icons/small-add-black.svg b/lms/public/icons/small-add-black.svg similarity index 100% rename from school/public/icons/small-add-black.svg rename to lms/public/icons/small-add-black.svg diff --git a/school/public/icons/small-add.svg b/lms/public/icons/small-add.svg similarity index 100% rename from school/public/icons/small-add.svg rename to lms/public/icons/small-add.svg diff --git a/lms/public/icons/symbol-defs.svg b/lms/public/icons/symbol-defs.svg new file mode 100644 index 00000000..0090c5c8 --- /dev/null +++ b/lms/public/icons/symbol-defs.svg @@ -0,0 +1,31 @@ + diff --git a/school/public/icons/tick.svg b/lms/public/icons/tick.svg similarity index 100% rename from school/public/icons/tick.svg rename to lms/public/icons/tick.svg diff --git a/school/public/icons/up-arrow-white.svg b/lms/public/icons/up-arrow-white.svg similarity index 100% rename from school/public/icons/up-arrow-white.svg rename to lms/public/icons/up-arrow-white.svg diff --git a/school/public/icons/user.svg b/lms/public/icons/user.svg similarity index 100% rename from school/public/icons/user.svg rename to lms/public/icons/user.svg diff --git a/school/public/icons/white-arrow.svg b/lms/public/icons/white-arrow.svg similarity index 100% rename from school/public/icons/white-arrow.svg rename to lms/public/icons/white-arrow.svg diff --git a/school/public/icons/white-tick.svg b/lms/public/icons/white-tick.svg similarity index 100% rename from school/public/icons/white-tick.svg rename to lms/public/icons/white-tick.svg diff --git a/school/public/icons/wrong.svg b/lms/public/icons/wrong.svg similarity index 100% rename from school/public/icons/wrong.svg rename to lms/public/icons/wrong.svg diff --git a/school/public/images/Vector.png b/lms/public/images/Vector.png similarity index 100% rename from school/public/images/Vector.png rename to lms/public/images/Vector.png diff --git a/school/public/images/certificate-background.png b/lms/public/images/certificate-background.png similarity index 100% rename from school/public/images/certificate-background.png rename to lms/public/images/certificate-background.png diff --git a/school/public/images/course-home.png b/lms/public/images/course-home.png similarity index 100% rename from school/public/images/course-home.png rename to lms/public/images/course-home.png diff --git a/school/public/images/linkedin.png b/lms/public/images/linkedin.png similarity index 100% rename from school/public/images/linkedin.png rename to lms/public/images/linkedin.png diff --git a/school/public/images/play.png b/lms/public/images/play.png similarity index 100% rename from school/public/images/play.png rename to lms/public/images/play.png diff --git a/school/public/images/profile-banner.png b/lms/public/images/profile-banner.png similarity index 100% rename from school/public/images/profile-banner.png rename to lms/public/images/profile-banner.png diff --git a/school/public/images/wallpaper.png b/lms/public/images/wallpaper.png similarity index 100% rename from school/public/images/wallpaper.png rename to lms/public/images/wallpaper.png diff --git a/school/public/js/html2canvas.js b/lms/public/js/html2canvas.js similarity index 100% rename from school/public/js/html2canvas.js rename to lms/public/js/html2canvas.js diff --git a/school/public/js/livecode-canvas.js b/lms/public/js/livecode-canvas.js similarity index 100% rename from school/public/js/livecode-canvas.js rename to lms/public/js/livecode-canvas.js diff --git a/lms/public/js/profile.js b/lms/public/js/profile.js new file mode 100644 index 00000000..da0a5b9b --- /dev/null +++ b/lms/public/js/profile.js @@ -0,0 +1,10 @@ +frappe.ready(() => { + hide_profile_and_dashboard_for_guest_users(); +}); + +const hide_profile_and_dashboard_for_guest_users = () => { + if (frappe.session.user == "Guest") { + let links = $('.nav-link').filter((i, elem) => $(elem).text().trim() === "My Profile" || $(elem).text().trim() === "Dashboard"); + links.length && links.each((i, elem) => $(elem).addClass("hide")); + } +}; diff --git a/school/public/js/website.bundle.js b/lms/public/js/website.bundle.js similarity index 100% rename from school/public/js/website.bundle.js rename to lms/public/js/website.bundle.js diff --git a/school/query.py b/lms/query.py similarity index 100% rename from school/query.py rename to lms/query.py diff --git a/school/routing.py b/lms/routing.py similarity index 100% rename from school/routing.py rename to lms/routing.py diff --git a/school/lms/doctype/cohort_staff/__init__.py b/lms/templates/__init__.py similarity index 100% rename from school/lms/doctype/cohort_staff/__init__.py rename to lms/templates/__init__.py diff --git a/school/templates/assignment.html b/lms/templates/assignment.html similarity index 100% rename from school/templates/assignment.html rename to lms/templates/assignment.html diff --git a/school/templates/certificate.html b/lms/templates/certificate.html similarity index 95% rename from school/templates/certificate.html rename to lms/templates/certificate.html index 86f87de5..ac9bbc7e 100644 --- a/school/templates/certificate.html +++ b/lms/templates/certificate.html @@ -46,4 +46,4 @@
- + diff --git a/school/templates/course_list.html b/lms/templates/course_list.html similarity index 100% rename from school/templates/course_list.html rename to lms/templates/course_list.html diff --git a/lms/templates/courses_created.html b/lms/templates/courses_created.html new file mode 100644 index 00000000..5b18e173 --- /dev/null +++ b/lms/templates/courses_created.html @@ -0,0 +1,23 @@ +{% set courses = get_authored_courses(frappe.session.user, only_published=False) %} +{% if courses | length %} +
+ {% for course in courses %} + {{ widgets.CourseCard(course=course) }} + {% endfor %} +
+{% else %} +
+
+ +
+
+
{{ _("No courses created") }}
+
{{ _("Help others learn something new.") }}
+
+ +
+{% endif %} diff --git a/school/templates/emails/community_course_membership.html b/lms/templates/emails/community_course_membership.html similarity index 100% rename from school/templates/emails/community_course_membership.html rename to lms/templates/emails/community_course_membership.html diff --git a/school/templates/emails/job_report.html b/lms/templates/emails/job_report.html similarity index 100% rename from school/templates/emails/job_report.html rename to lms/templates/emails/job_report.html diff --git a/school/templates/emails/lms_course_interest.html b/lms/templates/emails/lms_course_interest.html similarity index 100% rename from school/templates/emails/lms_course_interest.html rename to lms/templates/emails/lms_course_interest.html diff --git a/school/templates/emails/lms_daily_digest.html b/lms/templates/emails/lms_daily_digest.html similarity index 100% rename from school/templates/emails/lms_daily_digest.html rename to lms/templates/emails/lms_daily_digest.html diff --git a/school/templates/emails/lms_invite_request_approved.html b/lms/templates/emails/lms_invite_request_approved.html similarity index 100% rename from school/templates/emails/lms_invite_request_approved.html rename to lms/templates/emails/lms_invite_request_approved.html diff --git a/school/templates/emails/lms_message.html b/lms/templates/emails/lms_message.html similarity index 100% rename from school/templates/emails/lms_message.html rename to lms/templates/emails/lms_message.html diff --git a/school/templates/emails/mentor_request_creation_email.html b/lms/templates/emails/mentor_request_creation_email.html similarity index 100% rename from school/templates/emails/mentor_request_creation_email.html rename to lms/templates/emails/mentor_request_creation_email.html diff --git a/school/templates/emails/mentor_request_status_update_email.html b/lms/templates/emails/mentor_request_status_update_email.html similarity index 100% rename from school/templates/emails/mentor_request_status_update_email.html rename to lms/templates/emails/mentor_request_status_update_email.html diff --git a/school/templates/exercise.html b/lms/templates/exercise.html similarity index 100% rename from school/templates/exercise.html rename to lms/templates/exercise.html diff --git a/school/templates/livecode/extension_footer.html b/lms/templates/livecode/extension_footer.html similarity index 98% rename from school/templates/livecode/extension_footer.html rename to lms/templates/livecode/extension_footer.html index 19fbac1b..10ec0e0f 100644 --- a/school/templates/livecode/extension_footer.html +++ b/lms/templates/livecode/extension_footer.html @@ -104,7 +104,7 @@ var name = $(e).data("name"); let code = editor.codemirror.doc.getValue(); - frappe.call("school.lms.api.submit_solution", { + frappe.call("lms.lms.api.submit_solution", { "exercise": name, "code": code }).then(r => { diff --git a/school/templates/livecode/extension_header.html b/lms/templates/livecode/extension_header.html similarity index 100% rename from school/templates/livecode/extension_header.html rename to lms/templates/livecode/extension_header.html diff --git a/school/lms/doctype/cohort_subgroup/__init__.py b/lms/templates/pages/__init__.py similarity index 100% rename from school/lms/doctype/cohort_subgroup/__init__.py rename to lms/templates/pages/__init__.py diff --git a/school/templates/quiz.html b/lms/templates/quiz.html similarity index 97% rename from school/templates/quiz.html rename to lms/templates/quiz.html index 5d5bf5bd..1e68d995 100644 --- a/school/templates/quiz.html +++ b/lms/templates/quiz.html @@ -1,4 +1,4 @@ -
{{ quiz.title }}
+
{{ quiz.title }}
diff --git a/school/templates/search_course/search_course.html b/lms/templates/search_course/search_course.html similarity index 90% rename from school/templates/search_course/search_course.html rename to lms/templates/search_course/search_course.html index 1e81fd8b..b9fb5900 100644 --- a/school/templates/search_course/search_course.html +++ b/lms/templates/search_course/search_course.html @@ -15,5 +15,5 @@
- + {% endif %} diff --git a/school/templates/search_course/search_course.js b/lms/templates/search_course/search_course.js similarity index 96% rename from school/templates/search_course/search_course.js rename to lms/templates/search_course/search_course.js index f5d2c617..ae88bd17 100644 --- a/school/templates/search_course/search_course.js +++ b/lms/templates/search_course/search_course.js @@ -25,7 +25,7 @@ const search_course = (e) => { } frappe.call({ - method: "school.lms.doctype.lms_course.lms_course.search_course", + method: "lms.lms.doctype.lms_course.lms_course.search_course", args: { "text": input }, diff --git a/school/templates/signup-form.html b/lms/templates/signup-form.html similarity index 64% rename from school/templates/signup-form.html rename to lms/templates/signup-form.html index 91c77910..67e0379d 100644 --- a/school/templates/signup-form.html +++ b/lms/templates/signup-form.html @@ -10,24 +10,6 @@
- {% set terms_of_use = frappe.db.get_single_value("LMS Settings", "terms_of_use") %} - {% set privacy_policy = frappe.db.get_single_value("LMS Settings", "privacy_policy") %} - - {% if terms_of_use or privacy_policy %} - - {% if terms_of_use %} - {% 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 = "" + _("Terms of Use") + "" %} - {% endif %} - - {% if privacy_policy %} - {% set privacy_policy_page = frappe.db.get_single_value("LMS Settings", "privacy_policy_page") %} - {% set privacy_page_route = frappe.db.get_value("Web Page", privacy_policy_page, "route") %} - {% set privacy_link = "" + _("Privacy Policy") + "" %} - {% endif %} - - {% set final_link = terms_link + _(" and ") + privacy_link if terms_of_use and privacy_policy else terms_link if terms_of_use else privacy_link %}
@@ -37,13 +19,12 @@ data-fieldtype="Check" data-fieldname="terms" id="signup-terms" required> - {{ _("I have read and agree to your {0}").format(final_link) }} + {{ _("I have read and agree to your {0}").format(get_signup_optin_checks()) }}

- {% endif %}
{% endblock %} diff --git a/school/www/courses/certificate.js b/lms/www/courses/certificate.js similarity index 100% rename from school/www/courses/certificate.js rename to lms/www/courses/certificate.js diff --git a/school/www/courses/certificate.py b/lms/www/courses/certificate.py similarity index 100% rename from school/www/courses/certificate.py rename to lms/www/courses/certificate.py diff --git a/school/www/courses/course.html b/lms/www/courses/course.html similarity index 57% rename from school/www/courses/course.html rename to lms/www/courses/course.html index e76af9fa..1b6825fa 100644 --- a/school/www/courses/course.html +++ b/lms/www/courses/course.html @@ -1,19 +1,24 @@ {% extends "templates/base.html" %} {% block title %}{{ course.title }} {% endblock %} + {% block head_include %} +{% include "public/icons/symbol-defs.svg" %} {% endblock %} + {% block content %} -
+
{{ CourseHomeHeader(course) }} - {{ CourseHeaderOverlay(course) }} -
-
- {{ Description(course) }} - {{ widgets.CourseOutline(course=course, membership=membership) }} - {{ widgets.Reviews(course=course, membership=membership) }} +
+
+
+ {{ CourseHeaderOverlay(course) }} + {{ Description(course) }} + {{ widgets.CourseOutline(course=course, membership=membership) }} + {{ widgets.Reviews(course=course, membership=membership) }} +
@@ -23,28 +28,32 @@ {% macro CourseHomeHeader(course) %}
-
- {{ BreadCrumb(course) }} - {{ CourseCardWide(course) }} +
+
+ {{ BreadCrumb(course) }} + {{ CourseCardWide(course) }} +
- {% endmacro %} {% macro BreadCrumb(course) %}
{{ _("All Courses") }} - + {{ course.title }}
{% endmacro %} {% macro CourseCardWide(course) %} -
+
{% for tag in get_tags(course.name) %}
{{ tag }}
@@ -57,58 +66,27 @@ {{ course.short_introduction }}
-
-
- {% set instructors = get_instructors(course.name) %} - {% set ins_len = instructors | length %} - {% for instructor in instructors %} - {% if ins_len > 1 and loop.index == 1 %} -
- {% endif %} - {{ widgets.Avatar(member=instructor, avatar_class="avatar-small") }} - - {% if ins_len > 1 and loop.index == ins_len %} -
- {% endif %} - {% endfor %} - - - {% if ins_len == 1 %} - {{ instructors[0].full_name }} - {% else %} - {% set suffix = "other" if ins_len - 1 == 1 else "others" %} - {{ instructors[0].full_name.split(" ")[0] }} and {{ ins_len - 1 }} {{ suffix }} - {% endif %} - - -
- - - - {% set avg_rating = get_average_rating(course.name) %} - {% if avg_rating %} -
- {% for i in [1, 2, 3, 4, 5] %} - - - - {% endfor %} -
- {{ avg_rating }} {{ _(" Rating ") }} - {% endif %} -
- {% if membership %} {% set progress = frappe.utils.cint(membership.progress) %} -
+
- {{ progress }} Complete
-
{{ progress }}% Completed
{% endif %} +
+
Instructors:
+ {% for instructor in get_instructors(course.name) %} +
+ {{ widgets.Avatar(member=instructor, avatar_class="avatar-small") }} + + {{ instructor.full_name }} + +
+ {% endfor %} +
+
{% endmacro%} @@ -124,64 +102,88 @@
{{ course.title }}
- You have opted to be notified for this course. You will receive an email when the course becomes available. + {{ _("You have opted to be notified for this course. You will receive an email when the course becomes available.") }}
- {% if get_lessons(course.name) | length %} -
- - {{ get_lessons(course.name) | length }} {{ _("Lessons") }} + {% if course.status == "Under Review" %} +
+ {{ _("Your course is currently under review. Once the review is complete, the System Admins will publish it on the website.") }}
{% endif %} - {% if get_students(course.name) | length %} - {% set initial_members = get_initial_members(course.name) %} -
- {% for member in initial_members %} - {% if initial_members | length > 1 and loop.index == 1 %} -
- {% endif %} - {{ widgets.Avatar(member=member, avatar_class="avatar-small") }} + {% if is_instructor(course.name) %} +
+ {{ _("Edit") }} + + + {{ _("Add Chapter") }} + + + + {{ _("Add Lesson") }} + +
+ {% endif %} - {% if initial_members | length > 1 and loop.index == initial_members | length %} +
+
+ + + + {{ get_students(course.name) | length }} {{ _("Enrolled") }} +
+ + + + {% if get_lessons(course.name) | length %} +
+ + + + {{ get_lessons(course.name) | length }} {{ _("Lessons") }}
{% endif %} - {% endfor %} - -
{{ get_students(course.name) | length }} {{ _("Enrolled") }}
- {% endif %} - - {% if not course.disable_self_learning and not membership and not course.upcoming and not restriction.restrict %} -
- {{ _("Start Learning") }} - -
- {% endif %} - - {% if membership %} {% set lesson_index = get_lesson_index(membership.current_lesson) if membership and - membership.current_lesson - else '1.1' %} + membership.current_lesson + else '1.1' %} + + {% if show_start_learing_cta %} +
+ {{ _("Start Learning") }} + +
+ + {% elif is_instructor(course.name) and not course.is_published and course.status != "Under Review" %} +
+ {{ _("Submit for Review") }} + +
+ + {% elif is_instructor(course.name) %} - Continue Learning + {{ _("Checkout Course") }} - {% endif %} - {% if course.upcoming and not is_user_interested %} + {% elif membership %} + + {{ _("Continue Learning") }} + + + {% elif course.upcoming and not is_user_interested %}
- Notify me when available + {{ _("Notify me when available") }}
- {% endif %} - {% if is_cohort_staff(course.name, frappe.session.user) %} + {% elif is_cohort_staff(course.name, frappe.session.user) %} - Manage the course + {{ _("Manage the course") }} {% endif %} @@ -245,12 +247,10 @@
- Previous - Next
{% endif %} diff --git a/school/www/courses/course.js b/lms/www/courses/course.js similarity index 76% rename from school/www/courses/course.js rename to lms/www/courses/course.js index 80068c4a..bf8921b8 100644 --- a/school/www/courses/course.js +++ b/lms/www/courses/course.js @@ -1,14 +1,7 @@ frappe.ready(() => { - if (frappe.session.user != "Guest") { - check_mentor_request(); - } hide_wrapped_mentor_cards(); - $("#apply-now").click((e) => { - create_mentor_request(e); - }); - $("#cancel-request").click((e) => { cancel_mentor_request(e); }); @@ -41,6 +34,10 @@ frappe.ready(() => { create_certificate(e); }); + $("#submit-for-review").click((e) => { + submit_for_review(e); + }); + $(document).scroll(function() { let timer; clearTimeout(timer); @@ -49,21 +46,6 @@ frappe.ready(() => { }) -var check_mentor_request = () => { - frappe.call({ - 'method': 'school.lms.doctype.lms_mentor_request.lms_mentor_request.has_requested', - 'args': { - course: decodeURIComponent($("#course-title").attr("data-course")), - }, - 'callback': (data) => { - if (data.message > 0) { - $("#mentor-request").addClass("hide"); - $("#already-applied").removeClass("hide") - } - } - }) -} - var hide_wrapped_mentor_cards = () => { var offset_top_prev; @@ -83,30 +65,10 @@ var hide_wrapped_mentor_cards = () => { } } -var create_mentor_request = (e) => { - e.preventDefault(); - if (frappe.session.user == "Guest") { - window.location.href = `/login?redirect-to=/courses/${$(e.currentTarget).attr("data-course")}`; - return; - } - frappe.call({ - "method": "school.lms.doctype.lms_mentor_request.lms_mentor_request.create_request", - "args": { - "course": decodeURIComponent($(e.currentTarget).attr("data-course")) - }, - "callback": (data) => { - if (data.message == "OK") { - $("#mentor-request").addClass("hide"); - $("#already-applied").removeClass("hide") - } - } - }) -} - var cancel_mentor_request = (e) => { e.preventDefault() frappe.call({ - "method": "school.lms.doctype.lms_mentor_request.lms_mentor_request.cancel_request", + "method": "lms.lms.doctype.lms_mentor_request.lms_mentor_request.cancel_request", "args": { "course": decodeURIComponent($(e.currentTarget).attr("data-course")) }, @@ -129,7 +91,7 @@ var join_course = (e) => { var batch = $(e.currentTarget).attr("data-batch"); batch = batch ? decodeURIComponent(batch) : ""; frappe.call({ - "method": "school.lms.doctype.lms_batch_membership.lms_batch_membership.create_membership", + "method": "lms.lms.doctype.lms_batch_membership.lms_batch_membership.create_membership", "args": { "batch": batch ? batch : "", "course": course @@ -184,7 +146,7 @@ var submit_review = (e) => { return; } frappe.call({ - method: "school.lms.doctype.lms_course_review.lms_course_review.submit_review", + method: "lms.lms.doctype.lms_course_review.lms_course_review.submit_review", args: { "rating": rating, "review": review, @@ -208,7 +170,7 @@ var notify_user = (e) => { } frappe.call({ - method: "school.lms.doctype.lms_course_interest.lms_course_interest.capture_interest", + method: "lms.lms.doctype.lms_course_interest.lms_course_interest.capture_interest", args: { "course": course }, @@ -223,7 +185,7 @@ const create_certificate = (e) => { e.preventDefault(); course = $(e.currentTarget).attr("data-course"); frappe.call({ - method: "school.lms.doctype.lms_certification.lms_certification.create_certificate", + method: "lms.lms.doctype.lms_certification.lms_certification.create_certificate", args: { "course": course }, @@ -237,7 +199,7 @@ const create_certificate = (e) => { const element_not_in_viewport = (el) => { const rect = el.getBoundingClientRect(); return rect.bottom < 0 || rect.right < 0 || rect.left > window.innerWidth || rect.top > window.innerHeight; -} +}; const handle_overlay_display = () => { const element = $(".related-courses").length && $(".related-courses")[0]; @@ -255,4 +217,23 @@ const handle_overlay_display = () => { "bottom": "5%" }); } +}; + +const submit_for_review = (e) => { + let course = $(e.currentTarget).data("course"); + frappe.call({ + method: "lms.lms.doctype.lms_course.lms_course.submit_for_review", + args: { + "course": course + }, + callback: (data) => { + if (data.message == "No Chp") { + frappe.msgprint(__(`There are no chapters in this course. + Please add chapters and lessons to your course before you submit it for review.`)); + } else if (data.message == "OK") { + frappe.msgprint(__("Your course has been submitted for review.")) + window.location.reload(); + } + } + }) } diff --git a/school/www/courses/course.py b/lms/www/courses/course.py similarity index 78% rename from school/www/courses/course.py rename to lms/www/courses/course.py index 2a55baae..0e82e470 100644 --- a/school/www/courses/course.py +++ b/lms/www/courses/course.py @@ -1,6 +1,6 @@ import frappe -from school.lms.doctype.lms_settings.lms_settings import check_profile_restriction -from school.lms.utils import get_membership +from lms.lms.doctype.lms_settings.lms_settings import check_profile_restriction +from lms.lms.utils import get_membership, is_instructor def get_context(context): context.no_cache = 1 @@ -13,7 +13,7 @@ def get_context(context): course = frappe.db.get_value("LMS Course", course_name, ["name", "title", "image", "short_introduction", "description", "is_published", "upcoming", - "disable_self_learning", "video_link", "enable_certification"], + "disable_self_learning", "video_link", "enable_certification", "status"], as_dict=True) related_courses = frappe.get_all("Related Courses", {"parent": course.name}, ["course"]) @@ -33,6 +33,7 @@ def get_context(context): if context.course.upcoming: context.is_user_interested = get_user_interest(context.course.name) context.restriction = check_profile_restriction() + context.show_start_learing_cta = show_start_learing_cta(course, membership, context.restriction) context.metatags = { "title": course.title, "image": course.image, @@ -46,3 +47,6 @@ def get_user_interest(course): "course": course, "user": frappe.session.user }) + +def show_start_learing_cta(course, membership, restriction): + return not course.disable_self_learning and not membership and not course.upcoming and not restriction.get("restrict") and not is_instructor(course.name) diff --git a/school/www/courses/index.html b/lms/www/courses/index.html similarity index 85% rename from school/www/courses/index.html rename to lms/www/courses/index.html index 977c0794..05e3b26f 100644 --- a/school/www/courses/index.html +++ b/lms/www/courses/index.html @@ -17,17 +17,17 @@ {% else %} - {% include "school/templates/search_course/search_course.html" %} + {% include "lms/templates/search_course/search_course.html" %}
{% set courses = live_courses %} {% set title = _("All Live Courses ({0})").format(courses | length) %} {% set classes = "live-courses" %} - {% include "school/templates/course_list.html" %} + {% include "lms/templates/course_list.html" %} {% set courses = upcoming_courses %} {% set title = _("All Upcoming Courses ({0})").format(courses | length) %} {% set classes = "upcoming-courses mt-10" %} - {% include "school/templates/course_list.html" %} + {% include "lms/templates/course_list.html" %}
{% endif %}
diff --git a/school/www/courses/index.py b/lms/www/courses/index.py similarity index 91% rename from school/www/courses/index.py rename to lms/www/courses/index.py index 0f81e601..5b82d844 100644 --- a/school/www/courses/index.py +++ b/lms/www/courses/index.py @@ -1,5 +1,5 @@ import frappe -from school.lms.doctype.lms_settings.lms_settings import check_profile_restriction +from lms.lms.doctype.lms_settings.lms_settings import check_profile_restriction def get_context(context): context.no_cache = 1 diff --git a/school/www/courses/utils.py b/lms/www/courses/utils.py similarity index 100% rename from school/www/courses/utils.py rename to lms/www/courses/utils.py diff --git a/school/lms/doctype/function/__init__.py b/lms/www/dashboard/__init__.py similarity index 100% rename from school/lms/doctype/function/__init__.py rename to lms/www/dashboard/__init__.py diff --git a/lms/www/dashboard/index.html b/lms/www/dashboard/index.html new file mode 100644 index 00000000..9f46f375 --- /dev/null +++ b/lms/www/dashboard/index.html @@ -0,0 +1,49 @@ +{% extends "templates/base.html" %} +{% block title %}{{ _("Dashboard")}} +{% endblock %} + +{% block content %} +{% set portal_course_creation = frappe.db.get_single_value("LMS Settings", "portal_course_creation") %} +
+
+ {% if portal_course_creation %} + + + {{ _("New Course")}} + + {% endif %} + +
+
+
+ {% include "lms/lms/web_template/courses_enrolled/courses_enrolled.html" %} +
+ {% if portal_course_creation %} +
+ {% include "lms/templates/courses_created.html" %} +
+ {% endif %} +
+
+
+ + + +{% endblock %} diff --git a/school/lms/doctype/industry/__init__.py b/lms/www/jobs/__init__.py similarity index 100% rename from school/lms/doctype/industry/__init__.py rename to lms/www/jobs/__init__.py diff --git a/school/www/jobs/index.html b/lms/www/jobs/index.html similarity index 66% rename from school/www/jobs/index.html rename to lms/www/jobs/index.html index 767dbeb6..decdc2c0 100644 --- a/school/www/jobs/index.html +++ b/lms/www/jobs/index.html @@ -1,6 +1,10 @@ {% extends "templates/base.html" %} {% block title %}{{ _('Job Openings') }}{% endblock %} +{% block head_include %} +{% include "public/icons/symbol-defs.svg" %} +{% endblock %} + {% block content %}
@@ -16,20 +20,25 @@
{% for job in jobs %}
-
+
-
+
{{ _(job.job_title) }}
- {{ job.company_name }} +
+
{{ job.company_name }}
+
+ + + + {{ job.location }} +
+
-
- -
{{ job.location }}
-
-
-
{{ job.type }}
-
{{ frappe.utils.format_date(job.creation, "medium") }}
+ +
+
{{ job.type }}
+
{{ frappe.utils.format_date(job.creation, "medium") }}
@@ -43,7 +52,7 @@
- +
{{ _("No open jobs") }}
diff --git a/school/www/jobs/index.py b/lms/www/jobs/index.py similarity index 100% rename from school/www/jobs/index.py rename to lms/www/jobs/index.py diff --git a/school/www/jobs/job.html b/lms/www/jobs/job.html similarity index 64% rename from school/www/jobs/job.html rename to lms/www/jobs/job.html index bdb277f5..29304896 100644 --- a/school/www/jobs/job.html +++ b/lms/www/jobs/job.html @@ -1,6 +1,10 @@ {% extends "templates/base.html" %} {% block title %}{{ _(job.job_title) }}{% endblock %} +{% block head_include %} +{% include "public/icons/symbol-defs.svg" %} +{% endblock %} + {% block content %}
@@ -8,27 +12,30 @@ {{ BreadCrumb(job) }}
-
-
-
- +
+
+
-
{{ _(job.job_title) }}
-
- {{ job.company_name }} - -
- -
{{ job.location }}
+
+
+
{{ _(job.job_title) }}
+
{{ job.type }}
+
+
+ {{ job.company_name }} +
+ + + +
{{ job.location }}
+
+
{{ frappe.utils.format_date(job.creation, "medium") }}
- -
{{ frappe.utils.format_date(job.creation, "medium") }}
-
{{ job.type }}
-
{% set application_link = job.application_link if frappe.session.user != 'Guest' else '/login?redirect-to=/jobs/' + job.name %} -
+
{{ _("Apply") }}
{{ _("Report") }}
@@ -38,7 +45,7 @@
-
{{ _(job.description) }}
+
{{ _(job.description) }}
@@ -83,7 +90,7 @@ {% macro BreadCrumb(job) %}
{{ _("Job Openings") }} - - {{ _(job.job_title) }} + + {{ job.job_title }}
{% endmacro %} diff --git a/school/www/jobs/job.js b/lms/www/jobs/job.js similarity index 91% rename from school/www/jobs/job.js rename to lms/www/jobs/job.js index 346312a7..a191d72c 100644 --- a/school/www/jobs/job.js +++ b/lms/www/jobs/job.js @@ -19,7 +19,7 @@ const open_report_dialog = (e) => { const report = (e) => { frappe.call({ - method: "school.job.doctype.job_opportunity.job_opportunity.report", + method: "lms.job.doctype.job_opportunity.job_opportunity.report", args: { "job": $(e.currentTarget).data("job"), "reason": $(".report-field").val() diff --git a/school/www/jobs/job.py b/lms/www/jobs/job.py similarity index 100% rename from school/www/jobs/job.py rename to lms/www/jobs/job.py diff --git a/school/lms/doctype/invite_request/__init__.py b/lms/www/macros/__init__.py similarity index 100% rename from school/lms/doctype/invite_request/__init__.py rename to lms/www/macros/__init__.py diff --git a/school/www/macros/common_macro.html b/lms/www/macros/common_macro.html similarity index 100% rename from school/www/macros/common_macro.html rename to lms/www/macros/common_macro.html diff --git a/school/www/macros/livecode.html b/lms/www/macros/livecode.html similarity index 96% rename from school/www/macros/livecode.html rename to lms/www/macros/livecode.html index 662a0546..5a77fcd0 100644 --- a/school/www/macros/livecode.html +++ b/lms/www/macros/livecode.html @@ -74,7 +74,7 @@ if (!frappe.sys_defaults) { - +