Download as
Browse Code »

Commit adfc46fb92f79f86c3e223adbdb27acd5a2782b1

Authored by filipecmedeiros
2 parents 184377ea 7f219cc5
Exists in master and in 5 other branches amadeus_univasf, dev, image-crop, pdf_file_html, refactoring

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

Showing 19 changed files with 102 additions and 41 deletions   Show diff stats
amadeus/settings.py
  Diff comments   View file @adfc46f
... ... @@ -55,6 +55,8 @@ INSTALLED_APPS = [
55 55 'courses',
56 56 'forum',
57 57 'poll',
  58 + 'avaliacao',
  59 +
58 60 ]
59 61  
60 62 MIDDLEWARE_CLASSES = [
... ...
avaliacao/__init__.py 0 → 100644
  Diff comments   View file @adfc46f
avaliacao/admin.py 0 → 100644
  Diff comments   View file @adfc46f
... ... @@ -0,0 +1,3 @@
  1 +from django.contrib import admin
  2 +
  3 +# Register your models here.
... ...
avaliacao/apps.py 0 → 100644
  Diff comments   View file @adfc46f
... ... @@ -0,0 +1,5 @@
  1 +from django.apps import AppConfig
  2 +
  3 +
  4 +class AvaliacaoConfig(AppConfig):
  5 + name = 'avaliacao'
... ...
avaliacao/migrations/__init__.py 0 → 100644
  Diff comments   View file @adfc46f
avaliacao/models.py 0 → 100644
  Diff comments   View file @adfc46f
... ... @@ -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)
... ...
avaliacao/tests.py 0 → 100644
  Diff comments   View file @adfc46f
... ... @@ -0,0 +1,3 @@
  1 +from django.test import TestCase
  2 +
  3 +# Create your tests here.
... ...
avaliacao/urls.py 0 → 100644
  Diff comments   View file @adfc46f
... ... @@ -0,0 +1,7 @@
  1 +from django.conf.urls import url
  2 +
  3 +from . import views
  4 +
  5 +urlpatterns =[
  6 +
  7 +]
... ...
avaliacao/views.py 0 → 100644
  Diff comments   View file @adfc46f
... ... @@ -0,0 +1,3 @@
  1 +from django.shortcuts import render
  2 +
  3 +# Create your views here.
... ...
core/urls.py
  Diff comments   View file @adfc46f
1 1 from django.conf.urls import url, include
2 2 from django.contrib.auth import views as auth_views
3 3 from django.contrib.auth.views import password_reset, password_reset_done,password_reset_confirm, password_reset_complete
4   -
5 4 from . import views
6 5  
7 6  
... ... @@ -12,10 +11,13 @@ urlpatterns = [
12 11 url(r'^logout/$', auth_views.logout, {'next_page': 'core:home'}, name='logout'),
13 12 url(r'^notification/([0-9]+)/$', views.processNotification, name='notification_read'),
14 13 url(r'^getNotifications/$', views.getNotifications, name='getNotifications'),
  14 +]
15 15  
16   - 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"),
17   - url(r'^reset/done/$', password_reset_done, {'template_name':'registration/passwor_reset_done.html'}),
18   - 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'}),
19   - url(r'^done/$', password_reset_complete,{'template_name':'registration/passwor_reset_complete.html'}),
  16 +#Reset Password
  17 +urlpatterns += [
  18 + url(r'^password/reset/$', password_reset, {'post_reset_redirect' : 'password/reset/done/','template_name': 'registration/passwor_reset_form.html'}, name="password_reset"),
  19 + url(r'^password/reset/done/$', password_reset_done, {'template_name': 'registration/passwor_reset_done.html'}),
  20 + 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'}),
  21 + url(r'^password/done/$', password_reset_complete,{'template_name': 'registration/passwor_reset_complete.html'}),
20 22  
21 23 ]
... ...
courses/templates/course/index.html
  Diff comments   View file @adfc46f
... ... @@ -53,10 +53,20 @@
53 53 {% endfor %}
54 54 {% endif %}
55 55  
  56 +<div class="col-md-12">
  57 + <div class="input-group">
  58 + <div class="form-group is-empty"><input type="search" class="form-control" placeholder="Search Courses"></div>
  59 + <span class="input-group-btn input-group-sm">
  60 + <button type="button" class="btn btn-fab btn-fab-mini">
  61 + <i class="material-icons">search</i>
  62 + </button>
  63 + </span>
  64 + </div>
  65 + </div>
56 66 {% if user|has_role:'professor, system_admin' %}
57 67  
58 68 <div class="col-md-12">
59   - {% if courses_teacher|length > 0 %}
  69 + {% if courses|length > 0 %}
60 70 {% for course in courses_teacher %}
61 71 <!-- Put your content here! -->
62 72 <div class="panel-group ui-accordion ui-widget ui-helper-reset ui-sortable" id="accordion" role="tablist" aria-multiselectable="false">
... ... @@ -130,21 +140,11 @@
130 140 </div>
131 141 </div>
132 142 </div>
  143 +{% endif %}
133 144  
134   -{% else %}
  145 +{% if user|has_role:'students' %}
135 146  
136   - <div class="col-md-12">
137   - <div class="input-group">
138   - <div class="form-group is-empty"><input type="search" class="form-control" placeholder="Search Courses"></div>
139   - <span class="input-group-btn input-group-sm">
140   - <button type="button" class="btn btn-fab btn-fab-mini">
141   - <i class="material-icons">search</i>
142   - </button>
143   - </span>
144   - </div>
145   - </div>
146   -
147   - {% if subjects_student|length > 0 %}
  147 + {% if courses|length > 0 %}
148 148 {% for course in courses_student %}
149 149 <div class="col-md-12">
150 150 <div class="panel panel-info">
... ... @@ -154,9 +154,15 @@
154 154 <img src="" class="img-responsive" />
155 155 {% endif %} -->
156 156 <div class="panel-heading">
157   - <h3 class="panel-title">Course</h3>
158   - <span class="label label-info">{{ course.category }}</span>
159   - <span class="label label-warning">{{ course.max_students }} {% trans 'students tops' %}</span>
  157 + <div class="row">
  158 + <div class="col-md-9">
  159 + <h3 class="panel-title">{{course.name}}</h3>
  160 + </div>
  161 + <div class="col-md-3">
  162 + <span class="label label-info">{{ course.category }}</span>
  163 + <span class="label label-warning">{{ course.max_students }} {% trans 'students tops' %}</span>
  164 + </div>
  165 + </div>
160 166 </div>
161 167 <div class="panel-body">
162 168 <p><b>Course Name: </b>{{ course.name }}</p>
... ... @@ -165,18 +171,22 @@
165 171 <p>
166 172 <b>Description:</b>
167 173 <i>
168   - "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."
  174 + {% if couse.description %}
  175 + {{course.description|linebreaks}}
  176 + {% else %}
  177 + {% trans 'No description' %}
  178 + {% endif %}
169 179 </i>
170 180 </p>
171 181  
172   - {% if user|has_role:'professor, system_admin' %}
  182 + <!--{% if user|has_role:'professor, system_admin' %}
173 183 <a href="{% url 'course:update' course.slug %}" class="btn btn-sm btn-primary">
174 184 <span class="glyphicon glyphicon-edit"></span>
175 185 </a>
176 186 <a href="{% url 'course:delete' course.slug %}" class="btn btn-sm btn-danger">
177 187 <span class="glyphicon glyphicon-trash"></span>
178 188 </a>
179   - {% endif %}
  189 + {% endif %}-->
180 190  
181 191 <a href="{% url 'course:view' course.slug %}" class="btn btn-raised btn-default center-block">View Course</a>
182 192 </div>
... ... @@ -185,7 +195,6 @@
185 195  
186 196 {% endfor %}
187 197  
188   -
189 198 <nav aria-label="Page navigation">
190 199 <ul class="pagination">
191 200 {% for page_number in paginator.page_range %}
... ... @@ -199,4 +208,5 @@
199 208 {% trans 'No courses found' %}
200 209 {% endif %}
201 210 {% endif %}
  211 +
202 212 {% endblock %}
... ...
courses/templates/course/view.html
  Diff comments   View file @adfc46f
... ... @@ -52,10 +52,10 @@
52 52 <div class="panel panel-info">
53 53 <div class="panel-heading headingOne">
54 54 <div class="row">
55   - <div class="col-xs-8 col-md-10 titleTopic">
  55 + <div class="col-xs-8 col-md-9 titleTopic">
56 56 <h4>{{course}}</h4>
57 57 </div>
58   - <div class="col-xs-4 col-md-2" id="divMoreActions">
  58 + <div class="col-xs-4 col-md-3" id="divMoreActions">
59 59 <div class="btn-group">
60 60 <button type="button" class="btn btn-default btn-sm eye" data-toggle="tooltip" data-placement="bottom" title="Visible">
61 61 <i class="fa fa-eye fa-2x" aria-hidden="true"></i>
... ... @@ -99,7 +99,7 @@
99 99 </div>
100 100 <div class="modal-body">
101 101 <div>
102   - <form class="form-horizontal">
  102 + <!--<form class="form-horizontal">
103 103 <div class="form-group is-empty">
104 104 <label class="control-label col-md-2 col-md-offset-1 col-xs-2 col-xs-offset-1">Name</label>
105 105 <div class="col-md-8 col-xs-8">
... ... @@ -148,7 +148,7 @@
148 148 </div>
149 149 </div>
150 150 </div>
151   - </form>
  151 + </form>-->
152 152 </div>
153 153 <div class="modal-footer">
154 154 <button type="button" data-dismiss="modal" class="btn btn-default">Cancel</button>
... ... @@ -190,12 +190,12 @@
190 190 <div class="panel panel-info">
191 191 <div class="panel-heading headingTwo ui-sortable-handle" role="tab">
192 192 <div class="row">
193   - <div class="col-xs-9 col-md-10 titleTopic">
  193 + <div class="col-xs-9 col-md-9 titleTopic">
194 194 <a role="button" data-toggle="collapse" data-parent="#accordion" href=".collapseTwo" aria-expanded="true" aria-controls="collapseTwo">
195   - <h4>{{subject.name}}</h4>
  195 + <h4 style="color:white">{{subject.name}}</h4>
196 196 </a>
197 197 </div>
198   - <div class="col-xs-3 col-md-2" id="divMoreActions">
  198 + <div class="col-xs-3 col-md-3" id="divMoreActions">
199 199 <div class="btn-group">
200 200 <button type="button" class="btn btn-default btn-sm eye" data-toggle="tooltip" data-placement="bottom" title="Visible">
201 201 <i class="fa fa-eye fa-2x" aria-hidden="true"></i>
... ... @@ -233,6 +233,10 @@
233 233 <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>
234 234 </div>
235 235 </div>
  236 +<div class="form-group">
  237 + <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>
  238 +</div>
  239 +
236 240 {% endfor %}
237 241  
238 242  
... ...
courses/templates/subject/index.html
  Diff comments   View file @adfc46f
... ... @@ -67,7 +67,9 @@
67 67 {% endfor %}
68 68  
69 69 {% if user|has_role:'system_admin' or topic.owner == user%}
70   - <a name="create_topic" class="btn btn-primary btn-md btn-block" href="{% url 'course:create_topic' subject.slug %}">{% trans "Create Topic" %}</a>
  70 + <div class="form-group">
  71 + <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>
  72 + </div>
71 73 {% endif %}
72 74  
73 75 {% endblock %}
... ...
courses/urls.py
  Diff comments   View file @adfc46f
... ... @@ -25,6 +25,6 @@ urlpatterns = [
25 25  
26 26  
27 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 ]
... ...
courses/views.py
  Diff comments   View file @adfc46f
... ... @@ -24,13 +24,14 @@ class IndexView(LoginRequiredMixin, NotificationMixin, generic.ListView):
24 24 redirect_field_name = 'next'
25 25 queryset = Course.objects.all()
26 26 template_name = 'course/index.html'
27   - context_object_name = 'courses_student'
  27 + context_object_name = 'courses'
28 28 paginate_by = 3
29 29  
30 30 def get_context_data(self, **kwargs):
31 31 context = super(IndexView, self).get_context_data(**kwargs)
32 32 context['categories'] = Category.objects.all()
33 33 context['courses_teacher'] = Course.objects.filter(professors__name = self.request.user.name)
  34 + context['courses_student'] = Course.objects.filter(students__name = self.request.user.name)
34 35  
35 36 return context
36 37  
... ...
forum/static/js/forum.js
  Diff comments   View file @adfc46f
... ... @@ -69,7 +69,7 @@ function createForum(url, topic) {
69 69 console.log(data);
70 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 74 $("#createForum").modal('hide');
75 75  
... ...
forum/templates/forum/forum_form.html
  Diff comments   View file @adfc46f
1 1 {% load static i18n %}
2 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 5 {% csrf_token %}
6 6 {% for field in form %}
7 7 <div class="form-group {% if form.has_error %} has-error {% endif %} is-fileinput">
... ...
forum/views.py
  Diff comments   View file @adfc46f
... ... @@ -41,7 +41,6 @@ class CreateForumView(LoginRequiredMixin, generic.edit.CreateView):
41 41 return self.render_to_response(self.get_context_data(form = form), status = 400)
42 42  
43 43 def get_success_url(self):
44   - print("Pass")
45 44 self.success_url = reverse('course:forum:render_forum', args = (self.object.id, ))
46 45  
47 46 return self.success_url
... ... @@ -49,7 +48,7 @@ class CreateForumView(LoginRequiredMixin, generic.edit.CreateView):
49 48 def render_forum(request, forum):
50 49 last_forum = get_object_or_404(Forum, id = forum)
51 50  
52   - return HttpResponse(str(reverse_lazy('course:forum:index')) + '-' + str(forum) + '-' + str(last_forum.name))
  51 + return HttpResponse(str(reverse_lazy('course:forum:view', args = (), kwargs = {'slug': last_forum.slug})) + '-' + str(forum) + '-' + str(last_forum.name))
53 52  
54 53 class ForumDeleteView(LoginRequiredMixin, generic.DeleteView):
55 54 login_url = reverse_lazy("core:home")
... ...
manage.py 100755 → 100644
  Diff comments   View file @adfc46f