Skip to content

C
clinicaltrials
Commit e71f354b authored by Romain Loth's avatar Romain Loth
Browse files
Options

minor messages cleanup and harmonizations

parent 3d435707
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 97 deletions
run.sh 100644 → 100755
View file @ e71f354b
File mode changed from 100644 to 100755
services/db.py
View file @ e71f354b
......@@ -405,14 +405,13 @@ def save_scholar(uid, date, safe_recs, reg_db, uactive=True, update_flag=False):
set_full_str,
uid
)
print(full_statmt)
mlog("DEBUG", "UPDATE" if update_flag else "INSERT", "SQL statement:", full_statmt)
reg_db_c.execute(full_statmt)
reg_db.commit()
def save_pairs_sch_kw(pairings_list, comex_db):
"""
Simply save all pairings (uid, kwid) in the list
......
services/main.py
View file @ e71f354b
......@@ -136,10 +136,9 @@ def services():
return redirect(url_for('login', _external=True))
# /services/test
@app.route(config['PREFIX'] + '/test', methods=['GET'])
def test_stuff():
print(UCACHE)
return render_template("message.html", message="UCACHE="+sub('<|&|>','::',repr(UCACHE)))
# @app.route(config['PREFIX'] + '/test', methods=['GET'])
# def test_stuff():
# return render_template("message.html", message="UCACHE="+sub('<|&|>','::',repr(UCACHE)))
# /services/api/aggs
@app.route(config['PREFIX'] + config['API_ROUTE'] + '/aggs')
......
services/user.py
View file @ e71f354b
......@@ -40,7 +40,7 @@ def load_user(uid):
UCACHE[uid] = u
mlog("DEBUG", "load_user: user re-loaded from DB")
except Exception as err:
print("User(%s) init error:" % str(uid), err)
mlog("ERROR", "User(%s) init error:" % str(uid), err)
return u
......
templates/message.html
View file @ e71f354b
......@@ -9,6 +9,7 @@
<!-- ======================================================================= -->
{% block main_content %}
<div class="row spacerrow">&nbsp;</div>
<div class="row">
<div class="spacer col-sm-1 col-md-1">&nbsp;</div>
<div class="col-sm-8 col-md-8">
......@@ -23,10 +24,3 @@
</div>
{% endblock %}
<!-- ======================================================================= -->
{% block last_imports %}
<!-- our js -->
<script src="{{ url_for('static', filename='js/comex_user_shared.js') }}"></script>
{% endblock %}
templates/thank_you.html
View file @ e71f354b
<!DOCTYPE html>
<html lang="fr-FR">
<head>
<meta charset="utf-8">
<title>Formulaire Community Explorer : réponses enregistrées</title>
<meta name="description" content="Formulaire d'enregistrement sur la plateforme Community Explorer (ISCPIF CNRS UPS 3611)">
<meta name="keywords" content="complex systems, community, registration form">
{% extends "base_layout.html" %}
<!-- CSS -->
<link type=text/css rel=stylesheet href="{{ url_for('static', filename='css/bootstrap.min.css') }}">
<link type=text/css rel=stylesheet href="{{ url_for('static', filename='css/topbar_bootstrap_retrocompatibility.css') }}">
<link type=text/css rel=stylesheet href="{{ url_for('static', filename='css/comex_reg.css') }}">
{% block headers %}
<title>Community Explorer Form : saved answers</title>
<meta name="description" content="Community Explorer (ISCPIF CNRS UPS 3611)">
<meta name="keywords" content="complex systems, community, registration form">
{% endblock %}
<!-- Piwik -->
<script type="text/javascript">
var _paq = _paq || [];
_paq.push(['trackPageView']);
_paq.push(['enableLinkTracking']);
(function() {
var u="//piwik.iscpif.fr/";
_paq.push(['setTrackerUrl', u+'piwik.php']);
_paq.push(['setSiteId', '4']);
var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
})();
</script>
<noscript><p><img src="//piwik.iscpif.fr/piwik.php?idsite=4" style="border:0;" alt="" /></p></noscript>
<!-- End Piwik Code -->
</head>
<body>
<div class="topbar" style="opacity: 0.93;">
<div class="topbar-inner">
<div class="container-fluid">
<a class="brand" href="http://www.iscpif.fr">
<span class="glyphicon glyphicon-home white"></i></a>
<ul class="white nav navbar-nav">
<li>
<a id="mainpagelink" href="/"> <strong>Complex systems community explorer</strong></a>
</li>
</ul>
</div>
</div>
</div>
<!-- ======================================================================= -->
<div class="page container-fluid">
{% block main_content %}
<div class="row spacerrow">&nbsp;</div>
<div class="row">
<div class="spacer col-sm-1 col-md-1">&nbsp;</div>
......@@ -89,44 +55,4 @@
<div class="spacer col-sm-2 col-md-2">&nbsp;</div>
</div>
<div class="row bigspacerrow">&nbsp;</div>
<!-- FOOTER TEXT AND LINKS -->
<footer>
<!-- This directory is maintained by the <a href="http://cssociety.org" target="blank">Complex Systems Society</a>
and the <a href="http://iscpif.fr" target="blank">Complex Systems Institute of Paris Ile-de-France</a>.<br/>-->
<center>
<a href="http://communityexplorer.org/about.html"><span class="glyphicon glyphicon-question-sign"></span> About</a> -
<a href="http://moma.csregistry.org/feedback" target="BLANK"><span class="glyphicon glyphicon-repeat"></span> Feedback</a> -
<a href="http://communityexplorer.org/privacy.html"> <span class="glyphicon glyphicon-list-alt"></span> Privacy</a>
<br>
Directory maintained by the
<a href="http://cssociety.org/" target="blank"> Complex Systems Society</a> and the
<a href="http://iscpif.fr/" target="blank">Complex Systems Institute of Paris Ile-de-France</a>.
<br>
<a href="http://cssociety.org/" target="_BLANK">
<img src="{{ url_for('static', filename='images/css.png') }}" alt="http://cssociety.org"
style="border: none; margin-bottom : -6px;"
title="isc-pif" height="25px">
</a>
<a href="http://iscpif.fr/">
<img src="{{ url_for('static', filename='images/iscpif_short.png') }}" alt="iscpif.fr"
style="border: none; margin-bottom : -6px;"
title="isc-pif">
</a>
<a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/3.0/" target="blank">
<img alt="Creative Commons License" style="border: none; margin-bottom : -6px;" src="{{ url_for('static', filename='images/cc.png') }}" height="20px">
</a> -
<!-- <a href="http://moma.csregistry.org/" target="_BLANK"> MOMA</a> - -->
<a href="http://iscpif.fr/" target="_BLANK">ISC-PIF</a> -
<a href="http://www.cnrs.fr/fr/recherche/index.htm" target="_BLANK">CNRS</a>.
</center>
<p>&nbsp;</p>
</footer>
</div>
</body>
</html>
{% endblock %}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment