Rename_Document_to_Concept

cms/admin.py

@@ -1,12 +1,16 @@
 from django.contrib import admin
 
-from .models import (Enseignant, Domaine, Competence, SousCompetence, Objectif,
-                     Ressource, Module, Processus, Document, UploadDoc)
+from .models import (
+    Enseignant, Domaine, Competence, SousCompetence, Objectif,
+    Ressource, Module, Processus, Concept, UploadDoc
+)
 
-from .forms import (ProcessusAdminForm, ProcessusInlineAdminForm, ModuleAdminForm,
-                    DomaineAdminForm, CompetenceAdminForm, SousCompetenceInlineAdminForm,
-                    CompetenceInlineAdminForm, ObjectifAdminForm, RessourceAdminForm,
-                    SousCompetenceAdminForm, DocumentAdminForm, UploadAdminForm)
+from .forms import (
+    ProcessusAdminForm, ProcessusInlineAdminForm, ModuleAdminForm,
+    DomaineAdminForm, CompetenceAdminForm, SousCompetenceInlineAdminForm,
+    CompetenceInlineAdminForm, ObjectifAdminForm, RessourceAdminForm,
+    SousCompetenceAdminForm, ConceptAdminForm, UploadAdminForm
+)
 
 
 class SousCompetenceInline(admin.TabularInline):
@@ -74,8 +78,8 @@ class DomaineAdmin(admin.ModelAdmin):
     inlines = [ProcessusInlineAdmin]
 
 
-class DocumentAdmin(admin.ModelAdmin):
-    form = DocumentAdminForm
+class ConceptAdmin(admin.ModelAdmin):
+    form = ConceptAdminForm
 
 
 class UploadAdmin(admin.ModelAdmin):
@@ -90,5 +94,5 @@ admin.site.register(Objectif, ObjectifAdmin)
 admin.site.register(Ressource, RessourceAdmin)
 admin.site.register(Module, ModuleAdmin)
 admin.site.register(Processus, ProcessusAdmin)
-admin.site.register(Document, DocumentAdmin)
+admin.site.register(Concept, ConceptAdmin)
 admin.site.register(UploadDoc, UploadAdmin)

cms/forms.py

@@ -4,15 +4,17 @@ Created on 17 nov. 2012
 @author: alzo
 """
 from django import forms
-
-from .models import (Processus, Module, Domaine, Competence, SousCompetence, Document, UploadDoc)
 from tinymce.widgets import TinyMCE
 
+from .models import (
+    Processus, Module, Domaine, Competence, SousCompetence, Concept, UploadDoc
+)
 
-class DocumentAdminForm(forms.ModelForm):
+
+class ConceptAdminForm(forms.ModelForm):
     
     class Meta:
-        model = Document
+        model = Concept
         fields = ('titre', 'texte', 'published')
         
         widgets = {

cms/migrations/0007_Rename_Document_to_Concept.py

@@ -0,0 +1,67 @@
+# Generated by Django 2.0.1 on 2018-02-16 14:01
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cms', '0006_auto_20170616_0906'),
+    ]
+
+    operations = [
+        migrations.RenameModel(
+            old_name='Document',
+            new_name='Concept',
+        ),
+        migrations.RemoveField(
+            model_name='module',
+            name='periode_presentiel',
+        ),
+        migrations.AlterField(
+            model_name='competence',
+            name='module',
+            field=models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.SET_NULL, to='cms.Module'),
+        ),
+        migrations.AlterField(
+            model_name='competence',
+            name='proces_eval',
+            field=models.ForeignKey(default=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='cms.Processus'),
+        ),
+        migrations.AlterField(
+            model_name='domaine',
+            name='responsable',
+            field=models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.SET_NULL, to='cms.Enseignant'),
+        ),
+        migrations.AlterField(
+            model_name='module',
+            name='processus',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='cms.Processus'),
+        ),
+        migrations.AlterField(
+            model_name='objectif',
+            name='module',
+            field=models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.PROTECT, to='cms.Module'),
+        ),
+        migrations.AlterField(
+            model_name='processus',
+            name='domaine',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='cms.Domaine'),
+        ),
+        migrations.AlterField(
+            model_name='ressource',
+            name='module',
+            field=models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.PROTECT, to='cms.Module'),
+        ),
+        migrations.AlterField(
+            model_name='souscompetence',
+            name='competence',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='cms.Competence'),
+        ),
+        migrations.AlterField(
+            model_name='uploaddoc',
+            name='docfile',
+            field=models.FileField(upload_to='doc'),
+        ),
+    ]

cms/models.py

@@ -177,7 +177,7 @@ class Objectif(models.Model):
         return '{0}'.format(self.nom)
  
     
-class Document(models.Model):
+class Concept(models.Model):
     titre = models.CharField(max_length=128, blank=True)
     texte = tinymce_models.HTMLField(blank=True,)
     published = models.BooleanField(default=False)

cms/views.py

@@ -11,7 +11,9 @@ from django.db.models import F, Sum
 from django.http import HttpResponse
 
 from cms.pdf import PeriodSemesterPdf, ModuleDescriptionPdf, FormationPlanPdf
-from cms.models import (Domaine, Processus, Module, Competence, Document, UploadDoc,)
+from cms.models import (
+    Domaine, Processus, Module, Competence, Concept, UploadDoc
+)
 
 
 class HomeView(TemplateView):
@@ -63,9 +65,9 @@ class EvaluationView(ListView):
     model = Processus
 
 
-class DocumentDetailView(DetailView):
-    template_name = 'cms/document_detail.html'
-    model = Document
+class ConceptDetailView(DetailView):
+    template_name = 'cms/concept_detail.html'
+    model = Concept
 
 
 class UploadDocListView(ListView):

common/urls.py

@@ -39,7 +39,7 @@ urlpatterns = [
     path('travail/', views.TravailPersoListView.as_view(), name='travail'),
     path('module_pdf/<int:pk>/', views.print_module_pdf, name='module-pdf'),
     path('upload/', views.UploadDocListView.as_view(), name='uploaddoc-list'),
-    path('document/<int:pk>/', views.DocumentDetailView.as_view(), name='document-detail'),
+    path('document/<int:pk>/', views.ConceptDetailView.as_view(), name='concept-detail'),
     path('upload/<int:pk>/', views.UploadDocDetailView.as_view(), name='uploaddoc-detail'),
 
     # url(r'^emplois/$', views.EmploiListView.as_view(), name='emploi-list'),

templates/cms/base_site.html

@@ -26,11 +26,8 @@
             <li><a href="{% url 'periodes' %}">Périodes</a>&nbsp;&nbsp;</li>
             <li><a href="{% url 'competences' %}">Compétences</a>&nbsp;&nbsp;</li>
             <li><a href="{% url 'travail' %}">Heures de formation</a>&nbsp;&nbsp;</li>
-            <li><a href="{% url 'document-detail' 1 %}">Concept pédagogique</a>&nbsp;&nbsp;</li>
-            <li><a href="{% url 'document-detail' 2 %}">Concept de formation</a>&nbsp;&nbsp;</li>
-
-            <!-- <li><a href="{% url 'evaluation' %}">Evaluation</a>&nbsp;&nbsp;</li> -->
-
+            <li><a href="{% url 'concept-detail' 1 %}">Concept pédagogique</a>&nbsp;&nbsp;</li>
+            <li><a href="{% url 'concept-detail' 2 %}">Concept de formation</a>&nbsp;&nbsp;</li>
             <li><a href="{% url 'uploaddoc-list' %}">Téléchargements</a>&nbsp;&nbsp;</li>
             {% if has_permission %}
                 <li><a href="#">Calendrier</a>&nbsp;&nbsp;</li>