update branch before working

src/main/webapp/app/entities/graded-comment/graded-comment.model.ts

@@ -8,6 +8,7 @@ export interface IGradedComment {
   grade?: number | null;
   questionId?: number;
   studentResponses?: IStudentResponse[];
+  shortcut?: string | string[];
 }
 
 export class GradedComment implements IGradedComment {
@@ -18,7 +19,8 @@ export class GradedComment implements IGradedComment {
     public description?: string | null,
     public grade?: number | null,
     public questionId?: number,
-    public studentResponses?: IStudentResponse[]
+    public studentResponses?: IStudentResponse[],
+    public shortcut?: string | string[],
   ) {}
 }
 

src/main/webapp/app/entities/text-comment/text-comment.model.ts

@@ -7,6 +7,7 @@ export interface ITextComment {
   zonegeneratedid?: string | null;
   questionId?: number;
   studentResponses?: IStudentResponse[];
+  shortcut?: string | string[];
 }
 
 export class TextComment implements ITextComment {
@@ -16,7 +17,8 @@ export class TextComment implements ITextComment {
     public description?: string | null,
     public zonegeneratedid?: string | null,
     public questionId?: number,
-    public studentResponses?: IStudentResponse[]
+    public studentResponses?: IStudentResponse[],
+    public shortcut?: string | string[],
   ) {}
 }
 

src/main/webapp/app/opencv.worker.ts

@@ -640,7 +640,7 @@ async function doPredictionsAsync(p: {
       }
       console.timeEnd('analysePage');
     }
-    console.error(JSON.stringify(source));
+    // console.error(JSON.stringify(source));
     source.target.postMessage({ msg: p.msg, payload: outputs, uid: p.uid }, opts);
   } else {
     // TODO

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">

src/main/webapp/app/scanexam/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>
 

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"

src/main/webapp/app/scanexam/associer-copies-etudiants/associer-copies-etudiants.component.ts

@@ -262,15 +262,15 @@ export class AssocierCopiesEtudiantsComponent implements OnInit, AfterViewInit {
     this.shortcuts.push(
       {
         // ArrowRight
-        key: ['ctrl + right', 'meta + right'],
+        key: ['ctrl + right', 'cmd + right'],
         label: 'Navigation',
         description: this.translateService.instant('scanexam.nextstudent'),
         command: () => this.nextStudent(),
         preventDefault: true,
       },
       {
         // ArrowLeft
-        key: ['ctrl + left', 'meta + left'],
+        key: ['ctrl + left', 'cmd + left'],
         label: 'Navigation',
         description: this.translateService.instant('scanexam.previousstudent'),
         command: () => this.previousStudent(),
@@ -359,9 +359,6 @@ export class AssocierCopiesEtudiantsComponent implements OnInit, AfterViewInit {
       );
     }
 
-    /*    console.error(candidateName.map((e: any) => (this.latinise(e)! as string).toLowerCase()));
-    console.error(candidateFirstName.map((e: any) => (this.latinise(e)! as string)?.toLowerCase()));
-    console.error(candidateIne.map((e: any) => (this.latinise(e)! as string)?.toLowerCase())); */
     let pageNumber = z1?.pageNumber;
     if (pageNumber === undefined) {
       pageNumber = z2?.pageNumber;

src/main/webapp/app/scanexam/corrigequestion/ZoneCorrectionHandler.ts

@@ -84,6 +84,7 @@ export class ZoneCorrectionHandler {
     canvas.on('selection:updated', (e: any) => this.onSelectionUpdated(e as any));
     canvas.on('object:moving', (e: any) => this.onObjectMoving(e as any));
     canvas.on('object:scaling', (e: any) => this.onObjectScaling(e as any));
+    canvas.on('object:modified', () => this.onObjectModified());
   }
 
   private onCanvasMouseDown(event: { e: Event }) {
@@ -99,6 +100,11 @@ export class ZoneCorrectionHandler {
     this.eventHandler.canvas = this.canvas!;
     this.eventHandler.mouseUp();
   }
+  private onObjectModified() {
+    this.eventHandler.canvas = this.canvas!;
+    this.eventHandler.objectModified();
+  }
+
   private onSelectionCreated(e: any) {
     this.eventHandler.canvas = this.canvas!;