Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
26,855 Commits 3 Branches 0 Tags 1 GiB
a9b2e4e4a8
Commit Graph

221 Commits

Author SHA1 Message Date
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
scmmishra
31cbe3c0dc Added function to retrieve quiz data as JSON 2019-02-19 13:05:23 +05:30
scmmishra
d1650b9f63 Modified Question doctype for a better design 2019-02-19 13:05:23 +05:30
scmmishra
1fc45c547b Added Course Enrollment doctype 2019-02-19 13:05:23 +05:30
scmmishra
06d175a2bd Added Quiz Activity doctype 2019-02-19 13:05:23 +05:30
scmmishra
e7308125b4 Replaced Student Course Activity with Course Activity 2019-02-19 13:05:23 +05:30
scmmishra
17294e703e Course Activity linked to Student ID 2019-02-19 13:05:23 +05:30
scmmishra
4ae11f4d74 LMS: added python functions to evaulate quiz and save student activity 
Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
 2019-02-19 13:05:23 +05:30
scmmishra
eab0b833a1 Modified Student Course Activity Doctype 
Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
 2019-02-19 13:05:23 +05:30
scmmishra
de36e13db7 modified doctypes for lms 
Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
 2019-02-19 13:05:23 +05:30
scmmishra
836a4b5e54 lms: add activity child table and create frontend 
Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
 2019-02-19 13:05:23 +05:30
scmmishra
b3b003f518 course_activity: create doctype for tracking student course activity 
Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
 2019-02-19 13:05:23 +05:30
scmmishra
55e7c1a866 api: create user account for student 
Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
 2019-02-19 13:05:23 +05:30
scmmishra
43da645be0 Added Web Academy Applicant doctype 2019-02-19 13:05:23 +05:30
scmmishra
4e208e99bc Added Student Course Acitivity doctype 2019-02-19 13:05:23 +05:30
scmmishra
84a49d5ea7 Modified Content doctype, added question child table for quiz 2019-02-19 13:03:59 +05:30
scmmishra
f05837a895 Updated Content Doctype 2019-02-19 13:03:59 +05:30
scmmishra
abd1d209fb Added Content Doctype 2019-02-19 13:03:59 +05:30
Saurabh
a342138625 Merge branch 'master' into develop 2019-01-30 12:38:58 +05:30
rohitwaghchaure
25e63e806c fix: modified date (#16520) 2019-01-30 11:46:34 +05:30
Sagar Vora
f97c5dad82 Merge branch 'staging' into develop 2019-01-29 18:39:14 +05:30
Aditya Hase
f3c22f342c fix(unicode): Import unicode_literals in every file 2019-01-22 18:36:10 +05:30
Suraj Shetty
146be9f6a6 Merge branch 'develop' of github.com:frappe/erpnext into general-ui-fixes 2018-12-24 16:08:43 +05:30
Suraj Shetty
b2965001d1 Replace 'Make' with 'Create' 2018-12-23 13:25:58 +05:30
Frappe Bot
1b7c583c48 Merge branch 'staging' into develop 2018-12-21 05:46:23 +00:00
shreyashah115@gmail.com
a5dc08ee8e fix: remove paid_amount and modify query 2018-12-17 16:47:17 +05:30
Frappe Bot
7c2a5bddb1 Merge branch 'staging' into develop 2018-12-06 09:50:25 +00:00
Frappe Bot
ee5d7e6d0f Merge branch 'master' into staging-fixes 2018-12-06 09:26:42 +00:00
Zlash65
db43c3af68 display message if details to fetch grade isnt filled up 2018-12-03 12:15:10 +05:30
Ameya Shenoy
fe1f532bc0
Merge branch 'staging' into develop 2018-11-28 08:28:37 +00:00
deepeshgarg007
bc513a8828 Removed paid amount form Fees doctype 2018-11-26 20:43:39 +05:30
deepeshgarg007
a9525de0da paid amount fix in fees 2018-11-26 20:34:32 +05:30
Ameya Shenoy
8075a576f9
Merge branch 'staging' into develop 2018-11-05 06:53:27 +00:00
Tyler Matteson
d14e46ef02 Doctypes in domains that are in beta are now restricted to that domain 
non-profit, agriculture, healthcare, hospitality, education

Please enter the commit message for your changes. Lines starting
 2018-11-04 08:39:52 -05:00
Ameya Shenoy
df62296a26
Merge branch 'staging' into develop 2018-10-30 12:54:16 +00:00
Ameya Shenoy
6178b79555
Merge branch 'master' into staging-fixes 2018-10-30 12:48:45 +00:00
Shreya Shah
452619c668 fix(report): Return if not list (#15849) 2018-10-30 11:26:01 +05:30
Ameya Shenoy
f90af80344
Merge branch 'staging' into develop 2018-10-11 06:58:53 +00:00
rohitwaghchaure
4cfff7829b Added validation to check duplicate student leave application (#15636) 2018-10-10 14:47:48 +05:30