move html from Contributor to partial templates

SciPost_v1/settings/base.py

@@ -122,6 +122,7 @@ SHELL_PLUS_POST_IMPORTS = (
          'VettedCommentaryFactory',
          'UnvettedCommentaryFactory',
          'UnpublishedVettedCommentaryFactory',)),
+    ('scipost.factories', ('ContributorFactory')),
 )
 
 MATHJAX_ENABLED = True

scipost/factories.py

@@ -22,6 +22,8 @@ class ContributorFactory(factory.django.DjangoModelFactory):
     country_of_employment = factory.Iterator(list(COUNTRIES))
     affiliation = factory.Faker('company')
     expertises = factory.Iterator(SCIPOST_SUBJECT_AREAS[0][1], getter=lambda c: [c[0]])
+    personalwebpage = factory.Faker('domain_name')
+    address = factory.Faker('address')
 
     class Meta:
         model = Contributor

scipost/models.py

@@ -108,64 +108,6 @@ class Contributor(models.Model):
         self.key_expires = datetime.datetime.now() + datetime.timedelta(days=2)
         self.save()
 
-    def private_info_as_table(self):
-        template = Template('''
-            <table>
-            <tr><td>Title: </td><td>&nbsp;</td><td>{{ title }}</td></tr>
-            <tr><td>First name: </td><td>&nbsp;</td><td>{{ first_name }}</td></tr>
-            <tr><td>Last name: </td><td>&nbsp;</td><td>{{ last_name }}</td></tr>
-            <tr><td>Email: </td><td>&nbsp;</td><td>{{ email }}</td></tr>
-            <tr><td>ORCID id: </td><td>&nbsp;</td><td>{{ orcid_id }}</td></tr>
-            <tr><td>Country of employment: </td><td>&nbsp;</td>
-            <td>{{ country_of_employment }}</td></tr>
-            <tr><td>Affiliation: </td><td>&nbsp;</td><td>{{ affiliation }}</td></tr>
-            <tr><td>Address: </td><td>&nbsp;</td><td>{{ address }}</td></tr>
-            <tr><td>Personal web page: </td><td>&nbsp;</td><td>{{ personalwebpage }}</td></tr>
-            <tr><td>Accept SciPost emails: </td><td>&nbsp;</td><td>{{ accepts_SciPost_emails }}</td></tr>
-            </table>
-        ''')
-        context = Context({
-            'title': self.get_title_display(),
-            'first_name': self.user.first_name,
-            'last_name': self.user.last_name,
-            'email': self.user.email,
-            'orcid_id': self.orcid_id,
-            'country_of_employment': str(self.country_of_employment.name),
-            'affiliation': self.affiliation,
-            'address': self.address,
-            'personalwebpage': self.personalwebpage,
-            'accepts_SciPost_emails': self.accepts_SciPost_emails,
-        })
-        return template.render(context)
-
-    def public_info_as_table(self):
-        """Prints out all publicly-accessible info as a table."""
-
-        template = Template('''
-            <table>
-            <tr><td>Title: </td><td>&nbsp;</td><td>{{ title }}</td></tr>
-            <tr><td>First name: </td><td>&nbsp;</td><td>{{ first_name }}</td></tr>
-            <tr><td>Last name: </td><td>&nbsp;</td><td>{{ last_name }}</td></tr>
-            <tr><td>ORCID id: </td><td>&nbsp;</td><td>{{ orcid_id }}</td></tr>
-            <tr><td>Country of employment: </td><td>&nbsp;</td>
-            <td>{{ country_of_employment }}</td></tr>
-            <tr><td>Affiliation: </td><td>&nbsp;</td><td>{{ affiliation }}</td></tr>
-            <tr><td>Personal web page: </td><td>&nbsp;</td><td>{{ personalwebpage }}</td></tr>
-            </table>
-        ''')
-        context = Context({
-                'title': self.get_title_display(),
-                'first_name': self.user.first_name,
-                'last_name': self.user.last_name,
-                'email': self.user.email,
-                'orcid_id': self.orcid_id,
-                'country_of_employment': str(self.country_of_employment.name),
-                'affiliation': self.affiliation,
-                'address': self.address,
-                'personalwebpage': self.personalwebpage
-                })
-        return template.render(context)
-
     def discipline_as_string(self):
         # Redundant, to be removed in future
         return self.get_discipline_display()

scipost/templates/scipost/_private_info_as_table.html

+<table>
+    <tr><td>Title: </td><td>&nbsp;</td><td>{{ contributor.get_title_display }}</td></tr>
+    <tr><td>First name: </td><td>&nbsp;</td><td>{{ contributor.user.first_name }}</td></tr>
+    <tr><td>Last name: </td><td>&nbsp;</td><td>{{ contributor.user.last_name }}</td></tr>
+    <tr><td>Email: </td><td>&nbsp;</td><td>{{ contributor.user.email }}</td></tr>
+    <tr><td>ORCID id: </td><td>&nbsp;</td><td>{{ contributor.orcid_id }}</td></tr>
+    <tr><td>Country of employment: </td><td>&nbsp;</td>
+    <td>{{ contributor.country_of_employment.name }}</td></tr>
+    <tr><td>Affiliation: </td><td>&nbsp;</td><td>{{ contributor.affiliation }}</td></tr>
+    <tr><td>Address: </td><td>&nbsp;</td><td>{{ contributor.address }}</td></tr>
+    <tr><td>Personal web page: </td><td>&nbsp;</td><td>{{ contributor.personalwebpage }}</td></tr>
+    <tr><td>Accept SciPost emails: </td><td>&nbsp;</td><td>{{ contributor.accepts_SciPost_emails }}</td></tr>
+</table>

scipost/templates/scipost/_public_info_as_table.html

+<table>
+    <tr><td>Title: </td><td>&nbsp;</td><td>{{ contributor.get_title_display }}</td></tr>
+    <tr><td>First name: </td><td>&nbsp;</td><td>{{ contributor.user.first_name }}</td></tr>
+    <tr><td>Last name: </td><td>&nbsp;</td><td>{{ contributor.user.last_name }}</td></tr>
+    <tr><td>ORCID id: </td><td>&nbsp;</td><td>{{ contributor.orcid_id }}</td></tr>
+    <tr><td>Country of employment: </td><td>&nbsp;</td>
+    <td>{{ contributor.country_of_employment.name }}</td></tr>
+    <tr><td>Affiliation: </td><td>&nbsp;</td><td>{{ contributor.affiliation }}</td></tr>
+    <tr><td>Personal web page: </td><td>&nbsp;</td><td>{{ contributor.personalwebpage }}</td></tr>
+</table>

scipost/templates/scipost/contributor_info.html

@@ -15,7 +15,8 @@
     </div>
 </div>
 
-{{ contributor.public_info_as_table }}
+{% include "scipost/_public_info_as_table.html" with contributor=contributor %}
+
 <br>
 {% if contributor_publications %}
     {# <hr>#}

scipost/templates/scipost/personal_page.html

@@ -81,7 +81,7 @@
             <div class="row">
                 <div class="col-md-6">
                     <h3>Your personal details:</h3>
-                    {{ contributor.private_info_as_table }}
+                    {% include "scipost/_private_info_as_table.html" with contributor=contributor %}
 
                     <h3 class="mt-3">Your main discipline:</h3>
                     <ul><li>{{ contributor.discipline_as_string }}</li></ul>

scipost/templates/scipost/vet_registration_requests.html

@@ -41,7 +41,7 @@ $(function() {
     {% if not forloop.first %}<hr class="small">{% endif %}
     <div class="row">
         <div class="col-md-4">
-            {{ contributor_to_vet.private_info_as_table }}
+            {% include "scipost/_private_info_as_table.html" with contributor=contributor %}
         </div>
         <div class="col-md-8">
             <form action="{% url 'scipost:vet_registration_request_ack' contributor_id=contributor_to_vet.id %}" method="post">