Merge pull request 'bugfix/187-nan-date' (#193) from bugfix/187-nan-date into release

Reviewed-on: https://gitea.pangea.org/trustchain-oc1-orchestral/IdHub/pulls/193

idhub/admin/forms.py

@@ -248,6 +248,7 @@ class ImportForm(forms.Form):
         # convert dates to iso 8601
         for col in df.select_dtypes(include='datetime').columns:
             df[col] = df[col].dt.strftime("%Y-%m-%d")
+        df.fillna('', inplace=True)
 
         # convert numbers to strings if this is indicate in schema
         for col in props.keys():

idhub/templates/credentials/membership-card.json

@@ -57,7 +57,7 @@
     "identityNumber": "{{ identityNumber }}",
     "organisation": "{{ organisation }}",
     "membershipType": "{{ membershipType }}",
-    "membershipId": "{{ vc_id }}",
+    "membershipId": "{{ membershipId }}",
     "affiliatedSince": "{{ affiliatedSince }}",
     "affiliatedUntil": "{{ affiliatedUntil }}"
   },

idhub/templates/idhub/admin/issue_credentials.html

@@ -10,11 +10,11 @@
     </h3>
   </div>
   <div class="col text-end">
-    {% if object.get_status == 'Issued' %}
+    {% if object.status == 2 %}
     <a class="btn btn-green-admin me-2" href="{% url 'idhub:admin_credential_json' object.id %}">{% trans 'Download as JSON' %}</a>
     <a class="btn btn-yellow" class="btn btn-orange" data-bs-toggle="modal" data-bs-target="#confirm-revoke" href="javascript:void()">{% trans 'Revoke' %}</a>
     {% endif %}
-    {% if object.get_status == 'Enabled' %}
+    {% if object.status == 1 %}
     <a class="btn btn-orange" class="btn btn-orange" data-bs-toggle="modal" data-bs-target="#confirm-delete" href="javascript:void()">{% trans 'Delete' %}</a>
     {% endif %}
   </div>
@@ -46,7 +46,7 @@
       <strong>{% trans 'Status' %}:</strong>
       </div>
       <div class="col bg-light text-secondary">
-        {{ object.get_status}}
+        {{ object.get_status }}
       </div>
     </div>
   </div>

idhub/templates/idhub/user/credential.html

@@ -9,7 +9,7 @@
       {{ subtitle }}
     </h3>
   </div>
-  {% if object.get_status == 'Issued' %}
+  {% if object.status == 2 %}
     {% if object.eidas1_did and admin_validated %}
     <div class="col text-end">
       <a class="btn btn-green-user me-2" href="{{ url_ca }}">{% trans 'Download as PDF (Catalan)' %}</a>
@@ -20,12 +20,12 @@
     {% endif %}
   {% endif %}
   <div class="col text-end">
-    {% if object.get_status == 'Issued' %}
+    {% if object.status == 2 %}
       {% if object.eidas1_did and admin_validated %}
       {% endif %}
       <a class="btn btn-green-user" href="{% url 'idhub:user_credential_json' object.id %}">{% trans 'Download as JSON' %}</a>
     {% endif %}
-    {% if object.get_status == 'Enabled' %}
+    {% if object.status == 1 %}
       <a class="btn btn-green-user" href="{% url 'idhub:user_credentials_request' %}">{% trans 'Request credential' %}</a>
     {% endif %}
   </div>
@@ -57,7 +57,7 @@
       <strong>{% trans 'Status' %}:</strong>
       </div>
       <div class="col bg-light text-secondary">
-        {{ object.get_status}}
+        {{ object.get_status }}
       </div>
     </div>
   </div>