Commit graph

1399 commits

Author SHA1 Message Date
David Mudrak
6403358838 MDL-27550 workshop: fixed XHTML strictness of H3 and A combo
H3 is block level element while A is in-line element in XHTML.
Credit goes to Sam Hemelryk for spotting this during the peer-review.
2011-08-02 23:34:04 +02:00
David Mudrak
2c75324ee6 MDL-27550 workshop: rendering links to the submission and the assessment page
This usability improvement helps to provide feedback quickly during the
grading evaluation phase.
2011-08-02 23:33:33 +02:00
David Mudrak
3779dcae98 MDL-27550 workshop: students do not see peer-assessment that are not graded yet 2011-08-02 23:33:32 +02:00
David Mudrak
f68648e982 MDL-27550 workshop: display the feedback for the submission reviewer when the workshop is closed 2011-08-02 23:33:32 +02: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
c8ea2c4572 MDL-28298 workshop: do not use a constant without explicit inclusion of the library
Instead of including whole formslib just to get the constant defined, I
decided to hard-code the value and put the reference to the comment so
that eventual grep would spot it. Of course that is is not nice at all
but it's lesser of two evils imho.
2011-07-13 10:28:28 +02:00
Eloy Lafuente (stronk7)
1f767468ac Merge branch 'MDL-28015-workshop-sql' of git://github.com/mudrd8mz/moodle 2011-07-08 01:11:13 +02:00
David Mudrak
20e7fd839a MDL-28015 workshop - fixed unique list of columns in ORDER BY clause
MSSQL requires that the columns in the ORDER BY clause list must be
unique. The patch populates the list of fields by combining an array of
explicit sort definition with an array of implicit (default) sort
definition.
2011-07-07 15:17:27 +02:00
Eloy Lafuente (stronk7)
26635fd7f9 Merge branch 'MDL-28169' of git://github.com/nebgor/moodle 2011-07-07 10:21:32 +02:00
Aparup Banerjee
c5a8abfedd MDL-28169 Installation Added 2.1 upgrade (idiot proof) lines to upgrade scripts. 2011-07-07 11:40:38 +08:00
Aparup Banerjee
728ebac7f2 MDL-28135 general Updating all hardcoded "docs.moodle.org/en/Development:" type doc links to "docs.moodle.org/dev/" 2011-07-05 14:27:31 +08:00
Sam Hemelryk
f86e19b1ee Merge branch 'MDL-27829_block_pagetype_master' of git://github.com/andyjdavis/moodle 2011-06-29 17:04:13 +08:00
Andrew Davis (andyjdavis)
b38e2e28a1 MDL-27829 blocks: altered the algorithm used to find plugin page types 2011-06-27 12:27:41 +08:00
Eloy Lafuente (stronk7)
aad4048bd7 Merge branch 'MDL-27196-hardcodedstrings' of git://github.com/mudrd8mz/moodle 2011-06-23 00:25:27 +02:00
David Mudrak
e4394d00c4 MDL-27196 workshop - hardcoded strings in the random allocator 2011-06-22 17:58:48 +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
Eloy Lafuente (stronk7)
fc57ca6a54 Merge branch 'MDL-27969-randomallocator' of git://github.com/mudrd8mz/moodle 2011-06-22 14:15:52 +02:00
David Mudrak
9153248d22 MDL-27969 workshop - prevent PHP notices in the random allocator
When generating the output of the allocation results, the names of
reviewers and authors are obtained based on the current state of assigned
roles and the 'musthavesubmission' setting. Therefore, when we want to
display information about a re-used allocation, the name of the author
or the name of the author may not be available.

In case of reviewers, we first try to reload the list including the
users without own submission. If it does not help, we just display the
id of the user instead of the name. In case of authors, we just display
the id the user. I can't see much point of eventual fetching the user
record from the database just to populate the list that almost no-one
reads anyway.
2011-06-22 12:03:56 +02:00
David Mudrak
c1ab2b109e MDL-27970 workshop submission can't be edited after the deadline even if late submissions are allowed 2011-06-22 00:34:45 +02:00
Eloy Lafuente (stronk7)
ee1235e7af Merge branch 'backup-convert' of git://github.com/mudrd8mz/moodle 2011-06-14 22:38:27 +02:00
Eloy Lafuente (stronk7)
a0be4a1fcb Merge branch 'MDL-27065-workshop-categories' of git://github.com/mudrd8mz/moodle 2011-06-13 19:52:49 +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
David Mudrak
a74cadfa77 MDL-27065 workshop grades categories can be defined in mod_form
Because the Workshop module creates two grade items in the gradebook, we
can't use standard modedit features to set the corresponding category in
the gradebook (it supports single grade item only).

The patch also cleans the mod_form.php so that it does not use the
global $COURSE (just because I do not like this global variable).

And for the record - QuickForms must die.
2011-06-10 16:48:09 +02:00
David Mudrak
b61cf3ff8a MDL-22414 Merge branch 'master' into backup-convert
Conflicts:
	theme/base/style/core.css
2011-06-09 13:04:49 +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
30d5190a9b MDL-27452 Workshop 1.9 backups conversion support 2011-06-09 00:00:03 +02:00
Sam Hemelryk
e0f18a37c9 Merge branch 'MDL-27734-workshop-example-weight' of git://github.com/mudrd8mz/moodle 2011-06-07 16:24:17 +08:00
David Mudrak
b34b969103 MDL-27734 Fixed weights of the example submission assessments 2011-06-06 17:37:59 +02:00
David Mudrak
ce8157ed91 MDL-27733 workshop: keep the phase deadlines during the 1.9 => 2.0 upgrade 2011-06-06 17:36:32 +02:00
Sam Hemelryk
2b04c41c58 MDL-27471 Adding mandatory component & ratingarea to the ratings API + other fixes
* Added the component and ratingarea fields and implemented it throughout
  the rating API as mandatory fields
* Cleanup rating indexes
* Upgrade forum/data/glossary ratings
* Moved the logic in the render_rating method to methods of the rating object.
* Added new callback for checking ratingareas
* Cleaned comments here and there
* Mark the xxx_get_participants methods as deprecated
* Refactor rate_ajax and ratingsuser_can_view_aggregate methods
* Cleaned up rating/index.php to use html_table object and moved inline styles to CSS.
* Added missing properties of the rating object that were being set throughout the rating
  API.
2011-05-23 12:35:39 +02:00
sam marshall
6553cda7c9 MDL-26778 Change to completion should immediately affect nav block
Includes change so that updating completion resets the cache, and a debugging
warning if any module calls the completion viewed thing after it's already
printed navigation (which will mean navigation obviously doesn't update right
away). All existing modules that currently update after printing navigation
were updated.
2011-04-11 12:40:13 +01: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
David Mudrak
d67c20b873 MDL-26535 workshop: fixed availability of published and assessed submissions
While working on the new capability to view authors of published
submissions, I realized that published submissions are correctly listed
(implemented in 00bc77ee) but they can't be viewed by submission.php.
This patch fixes submission.php so that it allows to view published
submissions.

Also, I noticed that when the workshop is closed, the submissions that
were assessed by the user are not listed (as they were in the previous
phases) but submission.php provides access to them correctly. So I added
a code that lists assessed submissions in the closed phase.
2011-03-06 23:49:49 +01:00
David Mudrak
e13d02f544 MDL-26535 workshop: new capability to control the anonymity of published submissions
Re-using 'mod/workshop:viewauthornames' would not be a happy option here
because teacher would have to change local overrides every time when
they were closing or re-opening the workshop (if they wanted anonymous
assessment but non-anonymous hall of fame).
2011-03-04 14:08:00 +01:00
David Mudrak
757bade1f6 MDL-26684 workshop: fixed missing href attribute in the link to the own submission
This was caused by incorrect construction of workshop_submission_summary.
Instead of direct initiation, the helper method should be used. The
helper adds a property 'url' needed to render 'href' later.
2011-03-04 14:07:50 +01:00
David Mudrak
de6aaa7295 MDL-26683 workshop: fixed typos in code comments 2011-03-04 13:03:49 +01:00
Petr Skoda
431ac39634 MDL-26623 fix file permissions
The permissions are now going to be verified as part of the weekly release process.
2011-03-01 12:26:49 +01:00
David Mudrak
1dade8b185 MDL-26546 Workshop: fixed embedded images in Number of errors grading form
Because of this typo, embedded images were not loaded when the
assessment form was re-edited. Thanks Helen Foster for spotting this.
2011-02-22 22:19:16 +01:00
David Mudrak
7c26c3f875 MDL-26546 Workshop: fixed incorrect mapping name in the restore of assessment forms
There was a regression of 8fa86f and ac0f8f where I changed the mapping
names but did not use the new names in add_related_files() call.

All credit goes to Eloy Lafuente for spotting the problem and giving me
a hint on how to fix it.
2011-02-22 00:54:13 +01:00
David Mudrak
0c3c0de198 MDL-26312 Workshop: unset temporary arrays in upgrade code
Spotted by Petr Skoda during the code review.
2011-02-14 21:38:50 +01:00
David Mudrak
f593111b67 MDL-26312 Workshop: data integrity check to detect eventual course_modules corruption
Because of a bug in Workshop upgrade code, multiple workshop course_modules can
potentially point to a single workshop instance. The chance is pretty low as in most cases,
the upgrade failed. But under certain circumstances, workshop could be upgraded with
this data integrity issue. We want to detect it now and let the admin know.
2011-02-14 10:11:42 +01:00
David Mudrak
d0fb170520 MDL-26312 Workshop: fixed upgrade of module instances from 1.9 to 2.0
The patch changes workshop_upgrade_module_instances() so that it
processes old workshop records ordered by their id and it keeps the
instances id by using import_record() instead of insert_record().
Thanks to this, there is no mapping of workshop ids needed so the
function workshop_upgrade_workshop_id_mappings() is dropped and all
callers use plain workshop record.
2011-02-11 07:43:04 +01:00
Petr Skoda
f2f45270ee Merge branch 'MDL-26267' of git://github.com/samhemelryk/moodle 2011-02-07 23:07:16 +01:00
David Mudrak
32ea207a48 MDL-26298 Workshop: fixed trivial typos in phpDoc blocks 2011-02-07 10:49:34 +01:00
David Mudrak
d239b952a5 MDL-26296 Workshop: trivial change in manual allocator CSS
When only two rows of the allocations table are displayed with the new
allocation highlighted, it is better not highlight the odd row.
2011-02-07 10:49:30 +01:00
Sam Hemelryk
2addb4ba1b mod-workshop MDL-26267 workshop_extend_navigation argument 4 is now always going to be a cm_info object 2011-02-07 13:20:09 +08:00
David Mudrak
51abc39695 MDL-26188 Workshop: get rid of a method that is not used anyway
The protected method get_allocations_recordset() is a relict from
earlier development phases of Workshop module. Removing it as it
confuses recent Eloy's recordset usage detection tool.
2011-02-04 14:33:48 +01:00
Petr Skoda
99d19c13ae MDL-25855 some more missing filelib includes 2011-01-23 18:34:41 +01:00