extra = 4
-#class EvenementInline(AUFMetadataInlineAdminMixin, admin.TabularInline):
-# model = rh.Evenement
-# extra = 1
-
-
-#class EvenementRemunerationInline(AUFMetadataInlineAdminMixin, admin.TabularInline):
-# model = EvenementRemuneration
-# extra = 1
-
-#class EvenementAdmin(admin.ModelAdmin):
-# inlines = (EvenementRemunerationInline,)
-#
-#
-#class EvenementRemunerationAdmin(admin.ModelAdmin):
-# pass
-
-
class PosteCommentaireInline(AUFMetadataInlineAdminMixin, admin.TabularInline):
readonly_fields = ('owner', )
model = rh.PosteCommentaire
class ClassementAdmin(AUFMetadataAdminMixin, admin.ModelAdmin):
+ list_display = ('_classement', 'date_modification', 'user_modification', )
fieldsets = AUFMetadataAdminMixin.fieldsets + (
(None, {
'fields': ('type', 'echelon', 'degre', 'coefficient', )
}),
)
+ def _classement(self, obj):
+ return unicode(obj)
+ _classement.short_description = u"Classement"
class CommentaireAdmin(admin.ModelAdmin):
pass
-#class ContratAdmin(AUFMetadataAdminMixin, admin.ModelAdmin):
-# form = ContratForm
-# alphabet_filter = 'dossier__employe__nom'
-# search_fields = ('dossier__employe__nom', 'dossier__employe__prenom', 'dossier__poste__nom', 'dossier__poste__nom_feminin', )
-# list_display = ('id', '_employe', '_poste', 'date_debut', 'date_fin', '_implantation', )
-# fieldsets = AUFMetadataAdminMixin.fieldsets + (
-# (None, {
-# 'fields': ('dossier', 'type_contrat', 'date_debut', 'date_fin', )
-# }),
-# )
-#
-# def lookup_allowed(self, key, value):
-# if key in ('dossier__employe__nom__istartswith', ):
-# return True
-#
-# def _employe(self, obj):
-# return unicode(obj.dossier.employe)
-# _employe.short_description = "Employé"
-#
-# def _poste(self, obj):
-# return obj.dossier.poste.nom
-# _poste.short_description = "Poste"
-#
-# def _implantation(self, obj):
-# return obj.dossier.poste.implantation
-# _poste.short_description = "Implantation"
-
class DeviseAdmin(AUFMetadataAdminMixin, admin.ModelAdmin):
+ list_display = ('code', 'nom', 'date_modification', 'user_modification', 'actif', )
fieldsets = AUFMetadataAdminMixin.fieldsets + (
(None, {
'fields': ('code', 'nom', ),
'_date_debut',
'_date_fin',
'date_modification',
+ 'user_modification',
'actif',
)
list_filter = (
)
inlines = (DossierPieceInline, ContratInline,
RemunerationInline,
- #EvenementInline,
DossierCommentaireInline,
)
fieldsets = AUFMetadataAdminMixin.fieldsets + (
class FamilleEmploiAdmin(AUFMetadataAdminMixin, admin.ModelAdmin):
+ list_display = ('nom', 'date_modification', 'user_modification', 'actif', )
inlines = (TypePosteInline,)
fieldsets = AUFMetadataAdminMixin.fieldsets + (
(None, {
class OrganismeBstgAdmin(AUFMetadataAdminMixin, ProtectRegionMixin, admin.ModelAdmin):
- search_fields = ('nom', )
- list_display = ('nom', 'type', 'pays', )
+ search_fields = ('nom',)
+ list_display = ('nom', 'type', 'pays', 'date_modification', 'user_modification', 'actif', )
+ list_filter = ('type', )
inlines = (DossierROInline,)
fieldsets = AUFMetadataAdminMixin.fieldsets + (
(None, {
'_nom',
'_occupe_par',
'implantation',
- 'service',
+ '_service',
'date_debut',
'date_fin',
'date_modification',
DossierROInline,
PosteCommentaireInline, )
+
+ def _service(self, obj):
+ return obj.service
def _nom(self, poste):
link = u"""<a onclick="return showAddAnotherPopup(this);" href='%s'>%s</a> <a href="%s" title="Modifier le poste"><img src="%simg/page_edit.png" /></a>""" % \
class ServiceAdmin(AUFMetadataAdminMixin, admin.ModelAdmin):
- list_display = ('nom', 'actif', )
+ list_display = ('nom', 'date_modification', 'user_modification', 'actif', )
fieldsets = AUFMetadataAdminMixin.fieldsets + (
(None, {
'fields': ('nom', ),
)
class StatutAdmin(AUFMetadataAdminMixin, admin.ModelAdmin):
+ list_display = ('code', 'nom', 'date_modification', 'user_modification', 'actif', )
fieldsets = AUFMetadataAdminMixin.fieldsets + (
(None, {
'fields': ('code', 'nom', ),
)
class TauxChangeAdmin(admin.ModelAdmin):
- list_display = ('taux', 'devise', 'annee', )
+ list_display = ('taux', 'devise', 'annee', 'date_modification', 'user_modification', )
list_filter = ('devise', )
fieldsets = AUFMetadataAdminMixin.fieldsets + (
(None, {
)
class TypeContratAdmin(admin.ModelAdmin):
+ list_display = ('nom', 'nom_long', 'date_modification', 'user_modification', 'actif', )
fieldsets = AUFMetadataAdminMixin.fieldsets + (
(None, {
'fields': ('nom', 'nom_long', ),
class TypePosteAdmin(AUFMetadataAdminMixin, admin.ModelAdmin):
search_fields = ('nom', 'nom_feminin', )
- list_display = ('nom', 'famille_emploi', )
+ list_display = ('nom', 'famille_emploi', 'date_modification', 'user_modification', 'actif', )
list_filter = ('famille_emploi', )
fieldsets = AUFMetadataAdminMixin.fieldsets + (
(None, {
class TypeRemunerationAdmin(AUFMetadataAdminMixin, admin.ModelAdmin):
- list_display = ('nom', 'type_paiement', 'nature_remuneration', )
- #inlines = (RemunerationROInline,) utilité?
+ list_display = ('nom', 'type_paiement', 'nature_remuneration', 'date_modification', 'user_modification', 'actif', )
fieldsets = AUFMetadataAdminMixin.fieldsets + (
(None, {
'fields': ('nom', 'type_paiement', 'nature_remuneration', )
class TypeRevalorisationAdmin(AUFMetadataAdminMixin, admin.ModelAdmin):
- #inlines = (RemunerationROInline,) utilité?
+ list_display = ('nom', 'date_modification', 'user_modification', 'actif', )
fieldsets = AUFMetadataAdminMixin.fieldsets + (
(None, {
'fields': ('nom', )
class ValeurPointAdmin(AUFMetadataAdminMixin, admin.ModelAdmin):
- list_display = ('_devise_code', '_devise_nom', 'annee', 'valeur', )
+ list_display = ('_devise_code', '_devise_nom', 'annee', 'valeur', 'date_modification', 'user_modification', )
+ list_filter = ('annee', 'devise', )
fieldsets = AUFMetadataAdminMixin.fieldsets + (
(None, {
'fields': ('valeur', 'devise', 'implantation', 'annee', )
admin.site.register(rh.Poste, PosteAdmin)
admin.site.register(rh.ResponsableImplantation, ResponsableImplantationAdmin)
admin.site.register(rh.Service, ServiceAdmin)
-admin.site.register(rh.Statut, StatutAdmin) # FIXME: timeout in admin
+admin.site.register(rh.Statut, StatutAdmin)
admin.site.register(rh.TauxChange, TauxChangeAdmin)
-admin.site.register(rh.TypeContrat, TypeContratAdmin) # FIXME: timeout in admin
+admin.site.register(rh.TypeContrat, TypeContratAdmin)
admin.site.register(rh.TypePoste, TypePosteAdmin)
admin.site.register(rh.TypeRemuneration, TypeRemunerationAdmin)
admin.site.register(rh.TypeRevalorisation, TypeRevalorisationAdmin)