Changeset - e74dadda6adc
Parent rev.
Child rev.
[Not reviewed]
feature-donation-statistics
0 2 1
Dennis Fink - 9 years ago 2015-10-29 00:03:55
dennis.fink@c3l.lu
Begin empty template for donation statistics
3 files changed with 35 insertions and 0 deletions:
ennstatus/donate/views.py
5
ennstatus/templates/base.html
2
ennstatus/templates/donate/statistics.html
28
0 comments (0 inline, 0 general)
ennstatus/donate/views.py
➞
Show inline comments
 
@@ -76,48 +76,53 @@ def received():
 

			




	
	
	
		
 
    if not year_choices:

			




	
	
	
		
 
        current_app.logger.warn('No donations found!')

			




	
	
	
		
 
        return render_template('donate/received.html',

			




	
	
	
		
 
                               form=form, csv_file=None,

			




	
	
	
		
 
                               year=None, month=None, total=None)

			




	
	
	
		
 

			




	
	
	
		
 
    if request.method == 'POST':

			




	
	
	
		
 
        current_app.logger.debug('Validating form')

			




	
	
	
		
 
        if form.validate_on_submit():

			




	
	
	
		
 
            year = form.year.data

			




	
	
	
		
 
            month = form.month.data

			




	
	
	
		
 
            return redirect(url_for('donate.received', year=year, month=month))

			




	
	
	
		
 
    else:

			




	
	
	
		
 
        if 'year' in request.args and 'month' in request.args:

			




	
	
	
		
 
            year = request.args['year']

			




	
	
	
		
 
            month = request.args['month']

			




	
	
	
		
 
            form.year.data = year

			




	
	
	
		
 
            form.month.data = '{:02d}'.format(int(month))

			




	
	
	
		
 
            filename = '-'.join([year, month])

			




	
	
	
		
 
            if filename in files:

			




	
	
	
		
 
                current_app.logger.info('Showing date %s' % filename)

			




	
	
	
		
 
                csv_file = load_csv(filename)

			




	
	
	
		
 
            else:

			




	
	
	
		
 
                current_app.logger.warn('Date %s not found' % filename)

			




	
	
	
		
 
                return render_template('donate/received.html',

			




	
	
	
		
 
                                       form=form, csv_file=None,

			




	
	
	
		
 
                                       year=year, month=month, total=None)

			




	
	
	
		
 
        else:

			




	
	
	
		
 
            filename = files[-1]

			




	
	
	
		
 
            current_app.logger.info('Showing last date %s' % filename)

			




	
	
	
		
 
            year, month = filename.split('-')

			




	
	
	
		
 
            form.year.data = year

			




	
	
	
		
 
            form.month.data = '{:02d}'.format(int(month))

			




	
	
	
		
 
            csv_file = load_csv(filename)

			




	
	
	
		
 

			




	
	
	
		
 
        total = format_decimal(

			




	
	
	
		
 
            sum(

			




	
	
	
		
 
                parse_decimal(row[2], locale='de') for row in csv_file

			




	
	
	
		
 
            ),

			




	
	
	
		
 
            locale='de'

			




	
	
	
		
 
        )

			




	
	
	
		
 
        csv_file = load_csv(filename)

			




	
	
	
		
 

			




	
	
	
		
 
        current_app.logger.info('Return result')

			




	
	
	
		
 
        return render_template('donate/received.html',

			




	
	
	
		
 
                               form=form, csv_file=csv_file,

			




	
	
	
		
 
                               year=year, month=month, total=total)

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
@donate_page.route('/statistics')

			




	
	
	
		
 
def statistics():

			




	
	
	
		
 
    return render_template('donate/statistics.html')

			




        

    


    
    

    

        

                

                    ennstatus/templates/base.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -49,96 +49,98 @@

			




	
	
	
		
 
  <link rel="stylesheet" href="{{ url_for('static', filename='css/ennstatus.css') }}" />

			




	
	
	
		
 
  <link rel="shortcut icon" href="{{ url_for('static', filename='images/favicon.png') }}">

			




	
	
	
		
 
{% endblock %}

			




	
	
	
		
 

			




	
	
	
		
 
{% block body %}

			




	
	
	
		
 
<a href="#content" class="sr-only">Skip to main content</a>

			




	
	
	
		
 
<div class="container">

			




	
	
	
		
 
  {% block navbar %}

			




	
	
	
		
 
  <div class="navbar navbar-default">

			




	
	
	
		
 
    <div class="navbar-header">

			




	
	
	
		
 
      <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">

			




	
	
	
		
 
        <span class="icon-bar"></span>

			




	
	
	
		
 
        <span class="icon-bar"></span>

			




	
	
	
		
 
        <span class="icon-bar"></span>

			




	
	
	
		
 
      </button>

			




	
	
	
		
 
      <img class="navbar-brand" src="{{ url_for('static', filename='images/logo/FVDE_logo_thumbnail.png') }}"></img>

			




	
	
	
		
 
      <a class="navbar-brand" href="{{ url_for('root.index') }}">Enn.lu</a>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    <div class="navbar-collapse collapse">

			




	
	
	
		
 
      <ul class="nav navbar-nav">

			




	
	
	
		
 
        <li class="dropdown">

			




	
	
	
		
 
          <a href="#" class="dropdown-toggle" data-toggle="dropdown">About <b class="caret"></b></a>

			




	
	
	
		
 
          <ul class="dropdown-menu">

			




	
	
	
		
 
            <li><a href="//{{ wiki_url }}/doku.php?id=news" target="blank">News</a></li>

			




	
	
	
		
 
            <li class="divider"></li>

			




	
	
	
		
 
            <li><a href="{{ url_for('root.about') }}">Organization</a></li>

			




	
	
	
		
 
            <li><a href="{{ url_for('root.partners') }}">Partners</a></li>

			




	
	
	
		
 
          </ul>

			




	
	
	
		
 
        </li>

			




	
	
	
		
 
        <li class="dropdown">

			




	
	
	
		
 
          <a href="#" class="dropdown-toggle" data-toggle="dropdown">Services <b class="caret"></b></a>

			




	
	
	
		
 
          <ul class="dropdown-menu">

			




	
	
	
		
 
            <li><a href="{{ url_for('status.index') }}">Tor Servers</a></li>

			




	
	
	
		
 
            <li class="divider"></li>

			




	
	
	
		
 
            <li><a href="{{ url_for('root.mirrors') }}">Mirrors</a></li>

			




	
	
	
		
 
            <li><a href="//{{ wiki_url }}">Wiki</a></li>

			




	
	
	
		
 
            <li class="divider"></li>

			




	
	
	
		
 
            <li><a href="{{ url_for('root.ennstatus') }}">About Ënnstatus</a></li>

			




	
	
	
		
 
          </ul>

			




	
	
	
		
 
        </li>

			




	
	
	
		
 
        <li class="dropdown">

			




	
	
	
		
 
          <a href="#" class="dropdown-toggle" data-toggle="dropdown">Support <b class="caret"></b></a>

			




	
	
	
		
 
          <ul class="dropdown-menu">

			




	
	
	
		
 
            <li><a href="{{ url_for('donate.index') }}">Donate</a></li>

			




	
	
	
		
 
            <li><a href="{{ url_for('donate.received') }}">Donation history</a></li>

			




	
	
	
		
 
            <li><a href="{{ url_for('root.bridgeprogram')}}">Adopt a Bridge</a></li>

			




	
	
	
		
 
            <li class="divider"></li>

			




	
	
	
		
 
            <li><a href="{{ url_for('root.member') }}">Join Us</a></li>

			




	
	
	
		
 
            <li class="divider"></li>

			




	
	
	
		
 
            <li><a href="{{ url_for('donate.statistics') }}">Donation statistics</a></li>

			




	
	
	
		
 
            <li class="dropdown-submenu">

			




	
	
	
		
 
            </li>

			




	
	
	
		
 
          </ul>

			




	
	
	
		
 
        </li>

			




	
	
	
		
 
        <li class="dropdown">

			




	
	
	
		
 
          <a href="#" class="dropdown-toggle" data-toggle="dropdown">Contact <b class="caret"></b></a>

			




	
	
	
		
 
          <ul class="dropdown-menu">

			




	
	
	
		
 
            <li><a href="{{ url_for('root.contact') }}">General</a></li>

			




	
	
	
		
 
            <li><a href="{{ url_for('root.abuse') }}">Abuse</a></li>

			




	
	
	
		
 
            <li class="divider"></li>

			




	
	
	
		
 
            <li><a href="https://twitter.com/FrennVunDerEnn" target="blank">Twitter</a></li>

			




	
	
	
		
 
            <li><a href="http://lists.enn.lu/listinfo/discuss" target="blank">Mailing List</a></li>

			




	
	
	
		
 
          </ul>

			




	
	
	
		
 
        </li>

			




	
	
	
		
 
      </ul>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
  </div>

			




	
	
	
		
 
  {% endblock %}

			




	
	
	
		
 
  <div class="row" id="content">

			




	
	
	
		
 
  {% with messages = get_flashed_messages(with_categories=True) %}

			




	
	
	
		
 
    {% if messages %}

			




	
	
	
		
 
      <div class="col-md-12">

			




	
	
	
		
 
        {% for category, message in messages %}

			




	
	
	
		
 
          {{ base_macros.display_error(category, message) }}

			




	
	
	
		
 
        {% endfor %}

			




	
	
	
		
 
      </div>

			




	
	
	
		
 
    {% endif %}

			




	
	
	
		
 
  {% endwith %}

			




	
	
	
		
 
  {% block content %}

			




	
	
	
		
 
  {% endblock %}

			




	
	
	
		
 
  </div>

			




	
	
	
		
 
  <footer class="col-md-12">

			




	
	
	
		
 
    <hr style="margin-bottom: 0.5%;">

			




	
	
	
		
 
    <div class="text-center clearfix">

			




	
	
	
		
 
      <div class="pull-left">

			




	
	
	
		
 
        <a href="https://twitter.com/FrennVunDerEnn" target="blank">@FrennVunDerEnn</a>

			




	
	
	
		
 
      </div>

			




	
	
	
		
 
      <strong>Frënn vun der Enn a.s.b.l.</strong>  <em>(R.C.S. Luxembourg F 9.478)</em>

			




	
	
	
		
 
      <div class="pull-right">

			




	
	
	
		
 
        <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_US" target="blank">CC-BY-NC-SA</a>

			




	
	
	
		
 
      </div>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
  </footer>

			




	
	
	
		
 
</div>

			




	
	
	
		
 

			




	
	
	
		
 
{% block scripts %}

			




	
	
	
		
 
  {{ super() }}

			




	
	
	
		
 
{% endblock %}

			




        

    


    
    

    

        

                

                    ennstatus/templates/donate/statistics.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
new file 100644

			




	
	
	
		
 
{# Ënnstatus

			




	
	
	
		
 
   Copyright (C) 2015  Dennis Fink

			




	
	
	
		
 

			




	
	
	
		
 
   This program is free software: you can redistribute it and/or modify

			




	
	
	
		
 
   it under the terms of the GNU General Public License as published by

			




	
	
	
		
 
   the Free Software Foundation, either version 3 of the License, or

			




	
	
	
		
 
   (at your option) any later version.

			




	
	
	
		
 

			




	
	
	
		
 
   This program is distributed in the hope that it will be useful,

			




	
	
	
		
 
   but WITHOUT ANY WARRANTY; without even the implied warranty of

			




	
	
	
		
 
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

			




	
	
	
		
 
   GNU General Public License for more details.

			




	
	
	
		
 

			




	
	
	
		
 
   You should have received a copy of the GNU General Public License

			




	
	
	
		
 
   along with this program.  If not, see <http://www.gnu.org/licenses/>.

			




	
	
	
		
 
#}

			




	
	
	
		
 

			




	
	
	
		
 
{% extends "base.html" %}

			




	
	
	
		
 

			




	
	
	
		
 
{% set title = "Donate - Statistics" %}

			




	
	
	
		
 

			




	
	
	
		
 
{% block content %}

			




	
	
	
		
 
  <div class="col-md-12">

			




	
	
	
		
 
    <h2>Donate Statistics</h2>

			




	
	
	
		
 
  </div>

			




	
	
	
		
 
  <div class="col-md-12">

			




	
	
	
		
 
  </div>

			




	
	
	
		
 
{% endblock %}

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        Server instance: saturn-1598796
    
    
        This site is powered by
            Kallithea,
        which is
        © 2010–2021 by various authors & licensed under GPLv3.
            – Support