Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions src/app/quiz/quiz-checkbox.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ clr-checkbox-container {
.quiz-question-title {
white-space: wrap;
width: calc(100% - 40px) !important;
margin-left: 20px;
margin-right: 20px;
margin-bottom: 10px;
max-width: 100%;
}
223 changes: 153 additions & 70 deletions src/app/quiz/quiz.component.html
Original file line number Diff line number Diff line change
@@ -1,107 +1,190 @@
<pre class="quiz-container">
@if (quizTitle) { <h5 class="quiz-title">{{ quizTitle }}</h5> }
<div class="quiz-container">
<div class="card quiz-card">
<div class="card-block">
@if (quizTitle) {
<h5 class="quiz-title">{{ quizTitle }}</h5>
}

@if(isPersistent && !loadingQuiz && !currentQuiz) {
<clr-alert
[clrAlertType]="'danger'"
[clrAlertClosable]="false"
>
<clr-alert-item>
<span class="alert-text">
Failed to load quiz!
@if (isPersistent && !loadingQuiz && !currentQuiz) {
<clr-alert [clrAlertType]="'danger'" [clrAlertClosable]="false">
<clr-alert-item>
<span class="alert-text"> Failed to load quiz! </span>
</clr-alert-item>
</clr-alert>
}

@if (isPersistent && loadingQuestions && started) {
<span class="spinner spinner-inline"> Loading... </span>
<span> Loading Questions... </span>
}
@if (
(!isPersistent || (isPersistent && started)) && questions.length > 0
) {
<div class="quiz-progress">
<div class="progress">
<progress [value]="progress" max="100"></progress>
</div>
</div>

@for (q of questions; track q.id || q.title; let i = $index) {
<div [hidden]="i !== currentIndex">
@if (q.type === 'checkbox') {
<quiz-checkbox
[quizId]="quizId"
[scenarioId]="scenarioId"
[questionId]="q.id || ''"
[title]="q.title"
[helperText]="q.helperText || ''"
[validation]="q.validation"
[successMsg]="q.successMsg"
[errMsg]="q.errorMsg"
[shuffle]="q.shuffle"
[questionAnswers]="q.answers"
[correctAnswerIds]="correctIdsByQid.get(q.id ?? '') ?? testObs"
[remotePass]="remotePass"
></quiz-checkbox>
} @else {
<quiz-radio
[quizId]="quizId"
[scenarioId]="scenarioId"
[questionId]="q.id || ''"
[title]="q.title"
[helperText]="q.helperText || ''"
[validation]="q.validation"
[successMsg]="q.successMsg"
[errMsg]="q.errorMsg"
[shuffle]="q.shuffle"
[questionAnswers]="q.answers"
[correctAnswerIds]="correctIdsByQid.get(q.id ?? '') ?? testObs"
[remotePass]="remotePass"
></quiz-radio>
}
</div>
}
}
</div>

@if ((!isPersistent || (isPersistent && started)) && questions.length > 0) {
<div class="card-footer quiz-footer">
<button
class="btn btn-outline"
type="button"
(click)="prevQuestion()"
[disabled]="currentIndex === 0"
>
Previous
</button>

<span class="quiz-footer-label">
Question {{ currentIndex + 1 }} / {{ totalQuestions }}
</span>
</clr-alert-item>
</clr-alert>
}
@else if (isPersistent && alreadyPassed) {

<button
class="btn"
[ngClass]="
currentIndex === totalQuestions - 1 ? 'btn-outline' : 'btn-primary'
"
type="button"
(click)="nextQuestion()"
[disabled]="currentIndex === totalQuestions - 1"
>
Next
</button>
</div>
}
</div>
@if (isPersistent && alreadyPassed) {
<app-alert #failedDownloadAlert></app-alert>
<clr-alert
[clrAlertType]="'success'"
[clrAlertClosable]="false"
[clrAlertIcon]="'check-circle'"
>
<clr-alert-item class="centered">
<span class="alert-text">
You passed this quiz. Great job!
</span>
@if(quizIssuer) {
<span class="alert-text"> You passed this quiz. Great job! </span>
@if (quizIssuer) {
<div class="alert-actions">
<button class="btn alert-action" (click)="download()">Download Certificate</button>
<button class="btn btn-primary" (click)="download()">
Download Certificate
</button>
</div>
}
</clr-alert-item>
</clr-alert>
} @else if(isPersistent && loadingQuestions && started) {
<span class="spinner spinner-inline"> Loading... </span>
<span> Loading Questions... </span>
} @else if (!isPersistent || isPersistent && !alreadyPassed && started) {
@for (q of questions; track q.id || q.title; let i = $index) {
@if (q.type === 'checkbox') {
<quiz-checkbox
[quizId]="quizId"
[scenarioId]="scenarioId"
[questionId]="q.id || ''"
[title]="q.title"
[helperText]="q.helperText || ''"
[validation]="q.validation"
[successMsg]="q.successMsg"
[errMsg]="q.errorMsg"
[shuffle]="q.shuffle"
[questionAnswers]="q.answers"
[correctAnswerIds]="correctIdsByQid.get(q.id ?? '') ?? testObs"
[remotePass]="remotePass"
></quiz-checkbox>
} @else {
<quiz-radio
[quizId]="quizId"
[scenarioId]="scenarioId"
[questionId]="q.id || ''"
[title]="q.title"
[helperText]="q.helperText || ''"
[validation]="q.validation"
[successMsg]="q.successMsg"
[errMsg]="q.errorMsg"
[shuffle]="q.shuffle"
[questionAnswers]="q.answers"
[correctAnswerIds]="correctIdsByQid.get(q.id ?? '') ?? testObs"
[remotePass]="remotePass"
></quiz-radio>
}
}
@if (!isPersistent || (isPersistent && !alreadyPassed && started)) {
@if (isSubmitted && alreadyPassed === false) {
<clr-alert [clrAlertType]="'warning'" [clrAlertClosable]="false">
<clr-alert-item>
<span class="alert-text">
You did not reach the required score. Please try again.
</span>
</clr-alert-item>
</clr-alert>
}

<div class="button-container">
<button
[disabled]="allowedAtts < 1 || isSubmitted || alreadyPassed"
class="btn btn-success-outline submit-button"
type="submit"
(click)="submit()"
>
Submit
</button>
<button
[disabled]="allowedAtts < 1 || !isSubmitted || alreadyPassed"
class="btn btn-outline reset-button"
(click)="reset()"
>
Retry
</button>
<button
[disabled]="allowedAtts < 1 || isSubmitted || alreadyPassed"
class="btn"
[ngClass]="
currentIndex === totalQuestions - 1
? 'btn-success'
: 'btn-success-outline'
"
type="submit"
(click)="submit()"
>
Submit Quiz
</button>
</div>
@if(allowedAtts <= 100) {
<span class="clr-subtext">Allowed attempts left: {{ allowedAtts }}</span>

@if (allowedAtts <= 100) {
<span class="clr-subtext attempts">
Allowed attempts left: {{ allowedAtts }}
</span>
}
}
@if(isPersistent && loadingQuestions && !started && !alreadyPassed && !loadingQuiz) {

@if (
isPersistent &&
loadingQuestions &&
!started &&
!alreadyPassed &&
!loadingQuiz
) {
<div class="button-container">
<button
[disabled]="started || alreadyPassed || allowedAtts < 1"
class="btn btn-success-outline submit-button"
(click)="start(currentQuiz)"
>
Start
Start Quiz
</button>
</div>
@if(allowedAtts <= 100) {
<span class="clr-subtext">Allowed attempts left: {{ allowedAtts }}</span>
@if (allowedAtts <= 100) {
<span class="clr-subtext attempts">
Allowed attempts left: {{ allowedAtts }}
</span>
}
}
</pre>
</div>

<clr-modal [(clrModalOpen)]="showIncompleteModal" [clrModalClosable]="true">
<h3 class="modal-title">Incomplete quiz</h3>
<div class="modal-body">
<p>Please answer all questions before submitting your quiz.</p>
</div>
<div class="modal-footer">
<button class="btn btn-primary" (click)="showIncompleteModal = false">
OK
</button>
</div>
</clr-modal>
46 changes: 45 additions & 1 deletion src/app/quiz/quiz.component.scss
Original file line number Diff line number Diff line change
@@ -1,17 +1,25 @@
.quiz-container {
display: flex;
flex-direction: column;
border: none;
padding: 20px;
margin-top: 20px;
border-radius: var(--cds-alias-object-border-radius-100);
}

.quiz-title {
margin-bottom: 1.2rem;
margin-bottom: 1rem;
margin-top: 0;
font-weight: bold;
}

.button-container {
display: flex;
width: 100%;
flex-direction: row;
padding: 20px;
justify-content: flex-end;
gap: 5px;
}

.submit-button {
Expand All @@ -24,3 +32,39 @@
.centered {
align-items: center;
}

.attempts {
align-self: flex-end;
}

.nav-container {
display: flex;
align-items: center;
margin: 1rem 0;

.nav-label {
margin: 0 1rem;
}
}

.quiz-progress {
margin-bottom: 1rem;
}

.quiz-card {
margin-top: 0.5rem;
margin-bottom: 0.5rem;
border: 1px;
border-radius: var(--cds-alias-object-border-radius-100);
}

.quiz-footer {
display: flex;
align-items: center;
gap: 1rem;

&-label {
font-size: var(--cds-alias-typography-caption-font-size);
opacity: 0.8;
}
}
Loading
Loading