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
Shreya Shah
1f4c263a63
[minor] Program Enrollment Tool ( #15013 )
...
* Make academic term field mandatory
* Add disabled field to Student Group
* Mandatory check in Education Settings for Academic Term
* Fix as per review
2018-07-27 10:59:14 +05:30
Nabin Hait
d0a2b1619b
Optimization for marking student attendance
2018-07-27 10:51:55 +05:30
Faris Ansari
9e874af9ba
Query report print ( #14935 )
...
* QueryReport
- Only print visible columns in report
- Use get_columns_for_print method instead of directly
accessing report.columns
* Query Report
- Replace frappe.query_report_filters_by_name with new API
2018-07-18 09:28:44 +05:30
Shreya Shah
b75e77a2cc
Fix syntax ( #14342 )
2018-06-05 10:33:29 +05:30
Zarrar
c141eb00ee
[Enhance] Department added wherever applicable ( #14121 )
...
* set All Department as default parent_department
* add department field in employee_transfer
* copied data from options to fetch_from
* add department field wherever employee's link field present
* empty options field where fetch_from is added
2018-05-23 11:11:36 +05:30
Saurabh
2ca83d61ea
Resolve merge conflicts from enterprise_sprint branch
2018-05-14 21:15:46 +05:30
Zlash65
03ad0f2f4a
set query for department based on company
2018-05-14 16:07:28 +05:30
Nabin Hait
9036b9ee85
Merge branch 'master' into develop
2018-05-08 16:31:42 +05:30
Manas Solanki
cf26b2ca1c
[minor] fix for the student report card
2018-05-08 12:39:02 +05:30
bghayad
1184a7300a
Adding Payments View for Fees ( #13939 )
...
* Adding View Payments For Fees
* Adding View Payments For Fees
* Adding Payments View For Fees
2018-05-07 18:20:37 +05:30
Shreya
fd47b92138
renamed color field
2018-05-01 18:55:17 +05:30
Shreya
4c8a08effb
color field for calendar in course schedule
2018-05-01 18:54:20 +05:30
bghayad
1c3830c53f
Student Account Ledger Button ( #13591 )
...
* Student Account Ledger Button
* Student Account Ledger Button
* Student Account Ledger Button
* Student Account Ledger Button
2018-04-24 12:12:11 +05:30
Saurabh
2e7a45dbb4
resolved merge conflicts
2018-04-24 11:16:13 +05:30
Zarrar
68a7ee22f2
order_by for gantt error fix ( #13752 )
2018-04-23 13:22:03 +05:30
Saurabh
492aff2a8b
[fix] check if academic_year exists ( #13665 )
2018-04-17 14:21:40 +05:30
Nabin Hait
2b682c82e8
Fixed merge conflict
2018-04-04 11:40:16 +05:30
Manas Solanki
ccf2b7b08b
minor fix for the program enrollment tool
2018-03-29 16:36:59 +05:30
Nabin Hait
b9c82b9790
Fixed merge conflict
2018-03-27 14:25:27 +05:30
Manas Solanki
398eac3f4c
message in the program enrollment tool ( #13393 )
2018-03-27 11:21:47 +05:30
Nabin Hait
061d912749
Fixed merge conflict
2018-03-23 16:20:27 +05:30
Manas Solanki
e010ddf65f
Student Report Card ( #13346 )
...
* finalise the assessment report
* minor fixes for button
* fix the travis and codacy
2018-03-21 17:50:42 +05:30
Zarrar
9a01baac1d
explicitely provide order_by ( #13338 )
2018-03-20 14:08:44 +05:30
Shreya
5042dd32da
undefined args error
2018-03-19 17:45:39 +05:30
Manas Solanki
633a39144d
addition of student report card generation tool
2018-03-16 01:57:45 +05:30
Nabin Hait
5e63c265db
Fixed merge conflict
2018-03-09 17:34:39 +05:30
Suraj Shetty
f2d28ebd6a
Data import Tool bug fix ( #13165 )
...
* fixes #13064
* commonified naming series checks
* test fixes
replaced test employee names according to naming series
2018-03-09 12:33:13 +05:30
Manas Solanki
bb42e3b411
Merge pull request #13214 from manassolanki/assessment-report-fix
...
minor fix for key error in assessment reports
2018-03-07 16:30:35 +05:30
Manas Solanki
586e9400b1
minor fix for key error
2018-03-07 16:28:21 +05:30
Nabin Hait
c50d7446b5
Merge branch 'master' into develop
2018-03-07 13:09:07 +05:30
Manas Solanki
12d7bfb658
allow renaming of the guardian
2018-03-07 12:52:31 +05:30
Nabin Hait
c43c95e0aa
Fixed merge conflict
2018-03-05 14:54:44 +05:30
Achilles Rasquinha
646522886c
self.assertEqual
2018-02-28 21:13:51 +05:30
Achilles Rasquinha
96698c9a77
Use range instead xrange ( #13128 )
...
* Use range instead of xrange
* convert float to int
2018-02-28 16:12:51 +05:30
Manas Solanki
51dfba749b
filter students on basis of category and button to show fees
2018-02-26 19:32:26 +05:30
Nabin Hait
e6d65bc2a1
Fixed translations and tests ( #12900 )
...
* Fixed translations and tests
* minor fixes
* minor test fixes
2018-02-14 17:44:06 +05:30
Saurabh
2735701aab
resolved merge conflicts
2018-02-14 11:51:09 +05:30
Manas Solanki
37b2aa2b11
changes in the education module ( #12827 )
...
update the module page
remove fee from beta
2018-02-08 19:00:51 +05:30
Achilles Rasquinha
6ceffbd2f8
Merge pull request #12710 from achillesrasquinha/12704
...
Python 3 Compatible Fixes.
2018-01-31 11:23:05 +05:30
Achilles Rasquinha
ef58be1302
Fixed education string
2018-01-30 13:58:43 +05:30
Saurabh
03f6b3e588
resolved merge conflicts
2018-01-29 16:25:33 +05:30
Manas Solanki
8985077652
Assessment Module Report ( #12605 )
...
* updated course wise assessment report
* added new report Final assessment grades
2018-01-26 11:20:33 +05:30
Saurabh
35d8ce4fbd
resolved merge conflicts
2018-01-12 16:58:32 +05:30
Manas Solanki
bba5fd7a38
Assessment module addition ( #12417 )
...
* add academic session details in the Assessmet Plan
* add the academic session and few details in the assessment result
* fix codacy
2018-01-12 16:21:09 +05:30
Nabin Hait
cb495fb33b
Merge branch 'master' into develop
2018-01-05 13:17:00 +05:30
Manas Solanki
171157f1b3
Fix + Enhancement in Program Enrollment Tool ( #12291 )
...
* Fix + Enhancement in Program Enrollment Tool
* updated the docs
2018-01-05 12:42:39 +05:30
Shreya Shah
df0dd8be5f
Travis fix for client side tests ( #12224 )
...
* salary slip test fix
* attendance tool test fix
* timeout after routing
2017-12-29 14:04:46 +05:30
Manas Solanki
91017cba8d
Additional fields in the instructor doctype for the academics log and minor permission changes ( #12204 )
2017-12-28 12:34:36 +05:30
Manas Solanki
e20a0f1115
[Fix] make PE unique for the combination of academic year and academic term ( #12214 )
2017-12-28 12:29:11 +05:30
Manas Solanki
5807cd8e6f
Set the guardian role automatically. ( #12136 )
...
* Add the guardian role for parent portal
* invite guardian as user
2017-12-22 10:50:10 +05:30
Zarrar
17fd6610dc
Fix travis ( #11882 )
...
* fieldname wrong
* bifurcated test into two - error when both were running async
* minor fixes with link and route
* move school domain rename up
* fix async creation of operations test
* edit-in-full-page is button, not link
* set_route issue in production order test
* minor changes
* fix task tree test
* more fixes
* fix server side issue
* improvising ui tests
2017-12-08 14:57:38 +05:30
Manas Solanki
a160879159
set the reference document in the payment entry while creating from fees ( #11861 )
...
* set the reference document in the payment entry while creating from fees
* allocate the paid amount in the reference document
2017-12-06 14:05:39 +05:30
Manas Solanki
e6fd07fda9
Changes in the Fee structure ( #11842 )
...
* academic year non mandatory in the fee structure and minor changes
* update the docs
2017-12-04 19:21:50 +05:30
Manas Solanki
3bac586ee2
fix in the assessment result tool while entering the zero marks ( #11837 )
2017-12-04 12:55:10 +05:30
Manas Solanki
f9cc56cd62
minor fixes in the assessment result tool ( #11795 )
2017-11-30 11:39:06 +05:30
Prateeksha Singh
bf31d853e7
Merge pull request #11762 from manassolanki/fix
...
fix for module in the new report
2017-11-28 19:08:52 +05:30
Manas Solanki
49ff065684
fix for the new report module
2017-11-28 18:44:06 +05:30
Manas Solanki
84e9d45055
Minor fixes for the Education domain ( #11758 )
...
* add the new role Education Manager for education settings
* minor changes in the hooks for bootinfo
* Fix for amending the assessment plan
2017-11-28 18:04:08 +05:30
Manas Solanki
966f141f62
Rename schools to Education ( #11524 )
...
* renaming for the docs, demo data and patch
* changes in the doctypes and reports
* rename the config file
* Few name changes in messages and license
* rename the school settings to education settings
* changes in the documentation
* added the setup file for the fixtures
* corrected the ui tests file path
* fix the codacy
* add the patch for renaming few doctypes and fields
* changes in the patch
2017-11-23 15:22:10 +05:30