Update user competency selection and add course select (#294)

* Update selection in LATEST MODULE

* Add Course Selection to profile

* Add option for external/other on registration list.

* Add user lable to profile page

* Add hackathon count and veteran status to profile page

* Updating build file

* Automate S3 staticfiles creation

* Amend script

* Adjusting script

* Adding missing migration file

* Fixing participated hackathons function

---------

Co-authored-by: Stefan Dworschak <stef.dworschak@gmail.com>

Author: kenanwright1988

.github/workflows/build.yml

@@ -4,7 +4,6 @@ on:
   release:
     types:
       - created
-        # branches: [ master ]
 
 jobs:
 
@@ -15,9 +14,6 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - name: Install AWS CLI
-        run: sudo apt-get update -y && sudo apt-get install -y awscli
-
       - name: Docker Login
         run: AWS_DEFAULT_REGION=eu-west-1 AWS_ACCESS_KEY_ID=${{secrets.AWS_ACCESS_KEY}} AWS_SECRET_ACCESS_KEY=${{secrets.AWS_SECRET_ACCESS_KEY}} aws ecr get-login-password | docker login --username AWS --password-stdin 949266541515.dkr.ecr.eu-west-1.amazonaws.com/ci-hackathon-app
 
@@ -26,3 +22,9 @@ jobs:
 
       - name: Push Image to AWS Regristry
         run: docker push 949266541515.dkr.ecr.eu-west-1.amazonaws.com/ci-hackathon-app:${GITHUB_REF##*/}
+
+      - name: Extract staticfiles folder from image
+        run: ./extract_staticfiles.sh ${GITHUB_REF##*/}
+
+      - name: Push staticfiles to S3
+        run: AWS_DEFAULT_REGION=eu-west-1 AWS_ACCESS_KEY_ID=${{secrets.AWS_ACCESS_KEY}} AWS_SECRET_ACCESS_KEY=${{secrets.AWS_SECRET_ACCESS_KEY}} aws s3 cp --recursive --acl public-read staticfiles s3://codeinstitute-webpublic/hackathon_staticfiles/${GITHUB_REF##*/}

Dockerfile

@@ -25,6 +25,8 @@ COPY ./templates/ /hackathon-app/templates/
 COPY ./hackadmin/ /hackathon-app/hackadmin/
 COPY ./manage.py /hackathon-app/manage.py
 
+RUN python3 manage.py collectstatic
+
 EXPOSE 8000
 ENTRYPOINT ["gunicorn", "--workers=5", "--timeout=120", "--access-logfile=-",\
             "--bind=0.0.0.0:8000", "--max-requests=1000", "main.wsgi:application"]

accounts/forms.py

@@ -1,7 +1,7 @@
 from django import forms
 from django.contrib.auth import get_user_model
 
-from .lists import LMS_MODULES_CHOICES, TIMEZONE_CHOICES
+from .lists import LMS_MODULES_CHOICES, TIMEZONE_CHOICES, LMS_COURSE_CHOICES
 from .models import CustomUser
 
 
@@ -23,6 +23,10 @@ class SignupForm(forms.Form):
         widget=forms.Select(choices=LMS_MODULES_CHOICES),
         label="Where are you currently in the programme?"
     )
+    current_course = forms.CharField(
+        widget=forms.Select(choices=LMS_COURSE_CHOICES),
+        label="What course are you currently on?"
+    )
     timezone = forms.CharField(
         widget=forms.Select(choices=TIMEZONE_CHOICES),
         label="Timezone"
@@ -31,7 +35,7 @@ class SignupForm(forms.Form):
     class Meta:
         fields = (
             'email', 'password1', 'password2', 'slack_display_name',
-            'current_lms_module', 'timezone',
+            'current_lms_module', 'timezone', 'current_course', 
         )
         model = get_user_model()
 
@@ -41,6 +45,7 @@ def signup(self, request, user):
         user.username = self.cleaned_data['email']
         user.slack_display_name = self.cleaned_data['slack_display_name']
         user.current_lms_module = self.cleaned_data['current_lms_module']
+        user.current_course = self.cleaned_data['current_course']
         user.timezone = self.cleaned_data['timezone']
         user.save()
 
@@ -62,6 +67,10 @@ class EditProfileForm(forms.ModelForm):
         widget=forms.Select(choices=LMS_MODULES_CHOICES),
         label="Where are you currently in the programme?"
     )
+    current_course = forms.CharField(
+        widget=forms.Select(choices=LMS_COURSE_CHOICES),
+        label="What course are you currently on?"
+    )
     about = forms.CharField(widget=forms.Textarea(), required=False)
     website_url = forms.CharField(required=False)
     timezone = forms.CharField(
@@ -76,6 +85,7 @@ class Meta:
             'full_name',
             'about',
             'slack_display_name',
+            'current_course', 
             'current_lms_module',
             'website_url',
             'timezone',

accounts/lists.py

@@ -18,22 +18,31 @@
 """
 LMS_MODULES_CHOICES = (
     ('', 'Select Learning Stage'),
-    ('programme_preliminaries', 'Programme Preliminaries'),
-    ('programming_paradigms', 'Programming Paradigms'),
-    ('html_essentials', 'HTML Essentials'),
-    ('css_essentials', 'CSS Essentials'),
-    ('user_centric_frontend_development', 'User Centric Frontend Development'),
-    ('comparative_programming_languages_essentials',
-        'Comparative Programming Languages Essentials'),
-    ('javascript_essentials', 'Javascript Essentials'),
-    ('interactive_frontend_development', 'Interactive Frontend Development'),
-    ('python_essentials', 'Python Essentials'),
-    ('practical_python', 'Practical Python'),
-    ('data_centric_development', 'Data Centric Development'),
-    ('backend_development', 'Backend Development'),
-    ('full_stack_frameworks_with_django', 'Full Stack Frameworks with Django'),
-    ('alumni', 'Alumni'),
+    ('no_coding_experience', 'No coding experience'),
+    ('just_starting', 'Just starting the course'),
+    ('mid_course', 'In the middle of the course'),
+    ('end_course', 'At the end of the course'),
+    ('graduated', 'Graduated'),
+    ('dev_duties',
+        'Working with some development duties'),
+    ('working_dev', 'Working as a developer'),
+    ('guest_judge', 'Guest judge'),
+    ('guest_facilitator', 'Guest facilitator'),
     ('staff', 'Staff'),
 )
 
+"""
+List of CI courses to be passed into dropdown of same name for each
+user selection.
+"""
+LMS_COURSE_CHOICES = (
+    ('', 'Select Current Course'),
+    ('L3', 'The Level 3 Diploma in Software Development (L3)'),
+    ('5P', 'The 5 project Diploma in Software Development Course (5P)'),
+    ('4P', 'The 4 project Diploma in Software Development Course (4P)'),
+    ('FSBC', 'The 16 Week Full Stack Developer Bootcamp (BC)'),
+    ('DATABC', 'The 16 Week Data-Analytics Bootcamp (DBC)'),
+    ('external', 'Other/External'),
+)
+
 TIMEZONE_CHOICES = [(tz, tz) for tz in pytz.all_timezones]

accounts/migrations/0021_auto_20250205_1138.py

@@ -0,0 +1,23 @@
+# Generated by Django 3.1.13 on 2025-02-05 11:38
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('accounts', '0020_auto_20230104_1655'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='customuser',
+            name='current_course',
+            field=models.CharField(choices=[('', 'Select Current Course'), ('L3', 'The Level 3 Diploma in Software Development (L3)'), ('5P', 'The 5 project Diploma in Software Development Course (5P)'), ('4P', 'The 4 project Diploma in Software Development Course (4P)'), ('FSBC', 'The 16 Week Full Stack Developer Bootcamp (BC)'), ('DATABC', 'The 16 Week Data-Analytics Bootcamp (DBC)')], default='', max_length=50),
+        ),
+        migrations.AlterField(
+            model_name='customuser',
+            name='current_lms_module',
+            field=models.CharField(choices=[('', 'Select Learning Stage'), ('no_coding_experience', 'No coding experience'), ('just_starting', 'Just starting the course'), ('mid_course', 'In the middle of the course'), ('end_course', 'At the end of the course'), ('graduated', 'Graduated'), ('dev_duties', 'Working with some development duties'), ('working_dev', 'Working as a developer'), ('guest_judge', 'Guest judge'), ('guest_facilitator', 'Guest facilitator'), ('staff', 'Staff')], default='', max_length=50),
+        ),
+    ]

accounts/migrations/0022_auto_20250206_1702.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.1.13 on 2025-02-06 17:02
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('accounts', '0021_auto_20250205_1138'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='customuser',
+            name='current_course',
+            field=models.CharField(choices=[('', 'Select Current Course'), ('L3', 'The Level 3 Diploma in Software Development (L3)'), ('5P', 'The 5 project Diploma in Software Development Course (5P)'), ('4P', 'The 4 project Diploma in Software Development Course (4P)'), ('FSBC', 'The 16 Week Full Stack Developer Bootcamp (BC)'), ('DATABC', 'The 16 Week Data-Analytics Bootcamp (DBC)'), ('external', 'Other/External')], default='', max_length=50),
+        ),
+    ]

accounts/models.py

@@ -5,7 +5,7 @@
 from django.db import models
 from django.contrib.auth.models import AbstractUser
 
-from .lists import LMS_MODULES_CHOICES, TIMEZONE_CHOICES
+from .lists import LMS_MODULES_CHOICES, TIMEZONE_CHOICES, LMS_COURSE_CHOICES
 from main.models import SingletonModel
 from teams.lists import LMS_LEVELS
 
@@ -61,6 +61,13 @@ class CustomUser(AbstractUser):
         choices=LMS_MODULES_CHOICES
     )
 
+    current_course = models.CharField(
+        max_length=50,
+        blank=False,
+        default='',
+        choices=LMS_COURSE_CHOICES
+    )
+
     organisation = models.ForeignKey(
         Organisation,
         on_delete=models.CASCADE,
@@ -130,6 +137,7 @@ def to_team_member(self):
             'userid': self.id,
             'name': self.slack_display_name or self.email,
             'level': LMS_LEVELS.get(self.current_lms_module) or 1,
+            'course': LMS_LEVELS.get(self.current_lms_module) or 1,
             'timezone': self.timezone_to_offset(),
             'num_hackathons': teams.count(),
             'participant_label': self.participant_label(),
@@ -141,9 +149,12 @@ def timezone_to_offset(self):
         offset = datetime.now(pytz.timezone(self.timezone)).strftime('%z')
         return f'UTC{offset[:-2]}'
 
-    def participant_label(self):
-        teams = self.participated_hackteams.filter(
+    def get_participated_teams(self):
+        return self.participated_hackteams.filter(
             hackathon__status='finished')
+
+    def participant_label(self):
+        teams = self.get_participated_teams()
         if teams.count() == 0:
             return 'Hackathon Newbie'
         elif teams.count() < 2:

extract_staticfiles.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+rm -fr staticfiles
+
+container_id=$(docker create 949266541515.dkr.ecr.eu-west-1.amazonaws.com/ci-hackathon-app:$1)
+docker cp $container_id:/hackathon-app/static ./staticfiles
+docker rm -v $container_id
+

profiles/templates/profiles/profile.html

@@ -71,6 +71,11 @@
                     <label for="about">About</label>
                     <p id="about" class="profile-about">{% if user.about %}{{ user.about }}{% else %}N/A{% endif %}</p>
 
+                    <label for="latestCourse">My Course</label>
+                    <p id="latestCourse">
+                        {{ user.current_course|upper }}
+                    </p>
+
                     <label for="latestModule">Latest Module</label>
                     <p id="latestModule">
                         {{ user.human_readable_current_lms_module|title }}
@@ -81,10 +86,32 @@
                         {{ user.timezone|title }}
                     </p>
 
+                    <label for="userLabel">Hackathon Level</label>
+                    <p id="userLabel">
+                        {{ user.participant_label|title }}
+                    </p>
+
+                    <label for="userTeamCount">Hackathons Joined</label>
+                    <p id="userTeamCount">
+                       {{ user.get_participated_teams|length }}
+                    </p>
+                    <label for="userHackathons">List of Hackathons Joined</label>
+                    {% if user.get_participated_teams %}
+                    <ul id="userHackathons">
+                        {% for team in user.get_participated_teams %}
+                        <li>
+                            <a href="{% url 'hackathon:view_hackathon' team.hackathon.id %}" class="profile-url">{{ team.hackathon.display_name }}</a>
+                        </li>
+                        {% endfor %}
+                    </ul>
+                    {% else %}
+                        <p id="userHackathons">You haven't participated in any hackathons yet. Why not sign up for the next one?</p>
+                    {% endif %}
+
                     <label for="website">Website</label>
                     <p id="website" class="profile-website-url">
                         {% if user.website_url %}
-                        <a href="{{ user.website_url }}" target="_blank">
+                        <a href="{{ user.website_url }}" target="_blank" class="profile-url">
                         {{ user.website_url }}
                         </a>
                         {% else %}N/A{% endif %}

static/css/profile.css

@@ -46,9 +46,12 @@
     display: block;
 }
 
+.card .card-body a.profile-url {
+    font-size: 1rem;
+}
+
 .card .card-body p.profile-website-url a {
     text-transform: lowercase;
-    font-size: 1rem;
 }
 /* For specific color targeting of 'o' chars in keeping with the CI Logo */
 
@@ -66,4 +69,4 @@ hr.thick {
 html form label,
 .dark-text {
     font-weight: 700;
-}
+}