diff --git a/generic/models.py b/generic/models.py index 109eef4a..bd4f5d25 100644 --- a/generic/models.py +++ b/generic/models.py @@ -143,6 +143,7 @@ class QuestionNote(models.Model): return "{}: {} [{}] {} / {}".format(self.content_type, self.get_author_str(), self.created_on, self.note_type, self.note) def get_absolute_url(self): + # TODO: return to question if logged in return "/" def get_object_url(self): diff --git a/longs/admin.py b/longs/admin.py index 8ad0cc74..5ad0a926 100755 --- a/longs/admin.py +++ b/longs/admin.py @@ -1,5 +1,5 @@ from django.contrib import admin -from .models import Long, LongSeries, LongSeriesImage, Note, LongCreationDefault, Exam, CidUserAnswer +from .models import Long, LongSeries, LongSeriesImage, LongCreationDefault, Exam, CidUserAnswer import tagulous.admin @@ -16,7 +16,6 @@ from generic.models import Examination, Sign, Condition # Register your models here. # admin.site.register(Examination) # admin.site.register(Site) -admin.site.register(Note) admin.site.register(LongCreationDefault) admin.site.register(LongSeriesImage) admin.site.register(CidUserAnswer) diff --git a/longs/forms.py b/longs/forms.py index cc324da4..bafe9c78 100755 --- a/longs/forms.py +++ b/longs/forms.py @@ -10,7 +10,6 @@ from django.forms import inlineformset_factory from longs.models import ( #Examination, - Note, Long, LongSeries, LongSeriesImage, @@ -49,13 +48,6 @@ class ExaminationForm(ModelForm): fields = ["examination"] -class NoteForm(ModelForm): - class Meta: - model = Note - fields = ["note"] - - - class LongCreationDefaultForm(ModelForm): class Meta: model = LongCreationDefault diff --git a/longs/models.py b/longs/models.py index 7bf977ab..951e8937 100644 --- a/longs/models.py +++ b/longs/models.py @@ -550,25 +550,6 @@ class LongSeries(models.Model): # image_tag.short_description = 'Image' -class Note(models.Model): - long = models.ForeignKey( - Long, related_name="long_notes", on_delete=models.CASCADE, null=True - ) - # author = models.ForeignKey(User, - author = models.ForeignKey( - settings.AUTH_USER_MODEL, related_name="long_notes", on_delete=models.CASCADE - ) - note = models.TextField() - created_on = models.DateTimeField(auto_now_add=True) - - def get_absolute_url(self): - self.pk = self.long_id - return reverse("longs:question_detail", kwargs={"pk": self.pk}) - - def __str__(self): - return "{} [{}] {}".format(self.long, self.author, self.created_on) - - class LongCreationDefault(models.Model): # author = models.OneToOneField(User, author = models.OneToOneField( diff --git a/longs/templates/longs/long_display_block.html b/longs/templates/longs/long_display_block.html index edc94237..ad108700 100755 --- a/longs/templates/longs/long_display_block.html +++ b/longs/templates/longs/long_display_block.html @@ -71,13 +71,6 @@
Notes: -
diff --git a/longs/templates/longs/note_form.html b/longs/templates/longs/note_form.html deleted file mode 100755 index c5b56835..00000000 --- a/longs/templates/longs/note_form.html +++ /dev/null @@ -1,12 +0,0 @@ -{% extends "longs/base.html" %} - -{% block content %} -

Add Note

-
- {% csrf_token %} - - {{ form.as_table }} -
- -
-{% endblock %} diff --git a/longs/templates/longs/question_detail.html b/longs/templates/longs/question_detail.html index 6b9a5157..c6cd4b66 100755 --- a/longs/templates/longs/question_detail.html +++ b/longs/templates/longs/question_detail.html @@ -8,7 +8,7 @@ Edit Clone Delete - Add Note + Add Note {% if request.user.is_superuser %} Admin Edit {% endif %} diff --git a/longs/urls.py b/longs/urls.py index 3b4c83d6..02de70cf 100755 --- a/longs/urls.py +++ b/longs/urls.py @@ -168,7 +168,6 @@ urlpatterns = [ views.LongSeriesUpdate.as_view(), name="long_series_update", ), - path("/add_note", views.AddNote.as_view(), name="long_add_note"), path( "user_answers/", views.UserAnswerTableView.as_view(), diff --git a/longs/views.py b/longs/views.py index 1bacc758..cbce7b19 100755 --- a/longs/views.py +++ b/longs/views.py @@ -25,13 +25,11 @@ from .forms import ( LongSeriesForm, LongSeriesImageFormSet, MarkLongQuestionForm, SeriesFormSet, - NoteForm, ExaminationForm, ExamForm, ) from .models import ( Long, LongSeries, - Note, Examination, Exam, CidUserAnswer, @@ -124,7 +122,6 @@ def question_detail(request, pk): # if request.user not in long.author.all(): # raise PermissionDenied - # logging.debug(long.long_notes.first()) # logging.debug(long.subspecialty.first().name.all()) return render(request, "longs/question_detail.html", {"question": long}) @@ -136,7 +133,6 @@ def long_series_detail(request, pk): # if request.user not in long.author.all(): # raise PermissionDenied - # logging.debug(long.long_notes.first()) # logging.debug(long.subspecialty.first().name.all()) return render(request, "longs/long_series.html", {"series": series}) @@ -174,7 +170,6 @@ def long_split(request, pk): # if request.user not in long.author.all(): # raise PermissionDenied - # logging.debug(long.long_notes.first()) # logging.debug(long.subspecialty.first().name.all()) return render(request, "longs/question_detail.html", {"question": long}) @@ -236,37 +231,6 @@ class LongCreationDefaultView(LoginRequiredMixin, UpdateView): # form.instance.author.add(self.request.user.id) -class AddNote(LoginRequiredMixin, CreateView): - model = Note - form_class = NoteForm - - # fields = '__all__' - # #fields = [ 'condition' ] - # #initial = {'date_of_death': '05/01/2018'} - # exclude = [ 'created_date', 'published_date' ] - def dispatch(self, request, *args, **kwargs): - """ - Overridden so we can make sure the `Long` instance exists - before going any further. - """ - self.pk = get_object_or_404(Long, pk=kwargs["pk"]) - return super().dispatch(request, *args, **kwargs) - - def form_valid(self, form): - - note = form.save(commit=False) - - note.long = self.pk - - note.author = self.request.user - note.save() - - response = super().form_valid(form) - - return response - - # form.instance.author.add(self.request.user.id) - #@login_required #@user_is_author_or_long_checker #def long_delete(request, pk): diff --git a/rapids/admin.py b/rapids/admin.py index 87aa9ace..c07f584a 100755 --- a/rapids/admin.py +++ b/rapids/admin.py @@ -1,5 +1,5 @@ from django.contrib import admin -from .models import Rapid, RapidImage, Examination, Site, Abnormality, Region, Note, RapidCreationDefault, Answer, Exam, CidUserAnswer +from .models import Rapid, RapidImage, Examination, Site, Abnormality, Region, RapidCreationDefault, Answer, Exam, CidUserAnswer import tagulous.admin @@ -13,7 +13,6 @@ admin.site.register(Examination) #admin.site.register(Site) admin.site.register(Abnormality) admin.site.register(Region) -admin.site.register(Note) admin.site.register(RapidCreationDefault) admin.site.register(Answer) diff --git a/rapids/forms.py b/rapids/forms.py index f7993321..5c516529 100755 --- a/rapids/forms.py +++ b/rapids/forms.py @@ -11,7 +11,6 @@ from django.forms import inlineformset_factory from rapids.models import ( Abnormality, Examination, - Note, Rapid, RapidCreationDefault, RapidImage, @@ -44,12 +43,6 @@ class ExaminationForm(ModelForm): fields = ["examination"] -class NoteForm(ModelForm): - class Meta: - model = Note - fields = ["note"] - - class RegionForm(ModelForm): class Meta: model = Region diff --git a/rapids/models.py b/rapids/models.py index cec0dc96..cb66f911 100644 --- a/rapids/models.py +++ b/rapids/models.py @@ -425,26 +425,6 @@ class RapidImage(models.Model): image_tag.short_description = 'Image' -class Note(models.Model): - rapid = models.ForeignKey(Rapid, - related_name="rapid_notes", - on_delete=models.CASCADE, - null=True) - #author = models.ForeignKey(User, - author = models.ForeignKey( settings.AUTH_USER_MODEL, - related_name="rapid_notes", - on_delete=models.CASCADE) - note = models.TextField() - created_on = models.DateTimeField(auto_now_add=True) - - def get_absolute_url(self): - self.pk = self.rapid_id - return reverse('rapids:question_detail', kwargs={'pk': self.pk}) - - def __str__(self): - return "{} [{}] {}".format(self.rapid, self.author, self.created_on) - - class RapidCreationDefault(models.Model): #author = models.OneToOneField(User, author = models.OneToOneField( diff --git a/rapids/templates/rapids/note_form.html b/rapids/templates/rapids/note_form.html deleted file mode 100755 index 89dcd1ae..00000000 --- a/rapids/templates/rapids/note_form.html +++ /dev/null @@ -1,12 +0,0 @@ -{% extends "rapids/base.html" %} - -{% block content %} -

Add Note

-
- {% csrf_token %} - - {{ form.as_table }} -
- -
-{% endblock %} diff --git a/rapids/templates/rapids/question_display_block.html b/rapids/templates/rapids/question_display_block.html index 4eb7c195..bd47796d 100755 --- a/rapids/templates/rapids/question_display_block.html +++ b/rapids/templates/rapids/question_display_block.html @@ -59,14 +59,6 @@ {% if view_feedback %} Notes: - - Anon Notes: