Merge pull request #3 from cmu-delphi/crowdcast/202014

Changes for week 202014

Author: krivard

site/common/database.php

@@ -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") {
@@ -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']),

site/common/header.php

@@ -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) {
@@ -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>

site/css/style.php

@@ -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%;