From aac1e8a884125bd19d1d3ddee56994051d4ef188 Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Fri, 15 Apr 2022 23:39:40 +0200
Subject: [PATCH] client: fixed date display
---
client/blueprints/Milestones.py | 11 +++++++++++
client/version.json | 4 ++--
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/client/blueprints/Milestones.py b/client/blueprints/Milestones.py
index b95188c..6c901e6 100644
--- a/client/blueprints/Milestones.py
+++ b/client/blueprints/Milestones.py
@@ -1,3 +1,5 @@
+from datetime import datetime
+
import requests
from flask import Blueprint, render_template, redirect, url_for, request
@@ -9,6 +11,9 @@ from logic.Localization import LOCALIZATION
def construct_blueprint(urlBuilder):
milestones = Blueprint('admin_milestones', __name__)
+ DATE_FORMAT_API = '%d.%m.%Y'
+ DATE_FORMAT_INPUT_FIELD = '%Y-%m-%d'
+
@milestones.route('/admin/milestones/overview', methods=['GET'])
@require_api_token
def overview():
@@ -53,9 +58,15 @@ def construct_blueprint(urlBuilder):
milestone = requests.get(urlBuilder.build_url('milestone', ID)).json()
if milestone['DueDate'] == '-':
milestone['DueDate'] = ''
+ else:
+ milestone['DueDate'] = datetime.strptime(milestone['DueDate'], DATE_FORMAT_API).strftime(
+ DATE_FORMAT_INPUT_FIELD)
if milestone['CompletionDate'] == '-':
milestone['CompletionDate'] = ''
+ else:
+ milestone['DueDate'] = datetime.strptime(milestone['CompletionDate'], DATE_FORMAT_API).strftime(
+ DATE_FORMAT_INPUT_FIELD)
return render_template('admin/milestones/edit.html',
title='Edit Milestone',
diff --git a/client/version.json b/client/version.json
index 093a93b..b15927c 100644
--- a/client/version.json
+++ b/client/version.json
@@ -1,7 +1,7 @@
{
"version": {
- "name": "v1.6.0",
- "code": 23,
+ "name": "v1.6.1",
+ "code": 24,
"date": "15.04.22"
}
}
\ No newline at end of file
--
GitLab