thesis: add defense and submission date

Author: kpsherva

invenio_rdm_records/assets/semantic-ui/js/invenio_rdm_records/src/deposit/customFields/Thesis.js

@@ -19,6 +19,8 @@ export class Thesis extends Component {
       university,
       department,
       type,
+      date_submitted: dateSubmitted,
+      date_defended: dateDefended,
       icon,
       label,
     } = this.props;
@@ -61,6 +63,26 @@ export class Thesis extends Component {
               <label className="helptext mb-0">{type.description}</label>
             )}
           </Grid.Column>
+          <Grid.Column width="8">
+            <Input
+              fieldPath={`${fieldPath}.date_submitted`}
+              label={dateSubmitted.label}
+              placeholder={dateSubmitted.placeholder}
+            />
+            {dateSubmitted.description && (
+              <label className="helptext mb-0">{dateSubmitted.description}</label>
+            )}
+          </Grid.Column>
+          <Grid.Column width="8">
+            <Input
+              fieldPath={`${fieldPath}.date_defended`}
+              label={dateDefended.label}
+              placeholder={dateDefended.placeholder}
+            />
+            {dateDefended.description && (
+              <label className="helptext mb-0">{dateDefended.description}</label>
+            )}
+          </Grid.Column>
         </Grid>
       </>
     );
@@ -72,6 +94,8 @@ Thesis.propTypes = {
   university: PropTypes.object.isRequired,
   department: PropTypes.object.isRequired,
   type: PropTypes.object.isRequired,
+  date_submitted: PropTypes.object.isRequired,
+  date_defended: PropTypes.object.isRequired,
   icon: PropTypes.string,
   label: PropTypes.string,
 };

invenio_rdm_records/contrib/thesis/custom_fields.py

@@ -16,7 +16,7 @@
 from invenio_i18n import lazy_gettext as _
 from invenio_records_resources.services.custom_fields import BaseCF
 from marshmallow import fields
-from marshmallow_utils.fields import SanitizedUnicode
+from marshmallow_utils.fields import SanitizedUnicode, EDTFLevel2DateString
 
 
 class ThesisCF(BaseCF):
@@ -30,6 +30,8 @@ def field(self):
                 "university": SanitizedUnicode(),
                 "department": SanitizedUnicode(),
                 "type": SanitizedUnicode(),
+                "date_submitted": EDTFLevel2DateString(),
+                "date_defended": EDTFLevel2DateString(),
             }
         )
 
@@ -42,6 +44,8 @@ def mapping(self):
                 "university": {"type": "keyword"},
                 "department": {"type": "keyword"},
                 "type": {"type": "keyword"},
+                "date_submitted": {"type": "keyword"},
+                "date_defended": {"type": "keyword"},
             },
         }
 
@@ -81,6 +85,20 @@ def mapping(self):
                         "The type of thesis (e.g. Masters, PhD, Engineers, Bachelors)"
                     ),
                 },
+                "date_submitted": {
+                    "label": _("Submission date"),
+                    "placeholder": "",
+                    "description": _(
+                        "Submission date in YYYY-MM-DD format."
+                    ),
+                },
+                "date_defended": {
+                    "label": _("Defense date"),
+                    "placeholder": "",
+                    "description": _(
+                        "Defense date in YYYY-MM-DD format."
+                    ),
+                },
             },
         }
     ],