Merge pull request #282 from babyfeed/release_updates

fix: institution display in research admin users component (use id as…
babyfeed · Nov 7, 2024 · 9d90ef4 · 9d90ef4
2 parents 6488742 + 59acda7
commit 9d90ef4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/app/pages/research-admin-users/research-admin-users.component.html b/src/app/pages/research-admin-users/research-admin-users.component.html
@@ -69,7 +69,7 @@
           <td><a [routerLink]="['/admin/researcher/user/', u.userId]"> {{ u.username }} </a></td>
           <td> {{ u.firstname}} </td>
           <td> {{ u.lastname }} </td>
-          <td> {{ ResearchInstNames[u.assignedResearchInstitutionId - 1] }} </td>
+          <td> {{ ResearchInstNames[u.assignedResearchInstitutionId] }} </td>
         </tr>
       </table>
 
@@ -106,7 +106,7 @@
           <td> <a [routerLink]="['/admin/user/' + usertype.participant, participant.userId]"> {{ participant.username}} </a></td>
           <td> {{ findAssignedResearcherForParticipant?.username}} </td>
           <td> {{ participant.usertype }} </td>
-          <td> {{ ResearchInstNames[participant?.assignedResearcherInst - 1] }} </td>
+          <td> {{ ResearchInstNames[participant?.assignedResearcherInst] }} </td>
         </tr>
       </table>
     </div>

diff --git a/src/app/pages/research-admin-users/research-admin-users.component.ts b/src/app/pages/research-admin-users/research-admin-users.component.ts
@@ -35,7 +35,7 @@ export class AdminResearchUsersComponent implements OnInit {
   public filteredResearchInstForParticipantsList: String[] = [];
   public researcherUserNames: string[] =[];
   public participantUserNames: string[] =[];
-  ResearchInstNames: string[] = [];
+  ResearchInstNames: { [id: string]: string  } = {};
   researchInstitutionList: FFQResearchInstitution[];
   researcherList: FFQResearcher[] = [];
   participantsList: FfqParticipant[] = [];
@@ -78,7 +78,9 @@ export class AdminResearchUsersComponent implements OnInit {
     researchInstList.subscribe((data) => {
         this.researchInstitutionList = data;
         data.forEach((researchInst) => {
-        this.ResearchInstNames.push(researchInst.institutionName);
+          if(researchInst.researchInstitutionId) {
+            this.ResearchInstNames[researchInst.researchInstitutionId] = researchInst.institutionName;
+          }
         this.researchInstitutionLength = data.length;
       });
     });