From: Yoan Le Clanche Date: Tue, 30 May 2023 11:56:42 +0000 (+0200) Subject: Add session ro webclass record X-Git-Tag: 2.9.0~67^2~3 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=b94a47c1c10e5612e793ca8bd57b407be19b05cb;p=teleforma.git Add session ro webclass record --- diff --git a/teleforma/webclass/migrations/0008_webclassrecord_session.py b/teleforma/webclass/migrations/0008_webclassrecord_session.py new file mode 100644 index 00000000..0ccf0436 --- /dev/null +++ b/teleforma/webclass/migrations/0008_webclassrecord_session.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.13 on 2023-05-30 11:22 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('webclass', '0007_auto_20220616_1759'), + ] + + operations = [ + migrations.AddField( + model_name='webclassrecord', + name='session', + field=models.CharField(blank=True, choices=[('1', '1'), ('2', '2'), ('3', '3'), ('4', '4'), ('5', '5'), ('6', '6'), ('7', '7'), ('8', '8'), ('9', '9'), ('10', '10'), ('11', '11'), ('12', '12'), ('13', '13'), ('14', '14'), ('15', '15'), ('16', '16'), ('17', '17'), ('18', '18'), ('19', '19'), ('20', '20'), ('21', '21'), ('22', '22'), ('23', '23'), ('24', '24'), ('25', '25'), ('26', '26'), ('27', '27'), ('28', '28'), ('29', '29'), ('30', '30'), ('31', '31'), ('32', '32'), ('33', '33'), ('34', '34'), ('35', '35'), ('36', '36'), ('37', '37'), ('38', '38'), ('39', '39'), ('40', '40'), ('41', '41'), ('42', '42'), ('43', '43'), ('44', '44'), ('45', '45'), ('46', '46'), ('47', '47'), ('48', '48'), ('49', '49'), ('50', '50'), ('51', '51'), ('52', '52'), ('53', '53'), ('54', '54'), ('55', '55'), ('56', '56'), ('57', '57'), ('58', '58'), ('59', '59'), ('60', '60'), ('61', '61'), ('62', '62'), ('63', '63'), ('64', '64'), ('65', '65'), ('66', '66'), ('67', '67'), ('68', '68'), ('69', '69'), ('70', '70'), ('71', '71'), ('72', '72'), ('73', '73'), ('74', '74'), ('75', '75'), ('76', '76'), ('77', '77'), ('78', '78'), ('79', '79'), ('80', '80'), ('81', '81'), ('82', '82'), ('83', '83'), ('84', '84'), ('85', '85'), ('86', '86'), ('87', '87'), ('88', '88'), ('89', '89'), ('90', '90'), ('91', '91'), ('92', '92'), ('93', '93'), ('94', '94'), ('95', '95'), ('96', '96'), ('97', '97'), ('98', '98'), ('99', '99')], max_length=16, null=True, verbose_name='session'), + ), + ] diff --git a/teleforma/webclass/models.py b/teleforma/webclass/models.py index 430ae8d7..5ff01ed5 100644 --- a/teleforma/webclass/models.py +++ b/teleforma/webclass/models.py @@ -408,6 +408,8 @@ class WebclassRecord(models.Model): bbb_server = models.ForeignKey( 'BBBServer', related_name='webclass_records', verbose_name='Serveur BBB', on_delete=models.CASCADE) created = models.DateTimeField("Date de la conférence", auto_now_add=True) + session = models.CharField( + _('session'), choices=session_choices, max_length=16, blank=True, null=True) WEBCLASS = 'WC' CORRECTION = 'CC' @@ -433,10 +435,12 @@ class WebclassRecord(models.Model): @staticmethod def get_records(period, course): record_ids = set() + records_mapping = {} # id : category mapping category_mapping = {} for record in WebclassRecord.objects.filter(period=period, course=course): record_ids.add(record.record_id) + records_mapping[record.record_id] = record category_mapping[record.record_id] = record.category if not record_ids: return {} @@ -445,9 +449,9 @@ class WebclassRecord(models.Model): # group records by category categories = {} for record in records: + record['obj'] = records_mapping.get(record['id']) category = category_mapping[record['id']] if category not in categories: categories[category] = [] categories[category].append(record) - return categories diff --git a/teleforma/webclass/templates/webclass/webclass_record.html b/teleforma/webclass/templates/webclass/webclass_record.html index ae78052d..3e6f839b 100644 --- a/teleforma/webclass/templates/webclass/webclass_record.html +++ b/teleforma/webclass/templates/webclass/webclass_record.html @@ -16,6 +16,10 @@ {% endif %}
{% trans "Begin" %}
{{ record.start_date }}
+ {% if record.obj.session %} +
{% trans "Session" %}
+
{{ record.obj.session }}
+ {% endif %}