diff --git a/bestnotes/migrations/0002_note_subject_topic.py b/bestnotes/migrations/0002_note_subject_topic.py new file mode 100644 index 0000000..f0899ea --- /dev/null +++ b/bestnotes/migrations/0002_note_subject_topic.py @@ -0,0 +1,44 @@ +# Generated by Django 2.2.7 on 2019-12-07 10:44 + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('bestnotes', '0001_initial'), + ] + + operations = [ + migrations.CreateModel( + name='Subject', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=30)), + ('student', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='bestnotes.StudentProfile')), + ], + ), + migrations.CreateModel( + name='Topic', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=30)), + ('add_date', models.DateField()), + ('subject', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='bestnotes.Subject')), + ], + ), + migrations.CreateModel( + name='Note', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=30)), + ('text', models.TextField()), + ('add_date', models.DateField()), + ('topic', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='bestnotes.Topic')), + ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), + ], + ), + ] diff --git a/bestnotes/migrations/0003_auto_20191207_1056.py b/bestnotes/migrations/0003_auto_20191207_1056.py new file mode 100644 index 0000000..2efee8e --- /dev/null +++ b/bestnotes/migrations/0003_auto_20191207_1056.py @@ -0,0 +1,19 @@ +# Generated by Django 2.2.7 on 2019-12-07 10:56 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('bestnotes', '0002_note_subject_topic'), + ] + + operations = [ + migrations.AlterField( + model_name='note', + name='user', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='bestnotes.StudentProfile'), + ), + ] diff --git a/bestnotes/models.py b/bestnotes/models.py index e834dfe..547c768 100644 --- a/bestnotes/models.py +++ b/bestnotes/models.py @@ -29,6 +29,14 @@ class Topic(models.Model): subject = models.ForeignKey(Subject, on_delete=models.CASCADE) add_date = models.DateField() +class Note(models.Model): + name = models.CharField(max_length=30) + text = models.TextField(blank=False) + topic = models.ForeignKey(Topic, on_delete=models.SET_NULL, null=True) + user = models.ForeignKey(StudentProfile, on_delete=models.CASCADE) + add_date = models.DateField() + + diff --git a/bestnotes/templates/test.html b/bestnotes/templates/test.html new file mode 100644 index 0000000..31ab943 --- /dev/null +++ b/bestnotes/templates/test.html @@ -0,0 +1,12 @@ +{% extends 'base.html' %} +{% load static %} + +{% block content %} + +{% for note in notes%} + +{{ note.name }} + +{% endfor %} + +{% endblock %} \ No newline at end of file diff --git a/bestnotes/templates/testid.html b/bestnotes/templates/testid.html new file mode 100644 index 0000000..31ab943 --- /dev/null +++ b/bestnotes/templates/testid.html @@ -0,0 +1,12 @@ +{% extends 'base.html' %} +{% load static %} + +{% block content %} + +{% for note in notes%} + +{{ note.name }} + +{% endfor %} + +{% endblock %} \ No newline at end of file diff --git a/bestnotes/urls.py b/bestnotes/urls.py index 963bae8..54b210e 100644 --- a/bestnotes/urls.py +++ b/bestnotes/urls.py @@ -7,4 +7,6 @@ urlpatterns = [ path('accounts/', include("django.contrib.auth.urls")), path('subject/', views.subject, name="subject"), path('subject/', views.subject_id, name="subjectid"), + path('notes/', views.notes_all, name="notes"), + path('notes/', views.notes_name, name="notes_name") ] \ No newline at end of file diff --git a/bestnotes/views.py b/bestnotes/views.py index bc22fd3..7c400f7 100644 --- a/bestnotes/views.py +++ b/bestnotes/views.py @@ -1,5 +1,5 @@ from django.shortcuts import render - +from bestnotes.models import Note # Create your views here. from django.http import HttpResponse @@ -14,4 +14,21 @@ def subject(request): return render(request, "subjects.html", {}) def subject_id(request,id): - return render(request, "subject.html", {'id': id}) \ No newline at end of file + return render(request, "subject.html", {'id': id}) + +#Give all notes connected with subject name and pass it to html +def notes_name(request,subject_name): + all_notes = Note.objects.all() + subject_notes = all_notes.filter(topic__subject__name=subject_name) #Get all notes with subject name + context = { + 'notes' : subject_notes + } + #Change website here + return render(request, "test.html", context) + +def notes_all(request): + all_notes = Note.objects.all() + context = { + 'notes' : all_notes + } + return render(request, "test.html", context) \ No newline at end of file diff --git a/db.sqlite3 b/db.sqlite3 index c6ed4d5..2dae053 100644 Binary files a/db.sqlite3 and b/db.sqlite3 differ