Merge pull request #121 from Nathan-Etave/feat/administration

PR: Merge de feat/administration dans dev

Author: etave

app/administration/routes.py

@@ -16,7 +16,7 @@
 from app.models.utilisateur import UTILISATEUR
 from app.models.a_acces import A_ACCES
 from app.models.role import ROLE
-from app.utils import Whoosh
+from app.utils import Whoosh, check_notitications
 from fasteners import InterProcessLock
 
 
@@ -37,6 +37,7 @@ def administration():
         roles=all_roles,
         is_admin=True,
         is_authenticated=True,
+        has_notifications=check_notitications(),
     )
 
 
@@ -209,7 +210,7 @@ def create_folder(data):
         db.session.commit()
     except Exception as e:
         db.session.rollback()
-        socketio.emit('folder_creation_failed', {'error': str(e)}, namespace='/administration')
+        socketio.emit('folder_not_created', {'error': str(e)}, namespace='/administration')
         return
     try:
         db.session.execute(A_ACCES.insert().values(id_Role=1, id_Dossier=folder.id_Dossier))
@@ -220,7 +221,7 @@ def create_folder(data):
         db.session.rollback()
         db.session.delete(folder)
         db.session.commit()
-        socketio.emit('folder_creation_failed', {'error': str(e)}, namespace='/administration')
+        socketio.emit('folder_not_created', {'error': str(e)}, namespace='/administration')
         return
     try:
         if parent_folder_id != 0:
@@ -233,6 +234,47 @@ def create_folder(data):
             db.session.execute(A_ACCES.delete().where(A_ACCES.c.id_Role == role).where(A_ACCES.c.id_Dossier == folder.id_Dossier))
         db.session.delete(folder)
         db.session.commit()
-        socketio.emit('folder_creation_failed', {'error': str(e)}, namespace='/administration')
+        socketio.emit('folder_not_created', {'error': str(e)}, namespace='/administration')
         return
-    socketio.emit('folder_created', {'folderId': folder.id_Dossier, 'folderName': folder_name, 'folderColor': folder.couleur_Dossier, 'parentFolderId': parent_folder_id}, namespace='/administration')
+    socketio.emit('folder_created', {'folderId': folder.id_Dossier, 'folderName': folder_name, 'folderColor': folder.couleur_Dossier, 'parentFolderId': parent_folder_id}, namespace='/administration')
+
+@socketio.on('modify_folder', namespace='/administration')
+def modify_folder(data):
+    folder_id = data.get('folderId')
+    folder_name = data.get('folderName')
+    parent_folder_id = data.get('parentFolderId')
+    folder_roles = data.get('folderRoles')
+    folder_color = data.get('folderColor')
+    folder = DOSSIER.query.get(folder_id)
+    folder.nom_Dossier = folder_name
+    folder.couleur_Dossier = folder_color
+    try:
+        if parent_folder_id != 0:
+            db.session.execute(SOUS_DOSSIER.delete().where(SOUS_DOSSIER.c.id_Dossier_Enfant == folder_id))
+            db.session.execute(SOUS_DOSSIER.insert().values(id_Dossier_Parent=parent_folder_id, id_Dossier_Enfant=folder_id))
+            db.session.commit()
+        else:
+            db.session.execute(SOUS_DOSSIER.delete().where(SOUS_DOSSIER.c.id_Dossier_Enfant == folder_id))
+            db.session.commit()
+    except Exception as e:
+        db.session.rollback()
+        socketio.emit('folder_not_modified', {'error': str(e)}, namespace='/administration')
+        return
+    try:
+        db.session.execute(A_ACCES.delete().where(A_ACCES.c.id_Dossier == folder_id))
+        db.session.commit()
+    except Exception as e:
+        db.session.rollback()
+        socketio.emit('folder_not_modified', {'error': str(e)}, namespace='/administration')
+        return
+    try:
+        db.session.execute(A_ACCES.insert().values(id_Role=1, id_Dossier=folder_id))
+        for role in folder_roles:
+            db.session.execute(A_ACCES.insert().values(id_Role=role, id_Dossier=folder_id))
+        db.session.commit()
+    except Exception as e:
+        db.session.rollback()
+        socketio.emit('folder_not_modified', {'error': str(e)}, namespace='/administration')
+        return
+    db.session.commit()
+    socketio.emit('folder_modified', {'folderId': folder_id, 'folderName': folder_name, 'folderColor': folder_color}, namespace='/administration')

app/decorators.py

@@ -5,7 +5,7 @@
 def admin_required(f):
     @wraps(f)
     def decorated_function(*args, **kwargs):
-        if not current_user.id_Role == 1:
+        if not current_user.is_admin():
             abort(403)
         return f(*args, **kwargs)
     return decorated_function

app/desktop/routes.py

@@ -4,8 +4,9 @@
 from app import socketio
 from app.extensions import db
 from app.models.fichier import FICHIER
+from app.utils import check_notitications
 
 @bp.route('/')
 @login_required
 def desktop():
-    return render_template('desktop/index.html', is_authenticated=True, is_admin=current_user.id_Role == 1, has_notifications=current_user.NOTIFICATION != [])
+    return render_template('desktop/index.html', is_authenticated=True, is_admin=current_user.is_admin(), has_notifications=check_notitications())

app/home/routes.py

@@ -7,6 +7,7 @@
 from app.models.a_recherche import A_RECHERCHE
 from app.forms.search_form import SearchForm
 from datetime import datetime
+from app.utils import check_notitications
 
 
 @bp.route("/", methods=["GET", "POST"])
@@ -33,8 +34,8 @@ def home():
     return render_template(
         "home/index.html",
         is_authenticated=True,
-        is_admin=current_user.id_Role == 1,
-        has_notifications=current_user.NOTIFICATION != [],
+        is_admin=current_user.is_admin(),
+        has_notifications=check_notitications(),
         favorite_files=favorite_files,
         researches=researches,
         form=form,

app/models/utilisateur.py

@@ -25,6 +25,9 @@ def get_id(self):
 
     def to_dict(self):
         return {c.name: getattr(self, c.name) for c in self.__table__.columns}
+    
+    def is_admin(self):
+        return self.id_Role == 1
 
     FICHIER_: Mapped[List['FICHIER']] = relationship('FICHIER', secondary='FAVORIS', back_populates='UTILISATEUR_')
     ROLE_: Mapped[Optional['ROLE']] = relationship('ROLE', back_populates='UTILISATEUR')

app/notifications/routes.py

@@ -18,6 +18,7 @@
 from app.models.notification import NOTIFICATION
 from app.models.utilisateur import UTILISATEUR
 from app.models.role import ROLE
+from app.utils import check_notitications
 
 
 @bp.route("/", methods=["GET"])
@@ -36,7 +37,7 @@ def notifications():
         roles=roles,
         is_authenticated=True,
         is_admin=True,
-        has_notifications=current_user.NOTIFICATION != [],
+        has_notifications=check_notitications(),
     )
 
 

app/profil/routes.py

@@ -7,6 +7,7 @@
 from app.forms.edit_profil_form import Edit_profil_form
 from flask_bcrypt import check_password_hash, generate_password_hash
 from app.models.utilisateur import UTILISATEUR
+from app.utils import check_notitications
 
 
 @bp.route("/", methods=["GET", "POST"])
@@ -20,8 +21,8 @@ def profil():
     return render_template(
         "profil/index.html",
         is_authenticated=True,
-        is_admin=current_user.id_Role == 1,
-        has_notifications=current_user.NOTIFICATION != [],
+        is_admin=current_user.is_admin(),
+        has_notifications=check_notitications(),
         user=current_user,
         edit_mode=False,
     )
@@ -59,8 +60,8 @@ def edit():
     return render_template(
         "profil/index.html",
         is_authenticated=True,
-        is_admin=current_user.id_Role == 1,
-        has_notifications=current_user.NOTIFICATION != [],
+        is_admin=current_user.is_admin(),
+        has_notifications=check_notitications(),
         user=current_user,
         form=form,
         edit_mode=True,

app/search/routes.py

@@ -8,6 +8,7 @@
 from app.forms.search_form import SearchForm
 from app import socketio
 from fasteners import InterProcessLock
+from app.utils import check_notitications
 
 
 @bp.route("/", methods=["GET", "POST"])
@@ -27,8 +28,8 @@ def search():
     return render_template(
         "search/index.html",
         is_authenticated=True,
-        is_admin=current_user.id_Role == 1,
-        has_notifications=current_user.NOTIFICATION != [],
+        is_admin=current_user.is_admin(),
+        has_notifications=check_notitications(),
         folders=results,
         query=query,
         form=form,

app/static/js/administration.js

@@ -252,22 +252,57 @@ document.addEventListener('DOMContentLoaded', function () {
         });
     });
 
-    const modalParentFolder = document.querySelector('#parentFolder');
+    const modalParentFolders = document.querySelectorAll('#parentFolder');
+    const modalExistingFolders = document.querySelector('#existingFolder');
     folders.forEach((folder) => {
-        modalParentFolder.innerHTML += `<option value="${folder.dataset.folder}">${folder.dataset.name}</option>`;
+        modalParentFolders.forEach((select) => {
+            select.innerHTML += `<option value="${folder.dataset.folder}">${folder.dataset.name}</option>`;
+        });
+        modalExistingFolders.innerHTML += `<option value="${folder.dataset.folder}">${folder.dataset.name}</option>`;
+    });
+
+    const modifyFolderModal = document.querySelector('#modifyFolderModal');
+    modalExistingFolders.addEventListener('change', function (event) {
+        let folderId = event.target.value;
+        if (folderId == '0') {
+            modifyFolderModal.querySelector('#folderName').value = '';
+            modifyFolderModal.querySelector('#parentFolder').value = '0';
+            modifyFolderModal.querySelectorAll('.role-checkbox:checked').forEach((cb) => {
+                cb.checked = false;
+            });
+            modifyFolderModal.querySelector('#folderColor').value = '#000000';
+            return;
+        }
+        let folderArray = Array.from(folders);
+        let folder = folderArray.find(f => f.dataset.folder == folderId);
+        modifyFolderModal.querySelector('#folderName').value = folder.dataset.name;
+        modifyFolderModal.querySelector('#parentFolder').value = folder.dataset.parent;
+        folder.dataset.roles.split(',').forEach((role) => {
+            if (role !== '1') {
+                modifyFolderModal.querySelector(`#role${role}`).checked = true;
+            }
+        });
+        modifyFolderModal.querySelector('#folderColor').value = folder.dataset.color;
     });
 
+    const addFolderModal = document.querySelector('#addFolderModal');
     const createFolderButton = document.querySelector('#createFolderButton');
     createFolderButton.addEventListener('click', function (event) {
         if (fileTotal != fileUploadTotal) {
             return;
         }
-        let folderName = document.querySelector('#folderName').value;
-        let parentFolderId = document.querySelector('#parentFolder').value;
-        let folderRoles = Array.from(document.querySelectorAll('.role-checkbox:checked')).map(cb => cb.value);
-        let folderColor = document.querySelector('#folderColor').value;
+        let folderName = addFolderModal.querySelector('#folderName').value;
+        let parentFolderId = addFolderModal.querySelector('#parentFolder').value;
+        let folderRoles = Array.from(addFolderModal.querySelectorAll('.role-checkbox:checked')).map(cb => cb.value);
+        let folderColor = addFolderModal.querySelector('#folderColor').value;
         createFolderButton.disabled = true;
-        socket.emit('create_folder', { folderName: folderName, parentFolderId: parentFolderId, folderRoles: folderRoles, folderColor: folderColor });
+        if (folderName !== '') {
+            socket.emit('create_folder', { folderName: folderName, parentFolderId: parentFolderId, folderRoles: folderRoles, folderColor: folderColor });
+        }
+        else {
+            alert('Veuillez remplir tous les champs.');
+            createFolderButton.disabled = false;
+        }
     });
 
     socket.on('folder_created', function (data) {
@@ -287,4 +322,42 @@ document.addEventListener('DOMContentLoaded', function () {
             return;
         }
     });
+
+    const modifyFolderButton = document.querySelector('#modifyFolderButton');
+    modifyFolderButton.addEventListener('click', function (event) {
+        if (fileTotal != fileUploadTotal) {
+            return;
+        }
+        let folderId = modifyFolderModal.querySelector('#existingFolder').value;
+        let folderName = modifyFolderModal.querySelector('#folderName').value;
+        let parentFolderId = modifyFolderModal.querySelector('#parentFolder').value;
+        let folderRoles = Array.from(modifyFolderModal.querySelectorAll('.role-checkbox:checked')).map(cb => cb.value);
+        let folderColor = modifyFolderModal.querySelector('#folderColor').value;
+        modifyFolderButton.disabled = true;
+        if (folderName !== '' && folderId !== '0') {
+            socket.emit('modify_folder', { folderId: folderId, folderName: folderName, parentFolderId: parentFolderId, folderRoles: folderRoles, folderColor: folderColor });
+        }
+        else {
+            alert('Veuillez remplir tous les champs.');
+            modifyFolderButton.disabled = false;
+        }
+    });
+
+    socket.on('folder_modified', function (data) {
+        window.location.reload();
+    });
+
+    socket.on('folder_not_modified', function (data) {
+        alert(`La modification du dossier a échoué: ${data.error}`);
+        modifyFolderButton.disabled = false;
+    });
+
+    const formModifyFolder = document.querySelector('#modifyFolderModal').querySelector('form');
+    formModifyFolder.addEventListener('submit', function (event) {
+        if (fileTotal != fileUploadTotal) {
+            event.preventDefault();
+            alert('Veuillez attendre la fin du téléversement des fichiers avant de modifier un dossier.');
+            return;
+        }
+    });
 });