Samples grid and Basic Export do not contain correct information about the sample's district

[carina29]

Problem Description

For samples associated with contacts, the displayed district in the samples grid and in the Basic Export should be the Contact's grid (if exists) or the source case's district if the contact's district is not filled.

Proposed Change

For samples associated with contacts, display in the grid and in the basic export the district associated with the contact (if is filled) or with the contact's source case ( if the contact's district is not filled).

Added Value/Benefit

Consistency in the way information is displayed in the grid and exports.

Acceptance Criteria

• [ ] when both the contact and the contact's source case have information regarding the district, the information from the contact page should come first (be displayed in the samples grid and basic export);

• [ ] when only the contact has district, the information should be displayed in the samples grid and the basic export;

• [ ] when only the contact's source case has district, the information should be displayed in the samples grid and basic export;

Implementation Details

Note: For samples associated with event participants, the logic is implemented here: https://github.com/SORMAS-Foundation/SORMAS-Project/issues/12940

Mockups

No response

Additional Information

No response