= computed(() => {
@@ -93,7 +97,11 @@ const handleSubmit = async (e) => {
+ :class="{ 'opacity-25': form.processing }" :disabled="form.processing" :icon="mdiBookEdit" small />
+
diff --git a/resources/js/Pages/Editor/Dataset/RejectToReviewer.vue b/resources/js/Pages/Editor/Dataset/RejectToReviewer.vue
new file mode 100644
index 0000000..7889c2c
--- /dev/null
+++ b/resources/js/Pages/Editor/Dataset/RejectToReviewer.vue
@@ -0,0 +1,117 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ form.errors.server_state }}
+
+
+
+
+
+
+ {{ form.errors.reject_editor_note }}
+
+
+
+
+
+
+
+
+
+
+
+
+
Be Warned
+
{{ flash.warning }}
+
+
{{ formatServerState(dataset.server_state) }}
+
+
+
+
+ {{ dataset.reject_editor_note }}
+
+
+
+
+ |
@@ -146,12 +163,13 @@ const formatServerState = (state: string) => {
-
diff --git a/resources/js/Pages/Reviewer/Dataset/Review.vue b/resources/js/Pages/Reviewer/Dataset/Review.vue
index fc12153..b33500b 100644
--- a/resources/js/Pages/Reviewer/Dataset/Review.vue
+++ b/resources/js/Pages/Reviewer/Dataset/Review.vue
@@ -10,17 +10,20 @@ import BaseButtons from '@/Components/BaseButtons.vue';
import { stardust } from '@eidellev/adonis-stardust/client';
import { mdiArrowLeftBoldOutline, mdiGlasses } from '@mdi/js';
import FormValidationErrors from '@/Components/FormValidationErrors.vue';
-import { mdiReiterate } from '@mdi/js';
+import { mdiReiterate, mdiBookOpenPageVariant, mdiFinance } from '@mdi/js';
+import MapComponentView from '@/Components/Map/MapComponentView.vue';
+import IconSvg from '@/Components/Icons/IconSvg.vue';
+import CardBoxSimple from '@/Components/CardBoxSimple.vue';
const props = defineProps({
dataset: {
type: Object,
default: () => ({}),
},
- fields: {
- type: Object,
- required: true,
- },
+ // fields: {
+ // type: Object,
+ // required: true,
+ // },
can: {
type: Object,
default: () => ({}),
@@ -34,18 +37,6 @@ const errors: Ref = computed(() => {
return usePage().props.errors;
});
-// const form = useForm({
-// preferred_reviewer: '',
-// preferred_reviewer_email: '',
-// preferation: 'yes_preferation',
-
-// // preferation: '',
-// // isPreferationRequired: false,
-// });
-
-
-// const isPreferationRequired = computed(() => form.preferation === 'yes_preferation');
-
const handleSubmit = async (e) => {
e.preventDefault();
@@ -53,6 +44,19 @@ const handleSubmit = async (e) => {
// await form.put(stardust.route('dataset.releaseUpdate', [props.dataset.id]));
// // await form.put(stardust.route('editor.dataset.update', [props.dataset.id]));
};
+
+
+const getFileSize = (file: File) => {
+ if (file.size > 1024) {
+ if (file.size > 1048576) {
+ return Math.round(file.size / 1048576) + 'mb';
+ } else {
+ return Math.round(file.size / 1024) + 'kb';
+ }
+ } else {
+ return file.size + 'b';
+ }
+}
@@ -64,7 +68,7 @@ const handleSubmit = async (e) => {
-
+
@@ -74,26 +78,546 @@ const handleSubmit = async (e) => {
-
-
-
-
+
+
+
+
+ Language
+
+
+
+
+ {{ dataset.language || 'Not specified' }}
+
+
+
-
-
-
+
+ Licenses
+
+
+
+
+
+ {{ license.name }}
+
+
+
+
+
+ No licenses specified
+
+
+ Total licenses: {{ dataset.licenses.length }}
+
+
+
+
+ Dataset Type
+
+
+
+
+ {{ dataset.type || 'Not specified' }}
+
+
+
+
+
+
+
+ Creating
+ Corporation
+
+
+
+
+
+ {{ dataset.creating_corporation || 'Not specified' }}
+
+
+
+
+
+
+
+ Project
+
+
+ {{ dataset.project?.label || 'Not specified' }}
+
+
+
+
+
+ Embargo Date
+
+
+ {{ dataset.embargo_date }}
+
+
+ No embargo date set
+
+
+
+
+
+ Main Title
+
+
+
+ {{ dataset.titles[0].language }}
+
+
+ Main
+
+
+
+ {{ dataset.titles[0].value }}
+
+
+
+
+
+ Additional Titles
+
+
+
+
+
+
+ {{ title.language }}
+
+
+ {{ title.type }}
+
+
+
+ {{ title.value }}
+
+
+
+
+
+ Total titles: {{ dataset.titles.length }}
+
+
+ Main Abstract
+
+
+
+ {{ dataset.descriptions[0].language }}
+
+
+ Abstract
+
+
+
+
+ {{ dataset.descriptions[0].value }}
+
+
+
+
+
+ Additional
+ Descriptions
+
+
+
+
+
+ {{ item.language }}
+
+
+ {{ item.type }}
+
+
+
+ {{ item.value }}
+
+
+
+
+
+
+ Total descriptions: {{ dataset.descriptions.length }}
+
+
+
+
+
+
+
+
+ {{ author.academic_title }} {{ author.first_name }} {{ author.last_name
+ }}
+
+
+
+
+ {{ author.email
+ }}
+
+
+
+
+ ORCID: {{
+ author.identifier_orcid
+ }}
+
+
+
+
+
+ {{ author.academic_title }}
+
+
+
+
+
+
+ Total authors: {{ dataset.authors.length }}
+
+
+ No contributors defined
+
+
+
+
+
+
+
+
+ {{ contributor.academic_title }} {{ contributor.first_name }} {{
+ contributor.last_name
+ }}
+
+
+ {{ contributor.pivot_contributor_type }}
+
+
+
+
+
+ {{
+ contributor.email }}
+
+
+
+
+ ORCID: {{
+ contributor.identifier_orcid }}
+
+
+
+
+
+ {{ contributor.academic_title }}
+
+
+
+
+
+
+ Total contributors: {{ dataset.contributors.length }}
+
+ Geographic Coverage
+
+
+
+
+
+
+
+
+
+ Geographic extent of the dataset
+
+
+
+
+
+
+
+ {{ dataset.coverage.x_min }}
+
+
+
+
+
+
+
+
+
+ {{ dataset.coverage.x_max }}
+
+
+
+
+
+
+
+
+
+ {{ dataset.coverage.y_min }}
+
+
+
+
+
+
+
+
+
+ {{ dataset.coverage.y_max }}
+
+
+
+
+ Dataset References:
+
+
+
+
+
+ {{ item.value
+ }}
+ {{ item.label
+ }}
+
+
+
+ {{ item.type }}
+
+
+ {{ item.relation }}
+
+
+
+
+
+
+ Total references: {{ dataset.references.length }}
+
+
+ Keywords/Subjects:
+
+
+
+ {{ subject.value }}
+ ({{ subject.type
+ }})
+
+
+
+ Total keywords: {{ dataset.subjects.length }}
+
+ Dataset Files
+
+
+
+
+
+
+
+ {{ file.label }}
+
+
+ {{ getFileSize(file) }}
+
+
+
+
+
+
+
+
+ No files attached to this dataset
+
+
+ Total files: {{ dataset.files.length }}
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/start/routes.ts b/start/routes.ts
index c979b51..ad28a87 100644
--- a/start/routes.ts
+++ b/start/routes.ts
@@ -392,7 +392,16 @@ router
.as('editor.file.download')
.where('id', router.matchers.number())
.use([middleware.auth(), middleware.can(['dataset-editor-update'])]);
-
+ router
+ .get('dataset/:id/rejectToReviewer', [EditorDatasetController, 'rejectToReviewer'])
+ .as('editor.dataset.rejectToReviewer')
+ .where('id', router.matchers.number())
+ .use([middleware.auth(), middleware.can(['dataset-editor-reject'])]);
+ router
+ .put('dataset/:id/rejectToReviewer', [EditorDatasetController, 'rejectToReviewerUpdate'])
+ .as('editor.dataset.rejectToReviewerUpdate')
+ .where('id', router.matchers.number())
+ .use([middleware.auth(), middleware.can(['dataset-editor-reject'])]);
router
.get('dataset/:id/publish', [EditorDatasetController, 'publish'])
.as('editor.dataset.publish')
@@ -437,6 +446,11 @@ router
.as('reviewer.dataset.reviewUpdate')
.where('id', router.matchers.number())
.use([middleware.auth(), middleware.can(['dataset-review'])]);
+ router
+ .get('/file/download/:id', [ReviewerDatasetController, 'download'])
+ .as('reviewer.file.download')
+ .where('id', router.matchers.number())
+ .use([middleware.auth(), middleware.can(['dataset-review'])]);
router
.get('dataset/:id/reject', [ReviewerDatasetController, 'reject'])
.as('reviewer.dataset.reject')
|