Use select_options for list fields

hitier
1 parent 687ef08f
Showing 4 changed files with 43 additions and 17 deletions Show diff stats
app/main/routes.py
app/main/templates/agent.html
app/main/templates/agent_edit.html
app/models.py
@@ -3,7 +3,7 @@ from flask_login import login_required, current_user
  
 from . import bp
  
-from app.models import Agent, Project, Service, Capacity, Period, db
+from app.models import Agent, Project, Service, Capacity, Period, db, Company, AgentGrade, AgentStatus, AgentBap
 from app import db_mgr
 from app.auth.routes import role_required
  
@@ -121,13 +121,21 @@ def agent_edit(agent_id=None):
     # Make the form, filled with existing agent if updating
     #
     if request.method == 'GET':
+        companies = Company.query.all()
+        grades = AgentGrade.query.all()
+        statuses = AgentStatus.query.all()
+        baps = AgentBap.query.all()
         if agent_id:
             this_agent = Agent.query.get(int(agent_id))
         else:
             this_agent = Agent()
         # export to structure for jinja display
         agent_struct = this_agent.to_struct()
-        return render_template('agent_edit.html', agent=agent_struct)
+        return render_template('agent_edit.html', agent=agent_struct,
+                               companies=companies,
+                               statuses=statuses,
+                               baps=baps,
+                               grades=grades)
     # Or submit for db writing
     #
     elif request.method == 'POST':
@@ -145,7 +153,7 @@ def agent_edit(agent_id=None):
         db.session.add(this_agent)
         db.session.commit()
         # we're done
-        flash(f"Agent {this_agent.fullname} "+done_string)
+        flash(f"Agent {this_agent.fullname} " + done_string)
         return redirect(url_for('main.agent', agent_id=this_agent.id))
  
  
@@ -33,6 +33,8 @@
       <dd class="col-sm-10 text-left">{{agent.company.name}}</dd>
       <dt class="col-sm-2 text-right">Corps :</dt>
       <dd class="col-sm-10 text-left"></dd>
+      <dt class="col-sm-2 text-right">Grade :</dt>
+      <dd class="col-sm-10 text-left">{{agent.grade.name}}</dd>
       <dt class="col-sm-2 text-right">BAP :</dt>
       <dd class="col-sm-10 text-left">{{agent.bap.name}}</dd>
       {# TODO: puth different spacing #}
 {% extends "base_page.html" %}
 {#  Set the title that will be used in base_page #}
 {% if agent['agent_id'] != '' %}
-  {% set subtitle = "Modifier l'agent"+ agent['fullname'] +":" %}
+  {% set subtitle = "Modifier l'agent "+ agent['fullname'] +":" %}
 {% else %}
   {% set subtitle = "Ajouter un nouvel agent:" %}
 {% endif %}
@@ -29,20 +29,40 @@
           {{ 'checked' if agent['permanent'] == 1 }} value="1">
     </div>
     <div class="form-group">
-      <label for="company">Structure</label>
-      <input class="form-control" id="company_id" name="company_id" type="text" value="{{ agent['company_id'] }}">
+      <label for="company_id">Structure</label>
+      <select id="company_id" name="company_id" class="form-select">
+        <option selected>---</option>
+        {% for c in companies %}
+          <option value="{{ c.id }}" {{ "selected" if c.id == agent['company_id'] }}>{{ c.name }}</option>
+        {% endfor %}
+      </select>
     </div>
     <div class="form-group">
-      <label for="grade">Grade</label>
-      <input class="form-control" id="grade_id" name="grade_id" type="text" value="{{ agent['grade_id'] }}">
+      <label for="grade_id">Grade</label>
+      <select id="grade_id" name="grade_id" class="form-select">
+        <option selected>---</option>
+        {% for g in grades %}
+          <option value="{{ g.id }}" {{ "selected" if g.id == agent['grade_id'] }}>{{ g.name }}</option>
+        {% endfor %}
+      </select>
     </div>
     <div class="form-group">
-      <label for="status">Statut</label>
-      <input class="form-control" id="status_id" name="status_id" type="text" value="{{ agent['status_id'] }}">
+      <label for="status_id">Statut</label>
+      <select id="status_id" name="status_id" class="form-select">
+        <option selected>---</option>
+        {% for s in statuses %}
+          <option value="{{ s.id }}" {{ "selected" if s.id == agent['status_id'] }}>{{ s.name }}</option>
+        {% endfor %}
+      </select>
     </div>
     <div class="form-group">
-      <label for="bap">Bap</label>
-      <input class="form-control" id="bap_id" name="bap_id" type="text" value="{{ agent['bap_id'] }}">
+      <label for="bap_id">Bap</label>
+      <select id="bap_id" name="bap_id" class="form-select">
+        <option selected>---</option>
+        {% for b in baps %}
+          <option value="{{ b.id }}" {{ "selected" if b.id == agent['bap_id'] }}>{{ b.name }}</option>
+        {% endfor %}
+      </select>
     </div>
     <input class="btn btn-dark" type="submit" value="Valider">
   </form>
@@ -111,11 +111,7 @@ class Agent(db.Model):
         :return:
         """
         for key in self.export_keys:
-            # deal with checked value
-            if key in ['permanent', 'virtual']:
-                setattr(self, key, form_request.form.get(key))
-            else:
-                setattr(self, key, form_request.form[key])
+            setattr(self, key, form_request.form.get(key))
  
  
 class Service(db.Model):