Commit graph

1554 commits

Author SHA1 Message Date
David Monllao
85384d44c7 MDL-57757 mod_lesson: Check that there is an object 2017-03-29 12:56:33 +02:00
David Monllao
f9b99736f4 Merge branch 'MDL-57757-master' of git://github.com/jleyva/moodle 2017-03-29 12:51:46 +02: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
86ff8ccd22 MDL-57757 mod_lesson: Handle empty answers
This is and edge case created by a bug in the numeric question type.
2017-03-29 11:01:02 +02:00
David Monllao
3ecbebc816 Merge branch 'MDL-58329-master' of git://github.com/jleyva/moodle 2017-03-27 15:47:55 +02:00
Juan Leyva
448a488642 MDL-58329 mod_lesson: New WS function mod_lesson_get_lesson 2017-03-27 14:48:28 +02:00
Juan Leyva
a0558b5607 MDL-58329 mod_lesson: Refactor to use new exporter
Refactor existing WS to use the new summary_exporter
2017-03-27 14:42:11 +02:00
David Monllao
76e4853585 Merge branch 'MDL-57760-master' of git://github.com/jleyva/moodle 2017-03-27 13:39:44 +02:00
David Monllao
7cf5c3d54c Merge branch 'MDL-57762-master' of git://github.com/jleyva/moodle 2017-03-27 13:31:29 +02:00
Juan Leyva
2db90397f1 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 13:10:01 +02:00
Juan Leyva
c6f9f06146 MDL-57759 mod_lesson: New settings for allowing offline attempts 2017-03-27 13:10:00 +02:00
Juan Leyva
635721f5c1 MDL-57762 mod_lesson: Implement the check_updates callback 2017-03-27 10:51:42 +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
d874370b20 MDL-57759 mod_lesson: New settings for allowing offline attempts 2017-03-27 10:41:08 +02:00
Juan Leyva
79d5e88215 MDL-57757 mod_lesson: New WS mod_lesson_get_user_attempt 2017-03-27 10:37:21 +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
899b000d99 MDL-57754 mod_lesson: New Web Service mod_lesson_get_attempts_overview 2017-03-27 10:34:45 +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
5f3351d747 MDL-57724 mod_lesson: New Web Service mod_lesson_finish_attempt 2017-03-22 17:24:24 +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
David Monllao
33c5f9fd63 Merge branch 'MDL-57696-master' of git://github.com/jleyva/moodle 2017-03-22 13:01:03 +01:00
Juan Leyva
e1f88fe7c4 MDL-57696 mod_lesson: New WS mod_lesson_process_page 2017-03-22 10:54:12 +01:00
David Monllao
2800c3f43d Merge branch 'MDL-57688-master' of git://github.com/jleyva/moodle 2017-03-22 10:16:54 +01:00
Juan Leyva
269eb6c810 MDL-57688 mod_lesson: Fix parameter type for pageid and review 2017-03-22 10:09:39 +01:00
David Monllao
7f0ddd40fb Merge branch 'MDL-57693-master' of git://github.com/jleyva/moodle 2017-03-21 21:18:11 +01:00
David Monllao
5b95bd50df Merge branch 'MDL-57688-master' of git://github.com/jleyva/moodle 2017-03-21 19:59:00 +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
ef8d1c9a15 MDL-57693 mod_lesson: New WS mod_lesson_get_page_data 2017-03-21 15:48:18 +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
d088632b97 MDL-57688 mod_lesson: New WS mod_lesson_launch_attempt 2017-03-21 15:43:24 +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
David Monllao
a2ccbae441 Merge branch 'MDL-57685_master' of git://github.com/dmonllao/moodle 2017-03-21 10:54: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
David Monllao
2ddcf27219 Merge branch 'MDL-57665_master' of git://github.com/dmonllao/moodle 2017-03-20 11:25:09 +01:00
David Monllao
c12578d3a2 Merge branch 'MDL-57664_master' of git://github.com/dmonllao/moodle 2017-03-20 11:20:22 +01:00
Juan Leyva
f8edef2e58 MDL-57665 mod_lesson: New WS mod_lesson_get_user_timers 2017-03-20 11:18:34 +01:00
Juan Leyva
592c94f3ba MDL-57665 mod_lesson: New method for get timers 2017-03-20 11:18:29 +01:00
Juan Leyva
ba6b2c11f6 MDL-57664 mod_lesson: New Ws mod_lesson_get_content_pages_viewed 2017-03-20 11:16:55 +01:00
Juan Leyva
b584c49d03 MDL-57664 mod_lesson: New lesson method get_content_pages_viewed 2017-03-20 11:16:46 +01:00
Dan Poltawski
5d8d3a8ce2 Merge branch 'MDL-57657-master' of git://github.com/jleyva/moodle 2017-03-20 07:24:54 +00:00
Andrew Nicols
2154c9824d Merge branch 'MDL-40759-master' of git://github.com/damyon/moodle 2017-03-20 13:57:38 +08:00
Damyon Wiese
663640f5b3 MDL-40759 icons: convert uses of pix_url to pix_icon
Also change filepicker to use scaled svgs instead of sets of custom pngs. The svgs are taken from font-awesome.
2017-03-17 15:52:17 +08:00
Damyon Wiese
2b931458ad MDL-40759 plugins: Add font icon mapping to all plugins 2017-03-17 15:51:29 +08:00