WIP Member registry

entrypoint.sh

@@ -49,10 +49,10 @@ case "$1" in
     pip install -r requirements-tests.txt
     wait_redis
     cd $2
+    export TESTS_RUNNING=1
     ./manage.py collectstatic --noinput
     ./manage.py compress
     ./manage.py compilemessages
-    export TESTS_RUNNING=1
     py.test -v --cov serviceform/ --cov tasks/ tests/
   ;;
   'bash')

serviceform/__init__.py

@@ -0,0 +1,6 @@
+import pkg_resources
+
+try:
+    __version__ = pkg_resources.get_distribution("serviceform").version
+except pkg_resources.DistributionNotFound:
+    __version__ = 'not installed'

serviceform/serviceform/admin.py

@@ -177,38 +177,22 @@ class QuestionInline(ResponsibleMixin, GrappelliSortableHiddenMixin, NestedTabul
     fields = ('question', 'responsibles', 'answer_type', 'required', 'order')
 
 
-class EmailTemplateInline(NestedStackedInline):
-    fields = ('name', 'subject', 'content')
-    model = models.EmailTemplate
-    extra = 0
-
-
 class RevisionInline(NestedStackedInline):
     fields = ('name', ('valid_from', 'valid_to'), 'send_emails_after',
-              'send_bulk_email_to_participants')
+              'send_bulk_email_to_participations')
     model = models.FormRevision
     extra = 0
 
 
-class ResponsibilityPersonInline(NestedStackedInline):
-    model = models.ResponsibilityPerson
-    extra = 0
-    fields = (('forenames', 'surname'), ('email', 'phone_number'), 'street_address',
-              ('postal_code', 'city'), 'send_email_notifications', 'hide_contact_details',
-              'show_full_report', 'personal_link')
-    readonly_fields = ('personal_link',)
-
-
 @admin.register(models.ServiceForm)
 class ServiceFormAdmin(OwnerSaveMixin, ExtendedLogMixin, NestedModelAdminMixin,
                        GuardedModelAdminMixin, admin.ModelAdmin):
     class Media:
         css = {'all': ('serviceform/serviceform_admin.css',)}
 
-    inlines = [RevisionInline, EmailTemplateInline, ResponsibilityPersonInline,
-               Level1CategoryInline, QuestionInline]
+    inlines = [RevisionInline, Level1CategoryInline, QuestionInline]
 
-    superuser_actions = ['bulk_email_former_participants', 'bulk_email_responsibles']
+    superuser_actions = ['bulk_email_former_participations', 'bulk_email_responsibles']
     if settings.DEBUG:
         superuser_actions.append('shuffle_data')
 
@@ -227,15 +211,15 @@ class Media:
 
     email_settings = (
         'require_email_verification',
-        'verification_email_to_participant',
+        'verification_email_to_participation',
         'email_to_responsibles',
         'email_to_invited_users',
 
-        'email_to_participant',
-        'resend_email_to_participant',
+        'email_to_participation',
+        'resend_email_to_participation',
 
-        'email_to_participant_on_update',
-        'email_to_former_participants',
+        'email_to_participation_on_update',
+        'email_to_former_participations',
 
         'bulk_email_to_responsibles',
         'email_to_responsible_auth_link',
@@ -262,8 +246,8 @@ class Media:
                  (_('Ownership'), {'fields': ownership}),
                  (_('Email settings'), {'fields': email_settings}),
                  (_('Customization'), {'fields': customization}),
-                 (_('Ask details from participants'), {'fields': visible_contact_details}),
-                 (_('Require details from participants'), {'fields': required_contact_details}),
+                 (_('Ask details from participations'), {'fields': visible_contact_details}),
+                 (_('Require details from participations'), {'fields': required_contact_details}),
                  )
 
     new_fieldsets = ((_('Basic information'), {'fields': basic}),)
@@ -282,12 +266,12 @@ def get_actions(self, request: HttpRequest):
                 actions.pop(a, None)
         return actions
 
-    def bulk_email_former_participants(self, request: HttpRequest,
+    def bulk_email_former_participations(self, request: HttpRequest,
                                        queryset: Iterable[models.ServiceForm]) -> None:
         for serviceform in queryset:
-            serviceform.bulk_email_former_participants()
+            serviceform.bulk_email_former_participations()
 
-    bulk_email_former_participants.short_description = _('Bulk email former participants now!')
+    bulk_email_former_participations.short_description = _('Bulk email former participations now!')
 
     def bulk_email_responsibles(self, request: HttpRequest,
                                 queryset: Iterable[models.ServiceForm]) -> None:
@@ -301,7 +285,7 @@ def shuffle_data(self, request: HttpRequest,
         for serviceform in queryset:
             utils.shuffle_person_data(serviceform)
 
-    shuffle_data.short_description = _('Shuffle participant data')
+    shuffle_data.short_description = _('Shuffle participation data')
 
     def get_queryset(self, request: HttpRequest):
         qs = super().get_queryset(request)
@@ -311,13 +295,13 @@ def get_queryset(self, request: HttpRequest):
     def get_form(self, request: HttpRequest, obj: models.ServiceForm=None, **kwargs):
         form = super().get_form(request, obj, **kwargs)
         if obj:
-            request._responsibles = responsibles = models.ResponsibilityPerson.objects.filter(
-                form=obj)
+            request._responsibles = responsibles = models.Member.objects.filter(
+                organization_id=obj.organization_id)
             form.base_fields['responsible'].queryset = responsibles
             form.base_fields['current_revision'].queryset = models.FormRevision.objects.filter(
                 form=obj)
 
-            emailtemplates = models.EmailTemplate.objects.filter(form=obj)
+            emailtemplates = models.EmailTemplate.objects.filter(organization=obj.organization)
 
             for name, field in form.base_fields.items():
                 if 'email_to' in name:
@@ -353,12 +337,62 @@ class EmailMessageAdmin(ExtendedLogMixin, admin.ModelAdmin):
                     'content_display',)
 
 
-@admin.register(models.Participant)
-class ParticipantAdmin(ExtendedLogMixin, admin.ModelAdmin):
+class MemberInline(NestedStackedInline):
+    model = models.Member
+    extra = 0
+    fields = (('forenames', 'surname'), ('email', 'phone_number'), 'street_address',
+              ('postal_code', 'city'), 'allow_responsible_email',
+              'allow_participation_email', 'hide_contact_details',
+              'show_full_report', 'personal_link')
+    readonly_fields = ('personal_link',)
+
+
+class EmailTemplateInline(NestedStackedInline):
+    fields = ('name', 'subject', 'content')
+    model = models.EmailTemplate
+    extra = 0
+
+
+@admin.register(models.Organization)
+class OrganizationAdmin(ExtendedLogMixin, NestedModelAdminMixin, GuardedModelAdminMixin,
+                        admin.ModelAdmin):
+    list_display = ('name',)
+    inlines = [MemberInline, EmailTemplateInline]
+    basic = ('name', )
+    new_fieldsets = ((_('Basic information'), {'fields': basic}),)
+
+    def get_form(self, request: HttpRequest, obj: models.Organization=None, **kwargs):
+        form = super().get_form(request, obj, **kwargs)
+        if obj:
+            emailtemplates = models.EmailTemplate.objects.filter(organization=obj)
+
+            for name, field in form.base_fields.items():
+                if 'email_to' in name:
+                    field.queryset = emailtemplates
+                    if obj and field.queryset:
+                        field.required = True
+
+        return form
+
+    def save_model(self, request: HttpRequest, obj: models.Organization, form, change: bool):
+        rv = super().save_model(request, obj, form, change)
+        if not change:
+            obj.create_initial_data()
+        return rv
+
+    def get_fieldsets(self, request: HttpRequest, obj: models.Organization=None):
+        return self.new_fieldsets if obj is None else super().get_fieldsets(request, obj)
+
+    def get_inline_instances(self, request: HttpRequest, obj: models.Organization=None):
+        return super().get_inline_instances(request, obj) if obj else []
+
+
+@admin.register(models.Participation)
+class ParticipationAdmin(ExtendedLogMixin, admin.ModelAdmin):
     list_display = (
         'id', '__str__', 'form_display', 'form_revision', 'status', 'activities_display',
-        'created_at', 'last_modified', 'personal_link')
-    fields = ('forenames', 'surname')
+        'created_at', 'last_modified',)
+    fields = ('member',)
 
     def get_queryset(self, request):
         qs = super().get_queryset(request).select_related('form_revision__form')

serviceform/serviceform/emails.py

@@ -21,7 +21,7 @@
 bulk_email_to_responsibles = _("""Dear {{responsible}},
 
 Participation results for {{form}} are now available for you to view.
-You can see all participants for the activities you are responsible of in the following URL:
+You can see all participations for the activities you are responsible of in the following URL:
 {{url}}
 From now on, you will also receive a notification message, if a new participation submitted to
 the areas you are responsible of.You can also adjust your contact details and email notification
@@ -34,7 +34,7 @@
 {{contact}}""")
 
 
-invite = _("""Dear {{participant}},
+invite = _("""Dear {{participation}},
 
 You are invited to participate in "{{ form }}".
 You can fill in your participation details at {{ url }}.
@@ -47,8 +47,8 @@
 
 message_to_responsibles = _("""Dear {{responsible}},
 
-New participation from {{participant}} has just been submitted to {{form}}.
-You can see all participants for the activities you are responsible of in the following URL:
+New participation from {{participation}} has just been submitted to {{form}}.
+You can see all participations for the activities you are responsible of in the following URL:
 {{url}}
 You can also adjust your contact details and email notification preferences from that URL.
 
@@ -58,7 +58,7 @@
 Contact person:
 {{contact}}""")
 
-participant_new_form_revision = _("""Dear {{participant}},
+participation_new_form_revision = _("""Dear {{participation}},
 
 New form revision to "{{ form }}" has been published.
 Please update your participation information at {{ url }}.
@@ -69,7 +69,7 @@
 Contact person:
 {{contact}}""")
 
-participant_on_finish = _("""Dear {{participant}},
+participation_on_finish = _("""Dear {{participation}},
 
 You submitted form "{{ form }}" on {{ last_modified }}.
 If you wish to change any of the details you gave, you can go to {{ url }}.
@@ -80,7 +80,7 @@
 Contact person:
 {{contact}}""")
 
-resend_email_to_participants = _("""Dear {{participant}},
+resend_email_to_participations = _("""Dear {{participation}},
 
 You submitted form "{{ form }}" on {{ last_modified }}.
 If you wish to change any of the details you gave, you can go to {{ url }}.
@@ -91,7 +91,7 @@
 Contact person:
 {{contact}}""")
 
-participant_on_update = _("""Dear {{participant}},
+participation_on_update = _("""Dear {{participation}},
 
 You submitted update to your data on form "{{ form }}" on {{ last_modified }}.
 If you wish to change any of the details you gave, you can go to {{ url }}.
@@ -105,7 +105,7 @@
 
 request_responsible_auth_link = _("""Dear {{responsible}},
 
-You can see all participants for the activities you are responsible of in the following URL:
+You can see all participations for the activities you are responsible of in the following URL:
 {{url}}
 
 Best regards,
@@ -115,7 +115,7 @@
 {{contact}}""")
 
 
-verification_email_to_participant = _("""Dear {{participant}},
+verification_email_to_participation = _("""Dear {{participation}},
 
 Your email address needs to be verified. Please do so by clicking link below. Then you can
 continue filling the form.
@@ -127,3 +127,16 @@
 
 Contact person:
 {{contact}}""")
+
+
+# TODO: check this email content
+email_to_member_auth_link = _("""Dear {{member}},
+
+Here is your link to access your data in {{organization}}:
+{{url}}
+
+Best regards,
+Service form system administrators
+
+Contact person:
+{{contact}}""")

serviceform/serviceform/fields.py

@@ -0,0 +1,14 @@
+from colorful.fields import RGBColorField
+
+
+class ColorField(RGBColorField):
+    def get_prep_value(self, value: 'ColorStr') -> 'Optional[ColorStr]':
+        rv = super().get_prep_value(value)
+        if rv == '#000000':
+            rv = None
+        return rv
+
+    def from_db_value(self, value: 'Optional[ColorStr]', *args):
+        if value is None:
+            return '#000000'
+        return value