scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-20 14:45:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6929 from lasniscinote/gl_SCI_9973

Browse source 
(fix) Update the multiselect dropdown color switch step 2 [SCI-9973]
This commit is contained in:
Martin Artnik 2024-01-12 13:35:44 +01:00 committed by GitHub
parent 71c58e3769 a7f332e630
commit 5251218030
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/javascript/vue/repository_item_sidebar/repository_values/RepositoryStockValue.vue
View file

@ -3,7 +3,16 @@
<div class="font-inter text-sm font-semibold leading-5 relative h-[20px] flex flex-row">
<div class="flex flex-row gap-1">
<span class="truncate w-fit inline-block" :title="colName">{{ colName }}</span>
<div v-if="values?.reminder" class="bg-sn-alert-passion w-1.5 h-1.5 min-w-[0.375rem] min-h-[0.375rem] rounded hover:cursor-pointer" :title="values.reminder_text"></div>
<div v-if="values?.reminder" >
<div v-if="isBetweenThresholdAndDepleted"
class="bg-sn-alert-brittlebush w-1.5 h-1.5 min-w-[0.375rem] min-h-[0.375rem] rounded hover:cursor-pointer"
:title="values.reminder_text">
</div>
<div v-else
class="bg-sn-alert-passion w-1.5 h-1.5 min-w-[0.375rem] min-h-[0.375rem] rounded hover:cursor-pointer"
:title="values.reminder_text">
</div>
</div>
</div>
<a style="text-decoration: none;" class="absolute right-0 btn-text-link font-normal export-consumption-button"
v-if="permissions?.can_export_repository_stock === true && values?.stock_formatted" :data-rows="JSON.stringify([repositoryRowId])"
@ -43,6 +52,10 @@ export default {
if (this.canEdit && this.isEditing) return `${className} border-sn-science-blue`;
if (this.canEdit) return `${className} border-sn-light-grey hover:border-sn-sleepy-grey`;
return '';
},
isBetweenThresholdAndDepleted() {
return Number(this.values.stock_amount) <= Number(this.values.low_stock_threshold)
&& (Number(this.values.stock_amount) > 0);
}
},
data() {

2
app/javascript/vue/shared/checklist_select.vue
View file

@ -48,7 +48,7 @@
:key="option.id"
class="checklist px-3 py-2 rounded hover:bg-sn-super-light-grey cursor-pointer
flex gap-1 justify-start items-center"
:class="option.id === this.lastSelectedOption ? 'bg-sn-super-light-blue' : ''"
:class="option.id === this.lastSelectedOption ? 'bg-sn-super-light-blue hover:bg-sn-super-light-blue' : ''"
@change="toggleOption"
@click="triggerLabelClick($event, option.id)"
>

3
config/environments/development.rb
View file

@ -61,7 +61,7 @@ Rails.application.configure do
config.active_support.disallowed_deprecation_warnings = []
# Raise an error on page load if there are pending migrations.
# config.active_record.migration_error = :page_load
config.active_record.migration_error = :page_load
# Highlight code that triggered database queries in logs.
config.active_record.verbose_query_logs = true
@ -104,4 +104,5 @@ Rails.application.configure do
else
config.x.new_team_on_signup = false
end
config.hosts << "dev.scinote.test"
end