python/django-maraudes
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

modified website.decorators, webpage->app_config, created new configs

Browse Source
This commit is contained in:
Arthur Gerbaud
2016-11-19 21:46:40 +01:00
parent f4f366f514
commit 891ef9ef63
14 changed files with 148 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
maraudes/templates/compte_rendu/menu/creation.html Normal file
View File

@@ -0,0 +1,54 @@
{% load bootstrap3 %}
<li class="dropdown app-menu"><a class="dropdown-toggle" data-toggle="dropdown" href="#">Création<b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="#" id="new-sujet">{% bootstrap_icon "user" %} Nouveau sujet</a></li>
<li><a href="#" id="new-lieu">{% bootstrap_icon "globe" %} Nouveau lieu</a></li>
</ul>
<script type="text/javascript">
/* Lier les boutons de création
* Thanks to Derek Morgan, https://dmorgan.info/posts/django-views-bootstrap-modals/
*/
$(function() {
var formAjaxSubmit = function(form, modal) {
$(form).submit(function (e) {
e.preventDefault();
$.ajax({
type: $(this).attr('method'),
url: $(this).attr('action'),
data: $(this).serialize(),
success: function (xhr, ajaxOptions, thrownError) {
if ( $(xhr).find('.has-error').length > 0 || $(xhr).find('.alert-danger').length > 0) {
$(modal).find('.modal-body').html(xhr);
formAjaxSubmit(form, modal);
} else {
$(modal).modal('toggle');
// Reload page ?
location.reload(true)
}
},
error: function (xhr, ajaxOptions, thrownError) {
// handle response errors here
}
});
});
};
/* TODO: Use formAjaxSubmit above, but reload page on form success */
$('#new-sujet').click(function() {
$('#form-modal-body').load('{% url "sujets:create" %}?next={% url "maraudes:create" pk=maraude.id %}', function () {
$('.modal-title').text("Nouveau sujet");
$('#form-modal').modal('toggle');
formAjaxSubmit("#form-modal-body form", "#form-modal");
});
});
$('#new-lieu').click(function() {
$('#form-modal-body').load('{% url "maraudes:lieu-create" %}?next={% url "maraudes:create" pk=maraude.id %}', function () {
$('.modal-title').text("Nouveau lieu");
$('#form-modal').modal('toggle');
formAjaxSubmit("#form-modal-body form", "#form-modal");
});
});
});
</script>

56
maraudes/templates/compte_rendu/menu_creation.html
View File

@@ -1,56 +0,0 @@
{% if user.is_superuser %}{% load bootstrap3 %}
<li class="dropdown app-menu"><a class="dropdown-toggle" data-toggle="dropdown" href="#">Création<b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="#" id="new-sujet">{% bootstrap_icon "user" %} Nouveau sujet</a></li>
<li><a href="#" id="new-lieu">{% bootstrap_icon "globe" %} Nouveau lieu</a></li>
</ul>
{% endif %}
<script type="text/javascript">
/* Lier les boutons de création
* Thanks to Derek Morgan, https://dmorgan.info/posts/django-views-bootstrap-modals/
*/
$(function() {
var formAjaxSubmit = function(form, modal) {
$(form).submit(function (e) {
e.preventDefault();
$.ajax({
type: $(this).attr('method'),
url: $(this).attr('action'),
data: $(this).serialize(),
success: function (xhr, ajaxOptions, thrownError) {
if ( $(xhr).find('.has-error').length > 0 || $(xhr).find('.alert-danger').length > 0) {
$(modal).find('.modal-body').html(xhr);
formAjaxSubmit(form, modal);
} else {
$(modal).modal('toggle');
// Reload page ?
location.reload(true)
}
},
error: function (xhr, ajaxOptions, thrownError) {
// handle response errors here
}
});
});
};
/* TODO: Use formAjaxSubmit above, but reload page on form success */
$('#new-sujet').click(function() {
$('#form-modal-body').load('{% url "sujets:create" %}?next={% url "maraudes:create" pk=maraude.id %}', function () {
$('.modal-title').text("Nouveau sujet");
$('#form-modal').modal('toggle');
formAjaxSubmit("#form-modal-body form", "#form-modal");
});
});
$('#new-lieu').click(function() {
$('#form-modal-body').load('{% url "maraudes:lieu-create" %}?next={% url "maraudes:create" pk=maraude.id %}', function () {
$('.modal-title').text("Nouveau lieu");
$('#form-modal').modal('toggle');
formAjaxSubmit("#form-modal-body form", "#form-modal");
});
});
});
</script>

0
maraudes/templates/maraudes/menu_administration.html → maraudes/templates/maraudes/menu/admin_menu.html
View File

0
maraudes/templates/maraudes/menu_dernieres_maraudes.html → maraudes/templates/maraudes/menu/dernieres_maraudes.html
View File

2
maraudes/tests.py
View File

@@ -7,7 +7,7 @@ from django.test import TestCase
from .models import Maraude, Maraudeur, ReferentMaraude
# Create your tests here.
from alsa.base_data import MARAUDEURS
from maraudes_project.base_data import MARAUDEURS
MARAUDE_DAYS = [
True, True, False, True, True, False, False

37
maraudes/views.py
View File

@@ -25,11 +25,24 @@ from .forms import ( RencontreForm, RencontreInlineFormSet,
from utilisateurs.models import Maraudeur
from website import decorators as website
webpage = website.webpage(
maraudes = website.app_config(
name="maraudes",
groups=[Maraudeur],
menu=["maraudes/menu/dernieres_maraudes.html"],
admin_menu=["maraudes/menu/admin_menu.html"],
ajax=False,
app_users=[Maraudeur],
app_menu=["maraudes/menu_dernieres_maraudes.html", "maraudes/menu_administration.html"]
)
compte_rendu = website.app_config(
name="maraudes",
groups=[Maraudeur],
menu=["compte_rendu/menu/creation.html"],
ajax=False,
)
maraudes_ajax = website.app_config(
name="maraudes",
groups=[Maraudeur],
ajax=True,
)
from django.core.mail import send_mail
@@ -51,7 +64,7 @@ class DerniereMaraudeMixin(object):
@webpage
@maraudes
class IndexView(DerniereMaraudeMixin, generic.TemplateView):
class PageInfo:
@@ -88,7 +101,7 @@ class IndexView(DerniereMaraudeMixin, generic.TemplateView):
return Maraude.objects.next
## MARAUDES
@webpage
@maraudes
class MaraudeDetailsView(DerniereMaraudeMixin, generic.DetailView):
""" Vue détaillé d'un compte-rendu de maraude """
@@ -109,7 +122,7 @@ class MaraudeDetailsView(DerniereMaraudeMixin, generic.DetailView):
@webpage
@maraudes
class MaraudeListView(DerniereMaraudeMixin, generic.ListView):
""" Vue de la liste des compte-rendus de maraude """
@@ -129,7 +142,7 @@ class MaraudeListView(DerniereMaraudeMixin, generic.ListView):
## COMPTE-RENDU DE MARAUDE
@webpage
@compte_rendu
class CompteRenduCreateView(generic.DetailView):
""" Vue pour la création d'un compte-rendu de maraude """
@@ -147,8 +160,8 @@ class CompteRenduCreateView(generic.DetailView):
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
# Overrides app_menu and replace it
self.app_menu = ["compte_rendu/menu_creation.html"]
#WARNING: Overrides app_menu and replace it
self._user_menu = ["compte_rendu/menu/creation.html"]
def get_forms(self, *args, initial=None):
self.form = RencontreForm(*args,
@@ -235,7 +248,7 @@ class CompteRenduCreateView(generic.DetailView):
@webpage
@compte_rendu
class CompteRenduUpdateView(generic.DetailView):
""" Vue pour mettre à jour le compte-rendu de la maraude """
@@ -301,7 +314,7 @@ class CompteRenduUpdateView(generic.DetailView):
## PLANNING
@webpage
@maraudes
class PlanningView(generic.TemplateView):
""" Display and edit the planning of next Maraudes """
@@ -371,7 +384,7 @@ class PlanningView(generic.TemplateView):
## LIEU
@website.webpage(ajax=True, permissions=['maraudes.add_lieu'])
@maraudes_ajax
class LieuCreateView(generic.edit.CreateView):
model = Lieu
template_name = "maraudes/lieu_create.html"