From 6e010e9bcf54980a055f7225b8d27b2b4ed658ed Mon Sep 17 00:00:00 2001
From: ksanu <j.plebaniak@gmail.com>
Date: Sun, 15 Dec 2019 17:49:20 +0100
Subject: [PATCH] BES-45 BES-50 BES-51 Added topics.html template, added method
 to use template notes.html to generate notes_by_topic_id, modified backend to
 work with the mentioned addtions.

---
 .idea/workspace.xml                           |  10 ++-----
 .../__pycache__/__init__.cpython-38.pyc       | Bin 205 -> 205 bytes
 .../__pycache__/settings.cpython-38.pyc       | Bin 2526 -> 2526 bytes
 .../__pycache__/urls.cpython-38.pyc           | Bin 1128 -> 1128 bytes
 .../__pycache__/wsgi.cpython-38.pyc           | Bin 626 -> 626 bytes
 bestnotes/__pycache__/__init__.cpython-38.pyc | Bin 198 -> 198 bytes
 bestnotes/__pycache__/admin.cpython-38.pyc    | Bin 424 -> 424 bytes
 bestnotes/__pycache__/apps.cpython-38.pyc     | Bin 424 -> 424 bytes
 bestnotes/__pycache__/models.cpython-38.pyc   | Bin 1988 -> 1988 bytes
 bestnotes/__pycache__/urls.cpython-38.pyc     | Bin 633 -> 779 bytes
 bestnotes/__pycache__/views.cpython-38.pyc    | Bin 1504 -> 2129 bytes
 .../__pycache__/0001_initial.cpython-38.pyc   | Bin 1054 -> 1054 bytes
 .../__pycache__/__init__.cpython-38.pyc       | Bin 209 -> 209 bytes
 bestnotes/static/topics.css                   |   4 +++
 bestnotes/templates/subjects.html             |   6 ++--
 bestnotes/templates/topics.html               |  25 ++++++++++++++++
 bestnotes/urls.py                             |   2 ++
 bestnotes/views.py                            |  28 +++++++++++++++++-
 18 files changed, 64 insertions(+), 11 deletions(-)
 create mode 100644 bestnotes/static/topics.css
 create mode 100644 bestnotes/templates/topics.html

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 18ebf11..205d83f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,16 +2,12 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="b23c009e-2f8a-48f7-8b29-023f93596932" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/bestnotes/static/note.css" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/bestnotes/templates/note.html" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/bestnotes/templates/test.html" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/bestnotes/templates/testid.html" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/bestnotes/static/topics.css" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/bestnotes/templates/topics.html" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/bestnotes/admin.py" beforeDir="false" afterPath="$PROJECT_DIR$/bestnotes/admin.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/bestnotes/models.py" beforeDir="false" afterPath="$PROJECT_DIR$/bestnotes/models.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/bestnotes/templates/subjects.html" beforeDir="false" afterPath="$PROJECT_DIR$/bestnotes/templates/subjects.html" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/bestnotes/urls.py" beforeDir="false" afterPath="$PROJECT_DIR$/bestnotes/urls.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/bestnotes/views.py" beforeDir="false" afterPath="$PROJECT_DIR$/bestnotes/views.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/db.sqlite3" beforeDir="false" afterPath="$PROJECT_DIR$/db.sqlite3" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
diff --git a/BestNotesProject/__pycache__/__init__.cpython-38.pyc b/BestNotesProject/__pycache__/__init__.cpython-38.pyc
index 4f67563bbaa01add005afdef59bbc219399a022a..9409a91f64ab01a06bc6e1b618087f0ee6bfe124 100644
GIT binary patch
delta 25
fcmX@hc$Senl$V!_0SLsxzD?wAV=^(FIN1sSO*IB?

delta 25
fcmX@hc$Senl$V!_0SFE~d_9r7jmg+(;$$lTTE7RD

diff --git a/BestNotesProject/__pycache__/settings.cpython-38.pyc b/BestNotesProject/__pycache__/settings.cpython-38.pyc
index 713bf6fb45445a6c5953c14d0d842b23e910f5dd..4e0d2b15c0f513e81935477be8adbc4aeee54203 100644
GIT binary patch
delta 27
hcmca7d{3A=l$V!_0SLsxzHQ`|<YY22ovg;W0{~nq28;jz

delta 27
hcmca7d{3A=l$V!_0SFE~e7%udl9S2UXtEmT4ghQj2ebeH

diff --git a/BestNotesProject/__pycache__/urls.cpython-38.pyc b/BestNotesProject/__pycache__/urls.cpython-38.pyc
index 6e26703cd5a7dc0faa9dc683cb47c36322789260..bd8ec0e718a053cb0660af3c9dfa99b2c9549cc1 100644
GIT binary patch
delta 27
hcmaFC@q&Xpl$V!_0SLsxzHQ_dXJIliovgy*0svc11_%HE

delta 27
hcmaFC@q&Xpl$V!_0SFE~e7%udoQ28QXtD~63jk{@2QUBt

diff --git a/BestNotesProject/__pycache__/wsgi.cpython-38.pyc b/BestNotesProject/__pycache__/wsgi.cpython-38.pyc
index b904c6c79fa8f6270af55b4816a53f346c67f4e0..78c907d08c790a15e83b24c9f44ac23817b94053 100644
GIT binary patch
delta 27
hcmeyw@`;5zl$V!_0SLsxzHQ`IXJRrjoovEn2LN3(1}Xpm

delta 27
hcmeyw@`;5zl$V!_0SFE~e7%udor%fVXtD{D9RO_-2T}k4

diff --git a/bestnotes/__pycache__/__init__.cpython-38.pyc b/bestnotes/__pycache__/__init__.cpython-38.pyc
index 98cd8c1e40a73106401486571b40428ae131908c..819fe94e9323c225183c3534d2b35e2fe339fb76 100644
GIT binary patch
delta 25
fcmX@cc#M%dl$V!_0SLsxzD?wAV=^(FIN2BgOWp=q

delta 25
fcmX@cc#M%dl$V!_0SFE~d_9r7jmg+(;$&k0S!f4=

diff --git a/bestnotes/__pycache__/admin.cpython-38.pyc b/bestnotes/__pycache__/admin.cpython-38.pyc
index 51ff548daaab8691339a214d90f607c136aa2da9..3579e69137537dc1f3369571b05830bfc3023c9c 100644
GIT binary patch
delta 27
hcmZ3%yn>lKl$V!_0SLsxzHQ`=XJj%lot(pH0{~Et1^@s6

delta 27
hcmZ3%yn>lKl$V!_0SIg#zuw3l&&XtKG&zUS1^`(=2BiQ1

diff --git a/bestnotes/__pycache__/apps.cpython-38.pyc b/bestnotes/__pycache__/apps.cpython-38.pyc
index 8222c11c1c9c4476d8eef096806b18a3e7fa50b0..576b6b5f2874b7c83eb46812d4d86ea9987e58da 100644
GIT binary patch
delta 27
hcmZ3%yn>lKl$V!_0SLsxzHQ`IXJj%loovEb0su}X1;_vZ

delta 27
hcmZ3%yn>lKl$V!_0SFE~e7%udosr4dXtD`o2>@OM2Jip?

diff --git a/bestnotes/__pycache__/models.cpython-38.pyc b/bestnotes/__pycache__/models.cpython-38.pyc
index 451b6ac6c2cd3d73f41324418a14312f8f9ecf9a..6ac553adddcadb1ad18f8cc995cf4eca98a44cda 100644
GIT binary patch
delta 28
icmX@Ye}tbql$V!_0SLsxzHQ{5&ctM5x_Jqc0xJMwZwAW%

delta 28
icmX@Ye}tbql$V!_0SK}lz23+@or%fVX!8;#1y%rVTL+u~

diff --git a/bestnotes/__pycache__/urls.cpython-38.pyc b/bestnotes/__pycache__/urls.cpython-38.pyc
index bf3bc276065c16e3a1fded175d2594cff70102c6..33950d9f18b835b968fccc51b2138ba6e76c45bb 100644
GIT binary patch
delta 349
zcmey#(#@tF%FD~e00ckczQwL#Vqka-;vfTFAjbiSix*7Pu2)NCOc73H$>L5CNMY+`
z2J%FJJf0L$5HFoGiZ?|pm_bu~;+EO<l6m<hsm1Y0mGLF{1)0hEHef0~GsW%}D_E*Z
z5i9~$Qe2vpm6}`vl-0LEu<dTKL6lUnfpzFt2|;LNHBlT8i!xLEH2H3Er(`AOrRVFF
zPVQke4;6$+!Q22e{+0+fOK)*P6ei~6+~R^T^AdAYZ*i9v<rE~Al%y8r6|ZC{5(NfB
kk?7<XjDAcerjsq0w57y=A_7c2%zR8djC?T21Y~^$0OF`@YXATM

delta 193
zcmeBX`^lmm%FD~e00ggIzK&&MVqka-;vfTVAjbiSi(4jY*K?(_M{%bJ2Qz4jOuR7L
zm@O~AB(+%o7Au&p5`l1Sic6ESQj<&K^AdAY?QU^_MZp|DO`gdQ7#&qPAwr2cIYm4`
zqi=DS7UdKqmXxFx<rS}FC=vpS6$wo)WAbA%Hky2lNm~pgBEZDM%*VvT$OnQ<K>Qs5
D7(+67

diff --git a/bestnotes/__pycache__/views.cpython-38.pyc b/bestnotes/__pycache__/views.cpython-38.pyc
index a58aadd47e94fe6884fd0b994864fdc4d10dbfa3..ef2b51c09ef7e007369dbb9f347145a4cb112f67 100644
GIT binary patch
literal 2129
zcmb_d%Z}qj6m?bkm1n1Wn#TZwhMkcn8X8!D5JK~iU@;LQgOIEsE1jzDIO9jCsxTyS
zR?U__U;)cs@ge+yx2*U97PA2EEj#J%OtS!C%k{3h_ndof`O8kHX~FaB_>ZrD@h$5&
z>|A{)bUuMk&7t5HCyAAkkPvLsgr+QHsU6y>6FO#$C2s149<*)ld~bz5cew|3gZsPz
zb(1%F3+fhc^A6N)-sO8xcX*HQL*3;E{1()E{BURmFZ>QxtqW4RQe<4nfR*+j*P?VD
z=ks_{dc(!ZOiXk@%J!#P&%Y3Ao@Yu-2=1#NY}@eNhflSk&{hFJV(XlN2|8GHrg<vn
z<1^8p>NJrE8BBUoe6tWrUsw_;dNzId;pkC56A#9j7!CD;$K$UaeKs136c)+oI11x5
zf4Yp0@4oZFo#VTs;ZkXlE~7X*&1E{)%gG8h-g`K_^WOWTd$0$AsL=_uGSm7t7Ee`w
zzAXKXKOTCF?pRc!<Np$ts>o57uq1@If@3hr7IaImUWXPcYeaU?nz0NGe6a1nXGrWp
zqau;hg2coS$p))-eUdR)(wG}A11cM^L3Xh~DzDgX);pq@@4?K*JhrcycVS=~!_T3k
ztr_`={%oyjL1(NWocuu6Oxp!JC!9X9<pW$Xb6|$SjLq%Bj>+25F2vp`9CTTG+&w2l
zkTU4N8w8|s5%mIsqVp%AjgeV3ur!!fdl<AM=pUWti;VXJU!q&3mm3|bl8uw3bWh_%
z3t6&6WF<QjS~6H9F`R*WNk-X##StE^O2<@TOU2n)BFtdvP4Y~O@ANKd9<Bw(4&Xe6
zg+-dA4R4oHi~eP^HkG$w^csU0ye)%oL+54&A)pL+vVlp9v%)r^wSk-PKx4{9(I#Tx
zfP4wgdDb+p8-6YvLx<dlafzPETUa3az^Q;^XyuDggq_VvX1{zHCwApwrlM?|iX)gd
z*=xX7KyCRNjQ+nc8#T-toqPq|dKHQqK<QTtVBVl;Ro#EauwP*~Sw@?U$o}(CUf+fC
zA2eT3PH$T?XXdU!?*-%RM+%zvAeMHmd7nF5&AS-a)+P)XP@{cXZW7rrAG*eIwW^?2
z*U4)CG0H(*&4q?Uk?jWm5XbO7DQ%47^QnM}2%DG+m7Vagsv}4+Avb!HZ{RsMiDa`J
z7~VjM`Ma?CGB+q>2cv}k>DrJRZ^GQQs}%LQ%?*shHaFm2!3%CpH3JUeuBop&qx@9^
zGFKbn2llS;jpkXUc@)ZxuA7@hMS%T2EK#U_kawNM@-65Mf?n9;vvGEo_ti9)da}^U
za2WQszm9&IbCIaZ1rr0*PT8vWP2taIE+6v~F|m*)4e^pNDI^iJ;l&uel7=QB&2Pg0
d2&^m;@iA&dVN~1X5Uv{E@fo~bzv(yp-ropr#EAd^

delta 625
zcmZuuziZn-6xQ8IvVJ-;IE~$8=$43<3~|TMC1f=zrBD=taQsBvAY0*drceS|`VTm_
zcIa9%buWQTnX{@(*HXH6=+eF?r^b|?;Cs67z4v|h?(U+me)DA*dIqk~KfWIwShMB^
zdo_F9J!A$LAaZkTB^LghV7)UE8*FG`Y=8qUMh86bF}e^yh|z;4tYGvZdSS$^Z>0N?
zRkq9~kja=;X1`F`>^5bN-ei5=+tF`Wk9qov?MF5iOJ@P@CGRj_cX@xcL1eJV)HSX?
z=j*z|Tl&4#(_i>g7U)PEg%*~@ww$-<x8jMvB&k1%Ew-j_%;y(vRh+#ZrfE4nKFx+I
zO(%nKCRefhm#eZ;ZI9GAk1c7E?FvCe&>|2Bm?DoP_$yHNw}}cD6b@U;2h_532;5el
z{$M_0UH#MEyC6^5L5R(N-D)E-ABLp=tL09}CLQE?j3s6Ln9Sqc;J-~FA0pR}gCv5}
z!Q`aaE=Pq_!>KCkDU#?|UpLw(m4BZeDRn044khVGpCBYyBj^&4;?g|x*FdgvcE<%w
X^XwVJT}js!us{Udu^fS4({cX*5_*4g

diff --git a/bestnotes/migrations/__pycache__/0001_initial.cpython-38.pyc b/bestnotes/migrations/__pycache__/0001_initial.cpython-38.pyc
index 6a55fba16b22282469829b0eb72feaf947f060ee..1f8d7f048fb43e66a0ba1bb1cddc2600f92038c3 100644
GIT binary patch
delta 27
hcmbQoF^_{gl$V!_0SLsxzHQ{TVrDWio$Sth9RN;q21@_{

delta 27
hcmbQoF^_{gl$V!_0SFE~e7%v|ikZpSXtF!=bpT#b2Xg=b

diff --git a/bestnotes/migrations/__pycache__/__init__.cpython-38.pyc b/bestnotes/migrations/__pycache__/__init__.cpython-38.pyc
index feebe36cb7406eace3fa9c7eb7d6677dd337dd26..f9ec7a85e7a792b2a096400750a41ed95bb5b733 100644
GIT binary patch
delta 25
fcmcb}c#)Ail$V!_0SLsxzD?wAV=^(FIN1&WP5B0T

delta 25
fcmcb}c#)Ail$V!_0SFE~d_9r7jmg+(;$%AjTZ0Fp

diff --git a/bestnotes/static/topics.css b/bestnotes/static/topics.css
new file mode 100644
index 0000000..1616677
--- /dev/null
+++ b/bestnotes/static/topics.css
@@ -0,0 +1,4 @@
+.subjectname{
+    text-decoration: none;
+    color:white;
+}
\ No newline at end of file
diff --git a/bestnotes/templates/subjects.html b/bestnotes/templates/subjects.html
index b4872e8..be6fc2b 100644
--- a/bestnotes/templates/subjects.html
+++ b/bestnotes/templates/subjects.html
@@ -26,17 +26,17 @@
     <a class="row justify-content-center text-white">Liczba dostępnych przedmiotów: 3/5</a>
     <ul class="list-group cProductsList mt-3"> 
             <li class="list-group-item d-sm-flex justify-content-between"><p class="p-0 m-0 flex-grow-1">Programowanie</p> 
-                <button class="btn-primary mr-1" ><a class="nolink" href="/bestnotes/notes/1">Zarządzaj</a></button> 
+                <button class="btn-primary mr-1" ><a class="nolink" href="/bestnotes/topics_by_subject_id/1">Zarządzaj</a></button>
                 <button class="btn-success mr-1">Edytuj</button>  
                 <button class="btn-danger">Usuń</button>
             </li>
             <li class="list-group-item d-sm-flex justify-content-between"><p class="p-0 m-0 flex-grow-1">Matematyka</p>  
-                <button class="btn-primary mr-1"><a class="nolink" href="/bestnotes/notes/2">Zarządzaj</a></button>
+                <button class="btn-primary mr-1"><a class="nolink" href="/bestnotes/topics_by_subject_id/2">Zarządzaj</a></button>
                 <button class="btn-success mr-1">Edytuj</button>
                 <button class="btn-danger">Usuń</button>
             </li> 
             <li class="list-group-item d-sm-flex justify-content-between"><p class="p-0 m-0 flex-grow-1">Systemy informatyczne</p>  
-                <button class="btn-primary mr-1"><a class="nolink" href="/bestnotes/notes/3">Zarządzaj</a></button>
+                <button class="btn-primary mr-1"><a class="nolink" href="/bestnotes/topics_by_subject_id/3">Zarządzaj</a></button>
                 <button class="btn-success mr-1">Edytuj</button>
                 <button class="btn-danger">Usuń</button>
              </li> 
diff --git a/bestnotes/templates/topics.html b/bestnotes/templates/topics.html
new file mode 100644
index 0000000..b333778
--- /dev/null
+++ b/bestnotes/templates/topics.html
@@ -0,0 +1,25 @@
+{% extends 'base.html' %}
+{% load static %}
+{% block css %}
+    <link rel="stylesheet" type="text/css" href="{% static 'topics.css' %}">
+{% endblock %}
+{% block content %}
+{% include 'navbar.html' %}
+<div class="container d-flex justify-content-center">
+    <div class="row mt-4"><h1 class="subjectname">{{subject_name}}</h1></div>
+</div>
+
+<div class="container d-flex justify-content-center">
+    <div class="row">
+        <div class="col-sm-12">
+            <h2 class="text-white text-center">Dostępne zagadnienia</h2>
+            <ul class="list-group cProductsList mt-4">
+                {% for topic in topics%}
+                    <a href="/bestnotes/notes_by_topic/{{ topic.id }}" class="list-group-item list-group-item-action">{{ topic.name }}</a>
+                {% endfor %}
+            </ul>
+        </div>
+    </div>
+</div>
+
+{% endblock %}
diff --git a/bestnotes/urls.py b/bestnotes/urls.py
index e57149e..393adc0 100644
--- a/bestnotes/urls.py
+++ b/bestnotes/urls.py
@@ -9,6 +9,8 @@ urlpatterns = [
     path('subject/', views.subject, name="subject"),
     path('subject/<id>', views.subject_id, name="subjectid"),
     path('note/<id>', views.note_id, name="note"),
+    path('notes_by_topic/<topic_id>', views.notes_by_topic_id, name="notes"),
+    path('topics_by_subject_id/<subject_id>', views.topics_by_subject_id, name="topics"),
 
     path('notes/', views.notes_all, name="notes"),
     path('notes/<subject_id>', views.notes_name, name="notes_id")
diff --git a/bestnotes/views.py b/bestnotes/views.py
index 83d7720..f2b3f16 100644
--- a/bestnotes/views.py
+++ b/bestnotes/views.py
@@ -1,5 +1,5 @@
 from django.shortcuts import render
-from bestnotes.models import Note
+from bestnotes.models import Note, Topic, Subject
 # Create your views here.
 
 from django.http import HttpResponse
@@ -38,6 +38,32 @@ def notes_name(request,subject_id):
     #Change website here
     return render(request, "notes.html", context)
 
+
+def notes_by_topic_id(request,topic_id):
+    all_notes = Note.objects.all()
+    topic_notes = all_notes.filter(topic__id=topic_id) #Get all notes with given topic id
+    context = {
+        'notes' : topic_notes
+    }
+    #Change website here
+    return render(request, "notes.html", context)
+
+def topics_by_subject_id(request,subject_id):
+    all_topics = Topic.objects.all()
+    topics_under_subject = all_topics.filter(subject__id=subject_id) #get topics under given subject
+
+    if len(topics_under_subject) > 0:
+        subject_name = all_topics[0].subject.name  # Get note with given id
+
+        context = {
+            'subject_name': subject_name,
+            'topics': topics_under_subject
+        }
+        return render(request, "topics.html", context)
+    else:
+        return HttpResponse("Topics not found.")
+
+
 def notes_all(request):
     all_notes = Note.objects.all()
     context = {