Add new VSL app with initial models and admin configuration.

Created VslDest model with fields for ID, name, creation date, and update date.
Added VslConfig to settings.py.
Configured admin interface for VslDest.
Initialized migrations for VslDest model.
Included basic test and view files for future development.

.gitea/workflows/docker_builder_latest.yaml

@@ -9,7 +9,7 @@ on:
 jobs:
   build:
     if: github.actor != 'github-actions[bot]'
-    runs-on: self-hosted
+    #runs-on: self-hosted
     container:
       image: alpine:latest
     steps:

Reskreen/settings.py

@@ -52,6 +52,7 @@ INSTALLED_APPS = [
     'studenteval.apps.StudentevalConfig',
     'comm_op.apps.CommOpConfig',
     'custom_admin.apps.CustomAdminConfig',
+    'vsl.apps.VslConfig',
     'rangefilter',
     'django.contrib.admin',
     'carnet_rouge.apps.CarnetRougeConfig',

VERSION

@@ -1 +1 @@
-v3.1.67
+v3.1.69

config/my_dev.cnf

@@ -3,5 +3,5 @@ database = 	django_prod
 user = 	django_usr
 password = YwVHV36ovBTXWugb
 default-character-set = utf8
-host =33.15.0.2
+host =33.15.0.1
 port =3306

docker-compose.yml

@@ -67,11 +67,7 @@ networks:
     external: true
 volumes:
   reskreen-data:
-    driver: local
-    driver_opts:
-      device: /home/prod/Reskreen
-      o: bind
-      type: none
+   
 configs:
   env-reskreen-frontend:
     external: true

studenteval/models.py

@@ -119,12 +119,18 @@ class cl_Student_eval(models.Model):
             if eval.ID == self.ID:
                 to_be_set = True
             else:
-                #print(f"check eval {eval} {eval.nEval_Type} ({eval.nEval_Type == 1}) ? {eval.sRef} ==  {self.sRef} => {eval.sRef == self.sRef} {self}")
+                print("check eval")
+                print(eval)
+                print(self)
+                
                 if eval.nEval_Type == "1" and eval.sRef == self.sRef:
-                    print(f"Eval mirror found {eval} / {self}")
+                    print(f"Eval mirror found type 1 {eval} / {self}")
                     to_be_set = True
-                elif eval.nEval_Type == "2" and eval.dtDate == self.dtDate:
-                    print(f"Eval mirror found {eval} / {self}")
+                elif eval.nEval_Type == "2" and eval.sRef == self.sRef:
+                    print(f"Eval mirror found type 2 {eval} / {self}")
+                    to_be_set = True
+                if eval.nEval_Type == "3" and eval.sRef == self.sRef:
+                    print(f"Eval mirror found type 3 {eval} / {self}")
                     to_be_set = True
 
             if to_be_set:
@@ -137,7 +143,7 @@ class cl_Student_eval(models.Model):
 
         if self.o_Encadrant_eval is not None and self.o_Auto_eval is not None:
             self.mirrored = True
-        #print(f" auto = {self.o_Auto_eval} / encadrant = {self.o_Encadrant_eval}")
+            print(f" auto = {self.o_Auto_eval} / encadrant = {self.o_Encadrant_eval}")
 
 
     def get_all_evals_for_student(self,sStudent=None):

studenteval/templates/studenteval/cl_student_eval.html

@@ -103,14 +103,14 @@
                 <table class="w-full">
                     <tbody>
                         <tr class="border-b">
-                            <th class="py-2 px-4 text-left font-semibold">Avis Global</th>
+                            <th class="py-2 px-4 text-left font-semibold">Avis Global {{object.o_Encadrant_eval.ID}}</th>
 
                         </tr>
                         <tr class="border-b">
                             <td class="py-2 px-4">{{ object.o_Encadrant_eval.sDesc_global | safe }}</td>
                         </tr>
                         <tr class="border-b">
-                            <th class="py-2 px-4 text-left font-semibold">Avis Global (auto)</th>
+                            <th class="py-2 px-4 text-left font-semibold">Avis Global (auto) {{object.o_Auto_eval.ID}}</th>
 
                         </tr>
                         <tr class="border-b">

vsl/admin.py

@@ -0,0 +1,11 @@
+from django.contrib import admin
+from vsl.models import VslDest
+
+
+@admin.register(VslDest)
+class vsl_destAdmin(admin.ModelAdmin):
+    list_display = ('id', 'name')
+
+    ordering = ('id',)
+    list_per_page = 100
+    search_fields = ('name',)

vsl/apps.py

@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class VslConfig(AppConfig):
+    default_auto_field = 'django.db.models.BigAutoField'
+    name = 'vsl'

vsl/migrations/0001_initial.py

@@ -0,0 +1,23 @@
+# Generated by Django 5.0.10 on 2025-06-04 16:48
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='VslDest',
+            fields=[
+                ('id', models.AutoField(primary_key=True, serialize=False, verbose_name='ID du Suivi')),
+                ('name', models.CharField(max_length=255, verbose_name='Dénomination')),
+                ('date_creation', models.DateTimeField(auto_now_add=True, verbose_name='Date de création')),
+                ('date_modification', models.DateTimeField(auto_now=True, verbose_name='Date de modification')),
+            ],
+        ),
+    ]

vsl/migrations/0002_rename_date_creation_vsldest_dtcreate_and_more.py

@@ -0,0 +1,23 @@
+# Generated by Django 5.0.10 on 2025-06-04 16:49
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('vsl', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='vsldest',
+            old_name='date_creation',
+            new_name='dtCreate',
+        ),
+        migrations.RenameField(
+            model_name='vsldest',
+            old_name='date_modification',
+            new_name='dtUpdate',
+        ),
+    ]

vsl/migrations/0003_rename_name_vsldest_dest.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.0.10 on 2025-06-04 16:50
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('vsl', '0002_rename_date_creation_vsldest_dtcreate_and_more'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='vsldest',
+            old_name='name',
+            new_name='dest',
+        ),
+    ]

vsl/migrations/0004_rename_dest_vsldest_name.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.0.10 on 2025-06-04 16:51
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('vsl', '0003_rename_name_vsldest_dest'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='vsldest',
+            old_name='dest',
+            new_name='name',
+        ),
+    ]

vsl/models.py

@@ -0,0 +1,22 @@
+from django.db import models
+
+
+class VslDest(models.Model):
+    # ID auto-incrémenté par défaut
+    id = models.AutoField("ID du Suivi", primary_key=True)
+
+    # Champ de chaîne de caractères avec une longueur maximale de 255 caractères
+    name = models.CharField("Dénomination", max_length=255)
+
+    # Champ pour la date de création, automatiquement défini à la création
+    dtCreate = models.DateTimeField("Date de création", auto_now_add=True)
+
+    # Champ pour la date de modification, automatiquement mis à jour à chaque modification
+    dtUpdate = models.DateTimeField("Date de modification", auto_now=True)
+
+    def __str__(self):
+        return self.name
+    class Meta:
+        verbose_name = "Destination VSL"
+        verbose_name_plural = "Destinations VSL"
+        ordering = ["id"]

vsl/tests.py

@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.

vsl/views.py

@@ -0,0 +1,3 @@
+from django.shortcuts import render
+
+# Create your views here.