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/.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 100% rename from school/fixtures/custom_field.json rename to lms/fixtures/custom_field.json 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 63% rename from school/hooks.py rename to lms/hooks.py index 0a11804c..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,54 +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_enrolled_courses", - "school.overrides.user.get_course_membership", - "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", - "school.lms.utils.get_signup_optin_checks", - "school.lms.utils.get_popular_courses" + "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 = [ @@ -227,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 100% rename from school/lms/doctype/chapter_reference/chapter_reference.json rename to lms/lms/doctype/chapter_reference/chapter_reference.json 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 100% rename from school/lms/doctype/course_chapter/course_chapter.json rename to lms/lms/doctype/course_chapter/course_chapter.json 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 100% rename from school/lms/doctype/course_lesson/course_lesson.json rename to lms/lms/doctype/course_lesson/course_lesson.json diff --git a/school/lms/doctype/course_lesson/course_lesson.py b/lms/lms/doctype/course_lesson/course_lesson.py similarity index 98% rename from school/lms/doctype/course_lesson/course_lesson.py rename to lms/lms/doctype/course_lesson/course_lesson.py index ee0023b6..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, get_lesson_url +from lms.lms.utils import get_course_progress, get_lesson_url class CourseLesson(Document): def validate(self): 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 100% rename from school/lms/doctype/lesson_reference/lesson_reference.json rename to lms/lms/doctype/lesson_reference/lesson_reference.json 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 100% rename from school/lms/doctype/lms_batch_membership/lms_batch_membership.json rename to lms/lms/doctype/lms_batch_membership/lms_batch_membership.json 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 98% rename from school/lms/doctype/lms_course/lms_course.json rename to lms/lms/doctype/lms_course/lms_course.json index 671e6efb..b3429c05 100644 --- a/school/lms/doctype/lms_course/lms_course.json +++ b/lms/lms/doctype/lms_course/lms_course.json @@ -1,7 +1,7 @@ { "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" @@ -225,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 97% rename from school/lms/doctype/lms_course/lms_course.py rename to lms/lms/doctype/lms_course/lms_course.py index 94648505..f814ce50 100644 --- a/school/lms/doctype/lms_course/lms_course.py +++ b/lms/lms/doctype/lms_course/lms_course.py @@ -6,9 +6,9 @@ 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): @@ -195,7 +195,7 @@ 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() diff --git a/school/lms/doctype/lms_course/test_lms_course.py b/lms/lms/doctype/lms_course/test_lms_course.py similarity index 100% rename from school/lms/doctype/lms_course/test_lms_course.py rename to lms/lms/doctype/lms_course/test_lms_course.py 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 96% rename from school/lms/doctype/lms_settings/lms_settings.json rename to lms/lms/doctype/lms_settings/lms_settings.json index 2fa1f3f5..bcd59c9b 100644 --- a/school/lms/doctype/lms_settings/lms_settings.json +++ b/lms/lms/doctype/lms_settings/lms_settings.json @@ -7,9 +7,9 @@ "field_order": [ "show_search", "portal_course_creation", - "search_placeholder", - "column_break_2", "force_profile_completion", + "column_break_2", + "search_placeholder", "livecode_url", "signup_settings_section", "terms_of_use", @@ -114,8 +114,8 @@ "label": "Enable Course Creation from Portal" }, { - "fieldname": "column_break_9", - "fieldtype": "Column Break" + "fieldname": "column_break_9", + "fieldtype": "Column Break" }, { "default": "0", @@ -135,7 +135,7 @@ "index_web_pages_for_search": 1, "issingle": 1, "links": [], - "modified": "2022-03-10 18:45:58.372370", + "modified": "2022-03-23 16:07:29.491432", "modified_by": "Administrator", "module": "LMS", "name": "LMS Settings", @@ -156,4 +156,4 @@ "sort_order": "DESC", "states": [], "track_changes": 1 -} +} \ No newline at end of file diff --git a/school/lms/doctype/lms_settings/lms_settings.py b/lms/lms/doctype/lms_settings/lms_settings.py similarity index 100% rename from school/lms/doctype/lms_settings/lms_settings.py rename to lms/lms/doctype/lms_settings/lms_settings.py 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 5acb6322..520be6fc 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 99% rename from school/lms/utils.py rename to lms/lms/utils.py index 4df6f045..af175462 100644 --- a/school/lms/utils.py +++ b/lms/lms/utils.py @@ -1,7 +1,7 @@ import re import frappe from frappe.utils import flt, cint, cstr -from school.lms.md import markdown_to_html, find_macros +from lms.lms.md import markdown_to_html, find_macros import string from frappe import _ 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/school/lms/web_form/chapter/chapter.js b/lms/lms/web_form/chapter/chapter.js similarity index 100% rename from school/lms/web_form/chapter/chapter.js rename to lms/lms/web_form/chapter/chapter.js diff --git a/school/lms/web_form/chapter/chapter.json b/lms/lms/web_form/chapter/chapter.json similarity index 100% rename from school/lms/web_form/chapter/chapter.json rename to lms/lms/web_form/chapter/chapter.json diff --git a/school/lms/web_form/chapter/chapter.py b/lms/lms/web_form/chapter/chapter.py similarity index 100% rename from school/lms/web_form/chapter/chapter.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/school/lms/web_form/course/course.js b/lms/lms/web_form/course/course.js similarity index 100% rename from school/lms/web_form/course/course.js rename to lms/lms/web_form/course/course.js diff --git a/school/lms/web_form/course/course.json b/lms/lms/web_form/course/course.json similarity index 100% rename from school/lms/web_form/course/course.json rename to lms/lms/web_form/course/course.json diff --git a/school/lms/web_form/course/course.py b/lms/lms/web_form/course/course.py similarity index 100% rename from school/lms/web_form/course/course.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/school/lms/web_form/lesson/lesson.js b/lms/lms/web_form/lesson/lesson.js similarity index 85% rename from school/lms/web_form/lesson/lesson.js rename to lms/lms/web_form/lesson/lesson.js index 0044ba2d..4347f730 100644 --- a/school/lms/web_form/lesson/lesson.js +++ b/lms/lms/web_form/lesson/lesson.js @@ -1,7 +1,7 @@ frappe.ready(function() { frappe.web_form.after_save = () => { frappe.call({ - method: "school.lms.doctype.course_lesson.course_lesson.get_lesson_info", + method: "lms.lms.doctype.course_lesson.course_lesson.get_lesson_info", args: { "chapter": frappe.web_form.doc.chapter }, diff --git a/school/lms/web_form/lesson/lesson.json b/lms/lms/web_form/lesson/lesson.json similarity index 100% rename from school/lms/web_form/lesson/lesson.json rename to lms/lms/web_form/lesson/lesson.json diff --git a/school/lms/web_form/lesson/lesson.py b/lms/lms/web_form/lesson/lesson.py similarity index 100% rename from school/lms/web_form/lesson/lesson.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/school/lms/web_template/courses_enrolled/courses_enrolled.html b/lms/lms/web_template/courses_enrolled/courses_enrolled.html similarity index 100% rename from school/lms/web_template/courses_enrolled/courses_enrolled.html rename to lms/lms/web_template/courses_enrolled/courses_enrolled.html diff --git a/school/lms/web_template/courses_enrolled/courses_enrolled.json b/lms/lms/web_template/courses_enrolled/courses_enrolled.json similarity index 100% rename from school/lms/web_template/courses_enrolled/courses_enrolled.json rename to lms/lms/web_template/courses_enrolled/courses_enrolled.json 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 100% rename from school/lms/widgets/CourseCard.html rename to lms/lms/widgets/CourseCard.html diff --git a/school/lms/widgets/CourseOutline.html b/lms/lms/widgets/CourseOutline.html similarity index 90% rename from school/lms/widgets/CourseOutline.html rename to lms/lms/widgets/CourseOutline.html index 1cb38938..c3149d9e 100644 --- a/school/lms/widgets/CourseOutline.html +++ b/lms/lms/widgets/CourseOutline.html @@ -7,7 +7,7 @@
@@ -36,7 +36,7 @@ {% if membership %} + src="/assets/lms/icons/check.svg"> {% endif %} @@ -148,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 98% rename from school/lms/widgets/Reviews.html rename to lms/lms/widgets/Reviews.html index bf6069b4..9106769c 100644 --- a/school/lms/widgets/Reviews.html +++ b/lms/lms/widgets/Reviews.html @@ -87,7 +87,7 @@ {% else %}
- +
{{ _("Review the course") }}
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 99% rename from school/overrides/user.py rename to lms/overrides/user.py index 25bd819c..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): 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 100% rename from school/patches.txt rename to lms/patches.txt 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/school/patches/v0_0/set_course_in_lesson.py b/lms/patches/v0_0/set_course_in_lesson.py similarity index 100% rename from school/patches/v0_0/set_course_in_lesson.py rename to lms/patches/v0_0/set_course_in_lesson.py diff --git a/school/patches/v0_0/set_status_in_course.py b/lms/patches/v0_0/set_status_in_course.py similarity index 100% rename from school/patches/v0_0/set_status_in_course.py rename to lms/patches/v0_0/set_status_in_course.py 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 97% rename from school/public/css/style.css rename to lms/public/css/style.css index eedc201a..946bbca9 100644 --- a/school/public/css/style.css +++ b/lms/public/css/style.css @@ -257,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; } @@ -275,7 +275,7 @@ input[type=checkbox] { .course-card-wide { background-color: white; - padding: 0 1rem 1rem; + padding: 0 1.25rem 1.25rem; border-radius: var(--border-radius); width: 50%; box-shadow: var(--shadow-base); @@ -305,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 { @@ -348,7 +347,7 @@ input[type=checkbox] { .is-secondary:hover { text-decoration: none; - color: inherit; + color: var(--gray-900); } .is-default { @@ -401,7 +400,7 @@ input[type=checkbox] { } .reviews-parent { - margin: 5rem 0; + padding-bottom: 5rem; color: var(--gray-900); } @@ -584,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 { @@ -657,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; } @@ -669,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; } } @@ -735,10 +739,6 @@ input[type=checkbox] { } } -.profile-link { - margin-left: auto; -} - .creator-badge { background: #48BB74; padding: 4px 6px; @@ -846,6 +846,10 @@ pre { font-size: 1rem; } +.markdown-source p:last-child { + margin-bottom: 0; +} + .avatar img { object-fit: cover; } @@ -994,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; } @@ -1165,13 +1169,6 @@ pre { color: var(--gray-900); } -.course-intructor-rating-section { - display: flex; - align-items: center; - justify-content: space-between; - margin-top: 2rem; -} - .seperator { margin: 0 1rem; } 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/school/public/icons/symbol-defs.svg b/lms/public/icons/symbol-defs.svg similarity index 100% rename from school/public/icons/symbol-defs.svg rename to lms/public/icons/symbol-defs.svg 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/school/public/js/profile.js b/lms/public/js/profile.js similarity index 100% rename from school/public/js/profile.js rename to lms/public/js/profile.js 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/school/templates/courses_created.html b/lms/templates/courses_created.html similarity index 89% rename from school/templates/courses_created.html rename to lms/templates/courses_created.html index 5977fee0..5b18e173 100644 --- a/school/templates/courses_created.html +++ b/lms/templates/courses_created.html @@ -8,7 +8,7 @@ {% else %}
- +
{{ _("No courses created") }}
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 100% rename from school/templates/quiz.html rename to lms/templates/quiz.html 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 97% rename from school/templates/signup-form.html rename to lms/templates/signup-form.html index 1c668757..67e0379d 100644 --- a/school/templates/signup-form.html +++ b/lms/templates/signup-form.html @@ -49,7 +49,7 @@ } frappe.call({ - method: "school.overrides.user.sign_up", + method: "lms.overrides.user.sign_up", args: { "email": ($("#signup_email").val() || "").trim(), "full_name": frappe.utils.xss_sanitise(($("#signup_fullname").val() || "").trim()), diff --git a/school/test_widgets.py b/lms/test_widgets.py similarity index 100% rename from school/test_widgets.py rename to lms/test_widgets.py diff --git a/school/widgets.py b/lms/widgets.py similarity index 99% rename from school/widgets.py rename to lms/widgets.py index 99ed1829..e147a3c4 100644 --- a/school/widgets.py +++ b/lms/widgets.py @@ -15,7 +15,6 @@ from frappe.utils.jinja import get_jenv # widgets/SomeWidgets.html in each of these modules. MODULES = [ "lms", - "community" ] def update_website_context(context): diff --git a/school/lms/doctype/cohort_web_page/__init__.py b/lms/www/__init__.py similarity index 100% rename from school/lms/doctype/cohort_web_page/__init__.py rename to lms/www/__init__.py diff --git a/school/lms/doctype/course_chapter/__init__.py b/lms/www/__pycache__/__init__.py similarity index 100% rename from school/lms/doctype/course_chapter/__init__.py rename to lms/www/__pycache__/__init__.py diff --git a/school/lms/doctype/course_instructor/__init__.py b/lms/www/batch/__init__.py similarity index 100% rename from school/lms/doctype/course_instructor/__init__.py rename to lms/www/batch/__init__.py diff --git a/school/lms/doctype/course_lesson/__init__.py b/lms/www/batch/__pycache__/__init__.py similarity index 100% rename from school/lms/doctype/course_lesson/__init__.py rename to lms/www/batch/__pycache__/__init__.py diff --git a/school/www/batch/join.html b/lms/www/batch/join.html similarity index 95% rename from school/www/batch/join.html rename to lms/www/batch/join.html index e1c9f77d..0a839709 100644 --- a/school/www/batch/join.html +++ b/lms/www/batch/join.html @@ -49,7 +49,7 @@ frappe.ready(() => { $("#confirm").click((e) => { 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.name }}, "course": {{ batch.course }} diff --git a/school/www/batch/join.py b/lms/www/batch/join.py similarity index 100% rename from school/www/batch/join.py rename to lms/www/batch/join.py diff --git a/school/www/batch/learn.html b/lms/www/batch/learn.html similarity index 94% rename from school/www/batch/learn.html rename to lms/www/batch/learn.html index 98778f67..2b626d5b 100644 --- a/school/www/batch/learn.html +++ b/lms/www/batch/learn.html @@ -13,7 +13,7 @@ {% endblock %} {% block content %} -
+
{{ BreadCrumb(course, lesson) }}
@@ -35,9 +35,9 @@ {% macro BreadCrumb(course, lesson) %}
{{ _("All Courses") }} - + {{ course.title }} - + {{ lesson.title }}
{% endmacro %} @@ -110,7 +110,7 @@
{% if prev_url %} {% endif %} @@ -138,7 +138,7 @@ {% if course.enable_certification %}
diff --git a/school/www/batch/learn.js b/lms/www/batch/learn.js similarity index 95% rename from school/www/batch/learn.js rename to lms/www/batch/learn.js index 52aa0c61..536bf0be 100644 --- a/school/www/batch/learn.js +++ b/lms/www/batch/learn.js @@ -49,7 +49,7 @@ frappe.ready(() => { const save_current_lesson = () => { if ($(".title").hasClass("is-member")) { - frappe.call("school.lms.api.save_current_lesson", { + frappe.call("lms.lms.api.save_current_lesson", { course_name: $(".title").attr("data-course"), lesson_name: $(".title").attr("data-lesson") }) @@ -97,7 +97,7 @@ const mark_progress = (e) => { if (status != current_status) { frappe.call({ - method: "school.lms.doctype.course_lesson.course_lesson.save_progress", + method: "lms.lms.doctype.course_lesson.course_lesson.save_progress", args: { lesson: $(".title").attr("data-lesson"), course: $(".title").attr("data-course"), @@ -158,7 +158,7 @@ const quiz_summary = (e) => { var total_questions = $(".question").length; frappe.call({ - method: "school.lms.doctype.lms_quiz.lms_quiz.quiz_summary", + method: "lms.lms.doctype.lms_quiz.lms_quiz.quiz_summary", args: { "quiz": quiz_name, "results": localStorage.getItem(quiz_name) @@ -226,7 +226,7 @@ const parse_options = () => { const add_icon = (element, icon) => { $(element).closest(".custom-checkbox").removeClass("active-option"); var label = $(element).siblings(".option-text").text(); - $(element).parent().empty().html(`
${label}
`); + $(element).parent().empty().html(`
${label}
`); }; const add_to_local_storage = (quiz_name, current_index, answer, is_correct) => { @@ -244,7 +244,7 @@ const create_certificate = (e) => { e.preventDefault(); course = $(".title").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 }, @@ -303,7 +303,7 @@ const upload_file = (file, target) => { const create_lesson_work = (file, target) => { frappe.call({ - method: "school.lms.doctype.lesson_assignment.lesson_assignment.upload_assignment", + method: "lms.lms.doctype.lesson_assignment.lesson_assignment.upload_assignment", args: { assignment: file.file_url, lesson: $(".title").attr("data-lesson"), @@ -363,7 +363,7 @@ const fetch_assignments = () => { if ($(".attach-file").length <= 0) return; frappe.call({ - method: "school.lms.doctype.lesson_assignment.lesson_assignment.get_assignment", + method: "lms.lms.doctype.lesson_assignment.lesson_assignment.get_assignment", args: { "lesson": $(".title").attr("data-lesson") }, diff --git a/school/www/batch/learn.py b/lms/www/batch/learn.py similarity index 89% rename from school/www/batch/learn.py rename to lms/www/batch/learn.py index 4c47ba53..648c94ea 100644 --- a/school/www/batch/learn.py +++ b/lms/www/batch/learn.py @@ -1,9 +1,9 @@ from re import I import frappe -from school.www.utils import get_common_context, redirect_to_lesson -from school.lms.utils import get_lesson_url +from lms.www.utils import get_common_context, redirect_to_lesson +from lms.lms.utils import get_lesson_url from frappe.utils import cstr, flt -from school.www import batch +from lms.www import batch def get_context(context): get_common_context(context) @@ -52,8 +52,8 @@ def get_lesson_index(course, batch, user): return lesson and course.get_lesson_index(lesson) def get_page_extensions(context): - default_value = ["school.plugins.PageExtension"] - classnames = frappe.get_hooks("school_lesson_page_extensions") or default_value + default_value = ["lms.plugins.PageExtension"] + classnames = frappe.get_hooks("lms_lesson_page_extensions") or default_value extensions = [frappe.get_attr(name)() for name in classnames] for e in extensions: e.set_context(context) diff --git a/school/lms/doctype/education_detail/__init__.py b/lms/www/cohorts/__init__.py similarity index 100% rename from school/lms/doctype/education_detail/__init__.py rename to lms/www/cohorts/__init__.py diff --git a/school/www/cohorts/base.html b/lms/www/cohorts/base.html similarity index 89% rename from school/www/cohorts/base.html rename to lms/www/cohorts/base.html index f0177dc4..a1496f0e 100644 --- a/school/www/cohorts/base.html +++ b/lms/www/cohorts/base.html @@ -6,7 +6,7 @@ {% for link in nav %} {{ link.title }} {% if not loop.last %} - + {% endif %} {% endfor %}
diff --git a/school/www/cohorts/cohort.html b/lms/www/cohorts/cohort.html similarity index 100% rename from school/www/cohorts/cohort.html rename to lms/www/cohorts/cohort.html diff --git a/school/www/cohorts/cohort.py b/lms/www/cohorts/cohort.py similarity index 100% rename from school/www/cohorts/cohort.py rename to lms/www/cohorts/cohort.py diff --git a/school/www/cohorts/index.html b/lms/www/cohorts/index.html similarity index 100% rename from school/www/cohorts/index.html rename to lms/www/cohorts/index.html diff --git a/school/www/cohorts/index.py b/lms/www/cohorts/index.py similarity index 100% rename from school/www/cohorts/index.py rename to lms/www/cohorts/index.py diff --git a/school/www/cohorts/join.html b/lms/www/cohorts/join.html similarity index 97% rename from school/www/cohorts/join.html rename to lms/www/cohorts/join.html index 34b55c2e..cb2423d2 100644 --- a/school/www/cohorts/join.html +++ b/lms/www/cohorts/join.html @@ -57,7 +57,7 @@ $(function() { var subgroup = parts[5]; var invite_code = parts[6]; - frappe.call('school.lms.api.join_cohort', { + frappe.call('lms.lms.api.join_cohort', { course: course, cohort: cohort, subgroup: subgroup, diff --git a/school/www/cohorts/join.py b/lms/www/cohorts/join.py similarity index 100% rename from school/www/cohorts/join.py rename to lms/www/cohorts/join.py diff --git a/school/www/cohorts/subgroup.html b/lms/www/cohorts/subgroup.html similarity index 95% rename from school/www/cohorts/subgroup.html rename to lms/www/cohorts/subgroup.html index 8a393626..2b61c052 100644 --- a/school/www/cohorts/subgroup.html +++ b/lms/www/cohorts/subgroup.html @@ -185,7 +185,7 @@ $(function() { frappe.confirm( `Are you sure to accept ${email} to this subgroup?`, function() { - run_action("school.lms.api.approve_cohort_join_request", name, el, "approved", "Approved"); + run_action("lms.lms.api.approve_cohort_join_request", name, el, "approved", "Approved"); } ); }); @@ -195,7 +195,7 @@ $(function() { var name = $(this).parent().data("name"); var email = $(this).parent().data("email"); frappe.confirm(`Are you sure to reject ${email} from joining this subgroup?`, function() { - run_action("school.lms.api.reject_cohort_join_request", name, el, "rejected", "Rejected!"); + run_action("lms.lms.api.reject_cohort_join_request", name, el, "rejected", "Rejected!"); }); }); @@ -204,7 +204,7 @@ $(function() { var name = $(this).parent().data("name"); var email = $(this).parent().data("email"); frappe.confirm(`Are you sure to undo the rejection of ${email}?`, function() { - run_action("school.lms.api.undo_reject_cohort_join_request", name, el, "undo-reject", "Reject Undone!"); + run_action("lms.lms.api.undo_reject_cohort_join_request", name, el, "undo-reject", "Reject Undone!"); }); }); @@ -228,7 +228,7 @@ $(function() { var subgroup = $("#page-title").data("subgroup"); var title = $("#page-title").data("title"); var email = $("#mentor-email").val(); - frappe.call("school.lms.api.add_mentor_to_subgroup", { + frappe.call("lms.lms.api.add_mentor_to_subgroup", { subgroup: subgroup, email: email }) diff --git a/school/www/cohorts/subgroup.py b/lms/www/cohorts/subgroup.py similarity index 100% rename from school/www/cohorts/subgroup.py rename to lms/www/cohorts/subgroup.py diff --git a/school/www/cohorts/utils.py b/lms/www/cohorts/utils.py similarity index 100% rename from school/www/cohorts/utils.py rename to lms/www/cohorts/utils.py diff --git a/school/lms/doctype/exercise/__init__.py b/lms/www/community/__init__.py similarity index 100% rename from school/lms/doctype/exercise/__init__.py rename to lms/www/community/__init__.py diff --git a/school/www/community/index.html b/lms/www/community/index.html similarity index 100% rename from school/www/community/index.html rename to lms/www/community/index.html diff --git a/school/www/community/index.js b/lms/www/community/index.js similarity index 96% rename from school/www/community/index.js rename to lms/www/community/index.js index f84678f8..15795f11 100644 --- a/school/www/community/index.js +++ b/lms/www/community/index.js @@ -24,7 +24,7 @@ const search = (e) => { start = 0; frappe.call({ - method: "school.overrides.user.search_users", + method: "lms.overrides.user.search_users", args: { "start": start, "text": input diff --git a/school/www/community/index.py b/lms/www/community/index.py similarity index 100% rename from school/www/community/index.py rename to lms/www/community/index.py diff --git a/school/lms/doctype/exercise_latest_submission/__init__.py b/lms/www/courses/__init__.py similarity index 100% rename from school/lms/doctype/exercise_latest_submission/__init__.py rename to lms/www/courses/__init__.py diff --git a/school/lms/doctype/exercise_submission/__init__.py b/lms/www/courses/__pycache__/__init__.py similarity index 100% rename from school/lms/doctype/exercise_submission/__init__.py rename to lms/www/courses/__pycache__/__init__.py diff --git a/school/www/courses/certificate.html b/lms/www/courses/certificate.html similarity index 86% rename from school/www/courses/certificate.html rename to lms/www/courses/certificate.html index 3d1ceba0..0013bb96 100644 --- a/school/www/courses/certificate.html +++ b/lms/www/courses/certificate.html @@ -9,7 +9,7 @@
All Courses - + {{ course.title }}
@@ -19,7 +19,7 @@ data-certificate-name="{{ student.full_name }} - {{ course.title }}">Export
{% endif %} - {% include "school/templates/certificate.html" %} + {% include "lms/templates/certificate.html" %}
{% 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 82% rename from school/www/courses/course.html rename to lms/www/courses/course.html index 405586b5..1b6825fa 100644 --- a/school/www/courses/course.html +++ b/lms/www/courses/course.html @@ -46,7 +46,7 @@ {% macro BreadCrumb(course) %}
{{ _("All Courses") }} - + {{ course.title }}
{% endmacro %} @@ -66,38 +66,6 @@ {{ course.short_introduction }}
-
- -
- - - - {{ get_students(course.name) | length }} {{ _("Enrolled") }} -
- - {% if get_lessons(course.name) | length %} -
- - - - {{ get_lessons(course.name) | length }} {{ _("Lessons") }} -
- {% 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) %}
@@ -143,19 +111,19 @@
{% endif %} + {% if is_instructor(course.name) %}
- {% if is_instructor(course.name) %} - {{ _("Edit") }} - - - {{ _("Add Chapter") }} - - - - {{ _("Add Lesson") }} - - {% endif %} + {{ _("Edit") }} + + + {{ _("Add Chapter") }} + + + + {{ _("Add Lesson") }} +
+ {% endif %}
@@ -184,25 +152,25 @@ {% 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) %} - {{ _("Checkout Course") }} + {{ _("Checkout Course") }} {% elif membership %} - {{ _("Continue Learning") }} + {{ _("Continue Learning") }} {% elif course.upcoming and not is_user_interested %} diff --git a/school/www/courses/course.js b/lms/www/courses/course.js similarity index 77% rename from school/www/courses/course.js rename to lms/www/courses/course.js index 67447feb..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); }); @@ -53,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; @@ -87,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")) }, @@ -133,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 @@ -188,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, @@ -212,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 }, @@ -227,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 }, @@ -264,7 +222,7 @@ const handle_overlay_display = () => { const submit_for_review = (e) => { let course = $(e.currentTarget).data("course"); frappe.call({ - method: "school.lms.doctype.lms_course.lms_course.submit_for_review", + method: "lms.lms.doctype.lms_course.lms_course.submit_for_review", args: { "course": course }, diff --git a/school/www/courses/course.py b/lms/www/courses/course.py similarity index 93% rename from school/www/courses/course.py rename to lms/www/courses/course.py index b8bfc35a..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, is_instructor +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 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/school/www/dashboard/index.html b/lms/www/dashboard/index.html similarity index 92% rename from school/www/dashboard/index.html rename to lms/www/dashboard/index.html index c643915d..9f46f375 100644 --- a/school/www/dashboard/index.html +++ b/lms/www/dashboard/index.html @@ -26,11 +26,11 @@
- {% include "school/lms/web_template/courses_enrolled/courses_enrolled.html" %} + {% include "lms/lms/web_template/courses_enrolled/courses_enrolled.html" %}
{% if portal_course_creation %}
- {% include "school/templates/courses_created.html" %} + {% include "lms/templates/courses_created.html" %}
{% endif %}
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 96% rename from school/www/jobs/index.html rename to lms/www/jobs/index.html index 1c0b3e71..decdc2c0 100644 --- a/school/www/jobs/index.html +++ b/lms/www/jobs/index.html @@ -52,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 98% rename from school/www/jobs/job.html rename to lms/www/jobs/job.html index 24e9b621..29304896 100644 --- a/school/www/jobs/job.html +++ b/lms/www/jobs/job.html @@ -90,7 +90,7 @@ {% macro BreadCrumb(job) %}
{{ _("Job Openings") }} - + {{ 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) { - +