experiment

test_tube_scanner/scanner/admin.py

@@ -30,7 +30,7 @@ class ConfigurationAdmin(admin.ModelAdmin):
             "classes": ("collapse",),
         }),
         (_("Calibration / Balayage"), {
-            "fields": ("calibration_crop_radius", "calibration_default_multiwell", "calibration_default_feed", "calibration_default_step", "calibration_default_duration"),
+            "fields": ("tube_axis", "calibration_crop_radius", "calibration_default_multiwell", "calibration_default_feed", "calibration_default_step", "calibration_default_duration"),
             "classes": ("collapse",),
         }),
         (_("Tracking: valeurs par défaut"), {
@@ -101,7 +101,7 @@ class SessionExperimentInlineAdmin(admin.TabularInline):
 class SessionAdmin(admin.ModelAdmin):
     list_filter = ('author',)
     inlines = (SessionExperimentInlineAdmin, )
-    list_display = ('name', 'author', 'created', 'finished', 'active', 'expected_export', 'expected_scanning', )
+    list_display = ('name', 'id', 'author', 'created', 'finished', 'active', 'expected_export', 'expected_scanning', )
     readonly_fields = (
         'created', 
         'finished',

test_tube_scanner/scanner/models.py

@@ -35,7 +35,7 @@ VIDEO_TYPE = [
 CAPTURE_TYPE = [
     ('rpi', _("Arducam")),
     ('webcam', _("Webcam")),
-    ('file', _("mp4")),
+    ('file', _("Fichier vidéo (mp4, avi)")),
 ]
 
 TUBE_AXIS_TYPE = [
@@ -250,7 +250,7 @@ class Experiment(models.Model):
     
     
     def save(self, *args, **kwargs):
-        self.identifier = slugify(f'{self.created.isoformat()[:19]}-{self.id}-{self.multiwell.position}')
+        self.identifier = f'{self.id}-{self.multiwell.position}_{self.created.isoformat()[:19]}'
         super().save(*args, **kwargs)
 
 
@@ -265,7 +265,7 @@ class Experiment(models.Model):
         verbose_name_plural = _("Expériences")
 
     def __str__(self):
-        return f'{self.id}:{self.title}-{self.created}'
+        return f'{self.identifier}'
 
 
 class Session(models.Model):

test_tube_scanner/scanner/templates/scanner/base.html

@@ -11,12 +11,11 @@
         <a href="#" class="w3-bar-item w3-mobile w3-btn w3-hover-opacity w3-right w3-xlarge w3-text-green" onclick="goFullscreen()" title="{% trans 'Ecran plein' %}">
             <i class="fa-solid fa-maximize"></i>
         </a>
-        {% if request.user.is_superuser %}
-		<div class="w3-dropdown-hover w3-right">	    
-		    <button class="w3-button w3-dark-plus">&#9776;&nbsp;<span>{% trans "Administrations" %}</span></button>
-		    <div class="w3-dropdown-content w3-bar-block w3-border w3-dark-low"  style="right:.25em;">
-			        <hr class="w3-bar-item divider w3-grey">
 
+		<div class="w3-dropdown-hover w3-right">	    
+		    <button class="w3-button w3-dark-plus">&#9776;&nbsp;<span>{{ request.user.username }}</span></button>
+		    <div class="w3-dropdown-content w3-bar-block w3-border w3-dark-low"  style="right:.25em;">
+                {% if request.user.is_superuser %}
 	                <a href="{% url 'scanner:admin' %}"  class="w3-bar-item w3-btn w3-hover-opacity" title="{% trans "Accès django" %}">
 	                    <i class="fa-solid fa-gear w3-text-pink"></i> {% trans "Base de données" %}
 	                </a>
@@ -37,7 +36,7 @@
 	                <a href="{% url 'scanner:logs_worker' %}"  class="w3-bar-item w3-btn w3-hover-opacity" target="_blank">
 	                     <i class="fa-regular fa-file-lines w3-text-amber"></i> {% trans "Logs des services" %}
 	                </a>    		        
-
+                {% endif %}      
 		        <hr class="w3-bar-item divider w3-grey">
 		        <form method="post" action="{% url 'logout' %}">
 		            {% csrf_token %}
@@ -47,22 +46,16 @@
 		        </form>
 		    </div>
          </div>
-         {% endif %}        
+
     </div>
 {% endblock  %}
 {% block sidebar %}
 	<div class="w3-dark-xlight w3-border-bottom">
 	    <div class="w3-large w3-bold">
 	       <a href="/" class="w3-btn w3-hover-opacity w100 w3-left-align">{{ app_title }}<br>
-	       <span class="w3-tiny">{{ app_sub_title }}</span>
+	           <span class="w3-tiny">{{ app_sub_title }}</span>
 	       </a>
 	    </div>
-	    <form method="post" action="{% url 'logout' %}" class="w3-padding-small">
-	        {% csrf_token %}
-	        <button class="w3-bar-item w3-btn w3-hover-opacity" type="submit" title="{% trans 'Déconnexion' %}">
-	           {{ request.user.username }}<i class="fa-solid fa-right-from-bracket w3-right"></i>
-	        </button>
-	    </form>
 	</div>
 	{% block system %}
 	<div class="w3-light-blue w3-padding-large">
@@ -124,7 +117,8 @@
             {% endif %}   
             <a href="{% url 'scanner:scanning' %}"  class="w3-bar-item w3-btn w3-hover-opacity">
                 <i class="fa-solid fa-film w3-text-green w3-xlarge""></i> {% trans "Balayage multi-puits" %}
-            </a>             
+            </a>
+            <div class="w3-bar-item w3-dark-xxlight">{% trans "Résultats " %}</div>
             <a href="{% url 'scanner:images' %}"  class="w3-bar-item w3-btn w3-hover-opacity">
                  <i class="fa-regular fa-images w3-text-cyan w3-xlarge" w3-xlarge""></i> {% trans "Gestionnaire d'images" %}
             </a>
@@ -142,7 +136,7 @@
     <script>
     const stats_endpoint =  "{% url 'scanner:api_stats' %}";
     </script>
-    <script src="/static/scanner/js/stats.js"></script>
+    <!--script src="/static/scanner/js/stats.js"></script-->
 {% endblock %}
 
 

test_tube_scanner/scanner/templatetags/scanner_tags.py

@@ -10,7 +10,7 @@ def multiwell_cards(sid, experiment):
     row_def = experiment.multiwell.row_def.split(',')
     multiwells.append(
     f'''
-    <div class="w3-center w3-sand">{experiment.title}</div>
+    <div class="w3-padding-small w3-sand">{experiment.title}</div>
     <div class="w3-border multiwell_cards">
     ''')
     for row in range(experiment.multiwell.rows):