Skip to content

Commit

Permalink
Merge pull request #494 from correctexam/235-on-mobile-add-swipe-righ…
Browse files Browse the repository at this point in the history 
…t-and-left-to-go-from-one-student-to-the-next-one

correct star misaligned
  • Loading branch information
@barais
barais authored Feb 23, 2024
2 parents ccdecb7 + c11a2ca commit 133f512
Show file tree
Hide file tree
Showing 2 changed files with 76 additions and 68 deletions.
140 changes: 72 additions & 68 deletions src/main/webapp/app/scanexam/corrigequestion/corrigequestion.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -453,12 +453,14 @@ <h3 jhiTranslate="scanexam.layoutoptions">Layout options</h3>
style="overflow-y: auto; overflow-x: hidden; max-height: 85vh; position: sticky; top: 0"
>
<div class="grid grid-nogutter">
<div style="padding-bottom: 1rem" class="col-3 sm:col-3 md:col-3 lg:col-12 xl:col-12">
<div *ngIf="currentQuestion?.libelle !== undefined && currentQuestion?.libelle !== ''">
<div style="padding-bottom: 1rem" class="flex col-3 sm:col-3 md:col-3 lg:col-12 xl:col-12 flex flex-column">
<div class="flex-item" *ngIf="currentQuestion?.libelle !== undefined && currentQuestion?.libelle !== ''">
<span [tooltipPosition]="'top'" [pTooltip]="'scanexam.libelle' | translate">{{ currentQuestion?.libelle }}</span>
<BR />
</div>
<div
style="width: 100%"
class="flex-item"
*ngIf="
currentQuestion !== undefined &&
currentQuestion.gradeType === 'DIRECT' &&
Expand All @@ -478,74 +480,76 @@ <h3 jhiTranslate="scanexam.layoutoptions">Layout options</h3>
></p-rating
><BR />
</div>
<div class="flex-item">
<span jhiTranslate="scanexam.noteattribuee">Note attribuée : </span>
<span
*ngIf="
(currentQuestion?.typeAlgoName === 'QCM' || currentQuestion?.gradeType !== 'HYBRID') &&
questionStep > 0 &&
resp?.id &&
currentNote !== undefined
"
><b>{{ currentNote! / questionStep | number: '1.0-2' }}</b></span
>
<span
*ngIf="
(currentQuestion?.typeAlgoName === 'QCM' || currentQuestion?.gradeType !== 'HYBRID') && questionStep <= 0 && resp?.id
"
><b>{{ currentNote }}</b></span
><span
*ngIf="
(currentQuestion?.typeAlgoName === 'QCM' || currentQuestion?.gradeType !== 'HYBRID') &&
resp?.id &&
questions !== undefined &&
questions!.length > 0
"
><b> / {{ questions![0].point! }}</b></span
>
<span
*ngIf="
currentQuestion?.typeAlgoName !== 'QCM' &&
currentQuestion?.gradeType === 'HYBRID' &&
resp?.id &&
questions !== undefined &&
questions!.length > 0
"
><b> {{ currentNote | number: '1.0-2' }} / {{ questions![0].point! }}</b></span
>
<span *ngIf="!resp?.id" jhiTranslate="scanexam.noneval">non évalué</span>
<span
*ngIf="resp?.id"
class="float-end"
[tooltipPosition]="'left'"
[tooltipZIndex]="'3000'"
[pTooltip]="'scanexam.tooltipResetAnswer' | translate"
(click)="removeAnswer()"
>
<fa-icon icon="trash"></fa-icon>
</span>
<span *ngIf="resp?.id" class="float-end"> &nbsp; &nbsp; </span>

<span jhiTranslate="scanexam.noteattribuee">Note attribuée : </span>

<span
*ngIf="
(currentQuestion?.typeAlgoName === 'QCM' || currentQuestion?.gradeType !== 'HYBRID') &&
questionStep > 0 &&
resp?.id &&
currentNote !== undefined
"
><b>{{ currentNote! / questionStep | number: '1.0-2' }}</b></span
>
<span
*ngIf="(currentQuestion?.typeAlgoName === 'QCM' || currentQuestion?.gradeType !== 'HYBRID') && questionStep <= 0 && resp?.id"
><b>{{ currentNote }}</b></span
><span
*ngIf="
(currentQuestion?.typeAlgoName === 'QCM' || currentQuestion?.gradeType !== 'HYBRID') &&
resp?.id &&
questions !== undefined &&
questions!.length > 0
"
><b> / {{ questions![0].point! }}</b></span
>
<span
*ngIf="
currentQuestion?.typeAlgoName !== 'QCM' &&
currentQuestion?.gradeType === 'HYBRID' &&
resp?.id &&
questions !== undefined &&
questions!.length > 0
"
><b> {{ currentNote | number: '1.0-2' }} / {{ questions![0].point! }}</b></span
>
<span *ngIf="!resp?.id" jhiTranslate="scanexam.noneval">non évalué</span>
<span
*ngIf="resp?.id"
class="float-end"
[tooltipPosition]="'left'"
[tooltipZIndex]="'3000'"
[pTooltip]="'scanexam.tooltipResetAnswer' | translate"
(click)="removeAnswer()"
>
<fa-icon icon="trash"></fa-icon>
</span>
<span *ngIf="resp?.id" class="float-end"> &nbsp; &nbsp; </span>

<span
*ngIf="resp?.id"
class="float-end"
[tooltipPosition]="'left'"
[tooltipZIndex]="'3000'"
[pTooltip]="'scanexam.tooltipCompareMark' | translate"
(click)="compareMark($event, resp!)"
>
<fa-icon icon="code-compare"></fa-icon>
</span>
<span *ngIf="resp?.id" class="float-end"> &nbsp; &nbsp; </span>
<span
*ngIf="resp?.id"
class="float-end"
[tooltipPosition]="'left'"
[tooltipZIndex]="'3000'"
[pTooltip]="'scanexam.tooltipCompareMark' | translate"
(click)="compareMark($event, resp!)"
>
<fa-icon icon="code-compare"></fa-icon>
</span>
<span *ngIf="resp?.id" class="float-end"> &nbsp; &nbsp; </span>

<span
class="float-end"
[tooltipPosition]="'left'"
[tooltipZIndex]="'3000'"
[pTooltip]="'scanexam.editquestionTooltip' | translate"
(click)="editQuestion()"
>
<fa-icon icon="edit"></fa-icon>
</span>
<span
class="float-end"
[tooltipPosition]="'left'"
[tooltipZIndex]="'3000'"
[pTooltip]="'scanexam.editquestionTooltip' | translate"
(click)="editQuestion()"
>
<fa-icon icon="edit"></fa-icon>
</span>
</div>
</div>
<div *ngIf="resp" style="padding-bottom: 0.4rem" class="col-3 sm:col-3 md:col-3 lg:col-12 xl:col-12">
<label jhiTranslate="scanexam.excellente">Excellente réponse: </label>
Expand Down
4 changes: 4 additions & 0 deletions src/main/webapp/content/scss/global.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,10 @@ a:hover {
color: $dropdown-link-hover-color;
}

.p-rating {
flex-flow: wrap;
width: 100%;
}
/* ==========================================================================
Browser Upgrade Prompt
========================================================================== */
Expand Down

0 comments on commit 133f512

Please sign in to comment.