Skip to content

Commit 2f0d41c

Browse files
Merge pull request #213 from codevence/develop
Release 4.24 (preview)
2 parents 7309a06 + c8a31de commit 2f0d41c

File tree

11 files changed

+2411
-2242
lines changed

11 files changed

+2411
-2242
lines changed

docs/about/introduction/knowledge-model.rst

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ Validation is used to define some rules for the answers in Value question type.
153153
Reference
154154
---------
155155

156-
References are used to provide additional information for :ref:`questions<question>`. There are two types of references. :ref:`Resource page reference<resource-page>` and :ref:`URL reference<url-reference>`. resource page references are gathered in the resource collections.
156+
References are used to provide additional information for :ref:`questions<question>`. There are three types of references. :ref:`Resource page reference<resource-page>`, :ref:`URL reference<url-reference>`, and :ref:`Cross reference<cross-reference>`. resource page references are gathered in the resource collections.
157157

158158
.. _resource-collection:
159159

@@ -176,6 +176,13 @@ URL Reference
176176

177177
A URL reference is a simple link to any website. It has **URL** which is the actual link and a **label** that describes what the reference is about. URL reference is set up on a level of question, not on a level of knowledge model.
178178

179+
.. _cross-reference:
180+
181+
Cross Reference
182+
^^^^^^^^^^^^^^^
183+
184+
A cross reference is a link to another question within the same knowledge model. It has **question** which is the referenced question selected from dropdown list and a **description** that describes what the reference is about.
185+
179186
.. _expert:
180187

181188
Expert

docs/applications/admin-center/settings/system/locales/create.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ We can create a new locale directly in |project_name| by pressing :guilabel:`Cre
55

66
Finally, a POT files can be downloaded here. From them, we can create PO files in a standard (`gettext <https://www.gnu.org/software/gettext/>`__-based) way. There is a POT file for each app of FAIR Wizard and also for the emails.
77

8-
We can :download:`download localization files here<./create/fw-4-23-0-locales.zip>`.
8+
We can :download:`download localization files here<./create/fw-4-24-0-locales.zip>`.
99

1010
.. figure:: create/form.png
1111

Binary file not shown.
Binary file not shown.

docs/applications/data-management-planner/projects/list/detail/questionnaire.rst

Lines changed: 29 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Questionnaire is the first tab of the project detail. This is the most important
1111
Current Phase
1212
=============
1313

14-
If the :ref:`knowledge model<knowledge-model>` we use for the :ref:`project<project>` has :ref:`phases<phase>` defined, we can see a phase selection in the questionnaire detail. Different questions become desirable based on the selected phase. For example, some should be answered before submitting the proposal, while others can be filled later.
14+
If the :ref:`knowledge model<knowledge-model>` we use for the :ref:`project<project>` has :ref:`phases<phase>` defined, we can see a phase selection in the questionnaire detail. Different questions become desirable based on the selected phase. For example, some should be answered before submitting the proposal, while others can be filled later. The phase progress is also visible.
1515

1616
.. figure:: questionnaire/phase-selection.png
1717
:width: 299
@@ -207,6 +207,20 @@ All of value question types (except for color) can have validations set on them.
207207

208208
Warnings referring to questions with invalid values.
209209

210+
.. _todos:
211+
212+
TODOs
213+
=====
214+
215+
When we are filling in the questionnaire, we can stumble upon a question that we don't know how to answer yet, but we don't want to forget to come back to that question. We can click on :guilabel:`+ Add TODO` to add a TODO to the question.
216+
217+
We can then open the :guilabel:`TODOs` tab from the questionnaire menu to see the list of all questions with assigned TODO in the questionnaire. By clicking on a question there, we can quickly jump back to that question and fill it.
218+
219+
.. figure:: questionnaire/todos.png
220+
:width: 334
221+
222+
List of TODOs.
223+
210224

211225
Comments
212226
========
@@ -267,21 +281,6 @@ Editor Notes
267281
Besides comments there are also editor notes which work the same way as comments but they are visible only to project editors and owners. We can use editor notes to internal communication with our team while working on the DMP and then comments to gather the feedback from supervisor or reviewer.
268282

269283

270-
.. _todos:
271-
272-
TODOs
273-
=====
274-
275-
When we are filling in the questionnaire, we can stumble upon a question that we don't know how to answer yet, but we don't want to forget to come back to that question. We can click on :guilabel:`+ Add TODO` to add a TODO to the question.
276-
277-
We can then open the :guilabel:`TODOs` tab from the questionnaire menu to see the list of all questions with assigned TODO in the questionnaire. By clicking on a question there, we can quickly jump back to that question and fill it.
278-
279-
.. figure:: questionnaire/todos.png
280-
:width: 334
281-
282-
List of TODOs.
283-
284-
285284
Version History
286285
===============
287286

@@ -325,3 +324,17 @@ We can also revert a questionnaire to an older version. We can simply find the d
325324
.. WARNING::
326325

327326
Reverting to an older version cannot be undone. It is therefore recommended to create a copy of the project before reverting.
327+
328+
329+
Search
330+
======
331+
332+
Search is accessible from the questionnaire menu bar by clicking on the :guilabel:`🔍` button. A search side panel opens where we can type in our search query. The search works in real-time, so while we are typing, the results are displayed below. We can fulltext search in questions and answers. In questions not only the question name but also description and references. The search is case insensitive.
333+
334+
We can click on any of the search results to quickly navigate to that question in the questionnaire.
335+
336+
.. TODO::
337+
338+
Add screenshot of the search panel.
339+
340+

docs/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
registry_name = 'FAIR Wizard Registry'
2727

2828
# The full version, including alpha/beta/rc tags
29-
version = release = '4.23'
29+
version = release = '4.24'
3030

3131
rst_prolog = f"""
3232

docs/more/development/document-templates/document-context.rst

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -426,8 +426,9 @@ get a more specific one and never just a ``Question``.
426426

427427
Aliases:
428428

429-
- ``url_references`` (``list[``\ :ref:`odc-url-reference`\ ``]``)
429+
- ``cross_references`` (``list[``\ :ref:`odc-cross-reference`\ ``]``)
430430
- ``resource_page_references`` (``list[``\ :ref:`odc-resource-page-reference`\ ``]``)
431+
- ``url_references`` (``list[``\ :ref:`odc-url-reference`\ ``]``)
431432

432433
Notes:
433434

@@ -561,13 +562,13 @@ As for the :ref:`odc-question` class, ``Reference`` is also a superclass and you
561562
- ``type`` (``str``)
562563
- ``annotations`` (``dict[str,str]``)
563564

564-
.. _odc-url-reference:
565+
.. _odc-cross-reference:
565566

566-
URLReference
567-
''''''''''''
567+
CrossReference
568+
''''''''''''''
568569

569-
- ``label`` (``str``)
570-
- ``url`` (``str``)
570+
- ``target_uuid`` (``str``)
571+
- ``description`` (``str``)
571572

572573
.. _odc-resource-page-reference:
573574

@@ -576,6 +577,14 @@ ResourcePageReference
576577

577578
- ``resource_page`` (``Optional[``\ :ref:`odc-resource-page`\ ``]``)
578579

580+
.. _odc-url-reference:
581+
582+
URLReference
583+
''''''''''''
584+
585+
- ``label`` (``str``)
586+
- ``url`` (``str``)
587+
579588

580589
.. _odc-resource-collection:
581590

0 commit comments

Comments
 (0)