27 Commits

Author	SHA1	Message	Date
Rucha Mahabal	8edace1a58	fix: covert Program wise Fee Collection to a Script Report	2020-08-05 16:24:21 +05:30
Rucha Mahabal	fdcaecb58c	Merge branch 'develop' into education-dashboard	2020-07-27 22:23:08 +05:30
Rucha Mahabal	6c11f26a11	feat: Education dashboard charts and number cards	2020-07-27 18:50:04 +05:30
Rucha Mahabal	49140ccbfd	feat: Program wise Fee Collection Query Report	2020-07-27 18:48:15 +05:30
Rucha Mahabal	860a824a7c	fix: change label for final grade	2020-07-24 14:32:36 +05:30
Rucha Mahabal	27835b7789	fix: add labels to chart datasets in course wise assessment	2020-07-24 14:07:00 +05:30
Rucha Mahabal	833682b03d	feat(Education): Student Attendance and Leave Enhancements (#22623) ... * feat: make Student Attendance doctype submittable * feat: add attendance related fields in Student Leave Application * feat: update Attendance records on Leave Application submission * refactor: better error messages and ORM queries * fix: show present only for leave applications with mark_as_present enabled in attendance reports * test: Student Leave Application * fix: filter for attendance records * fix: codacy issues	2020-07-23 16:40:07 +05:30
Anupam Kumar	10c7faf090	updating education report modified time (#22418) ... Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>	2020-06-24 17:34:52 +05:30
Suraj Shetty	da6806e6bc	fix: Translation strings with trailing spaces (#21192)	2020-04-08 09:32:41 +05:30
Mangesh-Khairnar	5dcf2c669f	chore: remove unlinked letter head references (#19138)	2019-09-24 09:53:06 +05:30
shreyashah115@gmail.com	a5dc08ee8e	fix: remove paid_amount and modify query	2018-12-17 16:47:17 +05:30
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
Faris Ansari	4809f86035	fix(report): field -> fieldname, dateutil -> frappe.datetime (#15106)	2018-08-14 10:56:18 +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
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
Nabin Hait	061d912749	Fixed merge conflict	2018-03-23 16:20:27 +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
Manas Solanki	586e9400b1	minor fix for key error	2018-03-07 16:28:21 +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	37b2aa2b11	changes in the education module (#12827) ... update the module page remove fee from beta	2018-02-08 19:00:51 +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
Manas Solanki	49ff065684	fix for the new report module	2017-11-28 18:44:06 +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