diff --git a/gestion/migrations/0003_historicalpinte.py b/gestion/migrations/0003_historicalpinte.py new file mode 100644 index 0000000..243fc58 --- /dev/null +++ b/gestion/migrations/0003_historicalpinte.py @@ -0,0 +1,37 @@ +# Generated by Django 2.1 on 2018-12-21 20:51 + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion +import simple_history.models + + +class Migration(migrations.Migration): + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('gestion', '0002_pinte'), + ] + + operations = [ + migrations.CreateModel( + name='HistoricalPinte', + fields=[ + ('id', models.IntegerField(auto_created=True, blank=True, db_index=True, verbose_name='ID')), + ('last_update_date', models.DateTimeField(blank=True, editable=False)), + ('history_id', models.AutoField(primary_key=True, serialize=False)), + ('history_change_reason', models.CharField(max_length=100, null=True)), + ('history_date', models.DateTimeField()), + ('history_type', models.CharField(choices=[('+', 'Created'), ('~', 'Changed'), ('-', 'Deleted')], max_length=1)), + ('current_owner', models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to=settings.AUTH_USER_MODEL)), + ('history_user', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to=settings.AUTH_USER_MODEL)), + ('previous_owner', models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to=settings.AUTH_USER_MODEL)), + ], + options={ + 'verbose_name': 'historical pinte', + 'ordering': ('-history_date', '-history_id'), + 'get_latest_by': 'history_date', + }, + bases=(simple_history.models.HistoricalChanges, models.Model), + ), + ] diff --git a/gestion/models.py b/gestion/models.py index f69c16e..64a898e 100644 --- a/gestion/models.py +++ b/gestion/models.py @@ -233,3 +233,4 @@ class Pinte(models.Model): current_owner = models.ForeignKey(User, on_delete=models.PROTECT, null=True, default=None, related_name="pinte_owned_currently") previous_owner = models.ForeignKey(User, on_delete=models.PROTECT, null=True, default=None, related_name="pinte_owned_previously") last_update_date = models.DateTimeField(auto_now=True) + history = HistoricalRecords() diff --git a/preferences/migrations/0002_auto_20181221_2151.py b/preferences/migrations/0002_auto_20181221_2151.py new file mode 100644 index 0000000..f02f5f4 --- /dev/null +++ b/preferences/migrations/0002_auto_20181221_2151.py @@ -0,0 +1,23 @@ +# Generated by Django 2.1 on 2018-12-21 20:51 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('preferences', '0001_initial'), + ] + + operations = [ + migrations.AddField( + model_name='generalpreferences', + name='use_pinte_monitoring', + field=models.BooleanField(default=False), + ), + migrations.AddField( + model_name='historicalgeneralpreferences', + name='use_pinte_monitoring', + field=models.BooleanField(default=False), + ), + ] diff --git a/preferences/models.py b/preferences/models.py index 8f41f74..3bff4f1 100644 --- a/preferences/models.py +++ b/preferences/models.py @@ -30,6 +30,7 @@ class GeneralPreferences(models.Model): secretary = models.CharField(max_length=255, blank=True) brewer = models.CharField(max_length=255, blank=True) grocer = models.CharField(max_length=255, blank=True) + use_pinte_monitoring = models.BooleanField(default=False) history = HistoricalRecords() class Cotisation(models.Model): diff --git a/preferences/templates/preferences/general_preferences.html b/preferences/templates/preferences/general_preferences.html index 1addb98..06ac677 100644 --- a/preferences/templates/preferences/general_preferences.html +++ b/preferences/templates/preferences/general_preferences.html @@ -1,10 +1,11 @@ {% extends 'base.html' %} {% block entete %}Administration{% endblock %} -{% block nav %} +{% block navbar %} {% endblock %} @@ -75,6 +76,21 @@ {{form.brewer}} + + + +
+
+
+
+

Autre

+
+
+
+ {{form.use_pinte_monitoring}} + +
+