Merge pull request #1 from resistmanagement/edit-time-entry-display-f…

…ields Update Task's Worker dropdown to not assume a type of Party
resistmanagement · Oct 12, 2022 · eb275b6 · eb275b6
2 parents 5c69000 + dbd44af
commit eb275b6
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/screen/SimpleScreens/Task/EditTimeEntries.xml b/screen/SimpleScreens/Task/EditTimeEntries.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-This software is in the public domain under CC0 1.0 Universal plus a 
+This software is in the public domain under CC0 1.0 Universal plus a
 Grant of Patent License.
 
 To the extent possible under law, the author(s) have dedicated all
@@ -77,10 +77,11 @@ along with this software (see the LICENSE.md file). If not, see
             </field>
             <field name="partyId"><default-field title="Worker">
                 <drop-down no-current-selected-key="${ec.user.userAccount.partyId}" current="selected">
-                    <entity-options key="${partyId}" text="${firstName} ${lastName} (${partyId})">
-                        <entity-find entity-name="WorkEffortPartyAndPerson">
+                    <entity-options key="${partyId}" text="${firstName ? firstName + ' ' + lastName : (organizationName ?: pseudoId)} (${partyId})">
+                        <entity-find entity-name="WorkEffortAndPartyDetail">
                             <date-filter/>
                             <econdition field-name="workEffortId"/>
+                            <select-field field-name="firstName, lastName, organizationName, pseudoId, partyId"/>
                         </entity-find>
                     </entity-options>
                 </drop-down>