Some registries working :)

registry/admin.py

@@ -1,11 +1,102 @@
 # -*- coding: utf-8 -*-
+__LICENSE__ = u"""
+    This file is part of Hufrce Program.
+
+    Hufrce Program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    Hufrce Program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Hufrce Program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+    Ten plik jest częścią Hufrce Program.
+
+    Program Hufce jest wolnym oprogramowaniem; możesz go rozprowadzać dalej
+    i/lub modyfikować na warunkach Powszechnej Licencji Publicznej GNU,
+    wydanej przez Fundację Wolnego Oprogramowania - według wersji 2 tej
+    Licencji lub (według twojego wyboru) którejś z późniejszych wersji.
+
+    Niniejszy program rozpowszechniany jest z nadzieją, iż będzie on
+    użyteczny - jednak BEZ JAKIEJKOLWIEK GWARANCJI, nawet domyślnej
+    gwarancji PRZYDATNOŚCI HANDLOWEJ albo PRZYDATNOŚCI DO OKREŚLONYCH
+    ZASTOSOWAŃ. W celu uzyskania bliższych informacji sięgnij do
+    Powszechnej Licencji Publicznej GNU.
+
+    Z pewnością wraz z niniejszym programem otrzymałeś też egzemplarz
+    Powszechnej Licencji Publicznej GNU (GNU General Public License);
+    jeśli nie - napisz do Free Software Foundation, Inc., 59 Temple
+    Place, Fifth Floor, Boston, MA  02110-1301  USA
+"""
 __author__ = 'jb'
 
 from django.contrib import admin
 
 import models
 
-#class DictionaryAdmin(admin.ModelAdmin):
-#    pass
+import forms
+
+
+class ScoutBookAdmin(admin.ModelAdmin):
+    list_display = [
+        'id', 'name', 'surname', 'book_no', 'issue_date', 'troop', 'srodowisko'
+    ]
+    list_filter = [
+        'srodowisko', 'troop'
+    ]
+    search_fields = [
+        'name', 'surname', 'book_no', 'issue_date', 'troop__name', 'srodowisko__name'
+    ]
+
+
+class ScoutBookHistoryAdminInline(admin.TabularInline):
+    model = models.ScoutBookHistory
+    extra = 0
+    can_delete = False
+    max_num = 0
+    readonly_fields = [
+            'id', 'name', 'surname', 'book_no', 'issue_date', 'troop', 'srodowisko'
+    ]
+
+class ScoutBookRegistryAdmin(ScoutBookAdmin):
+    inlines = [ScoutBookHistoryAdminInline]
+    form = forms.ScoutForm
+
+
+class UprawkoHistoryInline(admin.TabularInline):
+    model = models.UprawnienieRegistryHistory
+    extra = 0
+    can_delete = False
+    max_num = 0
+    readonly_fields = [
+        'id', 'name', 'surname', 'uprawnienie', 'rozkaz', 'srodowisko'
+    ]
+
+
+class UprawkoAdmin(admin.ModelAdmin):
+    list_display = [
+            'id', 'name', 'surname', 'uprawnienie', 'rozkaz', 'srodowisko'
+    ]
+    list_filter = [
+        'uprawnienie', 'srodowisko', 'rozkaz'
+    ]
+    search_fields = [
+        'id', 'name', 'surname', 'uprawnienie__name', 'rozkaz', 'srodowisko__name'
+    ]
+    form = forms.UprawkoForm
+    inlines = [UprawkoHistoryInline]
+
+
 
 admin.site.register(models.Dictionary)
+
+#admin.site.register(models.ScoutBookHistoryAdminInline, ScoutBookAdmin)
+
+admin.site.register(models.ScoutBookRegistry, ScoutBookRegistryAdmin)
+
+admin.site.register(models.UprawnienieRegistry, UprawkoAdmin)

registry/forms.py

@@ -0,0 +1,32 @@
+# -*- coding: utf-8 -*-
+from django.db.models.query_utils import Q
+
+__author__ = 'jb'
+
+from django.forms import ChoiceField, ModelForm
+
+from django.db import models
+from models import Dictionary
+
+class DictionayModelForm(ModelForm):
+
+    def __init__(self, *largs, **kwargs):
+        super(DictionayModelForm, self).__init__(*largs, **kwargs)
+        if self.instance and self.instance.pk is not None:
+            for f in self.instance._meta.fields:
+                if isinstance(f, models.ForeignKey) and issubclass(f.rel.to, Dictionary):
+                    model_field = self.fields[f.name]
+                    value = getattr(self.instance, f.name, None)
+                    if value and value not in model_field.choices:
+                        model_field.queryset = Dictionary.objects.filter(Q(**f.rel.limit_choices_to) | Q(id = value.id))
+
+class ScoutForm(DictionayModelForm):
+    class Meta:
+        from models import ScoutBookRegistry
+        model = ScoutBookRegistry
+    pass
+
+class UprawkoForm(DictionayModelForm):
+    class Meta:
+        from models import UprawnienieRegistry
+        model = UprawnienieRegistry

registry/migrations/0002_auto__add_field_scoutbookhistory_lp__add_field_scoutbookregistry_lp__a.py

@@ -0,0 +1,67 @@
+# encoding: 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 'ScoutBookHistory.lp'
+        db.add_column('registry_scoutbookhistory', 'lp', self.gf('django.db.models.fields.PositiveSmallIntegerField')(null=True, blank=True), keep_default=False)
+
+        # Adding field 'ScoutBookRegistry.lp'
+        db.add_column('registry_scoutbookregistry', 'lp', self.gf('django.db.models.fields.PositiveSmallIntegerField')(null=True, blank=True), keep_default=False)
+
+        # Adding unique constraint on 'ScoutBookRegistry', fields ['book_no']
+        db.create_unique('registry_scoutbookregistry', ['book_no'])
+
+
+    def backwards(self, orm):
+
+        # Removing unique constraint on 'ScoutBookRegistry', fields ['book_no']
+        db.delete_unique('registry_scoutbookregistry', ['book_no'])
+
+        # Deleting field 'ScoutBookHistory.lp'
+        db.delete_column('registry_scoutbookhistory', 'lp')
+
+        # Deleting field 'ScoutBookRegistry.lp'
+        db.delete_column('registry_scoutbookregistry', 'lp')
+
+
+    models = {
+        'registry.dictionary': {
+            'Meta': {'object_name': 'Dictionary'},
+            'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '250'}),
+            'type': ('django.db.models.fields.CharField', [], {'max_length': '250'})
+        },
+        'registry.scoutbookhistory': {
+            'Meta': {'object_name': 'ScoutBookHistory'},
+            'book_no': ('django.db.models.fields.CharField', [], {'max_length': '250'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'issue_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'lp': ('django.db.models.fields.PositiveSmallIntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '250'}),
+            'parent_instance': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'history'", 'to': "orm['registry.ScoutBookRegistry']"}),
+            'save_date': ('django.db.models.fields.DateField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'srodowisko': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['registry.Dictionary']"}),
+            'surname': ('django.db.models.fields.CharField', [], {'max_length': '250'}),
+            'troop': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['registry.Dictionary']"})
+        },
+        'registry.scoutbookregistry': {
+            'Meta': {'unique_together': "(('book_no',),)", 'object_name': 'ScoutBookRegistry'},
+            'book_no': ('django.db.models.fields.CharField', [], {'max_length': '250'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'issue_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'lp': ('django.db.models.fields.PositiveSmallIntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '250'}),
+            'srodowisko': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['registry.Dictionary']"}),
+            'surname': ('django.db.models.fields.CharField', [], {'max_length': '250'}),
+            'troop': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['registry.Dictionary']"})
+        }
+    }
+
+    complete_apps = ['registry']

registry/migrations/0003_auto__del_field_scoutbookhistory_lp__del_field_scoutbookregistry_lp.py

@@ -0,0 +1,59 @@
+# encoding: 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):
+
+        # Deleting field 'ScoutBookHistory.lp'
+        db.delete_column('registry_scoutbookhistory', 'lp')
+
+        # Deleting field 'ScoutBookRegistry.lp'
+        db.delete_column('registry_scoutbookregistry', 'lp')
+
+
+    def backwards(self, orm):
+
+        # Adding field 'ScoutBookHistory.lp'
+        db.add_column('registry_scoutbookhistory', 'lp', self.gf('django.db.models.fields.PositiveSmallIntegerField')(null=True, blank=True), keep_default=False)
+
+        # Adding field 'ScoutBookRegistry.lp'
+        db.add_column('registry_scoutbookregistry', 'lp', self.gf('django.db.models.fields.PositiveSmallIntegerField')(null=True, blank=True), keep_default=False)
+
+
+    models = {
+        'registry.dictionary': {
+            'Meta': {'object_name': 'Dictionary'},
+            'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '250'}),
+            'type': ('django.db.models.fields.CharField', [], {'max_length': '250'})
+        },
+        'registry.scoutbookhistory': {
+            'Meta': {'object_name': 'ScoutBookHistory'},
+            'book_no': ('django.db.models.fields.CharField', [], {'max_length': '250'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'issue_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '250'}),
+            'parent_instance': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'history'", 'to': "orm['registry.ScoutBookRegistry']"}),
+            'save_date': ('django.db.models.fields.DateField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'srodowisko': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['registry.Dictionary']"}),
+            'surname': ('django.db.models.fields.CharField', [], {'max_length': '250'}),
+            'troop': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['registry.Dictionary']"})
+        },
+        'registry.scoutbookregistry': {
+            'Meta': {'unique_together': "(('book_no',),)", 'object_name': 'ScoutBookRegistry'},
+            'book_no': ('django.db.models.fields.CharField', [], {'max_length': '250'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'issue_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '250'}),
+            'srodowisko': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['registry.Dictionary']"}),
+            'surname': ('django.db.models.fields.CharField', [], {'max_length': '250'}),
+            'troop': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['registry.Dictionary']"})
+        }
+    }
+
+    complete_apps = ['registry']

registry/migrations/0004_auto__add_uprawnienieregistryhistory__add_uprawnienieregistry.py

@@ -0,0 +1,97 @@
+# encoding: 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 model 'UprawnienieRegistryHistory'
+        db.create_table('registry_uprawnienieregistryhistory', (
+            ('save_date', self.gf('django.db.models.fields.DateField')(auto_now_add=True, blank=True)),
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('name', self.gf('django.db.models.fields.CharField')(max_length=250)),
+            ('surname', self.gf('django.db.models.fields.CharField')(max_length=250)),
+            ('uprawnienie', self.gf('django.db.models.fields.related.ForeignKey')(related_name='+', to=orm['registry.Dictionary'])),
+            ('rozkaz', self.gf('django.db.models.fields.CharField')(max_length=250)),
+            ('srodowisko', self.gf('django.db.models.fields.related.ForeignKey')(blank=True, related_name='+', null=True, to=orm['registry.Dictionary'])),
+            ('parent_instance', self.gf('django.db.models.fields.related.ForeignKey')(related_name='history', to=orm['registry.UprawnienieRegistry'])),
+        ))
+        db.send_create_signal('registry', ['UprawnienieRegistryHistory'])
+
+        # Adding model 'UprawnienieRegistry'
+        db.create_table('registry_uprawnienieregistry', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('name', self.gf('django.db.models.fields.CharField')(max_length=250)),
+            ('surname', self.gf('django.db.models.fields.CharField')(max_length=250)),
+            ('uprawnienie', self.gf('django.db.models.fields.related.ForeignKey')(related_name='+', to=orm['registry.Dictionary'])),
+            ('rozkaz', self.gf('django.db.models.fields.CharField')(max_length=250)),
+            ('srodowisko', self.gf('django.db.models.fields.related.ForeignKey')(blank=True, related_name='+', null=True, to=orm['registry.Dictionary'])),
+        ))
+        db.send_create_signal('registry', ['UprawnienieRegistry'])
+
+
+    def backwards(self, orm):
+
+        # Deleting model 'UprawnienieRegistryHistory'
+        db.delete_table('registry_uprawnienieregistryhistory')
+
+        # Deleting model 'UprawnienieRegistry'
+        db.delete_table('registry_uprawnienieregistry')
+
+
+    models = {
+        'registry.dictionary': {
+            'Meta': {'object_name': 'Dictionary'},
+            'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '250'}),
+            'type': ('django.db.models.fields.CharField', [], {'max_length': '250'})
+        },
+        'registry.scoutbookhistory': {
+            'Meta': {'object_name': 'ScoutBookHistory'},
+            'book_no': ('django.db.models.fields.CharField', [], {'max_length': '250'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'issue_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '250'}),
+            'parent_instance': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'history'", 'to': "orm['registry.ScoutBookRegistry']"}),
+            'save_date': ('django.db.models.fields.DateField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'srodowisko': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['registry.Dictionary']"}),
+            'surname': ('django.db.models.fields.CharField', [], {'max_length': '250'}),
+            'troop': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'null': 'True', 'to': "orm['registry.Dictionary']"})
+        },
+        'registry.scoutbookregistry': {
+            'Meta': {'unique_together': "(('book_no',),)", 'object_name': 'ScoutBookRegistry'},
+            'book_no': ('django.db.models.fields.CharField', [], {'max_length': '250'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'issue_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '250'}),
+            'srodowisko': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['registry.Dictionary']"}),
+            'surname': ('django.db.models.fields.CharField', [], {'max_length': '250'}),
+            'troop': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'null': 'True', 'to': "orm['registry.Dictionary']"})
+        },
+        'registry.uprawnienieregistry': {
+            'Meta': {'object_name': 'UprawnienieRegistry'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '250'}),
+            'rozkaz': ('django.db.models.fields.CharField', [], {'max_length': '250'}),
+            'srodowisko': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['registry.Dictionary']"}),
+            'surname': ('django.db.models.fields.CharField', [], {'max_length': '250'}),
+            'uprawnienie': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': "orm['registry.Dictionary']"})
+        },
+        'registry.uprawnienieregistryhistory': {
+            'Meta': {'object_name': 'UprawnienieRegistryHistory'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '250'}),
+            'parent_instance': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'history'", 'to': "orm['registry.UprawnienieRegistry']"}),
+            'rozkaz': ('django.db.models.fields.CharField', [], {'max_length': '250'}),
+            'save_date': ('django.db.models.fields.DateField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'srodowisko': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['registry.Dictionary']"}),
+            'surname': ('django.db.models.fields.CharField', [], {'max_length': '250'}),
+            'uprawnienie': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': "orm['registry.Dictionary']"})
+        }
+    }
+
+    complete_apps = ['registry']