Skip to content

Commit 99f4107

Browse files
committed
TD-1565 Removing additional method for fetching delegate user id
1 parent 2c359b4 commit 99f4107

File tree

3 files changed

+1
-15
lines changed

3 files changed

+1
-15
lines changed

DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/SelfAssessmentDataService.cs

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,6 @@ int GetSelfAssessmentActivityDelegatesExportCount(string searchString, string so
163163
void RemoveDelegateSelfAssessment(int candidateAssessmentsId);
164164
int? GetSupervisorsCountFromCandidateAssessmentId(int candidateAssessmentsId);
165165
bool CheckForSameCentre(int centreId, int candidateAssessmentsId);
166-
int? GetDelegateUserId(int CandidateAssessmentId, int selfAssessmentId);
167166
int? GetDelegateAccountId(int centreId, int delegateUserId);
168167
int CheckDelegateSelfAssessment(int candidateAssessmentsId);
169168
}
@@ -686,14 +685,6 @@ public bool CheckForSameCentre(int centreId, int candidateAssessmentsId)
686685
);
687686
return ResultCount == 1 ? true : false;
688687
}
689-
public int? GetDelegateUserId(int CandidateAssessmentId, int selfAssessmentId)
690-
{
691-
return connection.QueryFirstOrDefault<int>(
692-
@"SELECT DelegateUserID FROM CandidateAssessments
693-
WHERE (SelfAssessmentID = @selfAssessmentId) AND ( ID =@CandidateAssessmentId)",
694-
new { CandidateAssessmentId, selfAssessmentId}
695-
);
696-
}
697688
public int? GetDelegateAccountId(int centreId, int delegateUserId)
698689
{
699690
return connection.QueryFirstOrDefault<int>(

DigitalLearningSolutions.Web/Controllers/TrackingSystem/Delegates/ViewDelegateController.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public IActionResult Index(int delegateId, string? callType)
9090
{
9191
selfassessment.SupervisorCount = selfAssessmentService.GetSupervisorsCountFromCandidateAssessmentId(selfassessment.CandidateAssessmentId);
9292
selfassessment.IsSameCentre = selfAssessmentService.CheckForSameCentre(centreId, selfassessment.CandidateAssessmentId);
93-
selfassessment.DelegateUserId = selfAssessmentService.GetDelegateUserId(selfassessment.CandidateAssessmentId, selfassessment.Id);
93+
selfassessment.DelegateUserId = delegateUserCard.UserId;
9494
}
9595

9696
var model = new ViewDelegateViewModel(delegateUserCard, customFields, delegateCourses, selfAssessments);

DigitalLearningSolutions.Web/Services/SelfAssessmentService.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,6 @@ public int GetSelfAssessmentActivityDelegatesExportCount(string searchString, s
139139
void RemoveDelegateSelfAssessment(int candidateAssessmentsId);
140140
public int? GetSupervisorsCountFromCandidateAssessmentId(int candidateAssessmentsId);
141141
public bool CheckForSameCentre(int centreId, int candidateAssessmentsId);
142-
public int? GetDelegateUserId(int CandidateAssessmentId, int selfAssessmentId);
143142
public int? GetDelegateAccountId(int centreId, int delegateUserId);
144143
int CheckDelegateSelfAssessment(int candidateAssessmentsId);
145144
}
@@ -506,10 +505,6 @@ public bool CheckForSameCentre(int centreId, int candidateAssessmentsId)
506505
{
507506
return selfAssessmentDataService.CheckForSameCentre(centreId, candidateAssessmentsId);
508507
}
509-
public int? GetDelegateUserId(int CandidateAssessmentId, int selfAssessmentId)
510-
{
511-
return selfAssessmentDataService.GetDelegateUserId(CandidateAssessmentId, selfAssessmentId);
512-
}
513508
public int? GetDelegateAccountId(int centreId, int delegateUserId)
514509
{
515510
return selfAssessmentDataService.GetDelegateAccountId(centreId, delegateUserId);

0 commit comments

Comments
 (0)