FVDE/ennstatus Changeset - 2e387039df8d · Chaos Computer Club Lëtzebuerg Projects

Changeset - 2e387039df8d

Parent rev.

Child rev.

[Not reviewed]

Merge dev

0 2 0

Dennis Fink - 9 years ago 2015-10-27 23:11:53
dennis.fink@c3l.lu

Merged hotfix-received-total

2 files changed with 3 insertions and 2 deletions:

ennstatus/donate/views.py

setup.py

0 comments (0 inline, 0 general)

ennstatus/donate/views.py

➞

Show inline comments

@@ @@ -14,6 +14,7 @@ @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 from decimal import Decimal
 from flask import (Blueprint, render_template, request,
                    redirect, url_for, current_app)
@@ @@ -107,7 +108,7 @@ def received(): @@
             form.month.data = '{:02d}'.format(int(month))
             csv_file = load_csv(filename)
-        total = str(sum(int(row[2]) for row in csv_file))
+        total = str(sum(Decimal(row[2].replace(',', '.')) for row in csv_file))
         csv_file = load_csv(filename)
         current_app.logger.info('Return result')

setup.py

➞

Show inline comments

@@ @@ -11,7 +11,7 @@ def _get_requirements(): @@
 setup(name='Ennstatus',
-      version='5.2.0-dev',
+      version='5.2.1-dev',
       description=('Ennstatus provides the user with vital information about '
                    'the status of the organizations Tor servers.'),
       author='Frënn vun der Ënn',

0 comments (0 inline, 0 general)