Certification dev

.github/workflows/build-push-images-release.yaml

@@ -66,7 +66,7 @@ jobs:
         with:
           images: ${{ secrets.DOCKERHUB_REPO }}/projecta-uwsgi
           tags: |
-            type=semver,pattern=\d.\d.\d
+            type=semver,pattern={{version}}
             type=ref,event=branch
             type=ref,event=pr
 

README-dev.md

@@ -33,9 +33,9 @@ When it's done, you can continue with this command:
 Linux and MacOS:
 
 ```
+cp docker-compose.override.example.yml docker-compose.override.yml
 make build-devweb
 make devweb
-cp docker-compose.override.example.yml docker-compose.override.yml
 ```
 
 In case you don't get some not installed packages, you can run this 
@@ -54,6 +54,7 @@ repeatable steps:
 Windows:
 
 ```
+copy docker-compose.override.example.yml docker-compose.override.yml
 make-devbuild.bat
 make-devweb.bat
 ```

deployment/docker/Dockerfile

@@ -6,7 +6,7 @@ MAINTAINER Tim Sutton<tim@kartoza.com>
 #RUN  ln -s /bin/true /sbin/initctl
 
 # Pandoc needed to generate rst dumps, uic compressor needed for django-pipeline
-RUN apt-get update -y; apt-get -y --force-yes install yui-compressor gettext
+RUN apt-get update -y && apt-get -y --force-yes install yui-compressor gettext
 RUN wget https://github.com/jgm/pandoc/releases/download/1.17.1/pandoc-1.17.1-2-amd64.deb
 RUN dpkg -i pandoc-1.17.1-2-amd64.deb && rm pandoc-1.17.1-2-amd64.deb
 
@@ -18,7 +18,7 @@ ENV CRYPTOGRAPHY_DONT_BUILD_RUST=1
 ADD deployment/docker/REQUIREMENTS.txt /REQUIREMENTS.txt
 ADD deployment/docker/uwsgi.conf /uwsgi.conf
 ADD django_project /home/web/django_project
-RUN pip install -r /REQUIREMENTS.txt
+RUN pip install --upgrade pip && pip install -r /REQUIREMENTS.txt
 RUN pip install uwsgi
 
 
@@ -50,7 +50,7 @@ RUN echo "export VISIBLE=now" >> /etc/profile
 # End of cut & paste section
 
 ADD deployment/docker/REQUIREMENTS-dev.txt /REQUIREMENTS-dev.txt
-RUN pip install -r /REQUIREMENTS-dev.txt
+RUN pip install --upgrade pip && pip install -r /REQUIREMENTS-dev.txt
 ADD deployment/docker/bashrc /root/.bashrc
 
 # --------------------------------------------------------

deployment/docker/REQUIREMENTS.txt

@@ -44,3 +44,4 @@ pinax-notifications==5.0.3
 pinax-templates==2.0.2
 # rich text editor
 django-tinymce==3.2.0
+django-sorting-bootstrap==2.8.0

django_project/.version

@@ -1 +1 @@
-2.2.0
+2.3.1

django_project/certification/admin.py

@@ -4,6 +4,7 @@
 from django.contrib.gis import admin
 from simple_history.admin import SimpleHistoryAdmin
 from certification.models.certificate import Certificate
+from certification.models.certificate_type import CertificateType
 from certification.models.course import Course
 from certification.models.training_center import TrainingCenter
 from certification.models.course_convener import CourseConvener
@@ -34,6 +35,15 @@ def queryset(self, request):
         return query_set
 
 
+class CertificateTypeAdmin(admin.ModelAdmin):
+    """CertificateType admin model."""
+
+    list_display = ('name', 'wording', 'order')
+    list_editable = ('order', )
+    search_fields = ('name', 'wording')
+    ordering = ('order', )
+
+
 class AttendeeAdmin(admin.ModelAdmin):
     """Attendee admin model."""
     list_display = ('firstname', 'surname', 'email', 'certifying_organisation')
@@ -163,6 +173,7 @@ class StatusAdmin(admin.ModelAdmin):
 
 
 admin.site.register(Certificate, CertificateAdmin)
+admin.site.register(CertificateType, CertificateTypeAdmin)
 admin.site.register(Attendee, AttendeeAdmin)
 admin.site.register(Course, CourseAdmin)
 admin.site.register(CourseType, CourseTypeAdmin)

django_project/certification/forms.py

@@ -18,9 +18,13 @@
     Fieldset,
     Submit,
     Field,
+    HTML
 )
 from .models import (
     CertifyingOrganisation,
+    CertifyingOrganisationChecklist,
+    CertificateType,
+    CertificateChecklist,
     CourseConvener,
     CourseType,
     TrainingCenter,
@@ -68,6 +72,27 @@ def __init__(self, *args, **kwargs):
         form_title = 'New Certifying Organisation for %s' % self.project.name
         self.helper = FormHelper()
         self.helper.include_media = False
+        self.RESPONSE_NAME_PREFIX = 'checklist-response'
+
+        # additional layout for checklist questions
+        self.certificate_checklists = CertificateChecklist.objects.filter(
+                is_archived=False, is_additional_response_enabled=True).all()
+        checklist_questions = []
+        if CertificateChecklist.objects.filter(
+                is_archived=False,
+                is_additional_response_enabled=True).exists():
+            checklist_questions.append(
+                HTML('<legend>Please answer the following questions</legend>')
+            )
+        for _ in self.certificate_checklists:
+            checklist_questions.append(
+                Field(
+                    f'{self.RESPONSE_NAME_PREFIX}_{_.id}',
+                    css_class='form-control',
+                    label=f'{_.question}'
+                )
+            )
+
         layout = Layout(
             Fieldset(
                 form_title,
@@ -79,8 +104,9 @@ def __init__(self, *args, **kwargs):
                 Field('organisation_phone', css_class='form-control'),
                 Field('logo', css_class='form-control'),
                 Field('organisation_owners', css_class='form-control'),
+                *checklist_questions,
                 Field('project', css_class='form-control'),
-                css_id='project-form')
+                css_id='project-form'),
         )
         self.helper.layout = layout
         self.helper.html5_required = False
@@ -90,12 +116,40 @@ def __init__(self, *args, **kwargs):
         self.fields['organisation_owners'].initial = [self.user]
         self.fields['project'].initial = self.project
         self.fields['project'].widget = forms.HiddenInput()
+        # additional fields for checklist questions
+        for cl in self.certificate_checklists:
+            field_name = f'{self.RESPONSE_NAME_PREFIX}_{cl.id}'
+            self.fields[field_name] = forms.CharField(
+                widget=forms.Textarea(),
+                label=f'{cl.question}'
+            )
+            if (self.instance and
+                    cl.certifyingorganisationchecklist_set.filter(
+                        certifying_organisation=self.instance).exists()):
+                applicant_resp = cl.certifyingorganisationchecklist_set.filter(
+                    certifying_organisation=self.instance
+                ).last().applicant_response
+                self.fields[field_name].initial = applicant_resp
         self.helper.add_input(Submit('submit', 'Submit'))
 
     def save(self, commit=True):
         instance = super(CertifyingOrganisationForm, self).save(commit=False)
         instance.save()
         self.save_m2m()
+        # save the checklist_response
+        for cl in self.certificate_checklists:
+            cert_org_cl, _ = (
+                CertifyingOrganisationChecklist.objects.get_or_create(
+                    question=cl, certifying_organisation=instance
+                )
+            )
+            if cl.is_additional_response_enabled:
+                field_name = f'{self.RESPONSE_NAME_PREFIX}_{cl.id}'
+                response_text = None
+                if self.cleaned_data[field_name]:
+                    response_text = self.cleaned_data[field_name]
+                cert_org_cl.applicant_response = response_text
+                cert_org_cl.save()
         return instance
 
 
@@ -156,6 +210,7 @@ class Meta:
             'user',
             'degree',
             'signature',
+            'is_active',
         )
 
     def __init__(self, *args, **kwargs):
@@ -171,6 +226,7 @@ def __init__(self, *args, **kwargs):
                 Field('user', css_class='form-control chosen-select'),
                 Field('degree', css_class='form-control'),
                 Field('signature', css_class='form-control'),
+                Field('is_active', css_class='checkbox-primary'),
             )
         )
         self.helper.layout = layout
@@ -303,6 +359,7 @@ class Meta:
             'end_date',
             'template_certificate',
             'certifying_organisation',
+            'certificate_type',
         )
 
     def __init__(self, *args, **kwargs):
@@ -322,14 +379,16 @@ def __init__(self, *args, **kwargs):
                 Field('start_date', css_class='form-control'),
                 Field('end_date', css_class='form-control'),
                 Field('template_certificate', css_class='form-control'),
+                Field('certificate_type', css_class='form-control'),
             )
         )
         self.helper.layout = layout
         self.helper.html5_required = False
         super(CourseForm, self).__init__(*args, **kwargs)
         self.fields['course_convener'].queryset = \
             CourseConvener.objects.filter(
-                certifying_organisation=self.certifying_organisation)
+                certifying_organisation=self.certifying_organisation,
+                is_active=True)
         self.fields['course_convener'].label_from_instance = \
             lambda obj: "%s <%s>" % (obj.user.get_full_name(), obj)
         self.fields['course_type'].queryset = \
@@ -342,6 +401,10 @@ def __init__(self, *args, **kwargs):
             self.certifying_organisation
         self.fields['certifying_organisation'].widget = forms.HiddenInput()
         self.helper.add_input(Submit('submit', 'Submit'))
+        self.fields['certificate_type'].queryset = \
+            CertificateType.objects.filter(
+                projectcertificatetype__project=
+                self.certifying_organisation.project)
 
     def save(self, commit=True):
         instance = super(CourseForm, self).save(commit=False)

django_project/certification/migrations/0007_certificatetype.py

@@ -0,0 +1,34 @@
+# Generated by Django 2.2.18 on 2021-12-03 00:56
+
+from django.db import migrations, models
+
+
+def add_certification_type_as_existing_value(apps, schema_editor):
+    CertificateType = apps.get_model('certification', 'CertificateType')
+    CertificateType.objects.create(
+        name='attendance and completion',
+        wording='Has attended and completed the course:',
+        order=0
+    )
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('certification', '0006_auto_20210730_0615'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='CertificateType',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(help_text='Certificate type.', max_length=200, unique=True)),
+                ('description', models.TextField(blank=True, help_text='Certificate type description - 1000 characters limit.', max_length=1000, null=True)),
+                ('wording', models.CharField(help_text='Wording that will be placed on certificate. e.g. "Has attended and completed".', max_length=500)),
+                ('order', models.IntegerField(blank=True, null=True, unique=True)),
+            ],
+        ),
+
+        migrations.RunPython(add_certification_type_as_existing_value, reverse_code=migrations.RunPython.noop),
+    ]

django_project/certification/migrations/0007_courseconvener_is_active.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.2.18 on 2021-11-26 04:51
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('certification', '0006_auto_20210730_0615'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='courseconvener',
+            name='is_active',
+            field=models.BooleanField(default=True, help_text='Inactive Convener will not be available in your organisation list.'),
+        ),
+    ]

django_project/certification/migrations/0008_projectcertificatetype.py

@@ -0,0 +1,38 @@
+# Generated by Django 2.2.18 on 2021-12-10 02:23
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+def create_existing_project_certificate_type(apps, schema_editor):
+    CertificateType = apps.get_model('certification', 'CertificateType')
+    ProjectCertificateType = apps.get_model('certification', 'ProjectCertificateType')
+    Project = apps.get_model('base', 'Project')
+    certificate_type = CertificateType.objects.filter(
+        name='attendance and completion').first()
+    projects = Project.objects.all()
+
+    for project in projects:
+        ProjectCertificateType.objects.create(
+            project=project,
+            certificate_type=certificate_type
+        )
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('base', '0006_auto_20210308_0244'),
+        ('certification', '0007_certificatetype'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='ProjectCertificateType',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('certificate_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='certification.CertificateType')),
+                ('project', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='base.Project')),
+            ],
+        ),
+
+        migrations.RunPython(create_existing_project_certificate_type, reverse_code=migrations.RunPython.noop),
+    ]

django_project/certification/migrations/0009_course_certificate_type.py

@@ -0,0 +1,41 @@
+# Generated by Django 2.2.18 on 2021-12-10 08:31
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+def set_existing_certificate_type_value(apps, shcema_editor):
+    CertificateType = apps.get_model('certification', 'CertificateType')
+    Course = apps.get_model('certification', 'Course')
+    certificate_type = CertificateType.objects.filter(
+        name='attendance and completion').first()
+    courses = Course.objects.all()
+
+    for course in courses:
+        course.certificate_type = certificate_type
+        course.save(update_fields=['certificate_type'])
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('certification', '0008_projectcertificatetype'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='course',
+            name='certificate_type',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to='certification.CertificateType'),
+        ),
+
+        migrations.RunPython(set_existing_certificate_type_value, reverse_code=migrations.RunPython.noop),
+
+        migrations.AlterField(
+            model_name='course',
+            name='certificate_type',
+            field=models.ForeignKey(null=False, on_delete=django.db.models.deletion.PROTECT,
+                                    to='certification.CertificateType'),
+            preserve_default=False,
+        ),
+
+    ]