Commit Graph

471 Commits

Author SHA1 Message Date
844d27b2cd Merge branch 'MDL-65968-master' of git://github.com/jleyva/moodle 2019-09-24 12:01:10 +08:00
dcadc8c54c MDL-65968 notifications: Use f1 size avatars for Push notifications 2019-09-17 16:29:02 +02:00
0b9f2215d0 MDL-66113 assign: Apply user overrides in get_submission_status WS 2019-09-16 12:05:55 +02:00
eb70a00163 Merge branch 'MDL-66137-38_mod_assign_marking_workflow_incorrect_grade_display' of https://github.com/tomdickman/moodle 2019-09-04 13:44:49 +08:00
028c5ed5f9 MDL-66137 mod_assign: fixed marking workflow incorrect grade display
Aligned logic between quick grading changes and set marking workflow state changes to accurately
finalise or remove final grade from the gradebook, depending on the marking workflow state if
being used.
2019-09-04 14:29:30 +10:00
d2c09e8ffd MDL-66575 mod_assign: fix first day of current month behat edge case
What we really want to test in this behat test is the 2 extremes:
the user who started a long time ago and doesn't have access any more
and the user who started recently, who does have access. To fix all
problems with datetime clashes, it's probably better to just use
'yesterday' for the current student's enrolment start time.
2019-09-02 13:11:49 +08:00
f69543d741 Merge branch 'MDL-66558-master' of https://github.com/snake/moodle 2019-08-30 10:41:45 +08:00
cb14d4d811 MDL-66558 core_course: fix edge case in relative dates behat feature 2019-08-30 10:19:42 +08:00
62f1640df2 MDL-65116 mod_assign : Assignment due date does not update for groups.
This commit fixes the assignment due date not showing correctly according to groups selected by users who can view grades
2019-08-23 13:08:53 +10:00
7da3ab8359 Merge branch 'MDL-65925-grade-page-broken-for-deleted-submission-master' of https://github.com/ilya-catalyst/moodle 2019-08-14 15:28:14 +08:00
9ce55a8668 MDL-66147 mod_assign: behat test covering relative due date field
Tests that each student has a fixed amount of time, relative to their
course start date, in which to submit the assignment, and that teachers
are shown the dates relative to each student when grading.
2019-08-13 15:09:13 +08:00
d0cff2367a MDL-66147 mod_assign: external get_participant supports relative dates 2019-08-13 15:09:13 +08:00
db381d5c87 MDL-66147 mod_assign: Change assign to return calculated instance data
Changes include:
- Added a private method calculate_properties(), which calculates
per-user instance properties and stores them in an instance var.
- get_instance() now takes a userid param, and calls the
calculate_properties() method, allowing per-user instances to be
returned.
- Added a public method get_default_instance(), which returns the
non-augmented instance data (no per-user properties), so we can
still get back the raw instance data when needed.
- The get_course method has been changed to make sure we always have an
object property, not a string - which happened in some cases (when
commenting on the assign submission page, for example).
2019-08-12 09:35:51 +08:00
64ce596f8c MDL-65925 assign: Grade page broken if submission was deleted. 2019-08-12 09:28:50 +10:00
96e444665e MDL-65517 block_timeline: Hide completed course modules in Timeline
When some activities are manually completed by students, some are still showing in students' timeline.
This commit fix that for module assign,chat,choice,feedback,lesson,quiz,scorm and workshop.
2019-07-12 09:16:40 +10:00
d0df20d88b Merge branch 'MDL-64811_group_submission_warning' of git://github.com/davosmith/moodle 2019-07-09 17:57:37 +02:00
9cb135db20 MDL-61114 mod_assign: assignment overrides to observe group membership 2019-07-03 18:00:11 +02:00
8773296b77 MDL-64811 mod_assign: fix webservice return type 2019-07-01 11:22:57 +01:00
6f5990024c Merge branch 'MDL-66003-master-enfix' of git://github.com/mudrd8mz/moodle 2019-06-26 23:04:18 +02:00
d201dba655 MDL-66003 lang: Use the updated strings in the tests 2019-06-25 18:05:03 +02:00
f82931c169 MDL-65922 core: add grade_item_updated event 2019-06-21 08:54:37 +10:00
74ddcaaa6f MDL-64811 mod_assign: warn about 'Default group' submissions 2019-06-17 16:01:47 +01:00
375e2ecea0 MDL-57487 mod_assign: final deprecation xxx_print_overview
Apart from deprecating assign_print_overview , the following methods
have been also deprecated because they are not used anymore:
- assign_get_mysubmission_details_for_print_overview
- assign_get_grade_details_for_print_overview
2019-06-14 17:41:18 +02:00
2356454f21 MDL-60680 notifications: Include action buttons information 2019-04-25 14:55:57 +02:00
36fa0ec900 MDL-60680 notifications: Return custom data in notifications 2019-04-25 14:55:18 +02:00
85f47bae7f MDL-65204 phpunit: various fixes to assertions
Namely:
   - 3rd param of assertEquals() cannot be null.
   - Some incorrect uses of assertNotEmpty().
   - Comparing 2 strings now uses strict (===) evaluation.
       Link: https://github.com/sebastianbergmann/phpunit/issues/3185
     Solution here is one of:
       a) Return to the previous situation, making the comparison
          softer. That can achieved by forcing different types, so
          float == string works.
       b) Changing APIs (both forms and database return strings) to
          perform some conversion to floats. That would make float
          comparison (with floats or strings) to work too.
     The patch here follows the a) approach. Changing all the internals
     for proper float handling sounds excesive when it has been working
     perfectly since ever. So we went the easier route, just getting
     rid of the new === comparisons when needed by changing expectation
     types to float.
2019-04-03 10:39:19 +08:00
2a0b517257 MDL-65173 message_email: removed bogus logic
This reverts commit 0f38e62970.
2019-03-25 17:12:53 +08:00
3c1bb2334d Merge branch 'MDL-64444-master' of git://github.com/jleyva/moodle 2019-02-28 01:19:13 +01:00
a0e20ce87c Merge branch 'MDL-64761-master' of git://github.com/dpalou/moodle 2019-02-27 15:36:18 +01:00
4f3f8fba67 Merge branch 'MDL-45151-master' of git://github.com/damyon/moodle 2019-02-19 06:39:24 +01:00
7a5669557c MDL-64377 assign: Behat test fix
The behat assumed that after editing a submission, the next page would be the assignment
front page even though we were previously on the "view all submissions" page. The extra
step to go back to the "view all submissions" page is no longer needed so has been removed.
2019-02-07 09:33:52 +08:00
74f6a5d482 MDL-64507 assign: Behat test "Hide grader identity"
Test that you can't see the identity of the grader even on previous attempts.
2019-02-07 12:16:46 +13:00
e6d28cbb40 Merge branch 'MDL-64377-master' of git://github.com/damyon/moodle 2019-02-05 12:46:01 +01:00
37fc47f17d MDL-64377 assign: Allow remove submission
Calls each submission plugin to remove the data for a submission.
2019-02-05 11:54:49 +08:00
468ee73bba MDL-64761 assign: Add tests for hidden grader in WS 2019-02-04 15:29:47 +01:00
2f2b0bfc61 Merge branch 'MDL-63578-master' of git://github.com/damyon/moodle 2019-02-01 13:31:31 +01:00
5ac7838e3c MDL-45151 assign: Add anonymous flag to events if blindmarking 2019-02-01 09:12:48 +08:00
ff9a0f8289 MDL-63578 assign: Better page titles
Use the context function get_context_name() to set the page title. This will
change it from "Assignment" to "C1: Important foods to eat".

The get_context_name() for activity modules is updated to include the course short name (not the
name of the activity type).
2019-01-31 10:47:24 +08:00
cf0cad920c MDL-64444 mod_assign: Use correct permissions for context locking
Some WebServices does not use the correct permissions.
This mean that when a context is locked, they don't behave as expected.
2019-01-30 15:07:58 +01:00
3c4fd88193 MDL-56604 assign: Group submission status
On the page listing all assignments for the course,
show the status of the group submission if teamsubmissions is enabled
for the assignment.
2019-01-24 14:33:54 +08:00
0f38e62970 MDL-64400 core_messages: Mark notifications sent via email as read 2018-12-27 09:15:53 +01:00
e63084ec1b Merge branch 'MDL-60474-master' of git://github.com/damyon/moodle 2018-12-19 10:14:13 +08:00
064f15033f MDL-60474 assign: Consistent user filters
Use the current filters and sorting on the user grading table in the single
page grading app when it is possible.

This replaces the popover used to configure the filters to one that closely matches the
one from the grading table. It supports standard filters, workflow filters and allocated marker filters.

It will also support group filtering and suspended user filtering but we don't show the controls for those in
the single grading page.
2018-12-19 10:10:23 +08:00
91a2215eea MDL-49673 mod_assign: Tidy up hidegrader patch 2018-12-18 14:33:42 +13:00
f14afd2936 MDL-49673 mod_assign: option to hide grader 2018-12-14 13:50:06 +13:00
246149f059 Merge branch 'MDL-53035-master' of git://github.com/vmdef/moodle 2018-11-16 00:35:33 +01:00
df3d877656 MDL-63832 assign: Check current user can view submission 2018-11-14 16:53:34 +01:00
e26d40e343 MDL-53035 mod_assign: add course_module_viewed event 2018-11-08 09:54:55 +00:00
52d575b396 Merge branch 'MDL-63820' of git://github.com/albertgasset/moodle 2018-10-31 16:01:40 +08:00
577fdc3438 MDL-63820 assignfeedback_comments: Implement get_file_areas 2018-10-30 15:25:58 +01:00