From bed4a9902cffeafb1c5e82af5f3b6444e8e651ab Mon Sep 17 00:00:00 2001 From: zoekuebrich Date: Thu, 16 Feb 2023 20:23:26 -0800 Subject: [PATCH 1/4] removed advisors from showing up in waiver logs --- huxley/core/models.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/huxley/core/models.py b/huxley/core/models.py index 1a53c84e..facd8ab8 100644 --- a/huxley/core/models.py +++ b/huxley/core/models.py @@ -746,6 +746,9 @@ def process_waiver(cls, waiver): delegate.save() return "Successfully confirmed waiver for %s." % delegate.name + #check if advisor + if len(users_list) == 1 and users_list[0].is_advisor(): + return "Advisor waiver unneeded." # log the unmatched waiver error_waiver_log = WaiverLog( waiver_unique_id=unique_id, From eb98fbcbd0ffb728d5298216ad3ee74458048f4f Mon Sep 17 00:00:00 2001 From: Sonika Vuyyuru Date: Tue, 28 Feb 2023 22:20:16 -0800 Subject: [PATCH 2/4] changed runner in git actions to resolve build issue --- .github/workflows/django.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/django.yml b/.github/workflows/django.yml index 22e822b6..3569cd0e 100644 --- a/.github/workflows/django.yml +++ b/.github/workflows/django.yml @@ -9,7 +9,7 @@ on: jobs: build: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 strategy: max-parallel: 4 matrix: From 0f737e92d7946a83150b402784d911ab7438547b Mon Sep 17 00:00:00 2001 From: Sonika Vuyyuru <37266127+sonikavuyyuru@users.noreply.github.com> Date: Wed, 1 Mar 2023 09:14:50 -0800 Subject: [PATCH 3/4] New feedback questions (#824) * Added payment type and invoice sent to Huxley Registration Data Google Sheets * Adapted registration tests to account for new columns in Google Sheets * modified committee feedback form * changed runner in git actions to resolve build issue * added most recent migrations --------- Co-authored-by: Sonika Vuyyuru --- .../migrations/0060_auto_20230228_2230.py | 38 ++++++++ huxley/core/models.py | 14 ++- .../DelegateCommitteeFeedbackView.js | 90 ++++++++++++++++++- 3 files changed, 138 insertions(+), 4 deletions(-) create mode 100644 huxley/core/migrations/0060_auto_20230228_2230.py diff --git a/huxley/core/migrations/0060_auto_20230228_2230.py b/huxley/core/migrations/0060_auto_20230228_2230.py new file mode 100644 index 00000000..97d45fa5 --- /dev/null +++ b/huxley/core/migrations/0060_auto_20230228_2230.py @@ -0,0 +1,38 @@ +# Generated by Django 2.2.6 on 2023-02-28 22:30 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('core', '0059_registration_invoices_sent'), + ] + + operations = [ + migrations.AddField( + model_name='committeefeedback', + name='conferences_attended', + field=models.FloatField(blank=True, default=1), + ), + migrations.AddField( + model_name='committeefeedback', + name='other_events', + field=models.IntegerField(blank=True, choices=[(0, 'Blank'), (1, 'Delegate Workshop Only'), (2, 'Fall Conference Only'), (3, 'Delegate Workshop and Fall Conference'), (4, 'Neither/I do not know what these are')], default=0), + ), + migrations.AddField( + model_name='committeefeedback', + name='outreach_sessions', + field=models.IntegerField(blank=True, choices=[(0, 'Blank'), (1, 'No'), (2, 'Unsure'), (3, 'Yes')], default=0), + ), + migrations.AddField( + model_name='committeefeedback', + name='team_format', + field=models.IntegerField(blank=True, choices=[(0, 'Blank'), (1, 'Club'), (2, 'Class'), (3, 'Other/unsure')], default=0), + ), + migrations.AlterField( + model_name='committeefeedback', + name='berkeley_perception', + field=models.IntegerField(blank=True, choices=[(0, 'Blank'), (1, 'No'), (2, 'Unsure'), (3, 'Yes')], default=0), + ), + ] diff --git a/huxley/core/models.py b/huxley/core/models.py index 1a53c84e..5376328d 100644 --- a/huxley/core/models.py +++ b/huxley/core/models.py @@ -162,8 +162,10 @@ class CommitteeFeedback(models.Model): (9, 9), (10, 10), ) - LIKELY_CHOICES = ((0, 'Blank'), (1, 'No'), - (2, 'No change/unsure'), (3, 'Yes')) + LIKELY_CHOICES = ((0, 'Blank'), (1, 'No'), (2, 'Unsure'), (3, 'Yes')) + + CLUB_OR_CLASS = ((0, 'Blank'), (1, 'Club'), (2, 'Class'), (3, 'Other/unsure')) + DW_OR_FC = ((0, 'Blank'), (1, 'Delegate Workshop Only'), (2, 'Fall Conference Only'), (3,'Delegate Workshop and Fall Conference'), (4, 'Neither/I do not know what these are')) committee = models.ForeignKey(Committee, on_delete=models.CASCADE) comment = models.TextField(blank=True, default='') @@ -215,7 +217,13 @@ class CommitteeFeedback(models.Model): berkeley_perception = models.IntegerField( blank=True, default=0, choices=LIKELY_CHOICES) money_spent = models.FloatField(blank=True, default=0) - + conferences_attended = models.FloatField(blank=True, default=1) + team_format = models.IntegerField( + blank = True, default=0, choices=CLUB_OR_CLASS) + other_events = models.IntegerField( + blank = True, default=0, choices=DW_OR_FC) + outreach_sessions = models.IntegerField( + blank = True, default=0, choices=LIKELY_CHOICES) def __str__(self): return str(self.committee.name) + " - Comment " + str(self.id) diff --git a/huxley/www/js/components/DelegateCommitteeFeedbackView.js b/huxley/www/js/components/DelegateCommitteeFeedbackView.js index dfe825d9..f72738df 100644 --- a/huxley/www/js/components/DelegateCommitteeFeedbackView.js +++ b/huxley/www/js/components/DelegateCommitteeFeedbackView.js @@ -321,12 +321,100 @@ class DelegateCommitteeFeedbackView extends React.Component {

+
+
+
+
+ +
+
+
+
+
+ +
+
+
+
+
+ +
+
+
+
+
+ +
); }; From bc5ae3faeba98aceab7b81c7507cc16b441abc1e Mon Sep 17 00:00:00 2001 From: zoekuebrich Date: Thu, 16 Feb 2023 20:23:26 -0800 Subject: [PATCH 4/4] removed advisors from showing up in waiver logs --- huxley/core/models.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/huxley/core/models.py b/huxley/core/models.py index 5376328d..efd9a047 100644 --- a/huxley/core/models.py +++ b/huxley/core/models.py @@ -754,6 +754,9 @@ def process_waiver(cls, waiver): delegate.save() return "Successfully confirmed waiver for %s." % delegate.name + #check if advisor + if len(users_list) == 1 and users_list[0].is_advisor(): + return "Advisor waiver unneeded." # log the unmatched waiver error_waiver_log = WaiverLog( waiver_unique_id=unique_id,