diff --git a/app/migrations/0019_auto_20201009_2144.py b/app/migrations/0019_auto_20201009_2144.py new file mode 100644 index 0000000000000000000000000000000000000000..335ca13aca91e9c8a1cc33fb0d590e7ef624dd40 --- /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 0000000000000000000000000000000000000000..1a699aa8fe33c163d8a8592878b94fa3896dafcc --- /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 0000000000000000000000000000000000000000..bc7d7853bf6194d48c51f4c9c79f26fa7e73b992 --- /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 0000000000000000000000000000000000000000..3b306a4855b623a00fbefb309a487ec76e76367e --- /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 f992f0adddd5134b71a865e2947f7c4db70898d1..78366ce2d0ad7c92231b997f9ecf9ad2b473b7d8 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 f79396093e8f65e7c54dc70b5c36e3636fb3e43e..9de39b969a9b35b217f0e70565a0bbe630f352e8 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)