Merge pull request #405 from correctexam/402-feedback-view-add-a-link…

…-to-the-correction-view-for-instructors-feature-request 402 feedback view add a link to the correction view for instructors feature request
correctexam · Nov 24, 2023 · 51633bd · 51633bd
2 parents 2eae1e7 + 8eb7a76
commit 51633bd
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 12 deletions.
diff --git a/src/main/webapp/app/scanexam/annotate-template/paint/paint.component.html b/src/main/webapp/app/scanexam/annotate-template/paint/paint.component.html
@@ -2,8 +2,18 @@
   <div class="">
     <jhi-fabric-canvas [exam]="exam" [content]="content" [numeroEvent]="numero"></jhi-fabric-canvas>
   </div>
-  <div class="flex flex-column flex-grow-1 top-0 right-0 p-1 m-2">
-    <button type="submit" (click)="previousState()" class="right-0 p-button-primary" pButton data-cy="entityDetailsBackButton">
+  <div
+    class="flex flex-column flex-grow-1 top-0 right-0 p-1 m-2"
+    style="overflow-y: auto; overflow-x: hidden; max-height: 85vh; position: sticky; top: 0"
+  >
+    <button
+      style="overflow: visible"
+      type="submit"
+      (click)="previousState()"
+      class="right-0 p-button-primary"
+      pButton
+      data-cy="entityDetailsBackButton"
+    >
       <fa-icon icon="arrow-left"></fa-icon>&nbsp;<span jhiTranslate="entity.action.back">Back</span>
     </button>
     <div class="templateForm">

diff --git a/...exam/annotate-template/paint/questionpropertiesview/questionpropertiesview.component.html b/...exam/annotate-template/paint/questionpropertiesview/questionpropertiesview.component.html
@@ -1,4 +1,11 @@
-<p-sidebar [position]="'right'" [(visible)]="layoutsidebarVisible">
+<p-sidebar
+  [position]="'right'"
+  [(visible)]="layoutsidebarVisible"
+  [blockScroll]="true"
+  [showCloseIcon]="true"
+  styleClass="p-0"
+  appendTo="body"
+>
   <jhi-create-comments [question]="questions[0]"></jhi-create-comments>
 </p-sidebar>
 

diff --git a/src/main/webapp/app/scanexam/annotate-template/paint/toolbar/toolbar.component.html b/src/main/webapp/app/scanexam/annotate-template/paint/toolbar/toolbar.component.html
@@ -125,7 +125,7 @@ <h3 jhiTranslate="scanexam.confirmremove"></h3>
       <img src="/content/images/toolbar-images/fill.png" />
     </div>-->
   </div>
-  <div class="d-flex flex-wrap mb-5">
+  <div class="d-flex flex-wrap mb-1">
     <div
       [title]="'scanexam.erase' | translate"
       class="toolbox-item ml-1 mt-1"

diff --git a/src/main/webapp/app/scanexam/corrigequestion/corrigequestion.component.html b/src/main/webapp/app/scanexam/corrigequestion/corrigequestion.component.html
@@ -373,7 +373,10 @@ <h2 id="jhi-course-heading" data-cy="CourseCreateUpdateHeading" jhiTranslate="sc
         </div>
       </div>
 
-      <div class="col-12 sm:col-12 md:col-12 lg:col-3 xl:col-2">
+      <div
+        class="col-12 sm:col-12 md:col-12 lg:col-3 xl:col-2"
+        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 !== ''">
@@ -435,7 +438,7 @@ <h2 id="jhi-course-heading" data-cy="CourseCreateUpdateHeading" jhiTranslate="sc
               <fa-icon icon="code-compare"></fa-icon>
             </span>
           </div>
-          <div *ngIf="resp" style="padding-bottom: 1rem" class="col-3 sm:col-3 md:col-3 lg:col-12 xl:col-12">
+          <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>
             <p-inputSwitch
               [disabled]="blocked"
@@ -447,7 +450,7 @@ <h2 id="jhi-course-heading" data-cy="CourseCreateUpdateHeading" jhiTranslate="sc
               [tooltipZIndex]="'3000'"
             ></p-inputSwitch>
           </div>
-          <div *ngIf="resp" style="padding-bottom: 1rem" class="col-3 sm:col-3 md:col-3 lg:col-12 xl:col-12">
+          <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.badanswer">Mauvaise réponse remarquable: </label>
             <p-inputSwitch
               [disabled]="blocked"
@@ -459,13 +462,17 @@ <h2 id="jhi-course-heading" data-cy="CourseCreateUpdateHeading" jhiTranslate="sc
               [tooltipZIndex]="'3000'"
             ></p-inputSwitch>
           </div>
-          <div style="padding-bottom: 1rem" class="col-3 sm:col-3 md:col-3 lg:col-12 xl:col-12">
+          <div style="padding-bottom: 0.3rem; margin-bottom: 0.7rem" class="col-3 sm:col-3 md:col-3 lg:col-12 xl:col-12">
             <jhi-graphical-toolbarcorrection></jhi-graphical-toolbarcorrection>
           </div>
         </div>
 
         <div class="grid" *ngIf="currentQuestion && currentQuestion?.gradeType === 'DIRECT' && currentQuestion?.typeAlgoName !== 'QCM'">
-          <div *ngFor="let comment of currentTextComment4Question" style="padding: 0.2rem" class="sm:col-3 md:col-3 lg:col-12 xl:col-12">
+          <div
+            *ngFor="let comment of currentTextComment4Question"
+            style="padding-left: 0.5rem; padding-right: 0.5rem; padding-top: 0.2rem; padding-bottom: 0.2rem"
+            class="sm:col-3 md:col-3 lg:col-12 xl:col-12"
+          >
             <div class="card" [style]="getStyle(comment)">
               <div class="card-body">
                 <span class="float-end" (click)="removeTextComment(comment)">
@@ -569,7 +576,11 @@ <h5 [tooltipZIndex]="'3000'" [pTooltip]="comment.description!" tooltipPosition="
         </div>
 
         <div class="grid" *ngIf="(currentQuestion && currentQuestion?.gradeType !== 'DIRECT') || currentQuestion?.typeAlgoName === 'QCM'">
-          <div *ngFor="let comment of currentGradedComment4Question" style="padding: 0.2rem" class="sm:col-3 md:col-3 lg:col-12 xl:col-12">
+          <div
+            *ngFor="let comment of currentGradedComment4Question"
+            style="padding-left: 0.5rem; padding-right: 0.5rem; padding-top: 0.2rem; padding-bottom: 0.2rem"
+            class="sm:col-3 md:col-3 lg:col-12 xl:col-12"
+          >
             <div class="card" [style]="getStyle(comment)">
               <div class="card-body">
                 <span *ngIf="currentQuestion?.typeAlgoName !== 'QCM'" class="float-end clickable" (click)="removeGradedComment(comment)"
@@ -720,7 +731,7 @@ <h5 [tooltipZIndex]="'3000'" [pTooltip]="comment!.description!" tooltipPosition=
             currentQuestion?.typeAlgoName !== 'QCM'
           "
         >
-          <div style="padding-left: 0.2rem; padding-right: 0.2rem; padding-top: 0.8rem" class="sm:col-6 md:col-6 lg:col-12 xl:col-12">
+          <div style="padding-left: 0.5rem; padding-right: 0.5rem; padding-top: 0.8rem" class="sm:col-6 md:col-6 lg:col-12 xl:col-12">
             <div class="card">
               <div class="card-body">
                 <h5 class="card-title" jhiTranslate="scanexam.newcomment">Nouveau commentaire</h5>

diff --git a/src/main/webapp/app/scanexam/corrigequestion/toolbar/toolbar.component.html b/src/main/webapp/app/scanexam/corrigequestion/toolbar/toolbar.component.html
@@ -1,5 +1,5 @@
 <div>
-  <div class="d-flex flex-wrap mb-5">
+  <div class="d-flex flex-wrap mb-1">
     <div
       [title]="'scanexam.selectmove' | translate"
       class="toolbox-item ml-1 mt-1"