evaluation

This commit is contained in:
alazo 2017-03-09 16:20:13 +01:00
parent 49fbc9bd54
commit 27ddf8883a
8 changed files with 58 additions and 4 deletions

View file

@ -50,8 +50,8 @@ class ProcessusInlineAdmin(admin.TabularInline):
class CompetenceAdmin(admin.ModelAdmin): class CompetenceAdmin(admin.ModelAdmin):
form = CompetenceAdminForm form = CompetenceAdminForm
list_display = ('code', 'nom', 'module') list_display = ('code', 'nom', 'proces_eval')
list_editable = ('module',) list_editable = ('proces_eval',)
inlines = (SousCompetenceInline,) inlines = (SousCompetenceInline,)

View file

@ -142,6 +142,7 @@ class Competence(models.Model):
type = models.CharField(max_length=35, blank=True, default='') type = models.CharField(max_length=35, blank=True, default='')
module = models.ForeignKey(Module, null=True, default=None) module = models.ForeignKey(Module, null=True, default=None)
proces_eval = models.ForeignKey(Processus, null=True, default=True) proces_eval = models.ForeignKey(Processus, null=True, default=True)
list_display = ('code', 'nom', 'type','proces_eval')
class Meta: class Meta:
ordering = ('code',) ordering = ('code',)

5
cms/static/js/jquery.js vendored Executable file

File diff suppressed because one or more lines are too long

View file

@ -7,7 +7,7 @@ Created on 4 déc. 2012
import os import os
from django.shortcuts import render, render_to_response from django.shortcuts import render, render_to_response
from django.views.generic import ListView, TemplateView, DetailView from django.views.generic import ListView, TemplateView, DetailView
from .models import Domaine, Processus, Module, Document, PDFResponse, MyDocTemplate, MyDocTemplateLandscape from .models import Domaine, Processus, Module, Competence, Document, PDFResponse, MyDocTemplate, MyDocTemplateLandscape
from .models import style_normal, style_bold, style_title from .models import style_normal, style_bold, style_title
from django.db.models import F, Sum from django.db.models import F, Sum
from django.conf import settings from django.conf import settings
@ -162,6 +162,10 @@ def Preformatted_left(text):
def Preformatted_right(text): def Preformatted_right(text):
return Preformatted(text, style_normal, maxLineLength=110) return Preformatted(text, style_normal, maxLineLength=110)
class EvaluationView(ListView):
template_name = 'cms/evaluation.html'
model = Processus
class ModulePDF(DetailView): class ModulePDF(DetailView):

View file

@ -31,6 +31,7 @@ urlpatterns = [
url(r'^modules/$', views.ModuleListView.as_view(), name='module-list'), url(r'^modules/$', views.ModuleListView.as_view(), name='module-list'),
url(r'^periodes$', views.PeriodeView.as_view(), name='periodes'), url(r'^periodes$', views.PeriodeView.as_view(), name='periodes'),
url(r'^periodes_pdf$', views.PeriodePDFView.as_view(), name='periodes-pdf'), url(r'^periodes_pdf$', views.PeriodePDFView.as_view(), name='periodes-pdf'),
url(r'^evaluation/$', views.EvaluationView.as_view(), name='evaluation'),
url(r'^upload/$', views.AddDocument.as_view(), name='upload'), url(r'^upload/$', views.AddDocument.as_view(), name='upload'),
url(r'^download/(?P<file_name>.+)$', views.Download, name='download'), url(r'^download/(?P<file_name>.+)$', views.Download, name='download'),
url(r'^calendrier/$', views.pdf_view, name='pdf-view'), url(r'^calendrier/$', views.pdf_view, name='pdf-view'),

View file

@ -5,7 +5,7 @@
<title>{% block title %}{% endblock %}</title> <title>{% block title %}{% endblock %}</title>
<link rel="stylesheet" type="text/css" href="{% static "admin/css/base.css" %}" /> <link rel="stylesheet" type="text/css" href="{% static "admin/css/base.css" %}" />
<link rel="stylesheet" type="text/css" href="{% static "admin/css/dashboard.css" %}" /> <link rel="stylesheet" type="text/css" href="{% static "admin/css/dashboard.css" %}" />
<script src="{% static 'js/jquery.js' %}"></script>
{% block extrastyle %}<link rel="stylesheet" type="text/css" href="{% static "css/main.css" %}" />{% endblock %} {% block extrastyle %}<link rel="stylesheet" type="text/css" href="{% static "css/main.css" %}" />{% endblock %}
{% if LANGUAGE_BIDI %}<link rel="stylesheet" type="text/css" href="{% block stylesheet_rtl %}{% static "admin/css/rtl.css" %}{% endblock %}" />{% endif %} {% if LANGUAGE_BIDI %}<link rel="stylesheet" type="text/css" href="{% block stylesheet_rtl %}{% static "admin/css/rtl.css" %}{% endblock %}" />{% endif %}
{% block extrahead %}{% endblock %} {% block extrahead %}{% endblock %}

View file

@ -22,6 +22,7 @@
<li><a href="{% url 'processus-list' %}">Processus</a>&nbsp;&nbsp;</li> <li><a href="{% url 'processus-list' %}">Processus</a>&nbsp;&nbsp;</li>
<li><a href="{% url 'module-list' %}">Modules</a>&nbsp;&nbsp;</li> <li><a href="{% url 'module-list' %}">Modules</a>&nbsp;&nbsp;</li>
<li><a href="{% url 'periodes' %}">Périodes</a>&nbsp;&nbsp;</li> <li><a href="{% url 'periodes' %}">Périodes</a>&nbsp;&nbsp;</li>
<li><a href="{% url 'evaluation' %}">Evaluation</a>&nbsp;&nbsp;</li>
<!-- <li><a href="{% url 'pdf-view' %}">Calendrier</a>&nbsp;&nbsp;</li>--> <!-- <li><a href="{% url 'pdf-view' %}">Calendrier</a>&nbsp;&nbsp;</li>-->
{% if has_permission %} {% if has_permission %}
<li><a href="#">Calendrier</a>&nbsp;&nbsp;</li> <li><a href="#">Calendrier</a>&nbsp;&nbsp;</li>

View file

@ -0,0 +1,42 @@
{% extends "./base_site.html" %}
{% load i18n static %}
{% block coltype %}colMS{% endblock %}
{% block bodyclass %}{{ block.super }}{% endblock %}
{% block content %}
<script type="text/javascript">
$(document).ready(function(){
$("select.P01").change(function(){
tot = 0
$('select.P01 option:selected').each(function(){
tot = tot + parseInt($(this).val());
});
alert(tot);
});
});
</script>
<div id="content-main">
<h1>Evaluation des compétences</h1>
<table>
{% for p in object_list %}
<tr><th>{{p}}</th><td></td></tr>
{% for c in p.competence_set.all %}
<tr><td>{{c}}</td><td><select class="{{p.code}}" ><option value="0">0</option><option value="1">1</option><option value="2">2</option><option value="3">3</option></select></td></tr>
{% endfor %}
{% endfor %}
</table>
</div>
{% endblock %}