transform clicrdv module into a third-party apps (#2582)

passerelle/__init__.py

@@ -0,0 +1,6 @@
+import sys
+import os.path
+
+apps_dir = os.path.join(os.path.dirname(__file__), 'apps')
+if apps_dir not in sys.path:
+    sys.path.append(apps_dir)

passerelle/apps/clicrdv/admin.py

@@ -0,0 +1,18 @@
+from django.contrib import admin
+
+from models import ClicRdvDateDataSource, ClicRdvDateTimeDataSource
+
+
+class ClicRdvDateDataSourceAdmin(admin.ModelAdmin):
+    prepopulated_fields = {'slug': ('title',)}
+
+
+admin.site.register(ClicRdvDateDataSource, ClicRdvDateDataSourceAdmin)
+
+
+class ClicRdvDateTimeDataSourceAdmin(admin.ModelAdmin):
+    prepopulated_fields = {'slug': ('title',)}
+
+
+admin.site.register(ClicRdvDateTimeDataSource, ClicRdvDateTimeDataSourceAdmin)
+

passerelle/apps/clicrdv/models.py

@@ -2,15 +2,14 @@ import base64
 import datetime
 import json
 import urllib2
-import time
 
 from django.conf import settings
-from django.contrib import admin
 from django.db import models
 from django.utils.dateformat import format as date_format
 from django.utils.dateformat import time_format
 
-from .models import BaseDataSource
+
+from passerelle.datasources.models import BaseDataSource
 
 
 def get_clicrdv_req(url):
@@ -27,9 +26,11 @@ def get_clicrdv_req(url):
     req.add_header('Authorization', authheader)
     return req
 
+
 def get_json(url):
     return json.load(urllib2.urlopen(get_clicrdv_req(url)))
 
+
 def get_available_timeslots(intervention, date_start=None, date_end=None):
     timeslots = []
     iid = intervention
@@ -80,15 +81,3 @@ class ClicRdvDateTimeDataSource(BaseDataSource):
             data.append(timed)
         data.sort(lambda x,y: cmp(x.get('id'), y.get('id')))
         return data
-
-
-class ClicRdvDateDataSourceAdmin(admin.ModelAdmin):
-    prepopulated_fields = {'slug': ('title',)}
-
-admin.site.register(ClicRdvDateDataSource, ClicRdvDateDataSourceAdmin)
-
-
-class ClicRdvDateTimeDataSourceAdmin(admin.ModelAdmin):
-    prepopulated_fields = {'slug': ('title',)}
-
-admin.site.register(ClicRdvDateTimeDataSource, ClicRdvDateTimeDataSourceAdmin)

passerelle/settings.py

@@ -128,6 +128,7 @@ INSTALLED_APPS = (
     # Uncomment the next line to enable admin documentation:
     # 'django.contrib.admindocs',
     'passerelle.datasources',
+    'clicrdv',
 )
 
 # A sample logging configuration. The only tangible logging