entrouvert
/
dauphine-logement
Archived
17
0
Fork 0
Code Issues Pull Requests Releases Activity

Demande plus d'informations pour l'inscription des profils offre (fixes #7148)

This commit is contained in:
Benjamin Dauvergne 2015-07-01 12:59:11 +02:00
parent e67698272b
commit 8d2d23b056
5 changed files with 220 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
appli_project/appli_offre/forms.py
View File

@ -26,6 +26,16 @@ from appli_project.appli_socle import views as socle_views
class InscriptionForm(FormulaireAvecRelaie):
email = forms.EmailField(label=_(u'Votre email'))
first_name = forms.CharField(label=_(u'Prénom'))
last_name = forms.CharField(label=_(u'Nom'))
address = forms.CharField(label=_(u'Adresse personnelle'),
widget=forms.Textarea)
phone = forms.CharField(max_length=20,
label=_(u'Téléphone fixe'))
mobile = forms.CharField(max_length=20,
label=_(u'Mobile'))
job = forms.CharField(max_length=128,
label=_(u'Profession'))
comment = forms.ChoiceField(label=_(u'Comment avez-vous connu le site ?'),
choices=models.ProfilOffre.COMMENT)
@ -47,7 +57,6 @@ class InscriptionForm(FormulaireAvecRelaie):
def save(self):
email = self.cleaned_data['email']
url = self.next_url()
print url
self.jeton = jeton = ''.join([random.SystemRandom().choice('123456789ABCDEFGHJKMNPQRSTUVWXYZ')
for i in range(8)])
d = { 'next': url, 'creation': 1 }
@ -85,6 +94,12 @@ ou bien recopier le lien suivant dans la barre d'adresse de votre navigateur:
helper.form_class = 'form-horizontal'
helper.layout = Layout(
'email',
'first_name',
'last_name',
'address',
'phone',
'mobile',
'job',
'comment',
'next',
ButtonHolder(

2
appli_project/appli_socle/admin.py
View File

@ -183,7 +183,7 @@ class ProfilOffreAdmin(ModelAdmin):
(_(u'Notifications par mail'), { 'fields':
(('accepte_notif_alertes', 'accepte_notif_depublication', 'accepte_invitations'),) }),
(_(u'Informations complémentaires'), { 'fields':
('first_name', 'last_name', 'comment', 'last_login')}))
('first_name', 'last_name', 'address', 'phone', 'mobile', 'job', 'comment', 'last_login')}))
actions = [ actions.export_as_csv, actions.desactivate_user, actions.activate_user ]
def save_model(self, request, obj, form, change):

3
appli_project/appli_socle/forms.py
View File

@ -219,8 +219,9 @@ class CodeDeConfirmationForm(forms.Form):
if 'creation' in self.value:
kwargs = {
'email': email,
'comment': self.value.get('comment', ''),
}
for key in ('first_name', 'last_name', 'address', 'job', 'phone', 'mobile', 'comment'):
kwargs[key] = self.value.get(key, '')
self.user_cache, self.created = models.ProfilOffre.objects.get_or_create(**kwargs)
self.user_cache.backend = 'appli_project.appli_socle.backends.ProfilOffreMoteurAuthentification'
if self.created:

194
appli_project/appli_socle/migrations/0020_auto__add_field_profiloffre_address__add_field_profiloffre_phone__add_.py Normal file
View File

@ -0,0 +1,194 @@
# -*- coding: utf-8 -*-
import datetime
from south.db import db
from south.v2 import SchemaMigration
from django.db import models
class Migration(SchemaMigration):
def forwards(self, orm):
# Adding field 'ProfilOffre.address'
db.add_column('appli_socle_profiloffre', 'address',
self.gf('django.db.models.fields.TextField')(default='', blank=True),
keep_default=False)
# Adding field 'ProfilOffre.phone'
db.add_column('appli_socle_profiloffre', 'phone',
self.gf('django.db.models.fields.CharField')(default='', max_length=20, blank=True),
keep_default=False)
# Adding field 'ProfilOffre.mobile'
db.add_column('appli_socle_profiloffre', 'mobile',
self.gf('django.db.models.fields.CharField')(default='', max_length=20, blank=True),
keep_default=False)
# Adding field 'ProfilOffre.job'
db.add_column('appli_socle_profiloffre', 'job',
self.gf('django.db.models.fields.CharField')(default='', max_length=128, blank=True),
keep_default=False)
def backwards(self, orm):
# Deleting field 'ProfilOffre.address'
db.delete_column('appli_socle_profiloffre', 'address')
# Deleting field 'ProfilOffre.phone'
db.delete_column('appli_socle_profiloffre', 'phone')
# Deleting field 'ProfilOffre.mobile'
db.delete_column('appli_socle_profiloffre', 'mobile')
# Deleting field 'ProfilOffre.job'
db.delete_column('appli_socle_profiloffre', 'job')
models = {
'appli_socle.annonce': {
'Meta': {'ordering': "('etat_validation', 'derniere_publication')", 'object_name': 'Annonce'},
'date_de_creation': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
'derniere_publication': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
'derniere_validation': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
'derniere_validation_par': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'on_delete': 'models.SET_NULL', 'blank': 'True'}),
'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
'duree_location': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
'etat_validation': ('django.db.models.fields.CharField', [], {'default': "'attend_validation'", 'max_length': '32', 'db_index': 'True'}),
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'monnaie': ('django.db.models.fields.CharField', [], {'default': "'EUR'", 'max_length': '3'}),
'nos_logements': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}),
'pays': ('django.db.models.fields.CharField', [], {'default': "'FR'", 'max_length': '3'}),
'photo': ('django.db.models.fields.files.ImageField', [], {'max_length': '100', 'blank': 'True'}),
'position_geographique': ('django.contrib.gis.db.models.fields.PointField', [], {}),
'prestations': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['appli_socle.Prestation']", 'symmetrical': 'False', 'blank': 'True'}),
'prix_par_mois': ('django.db.models.fields.DecimalField', [], {'max_digits': '6', 'decimal_places': '2', 'db_index': 'True'}),
'proprietaire': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'annonces'", 'to': "orm['appli_socle.ProfilOffre']"}),
'raison_invalidation': ('django.db.models.fields.TextField', [], {'default': "''", 'null': 'True', 'blank': 'True'}),
'surface_en_m2': ('django.db.models.fields.PositiveIntegerField', [], {}),
'type_d_offre': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['appli_socle.TypeOffre']", 'on_delete': 'models.SET_DEFAULT'}),
'type_de_logement': ('django.db.models.fields.CharField', [], {'default': "'studio'", 'max_length': '16'}),
'ville': ('django.db.models.fields.CharField', [], {'default': "'Paris'", 'max_length': '64'}),
'zones': ('django.db.models.fields.related.ManyToManyField', [], {'db_index': 'True', 'to': "orm['appli_socle.Zone']", 'symmetrical': 'False', 'blank': 'True'})
},
'appli_socle.emailmodele': {
'Meta': {'object_name': 'EmailModele'},
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'nom': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
'sujet': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
'texte': ('django.db.models.fields.TextField', [], {})
},
'appli_socle.parametre': {
'Meta': {'object_name': 'Parametre'},
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'nom': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
'valeur': ('picklefield.fields.PickledObjectField', [], {}),
'valeur_email': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['appli_socle.EmailModele']", 'null': 'True', 'on_delete': 'models.PROTECT', 'blank': 'True'})
},
'appli_socle.prestation': {
'Meta': {'object_name': 'Prestation'},
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'type_de_prestation': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['appli_socle.TypeDePrestation']"}),
'valeur_numerique': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'})
},
'appli_socle.profiloffre': {
'Meta': {'object_name': 'ProfilOffre'},
'acceptation_cgu': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
'acceptation_charte_qualite': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
'accepte_invitations': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
'accepte_notif_alertes': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
'accepte_notif_depublication': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
'address': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
'comment': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '32', 'blank': 'True'}),
'job': ('django.db.models.fields.CharField', [], {'max_length': '128', 'blank': 'True'}),
'mobile': ('django.db.models.fields.CharField', [], {'max_length': '20', 'blank': 'True'}),
'phone': ('django.db.models.fields.CharField', [], {'max_length': '20', 'blank': 'True'}),
'sans_validation': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
'url_de_contact': ('django.db.models.fields.URLField', [], {'max_length': '1024', 'blank': 'True'}),
'user_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True', 'primary_key': 'True'})
},
'appli_socle.profilrecherche': {
'Meta': {'object_name': 'ProfilRecherche'},
'acceptation_cgu': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
'acceptation_charte_qualite': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
'annonces_sauvegardees': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'sauvegardee_par'", 'blank': 'True', 'to': "orm['appli_socle.Annonce']"}),
'recherches_sauvegardees': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['appli_socle.RechercheSauvegardee']", 'symmetrical': 'False', 'blank': 'True'}),
'type_d_offre': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['appli_socle.TypeOffre']", 'symmetrical': 'False', 'blank': 'True'}),
'user_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True', 'primary_key': 'True'})
},
'appli_socle.recherchesauvegardee': {
'Meta': {'object_name': 'RechercheSauvegardee'},
'duree_location': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'intra_muros': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
'montant_loyer': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
'prix_maximum': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '6', 'decimal_places': '2', 'blank': 'True'}),
'types_de_logement': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
'zones': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['appli_socle.Zone']", 'null': 'True', 'blank': 'True'})
},
'appli_socle.typedeprestation': {
'Meta': {'ordering': "('ordre', 'nom')", 'object_name': 'TypeDePrestation'},
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'nom': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
'nom_en': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
'nom_fr': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
'ordre': ('django.db.models.fields.IntegerField', [], {}),
'type_de_valeur': ('django.db.models.fields.CharField', [], {'default': "'B'", 'max_length': '1'})
},
'appli_socle.typeoffre': {
'Meta': {'object_name': 'TypeOffre'},
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'nom': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
'nom_en': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
'nom_fr': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'})
},
'appli_socle.utilisateurcas': {
'Meta': {'unique_together': "(('identifiant', 'domain'),)", 'object_name': 'UtilisateurCAS'},
'domain': ('django.db.models.fields.CharField', [], {'default': "'dauphine'", 'max_length': '128'}),
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'identifiant': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'utilisateur_cas'", 'unique': 'True', 'to': "orm['auth.User']"})
},
'appli_socle.zone': {
'Meta': {'object_name': 'Zone'},
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'nom': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
'polygon': ('django.contrib.gis.db.models.fields.PolygonField', [], {})
},
'auth.group': {
'Meta': {'object_name': 'Group'},
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
},
'auth.permission': {
'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
},
'auth.user': {
'Meta': {'object_name': 'User'},
'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
},
'contenttypes.contenttype': {
'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
}
}
complete_apps = ['appli_socle']

7
appli_project/appli_socle/models.py
View File

@ -143,6 +143,13 @@ class ProfilOffre(EmailUnique, NoCollisionWithUser):
blank=True,
verbose_name=_(u'Comment avez-vous connu le site ?'),
choices=COMMENT, default='')
address = TextField(verbose_name=_(u'Adresse personnelle'), blank=True)
phone = CharField(max_length=20,
verbose_name=_(u'Téléphone fixe'), blank=True)
mobile = CharField(max_length=20,
verbose_name=_(u'Mobile'), blank=True)
job = CharField(max_length=128,
verbose_name=_(u'Profession'), blank=True)
username_prefix = 'offre'