Completed admin views

Corrected model method return values

ref-test/app/models/entry.py

@@ -4,7 +4,6 @@ from ..tools.encryption import decrypt, encrypt
 from ..tools.logs import write
 from .test import Test
 
-from flask import jsonify
 from flask_login import current_user
 
 from datetime import datetime, timedelta
@@ -79,7 +78,7 @@ class Entry(db.Model):
         write('tests.log', f'Test completed by {self.get_first_name()} {self.get_surname()}.')
         delta = timedelta(minutes=self.test.time_limit+1)
         if not self.test.time_limit or self.end_time <= self.start_time + delta:
-            self.status = 'finished'
+            self.status = 'completed'
             self.valid = True
         else:
             self.status = 'late'
@@ -87,10 +86,18 @@ class Entry(db.Model):
         db.session.commit()
 
     def validate(self):
-        if self.valid: return False, jsonify({'error':f'The entry is already valid.'})
-        if self.status == 'started': return False, jsonify({'error':f'The entry is still pending.'})
+        if self.valid: return False, f'The entry is already valid.'
+        if self.status == 'started': return False, 'The entry is still pending.'
         self.valid = True
         self.status = 'completed'
         db.session.commit()
-        message = f'The entry {self.id} has been validated by {current_user.get_username()}.'
-        return True, jsonify({'success': message})
+        write('system.log', f'The entry {self.id} has been validated by {current_user.get_username()}.')
+        return True, f'The entry {self.id} has been validated.'
+
+    def delete(self):
+        id = self.id
+        name = f'{self.get_first_name()} {self.get_surname()}'
+        db.session.delete(self)
+        db.session.commit()
+        write('system.log', f'The entry {id} by {name} has been deleted by {current_user.get_username()}.')
+        return True, 'Entry deleted.'