Changeset - ceb89e14107f
[Not reviewed]
default
0 5 0
Dennis Fink - 11 years ago 2013-11-18 23:23:51
dennis.fink@c3l.lu
updated ennstatus
5 files changed with 8 insertions and 8 deletions:
0 comments (0 inline, 0 general)
ennstatus/api/views.py
Show inline comments
 
@@ -97,7 +97,7 @@ def export(export_format, server_type):
 
            servers = list(all_servers_by_type(server_type.capitalize()))
 

	
 
        if export_format == 'json':
 
            response = {'enn-network': servers}
 
            response = {'enn_network': servers}
 
            current_app.logger.info('Returning as json!')
 
            return jsonify(response)
 
        else:
ennstatus/donate/functions.py
Show inline comments
 
@@ -8,7 +8,7 @@ def load_csv(date):
 
    filename = '.'.join([date, 'csv'])
 
    path = os.path.join('donations', filename)
 

	
 
    with open(path, newline='') as csvfile:
 
    with open(path) as csvfile:
 
        csvreader = csv.reader(csvfile, delimiter=',')
 

	
 
        for row in csvreader:
ennstatus/donate/views.py
Show inline comments
 
@@ -69,7 +69,7 @@ def received():
 
                csv_file = load_csv(date)
 
            else:
 
                current_app.logger.warn('Date %s not found' % date)
 
                return ('Date %s not found!', 500,
 
                return ('Date %s not found!' % date, 500,
 
                        {'Content-Type': 'text/plain'})
 
        else:
 
            current_app.logger.info('Showing last date %s' % choices[-1])
ennstatus/templates/api/extract/xml/network.xml
Show inline comments
 
<?xml version="1.0" encoding="UTF-8" ?>
 
<enn-network>
 
<enn_network>
 
  {% for server in servers %}
 
    {%- include "api/extract/xml/server.xml" %}
 
  {% endfor %}
 
</enn-network>
 
</enn_network>
ennstatus/templates/donate/macros.html
Show inline comments
 
@@ -24,9 +24,9 @@
 
      {% for row in csv_file %}
 
        <tr>
 
          <td>{{ loop.index }}</td>
 
          <td>{{ row[0] }}</td>
 
          <td>{{ row[1] }}</td>
 
          <td>{{ colorize_numbers(row[2]) }}</td>
 
          <td>{{ row[0].decode('utf-8') }}</td>
 
          <td>{{ row[1].decode('utf-8') }}</td>
 
          <td>{{ colorize_numbers(row[2].decode('utf-8')) }}</td>
 
        </tr>
 
      {% endfor %}
 
    </tbody>
0 comments (0 inline, 0 general)