diff --git a/Reskreen/settings.py b/Reskreen/settings.py index cc62fef..c534d20 100644 --- a/Reskreen/settings.py +++ b/Reskreen/settings.py @@ -42,8 +42,8 @@ INSTALLED_APPS = [ 'vehicles.apps.VehiclesConfig', 'collabs.apps.CollabsConfig', 'rangefilter', - - + + ] MIDDLEWARE = [ @@ -81,7 +81,7 @@ WSGI_APPLICATION = 'Reskreen.wsgi.application' # https://docs.djangoproject.com/en/4.0/ref/settings/#databases - +""" DATABASES = { 'default': { 'ENGINE': 'django.db.backends.sqlite3', @@ -97,7 +97,7 @@ DATABASES = { }, } } -""" + # Password validation # https://docs.djangoproject.com/en/4.0/ref/settings/#auth-password-validators @@ -223,8 +223,8 @@ JAZZMIN_SETTINGS = { # Custom links to append to app groups, keyed on app name "custom_links": { "books": [{ - "name": "Make Messages", - "url": "make_messages", + "name": "Make Messages", + "url": "make_messages", "icon": "fas fa-comments", "permissions": ["books.view_book"] }] diff --git a/collabs/migrations/0001_initial.py b/collabs/migrations/0001_initial.py index 716e957..4ab29de 100644 --- a/collabs/migrations/0001_initial.py +++ b/collabs/migrations/0001_initial.py @@ -1,6 +1,8 @@ -# Generated by Django 4.0 on 2022-01-31 15:05 +# Generated by Django 4.0 on 2022-03-06 19:55 +import django.core.validators from django.db import migrations, models +import django.db.models.deletion class Migration(migrations.Migration): @@ -8,6 +10,7 @@ class Migration(migrations.Migration): initial = True dependencies = [ + ('auth', '0012_alter_user_first_name_max_length'), ] operations = [ @@ -15,14 +18,21 @@ class Migration(migrations.Migration): name='Collabs_hour', fields=[ ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('userName', models.CharField(max_length=100, verbose_name="Nom d'utilisateur")), - ('collab', models.CharField(max_length=10, verbose_name='Collaborateur')), - ('nHour', models.IntegerField(default=0, verbose_name='Heure')), - ('nMinutes', models.IntegerField(default=0, verbose_name='Minutes')), - ('sRemarques', models.TextField(verbose_name='Remarques')), - ('bNoticed', models.BooleanField(default=0, verbose_name='Pris en compte')), + ('userName', models.CharField(max_length=100, verbose_name='Auteur')), + ('nHour', models.PositiveIntegerField(default=0, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(23)], verbose_name='Heures')), + ('nMinutes', models.PositiveIntegerField(default=0, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(60)], verbose_name='Minutes')), + ('sRemarques', models.TextField(blank=True, verbose_name='Remarques')), + ('bNoticed', models.BooleanField(blank=True, default=False, verbose_name='Vérifiée')), + ('dtDate', models.DateField(verbose_name='Date')), + ('sBases', models.CharField(choices=[('1', 'Monthey'), ('2', 'Uvrier')], default=1, max_length=1, verbose_name='Employé de la base de')), ('dtUpdate', models.DateTimeField(auto_now=True, verbose_name='Date de modification')), - ('dtCreated', models.DateTimeField(auto_now_add=True)), + ('dtCreated', models.DateTimeField(auto_now_add=True, verbose_name='Date de création')), + ('user', models.ForeignKey(default=0, on_delete=django.db.models.deletion.DO_NOTHING, to='auth.user', verbose_name='Collaborateur')), ], + options={ + 'verbose_name': 'heure suplémentaire', + 'verbose_name_plural': 'heures suplémentaires', + 'permissions': (('can_notice', 'Peut noter comme traitée'),), + }, ), ] diff --git a/collabs/migrations_dev/0001_initial.py b/collabs/migrations_dev/0001_initial.py new file mode 100644 index 0000000..716e957 --- /dev/null +++ b/collabs/migrations_dev/0001_initial.py @@ -0,0 +1,28 @@ +# Generated by Django 4.0 on 2022-01-31 15:05 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ] + + operations = [ + migrations.CreateModel( + name='Collabs_hour', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('userName', models.CharField(max_length=100, verbose_name="Nom d'utilisateur")), + ('collab', models.CharField(max_length=10, verbose_name='Collaborateur')), + ('nHour', models.IntegerField(default=0, verbose_name='Heure')), + ('nMinutes', models.IntegerField(default=0, verbose_name='Minutes')), + ('sRemarques', models.TextField(verbose_name='Remarques')), + ('bNoticed', models.BooleanField(default=0, verbose_name='Pris en compte')), + ('dtUpdate', models.DateTimeField(auto_now=True, verbose_name='Date de modification')), + ('dtCreated', models.DateTimeField(auto_now_add=True)), + ], + ), + ] diff --git a/collabs/migrations/0002_collabs_hour_user.py b/collabs/migrations_dev/0002_collabs_hour_user.py similarity index 78% rename from collabs/migrations/0002_collabs_hour_user.py rename to collabs/migrations_dev/0002_collabs_hour_user.py index 6cc6eed..19cf3ba 100644 --- a/collabs/migrations/0002_collabs_hour_user.py +++ b/collabs/migrations_dev/0002_collabs_hour_user.py @@ -15,6 +15,6 @@ class Migration(migrations.Migration): migrations.AddField( model_name='collabs_hour', name='user', - field=models.ForeignKey(default=0, on_delete=django.db.models.deletion.DO_NOTHING, to='auth.user'), + field=models.ForeignKey( on_delete=django.db.models.deletion.DO_NOTHING, to='auth.user'), ), ] diff --git a/collabs/migrations/0003_remove_collabs_hour_collab.py b/collabs/migrations_dev/0003_remove_collabs_hour_collab.py similarity index 100% rename from collabs/migrations/0003_remove_collabs_hour_collab.py rename to collabs/migrations_dev/0003_remove_collabs_hour_collab.py diff --git a/collabs/migrations/0004_rename_user_collabs_hour_collaborateur.py b/collabs/migrations_dev/0004_rename_user_collabs_hour_collaborateur.py similarity index 100% rename from collabs/migrations/0004_rename_user_collabs_hour_collaborateur.py rename to collabs/migrations_dev/0004_rename_user_collabs_hour_collaborateur.py diff --git a/collabs/migrations/0005_remove_collabs_hour_collaborateur_collabs_hour_user.py b/collabs/migrations_dev/0005_remove_collabs_hour_collaborateur_collabs_hour_user.py similarity index 80% rename from collabs/migrations/0005_remove_collabs_hour_collaborateur_collabs_hour_user.py rename to collabs/migrations_dev/0005_remove_collabs_hour_collaborateur_collabs_hour_user.py index 413fc84..691422d 100644 --- a/collabs/migrations/0005_remove_collabs_hour_collaborateur_collabs_hour_user.py +++ b/collabs/migrations_dev/0005_remove_collabs_hour_collaborateur_collabs_hour_user.py @@ -19,6 +19,6 @@ class Migration(migrations.Migration): migrations.AddField( model_name='collabs_hour', name='user', - field=models.ForeignKey(default=0, on_delete=django.db.models.deletion.DO_NOTHING, to='auth.user', verbose_name='test'), + field=models.ForeignKey( on_delete=django.db.models.deletion.DO_NOTHING, to='auth.user', verbose_name='test'), ), ] diff --git a/collabs/migrations/0006_alter_collabs_hour_username.py b/collabs/migrations_dev/0006_alter_collabs_hour_username.py similarity index 100% rename from collabs/migrations/0006_alter_collabs_hour_username.py rename to collabs/migrations_dev/0006_alter_collabs_hour_username.py diff --git a/collabs/migrations/0007_rename_user_collabs_hour_collaborateur_and_more.py b/collabs/migrations_dev/0007_rename_user_collabs_hour_collaborateur_and_more.py similarity index 100% rename from collabs/migrations/0007_rename_user_collabs_hour_collaborateur_and_more.py rename to collabs/migrations_dev/0007_rename_user_collabs_hour_collaborateur_and_more.py diff --git a/collabs/migrations/0008_rename_collaborateur_collabs_hour_user.py b/collabs/migrations_dev/0008_rename_collaborateur_collabs_hour_user.py similarity index 100% rename from collabs/migrations/0008_rename_collaborateur_collabs_hour_user.py rename to collabs/migrations_dev/0008_rename_collaborateur_collabs_hour_user.py diff --git a/collabs/migrations/0009_alter_collabs_hour_dtcreated_and_more.py b/collabs/migrations_dev/0009_alter_collabs_hour_dtcreated_and_more.py similarity index 100% rename from collabs/migrations/0009_alter_collabs_hour_dtcreated_and_more.py rename to collabs/migrations_dev/0009_alter_collabs_hour_dtcreated_and_more.py diff --git a/collabs/migrations/0010_alter_collabs_hour_bnoticed.py b/collabs/migrations_dev/0010_alter_collabs_hour_bnoticed.py similarity index 100% rename from collabs/migrations/0010_alter_collabs_hour_bnoticed.py rename to collabs/migrations_dev/0010_alter_collabs_hour_bnoticed.py diff --git a/collabs/migrations/0011_alter_collabs_hour_options_alter_collabs_hour_nhour.py b/collabs/migrations_dev/0011_alter_collabs_hour_options_alter_collabs_hour_nhour.py similarity index 100% rename from collabs/migrations/0011_alter_collabs_hour_options_alter_collabs_hour_nhour.py rename to collabs/migrations_dev/0011_alter_collabs_hour_options_alter_collabs_hour_nhour.py diff --git a/collabs/migrations/0012_collabs_hour_dtdate_alter_collabs_hour_bnoticed.py b/collabs/migrations_dev/0012_collabs_hour_dtdate_alter_collabs_hour_bnoticed.py similarity index 100% rename from collabs/migrations/0012_collabs_hour_dtdate_alter_collabs_hour_bnoticed.py rename to collabs/migrations_dev/0012_collabs_hour_dtdate_alter_collabs_hour_bnoticed.py diff --git a/collabs/migrations/0013_alter_collabs_hour_dtdate.py b/collabs/migrations_dev/0013_alter_collabs_hour_dtdate.py similarity index 100% rename from collabs/migrations/0013_alter_collabs_hour_dtdate.py rename to collabs/migrations_dev/0013_alter_collabs_hour_dtdate.py diff --git a/collabs/migrations/0014_alter_collabs_hour_dtdate.py b/collabs/migrations_dev/0014_alter_collabs_hour_dtdate.py similarity index 100% rename from collabs/migrations/0014_alter_collabs_hour_dtdate.py rename to collabs/migrations_dev/0014_alter_collabs_hour_dtdate.py diff --git a/collabs/migrations/0015_alter_collabs_hour_dtdate_and_more.py b/collabs/migrations_dev/0015_alter_collabs_hour_dtdate_and_more.py similarity index 100% rename from collabs/migrations/0015_alter_collabs_hour_dtdate_and_more.py rename to collabs/migrations_dev/0015_alter_collabs_hour_dtdate_and_more.py diff --git a/collabs/migrations/0016_collabs_hour_sbases.py b/collabs/migrations_dev/0016_collabs_hour_sbases.py similarity index 100% rename from collabs/migrations/0016_collabs_hour_sbases.py rename to collabs/migrations_dev/0016_collabs_hour_sbases.py diff --git a/collabs/migrations_dev/0017_alter_collabs_hour_options.py b/collabs/migrations_dev/0017_alter_collabs_hour_options.py new file mode 100644 index 0000000..df4c2db --- /dev/null +++ b/collabs/migrations_dev/0017_alter_collabs_hour_options.py @@ -0,0 +1,17 @@ +# Generated by Django 4.0 on 2022-03-06 19:48 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('collabs', '0016_collabs_hour_sbases'), + ] + + operations = [ + migrations.AlterModelOptions( + name='collabs_hour', + options={'permissions': (('can_notice', 'Peut noter comme traitée'),), 'verbose_name': 'heure suplémentaire', 'verbose_name_plural': 'heures suplémentaires'}, + ), + ] diff --git a/collabs/migrations_dev/__init__.py b/collabs/migrations_dev/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/db.sqlite3 b/db.sqlite3 index cee4180..22d5252 100644 Binary files a/db.sqlite3 and b/db.sqlite3 differ diff --git a/my.cnf b/my.cnf index 70a4010..6777dcf 100644 --- a/my.cnf +++ b/my.cnf @@ -3,5 +3,5 @@ database = django_dev user = django_usr password = YwVHV36ovBTXWugb default-character-set = utf8 -host =192.168.3.113 -port =3306 \ No newline at end of file +host =localhost +port =3306