Explorar o código

A new field added in location field and displays all location in list view

Mohidul Islam %!s(int64=5) %!d(string=hai) anos
pai
achega
8d047c78ed

+ 4 - 2
dashboard/templates/base.html

@@ -40,10 +40,12 @@
           {% block content %}{% endblock %}
         </div>
         <div class="col-md-3">
-          <div class="content-section" style="position: fixed">
+          <div class="content-section">
             <h3>ER Locations</h3>
               <ul class="list-group">
-                <li class="list-group-item list-group-item-light">Location1</li>
+                  {% for loc in locations %}
+                    <li class="list-group-item list-group-item-light"><a href="{% url 'review-list' loc.location_id %}">{{ loc.care_name }}</a></li>
+                  {% endfor %}
               </ul>
           </div>
         </div>

+ 5 - 4
dashboard/views.py

@@ -1,6 +1,7 @@
 from django.shortcuts import render
 from django.views.generic.list import View
 from review.models import Review, Reply
+from gauth.models import Location
 from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
 
 
@@ -8,10 +9,8 @@ class ReviewListView(View):
 
     def get(self, request, location_id, *args, **kwargs):
         reviews = Review.objects.filter(location_id=location_id).order_by('-update_time')
+        locations = Location.objects.all()
         page = request.GET.get('page', 1)
-        # context = {
-        #     'reviews': reviews
-        # }
         paginator = Paginator(reviews, 50)
         try:
             reviews = paginator.page(page)
@@ -19,4 +18,6 @@ class ReviewListView(View):
             reviews = paginator.page(1)
         except EmptyPage:
             reviews = paginator.page(paginator.num_pages)
-        return render(request, 'review_list.html', {'reviews': reviews})
+        context = {'reviews': reviews, 'locations': locations}
+
+        return render(request, 'review_list.html', context)

+ 1 - 1
gauth/admin.py

@@ -7,7 +7,7 @@ class UserModelAdmin(admin.ModelAdmin):
 
 
 class LocationsAdmin(admin.ModelAdmin):
-    list_display = ['location_id', 'location_name', 'website_url', 'display_name']
+    list_display = ['location_id','care_name', 'location_name', 'website_url', 'display_name']
 
 
 admin.site.register(Location, LocationsAdmin)

+ 18 - 0
gauth/migrations/0006_location_care_name.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.0 on 2020-01-02 10:04
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('gauth', '0005_auto_20200101_0803'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='location',
+            name='care_name',
+            field=models.CharField(max_length=50, null=True),
+        ),
+    ]

+ 1 - 0
gauth/models.py

@@ -13,6 +13,7 @@ class UserModel(models.Model):
 
 class Location(models.Model):
     location_id = models.CharField(max_length=50, primary_key=True)
+    care_name = models.CharField(max_length=50, null=True)
     location_name = models.CharField(max_length=120)
     website_url = models.URLField()
     display_name = models.CharField(max_length=120)