Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
28,588 Commits 3 Branches 0 Tags 1 GiB
5c008ef023
Commit Graph

252 Commits

Author SHA1 Message Date
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