Merge pull request #321 from pateljannat/version-13-lms

The new image of anandology/frappe-bench has the following changes:
- the bench directoy is changed from /home/bench/frappe-bench to /opt/frappe-bench
- dependency on external redis service is removed

Updated the docker-compose.yml to reflect these changes. Also pinned the
docker image to anandology/frappe-bench:2021.10

.github/workflows/ci.yml

@@ -6,7 +6,7 @@ on:
   pull_request: {}
 jobs:
   tests:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     services:
       redis-cache:
         image: redis:alpine
@@ -32,7 +32,7 @@ jobs:
     - name: setup python
       uses: actions/setup-python@v2
       with:
-        python-version: 3.9
+        python-version: '3.9'
     - name: setup node
       uses: actions/setup-node@v2
       with:
@@ -57,15 +57,18 @@ 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 --verbose --site frappe.local install-app school
+      run: bench --verbose --site frappe.local install-app lms
+    - name: setup requirements
+      working-directory: /home/runner/frappe-bench
+      run: bench setup requirements --dev
     - name: allow tests
       working-directory: /home/runner/frappe-bench
       run: bench --site frappe.local set-config allow_tests true
@@ -74,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
 

.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

Contribution.md

@@ -0,0 +1,7 @@
+
+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.
+1. Commit your changes to your branch. Make sure to use a semantic commit message.
+1. Push your branch to your fork on Github, and issue a pull request.

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
+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

README.md

@@ -1,79 +1,25 @@
-## School
+## LMS
 
-This app helps people organize and manage their own communities.
+Create online courses without much hassle.
 
-The App has following components:
+![Course Home](/lms/public/images/course-home.png)
 
-1. Hackathons
-1. LMS
+## Features
 
-School is built on the [Frappe Framework](https://github.com/frappe/frappe), a full-stack web app framework built with Python & JavaScript.
+1. Simple Backend Forms.
+1. The UI is clean and minimal.
+1. Lessons can be in the form of texts, videos, quizzes or a combination of all of these.
 
 ## Development Setup
 
-**Step 1:** Clone the repo
+1. [Through Docker](docker-installation.md)
+1. [Direct install through bench](bench-installation.md)
 
-```
-$ git clone https://github.com/frappe/school.git
 
-$ cd school
-```
+### Contributing
 
-**Step 2:** Run docker-compose
+1. [Contribution Guidelines](Contribution.md)
 
-```
-$ docker-compose up
-```
+## License
 
-**Step 3:** Visit the website at http://localhost:8000/
-
-You'll have to go through the setup wizard to setup the website for the first time you access it. Login using the following credentiasl to complete the setup wizard.
-
-```
-Username: Administrator
-password: admin
-```
-
-TODO: Explain how to load sample data
-
-## Stopping the server
-
-Press `ctrl+c` in the terminal to stop the server. You can also run `docker-compose down` in another terminal to stop it.
-
-To completely reset the instance, do the following:
-
-```
-$ docker-compose down --volumes
-$ docker-compose up
-```
-
-## Making Code Changes
-
-The dev setup is configured to reload whenever any code is changed. Just edit the code and reload the webpage.
-
-Commit the changes in a branch and send a pull request.
-
-## Local Setup - The Hard Way
-
-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. Run bench get-app https://github.com/frappe/school.
-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.
-
-### Contribution Guidelines (for The Hard Way)
-
-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. 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.
-1. Commit your changes to your branch. Make sure to use a semantic commit message.
-1. Push your branch to your fork on Github, and issue a pull request.
-
-#### License
-
-AGPL
+[GNU AFFERO GENERAL PUBLIC LICENSE](license.txt)

bench-installation.md

@@ -0,0 +1,10 @@
+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 lms.test.
+1. Fork the lms app
+1. Run bench get-app <url-of-your-form>.
+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.

docker-compose.yml

@@ -1,12 +1,6 @@
 version: "3"
 
 services:
-  redis-cache:
-    image: redis:alpine
-  redis-queue:
-    image: redis:alpine
-  redis-socketio:
-    image: redis:alpine
   mariadb:
     image: mariadb
     volumes:
@@ -15,18 +9,15 @@ services:
       - MYSQL_ROOT_PASSWORD=root
     command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
   bench:
-    image: anandology/frappe-bench
+    image: anandology/frappe-bench:2021.10
     volumes:
-      - .:/home/bench/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:
       - mariadb
-      - redis-cache
-      - redis-queue
-      - redis-socketio
     ports:
       - 8000:8000
       - 9000:9000

docker-installation.md

@@ -0,0 +1,35 @@
+**Step 1:** Clone the repo
+
+```
+$ git clone https://github.com/frappe/lms.git
+
+$ cd lms
+```
+
+**Step 2:** Run docker-compose
+
+```
+$ docker-compose up
+```
+
+**Step 3:** Visit the website at http://localhost:8000/
+
+You'll have to go through the setup wizard to setup the website for the first time you access it. Login using the following credentiasl to complete the setup wizard.
+
+```
+Username: Administrator
+password: admin
+```
+
+TODO: Explain how to load sample data
+
+## Stopping the server
+
+Press `ctrl+c` in the terminal to stop the server. You can also run `docker-compose down` in another terminal to stop it.
+
+To completely reset the instance, do the following:
+
+```
+$ docker-compose down --volumes
+$ docker-compose up
+```

license.txt

@@ -1 +1,661 @@
-License: AGPL
+GNU AFFERO GENERAL PUBLIC LICENSE
+   Version 3, 19 November 2007
+
+Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+Everyone is permitted to copy and distribute verbatim copies
+of this license document, but changing it is not allowed.
+
+        Preamble
+
+The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+The precise terms and conditions for copying, distribution and
+modification follow.
+
+   TERMS AND CONDITIONS
+
+0. Definitions.
+
+"This License" refers to version 3 of the GNU Affero General Public License.
+
+"Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+"The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+1. Source Code.
+
+The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+The Corresponding Source for a work in source code form is that
+same work.
+
+2. Basic Permissions.
+
+All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+4. Conveying Verbatim Copies.
+
+You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+5. Conveying Modified Source Versions.
+
+You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+a) The work must carry prominent notices stating that you modified
+it, and giving a relevant date.
+
+b) The work must carry prominent notices stating that it is
+released under this License and any conditions added under section
+7.  This requirement modifies the requirement in section 4 to
+"keep intact all notices".
+
+c) You must license the entire work, as a whole, under this
+License to anyone who comes into possession of a copy.  This
+License will therefore apply, along with any applicable section 7
+additional terms, to the whole of the work, and all its parts,
+regardless of how they are packaged.  This License gives no
+permission to license the work in any other way, but it does not
+invalidate such permission if you have separately received it.
+
+d) If the work has interactive user interfaces, each must display
+Appropriate Legal Notices; however, if the Program has interactive
+interfaces that do not display Appropriate Legal Notices, your
+work need not make them do so.
+
+A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+6. Conveying Non-Source Forms.
+
+You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+a) Convey the object code in, or embodied in, a physical product
+(including a physical distribution medium), accompanied by the
+Corresponding Source fixed on a durable physical medium
+customarily used for software interchange.
+
+b) Convey the object code in, or embodied in, a physical product
+(including a physical distribution medium), accompanied by a
+written offer, valid for at least three years and valid for as
+long as you offer spare parts or customer support for that product
+model, to give anyone who possesses the object code either (1) a
+copy of the Corresponding Source for all the software in the
+product that is covered by this License, on a durable physical
+medium customarily used for software interchange, for a price no
+more than your reasonable cost of physically performing this
+conveying of source, or (2) access to copy the
+Corresponding Source from a network server at no charge.
+
+c) Convey individual copies of the object code with a copy of the
+written offer to provide the Corresponding Source.  This
+alternative is allowed only occasionally and noncommercially, and
+only if you received the object code with such an offer, in accord
+with subsection 6b.
+
+d) Convey the object code by offering access from a designated
+place (gratis or for a charge), and offer equivalent access to the
+Corresponding Source in the same way through the same place at no
+further charge.  You need not require recipients to copy the
+Corresponding Source along with the object code.  If the place to
+copy the object code is a network server, the Corresponding Source
+may be on a different server (operated by you or a third party)
+that supports equivalent copying facilities, provided you maintain
+clear directions next to the object code saying where to find the
+Corresponding Source.  Regardless of what server hosts the
+Corresponding Source, you remain obligated to ensure that it is
+available for as long as needed to satisfy these requirements.
+
+e) Convey the object code using peer-to-peer transmission, provided
+you inform other peers where the object code and Corresponding
+Source of the work are being offered to the general public at no
+charge under subsection 6d.
+
+A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+"Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+7. Additional Terms.
+
+"Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+a) Disclaiming warranty or limiting liability differently from the
+terms of sections 15 and 16 of this License; or
+
+b) Requiring preservation of specified reasonable legal notices or
+author attributions in that material or in the Appropriate Legal
+Notices displayed by works containing it; or
+
+c) Prohibiting misrepresentation of the origin of that material, or
+requiring that modified versions of such material be marked in
+reasonable ways as different from the original version; or
+
+d) Limiting the use for publicity purposes of names of licensors or
+authors of the material; or
+
+e) Declining to grant rights under trademark law for use of some
+trade names, trademarks, or service marks; or
+
+f) Requiring indemnification of licensors and authors of that
+material by anyone who conveys the material (or modified versions of
+it) with contractual assumptions of liability to the recipient, for
+any liability that these contractual assumptions directly impose on
+those licensors and authors.
+
+All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+8. Termination.
+
+You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+9. Acceptance Not Required for Having Copies.
+
+You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+10. Automatic Licensing of Downstream Recipients.
+
+Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+11. Patents.
+
+A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+12. No Surrender of Others' Freedom.
+
+If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+13. Remote Network Interaction; Use with the GNU General Public License.
+
+Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+14. Revised Versions of this License.
+
+The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+15. Disclaimer of Warranty.
+
+THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+16. Limitation of Liability.
+
+IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+17. Interpretation of Sections 15 and 16.
+
+If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+ END OF TERMS AND CONDITIONS
+
+How to Apply These Terms to Your New Programs
+
+If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+<one line to give the program's name and a brief idea of what it does.>
+Copyright (C) <year>  <name of author>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as published
+by the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+<http://www.gnu.org/licenses/>.

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_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_js = "website.bundle.js"
+web_include_css = "/assets/css/lms.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"]
 # 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
@@ -141,7 +141,7 @@ website_route_rules = [
 	{"from_route": "/courses/<course>/learn/<int:chapter>.<int:lesson>", "to_route": "batch/learn"},
 	{"from_route": "/courses/<course>/progress", "to_route": "batch/progress"},
 	{"from_route": "/courses/<course>/join", "to_route": "batch/join"},
-	{"from_route": "/users", "to_route": "profiles/profile"}
+	{"from_route": "/users/<string(minlength=4):username>", "to_route": "profiles/profile"}
 ]
 
 website_redirects = [
@@ -149,41 +149,29 @@ website_redirects = [
 ]
 
 update_website_context = [
-    'school.widgets.update_website_context',
+    'lms.widgets.update_website_context',
 ]
 
-jinja = {
-    "methods": [
-        "school.page_renderers.get_profile_url"
-    ],
-    "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.v.plugins.PageExtension
-# school_lesson_page_extension = None
+## subclass of lms.plugins.PageExtension
+# lms = None
 
-#school_lesson_page_extensions = [
-#	"school.plugins.LiveCodeExtension"
+#lms_lesson_page_extensions = [
+#	"lms.plugins.LiveCodeExtension"
 #]
 
 ## 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"
+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"
 }
 
-# page_renderer to manage profile pages
-page_renderer = [
-	"school.page_renderers.ProfileRedirectPage",
-	"school.page_renderers.ProfilePage"
-]
-
 # set this to "/" to have profiles on the top-level
 profile_url_prefix = "/users/"

lms/lms/dashboard_chart/course_enrollments/course_enrollments.json

@@ -0,0 +1,30 @@
+{
+ "based_on": "creation",
+ "chart_name": "Course Enrollments",
+ "chart_type": "Count",
+ "creation": "2021-09-30 12:23:09.414853",
+ "docstatus": 0,
+ "doctype": "Dashboard Chart",
+ "document_type": "LMS Batch Membership",
+ "dynamic_filters_json": "[]",
+ "filters_json": "[]",
+ "group_by_type": "Count",
+ "idx": 0,
+ "is_public": 1,
+ "is_standard": 1,
+ "last_synced_on": "2021-10-17 13:32:21.745498",
+ "modified": "2021-10-21 17:31:06.997133",
+ "modified_by": "Administrator",
+ "module": "LMS",
+ "name": "Course Enrollments",
+ "number_of_groups": 0,
+ "owner": "basawaraj@erpnext.com",
+ "source": "",
+ "time_interval": "Daily",
+ "timeseries": 1,
+ "timespan": "Last Quarter",
+ "type": "Line",
+ "use_report_chart": 0,
+ "value_based_on": "",
+ "y_axis": []
+}

lms/lms/doctype/course_lesson/course_lesson.js

@@ -1,7 +1,7 @@
 // Copyright (c) 2021, FOSS United and contributors
 // For license information, please see license.txt
 
-frappe.ui.form.on('Lesson', {
+frappe.ui.form.on('Course Lesson', {
   setup: function (frm) {
     frm.trigger('setup_help');
   },

lms/lms/doctype/course_lesson/course_lesson.py

@@ -65,11 +65,12 @@ class CourseLesson(Document):
 
 @frappe.whitelist()
 def save_progress(lesson, course, status):
-    if not frappe.db.exists("LMS Batch Membership",
-            {
-                "member": frappe.session.user,
-                "course": course
-            }):
+    membership = frappe.db.exists("LMS Batch Membership",
+                    {
+                        "member": frappe.session.user,
+                        "course": course
+                    })
+    if not membership:
         return
 
     if frappe.db.exists("LMS Course Progress",
@@ -92,5 +93,8 @@ def save_progress(lesson, course, status):
             "lesson": lesson,
             "status": status,
         }).save(ignore_permissions=True)
+
     course_details = frappe.get_doc("LMS Course", course)
-    return course_details.get_course_progress()
+    progress = course_details.get_course_progress()
+    frappe.db.set_value("LMS Batch Membership", membership, "progress", progress)
+    return progress

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
 

lms/lms/doctype/lms_batch/lms_batch.py

@@ -6,8 +6,8 @@ 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 lms.lms.doctype.lms_batch_membership.lms_batch_membership import create_membership
+from lms.query import find, find_all
 
 class LMSBatch(Document):
     def validate(self):

lms/lms/doctype/lms_batch_membership/lms_batch_membership.json

@@ -5,15 +5,16 @@
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
-  "batch",
+  "course",
   "member",
   "member_name",
   "member_username",
   "column_break_3",
-  "course",
+  "batch",
   "member_type",
-  "role",
-  "current_lesson"
+  "progress",
+  "current_lesson",
+  "role"
  ],
  "fields": [
   {
@@ -65,6 +66,7 @@
    "fieldname": "course",
    "fieldtype": "Link",
    "in_list_view": 1,
+   "in_standard_filter": 1,
    "label": "Course",
    "options": "LMS Course"
   },
@@ -80,11 +82,18 @@
    "fieldtype": "Data",
    "label": "Memeber Username",
    "read_only": 1
+  },
+  {
+   "fieldname": "progress",
+   "fieldtype": "Data",
+   "label": "Progress",
+   "read_only": 1
   }
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2021-09-29 15:27:58.765399",
+ "migration_hash": "fe10c462acf5e727d864305d7ce90e73",
+ "modified": "2021-10-20 15:10:33.767419",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Batch Membership",
@@ -105,6 +114,5 @@
  ],
  "quick_entry": 1,
  "sort_field": "modified",
- "sort_order": "DESC",
- "track_changes": 1
+ "sort_order": "DESC"
 }

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"
@@ -192,4 +192,4 @@
  "sort_order": "DESC",
  "title_field": "title",
  "track_changes": 1
-}
+}

lms/lms/doctype/lms_course/lms_course.py

@@ -7,7 +7,7 @@ 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 ...utils import slugify
 
@@ -251,7 +251,7 @@ class LMSCourse(Document):
 
         membership = frappe.db.get_value("LMS Batch Membership",
                         filters,
-                        ["name", "batch", "current_lesson", "member_type"],
+                        ["name", "batch", "current_lesson", "member_type", "progress"],
                         as_dict=True)
 
         if membership and membership.batch:
@@ -362,3 +362,28 @@ def reindex_exercises(doc):
     course = frappe.get_doc("LMS Course", course_data['name'])
     course.reindex_exercises()
     frappe.msgprint("All exercises in this course have been re-indexed.")
+
+@frappe.whitelist(allow_guest=True)
+def search_course(text):
+    search_courses = []
+    courses = frappe.get_all("LMS Course",
+                filters= {
+                    "is_published": True
+                },
+                or_filters = {
+                    "title": ["like", "%{0}%".format(text)],
+                    "tags": ["like", "%{0}%".format(text)],
+                    "short_introduction": ["like", "%{0}%".format(text)],
+                    "description": ["like", "%{0}%".format(text)],
+                })
+
+    """ for course in courses:
+        search_courses.append(frappe.get_doc("LMS Course", course)) """
+
+    """ template = frappe.render_template("lms/templates/course_list.html", {
+        "title": _("Search Results"),
+        "courses": search_courses,
+        "widgets": Widgets()
+    }) """
+
+    return courses

lms/lms/doctype/lms_course_review/lms_course_review.json

@@ -33,7 +33,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2021-08-31 12:37:23.832131",
+ "modified": "2021-11-16 17:23:50.697891",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Course Review",
@@ -52,7 +52,9 @@
    "write": 1
   }
  ],
+ "search_fields": "course",
  "sort_field": "modified",
  "sort_order": "DESC",
+ "title_field": "course",
  "track_changes": 1
 }