refactor Task model to use DateTime for echeance_prochaine; update task creation and calendar display accordingly

Author: yassinezorgui

__pycache__/models.cpython-312.pyc

@@ -21,7 +21,7 @@ class Task(db.Model):
     action_programmee = db.Column(db.String(200), nullable=False)
     periodicite = db.Column(db.String(50), nullable=False)
     responsable = db.Column(db.String(100), nullable=False)
-    echeance_prochaine = db.Column(db.String(100), nullable=True)
+    echeance_prochaine = db.Column(db.DateTime, nullable=False)  # Changed from String to DateTime
     acteurs_externes = db.Column(db.String(200), nullable=True)
     last_completed = db.Column(db.DateTime, nullable=True)
 

__pycache__/routes.cpython-312.pyc

@@ -1,4 +1,3 @@
-# Create a new file called reset_db.py
 from app import create_app
 from models import db
 

instance/calendar.db

@@ -23,34 +23,34 @@ def login():
     @app.route('/add-task', methods=['GET', 'POST'])
     @login_required
     def add_task():
-        """Handle task creation (admin only)"""
         if current_user.role != 'admin':
             flash('Access denied. Admins only.', 'danger')
             return redirect(url_for('login'))
-            
+    
         form = TaskForm()
         if form.validate_on_submit():
             task = Task(
                 volet=form.volet.data,
                 action_programmee=form.action_programmee.data,
                 periodicite=form.periodicite.data,
                 responsable=form.responsable.data,
-                echeance_prochaine=form.echeance_prochaine.data,
+                echeance_prochaine=datetime.combine(form.echeance_prochaine.data, datetime.min.time()),  # Convert date to datetime
                 acteurs_externes=form.acteurs_externes.data
             )
             db.session.add(task)
             db.session.commit()
             flash('Task added successfully!', 'success')
-            return redirect(url_for('add_task'))
+            return redirect(url_for('tasks_calendar'))
         return render_template('add_task.html', form=form)
 
     @app.route('/calendar')
     @login_required
     def tasks_calendar():
         tasks = Task.query.order_by(Task.echeance_prochaine).all()
         return render_template('tasks_calendar.html', 
-                             tasks=tasks,
-                             today=datetime.now().date())
+                                tasks=tasks,
+                                today=datetime.now(),
+                                datetime=datetime)
 
     @app.route('/complete-task/<int:task_id>', methods=['POST'])
     @login_required

models.py

@@ -26,12 +26,13 @@ <h1>Tasks Calendar</h1>
         </thead>
         <tbody>
             {% for task in tasks %}
-            <tr {% if task.echeance_prochaine.date() < today %}class="table-danger"{% endif %}>
+            {% set echeance = task.echeance_prochaine if task.echeance_prochaine is not string else datetime.strptime(task.echeance_prochaine, '%Y-%m-%d') %}
+            <tr {% if echeance < today %}class="table-danger"{% endif %}>
                 <td>{{ task.volet }}</td>
                 <td>{{ task.action_programmee }}</td>
                 <td>{{ task.periodicite }}</td>
                 <td>{{ task.responsable }}</td>
-                <td>{{ task.echeance_prochaine.strftime('%Y-%m-%d') }}</td>
+                <td>{{ echeance.strftime('%Y-%m-%d') }}</td>
                 <td>{{ task.acteurs_externes or '-' }}</td>
                 <td>
                     {% if task.last_completed %}