diff --git a/amadeus/roles.py b/amadeus/roles.py index 8441e6e..82e52b8 100644 --- a/amadeus/roles.py +++ b/amadeus/roles.py @@ -24,4 +24,4 @@ class Professor(AbstractUserRole): } class SystemAdmin(AbstractUserRole): - pass \ No newline at end of file + pass diff --git a/amadeus/staticfiles/js/modal_poll.js b/amadeus/staticfiles/js/modal_poll.js new file mode 100644 index 0000000..d40eb82 --- /dev/null +++ b/amadeus/staticfiles/js/modal_poll.js @@ -0,0 +1,43 @@ +//controles do modal +$(window).ready(function() { // utilizado para abrir o modal quando tiver tido algum erro no preenchimento do formulario + if($('.not_submited').length){ + $('#poll').modal('show'); + } +}); +var Answer = { + init: function(url) { // utilizado para adicionar um novo campo de resposta + $.get(url, function(data){ + $("#form").append(data); + var cont = 1; + $("#form div div div input").each(function(){ + $(this).attr('name',cont++); + }); + }); + } +}; + +var Submite = { + post: function(url,dados){ + $('#poll').modal('hide'); + $.post(url,dados, function(data){ + }).fail(function(data){ + $("div.modal-backdrop.fade.in").remove(); + $("#modal_poll").empty(); + $("#modal_poll").append(data.responseText); + }); + }, + remove: function(url,dados, id_li_link){ + $('#poll').modal('hide'); + $.post(url,dados, function(data){ + $(id_li_link).remove(); + $("#modal_poll").empty(); + $("div.modal-backdrop.fade.in").remove(); + }).fail(function(){ + $("#modal_poll").empty(); + $("#modal_poll").append(data); + $('#poll').modal('show'); + }); + } +} + +alert("essfd"); diff --git a/amadeus/staticfiles/js/modals_requisitions.js b/amadeus/staticfiles/js/modals_requisitions.js new file mode 100644 index 0000000..0040d57 --- /dev/null +++ b/amadeus/staticfiles/js/modals_requisitions.js @@ -0,0 +1,14 @@ +var Modal = { + get: function (url, id_modal, id_div_modal){ + $.get(url, function(data){ + if($(id_modal).length){ + $(id_div_modal).empty(); + $(id_div_modal).append(data); + } else { + $(id_div_modal).append(data); + } + $(id_modal).modal('show'); + }); + } +}; +alert("req"); diff --git a/amadeus/staticfiles/js/sortable_poll.js b/amadeus/staticfiles/js/sortable_poll.js new file mode 100644 index 0000000..dc325c6 --- /dev/null +++ b/amadeus/staticfiles/js/sortable_poll.js @@ -0,0 +1,12 @@ +//deve ser importado apenas depois do html +$( "#form" ).sortable({ // utilizado para fazer a re-organização das respostas + delay: 100, + distance: 5, + update: function( event, ui ) { + var cont = 1; + $("#form div div div input").each(function(){ + $(this).attr('name',cont++); + }); + }, +}); +alert("sort"); diff --git a/app/templates/app/base.html b/app/templates/app/base.html deleted file mode 100644 index f24427d..0000000 --- a/app/templates/app/base.html +++ /dev/null @@ -1,22 +0,0 @@ -{% extends 'base.html' %} - -{% load static i18n %} - -{% block menu_top %} - -{% endblock %} \ No newline at end of file diff --git a/app/templates/app/index.html b/app/templates/app/index.html deleted file mode 100644 index 5291646..0000000 --- a/app/templates/app/index.html +++ /dev/null @@ -1,181 +0,0 @@ -{% extends 'app/base.html' %} - -{% load static i18n permission_tags %} - -{% block sidebar %} -

{% trans 'You have:' %}

-
- - 4 - {% trans 'Pending Tasks' %} - - - 0 - {% trans 'Users Online' %} - -
- -
- -

{% trans 'You can:' %}

-
- {% if user|has_role:'professor' %} - - {% trans 'Create Course' %} - - {% endif %} - {% if user|has_role:'professor' %} - - {% trans 'Manage Users' %} - - {% endif %} - - {% trans 'Manage Courses' %} - - {% if user|has_role:'professor' %} - - {% trans 'Gerenciar Categorias' %} - - {% endif %} -
- -
- - {% if user|has_role:'student' %} -

{% trans 'Your course(s):' %}

-

{% trans 'No courses subscribed yet' %}

- {% endif %} -{% endblock %} - -{% block content %} -
-
-
-
-
- -
- -
-
-
- -
- -
- -
{% trans 'Most popular keywords:' %}
- -
-
-{% endblock %} diff --git a/courses/templates/category/create.html b/courses/templates/category/create.html index 87f454e..efd4208 100644 --- a/courses/templates/category/create.html +++ b/courses/templates/category/create.html @@ -23,7 +23,7 @@ -{% if user|has_role:'professor, system_admin' %} +{% if user|has_role:'professor' or user|has_role:'system_admin' %} -{% if user|has_role:'professor, system_admin' %} +{% if user|has_role:'professor' or user|has_role:'system_admin' %} - - {% if user|has_role:'professor, system_admin' %} + + {% if user|has_role:'professor' or user|has_role:'system_admin' %} -{% if user|has_role:'professor, system_admin' %} +{% if user|has_role:'professor' or user|has_role:'system_admin' %} - {% if user|has_role:'professor, system_admin' %} + {% if user|has_role:'professor' or user|has_role:'system_admin' %} -{% if user|has_role:'professor, system_admin' %} +{% if user|has_role:'professor' or user|has_role:'system_admin' %}
@@ -103,7 +103,7 @@

{{course.name}}

- {% if user|has_role:'professor, system_admin' %} + {% if user|has_role:'professor' or user|has_role:'system_admin' %}
- {% if user|has_role:'professor, system_admin' %} + {% if user|has_role:'professor' or user|has_role:'system_admin' %}
-{% if user|has_role:'professor, system_admin' %} +{% if user|has_role:'professor' or user|has_role:'system_admin' %}
@@ -190,8 +192,8 @@ - -{% if user|has_role:'system_admin' or topic.owner == user%} +{% professor_subject topic.subject user as professor_topic %} +{% if professor_topic %} {% include "files/create_file.html" %} {% endif %} @@ -240,12 +242,9 @@ - - {% if user|has_role:'system_admin' or topic.owner == user%} + {% professor_subject topic.subject user as professor_links %} + {% if professor_links%} {% include "links/create_link.html" %} - {% endif %} - - {% if user|has_role:'system_admin' or topic.owner == user%} {% include "links/delete_link.html" %} {% endif %} @@ -365,7 +364,8 @@ - {% if user|has_role:'system_admin' or topic.owner == user%} + {% professor_subject topic.subject user as links_update %} + {% if links_update%} {% include "links/update_link.html" %} {% endif %} diff --git a/courses/templates/subject/index.html b/courses/templates/subject/index.html index af01d9a..cc9b2f8 100644 --- a/courses/templates/subject/index.html +++ b/courses/templates/subject/index.html @@ -1,6 +1,6 @@ {% extends 'base.html' %} -{% load static i18n permission_tags %} +{% load static i18n permission_tags professor_access%} {% block breadcrumbs %} @@ -12,7 +12,7 @@ {% else %}
  • {{ subject.name }}
  • {% endif %} - + {% endblock %} @@ -28,7 +28,7 @@ - + {% endblock %} @@ -39,7 +39,8 @@

    {{subject}}

    - {% if user|has_role:'system_admin' or user in subject.professors %} + {% professor_subject subject user as subject_professor%} + {% if subject_professor %}
    - + {% for topic in topics %} - {% if user|has_role:'system_admin' or topic.owner == user%} + {% professor_subject topic.subject user as topic_professor%} + {% if topic_professor %} {% include "subject/form_view_teacher.html" %} {% else %} {% include "subject/form_view_student.html" %} {% endif %} {% endfor %} - - {% if user|has_role:'system_admin' or topic.owner == user%} + {% professor_subject subject user as professor_sub %} + {% if professor_sub %}
    {% trans "Create Topic" %}
    - {% endif %} + {% endif %} {% endblock %} diff --git a/courses/templates/subject/poll_item_actions.html b/courses/templates/subject/poll_item_actions.html index 7815e6d..5aa87b8 100644 --- a/courses/templates/subject/poll_item_actions.html +++ b/courses/templates/subject/poll_item_actions.html @@ -1,18 +1,17 @@ -{% load static i18n permission_tags%} +{% load static i18n permission_tags professor_access %} -{% if request.user|has_role:'professor, system_admin'%} {% for poll in polls %} -
  • poll {{ poll.name }}
  • -{% endfor %} - -{% else %} -{% for poll in polls %} -
  • poll {{ poll.name }}
  • -{% endfor %} -{% endif %} + {% professor_subject poll.topic.subject request.user as permission%} + {% if permission %} +
  • poll {{ poll.name }}
  • + {% else %} +
  • poll {{ poll.name }}
  • + {% endif %} + {% endfor %} +{# #} diff --git a/courses/templates/subject_category/index.html b/courses/templates/subject_category/index.html index bb72f19..091f223 100644 --- a/courses/templates/subject_category/index.html +++ b/courses/templates/subject_category/index.html @@ -1,13 +1,13 @@ {% extends 'base.html' %} -{% load static i18n permission_tags %} +{% load static i18n permission_tags professor_access%} {% block breadcrumbs %} {% endblock %} @@ -43,12 +43,14 @@

    {{subject}}

    - {% if user|has_role:'system_admin' or user in subject.professors %} + {% professor_subject subject user as professor_sub%} + {% if professor_sub %} {% trans "edit" %} {% endif %}
    - {% if user|has_role:'system_admin' or user in subject.professors %} + {% professor_subject subject user as delete_sub%} + {% if delete_sub %} {% trans "delete" %} {% endif %}
    @@ -60,6 +62,6 @@

    - + {% endblock %} diff --git a/courses/templates/topic/index.html b/courses/templates/topic/index.html index 293412c..d81ba53 100644 --- a/courses/templates/topic/index.html +++ b/courses/templates/topic/index.html @@ -1,13 +1,14 @@ {% extends 'base.html' %} -{% load static i18n permission_tags %} +{% load static i18n permission_tags professor_access %} {% block breadcrumbs %}