Student personality fields and capstone proposal tracking

Author: stevebrownlee

.python-version

@@ -1 +1 @@
-3.8.1
+3.9.1

LearningAPI.session.sql

@@ -8,9 +8,6 @@ FROM public."LearningAPI_opportunity";
 SELECT *
 FROM public."LearningAPI_learningrecord";
 
-SELECT *
-FROM public."LearningAPI_LearningRecordEntry";
-
 SELECT *
 FROM public."socialaccount_socialaccount";
 
@@ -25,59 +22,35 @@ FROM public."authtoken_token";
 
 select * from pg_catalog.pg_tables;
 
-SELECT *
-FROM public."LearningAPI_nssusercohort";
-
-INSERT INTO public."LearningAPI_nssusercohort" (cohort_id, nss_user_id)
-VALUES (1, 6);
-
-
-DELETE from public."LearningAPI_nssusercohort"
-where id = 2;
-
-
-INSERT INTO public."LearningAPI_course" (name)
-VALUES ('JavaScript and React');
-
-INSERT INTO public."LearningAPI_book" (name, course_id)
-VALUES ('Bangazon', 1);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+SELECT * FROM public."LearningAPI_studentpersonality";
 
+INSERT INTO public."LearningAPI_studentpersonality"
+    (student_id, briggs_myers_type,
+        bfi_extraversion, bfi_agreeableness, bfi_conscientiousness,
+        bfi_neuroticism, bfi_openness)
+VALUES
+    (2, 'ENTJ-A', 69, 96, 73, 0, 94);
 
+SELECT * FROM  public."LearningAPI_capstone";
+SELECT * FROM  public."LearningAPI_proposalstatus";
 
+INSERT INTO public."LearningAPI_capstonetimeline"
+(capstone_id, status_id, date)
+VALUES
+(3, 1, '2022-11-04');
 
 
+INSERT INTO public."LearningAPI_capstone"
+    (proposal_url, repo_url, course_id,
+     student_id, description)
+VALUES
+    (
+        'http://www.claire.com',
+        'http://www.claire.com',
+        3,
+        56,
+        'Client side capstone proposal'
+    );
 
 
 
@@ -108,11 +81,6 @@ GROUP BY "LearningAPI_cohort"."id"
 ;
 
 
-
-
-
-
-
 select * from public."LearningAPI_learningrecord";
 
 
@@ -128,4 +96,4 @@ left outer join public."LearningAPI_learningrecord" r
         and
         r.student_id = 19
 where r.achieved is NULL
-order by w.tier;
+order by w.tier;

LearningAPI/admin.py

@@ -1,33 +1,42 @@
 from django.contrib import admin
 
-# Register your models here.
 from .models.people import NssUser
-from .models.skill import (
-    CoreSkill, CoreSkillRecord,
-    LearningRecordEntry, LearningRecord, LearningWeight,
-)
+from .models.coursework import Course
+from .models.skill import (CoreSkill, CoreSkillRecord, LearningRecord,
+                           LearningRecordEntry, LearningWeight)
 
 
+@admin.register(Course)
+class CourseAdmin(admin.ModelAdmin):
+    """Core skills"""
+    list_display = ['name',]
+
 @admin.register(CoreSkill)
 class CoreSkillAdmin(admin.ModelAdmin):
+    """Core skills"""
     list_display = ['label',]
 
 @admin.register(CoreSkillRecord)
 class CoreSkillRecordAdmin(admin.ModelAdmin):
+    """Core skill records"""
     list_display = ('student', 'skill', 'level',)
 
 @admin.register(LearningWeight)
 class LearningWeightAdmin(admin.ModelAdmin):
+    """Learning weights"""
     list_display = ['label', 'weight',]
 
 @admin.register(LearningRecord)
 class LearningRecordAdmin(admin.ModelAdmin):
+    """Learning records"""
     list_display = ['student', 'weight',]
 
 @admin.register(LearningRecordEntry)
 class LearningRecordEntryAdmin(admin.ModelAdmin):
+    """Learning record entries"""
     list_display = ['record', 'instructor', 'note']
 
 @admin.register(NssUser)
 class NssUserAdmin(admin.ModelAdmin):
+    """Users"""
     list_display = ['user', 'slack_handle', 'github_handle']

LearningAPI/migrations/0009_alter_learningrecordentry_options_capstone_repo_url_and_more.py

@@ -0,0 +1,36 @@
+# Generated by Django 4.0.3 on 2022-10-26 00:13
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('LearningAPI', '0008_dailystatus'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='learningrecordentry',
+            options={'ordering': ('-recorded_on',)},
+        ),
+        migrations.AddField(
+            model_name='capstone',
+            name='repo_url',
+            field=models.CharField(blank=True, max_length=256, null=True),
+        ),
+        migrations.CreateModel(
+            name='StudentPersonality',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('briggs_myers_type', models.CharField(blank=True, max_length=6, null=True)),
+                ('bfi_extraversion', models.IntegerField()),
+                ('bfi_agreeableness', models.IntegerField()),
+                ('bfi_conscientiousness', models.IntegerField()),
+                ('bfi_neuroticism', models.IntegerField()),
+                ('bfi_openness', models.IntegerField()),
+                ('student', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='personality', to='LearningAPI.nssuser')),
+            ],
+        ),
+    ]

LearningAPI/models/coursework/capstone.py

@@ -2,7 +2,9 @@
 
 
 class Capstone(models.Model):
+    """Capstone model"""
     student = models.ForeignKey("NssUser", on_delete=models.DO_NOTHING, related_name="capstones")
     course = models.ForeignKey("Course", on_delete=models.DO_NOTHING)
     proposal_url = models.CharField(max_length=256)
+    repo_url = models.CharField(max_length=256, blank=True, null=True)
     description = models.CharField(max_length=256)

LearningAPI/models/coursework/capstone_timeline.py

@@ -2,6 +2,6 @@
 
 
 class CapstoneTimeline(models.Model):
-    capstone = models.ForeignKey("Capstone", on_delete=models.DO_NOTHING)
+    capstone = models.ForeignKey("Capstone", on_delete=models.DO_NOTHING, related_name="statuses")
     status = models.ForeignKey("ProposalStatus", on_delete=models.DO_NOTHING)
     date = models.DateField(auto_now=True, auto_now_add=False)

LearningAPI/models/coursework/chapter_note.py

@@ -1,7 +1,9 @@
+"""Chapter note class module"""
 from django.db import models
 
 
 class ChapterNote(models.Model):
+    """Notes for book chapters"""
     user = models.ForeignKey("NssUser", on_delete=models.CASCADE)
     markdown_text = models.TextField()
     chapter = models.ForeignKey("Chapter", on_delete=models.CASCADE)
@@ -14,4 +16,4 @@ def votes(self):
 
     @votes.setter
     def votes(self, value):
-        self.__votes = value
+        self.__votes = value

LearningAPI/models/coursework/course.py

@@ -4,9 +4,15 @@
 class Course(models.Model):
     name = models.CharField(max_length=75)
 
+    def __str__(self) -> str:
+        return self.name
+
     @property
     def chapters(self):
-        return self.__chapters
+        try:
+            return self.__chapters
+        except AttributeError as ex:
+            return 0
 
     @chapters.setter
     def chapters(self, value):

LearningAPI/models/people/__init__.py

@@ -9,3 +9,4 @@
 from .student_assessment_status import StudentAssessmentStatus
 from .student_assessment import StudentAssessment
 from .daily_status import DailyStatus
+from .student_personality import StudentPersonality

LearningAPI/models/people/cohort.py

@@ -22,7 +22,7 @@ def students(self):
         """
         try:
             return self.__students
-        except AttributeError as ex:
+        except AttributeError:
             return 0
 
     @students.setter
@@ -38,10 +38,9 @@ def instructors(self):
         """
         try:
             return self.__instructors
-        except AttributeError as ex:
+        except AttributeError:
             return 0
 
-
     @instructors.setter
     def instructors(self, value):
         self.__instructors = value

LearningAPI/models/people/student_personality.py

@@ -0,0 +1,13 @@
+"""Student personality profile database model"""
+from django.db import models
+
+
+class StudentPersonality(models.Model):
+    """Model for students to enter in their personality profile data"""
+    student = models.OneToOneField("NSSUser", on_delete=models.CASCADE, related_name='personality')
+    briggs_myers_type = models.CharField(max_length=6, null=True, blank=True)
+    bfi_extraversion = models.IntegerField()
+    bfi_agreeableness = models.IntegerField()
+    bfi_conscientiousness = models.IntegerField()
+    bfi_neuroticism = models.IntegerField()
+    bfi_openness = models.IntegerField()

LearningAPI/views/__init__.py

@@ -17,5 +17,9 @@
 from .assessment import StudentAssessmentView
 from .assessment_status import AssessmentStatusView
 from .slack import SlackChannel
+from .slack_message import SlackMessage
 from .core_skill_view import CoreSkillViewSet
 from .core_skill_record_view import CoreSkillRecordViewSet
+from .student_personality_view import StudentPersonalityViewSet
+from .proposal_status import ProposalStatusView
+from .proposal_timeline import TimelineView

LearningAPI/views/assessment.py

@@ -1,11 +1,15 @@
+"""Assessment view module"""
 from django.http import HttpResponseServerError
 from django.utils.decorators import method_decorator
+
 from rest_framework import permissions, serializers, status
-from rest_framework.viewsets import ViewSet
-from rest_framework.response import Response
 from rest_framework.pagination import PageNumberPagination
+from rest_framework.response import Response
+from rest_framework.viewsets import ViewSet
+
 from LearningAPI.decorators import is_instructor
-from LearningAPI.models.people import NssUser, StudentAssessment, StudentAssessmentStatus, Assessment
+from LearningAPI.models.people import (Assessment, NssUser, StudentAssessment,
+                                       StudentAssessmentStatus)
 
 
 class StudentAssessmentPermission(permissions.BasePermission):