Projet

Général

Profil

0001-ressources-improved-socialisation-place-search.patch

Jérôme Schneider, 10 juillet 2014 18:25

Télécharger (27,2 ko)

Voir les différences: 

Subject: [PATCH] ressources: improved socialisation place search

Fixes #5127

 calebasse/ressources/lookups.py                    |  29 +-
 .../0009_auto__add_field_school_display_name.py    | 324 +++++++++++++++++++++
 calebasse/ressources/models.py                     |  16 +
 3 files changed, 356 insertions(+), 13 deletions(-)
 create mode 100644 calebasse/ressources/migrations/0009_auto__add_field_school_display_name.py
calebasse/ressources/lookups.py
1 1 
# -*- coding: utf-8 -*-
2 2 
import itertools
3 
import re
4 

  		




  
  5
  
    
from django.db.models import Q

  		




  3
  6
  
    

  		




  4
  7
  
    
from calebasse.lookups import CalebasseLookup

  		




  5
  8
  
    
from calebasse.personnes.models import Worker

  		




  ......




  61
  64
  
    
class SchoolLookup(CalebasseLookup):

  		




  62
  65
  
    
    model = School

  		




  63
  66
  
    
    search_field = 'name'

  		




  
  67
  
    
    query_words = []

  		




  
  68
  
    

  		




  
  69
  
    
    def get_query(self, q, request):

  		




  
  70
  
    
        words = q.split()

  		




  
  71
  
    
        self.query_words = words

  		




  
  72
  
    
        lookups = [Q(display_name__icontains=word) for word in words]

  		




  
  73
  
    
        return School.objects.filter(*lookups)

  		




  64
  74
  
    

  		




  65
  75
  
    
    def get_result(self, obj):

  		




  66
  76
  
    
        return self.format_item_display(obj)

  		




  67
  77
  
    

  		




  68
  78
  
    
    def format_match(self, obj):

  		




  69
  
  
    
        return self.format_item_display(obj)

  		




  
  79
  
    
        display = obj.display_name

  		




  
  80
  
    
        for word in self.query_words:

  		




  
  81
  
    
            pattern = re.compile(r"(%s)" % word, re.IGNORECASE)

  		




  
  82
  
    
            display = re.sub(pattern, r"<strong>\1</strong>", display)

  		




  
  83
  
    
        return display

  		




  70
  84
  
    

  		




  71
  85
  
    
    def format_item_display(self, obj):

  		




  72
  
  
    
        text = ''

  		




  73
  
  
    
        if obj.school_type.name != 'Inconnu':

  		




  74
  
  
    
            text = unicode(obj.school_type) + ' ' + obj.name

  		




  75
  
  
    
        else:

  		




  76
  
  
    
            text = obj.name

  		




  77
  
  
    
        if obj.address:

  		




  78
  
  
    
            text += " - "  + obj.address

  		




  79
  
  
    
        if obj.private:

  		




  80
  
  
    
            text += " (Privé)"

  		




  81
  
  
    
        else:

  		




  82
  
  
    
            text +=  " (Public)"

  		




  83
  
  
    
        return text

  		




  
  86
  
    
        return obj.display_name

  		




  84
  87
  
    

  		












  

    
      calebasse/ressources/migrations/0009_auto__add_field_school_display_name.py
    
  





  
  1
  
    
# -*- coding: utf-8 -*-

  		




  
  2
  
    
from south.utils import datetime_utils as datetime

  		




  
  3
  
    
from south.db import db

  		




  
  4
  
    
from south.v2 import SchemaMigration

  		




  
  5
  
    
from django.db import models

  		




  
  6
  
    

  		




  
  7
  
    

  		




  
  8
  
    
class Migration(SchemaMigration):

  		




  
  9
  
    

  		




  
  10
  
    
    def forwards(self, orm):

  		




  
  11
  
    
        # Adding field 'School.display_name'

  		




  
  12
  
    
        db.add_column(u'ressources_school', 'display_name',

  		




  
  13
  
    
                      self.gf('django.db.models.fields.CharField')(default='', max_length=256, null=True, blank=True),

  		




  
  14
  
    
                      keep_default=False)

  		




  
  15
  
    
        from calebasse.ressources.models import School

  		




  
  16
  
    
        for school in School.objects.all():

  		




  
  17
  
    
            school.save()

  		




  
  18
  
    

  		




  
  19
  
    

  		




  
  20
  
    
    def backwards(self, orm):

  		




  
  21
  
    
        # Deleting field 'School.display_name'

  		




  
  22
  
    
        db.delete_column(u'ressources_school', 'display_name')

  		




  
  23
  
    

  		




  
  24
  
    

  		




  
  25
  
    
    models = {

  		




  
  26
  
    
        u'ressources.acttype': {

  		




  
  27
  
    
            'Meta': {'ordering': "('-display_first', 'name')", 'object_name': 'ActType'},

  		




  
  28
  
    
            'billable': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),

  		




  
  29
  
    
            'display_first': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),

  		




  
  30
  
    
            'group': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),

  		




  
  31
  
    
            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),

  		




  
  32
  
    
            'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}),

  		




  
  33
  
    
            'old_id': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True', 'blank': 'True'}),

  		




  
  34
  
    
            'service': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['ressources.Service']", 'null': 'True', 'blank': 'True'})

  		




  
  35
  
    
        },

  		




  
  36
  
    
        u'ressources.advicegiver': {

  		




  
  37
  
    
            'Meta': {'object_name': 'AdviceGiver'},

  		




  
  38
  
    
            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),

  		




  
  39
  
    
            'name': ('django.db.models.fields.CharField', [], {'max_length': '150'})

  		




  
  40
  
    
        },

  		




  
  41
  
    
        u'ressources.analysemotive': {

  		




  
  42
  
    
            'Meta': {'object_name': 'AnalyseMotive'},

  		




  
  43
  
    
            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),

  		




  
  44
  
    
            'name': ('django.db.models.fields.CharField', [], {'max_length': '150'})

  		




  
  45
  
    
        },

  		




  
  46
  
    
        u'ressources.codecftmea': {

  		




  
  47
  
    
            'Meta': {'ordering': "['ordering_code']", 'object_name': 'CodeCFTMEA'},

  		




  
  48
  
    
            'axe': ('django.db.models.fields.IntegerField', [], {'max_length': '1'}),

  		




  
  49
  
    
            'code': ('django.db.models.fields.IntegerField', [], {}),

  		




  
  50
  
    
            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),

  		




  
  51
  
    
            'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}),

  		




  
  52
  
    
            'ordering_code': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'})

  		




  
  53
  
    
        },

  		




  
  54
  
    
        u'ressources.familymotive': {

  		




  
  55
  
    
            'Meta': {'object_name': 'FamilyMotive'},

  		




  
  56
  
    
            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),

  		




  
  57
  
    
            'name': ('django.db.models.fields.CharField', [], {'max_length': '150'})

  		




  
  58
  
    
        },

  		




  
  59
  
    
        u'ressources.familysituationtype': {

  		




  
  60
  
    
            'Meta': {'object_name': 'FamilySituationType'},

  		




  
  61
  
    
            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),

  		




  
  62
  
    
            'name': ('django.db.models.fields.CharField', [], {'max_length': '150'})

  		




  
  63
  
    
        },

  		




  
  64
  
    
        u'ressources.healthcenter': {

  		




  
  65
  
    
            'Meta': {'object_name': 'HealthCenter'},

  		




  
  66
  
    
            'abbreviation': ('django.db.models.fields.CharField', [], {'default': 'True', 'max_length': '8', 'null': 'True'}),

  		




  
  67
  
    
            'accounting_number': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}),

  		




  
  68
  
    
            'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),

  		




  
  69
  
    
            'address': ('django.db.models.fields.CharField', [], {'max_length': '120'}),

  		




  
  70
  
    
            'address_complement': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '120', 'null': 'True', 'blank': 'True'}),

  		




  
  71
  
    
            'city': ('django.db.models.fields.CharField', [], {'max_length': '80'}),

  		




  
  72
  
    
            'code': ('django.db.models.fields.CharField', [], {'max_length': '4', 'null': 'True', 'blank': 'True'}),

  		




  
  73
  
    
            'computer_center_code': ('django.db.models.fields.CharField', [], {'default': 'True', 'max_length': '8', 'null': 'True'}),

  		




  
  74
  
    
            'correspondant': ('django.db.models.fields.CharField', [], {'max_length': '80'}),

  		




  
  75
  
    
            'dest_organism': ('django.db.models.fields.CharField', [], {'max_length': '8'}),

  		




  
  76
  
    
            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),

  		




  
  77
  
    
            'fax': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}),

  		




  
  78
  
    
            'hc_invoice': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': u"orm['ressources.HealthCenter']", 'null': 'True', 'blank': 'True'}),

  		




  
  79
  
    
            'health_fund': ('django.db.models.fields.CharField', [], {'max_length': '3'}),

  		




  
  80
  
    
            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),

  		




  
  81
  
    
            'large_regime': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['ressources.LargeRegime']"}),

  		




  
  82
  
    
            'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}),

  		




  
  83
  
    
            'phone': ('django.db.models.fields.CharField', [], {'max_length': '30'}),

  		




  
  84
  
    
            'zip_code': ('django.db.models.fields.CharField', [], {'max_length': '8'})

  		




  
  85
  
    
        },

  		




  
  86
  
    
        u'ressources.holidaytype': {

  		




  
  87
  
    
            'Meta': {'object_name': 'HolidayType'},

  		




  
  88
  
    
            'for_group': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),

  		




  
  89
  
    
            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),

  		




  
  90
  
    
            'name': ('django.db.models.fields.CharField', [], {'max_length': '150'})

  		




  
  91
  
    
        },

  		




  
  92
  
    
        u'ressources.inscriptionmotive': {

  		




  
  93
  
    
            'Meta': {'object_name': 'InscriptionMotive'},

  		




  
  94
  
    
            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),

  		




  
  95
  
    
            'name': ('django.db.models.fields.CharField', [], {'max_length': '150'})

  		




  
  96
  
    
        },

  		




  
  97
  
    
        u'ressources.job': {

  		




  
  98
  
    
            'Meta': {'object_name': 'Job'},

  		




  
  99
  
    
            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),

  		




  
  100
  
    
            'name': ('django.db.models.fields.CharField', [], {'max_length': '150'})

  		




  
  101
  
    
        },

  		




  
  102
  
    
        u'ressources.largeregime': {

  		




  
  103
  
    
            'Meta': {'object_name': 'LargeRegime'},

  		




  
  104
  
    
            'code': ('django.db.models.fields.CharField', [], {'max_length': '2'}),

  		




  
  105
  
    
            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),

  		




  
  106
  
    
            'name': ('django.db.models.fields.CharField', [], {'max_length': '150'})

  		




  
  107
  
    
        },

  		




  
  108
  
    
        u'ressources.managementcode': {

  		




  
  109
  
    
            'Meta': {'object_name': 'ManagementCode'},

  		




  
  110
  
    
            'code': ('django.db.models.fields.CharField', [], {'max_length': '10'}),

  		




  
  111
  
    
            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),

  		




  
  112
  
    
            'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}),

  		




  
  113
  
    
            'old_id': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True', 'blank': 'True'})

  		




  
  114
  
    
        },

  		




  
  115
  
    
        u'ressources.maritalstatustype': {

  		




  
  116
  
    
            'Meta': {'object_name': 'MaritalStatusType'},

  		




  
  117
  
    
            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),

  		




  
  118
  
    
            'name': ('django.db.models.fields.CharField', [], {'max_length': '150'})

  		




  
  119
  
    
        },

  		




  
  120
  
    
        u'ressources.mdph': {

  		




  
  121
  
    
            'Meta': {'object_name': 'MDPH'},

  		




  
  122
  
    
            'address': ('django.db.models.fields.CharField', [], {'max_length': '120', 'null': 'True', 'blank': 'True'}),

  		




  
  123
  
    
            'address_complement': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '120', 'null': 'True', 'blank': 'True'}),

  		




  
  124
  
    
            'city': ('django.db.models.fields.CharField', [], {'max_length': '80', 'null': 'True', 'blank': 'True'}),

  		




  
  125
  
    
            'department': ('django.db.models.fields.CharField', [], {'max_length': '200'}),

  		




  
  126
  
    
            'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),

  		




  
  127
  
    
            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),

  		




  
  128
  
    
            'fax': ('calebasse.models.PhoneNumberField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),

  		




  
  129
  
    
            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),

  		




  
  130
  
    
            'phone': ('calebasse.models.PhoneNumberField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),

  		




  
  131
  
    
            'website': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),

  		




  
  132
  
    
            'zip_code': ('calebasse.models.ZipCodeField', [], {'max_length': '5', 'null': 'True', 'blank': 'True'})

  		




  
  133
  
    
        },

  		




  
  134
  
    
        u'ressources.mdphrequest': {

  		




  
  135
  
    
            'Meta': {'object_name': 'MDPHRequest'},

  		




  
  136
  
    
            'comment': ('django.db.models.fields.TextField', [], {'max_length': '3000', 'null': 'True', 'blank': 'True'}),

  		




  
  137
  
    
            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),

  		




  
  138
  
    
            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),

  		




  
  139
  
    
            'mdph': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['ressources.MDPH']"}),

  		




  
  140
  
    
            'start_date': ('django.db.models.fields.DateField', [], {})

  		




  
  141
  
    
        },

  		




  
  142
  
    
        u'ressources.mdphresponse': {

  		




  
  143
  
    
            'Meta': {'object_name': 'MDPHResponse'},

  		




  
  144
  
    
            'comment': ('django.db.models.fields.TextField', [], {'max_length': '3000', 'null': 'True', 'blank': 'True'}),

  		




  
  145
  
    
            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),

  		




  
  146
  
    
            'end_date': ('django.db.models.fields.DateField', [], {}),

  		




  
  147
  
    
            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),

  		




  
  148
  
    
            'mdph': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['ressources.MDPH']"}),

  		




  
  149
  
    
            'name': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),

  		




  
  150
  
    
            'rate': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}),

  		




  
  151
  
    
            'start_date': ('django.db.models.fields.DateField', [], {}),

  		




  
  152
  
    
            'type_aide': ('django.db.models.fields.IntegerField', [], {'default': '0', 'max_length': '1'})

  		




  
  153
  
    
        },

  		




  
  154
  
    
        u'ressources.nationality': {

  		




  
  155
  
    
            'Meta': {'object_name': 'Nationality'},

  		




  
  156
  
    
            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),

  		




  
  157
  
    
            'name': ('django.db.models.fields.CharField', [], {'max_length': '150'})

  		




  
  158
  
    
        },

  		




  
  159
  
    
        u'ressources.office': {

  		




  
  160
  
    
            'Meta': {'object_name': 'Office'},

  		




  
  161
  
    
            'address': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '120', 'null': 'True', 'blank': 'True'}),

  		




  
  162
  
    
            'address_complement': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '120', 'null': 'True', 'blank': 'True'}),

  		




  
  163
  
    
            'city': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '80', 'null': 'True', 'blank': 'True'}),

  		




  
  164
  
    
            'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),

  		




  
  165
  
    
            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),

  		




  
  166
  
    
            'fax': ('calebasse.models.PhoneNumberField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),

  		




  
  167
  
    
            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),

  		




  
  168
  
    
            'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}),

  		




  
  169
  
    
            'phone': ('calebasse.models.PhoneNumberField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),

  		




  
  170
  
    
            'zip_code': ('calebasse.models.ZipCodeField', [], {'default': 'None', 'max_length': '5', 'null': 'True', 'blank': 'True'})

  		




  
  171
  
    
        },

  		




  
  172
  
    
        u'ressources.outmotive': {

  		




  
  173
  
    
            'Meta': {'object_name': 'OutMotive'},

  		




  
  174
  
    
            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),

  		




  
  175
  
    
            'name': ('django.db.models.fields.CharField', [], {'max_length': '150'})

  		




  
  176
  
    
        },

  		




  
  177
  
    
        u'ressources.outto': {

  		




  
  178
  
    
            'Meta': {'object_name': 'OutTo'},

  		




  
  179
  
    
            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),

  		




  
  180
  
    
            'name': ('django.db.models.fields.CharField', [], {'max_length': '150'})

  		




  
  181
  
    
        },

  		




  
  182
  
    
        u'ressources.parentalauthoritytype': {

  		




  
  183
  
    
            'Meta': {'object_name': 'ParentalAuthorityType'},

  		




  
  184
  
    
            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),

  		




  
  185
  
    
            'name': ('django.db.models.fields.CharField', [], {'max_length': '150'})

  		




  
  186
  
    
        },

  		




  
  187
  
    
        u'ressources.parentalcustodytype': {

  		




  
  188
  
    
            'Meta': {'object_name': 'ParentalCustodyType'},

  		




  
  189
  
    
            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),

  		




  
  190
  
    
            'name': ('django.db.models.fields.CharField', [], {'max_length': '150'})

  		




  
  191
  
    
        },

  		




  
  192
  
    
        u'ressources.patientrelatedlink': {

  		




  
  193
  
    
            'Meta': {'object_name': 'PatientRelatedLink'},

  		




  
  194
  
    
            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),

  		




  
  195
  
    
            'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}),

  		




  
  196
  
    
            'old_camsp_id': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True', 'blank': 'True'}),

  		




  
  197
  
    
            'old_cmpp_id': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True', 'blank': 'True'}),

  		




  
  198
  
    
            'old_sessad_dys_id': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True', 'blank': 'True'}),

  		




  
  199
  
    
            'old_sessad_ted_id': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True', 'blank': 'True'})

  		




  
  200
  
    
        },

  		




  
  201
  
    
        u'ressources.priceperact': {

  		




  
  202
  
    
            'Meta': {'object_name': 'PricePerAct'},

  		




  
  203
  
    
            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),

  		




  
  204
  
    
            'price': ('django.db.models.fields.DecimalField', [], {'max_digits': '5', 'decimal_places': '2'}),

  		




  
  205
  
    
            'start_date': ('django.db.models.fields.DateField', [], {})

  		




  
  206
  
    
        },

  		




  
  207
  
    
        u'ressources.provenance': {

  		




  
  208
  
    
            'Meta': {'object_name': 'Provenance'},

  		




  
  209
  
    
            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),

  		




  
  210
  
    
            'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}),

  		




  
  211
  
    
            'old_id': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True', 'blank': 'True'}),

  		




  
  212
  
    
            'old_service': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True', 'blank': 'True'})

  		




  
  213
  
    
        },

  		




  
  214
  
    
        u'ressources.provenanceplace': {

  		




  
  215
  
    
            'Meta': {'object_name': 'ProvenancePlace'},

  		




  
  216
  
    
            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),

  		




  
  217
  
    
            'name': ('django.db.models.fields.CharField', [], {'max_length': '150'})

  		




  
  218
  
    
        },

  		




  
  219
  
    
        u'ressources.ressource': {

  		




  
  220
  
    
            'Meta': {'object_name': 'Ressource'},

  		




  
  221
  
    
            'etablissement': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['ressources.Office']"}),

  		




  
  222
  
    
            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),

  		




  
  223
  
    
            'name': ('django.db.models.fields.CharField', [], {'max_length': '150'})

  		




  
  224
  
    
        },

  		




  
  225
  
    
        u'ressources.school': {

  		




  
  226
  
    
            'Meta': {'object_name': 'School'},

  		




  
  227
  
    
            'address': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '120', 'null': 'True', 'blank': 'True'}),

  		




  
  228
  
    
            'address_complement': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '120', 'null': 'True', 'blank': 'True'}),

  		




  
  229
  
    
            'city': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '80', 'null': 'True', 'blank': 'True'}),

  		




  
  230
  
    
            'description': ('django.db.models.fields.TextField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}),

  		




  
  231
  
    
            'director_name': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '70', 'null': 'True', 'blank': 'True'}),

  		




  
  232
  
    
            'display_name': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '256', 'null': 'True', 'blank': 'True'}),

  		




  
  233
  
    
            'email': ('django.db.models.fields.EmailField', [], {'default': 'None', 'max_length': '75', 'null': 'True', 'blank': 'True'}),

  		




  
  234
  
    
            'fax': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '30', 'null': 'True', 'blank': 'True'}),

  		




  
  235
  
    
            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),

  		




  
  236
  
    
            'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}),

  		




  
  237
  
    
            'old_id': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True', 'blank': 'True'}),

  		




  
  238
  
    
            'old_service': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True', 'blank': 'True'}),

  		




  
  239
  
    
            'phone': ('calebasse.models.PhoneNumberField', [], {'default': 'None', 'max_length': '20', 'null': 'True', 'blank': 'True'}),

  		




  
  240
  
    
            'private': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),

  		




  
  241
  
    
            'school_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['ressources.SchoolType']"}),

  		




  
  242
  
    
            'zip_code': ('calebasse.models.ZipCodeField', [], {'default': 'None', 'max_length': '5', 'null': 'True', 'blank': 'True'})

  		




  
  243
  
    
        },

  		




  
  244
  
    
        u'ressources.schoollevel': {

  		




  
  245
  
    
            'Meta': {'object_name': 'SchoolLevel'},

  		




  
  246
  
    
            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),

  		




  
  247
  
    
            'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}),

  		




  
  248
  
    
            'old_id': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True', 'blank': 'True'}),

  		




  
  249
  
    
            'old_service': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True', 'blank': 'True'})

  		




  
  250
  
    
        },

  		




  
  251
  
    
        u'ressources.schoolteacherrole': {

  		




  
  252
  
    
            'Meta': {'object_name': 'SchoolTeacherRole'},

  		




  
  253
  
    
            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),

  		




  
  254
  
    
            'name': ('django.db.models.fields.CharField', [], {'max_length': '150'})

  		




  
  255
  
    
        },

  		




  
  256
  
    
        u'ressources.schooltype': {

  		




  
  257
  
    
            'Meta': {'object_name': 'SchoolType'},

  		




  
  258
  
    
            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),

  		




  
  259
  
    
            'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}),

  		




  
  260
  
    
            'services': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['ressources.Service']", 'symmetrical': 'False'})

  		




  
  261
  
    
        },

  		




  
  262
  
    
        u'ressources.service': {

  		




  
  263
  
    
            'Meta': {'object_name': 'Service'},

  		




  
  264
  
    
            'description': ('django.db.models.fields.TextField', [], {}),

  		




  
  265
  
    
            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),

  		




  
  266
  
    
            'fax': ('calebasse.models.PhoneNumberField', [], {'max_length': '20'}),

  		




  
  267
  
    
            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),

  		




  
  268
  
    
            'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}),

  		




  
  269
  
    
            'phone': ('calebasse.models.PhoneNumberField', [], {'max_length': '20'}),

  		




  
  270
  
    
            'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50'})

  		




  
  271
  
    
        },

  		




  
  272
  
    
        u'ressources.sessiontype': {

  		




  
  273
  
    
            'Meta': {'object_name': 'SessionType'},

  		




  
  274
  
    
            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),

  		




  
  275
  
    
            'name': ('django.db.models.fields.CharField', [], {'max_length': '150'})

  		




  
  276
  
    
        },

  		




  
  277
  
    
        u'ressources.socialisationduration': {

  		




  
  278
  
    
            'Meta': {'object_name': 'SocialisationDuration'},

  		




  
  279
  
    
            'comment': ('django.db.models.fields.TextField', [], {'max_length': '3000', 'null': 'True', 'blank': 'True'}),

  		




  
  280
  
    
            'contact': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '200', 'null': 'True', 'blank': 'True'}),

  		




  
  281
  
    
            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),

  		




  
  282
  
    
            'end_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),

  		




  
  283
  
    
            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),

  		




  
  284
  
    
            'level': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['ressources.SchoolLevel']", 'null': 'True', 'blank': 'True'}),

  		




  
  285
  
    
            'redoublement': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),

  		




  
  286
  
    
            'school': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['ressources.School']", 'null': 'True', 'blank': 'True'}),

  		




  
  287
  
    
            'start_date': ('django.db.models.fields.DateField', [], {})

  		




  
  288
  
    
        },

  		




  
  289
  
    
        u'ressources.transportcompany': {

  		




  
  290
  
    
            'Meta': {'object_name': 'TransportCompany'},

  		




  
  291
  
    
            'address': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '120', 'null': 'True', 'blank': 'True'}),

  		




  
  292
  
    
            'address_complement': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '120', 'null': 'True', 'blank': 'True'}),

  		




  
  293
  
    
            'city': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '80', 'null': 'True', 'blank': 'True'}),

  		




  
  294
  
    
            'correspondant': ('django.db.models.fields.CharField', [], {'max_length': '80', 'null': 'True', 'blank': 'True'}),

  		




  
  295
  
    
            'description': ('django.db.models.fields.TextField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}),

  		




  
  296
  
    
            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),

  		




  
  297
  
    
            'fax': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '30', 'null': 'True', 'blank': 'True'}),

  		




  
  298
  
    
            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),

  		




  
  299
  
    
            'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}),

  		




  
  300
  
    
            'old_camsp_id': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True', 'blank': 'True'}),

  		




  
  301
  
    
            'old_cmpp_id': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True', 'blank': 'True'}),

  		




  
  302
  
    
            'old_sessad_dys_id': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True', 'blank': 'True'}),

  		




  
  303
  
    
            'old_sessad_ted_id': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True', 'blank': 'True'}),

  		




  
  304
  
    
            'phone': ('calebasse.models.PhoneNumberField', [], {'default': 'None', 'max_length': '20', 'null': 'True', 'blank': 'True'}),

  		




  
  305
  
    
            'zip_code': ('calebasse.models.ZipCodeField', [], {'default': 'None', 'max_length': '5', 'null': 'True', 'blank': 'True'})

  		




  
  306
  
    
        },

  		




  
  307
  
    
        u'ressources.transporttype': {

  		




  
  308
  
    
            'Meta': {'object_name': 'TransportType'},

  		




  
  309
  
    
            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),

  		




  
  310
  
    
            'name': ('django.db.models.fields.CharField', [], {'max_length': '150'})

  		




  
  311
  
    
        },

  		




  
  312
  
    
        u'ressources.uninvoicablecode': {

  		




  
  313
  
    
            'Meta': {'object_name': 'UninvoicableCode'},

  		




  
  314
  
    
            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})

  		




  
  315
  
    
        },

  		




  
  316
  
    
        u'ressources.workertype': {

  		




  
  317
  
    
            'Meta': {'object_name': 'WorkerType'},

  		




  
  318
  
    
            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),

  		




  
  319
  
    
            'intervene': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),

  		




  
  320
  
    
            'name': ('django.db.models.fields.CharField', [], {'max_length': '150'})

  		




  
  321
  
    
        }

  		




  
  322
  
    
    }

  		




  
  323
  
    

  		




  
  324
  
    
    complete_apps = ['ressources']

  		












  

    
      calebasse/ressources/models.py
    
  





  226
  226
  
    
            return unicode(self.school_type) + ' ' + self.name

  		




  227
  227
  
    
        return self.name

  		




  228
  228
  
    

  		




  
  229
  
    
    def save(self, **kwargs):

  		




  
  230
  
    
        self.display_name = ""

  		




  
  231
  
    
        if self.school_type.name != 'Inconnu':

  		




  
  232
  
    
            self.display_name = unicode(self.school_type) + ' ' + self.name

  		




  
  233
  
    
        else:

  		




  
  234
  
    
            self.display_name = self.name

  		




  
  235
  
    
        if self.address:

  		




  
  236
  
    
            self.display_name += " - "  + self.address

  		




  
  237
  
    
        if self.private:

  		




  
  238
  
    
            self.display_name += " (Privé)"

  		




  
  239
  
    
        else:

  		




  
  240
  
    
            self.display_name +=  " (Public)"

  		




  
  241
  
    
        super(School, self).save(**kwargs)

  		




  
  242
  
    

  		




  
  243
  
    
    display_name = models.CharField(max_length=256,

  		




  
  244
  
    
            blank=True, null=True, default='')

  		




  229
  245
  
    
    school_type = models.ForeignKey('ressources.SchoolType',

  		




  230
  246
  
    
        verbose_name=u"Type d'établissement")

  		




  231
  247
  
    
    description = models.TextField(blank=True, null=True, default=None)

  		




  232
  
  
    
-