lilianrock/Generateurv2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://gittea.dev/Lilian937342/Generateur_v2

Browse Source
This commit is contained in:
root 2022-06-24 20:12:16 +02:00
commit 3b0a63aae8
21 changed files with 77 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/api/api/settings.py
View File

@ -177,7 +177,7 @@ USE_TZ = True
# Static files (CSS, JavaScript, Images) # Static files (CSS, JavaScript, Images)
# https://docs.djangoproject.com/en/4.0/howto/static-files/ # https://docs.djangoproject.com/en/4.0/howto/static-files/
STATIC_URL = 'static/' STATIC_URL = '/static/'
STATIC_ROOT = os.path.join(BASE_DIR, 'static') STATIC_ROOT = os.path.join(BASE_DIR, 'static')

2
backend/api/exercices/filters.py
View File

@ -24,6 +24,6 @@ class ExosFilter(django_filters.FilterSet):
withAllTags = list(filter(lambda t: all( withAllTags = list(filter(lambda t: all(
i in [t.id_code for t in t.tags.all()] for i in tags ), withT)) i in [t.id_code for t in t.tags.all()] for i in tags ), withT))
withAllTagsQ = parent.filter(id_code__in = [e.id_code for e in withAllTags]) withAllTagsQ = parent.filter(id_code__in = [e.id_code for e in withAllTags])
print('WIRHA', withAllTagsQ)
return withAllTagsQ.filter(name__icontains=search) return withAllTagsQ.filter(name__icontains=search)

12
backend/api/exercices/pdfmaker.py
View File

@ -40,16 +40,16 @@ def pdf_settings(path, number_in_serie, consigne):
def page_settings(exos): def page_settings(exos):
# print(exos) #
max = 100 max = 100
total = 10 + 3 + 8 total = 10 + 3 + 8
pages = [{'exos': [], 'index': 1, 'jump': 0}] pages = [{'exos': [], 'index': 1, 'jump': 0}]
page_num = 0 page_num = 0
for ex in list(map(lambda e: e['exos'], exos)): for ex in list(map(lambda e: e['exos'], exos)):
#print(ex) #
for e in ex: for e in ex:
if (total) + (len(e['exercice'][0])) <= max: if (total) + (len(e['exercice'][0])) <= max:
#print(total + len(e['exercice'][0]) + 2, #
#total + len(e['exercice'][0]) + 2 < max, e['index']) #total + len(e['exercice'][0]) + 2 < max, e['index'])
total += (len(e['exercice'][0]) * 2 * 2) + 4 + 3 total += (len(e['exercice'][0]) * 2 * 2) + 4 + 3
e['notLast'] = True e['notLast'] = True
@ -59,14 +59,14 @@ def page_settings(exos):
pages[page_num]['exos']) - 1]['notLast'] = False pages[page_num]['exos']) - 1]['notLast'] = False
rest = max - (total - 1) rest = max - (total - 1)
pages[page_num]['jump'] = rest pages[page_num]['jump'] = rest
#print('tot', pages[page_num]['jump']) #
id = pages[page_num]['index'] id = pages[page_num]['index']
page_num += 1 page_num += 1
pages.append({'exos': [], 'index': id + 1, 'jump': 0}) pages.append({'exos': [], 'index': id + 1, 'jump': 0})
pages[page_num]['exos'].append(e) pages[page_num]['exos'].append(e)
total = (len(e['exercice'][0]) * 2 * 2) + 4 + 10 + 3 + 3 + 8 total = (len(e['exercice'][0]) * 2 * 2) + 4 + 10 + 3 + 3 + 8
#print('pgages', len(pages)) #
pages[len(pages) - 1]['exos'][len(pages[len(pages) - 1] pages[len(pages) - 1]['exos'][len(pages[len(pages) - 1]
['exos']) - 1]['notLast'] = False ['exos']) - 1]['notLast'] = False
#print(list(map(lambda e:e['exos'],exos))) #
return pages return pages

2
backend/api/exercices/signals.py
View File

@ -17,7 +17,7 @@ def auto_delete_file_on_delete(sender, instance, **kwargs):
Deletes file from filesystem Deletes file from filesystem
when corresponding `MediaFile` object is deleted. when corresponding `MediaFile` object is deleted.
""" """
print(instance, instance.exo_model.path, instance.id_code)
if instance.exo_model: if instance.exo_model:
if os.path.isfile(instance.exo_model.path): if os.path.isfile(instance.exo_model.path):
os.remove(instance.exo_model.path) os.remove(instance.exo_model.path)

34
backend/api/exercices/views.py
View File

@ -70,7 +70,11 @@ class ExerciceAPI(APIView):
userExosListSorted = userExos userExosListSorted = userExos
if code != 'all' and code != 'pdf' and code != "web": if code != 'all' and code != 'pdf' and code != "web":
try:
exo = Exercice.objects.get(id_code=code) exo = Exercice.objects.get(id_code=code)
except:
return Response({'error': "Not found"}, status= status.HTTP_404_NOT_FOUND)
isUser = False isUser = False
if request.user == exo.author: if request.user == exo.author:
isUser = True isUser = True
@ -111,7 +115,7 @@ class ExerciceAPI(APIView):
# sleep(2) # sleep(2)
return Response({"status": "200", "errors": {}, "data": {**ExerciceSerializer(new_exo).data, "author": UserSerializer(new_exo.author).data if new_exo.author != None else None, 'exo_model': {'filename': new_exo.exo_model.name.split('/')[-1], "data": open(new_exo.exo_model.name, 'r').read()}, "tags": [{**TagSerializer(t).data, 'value': t.id_code, 'label': t.name} for t in new_exo.tags.all()]}}, status=status.HTTP_200_OK) return Response({"status": "200", "errors": {}, "data": {**ExerciceSerializer(new_exo).data, "author": UserSerializer(new_exo.author).data if new_exo.author != None else None, 'exo_model': {'filename': new_exo.exo_model.name.split('/')[-1], "data": open(new_exo.exo_model.name, 'r').read()}, "tags": [{**TagSerializer(t).data, 'value': t.id_code, 'label': t.name} for t in new_exo.tags.all()]}}, status=status.HTTP_200_OK)
print(create_serializer.errors, 'errs')
return Response({"status": "400", "errors": create_serializer.errors}, status=status.HTTP_400_BAD_REQUEST) return Response({"status": "400", "errors": create_serializer.errors}, status=status.HTTP_400_BAD_REQUEST)
@method_decorator(login_required) @method_decorator(login_required)
@ -241,7 +245,7 @@ def getExoModelFile(request):
return Response({'errors': 'Not found'}, status=status.HTTP_404_NOT_FOUND) return Response({'errors': 'Not found'}, status=status.HTTP_404_NOT_FOUND)
exo = exo[0] exo = exo[0]
model = exo.exo_model model = exo.exo_model
print(model.name)
with open(model.name, 'r') as f: with open(model.name, 'r') as f:
response = HttpResponse(f.read(), content_type='text/x-python') response = HttpResponse(f.read(), content_type='text/x-python')
@ -259,7 +263,7 @@ def fav(request):
originExo = exo[0] originExo = exo[0]
exo = exo[0] exo = exo[0]
with open(exo.exo_model.path, 'r') as f: with open(exo.exo_model.path, 'r') as f:
print(f.name.split('/')[-1])
exo.pk = None exo.pk = None
exo.id = None exo.id = None
exo.id_code = generate_unique_code_step() exo.id_code = generate_unique_code_step()
@ -291,7 +295,7 @@ class TagsAPI(APIView):
tagsList = [] tagsList = []
for o in options: for o in options:
# print(o) #
if o['value'].startswith('new_opt'): if o['value'].startswith('new_opt'):
newTag = Tag(name=o['label'], newTag = Tag(name=o['label'],
color=o['color'], user=request.user) color=o['color'], user=request.user)
@ -347,7 +351,7 @@ class Editor(APIView):
script.write(code) script.write(code)
proc = subprocess.Popen(['python3.10', 'tmp.py', ], proc = subprocess.Popen(['python3.10', 'tmp.py', ],
stdout=subprocess.PIPE, stderr=subprocess.PIPE, cwd=tempdir) stdout=subprocess.PIPE, stderr=subprocess.PIPE, cwd=tempdir)
print(open(os.path.join(tempdir, "tmp.py"), 'r').read())
out, err = proc.communicate() out, err = proc.communicate()
out = out.decode().splitlines() out = out.decode().splitlines()
return Response({"out": out, "error": err.decode('utf-8').splitlines()}, status=status.HTTP_200_OK) return Response({"out": out, "error": err.decode('utf-8').splitlines()}, status=status.HTTP_200_OK)
@ -382,7 +386,7 @@ def pdfGen(request):
for e in range(len(exos)): for e in range(len(exos)):
for exo in range(len(exos[e]['exos'])): for exo in range(len(exos[e]['exos'])):
# print(exos[e]['exos'][exo]) #
exos[e]['exos'][exo]['calcul'] = sympy.latex( exos[e]['exos'][exo]['calcul'] = sympy.latex(
exos[e]['exos'][exo]['calcul']) exos[e]['exos'][exo]['calcul'])
@ -447,11 +451,11 @@ def pdfGen(request):
fich_name = request.data.get('file') fich_name = request.data.get('file')
if fich_name.count('.') >= 1: if fich_name.count('.') >= 1:
ext = fich_name.split('.')[-1] ext = fich_name.split('.')[-1]
# print(ext) #
if ext == 'pdf': if ext == 'pdf':
fich_name = fich_name fich_name = fich_name
elif ext != 'pdf': elif ext != 'pdf':
# print('nipe') #
fich_name = fich_name.replace(f'.{ext}', '.pdf') fich_name = fich_name.replace(f'.{ext}', '.pdf')
else: else:
fich_name = fich_name + '.pdf' fich_name = fich_name + '.pdf'
@ -463,7 +467,7 @@ class PDF(APIView):
exos = list(map(lambda ex: pdf_settings( exos = list(map(lambda ex: pdf_settings(
Exercice.objects.filter(id_code=ex['id_code'])[0].exo_model.name, 14, int(ex['numberInExo']), int(ex['numberOfExo']), 1, ex['consigne']), request.data.get('exos'))) Exercice.objects.filter(id_code=ex['id_code'])[0].exo_model.name, 14, int(ex['numberInExo']), int(ex['numberOfExo']), 1, ex['consigne']), request.data.get('exos')))
# print(exos) #
# dans str mettre space(0.5) replace by \hspace{0.5cm} # dans str mettre space(0.5) replace by \hspace{0.5cm}
template_name = 'test.tex' template_name = 'test.tex'
symbols = { symbols = {
@ -475,7 +479,7 @@ class PDF(APIView):
# a refaire pour supp les symbols # a refaire pour supp les symbols
for e in range(len(exos)): for e in range(len(exos)):
for exo in range(len(exos[e]['exos'])): for exo in range(len(exos[e]['exos'])):
# print(exos[e]['exos'][exo]) #
exos[e]['exos'][exo]['calcul'] = sympy.latex( exos[e]['exos'][exo]['calcul'] = sympy.latex(
exos[e]['exos'][exo]['calcul']) exos[e]['exos'][exo]['calcul'])
@ -509,7 +513,7 @@ class PDF(APIView):
template = get_template('test.tex') template = get_template('test.tex')
latex = template.render(context) # latex to compile latex = template.render(context) # latex to compile
# print(latex) #
with tempfile.TemporaryDirectory() as tempdir: with tempfile.TemporaryDirectory() as tempdir:
direct = tempdir direct = tempdir
with open(os.path.join(direct, 'tmp.tex'), 'x', encoding='utf-8') as f: with open(os.path.join(direct, 'tmp.tex'), 'x', encoding='utf-8') as f:
@ -541,11 +545,11 @@ class PDF(APIView):
fich_name = request.data.get('file') fich_name = request.data.get('file')
if fich_name.count('.') >= 1: if fich_name.count('.') >= 1:
ext = fich_name.split('.')[-1] ext = fich_name.split('.')[-1]
# print(ext) #
if ext == 'pdf': if ext == 'pdf':
fich_name = fich_name fich_name = fich_name
elif ext != 'pdf': elif ext != 'pdf':
# print('nipe') #
fich_name = fich_name.replace(f'.{ext}', '.pdf') fich_name = fich_name.replace(f'.{ext}', '.pdf')
else: else:
fich_name = fich_name + '.pdf' fich_name = fich_name + '.pdf'
@ -560,7 +564,7 @@ class Test(APIView):
code = "VZRKLZ" code = "VZRKLZ"
ex = Exercice.objects.filter(id_code=code)[0] ex = Exercice.objects.filter(id_code=code)[0]
model = ex.exo_model model = ex.exo_model
print('model', model.name)
oplist = Generateur(model.name, 2, 'calcul') oplist = Generateur(model.name, 2, 'calcul')
return Response({"data": oplist}, status=status.HTTP_200_OK) return Response({"data": oplist}, status=status.HTTP_200_OK)
@ -569,6 +573,6 @@ class ExoModelApi(APIView):
def get(self, request, format=None): def get(self, request, format=None):
code = request.GET.get('id_code') code = request.GET.get('id_code')
exo = Exercice.objects.filter(id_code=code)[0] exo = Exercice.objects.filter(id_code=code)[0]
print(exo.exo_model.name)
model = open(exo.exo_model.name, 'rb') model = open(exo.exo_model.name, 'rb')
return FileResponse(model, status=status.HTTP_200_OK) return FileResponse(model, status=status.HTTP_200_OK)

30
backend/api/room/consumers.py
View File

@ -19,21 +19,21 @@ class RoomConsumer(AsyncWebsocketConsumer):
self.user = None self.user = None
try: try:
self.room = await self.get_room() self.room = await self.get_room()
print('Connected')
await self.accept() await self.accept()
await self.send(json.dumps({'type': 'connect', "clientId": self.clientId})) await self.send(json.dumps({'type': 'connect', "clientId": self.clientId}))
except: except:
print('closed')
await self.close() await self.close()
async def receive(self, text_data): async def receive(self, text_data):
text_data_json = json.loads(text_data) text_data_json = json.loads(text_data)
type = text_data_json['data']['type'] type = text_data_json['data']['type']
print("EVENT", type)
print('USER', self.scope['user'])
if type == "login": if type == "login":
print('LOF', self.scope['user'])
participants = await self.get_participants() participants = await self.get_participants()
if self.scope['user'].is_anonymous: if self.scope['user'].is_anonymous:
nick = text_data_json['data']['nick'] nick = text_data_json['data']['nick']
@ -84,7 +84,7 @@ class RoomConsumer(AsyncWebsocketConsumer):
new_participant = await self.add_participant(nick, str(uuid4())) new_participant = await self.add_participant(nick, str(uuid4()))
else: else:
new_participant = await self.add_user(code) new_participant = await self.add_user(code)
print(new_participant)
await self.del_waiter_db(code) await self.del_waiter_db(code)
await self.channel_layer.group_send(f'waiter__{code}', {"type": "accept_room", 'id_code': self.room_id, 'code': new_participant['code']}) await self.channel_layer.group_send(f'waiter__{code}', {"type": "accept_room", 'id_code': self.room_id, 'code': new_participant['code']})
@ -118,7 +118,7 @@ class RoomConsumer(AsyncWebsocketConsumer):
participant = list( participant = list(
filter(lambda p: p['code'] == code, participants))[0] filter(lambda p: p['code'] == code, participants))[0]
await self.channel_layer.group_discard(f'waiter__{code}', self.channel_name) await self.channel_layer.group_discard(f'waiter__{code}', self.channel_name)
print('new user', participant)
self.clientId = participant['clientId'] self.clientId = participant['clientId']
await self.channel_layer.group_add(self.room_id, self.channel_name) await self.channel_layer.group_add(self.room_id, self.channel_name)
self.user = participant self.user = participant
@ -179,7 +179,7 @@ class RoomConsumer(AsyncWebsocketConsumer):
elif type == "reconnect": elif type == "reconnect":
client = text_data_json['data']['clientId'] client = text_data_json['data']['clientId']
print("reconeect", self.scope['user'].is_anonymous)
if not self.scope['user'].is_anonymous: if not self.scope['user'].is_anonymous:
userInRoom = await self.userInRoom() userInRoom = await self.userInRoom()
if not userInRoom: if not userInRoom:
@ -199,7 +199,7 @@ class RoomConsumer(AsyncWebsocketConsumer):
await self.connect_participant() await self.connect_participant()
self.clientId = self.scope['user'].clientId self.clientId = self.scope['user'].clientId
print('SENDING')
await self.send(json.dumps({'type': "reconnected", "clientId": self.scope['user'].clientId, 'id_code': self.room_id, 'identity': self.user})) await self.send(json.dumps({'type': "reconnected", "clientId": self.scope['user'].clientId, 'id_code': self.room_id, 'identity': self.user}))
await self.channel_layer.group_send(self.room_id, {"type": "reconnect.event", 'nick': self.user['nick']}) await self.channel_layer.group_send(self.room_id, {"type": "reconnect.event", 'nick': self.user['nick']})
await self.channel_layer.group_send(f'owner__{self.room_id}', {"type": "reconnect.event", 'nick': self.user['nick']}) await self.channel_layer.group_send(f'owner__{self.room_id}', {"type": "reconnect.event", 'nick': self.user['nick']})
@ -214,10 +214,10 @@ class RoomConsumer(AsyncWebsocketConsumer):
filter(lambda p: p['clientId'] == client, participants))[0] filter(lambda p: p['clientId'] == client, participants))[0]
if participant['clientId'] == self.room.owner['clientId'] and participant['code'] == self.room.owner['code']: if participant['clientId'] == self.room.owner['clientId'] and participant['code'] == self.room.owner['code']:
print('add in admin')
await self.channel_layer.group_add(f'owner__{self.room_id}', self.channel_name) await self.channel_layer.group_add(f'owner__{self.room_id}', self.channel_name)
else: else:
print('add in users')
await self.channel_layer.group_add(self.room_id, self.channel_name) await self.channel_layer.group_add(self.room_id, self.channel_name)
participant['online'] = True participant['online'] = True
self.user = participant self.user = participant
@ -245,11 +245,11 @@ class RoomConsumer(AsyncWebsocketConsumer):
clientId = text_data_json['data']["clientId"] clientId = text_data_json['data']["clientId"]
status = 'anonymous' if len(code) == 6 else 'user' status = 'anonymous' if len(code) == 6 else 'user'
print('EST')
if status == 'anonymous': if status == 'anonymous':
participants = await self.get_participants() participants = await self.get_participants()
participant = [p for p in participants if p['code'] == code] participant = [p for p in participants if p['code'] == code]
print('PARTICIPANR', participant)
if len(participant) == 0: if len(participant) == 0:
pass pass
else: else:
@ -259,7 +259,7 @@ class RoomConsumer(AsyncWebsocketConsumer):
await self.channel_layer.group_send(f'owner__{self.room_id}', {'type': "ban_participant", "code": code, "nick": nick}) await self.channel_layer.group_send(f'owner__{self.room_id}', {'type': "ban_participant", "code": code, "nick": nick})
else: else:
user = await self.get_user(code) user = await self.get_user(code)
print('USER', user, code)
if self.scope['user'] == user: if self.scope['user'] == user:
await self.del_user(code) await self.del_user(code)
await self.channel_layer.group_send(self.room_id, {'type': "ban_participant", "code": code, "nick": nick}) await self.channel_layer.group_send(self.room_id, {'type': "ban_participant", "code": code, "nick": nick})
@ -346,7 +346,7 @@ class RoomConsumer(AsyncWebsocketConsumer):
id_code=self.room.id_code)) != 0 id_code=self.room.id_code)) != 0
async def disconnect(self, close_code): async def disconnect(self, close_code):
print('Disconnect')
if self.waiter == False and self.user != None: if self.waiter == False and self.user != None:
await self.disconnect_participant() await self.disconnect_participant()
await self.channel_layer.group_discard(self.room_id, self.channel_name) await self.channel_layer.group_discard(self.room_id, self.channel_name)

6
backend/api/room/models.py
View File

@ -115,12 +115,10 @@ class RoomManager(models.Manager):
return None return None
waiters = room.waiters waiters = room.waiters
print('NEWNAME', new_name, new_name in list(
map(lambda p: p['nick'], waiters)), list(map(lambda p: p['nick'], waiters)), waiters)
if new_name in list(map(lambda p: p['nick'], waiters)): if new_name in list(map(lambda p: p['nick'], waiters)):
return None return None
print('PASSED')
if code == None: if code == None:
while True: while True:
code = ''.join(random.choices(string.ascii_uppercase, k=6)) code = ''.join(random.choices(string.ascii_uppercase, k=6))
@ -232,7 +230,7 @@ class ParcoursManager(models.Manager):
challengers = parcours.challenger challengers = parcours.challenger
challengers = [c for c in challengers if c['code'] == user_code] challengers = [c for c in challengers if c['code'] == user_code]
if len(challengers) == 0: if len(challengers) == 0:
print('NOPE', user_code)
return None return None
c = challengers[0] c = challengers[0]
return {'value': round(functools.reduce(lambda a, b: a+b, [e['note']['value'] for e in c['exos']])/len(c['exos']), 2), 'total': c['exos'][0]['note']['total']} return {'value': round(functools.reduce(lambda a, b: a+b, [e['note']['value'] for e in c['exos']])/len(c['exos']), 2), 'total': c['exos'][0]['note']['total']}

2
backend/api/room/serializers.py
View File

@ -105,7 +105,7 @@ class ParcoursCreateSerializer(serializers.ModelSerializer):
'timer', 'exercices', 'success_condition') # + challenger ? 'timer', 'exercices', 'success_condition') # + challenger ?
def validate_exercices(self, value): def validate_exercices(self, value):
print('EXOS', value)
if len(value) == 0: if len(value) == 0:
raise serializers.ValidationError('Aucun exercice séléctioné') raise serializers.ValidationError('Aucun exercice séléctioné')
return value return value

18
backend/api/room/views.py
View File

@ -104,7 +104,7 @@ class RoomAPI(APIView):
else: else:
return Response({'error': 'Unauthorized'}, status=status.HTTP_401_UNAUTHORIZED) return Response({'error': 'Unauthorized'}, status=status.HTTP_401_UNAUTHORIZED)
else: else:
print('CLIENTID', clientId, room.owner)
if clientId == room.owner['clientId']: if clientId == room.owner['clientId']:
room.delete() room.delete()
else: else:
@ -122,7 +122,7 @@ class RoomAPI(APIView):
room = Room.objects.filter(id_code=code)[0] room = Room.objects.filter(id_code=code)[0]
except IndexError: except IndexError:
return Response({'error': 'No room'}, status=status.HTTP_502_BAD_GATEWAY) return Response({'error': 'No room'}, status=status.HTTP_502_BAD_GATEWAY)
# print(room)
if 'roomsJoined' not in request.session: if 'roomsJoined' not in request.session:
request.session['roomsJoined'] = [] request.session['roomsJoined'] = []
elif 'roomsJoined' in request.session: elif 'roomsJoined' in request.session:
@ -224,7 +224,7 @@ def getEditParcours(request):
@api_view(['POST']) @api_view(['POST'])
def lockRoom(request): def lockRoom(request):
print('DATA', request.data)
room_id = request.data['id_code'] room_id = request.data['id_code']
if request.user.is_authenticated: if request.user.is_authenticated:
@ -245,7 +245,7 @@ def lockRoom(request):
@api_view(['POST']) @api_view(['POST'])
def publicResultToggler(request): def publicResultToggler(request):
print('DATA', request.data)
room_id = request.data['id_code'] room_id = request.data['id_code']
if request.user.is_authenticated: if request.user.is_authenticated:
@ -267,7 +267,7 @@ def publicResultToggler(request):
@api_view(['POST']) @api_view(['POST'])
def changeRoomName(request): def changeRoomName(request):
print('DATA', request.data)
room_id = request.data['id_code'] room_id = request.data['id_code']
if request.user.is_authenticated: if request.user.is_authenticated:
@ -396,10 +396,10 @@ class ChallengeAPI(APIView):
filter(lambda c: c['order'] == a['order'], correctionExos['exos']))[0] filter(lambda c: c['order'] == a['order'], correctionExos['exos']))[0]
correctInputs = exoCorrect['inputs'] correctInputs = exoCorrect['inputs']
print('correcti', correctInputs)
studentsInput = sorted( studentsInput = sorted(
a['inputs'], key=lambda i: i.get('order')) a['inputs'], key=lambda i: i.get('order'))
print('correctiinnnn\n\n', studentsInput)
corrigedInputs = [{**inp, "value": studentsInput[inp['order']]['value'], "isCorrect": (str(studentsInput[inp['order']]['value']) == str( corrigedInputs = [{**inp, "value": studentsInput[inp['order']]['value'], "isCorrect": (str(studentsInput[inp['order']]['value']) == str(
inp['correction'])) if inp['correction'] != "" else None} for inp in correctInputs] inp['correction'])) if inp['correction'] != "" else None} for inp in correctInputs]
corrigedList.append({**a, 'inputs': corrigedInputs}) corrigedList.append({**a, 'inputs': corrigedInputs})
@ -486,7 +486,7 @@ class ParcoursAPI(APIView):
id_code = request.data.get('id_code') id_code = request.data.get('id_code')
code = request.data.get('code') code = request.data.get('code')
print(f'id_code={id_code};code={code}')
parcours = Parcours.objects.filter(id_code=id_code) parcours = Parcours.objects.filter(id_code=id_code)
if len(parcours) == 0: if len(parcours) == 0:
@ -527,7 +527,7 @@ class ParcoursAPI(APIView):
if not serial.is_valid(): if not serial.is_valid():
return Response(serial.errors, status=status.HTTP_400_BAD_REQUEST) return Response(serial.errors, status=status.HTTP_400_BAD_REQUEST)
parcours = serial.create(serial.validated_data) parcours = serial.create(serial.validated_data)
print('PARCOURS', parcours)
layer = get_channel_layer() layer = get_channel_layer()
async_to_sync(layer.group_send)(room_code, { async_to_sync(layer.group_send)(room_code, {
'type': 'new_parcours', 'parcours': ParcoursFullSerializer(parcours).data}) 'type': 'new_parcours', 'parcours': ParcoursFullSerializer(parcours).data})

8
frontend/components/exos/Card.jsx
View File

@ -24,7 +24,7 @@ function CardComp({ step, setActive, deleted, tags, queryKey }) {
{ {
onSuccess: (data, variables, context) => { onSuccess: (data, variables, context) => {
queryClient.setQueryData(queryKey, (old) => { queryClient.setQueryData(queryKey, (old) => {
console.log("test old", old);
return { return {
...old, ...old,
results: [ results: [
@ -47,7 +47,7 @@ function CardComp({ step, setActive, deleted, tags, queryKey }) {
setTagMode(false); setTagMode(false);
}, },
onError: (data) => { onError: (data) => {
console.log("ERROR", data);
notificationService.error( notificationService.error(
"Erreur", "Erreur",
`Les tags de ${step.name} n'ont pu être modifiés !` `Les tags de ${step.name} n'ont pu être modifiés !`
@ -68,7 +68,7 @@ function CardComp({ step, setActive, deleted, tags, queryKey }) {
queryClient.invalidateQueries(queryKey); queryClient.invalidateQueries(queryKey);
} }
queryClient.setQueriesData(queryKey, (old) => { queryClient.setQueriesData(queryKey, (old) => {
console.log("test old", old);
return { return {
...old, ...old,
results: [ results: [
@ -92,7 +92,7 @@ function CardComp({ step, setActive, deleted, tags, queryKey }) {
setTagMode(false); setTagMode(false);
}, },
onError: (e) => { onError: (e) => {
console.log(e);
notificationService.error( notificationService.error(
"Erreur", "Erreur",
`Le tag n'a pu être retiré de ${step.name} !` `Le tag n'a pu être retiré de ${step.name} !`

2
frontend/components/exos/ExoCreateForm.jsx
View File

@ -143,7 +143,7 @@ export default function ExoCreateForm({ cancel, resetFilter }) {
type="checkbox" type="checkbox"
checked={newExo.private} checked={newExo.private}
onChange={(e) => { onChange={(e) => {
console.log(e.target);
setNewExo({ ...newExo, private: !newExo.private }); setNewExo({ ...newExo, private: !newExo.private });
}} }}
/> />

2
frontend/components/exos/ExoEditForm.jsx
View File

@ -133,7 +133,7 @@ export function ExoEditForm({ step, cancel, setFull, full }) {
type="checkbox" type="checkbox"
checked={spec.private} checked={spec.private}
onChange={(e) => { onChange={(e) => {
console.log(e.target);
setSpec({ ...spec, private: !spec.private }); setSpec({ ...spec, private: !spec.private });
}} }}
/> />

6
frontend/components/exos/ModalCard.jsx
View File

@ -36,7 +36,9 @@ export default function ModalCard({ step, onClose, onDelete, tags, queryKey }) {
data: step_data, data: step_data,
} = useQuery( } = useQuery(
["exo-data", step.id_code], ["exo-data", step.id_code],
async () => await getExos(step.id_code), async () => await getExos(step.id_code).catch(() => {
notificationService.error('Erreur', "Exercice introuvable")
}),
{ initialData: step, refetchOnWindowFocus: !edit } { initialData: step, refetchOnWindowFocus: !edit }
); );
const [selected, setSelected] = useState([]); const [selected, setSelected] = useState([]);
@ -120,7 +122,7 @@ export default function ModalCard({ step, onClose, onDelete, tags, queryKey }) {
return { ...old, tags: data.data.tags }; return { ...old, tags: data.data.tags };
}); });
queryClient.setQueryData(queryKey, (old) => { queryClient.setQueryData(queryKey, (old) => {
console.log("test old", old);
return { return {
...old, ...old,
results: [ results: [

2
frontend/components/exos/Pagination.jsx
View File

@ -97,7 +97,7 @@ export function Pagination({ setPage, page, pages }) {
: page + 3 : page + 3
) )
.map((p) => { .map((p) => {
console.log("new pagin", p);
return ( return (
<p <p
onClick={() => { onClick={() => {

2
frontend/components/exos/StepOptions.jsx
View File

@ -21,7 +21,7 @@ export default function StepOptions({ pageChange, serieChange }) {
e.target.value == '' e.target.value == ''
); );
if (!isNaN(parseInt(e.target.value, 10))) { if (!isNaN(parseInt(e.target.value, 10))) {
console.log("nope");
if (parseInt(e.target.value, 10) > 100) { if (parseInt(e.target.value, 10) > 100) {
setPage(100); setPage(100);
pageChange && pageChange(100); pageChange && pageChange(100);

2
frontend/components/exos/modelInput.jsx
View File

@ -72,7 +72,7 @@ export default function ModelInput({
var filename = e.target.files[0].name; var filename = e.target.files[0].name;
var splitting = filename.split("."); var splitting = filename.split(".");
if (splitting[splitting.length - 1] != "py") { if (splitting[splitting.length - 1] != "py") {
console.log("nope");
} else { } else {
setModel({ filename: e.target.files[0].name, data: text }); setModel({ filename: e.target.files[0].name, data: text });
} }

4
frontend/components/pdf_gen/tagContainer.jsx
View File

@ -9,7 +9,7 @@ export default function TagContainer({ tags }) {
const [invisible, setInvisible] = useState([]); const [invisible, setInvisible] = useState([]);
useLayoutEffect(() => { useLayoutEffect(() => {
if (ref.current.clientWidth < ref.current.scrollWidth) { if (ref.current.clientWidth < ref.current.scrollWidth) {
console.log("overflow", ref);
var element = ref.current; var element = ref.current;
var invi = []; var invi = [];
for (var i = 0; i < element.childElementCount; i++) { for (var i = 0; i < element.childElementCount; i++) {
@ -24,7 +24,7 @@ export default function TagContainer({ tags }) {
element.children[i].style.display = "none"; element.children[i].style.display = "none";
} }
} }
console.log(invi);
setInvisible([...invi]); setInvisible([...invi]);
} }
}, [ref]); }, [ref]);

2
frontend/components/room/ParcoursView.jsx
View File

@ -229,7 +229,7 @@ export default function ParcoursView({ parcours_id, room_code, user }) {
}, [parcours]); }, [parcours]);
const router = useRouter(); const router = useRouter();
console.log("PARCOURS", parcours);
const [dataCorrection, setDataCorrection] = useState(); const [dataCorrection, setDataCorrection] = useState();
const [onglet, setOnglet] = useState("tab"); const [onglet, setOnglet] = useState("tab");

4
frontend/context/websocket.context.js
View File

@ -24,11 +24,11 @@ export const WebsocketProvider = ({ children }) => {
}); });
}; };
ws.current.onclose = (c) => { ws.current.onclose = (c) => {
console.log("CLOSED", c);
setConnected(false); setConnected(false);
}; };
ws.current.onerror = (e) => { ws.current.onerror = (e) => {
console.log("ERROR", e);
//router.push({ pathname: '/room/join' }) //router.push({ pathname: '/room/join' })
ws.current.close(); ws.current.close();

2
frontend/pages/login.jsx
View File

@ -29,7 +29,7 @@ export default function Login() {
router.push({ pathname: "/dashboard" }); router.push({ pathname: "/dashboard" });
}) })
.catch((err) => { .catch((err) => {
console.log(err.response.data);
setError({ ...err.response.data }); setError({ ...err.response.data });
}); });
}} }}

2
frontend/pages/register.jsx
View File

@ -39,7 +39,7 @@ export default function Register() {
router.push({ pathname: "/dashboard" }); router.push({ pathname: "/dashboard" });
}) })
.catch((err) => { .catch((err) => {
console.log(err.response.data);
setError({ ...err.response.data }); setError({ ...err.response.data });
}); });
}} }}