Notification de sauvegarde

app/forms.py

@@ -162,7 +162,7 @@ class PNForm(Form):
     class Meta:
         model = models.PN
 
-    type = RadioField("Type", choices=["1","2","3"])
+    type = RadioField("Type de parcours", choices=["1","2","3"])
         
 class ACForm(Form):
     regex = "^AC\d{4}$"

app/models.py

@@ -1,28 +1,28 @@
 from app import db
 
 Semestres_Competences = db.Table("Semestres_Competences",
-    db.Column("Semestre_num", db.String(1), db.ForeignKey("semestre.num")),
-    db.Column("Competence_code", db.String(3), db.ForeignKey("competence.code"))
+    db.Column("Semestre_num", db.String(32), db.ForeignKey("semestre.num")),
+    db.Column("Competence_code", db.String(32), db.ForeignKey("competence.code"))
 )
 
 ACs_Competences = db.Table("ACs_Competences",
-    db.Column("AC_code", db.String(6), db.ForeignKey("AC.code")),
-    db.Column("Competence_code", db.String(3), db.ForeignKey("competence.code"))
+    db.Column("AC_code", db.String(32), db.ForeignKey("AC.code")),
+    db.Column("Competence_code", db.String(32), db.ForeignKey("competence.code"))
 )
 
 Ressources_ACs = db.Table("Ressources_ACs",
-    db.Column("Ressource_code", db.String(4), db.ForeignKey("ressource.code")),
-    db.Column("AC_code", db.String(6), db.ForeignKey("AC.code"))
+    db.Column("Ressource_code", db.String(32), db.ForeignKey("ressource.code")),
+    db.Column("AC_code", db.String(32), db.ForeignKey("AC.code"))
 )
 
 Ressources_SAEs = db.Table("Ressources_SAEs",
-    db.Column("Ressource_code", db.String(4), db.ForeignKey("ressource.code")),
-    db.Column("SAE_code", db.String(5), db.ForeignKey("SAE.code"))
+    db.Column("Ressource_code", db.String(32), db.ForeignKey("ressource.code")),
+    db.Column("SAE_code", db.String(32), db.ForeignKey("SAE.code"))
 )
 
 SAEs_ACs = db.Table("SAEs_ACs",
-    db.Column("SAE_code", db.String(5), db.ForeignKey("SAE.code")),
-    db.Column("AC_code", db.String(6), db.ForeignKey("AC.code"))
+    db.Column("SAE_code", db.String(32), db.ForeignKey("SAE.code")),
+    db.Column("AC_code", db.String(32), db.ForeignKey("AC.code"))
 )
 
 class Semestre(db.Model):
@@ -38,7 +38,7 @@ class Semestre(db.Model):
         return "<Semestre {}>".format(self.num)
 
 class Competence(db.Model):
-    code = db.Column(db.String(3), primary_key = True, info={'label': 'Code'})
+    code = db.Column(db.String(32), primary_key = True, info={'label': 'Code'})
     nom = db.Column(db.String(255), info={'label': 'Nom'})
     diminutif = db.Column(db.String(30), info={'label': 'Diminutif'})
     description = db.Column(db.Text(), info={'label': 'Description'})
@@ -85,8 +85,8 @@ class Competence(db.Model):
         return "<Competence {}>".format(self.code)
 
 class CoefSAE(db.Model):
-    competence_code = db.Column(db.String(3), db.ForeignKey("competence.code"), primary_key=True)
-    sae_code = db.Column(db.String(6), db.ForeignKey("SAE.code"), primary_key=True)
+    competence_code = db.Column(db.String(32), db.ForeignKey("competence.code"), primary_key=True)
+    sae_code = db.Column(db.String(32), db.ForeignKey("SAE.code"), primary_key=True)
     coef = db.Column(db.String(2))
     competence = db.relationship("Competence", lazy=False, backref=db.backref("saes"))
     sae = db.relationship("SAE", lazy=False, backref=db.backref("competences"))
@@ -97,8 +97,8 @@ class CoefSAE(db.Model):
         return result
 
 class CoefRessource(db.Model):
-    competence_code = db.Column(db.String(3), db.ForeignKey("competence.code"), primary_key=True)
-    ressource_code = db.Column(db.String(4), db.ForeignKey("ressource.code"), primary_key=True)
+    competence_code = db.Column(db.String(32), db.ForeignKey("competence.code"), primary_key=True)
+    ressource_code = db.Column(db.String(32), db.ForeignKey("ressource.code"), primary_key=True)
     coef = db.Column(db.String(2))
     competence = db.relationship("Competence", lazy=False, backref=db.backref("ressources"))
     ressource = db.relationship("Ressource", lazy=False, backref=db.backref("competences"))
@@ -109,7 +109,7 @@ class CoefRessource(db.Model):
         return result
 
 class AC(db.Model):
-    code = db.Column(db.String(6), primary_key = True, info={'label': 'Code'})
+    code = db.Column(db.String(32), primary_key = True, info={'label': 'Code'})
     titre = db.Column(db.String(255), info={'label': 'Titre'})
     saes = db.relationship("SAE", secondary=SAEs_ACs, lazy=False, backref=db.backref("acs", lazy=False))
     ressources = db.relationship("Ressource", order_by="Ressource.code", secondary=Ressources_ACs, lazy=False, backref=db.backref("acs", lazy=False))
@@ -126,7 +126,7 @@ class AC(db.Model):
         return "<AC {}>".format(self.code)
   
 class PN(db.Model):
-    code = db.Column(db.String(3), primary_key = True, info={'label': 'Code'})
+    code = db.Column(db.String(32), primary_key = True, info={'label': 'Code'})
     nom = db.Column(db.String(255), info={'label': 'Nom'})
     diminutif = db.Column(db.String(30), info={'label': 'Diminutif'})
     description = db.Column(db.Text(), info={'label': 'Description'})
@@ -141,7 +141,7 @@ class PN(db.Model):
         return "<PN {}>".format(self.code)
 
 class SAE(db.Model):
-    code = db.Column(db.String(5), primary_key = True, info={'label': 'Code'})
+    code = db.Column(db.String(32), primary_key = True, info={'label': 'Code'})
     titre = db.Column(db.String(255), info={'label': 'Titre'})
     semestre = db.Column(db.String(255), info={'label': 'Semestre'})
     heures_encadrees = db.Column(db.String(3), info={'label': 'Heures Encadrées'})
@@ -173,7 +173,7 @@ class SAE(db.Model):
         return "<SAE {}>".format(self.code)
 
 class Ressource(db.Model): 
-    code = db.Column(db.String(4), primary_key = True, info={'label': 'Code'})
+    code = db.Column(db.String(32), primary_key = True, info={'label': 'Code'})
     nom = db.Column(db.String(255), info={'label': 'Nom'})
     semestre = db.Column(db.String(255), info={'label': 'Semestre'})
     heures_formation = db.Column(db.String(3), info={'label': 'Heures Formation'})

app/routes.py

@@ -3,7 +3,7 @@ from app import app, db
 from app.forms import *
 import app.models as models
 
-@app.route("/")
+@app.route("/", methods=["GET","POST"])
 @app.route("/index", methods=["GET","POST"])
 def index():
     form = AccueilForm()
@@ -27,6 +27,9 @@ def index():
 def Semestre(num):
     form = SemestreForm()
     semestre = models.Semestre.query.filter_by(num=num).first()
+    if semestre == None:
+        flash("Ce Semestre n'existe pas!", "error")
+        return redirect(url_for("index"))
     for i, ue in enumerate(semestre.ues):
         if form.ueform.__len__() < len(semestre.ues): form.ueform.append_entry(data={"ue": ue.code})
         # Donne aux dropdowns la liste des objets de formations que les ACs possèdent sans doublons
@@ -98,6 +101,8 @@ def PN(code):
             form.exporterRef()
         elif form.sauvegarder.data:
             form.sauvegarderRef()
+            flash("Le référentiel " + form.code.data + " a été sauvegardé!", "success")
+            return redirect(url_for("PN", code=form.code.data[2:]))
         return redirect(url_for("PN"))
     elif code:
         referentiel = models.PN.query.filter_by(code="PN"+code).first()
@@ -123,6 +128,8 @@ def AC(code):
             form.exporterRef()
         elif form.sauvegarder.data:
             form.sauvegarderRef()
+            flash("Le référentiel " + form.code.data + " a été sauvegardé!", "success")
+            return redirect(url_for("AC", code=form.code.data[2:]))
         return redirect(url_for("AC"))
     elif code:
         referentiel = models.AC.query.filter_by(code="AC"+code).first()
@@ -148,6 +155,8 @@ def SAE(code):
             form.exporterRef()
         elif form.sauvegarder.data:
             form.sauvegarderRef()
+            flash("Le référentiel " + form.code.data + " a été sauvegardé!", "success")
+            return redirect(url_for("SAE", code=form.code.data[3:]))
         return redirect(url_for("SAE"))
     elif code:
         referentiel = models.SAE.query.filter_by(code="SAE"+code).first()
@@ -173,6 +182,8 @@ def Ressource(code):
             form.exporterRef()
         elif form.sauvegarder.data:
             form.sauvegarderRef()
+            flash("Le référentiel " + form.code.data + " a été sauvegardé!", "success")
+            return redirect(url_for("Ressource", code=form.code.data[1:]))
         return redirect(url_for("Ressource"))
     elif code:
         referentiel = models.Ressource.query.filter_by(code="R"+code).first()
@@ -198,6 +209,8 @@ def Competence(code):
             form.exporterRef()
         if form.sauvegarder.data:
             form.sauvegarderRef()
+            flash("Le référentiel " + form.code.data + " a été sauvegardé!", "success")
+            return redirect(url_for("Competence", code=form.code.data[2:]))
         return redirect(url_for("Competence"))
     elif code:
         referentiel = models.Competence.query.filter_by(code="RT"+code).first()

app/templates/base.html

@@ -96,12 +96,27 @@
     <!-- Contenu de la page -->
     <div class="container">
         <div class="box">
-            {% with messages = get_flashed_messages() %}
-            {% if messages %}
-            <script>
-                alert("{% for message in messages %}{{message}}{% endfor %}");
-            </script>
-            {% endif %}
+            {% with messages = get_flashed_messages(category_filter=["error"]) %}
+                {% if messages %}
+                <article class="message is-danger">
+                    <div class="message-body">
+                        {% for message in messages %}
+                        <p>{{message}}</p>
+                        {% endfor %}
+                    </div>
+                </article>     
+                {% endif %}
+            {% endwith %}
+            {% with messages = get_flashed_messages(category_filter=["success"]) %}
+                {% if messages %}
+                <article class="message is-success">
+                    <div class="message-body">
+                        {% for message in messages %}
+                        <p>{{message}}</p>
+                        {% endfor %}
+                    </div>
+                </article>     
+                {% endif %}
             {% endwith %}
             {% block content %}
             {% endblock %}