gavin
728f8d09c8
fix: AttributeError on new Student creation ( #19786 )
2019-12-03 12:54:46 +05:30
Victor Munene
b3af2adc4a
use program.courses instead of get_all_children to get course list ( #19695 )
2019-11-29 18:12:13 +05:30
Rohit Waghchaure
39eeac265b
fix: not able to select department in instructor form
2019-11-18 15:20:15 +05:30
theopen-institute
36520ef951
fix: Add a setting to make creation of new Student User optional ( #19122 )
...
* New setting to skip Student User creation
* Allow skip of new User creation via settings
2019-11-06 19:09:15 +05:30
Sagar Gharge
f935e37925
[Fix] restricted duplicate guardians on student doctype ( #19194 )
2019-10-15 14:38:04 +05:30
Mangesh-Khairnar
5dcf2c669f
chore: remove unlinked letter head references ( #19138 )
2019-09-24 09:53:06 +05:30
Fisher Yu
cd38ba4833
fix: several bugs and improvement ideas for education module #18599 ( #18600 )
...
* Update student_report_generation_tool.py
bug fix
* Update student_applicant.json
* Update program_course.json
* Update course_activity.json
2019-09-11 19:10:39 +05:30
Govind S Menokee
c901d6322c
fix(18837): Student creation error ( #18838 )
...
Academic user not able to create student
2019-09-05 14:50:23 +05:30
Anurag Mishra
841d852f41
refactor: added missing translation functions ( #18143 )
...
* fix: Translating Error and Messages
* Update erpnext/controllers/item_variant.py
Co-Authored-By: Shivam Mishra <scmmishra@users.noreply.github.com>
* Update erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
Co-Authored-By: Shivam Mishra <scmmishra@users.noreply.github.com>
2019-07-03 15:15:08 +05:30
Shivam Mishra
3264822c1c
test: fixed unknown column course_name
2019-06-12 15:43:36 +05:30
Shivam Mishra
a99d3a844f
test: fix fixtures for program and course
2019-06-12 14:32:27 +05:30
Shivam Mishra
147cd1035e
Merge branch 'develop' into lms-patch-3
2019-06-12 12:44:12 +05:30
Shivam Mishra
d9e68c9f69
refactor: remove course name field from ProgramCourse
2019-06-12 12:43:22 +05:30
Shivam Mishra
a9508862b2
refactor: doctype settings for lms
2019-06-12 12:39:12 +05:30
Shivam Mishra
d49b5e4736
fix: sql query case fix
2019-06-06 17:19:53 +05:30
Shivam Mishra
76fe1b1e9f
Merge pull request #17674 from scmmishra/lms-refactor
...
refactor: lms
2019-06-06 16:32:17 +05:30
Shivam Mishra
09cd46fa0b
fix: minor bugs
2019-06-06 14:02:49 +05:30
Shivam Mishra
624b4fd5b8
refactor: better sql
2019-06-06 11:30:56 +05:30
Shivam Mishra
d69892abfa
feat: added topic page
2019-06-05 19:42:30 +05:30
Shivam Mishra
9cad9439a1
fix: travis fixes for education setup
2019-06-05 17:52:21 +05:30
Shivam Mishra
7597baab95
refactor: minor fixes
2019-06-05 17:49:42 +05:30
Shivam Mishra
16b4129ede
feat: added student profile page
2019-06-05 17:29:48 +05:30
Shivam Mishra
6593263df8
feat: added navigation
2019-06-05 13:34:44 +05:30
Shivam Mishra
570161b978
feat: added course progress apis
2019-06-05 13:08:53 +05:30
Shivam Mishra
6d4c666476
feat: added topic progress api
2019-06-03 14:41:05 +05:30
Shivam Mishra
8ddb63adae
feat: added auto course enrollment for enrolled programs
2019-06-03 14:40:52 +05:30
Shivam Mishra
d1a252190b
refactor: refactored quiz api and added quiz.js
2019-06-03 12:57:38 +05:30
Shivam Mishra
46b3446da0
refactor: add check for max passing score
2019-05-30 18:55:16 +05:30
Shivam Mishra
7c7053fcf5
refactor: added question type field
2019-05-30 18:54:58 +05:30
Shivam Mishra
e94e9d2b06
feat: content navigation and activity tracking working
2019-05-30 18:23:03 +05:30
Shivam Mishra
12579617f3
refactor: added enrolled status to program card
2019-05-30 17:20:31 +05:30
Shivam Mishra
dfdb92f4b1
refactor: added enrollment api
2019-05-30 16:36:01 +05:30
Shivam Mishra
f927502cc5
refactor: added lms utilities for enrollment and program list
2019-05-29 18:39:52 +05:30
Shivam Mishra
08425d46fa
refactor: set Student as default portal role for Education
2019-05-29 18:37:52 +05:30
Shivam Mishra
65681bf317
refactor: allow disbaling self enroll on lms
2019-05-29 15:15:30 +05:30
deepeshgarg007
acc2422167
Merge branch develop into dimensions
2019-05-28 12:18:32 +05:30
deepeshgarg007
6f6636abfe
fix: Add dimension section in multiple doctypes
2019-05-26 12:31:01 +05:30
Shivam Mishra
c8c790a097
feat: Added content page and minor doctype changes
2019-05-21 12:04:50 +05:30
Syed Mujeer Hashmi
045194c230
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
2019-05-17 16:26:31 +05:30
Shivam Mishra
776d891b19
fix: test for course
2019-05-14 14:16:50 +05:30
Shivam Mishra
f2d62195b0
chore: Minor code improvements
2019-05-14 11:24:45 +05:30
Shivam Mishra
d2c4af154b
fix: Video not found bug
2019-05-14 11:24:40 +05:30
Shivam Mishra
51b6fe2b8d
feat: Allow disbaling LMS ( #17587 )
2019-05-14 10:22:15 +05:30
Syed Mujeer Hashmi
b146df6460
feat: Student Group with Student Category filter
...
The Student Category field is added to the Student Group doctype.The
students are fetched from Program Enrollment with added Student Category.
This helps in creating student group based on Program,Batch and Student
Category.Which helps in creating fee schedule with fee structures
defined based on student category.
Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>
2019-04-29 13:16:00 +05:30
scmmishra
68b3203366
chore: Moved get_quiz_progress
and get_program_progress
to a class function in program_enrollment
2019-04-22 18:50:08 +05:30
scmmishra
5079e6c1c1
chore: minor improvements
2019-04-22 14:48:32 +05:30
scmmishra
ac8d3479c9
feat: Added add_quiz_activity
function to course_enrollment class
2019-04-22 14:38:51 +05:30
scmmishra
33969b7d7c
chore: Minor change to question doctype
2019-04-22 14:30:14 +05:30
scmmishra
66d239281c
chore: minor code improvements
2019-04-22 14:10:09 +05:30
scmmishra
da2c90cd18
chore: renamed get_program
api functions
...
- `get_program` is renamed to `get_program_and_enrollment_status`
- `get_program_detail` is renamed to `get_program`
- Minor code improvements
2019-04-22 12:21:40 +05:30
scmmishra
327334a830
chore: refactor utils.get_current_student
2019-04-22 12:03:17 +05:30
scmmishra
5214c5cdb3
fix: Minor fix to test program
2019-04-10 20:37:45 +05:30
scmmishra
8c89083647
fix: test fixes for program doctype
2019-04-10 20:02:39 +05:30
scmmishra
7a1c649dbd
fix: Test fixes
2019-04-10 19:02:06 +05:30
scmmishra
d2917a8c38
feat: Fixed test data for student doctype
2019-04-10 17:50:26 +05:30
scmmishra
acc0fa3b00
fix: Added desciption in program test record
2019-04-09 13:20:11 +05:30
scmmishra
bae2d669b5
fix: codacy linting issues
2019-04-09 12:57:56 +05:30
scmmishra
abb35ad308
fix: Possible fix for failing tests
2019-04-09 12:38:42 +05:30
scmmishra
dd889f8796
fix: Fixed hero image field in COurse and Topic
2019-04-09 11:36:31 +05:30
scmmishra
a409400e58
feat: added hero image field
2019-04-01 15:42:38 +05:30
scmmishra
2b7e158e50
feat: Quiz attempt limits is configurable
...
- Added a 'no limit' check to `check_quiz_completion` in utils.py
- Added disabled flag for questions in quiz component
- Refactored `get_quiz_without_answers` to send attempt limit data to client
2019-03-29 12:45:08 +05:30
scmmishra
3d39b88e7c
feat: LMS now supports multiple correct choice questions
2019-03-27 18:01:14 +05:30
scmmishra
43e9375642
feat [WIP]: Added multiple choice question component
2019-03-20 13:25:02 +05:30
scmmishra
000e706337
feat: Only student progress is recorded in LMS
...
Changes
- Instructors can freely audit the course and their progress will not be recorded
- Added check for super access for get_program in utils.py
- Guests can view topics page
- Instructors can see explore topic button
- Content Activity is only saved for a student in lms.py
- Modified variable names in topic.py
2019-03-19 12:30:43 +05:30
scmmishra
eaed1ae3d6
fix: Added import statement for translate wrapper
2019-03-18 19:11:07 +05:30
scmmishra
f2c638f8ab
fix (minor): Replaced text editor with small text in course doctype
2019-03-18 18:38:51 +05:30
scmmishra
acc278de9c
feat: Added validations for question doctype
...
- A question must have more than two options
- A question must have at least one correct option
2019-03-18 18:38:18 +05:30
scmmishra
5c646e60f5
fix: Auto course enrollment for enrolled programs in LMS
2019-03-18 18:37:35 +05:30
scmmishra
a0978a2aab
chore: Cleaned up quiz.py
2019-03-18 18:37:06 +05:30
scmmishra
dcbe7e5490
fix: Added permissions for instructor
...
Also made description mandatory in program
2019-03-18 15:29:30 +05:30
scmmishra
21823f5f66
feat: Added test for program_enrollment
2019-03-14 15:44:01 +05:30
scmmishra
e3b7e1381d
feat: Moved make_course_activity to test_course_activity.py
2019-03-14 15:34:13 +05:30
scmmishra
8aa6ac7b03
feat: Moved setup_program to test_program.py
2019-03-14 15:32:22 +05:30
scmmishra
a98e936d26
chore: Removed LMS Activity Doctype
2019-03-14 15:24:26 +05:30
scmmishra
88b2244468
feat: Added test for course_enrollment
2019-03-14 15:19:20 +05:30
scmmishra
c75b513e2c
fix: Enrollment bug
2019-03-14 15:16:14 +05:30
scmmishra
62416224ab
feat: Added test utilities for course_activity
2019-03-06 19:01:28 +05:30
scmmishra
18ddc92947
feat: Added check for duplicate course enrollment
2019-03-06 17:05:17 +05:30
scmmishra
890ce60e86
style: Removed trailing spaces
2019-03-06 17:04:42 +05:30
scmmishra
531d2761cf
feat: Refactored some enrollment functions
2019-03-06 17:04:17 +05:30
scmmishra
b72ba416ff
feat: More tests
2019-03-06 17:03:51 +05:30
scmmishra
bf9a10fd5e
chore(style): Renamed a function
2019-03-06 15:45:35 +05:30
scmmishra
bcfe6f024f
feat: Added lms tests for student doctype
2019-03-06 15:26:41 +05:30
scmmishra
92ab107b60
fix: Minor fix
2019-03-06 15:26:20 +05:30
scmmishra
4a7e2c1e2f
feat: Minor changes to topic tests
2019-03-06 15:19:02 +05:30
scmmishra
2cec025bbe
feat: Added test for program doctype
2019-03-06 15:18:43 +05:30
scmmishra
64347a5642
feat: Added test for Course Doctype
2019-03-06 15:18:27 +05:30
scmmishra
75defde940
fix: fixed user creation bug in student
2019-03-06 15:18:01 +05:30
scmmishra
28dd4c139e
feat: Added test for Topic Doctype
...
- Added test for get_contents function
- Removed unused class functions
2019-03-04 14:21:22 +05:30
scmmishra
de5f71ae9e
fix: Showing Topic Progress
2019-02-28 15:40:49 +05:30
scmmishra
3866dee3e1
feat: Corse doctype
2019-02-26 16:37:31 +05:30
scmmishra
765529241e
[Major][Breaking] More changes
2019-02-19 13:06:33 +05:30
scmmishra
da39da627c
[Major][Breaking] Server side changes to handle Topic Layer
...
- Moved `get_course_progress` to CourseEnrollment class.
- Added Topic context to progress functions in lms.py
- Create user on creation of a student
2019-02-19 13:06:33 +05:30
scmmishra
cc7290b7af
[Major][Breaking] Student Class
2019-02-19 13:06:33 +05:30
scmmishra
766f68a20a
[Major][Breaking] Modified lms.py and utils
2019-02-19 13:06:33 +05:30
scmmishra
e7d52c594b
[Major][Breaking] Program Enrollment Creates Course enrollment
2019-02-19 13:06:33 +05:30
scmmishra
1253061055
[Major][Breaking] Modified Course Doctype, added Topic based functions
2019-02-19 13:06:33 +05:30
scmmishra
42f50fd82c
[Major][Breaking] Added Topic Layer in Course
2019-02-19 13:06:33 +05:30
scmmishra
42f3c51ff7
Removed Content Doctype
2019-02-19 13:06:33 +05:30
scmmishra
6663ca1d7f
Adding Test Utils
2019-02-19 13:06:33 +05:30
scmmishra
c51f738b03
Refactored student creation
2019-02-19 13:06:33 +05:30
scmmishra
c84a318591
Student and User link for LMS added
2019-02-19 13:06:33 +05:30
scmmishra
798f13be0d
More Improvements
2019-02-19 13:06:33 +05:30
scmmishra
97c994f394
create course enrollment if not already enrolled for a program
2019-02-19 13:06:33 +05:30
scmmishra
cc755f6204
Doctype Changes for Beta Release
2019-02-19 13:06:33 +05:30
scmmishra
082e3c94ef
Minor Fixes: Student Enrollment
2019-02-19 13:06:32 +05:30
scmmishra
1192529698
Refactored lms.py, modified utils
2019-02-19 13:06:32 +05:30
scmmishra
babb68d36c
Refactored server side code
2019-02-19 13:06:32 +05:30
scmmishra
19e12ac3d6
Minor changes to quiz doctype
2019-02-19 13:06:32 +05:30
scmmishra
f9b2fb6717
Fixed course and content page
2019-02-19 13:06:32 +05:30
scmmishra
892b0c23fc
Added class functions
2019-02-19 13:06:31 +05:30
scmmishra
cc166c01eb
Improved Client implementation
2019-02-19 13:06:31 +05:30
scmmishra
c1b1a5ec37
Permission Changes
2019-02-19 13:06:31 +05:30
scmmishra
8fa9adec37
More Bug fixes UI and Permissions
2019-02-19 13:06:31 +05:30
scmmishra
05e07b44b1
Removed unused utils functions
2019-02-19 13:06:31 +05:30
scmmishra
734a746687
Minor DocType changes
2019-02-19 13:06:31 +05:30
scmmishra
850dfd0358
Set appropriate permissions
2019-02-19 13:06:31 +05:30
scmmishra
9f316a3b30
Permission changes
2019-02-19 13:06:31 +05:30
scmmishra
0187b18c06
Added methods to saving Quiz attempts
2019-02-19 13:06:31 +05:30
scmmishra
1a04f774d7
LMS: Saving Course Activity
2019-02-19 13:06:31 +05:30
scmmishra
7d5e218155
Modified Quiz Evaluation
2019-02-19 13:06:31 +05:30
scmmishra
90722e3a9b
Fixed Permissions for LMS User
2019-02-19 13:06:31 +05:30
scmmishra
73a31ec7bb
Added functions to query Student enrollments
2019-02-19 13:06:31 +05:30
scmmishra
91aa0e07c8
Added class function for student enrollment
2019-02-19 13:06:31 +05:30
scmmishra
f9e8e4e2d3
Modified question.py
2019-02-19 13:06:30 +05:30
scmmishra
cfc35f4424
Quiz: Save responses as an object
2019-02-19 13:06:30 +05:30
scmmishra
d87ca178d8
UI for Quiz
2019-02-19 13:06:30 +05:30
scmmishra
1778b59efa
Started with Vue
2019-02-19 13:06:30 +05:30
scmmishra
5e758aea00
Minor Changes
2019-02-19 13:06:29 +05:30
scmmishra
75ad128912
Added LMS Settings
2019-02-19 13:06:29 +05:30
scmmishra
1e1f1ad186
LMS: Course Completion Status Working
2019-02-19 13:06:29 +05:30
scmmishra
a8703d4036
LMS: Changes to Course Activity Doctype, Course Activity Tracking Works
...
Co-authored-by: Sahil <sahilkhan28297@gmail.com>
2019-02-19 13:06:29 +05:30
scmmishra
57c77e452b
LMS: Course Activity
...
Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
2019-02-19 13:06:29 +05:30
scmmishra
7409fe6438
LMS: Quiz Eval and Max Attempts Check
...
Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
2019-02-19 13:06:29 +05:30
Chinmay Pai
3574ac3f5e
quiz_activity: add quiz activity
...
Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>
2019-02-19 13:06:29 +05:30
scmmishra
3bf71a2df6
Quiz Logic
2019-02-19 13:06:29 +05:30
scmmishra
d133e8229b
Quiz Evaluation Logic
2019-02-19 13:06:29 +05:30
scmmishra
4f439ec4dd
Quiz eval utils
2019-02-19 13:06:29 +05:30
scmmishra
0d4135ec2b
LMS: Fixed view for Quiz
...
Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
2019-02-19 13:06:29 +05:30
scmmishra
590227b107
LMS: Fixed views for article and video
2019-02-19 13:06:29 +05:30
scmmishra
18baff5fec
Minor changes to question doctype
...
Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
2019-02-19 13:06:29 +05:30
scmmishra
541a522b26
LMS:Added class methods for course, program and student doctypes
...
Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
2019-02-19 13:06:29 +05:30
Chinmay Pai
1869419bdc
lms: refactor entire course model
...
each course item now has its own doctype.
Co-authored-by: Shivam Mishra <scm.mymail@gmail.com>
Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>
2019-02-19 13:06:28 +05:30
scmmishra
685584bf56
Quiz: Quiz now displays correctly on the portal
...
Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
2019-02-19 13:06:28 +05:30
scmmishra
3757a4eab8
Modified program and index view
...
Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
2019-02-19 13:06:28 +05:30
scmmishra
fa2db3c41b
LMS: Added functions to get LMS contents
...
Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
2019-02-19 13:06:28 +05:30
scmmishra
82df4378de
Changes to get_quiz function
2019-02-19 13:06:28 +05:30
scmmishra
3cbb9795a4
Minor changes to doctypes
2019-02-19 13:06:28 +05:30
scmmishra
f9cef33e41
Dashboard changes for student and program
2019-02-19 13:06:28 +05:30
scmmishra
5311e3898c
General Changes
2019-02-19 13:06:28 +05:30