pikram/tasker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed datetime format handled by API and removed datetime convertion in frontend

Browse Source
This commit is contained in:
Marcin-Ramotowski 2025-04-30 17:57:08 +00:00
parent 0acde40aa3
commit 36c21fe100
2 changed files with 6 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
api/task_views.py
View File

@ -40,7 +40,7 @@ def get_tasks_by_user(user_id):
def create_task(): def create_task():
data = request.get_json() data = request.get_json()
validate_task_data(data) validate_task_data(data)
due_date = datetime.strptime(data['due_date'], '%d-%m-%Y %H:%M') due_date = datetime.strptime(data['due_date'], '%Y-%m-%dT%H:%M')
task = Task(title=data['title'], description=data['description'], due_date=due_date, task = Task(title=data['title'], description=data['description'], due_date=due_date,
done=data['done'], user_id=get_jwt_identity()) done=data['done'], user_id=get_jwt_identity())
@ -69,7 +69,7 @@ def update_task(task_id):
requested_value = request_data.get(field_name) requested_value = request_data.get(field_name)
if requested_value is None: if requested_value is None:
continue continue
new_value = datetime.strptime(requested_value, '%d-%m-%Y %H:%M') \ new_value = datetime.strptime(requested_value, '%Y-%m-%dT%H:%M') \
if field_name == 'due_date' else requested_value if field_name == 'due_date' else requested_value
setattr(task, field_name, new_value) setattr(task, field_name, new_value)
db.session.commit() db.session.commit()
@ -102,9 +102,9 @@ def validate_task_data(task):
due_date = task.get('due_date') due_date = task.get('due_date')
if due_date: if due_date:
try: try:
datetime.strptime(due_date, '%d-%m-%Y %H:%M') datetime.strptime(due_date, '%Y-%m-%dT%H:%M')
except ValueError: except ValueError:
abort(400, "Incorrect datetime format. Expected DD-MM-YYYY HH:MM") abort(400, "Incorrect datetime format. Expected ISO format: YYYY-MM-DDTHH:MM")
done = task.get('done') done = task.get('done')
if done is not None and done not in (0, 1): if done is not None and done not in (0, 1):
abort(400, "Incorrect done field value. Expected 0 or 1") abort(400, "Incorrect done field value. Expected 0 or 1")

24
frontend/src/pages/Tasks.tsx
View File

@ -15,13 +15,6 @@ interface Task {
done: boolean; done: boolean;
} }
const formatDateForApi = (dateStr: string): string => {
const [datePart, timePart] = dateStr.split('T');
const [year, month, day] = datePart.split('-');
const [hours, minutes] = timePart.split(':');
return `${day}-${month}-${year} ${hours}:${minutes}`;
}
const Tasks = () => { const Tasks = () => {
const [tasks, setTasks] = useState<Task[]>([]); const [tasks, setTasks] = useState<Task[]>([]);
const [newTask, setNewTask] = useState({ title: "", description: "", due_date: "", done: false }); const [newTask, setNewTask] = useState({ title: "", description: "", due_date: "", done: false });
@ -55,13 +48,7 @@ const Tasks = () => {
const handleCreateTask = async () => { const handleCreateTask = async () => {
try { try {
const payload = { const task = await createTask(newTask);
...newTask,
due_date: newTask.due_date
? formatDateForApi(newTask.due_date)
: "",
};
const task = await createTask(payload);
setTasks([...tasks, task]); // List update setTasks([...tasks, task]); // List update
setNewTask({ title: "", description: "", due_date: "", done: false }); // Form reset setNewTask({ title: "", description: "", due_date: "", done: false }); // Form reset
} catch (error) { } catch (error) {
@ -113,14 +100,7 @@ const Tasks = () => {
const handleSaveEdit = async (taskId: number) => { const handleSaveEdit = async (taskId: number) => {
try { try {
const payload = { const response = await api.patch(`/tasks/${taskId}`, editedTask);
...editedTask,
due_date: editedTask.due_date
? formatDateForApi(editedTask.due_date)
: undefined,
};
const response = await api.patch(`/tasks/${taskId}`, payload);
setTasks(tasks.map((t) => (t.id === taskId ? response.data : t))); setTasks(tasks.map((t) => (t.id === taskId ? response.data : t)));
setEditingTaskId(null); setEditingTaskId(null);
setEditedTask({}); setEditedTask({});