Merge remote-tracking branch 'origin/master'

# Conflicts:
#	resources/views/admin/home.blade.php

resources/views/admin/home.blade.php

@@ -240,7 +240,7 @@
 
     <select class="hospital-select" name="hospital-select">
         @foreach($projects as $project)
-        <option value="{{$project->id}}" @if($project->id == $project_id) {{ "selected" }}@endif>{{$project->name}}</option>
+        <option value="{{$project->id}}" @if(request()->project_id === $project->id){{ "selected" }}@endif>{{$project->name}}</option>
         @endforeach
     </select>
 
@@ -516,10 +516,25 @@
                 setBarChartOption($(this).val())
             })
         }
+        function hospitalSelectListner () {
+            if (window.location.search) {
+                var project_id = window.location.search.split("=")
+                if (project_id[1]) {
+                    $("[name=hospital-select] option[value="+project_id[1]+"]").prop("selected",true)
+                }
+            }
+
+            $("[name=hospital-select]").change(function () {
+                var url = window.location.origin + window.location.pathname;
+                url += ("?project_id=" + $(this).val());
+                window.open(url,'_self');
+            })
+        }
         (function () {
             initPieChart()
             initBarChart()
             typeSwitchListener()
+            hospitalSelectListner()
         })()
     </script>
 @endpush