avancé de dev
This commit is contained in:
0
collabs/__init__.py
Normal file
0
collabs/__init__.py
Normal file
43
collabs/admin.py
Normal file
43
collabs/admin.py
Normal file
@@ -0,0 +1,43 @@
|
||||
from django.contrib import admin
|
||||
|
||||
from collabs.models import Collabs_hour
|
||||
|
||||
|
||||
from django import forms
|
||||
|
||||
|
||||
class Collabs_hour_Form_admin(forms.ModelForm):
|
||||
class Meta:
|
||||
model = Collabs_hour
|
||||
fields = ["user", "sRemarques", "bNoticed"]
|
||||
readonly_fields = ["user", "nHour", "nMinutes"]
|
||||
|
||||
|
||||
|
||||
class Collabs_hour_Admin(admin.ModelAdmin):
|
||||
list_display = ('user','dtCreated','bNoticed')
|
||||
list_editable = ['bNoticed']
|
||||
list_filter = ['dtCreated']
|
||||
search_fields = ['userName']
|
||||
readonly_fields = ['userName']
|
||||
|
||||
fields = ["user","nHour", "nMinutes", "sRemarques"]
|
||||
|
||||
def get_form(self, request, obj=None, **kwargs):
|
||||
#if request.user.has_perm("collabs.can_notice"):
|
||||
if request.user.is_superuser:
|
||||
kwargs['form'] = Collabs_hour_Form_admin # ModelForm
|
||||
print("PASS SUPERUSER")
|
||||
|
||||
return super().get_form(request, obj, **kwargs)
|
||||
|
||||
|
||||
|
||||
def save_model(self, request, obj, form, change):
|
||||
|
||||
|
||||
super().save_model(request, obj, form, change)
|
||||
|
||||
|
||||
admin.site.register(Collabs_hour, Collabs_hour_Admin)
|
||||
#admin.site.register(Collabs_hour)
|
6
collabs/apps.py
Normal file
6
collabs/apps.py
Normal file
@@ -0,0 +1,6 @@
|
||||
from django.apps import AppConfig
|
||||
|
||||
|
||||
class CollabsConfig(AppConfig):
|
||||
default_auto_field = 'django.db.models.BigAutoField'
|
||||
name = 'collabs'
|
28
collabs/migrations/0001_initial.py
Normal file
28
collabs/migrations/0001_initial.py
Normal file
@@ -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)),
|
||||
],
|
||||
),
|
||||
]
|
20
collabs/migrations/0002_collabs_hour_user.py
Normal file
20
collabs/migrations/0002_collabs_hour_user.py
Normal file
@@ -0,0 +1,20 @@
|
||||
# Generated by Django 4.0 on 2022-01-31 15:13
|
||||
|
||||
from django.db import migrations, models
|
||||
import django.db.models.deletion
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('auth', '0012_alter_user_first_name_max_length'),
|
||||
('collabs', '0001_initial'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name='collabs_hour',
|
||||
name='user',
|
||||
field=models.ForeignKey(default=0, on_delete=django.db.models.deletion.DO_NOTHING, to='auth.user'),
|
||||
),
|
||||
]
|
17
collabs/migrations/0003_remove_collabs_hour_collab.py
Normal file
17
collabs/migrations/0003_remove_collabs_hour_collab.py
Normal file
@@ -0,0 +1,17 @@
|
||||
# Generated by Django 4.0 on 2022-01-31 17:11
|
||||
|
||||
from django.db import migrations
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('collabs', '0002_collabs_hour_user'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.RemoveField(
|
||||
model_name='collabs_hour',
|
||||
name='collab',
|
||||
),
|
||||
]
|
@@ -0,0 +1,18 @@
|
||||
# Generated by Django 4.0 on 2022-01-31 17:13
|
||||
|
||||
from django.db import migrations
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('collabs', '0003_remove_collabs_hour_collab'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.RenameField(
|
||||
model_name='collabs_hour',
|
||||
old_name='user',
|
||||
new_name='Collaborateur',
|
||||
),
|
||||
]
|
@@ -0,0 +1,24 @@
|
||||
# Generated by Django 4.0 on 2022-01-31 17:14
|
||||
|
||||
from django.db import migrations, models
|
||||
import django.db.models.deletion
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('auth', '0012_alter_user_first_name_max_length'),
|
||||
('collabs', '0004_rename_user_collabs_hour_collaborateur'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.RemoveField(
|
||||
model_name='collabs_hour',
|
||||
name='Collaborateur',
|
||||
),
|
||||
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'),
|
||||
),
|
||||
]
|
18
collabs/migrations/0006_alter_collabs_hour_username.py
Normal file
18
collabs/migrations/0006_alter_collabs_hour_username.py
Normal file
@@ -0,0 +1,18 @@
|
||||
# Generated by Django 4.0 on 2022-01-31 17:15
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('collabs', '0005_remove_collabs_hour_collaborateur_collabs_hour_user'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AlterField(
|
||||
model_name='collabs_hour',
|
||||
name='userName',
|
||||
field=models.CharField(max_length=100, verbose_name='auteur'),
|
||||
),
|
||||
]
|
@@ -0,0 +1,23 @@
|
||||
# Generated by Django 4.0 on 2022-01-31 17:16
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('collabs', '0006_alter_collabs_hour_username'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.RenameField(
|
||||
model_name='collabs_hour',
|
||||
old_name='user',
|
||||
new_name='Collaborateur',
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name='collabs_hour',
|
||||
name='userName',
|
||||
field=models.CharField(max_length=100, verbose_name='Auteur'),
|
||||
),
|
||||
]
|
@@ -0,0 +1,36 @@
|
||||
# Generated by Django 4.0 on 2022-01-31 17:28
|
||||
|
||||
import django.core.validators
|
||||
from django.db import migrations, models
|
||||
import django.db.models.deletion
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('auth', '0012_alter_user_first_name_max_length'),
|
||||
('collabs', '0008_rename_collaborateur_collabs_hour_user'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AlterField(
|
||||
model_name='collabs_hour',
|
||||
name='dtCreated',
|
||||
field=models.DateTimeField(auto_now_add=True, verbose_name='Date de création'),
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name='collabs_hour',
|
||||
name='nHour',
|
||||
field=models.PositiveIntegerField(default=0, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(23)], verbose_name='Heure'),
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name='collabs_hour',
|
||||
name='nMinutes',
|
||||
field=models.PositiveIntegerField(default=0, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(60)], verbose_name='Minutes'),
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name='collabs_hour',
|
||||
name='user',
|
||||
field=models.ForeignKey(default=0, on_delete=django.db.models.deletion.DO_NOTHING, to='auth.user', verbose_name='Collaborateur'),
|
||||
),
|
||||
]
|
18
collabs/migrations/0010_alter_collabs_hour_bnoticed.py
Normal file
18
collabs/migrations/0010_alter_collabs_hour_bnoticed.py
Normal file
@@ -0,0 +1,18 @@
|
||||
# Generated by Django 4.0 on 2022-01-31 17:44
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('collabs', '0009_alter_collabs_hour_dtcreated_and_more'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AlterField(
|
||||
model_name='collabs_hour',
|
||||
name='bNoticed',
|
||||
field=models.BooleanField(blank=True, verbose_name='Pris en compte'),
|
||||
),
|
||||
]
|
@@ -0,0 +1,23 @@
|
||||
# Generated by Django 4.0 on 2022-01-31 17:47
|
||||
|
||||
import django.core.validators
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('collabs', '0010_alter_collabs_hour_bnoticed'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AlterModelOptions(
|
||||
name='collabs_hour',
|
||||
options={'permissions': (('can_notice', 'Peut noter comme traitée'),)},
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name='collabs_hour',
|
||||
name='nHour',
|
||||
field=models.PositiveIntegerField(default=0, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(23)], verbose_name='Heures'),
|
||||
),
|
||||
]
|
0
collabs/migrations/__init__.py
Normal file
0
collabs/migrations/__init__.py
Normal file
24
collabs/models.py
Normal file
24
collabs/models.py
Normal file
@@ -0,0 +1,24 @@
|
||||
import datetime
|
||||
|
||||
from django.core.validators import MinValueValidator, MaxValueValidator
|
||||
from django.db import models
|
||||
from django.conf import settings
|
||||
from django.utils import timezone
|
||||
from django.contrib import admin
|
||||
|
||||
class Collabs_hour(models.Model):
|
||||
userName = models.CharField("Auteur", max_length=100)
|
||||
user = models.ForeignKey(settings.AUTH_USER_MODEL, verbose_name="Collaborateur", on_delete=models.DO_NOTHING, default=0)
|
||||
nHour = models.PositiveIntegerField("Heures", default=0, validators=[MinValueValidator(0), MaxValueValidator(23)])
|
||||
nMinutes = models.PositiveIntegerField("Minutes", default=0, validators=[MinValueValidator(0), MaxValueValidator(60)])
|
||||
sRemarques = models.TextField("Remarques")
|
||||
bNoticed = models.BooleanField("Pris en compte", blank=True)
|
||||
dtUpdate = models.DateTimeField('Date de modification', auto_now=True)
|
||||
dtCreated = models.DateTimeField('Date de création', auto_now_add=True)
|
||||
|
||||
class Meta:
|
||||
permissions = (
|
||||
("can_notice", "Peut noter comme traitée"),
|
||||
|
||||
)
|
||||
|
3
collabs/tests.py
Normal file
3
collabs/tests.py
Normal file
@@ -0,0 +1,3 @@
|
||||
from django.test import TestCase
|
||||
|
||||
# Create your tests here.
|
3
collabs/views.py
Normal file
3
collabs/views.py
Normal file
@@ -0,0 +1,3 @@
|
||||
from django.shortcuts import render
|
||||
|
||||
# Create your views here.
|
Reference in New Issue
Block a user