Now charge add route creates new charge

hitier
1 parent 7daae4a7
Showing 2 changed files with 43 additions and 17 deletions Show diff stats
app/main/routes.py
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, Company, AgentGrade, AgentStatus, AgentBap
+from app.models import Agent, Project, Service, Capacity, Period, db, Company, AgentGrade, AgentStatus, AgentBap, Charge
 from app import db_mgr
 from app.auth.routes import role_required
  
@@ -84,22 +84,6 @@ def periods():
                            periods=all_periods)
  
  
-@bp.route('/charge/add')
-@role_required('service')
-def charge_add():
-    this_agents = Agent.query.order_by(Agent.firstname).all()
-    this_projects = Project.query.order_by(Project.name).all()
-    this_services = Service.query.order_by(Service.name).all()
-    this_periods = Period.query.order_by(Period.id).all()
-    this_capacities = Capacity.query.order_by(Capacity.name).all()
-    return render_template('charge.html', subtitle="Affecter un agent",
-                           projects=this_projects,
-                           services=this_services,
-                           periods=this_periods,
-                           capacities=this_capacities,
-                           agents=this_agents)
-
-
 @bp.route('/project/<project_id>')
 @role_required('project')
 def project(project_id):
@@ -124,6 +108,8 @@ def agent(agent_id):
                            subtitle=f"{this_agent.fullname}")
  
  
+# - - - - - - - - - - - - - - - - - - - -  FORMS  - - - - - - - - - - - - - - - - - - - - #
+
 @bp.route('/agent/create', methods=('POST', 'GET'))
 @bp.route('/agent/<agent_id>/edit', methods=('POST', 'GET'))
 @role_required('service')
@@ -167,6 +153,31 @@ def agent_edit(agent_id=None):
         return redirect(url_for('main.agent', agent_id=this_agent.id))
  
  
+@bp.route('/charge/add', methods=('POST', 'GET'))
+@role_required('service')
+def charge_add():
+    if request.method == 'GET':
+        this_agents = Agent.query.order_by(Agent.firstname).all()
+        this_projects = Project.query.order_by(Project.name).all()
+        this_services = Service.query.order_by(Service.name).all()
+        this_periods = Period.query.order_by(Period.id).all()
+        this_capacities = Capacity.query.order_by(Capacity.name).all()
+        return render_template('charge.html', subtitle="Affecter un agent",
+                               projects=this_projects,
+                               services=this_services,
+                               periods=this_periods,
+                               capacities=this_capacities,
+                               agents=this_agents)
+    elif request.method == 'POST':
+        this_agent = Agent.query.get(request.form.get('agent_id'))
+        this_charge = Charge()
+        this_charge.from_request(request)
+        db.session.add(this_charge)
+        db.session.commit()
+        flash(f"Nouvelle charge pour l'agent {this_agent.fullname}")
+        return redirect(url_for('main.agent', agent_id=this_agent.id))
+
+
 # - - - - - - - - - - - - - - - - - - - -  REST API - - - - - - - - - - - - - - - - - - - -
  
 @bp.route('/charge/project/<project_id>/<category>')
@@ -143,3 +143,18 @@ class Charge(db.Model):
     capacity_id = db.Column(db.Integer, db.ForeignKey('capacity.id'))
     period_id = db.Column(db.Integer, db.ForeignKey('period.id'))
     charge_rate = db.Column(db.Integer)
+
+    @property
+    def export_keys(self):
+        return ['agent_id', 'project_id', 'service_id', 'capacity_id', 'period_id', 'charge_rate']
+
+    def from_request(self, form_request):
+        """
+        Get a form request structure and fill in our fields
+
+        :param form_request:
+        :return:
+        """
+        for key in self.export_keys:
+            setattr(self, key, form_request.form.get(key))
+