23766 Commits

Author SHA1 Message Date
Jun Pataleta
8b12ca7d1b Merge branch 'MDL-75289-master' of https://github.com/andrewnicols/moodle 2022-11-03 12:44:40 +03:00
Jun Pataleta
486645f487 Merge branch 'MDL-75513-master-3' of https://github.com/mihailges/moodle 2022-11-03 12:44:40 +03:00
Andrew Nicols
8f37e6ecff MDL-75289 mod_data: Make JS more resilient
This change makes the JS in for preset management more resilient.

Previously, if the button was not on the page then an error was thrown.

Instead this code changes the listener to listen to the document and
filters the clicked element based on the same selector. This is a much
safer approach as it will not error if the selector was not found on the
page.

In this case the behat test introduced elsewhere in this issue is
testing a scenario where the Save as preset button is not present
because there are no fields to store as a preset.
2022-11-03 10:02:23 +08:00
Mihail Geshoski
3d1bb8e863 MDL-75513 behat: Update existing behat tests 2022-11-02 17:45:52 +08:00
Ilya Tregubov
ea58a656c1 Merge branch 'MDL-75289-master' of https://github.com/sarjona/moodle 2022-11-01 15:38:56 +03:00
Jun Pataleta
c0580bc013 Merge branch 'MDL-76120-master' of https://github.com/andrewnicols/moodle 2022-11-01 09:17:19 +08:00
Sara Arjona
61e8b806ec MDL-75289 mod_data: Implement prototyped tertiary nav
On the Database page:
- The List/single view is displayed in the right.
- The buttons Import entries, export entries and Export to portfolio
have been moved to the Actions menu.
- The List/Single view headings have been removed.
- The "Save settings" secondary button is hidden when advanced search
is enabled.
- The result (Found X out of Y entries, No records found) are not
displayed as notifications anymore.

On the Presets page:
- The buttons (Import, Export and Save as preset) have been moved to an
actions menu to the tertiary navigation. Some of these options have been
renamed.
- Remove the Action column heading from the table.

On the Presets preview page:
- Move the preset name to the heading in the tertiary navigation (Preview
of xxxxx), and remove the current preset name from the page.
- Align the List/single template to the right in the tertiary navigation.
- Make primary the "Use this preset" button.

On the Fields page:
- Remove the "Manage fields" menu.
- Remove the Export and Save as preset from the tertiary navigation.
- Align Create a field to the right in the tertiary navigation.
- Add a description at the top of the page.
- Remove the Action column heading from the table.
- Move field actions (Edit and Delete) to ellipsis.

On the Templates page:
- Move Export and Save as preset to the Actions menu.
- Move the templates list to a tertiary navigation selector and remove
the template heading.
- Reorder the templates list (Add entry template should be displayed
at the begining, instead of List template).
- Rename "Enable editor" to "Enable code editor".
2022-10-31 15:24:13 +01:00
Jun Pataleta
61146c9088 Merge branch 'MDL-76108-master' of https://github.com/aanabit/moodle 2022-10-31 16:49:25 +08:00
Jake Dallimore
77a1212d41 Merge branch 'MDL-76041-master' of https://github.com/call-learning/moodle 2022-10-31 11:43:49 +08:00
Víctor Déniz
04d8fc6070 Merge branch 'MDL-68437-master' of https://github.com/mihailges/moodle 2022-10-28 17:44:50 +01:00
Amaia Anabitarte
3e96f16688 MDL-76108 mod_lesson: improving count call for PHP8.0 2022-10-28 18:16:32 +02:00
Sara Arjona
53c4fc9af0 MDL-75289 mod_data: Reorder secondary nav tabs
The Presets tab should be displayed before Fields and Templates.
2022-10-28 15:30:26 +02:00
Andrew Nicols
d396af9393 MDL-76120 behat: Swap click on select option to set field
Recent versions of Marionette do not like to click on the option
element so we must always use the set field option.
2022-10-28 20:53:22 +08:00
Sara Arjona
88622bf25b NOBUG: Fixed SVG browser compatibility 2022-10-28 14:09:34 +02:00
Jake Dallimore
df90988239 Merge branch 'MDL-68943-master' of https://github.com/cameron1729/moodle 2022-10-28 11:49:42 +08:00
Cameron Ball
01074798e1 MDL-68943 assignfeedback_editpdf: Upgrade step for stale conversions 2022-10-28 11:03:29 +08:00
Cameron Ball
1e98c4ad27 MDL-68943 assignfeedback_editpdf: Reconvert updated files 2022-10-28 11:03:29 +08:00
Sara Arjona
af17803658 Merge branch 'MDL-75188-master' of https://github.com/laurentdavid/moodle 2022-10-27 21:45:21 +02:00
Laurent David
cf12af7519 MDL-75188 mod_data: Use cmid instead of id
* Based on previous changes, fix ids so they are consistent with other modules (in preparation for MDL-75255)
2022-10-27 18:34:45 +02:00
Laurent David
d67fbbb80d MDL-75188 mod_data: Move import preset for to a modal
* Use a modal instead of a standard page to select the preset file
   and import it.
 * Change the zero state import button to a modal dialog so it uses the same
   workflow as on the preset page
2022-10-27 18:32:23 +02:00
Sara Arjona
0b03a3d41a Merge branch 'MDL-64231-master' of https://github.com/ferranrecio/moodle 2022-10-27 16:56:21 +02:00
Ferran Recio
b9900c2b45 MDL-64231 mod_assign: download submissions with group folder 2022-10-27 11:11:12 +02:00
Sara Arjona
c122d3a7f5 Merge branch 'MDL-69275-submissionreview-resquashed' of https://github.com/cengage/moodle 2022-10-27 08:48:08 +02:00
Jun Pataleta
de4566644f Merge branch 'MDL-75597-master' of https://github.com/ferranrecio/moodle 2022-10-27 11:56:35 +08:00
Claude Vervoort
12e207de9d MDL-69275 mod_lti: submission review (gradebook launch) 2022-10-26 15:03:41 -04:00
Jun Pataleta
c76a2a05ba Merge branch 'MDL-72558' of https://github.com/NoelDeMartin/moodle 2022-10-26 13:37:45 +08:00
Amaia Anabitarte
c1d6de60c4 MDL-76006 mod_data: Change zero state images 2022-10-25 17:50:27 +02:00
Amaia Anabitarte
ab97d41644 MDL-75335 mod_data: Zero state for Fields and Templates 2022-10-25 16:35:58 +02:00
Amaia Anabitarte
32c8f75c0d MDL-75335 mod_data: Change Use a preset string 2022-10-25 16:05:24 +02:00
Andrew Nicols
79952f5084 Merge branch 'MDL-76049' of https://github.com/timhunt/moodle 2022-10-25 11:49:25 +08:00
Andrew Nicols
d07cbb7641 Merge branch 'MDL-75763-master' of https://github.com/call-learning/moodle 2022-10-25 11:10:32 +08:00
Andrew Nicols
f0be30af14 Merge branch 'MDL-74911-master' of https://github.com/matthewhilton/moodle 2022-10-24 22:22:28 +08:00
Sara Arjona
b2816b93bf MDL-75684 mod_data: Display pending approval in resources
In MDL-75664, the approval status badge was re-added. However,
the resources list template was missing so this commit is for
fixing this.
2022-10-24 13:01:39 +02:00
Sara Arjona
16ba7cbe96 MDL-75684 mod_data: Add metadata to templates
Each template should display at the top the information about the
user who has created the entry, when it was created and modified.

Apart from that, this commit also includes:
- For the Journal preset, a link on each card entry title has been
added, to open the Single view.
- For the Resources preset, the Author field has been renamed to
"Author of resource" and the Description to "Content".
- For the Resources preset, the Author and Type fields will be
hidden in the List view for small devices.
2022-10-24 13:01:39 +02:00
Sara Arjona
e80ec13230 MDL-75684 mod_data: Remove duplicated label 2022-10-24 13:01:39 +02:00
Sara Arjona
09a2c6a0e8 MDL-75684 mod_data: Add author name/lastname to adv search
Add the "First name" and "Last name" fields at the beginning of the
advanced search template for all the presets.
2022-10-24 13:01:39 +02:00
Sara Arjona
a8452c9d25 MDL-75684 mod_data: Remove List/Single view headings
Apart from removing the "List view" and "Single view" h2 headings,
the presets and templates must be also reviewed to confirm no
heading is skipped (so h2 > h3 > h4 ...).

For the Journal preset, the "Reflections" heading has been removed
here too.
2022-10-24 13:01:39 +02:00
Sara Arjona
9fbc24898b MDL-75684 mod_data: Update action icons
The edit icon has been replaced from a cog to a pencil.
Besides, the actions icons will be displayed using black colour.
2022-10-24 13:01:39 +02:00
Matthew Hilton
e02aa3ad9a MDL-74911 assignfeedback_editpdf: per-assignment conversion poll lock
The lock ensures that multiple conversions do not happen for the same
assignment submission.

Otherwise, subsequent conversions will fail when trying to save the
converted file.
2022-10-24 12:54:53 +10:00
Matthew Hilton
617a32f3f0 MDL-74911 assignfeedback_editpdf: unlock session when polling conversion
Polling conversions will run the document conversion immediately if the
conversion has not already been completed.

Releasing the session lock while doing this ensures large conversions
do not unnecessarily hold the users session.
2022-10-24 12:54:53 +10:00
Ilya Tregubov
660b56eb50 Merge branch 'MDL-75362-refactor' of https://github.com/Chocolate-lightning/moodle 2022-10-21 09:56:19 +03:00
Sara Arjona
31419c1f28 Merge branch 'MDL-75211-master' of https://github.com/ferranrecio/moodle 2022-10-21 09:07:58 +03:00
Tim Hunt
1944c03e7e MDL-76049 quiz generator: update calendar events for new overrides 2022-10-20 23:44:23 +01:00
Mathew May
e7c1c2841d MDL-75362 gradereport_user: Roll in zero state work for user report 2022-10-20 21:24:51 +08:00
Jun Pataleta
80d4981d8d Merge branch 'MDL-75401-master-integration' of https://github.com/ferranrecio/moodle 2022-10-20 18:31:00 +08:00
Jun Pataleta
de11a92ed0 Merge branch 'MDL-75497-master4' of https://github.com/raortegar/moodle 2022-10-20 17:29:11 +08:00
Jun Pataleta
b720790aec Merge branch 'MDL-75599-master' of https://github.com/laurentdavid/moodle 2022-10-20 17:26:08 +08:00
raortegar
bf5cd9cf98 MDL-75497 mod_data: Review Check existence of field.class.php 2022-10-20 09:14:48 +02:00
Jun Pataleta
d98380b272 Merge branch 'MDL-75894-master' of https://github.com/jleyva/moodle 2022-10-20 14:40:22 +08:00
Jun Pataleta
6875318513 Merge branch 'MDL-59458-master' of https://github.com/laurentdavid/moodle 2022-10-20 13:57:40 +08:00