From 449e9e93b5f51bc373719c12eb774fa982256dd5 Mon Sep 17 00:00:00 2001 From: Nilovna Bascunan-Vasquez Date: Mon, 25 Jul 2011 12:08:15 -0400 Subject: [PATCH 1/1] 1734: Partie-1 - utilisation du package auf.django.emploi dans le site institutionnel --- auf/django/emploi/api.py | 23 +++++++++++------------ auf/django/emploi/models.py | 12 ++++++------ 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/auf/django/emploi/api.py b/auf/django/emploi/api.py index acc9d82..a9478de 100644 --- a/auf/django/emploi/api.py +++ b/auf/django/emploi/api.py @@ -4,41 +4,40 @@ from django.shortcuts import render_to_response, redirect, get_object_or_404 from django.utils import simplejson from auf.django.emploi import models as emploi from auf.django.emploi import forms as emploiForms -from recrutement.api import API as api -from restkit import request +from restkit import request as req class API: def __init__(self, request): self.request = request def offre_emploi_liste(self): - url = "/call/offre_emploi_liste/" - r = request(url) + url = "http://127.0.0.1:8080/api/offre_emploi_liste/" + r = req(url) liste_json = r.body_string() liste_offres = simplejson.loads(liste_json) obj_offres_emploi = [] for offre_dict in liste_offres: offre = emploi.OffreEmploi() - offre.est_affiche = offre_dict['est_affiche'] - offre.statut = offre_dict['statut'] + #offre.est_affiche = offre_dict['est_affiche'] + #offre.statut = offre_dict['statut'] offre.nom = offre_dict['nom'] offre.resume = offre_dict['resume'] offre.description = offre_dict['description'] - offre.poste = offre_dict['poste'] + #offre.poste = offre_dict['poste'] offre.date_limite = offre_dict['date_limite'] - offre.region = offre_dict['region'] - offre.bureau = offre_dict['bureau'] + #offre.region = offre_dict['region'] + #offre.bureau = offre_dict['bureau'] offre.duree_affectation = offre_dict['duree_affectation'] offre.renumeration = offre_dict['renumeration'] offre.debut_affectation = offre_dict['debut_affectation'] - offre.lieu_affectation = offre_dict['lieu_affectation'] + #offre.lieu_affectation = offre_dict['lieu_affectation'] obj_offres_emploi.append(offre) return obj_offres_emploi def offre_emploi(self, offre_id): url = "/call/offre_emploi/%s" - r = request(url % (offre_id)) + r = req(url % (offre_id)) offre_json = r.body_string() offre_dict = simplejson.loads(offre_json) @@ -48,7 +47,7 @@ class API: obj_offre.nom = offre_dict('nom') obj_offre.resume = offre_dict('resume') obj_offre.description = offre_dict('description') - obj_offre.poste = offre_dict('poste') + #obj_offre.poste = offre_dict('poste') obj_offre.date_limite = offre_dict('date_limite') obj_offre.region = offre_dict('region') obj_offre.bureau = offre_dict('bureau') diff --git a/auf/django/emploi/models.py b/auf/django/emploi/models.py index 36a6e96..62716c4 100755 --- a/auf/django/emploi/models.py +++ b/auf/django/emploi/models.py @@ -76,7 +76,7 @@ class OffreEmploi(Metadata): nom = models.CharField(max_length=255) resume = models.TextField(verbose_name="Résumé") description = tinymce_models.HTMLField() - poste = models.ForeignKey('rh.Poste', db_column='poste') + #poste = models.ForeignKey('rh.Poste', db_column='poste') date_limite = models.DateField(verbose_name="Date limite", help_text=HELP_TEXT_FORMAT_DATE,) region = models.ForeignKey(ref.Region, db_column='region', @@ -139,8 +139,8 @@ class Candidat(Metadata): db_table = 'emploi_candidat' # Upload de fichiers -storage_prive = FileSystemStorage(settings.PRIVE_MEDIA_ROOT, - base_url=settings.PRIVE_MEDIA_URL) +#storage_prive = FileSystemStorage(settings.PRIVE_MEDIA_ROOT, +# base_url=settings.PRIVE_MEDIA_URL) def candidat_piece_dispatch(instance, filename): path = "offre_emploi/%s_%s/%s/%s_%s" % (instance.candidat.nom, @@ -153,9 +153,9 @@ class CandidatPiece(models.Model): related_name='candidat_piece') nom = models.CharField(max_length=3, choices=TYPE_PIECE_CHOICES) #path = PrivateFileField("file", upload_to=candidat_piece_dispatch) - path = models.FileField(verbose_name="Fichier", - upload_to=candidat_piece_dispatch, - storage=storage_prive, ) + # path = models.FileField(verbose_name="Fichier", + # upload_to=candidat_piece_dispatch, ) + #storage=storage_prive, ) class Meta: db_table = 'emploi_evaluateur' -- 1.7.10.4