Merge branch 'main' into sites

* main: 📝 Update release notes Always fetch the whole previous year and all of this year so far (TampereHacklab#444) 📝 Update release notes Bump werkzeug from 2.2.3 to 2.3.8 (TampereHacklab#454) 📝 Update release notes Bump pygments from 2.14.0 to 2.15.0 (TampereHacklab#451) 📝 Update release notes feat: add in-app settings panel using django-constance (TampereHacklab#433)
HacklabJKL · Dec 4, 2023 · 86ace31 · 86ace31
2 parents 0dfe603 + 431c368
commit 86ace31
Show file tree

Hide file tree

Showing 4 changed files with 101 additions and 86 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+* Always fetch the whole previous year and all of this year so far. PR [#444](https://github.com/TampereHacklab/mulysa/pull/444) by [@tswfi](https://github.com/tswfi).
+* Bump werkzeug from 2.2.3 to 2.3.8. PR [#454](https://github.com/TampereHacklab/mulysa/pull/454) by [@dependabot[bot]](https://github.com/apps/dependabot).
+* Bump pygments from 2.14.0 to 2.15.0. PR [#451](https://github.com/TampereHacklab/mulysa/pull/451) by [@dependabot[bot]](https://github.com/apps/dependabot).
+* feat: add in-app settings panel using django-constance. PR [#433](https://github.com/TampereHacklab/mulysa/pull/433) by [@braaar](https://github.com/braaar).
 * remove pyup from readme. PR [#442](https://github.com/TampereHacklab/mulysa/pull/442) by [@tswfi](https://github.com/tswfi).
 * remove pyup, using dependabot now. PR [#440](https://github.com/TampereHacklab/mulysa/pull/440) by [@tswfi](https://github.com/tswfi).
 * Small changes to custominvoice texts suggested on tampere channels. PR [#438](https://github.com/TampereHacklab/mulysa/pull/438) by [@tswfi](https://github.com/tswfi).

diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/www/static/www/graphs.js b/www/static/www/graphs.js
@@ -1,10 +1,15 @@
 async function renderTransactionsGraph() {
-  // for now default to fetching data 1 year back from now
-  // this fetches the data aggregated per day
+  // for now default to fetching all of last years data and this year untill today
+
+  // today
   let startDate = new Date();
+  // one year back
   startDate.setFullYear(startDate.getFullYear() - 1);
+  // january
+  startDate.setMonth(0);
   // and from the first day of the month
   startDate.setDate(1);
+
   const queryParams = {
     date__gte: startDate.toISOString().slice(0, 10),
   };

diff --git a/www/templates/www/banktransaction.html b/www/templates/www/banktransaction.html
@@ -1,8 +1,5 @@
-{% extends "www/base.html" %}
-{% load i18n %}
-{% load bootstrap4 %}
-{% block content %}
-{% load verbose_names %}
+{% extends "www/base.html" %} {% load i18n %} {% load bootstrap4 %} {% block
+content %} {% load verbose_names %}
 
 <h2>{% trans 'Bank Transaction' %}</h2>
 
@@ -13,42 +10,39 @@ <h2>{% trans 'Bank Transaction' %}</h2>
     {% trans 'Business ID' %}: {{config.RECEIPT_REGID}}<br />
   </p>
   <p>
-    {% get_verbose_field_name banktransaction "date" %}: {{ banktransaction.date }}<br />
+    {% get_verbose_field_name banktransaction "date" %}: {{ banktransaction.date
+    }}<br />
     {% trans 'Transaction id' %}: {{ banktransaction.id }}<br />
-    {% get_verbose_field_name banktransaction "reference_number" %}: {{ banktransaction.reference_number }}<br />
-    {% get_verbose_field_name banktransaction "archival_reference" %}: {{ banktransaction.archival_reference }}<br />
-    {% get_verbose_field_name banktransaction "sender" %}: {{ banktransaction.sender }}<br />
+    {% get_verbose_field_name banktransaction "reference_number" %}: {{
+    banktransaction.reference_number }}<br />
+    {% get_verbose_field_name banktransaction "archival_reference" %}: {{
+    banktransaction.archival_reference }}<br />
+    {% get_verbose_field_name banktransaction "sender" %}: {{
+    banktransaction.sender }}<br />
     {% trans 'User' %}: {{ banktransaction.user }}
   </p>
 
   <ul>
     {% for servicesubscription in banktransaction.servicesubscription_set.all %}
-      <li>{{servicesubscription.service.name}}</li>
-    {% endfor %}
-    {% for custominvoice in banktransaction.custominvoice_set.all %}
-      <li>{{custominvoice.subscription.service.name}}</li>
+    <li>{{servicesubscription.service.name}}</li>
+    {% endfor %} {% for custominvoice in banktransaction.custominvoice_set.all
+    %}
+    <li>{{custominvoice.subscription.service.name}}</li>
     {% endfor %}
   </ul>
-  <p>
-    {% trans 'Grand total' %}: {{ banktransaction.amount }}€
-  </p>
+  <p>{% trans 'Grand total' %}: {{ banktransaction.amount }}€</p>
 </div>
 
 <div id="vatinfo">
-  {# This might require tweaking... for now it seems to be #}
-  {# enough that it is mentioned that everything is VAT 0% #}
-  <p>
-    {% blocktrans %}
-      Seller not VAT-liable
-    {% endblocktrans %}
-  </p>
+  {# This might require tweaking... for now it seems to be #} {# enough that it
+  is mentioned that everything is VAT 0% #}
+  <p>{% blocktrans %} Seller not VAT-liable {% endblocktrans %}</p>
 </div>
 
 <div id="promoinfo">
   <p>
-    {% blocktrans with name=site.name %}
-     Thank you and please tell your friends about {{ name }} :)
-    {% endblocktrans %}
+    {% blocktrans with name=site.name %} Thank you and please tell your friends
+    about {{ name }} :) {% endblocktrans %}
   </p>
 </div>