Merge branch 'dev' of https://github.com/amadeusproject/amadeuslms into dev

Jailson Dias
2 parents e5987f89 f9504c73
Showing 13 changed files with 164 additions and 64 deletions Show diff stats
courses/templates/subject/form_view_teacher.html
courses/templates/topic/link_topic_list.html
courses/templates/topic/link_topic_list_edit.html
courses/templatetags/list_topic_foruns.py
courses/urls.py
forum/tests/test_model_answer.py
forum/tests/test_model_forum.py
links/admin.py
links/forms.py
links/models.py
links/static/links.js
links/urls.py
links/views.py
@@ -4,6 +4,7 @@
         <script type="text/javascript" src="{% static 'js/forum.js' %}"></script>
         <script src="{% static 'js/file.js' %}"></script>
         <script type="text/javascript" src="{% static 'js/material.js' %}"></script>
+        <script type = "text/javascript" src="{% static 'link.js' %}"></script>
     {% endblock %}
     <div class="panel-group accordion ui-accordion ui-widget ui-helper-reset ui-sortable" role="tablist" aria-multiselectable="false">
@@ -54,7 +55,7 @@
                   <div class="dropdown">
                     <a href="#" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-plus-circle fa-lg" aria-hidden="true"></i></a>
                     <ul class="dropdown-menu" aria-labelledby="dLabel">
-                        <li><a href="javascript:void(0)" data-toggle="modal" data-target="#createLinksModal">Create a Link<div class="ripple-container"><div class="ripple ripple-on ripple-out" style="left: 54.5312px; top: 22px; background-color: rgb(0, 150, 136); transform: scale(20);"></div></div></a></li>
+                        <li><a href=" javascript:get_modal_link('{% url 'course:links:create_link' %}', '#createLinksModal','#divModalLink')  ">Create a Link<div class="ripple-container"><div class="ripple ripple-on ripple-out" style="left: 54.5312px; top: 22px; background-color: rgb(0, 150, 136); transform: scale(20);"></div></div></a></li>
                         <li>
                             <a href="javascript:get_modal_file('{% url 'course:file:create_file' topic.slug %}', '#fileModal', '#divModalFile')">
                                 {% trans "Create a file" %}
@@ -69,7 +70,7 @@
                 </div>
                 <ul>
                     {% list_topic_file request topic %}
-                    <li><i class="fa fa-link" aria-hidden="true"></i>  <a href="#" data-toggle="modal" data-target="#linksModal">Link 1</a></li>
+                    {% list_topic_link request topic%}
                     <li><i class="fa fa-file-code-o" aria-hidden="true"></i> <a href="#" data-toggle="modal" data-target="#embedModal">EMBED Material</a></li>
                 </ul>
               </div>
@@ -115,12 +116,13 @@
                   <div class="dropdown">
                     <a href="#" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-plus-circle fa-lg" aria-hidden="true"></i></a>
                     <ul class="dropdown-menu" aria-labelledby="dLabel">
-                      <li><a href="javascript:void(0)" data-toggle="modal" data-target="#createLinksModal">Create a Link</a></li>
+                      <li><a href=" javascript:get_modal_link('{% url 'course:links:create_link' %}', '#createLinksModal','#divModalLink')  ">Create a Link</a></li>
                       <li><a href="javascript:void(0)" data-toggle="modal" data-target="#fileModal">Create a file</a></li>
                     </ul>
                   </div>
                 </div>
                 <ul>
+                    {% list_topic_link_edit request topic%}
                     {% list_topic_file_edit request topic %}
                 </ul>
               </div>
@@ -175,31 +177,6 @@
       </div>
     </div>
     <!-- END -->
-    <!--MODAL VIEW LINK-->
-    <div class="modal fade" id="linksModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
-      <div class="modal-dialog" role="document">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
-            <h4 class="modal-title" id="myModalLabel">Links</h4>
-          </div>
-          <div class="modal-body">
-            <!-- Card -->
-            <article class="card animated fadeInLeft">
-               <img class="card-img-top img-responsive" src="https://www.python.org/static/opengraph-icon-200x200.png" align="left">
-               <div class="card-block">
-                  <b class="card-title">Python</b><p></p>
-                  <b class="text-muted">Guido van Rossum</b>
-                  <p class="card-text"> </p><p>Python is a widely used high-level, general-purpose, interpreted, dynamic programming language. Its design philosophy emphasizes code readability, and its syntax allows programmers to express concepts in fewer lines of code than possible in languages such as C++ or Java.</p>
-                  <a href="https://www.python.org/" class="btn btn-primary">Read more</a>
-               </div>
-            </article>
-            <!-- .end Card -->
-          </div>
-        </div>
-      </div>
-    </div>
-    <!-- EndModal -->
     {% professor_subject topic.subject user as professor_links %}
     {% if professor_links%}
         {% include "links/create_link.html" %}
@@ -0,0 +1,27 @@
+{% load static i18n list_topic_foruns permission_tags %}
+{% for link in links%}
+        <li><i class="fa fa-link" aria-hidden="true"></i>  <a href="#" data-toggle="modal" data-target="#linksModal{{slug}}{{ forloop.counter }}">{{link}}</a></li>
+        <!--MODAL VIEW LINK-->
+        <div class="modal fade" id="linksModal{{slug}}{{ forloop.counter}}" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
+          <div class="modal-dialog" role="document">
+            <div class="modal-content">
+              <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
+                <h4 class="modal-title" id="myModalLabel">Link</h4>
+              </div>
+              <div class="modal-body">
+                <!-- Card -->
+                <article class="card animated fadeInLeft">
+                   <div class="card-block">
+                      <b class="card-title">{{link.name}}</b><p></p>
+                      <p class="card-text"> </p><p>{{link.link_description}}</p>
+                      <a href="{{ link.link_url }}" class="btn btn-primary">Read more</a>
+                   </div>
+                </article>
+                <!-- .end Card -->
+              </div>
+            </div>
+          </div>
+        </div>
+        <!-- EndModal -->
+{% endfor %}
@@ -0,0 +1,31 @@
+{% load static i18n list_topic_foruns permission_tags %}
+{% for link in links%}
+        <li class="icon_edit_remove"> <a href="#" data-toggle="modal" data-target="#linksModalEdit"><i class="fa fa-pencil fa-lg" aria-hidden="true"></i></a>  <a href="#" data-toggle="modal" data-target="#removeLink"><i class="fa fa-trash fa-lg" aria-hidden="true"></i></a></li>
+        <li><i class="fa fa-link" aria-hidden="true"></i>  <a href="#" data-toggle="modal" data-target="#linksModal{{slug}}{{ forloop.counter }}">{{link}}</a></li>
+
+        <!--MODAL VIEW LINK-->
+        <div class="modal fade" id="linksModal{{slug}}{{ forloop.counter}}" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
+          <div class="modal-dialog" role="document">
+            <div class="modal-content">
+              <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
+                <h4 class="modal-title" id="myModalLabel">Link</h4>
+              </div>
+              <div class="modal-body">
+                <!-- Card -->
+                <article class="card animated fadeInLeft">
+                   <div class="card-block">
+                      <b class="card-title">{{link.name}}</b><p></p>
+                      <p class="card-text"> </p><p>{{link.link_description}}</p>
+                      <a href="{{ link.link_url }}" class="btn btn-primary">Read more</a>
+                   </div>
+                </article>
+                <!-- .end Card -->
+              </div>
+            </div>
+          </div>
+        </div>
+        <!-- EndModal -->
+{% endfor %}
+  <div class = "row" id="divModalLink">
+  </div>
 from django import template
+from links.models import Link
 from forum.models import Forum
 from poll.models import Poll
 from files.models import TopicFile
@@ -51,3 +52,21 @@ def list_topic_file_edit(request, topic):
     context['topic'] = topic
     return context
+
+@register.inclusion_tag('topic/link_topic_list_edit.html')
+def list_topic_link_edit(request,topic):
+    context = {
+        'request':request
+    }
+    context['links'] = Link.objects.filter(topic = topic)
+    context['slug'] = topic.slug
+    return context
+
+@register.inclusion_tag('topic/link_topic_list.html')
+def list_topic_link(request,topic):
+    context = {
+        'request':request
+    }
+    context['links'] = Link.objects.filter(topic = topic)
+    context['slug'] = topic.slug
+    return context
@@ -30,6 +30,7 @@ urlpatterns = [
 	url(r'^exam/', include('exam.urls', namespace = 'exam')),
 	url(r'^files/', include('files.urls', namespace = 'file')),
 	url(r'^upload-material/$', views.UploadMaterialView.as_view(), name='upload_material'),
+	url(r'^links/',include('links.urls',namespace = 'links')),
@@ -93,16 +93,26 @@ class PostAnswerTestCase (TestCase):
         )
         self.post_student.save()
-        self.answer = PostAnswer.objects.create(
+        self.answerStudent = PostAnswer.objects.create(
             user = self.user_student,
             post = self.post_professor,
             message = 'testing a post answer',
             modification_date = '2016-10-05',
             answer_date = '2016-10-04',
         )
-        self.answer.save()
+        self.answerStudent.save()
+
+        self.answerProfessor = PostAnswer.objects.create(
+            user = self.user_professor,
+            post = self.post_student,
+            message = 'testing a post answer',
+            modification_date = '2016-10-05',
+            answer_date = '2016-10-04',
+        )
+        self.answerProfessor.save()
     def test_create_answer_post (self):
+        list_answers = PostAnswer.objects.filter(user=self.user_professor).count()
         answer = PostAnswer.objects.create(
             user = self.user_professor,
             post = self.post_student,
@@ -112,19 +122,46 @@ class PostAnswerTestCase (TestCase):
         )
         answer.save()
-        self.assertEquals (answer, PostAnswer.objects.get(user=self.user_professor, post=self.post_student))
+        self.assertEquals (list_answers+1, PostAnswer.objects.filter(user=self.user_professor, post=self.post_student).count())
+
+        list_answers = PostAnswer.objects.filter(user=self.user_student).count()
+        answer = PostAnswer.objects.create(
+            user = self.user_student,
+            post = self.post_professor,
+            message = 'testing a post answer2',
+            modification_date = '2016-10-05',
+            answer_date = '2016-10-04',
+        )
+        answer.save()
+
+        self.assertEquals (list_answers+1, PostAnswer.objects.filter(user=self.user_student, post=self.post_professor).count())       
     def test_update_answer_post (self):
-        self.answer.message = 'updating a answer post'
-        self.answer.save()
+        self.answerStudent.message = 'updating a student answer post'
+        self.answerStudent.save()
+        answer = PostAnswer.objects.get(message='updating a student answer post')
-        self.assertEquals(self.answer, PostAnswer.objects.all()[0]) 
+        self.assertEquals(self.answerStudent, answer) 
-    def test_delete_answer_post (self):
-        answer = PostAnswer.objects.get(user=self.user_student, post=self.post_professor)
-        self.answer.delete()
-        try:
-            answer = PostAnswer.objects.get(user=self.user_student, post=self.post_professor)
-        except:
-            pass
 \ No newline at end of file
+        self.answerProfessor.message = 'updating a professor answer post'
+        self.answerProfessor.save()
+        answer = PostAnswer.objects.get(message='updating a professor answer post')
+
+        self.assertEquals(self.answerProfessor, answer)
+
+    def test_delete_answer_post (self):
+        list_studentAnswers = PostAnswer.objects.filter(user=self.user_student).count()
+        self.assertEquals(list_studentAnswers, 1)
+
+        self.answerStudent.delete()
+        list_studentAnswers = PostAnswer.objects.filter(user=self.user_student).count()
+        self.assertEquals(list_studentAnswers, 0)
+        
+        list_professorAnswers = PostAnswer.objects.filter(user=self.user_professor).count()
+        self.assertEquals(list_professorAnswers, 1)
+
+        self.answerProfessor.delete()
+        list_professorAnswers = PostAnswer.objects.filter(user=self.user_professor).count()
+        self.assertEquals(list_professorAnswers, 0)
+         
 \ No newline at end of file
@@ -77,6 +77,8 @@ class ForumTestCase (TestCase):
         self.forum.save()
     def test_create_forum (self):
+        list_forum = Forum.objects.all().count()
+
     	forum = Forum.objects.create(
     		topic=self.topic,
     		name = 'forum test2',
@@ -87,20 +89,18 @@ class ForumTestCase (TestCase):
     	)
     	forum.save()
-    	self.assertEquals(forum, Forum.objects.filter(name='forum test2')[0])
+    	self.assertEquals(list_forum+1, Forum.objects.all().count())
-    def test_update_forum(self):        
+    def test_update_forum(self):
+        list_forum = Forum.objects.all().count()        
         self.forum.name = 'forum test updated'
         self.forum.save()
         self.assertEquals(self.forum, Forum.objects.get(name='forum test updated'))
+        self.assertEquals(list_forum, Forum.objects.all().count())
     def test_delete_forum (self):
-        forum = Forum.objects.get(name='forum test')
+        list_forum = Forum.objects.all().count()
         self.forum.delete()
-        try:
-            forum = Forum.objects.get(name='forum test')
-        except:
-            pass
-            
 \ No newline at end of file
+        self.assertEquals(list_forum-1, Forum.objects.all().count())            
 \ No newline at end of file
@@ -3,8 +3,8 @@ from django.contrib import admin
 from .models import Link
 class LinkAdmin(admin.ModelAdmin):
-	list_display = ['name', 'link','description']
-	search_fields = ['name', 'link','description']
+	list_display = ['name', 'link_url','link_description']
+	search_fields = ['name', 'link_url','link_description']
 admin.site.register(Link, LinkAdmin)
@@ -5,16 +5,16 @@ import validators
 class CreateLinkForm(forms.ModelForm):
     def clean_link(self):
-        link = self.cleaned_data['link']
-        if not validators.url(link):
+        link_url = self.cleaned_data['link_url']
+        if not validators.url(link_url):
             raise forms.ValidationError(_('Please enter a valid URL'))
-        return link
+        return link_url
     class Meta:
         model = Link
-        fields = ['name','link','description']
+        fields = ['name','link_url','link_description']
 class UpdateLinkForm(forms.ModelForm):
     class Meta:
         model = Link
-        fields = ['name','link','description']
+        fields = ['name','link_url','link_description']
-
 from django.db import models
 from courses.models import Material
 from autoslug.fields import AutoSlugField
 # Create your models here.
-class Link(models.Model):
-	name = models.CharField(max_length=100)
-	link = models.URLField()
-	description = models.CharField(max_length=200)
+class Link(Material):
+	link_url = models.URLField()
+	link_description = models.CharField(max_length=200)
 	class Meta:
 		verbose_name = 'Link'
 		verbose_name_plural = "Links"
@@ -0,0 +1,9 @@
+function get_modal_link(url, id,div_content){
+    $.get(url, function (data) {
+        //alert(data);
+        // $(div_content).empty();
+        // $(div_content).append(data);
+        $(id).modal('show');
+    });
+
+}
@@ -2,5 +2,7 @@ from django.conf.urls import url, include
 from . import views
 urlpatterns = [
-    url(r'^$', views.CreateLink.as_view(), name='teste')
+    url(r'^$', views.CreateLink.as_view(), name='create_link'),
+    url(r'^deletelink/(?P<linkname>[\w_-]+)/$', views.deleteLink,name = 'delete_link'),
+	url(r'^updatelink/(?P<linkname>[\w_-]+)/$', views.UpdateLink.as_view(),name = 'update_link'),
 ]
@@ -13,7 +13,7 @@ class CreateLink(generic.CreateView):
     template_name = 'links/create_link.html'
     form_class = CreateLinkForm
     success_url = reverse_lazy('course:manage')
-    context_object_name = 'links'
+    context_object_name = 'form'
     def form_valid(self, form):
         form.save()
@@ -26,7 +26,6 @@ class CreateLink(generic.CreateView):
         context['form'] = CreateLinkForm
         return context
-
 def deleteLink(request,linkname):
     link = get_object_or_404(Link,name = linkname)
     link.delete()
@@ -0,0 +1,27 @@		@@ -0,0 +1,27 @@
	1	+{% load static i18n list_topic_foruns permission_tags %}
	2	+{% for link in links%}
	3	+ <li><i class="fa fa-link" aria-hidden="true"></i> <a href="#" data-toggle="modal" data-target="#linksModal{{slug}}{{ forloop.counter }}">{{link}}</a></li>
	4	+ <!--MODAL VIEW LINK-->
	5	+ <div class="modal fade" id="linksModal{{slug}}{{ forloop.counter}}" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
	6	+ <div class="modal-dialog" role="document">
	7	+ <div class="modal-content">
	8	+ <div class="modal-header">
	9	+ <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
	10	+ <h4 class="modal-title" id="myModalLabel">Link</h4>
	11	+ </div>
	12	+ <div class="modal-body">
	13	+ <!-- Card -->
	14	+ <article class="card animated fadeInLeft">
	15	+ <div class="card-block">
	16	+ <b class="card-title">{{link.name}}</b><p></p>
	17	+ <p class="card-text"> </p><p>{{link.link_description}}</p>
	18	+ <a href="{{ link.link_url }}" class="btn btn-primary">Read more</a>
	19	+ </div>
	20	+ </article>
	21	+ <!-- .end Card -->
	22	+ </div>
	23	+ </div>
	24	+ </div>
	25	+ </div>
	26	+ <!-- EndModal -->
	27	+{% endfor %}
@@ -0,0 +1,31 @@		@@ -0,0 +1,31 @@
	1	+{% load static i18n list_topic_foruns permission_tags %}
	2	+{% for link in links%}
	3	+ <li class="icon_edit_remove"> <a href="#" data-toggle="modal" data-target="#linksModalEdit"><i class="fa fa-pencil fa-lg" aria-hidden="true"></i></a> <a href="#" data-toggle="modal" data-target="#removeLink"><i class="fa fa-trash fa-lg" aria-hidden="true"></i></a></li>
	4	+ <li><i class="fa fa-link" aria-hidden="true"></i> <a href="#" data-toggle="modal" data-target="#linksModal{{slug}}{{ forloop.counter }}">{{link}}</a></li>
	5	+
	6	+ <!--MODAL VIEW LINK-->
	7	+ <div class="modal fade" id="linksModal{{slug}}{{ forloop.counter}}" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
	8	+ <div class="modal-dialog" role="document">
	9	+ <div class="modal-content">
	10	+ <div class="modal-header">
	11	+ <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
	12	+ <h4 class="modal-title" id="myModalLabel">Link</h4>
	13	+ </div>
	14	+ <div class="modal-body">
	15	+ <!-- Card -->
	16	+ <article class="card animated fadeInLeft">
	17	+ <div class="card-block">
	18	+ <b class="card-title">{{link.name}}</b><p></p>
	19	+ <p class="card-text"> </p><p>{{link.link_description}}</p>
	20	+ <a href="{{ link.link_url }}" class="btn btn-primary">Read more</a>
	21	+ </div>
	22	+ </article>
	23	+ <!-- .end Card -->
	24	+ </div>
	25	+ </div>
	26	+ </div>
	27	+ </div>
	28	+ <!-- EndModal -->
	29	+{% endfor %}
	30	+ <div class = "row" id="divModalLink">
	31	+ </div>
1	from django import template	1	from django import template
2		2
		3	+from links.models import Link
3	from forum.models import Forum	4	from forum.models import Forum
4	from poll.models import Poll	5	from poll.models import Poll
5	from files.models import TopicFile	6	from files.models import TopicFile
	@@ -51,3 +52,21 @@ def list_topic_file_edit(request, topic):		@@ -51,3 +52,21 @@ def list_topic_file_edit(request, topic):
51	context['topic'] = topic	52	context['topic'] = topic
52		53
53	return context	54	return context
		55	+
		56	+@register.inclusion_tag('topic/link_topic_list_edit.html')
		57	+def list_topic_link_edit(request,topic):
		58	+ context = {
		59	+ 'request':request
		60	+ }
		61	+ context['links'] = Link.objects.filter(topic = topic)
		62	+ context['slug'] = topic.slug
		63	+ return context
		64	+
		65	+@register.inclusion_tag('topic/link_topic_list.html')
		66	+def list_topic_link(request,topic):
		67	+ context = {
		68	+ 'request':request
		69	+ }
		70	+ context['links'] = Link.objects.filter(topic = topic)
		71	+ context['slug'] = topic.slug
		72	+ return context
	@@ -30,6 +30,7 @@ urlpatterns = [		@@ -30,6 +30,7 @@ urlpatterns = [
30	url(r'^exam/', include('exam.urls', namespace = 'exam')),	30	url(r'^exam/', include('exam.urls', namespace = 'exam')),
31	url(r'^files/', include('files.urls', namespace = 'file')),	31	url(r'^files/', include('files.urls', namespace = 'file')),
32	url(r'^upload-material/$', views.UploadMaterialView.as_view(), name='upload_material'),	32	url(r'^upload-material/$', views.UploadMaterialView.as_view(), name='upload_material'),
		33	+ url(r'^links/',include('links.urls',namespace = 'links')),
33		34
34		35
35		36
	@@ -93,16 +93,26 @@ class PostAnswerTestCase (TestCase):		@@ -93,16 +93,26 @@ class PostAnswerTestCase (TestCase):
93	)	93	)
94	self.post_student.save()	94	self.post_student.save()
95		95
96	- self.answer = PostAnswer.objects.create(	96	+ self.answerStudent = PostAnswer.objects.create(
97	user = self.user_student,	97	user = self.user_student,
98	post = self.post_professor,	98	post = self.post_professor,
99	message = 'testing a post answer',	99	message = 'testing a post answer',
100	modification_date = '2016-10-05',	100	modification_date = '2016-10-05',
101	answer_date = '2016-10-04',	101	answer_date = '2016-10-04',
102	)	102	)
103	- self.answer.save()	103	+ self.answerStudent.save()
		104	+
		105	+ self.answerProfessor = PostAnswer.objects.create(
		106	+ user = self.user_professor,
		107	+ post = self.post_student,
		108	+ message = 'testing a post answer',
		109	+ modification_date = '2016-10-05',
		110	+ answer_date = '2016-10-04',
		111	+ )
		112	+ self.answerProfessor.save()
104		113
105	def test_create_answer_post (self):	114	def test_create_answer_post (self):
		115	+ list_answers = PostAnswer.objects.filter(user=self.user_professor).count()
106	answer = PostAnswer.objects.create(	116	answer = PostAnswer.objects.create(
107	user = self.user_professor,	117	user = self.user_professor,
108	post = self.post_student,	118	post = self.post_student,
	@@ -112,19 +122,46 @@ class PostAnswerTestCase (TestCase):		@@ -112,19 +122,46 @@ class PostAnswerTestCase (TestCase):
112	)	122	)
113	answer.save()	123	answer.save()
114		124
115	- self.assertEquals (answer, PostAnswer.objects.get(user=self.user_professor, post=self.post_student))	125	+ self.assertEquals (list_answers+1, PostAnswer.objects.filter(user=self.user_professor, post=self.post_student).count())
		126	+
		127	+ list_answers = PostAnswer.objects.filter(user=self.user_student).count()
		128	+ answer = PostAnswer.objects.create(
		129	+ user = self.user_student,
		130	+ post = self.post_professor,
		131	+ message = 'testing a post answer2',
		132	+ modification_date = '2016-10-05',
		133	+ answer_date = '2016-10-04',
		134	+ )
		135	+ answer.save()
		136	+
		137	+ self.assertEquals (list_answers+1, PostAnswer.objects.filter(user=self.user_student, post=self.post_professor).count())
116		138
117	def test_update_answer_post (self):	139	def test_update_answer_post (self):
118	- self.answer.message = 'updating a answer post'
119	- self.answer.save()	140	+ self.answerStudent.message = 'updating a student answer post'
		141	+ self.answerStudent.save()
		142	+ answer = PostAnswer.objects.get(message='updating a student answer post')
120		143
121	- self.assertEquals(self.answer, PostAnswer.objects.all()[0])	144	+ self.assertEquals(self.answerStudent, answer)
122		145
123	- def test_delete_answer_post (self):
124	- answer = PostAnswer.objects.get(user=self.user_student, post=self.post_professor)
125	- self.answer.delete()
126		146
127	- try:
128	- answer = PostAnswer.objects.get(user=self.user_student, post=self.post_professor)
129	- except:
130	- pass
131	\ No newline at end of file	147	\ No newline at end of file
		148	+ self.answerProfessor.message = 'updating a professor answer post'
		149	+ self.answerProfessor.save()
		150	+ answer = PostAnswer.objects.get(message='updating a professor answer post')
		151	+
		152	+ self.assertEquals(self.answerProfessor, answer)
		153	+
		154	+ def test_delete_answer_post (self):
		155	+ list_studentAnswers = PostAnswer.objects.filter(user=self.user_student).count()
		156	+ self.assertEquals(list_studentAnswers, 1)
		157	+
		158	+ self.answerStudent.delete()
		159	+ list_studentAnswers = PostAnswer.objects.filter(user=self.user_student).count()
		160	+ self.assertEquals(list_studentAnswers, 0)
		161	+
		162	+ list_professorAnswers = PostAnswer.objects.filter(user=self.user_professor).count()
		163	+ self.assertEquals(list_professorAnswers, 1)
		164	+
		165	+ self.answerProfessor.delete()
		166	+ list_professorAnswers = PostAnswer.objects.filter(user=self.user_professor).count()
		167	+ self.assertEquals(list_professorAnswers, 0)
		168	+
132	\ No newline at end of file	169	\ No newline at end of file
	@@ -3,8 +3,8 @@ from django.contrib import admin		@@ -3,8 +3,8 @@ from django.contrib import admin
3	from .models import Link	3	from .models import Link
4		4
5	class LinkAdmin(admin.ModelAdmin):	5	class LinkAdmin(admin.ModelAdmin):
6	- list_display = ['name', 'link','description']
7	- search_fields = ['name', 'link','description']	6	+ list_display = ['name', 'link_url','link_description']
		7	+ search_fields = ['name', 'link_url','link_description']
8		8
9		9
10	admin.site.register(Link, LinkAdmin)	10	admin.site.register(Link, LinkAdmin)
@@ -0,0 +1,9 @@		@@ -0,0 +1,9 @@
	1	+function get_modal_link(url, id,div_content){
	2	+ $.get(url, function (data) {
	3	+ //alert(data);
	4	+ // $(div_content).empty();
	5	+ // $(div_content).append(data);
	6	+ $(id).modal('show');
	7	+ });
	8	+
	9	+}
	@@ -2,5 +2,7 @@ from django.conf.urls import url, include		@@ -2,5 +2,7 @@ from django.conf.urls import url, include
2	from . import views	2	from . import views
3		3
4	urlpatterns = [	4	urlpatterns = [
5	- url(r'^$', views.CreateLink.as_view(), name='teste')	5	+ url(r'^$', views.CreateLink.as_view(), name='create_link'),
		6	+ url(r'^deletelink/(?P<linkname>[\w_-]+)/$', views.deleteLink,name = 'delete_link'),
		7	+ url(r'^updatelink/(?P<linkname>[\w_-]+)/$', views.UpdateLink.as_view(),name = 'update_link'),
6	]	8	]