Nantes Université

Skip to content
Extraits de code Groupes Projets
Valider 472265d6 rédigé par Arthur MICHEL's avatar Arthur MICHEL
Parcourir les fichiers

Merge branch 'Retour_6' into 'prod' 

Retour 6

See merge request !8
parents 93a58dd5 e4cd41c5
Aucune branche associée trouvée
Aucune étiquette associée trouvée
1 requête de fusion!8Retour 6
Masquer les modifications d'espaces
En ligne Côte à côte
catalog/migrations/0017_auto_20230605_1620.py 0 → 100644
+ 49
− 0
Voir le fichier @ 472265d6
# Generated by Django 3.2.14 on 2023-06-05 14:20
import django.core.validators
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('catalog', '0016_auto_20230427_1708'),
]
operations = [
migrations.AddField(
model_name='resource',
name='is_working',
field=models.BooleanField(default=False),
),
migrations.AlterField(
model_name='annotation',
name='demonstration',
field=models.IntegerField(blank=True, default=3, validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(5)]),
),
migrations.AlterField(
model_name='annotation',
name='difficulty',
field=models.DecimalField(blank=True, decimal_places=2, default=50, max_digits=4, validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(100)]),
),
migrations.AlterField(
model_name='annotation',
name='experiment',
field=models.IntegerField(blank=True, default=3, validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(5)]),
),
migrations.AlterField(
model_name='annotation',
name='presentation',
field=models.IntegerField(blank=True, default=3, validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(5)]),
),
migrations.AlterField(
model_name='annotation',
name='questioning',
field=models.IntegerField(blank=True, default=3, validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(5)]),
),
migrations.AlterField(
model_name='annotation',
name='trialAndError',
field=models.IntegerField(blank=True, default=3, validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(5)]),
),
]
catalog/migrations/0018_auto_20230606_1459.py 0 → 100644
+ 48
− 0
Voir le fichier @ 472265d6
# Generated by Django 3.2.14 on 2023-06-06 12:59
import django.core.validators
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('catalog', '0017_auto_20230605_1620'),
]
operations = [
migrations.RemoveField(
model_name='resource',
name='is_working',
),
migrations.AlterField(
model_name='annotation',
name='demonstration',
field=models.IntegerField(blank=True, default=0, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(5)]),
),
migrations.AlterField(
model_name='annotation',
name='difficulty',
field=models.DecimalField(blank=True, decimal_places=2, default=0, max_digits=4, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(100)]),
),
migrations.AlterField(
model_name='annotation',
name='experiment',
field=models.IntegerField(blank=True, default=0, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(5)]),
),
migrations.AlterField(
model_name='annotation',
name='presentation',
field=models.IntegerField(blank=True, default=0, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(5)]),
),
migrations.AlterField(
model_name='annotation',
name='questioning',
field=models.IntegerField(blank=True, default=0, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(5)]),
),
migrations.AlterField(
model_name='annotation',
name='trialAndError',
field=models.IntegerField(blank=True, default=0, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(5)]),
),
]
catalog/models.py
+ 12
− 12
Voir le fichier @ 472265d6
......@@ -236,13 +236,13 @@ class Annotation(models.Model):
blank=True
)
difficulty = models.DecimalField(
default=50,
default=0,
null=False,
blank=True,
max_digits=4,
decimal_places=2,
validators=[
MinValueValidator(1),
MinValueValidator(0),
MaxValueValidator(100)
]
)
......@@ -254,46 +254,46 @@ class Annotation(models.Model):
)
presentation = models.IntegerField(
null=False,
default=3,
default=0,
blank=True,
validators=[
MinValueValidator(1),
MinValueValidator(0),
MaxValueValidator(5)
]
)
demonstration = models.IntegerField(
null=False,
default=3,
default=0,
blank=True,
validators=[
MinValueValidator(1),
MinValueValidator(0),
MaxValueValidator(5)
]
)
questioning = models.IntegerField(
null=False,
default=3,
default=0,
blank=True,
validators=[
MinValueValidator(1),
MinValueValidator(0),
MaxValueValidator(5)
]
)
trialAndError = models.IntegerField(
null=False,
default=3,
default=0,
blank=True,
validators=[
MinValueValidator(1),
MinValueValidator(0),
MaxValueValidator(5)
]
)
experiment = models.IntegerField(
null=False,
default=3,
default=0,
blank=True,
validators=[
MinValueValidator(1),
MinValueValidator(0),
MaxValueValidator(5)
]
)
......
catalog/templates/catalog/base.html
+ 2
− 1
Voir le fichier @ 472265d6
......@@ -73,8 +73,9 @@
const expires = new Date(Date.now() + days * 864e5).toUTCString()
document.cookie = name + '=' + encodeURIComponent(value) + '; expires=' + expires + '; path=' + path
}
function go_annotate(resourceId, url, hashtag, i) {
function go_annotate(resourceId, ressourceTitle, url, hashtag, i) {
setCookie('ressourceid', resourceId);
setCookie('ressourcetitle', ressourceTitle)
if (clipboard_buffer[clipboard_buffer.length - 1] != hashtag){
copy(hashtag)
}
......
catalog/templates/customtags/reviews_cards.html
+ 3
− 2
Voir le fichier @ 472265d6
......@@ -65,8 +65,9 @@
</div>
<div class="row">
<div class="col">
<a type="button" onclick="go_annotate('{{ review.resource.id }}','{{ review.resource.entry_point }}',
'{{ review.review_tag }}', '{{ forloop.counter }}')" class="btn btn-secondary btn-block">C'est parti !</a>
<a type="button"
onclick="go_annotate('{{ review.resource.id }}','{{ review.resource.title}}',
'{{ review.resource.entry_point }}','{{ review.review_tag }}', '{{ forloop.counter }}')" class="btn btn-secondary btn-block">C'est parti !</a>
</div>
<div class="col">
{% if review.is_done %}
......
catalog/views.py
+ 0
− 5
Voir le fichier @ 472265d6
......@@ -134,11 +134,6 @@ def instructions(request):
context={"is_expert": request.user.is_authenticated and request.user.is_expert()})
# def detail(request, subject_id):
# subject = get_object_or_404(Subject, pk=subject_id)
# return render(request, 'catalog/detail.html', {'subject': subject})
def signup(request):
if request.method == 'POST':
form = forms.SignupForm(request.POST)
......
0% ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter