admin/groups: Combine submissions

New feature in Mahara 21.10.1 that had been left out
of 21.10.0: Combine the 'Archived submissions' and
'Current submissions' menu items (Bug #1949421).

source/administration/groups.rst

@@ -272,42 +272,46 @@ Certain settings are only available to staff, institution administrators, or sit
 #. Click the *Submit* button to save the changes.
 
 .. index::
-   pair: Group; Current submissions
+   pair: Group; Submissions
 
-.. _current_submissions:
-
-Current submissions
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Submissions
+~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-*Administration menu → Groups → Current submissions*
+*Administration menu → Groups → Submissions*
 
 .. note::
-   Only site administrators see this menu item, but institution administrators have also access to it via *Archived submissions*. There is a `bug report <https://bugs.launchpad.net/mahara/+bug/1949421>`_ to fix that.
+   Both site and institution administrators see this menu item.
+
+.. index::
+   pair: Group; Archived submissions
 
-When an author submits a portfolio to a group in Mahara or the an assignment in the LMS, it is displayed here.
+.. _archived_submissions:
 
-An administrator can release portfolios to authors who accidentally submitted their portfolios and want to rectify a mistake.
+Archived submissions
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+*Administration menu → Groups → Archived submissions*
+
+When group administrators or tutors release portfolios in groups that allow the archiving of submitted pages, these submissions are displayed here so you can download them. Alternatively, download the entire directory off the server to store archives for a longer period of time.
 
 .. seealso::
    This feature requires that `cron <https://wiki.mahara.org/index.php/System_Administrator%27s_Guide/Cron_Job>`_ runs.
 
-.. figure:: /images/administration/submissions_current.*
-   :alt: Review current submissions
+.. figure:: /images/administration/submissions_archived.*
+   :alt: Review archived submissions
 
-   Review current submissions
+   Review archived submissions
 
-#. Make sure you are on the *Current submissions* tab.
+#. Make sure you are on the *Archived submissions* tab.
 #. **Search**: Enter your search term. The default text in the field shows you in which institution context you perform your search. Type the name, display name, username, or email address or any partial thereof to search for in the search field. :ref:`If you turned on the exact search <plugin_search>`, you need to provide the correct name or email address and not a partial one.
 #. Use the drop-down arrow to choose a single institution in which to search for your group member.
 #. Click the *Search* button to start your search.
-#. **Submitted to**: This column shows the group or external host to which a particular page or collection was submitted to. You can click the group name in order to go to it directly.
+#. **Submitted to**: This column shows the group to which a particular page or collection was submitted to. You can click the group name in order to go to it directly.
 
    .. note::
-      If the group was deleted, the submission is still available, but the group name is not linked any more. It has its deletion date displayed.
+     If the group was deleted, the submission is still available, but the group name is not linked any more. It has its deletion date displayed.
 
-      The external host, i.e. short name of the LMS, is not clickable.
-
-#. **ID**: The ID of the group to which the portfolio was submitted. In the case of the submission to an LMS via :ref:`LTI Advantage <enable_ltiadvantage>`, the short name of this external app is displayed.
+#. **ID**: The ID of the archive file on the server. That allows you to match it to the file mentioned in the CSV download.
 #. The profile picture of the person.
 #. **First name**: The first name of the person. This is the default column for sorting results.
 
@@ -317,48 +321,60 @@ An administrator can release portfolios to authors who accidentally submitted th
 #. **Last name**: The last name of the person.
 #. **Display name**: The display name of the person.
 #. **Username**: Click on the username and you are taken to the person's administration settings page instead of their profile page as you would with the other names.
-#. **Portfolio**: The title of the portfolio that has been submitted.
+#. **Archive file**: The title of the portfolio that has been archived.
 
    .. note::
-      The portfolio title is linked, but the administrator does not immediately see it. The link is provided so the administrator can easily copy it to the portfolio author to confirm that they would be releasing the correct portfolio.
+      The archive is made in all available export formats.
 
-#. **Submitted on**: Date and time when the portfolio was submitted.
-#. **Release**: Check individual portfolios or click the *All* button to release all portfolios you see on screen. Alternatively, click the *None* button to reset your selection.
-#. If a portfolio is in the process of being archived, that is mentioned here.
-#. Click the *Release* button to release the selected portfolios **without archiving** them.
+#. **Archived on**: Date and time when the archive was made.
 #. The number of results are displayed.
-#. Click the *Export all data in CSV format* link to download data about the archived submissions.
+#. Click the *Export all data in CSV format* link to download data about the archived submissions. The CSV file contains the following information:
 
-.. index::
-   pair: Group; Archived submissions
+   * Username
+   * First name
+   * Last name
+   * Display name
+   * Email address
+   * Group name to which the portfolio was submitted
+   * ID
+   * Title of the submitted portfolio
+   * Path on disk where the archive is stored
 
-.. _archived_submissions:
+     .. note::
+        All submissions are stored in the 'submission' folder in your Mahara data directory on the server. Then, each account has a subdirectory and therein are all submissions of this account holder.
 
-Archived submissions
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+   * File name
+   * Time when the archive was made
 
-*Administration menu → Groups → Archived submissions*
+.. _current_submissions:
 
-When group administrators or tutors release portfolios in groups that allow the archiving of submitted pages, these submissions are displayed here so you can download them. Alternatively, download the entire directory off the server to store archives for a longer period of time.
+Current submissions
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+When an author submits a portfolio to a group in Mahara or an assignment in the LMS, it is displayed here.
+
+An administrator can release portfolios to authors who accidentally submitted their portfolios and want to rectify a mistake.
 
 .. seealso::
    This feature requires that `cron <https://wiki.mahara.org/index.php/System_Administrator%27s_Guide/Cron_Job>`_ runs.
 
-.. figure:: /images/administration/submissions_archived.*
-   :alt: Review archived submissions
+.. figure:: /images/administration/submissions_current.*
+   :alt: Review current submissions
 
-   Review archived submissions
+   Review current submissions
 
-#. Make sure you are on the *Archived submissions* tab.
+#. Make sure you are on the *Current submissions* tab.
 #. **Search**: Enter your search term. The default text in the field shows you in which institution context you perform your search. Type the name, display name, username, or email address or any partial thereof to search for in the search field. :ref:`If you turned on the exact search <plugin_search>`, you need to provide the correct name or email address and not a partial one.
 #. Use the drop-down arrow to choose a single institution in which to search for your group member.
 #. Click the *Search* button to start your search.
-#. **Submitted to**: This column shows the group to which a particular page or collection was submitted to. You can click the group name in order to go to it directly.
+#. **Submitted to**: This column shows the group or external host to which a particular page or collection was submitted to. You can click the group name in order to go to it directly.
 
    .. note::
       If the group was deleted, the submission is still available, but the group name is not linked any more. It has its deletion date displayed.
 
-#. **ID**: The ID of the archive file on the server. That allows you to match it to the file mentioned in the CSV download.
+      The external host, i.e. short name of the LMS, is not clickable.
+
+#. **ID**: The ID of the group to which the portfolio was submitted. In the case of the submission to an LMS via :ref:`LTI Advantage <enable_ltiadvantage>`, the short name of this external app is displayed.
 #. The profile picture of the person.
 #. **First name**: The first name of the person. This is the default column for sorting results.
 
@@ -368,30 +384,17 @@ When group administrators or tutors release portfolios in groups that allow the
 #. **Last name**: The last name of the person.
 #. **Display name**: The display name of the person.
 #. **Username**: Click on the username and you are taken to the person's administration settings page instead of their profile page as you would with the other names.
-#. **Archive file**: The title of the portfolio that has been archived.
+#. **Portfolio**: The title of the portfolio that has been submitted.
 
    .. note::
-      The archive is made in all available export formats.
+      The portfolio title is linked, but the administrator does not immediately see it. The link is provided so the administrator can easily copy it to the portfolio author to confirm that they would be releasing the correct portfolio.
 
-#. **Archived on**: Date and time when the archive was made.
+#. **Submitted on**: Date and time when the portfolio was submitted.
+#. **Release**: Check individual portfolios or click the *All* button to release all portfolios you see on screen. Alternatively, click the *None* button to reset your selection.
+#. If a portfolio is in the process of being archived, that is mentioned here.
+#. Click the *Release* button to release the selected portfolios **without archiving** them.
 #. The number of results are displayed.
-#. Click the *Export all data in CSV format* link to download data about the archived submissions. The CSV file contains the following information:
-
-  * Username
-  * First name
-  * Last name
-  * Display name
-  * Email address
-  * Group name to which the portfolio was submitted
-  * ID
-  * Title of the submitted portfolio
-  * Path on disk where the archive is stored
-
-    .. note::
-       All submissions are stored in the 'submission' folder in your Mahara data directory on the server. Then, each account has a subdirectory and therein are all submissions of this account holder.
-
-  * File name
-  * Time when the archive was made
+#. Click the *Export all data in CSV format* link to download data about the archived submissions.
 
 .. index::
    pair: Group; Group bulk creation and update