update develop branch

.gitignore

@@ -145,3 +145,5 @@ Desktop.ini
 # ESLint
 ######################
 .eslintcache
+
+danenv/

README.md

@@ -1,10 +1,14 @@
-# correctExamBack
+# CorrectExam back-end
 
-Deliver and Grade Your Assessments Anywhere
+The back-end of the app CorrectExam.
+
+## CorrectExam
+
+**Deliver and Grade Your Assessments Anywhere**
 
 This application helps you seamlessly administer and grade all of your in-class assessments (long exam or short). Save time grading and get a clear picture of how your students are doing. Provide a clear feedback to your students.
 
-# Feature
+### Feature
 
 Main feature are:
 
@@ -15,29 +19,65 @@ Main feature are:
 - use your tablet and your pen to annotate student sheet
 - provide clear feedback to your students
 
-# Technical stack
+### Technical stack
 
 
 This application was generated using JHipster 6.10.5 and JHipster Quarkus 1.1.1 (manually upgraded to quarkus 2.9.2.Final), you can find documentation and help at [https://www.jhipster.tech/documentation-archive/v6.10.5](https://www.jhipster.tech/documentation-archive/v6.10.5).
 
 
-## Build and deploy
+### Build and deploy
 
-Documenttion to deploy your own instance is available [here](https://correctexam.readthedocs.io/en/latest/Install.html)
+Documentation to deploy your own instance is available [here](https://correctexam.readthedocs.io/en/latest/Install.html)
 
 
 
 ## Development
 
-To start your application in the dev profile, run: 
+### Install
+
+The back-end requires Minio to store the PDF files.
+An easy way to install and launch Minio on your computer is to use an official Docker image:
+
+```
+podman run -p 9000:9000 -d -p 9090:9090 -e "MINIO_ROOT_USER=admin" -e "MINIO_ROOT_PASSWORD=minioadmin" -v /media/data/miniofiles:/data:Z quay.io/minio/minio server /data --console-address ":9090"
+```
+
+The back-end also requires a database.
+On Linux you can install MariaDB.
+On Fedora, you can run:
+
+```
+sudo dnf install mariadb-server
+sudo systemctl enable mariadb
+sudo systemctl start mariadb
+sudo mysql_secure_installation
+
+sudo mysql -u root
+CREATE DATABASE gradeScopeIstic;
+```
+
+The first run of the back-end must initial and populate the DB with fake data. To do so, run:
+```
+./mvnw quarkus:dev -Dquarkus.liquibase.migrate-at-start=true
+```
+
+It creates two users `user:user` and `admin:admin`.
+After that you can launch the back-end classically `./mvnw`
 
-    ./mvnw
+
+### Run in development mode
+
+To start your application in the dev profile, run:
+
+```
+./mvnw
+```
 
 For further instructions on how to develop with JHipster, have a look at [Using JHipster in development][].
 
-## Building for production
+### Building for production
 
-### Packaging as thin jar
+#### Packaging as thin jar
 
 To build the final jar and optimize the correctExam application for production, run:
 
@@ -51,7 +91,7 @@ To ensure everything worked, run:
 
 Refer to [Using JHipster in production][] for more details.
 
-### Packaging as native executable
+#### Packaging as native executable
 
 _Targeting your Operation System_
 In order to build a native image locally, your need to have [GraalVM](https://www.graalvm.org/) installed and `GRAALVM_HOME` defined.
@@ -72,15 +112,15 @@ If you plan to run your application in a container, run:
 
 It will use a Docker container with GraalVM installed and produce an 64 bit Linux executable.
 
-## Testing
+### Testing
 
 To launch your application's tests, run:
 
     ./mvnw verify
 
 For more information, refer to the [Running tests page][].
 
-## Using Docker to simplify development (optional)
+### Using Docker to simplify development (optional)
 
 You can use Docker to improve your JHipster development experience. A number of docker-compose configuration are available in the [src/main/docker](src/main/docker) folder to launch required third party services.
 
@@ -103,66 +143,14 @@ To stop it and remove the container, run:
 
 
 
-update question set point = point * 4;
-
-update `student_response` set note = note * 4;
-ALTER TABLE `question` ADD `libelle` VARCHAR(255) NULL DEFAULT NULL AFTER `valid_expression`;
-ALTER TABLE `gradeScopeIstic`.`final_result` ADD UNIQUE `UniqueStudentIdAndExamId` (`student_id`, `exam_id`);
-
-
-create table answer_2_hybrid_graded_comment (id bigint not null auto_increment, step_value integer, hybridcomments_id bigint, student_response_id bigint, primary key (id)) engine=InnoDB;
-create table hybrid_graded_comment (id bigint not null auto_increment, description longtext, grade integer, relative bit, step integer, text varchar(255), question_id bigint, primary key (id)) engine=InnoDB;
-
-
-alter table final_result add column frozen bit;
-alter table question add column defaultpoint integer;
-alter table answer_2_hybrid_graded_comment add constraint FK9ijm3itpjwpgf534m94df8dt6 foreign key (hybridcomments_id) references hybrid_graded_comment (id);
-alter table answer_2_hybrid_graded_comment add constraint FKqxflsw40s622dtyt99himou2k foreign key (student_response_id) references student_response (id);
-alter table hybrid_graded_comment add constraint FKrrl2y7dngtnqlklwt0scsy8jq foreign key (question_id) references question (id);
-
-ALTER TABLE `gradeScopeIstic`.`answer_2_hybrid_graded_comment` ADD UNIQUE `UniqueHybridcommentsIdAndStudentResponseId` (`student_response_id`, `hybridcomments_id`);
-
-ALTER TABLE `student_response` ADD UNIQUE(`question_id`, `sheet_id`);
-
-
-alter table student_response add column lastmodified datetime(6);
-alter table student_response add column correctedby_id bigint;
-alter table student_response add constraint FKinrpshecm7c6aiqo6000ju87c foreign key (correctedby_id) references jhi_user (id);
-
-alter table question add column randomhorizontalcorrection bit default 0;
-
-
-
-[x] unique constraint for answer_2_hybrid_graded_comment
-[x] delete correctly when removing exam or course
-[x] Import Export with HybridComment
-[x] Test import and export
-[x] check delete
-[x] Export PDF with HybridComment
-
-[x] update question or hybridComment => recompute score4 linked StudentResponse
-[x] test update question or hybridComment => recompute score4 linked StudentResponse
-[x] update maximal step from 5 to 12. 
-[x] Allow direct grading when clicking to star
-[x] Update view copie4student
-[x] update show all with this hybridComment
-[x] update apply to all the same grade
-
-
-
- SELECT resp.id FROM `student_response` as resp WHERE EXISTS( SELECT * FROM `student_response` as resp2 WHERE resp.id <> resp2.id and resp.question_id = resp2.question_id and resp.sheet_id = resp2.sheet_id);
-
-select * from student_response_textcomments as st3 where st3.student_response_id IN(
- SELECT resp.id FROM `student_response` as resp WHERE EXISTS( SELECT * FROM `student_response` as resp2 WHERE resp.id <> resp2.id and resp.question_id = resp2.question_id and resp.sheet_id = resp2.sheet_id));
-
+-- upgrade database script
 
 
-DELETE from answer_2_hybrid_graded_comment as an where an.student_response_id IN(
- SELECT resp.id FROM `student_response` as resp WHERE EXISTS( SELECT * FROM `student_response` as resp2 WHERE resp.id <> resp2.id and resp.question_id = resp2.question_id and resp.sheet_id = resp2.sheet_id));
+create table prediction (id bigint not null auto_increment, json_data tinytext, confidence float(53), question_number varchar(255), text varchar(2048), question_id bigint, sheet_id bigint, primary key (id));
+alter table template add column casename bit DEFAULT 1;
+alter table course add column archived bit not null DEFAULT 0;
 
-select an.* from answer_2_hybrid_graded_comment as an where an.student_response_id IN(SELECT resp.id FROM `student_response` as resp WHERE EXISTS( SELECT * FROM `student_response` as resp2 WHERE resp.id <> resp2.id and resp.question_id = resp2.question_id and resp.sheet_id = resp2.sheet_id));
 
-delete an.* from answer_2_hybrid_graded_comment as an where an.student_response_id IN(
- SELECT resp.id FROM `student_response` as resp WHERE EXISTS( SELECT * FROM `student_response` as resp2 WHERE resp.id <> resp2.id and resp.question_id = resp2.question_id and resp.sheet_id = resp2.sheet_id));
+alter table prediction add constraint FK1xsmwx00gk7213kwfeah9lcjx foreign key (question_id) references question (id);
+alter table prediction add constraint FK8nv2hkm3mhxll6be9mwj5402t foreign key (sheet_id) references exam_sheet (id);
 
- DELETE FROM `student_response` WHERE id in (53044,53045,53046,53047,53050,53051,53052,53053,53054,53055,53056,53057,53058,53059,53061,53062,53063,53064,53065,53066,53067,53068,53106,53107,53108,53109,53110,53111,53112,53113,53114,53115,53117,53118,53119,53120,53121,53122,53124,53125,53126,53127,53128,53129,53130,53131,53133,53134,53135,53136,53184,53185,53240,53241,53242,53243,53244,53245,53248,53249,53250,53251);

pom.xml

@@ -57,8 +57,6 @@
     </dependencyManagement>
     <dependencies>
 
-
-
        <dependency>
             <groupId>org.apache.pdfbox</groupId>
             <artifactId>pdfbox</artifactId>

src/main/docker/app.yml

@@ -23,6 +23,18 @@ services:
       file: mysql.yml
       service:  correctexam-mysql
 
+#To activate to setup rag
+
+#  correctexam-es:
+#    extends:
+#      file: es.yml
+#      service: correctexam-es
+
+#  correctexam-kibana:
+#    extends:
+#      file: es.yml
+#      service: correctexam-kibana
+
   front:
     image: barais/correctexam-front
     build:
@@ -67,3 +79,8 @@ services:
     volumes:
       -  ./exampleconf/smtprelay.ini:/app/smtprelay.ini:ro
       -  ./tmp:/tmp:rw
+
+# To activate to setup rag
+
+#networks:
+#  elastic:

src/main/docker/es.yml

@@ -0,0 +1,35 @@
+version: '1'
+services:
+  correctexam-es:
+    image: elasticsearch:8.8.0
+    ports:
+      - 9200:9200
+      - 9300:9300
+    networks:
+      - elastic
+    environment:
+      - discovery.type=single-node
+      - xpack.security.enabled=false
+      - "ES_JAVA_OPTS=-Xms512m -Xmx2048m"
+      - cluster.routing.allocation.disk.threshold_enabled=false
+    deploy:    
+      resources:
+          limits:
+            cpus: '2.0'
+          reservations:
+            cpus: '1.0'
+  correctexam-kibana:
+    image: docker.elastic.co/kibana/kibana:8.7.1
+    container_name: kibana
+    environment:
+      XPACK_ENCRYPTEDSAVEDOBJECTS_ENCRYPTIONKEY: d1a66dfd-c4d3-4a0a-8290-2abcb83ab3aa
+    ports:
+      - 5601:5601
+    networks:
+      - elastic
+    deploy:    
+      resources:
+          limits:
+            cpus: '2.0'
+          reservations:
+            cpus: '1.0'

src/main/docker/k8s/correctexam-mysql-claim0-persistentvolumeclaim.yaml

@@ -344,7 +344,8 @@ data:
 
     INSERT INTO `question_type` (`id`, `algo_name`, `endpoint`, `js_function`) VALUES
     (2, 'manual', '', ''),
-    (3, 'QCM', NULL, NULL);
+    (3, 'QCM', NULL, NULL),
+    (4, 'manuscrit', '', '');
 
     -- --------------------------------------------------------
 

src/main/java/fr/istic/domain/Course.java

@@ -34,6 +34,11 @@ public class Course extends PanacheEntityBase implements Serializable {
     @Column(name = "name", nullable = false)
     public String name;
 
+    @NotNull
+    @Column(name = "archived", nullable = false)
+    public Boolean archived = false;
+
+
     @OneToMany(mappedBy = "course", cascade = CascadeType.REMOVE, fetch = FetchType.LAZY)
     @Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
     public Set<Exam> exams = new HashSet<>();
@@ -92,6 +97,7 @@ public static Course update(Course course) {
         var entity = Course.<Course>findById(course.id);
         if (entity != null) {
             entity.name = course.name;
+            entity.archived = course.archived;
             entity.exams = course.exams;
             entity.groups = course.groups;
             entity.profs = course.profs;

src/main/java/fr/istic/domain/Exam.java

@@ -3,8 +3,6 @@
 import jakarta.json.bind.annotation.JsonbTransient;
 import io.quarkus.hibernate.orm.panache.PanacheQuery;
 import io.quarkus.runtime.annotations.RegisterForReflection;
-import org.hibernate.annotations.Cache;
-import org.hibernate.annotations.CacheConcurrencyStrategy;
 
 import jakarta.persistence.*;
 import jakarta.transaction.Transactional;
@@ -33,6 +31,8 @@ public class Exam extends PanacheEntityBase implements Serializable {
     @Column(name = "name", nullable = false)
     public String name;
 
+
+
     @OneToOne(cascade = CascadeType.REMOVE)
     @JoinColumn(unique = true)
     public Template template;

src/main/java/fr/istic/domain/ExamSheet.java

@@ -49,6 +49,11 @@ public class ExamSheet extends PanacheEntityBase implements Serializable {
     @JsonbTransient
     public Set<Student> students = new HashSet<>();
 
+
+    @OneToMany(mappedBy = "sheet")
+    @JsonbTransient
+    public Set<Prediction> predictions ;
+
     // jhipster-needle-entity-add-field - JHipster will add fields here, do not remove
 
     @Override