Skip to content

Commit

Permalink
Merge pull request #1157 from NFDI4Chem/remove-studies
Browse files Browse the repository at this point in the history 
fix: replace the word "study" with "sample"
  • Loading branch information
@CS76
CS76 authored Aug 14, 2024
2 parents aad1a62 + fa6c89e commit 5ddaa59
Show file tree
Hide file tree
Showing 8 changed files with 25 additions and 16 deletions.
4 changes: 2 additions & 2 deletions resources/js/App/Tour.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,14 +168,14 @@ export default {
header: {
title: "Studies",
},
content: `<small>In this panel, you have a view of all the studies in the project with the datasets they include.</small> `,
content: `<small>In this panel, you have a view of all the samples in the project with the datasets they include.</small> `,
},
{
target: "#tour-step-select-exp",
header: {
title: "Select Experiments",
},
content: `<small>You can navigate through different datasets (experiments) within the study through this dropdown.</small>`,
content: `<small>You can navigate through different datasets (experiments) within the sample through this dropdown.</small>`,
},
{
target: "#tour-step-nmrium",
Expand Down
4 changes: 2 additions & 2 deletions resources/js/Pages/Public/Project/Samples.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
>
<div class="flex items-baseline justify-between">
<div>
<h2 class="text-lg mb-3 font-bold">Studies</h2>
<h2 class="text-lg mb-3 font-bold">Samples</h2>
<div
v-if="!loading"
class="flex items-center mr-4 w-full"
Expand Down Expand Up @@ -65,7 +65,7 @@
<div
class="ml-3 font-semibold text-sm text-gray-600 uppercase tracking-wider"
>
No studies
No samples
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion resources/js/Pages/Study/Index.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
<div
class="ml-3 font-semibold text-sm text-gray-600 uppercase tracking-wider"
>
No studies that match the search query
No samples that match the search query
</div>
</div>
<button
Expand Down
9 changes: 5 additions & 4 deletions resources/js/Pages/Study/Layout.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@
v-if="study.is_deleted"
class="text-center px-3 py-1 bg-red-50 text-red-700 border-b"
>
<b>Warning: </b> This study is deleted. At the end of the 30-day
period, this study and all of its resources will be deleted
permanently and cannot be recovered. You can only restore a
deleted study/project within the 30-day recovery period.
<b>Warning: </b> This sample is deleted. At the end of the
30-day period, this sample and all of its resources will be
deleted permanently and cannot be recovered. You can only
restore a deleted study/project within the 30-day recovery
period.
</div>
<div>
<div
Expand Down
2 changes: 1 addition & 1 deletion resources/js/Pages/Study/Partials/Create.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
createStudyForm.description
"
name="description"
placeholder="Describe this study in atleast 20 characters."
placeholder="Describe this sample in at least 20 characters."
rows="3"
class="shadow-sm focus:ring-indigo-500 focus:border-indigo-500 block w-full sm:text-sm border-gray-300 rounded-md"
/>
Expand Down
2 changes: 1 addition & 1 deletion resources/js/Pages/Study/Partials/Delete.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<template #content>
<div class="max-w-xl text-sm text-gray-600">
Once your study is deleted, all of its resources and data will
Once your sample is deleted, all of its resources and data will
be permanently deleted. Before deleting your study, please
download any data or information that you wish to retain.
</div>
Expand Down
10 changes: 9 additions & 1 deletion resources/js/Shared/Citation.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,15 @@
</div>
<div class="ml-3 w-full">
<p class="text-md text-blue-700">
Cite this {{ model }}

<div v-if="model == 'study'">
Cite this sample
</div>
<div v-else>
Cite this {{ model }}
</div>


<select
v-model="selectedFormat"
class="-mt-2 -mr-2 block rounded-md border-gray-300 py-1 pl-3 pr-10 text-base focus:border-indigo-500 focus:outline-none focus:ring-indigo-500 sm:text-sm float-right"
Expand Down
8 changes: 4 additions & 4 deletions resources/js/Shared/Submission.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -258,10 +258,10 @@
project can have multiple
studies.
<b class="text-teal-700"
>A study corresponds to
a group of NMR
experiments of one
sample</b
>A sample study
corresponds to a group
of NMR experiments of
one sample</b
>, e.g. 1H, 13C, APT, COSY
HSQC, HMBC, NOESY in Bruker
Format or (another study) in
Expand Down

0 comments on commit 5ddaa59

Please sign in to comment.