Commit graph

79 commits

Author SHA1 Message Date
David Mudrák
58489e11f1 MDL-42190 workshop: Improve the confirmation of submission removal
I noticed we do not need to list the names of potentially affected
reviewers. If the user (teacher) has the capability to see other
assessments (which they do in 99%), the list of assessments is displayed
at the confirmation page anyway. If for some reason they do not have the
capability, we should not list the names.

The second fix is that the action buttons (such as Delete or Edit) are
not displayed on the removal confirmation page.

And finally, as the output->confirm() wraps the message with implicit
<p>, it is not valid to pass HTML with any block elements. So instead of
concatenating the two messages, we simply define a new string for this
situation.
2016-01-25 15:17:45 +01:00
Paul Nicholls
30c52da9be MDL-42190 workshop: Add "sumbission_deleted" event
Add (and trigger) an event for deletion of submissions, so that deletions
are logged.
2016-01-25 15:17:44 +01:00
Paul Nicholls
deabe48bc5 MDL-42190 workshop: Add the ability to delete submissions
A new capability is introduced to control this, granted to teacher/admin
roles by default: mod/workshop:deletesubmissions.  Additionally, students
can delete their own submissions if they are currently able to edit them.
2016-01-25 15:17:44 +01:00
M Kassaei
bfde810a8b MDL-50673 workshop: Display all participants during submission phase
This patch adds a new report to be displayed during the submission
phase. The report displays all participants who are supposed to submit
their work into the workshop and the status of their submission.
2015-07-16 19:21:37 +02:00
Gregory Faller
8164fad49d MDL-13831 course: add gradepass field to mod_form 2015-03-23 10:56:56 +08:00
Helen Foster
428330da1c MDL-49241 lang: Merge English strings from the en_fix language pack 2015-02-24 11:15:15 +01:00
David Mudrák
f2639dca1d MDL-31936 workshop: Add more options to the course reset form
This is built upon original work by Michael Hughes. We now have separate
settings for deleting workshop submissions, assessments and for resetting the
workshop phase.
2014-10-03 10:48:38 +02:00
Michael Hughes
6f760e0107 MDL-31936 workshop: Initial implementation of the course reset support 2014-10-03 10:44:40 +02:00
David Mudrák
56c8eaf5d2 MDL-46056 Remove invalid string definition from the workshop module
The correct version of the string is defined above.
2014-06-19 00:43:47 +02:00
Mark Nelson
e692f58558 MDL-43557 events: removed underscores from event string keys
AMOS START
 MOV [event_legacy_logged, logstore_legacy],[eventlegacylogged,logstore_legacy]
 MOV [event_cohort_created,cohort],[eventcohortcreated,cohort]
 MOV [event_cohort_deleted,cohort],[eventcohortdeleted,cohort]
 MOV [event_cohort_member_added,cohort],[eventcohortmemberadded,cohort]
 MOV [event_cohort_member_removed,cohort],[eventcohortmemberremoved,cohort]
 MOV [event_cohort_updated,cohort],[eventcohortupdated,cohort]
 MOV [event_group_created,group],[eventgroupcreated,group]
 MOV [event_group_deleted,group],[eventgroupdeleted,group]
 MOV [event_group_member_added,group],[eventgroupmemberadded,group]
 MOV [event_group_member_removed,group],[eventgroupmemberremoved,group]
 MOV [event_group_updated,group],[eventgroupupdated,group]
 MOV [event_grouping_created,group],[eventgroupingcreated,group]
 MOV [event_grouping_deleted,group],[eventgroupingdeleted,group]
 MOV [event_grouping_updated,group],[eventgroupingupdated,group]
 MOV [event_webservice_function_called,webservice],[eventwebservicefunctioncalled,webservice]
 MOV [event_webservice_login_failed,webservice],[eventwebserviceloginfailed,webservice]
 MOV [event_webservice_service_created,webservice],[eventwebserviceservicecreated,webservice]
 MOV [event_webservice_service_deleted,webservice],[eventwebserviceservicedeleted,webservice]
 MOV [event_webservice_service_updated,webservice],[eventwebserviceserviceupdated,webservice]
 MOV [event_webservice_service_user_added,webservice],[eventwebserviceserviceuseradded,webservice]
 MOV [event_webservice_service_user_removed,webservice],[eventwebserviceserviceuserremoved,webservice]
 MOV [event_webservice_token_created,webservice],[eventwebservicetokencreated,webservice]
 MOV [event_webservice_token_sent,webservice],[eventwebservicetokensent,webservice]
 MOV [event_user_loggedin,auth],[eventuserloggedin,auth]
 MOV [event_assessable_uploaded,assignsubmission_file],[eventassessableuploaded,assignsubmission_file]
 MOV [event_assessable_uploaded,assignsubmission_onlinetext],[eventassessableuploaded,assignsubmission_onlinetext]
 MOV [event_chapter_created,mod_book],[eventchaptercreated,mod_book]
 MOV [event_chapter_deleted,mod_book],[eventchapterdeleted,mod_book]
 MOV [event_chapter_updated,mod_book],[eventchapterupdated,mod_book]
 MOV [event_chapter_viewed,mod_book],[eventchapterviewed,mod_book]
 MOV [event_book_exported,booktool_exportimscp],[eventbookexported,booktool_exportimscp]
 MOV [event_book_printed,booktool_print],[eventbookprinted,booktool_print]
 MOV [event_chapter_printed,booktool_print],[eventchapterprinted,booktool_print]
 MOV [event_message_sent,mod_chat],[eventmessagesent,mod_chat]
 MOV [event_sessions_viewed,mod_chat],[eventsessionsviewed,mod_chat]
 MOV [event_answer_created,mod_choice],[eventanswercreated,mod_choice]
 MOV [event_answer_updated,mod_choice],[eventanswerupdated,mod_choice]
 MOV [event_report_viewed,mod_choice],[eventreportviewed,mod_choice]
 MOV [event_assessable_uploaded,mod_forum],[eventassessableuploaded,mod_forum]
 MOV [event_assessable_uploaded,mod_workshop],[eventassessableuploaded,mod_workshop]
AMOS END
2014-04-29 19:15:47 -07:00
Marina Glancy
1e242b41af MDL-44321 events: cleaning up course_module_instance_list_viewed event 2014-02-28 16:36:09 +08:00
Sam Hemelryk
5cdcfcb988 MDL-44183 mod_workshop: unified @package use 2014-02-21 08:33:40 +13:00
Adrian Greeve
1f0132716e MDL-40921 mod_workshop: New events to replace add_to_log function calls. 2014-02-07 13:21:23 +08:00
Ankit Agarwal
e10ea84ed0 MDL-42962 events: Remove duplicate code from all course_module_viewed events 2013-12-03 14:24:32 +08:00
Adrian Greeve
d76a0eec39 MDL-39962 - Events: Replace the legacy event workshop_viewed
This also includes the abstract class course_module_viewed.
2013-09-24 10:08:28 +08:00
Frederic Massart
3785358d47 MDL-39954 event: Delocalise get_description 2013-08-12 17:35:30 +08:00
Frederic Massart
cbf4b0e6f6 MDL-39954 mod_workshop: Log method can return array of parameters 2013-08-12 17:35:29 +08:00
David Mudrák
9e31e23d60 MDL-38603 Reorganise Workshop settings form
Example submissions settings moved into a dedicated section.
Self-assessment setting moved to the assessment section. There is no
need for the dedicated Workshop features section any more. All Workshop
feedback settings moved into a dedicated section.

Reorganised grading settings - the grading strategy put into the top
place as it is the essential setting. All other three settings are
related to calculating actual grades.

No advanced setting fields in the Workshop form. Mixing collapsible
sections with advanced fields (that are not even marked as "advanced"
any more) does not work well.

AMOS BEGIN
 CPY [feedback,mod_assign],[feedbacksettings,mod_workshop]
AMOS END
2013-04-18 23:31:35 +02:00
David Mudrák
88e79d8adb MDL-37602 Add support for browsing the overall feedback files 2013-03-26 21:25:45 +01:00
David Mudrák
c6a793d5a2 MDL-37602 Put the overall feedback fields to the bottom of the assessment form
The assessment form can be displayed as editable or read-only (frozen).
Neither the editor element nor the filemanager element support
displaying frozen content themselves so we need to pre-format and inject
static texts.

The list of attachments should be ideally generated by the renderer and
probably improved a bit - just quick and dirty solution must be enough
for now though (2.5 coding freeze is just behind the corner...).

AMOS BEGIN
 CPY [submissionattachment,mod_workshop],[feedbackauthorattachment,mod_workshop]
AMOS END
2013-03-26 21:25:00 +01:00
David Mudrák
1c6b484dab MDL-37602 Overall feedback can be configured in the workshop settings form
Three new fields are added into the into the Assessment settings section
of the form. The default value for the overallfeedbackmaxbytes is the
same as the maximum size for submission attachments (which seems to be a
reasonable value). If there is a demand and a strong use case, these
values can became per-site configurable (I can see no big benefit of
doing so right now).

AMOS BEGIN
 CPY [maxbytes,mod_workshop],[overallfeedbackmaxbytes,mod_workshop]
AMOS END
2013-03-25 13:23:02 +01:00
Helen Foster
ca084ef149 MDL-38352 Merge English strings from the en_fix language pack 2013-03-06 16:44:39 +01:00
David Mudrák
1df3bc143c MDL-37806 Display 'Save and show next' button when assessing workshop submissions
The button is displayed only when there is a pending (that is not
assessed yet) submission to assess.

AMOS BEGIN
 CPY [savenext,mod_assign],[saveandshownext,mod_workshop]
AMOS END
2013-01-31 18:21:51 +01:00
Dan Poltawski
05f2bdea31 Merge branch 'MDL-35422-workshop-submit-button' of git://github.com/mudrd8mz/moodle 2012-11-12 10:36:16 +08:00
David Mudrák
3cb4ce45c7 MDL-26349 Display the workshop final grades to participants when the activity is closed 2012-11-07 09:08:38 +01:00
David Mudrák
4c61fcd825 MDL-35421 Display the conclusion when the workshop is closed
There is a new task implemented for the teachers so they are expected to
provide the conclusion at the end of the assessment phase.
2012-11-01 17:36:40 +01:00
David Mudrák
5a49f825bd MDL-35421 Make the new conclusion field editable via mod_form 2012-11-01 17:36:40 +01:00
David Mudrák
dc1e95c96a MDL-35422 Fix the confusing submit button label 2012-10-24 17:43:28 +08:00
David Mudrák
4f11517667 MDL-36135 Give the grading evaluation methods control over their settings forms
From now on, the evaluator's method get_settings_form() should return a
subclass of workshop_evaluation_settings_form. The evaluation subplugins
are expected to use the define_sub() method to add their own fields into
the base form, although they can override the main define() method, too.

The former interface workshop_evaluation has been refactored into a
superclass with abstract methods which seems to be more robust.

Oh, by the way, I'm in Perth - yay!

AMOS BEGIN
 MOV [settings,workshopeval_best],[evaluationsettings,mod_workshop]
AMOS END
2012-10-20 00:17:13 +08:00
David Mudrák
a93dc3ecb7 MDL-36135 Display the workshop grading evaluation method chooser
Teachers can now choose the actual grading evaluation method to use
during the grading evaluation phase. The workshopeval_best is still used
as the default one (this may be made configurable later, although there
is no big benefit of it).
2012-10-20 00:17:13 +08:00
Sun Zhigang
4714f5323a MDL-33035 workshop: typo in strings 2012-05-22 19:22:12 +08:00
Helen Foster
2e6b68f4a8 MDL-32925 lang: Add extended help texts for all modules
Thanks to Mary Cooch & Martin Dougiamas who contributed to this
rewording.

AMOS BEGIN
   REM These module help texts are going to be displayed more prominently in the Moodle interface
AMOS END
2012-05-18 00:27:04 +08:00
David Mudrak
5547b0dce1 MDL-27508 introducing mod_workshop_renderer::perpage_selector() 2012-04-27 14:41:58 +02:00
David Mudrak
1c0c3ef5ee MDL-27508 workshop shows submissions per group in the submission phase 2012-04-27 14:41:58 +02:00
Dan Poltawski
bb0bd8cb58 Merge branch 'MDL-25660-workshop-calendar' of git://github.com/mudrd8mz/moodle
Conflicts:
	mod/workshop/lang/en/workshop.php
	mod/workshop/version.php
    mod/workshop/db/upgrade.php
2012-04-17 16:31:41 +08:00
David Mudrak
ac069aeb9d MDL-25660 workshop registers events in the calendar 2012-04-13 04:52:40 +02:00
David Mudrak
3fe6d62289 MDL-26099 workshop planner tool displays info about the automatic phase switching 2012-04-13 04:49:46 +02:00
David Mudrak
3ff0805726 MDL-26099 new workshop DB field phaseswitchassessment
Note that most line changes in the patch are caused by the recent
changes in the XMLDB TEXT fields handling (no size specified now) and by
the change in the indentation.
2012-04-13 04:49:46 +02:00
David Mudrak
df558765a4 MDL-26099 validate the phases open dates and deadlines 2012-04-13 04:49:46 +02:00
David Mudrak
9862128087 MDL-32235 introducing new workshop scheduled allocation plugin
The idea is to build a plugin that will internally call the random
allocator when the submissions deadline is reached. The teacher is able
to pre-define the configuration for the random allocator.
2012-04-13 04:49:45 +02:00
David Mudrak
31cea236af MDL-32235 improving the allocation results rendering
The new renderable class workshop_allocation_result provides a cleaner
interface between the allocator's init() method and the allocation.php
script.
2012-04-13 04:49:45 +02:00
Tim Hunt
88eca3cd26 MDL-19125 module restrictions: addinstance capabilities for all mods 2012-03-15 17:13:43 +00:00
David Mudrak
2dce240984 MDL-30271 Inform the user about the example assessment conflict, instead of throwing the exception 2011-11-25 16:01:48 +01:00
David Mudrak
38504a4490 MDL-27550 workshop: assessments are now displayed via proper rendering subsystem
AMOS BEGIN
 MOV [assessmentbyknown,mod_workshop],[assessmentbyfullname,mod_workshop]
AMOS END
2011-08-02 23:33:32 +02:00
David Mudrak
0dfb4bad56 MDL-27550 workshop: display the feedback for the submission author when the workshop is closed
The method user_picture::fields() was not available when these SQL
statements were originally written. Now instead of hard-coding the list
of returned fields, the user_picture is asked for the list.

Together with this change, methods workshop::get_submission_by_id()
and workshop::get_submission_by_author() now return the information
about the user who provided the feedback and overwrote the grade.
2011-08-02 23:33:32 +02:00
David Mudrak
069de416af MDL-27196 workshop - hardcoded string in the number of errors strategy form 2011-06-22 17:40:40 +02:00
Sam Hemelryk
46d3b9be73 Merged branch 's7_MDL-26105_block_settings_master' git://github.com/andyjdavis/moodle.git with changes 2011-06-13 16:54:52 +08:00
David Mudrak
9ddff589df MDL-26147 workshop - added capability to ignore time restrictions 2011-06-10 19:01:27 +02:00
Dongsheng Cai
b1627a92e5 MDL-26105 Block settings should contains less options, and be more user friendly
AMOS BEGIN
    MOV [page-blog-index, pagetype], [page-blog-index, blog]
    MOV [page-blog-x, pagetype], [page-blog-x, blog]
    MOV [page-tag-x, pagetype], [page-tag-x, tag]
    MOV [page-course-view-weeks, pagetype], [page-course-view-weeks, format_weeks]
    MOV [page-course-view-weeks-x, pagetype], [page-course-view-weeks-x, format_weeks]
    MOV [page-course-view-topics, pagetype], [page-course-view-topics, format_topics]
    MOV [page-course-view-topics-x, pagetype], [page-course-view-topics-x, format_topics]
AMOS END
2011-06-09 13:51:14 +08:00
David Mudrak
91dedc324f MDL-26784 Strings for the new plugin manager
The new strings file core_plugin defines names of all plugin types
supported by Moodle. Some strings have already been defined elsewhere
and we use AMOS script here to copy their translation, if it is
available.

AMOS BEGIN
 CPY [settings,core],[settings,core_plugin]
 CPY [status,core],[status,core_plugin]
 CPY [missingfromdisk,core],[status_missing,core_plugin]
 CPY [nodatabase,core_admin],[status_nodb,core_plugin]
 CPY [authenticationplugins,core],[type_auth_plural,core_plugin]
 CPY [block,core],[type_block,core_plugin]
 CPY [blocks,core],[type_block_plural,core_plugin]
 CPY [coursereport,core],[type_coursereport,core_plugin]
 CPY [coursereports,core],[type_coursereport_plural,core_plugin]
 CPY [filter,core],[type_filter,core_plugin]
 CPY [courseformats,core],[type_format_plural,core_plugin]
 CPY [activitymodule,core],[type_mod,core_plugin]
 CPY [activitymodules,core],[type_mod_plural,core_plugin]
 CPY [plagiarism,core_plagiarism],[type_plagiarism,core_plugin]
 CPY [portfolio,core_portfolio],[type_portfolio,core_plugin]
 CPY [portfolios,core_portfolio],[type_portfolio_plural,core_plugin]
 CPY [questiontype,core_admin],[type_qtype,core_plugin]
 CPY [questiontypes,core_admin],[type_qtype_plural,core_plugin]
 CPY [repository,core_repository],[type_repository,core_plugin]
 CPY [theme,core],[type_theme,core_plugin]
 CPY [themes,core],[type_theme_plural,core_plugin]
 CPY [uninstallplugin,core_admin],[uninstall,core_plugin]
 CPY [version,core],[version,core_plugin]
 CPY [assignmenttype,mod_assignment],[subplugintype_assignment,mod_assignment]
 CPY [presets,mod_data],[subplugintype_datapreset_plural,mod_data]
 CPY [evaluationmethod,mod_workshop],[subplugintype_workshopeval,mod_workshop]
 CPY [strategy,mod_workshop],[subplugintype_workshopform,mod_workshop]
AMOS END
2011-03-31 13:59:05 +02:00