Zarrar
1c6828e5d6
[UI Tests] School Academic Year test ( #10049 )
2017-07-25 11:45:39 +05:30
Makarand Bauskar
6e30f04181
[domainify] patch to set the restrict to domain for module_def ( #9912 )
2017-07-18 12:30:57 +05:30
Manas Solanki
79ed58fd36
chnages in the assessment report
2017-07-12 17:49:59 +05:30
Nabin Hait
c8b6d3badb
Merge pull request #9713 from manassolanki/stud-dashb
...
changes in the student dashboard
2017-07-10 19:10:57 +05:30
Manas Solanki
5d202ca31a
change in the student type
2017-07-10 18:40:53 +05:30
Manas Solanki
101a021f7b
added student type in program enrollment and changes in the student dashboard
2017-07-10 16:21:44 +05:30
Manas Solanki
195d2b577f
add few details in the student log ( #9670 )
2017-07-10 12:29:46 +05:30
Manas Solanki
77aa4762b8
don't request another ajax call if one is pending ( #9620 )
2017-07-10 12:12:16 +05:30
Manas Solanki
3d190a15ab
changes in the student dashboard
2017-07-07 17:29:29 +05:30
Nabin Hait
7bf192e46a
Merge pull request #9526 from manassolanki/validate-criteria
...
validate the duplicate assessment criteria
2017-07-06 15:47:10 +05:30
mbauskar
ee368221cf
[domainify] Domainification for schools doctype
2017-06-30 17:58:57 +05:30
Manas Solanki
800c69eec3
validate the duplicate assessment criteria
2017-06-29 13:00:22 +05:30
Makarand Bauskar
1eb31db71f
Merge pull request #9466 from manassolanki/validation
...
changes in student settings for validating the students in the student groups
2017-06-29 10:48:59 +05:30
Makarand Bauskar
ef95b4d6e3
Merge pull request #9468 from manassolanki/issue-11
...
in program enrollment filter out students which are already enrolled
2017-06-29 10:48:12 +05:30
Makarand Bauskar
7f9af46da5
[minor] removed whitespace
2017-06-29 09:38:46 +05:30
Makarand Bauskar
e38eb83358
[minor] removed print statement
2017-06-29 09:35:11 +05:30
Makarand Bauskar
af00c9f70b
[minor] removed whitespaces from get_students method
2017-06-29 09:25:19 +05:30
Makarand Bauskar
5c7545da0c
[minor] passed index for string format
2017-06-29 09:07:59 +05:30
Manas Solanki
d652221071
fetch queries for the students in the student group
2017-06-28 11:26:41 +05:30
Manas Solanki
3959c7c3c1
filter out students which are already enrolled in program enrollment
2017-06-27 18:22:05 +05:30
Manas Solanki
cb650f836e
validation of student in student attendance
2017-06-26 14:11:12 +05:30
Manas Solanki
7f64f623f0
Trigger assessment plan every time page loads
2017-06-21 12:08:23 +05:30
mbauskar
f9e2bf1ab4
fixed merge conflicts
2017-06-15 13:42:47 +05:30
Manas Solanki
67c4f1713b
Minor changes in the UX and courses automatically fetched upon saving ( #9264 )
2017-06-14 17:34:36 +05:30
tundebabzy
f5604c101c
Once primary key is generated, do not allow changing Series #8911 ( #9265 )
...
* changes set_only_once field for tabDocField to 1
* changes all affected doctypes `set_only_once` option to 1
* add patch name to text file
* adds test cases
* Revert "add patch name to text file"
This reverts commit fc7cb6b4557217cee61abfbbf42ff6f40099f23c.
* Revert "changes set_only_once field for tabDocField to 1"
This reverts commit 2b1f7f31a0d6491056d809f319bae0f7b84be435.
2017-06-14 16:10:09 +05:30
Nabin Hait
a128b21baa
Fixed merge conflict
2017-06-07 12:17:17 +05:30
Manas Solanki
ba7ed4626c
fetch query for assessment group ( #9120 )
2017-06-07 11:57:11 +05:30
Manas Solanki
b76b4f40a0
Added mode of transport in program enrollment ( #9124 )
2017-06-07 11:56:26 +05:30
Manas Solanki
214e6906e5
Addition of field 'group based on' in the student attendance tool ( #9152 )
2017-06-07 11:53:41 +05:30
Manas Solanki
39adfb52f3
Naming in the assessment plan ( #9153 )
2017-06-07 11:52:36 +05:30
Faris Ansari
5f27c94100
Merge pull request #9078 from netchampfaris/remove-globals
...
Lint and fix JS files
2017-06-06 11:35:42 +05:30
Nabin Hait
c9fa07b16d
Merge branch 'master' into develop
2017-05-30 15:59:04 +05:30
Manas Solanki
5f7b88d9c3
set student roll no in backend if not given ( #9039 )
2017-05-30 15:33:50 +05:30
Faris Ansari
ab74ca7fff
Lint and fix JS files
2017-05-30 12:54:42 +05:30
Nabin Hait
c795386230
Fixed merge conflict
2017-05-24 18:39:16 +05:30
Nabin Hait
fdce7a0dc3
Revert "link the different doctype in the school module ( #8844 )"
...
This reverts commit c320537e4c
2017-05-24 17:33:07 +05:30
Manas Solanki
c320537e4c
link the different doctype in the school module ( #8844 )
2017-05-24 17:29:23 +05:30
mbauskar
baa4afd67b
[minor] removed the Grade Interval and Grading Structure doctype
2017-05-24 17:13:16 +05:30
Nabin Hait
889e456dab
Merge branch 'master' into develop
2017-05-23 12:04:06 +05:30
Manas Solanki
a68fff470c
minor fix in student group ( #8959 )
2017-05-23 11:39:53 +05:30
Manas Solanki
56549fd3d9
link the different doctype in the school module ( #8844 )
2017-05-19 15:16:50 +05:30
Faris Ansari
f7a9023fda
Show empty state when no students are found in student attendance tool ( #8862 )
...
- fixes #8839
2017-05-17 19:37:31 +05:30
Manas Solanki
59472e5449
Changes in the student group creation tool ( #8833 )
2017-05-16 08:05:14 +05:30
Manas Solanki
426b8a14fd
Merge the student group and student batch ( #8663 )
...
* deleted student batch creation tool
* Patch for deleting the doctype and config
* Changes in the student attendance
* Patch for renaming the student batch as student group
* Changes in the student attendance
* Change in the student attendance reports
- Absent student report
- Student Batch-wise attendance
- Student monthly attendance sheet
* Changes in the patch
* Changes in the course schedule
* Changes in the course scheduling tool
* Change in the assessment plan
* Changes in the assessment result tool
* Cleanup
* Changes in the api.py
* create student group from student batch
* delete student batch
* add patch
* remove student batch from config/schools.py
* Delete the depricated doctype with patch
* Changes in patch
* Changes as per PR
2017-05-09 15:32:52 +05:30
Manas Solanki
65c8466622
check for mandatory field before frappe.call ( #8705 )
2017-05-05 17:28:09 +05:30
Manas Solanki
0da9bc6309
Fix for program enrollment
2017-04-28 14:37:25 +05:30
Manas Solanki
5a8a5b7d06
Fixes in Student Group
2017-04-28 14:37:25 +05:30
Manas Solanki
71373a176d
Configurable validation setting for the student group
2017-04-28 14:37:25 +05:30
Manas Solanki
d7afa69c6f
fix
2017-04-25 14:08:43 +05:30
Manas Solanki
c61dc9c7ea
Change in the assessment tool
2017-04-25 14:08:43 +05:30
