from django.contrib import admin
-<<<<<<< HEAD
-from rh.admin import (DossierAdmin, EvenementAdmin, EvenementRemunerationAdmin,
- PosteAdmin, PosteFinancementAdmin, RemunerationAdmin)
-from models import *
-
-=======
from budget.models import *
-from rh.lib import *
+from rh.lib import (ClassementAdmin, DossierAdmin, EvenementAdmin,
+ EvenementRemunerationAdmin, PosteAdmin, RemunerationAdmin,
+ ValeurPointAdmin, TauxChangeAdmin)
+
admin.site.register(Classement, ClassementAdmin)
->>>>>>> dev
admin.site.register(Dossier, DossierAdmin)
admin.site.register(Evenement, EvenementAdmin)
admin.site.register(EvenementRemuneration, EvenementRemunerationAdmin)
+# import ipdb; ipdb.set_trace()
admin.site.register(Poste, PosteAdmin)
-<<<<<<< HEAD
-admin.site.register(PosteFinancement, PosteFinancementAdmin)
-admin.site.register(Remuneration, RemunerationAdmin)
-=======
admin.site.register(Remuneration, RemunerationAdmin)
admin.site.register(ValeurPoint, ValeurPointAdmin)
admin.site.register(TauxChange, TauxChangeAdmin)
->>>>>>> dev
from rh.lib import *
-
-class CommentaireAdmin(admin.ModelAdmin):
- pass
-
-
-class PosteAdmin(admin.ModelAdmin):
- fieldsets = (
- (None, {
- 'fields': ('nom', 'nom_feminin', 'implantation', 'type_poste',
- 'service', 'responsable')
- }),
- ('Contrat', {
- 'fields': ('regime_travail', 'regime_travail_nb_heure_semaine')
- }),
- ('Recrutement', {
- 'fields': ('local', 'expatrie', 'mise_a_disposition', 'appel')
- }),
- ('Rémunération', {
- 'fields': ('classement_min', 'classement_max', 'valeur_point_min',
- 'valeur_point_max', 'devise_min', 'devise_max',
- 'salaire_min', 'salaire_max', 'indemn_min',
- 'indemn_max', 'autre_min', 'autre_max')
- }),
- ('Comparatifs de rémunération', {
- 'fields': ('devise_comparaison', 'comp_locale_min',
- 'comp_locale_max', 'comp_universite_min',
- 'comp_universite_max', 'comp_fonctionpub_min',
- 'comp_fonctionpub_max', 'comp_ong_min', 'comp_ong_max',
- 'comp_autre_min', 'comp_autre_max')
- }),
- ('Justification', {
- 'fields': ('justification',)
- }),
- ('Autres Metadata', {
- 'fields': ('date_validation', 'date_debut', 'date_fin')
- }),
- )
-
-
-class PosteFinancementAdmin(admin.ModelAdmin):
- pass
-
-class PostePieceAdmin(admin.ModelAdmin):
- pass
-
-class PosteCommentaireAdmin(admin.ModelAdmin):
- pass
-
-class EmployeAdmin(admin.ModelAdmin):
- pass
-
-class EmployePieceAdmin(admin.ModelAdmin):
- pass
-
-class EmployeCommentaireAdmin(admin.ModelAdmin):
- pass
-
-class AyantDroitAdmin(admin.ModelAdmin):
- pass
-
-class AyantDroitCommentaireAdmin(admin.ModelAdmin):
- pass
-
-class DossierAdmin(admin.ModelAdmin):
- list_display = ('_employe', '_poste')
-
- def _poste(self, dossier):
- return unicode(dossier.poste.nom)
- _poste.short_description = u'Poste'
-
- def _employe(self, dossier):
- return unicode(dossier.employe)
- _employe.short_description = u'Employé'
-
-class DossierPieceAdmin(admin.ModelAdmin):
- pass
-
-class DossierCommentaireAdmin(admin.ModelAdmin):
- pass
-
-class RemunerationAdmin(admin.ModelAdmin):
- pass
-
-class ContratAdmin(admin.ModelAdmin):
- pass
-
-class EvenementAdmin(admin.ModelAdmin):
- pass
-
-class EvenementRemunerationAdmin(admin.ModelAdmin):
- pass
-
-class FamilleEmploiAdmin(admin.ModelAdmin):
- pass
-
-class TypePosteAdmin(admin.ModelAdmin):
- pass
-
-class TypeRemunerationAdmin(admin.ModelAdmin):
- pass
-
-class TypeRevalorisationAdmin(admin.ModelAdmin):
- pass
-
-class ServiceAdmin(admin.ModelAdmin):
- pass
-
-class OrganismeBstgAdmin(admin.ModelAdmin):
- pass
-
-class StatutAdmin(admin.ModelAdmin):
- pass
-
-class ClassementAdmin(admin.ModelAdmin):
- pass
-
-class TauxChangeAdmin(admin.ModelAdmin):
- pass
-
-class ValeurPointAdmin(admin.ModelAdmin):
- pass
-
-class DeviseAdmin(admin.ModelAdmin):
- pass
-
-class TypeContratAdmin(admin.ModelAdmin):
- pass
-
-class ResponsableImplantationAdmin(admin.ModelAdmin):
- pass
-
-
#admin.site.register(Commentaire, CommentaireAdmin)
admin.site.register(Poste, PosteAdmin)
#admin.site.register(PosteFinancement, PosteFinancementAdmin)
class PosteFinancementAdmin(admin.ModelAdmin):
pass
+
class PostePieceAdmin(admin.ModelAdmin):
pass
+
class PosteCommentaireAdmin(admin.ModelAdmin):
pass
+
class EmployeAdmin(admin.ModelAdmin):
pass
+
class EmployePieceAdmin(admin.ModelAdmin):
pass
+
class EmployeCommentaireAdmin(admin.ModelAdmin):
pass
+
class AyantDroitAdmin(admin.ModelAdmin):
pass
+
class AyantDroitCommentaireAdmin(admin.ModelAdmin):
pass
+
class DossierAdmin(admin.ModelAdmin):
- pass
+ list_display = ('_employe', '_poste')
+
+ def _poste(self, dossier):
+ return unicode(dossier.poste.nom)
+ _poste.short_description = u'Poste'
+
+ def _employe(self, dossier):
+ return unicode(dossier.employe)
+ _employe.short_description = u'Employé'
+
class DossierPieceAdmin(admin.ModelAdmin):
pass
+
class DossierCommentaireAdmin(admin.ModelAdmin):
pass
+
class RemunerationAdmin(admin.ModelAdmin):
pass
+
class ContratAdmin(admin.ModelAdmin):
pass
+
class EvenementAdmin(admin.ModelAdmin):
pass
+
class EvenementRemunerationAdmin(admin.ModelAdmin):
pass
+
class FamilleEmploiAdmin(admin.ModelAdmin):
pass
+
class TypePosteAdmin(admin.ModelAdmin):
pass
+
class TypeRemunerationAdmin(admin.ModelAdmin):
pass
+
class TypeRevalorisationAdmin(admin.ModelAdmin):
pass
+
class ServiceAdmin(admin.ModelAdmin):
pass
+
class OrganismeBstgAdmin(admin.ModelAdmin):
pass
+
class StatutAdmin(admin.ModelAdmin):
pass
+
class ClassementAdmin(admin.ModelAdmin):
pass
+
class TauxChangeAdmin(admin.ModelAdmin):
pass
+
class ValeurPointAdmin(admin.ModelAdmin):
pass
+
class DeviseAdmin(admin.ModelAdmin):
pass
+
class TypeContratAdmin(admin.ModelAdmin):
pass
+
+
+class ResponsableImplantationAdmin(admin.ModelAdmin):
+ pass