From 9aa29b206850dbca50ca48cedd6a2a00d8a54fd9 Mon Sep 17 00:00:00 2001
From: tawoe <tawoe@posteo.de>
Date: Tue, 13 May 2025 15:13:11 +0200
Subject: [PATCH 1/3] upgrade bootstrap

---
 apimanager/apimanager/settings.py                           | 4 ++--
 apimanager/customers/templates/customers/create.html        | 2 +-
 apimanager/metrics/templates/metrics/api.html               | 2 +-
 apimanager/metrics/templates/metrics/connector.html         | 2 +-
 apimanager/metrics/templates/metrics/custom_summary.html    | 2 +-
 apimanager/metrics/templates/metrics/daily_summary.html     | 2 +-
 apimanager/metrics/templates/metrics/hourly_summary.html    | 2 +-
 apimanager/metrics/templates/metrics/monthly_summary.html   | 2 +-
 apimanager/metrics/templates/metrics/quarterly_summary.html | 2 +-
 apimanager/metrics/templates/metrics/weekly_summary.html    | 2 +-
 apimanager/metrics/templates/metrics/yearly_summary.html    | 2 +-
 requirements.txt                                            | 2 +-
 12 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/apimanager/apimanager/settings.py b/apimanager/apimanager/settings.py
index a61d510..9df1cb0 100644
--- a/apimanager/apimanager/settings.py
+++ b/apimanager/apimanager/settings.py
@@ -44,7 +44,7 @@ INSTALLED_APPS = [
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
-    'bootstrap',
+    'bootstrap4',
     'bootstrap_datepicker_plus',
     'mathfilters',
     'base',
@@ -301,7 +301,7 @@ ALLOW_DIRECT_LOGIN = True
 GATEWAYLOGIN_HAS_CBS = False
 ALLOW_GATEWAY_LOGIN = True
 
-# Use BOOTSTRAP3 if you are using Bootstrap 3
+# Use bootstrap4 if you are using Bootstrap 3
 BOOTSTRAP4 = {
     'include_jquery': True,
 }
diff --git a/apimanager/customers/templates/customers/create.html b/apimanager/customers/templates/customers/create.html
index d2ebf05..13923ce 100644
--- a/apimanager/customers/templates/customers/create.html
+++ b/apimanager/customers/templates/customers/create.html
@@ -5,7 +5,7 @@
 {% block page_title %}{{ block.super }} / {% trans "Customers" %}{% endblock page_title %}
 
 
-{% load bootstrap3 %}
+{% load bootstrap4 %}
 {% block content %}
 <div id="customers">
     {% bootstrap_javascript jquery='full' %}  {# Embed Bootstrap JS+jQuery #}
diff --git a/apimanager/metrics/templates/metrics/api.html b/apimanager/metrics/templates/metrics/api.html
index b4ac713..98648c0 100644
--- a/apimanager/metrics/templates/metrics/api.html
+++ b/apimanager/metrics/templates/metrics/api.html
@@ -6,7 +6,7 @@
 {% block extrajs %}
     <script type="text/javascript" src="{% static 'metrics/js/lastEndpointMetric.js' %}"></script>
 {% endblock extrajs %}
-{% load bootstrap3 %}
+{% load bootstrap4 %}
 {% block content %}
 <div id="metrics">
 	{% bootstrap_javascript jquery='full' %}  {# Embed Bootstrap JS+jQuery #}
diff --git a/apimanager/metrics/templates/metrics/connector.html b/apimanager/metrics/templates/metrics/connector.html
index eb69c81..984916f 100644
--- a/apimanager/metrics/templates/metrics/connector.html
+++ b/apimanager/metrics/templates/metrics/connector.html
@@ -3,7 +3,7 @@
 {% load i18n %}
 
 {% block page_title %}{{ block.super }} / Connector Metrics{% endblock page_title %}
-{% load bootstrap3 %}
+{% load bootstrap4 %}
 {% block content %}
 <div id="metrics">
 	{% bootstrap_javascript jquery='full' %}  {# Embed Bootstrap JS+jQuery #}
diff --git a/apimanager/metrics/templates/metrics/custom_summary.html b/apimanager/metrics/templates/metrics/custom_summary.html
index deee2fc..522a4c1 100644
--- a/apimanager/metrics/templates/metrics/custom_summary.html
+++ b/apimanager/metrics/templates/metrics/custom_summary.html
@@ -2,7 +2,7 @@
 {% load static %}
 {% load i18n %}
 {% block page_title %}{{ block.super }} / API Usage Report{% endblock page_title %}
-{% load bootstrap3 %}
+{% load bootstrap4 %}
 {% block content %}
 <div id="metrics">
 	<h1>{% trans "API Usage Report" %}</h1>
diff --git a/apimanager/metrics/templates/metrics/daily_summary.html b/apimanager/metrics/templates/metrics/daily_summary.html
index 7842673..7ecc439 100644
--- a/apimanager/metrics/templates/metrics/daily_summary.html
+++ b/apimanager/metrics/templates/metrics/daily_summary.html
@@ -5,7 +5,7 @@
 
 {% block page_title %}{{ block.super }} / API Usage Report{% endblock page_title %}
 
-{% load bootstrap3 %}
+{% load bootstrap4 %}
 {% block content %}
 
 <div id="metrics">
diff --git a/apimanager/metrics/templates/metrics/hourly_summary.html b/apimanager/metrics/templates/metrics/hourly_summary.html
index 16cdffa..291a3aa 100644
--- a/apimanager/metrics/templates/metrics/hourly_summary.html
+++ b/apimanager/metrics/templates/metrics/hourly_summary.html
@@ -3,7 +3,7 @@
 
 {% block page_title %}{{ block.super }} / API Usage Report{% endblock page_title %}
 
-{% load bootstrap3 %}
+{% load bootstrap4 %}
 {% block content %}
 
 <div id="metrics">
diff --git a/apimanager/metrics/templates/metrics/monthly_summary.html b/apimanager/metrics/templates/metrics/monthly_summary.html
index 6eaeb26..d6720e2 100644
--- a/apimanager/metrics/templates/metrics/monthly_summary.html
+++ b/apimanager/metrics/templates/metrics/monthly_summary.html
@@ -2,7 +2,7 @@
 {% load static %}
 {% load i18n %}
 {% block page_title %}{{ block.super }} / API Usage Report{% endblock page_title %}
-{% load bootstrap3 %}
+{% load bootstrap4 %}
 {% block content %}
 <div id="metrics">
 	<h1>{% trans "API Usage Report" %}</h1>
diff --git a/apimanager/metrics/templates/metrics/quarterly_summary.html b/apimanager/metrics/templates/metrics/quarterly_summary.html
index f169e80..a5b32b5 100644
--- a/apimanager/metrics/templates/metrics/quarterly_summary.html
+++ b/apimanager/metrics/templates/metrics/quarterly_summary.html
@@ -4,7 +4,7 @@
 
 {% block page_title %}{{ block.super }} / API Usage Report{% endblock page_title %}
 
-{% load bootstrap3 %}
+{% load bootstrap4 %}
 {% block content %}
 
 <div id="metrics">
diff --git a/apimanager/metrics/templates/metrics/weekly_summary.html b/apimanager/metrics/templates/metrics/weekly_summary.html
index 07227ec..ec070eb 100644
--- a/apimanager/metrics/templates/metrics/weekly_summary.html
+++ b/apimanager/metrics/templates/metrics/weekly_summary.html
@@ -4,7 +4,7 @@
 
 {% block page_title %}{{ block.super }} / API Usage Report{% endblock page_title %}
 
-{% load bootstrap3 %}
+{% load bootstrap4 %}
 {% block content %}
 
 <div id="metrics">
diff --git a/apimanager/metrics/templates/metrics/yearly_summary.html b/apimanager/metrics/templates/metrics/yearly_summary.html
index 8fd2daf..4cfbfb8 100644
--- a/apimanager/metrics/templates/metrics/yearly_summary.html
+++ b/apimanager/metrics/templates/metrics/yearly_summary.html
@@ -4,7 +4,7 @@
 
 {% block page_title %}{{ block.super }} / API Usage Report{% endblock page_title %}
 
-{% load bootstrap3 %}
+{% load bootstrap4 %}
 {% block content %}
 
 <div id="metrics">
diff --git a/requirements.txt b/requirements.txt
index a97a807..639b1d5 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,5 +9,5 @@ gunicorn==22.0.0
 matplotlib
 django-bootstrap-datepicker-plus
 django-mathfilters
-django-bootstrap
+django-bootstrap4
 django-csp
\ No newline at end of file

From 599eb454a6b0e2d999b5a151199c6a4660b94801 Mon Sep 17 00:00:00 2001
From: tawoe <tawoe@posteo.de>
Date: Tue, 13 May 2025 15:16:36 +0200
Subject: [PATCH 2/3] code clean

---
 apimanager/apimanager/settings.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apimanager/apimanager/settings.py b/apimanager/apimanager/settings.py
index 9df1cb0..b5b7f07 100644
--- a/apimanager/apimanager/settings.py
+++ b/apimanager/apimanager/settings.py
@@ -301,7 +301,6 @@ ALLOW_DIRECT_LOGIN = True
 GATEWAYLOGIN_HAS_CBS = False
 ALLOW_GATEWAY_LOGIN = True
 
-# Use bootstrap4 if you are using Bootstrap 3
 BOOTSTRAP4 = {
     'include_jquery': True,
 }

From d3e49324968ee929268a5dc404c5c9a09f45131a Mon Sep 17 00:00:00 2001
From: tawoe <tawoe@posteo.de>
Date: Wed, 14 May 2025 09:17:31 +0200
Subject: [PATCH 3/3] disable date-picker in metrics

---
 apimanager/metrics/forms.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/apimanager/metrics/forms.py b/apimanager/metrics/forms.py
index f4f692d..0e90ec7 100644
--- a/apimanager/metrics/forms.py
+++ b/apimanager/metrics/forms.py
@@ -24,14 +24,14 @@ PLACEHOLDER2 = "00:00:00"
 class MetricsForm(forms.Form):
     from_date = forms.DateTimeField(
         label=_(FROM_DATE),
-        widget=DateTimePickerInput(format=API_DATE_FORMAT_WITH_DAY_DATE_TIME),
+        #widget=DateTimePickerInput(format=API_DATE_FORMAT_WITH_DAY_DATE_TIME),
         required=True,
         initial=(datetime.now() - timedelta(1)).strftime(API_DATE_FORMAT_WITH_DAY_DATE_TIME),
     )
 
     to_date = forms.DateTimeField(
         label=_(TO_DATE),
-        widget=DateTimePickerInput(format=API_DATE_FORMAT_WITH_DAY_DATE_TIME),
+        #widget=DateTimePickerInput(format=API_DATE_FORMAT_WITH_DAY_DATE_TIME),
         required=True,
         initial=(datetime.now() - timedelta()).strftime(API_DATE_FORMAT_WITH_DAY_DATE_TIME),
     )
@@ -157,7 +157,7 @@ class ConnectorMetricsForm(MetricsForm):
     # override from_date until API returns values without given date
     from_date = forms.DateTimeField(
         label=_(FROM_DATE),
-        widget=DateTimePickerInput(format=API_DATE_FORMAT_WITH_DAY_DATE_TIME),
+        #widget=DateTimePickerInput(format=API_DATE_FORMAT_WITH_DAY_DATE_TIME),
         required=True,
         initial=(datetime.now() - timedelta(6)).strftime(API_DATE_FORMAT_WITH_DAY_DATE_TIME),
     )
@@ -193,13 +193,13 @@ class ConnectorMetricsForm(MetricsForm):
 class CustomSummaryForm(forms.Form):
     to_date = forms.DateTimeField(
         label=_(TO_DATE),
-        widget=DateTimePickerInput(format=API_DATE_FORMAT_WITH_DAY_DATE_TIME),
+        #widget=DateTimePickerInput(format=API_DATE_FORMAT_WITH_DAY_DATE_TIME),
         required=True,
         initial=(datetime.now()).strftime(API_DATE_FORMAT_WITH_DAY_DATE_TIME),
     )
     from_date_custom = forms.DateTimeField(
         label=_(FROM_DATE),
-        widget=DateTimePickerInput(format=API_DATE_FORMAT_WITH_DAY_DATE_TIME),
+        #widget=DateTimePickerInput(format=API_DATE_FORMAT_WITH_DAY_DATE_TIME),
         required=True,
         initial=(datetime.now() - timedelta(6)).strftime(API_DATE_FORMAT_WITH_DAY_DATE_TIME),
     )