changement settings mysql

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"]
         }]

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'),),
+            },
         ),
     ]

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)),
+            ],
+        ),
+    ]

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'),
         ),
     ]

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'),
         ),
     ]

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'},
+        ),
+    ]

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
+host =localhost
+port =3306