scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-09-06 13:14:29 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #8759 from aignatov-bio/ai-sci-12219-fix-experiment-status

Browse source 
Fix experiment status and replace group icon [SCI-12219]
This commit is contained in:
aignatov-bio 2025-08-08 11:59:43 +02:00 • committed by GitHub
commit 77ee3a2b42
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/javascript/vue/experiments/renderers/status.vue
View file

@ -39,9 +39,16 @@ export default {
},
methods: {
optionRenderer(option) {
let color = 'bg-sn-grey-500';
if (option[0] === 'in_progress') {
color = 'bg-sn-science-blue';
} else if (option[0] === 'done') {
color = 'bg-sn-alert-green';
}
return `
<div class="flex items-center gap-2">
<div class="${this.statusColor(option[0])} w-3 h-3 rounded-full"></div>
<div class="${color} w-3 h-3 rounded-full"></div>
<span>${option[1]}</span>
</div>`;
},

2
app/javascript/vue/shared/access_modal/assign_flyout.vue
View file

@ -37,7 +37,7 @@
<perfect-scrollbar class="max-h-80 relative">
<div v-for="userGroup in filteredUserGroups" :key="userGroup.id" class="py-2 flex items-center w-full">
<div>
<img src="/images/icon/group.png" class="rounded-full w-8 h-8">
<img src="/images/icon/group.svg" class="rounded-full w-8 h-8">
</div>
<div
class="truncate ml-2"

2
app/javascript/vue/shared/access_modal/edit.vue
View file

@ -50,7 +50,7 @@
<div>
<img
class="rounded-full w-8 h-8"
src="/images/icon/group.png"
src="/images/icon/group.svg"
>
</div>
<div class="truncate">

BIN
public/images/icon/group.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 935 B

5
public/images/icon/group.svg Normal file
View file

@ -0,0 +1,5 @@
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<rect x="0.5" y="0.5" width="23" height="23" rx="11.5" fill="#F9F9F9"/>
<rect x="0.5" y="0.5" width="23" height="23" rx="11.5" stroke="#EAECF0"/>
<path d="M4.50001 17.8331V16.6663C4.50001 16.2744 4.60001 15.9412 4.80001 15.6662C5.00001 15.3912 5.26689 15.1663 5.60001 14.9994C6.32501 14.6494 7.04189 14.3744 7.75814 14.1744C8.47439 13.9744 9.33314 13.8744 10.3331 13.8744C11.3331 13.8744 12.1913 13.9744 12.9081 14.1744C13.625 14.3744 14.3413 14.6494 15.0663 14.9994C15.3994 15.1663 15.6663 15.3912 15.8663 15.6662C16.0663 15.9412 16.1663 16.2744 16.1663 16.6663V17.8331H4.50001ZM10.3331 12C9.64126 12 9.05001 11.7581 8.56626 11.2669C8.08314 10.7837 7.83314 10.1919 7.83314 9.5C7.83314 8.80813 8.07501 8.23313 8.56626 7.74188C9.04939 7.25 9.64126 7 10.3331 7C11.025 7 11.6 7.25 12.0913 7.74188C12.5831 8.23375 12.8331 8.825 12.8331 9.5C12.8331 10.175 12.5831 10.7831 12.0913 11.2669C11.5994 11.75 11.0081 12 10.3331 12ZM16.3919 9.5C16.3919 10.1919 16.1419 10.7831 15.65 11.2669C15.1581 11.7506 14.5669 12 13.8919 12C13.85 12 13.8 12 13.75 11.9919C13.6919 11.9919 13.65 11.9837 13.625 11.9837C13.9 11.6337 14.1169 11.2506 14.275 10.8256C14.425 10.4006 14.5 9.95875 14.5 9.50063C14.5 9.0425 14.4169 8.62563 14.2581 8.20875C14.1 7.79188 13.8831 7.40063 13.625 7.04188C13.6669 7.025 13.7081 7.01687 13.75 7.00875C13.7919 7.00875 13.8419 7.00063 13.8919 7.00063C14.575 7.00063 15.1588 7.25062 15.65 7.7425C16.1413 8.23437 16.3919 8.82563 16.3919 9.50063V9.5ZM5.33314 17H15.3331V16.6669C15.3331 16.475 15.2831 16.3 15.1831 16.1587C15.0831 16.0087 14.9163 15.8669 14.6663 15.7338C14.0413 15.4006 13.3831 15.1506 12.6994 14.9756C12.0075 14.8006 11.2244 14.7175 10.3325 14.7175C9.44064 14.7175 8.65752 14.8006 7.96564 14.9756C7.27376 15.1506 6.62376 15.4006 5.99876 15.7338C5.74876 15.8756 5.57376 16.0169 5.48189 16.1587C5.38189 16.3006 5.34001 16.4756 5.34001 16.6669V17H5.33314ZM10.3331 11.1669C10.7913 11.1669 11.1831 11 11.5081 10.675C11.8331 10.35 12 9.95812 12 9.5C12 9.04188 11.8331 8.65 11.5081 8.325C11.1831 8 10.7913 7.83313 10.3331 7.83313C9.87501 7.83313 9.48314 8 9.15814 8.325C8.83314 8.65 8.66627 9.04188 8.66627 9.5C8.66627 9.95812 8.83314 10.35 9.15814 10.675C9.48314 11 9.87501 11.1669 10.3331 11.1669ZM17.25 16.3169V17.8337H19.5V16.3169C19.5 15.9587 19.4 15.6337 19.2081 15.325C19.0163 15.025 18.7413 14.775 18.3913 14.575C18.0331 14.3831 17.6663 14.2 17.2994 14.0419C16.9325 13.875 16.5494 13.75 16.1663 13.6669C16.5163 13.9919 16.7831 14.3837 16.9663 14.85C17.1494 15.3081 17.25 15.8 17.25 16.3169Z" fill="#1D2939"/>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 2.6 KiB