diff --git a/dspace/config/item-submission.xml b/dspace/config/item-submission.xml index 2bacbb0856d6..ad860a894dee 100644 --- a/dspace/config/item-submission.xml +++ b/dspace/config/item-submission.xml @@ -53,10 +53,10 @@ --> - - - - submit.progressbar.describe.umdType - org.dspace.app.rest.submit.step.DescribeStep - submission-form - - - - submit.progressbar.describe.mhheaType - org.dspace.app.rest.submit.step.DescribeStep - submission-form + + submit.progressbar.describe.stepone + org.dspace.app.rest.submit.step.DescribeStep + submission-form - + submit.progressbar.describe.stepone org.dspace.app.rest.submit.step.DescribeStep submission-form @@ -465,7 +458,6 @@ - @@ -477,12 +469,11 @@ collection --> - - + - --> + diff --git a/dspace/config/submission-forms.xml b/dspace/config/submission-forms.xml index a13529edb6b2..d426f99b32b2 100644 --- a/dspace/config/submission-forms.xml +++ b/dspace/config/submission-forms.xml @@ -1325,9 +1325,26 @@ - - -
+ + + dc @@ -1358,10 +1375,365 @@ + + + + + dc + contributor + author + true + + onebox + Enter the author's name (Last name, First name). + You must enter an author for this item. + + + + + dc + contributor + advisor + true + + onebox + Enter the advisor's name (Last name, First name). + + + + + + dc + title + + false + + onebox + Enter the main title of the item. + You must enter a main title for this item. + + + + + dc + title + alternative + true + + onebox + If the item has any alternative titles, please enter them here. + + + + + + dc + date + issued + false + + + date + Please give the date of previous publication or public distribution. + You can leave out the day and/or month if they aren't applicable. + + You must enter at least the year. + + + dc + publisher + + false + + + onebox + Enter the name of the publisher of the previously issued instance of this item. + + + + + + dc + description + uri + true + + + + Article, + Audiovisual, + Book, + Book chapter, + + Dissertation, + Image, + Preprint, + Presentation, + Report, + + Thesis, + Working Paper, + Other + + onebox + + Enter the DOI (Digital Object Identifier) or other external link to the published version of this research work. + + + ^(https*|DOI):(\/\/)*.* + + + + + dc + description + uri + true + + + + Dataset, + Software + + onebox + + Enter the link to any research publication supported by the dataset or software. If available, please use the DOI (Digital Object Identifier) for the publication. + + + ^(https*|DOI):(\/\/)*.* + + + + + dc + identifier + citation + false + + + + Article, + Audiovisual, + Book, + Book chapter, + + Dissertation, + Image, + Preprint, + Presentation, + Report, + + Thesis, + Working Paper, + Other + + onebox + If the item has been previously published or has a corresponding publication, enter its bibliographic citation. + + + + + + dc + identifier + citation + false + + + + Dataset, + Software + + onebox + Enter the standard citation for any research publication supported by the dataset or software. + + + + + + dc + relation + ispartofseries + true + + + + Article, + Audiovisual, + Book, + Book chapter, + + Dissertation, + Image, + Preprint, + Presentation, + Report, + + Thesis, + Working Paper, + Other + + series + Enter the series and number assigned to this item by your community. + + + + + + dc + identifier + + + true + + + + Article, + Audiovisual, + Book, + Book chapter, + + Dissertation, + Image, + Preprint, + Presentation, + Report, + + Thesis, + Working Paper, + Other + + qualdrop_value + If the item has any identification numbers or codes associated with + it, please enter the types and the actual numbers or codes. + + + + + + + dc + language + iso + false + + dropdown + Select the language of the main content of the item. If the language does not appear in the + list, please select 'Other'. If the content does not really have a language (for example, if it + is a dataset or an image) please select 'N/A'. + + + + + + + dc + subject + + true + + onebox + Enter appropriate subject keywords or phrases. To add multiple subject keywords, enter one term or phrase at a time and then click "Add more". + + + + + + dc + description + abstract + false + + textarea + Enter the abstract of the item. + + + + + + dc + description + sponsorship + false + + textarea + Enter the names of any sponsors and/or funding codes in the box. + + + + + + dc + description + + false + + + + Article, + Audiovisual, + Book, + Book chapter, + + Dissertation, + Image, + Preprint, + Presentation, + Report, + + Thesis, + Working Paper, + Other + + textarea + Enter any other description or comments in this box. + + + + + + dc + description + + false + + + + Dataset, + Software + + textarea + Description of methods used for data collection/generation, processing, analysis, standards, quality-assurance procedures, etc. + + + +
- -
+ + + dc @@ -1375,11 +1747,14 @@ Please select a type for this item. -
- - -
+ + dc @@ -1710,6 +2085,7 @@ +
diff --git a/dspace/docs/DrumSubmissionForms.md b/dspace/docs/DrumSubmissionForms.md index 1d2d19816ac8..51f03363cf30 100644 --- a/dspace/docs/DrumSubmissionForms.md +++ b/dspace/docs/DrumSubmissionForms.md @@ -16,6 +16,7 @@ process. * LIBDRUM-729 * LIBDRUM-747 * LIBDRUM-876 +* LIBDRUM-909 ## Submission Forms @@ -132,15 +133,29 @@ DSpace: ### Equitable Access Submission Form Changes -Both the default and MHHEA submission forms have a "Submission Type" step that -contains the "Type" field. - In the default submission form, selecting "Article" in the "Type" field dynamically displays the "Equitable Access" field. In the MHHEA form, the "Equitable Access" field is never displayed, as MHHEA submissions are never added to the "Equitable Access Policy" collection. +The disparate treatment of the "Equitable Access" between the default and MHHEA +submission forms is handled by having completely separate configurations for +these forms (see "umdDescribe" and "mhheaDescribe" in +"dspace/config/submission-forms.xml"). + +Each form definition has a "custom" and "common" section. The "custom" section +in each definition handles the "Equitable Access" field. The "common" section +in each definition are the fields that are the same in both forms. + +Keeping the two "common" sections in sync must be done manually. + +**Note:** The initial implementation of the "Equitable Access" functionality in +LIBDRUM-876 used separate submission form configurations to handle the "custom" +(Type, Equitable Access) functionality and a single "common" configuration for +the remaining fields. Unfortunately, this resulted in issues such as +LIBDRUM-909, in which required field warnings were not being displayed. + ### "local.equitableAccessSubmission" metadata field A "local.equitableAccessSubmission" metadata field was added to track the user's diff --git a/dspace/docs/DrumTestPlan.md b/dspace/docs/DrumTestPlan.md index f015f93a4ea0..bae742a4d52e 100644 --- a/dspace/docs/DrumTestPlan.md +++ b/dspace/docs/DrumTestPlan.md @@ -170,17 +170,17 @@ The "New item" modal dialog will be displayed. 6.3) Upload a PDF file to the page by dragging and dropping it onto the page. -6.4) Change the "Type" dropdown in the "Submission Type" panel to "Article". +6.4) Change the "Type" dropdown in the "Describe" panel to "Article". Verify that an additional "Equitable Access" dropdown with the label > Is this article being submitted to comply with the "Equitable Access to > Scholarly Articles Authored by University Faculty" > () policy?" -is added to the "Submission Type" panel. +is displayed. 6.5) Change the "Type" dropdown to "Book". Verify that the "Equitable Access" -dropdown field is removed from the "Submission Type" panel. +dropdown field is removed. 6.6) Fill out the following fields: