Commit de trucs qui traînent, pour pouvoir avancer !

diff --git a/auf_zap/conf.py.edit b/auf_zap/conf.py.edit
index 21b59ea..1d9087f 100644 (file)
--- a/auf_zap/conf.py.edit
+++ b/auf_zap/conf.py.edit
@@ -1,7 +1,7 @@
 import os
 
 DATABASE_ENGINE = 'sqlite3'    # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
-DATABASE_NAME = os.path.join(os.path.dirname(__file__), 'auf_zap.db') # Or path to database file if using sqlite3.
+DATABASE_NAME = os.path.join(os.path.dirname(__file__), 'data/auf_zap.db') # Or path to database file if using sqlite3.
 DATABASE_USER = ''             # Not used with sqlite3.
 DATABASE_PASSWORD = ''         # Not used with sqlite3.
 DATABASE_HOST = ''             # Set to empty string for localhost. Not used with sqlite3.

diff --git a/auf_zap/django.wsgi b/auf_zap/django.wsgi
new file mode 100755 (executable)
index 0000000..6706c65
--- /dev/null
+++ b/auf_zap/django.wsgi
@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+# http://code.google.com/p/modwsgi/wiki/IntegrationWithDjango
+
+import os, sys
+sys.path.append(os.path.dirname(os.path.dirname(__file__)))
+os.environ['DJANGO_SETTINGS_MODULE'] = 'auf_zap.settings'
+
+import django.core.handlers.wsgi
+application = django.core.handlers.wsgi.WSGIHandler()

diff --git a/auf_zap/formations/models.py b/auf_zap/formations/models.py
index ac13f22..6379785 100644 (file)
--- a/auf_zap/formations/models.py
+++ b/auf_zap/formations/models.py
@@ -102,8 +102,8 @@ class Formation(models.Model):
     niveau_diplome = models.ForeignKey(NiveauDiplome)
     domaine_scientifique = models.ForeignKey(DomaineScientifique)
     specialisation = models.ForeignKey(Specialisation)
-    langues = models.ManyToManyField(Langue)
-    annee_creation = models.DateField(u'Année de création de la formation')
+    langues = models.ManyToManyField(Langue, through='LangueFormation')
+    annee_creation = models.IntegerField(u'Année de création de la formation')
     duree_en_mois = models.IntegerField(u'Durée de la formation (en mois)')
     nom_responsable = models.CharField(u'Nom du responsable', max_length=100)
     nom_co_responsable = models.CharField(u'Nom du co-responsable', max_length=100)
@@ -116,7 +116,8 @@ class Formation(models.Model):
     partenaires = models.ManyToManyField(Universite)
     type_diplome = models.ForeignKey(TypeDiplome)
     reconnaissance_diplome = models.ForeignKey(ReconnaissanceDiplome)
-    indications_cout = models.CharField(u'Indications de coût', max_length=200)
+    frais_inscription = models.CharField(u"Frais d'inscription", max_length=200)
+    autres_frais = models.CharField(u'Autres frais', max_length=200)
     bourses_aides = models.CharField(u'Bourses et/ou aides', max_length=200)
     pre_requis = models.CharField(u'Pré-requis', max_length=200)
     type_selection = models.ForeignKey(TypeSelection)

diff --git a/auf_zap/settings.py b/auf_zap/settings.py
index dd33866..ccaf486 100644 (file)
--- a/auf_zap/settings.py
+++ b/auf_zap/settings.py
@@ -70,6 +70,7 @@ INSTALLED_APPS = (
     'django.contrib.contenttypes',
     'django.contrib.sessions',
     'django.contrib.sites',
+    'django.contrib.admindocs',
     'django.contrib.admin',
     'auf_zap.formations',
 )

diff --git a/auf_zap/sysadmin/__init__.py b/auf_zap/sysadmin/__init__.py
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/auf_zap/sysadmin/models.py b/auf_zap/sysadmin/models.py
new file mode 100644 (file)
index 0000000..71a8362
--- /dev/null
+++ b/auf_zap/sysadmin/models.py
@@ -0,0 +1,3 @@
+from django.db import models
+
+# Create your models here.

diff --git a/auf_zap/sysadmin/tests.py b/auf_zap/sysadmin/tests.py
new file mode 100644 (file)
index 0000000..2247054
--- /dev/null
+++ b/auf_zap/sysadmin/tests.py
@@ -0,0 +1,23 @@
+"""
+This file demonstrates two different styles of tests (one doctest and one
+unittest). These will both pass when you run "manage.py test".
+
+Replace these with more appropriate tests for your application.
+"""
+
+from django.test import TestCase
+
+class SimpleTest(TestCase):
+    def test_basic_addition(self):
+        """
+        Tests that 1 + 1 always equals 2.
+        """
+        self.failUnlessEqual(1 + 1, 2)
+
+__test__ = {"doctest": """
+Another way to test that 1 + 1 is equal to 2.
+
+>>> 1 + 1 == 2
+True
+"""}
+

diff --git a/auf_zap/sysadmin/views.py b/auf_zap/sysadmin/views.py
new file mode 100644 (file)
index 0000000..5ebe283
--- /dev/null
+++ b/auf_zap/sysadmin/views.py
@@ -0,0 +1,6 @@
+from django.shortcuts import render_to_response, get_object_or_404
+#from auf_zap.sysadmin.models import *
+
+def index(request):
+    return render_to_response('sysadmin/index.html', {})
+

diff --git a/auf_zap/urls.py b/auf_zap/urls.py
index 19d4976..10670c2 100644 (file)
--- a/auf_zap/urls.py
+++ b/auf_zap/urls.py
@@ -5,14 +5,15 @@ from django.contrib import admin
 admin.autodiscover()
 
 urlpatterns = patterns('',
+    (r'^$', 'django.views.generic.simple.redirect_to', {'url': '/sysadmin/'}),
+    (r'^sysadmin/', include('auf_zap.sysadmin.urls')),
     (r'^formations/', include('auf_zap.formations.urls')),
-
-    # Uncomment the admin/doc line below and add 'django.contrib.admindocs'
-    # to INSTALLED_APPS to enable admin documentation:
-    # (r'^admin/doc/', include('django.contrib.admindocs.urls')),
-
+    (r'^contacts/', include('auf_zap.contacts.urls')),
+    (r'^portail/', include('auf_zap.portail.urls')),
     # Uncomment the next line to enable the admin:
-    (r'^admin/', include(admin.site.urls)),
+    (r'^admin/doc/', include('django.contrib.admindocs.urls')),
+    (r'^admin/(.*)', admin.site.root),
+    #(r'^admin/', include(admin.site.urls)), # Django 1.1
     (r'^media/(?P<path>.*)$', 'django.views.static.serve',
         {'document_root': settings.MEDIA_ROOT}),
 )