Merge pull request #1062 from ministryofjustice/revert-1061-CAS-555-a…

…mend-the-person-identifier Revert "Always display persons Sex and conditionally display Gender Identity"
ministryofjustice · Aug 21, 2024 · 0db73b4 · 0db73b4
2 parents aba9993 + 68b4358
commit 0db73b4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/cypress_shared/components/placeContextHeader.ts b/cypress_shared/components/placeContextHeader.ts
@@ -26,12 +26,11 @@ export default class PlaceContextHeaderComponent extends Component {
           .next()
           .should('contain', DateFormats.isoDateToUIDate(person.dateOfBirth, { format: 'short' }))
 
-        cy.root().contains('Sex:').next().should('contain', person.sex)
-
         if (person.genderIdentity) {
           cy.root().contains('Gender identity:').next().should('contain', person.genderIdentity)
           cy.root().should('not.contain', 'Sex')
         } else {
+          cy.root().contains('Sex:').next().should('contain', person.sex)
           cy.root().should('not.contain', 'Gender identity')
         }
       }

diff --git a/server/views/components/place-context-header/macro.njk b/server/views/components/place-context-header/macro.njk
@@ -19,15 +19,16 @@
                             <dt class="place-context-header__key">Date of birth: </dt>
                             <dd class="place-context-header__value">{{ formatDate(person.dateOfBirth, {format: 'short'}) }}</dd>
                         </div>
-                        <div class="place-context-header__row">
-                            <dt class="place-context-header__key">Sex: </dt>
-                            <dd class="place-context-header__value">{{ person.sex }}</dd>
-                        </div>
                         {% if person.genderIdentity %}
                             <div class="place-context-header__row">
                                 <dt class="place-context-header__key">Gender identity: </dt>
                                 <dd class="place-context-header__value">{{ person.genderIdentity }}</dd>
                             </div>
+                        {% else %}
+                            <div class="place-context-header__row">
+                                <dt class="place-context-header__key">Sex: </dt>
+                                <dd class="place-context-header__value">{{ person.sex }}</dd>
+                            </div>
                         {% endif %}
                     {% endif %}