Move the retrieve of the template zones in a dedicated function

module.py

@@ -1497,36 +1497,7 @@ def submission_tenprint( id, tid ):
     
     ############################################################################
     
-    sql = """
-        SELECT
-            tenprint_zones.pc, tl_x, tl_y, br_x, br_y, angle, pc.name
-        FROM tenprint_zones
-        JOIN tenprint_zones_location ON tenprint_zones.pc = tenprint_zones_location.pc
-        JOIN pc ON tenprint_zones.pc = pc.id
-        WHERE
-            card = %s AND
-            tenprint_zones_location.side = %s
-        ORDER BY pc
-    """
-    r = config.db.query( sql, ( file[ 'template' ], t, ) ).fetchall()
-    
-    zones = []
-    for pc, tl_x, tl_y, br_x, br_y, angle, pc_name in r:
-        tl_x = float_or_null( tl_x )
-        tl_y = float_or_null( tl_y )
-        br_x = float_or_null( br_x )
-        br_y = float_or_null( br_y )
-        
-        zones.append( {
-            "pc": pc,
-            "tl_x": tl_x,
-            "tl_y": tl_y,
-            "br_x": br_x,
-            "br_y": br_y,
-            "angle": angle,
-            "pc_name": pc_name
-        } )
-    
+    zones = get_tenprint_template_zones( file[ 'template' ], t )
     datacolumns = [ 'tl_x', 'tl_y', 'br_x', 'br_y', 'angle' ]
     
     ############################################################################
@@ -1597,6 +1568,39 @@ def submission_file_set_note( id, t, file ):
 ################################################################################
 #    Tenprint templates
 
+def get_tenprint_template_zones( id, t ):
+    sql = """
+        SELECT
+            tenprint_zones.pc, tl_x, tl_y, br_x, br_y, angle, pc.name
+        FROM tenprint_zones
+        JOIN tenprint_zones_location ON tenprint_zones.pc = tenprint_zones_location.pc
+        JOIN pc ON tenprint_zones.pc = pc.id
+        WHERE
+            card = %s AND
+            tenprint_zones_location.side = %s
+        ORDER BY pc
+    """
+    r = config.db.query( sql, ( id, t, ) ).fetchall()
+    
+    zones = []
+    for pc, tl_x, tl_y, br_x, br_y, angle, pc_name in r:
+        tl_x = float_or_null( tl_x )
+        tl_y = float_or_null( tl_y )
+        br_x = float_or_null( br_x )
+        br_y = float_or_null( br_y )
+        
+        zones.append( {
+            "pc": pc,
+            "tl_x": tl_x,
+            "tl_y": tl_y,
+            "br_x": br_x,
+            "br_y": br_y,
+            "angle": angle,
+            "pc_name": pc_name
+        } )
+    
+    return zones
+
 @app.route( baseurl + '/tenprint_template/<id>/<t>' )
 @login_required
 def tp_template( id, t ):