David Saylor commited on
Commit ·
345e437
1
Parent(s): 5aeb1bd
updated with stylesheet
Browse files- CHRIS.py +0 -4
- static/styles.css +42 -0
- templates/exposure_index.html +1 -45
- templates/exposure_report.html +1 -3
- templates/index.html +3 -45
- templates/main.html +1 -3
- templates/report.html +1 -3
CHRIS.py
CHANGED
|
@@ -98,22 +98,18 @@ def app_post():
|
|
| 98 |
chemName = ''
|
| 99 |
|
| 100 |
if caIndex < 11:
|
| 101 |
-
isCA = True
|
| 102 |
MW = caData[caIndex][2]
|
| 103 |
chemName = '*' + caData[caIndex][0].decode('UTF-8') + '*'
|
| 104 |
impurity = float(request.form["impurity"]) * amount * 1e-2
|
| 105 |
if caIndex == 11:
|
| 106 |
-
isCA = True
|
| 107 |
MW = caData[caIndex][2]
|
| 108 |
chemName = '*' + request.form["chemName"] + '*'
|
| 109 |
impurity = float(request.form["impurity"]) * amount * 1e-2
|
| 110 |
if caIndex == 12:
|
| 111 |
-
isCA = True
|
| 112 |
MW = float(request.form["MW"])
|
| 113 |
chemName = '*' + request.form["chemName"] + '*'
|
| 114 |
impurity = float(request.form["impurity"]) * amount * 1e-2
|
| 115 |
if caIndex == 13:
|
| 116 |
-
isCA = False
|
| 117 |
MW = float(request.form["MW"])
|
| 118 |
chemName = '*' + request.form["chemName"] + '*'
|
| 119 |
|
|
|
|
| 98 |
chemName = ''
|
| 99 |
|
| 100 |
if caIndex < 11:
|
|
|
|
| 101 |
MW = caData[caIndex][2]
|
| 102 |
chemName = '*' + caData[caIndex][0].decode('UTF-8') + '*'
|
| 103 |
impurity = float(request.form["impurity"]) * amount * 1e-2
|
| 104 |
if caIndex == 11:
|
|
|
|
| 105 |
MW = caData[caIndex][2]
|
| 106 |
chemName = '*' + request.form["chemName"] + '*'
|
| 107 |
impurity = float(request.form["impurity"]) * amount * 1e-2
|
| 108 |
if caIndex == 12:
|
|
|
|
| 109 |
MW = float(request.form["MW"])
|
| 110 |
chemName = '*' + request.form["chemName"] + '*'
|
| 111 |
impurity = float(request.form["impurity"]) * amount * 1e-2
|
| 112 |
if caIndex == 13:
|
|
|
|
| 113 |
MW = float(request.form["MW"])
|
| 114 |
chemName = '*' + request.form["chemName"] + '*'
|
| 115 |
|
static/styles.css
ADDED
|
@@ -0,0 +1,42 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
body {font-family: Arial, Helvetica, sans-serif;}
|
| 2 |
+
|
| 3 |
+
/* The Modal (background) */
|
| 4 |
+
.modal {
|
| 5 |
+
display: none; /* Hidden by default */
|
| 6 |
+
position: fixed; /* Stay in place */
|
| 7 |
+
z-index: 1; /* Sit on top */
|
| 8 |
+
padding-top: 100px; /* Location of the box */
|
| 9 |
+
left: 0;
|
| 10 |
+
top: 0;
|
| 11 |
+
width: 100%; /* Full width */
|
| 12 |
+
height: 100%; /* Full height */
|
| 13 |
+
max-height: calc(100vh - 210px);
|
| 14 |
+
overflow: auto; /* Enable scroll if needed */
|
| 15 |
+
background-color: rgb(0,0,0); /* Fallback color */
|
| 16 |
+
background-color: rgba(0,0,0,0.4); /* Black w/ opacity */
|
| 17 |
+
}
|
| 18 |
+
|
| 19 |
+
/* Modal Content */
|
| 20 |
+
.modal-content {
|
| 21 |
+
background-color: #fefefe;
|
| 22 |
+
margin: auto;
|
| 23 |
+
padding: 20px;
|
| 24 |
+
border: 1px solid #888;
|
| 25 |
+
width: 80%;
|
| 26 |
+
}
|
| 27 |
+
|
| 28 |
+
/* The Close Button */
|
| 29 |
+
.close {
|
| 30 |
+
color: #aaaaaa;
|
| 31 |
+
float: right;
|
| 32 |
+
font-size: 28px;
|
| 33 |
+
font-weight: bold;
|
| 34 |
+
}
|
| 35 |
+
|
| 36 |
+
.close:hover,
|
| 37 |
+
.close:focus {
|
| 38 |
+
color: #000;
|
| 39 |
+
text-decoration: none;
|
| 40 |
+
cursor: pointer;
|
| 41 |
+
}
|
| 42 |
+
|
templates/exposure_index.html
CHANGED
|
@@ -6,51 +6,7 @@
|
|
| 6 |
<script src="https://cdn.jsdelivr.net/npm/jquery@3.5.1/dist/jquery.slim.min.js" integrity="sha384-DfXdz2htPH0lsSSs5nCTpuj/zy4C+OGpamoFVy38MVBnE+IbbVYUew+OrCXaRkfj" crossorigin="anonymous"></script>
|
| 7 |
<script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.1/dist/umd/popper.min.js" integrity="sha384-9/reFTGAW83EW2RDu2S0VKaIzap3H66lZH81PoYlFhbGU+6BZp6G7niu735Sk7lN" crossorigin="anonymous"></script>
|
| 8 |
<script src="https://cdn.jsdelivr.net/npm/bootstrap@4.6.1/dist/js/bootstrap.min.js" integrity="sha384-VHvPCCyXqtD5DqJeNxl2dtTyhF78xXNXdkwX1CZeRusQfRKp+tA7hAShOK/B/fQ2" crossorigin="anonymous"></script>
|
| 9 |
-
<
|
| 10 |
-
body {font-family: Arial, Helvetica, sans-serif;}
|
| 11 |
-
|
| 12 |
-
/* The Modal (background) */
|
| 13 |
-
.modal {
|
| 14 |
-
display: none; /* Hidden by default */
|
| 15 |
-
position: fixed; /* Stay in place */
|
| 16 |
-
z-index: 1; /* Sit on top */
|
| 17 |
-
padding-top: 100px; /* Location of the box */
|
| 18 |
-
left: 0;
|
| 19 |
-
top: 0;
|
| 20 |
-
width: 100%; /* Full width */
|
| 21 |
-
height: 100%; /* Full height */
|
| 22 |
-
max-height: calc(100vh - 210px);
|
| 23 |
-
overflow: auto; /* Enable scroll if needed */
|
| 24 |
-
background-color: rgb(0,0,0); /* Fallback color */
|
| 25 |
-
background-color: rgba(0,0,0,0.4); /* Black w/ opacity */
|
| 26 |
-
}
|
| 27 |
-
|
| 28 |
-
/* Modal Content */
|
| 29 |
-
.modal-content {
|
| 30 |
-
background-color: #fefefe;
|
| 31 |
-
margin: auto;
|
| 32 |
-
padding: 20px;
|
| 33 |
-
border: 1px solid #888;
|
| 34 |
-
width: 80%;
|
| 35 |
-
}
|
| 36 |
-
|
| 37 |
-
/* The Close Button */
|
| 38 |
-
.close {
|
| 39 |
-
color: #aaaaaa;
|
| 40 |
-
float: right;
|
| 41 |
-
font-size: 28px;
|
| 42 |
-
font-weight: bold;
|
| 43 |
-
}
|
| 44 |
-
|
| 45 |
-
.close:hover,
|
| 46 |
-
.close:focus {
|
| 47 |
-
color: #000;
|
| 48 |
-
text-decoration: none;
|
| 49 |
-
cursor: pointer;
|
| 50 |
-
}
|
| 51 |
-
|
| 52 |
-
</style>
|
| 53 |
-
|
| 54 |
</head>
|
| 55 |
|
| 56 |
<header>
|
|
|
|
| 6 |
<script src="https://cdn.jsdelivr.net/npm/jquery@3.5.1/dist/jquery.slim.min.js" integrity="sha384-DfXdz2htPH0lsSSs5nCTpuj/zy4C+OGpamoFVy38MVBnE+IbbVYUew+OrCXaRkfj" crossorigin="anonymous"></script>
|
| 7 |
<script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.1/dist/umd/popper.min.js" integrity="sha384-9/reFTGAW83EW2RDu2S0VKaIzap3H66lZH81PoYlFhbGU+6BZp6G7niu735Sk7lN" crossorigin="anonymous"></script>
|
| 8 |
<script src="https://cdn.jsdelivr.net/npm/bootstrap@4.6.1/dist/js/bootstrap.min.js" integrity="sha384-VHvPCCyXqtD5DqJeNxl2dtTyhF78xXNXdkwX1CZeRusQfRKp+tA7hAShOK/B/fQ2" crossorigin="anonymous"></script>
|
| 9 |
+
<link rel= "stylesheet" type= "text/css" href= "{{ url_for('static',filename='styles.css') }}">
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 10 |
</head>
|
| 11 |
|
| 12 |
<header>
|
templates/exposure_report.html
CHANGED
|
@@ -5,9 +5,7 @@
|
|
| 5 |
<title>CHRIS Report</title>
|
| 6 |
<script src="https://polyfill.io/v3/polyfill.min.js?features=es6"></script>
|
| 7 |
<script id="MathJax-script" async src="https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js"></script>
|
| 8 |
-
<
|
| 9 |
-
body {font-family: Arial, Helvetica, sans-serif;}
|
| 10 |
-
</style>
|
| 11 |
|
| 12 |
</head>
|
| 13 |
|
|
|
|
| 5 |
<title>CHRIS Report</title>
|
| 6 |
<script src="https://polyfill.io/v3/polyfill.min.js?features=es6"></script>
|
| 7 |
<script id="MathJax-script" async src="https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js"></script>
|
| 8 |
+
<link rel= "stylesheet" type= "text/css" href= "{{ url_for('static',filename='styles.css') }}">
|
|
|
|
|
|
|
| 9 |
|
| 10 |
</head>
|
| 11 |
|
templates/index.html
CHANGED
|
@@ -3,53 +3,11 @@
|
|
| 3 |
<head>
|
| 4 |
<meta charset="UTF-8">
|
| 5 |
<title>CHRIS</title>
|
| 6 |
-
|
|
|
|
| 7 |
<script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.1/dist/umd/popper.min.js" integrity="sha384-9/reFTGAW83EW2RDu2S0VKaIzap3H66lZH81PoYlFhbGU+6BZp6G7niu735Sk7lN" crossorigin="anonymous"></script>
|
| 8 |
<script src="https://cdn.jsdelivr.net/npm/bootstrap@4.6.1/dist/js/bootstrap.min.js" integrity="sha384-VHvPCCyXqtD5DqJeNxl2dtTyhF78xXNXdkwX1CZeRusQfRKp+tA7hAShOK/B/fQ2" crossorigin="anonymous"></script>
|
| 9 |
-
<
|
| 10 |
-
body {font-family: Arial, Helvetica, sans-serif;}
|
| 11 |
-
|
| 12 |
-
/* The Modal (background) */
|
| 13 |
-
.modal {
|
| 14 |
-
display: none; /* Hidden by default */
|
| 15 |
-
position: fixed; /* Stay in place */
|
| 16 |
-
z-index: 1; /* Sit on top */
|
| 17 |
-
padding-top: 100px; /* Location of the box */
|
| 18 |
-
left: 0;
|
| 19 |
-
top: 0;
|
| 20 |
-
width: 100%; /* Full width */
|
| 21 |
-
height: 100%; /* Full height */
|
| 22 |
-
max-height: calc(100vh - 210px);
|
| 23 |
-
overflow: auto; /* Enable scroll if needed */
|
| 24 |
-
background-color: rgb(0,0,0); /* Fallback color */
|
| 25 |
-
background-color: rgba(0,0,0,0.4); /* Black w/ opacity */
|
| 26 |
-
}
|
| 27 |
-
|
| 28 |
-
/* Modal Content */
|
| 29 |
-
.modal-content {
|
| 30 |
-
background-color: #fefefe;
|
| 31 |
-
margin: auto;
|
| 32 |
-
padding: 20px;
|
| 33 |
-
border: 1px solid #888;
|
| 34 |
-
width: 80%;
|
| 35 |
-
}
|
| 36 |
-
|
| 37 |
-
/* The Close Button */
|
| 38 |
-
.close {
|
| 39 |
-
color: #aaaaaa;
|
| 40 |
-
float: right;
|
| 41 |
-
font-size: 28px;
|
| 42 |
-
font-weight: bold;
|
| 43 |
-
}
|
| 44 |
-
|
| 45 |
-
.close:hover,
|
| 46 |
-
.close:focus {
|
| 47 |
-
color: #000;
|
| 48 |
-
text-decoration: none;
|
| 49 |
-
cursor: pointer;
|
| 50 |
-
}
|
| 51 |
-
|
| 52 |
-
</style>
|
| 53 |
|
| 54 |
</head>
|
| 55 |
|
|
|
|
| 3 |
<head>
|
| 4 |
<meta charset="UTF-8">
|
| 5 |
<title>CHRIS</title>
|
| 6 |
+
|
| 7 |
+
<script src="https://cdn.jsdelivr.net/npm/jquery@3.5.1/dist/jquery.slim.min.js" integrity="sha384-DfXdz2htPH0lsSSs5nCTpuj/zy4C+OGpamoFVy38MVBnE+IbbVYUew+OrCXaRkfj" crossorigin="anonymous"></script>
|
| 8 |
<script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.1/dist/umd/popper.min.js" integrity="sha384-9/reFTGAW83EW2RDu2S0VKaIzap3H66lZH81PoYlFhbGU+6BZp6G7niu735Sk7lN" crossorigin="anonymous"></script>
|
| 9 |
<script src="https://cdn.jsdelivr.net/npm/bootstrap@4.6.1/dist/js/bootstrap.min.js" integrity="sha384-VHvPCCyXqtD5DqJeNxl2dtTyhF78xXNXdkwX1CZeRusQfRKp+tA7hAShOK/B/fQ2" crossorigin="anonymous"></script>
|
| 10 |
+
<link rel= "stylesheet" type= "text/css" href= "{{ url_for('static',filename='styles.css') }}">
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 11 |
|
| 12 |
</head>
|
| 13 |
|
templates/main.html
CHANGED
|
@@ -5,9 +5,7 @@
|
|
| 5 |
<title>CHRIS</title>
|
| 6 |
<script src="https://polyfill.io/v3/polyfill.min.js?features=es6"></script>
|
| 7 |
<script id="MathJax-script" async src="https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js"></script>
|
| 8 |
-
<
|
| 9 |
-
body {font-family: Arial, Helvetica, sans-serif;}
|
| 10 |
-
</style>
|
| 11 |
</head>
|
| 12 |
|
| 13 |
<header>
|
|
|
|
| 5 |
<title>CHRIS</title>
|
| 6 |
<script src="https://polyfill.io/v3/polyfill.min.js?features=es6"></script>
|
| 7 |
<script id="MathJax-script" async src="https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js"></script>
|
| 8 |
+
<link rel= "stylesheet" type= "text/css" href= "{{ url_for('static',filename='styles.css') }}">
|
|
|
|
|
|
|
| 9 |
</head>
|
| 10 |
|
| 11 |
<header>
|
templates/report.html
CHANGED
|
@@ -5,9 +5,7 @@
|
|
| 5 |
<title>CHRIS Report</title>
|
| 6 |
<script src="https://polyfill.io/v3/polyfill.min.js?features=es6"></script>
|
| 7 |
<script id="MathJax-script" async src="https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js"></script>
|
| 8 |
-
<
|
| 9 |
-
body {font-family: Arial, Helvetica, sans-serif;}
|
| 10 |
-
</style>
|
| 11 |
|
| 12 |
</head>
|
| 13 |
|
|
|
|
| 5 |
<title>CHRIS Report</title>
|
| 6 |
<script src="https://polyfill.io/v3/polyfill.min.js?features=es6"></script>
|
| 7 |
<script id="MathJax-script" async src="https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js"></script>
|
| 8 |
+
<link rel= "stylesheet" type= "text/css" href= "{{ url_for('static',filename='styles.css') }}">
|
|
|
|
|
|
|
| 9 |
|
| 10 |
</head>
|
| 11 |
|