Commit Graph

279 Commits

Author SHA1 Message Date
Jake Dallimore a44987a081 Merge branch 'MDL-58179-master-fix' of https://github.com/andrewnicols/moodle 2018-03-22 12:05:29 +08:00
Andrew Nicols 195480e9d7 MDL-58179 mod_lesson: Add missing : in labels 2018-03-22 11:59:52 +08:00
Jun Pataleta a9d98d5029 Merge branch 'MDL-52989-master' of git://github.com/junpataleta/moodle 2018-03-22 11:29:56 +08:00
Luca Bösch 2ffd2afdba MDL-52989 mod_lesson: Fix cluster_jump returning a cluster page id. 2018-03-16 13:44:44 +01:00
Luca Bösch ef2b45a977 MDL-58179 lesson: Avoid using span with class "label" 2018-03-16 08:52:21 +01:00
Luca Bösch 457b3ed139 MDL-61498 lesson: link to next activity in boost 2018-03-08 17:24:12 +01:00
Mihail Geshoski 0e613a1f5b MDL-61211 lesson: Error when answer or response contains break tag 2018-03-01 09:50:51 +08:00
Mihail Geshoski 7b319d20a8 MDL-43042 lesson: Confusing feedback order in multiple answer questions 2018-01-05 15:03:14 +08:00
Jun Pataleta 409da21320 MDL-61042 mod_lesson: Initialise pageid variable 2017-12-15 17:36:16 +13:00
Damyon Wiese 57fe6616a8 Merge branch 'MDL-52538-master' of git://github.com/mihailges/moodle 2017-12-12 10:40:15 +08:00
Mihail Geshoski 2034f57fe1 MDL-52538 lesson: Grade info displayed while ongoing score disabled 2017-12-12 08:54:51 +08:00
Simey Lameze f077e0af7e MDL-60057 mod_lesson: add calendar drag and drop callbacks
AMOS BEGIN
        CPY [openafterclose,mod_choice],[openafterclose,mod_lesson]
	CPY [closebeforeopen,mod_choice],[closebeforeopen,mod_database]
	CPY [openafterclose,mod_choice],[openafterclose,mod_database]
AMOS END
2017-12-11 14:29:16 +08:00
Mihail Geshoski 994ccb7845 MDL-60538 lesson: check if max attempts exceeded, use new lang string 2017-10-25 09:00:20 +08:00
Andrew Nicols ea8b25c51f Merge branch 'MDL-59702' of https://github.com/andrewhancox/moodle 2017-08-22 11:01:30 +08:00
Josh Ebarvia 79189e975c MDL-51745 mod_lesson: Use format_text in response feedback 2017-08-07 15:53:11 +09:30
Andrew Hancox 6a8e25ef18 MDL-59702 mod_lesson: Use showuseridentity setting on overview report 2017-08-03 10:29:36 +01:00
Adrian Greeve 63cf03265b MDL-57649 mod_lesson: Delete answer files correctly.
The files associated with answers and responses were
not being deleted due to the fact that the wrong itemid
was being used.
2017-07-17 09:15:21 +08:00
David Monllao 1243fce158 Merge branch 'wip-MDL-59308-master' of git://github.com/marinaglancy/moodle 2017-06-27 16:41:26 +02:00
Josh Ebarvia a06face2ce MDL-49484 mod_lesson: Fix lesson page headers when editing 2017-06-24 05:21:25 +09:30
Marina Glancy 70b6230829 MDL-59308 calendar: pass module context when known
this will protect us from exceptions when context for removed instance can not be retrieved
2017-06-22 13:42:22 +08:00
Juan Leyva 63130e328d MDL-59133 mod_lesson: Return page record in get_user_attempt WS 2017-06-09 12:07:16 +01:00
Juan Leyva e7a11c20d6 MDL-58708 mod_lesson: Fix notice in lesson
The notice was displayed only when accesing restored Moodle 1.X lessons.
2017-04-26 16:05:25 +02:00
Juan Leyva d96d72955e MDL-58415 mod_lesson: Fix code styles and missing declaration
Found by the integrator review:
- Some incorrect code style declaration and phpdocs
- Missing $USER declaration
- Incorrect use of $lesson (should be $this)
2017-04-20 09:58:48 +02:00
Juan Leyva dd60892155 MDL-58415 mod_lesson: EOL var must be always numeric
Otherwise it will break the Web Service return description.
2017-04-20 09:58:47 +02:00
Juan Leyva 0fc1f24b12 MDL-58415 mod_lesson: Handle correctly review mode 2017-04-20 09:58:45 +02:00
Juan Leyva 0259109fb5 MDL-58415 mod_lesson: Avoid API http redirections
Deep in the lesson API there are some http redirections in special
pages like clusters.
We need to handle it via new parameters to avoid redirections.
2017-04-20 09:58:44 +02:00
Juan Leyva 16ca026c4b MDL-58415 mod_lesson: Force int type for calculated progress
Under some circumstances the value returned by the function needs
casting.
2017-04-20 09:58:44 +02:00
Mark Nelson e1cd93ce20 MDL-58423 core_calendar: moved \core_calendar\event class
Part of MDL-55611 epic.
2017-04-04 11:01:49 +01:00
Cameron Ball 8a8bd42528 MDL-57986 mod_lesson: Add action events
Part of MDL-55611 epic.
2017-04-03 11:37:07 +08:00
Mark Nelson e057f279e4 MDL-57497 core_calendar: added new calendar event class
Moved calendar_event class to new location using replaceclasses.php

Part of MDL-55611 epic.
2017-04-03 11:33:55 +08:00
David Monllao 9653e19b7e Merge branch 'MDL-57754-master' of git://github.com/jleyva/moodle 2017-03-29 12:37:35 +02:00
Juan Leyva 8c21800470 MDL-57754 mod_lesson: Include missing required file
The constant LESSON_PAGE_BRANCHTABLE requires the page type file.
2017-03-29 11:31:35 +02:00
Juan Leyva 707d50d1c8 MDL-57760 mod_lesson: New WS mod_lesson_get_pages_possible_jumps 2017-03-27 10:47:07 +02:00
Juan Leyva 87e472bd15 MDL-57759 mod_lesson: Handle offline attempts in view and WS
- Notify the user if there are previous offline attempts
- Set the offline attempts and return additional information via Web
Services
2017-03-27 10:41:09 +02:00
Juan Leyva 49e353782f MDL-57757 mod_lesson: Move user report code to function 2017-03-27 10:37:20 +02:00
Juan Leyva 7d5564d959 MDL-57754 mod_lesson: Move overview report code to function
Move the table and statistics generation to a new function
2017-03-27 10:34:44 +02:00
David Monllao 7e448ee5b4 Merge branch 'MDL-57724-master' of git://github.com/jleyva/moodle 2017-03-23 12:47:19 +01:00
Juan Leyva f3d9512d34 MDL-57724 mod_lesson: Init progress completed by default 2017-03-23 11:47:39 +01:00
David Monllao b7cc51ca60 Merge branch 'MDL-57724-master' of git://github.com/jleyva/moodle 2017-03-22 21:20:03 +01:00
Juan Leyva dfcabd3b33 MDL-57724 mod_lesson: Move EOL code to lib methods 2017-03-22 17:23:49 +01:00
David Monllao ee82b48efc MDL-57696 lesson: Replace old var reference by self 2017-03-22 13:13:06 +01:00
Juan Leyva e1f88fe7c4 MDL-57696 mod_lesson: New WS mod_lesson_process_page 2017-03-22 10:54:12 +01:00
Juan Leyva 8d6748380c MDL-57696 mod_lesson: Remove redirects from API
In this commit I removed redirects that potentially could break the Web
Services layer.
Instead doing redirect inside APIs I return a special flag that is
properly checked.
2017-03-21 15:51:51 +01:00
Juan Leyva 61b51764b8 MDL-57696 mod_lesson: Move code to lesson methods
Small refactor to avoid duplication in the Web Service
2017-03-21 15:51:50 +01:00
Juan Leyva 66cd7b8ecc MDL-57693 mod_lesson: Refactor to move code to lesson methods
This is a big refactor to avoid code duplication in the new WS.
Basically I’ve moved code from the page and renderer to the lesson
class.
New code is into methods, there are no code functionality changes (just
minor fixes in comments).
2017-03-21 15:48:17 +01:00
Juan Leyva dbba944e32 MDL-57688 mod_lesson: Move duplicated code to methods
Some code that will be used by Web Services was moved, we created new
methods to avoid code duplication:
- To generate the lesson messages on page view
- To check the time restrictions in a current attempt
2017-03-21 15:18:44 +01:00
Juan Leyva f4d0909fc0 MDL-57685 mod_lesson: New Web Service mod_lesson_get_pages 2017-03-21 10:53:35 +01:00
Juan Leyva 592c94f3ba MDL-57665 mod_lesson: New method for get timers 2017-03-20 11:18:29 +01:00
Juan Leyva b584c49d03 MDL-57664 mod_lesson: New lesson method get_content_pages_viewed 2017-03-20 11:16:46 +01:00
Juan Leyva 7d7a2a4ef1 MDL-57645 mod_lesson: Refactor code to move completion to lib
This commit also fix how completion was being set (before the access
restriction checks)
2017-03-16 16:40:24 +01:00