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

filipecmedeiros
2 parents 184377ea 7f219cc5
Showing 19 changed files with 102 additions and 41 deletions Show diff stats
amadeus/settings.py
avaliacao/__init__.py
avaliacao/admin.py
avaliacao/apps.py
avaliacao/migrations/__init__.py
avaliacao/models.py
avaliacao/tests.py
avaliacao/urls.py
avaliacao/views.py
core/urls.py
courses/templates/course/index.html
courses/templates/course/view.html
courses/templates/subject/index.html
courses/urls.py
courses/views.py
forum/static/js/forum.js
forum/templates/forum/forum_form.html
forum/views.py
manage.py
@@ -55,6 +55,8 @@ INSTALLED_APPS = [
     'courses',
     'forum',
     'poll',
+    'avaliacao',
+
 ]
 MIDDLEWARE_CLASSES = [
@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.
@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class AvaliacaoConfig(AppConfig):
+    name = 'avaliacao'
@@ -0,0 +1,20 @@
+from django.utils.translation import ugettext_lazy as _
+from django.db import models
+from autoslug.fields import AutoSlugField
+from users.models import User
+from core.models import Resource
+from courses.models import Activity
+
+class Avaliacao(Activity):
+
+    name_avalicao = models.CharField(_('Name'), max_length = 100)
+    init_date = models.DateField(_('Begin of Avaliacao Date'))
+    end_date = models.DateField(_('End of Avaliacao Date'))
+
+    class Meta:
+        #ordering = ('create_date','name')
+        verbose_name = _('Avaliacao')
+        verbose_name_plural = _('Avaliacoes')
+
+def __str__(self):
+    return str(self.name) + str("/") + str(self.topic)
@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.
@@ -0,0 +1,7 @@
+from django.conf.urls import url
+
+from . import views
+
+urlpatterns =[
+
+]
@@ -0,0 +1,3 @@
+from django.shortcuts import render
+
+# Create your views here.
 from django.conf.urls import url, include
 from django.contrib.auth import views as auth_views
 from django.contrib.auth.views import password_reset, password_reset_done,password_reset_confirm, password_reset_complete
-
 from . import views
@@ -12,10 +11,13 @@ urlpatterns = [
     url(r'^logout/$', auth_views.logout, {'next_page': 'core:home'}, name='logout'),
     url(r'^notification/([0-9]+)/$', views.processNotification, name='notification_read'),
     url(r'^getNotifications/$', views.getNotifications, name='getNotifications'),
+]
-	url(r'^reset/$', password_reset, {'template_name':'registration/passwor_reset_form.html','email_template_name':'registration/password_reset_email.html','post_reset_redirect':'done/'}, name="password_reset"),
-	url(r'^reset/done/$', password_reset_done, {'template_name':'registration/passwor_reset_done.html'}),
-	url(r'^reset/(?P<uidb36>[0-9A-Za-z]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})/$', password_reset_confirm, {'template_name':'registration/password_reset_confirm.html'}),
-	url(r'^done/$', password_reset_complete,{'template_name':'registration/passwor_reset_complete.html'}),
+#Reset Password
+urlpatterns += [
+	url(r'^password/reset/$', password_reset, {'post_reset_redirect' : 'password/reset/done/','template_name': 'registration/passwor_reset_form.html'}, name="password_reset"),
+	url(r'^password/reset/done/$', password_reset_done, {'template_name': 'registration/passwor_reset_done.html'}),
+	url(r'^password/reset/(?P<uidb36>[0-9A-Za-z]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})/$', password_reset_confirm, {'post_reset_redirect' : 'password/done/', 'template_name': 'registration/password_reset_confirm.html'}),
+	url(r'^password/done/$', password_reset_complete,{'template_name': 'registration/passwor_reset_complete.html'}),
 ]
@@ -53,10 +53,20 @@
 		{% endfor %}
 	{% endif %}
+<div class="col-md-12">
+		<div class="input-group">
+		  <div class="form-group is-empty"><input type="search" class="form-control" placeholder="Search Courses"></div>
+		    <span class="input-group-btn input-group-sm">
+		      <button type="button" class="btn btn-fab btn-fab-mini">
+		        <i class="material-icons">search</i>
+		      </button>
+		    </span>
+		</div>
+	</div>
 {% if user|has_role:'professor, system_admin' %}
 	<div class="col-md-12">
-		{% if courses_teacher|length > 0 %}
+		{% if courses|length > 0 %}
 			{% for course in courses_teacher %}
 			  <!-- Put your content here! -->
 	          <div class="panel-group ui-accordion ui-widget ui-helper-reset ui-sortable" id="accordion" role="tablist" aria-multiselectable="false">
@@ -130,21 +140,11 @@
 				</div>
 			</div>
 		</div>
+{% endif %}
-{% else %}
+{% if user|has_role:'students' %}
-	<div class="col-md-12">
-		<div class="input-group">
-		  <div class="form-group is-empty"><input type="search" class="form-control" placeholder="Search Courses"></div>
-		    <span class="input-group-btn input-group-sm">
-		      <button type="button" class="btn btn-fab btn-fab-mini">
-		        <i class="material-icons">search</i>
-		      </button>
-		    </span>
-		</div>
-	</div>
-
-	{% if subjects_student|length > 0 %}
+	{% if courses|length > 0 %}
 		{% for course in courses_student %}
 			<div class="col-md-12">
 			    <div class="panel panel-info">
@@ -154,9 +154,15 @@
 	            	<img src="" class="img-responsive" />
 	            {% endif %} -->
 				  <div class="panel-heading">
-				    	<h3 class="panel-title">Course</h3>
-				    	<span class="label label-info">{{ course.category }}</span>
-							<span class="label label-warning">{{ course.max_students }} {% trans 'students tops' %}</span>  
+					  <div class="row">
+					  	<div class="col-md-9">
+				  			<h3 class="panel-title">{{course.name}}</h3>
+				  		</div>
+				  		<div class="col-md-3">
+				  			<span class="label label-info">{{ course.category }}</span>
+							<span class="label label-warning">{{ course.max_students }} {% trans 'students tops' %}</span>
+				  		</div>
+					  </div>
 				  </div>     
 				  <div class="panel-body">
 				    <p><b>Course Name: </b>{{ course.name }}</p>
@@ -165,18 +171,22 @@
 				    <p>
 				      <b>Description:</b>
 				      <i>
-				        "Lorem ipsum dolor sit amet, consecctetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+				      {% if couse.description %}
+				        {{course.description|linebreaks}}
+				      {% else %}
+				      	{% trans 'No description' %}
+				      {% endif %}
 				      </i>
 				    </p>
-				    {% if user|has_role:'professor, system_admin' %}
+				    <!--{% if user|has_role:'professor, system_admin' %}
 						<a href="{% url 'course:update' course.slug %}" class="btn btn-sm btn-primary">
 							<span class="glyphicon glyphicon-edit"></span>
 						</a>
 						<a href="{% url 'course:delete' course.slug %}" class="btn btn-sm btn-danger">
 							<span class="glyphicon glyphicon-trash"></span>
 						</a>
-					{% endif %}
+					{% endif %}-->
 				    <a href="{% url 'course:view' course.slug %}" class="btn btn-raised btn-default center-block">View Course</a>
 				  </div>
@@ -185,7 +195,6 @@
     	{% endfor %}
-
     	<nav aria-label="Page navigation">
   			<ul class="pagination">
     			{% for page_number in paginator.page_range %}
@@ -199,4 +208,5 @@
 		{% trans 'No courses found' %}
 	{% endif %}
 {% endif %}
+
 {% endblock %}
@@ -52,10 +52,10 @@
     <div class="panel panel-info">
       <div class="panel-heading headingOne">
         <div class="row">
-          <div class="col-xs-8 col-md-10 titleTopic">
+          <div class="col-xs-8 col-md-9 titleTopic">
             <h4>{{course}}</h4>
           </div>
-          <div class="col-xs-4 col-md-2" id="divMoreActions">
+          <div class="col-xs-4 col-md-3" id="divMoreActions">
             <div class="btn-group">
               <button type="button" class="btn btn-default btn-sm eye" data-toggle="tooltip" data-placement="bottom" title="Visible">
                 <i class="fa fa-eye fa-2x" aria-hidden="true"></i>
@@ -99,7 +99,7 @@
       </div>
       <div class="modal-body">
         <div>
-          <form class="form-horizontal">
+          <!--<form class="form-horizontal">
             <div class="form-group is-empty">
               <label class="control-label col-md-2 col-md-offset-1 col-xs-2 col-xs-offset-1">Name</label>
               <div class="col-md-8 col-xs-8">
@@ -148,7 +148,7 @@
                 </div>
               </div>
             </div>
-          </form>
+          </form>-->
         </div>
         <div class="modal-footer">
           <button type="button" data-dismiss="modal" class="btn btn-default">Cancel</button>
@@ -190,12 +190,12 @@
 <div class="panel panel-info">
   <div class="panel-heading headingTwo ui-sortable-handle" role="tab">
     <div class="row">
-        <div class="col-xs-9 col-md-10 titleTopic">
+        <div class="col-xs-9 col-md-9 titleTopic">
           <a role="button" data-toggle="collapse" data-parent="#accordion" href=".collapseTwo" aria-expanded="true" aria-controls="collapseTwo">
-          <h4>{{subject.name}}</h4>
+          <h4 style="color:white">{{subject.name}}</h4>
           </a>
         </div>
-        <div class="col-xs-3 col-md-2" id="divMoreActions">
+        <div class="col-xs-3 col-md-3" id="divMoreActions">
           <div class="btn-group">
             <button type="button" class="btn btn-default btn-sm eye" data-toggle="tooltip" data-placement="bottom" title="Visible">
               <i class="fa fa-eye fa-2x" aria-hidden="true"></i>
@@ -233,6 +233,10 @@
         <a href="{% url 'course:view_subject' subject.slug %}" class="btn btn-raised btn-default center-block">{% trans 'View Subject' %}<div class="ripple-container"></div></a>
     </div>
 </div>
+<div class="form-group">
+  <a href="{% url 'course:create_subject' subject.slug %}" data-toggle="modal" data-target="" class="btn btn-primary btn-lg btn-block btn-raised">{% trans 'Create Subject' %}<div class="ripple-container"></div></a>
+</div>
+
 {% endfor %}
@@ -67,7 +67,9 @@
 	{% endfor %}
 	{% if user|has_role:'system_admin' or topic.owner == user%}
-		<a name="create_topic" class="btn btn-primary btn-md btn-block" href="{% url 'course:create_topic' subject.slug %}">{% trans "Create Topic" %}</a>
+		<div class="form-group">
+            <a href="{% url 'course:create_topic' subject.slug %}" data-toggle="modal" data-target="" class="btn btn-primary btn-lg btn-block btn-raised" name="create_topic">{% trans "Create Topic" %}<div class="ripple-container"></div></a>
+          </div>
 	{% endif %}	
 {% endblock %}
@@ -25,6 +25,6 @@ urlpatterns = [
 	url(r'^forum/', include('forum.urls', namespace = 'forum')),
-	url(r'^poll/', include('poll.urls', namespace = 'poll'))
-
+	url(r'^poll/', include('poll.urls', namespace = 'poll')),
+	url(r'^avaliacao/', include('avaliacao.urls', namespace = 'avaliacao'))
 ]
@@ -24,13 +24,14 @@ class IndexView(LoginRequiredMixin, NotificationMixin, generic.ListView):
 	redirect_field_name = 'next'
 	queryset = Course.objects.all()
 	template_name = 'course/index.html'
-	context_object_name = 'courses_student'
+	context_object_name = 'courses'
 	paginate_by = 3
 	def get_context_data(self, **kwargs):
 		context = super(IndexView, self).get_context_data(**kwargs)
 		context['categories'] = Category.objects.all()
 		context['courses_teacher'] = Course.objects.filter(professors__name = self.request.user.name)
+		context['courses_student'] = Course.objects.filter(students__name = self.request.user.name)
 		return context
@@ -69,7 +69,7 @@ function createForum(url, topic) {
                         console.log(data);
                         data = data.split('-');
-                        $('.foruns_list').append("<a id='forum_"+data[1]+"' href='javascript:showForum("+data[0]+","+data[1]+")'>"+data[2]+"<br /></a>");
+                        $('.foruns_list').append("<a id='forum_"+data[1]+"' href='"+data[0]+"'>"+data[2]+"<br /></a>");
                         $("#createForum").modal('hide');
 {% load static i18n %}
 {% load widget_tweaks %}
-<form id="forum_create" method="post" action="{% url 'forum:create' %}" enctype="multipart/form-data">
+<form id="forum_create" method="post" action="{% url 'course:forum:create' %}" enctype="multipart/form-data">
 	{% csrf_token %}
 	{% for field in form %}
 		<div class="form-group {% if form.has_error %} has-error {% endif %} is-fileinput">
@@ -41,7 +41,6 @@ class CreateForumView(LoginRequiredMixin, generic.edit.CreateView):
 		return self.render_to_response(self.get_context_data(form = form), status = 400)
 	def get_success_url(self):
-		print("Pass")
 		self.success_url = reverse('course:forum:render_forum', args = (self.object.id, ))
 		return self.success_url
@@ -49,7 +48,7 @@ class CreateForumView(LoginRequiredMixin, generic.edit.CreateView):
 def render_forum(request, forum):
 	last_forum = get_object_or_404(Forum, id = forum)
-	return HttpResponse(str(reverse_lazy('course:forum:index')) + '-' + str(forum) + '-' + str(last_forum.name))
+	return HttpResponse(str(reverse_lazy('course:forum:view', args = (), kwargs = {'slug': last_forum.slug})) + '-' + str(forum) + '-' + str(last_forum.name))
 class ForumDeleteView(LoginRequiredMixin, generic.DeleteView):
 	login_url = reverse_lazy("core:home")
@@ -0,0 +1,3 @@		@@ -0,0 +1,3 @@
	1	+from django.contrib import admin
	2	+
	3	+# Register your models here.
@@ -0,0 +1,5 @@		@@ -0,0 +1,5 @@
	1	+from django.apps import AppConfig
	2	+
	3	+
	4	+class AvaliacaoConfig(AppConfig):
	5	+ name = 'avaliacao'
@@ -0,0 +1,20 @@		@@ -0,0 +1,20 @@
	1	+from django.utils.translation import ugettext_lazy as _
	2	+from django.db import models
	3	+from autoslug.fields import AutoSlugField
	4	+from users.models import User
	5	+from core.models import Resource
	6	+from courses.models import Activity
	7	+
	8	+class Avaliacao(Activity):
	9	+
	10	+ name_avalicao = models.CharField(_('Name'), max_length = 100)
	11	+ init_date = models.DateField(_('Begin of Avaliacao Date'))
	12	+ end_date = models.DateField(_('End of Avaliacao Date'))
	13	+
	14	+ class Meta:
	15	+ #ordering = ('create_date','name')
	16	+ verbose_name = _('Avaliacao')
	17	+ verbose_name_plural = _('Avaliacoes')
	18	+
	19	+def __str__(self):
	20	+ return str(self.name) + str("/") + str(self.topic)
@@ -0,0 +1,3 @@		@@ -0,0 +1,3 @@
	1	+from django.test import TestCase
	2	+
	3	+# Create your tests here.
@@ -0,0 +1,7 @@		@@ -0,0 +1,7 @@
	1	+from django.conf.urls import url
	2	+
	3	+from . import views
	4	+
	5	+urlpatterns =[
	6	+
	7	+]
@@ -0,0 +1,3 @@		@@ -0,0 +1,3 @@
	1	+from django.shortcuts import render
	2	+
	3	+# Create your views here.
	@@ -25,6 +25,6 @@ urlpatterns = [		@@ -25,6 +25,6 @@ urlpatterns = [
25		25
26		26
27	url(r'^forum/', include('forum.urls', namespace = 'forum')),	27	url(r'^forum/', include('forum.urls', namespace = 'forum')),
28	- url(r'^poll/', include('poll.urls', namespace = 'poll'))
29	-	28	+ url(r'^poll/', include('poll.urls', namespace = 'poll')),
		29	+ url(r'^avaliacao/', include('avaliacao.urls', namespace = 'avaliacao'))
30	]	30	]
	@@ -69,7 +69,7 @@ function createForum(url, topic) {		@@ -69,7 +69,7 @@ function createForum(url, topic) {
69	console.log(data);	69	console.log(data);
70	data = data.split('-');	70	data = data.split('-');
71		71
72	- $('.foruns_list').append("<a id='forum_"+data[1]+"' href='javascript:showForum("+data[0]+","+data[1]+")'>"+data[2]+"<br /></a>");	72	+ $('.foruns_list').append("<a id='forum_"+data[1]+"' href='"+data[0]+"'>"+data[2]+"<br /></a>");
73		73
74	$("#createForum").modal('hide');	74	$("#createForum").modal('hide');
75		75
1	{% load static i18n %}	1	{% load static i18n %}
2	{% load widget_tweaks %}	2	{% load widget_tweaks %}
3		3
4	-<form id="forum_create" method="post" action="{% url 'forum:create' %}" enctype="multipart/form-data">	4	+<form id="forum_create" method="post" action="{% url 'course:forum:create' %}" enctype="multipart/form-data">
5	{% csrf_token %}	5	{% csrf_token %}
6	{% for field in form %}	6	{% for field in form %}
7	<div class="form-group {% if form.has_error %} has-error {% endif %} is-fileinput">	7	<div class="form-group {% if form.has_error %} has-error {% endif %} is-fileinput">