Commit f56bb609 authored by khalid's avatar khalid
Browse files

Change color for not in DAFNEE journals

parent 4c796096
......@@ -418,7 +418,7 @@ output$shiny_table <- DT::renderDataTable({
datatable(this_table$table, style= "bootstrap4",class = 'table-bordered table-condensed',
caption = htmltools::tags$caption( style = 'caption-side: top; text-align: center;',
htmltools::HTML('Journal in DAFNEE : <span style="color:forestgreen; font-size:18px"><i class="glyphicon glyphicon-thumbs-up"></i></span>&nbsp;&nbsp;&nbsp; not in DAFNEE : <span style="color:red; font-size:18px"><i class="glyphicon glyphicon-thumbs-down"></i></span>&nbsp;&nbsp;&nbsp; not surveyed : <span style="color:grey; font-size:18px"><i class="glyphicon glyphicon-eye-close"></i></span>' )
htmltools::HTML('Journal in DAFNEE : <span style="color:forestgreen; font-size:18px"><i class="glyphicon glyphicon-thumbs-up"></i></span>&nbsp;&nbsp;&nbsp; not in DAFNEE : <span style="color:grey; font-size:18px"><i class="glyphicon glyphicon-thumbs-down"></i></span>&nbsp;&nbsp;&nbsp; not surveyed : <span style="color:grey; font-size:18px"><i class="glyphicon glyphicon-eye-close"></i></span>' )
),
options = list( pageLength = 15,
dom = "Bfrtip",
......@@ -444,7 +444,7 @@ output$shiny_table <- DT::renderDataTable({
targets=7,
render=JS('function(data, type, row, meta){',
' if(type === "display"){',
' var color = data === "ok" ? "forestgreen" : data === "no" ? "red" : "grey";',
' var color = data === "ok" ? "forestgreen" : data === "no" ? "grey" : "grey";',
' var gdata = data === "ok" ? "thumbs-up" : data === "no" ? "thumbs-down" : "eye-close"; ',
' return "<span style=\\\"color:" + color + "; font-size:18px\\\"><i class=\\\"glyphicon glyphicon-" + gdata + "\\\"></i></span>";',
' } else {',
......
......@@ -39,12 +39,17 @@ ps aux | grep shiny | grep -v grep | grep -v mbbshiny | awk '{print $2}'
# on shiny.mbb.univ-montp2.fr (162.38.181.10) juste 10 instances
sudo kill -9 $(ps aux | grep shiny | grep -v grep | grep -v mbbshiny | awk '{print $2}')
dossier="/usr/local/maintenance"
cd $dossier/bibethique
#get latest version
git reset --hard
git pull
rm -rf ../bibethique80*
for i in {0..9}
do
cp -R $dossier/bibethique $dossier/bibethique800$i
......@@ -58,12 +63,17 @@ ps aux | grep shiny | grep -v grep | grep -v mbbshiny | awk '{print $2}'
# on khalid (162.38.181.45) juste 10 instances
sudo kill -9 $(ps aux | grep shiny | grep -v grep | grep -v mbbshiny | awk '{print $2}')
dossier="/disk1/projets/workspace"
cd $dossier/bibethique
#get latest version
git reset --hard
git pull
rm -rf ../bibethique80*
for i in {0..9}
do
cp -R $dossier/bibethique $dossier/bibethique800$i
......@@ -166,18 +176,24 @@ http {
}
Dans fichier /etc/nginx/sites-enabled/shiny :
Dans fichier /etc/nginx/sites-enabled/shiny.conf :
server {
listen 80 default_server;
listen [::]:80 default_server;
listen 443 ssl default_server;
listen [::]:443 ssl default_server;
ssl_certificate /etc/letsencrypt/live/dafnee.isem-evolution.fr/fullchain.pem;
ssl_certificate /etc/letsencrypt/live/dafnee.isem-evolution.fr/fullchain.pem;
#ssl_certificate /etc/letsencrypt/live/www.domain.tld /fullchain.pem; # managed by Certbot
#ssl_certificate_key /etc/letsencrypt/live/www.domain.tld /privkey.pem; # managed by Certbot
root /opt/shiny;
index index.html index.htm index.nginx-debian.html;
server_name www.domain.tld DAFNEE.domain.tld;
server_name dafnee.isem-evolution.fr;
location /.well-known/acme-challenge/ {
root /var/www/html;
}
location / {
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
......
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