mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity
49,541 Commits 36 Branches 519 Tags
Commit Graph

49541 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marina Glancy
ab156741fc MDL-29481: implemented rubrics renderer, improved rubrics UI 2011-10-17 17:03:25 +08:00
David Mudrak
8168299d7e Improved integration into the settings block 2011-10-16 19:40:47 +02:00
David Mudrak
03d448e5ff Activity module's settings form redirects to the management screen when advanced grading method was selected to use 2011-10-16 19:40:47 +02:00
David Mudrak
3bd217aaa4 Grading manager's set_active_method() returns bool now 2011-10-16 19:40:46 +02:00
David Mudrak
6b5b05dc3b Fixing the nullability of levelid field in the gradingform_rubric_fillings table 
Credit goes to Marina Glency for spotting this.
 2011-10-16 19:40:46 +02:00
David Mudrak
44354f9e32 Adding a unique key to the gradingform_rubric_fillings table 
Credit goes to Marina Glency for the suggestion.
 2011-10-16 19:40:45 +02:00
David Mudrak
998085c9f7 Dropping the uq_rater_per_item from the table grading_instances 
It was realized that we may need multiple instances per one rater/item
to be able to 1) implement a draft instance and 2) eventually keep the
history of advanced grading.
 2011-10-16 19:40:34 +02:00
David Mudrak
7ece4a0798 Merge branch 'rubric' of github.com:mudrd8mz/moodle into rubric 2011-10-13 22:45:30 +02:00
David Mudrak
20c207ab21 Merge branch 'master' into rubric 
Conflicts:
	lib/db/upgrade.php
 2011-10-13 22:42:47 +02:00
David Mudrak
ba2a25a816 Merge pull request #14 from marinaglancy/wip-MDL-29481-rubric 
MDL-29481: Filling rubric by teacher (first steps)
 2011-10-13 13:24:37 -07:00
Marina Glancy
3bf7ef29a5 MDL-29481: filling rubric by teacher, first steps 2011-10-13 16:27:33 +08:00
Eloy Lafuente (stronk7)
6731a04d93 weekly release 2.2dev 2011-10-12 23:46:36 +02:00
David Mudrak
a5c4c99b24 Merge pull request #13 from marinaglancy/wip-formvalidation-rubric 
Initial prototype of integrating advanced grading methods into current forms

There is a new form element called 'grading', which receives grading_controller as an argument and uses it's functions to produce html and validate the value.

The biggest change in grading form is that I included call to new function validate_and_preprocess_feedback, which validates and also fills the xgrade field with value, calculated by controller

Another issue: when the teacher grades the student on offline assignment for the first time, there may be no entry in submission table (and therefore no id). So I create a submission if there is advanced grading otherwise we won't be able to save via AJAX the process of filling rubric, because normal grading will create an entry only on submit.

And as an example I created text field in rubric, that is saved as grade. There is validation that value can not be more than 100.
 2011-10-12 01:06:27 -07:00
Marina Glancy
6798c63e20 Added form element grading and integrated it with grading_controller 2011-10-12 15:01:53 +08:00
Marina Glancy
18e6298c7b Added validation to grading form, implemented methods in advanced grading to return form contents and process and return the final grade 2011-10-12 11:48:06 +08:00
David Mudrak
6abcb0c21f Merge remote branch 'origin/master' into rubric 2011-10-12 03:13:55 +02:00
David Mudrak
fe817d8799 Various modifications and tweaks of the rubric editing page 2011-10-12 03:10:08 +02:00
David Mudrak
2824c44aec Merged Marina's recent work on rubric plugin 
Conflicts:
	grade/grading/form/lib.php
	grade/grading/form/rubric/lib.php
	grade/grading/lib.php
 2011-10-11 21:37:14 +02:00
Eloy Lafuente (stronk7)
f6e1809608 Merge branch 'MDL-29625' of git://github.com/timhunt/moodle 2011-10-11 12:10:51 +02:00
Tim Hunt
e4e0020ed6 MDL-29625 new helper function get_plugin_list_with_class. 
Based on the existing get_plugin_list_with_function. As part
of implementing this, I refactored out a
get_plugin_list_with_file function, which may also be useful.
 2011-10-11 10:46:23 +01:00
Aparup Banerjee
fc09870e0e Merge branch 'wip-MDL-27058-master' of git://github.com/samhemelryk/moodle.git (solved conflict) 2011-10-11 13:37:34 +08:00
Aparup Banerjee
44d872b87e Merge branch 'wip-MDL-27278-master' of git://github.com/samhemelryk/moodle 2011-10-11 11:19:14 +08:00
Aparup Banerjee
bdfb2b71b7 Merge branch 'wip-MDL-28549-master' of git://github.com/samhemelryk/moodle 2011-10-11 09:46:16 +08:00
Aparup Banerjee
e6d80c1d3e Merge branch 'wip-MDL-28582-master' of git://github.com/samhemelryk/moodle 2011-10-11 09:26:30 +08:00
Eloy Lafuente (stronk7)
71e1a1f820 MDL-20306 Add course_category idnumber field: version bump and fix missing add_field() call 2011-10-10 23:54:40 +02:00
Andrew Robert Nicols
83cd9b163a MDL-20306 Add course_category idnumber field 2011-10-10 23:54:30 +02:00
Sam Hemelryk
d87ef08598 Merge branch 'MDL-29447' of git://github.com/timhunt/moodle 2011-10-11 10:25:33 +13:00
Sam Hemelryk
811cbdcfbf Merge branch 'MDL-29640_master' of git://github.com/kordan/moodle 2011-10-11 10:15:46 +13:00
Aparup Banerjee
aabf13c240 Merge branch 'wip-MDL-29224-master' of git://github.com/samhemelryk/moodle 2011-10-10 23:14:05 +08:00
Aparup Banerjee
f717586091 Merge branch 'wip-MDL-29672-master' of git://github.com/samhemelryk/moodle 2011-10-10 22:45:01 +08:00
Kordan
2106024854 MDL-29640 fix for master 2011-10-10 13:19:15 +02:00
Eloy Lafuente (stronk7)
c676af9f72 MDL-29564 Assignment: whitespace fix 2011-10-10 13:08:48 +02:00
Marina Glancy
c586d2bfd6 MDL-29481: start implementing rubric editor 2011-10-10 15:27:15 +08:00
Sam Hemelryk
1216ab39d1 Merge branch 'MDL-16553' of git://github.com/bostelm/moodle 2011-10-10 17:56:14 +13:00
Dan Poltawski
e0daa8499a MDL-29661 - lib/googleapi.php - Switch to SSL urls 
I am not sure why I did not use these in the first instance, I don't
think Google supported SSL in the first versions of their API.

They do now, and it seems that this week they stopped supporting non-ssl
requests.
 2011-10-10 16:27:53 +13:00
Ruslan Kabalin
7757237cdd MDL-29692 enrol: cohort: Fix default role issue in Chrome 
This is related to MDL-24280, the issue still persists in Chrome. The patch
fixes it for Chrome and works fine for the most major browsers.
 2011-10-10 14:57:42 +13:00
Sam Hemelryk
3070626a74 Merge branch 'w40_MDL-29686_m2_yuicaching' of git://github.com/skodak/moodle 2011-10-10 12:20:38 +13:00
Sam Hemelryk
77b93da537 Merge branch 'MDL-29668' of git://github.com/stronk7/moodle 2011-10-10 12:09:34 +13:00
Sam Hemelryk
36a42c57d1 Merge branch 'MDL-29677' of git://github.com/stronk7/moodle 2011-10-10 12:03:39 +13:00
Stephen Bourget
19f7391c50 MDL-29564 Assignment: Fixed a fatal error caused by a missing include 2011-10-10 11:54:53 +13:00
Sam Hemelryk
f915430855 Merge branch 'master_MDL-29690' of git://github.com/danmarsden/moodle 2011-10-10 11:24:44 +13:00
Sam Hemelryk
356a6de351 MDL-27058 navigation: Added a setting to control whether user forum links are added 2011-10-10 10:57:02 +13:00
Sam Hemelryk
5a1b6297c9 MDL-28582 course-report: Added a nothing to display notification to the outline and complete activity reports 2011-10-10 10:35:05 +13:00
Sam Hemelryk
e7f9b7abc8 MDL-28549 navigation: Added a missing login check when adding the calendar link to the navigation 2011-10-10 10:30:22 +13:00
Sam Hemelryk
01ec550b0f MDL-29672 user: Fixed user edit page for non-admin users 2011-10-10 10:27:18 +13:00
Sam Hemelryk
32b9e80b15 MDL-27278 navigation: Admin users can now set the home page preference like normal users 2011-10-10 10:17:00 +13:00
Eloy Lafuente (stronk7)
b77088cd04 emergency release 2.2dev 2011-10-09 22:40:35 +02:00
Eloy Lafuente (stronk7)
033d656617 MDL-29520 - mysql multitable delete, outer join some tables 2011-10-09 22:15:27 +02:00
Eloy Lafuente (stronk7)
617a9bb4c3 MDL-29668 xmldb editor - fix PHP generation for foreign-unique keys 2011-10-08 21:49:56 +02:00
David Mudrak
fba356f375 MDL-29483 Initial draft of advanced grading support in the Assignment module 2011-10-08 01:02:31 +02:00