From 3fb35fc51601c457a7e6e19fe91cbf0005b41298 Mon Sep 17 00:00:00 2001 From: alazo Date: Wed, 8 Mar 2017 11:58:53 +0100 Subject: [PATCH] process-eval --- cms/models.py | 1 + cms/views.py | 21 ++++++++++++++++++++- common/urls.py | 2 +- 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/cms/models.py b/cms/models.py index e2709dc..6f40a99 100644 --- a/cms/models.py +++ b/cms/models.py @@ -141,6 +141,7 @@ class Competence(models.Model): nom = models.CharField(max_length=250, blank=False) type = models.CharField(max_length=35, blank=True, default='') module = models.ForeignKey(Module, null=True, default=None) + proces_eval = models.ForeignKey(Processus, null=True, default=True) class Meta: ordering = ('code',) diff --git a/cms/views.py b/cms/views.py index a7da03e..5357ffe 100644 --- a/cms/views.py +++ b/cms/views.py @@ -103,7 +103,7 @@ class HomwPDFView(TemplateView): ('BACKGROUND',(2,5), (2,5), colors.red), ('BACKGROUND',(4,5), (4,5), colors.red), ('BACKGROUND',(5,6), (5,6), colors.red), - ('BACKGROUND',(7,6), (7,6), colors.red), + ('BACKGROperiodesUND',(7,6), (7,6), colors.red), ('BACKGROUND',(5,7), (5,7), colors.red), ('BACKGROUND',(0,8), (1,9), colors.pink), ('BACKGROUND',(5,8), (-1,8), colors.pink), @@ -329,6 +329,25 @@ class PeriodePDFView(TemplateView): return response + +class AddDocument(TemplateView): + template_name = 'cms/upload.html' + + def post(self, request): + form = DocumentForm(request.POST, request.FILES) + if form.is_valid(): + newdoc = Document(docfile = request.FILES['docfile']) + newdoc.save() + + return HttpResponseRedirect('') + + def get(self, request): + form = DocumentForm() + return render (request, 'cms/upload.html', {'form': form}) + + + + def AddDoc(request): if request.method == 'POST': form = DocumentForm(request.POST, request.FILES) diff --git a/common/urls.py b/common/urls.py index 5dbae35..2bd0130 100644 --- a/common/urls.py +++ b/common/urls.py @@ -31,7 +31,7 @@ urlpatterns = [ url(r'^modules/$', views.ModuleListView.as_view(), name='module-list'), url(r'^periodes$', views.PeriodeView.as_view(), name='periodes'), url(r'^periodes_pdf$', views.PeriodePDFView.as_view(), name='periodes-pdf'), - url(r'^upload$', views.AddDoc, name='upload'), + url(r'^upload/$', views.AddDocument.as_view(), name='upload'), url(r'^download/(?P.+)$', views.Download, name='download'), url(r'^calendrier/$', views.pdf_view, name='pdf-view'), url(r'^module_pdf/(?P\d+)$', views.ModulePDF.as_view(), name='module-pdf'),