Merge branch 'feature/grading_credit' into develop
Conflicts: ~dev_rating/application/classes/Model/Teachers.php
Showing
- db/StoredFunctions.sql 77 additions, 34 deletionsdb/StoredFunctions.sql
- db/StoredProcedures.sql 11 additions, 3 deletionsdb/StoredProcedures.sql
- db/Structure.sql 34 additions, 4 deletionsdb/Structure.sql
- db/Views.sql 2 additions, 1 deletiondb/Views.sql
- db/fix.sql 15 additions, 83 deletionsdb/fix.sql
- ~dev_rating/application/bootstrap.php 13 additions, 9 deletions~dev_rating/application/bootstrap.php
- ~dev_rating/application/classes/Controller/DeanOffice/Credits.php 58 additions, 0 deletions...ing/application/classes/Controller/DeanOffice/Credits.php
- ~dev_rating/application/classes/Controller/DeanOffice/Sheets.php 2 additions, 2 deletions...ting/application/classes/Controller/DeanOffice/Sheets.php
- ~dev_rating/application/classes/Controller/Handler/Coursework.php 51 additions, 0 deletions...ing/application/classes/Controller/Handler/Coursework.php
- ~dev_rating/application/classes/Controller/Handler/Map.php 1 addition, 8 deletions~dev_rating/application/classes/Controller/Handler/Map.php
- ~dev_rating/application/classes/Controller/Student/Index.php 9 additions, 2 deletions~dev_rating/application/classes/Controller/Student/Index.php
- ~dev_rating/application/classes/Controller/Student/Subject.php 1 addition, 8 deletions...rating/application/classes/Controller/Student/Subject.php
- ~dev_rating/application/classes/Controller/Teacher/Discipline.php 33 additions, 32 deletions...ing/application/classes/Controller/Teacher/Discipline.php
- ~dev_rating/application/classes/Controller/Teacher/Index.php 16 additions, 16 deletions~dev_rating/application/classes/Controller/Teacher/Index.php
- ~dev_rating/application/classes/Controller/Teacher/Rating.php 1 addition, 0 deletions..._rating/application/classes/Controller/Teacher/Rating.php
- ~dev_rating/application/classes/DataHelper.php 7 additions, 1 deletion~dev_rating/application/classes/DataHelper.php
- ~dev_rating/application/classes/Model/CourseWork.php 33 additions, 0 deletions~dev_rating/application/classes/Model/CourseWork.php
- ~dev_rating/application/classes/Model/Discipline.php 35 additions, 1 deletion~dev_rating/application/classes/Model/Discipline.php
- ~dev_rating/application/classes/Model/Disciplines.php 9 additions, 0 deletions~dev_rating/application/classes/Model/Disciplines.php
- ~dev_rating/application/classes/Model/Teachers.php 4 additions, 4 deletions~dev_rating/application/classes/Model/Teachers.php
Please register or sign in to comment