From f8ea268b6c2cd583804d980a70f60ff69cf52b69 Mon Sep 17 00:00:00 2001
From: oki priyadi <oki.priyadi07@gmail.com>
Date: Fri, 9 Oct 2020 21:58:13 +0700
Subject: [PATCH] fitur search order by like (favorite materi)
---
app/migrations/0019_auto_20201009_2144.py | 18 +++++++++++++++++
app/migrations/0020_auto_20201009_2144.py | 18 +++++++++++++++++
app/migrations/0021_auto_20201009_2145.py | 23 ++++++++++++++++++++++
app/migrations/0022_auto_20201009_2149.py | 24 +++++++++++++++++++++++
app/templates/app/katalog_materi.html | 6 +++++-
app/views.py | 2 ++
6 files changed, 90 insertions(+), 1 deletion(-)
create mode 100644 app/migrations/0019_auto_20201009_2144.py
create mode 100644 app/migrations/0020_auto_20201009_2144.py
create mode 100644 app/migrations/0021_auto_20201009_2145.py
create mode 100644 app/migrations/0022_auto_20201009_2149.py
diff --git a/app/migrations/0019_auto_20201009_2144.py b/app/migrations/0019_auto_20201009_2144.py
new file mode 100644
index 0000000..335ca13
--- /dev/null
+++ b/app/migrations/0019_auto_20201009_2144.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.1 on 2020-10-09 14:44
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('app', '0018_subscribemodel'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='materi',
+ name='cover',
+ field=models.ImageField(blank=True, upload_to=''),
+ ),
+ ]
diff --git a/app/migrations/0020_auto_20201009_2144.py b/app/migrations/0020_auto_20201009_2144.py
new file mode 100644
index 0000000..1a699aa
--- /dev/null
+++ b/app/migrations/0020_auto_20201009_2144.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.1 on 2020-10-09 14:44
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('app', '0019_auto_20201009_2144'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='materi',
+ name='content',
+ field=models.FileField(blank=True, upload_to=''),
+ ),
+ ]
diff --git a/app/migrations/0021_auto_20201009_2145.py b/app/migrations/0021_auto_20201009_2145.py
new file mode 100644
index 0000000..bc7d785
--- /dev/null
+++ b/app/migrations/0021_auto_20201009_2145.py
@@ -0,0 +1,23 @@
+# Generated by Django 3.1 on 2020-10-09 14:45
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('app', '0020_auto_20201009_2144'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='materi',
+ name='content',
+ field=models.FileField(blank=True, null=True, upload_to=''),
+ ),
+ migrations.AlterField(
+ model_name='materi',
+ name='cover',
+ field=models.ImageField(blank=True, null=True, upload_to=''),
+ ),
+ ]
diff --git a/app/migrations/0022_auto_20201009_2149.py b/app/migrations/0022_auto_20201009_2149.py
new file mode 100644
index 0000000..3b306a4
--- /dev/null
+++ b/app/migrations/0022_auto_20201009_2149.py
@@ -0,0 +1,24 @@
+# Generated by Django 3.1 on 2020-10-09 14:49
+
+from django.db import migrations, models
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('app', '0021_auto_20201009_2145'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='materi',
+ name='date_created',
+ field=models.DateTimeField(default=django.utils.timezone.now, null=True),
+ ),
+ migrations.AlterField(
+ model_name='materi',
+ name='date_modified',
+ field=models.DateTimeField(auto_now=True, null=True),
+ ),
+ ]
diff --git a/app/templates/app/katalog_materi.html b/app/templates/app/katalog_materi.html
index f992f0a..78366ce 100644
--- a/app/templates/app/katalog_materi.html
+++ b/app/templates/app/katalog_materi.html
@@ -57,7 +57,7 @@
<a href= "/subscribeform"><img src="{% static 'images/sub-btn.png' %}" style="height:100px"></a>
<h2 class="pageTitle">Temukan Materi Yang Kamu Mau!</h2>
<p class="description">Cari dengan judul buku, penerbit, atau penulis</p>
- <form class="searchBar" action=''>
+ <form class="searchBar" action='/'>
<div class="col-6 form-group">
<input type="text" name='search' class="form-control" placeholder="Tulis di sini"
value='{{request.GET.search}}'>
@@ -118,6 +118,10 @@
<li>
<a href="?sort=terpopuler">terpopuler</a>
</li>
+ <li>
+ <a href="?sort=terfavorite">terfavorite (ter-like)</a>
+ </li>
+
<li>
<a href="?sort=judul">judul</a>
</li>
diff --git a/app/views.py b/app/views.py
index f793960..9de39b9 100644
--- a/app/views.py
+++ b/app/views.py
@@ -79,6 +79,8 @@ class DaftarKatalog(TemplateView):
lstMateri = lstMateri.order_by('date_created')
elif(getSort == "terpopuler"):
lstMateri = lstMateri.annotate(count=Count('like__id')).order_by('-count')
+ elif(getSort == "sort=terfavorite"):
+ lstMateri = lstMateri.annotate(count=Count('like__id')).order_by('-count')
context["materi_list"] = lstMateri
paginator = Paginator(context["materi_list"], 15)
--
GitLab