From f32a4ffa7377fca6d57666d7501a0c38b3161c23 Mon Sep 17 00:00:00 2001 From: Colby Date: Tue, 20 Jul 2021 10:36:34 -0500 Subject: [PATCH 1/4] adding kelsey editorial review and renaming andrew --- errata/migrations/0049_alter_errata_status.py | 18 +++++++++++ errata/migrations/0050_alter_errata_status.py | 18 +++++++++++ errata/models.py | 32 +++---------------- .../0010_alter_erratacontent_book_state.py | 18 +++++++++++ 4 files changed, 59 insertions(+), 27 deletions(-) create mode 100644 errata/migrations/0049_alter_errata_status.py create mode 100644 errata/migrations/0050_alter_errata_status.py create mode 100644 snippets/migrations/0010_alter_erratacontent_book_state.py diff --git a/errata/migrations/0049_alter_errata_status.py b/errata/migrations/0049_alter_errata_status.py new file mode 100644 index 000000000..df2ffce6b --- /dev/null +++ b/errata/migrations/0049_alter_errata_status.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.4 on 2021-07-20 15:10 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('errata', '0048_auto_20200807_1056'), + ] + + operations = [ + migrations.AlterField( + model_name='errata', + name='status', + field=models.CharField(choices=[('New', 'New'), ('Editorial Review', 'Editorial Review'), ('K-12 Editorial Review', 'K-12 Editorial Review'), ('Anthony Editorial Review', 'Anthony Editorial Review'), ('Reviewed', 'Reviewed'), ('Completed', 'Completed')], default='New', max_length=100), + ), + ] diff --git a/errata/migrations/0050_alter_errata_status.py b/errata/migrations/0050_alter_errata_status.py new file mode 100644 index 000000000..5d5cb146f --- /dev/null +++ b/errata/migrations/0050_alter_errata_status.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.4 on 2021-07-20 15:19 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('errata', '0049_alter_errata_status'), + ] + + operations = [ + migrations.AlterField( + model_name='errata', + name='status', + field=models.CharField(choices=[('New', 'New'), ('Editorial Review', 'Editorial Review'), ('K-12 Editorial Review', 'K-12 Editorial Review'), ('Kelsey Editorial Review', 'Kelsey Editorial Review'), ('Anthony Editorial Review', 'Anthony Editorial Review'), ('Reviewed', 'Reviewed'), ('Completed', 'Completed')], default='New', max_length=100), + ), + ] diff --git a/errata/models.py b/errata/models.py index 739a77dd4..51945d795 100644 --- a/errata/models.py +++ b/errata/models.py @@ -28,14 +28,16 @@ NEW = 'New' EDITORIAL_REVIEW = 'Editorial Review' -ANDREW_EDITORIAL_REVIEW = 'Andrew Editorial Review' +K12_EDITORIAL_REVIEW = 'K-12 Editorial Review' +KELSEY_EDITORIAL_REVIEW = 'Kelsey Editorial Review' ANTHONY_EDITORIAL_REVIEW = 'Anthony Editorial Review' REVIEWED = 'Reviewed' COMPLETED = 'Completed' ERRATA_STATUS = ( (NEW, 'New'), (EDITORIAL_REVIEW, 'Editorial Review'), - (ANDREW_EDITORIAL_REVIEW, 'Andrew Editorial Review'), + (K12_EDITORIAL_REVIEW, 'K-12 Editorial Review'), + (KELSEY_EDITORIAL_REVIEW, 'Kelsey Editorial Review'), (ANTHONY_EDITORIAL_REVIEW,'Anthony Editorial Review'), (REVIEWED, 'Reviewed'), (COMPLETED, 'Completed'), @@ -210,30 +212,6 @@ class Errata(models.Model): file_1 = models.FileField(upload_to='errata/user_uploads/1/', blank=True, null=True) file_2 = models.FileField(upload_to='errata/user_uploads/2/', blank=True, null=True) - # @property - # def user_email(self): - # try: - # user = get_user_info(self.submitted_by_account_id) - # return user['email'] - # except: - # return None - # - # @property - # def user_name(self): - # try: - # user = get_user_info(self.submitted_by_account_id) - # return user['fullname'] - # except: - # return None - # - # @property - # def user_faculty_status(self): - # try: - # user = get_user_info(self.submitted_by_account_id) - # return user['faculty_status'] - # except: - # return None - @property def accounts_link(self): try: @@ -248,7 +226,7 @@ def short_detail(self): def clean(self): if self.status == 'Completed' and not self.resolution or self.status == 'Reviewed' and not self.resolution: raise ValidationError({'resolution': 'Resolution is required if status is completed or reviewed.'}) - if (self.status == 'Editorial Review' or self.status == 'Andrew Editorial Review' or self.status == 'Anthony Editorial Review' or self.status == 'Reviewed' or self.status == 'Completed') and not self.is_assessment_errata: + if (self.status == 'Editorial Review' or self.status == 'K-12 Editorial Review' or self.status == 'Kelsey Editorial Review' or self.status == 'Anthony Editorial Review' or self.status == 'Reviewed' or self.status == 'Completed') and not self.is_assessment_errata: raise ValidationError({'is_assessment_errata': 'You must specify if this is an assessment errata.'}) if (self.status == 'Completed' and self.resolution == 'Duplicate') and not self.duplicate_id: raise ValidationError({'duplicate_id': 'You must specify the duplicate report ID when resolution is marked duplicate.'}) diff --git a/snippets/migrations/0010_alter_erratacontent_book_state.py b/snippets/migrations/0010_alter_erratacontent_book_state.py new file mode 100644 index 000000000..ea4a6a776 --- /dev/null +++ b/snippets/migrations/0010_alter_erratacontent_book_state.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.4 on 2021-07-20 15:10 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('snippets', '0009_alter_erratacontent_book_state'), + ] + + operations = [ + migrations.AlterField( + model_name='erratacontent', + name='book_state', + field=models.CharField(choices=[('live', 'Live'), ('coming_soon', 'Coming Soon'), ('new_edition_available', 'New Edition Forthcoming (Show new edition correction schedule)'), ('deprecated', 'Deprecated (Disallow errata submissions and show deprecated schedule)'), ('retired', 'Retired (Remove from website)')], default='live', help_text='The state of the book.', max_length=255), + ), + ] From 3f8bc8d15af2a54297f4d6216eae90ddcd66ebbc Mon Sep 17 00:00:00 2001 From: Colby Date: Tue, 20 Jul 2021 12:58:57 -0500 Subject: [PATCH 2/4] modifying db value name --- errata/migrations/0049_alter_errata_status.py | 4 ++-- errata/migrations/0050_alter_errata_status.py | 18 ------------------ errata/models.py | 4 ++-- 3 files changed, 4 insertions(+), 22 deletions(-) delete mode 100644 errata/migrations/0050_alter_errata_status.py diff --git a/errata/migrations/0049_alter_errata_status.py b/errata/migrations/0049_alter_errata_status.py index df2ffce6b..514800c20 100644 --- a/errata/migrations/0049_alter_errata_status.py +++ b/errata/migrations/0049_alter_errata_status.py @@ -1,4 +1,4 @@ -# Generated by Django 3.2.4 on 2021-07-20 15:10 +# Generated by Django 3.2.4 on 2021-07-20 17:55 from django.db import migrations, models @@ -13,6 +13,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='errata', name='status', - field=models.CharField(choices=[('New', 'New'), ('Editorial Review', 'Editorial Review'), ('K-12 Editorial Review', 'K-12 Editorial Review'), ('Anthony Editorial Review', 'Anthony Editorial Review'), ('Reviewed', 'Reviewed'), ('Completed', 'Completed')], default='New', max_length=100), + field=models.CharField(choices=[('New', 'New'), ('Editorial Review', 'Editorial Review'), ('K-12 Editorial Review', 'K-12 Editorial Review'), ('Associate Editorial Review', 'Kelsey Editorial Review'), ('Anthony Editorial Review', 'Anthony Editorial Review'), ('Reviewed', 'Reviewed'), ('Completed', 'Completed')], default='New', max_length=100), ), ] diff --git a/errata/migrations/0050_alter_errata_status.py b/errata/migrations/0050_alter_errata_status.py deleted file mode 100644 index 5d5cb146f..000000000 --- a/errata/migrations/0050_alter_errata_status.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.2.4 on 2021-07-20 15:19 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('errata', '0049_alter_errata_status'), - ] - - operations = [ - migrations.AlterField( - model_name='errata', - name='status', - field=models.CharField(choices=[('New', 'New'), ('Editorial Review', 'Editorial Review'), ('K-12 Editorial Review', 'K-12 Editorial Review'), ('Kelsey Editorial Review', 'Kelsey Editorial Review'), ('Anthony Editorial Review', 'Anthony Editorial Review'), ('Reviewed', 'Reviewed'), ('Completed', 'Completed')], default='New', max_length=100), - ), - ] diff --git a/errata/models.py b/errata/models.py index 51945d795..330c28370 100644 --- a/errata/models.py +++ b/errata/models.py @@ -29,7 +29,7 @@ NEW = 'New' EDITORIAL_REVIEW = 'Editorial Review' K12_EDITORIAL_REVIEW = 'K-12 Editorial Review' -KELSEY_EDITORIAL_REVIEW = 'Kelsey Editorial Review' +ASSOCIATE_EDITORIAL_REVIEW = 'Associate Editorial Review' ANTHONY_EDITORIAL_REVIEW = 'Anthony Editorial Review' REVIEWED = 'Reviewed' COMPLETED = 'Completed' @@ -37,7 +37,7 @@ (NEW, 'New'), (EDITORIAL_REVIEW, 'Editorial Review'), (K12_EDITORIAL_REVIEW, 'K-12 Editorial Review'), - (KELSEY_EDITORIAL_REVIEW, 'Kelsey Editorial Review'), + (ASSOCIATE_EDITORIAL_REVIEW, 'Kelsey Editorial Review'), (ANTHONY_EDITORIAL_REVIEW,'Anthony Editorial Review'), (REVIEWED, 'Reviewed'), (COMPLETED, 'Completed'), From 0315e80493657e8807cf5380e725be95f85d9e6e Mon Sep 17 00:00:00 2001 From: Colby Date: Tue, 20 Jul 2021 13:01:27 -0500 Subject: [PATCH 3/4] adding validation for associate status --- errata/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/errata/models.py b/errata/models.py index 330c28370..99f25069f 100644 --- a/errata/models.py +++ b/errata/models.py @@ -226,7 +226,7 @@ def short_detail(self): def clean(self): if self.status == 'Completed' and not self.resolution or self.status == 'Reviewed' and not self.resolution: raise ValidationError({'resolution': 'Resolution is required if status is completed or reviewed.'}) - if (self.status == 'Editorial Review' or self.status == 'K-12 Editorial Review' or self.status == 'Kelsey Editorial Review' or self.status == 'Anthony Editorial Review' or self.status == 'Reviewed' or self.status == 'Completed') and not self.is_assessment_errata: + if (self.status == 'Editorial Review' or self.status == 'K-12 Editorial Review' or self.status == 'Associate Editorial Review' or self.status == 'Anthony Editorial Review' or self.status == 'Reviewed' or self.status == 'Completed') and not self.is_assessment_errata: raise ValidationError({'is_assessment_errata': 'You must specify if this is an assessment errata.'}) if (self.status == 'Completed' and self.resolution == 'Duplicate') and not self.duplicate_id: raise ValidationError({'duplicate_id': 'You must specify the duplicate report ID when resolution is marked duplicate.'}) From a6c85153e83c3af4bcf11bc306730ab165b66e28 Mon Sep 17 00:00:00 2001 From: Colby Date: Tue, 20 Jul 2021 13:04:10 -0500 Subject: [PATCH 4/4] Delete 0010_alter_erratacontent_book_state.py --- .../0010_alter_erratacontent_book_state.py | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 snippets/migrations/0010_alter_erratacontent_book_state.py diff --git a/snippets/migrations/0010_alter_erratacontent_book_state.py b/snippets/migrations/0010_alter_erratacontent_book_state.py deleted file mode 100644 index ea4a6a776..000000000 --- a/snippets/migrations/0010_alter_erratacontent_book_state.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.2.4 on 2021-07-20 15:10 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('snippets', '0009_alter_erratacontent_book_state'), - ] - - operations = [ - migrations.AlterField( - model_name='erratacontent', - name='book_state', - field=models.CharField(choices=[('live', 'Live'), ('coming_soon', 'Coming Soon'), ('new_edition_available', 'New Edition Forthcoming (Show new edition correction schedule)'), ('deprecated', 'Deprecated (Disallow errata submissions and show deprecated schedule)'), ('retired', 'Retired (Remove from website)')], default='live', help_text='The state of the book.', max_length=255), - ), - ]