Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
31,300 Commits 3 Branches 0 Tags 1 GiB
65fa85ed89
Commit Graph

309 Commits

Author SHA1 Message Date
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
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
Suraj Shetty
bfc195dd8b Changes to support refactor in frappe pg-poc branch (#15287) 
* Remove quotes from sql to make it compatible with postgres as well

* Fix queries
- Replace mysql specifc queries with standard ones

* Make repo URL chages to test pg-poc

* Add root passowrd to test site config

* Fix quotes issue

* Remove debug flag from a pricing rule query

* Remove python 3.6 version from travis.yml

* Fix improper query issue

* Fix incorrect query

* Fix a query

- This fix need to be changed when we will  start supporting postgres
since date_format is not supported by postgres

* Get price list map as dict

* Convert price_list_currency_map to dict
 2018-09-21 10:20:52 +05:30
Rushabh Mehta
a2288ff8e7 fix(assessment_result): student must be in group (#15255) 
* fix(assessment_result): student must be in group

* fix(test_student_group): raise correct exception

* fix(unused-import): assessment-plan.py

* fix(tests)

* fix(tests)

* fix(test)

* fix(tests)
 2018-08-31 16:12:49 +05:30
Nabin Hait
28f9b0a9ab (fix)test case: loyalty program, course schedule and more 2018-08-29 17:05:11 +05:30
Nabin Hait
a804d6d487 Fixed merge conflict 2018-08-29 13:34:58 +05:30
Shreya Shah
a5add289bb Refactor Naming Series (#15070) 
* Patch to create Property Setter for existing naming series

* Update existing naming series options with new

* Add patch link to patches.txt

* Update patch

* Fix codacy

* Fix as per suggestions

* Remove old patch for property setter

* Improve as per suggested

- Modified the naming
- Also refactored naming for doctypes having autoname with series
- Added a patch to make property setter for autoname

* Fix Travis

* Rebase with develop
 2018-08-28 13:44:48 +05:30
rohitwaghchaure
e689a903d8 Allowed data import for Assessment Result (#15168) 2018-08-20 17:50:04 +05:30
Faris Ansari
4809f86035 fix(report): field -> fieldname, dateutil -> frappe.datetime (#15106) 2018-08-14 10:56:18 +05:30
Saurabh
824b388631 Resolved merge conflicts 2018-08-07 13:01:11 +05:30
rohitwaghchaure
fc682c86c6 [Fix] Inactive student validation issue while disabling the student group (#15095) 2018-08-06 14:29:46 +05:30
Nabin Hait
eed3d4c1b3 Fixed Merge Conflict 2018-07-31 12:36:16 +05:30
rohitwaghchaure
086da451ca Removed academic term from validation to check duplicate program enrollement (#15046) 2018-07-30 19:11:14 +05:30
Nabin Hait
fa06ee80e9 Fixed merge conflict 2018-07-27 12:54:00 +05:30