From 49779ea006ed6036a081b66be4a25449e66d25b8 Mon Sep 17 00:00:00 2001
From: Felipe Henrique de Almeida Bormann <fbormann@Felipes-MacBook-Air.local>
Date: Wed, 1 Feb 2017 17:56:51 -0300
Subject: [PATCH] removed date of notifications on link model

---
 links/forms.py                               | 22 +++-------------------
 links/migrations/0006_auto_20170201_1756.py  | 31 +++++++++++++++++++++++++++++++
 links/models.py                              |  5 +----
 subjects/templates/subjects/list_search.html |  4 ++--
 subjects/views.py                            |  2 +-
 5 files changed, 38 insertions(+), 26 deletions(-)
 create mode 100644 links/migrations/0006_auto_20170201_1756.py

diff --git a/links/forms.py b/links/forms.py
index a34380e..2349d25 100644
--- a/links/forms.py
+++ b/links/forms.py
@@ -26,12 +26,10 @@ class LinkForm(forms.ModelForm):
 
 	tags = forms.CharField(label = _('Tags'), required = False)
 	link_url = forms.URLField(label = _('Website URL'),required=True)
-	initial_view_date = forms.DateTimeField(input_formats=['%Y/%m/%d %I:%M %p', '%d/%m/%Y %I:%M %p', '%m/%d/%Y %I:%M %p'], required=False)
-	end_view_date = forms.DateTimeField(input_formats=['%Y/%m/%d %I:%M %p', '%d/%m/%Y %I:%M %p', '%m/%d/%Y %I:%M %p'], required=False ,help_text=[_('It sets a limit date to finish viewing the website link  ')])
-
+	
 	class Meta:
 		model = Link
-		fields = ['name','link_url', 'initial_view','initial_view_date', 'end_view','end_view_date', 'brief_description', 'all_students', 'students', 'groups', 'visible']
+		fields = ['name','link_url', 'brief_description', 'all_students', 'students', 'groups', 'visible']
 		labels = {
 			'name': _('Link name'),
 			'end_view' : _('End View'),
@@ -47,21 +45,7 @@ class LinkForm(forms.ModelForm):
 
 		cleaned_data = self.cleaned_data
 
-		if cleaned_data.get('end_view'):
-			end_view = cleaned_data.get('end_view')
-			if end_view and not cleaned_data.get('end_view_date'):
-				raise ValidationError(_('End View Date is not set'), code='invalid' )
-
-		if cleaned_data.get('initial_view'):
-			initial_view = cleaned_data.get('initial_view')
-			if initial_view and not cleaned_data.get('initial_view_date'):
-				raise ValidationError(_('Initial View Date is not set'), code='invalid' )
-		if cleaned_data.get('initial_view_date') and cleaned_data.get('end_view_date'):
-			end_view_date = cleaned_data.get('end_view_date')
-			initial_view_date = cleaned_data.get('initial_view_date')
-			if end_view_date < initial_view_date:
-				raise ValidationError(_('End View Date before Initial View Date'), code='invalid' )
-
+	
 		return cleaned_data
 	
 
diff --git a/links/migrations/0006_auto_20170201_1756.py b/links/migrations/0006_auto_20170201_1756.py
new file mode 100644
index 0000000..d1ac694
--- /dev/null
+++ b/links/migrations/0006_auto_20170201_1756.py
@@ -0,0 +1,31 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.4 on 2017-02-01 20:56
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('links', '0005_auto_20170201_0101'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='link',
+            name='end_view',
+        ),
+        migrations.RemoveField(
+            model_name='link',
+            name='end_view_date',
+        ),
+        migrations.RemoveField(
+            model_name='link',
+            name='initial_view',
+        ),
+        migrations.RemoveField(
+            model_name='link',
+            name='initial_view_date',
+        ),
+    ]
diff --git a/links/models.py b/links/models.py
index 3b68cc1..8876e1d 100644
--- a/links/models.py
+++ b/links/models.py
@@ -14,10 +14,7 @@ class Link(Resource):
 
     link_url = models.URLField(verbose_name = _("Link_URL"))
     
-    initial_view = models.BooleanField(_('Initial View'), default = False)
-    initial_view_date = models.DateTimeField(_('Initial View Date'), default= timezone.now, null=True)
-    end_view =  models.BooleanField(_('Initial View'), default = False)
-    end_view_date = models.DateTimeField(_('Initial View Date'), default=timezone.now, null=True)
+   
     class Meta:
         verbose_name = "Link"
         verbose_name_plural = "Links"
diff --git a/subjects/templates/subjects/list_search.html b/subjects/templates/subjects/list_search.html
index 52ee99c..4ac99fb 100644
--- a/subjects/templates/subjects/list_search.html
+++ b/subjects/templates/subjects/list_search.html
@@ -36,10 +36,10 @@
         <ul class="core-subjects-options">
             {% if all %}
                 <a href="{% url 'subjects:search' %}?search= {{tags}} "><li >{% trans "Subjects" %} ({{ totals.my_subjects }})</li></a>
-                <a href="" ><li class="active">{% trans "Resources" %} ({{ totals.all_subjects }})</li></a>
+                <a href="" ><li class="active">{% trans "Resources" %} ({{ totals.resources }})</li></a>
             {% else %}
                 <a href="{% url 'subjects:search' %}?search={{tags}}"><li class="active">{% trans "Subjects" %} ({{ totals.my_subjects }})</li></a>
-                <a href="" ><li>{% trans "Resources" %} ({{ totals.all_subjects }})</li></a>
+                <a href="" ><li>{% trans "Resources" %} ({{ totals.resources }})</li></a>
             {% endif %}
             
         </ul>
diff --git a/subjects/views.py b/subjects/views.py
index 3cf8498..043915a 100644
--- a/subjects/views.py
+++ b/subjects/views.py
@@ -607,7 +607,7 @@ class SubjectSearchView(LoginRequiredMixin, LogMixin, ListView):
         #pk = self.request.user.pk
         #my_subjects = Subject.objects.filter(Q(students__pk=pk) | Q(professor__pk=pk) | Q(category__coordinators__pk=pk) & Q(tags__name__in=tags) ).distinct()
         
-        self.totals = {'all_subjects': subjects.count(), 'my_subjects': subjects.count()}
+        self.totals = {'resources': subjects.count(), 'my_subjects': subjects.count()}
         #if self.kwargs.get('option'):
         #    subjects = my_subjects
         return subjects
--
libgit2 0.21.2