New routes and tpl: Capacity view, edit, delete

hitier
1 parent 8bcfce10
Showing 7 changed files with 122 additions and 12 deletions Show diff stats
app/main/routes.py
app/main/templates/capacities.html
app/main/templates/capacity.html
app/main/templates/capacity_form.html
app/models.py
app/templates/base_page.html
tests/frontend_tests.py
@@ -333,6 +333,38 @@ def capacities():
                            capacities=all_capacities)
  
  
+@bp.route('/capacity/<capacity_id>')
+@role_required('admin')
+def capacity(capacity_id):
+    # get capacity
+    this_capacity = Capacity.query.get(int(capacity_id))
+    # pass to template
+    return render_template('capacity.html', subtitle=f"{this_capacity.name}",
+                           capacity=this_capacity)
+
+
+@bp.route('/capacity/create', methods=('POST', 'GET'))
+@bp.route('/capacity/<capacity_id>/edit', methods=('POST', 'GET'))
+@role_required('admin')
+def capacity_edit(capacity_id=None):
+    return form_manager(object_class=Capacity,
+                        object_id_key='capacity_id',
+                        object_id=capacity_id,
+                        form_template='capacity_form.html',
+                        form_struct={},
+                        urlfor_exist_dict={'endpoint': 'main.capacity_edit'},
+                        urlfor_done_dict={'endpoint': 'main.capacity', 'capacity_id': None})
+
+
+@bp.route('/capacity/<capacity_id>/delete', methods=('POST', 'GET'))
+@role_required('admin')
+def capacity_delete(capacity_id=None):
+    flash("Suppression du Capacity pas encore implémentée", 'warning')
+    # this_label = Label.query.get(int(label_id))
+    # flash(f"Label {this_label.name} effacé")
+    return redirect(url_for('main.capacities'))
+
+
 @bp.route('/labels')
 @login_required
 def labels():
@@ -8,12 +8,19 @@
     <thead>
     <tr>
       <th scope="col">Fonction</th>
+      <th scope="col" class="col-1">Actions</th>
     </tr>
     </thead>
     <tbody>
     {% for capacity in capacities %}
       <tr>
-        <td>{{ capacity.name }}</td>
+        <td><a href="{{ url_for('main.capacity', capacity_id=capacity.id) }}">
+          {{ capacity.name }}</a>
+        </td>
+        <td>
+          {{ commons.edit_link(url_for('main.capacity_edit', capacity_id=capacity.id)) }}
+          {{ commons.delete_link( url_for('main.capacity_delete', capacity_id=capacity.id)) }}
+        </td>
       </tr>
     {% endfor %}
     </tbody>
@@ -0,0 +1,24 @@
+{% extends "base_page.html" %}
+{% block content %}
+
+  <!-- Invisible span to definte wich ul and a in the navbar are actived -->
+  <span id="nav_actived" style="display: none">agent,capacities</span>
+
+  <div class="card">
+    <div class="card-header">
+      Fiche Fonction
+    </div>
+    <div class="card-body">
+      <dl class="row agent">
+        <dt class="col-sm-2 text-right">ID :</dt>
+        <dd class="col-sm-10 text-left">{{ capacity.id }}</dd>
+        <dt class="col-sm-2 text-right">Nom :</dt>
+        <dd class="col-sm-10 text-left">{{ capacity.name }}</dd>
+        <dt class="col-sm-2 text-right"></dt>
+      </dl>
+      {{ commons.edit_link(url_for('main.capacity_edit', capacity_id=capacity.id), 25) }}
+      {{ commons.delete_link( url_for('main.capacity_delete', capacity_id=capacity.id), 25) }}
+    </div>
+  </div>
+
+{% endblock %}
@@ -0,0 +1,29 @@
+{% extends "base_page.html" %}
+
+{# Make link with form_manager #}
+{%  set capacity = object_struct %}
+
+{#  Set the title that will be used in base_page #}
+{% if capacity['id'] and capacity['id'] != '' %}
+  {% set subtitle = "Modifier la fonction "+ capacity['name'] %}
+{% else %}
+  {% set subtitle = "Ajouter une nouvelle fonction" %}
+{% endif %}
+
+{% block content %}
+
+  <!-- Invisible span to define wich ul and a in the navbar are actived -->
+  <span id="nav_actived" style="display: none">admin,capacity_edit</span>
+
+  <form id="capacity_form" class="pdc-form" action="{{ url_for('main.capacity_edit',
+         capacity_id=capacity['id']) }}" method="post">
+    {% if capacity['id'] and capacity['id'] != '' %}
+      <input class="form-control" id="capacity_id" name="capacity_id" type="hidden" value="{{ capacity['id'] }}">
+    {% endif %}
+    <div class="form-group">
+      <label for="name">Nom</label>
+      <input class="form-control" id="name" name="name" type="text" value="{{ capacity['name'] }}">
+    </div>
+    <input class="pdc-form-submit" type="submit" value="Valider">
+  </form>
+{% endblock %}
@@ -292,7 +292,7 @@ class Agent(db.Model, Formable):
     bap = relationship("AgentBap", back_populates="agents")
     status = relationship("AgentStatus", back_populates="agents")
     company = relationship("Company", back_populates="agents")
-    name = column_property(firstname+" "+secondname)
+    name = column_property(firstname + " " + secondname)
  
     @property
     def fullname(self):
@@ -322,10 +322,12 @@ class Service(db.Model):
     abbr = db.Column(db.String(50), unique=True)
  
  
-class Capacity(db.Model):
+class Capacity(db.Model, Formable):
     id = db.Column(db.Integer, primary_key=True)
     name = db.Column(db.String(100), unique=True)
  
+    export_keys = ['name']
+
  
 class Period(db.Model):
     id = db.Column(db.Integer, primary_key=True)
@@ -50,8 +50,6 @@
                                         href="{{ url_for('main.agents') }}">Liste des
                   agents</a>
                 </li>
-                <li class="nav-item"><a id="agents_stats" class="sub_link nav-link"
-                                        href="{{ url_for('main.agents_stats') }}">Statistiques</a></li>
                 <li class="nav-item"><a id="responsabilities" class="sub_link nav-link"
                                         href="{{ url_for('main.responsabilities') }}">Liste des responsabilités</a></li>
                 <li class="nav-item"><a id="capacities" class="sub_link nav-link "
@@ -63,6 +61,8 @@
                 <li class="nav-item"><a class="sub_link nav-link disabled" href="#">Liste des pôles</a></li>
                 <li class="nav-item"><a id="employments" class="sub_link nav-link"
                                         href="{{ url_for('main.employments') }}">Liste des emplois types</a></li>
+                <li class="nav-item"><a id="agents_stats" class="sub_link nav-link"
+                                        href="{{ url_for('main.agents_stats') }}">Statistiques</a></li>
               </ul>
             </li>
             <li class="nav-item">
@@ -134,10 +134,12 @@
                                         href="{{ url_for('main.label_edit') }}">Ajouter un label</a></li>
                 <li class="nav-item"><a class="sub_link nav-link disabled" href="#">Ajouter une compétence</a>
                 </li>
-                <li class="nav-item"><a class="sub_link nav-link disabled" href="#">Ajouter une fonction</a>
+                <li class="nav-item"><a id="capacity_edit" class="sub_link nav-link"
+                                        href="{{ url_for('main.capacity_edit') }}">Ajouter une fonction</a>
                 </li>
                 <li class="nav-item"><a id="responsability_edit" class="sub_link nav-link"
-                                        href="{{ url_for('main.responsability_edit') }}">Ajouter une responsabilité</a></li>
+                                        href="{{ url_for('main.responsability_edit') }}">Ajouter une responsabilité</a>
+                </li>
                 <li class="nav-item"><a class="sub_link nav-link disabled" href="#">Affecter un responsable de
                   projet</a></li>
                 <li class="nav-item"><a class="sub_link nav-link disabled" href="#">Affecter un responsable de
@@ -9,7 +9,7 @@ from selenium.webdriver.common.keys import Keys
 from selenium.webdriver.support.select import Select
  
 from app import create_app
-from app.models import Agent, Charge, Project, AgentResponsability, ProjectStatus, Label, Category
+from app.models import Agent, Charge, Project, AgentResponsability, ProjectStatus, Label, Category, Capacity
 from pdc_config import TestConfig
 from tests.common_db_feed import resources_to_instancedb
  
@@ -163,13 +163,12 @@ class AccessTestCase(BaseFrontTestCase):
     def test_responsability_page(self):
         self.check_page_h2('projet', url_for('main.responsability', responsability_id=1))
  
-    @unittest.skip("to be implemented")
-    def test_capacity_page(self):
-        pass
-
     def test_capacities(self):
         self.check_num_trs(59, url_for('main.capacities'))
  
+    def test_capacity_page(self):
+        self.check_page_h2('Acousticien', url_for('main.capacity', capacity_id=1))
+
     def test_project_status_page(self):
         self.check_page_h2('Abandonné', url_for('main.project_status', status_id=1))
  
@@ -240,6 +239,21 @@ class FormsTestCase(BaseFrontTestCase):
     def test_responsability_delete(self):
         self.check_delete(url_for('main.responsability_delete', responsability_id=1))
  
+    def test_capacity_add(self):
+        resp_dict = {'name': 'Ma Fonction'}
+        resp_add_url = url_for('main.capacity_edit')
+        self.check_edit(Capacity, resp_add_url, resp_dict)
+
+    # Test capacity form
+    def test_capacity_edit(self):
+        init_dict = {'name': 'Acousticien'}
+        resp_dict = {'name': 'Ma Fonction'}
+        resp_add_url = url_for('main.capacity_edit', capacity_id=1)
+        self.check_edit(Capacity, resp_add_url, resp_dict, init_dict)
+
+    def test_capacity_delete(self):
+        self.check_delete(url_for('main.capacity_delete', capacity_id=1))
+
     def test_agent_add(self):
         agent_dict = {'firstname': 'Hitier', 'secondname': 'Richard'}
         agent_add_url = url_for('main.agent_edit')