From 358a625cc4fed6d405c80cfc424ee45574ddb8a5 Mon Sep 17 00:00:00 2001 From: Bartuccio Antoine Date: Tue, 18 Jun 2019 10:56:05 +0200 Subject: [PATCH] pedagogy: simplify and implement department system according to old database model --- core/management/commands/populate.py | 1 + pedagogy/forms.py | 1 + pedagogy/migrations/0001_initial.py | 53 ++++++++++----------- pedagogy/models.py | 24 +++------- pedagogy/templates/pedagogy/uv_detail.jinja | 1 + pedagogy/tests.py | 1 + pedagogy/urls.py | 16 ------- pedagogy/views.py | 32 ------------- 8 files changed, 35 insertions(+), 94 deletions(-) diff --git a/core/management/commands/populate.py b/core/management/commands/populate.py index 204db9fb..caebd498 100644 --- a/core/management/commands/populate.py +++ b/core/management/commands/populate.py @@ -1113,6 +1113,7 @@ Welcome to the wiki page! manager="Laurent HEYBERGER", semester=settings.SITH_PEDAGOGY_UV_SEMESTER[3][0], language=settings.SITH_PEDAGOGY_UV_LANGUAGE[0][0], + department=settings.SITH_PROFILE_DEPARTMENTS[-2][0], credits=5, title="Participation dans une association étudiante", objectives="* Permettre aux étudiants de réaliser, pendant un semestre, un projet culturel ou associatif et de le valoriser.", diff --git a/pedagogy/forms.py b/pedagogy/forms.py index ba7c8ead..eed140b7 100644 --- a/pedagogy/forms.py +++ b/pedagogy/forms.py @@ -43,6 +43,7 @@ class UVForm(forms.ModelForm): "credit_type", "semester", "language", + "department", "credits", "hours_CM", "hours_TD", diff --git a/pedagogy/migrations/0001_initial.py b/pedagogy/migrations/0001_initial.py index d94cc85a..37c7f044 100644 --- a/pedagogy/migrations/0001_initial.py +++ b/pedagogy/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.11.20 on 2019-06-17 16:08 +# Generated by Django 1.11.20 on 2019-06-18 08:52 from __future__ import unicode_literals from django.conf import settings @@ -15,34 +15,6 @@ class Migration(migrations.Migration): dependencies = [migrations.swappable_dependency(settings.AUTH_USER_MODEL)] operations = [ - migrations.CreateModel( - name="EducationDepartment", - fields=[ - ( - "id", - models.AutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ) - ], - ), - migrations.CreateModel( - name="StudyField", - fields=[ - ( - "id", - models.AutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ) - ], - ), migrations.CreateModel( name="UV", fields=[ @@ -123,6 +95,29 @@ class Migration(migrations.Migration): verbose_name="credits", ), ), + ( + "department", + models.CharField( + choices=[ + ("TC", "TC"), + ("IMSI", "IMSI"), + ("IMAP", "IMAP"), + ("INFO", "INFO"), + ("GI", "GI"), + ("E", "E"), + ("EE", "EE"), + ("GESC", "GESC"), + ("GMC", "GMC"), + ("MC", "MC"), + ("EDIM", "EDIM"), + ("HUMA", "Humanities"), + ("NA", "N/A"), + ], + default="NA", + max_length=10, + verbose_name="departmenmt", + ), + ), ("title", models.CharField(max_length=300, verbose_name="title")), ( "manager", diff --git a/pedagogy/models.py b/pedagogy/models.py index 28f3c880..616d1129 100644 --- a/pedagogy/models.py +++ b/pedagogy/models.py @@ -98,7 +98,13 @@ class UV(models.Model): null=False, ) # Double star type not implemented yet - # Departments not implemented yet + + department = models.CharField( + _("departmenmt"), + max_length=10, + choices=settings.SITH_PROFILE_DEPARTMENTS, + default=settings.SITH_PROFILE_DEPARTMENTS[-1][0], + ) # All texts about the UV title = models.CharField(_("title"), max_length=300) @@ -240,19 +246,3 @@ class UVCommentReport(models.Model): """ pass - - -class EducationDepartment(models.Model): - """ - Education department of the school - """ - - pass - - -class StudyField(models.Model): - """ - Speciality inside an Education Department - """ - - pass diff --git a/pedagogy/templates/pedagogy/uv_detail.jinja b/pedagogy/templates/pedagogy/uv_detail.jinja index 58a389c5..42cb6580 100644 --- a/pedagogy/templates/pedagogy/uv_detail.jinja +++ b/pedagogy/templates/pedagogy/uv_detail.jinja @@ -7,6 +7,7 @@ {% block content %}

{% trans %}Back{% endtrans %}

{{ object.code }} - {{ object.title }}

+

{% trans %}Department: {% endtrans %}{{ object.department }}

{{ object.objectives|markdown }}

{{ object.program|markdown }}

{{ object.skills|markdown }}

diff --git a/pedagogy/tests.py b/pedagogy/tests.py index 6809d5f6..0de5b405 100644 --- a/pedagogy/tests.py +++ b/pedagogy/tests.py @@ -41,6 +41,7 @@ def create_uv_template(user_id, code="IFC1", exclude_list=[]): "credit_type": "TM", "semester": "SPRING", "language": "FR", + "department": "TC", "credits": 3, "hours_CM": 10, "hours_TD": 28, diff --git a/pedagogy/urls.py b/pedagogy/urls.py index 6bdb99c1..7d90c735 100644 --- a/pedagogy/urls.py +++ b/pedagogy/urls.py @@ -52,20 +52,4 @@ urlpatterns = [ url(r"^uv/create$", UVCreateView.as_view(), name="uv_create"), url(r"^uv/(?P[0-9]+)/delete$", UVDeleteView.as_view(), name="uv_delete"), url(r"^uv/(?P[0-9]+)/edit$", UVUpdateView.as_view(), name="uv_update"), - url( - r"^department/create$", - EducationDepartmentCreateView.as_view(), - name="department_create", - ), - url( - r"^department/(?P[0-9]+)/delete$", - EducationDepartmentDeleteView.as_view(), - name="department_delete", - ), - url(r"^study/create$", StudyFieldCreateView.as_view(), name="study_create"), - url( - r"^study/(?P[0-9]+)/delete$", - StudyFieldDeleteView.as_view(), - name="study_delete", - ), ] diff --git a/pedagogy/views.py b/pedagogy/views.py index e9fb709f..38309a56 100644 --- a/pedagogy/views.py +++ b/pedagogy/views.py @@ -217,35 +217,3 @@ class UVUpdateView(CanEditPropMixin, UpdateView): def get_success_url(self): return reverse_lazy("pedagogy:uv_detail", kwargs={"uv_id": self.object.id}) - - -class EducationDepartmentCreateView(CreateView): - """ - Add a new Education Department (Privileged) - """ - - pass - - -class EducationDepartmentDeleteView(DeleteView): - """ - Allow to delete an Education Department (Privileged) - """ - - pass - - -class StudyFieldCreateView(CreateView): - """ - Add a new Study Field (Privileged) - """ - - pass - - -class StudyFieldDeleteView(DeleteView): - """ - Allow to delete an Study Field (Privileged) - """ - - pass