Remise en forme du rapport

core/validation.py

@@ -93,7 +93,7 @@ class BaseValidator():
             pass
         validator.dt = time.time() - t0
         
-        report = validator.build_report("{} - Validation de {}".format(validator.schema_name, folder.name))
+        report = validator.build_report(validator.schema_name, folder.name)
         return report
     
     def validate(self, folder):
@@ -132,9 +132,10 @@ class BaseValidator():
     def _technical_validation(cls):
         raise NotImplementedError()
     
-    def build_report(self, title):
+    def build_report(self, schema, filename):
         report = {}
-        report["title"] = title
+        report["schema"] = schema
+        report["filename"] = filename
         report["exec_time"] = "{} s.".format(self.dt)
         report["checkpoints"] = [{"name": chk.name, "valid": chk.valid} for chk in self.checkpoints]
         

templates/report.html

@@ -17,10 +17,22 @@
 		<a id="logo" href="\" title="Retour à l'accueil">
 			<img src="{{ url_for('static', filename='mn_logo_mini.png') }}" />
 		</a>
-		<h1>{{ report['title'] }}</h1>
+		<h1>Rapport de contrôle</h1>
 	</header>
 	
 	<section id=main>
+		
+		<table style="text-align: left;">
+			<tr>
+				<th style="width: 150px;">Schéma</th>
+				<td>{{ report['schema'] }}</td>
+			</tr>
+			<tr>
+				<th>Fichier contrôlé</th>
+				<td>{{ report['filename'] }}</td>
+			</tr>
+		</table>
+		
 		<h3>Check-Points</h3>
 		<ul>
 	    {% for chk in report['checkpoints'] %}
@@ -40,11 +52,9 @@
 	       	<thead>
 	       		<tr>
 		       		<th>Erreur</th>
-		       		<th>Criticité</th>
 		       		<th>Fichier</th>
 		       		<th>Champs</th>
 		       		<th>Description</th>
-		       		<th>Aide</th>
 	       		</tr>
 	       	</thead>
 	       	<tbody>
@@ -52,13 +62,9 @@
 	      			{% for err in report['errors'][typeerr]['list'] %}
 		      			<tr>
 			      			<td>{{ typeerr }}</td>
-			       			<td></td>
 			       			<td>{{ err['filename'] }}</td>
 			       			<td>{{ err['field'] }}</td>
 			       			<td>{{ err['message'] }}</td>
-			       			<td>
-			       				<i class="fa fa-question-circle" style="color: blue" "title="{{ report['errors'][typeerr]['help'] }}"></i>
-			       			</td>
 		      			</tr>
 		      		{% endfor %}
 	      		{% endfor %}