Skip to content

Changes for week 202014 #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 10, 2020
Merged

Changes for week 202014 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions site/common/database.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ function getRegions($dbh, &$output, $userID) {
if(getEpiweekInfo($dbh, $temp) !== 1) {
return getResult($temp);
}
$result = $dbh->query("SELECT r.`id`, r.`name`, r.`states`, r.`population`, CASE WHEN s.`user_id` IS NULL THEN FALSE ELSE TRUE END `completed` FROM ec_fluv_regions r LEFT JOIN ec_fluv_submissions s ON s.`user_id` = {$userID} AND s.`region_id` = r.`id` AND s.`epiweek_now` = {$temp['epiweek']['round_epiweek']} ORDER BY r.`id` ASC");
$result = $dbh->query("SELECT r.`id`, r.`fluview_name`, r.`name`, r.`states`, r.`population`, CASE WHEN s.`user_id` IS NULL THEN FALSE ELSE TRUE END `completed` FROM ec_fluv_regions r LEFT JOIN ec_fluv_submissions s ON s.`user_id` = {$userID} AND s.`region_id` = r.`id` AND s.`epiweek_now` = {$temp['epiweek']['round_epiweek']} ORDER BY r.`id` ASC");
$regions = array();
while($row = $result->fetch_assoc()) {
if ($row['name'] == "ny_minus_jfk") {
Expand All @@ -347,7 +347,8 @@ function getRegions($dbh, &$output, $userID) {
}

$region = array(
'id' => intval($row['id']),
'id' => intval($row['id']),
'fluview_name' => $row['fluview_name'],
'name' => $region_name,
'states' => $row['states'],
'population' => intval($row['population']),
Expand Down
4 changes: 2 additions & 2 deletions site/common/header.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
<span class="effect_fluv">&lt;COVID-19 Edition&gt;</span>
</a>
</div>
<div class="box_subtitle">Epidemiological Forecasting by <span class="effect_delphi"><a class="delphi" target="_blank" rel="noopener" href="https://delphi.midas.cs.cmu.edu/">DELPHI</a></span></div>
<div class="box_subtitle">Epidemiological Forecasting by <span class="effect_delphi"><a class="delphi" target="_blank" rel="noopener" href="https://delphi.cmu.edu/">DELPHI</a></span></div>
</div>
<?php
if(!isset($skipLogin) || !$skipLogin) {
Expand Down Expand Up @@ -96,7 +96,7 @@
createDivider('|');
}
print('<span class="effect_delphi">');
createLink('DELPHI', 'https://delphi.midas.cs.cmu.edu/', true, 'delphi');
createLink('DELPHI', 'https://delphi.cmu.edu/', true, 'delphi');
print('</span>');
?>
</div>
Expand Down
5 changes: 5 additions & 0 deletions site/css/style.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,6 +351,11 @@
padding-top: 10px;
float: right;
}

div.sidebar_entry i.fa {margin-right:5px}
div.sidebar_region {margin-left:15px}
div.sidebar_region i.fa {margin-right:5px}

div.box_scroll_test {
width: 100%;
height: 100%;
Expand Down
Loading