fixed search cases for city bug

tusharrao198 · Feb 8, 2021 · 608cc19 · 608cc19
1 parent 0db4ced
commit 608cc19
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 50 deletions.
diff --git a/covidtracker/templates/covidtracker/city.html b/covidtracker/templates/covidtracker/city.html
@@ -2,7 +2,7 @@
 {% load static %}
 
 {% block content %}
-<div class="section-bg" style="padding:5%;" id="introduction">
+<div class="section-bg" style="padding:8%;" id="introduction">
       <!-- Default switch -->
   <div class='text-right' style='font-family: "JetBrains Mono", monospace;'> 
     Switch to Dark Mode

diff --git a/covidtracker/templates/covidtracker/district.html b/covidtracker/templates/covidtracker/district.html
@@ -3,7 +3,7 @@
 
 
 {% block content %}
-<div class="section-bg" style="padding:5%;" id="introduction">
+<div class="section-bg" style="padding:8%;" id="introduction">
   <!-- Default switch -->
   <div class='text-right' style='font-family: "JetBrains Mono", monospace;'> 
   Switch to Dark Mode
@@ -13,41 +13,39 @@
   </label>
   </div>  
   <div class="container mt-2">
-      <h1 class="title-a text-center headingtext">COVID Cases</h1>
+      <h1 class="title-head text-center headingtext">COVID Cases</h1>
       <hr class="titlehr" />
-    </div>
-
-
-<h2 align ="center" style="color:red"> <b>COVID Cases Districtwise</b></h2>
-  <div class="container">
-    <div class="section-bg">
-  <table  class="table table-bordered table-striped">
-  <thead class= "thead-dark">
-  <tr>
-    <th>Sr.No</th>
-    <th>State</th>
-    <th>Districts</th>
-    <th>Confirmed </th>
-    <th>Deaths</th>
-    <th>Recovered</th>
-    <th>Active</th>
-  </tr>
-  </thead>
-  <tbody>
-    {% for district in district_cases %}
+  </div>
+  <h2 align ="center" style="color:red"> <b>COVID Cases Districtwise</b></h2>
+    <div class="container">
+      <div class="section-bg">
+    <table  class="table table-bordered table-striped">
+    <thead class= "thead-dark">
     <tr>
-      <td>{{district.id}}</td>
-      <td>{{district.state_name}}</td>
-      <td>{{district.city_name}}</td>
-      <td>{{district.confirmed}}</td>
-      <td>{{district.Death}}</td>
-      <td>{{district.Recovered}}</td>
-      <td>{{district.Active}}</td>
+      <th>Sr.No</th>
+      <th>State</th>
+      <th>Districts</th>
+      <th>Confirmed </th>
+      <th>Deaths</th>
+      <th>Recovered</th>
+      <th>Active</th>
     </tr>
-  {% endfor %}
-  </tbody>
-  </table>
+    </thead>
+    <tbody>
+      {% for district in district_cases %}
+      <tr>
+        <td>{{district.id}}</td>
+        <td>{{district.state_name}}</td>
+        <td>{{district.city_name}}</td>
+        <td>{{district.confirmed}}</td>
+        <td>{{district.Death}}</td>
+        <td>{{district.Recovered}}</td>
+        <td>{{district.Active}}</td>
+      </tr>
+    {% endfor %}
+    </tbody>
+    </table>
+    </div>
   </div>
 </div>
-</div>
 {% endblock %}
diff --git a/covidtracker/templates/covidtracker/home.html b/covidtracker/templates/covidtracker/home.html
@@ -2,7 +2,7 @@
 {% load static %}
 
 {% block content %}
-<div class="section-bg" style="padding:5%;" id="introduction">
+<div class="section-bg" style="padding:8%;" id="introduction">
       <!-- Default switch -->
     <div class='text-right' style='font-family: "JetBrains Mono", monospace;'> 
         Switch to Dark Mode
@@ -18,7 +18,7 @@
     </div>
 
   <!-- cards  -->
-  <div class="card-group justify-content-center subtitle-a text-center" style='font-weight: 900;'>
+  <div class="card-deck justify-content-center subtitle-a text-center" style='font-weight: 900;'>
     <div class="card card1 bg-danger border-danger mb-2" style="max-width: 15rem;">
       <div class="card-header border-danger">Confirmed</div>
       <div class="card-body">
@@ -46,10 +46,8 @@
     <div class="card card4 bg-warning border-warning mb-2 " style="max-width: 15rem;">
       <div class="card-header border-warning">Active</div>
       <div class="card-body text-center">
-        <!-- <h5 class="card-title">Active</h5> -->
         <p class="card-text">{{Active}}</p>
       </div>
-      <!-- <div class="card-footer bg-transparent border-success">Footer</div> -->
     </div>
   </div>
   <br>

diff --git a/covidtracker/templates/covidtracker/search.html b/covidtracker/templates/covidtracker/search.html
@@ -5,7 +5,7 @@
 {% block content %}
 <h1 align ="center"style="color: green" ><b> Cases in State - Table</b></h1>
 
-<div class="section-bg" style="padding:5%;" id="introduction">
+<div class="section-bg" style="padding:8%;" id="introduction">
   <!-- Default switch -->
   <div class='text-right' style='font-family: "JetBrains Mono", monospace;'> 
   Switch to Dark Mode

diff --git a/covidtracker/views.py b/covidtracker/views.py
@@ -245,21 +245,25 @@ def search(request):
     state_query = request.GET["state"]
     city_query = request.GET["city"]
     # print(f"{state_query} - >> {city_query}")
-    city_cases = district_cases.objects.filter(
-        state_name=state_query, city_name=city_query
-    )
-    a = list(city_cases)
-    city_json = district_cases.objects.filter(
-        state_name=state_query, city_name=city_query
-    ).first()  # .first() conveerts object to instance)
+    if str(city_query) == "Unknown":
+        city_query = f"Unknown+{state_query}"
+        city_cases = district_cases.objects.filter(
+            state_name=state_query, city_name=city_query
+        )
+    else:
+        city_cases = district_cases.objects.filter(
+            state_name=state_query, city_name=city_query
+        )
+
+    # a = list(city_cases)
+    # city_json = district_cases.objects.filter(
+    #     state_name=state_query, city_name=city_query
+    # ).first()  # .first() convert object to instance)
 
     #  {'id': 983, 'city_name': 'Mandi', 'state_name': 'Himachal Pradesh', 'confirmed': 10096, 'Death': 124, 'Recovered': 9786, 'Active': 182}
-
-    city_json = model_to_dict(city_json)
-    # print(city_json)
+    # city_json = model_to_dict(city_json)
     context_ = {
         "query_results": city_cases,
-        "city_json": "city_json",
         "title": "Result",
         "search": "active",
     }