Commit graph

50200 commits

Author SHA1 Message Date
Ankit Kumar Agarwal
b84b783f6c MDL-28277 Small fixes 2011-11-03 07:45:52 +05:30
Ankit Kumar Agarwal
c03d2b753e MDL-28277 Added function to find question count 2011-11-03 07:45:50 +05:30
Ankit Kumar Agarwal
1135979696 MDL-28277 Basic Skeleton update
modified:   mod/scorm/report/interactions/report.php
2011-11-03 07:45:48 +05:30
Ankit Kumar Agarwal
8fb40a45fb MDL-28277 First Version push of the interactions plugin
new file:   mod/scorm/report/interactions/lang/en/scormreport_interactions.php
	new file:   mod/scorm/report/interactions/report.php
	new file:   mod/scorm/report/interactions/responsessettings_form.php
	new file:   mod/scorm/report/interactions/version.php
2011-11-03 07:45:46 +05:30
Ankit Kumar Agarwal
b7afad0e17 MDL27522 First version Push
modified:   mod/scorm/report.php
	new file:   mod/scorm/reportuser.php

MDL-27522 SCORM Reports-remove users report to seperate files for better re-use

	modified:   mod/scorm/reportuser.php

MDL-27522 SCORM Reports validated reportuser.php

	modified:   mod/scorm/report.php
	modified:   mod/scorm/reportuser.php

MDL-27522 SCORM REPORT - updating reportuser.php to use MUST_EXIST parameter

	modified:   mod/scorm/lang/en/scorm.php
	modified:   mod/scorm/reportuser.php

MDL-27522 SCORM Reports- Cleaning of codes
	modified:   mod/scorm/report.php
	modified:   mod/scorm/reportuser.php

MDL-27522 SCORM Reports- update formating

	modified:   mod/scorm/report.php
	modified:   mod/scorm/reportuser.php

MDL-27522 SCORM Reports removed unwanted codes from reportuser.php

	modified:   mod/scorm/reportuser.php

MDL-27522 Scorm Reports - optimising codes

	modified:   mod/scorm/report.php
	modified:   mod/scorm/reportuser.php

MDL-27522 Scorm Reports-Formating report.php
	modified:   mod/scorm/report.php

MDL-27522 Scorm Reporting - removing unsed variables

	modified:   mod/scorm/lang/en/scorm.php
	modified:   mod/scorm/report.php
	modified:   mod/scorm/reportuser.php

MDL-27522 SCORM Reporting - Renaming reportuser.php to userreport.php
	new file:   mod/scorm/userreport.php

MDL-27522 SCORM Reporting - deleting old reportuser.php

	deleted:    mod/scorm/reportuser.php

MDL-27522 Scorm Reporting - updated version number

MDL-27522 Scorm Reporting - Discarding version changes

MDL-27523 Scorm Reporting - Basic reporting plugin
	new file:   mod/scorm/report/basic/lang/en/scorm_basic.php
	new file:   mod/scorm/report/basic/report.php
	new file:   mod/scorm/report/default.php
	new file:   mod/scorm/report/reportlib.php

MDL-27523 Scorm Reporting - Database Table structure pushed
	new file:   mod/scorm/db/subplugins.php

MDL-27523 Scorm Reporting - Plugin container codes
	modified:   mod/scorm/report.php
	modified:   mod/scorm/tabs.php

MDL-27523 Scorm Reporting - Capability update
	modified:   mod/scorm/report/reportlib.php

MDL-27523 Scorm Reporting - commenting files
	modified:   mod/scorm/report/basic/db/install.php
	modified:   mod/scorm/report/basic/lang/en/scorm_basic.php
	modified:   mod/scorm/report/basic/version.php

MDL-27523 Scorm Reporting - Formating codes
	modified:   mod/scorm/report/basic/db/install.php
	modified:   mod/scorm/report/basic/report.php
	modified:   mod/scorm/report/basic/version.php
	modified:   mod/scorm/report/default.php
	modified:   mod/scorm/report/reportlib.php

MDL-27523 Scorm Reporting - fixing small bugs
	modified:   mod/scorm/report/basic/report.php

MDL-27523 Scorm Reporting - added databse upgrade code to scorm/db/upgrade.php

MDL-27523 Scorm Reporting - small optimisations

MDL-27523 SCorm Reporting - Removing Mod.php

MDL-27523 Scorm Reporting - Minor Fixes

	new file:   mod/scorm/db/subplugins.php
	modified:   mod/scorm/lang/en/scorm.php
	modified:   mod/scorm/report.php
	new file:   mod/scorm/report/basic/db/install.php
	new file:   mod/scorm/report/basic/lang/en/scorm_basic.php
	new file:   mod/scorm/report/basic/report.php
	new file:   mod/scorm/report/basic/version.php
	new file:   mod/scorm/report/default.php
	new file:   mod/scorm/report/reportlib.php
	modified:   mod/scorm/tabs.php
	modified:   mod/scorm/userreport.php

	modified:   mod/scorm/db/install.xml
	new file:   mod/scorm/db/subplugins.php
	modified:   mod/scorm/db/upgrade.php
	modified:   mod/scorm/lang/en/scorm.php
	modified:   mod/scorm/report.php
	new file:   mod/scorm/report/basic/db/install.php
	new file:   mod/scorm/report/basic/lang/en/scorm_basic.php
	new file:   mod/scorm/report/basic/report.php
	new file:   mod/scorm/report/basic/version.php
	new file:   mod/scorm/report/default.php
	new file:   mod/scorm/report/reportlib.php
	modified:   mod/scorm/tabs.php
	modified:   mod/scorm/userreport.php
	modified:   mod/scorm/version.php

MDL-27523 Scorm Reporting - Removing Database Refereneces

MDL-27523 Scorm Reporting - Updating structure to remove DB usage
	modified:   mod/scorm/db/upgrade.php
	modified:   mod/scorm/report.php
	modified:   mod/scorm/report/basic/report.php
	modified:   mod/scorm/report/default.php
	modified:   mod/scorm/report/reportlib.php

MDL-27523 Scorm Reporting - Minor fixes

MDL-27523 Scorm Reporting - Formating codes

MDL-27523 Scorm Reporting - Foramting Codes
	modified:   mod/scorm/report/basic/lang/en/scorm_basic.php
	modified:   mod/scorm/report/basic/report.php
	modified:   mod/scorm/report/default.php
	modified:   mod/scorm/report/reportlib.php

	new file:   mod/scorm/db/subplugins.php
	modified:   mod/scorm/lang/en/scorm.php
	modified:   mod/scorm/report.php
	new file:   mod/scorm/report/basic/lang/en/scorm_basic.php
	new file:   mod/scorm/report/basic/report.php
	new file:   mod/scorm/report/basic/version.php
	new file:   mod/scorm/report/default.php
	new file:   mod/scorm/report/reportlib.php
	modified:   mod/scorm/tabs.php
	modified:   mod/scorm/userreport.php
	modified:   mod/scorm/version.php
2011-11-03 07:45:43 +05:30
Eloy Lafuente (stronk7)
8778398293 MDL-30057 plugins - glossary/data new filters made 1st-class citizens 2011-11-03 02:51:17 +01:00
AMOS bot
5b82b2d827 Automatically generated installer lang files 2011-11-03 00:55:24 +00:00
David Mudrak
dd736a87ee Replaced deprecated get_system_context() with the new context_system::instance() 2011-11-02 23:35:05 +01:00
David Mudrak
d6d341d09b Merge remote branch 'origin/master' into rubric
Conflicts:
	lib/db/upgrade.php
	version.php
2011-11-02 23:17:08 +01:00
David Mudrak
9e3d352dee Improved handling of occupied target issue
If the target area already contains a form, we can't pick anything to
use there. If the user works in two windows or there are several
teachers modifying the same course, it can happen that the form suddenly
appears in the target area while we have the form picker still open. In
such case, we simply redirects the user to the target area instead of
displaying the pooky exception.
2011-11-02 22:29:47 +01:00
David Mudrak
9e4eb676e4 MDL-29483 The list of gradable areas is now obtained from the module
At the moment, only activity modules are supported.
2011-11-02 22:25:32 +01:00
David Mudrak
967d346f72 MDL-29794 It is now possible to re-use a form without sharing it as a template
The patch also improves displaying tags-like status information next to
the grading form titles.
2011-11-02 21:57:24 +01:00
Eloy Lafuente (stronk7)
735de1c276 weekly release 2.2dev 2011-11-02 19:52:31 +01:00
Eloy Lafuente (stronk7)
77c5a59017 Merge branch 'install_master' of git://github.com/amosbot/moodle 2011-11-02 19:48:26 +01:00
Eloy Lafuente (stronk7)
799be36820 MDL-29213 - add clarification note + todo once MDL-30039 arrives 2011-11-02 19:07:52 +01:00
David Mudrak
ce7f5c8d3b Merge pull request #20 from marinaglancy/wip-nov02-rubric 2011-11-02 03:41:12 -07:00
Marina Glancy
63b9a6d07d MDL-29920: grade.php in assignment now can show submission/feedback for a particular user (also when submission did not exist yet) 2011-11-02 11:13:14 +01:00
Marina Glancy
6184b84393 MDL-30037: fixed bug with grade calculation 2011-11-02 11:38:00 +08:00
Marina Glancy
0e2a1d755a MDL-29482: error message is displayed to graders if grading form is unavailable 2011-11-02 11:12:02 +08:00
Marina Glancy
3599b113a6 MDL-29482, MDL-29794, MDL-30037: supporting form status in rubriceditor and forms sharing; fixed bug with grade calculation 2011-11-02 10:45:32 +08:00
Jerome Mouneyrac
2b8fe35b65 MDL-30043 token.php should not return a mix of EXTERNAL_TOKEN_PERMANENT and EXTERNAL_TOKEN_EMBEDDED 2011-11-02 09:38:02 +08:00
Marina Glancy
2ae7faf128 MDL-29482: added validation to rubric editor and the 'work in progress' status 2011-11-02 09:12:58 +08:00
Marina Glancy
37f391f00a MDL-29481: added css border around selected rubric level 2011-11-02 09:04:14 +08:00
Marina Glancy
156d6f4876 MDL-29920: now complete report properly calls view_feedback in assignment 2011-11-02 09:04:01 +08:00
Dan Marsden
2f717fcc20 SCORM MDL-30041 fix case of string 2011-11-02 09:42:29 +13:00
David Mudrak
bb17ac1e32 MDL-29920 Gradebook grader report now supports grade analysis link
When grade analysis link is enabled, an icon is displayed next to each
grade of a module that supports grade.php file. The parameters needed to
identify the particular user and grade are passed to the grade.php
script.
2011-11-01 20:53:48 +01:00
Eloy Lafuente (stronk7)
5fbf87c802 Merge branch 'MDL-29879' of git://github.com/timhunt/moodle 2011-11-01 20:12:45 +01:00
Eloy Lafuente (stronk7)
313e048981 MDL-29283 import TCPDF to 5.9.133 - clean whitespace 2011-11-01 20:09:10 +01:00
Dan Marsden
a5ba44f93c MDL-29213 - fix for bug with flash player and IE 9
(cherry-picked and amended with 1-line whitespace)
2011-11-01 19:59:05 +01:00
David Mudrak
25ab1d50e2 MDL-29920 The link from gradebook back to the activity contains itemnumber
The activity module must have a chance to display appropriate grades
report per itemnumber. Most activity modules have just one grade items
si they can ignore the param. Complex modules like the Workshop need this.
2011-11-01 18:18:45 +01:00
David Mudrak
49a537b356 MDL-29482 The rubric editor is now able to save the status of the form definition 2011-11-01 18:04:31 +01:00
Eloy Lafuente (stronk7)
e785b0f3ca MDL-29283 import TCPDF to 5.9.133 - fix permissions 2011-11-01 17:27:26 +01:00
Eloy Lafuente (stronk7)
e686d11257 Merge branch 'w43_MDL-29283_m22_tcpdf' of git://github.com/skodak/moodle 2011-11-01 17:23:20 +01:00
David Mudrak
4d064218fb MDL-29794 Rename templates.php back to pick.php
We will need the general management page implemented in a separate
script. This one will be used for picking an existing form only.
2011-11-01 16:30:17 +01:00
David Mudrak
3f3ee7114e MDL-29794 Do not offer re-sharing of unmodified forms
The patch introduces a new field 'timecopied' that holds the timestamp
of when the given form was cloned last time. Using this field, we can
decide whether the form can be actually re-shared or not.

Note that the logic just hides the icon. It is meant as a usability
feature, not any real protection from sharing.
2011-11-01 16:10:12 +01:00
David Mudrak
86e9ccfd92 MDL-29794 Shared grading form templates can be deleted now
There is a new capability to manage all shared templates. Without this
capability, the user is allowed to delete just templates they previously
shared.

In the future, an option to edit the template directly might be added.
At the moment, the workaround is to pick the template into a temporary
assignment, edit it there and re-save it as a new template.
2011-11-01 14:05:11 +01:00
David Mudrak
7622ae95dc MDL-29108 Improved support for form definition status
Every grading form can be basically in either DRAFT state (currently
being edited) or READY state (available for usage). For shared
templates, the status is not relevant at the moment and they are
automatically in the READY state.
2011-11-01 12:32:06 +01:00
Eloy Lafuente (stronk7)
302f45e8de Merge branch 'w43_MDL-29982_m22_canaccess' of git://github.com/skodak/moodle 2011-11-01 12:26:31 +01:00
Tim Hunt
78f8261f6e MDL-29879 qbehaviour missing. Fix bad lang string. 2011-11-01 10:37:48 +00:00
Jerome Mouneyrac
f4a75854b7 MDL-30027 support no options + fix wrong param validation call 2011-11-01 15:22:28 +08:00
Aparup Banerjee
ddba89cc2a Merge branch 'w43_MDL-30005_m22_uri' of git://github.com/skodak/moodle 2011-11-01 15:18:44 +08:00
Petr Skoda
0775152ff0 MDL-30005 regression fix for non http/ftp urls 2011-11-01 07:56:33 +01:00
Aparup Banerjee
203683e415 Merge branch 'MDL-29983' of git://github.com/timhunt/moodle 2011-11-01 13:23:03 +08:00
Sam Hemelryk
21e7d4c5fc MDL-28720 calendar: Quick fix of a regression in set.php 2011-11-01 17:50:01 +13:00
Sam Hemelryk
f94d606f1f Merge branch 'w43_MDL-29964_m22_fixenrolevents' of git://github.com/skodak/moodle 2011-11-01 17:36:50 +13:00
Aparup Banerjee
d29f4e055d Merge branch 'w43_MDL-29990_m22_navcontinue' of git://github.com/skodak/moodle 2011-11-01 12:15:40 +08:00
Aparup Banerjee
b68c077632 Merge branch 'MDL-29787' of git://github.com/lazydaisy/moodle 2011-11-01 12:00:57 +08:00
Sam Hemelryk
5f3abf0a42 Merge branch 'w43_MDL-29980_m22_flowcss' of git://github.com/skodak/moodle 2011-11-01 16:52:02 +13:00
Sam Hemelryk
6ab6630b87 Merge branch 'MDL-29164' of git://github.com/timhunt/moodle 2011-11-01 16:47:16 +13:00
Gerwood Stewart
2388e7ca7d MDL-27521 Updates the can_finalize and can_unfinalize methods to deal with passing a submission object that isn't one (in this case is a Boolean value). This will result in both methods now returning false. Kick on effect is that it corrects the bug described in MDL-27521 by removing the button if it isn't possible to finalize the submission. 2011-11-01 11:35:39 +08:00