Commit cfed588e authored by GuiΩ's avatar GuiΩ
Browse files

Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	src/components/FeuilleListFeuilleSeance.vue
parents 622792fe 441e7a6d
Pipeline #503070 failed with stages
in 48 seconds
# Generated by Django 3.1.5 on 2021-03-11 09:14
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('am', '0030_auto_20210221_1304'),
]
operations = [
migrations.AlterField(
model_name='latexmodel',
name='description',
field=models.TextField(blank=True, null=True),
),
migrations.AlterField(
model_name='latexmodel',
name='position',
field=models.IntegerField(blank=True, null=True),
),
]
# Generated by Django 3.1.5 on 2021-03-11 09:17
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('am', '0031_auto_20210311_1014'),
]
operations = [
migrations.AlterField(
model_name='latexmodel',
name='delete_tmp',
field=models.BooleanField(default=True),
),
]
# Generated by Django 3.1.5 on 2021-03-11 09:19
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('am', '0032_auto_20210311_1017'),
]
operations = [
migrations.AlterField(
model_name='latexmodelpart',
name='code',
field=models.TextField(blank=True, null=True),
),
]
# Generated by Django 3.1.5 on 2021-03-11 15:14
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('am', '0033_auto_20210311_1019'),
]
operations = [
migrations.AddField(
model_name='latexmodel',
name='file_name',
field=models.CharField(default='am', max_length=50),
preserve_default=False,
),
]
# Generated by Django 3.1.5 on 2021-03-11 15:17
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('am', '0034_latexmodel_file_name'),
]
operations = [
migrations.AlterField(
model_name='latexmodel',
name='file_name',
field=models.CharField(max_length=255),
),
]
# Generated by Django 3.1.5 on 2021-03-11 15:17
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('am', '0035_auto_20210311_1617'),
]
operations = [
migrations.AlterField(
model_name='latexmodel',
name='file_name',
field=models.CharField(blank=True, max_length=255, null=True),
),
]
......@@ -392,7 +392,7 @@ class LatexModel(models.Model, VarReplacer):
baseName = kwargs.get('outfile')[0:-4]
else:
baseName = self._replace_vars(self.file_name, **kwargs)
outfile += '.pdf'
outfile = baseName + '.pdf'
try:
# check_call(cmd_tex_array) # pour afficher la sortie de compilation
# check_call(cmd_tex_array, stdout=DEVNULL) # sans affichage
......
......@@ -44,14 +44,14 @@ Events:
{{ seanceDate }}
</span>
<input v-if="datePickerVisible" v-model="date" size="10" @keyup="dateSave">
<br> <br>
<br>
<template v-for="model of $store.state.latex.models">
<template v-if="model.type === 'SE'">
<a :href="'api/seance/' + seance.id +'/get_pdf/?model_id=' + model.id">{{model.label}}.pdf</a><br>
<a :href="'/api/seance/' + seance.id +'/get_pdf/?model_id=' + model.id">{{model.label}}.pdf</a><br>
</template>
</template>
<br/>
<a @click="$store.dispatch('undoables/deleteSeance', seance)">Supprimer la séance</a>
<a v-if="deletable" @click="$store.dispatch('undoables/deleteSeance', seance)">Supprimer la séance</a>
</div>
</div>
</template>
......@@ -124,7 +124,7 @@ export default {
let firstPosition = 1000;
for (let questionPosee of this.seance.questionsPosees) {
let position = questionPosee.position
if (questionPosee.score !== null)
if (questionPosee.score)
this.newScores[position] = questionPosee.score * 5;
else
this.newScores[position] = null;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment