trustchain-oc1-orchestral
/
devicehub-teal
Archived
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #219 from RubenPX/feature/Search 

Feature: Search lots and devices
This commit is contained in:
Santiago L 2022-04-12 13:01:58 +02:00 committed by GitHub
parent 63d99998a2 3feb84cf02
commit 232d40c059
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 605 additions and 414 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -8,6 +8,7 @@ ml).
## master
## testing
- [added] #219 add functionality to searchbar (Lots and devices)
- [changed] #211 Print DHID-QR label for selected devices.
- [fixed] #214 Login workflow

5
development-setup.md
View File

@ -30,11 +30,6 @@ Create a demo table
export dhi=dbtest; dh dummy
```
copy `examples/app.py` to project directory:
```bash
copy examples/app.py .
```
## Run project
Run the app

177
ereuse_devicehub/static/js/main_inventory.js
View File

@ -180,3 +180,180 @@ function export_file(type_file) {
$("#exportAlertModal").click();
}
}
window.addEventListener("DOMContentLoaded", () => {
var searchForm = document.getElementById("SearchForm")
var inputSearch = document.querySelector("#SearchForm > input")
var doSearch = true
const Api = {
/**
* get lots id
* @returns get lots
*/
async get_lots() {
var request = await this.doRequest(API_URLS.lots, "GET", null)
if (request != undefined) return request.items
throw request
},
/**
* Get filtered devices info
* @param {number[]} ids devices ids
* @returns full detailed device list
*/
async get_devices(id) {
var request = await this.doRequest(API_URLS.devices + '?filter={"devicehub_id": ["' + id + '"]}', "GET", null)
if (request != undefined) return request.items
throw request
},
/**
*
* @param {string} url URL to be requested
* @param {String} type Action type
* @param {String | Object} body body content
* @returns {Object[]}
*/
async doRequest(url, type, body) {
var result;
try {
result = await $.ajax({
url: url,
type: type,
headers: {
"Authorization": API_URLS.Auth_Token
},
body: body
});
return result
} catch (error) {
console.error(error)
throw error
}
}
}
searchForm.addEventListener("submit", (event) => {
event.preventDefault();
})
let timeoutHandler = setTimeout(() => { }, 1)
let dropdownList = document.getElementById("dropdown-search-list")
let defaultEmptySearch = document.getElementById("dropdown-search-list").innerHTML
inputSearch.addEventListener("input", (e) => {
clearTimeout(timeoutHandler)
let searchText = e.target.value
if (searchText == '') {
document.getElementById("dropdown-search-list").innerHTML = defaultEmptySearch;
return
}
let resultCount = 0;
function searchCompleted() {
resultCount++;
if (resultCount < 2 && document.getElementById("dropdown-search-list").children.length > 0) {
setTimeout(() => {
document.getElementById("dropdown-search-list").innerHTML = `
<li id="deviceSearchLoader" class="dropdown-item">
<i class="bi bi-x-lg"></i>
<span style="margin-right: 10px">Nothing found</span>
</li>`
}, 100)
}
}
timeoutHandler = setTimeout(async () => {
dropdownList.innerHTML = `
<li id="deviceSearchLoader" class="dropdown-item">
<i class="bi bi-laptop"></i>
<div class="spinner-border spinner-border-sm" role="status">
<span class="visually-hidden">Loading...</span>
</div>
</li>
<li id="lotSearchLoader" class="dropdown-item">
<i class="bi bi-folder2"></i>
<div class="spinner-border spinner-border-sm" role="status">
<span class="visually-hidden">Loading...</span>
</div>
</li>`;
try {
Api.get_devices(searchText.toUpperCase()).then(devices => {
dropdownList.querySelector("#deviceSearchLoader").style = "display: none"
for (let i = 0; i < devices.length; i++) {
const device = devices[i];
// See: ereuse_devicehub/resources/device/models.py
var verboseName = `${device.type} ${device.manufacturer} ${device.model}`
const templateString = `
<li>
<a class="dropdown-item" href="${API_URLS.devices_detail.replace("ReplaceTEXT", device.devicehubID)}" style="display: flex; align-items: center;" href="#">
<i class="bi bi-laptop"></i>
<span style="margin-right: 10px">${verboseName}</span>
<span class="badge bg-secondary" style="margin-left: auto;">${device.devicehubID}</span>
</a>
</li>`;
dropdownList.innerHTML += templateString
if (i == 4) { // Limit to 4 resullts
break;
}
}
searchCompleted();
})
} catch (error) {
dropdownList.innerHTML += `
<li id="deviceSearchLoader" class="dropdown-item">
<i class="bi bi-x"></i>
<div class="spinner-border spinner-border-sm" role="status">
<span class="visually-hidden">Error searching devices</span>
</div>
</li>`;
console.log(error);
}
try {
Api.get_lots().then(lots => {
dropdownList.querySelector("#lotSearchLoader").style = "display: none"
for (let i = 0; i < lots.length; i++) {
const lot = lots[i];
if (lot.name.toUpperCase().includes(searchText.toUpperCase())) {
const templateString = `
<li>
<a class="dropdown-item" href="${API_URLS.lots_detail.replace("ReplaceTEXT", lot.id)}" style="display: flex; align-items: center;" href="#">
<i class="bi bi-folder2"></i>
<span style="margin-right: 10px">${lot.name}</span>
</a>
</li>`;
dropdownList.innerHTML += templateString
if (i == 4) { // Limit to 4 resullts
break;
}
}
}
searchCompleted();
})
} catch (error) {
dropdownList.innerHTML += `
<li id="deviceSearchLoader" class="dropdown-item">
<i class="bi bi-x"></i>
<div class="spinner-border spinner-border-sm" role="status">
<span class="visually-hidden">Error searching lots</span>
</div>
</li>`;
console.log(error);
}
}, 1000)
})
})

22
ereuse_devicehub/templates/ereuse_devicehub/base_site.html
View File

@ -12,9 +12,15 @@
</div><!-- End Logo -->
<div class="search-bar">
<form class="search-form d-flex align-items-center" method="POST" action="#">
<input type="text" name="query" placeholder="Search" title="Enter search keyword">
<form class="search-form d-flex align-items-center" method="POST" id="SearchForm" action="#">
<input class="dropdown-toggle" type="text" name="query" placeholder="Search" title="Enter search keyword" autocomplete="off" id="dropdownSearch" data-bs-toggle="dropdown" aria-expanded="false">
<button type="submit" title="Search"><i class="bi bi-search"></i></button>
<ul class="dropdown-menu" autoClose="outside" aria-labelledby="dropdownSearch" id="dropdown-search-list" style="min-width: 100px;">
<li class="dropdown-header"><h6 class="dropdown-header">You can search:</h6></li>
<li class="dropdown-item"><i class="bi bi-laptop"></i> Devices <span class="badge bg-secondary" style="float: right;">DHID</span></li>
<li class="dropdown-item"><i class="bi bi-folder2"></i> lots <span class="badge bg-secondary" style="float: right;">Name</span></li>
</ul>
</form>
</div><!-- End Search Bar -->
@ -224,4 +230,16 @@
</div>
</footer><!-- End Footer -->
<!-- API_CALLS -->
<script>
const API_URLS = {
Auth_Token: `Basic ${btoa("{{ current_user.token }}:")}`, //
currentUserID: "{{ current_user.id }}",
lots: "{{ url_for('Lot.main') }}",
lots_detail: "{{ url_for('inventory.lotdevicelist', lot_id='ReplaceTEXT') }}",
devices: "{{ url_for('Device.main') }}",
devices_detail: "{{ url_for('inventory.device_details', id='ReplaceTEXT')}}"
}
</script>
{% endblock body %}