diff -r 47b2d872c210 -r 0641866df1b0 eskp.py --- a/eskp.py Fri Mar 11 09:43:34 2016 +0100 +++ b/eskp.py Fri Mar 11 09:45:30 2016 +0100 @@ -19,11 +19,11 @@ import base64 LANGUAGE_SELECTED = "de" -#ToDo after engelish is implemented set LANGUAGE_SELECTED = None +# ToDo after engelish is implemented set LANGUAGE_SELECTED = None # We need the path of this file to find templates to translate ESKP_PATH = os.path.dirname(os.path.abspath(__file__)) -logging.basicConfig(filename=os.path.join(ESKP_PATH, 'eskp-app.log'),level=logging.DEBUG) +logging.basicConfig(filename=os.path.join(ESKP_PATH, 'eskp-app.log'), level=logging.DEBUG) app = Flask(__name__) babel = Babel(app) @@ -31,12 +31,10 @@ app.config['BABEL_DEFAULT_LOCALE'] = 'de' - def get_vcard(filename): filename = os.path.join(ESKP_PATH, filename) with codecs.open(filename, 'r', 'utf-8') as f: - vcard = f.read() - f.close() + vcard = f.read() return vobject.readOne(vcard) @@ -46,25 +44,36 @@ if os.path.isfile(filename): with codecs.open(filename, 'r', 'utf-8') as f: rst_data = f.read() - f.close() content = publish_parts(rst_data, writer_name='html', settings_overrides=overrides)['html_body'] return content + +def get_newest_date(): + files = os.listdir(os.path.join(ESKP_PATH, 'static/images/uvmap')) + getdates = get_valid_dates(files) + newest_date = getdates[-1] + + return newest_date + + def get_topmenue(): + newest_date = get_newest_date() menue = [ - ('/ozoneloss', _(u'Ozoneloss'), - (('/ozoneloss', _(u'overview')), - ('/ozoneloss/clams/2016', _(u'calculations')), - ('/ozoneloss/vpsc/2016', _(u'estimations')), - ('/ozoneloss/uvi', _(u'uv increase')))), - - ('/eskp', _(u'ESKP'),(None, None)), - ('/iek-7', _(u'IEK-7'),(None, None)) - ] + ('/ozoneloss', _(u'Ozoneloss'), + (('/ozoneloss', _(u'overview')), + ('/ozoneloss/clams/2016', _(u'calculations')), + ('/ozoneloss/vpsc/2016', _(u'estimations')), + ('/ozoneloss/uvi', _(u'uv increase')), + ('/ozoneloss/uvmap/' + newest_date, _(u'uv index map')))), + ('/eskp', _(u'ESKP'), (None, None)), + ('/iek-7', _(u'IEK-7'), (None, None)) + ] return menue + app.jinja_env.globals.update(get_topmenue=get_topmenue) + def get_o3lossclams_dates(): menue = [ ('/ozoneloss/clams/2016', _(u'2016')), @@ -72,9 +81,48 @@ ('/ozoneloss/clams/2012', _(u'2012')), ('/ozoneloss/clams/2011', _(u'2011')), ('/ozoneloss/clams/2010', _(u'2010')), - ] + ] return menue + +def get_valid_dates(files): + dates = [] + + for file in files: + if file.endswith('.png') and file.find('uvi') >= 0: + date = file[-12:-6] + dates.append(date) + dates.sort() + for date in dates: + i = 0 + for param in ['uvi', 'o3col', 'do3col']: + testfile = 'clams_' + param + '_' + date + '12.png' + if files.count(testfile) > 0: + i = i + 1 + if i <> 3: + dates.remove(date) + return dates + + +def get_o3lossuvmap_dates(date_show): + + files = os.listdir(os.path.join(ESKP_PATH,'static/images/uvmap')) + dates = get_valid_dates(files) + ndates = len(dates) + ind = dates.index(date_show) + if ind ==0 : + chosendates = [dates[ind+1]] + elif ind >= ndates - 1: + chosendates= [dates[ind-1]] + else: + chosendates = [dates[ind-1], dates[ind+1]] + menue = [] + for date in chosendates: + text_date = date[-2:] + '.' + date[-4:-2] + '.' + menue.append(('/ozoneloss/uvmap/' + date, _(text_date))) + return menue + + def get_vpsc_dates(): menue = [ ('/ozoneloss/vpsc/2016', _(u'2016')), @@ -84,11 +132,13 @@ ('/ozoneloss/vpsc/2012', _(u'2012')), ('/ozoneloss/vpsc/2011', _(u'2011')), ('/ozoneloss/vpsc/2010', _(u'2010')), - ] + ] return menue + app.jinja_env.globals.update(get_o3lossclams_dates=get_o3lossclams_dates) app.jinja_env.globals.update(get_vpsc_dates=get_vpsc_dates) +app.jinja_env.globals.update(get_o3lossuvmap_dates=get_o3lossuvmap_dates) def modal_info(template, act, title, filename): @@ -118,6 +168,13 @@ return render_template("/ozoneloss_clams.html", act="ozoneloss/clams/%s" % year, content=content, year=year) +@app.route('/ozoneloss/uvmap/') +def ozoneloss_uvmap_date(date): + filename = os.path.join("templates", get_locale(), "rst", "ozoneloss_uvmap.rst") + content = get_content(filename) + return render_template("/ozoneloss_uvmap.html", act="ozoneloss/uvmap/%s" % date, content=content, date=date) + + @app.route('/ozoneloss/vpsc/') def ozoneloss_vspc_year(year): filename = os.path.join("templates", get_locale(), "rst", "ozoneloss_vpsc.rst") @@ -137,6 +194,7 @@ eskp_info=_(u'About ESKP'), ) + @app.route('/en') def en(): global LANGUAGE_SELECTED @@ -145,6 +203,7 @@ eskp_info=_(u'About ESKP'), ) + @app.route("/eskp") def eskp(): filename = os.path.join("templates", get_locale(), "rst", "eskp.rst") @@ -155,13 +214,13 @@ def qr_image_data(card): - buf= StringIO.StringIO() + buf = StringIO.StringIO() qr = qrcode.QRCode( version=1, error_correction=qrcode.constants.ERROR_CORRECT_L, box_size=2, border=2, - ) + ) qr.add_data(card.serialize()) qr.make(fit=True) img = qr.make_image() @@ -172,12 +231,12 @@ @app.route("/ozoneloss") def ozoneloss(): - filename = os.path.join("templates", get_locale(), "rst", "ozoneloss.rst") content = get_content(filename) vcard_file = os.path.join("vcards", "jug.vcf") author = u"" + try: card = get_vcard(vcard_file) except IOError: @@ -185,12 +244,13 @@ if card is not None: qr_image = qr_image_data(card) author = render_template("/author_info.html", act="author", title=_(u"Ozoneloss"), - card=card, image=qr_image, contact=_(u"Contact"), exit=_(u"Close")) + card=card, image=qr_image, contact=_(u"Contact"), exit=_(u"Close")) filename = os.path.join("templates", get_locale(), "rst", "ozoneloss_publications.rst") publications = modal_info("/publications_info.html", "publications", _(u"Ozoneloss"), filename) return render_template("/ozoneloss.html", act="ozoneloss", content=content, - author=author,card=card, publications=publications ) + author=author, card=card, publications=publications) + @app.route("/ozoneloss/clams") def ozoneloss_clams(): @@ -198,6 +258,14 @@ content = get_content(filename) return render_template("/ozoneloss_clams.html", act="ozoneloss/clams", content=content) + +@app.route("/ozoneloss/uvmap") +def ozoneloss_uvmap(): + filename = os.path.join("templates", get_locale(), "rst", "ozoneloss_uvmap.rst") + content = get_content(filename) + return render_template("/ozoneloss_uvmap.html", act="ozoneloss/uvmap", content=content) + + @app.route("/ozoneloss/vpsc") def ozoneloss_vspc(): filename = os.path.join("templates", get_locale(), "rst", "ozoneloss_vpsc.rst") @@ -215,10 +283,10 @@ o3offset = 50. figname = "uvincr_lat%0.3i_do3%0.3i.svg" % (lat, o3offset) - return render_template('ozoneloss_uvi.html', act="ozoneloss/uvi", content=content, figname=figname, alt=_(u"UV increase at {{lat}} degrees N for {{o3offset}} DU ozone depletion")) + @app.route("/ozoneloss/uvi_graph", methods=['POST']) def ozoneloss_uvi_graph(): filename = os.path.join("templates", get_locale(), "rst", "ozoneloss_uvi.rst") @@ -236,17 +304,12 @@ latstr2 = latstr2.replace(u'S', '') lat = -float(latstr2) - figname = "uvincr_lat%0.3i_do3%0.3i.svg" % (lat, float(o3offsetstr)) return render_template('graph.html', act="ozoneloss_uvi_graph", content=content, figname=figname, o3offsetstr=o3offsetstr, latstr=latstr) - - - - @app.route("/iek-7") def institute(): filename = os.path.join("templates", get_locale(), "rst", "iek-7.rst") @@ -260,7 +323,7 @@ if card is not None: qr_image = qr_image_data(card) author = render_template("/author_info.html", act="author", title=_(u"IEK-7"), - card=card, image=qr_image, contact=_(u"Contact"), exit=_(u"Close")) + card=card, image=qr_image, contact=_(u"Contact"), exit=_(u"Close")) return render_template("/iek-7.html", act="iek-7", content=content, author=author, card=card, contact=u"IEK-7") @@ -273,14 +336,12 @@ return render_template("/content.html", act="imprint", content=content) - - - @app.errorhandler(404) def page_not_found(e): msg = _(u"Url: %(url)s not found", url=request.url) info = _(u"This information is not available!") return render_template("404.html", msg=msg, info=info) + if __name__ == "__main__": - app.run(host='localhost', port=5014) + app.run(host='localhost', port=5014, debug=True)