From f0c1711ac0563df475919fd08151ac4cbb2faba2 Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Thu, 16 Jun 2022 18:12:01 +0200 Subject: [PATCH] add webclass.comment, bump to 2.6.1 --- teleforma/__init__.py | 2 +- .../migrations/0007_auto_20220616_1759.py | 24 +++++++++++++++++++ teleforma/webclass/models.py | 9 +++++-- 3 files changed, 32 insertions(+), 3 deletions(-) create mode 100644 teleforma/webclass/migrations/0007_auto_20220616_1759.py diff --git a/teleforma/__init__.py b/teleforma/__init__.py index 46f49d72..078722bc 100644 --- a/teleforma/__init__.py +++ b/teleforma/__init__.py @@ -9,7 +9,7 @@ U{http://parisson.com/products/teleforma} """ __docformat__ = 'epytext en' -__version__ = '2.5.1' +__version__ = '2.6.1' __url__ = 'http://parisson.com/products/teleforma' __copyright__ = '(C) 2011-2022 Parisson' __license__ = 'CeCILL-v2' diff --git a/teleforma/webclass/migrations/0007_auto_20220616_1759.py b/teleforma/webclass/migrations/0007_auto_20220616_1759.py new file mode 100644 index 00000000..b5755db8 --- /dev/null +++ b/teleforma/webclass/migrations/0007_auto_20220616_1759.py @@ -0,0 +1,24 @@ +# Generated by Django 3.2.3 on 2022-06-16 17:59 + +from django.db import migrations, models +import teleforma.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('webclass', '0006_webclassrecord_category'), + ] + + operations = [ + migrations.AddField( + model_name='webclass', + name='comment', + field=teleforma.fields.ShortTextField(blank=True, max_length=255, verbose_name='comment'), + ), + migrations.AddField( + model_name='webclass', + name='session', + field=models.CharField(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')], default='1', max_length=16, verbose_name='session'), + ), + ] diff --git a/teleforma/webclass/models.py b/teleforma/webclass/models.py index 524ffbbf..251f6d67 100644 --- a/teleforma/webclass/models.py +++ b/teleforma/webclass/models.py @@ -3,6 +3,7 @@ import calendar import datetime from datetime import date, timedelta +from unidecode import unidecode import django.db.models as models from bigbluebutton_api_python import BigBlueButton @@ -15,8 +16,9 @@ from django.template.defaultfilters import slugify from django.utils import translation from django.utils.translation import ugettext_lazy as _ from jxmlease import XMLDictNode, XMLListNode -from teleforma.fields import DurationField -from unidecode import unidecode +from teleforma.fields import DurationField, ShortTextField +from teleforma.models import session_choices + translation.activate('fr') app_label = 'teleforma' @@ -147,8 +149,11 @@ class Webclass(models.Model): max_participants = models.IntegerField( 'Nombre maxium de participants par créneau', blank=True, null=True, default=80) end_date = models.DateField('date de fin', blank=True, null=True) + session = models.CharField(_('session'), choices=session_choices, + max_length=16, default="1") status = models.IntegerField( _('status'), choices=STATUS_CHOICES, default=2) + comment = ShortTextField(_('comment'), max_length=255, blank=True) objects = models.Manager() published = PublishedManager() -- 2.39.5