fix: merge conflict

CHANGELOG.md

@@ -1,3 +1,17 @@
+# [100.42.0](https://github.com/dhis2/capture-app/compare/v100.41.4...v100.42.0) (2023-10-24)
+
+
+### Features
+
+* [DHIS2-12361] Tracked Entity Relationships widget ([cafed8d](https://github.com/dhis2/capture-app/commit/cafed8d8aac3fe9955739b1a8ee2cdde57722967))
+
+## [100.41.4](https://github.com/dhis2/capture-app/compare/v100.41.3...v100.41.4) (2023-10-22)
+
+
+### Bug Fixes
+
+* **translations:** sync translations from transifex (master) ([c82ce9f](https://github.com/dhis2/capture-app/commit/c82ce9f69159878f5ca9cc2e6ca9944544099368))
+
 ## [100.41.3](https://github.com/dhis2/capture-app/compare/v100.41.2...v100.41.3) (2023-10-16)
 
 

cypress/e2e/WorkingLists/EventWorkingLists/EventWorkingListsUser/index.js

@@ -255,7 +255,7 @@ Then('the list should display data ordered descendingly by report date', () => {
     cy.get('input[placeholder="To"]').click();
 
     cy.contains('Update')
-        .click();
+        .click({ force: true });
 
     const rows = combineDataAndYear(lastYear, {
         '01-01': ['14 Female'],

docs/user/using-the-capture-app.md

@@ -986,6 +986,39 @@ The enrollment comment widget displays comments and allows addition of comments,
 
 By clicking in the text field, you will be able to enter new text and see action buttons **Save comment** and **Cancel**. Note that Enrollment comments are attributed to a user and cannot be deleted. 
 
+### Relationship widget
+
+The Relationships widget on the enrollment dashboard is used for viewing the record’s linked relationships to other records.
+The number next to the title signifies the total number of relationships
+
+![](resources/images/enrollment-dash-relationship-widget.png)
+
+For tracked entity instance relationships, the key attributes shown in the widget are the attributes that have been selected to be displayed on the relationship type page in Maintenance.
+
+If no attributes are selected, it will just show a row per record with tracked entity type name and relationship creation date.
+
+When clicking a tracked entity instance you should be taken to the Enrollment Dashboard. If the relationship type includes a program, you should be taken to the latest enrollment for that program. If no program is specified, you should still be sent to the enrollment dashboard, but without a program.
+
+Click the **Add new** button to add a new relationship. Adding a new relationship opens a dialog where you can select the applicable relationship type.
+
+![](resources/images/enrollment-dash-relationship-widget-add.png)
+
+Choose between linking to an existing tracked entity instance or creating a new one.
+
+![](resources/images/enrollment-dash-relationship-widget-add-choose.png)
+
+#### Existing tracked entity instance
+
+Use the search form to find any existing record to link to.
+
+![](resources/images/enrollment-dash-relationship-widget-add-existing.png)
+
+#### New tracked entity instance
+
+Use the form to create a new record and link.
+
+![](resources/images/enrollment-dash-relationship-widget-add-new.png)
+
 ### Tracked entity instance profile widget
 
 On the enrollment dashboard, you can view the tracked entity instance profile widget. Inside the profile widget you can view the key attributes values. 
@@ -1226,4 +1259,4 @@ The attribute option combo selector will be displayed when you are adding or cha
 
 Example from new Tracker event:
 
-![](resources/images/attribute-option-combo-tracker.png)
+![](resources/images/attribute-option-combo-tracker.png)

i18n/en.pot

@@ -5,8 +5,8 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"POT-Creation-Date: 2023-09-29T14:14:34.330Z\n"
-"PO-Revision-Date: 2023-09-29T14:14:34.330Z\n"
+"POT-Creation-Date: 2023-09-12T06:24:49.265Z\n"
+"PO-Revision-Date: 2023-09-12T06:24:49.265Z\n"
 
 msgid "Choose one or more dates..."
 msgstr "Choose one or more dates..."
@@ -947,6 +947,18 @@ msgstr "Event could not be loaded"
 msgid "Organisation unit could not be loaded"
 msgstr "Organisation unit could not be loaded"
 
+msgid "Selected program"
+msgstr "Selected program"
+
+msgid "Search {{uniqueAttrName}}"
+msgstr "Search {{uniqueAttrName}}"
+
+msgid "Search by attributes"
+msgstr "Search by attributes"
+
+msgid "Could not retrieve metadata. Please try again later."
+msgstr "Could not retrieve metadata. Please try again later."
+
 msgid "Possible duplicates found"
 msgstr "Possible duplicates found"
 
@@ -1010,9 +1022,6 @@ msgstr "Search {{name}}"
 msgid "Search by {{name}}"
 msgstr "Search by {{name}}"
 
-msgid "Search by attributes"
-msgstr "Search by attributes"
-
 msgid "all programs"
 msgstr "all programs"
 
@@ -1070,12 +1079,6 @@ msgstr "Missing search criteria"
 msgid "Results found"
 msgstr "Results found"
 
-msgid "Selected program"
-msgstr "Selected program"
-
-msgid "Search {{uniqueAttrName}}"
-msgstr "Search {{uniqueAttrName}}"
-
 msgid "Saved lists in this program"
 msgstr "Saved lists in this program"
 
@@ -1359,6 +1362,42 @@ msgstr "{{ scheduledEvents }} scheduled"
 msgid "Stages and Events"
 msgstr "Stages and Events"
 
+msgid "New TEI Relationship"
+msgstr "New TEI Relationship"
+
+msgid "Missing implementation step"
+msgstr "Missing implementation step"
+
+msgid "Go back without saving relationship"
+msgstr "Go back without saving relationship"
+
+msgid "New Relationship"
+msgstr "New Relationship"
+
+msgid "Link to an existing {{tetName}}"
+msgstr "Link to an existing {{tetName}}"
+
+msgid "An error occurred while adding the relationship"
+msgstr "An error occurred while adding the relationship"
+
+msgid "Something went wrong while loading relationships. Please try again later."
+msgstr "Something went wrong while loading relationships. Please try again later."
+
+msgid "{{trackedEntityTypeName}} relationships"
+msgstr "{{trackedEntityTypeName}} relationships"
+
+msgid "To open this relationship, please wait until saving is complete"
+msgstr "To open this relationship, please wait until saving is complete"
+
+msgid "Type"
+msgstr "Type"
+
+msgid "Created date"
+msgstr "Created date"
+
+msgid "Program stage name"
+msgstr "Program stage name"
+
 msgid "Working list could not be loaded"
 msgstr "Working list could not be loaded"
 

i18n/es.po

@@ -17,7 +17,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: i18next-conv\n"
-"POT-Creation-Date: 2023-09-04T07:07:59.195Z\n"
+"POT-Creation-Date: 2023-09-29T14:14:34.330Z\n"
 "PO-Revision-Date: 2019-06-27 07:31+0000\n"
 "Last-Translator: Enzo Nicolas Rossi <[email protected]>, 2023\n"
 "Language-Team: Spanish (https://app.transifex.com/hisp-uio/teams/100509/es/)\n"
@@ -172,6 +172,15 @@ msgstr "Coordenada"
 msgid "Enrollment"
 msgstr "Inscripción"
 
+msgid "Complete event"
+msgstr "Completar el evento"
+
+msgid "{{ stageName }} - Basic info"
+msgstr ""
+
+msgid "{{ stageName }} - Status"
+msgstr ""
+
 msgid "Please select {{categoryName}}"
 msgstr "Seleccione {{categoryName}}"
 
@@ -192,15 +201,18 @@ msgstr "Cancelar"
 msgid "Metadata error. see log for details"
 msgstr "Error de metadatos. ver registro para más detalles"
 
+msgid "{{ stageName }} - Details"
+msgstr ""
+
+msgid "{{ stageName }} - {{ sectionName }}"
+msgstr ""
+
 msgid "Assigned user"
 msgstr "Usuario asignado"
 
 msgid "Search for user"
 msgstr "Buscar usuario"
 
-msgid "Complete event"
-msgstr "Completar el evento"
-
 msgid "Basic info"
 msgstr "Información básica"
 
@@ -438,13 +450,13 @@ msgid "Days in the future"
 msgstr "Días en el futuro"
 
 msgid "From"
-msgstr "De"
+msgstr "Desde"
 
 msgid "Days in the past"
 msgstr "Días en el pasado"
 
 msgid "To"
-msgstr "Para"
+msgstr "Hasta"
 
 msgid "This week"
 msgstr "Esta semana"
@@ -791,7 +803,7 @@ msgid "There was an error loading the page"
 msgstr "Hubo un error al cargar la página"
 
 msgid "Choose a registering unit to start reporting"
-msgstr "Elija una unidad de registro para comenzar a informar"
+msgstr "Seleccione una unidad de registro para comenzar a informar"
 
 msgid "There are no feedbacks for this event"
 msgstr "No hay comentarios para este evento."
@@ -866,7 +878,7 @@ msgid "View enrollment"
 msgstr "Ver inscripción"
 
 msgid "Create for"
-msgstr "Crear para"
+msgstr "Crear"
 
 msgid ""
 "You can also choose a program from the top bar and create in that program"