Merge pull request #443 from CDLUC3/feature-432-433-DOI-registration

Feature 432 433 doi registration

Author: rushirajnenuji

impl/datacite_xml.py

@@ -413,6 +413,7 @@ def temp_mockFormElements():
         'creators-creator-0-nameIdentifier_1-schemeURI': '',
         'dates-date-0-date': '',
         'dates-date-0-dateType': '',
+        'dates-date-0-dateInformation': '',
         'descriptions-description-0-description': '',
         'descriptions-description-0-descriptionType': '',
         'descriptions-description-0-{http://www.w3.org/XML/1998/namespace}lang': '',

impl/form_objects.py

@@ -749,10 +749,13 @@ class DateForm(django.forms.Form):
         ("Submitted", _("Submitted")),
         ("Updated", _("Updated")),
         ("Valid", _("Valid")),
+        ("Withdrawn", _("Withdrawn")),
+        ("Other", _("Other"))
     )
     dateType = django.forms.ChoiceField(
         required=False, label=_("Type"), choices=DATE_TYPES
     )
+    dateInformation = django.forms.CharField(required=False, label=_("Date Information"))
 
 
 class AltIdForm(django.forms.Form):
@@ -989,6 +992,7 @@ def __init__(self, *args, **kwargs):
             ("ISNI", "ISNI"),
             ("GRID", "GRID"),
             ("Crossref Funder ID", _("Crossref Funder")),
+            ("ROR", "ROR"),
             ("Other", "Other"),
         )
         self.fields["funderIdentifier-funderIdentifierType"] = django.forms.ChoiceField(

templates/create/_datacite_date.html

@@ -21,6 +21,7 @@
 {{ form.non_field_errors }}
 {% include "create/_datacite_inlinetext.html" with field=form.date %}
 {% include "create/_datacite_inlineselect.html" with field=form.dateType %}
+{% include "create/_datacite_inlinetext.html" with field=form.dateInformation %}
   </div>
 {% endfor %}
 </div>