TD-4774 Correcting Condition For SignOff Button

rshrirohit · rshrirohit · commit 72d4b52e61b6 · 2024-10-09T07:36:34.000+01:00
diff --git a/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/SelfAssessmentOverview.cshtml b/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/SelfAssessmentOverview.cshtml
@@ -65,7 +65,7 @@
             </div>
         }
         <partial name="_OverviewActionButtons.cshtml" model=Model />
-        @if ((competencyQuestionsSummary == competencyVerifiedSummary) && (Model.NumberOfSelfAssessedOptionalCompetencies <= Model.SelfAssessment.MinimumOptionalCompetencies))
+        @if ((competencyQuestionsSummary == competencyVerifiedSummary) && (Model.NumberOfSelfAssessedOptionalCompetencies < Model.SelfAssessment.MinimumOptionalCompetencies))
         {
             <div class="nhsuk-warning-callout">
                 <h3 class="nhsuk-warning-callout__label">
@@ -198,6 +198,7 @@
                     }
                     @if (!Model.SupervisorSignOffs.Where(x => x.Verified == null).Any()
                    && latestResult > latestSignoff
+                   && (Model.NumberOfSelfAssessedOptionalCompetencies >= Model.SelfAssessment.MinimumOptionalCompetencies)
                    )
                     {
                         <a class="nhsuk-button nhsuk-button--secondary nhsuk-u-margin-bottom-2"

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@`
`65`	`65`	`</div>`
`66`	`66`	`}`
`67`	`67`	`<partial name="_OverviewActionButtons.cshtml" model=Model />`
`68`		`- @if ((competencyQuestionsSummary == competencyVerifiedSummary) && (Model.NumberOfSelfAssessedOptionalCompetencies <= Model.SelfAssessment.MinimumOptionalCompetencies))`
	`68`	`+ @if ((competencyQuestionsSummary == competencyVerifiedSummary) && (Model.NumberOfSelfAssessedOptionalCompetencies < Model.SelfAssessment.MinimumOptionalCompetencies))`
`69`	`69`	`{`
`70`	`70`	`<div class="nhsuk-warning-callout">`
`71`	`71`	`<h3 class="nhsuk-warning-callout__label">`
`@@ -198,6 +198,7 @@`
`198`	`198`	`}`
`199`	`199`	`@if (!Model.SupervisorSignOffs.Where(x => x.Verified == null).Any()`
`200`	`200`	`&& latestResult > latestSignoff`
	`201`	`+ && (Model.NumberOfSelfAssessedOptionalCompetencies >= Model.SelfAssessment.MinimumOptionalCompetencies)`
`201`	`202`	`)`
`202`	`203`	`{`
`203`	`204`	`<a class="nhsuk-button nhsuk-button--secondary nhsuk-u-margin-bottom-2"`