update space

.idea/workspace.xml

@@ -5,8 +5,13 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="27c9ae1a-a6fa-4472-8bcd-a7087620894b" name="Changes" comment="update space">
-      <change beforePath="$PROJECT_DIR$/routes/health_dashboard.py" beforeDir="false" afterPath="$PROJECT_DIR$/routes/health_dashboard.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/templates/dashboard.html" beforeDir="false" afterPath="$PROJECT_DIR$/templates/dashboard.html" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/models/schemas/todo_schema.py" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/routes/todo.py" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/templates/todos.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/README.md" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app.py" beforeDir="false" afterPath="$PROJECT_DIR$/app.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/services/auth_service.py" beforeDir="false" afterPath="$PROJECT_DIR$/services/auth_service.py" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -119,15 +124,7 @@
       <workItem from="1730338434025" duration="11075000" />
       <workItem from="1730305361670" duration="2425000" />
       <workItem from="1730378091154" duration="2435000" />
-      <workItem from="1730381153348" duration="5876000" />
-    </task>
-    <task id="LOCAL-00021" summary="update space">
-      <option name="closed" value="true" />
-      <created>1730325728071</created>
-      <option name="number" value="00021" />
-      <option name="presentableId" value="LOCAL-00021" />
-      <option name="project" value="LOCAL" />
-      <updated>1730325728071</updated>
+      <workItem from="1730381153348" duration="7510000" />
     </task>
     <task id="LOCAL-00022" summary="update space">
       <option name="closed" value="true" />
@@ -513,7 +510,15 @@
       <option name="project" value="LOCAL" />
       <updated>1730386845014</updated>
     </task>
-    <option name="localTasksCounter" value="70" />
+    <task id="LOCAL-00070" summary="update space">
+      <option name="closed" value="true" />
+      <created>1730387397425</created>
+      <option name="number" value="00070" />
+      <option name="presentableId" value="LOCAL-00070" />
+      <option name="project" value="LOCAL" />
+      <updated>1730387397425</updated>
+    </task>
+    <option name="localTasksCounter" value="71" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

README.md

@@ -64,11 +64,11 @@ This project combines a **Poultry Farming Assistance System** and a **Poultry Ma
 - [x] Set up image preprocessing for disease detection.
 - [x] Build endpoints for image upload and disease analysis.
 - [x] Generate health-related notifications and recommendations.
-- [ ] Implement real-time health monitoring and alerts.
+- [x] Implement real-time health monitoring and alerts.
 
 ### 4. To-Do List Management
-- [ ] Design MongoDB schema for to-do lists.
-- [ ] Create routes for farmers to view and mark to-do items.
+- [x] Design MongoDB schema for to-do lists.
+- [x] Create routes for farmers to view and mark to-do items.
 - [ ] Build functionality for admins to assign tasks.
 - [ ] Develop an **AdminLTE 4**-based UI for managing tasks.
 

app.py

@@ -13,6 +13,7 @@ from routes.disease_detection import disease_router
 from routes.administration import dashboard_router
 from services.health_monitoring_service import evaluate_health_data, get_health_alerts, send_alerts
 from huggingface_hub import login
+from routes.todo import todo_router
 
 # Setup logging
 logging.basicConfig(level=logging.INFO)
@@ -51,7 +52,8 @@ else:
 app.include_router(auth_router, prefix="/auth", tags=["Authentication"])
 app.include_router(disease_router, prefix="/disease", tags=["Disease Detection"])
 app.include_router(dashboard_router, prefix="/admin", tags=["Admin Dashboard"])
-
+app.include_router(todo_router, prefix="/admin/todos", tags=["Admin To-Do List"])
+app.include_router(todo_router, prefix="/todos", tags=["Farmer To-Do List"])
 @app.get("/", response_class=HTMLResponse)
 async def landing_page(request: Request):
     """Render the landing page template."""

models/schemas/todo_schema.py

@@ -0,0 +1,76 @@
+from pydantic import BaseModel, Field
+from typing import Optional
+from datetime import datetime
+from bson import ObjectId
+
+class PyObjectId(ObjectId):
+    """Custom ObjectId class for Pydantic validation."""
+    @classmethod
+    def __get_validators__(cls):
+        yield cls.validate
+
+    @classmethod
+    def validate(cls, v):
+        if not ObjectId.is_valid(v):
+            raise ValueError("Invalid ObjectId")
+        return ObjectId(v)
+
+class ToDoItem(BaseModel):
+    id: PyObjectId = Field(default_factory=PyObjectId, alias="_id")
+    title: str
+    description: Optional[str] = None
+    due_date: datetime
+    is_completed: bool = False
+    assigned_to: Optional[str] = None  # Username or User ID of the farmer
+    created_at: datetime = Field(default_factory=datetime.utcnow)
+    updated_at: Optional[datetime] = None  # Track the latest update timestamp
+
+    class Config:
+        json_encoders = {ObjectId: str}
+        schema_extra = {
+            "example": {
+                "title": "Feed the chickens",
+                "description": "Provide feed and check water levels for all chicken pens",
+                "due_date": "2024-11-05T14:00:00Z",
+                "is_completed": False,
+                "assigned_to": "farmer_username",
+                "created_at": "2024-10-31T10:00:00Z",
+                "updated_at": "2024-10-31T12:00:00Z"
+            }
+        }
+
+class ToDoCreate(BaseModel):
+    """Schema for creating a new to-do item."""
+    title: str
+    description: Optional[str] = None
+    due_date: datetime
+    assigned_to: Optional[str] = None  # Optional assignment at creation
+
+    class Config:
+        schema_extra = {
+            "example": {
+                "title": "Inspect chicken feed storage",
+                "description": "Check for any signs of spoilage or infestation",
+                "due_date": "2024-11-02T10:00:00Z",
+                "assigned_to": "farmer_username"
+            }
+        }
+
+class ToDoUpdate(BaseModel):
+    """Schema for updating an existing to-do item."""
+    title: Optional[str] = None
+    description: Optional[str] = None
+    due_date: Optional[datetime] = None
+    is_completed: Optional[bool] = None  # Allow marking as completed
+    assigned_to: Optional[str] = None  # Allow reassignment if needed
+
+    class Config:
+        schema_extra = {
+            "example": {
+                "title": "Check chicken feed storage",
+                "description": "Ensure feed is properly stored to avoid spoilage",
+                "due_date": "2024-11-03T08:00:00Z",
+                "is_completed": True,
+                "assigned_to": "another_farmer_username"
+            }
+        }

routes/administration.py

@@ -1,9 +1,14 @@
 # routes/administration.py
 
-from fastapi import APIRouter, Request
+from fastapi import APIRouter, Request, HTTPException, Depends
 from fastapi.templating import Jinja2Templates
 from datetime import datetime
+
+from starlette import status
 from starlette.responses import HTMLResponse
+
+from routes.todo import todo_collection
+from services.auth_service import is_admin_user, get_current_user
 from services.health_monitoring_service import evaluate_health_data
 from services.utils import db  # MongoDB instance from utils
 
@@ -44,3 +49,25 @@ async def health_dashboard(request: Request):
 
     # Render the dashboard template with real-time and historical alert data
     return templates.TemplateResponse("dashboard.html", context)
+
+
+@dashboard_router.get("/tasks", response_class=HTMLResponse)
+async def manage_tasks(request: Request, current_user: str = Depends(get_current_user)):
+    """
+    Render the task management page for admin users.
+    """
+    # Check if current user is an admin
+    if not is_admin_user(current_user):
+        raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="Admin privileges required.")
+
+    # Fetch all tasks and farmers for the dropdown
+    tasks = list(todo_collection.find({}))
+    farmers = list(db.get_collection("users").find({"role": "farmer"}))
+
+    context = {
+        "request": request,
+        "tasks": tasks,
+        "farmers": farmers,
+    }
+    return templates.TemplateResponse("admin_tasks.html", context)
+

routes/todo.py

@@ -0,0 +1,183 @@
+from fastapi import APIRouter, Depends, Request, HTTPException, status
+from fastapi.responses import JSONResponse
+from pydantic import BaseModel, Field
+from typing import Optional, List
+from services.auth_service import get_current_user, is_admin_user
+from services.utils import db
+from models.schemas.todo_schema import ToDoItem, ToDoCreate, ToDoUpdate
+from datetime import datetime
+from bson import ObjectId
+
+# Initialize the router
+todo_router = APIRouter()
+
+# MongoDB Collection for To-Do items
+todo_collection = db.get_collection("todo_items")
+
+
+
+
+# Admin Farmer Routes
+@todo_router.post("/admin/assign_task", response_model=dict)
+async def assign_task(
+        todo_data: ToDoCreate,
+        assigned_to: str,
+        current_user: str = Depends(get_current_user)
+):
+    """
+    Allows admin to assign a task to a farmer.
+    """
+    if not is_admin_user(current_user):
+        raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="Admin privileges required.")
+
+    task = todo_data.dict()
+    task.update({
+        "assigned_to": assigned_to,
+        "created_by": current_user,
+        "is_completed": False,
+        "created_at": datetime.utcnow()
+    })
+
+    result = todo_collection.insert_one(task)
+    if result.inserted_id:
+        return {"message": "Task assigned successfully."}
+    else:
+        raise HTTPException(status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail="Task assignment failed.")
+
+@todo_router.post("/admin/todos", response_model=ToDoItem)
+async def create_todo_item(
+        todo_data: ToDoCreate,
+        current_user: str = Depends(get_current_user),
+):
+    """
+    Allows an admin farmer to create a new to-do item.
+
+    Parameters:
+        todo_data (ToDoCreate): Data for creating the to-do item.
+        current_user (str): Current admin user creating the task.
+
+    Returns:
+        ToDoItem: The created to-do item document.
+    """
+    if not is_admin_user(current_user):
+        raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="Admin privileges required.")
+
+    todo_item = todo_data.dict()
+    todo_item.update({
+        "is_completed": False,
+        "created_by": current_user,
+        "created_at": datetime.utcnow(),
+    })
+    result = todo_collection.insert_one(todo_item)
+
+    if result.inserted_id:
+        return JSONResponse(status_code=status.HTTP_201_CREATED,
+                            content={"message": "To-do item created successfully."})
+    else:
+        raise HTTPException(status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail="Failed to create to-do item.")
+
+
+@todo_router.get("/admin/todos", response_model=List[ToDoItem])
+async def get_all_todo_items(current_user: str = Depends(get_current_user)):
+    """
+    Allows an admin farmer to view all to-do items.
+
+    Parameters:
+        current_user (str): Current admin user.
+
+    Returns:
+        List[ToDoItem]: List of all to-do items.
+    """
+    if not is_admin_user(current_user):
+        raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="Admin privileges required.")
+
+    todos = list(todo_collection.find({}))
+    return todos
+
+
+@todo_router.put("/admin/todos/{todo_id}", response_model=dict)
+async def update_todo_item(
+        todo_id: str,
+        todo_data: ToDoUpdate,
+        current_user: str = Depends(get_current_user),
+):
+    """
+    Allows an admin farmer to update any to-do item details.
+
+    Parameters:
+        todo_id (str): ID of the to-do item.
+        todo_data (ToDoUpdate): Data to update on the to-do item.
+
+    Returns:
+        dict: Update confirmation.
+    """
+    if not is_admin_user(current_user):
+        raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="Admin privileges required.")
+
+    update_data = {k: v for k, v in todo_data.dict().items() if v is not None}
+    result = todo_collection.update_one({"_id": ObjectId(todo_id)}, {"$set": update_data})
+
+    if result.modified_count:
+        return {"message": "To-do item updated successfully."}
+    else:
+        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="To-do item not found or not modified.")
+
+
+@todo_router.delete("/admin/todos/{todo_id}", response_model=dict)
+async def delete_todo_item(todo_id: str, current_user: str = Depends(get_current_user)):
+    """
+    Allows an admin farmer to delete any to-do item.
+
+    Parameters:
+        todo_id (str): ID of the to-do item to delete.
+
+    Returns:
+        dict: Deletion confirmation.
+    """
+    if not is_admin_user(current_user):
+        raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="Admin privileges required.")
+
+    result = todo_collection.delete_one({"_id": ObjectId(todo_id)})
+    if result.deleted_count:
+        return {"message": "To-do item deleted successfully."}
+    else:
+        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="To-do item not found.")
+
+
+# Normal Farmer Routes
+
+@todo_router.get("/todos", response_model=List[ToDoItem])
+async def get_assigned_todo_items(current_user: str = Depends(get_current_user)):
+    """
+    Allows a normal farmer to retrieve all tasks assigned to them.
+
+    Parameters:
+        current_user (str): Current authenticated farmer.
+
+    Returns:
+        List[ToDoItem]: List of to-do items assigned to the user.
+    """
+    todos = list(todo_collection.find({"assigned_to": current_user}))
+    return todos
+
+
+@todo_router.put("/todos/{todo_id}/complete", response_model=dict)
+async def complete_assigned_todo_item(todo_id: str, current_user: str = Depends(get_current_user)):
+    """
+    Allows a normal farmer to mark an assigned to-do item as completed.
+
+    Parameters:
+        todo_id (str): ID of the to-do item to mark as completed.
+
+    Returns:
+        dict: Completion confirmation message.
+    """
+    # Verify if the to-do item is assigned to the current user
+    todo = todo_collection.find_one({"_id": ObjectId(todo_id), "assigned_to": current_user})
+    if not todo:
+        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND,
+                            detail="To-do item not found or not assigned to you.")
+
+    todo_collection.update_one({"_id": ObjectId(todo_id)},
+                               {"$set": {"is_completed": True, "completed_at": datetime.utcnow()}})
+    return {"message": f"To-do item '{todo.get('title')}' marked as completed."}

services/auth_service.py

@@ -1,3 +1,5 @@
+# services/auth_service.py
+
 import os
 import logging
 from datetime import datetime, timedelta
@@ -9,7 +11,7 @@ from models.schemas.user_schema import UserCreate
 from fastapi import Depends, HTTPException, status
 from pydantic import BaseModel
 from jose import JWTError, jwt
-from services.utils import mongo_instance, log_to_db  # MongoDB and logging utilities
+from services.utils import mongo_instance, log_to_db, db  # MongoDB and logging utilities
 
 # Set up logging with a detailed format
 logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
@@ -135,6 +137,13 @@ def get_current_user(token: str = Depends(oauth2_scheme)) -> Union[str, None]:
     logger.info(f"Access granted to user: {username}")
     return username
 
+def is_admin_user(current_user: str):
+    # This is a placeholder for role-based validation. Replace with actual role check logic.
+    user = db.get_collection("users").find_one({"username": current_user})
+    if user and user.get("role") == "admin":
+        return True
+    return False
+
 def authenticate_user(username: str, password: str) -> Optional[dict]:
     """
     Authenticates a user by checking username and password.

templates/admin_tasks.html

@@ -0,0 +1,88 @@
+{% extends "base.html" %}
+
+{% block content %}
+<div class="content-header">
+    <div class="container-fluid">
+        <div class="row mb-2">
+            <div class="col-sm-6">
+                <h1 class="m-0">Task Management</h1>
+            </div>
+        </div>
+    </div>
+</div>
+
+<div class="content">
+    <div class="container-fluid">
+        <!-- Task Assignment Form -->
+        <div class="card card-primary">
+            <div class="card-header">
+                <h3 class="card-title">Assign New Task</h3>
+            </div>
+            <form id="taskForm" method="POST" action="/admin/assign_task">
+                <div class="card-body">
+                    <div class="form-group">
+                        <label for="taskTitle">Task Title</label>
+                        <input type="text" class="form-control" id="taskTitle" name="title" placeholder="Enter task title" required>
+                    </div>
+                    <div class="form-group">
+                        <label for="taskDescription">Description</label>
+                        <textarea class="form-control" id="taskDescription" name="description" placeholder="Task description"></textarea>
+                    </div>
+                    <div class="form-group">
+                        <label for="dueDate">Due Date</label>
+                        <input type="datetime-local" class="form-control" id="dueDate" name="due_date" required>
+                    </div>
+                    <div class="form-group">
+                        <label for="assignedTo">Assign To</label>
+                        <select class="form-control" id="assignedTo" name="assigned_to">
+                            <!-- Populate with list of farmers from backend -->
+                            {% for farmer in farmers %}
+                                <option value="{{ farmer.username }}">{{ farmer.username }}</option>
+                            {% endfor %}
+                        </select>
+                    </div>
+                </div>
+                <div class="card-footer">
+                    <button type="submit" class="btn btn-primary">Assign Task</button>
+                </div>
+            </form>
+        </div>
+
+        <!-- Task List -->
+        <div class="card mt-4">
+            <div class="card-header">
+                <h3 class="card-title">Assigned Tasks</h3>
+            </div>
+            <div class="card-body">
+                <table class="table table-bordered">
+                    <thead>
+                        <tr>
+                            <th>Task Title</th>
+                            <th>Description</th>
+                            <th>Due Date</th>
+                            <th>Assigned To</th>
+                            <th>Status</th>
+                            <th>Actions</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        {% for task in tasks %}
+                        <tr>
+                            <td>{{ task.title }}</td>
+                            <td>{{ task.description }}</td>
+                            <td>{{ task.due_date }}</td>
+                            <td>{{ task.assigned_to }}</td>
+                            <td>{{ 'Completed' if task.is_completed else 'Pending' }}</td>
+                            <td>
+                                <a href="/admin/todos/{{ task._id }}/edit" class="btn btn-warning btn-sm">Edit</a>
+                                <a href="/admin/todos/{{ task._id }}/delete" class="btn btn-danger btn-sm">Delete</a>
+                            </td>
+                        </tr>
+                        {% endfor %}
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+</div>
+{% endblock %}

templates/todos.html

@@ -0,0 +1,28 @@
+{% extends "base.html" %}
+{% block title %}To-Do List{% endblock %}
+{% block content %}
+
+<h2>To-Do List</h2>
+
+<ul>
+    {% for todo in todos %}
+        <li>
+            <input type="checkbox" onclick="completeTodo('{{ todo['_id'] }}')" {% if todo.is_completed %}checked{% endif %}>
+            <span>{{ todo.title }}</span> - <span>{{ todo.due_date.strftime('%Y-%m-%d') }}</span>
+        </li>
+    {% endfor %}
+</ul>
+
+<script>
+    async function completeTodo(todoId) {
+        const response = await fetch(`/todo/todos/${todoId}/complete`, { method: "PUT" });
+        if (response.ok) {
+            alert("To-do item marked as completed!");
+            window.location.reload();
+        } else {
+            alert("Failed to mark to-do as completed.");
+        }
+    }
+</script>
+
+{% endblock %}