Skip to content

Commit

Permalink
Merge pull request #90 from lcnetdev/search-type-togglewq
Browse files Browse the repository at this point in the history 
Search type toggle
  • Loading branch information
@f-osorio
f-osorio authored Oct 16, 2024
2 parents f9f07ee + 8f6e56b commit 8952dbc
Show file tree
Hide file tree
Showing 3 changed files with 111 additions and 16 deletions.
2 changes: 1 addition & 1 deletion src/components/panels/edit/fields/LookupComplex.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@

</template>

<ComplexLookupModal ref="complexLookupModal" :searchValue="searchValue" :authorityLookup="authorityLookup" @emitComplexValue="setComplexValue" @hideComplexModal="searchValue='';displayModal=false" :structure="structure" v-model="displayModal"/>
<ComplexLookupModal ref="complexLookupModal" :searchValue="searchValue" :authorityLookup="authorityLookup" @emitComplexValue="setComplexValue" @hideComplexModal="searchValue='';displayModal=false;" :structure="structure" v-model="displayModal"/>
<SubjectEditor ref="subjectEditorModal" :profileData="profileData" :searchValue="searchValue" :authorityLookup="authorityLookup" :isLiteral="isLiteral" @subjectAdded="subjectAdded" @hideSubjectModal="hideSubjectModal()" :structure="structure" v-model="displaySubjectModal"/>

</template>
Expand Down
103 changes: 99 additions & 4 deletions src/components/panels/edit/modals/ComplexLookupModal.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,9 @@
currentPage: 1,
maxPage: 0,
activeContext: null
activeContext: null,
searchType: "left",
}
Expand Down Expand Up @@ -150,7 +152,8 @@
}
}
window.clearTimeout(this.searchTimeout)
let searchType = this.searchType
let offset = this.offsetStart
if (this.activeComplexSearch != []) {
offset = this.offsetStep * (this.currentPage - 1)
Expand Down Expand Up @@ -179,6 +182,7 @@
a.urls
.replace('<QUERY>', this.searchValueLocal)
.replace('<OFFSET>', offset)
.replace('<TYPE>', searchType)
)
}
})
Expand Down Expand Up @@ -344,6 +348,15 @@
this.currentPage = 1
this.doSearch()
},
changeSearchType: function(event){
if (event.target.checked){
this.searchType = "keyword"
} else {
this.searchType = "left"
}
this.doSearch()
},
},
Expand Down Expand Up @@ -382,8 +395,19 @@
this.$refs.complexLookupModalDisplay.style.height = this.$refs.complexLookupModalContainer.getBoundingClientRect().height + 'px'
}
if (this.$refs.toggle){
if (this.$refs.toggle.checked){
this.searchType = "keyword"
} else {
this.searchType = "left"
}
}
})
})
},
mounted() {
Expand Down Expand Up @@ -429,10 +453,11 @@

<div class="complex-lookup-modal-search">


<template v-if="preferenceStore.returnValue('--b-edit-complex-use-select-dropdown') === false">
<div class="toggle-btn-grp cssonly">
<div v-for="opt in modalSelectOptions"><input type="radio" :value="opt.label" class="search-mode-radio" v-model="modeSelect" name="searchMode"/><label onclick="" class="toggle-btn">{{opt.label}}</label></div>
</div>

<div v-if="(activeComplexSearch && activeComplexSearch[0] && ((activeComplexSearch[0].total % 25 ) > 0 || activeComplexSearch.length > 0))" class="complex-lookup-paging">
<span>
<a href="#" title="first page" class="first" :class="{off: this.currentPage == 1}" @click="firstPage()">
Expand All @@ -450,7 +475,15 @@
</a>
</span>
</div>
</div>

<div id="container">
<input type="checkbox" id="search-type" class="toggle" name="search-type" value="keyword" @click="changeSearchType($event)" ref="toggle">
<label for="search-type" class="toggle-container">
<div>Left Anchored</div>
<div>Keyword</div>
</label>
</div>

</template>
<template v-if="preferenceStore.returnValue('--b-edit-complex-use-select-dropdown') === true">
<select v-model="modeSelect">
Expand Down Expand Up @@ -748,6 +781,7 @@
display: unset;
float: right;
width: auto !important;
z-index: 1;
}
.material-icons.pagination{
Expand All @@ -767,4 +801,65 @@
content: "\f054";
}
/* toggle */
/* https://hudecz.medium.com/how-to-create-a-pure-css-toggle-button-2fcc955a8984 */
#container{
margin-left: 5px;
}
.toggle {
display: none;
}
.toggle-container {
position: relative;
display: grid;
grid-template-columns: repeat(2, 1fr);
width: fit-content;
border: 3px solid lightskyblue;
border-radius: 20px;
background: lightskyblue;
font-weight: bold;
color: lightskyblue;
cursor: pointer;
}
.toggle-container::before {
content: '';
position: absolute;
width: 50%;
height: 100%;
left: 0%;
border-radius:20px;
background: black;
transition: all 0.3s;
}
.toggle-container div {
padding: 6px;
text-align: center;
z-index: 1;
}
.toggle:checked + .toggle-container::before {
left: 50%;
}
.toggle:checked + .toggle-container div:first-child{
color: black;
transition: color 0.3s;
}
.toggle:checked + .toggle-container div:last-child{
color: lightskyblue;
transition: color 0.3s;
}
.toggle + .toggle-container div:first-child{
color: lightskyblue;
transition: color 0.3s;
}
.toggle + .toggle-container div:last-child{
color: black;
transition: color 0.3s;
}
</style>
22 changes: 11 additions & 11 deletions src/stores/config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export const useConfigStore = defineStore('config', {

versionMajor: 0,
versionMinor: 14,
versionPatch: 40,
versionPatch: 41,

regionUrls: {

Expand Down Expand Up @@ -339,16 +339,16 @@ export const useConfigStore = defineStore('config', {
"processor" : 'lcAuthorities',
"modes":[
{
'NAF All':{"url":"http://preprod.id.loc.gov/authorities/names/suggest2/?q=<QUERY>&count=25&offset=<OFFSET>", "all":true},
'NAF Personal Names':{"url":"http://preprod.id.loc.gov/authorities/names/suggest2/?q=<QUERY>&rdftype=PersonalName&count=25&offset=<OFFSET>"},
'NAF Corporate Name':{"url":"http://preprod.id.loc.gov/authorities/names/suggest2/?q=<QUERY>&rdftype=CorporateName&count=25&offset=<OFFSET>"},
'NAF Name/Title':{"url":"http://preprod.id.loc.gov/authorities/names/suggest2/?q=<QUERY>&rdftype=NameTitle&count=25&offset=<OFFSET>"},
'NAF Title':{"url":"http://preprod.id.loc.gov/authorities/names/suggest2/?q=<QUERY>&rdftype=Title&count=25&offset=<OFFSET>"},
'NAF Geographic':{"url":"http://preprod.id.loc.gov/authorities/names/suggest2/?q=<QUERY>&rdftype=Geographic&count=25&offset=<OFFSET>"},
'NAF Conference Name':{"url":"http://preprod.id.loc.gov/authorities/names/suggest2/?q=<QUERY>&rdftype=ConferenceName&count=25&offset=<OFFSET>"},

'NAF Auth Names':{"url":"http://preprod.id.loc.gov/authorities/names/suggest2/?q=<QUERY>&memberOf=http://id.loc.gov/authorities/subjects/collection_NamesAuthorizedHeadings&count=25&offset=<OFFSET>"},
'NAF Geo SubDiv':{"url":"http://preprod.id.loc.gov/authorities/names/suggest2/?q=<QUERY>&memberOf=http://id.loc.gov/authorities/subjects/collection_GeographicSubdivisions&count=25&offset=<OFFSET>"}
'NAF All':{"url":"http://preprod.id.loc.gov/authorities/names/suggest2/?q=<QUERY>&count=25&offset=<OFFSET>&searchtype=<TYPE>", "all":true},
'NAF Personal Names':{"url":"http://preprod.id.loc.gov/authorities/names/suggest2/?q=<QUERY>&rdftype=PersonalName&count=25&offset=<OFFSET>&searchtype=<TYPE>"},
'NAF Corporate Name':{"url":"http://preprod.id.loc.gov/authorities/names/suggest2/?q=<QUERY>&rdftype=CorporateName&count=25&offset=<OFFSET>&searchtype=<TYPE>"},
'NAF Name/Title':{"url":"http://preprod.id.loc.gov/authorities/names/suggest2/?q=<QUERY>&rdftype=NameTitle&count=25&offset=<OFFSET>&searchtype=<TYPE>"},
'NAF Title':{"url":"http://preprod.id.loc.gov/authorities/names/suggest2/?q=<QUERY>&rdftype=Title&count=25&offset=<OFFSET>&searchtype=<TYPE>"},
'NAF Geographic':{"url":"http://preprod.id.loc.gov/authorities/names/suggest2/?q=<QUERY>&rdftype=Geographic&count=25&offset=<OFFSET>&searchtype=<TYPE>"},
'NAF Conference Name':{"url":"http://preprod.id.loc.gov/authorities/names/suggest2/?q=<QUERY>&rdftype=ConferenceName&count=25&offset=<OFFSET>&searchtype=<TYPE>"},

'NAF Auth Names':{"url":"http://preprod.id.loc.gov/authorities/names/suggest2/?q=<QUERY>&memberOf=http://id.loc.gov/authorities/subjects/collection_NamesAuthorizedHeadings&count=25&offset=<OFFSET>&searchtype=<TYPE>"},
'NAF Geo SubDiv':{"url":"http://preprod.id.loc.gov/authorities/names/suggest2/?q=<QUERY>&memberOf=http://id.loc.gov/authorities/subjects/collection_GeographicSubdivisions&count=25&offset=<OFFSET>&searchtype=<TYPE>"}
}
]

Expand Down

0 comments on commit 8952dbc

Please sign in to comment.