@@ -1432,42 +1432,13 @@ public async Task<IActionResult> DownloadCertificate(int candidateAssessmentId)
14321432 var competencyFlags = frameworkService . GetSelectedCompetencyFlagsByCompetecyIds ( competencyIds ) ;
14331433 var competencies = CompetencyFilterHelper . FilterCompetencies ( recentResults , competencyFlags , null ) ;
14341434 var supervisorSignOffs = selfAssessmentService . GetSupervisorSignOffsForCandidateAssessment ( competencymaindata . SelfAssessmentID , delegateUserId ) ;
1435- if ( ! CertificateHelper . CanViewCertificate ( recentResults , supervisorSignOffs ) )
1435+ var competencySummaries = CertificateHelper . CanViewCertificate ( recentResults , supervisorSignOffs ) ;
1436+ if ( ! competencySummaries . CanViewCertificate )
14361437 {
14371438 return RedirectToAction ( "StatusCode" , "LearningSolutions" , new { code = 401 } ) ;
14381439 }
1439- foreach ( var competency in competencies )
1440- {
1441- competency . QuestionLabel = assessment . QuestionLabel ;
1442- foreach ( var assessmentQuestion in competency . AssessmentQuestions )
1443- {
1444- if ( assessmentQuestion . AssessmentQuestionInputTypeID != 2 )
1445- {
1446- assessmentQuestion . LevelDescriptors = selfAssessmentService
1447- . GetLevelDescriptorsForAssessmentQuestion (
1448- assessmentQuestion . Id ,
1449- assessmentQuestion . MinValue ,
1450- assessmentQuestion . MaxValue ,
1451- assessmentQuestion . MinValue == 0
1452- ) . ToList ( ) ;
1453- }
1454- }
1455- }
1456-
1457- var CompetencyGroups = competencies . GroupBy ( competency => competency . CompetencyGroup ) ;
1458- var competencySummaries = from g in CompetencyGroups
1459- let questions = g . SelectMany ( c => c . AssessmentQuestions ) . Where ( q => q . Required )
1460- let selfAssessedCount = questions . Count ( q => q . Result . HasValue )
1461- let verifiedCount = questions . Count ( q => ! ( ( q . Result == null || q . Verified == null || q . SignedOff != true ) && q . Required ) )
1462- select new
1463- {
1464- SelfAssessedCount = selfAssessedCount ,
1465- VerifiedCount = verifiedCount ,
1466- Questions = questions . Count ( )
1467- } ;
1468-
1469- int sumVerifiedCount = competencySummaries . Sum ( item => item . VerifiedCount ) ;
1470- int sumQuestions = competencySummaries . Sum ( item => item . Questions ) ;
1440+ int sumVerifiedCount = competencySummaries . VerifiedCount ;
1441+ int sumQuestions = competencySummaries . QuestionsCount ;
14711442 var model = new ViewModels . LearningPortal . SelfAssessments . CompetencySelfAssessmentCertificateViewModel ( competencymaindata , competencycount , "Proficiencies" , accessors , activitySummaryCompetencySelfAssesment , sumQuestions , sumVerifiedCount , null ) ;
14721443 var renderedViewHTML = RenderRazorViewToString ( this , "SelfAssessments/DownloadCompetencySelfAssessmentCertificate" , model ) ;
14731444
0 commit comments