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

Merge pull request #220 from RubenPX/lot-list-2 

Change: Add reactive lots list
This commit is contained in:
Santiago L 2022-04-12 16:33:15 +02:00 committed by GitHub
parent 232d40c059 dada6cc328
commit 160777dc35
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 919 additions and 817 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -8,8 +8,9 @@ ml).
## master ## master
## testing ## testing
- [added] #219 add functionality to searchbar (Lots and devices) - [added] #219 Add functionality to searchbar (Lots and devices).
- [changed] #211 Print DHID-QR label for selected devices. - [changed] #211 Print DHID-QR label for selected devices.
- [changed] #218 Add reactivity to device lots.
- [fixed] #214 Login workflow - [fixed] #214 Login workflow
## [2.0.0] - 2022-03-15 ## [2.0.0] - 2022-03-15

56
ereuse_devicehub/inventory/forms.py
View File

@ -97,62 +97,6 @@ class FilterForm(FlaskForm):
return ['Desktop', 'Laptop', 'Server'] return ['Desktop', 'Laptop', 'Server']
class LotDeviceForm(FlaskForm):
lot = StringField('Lot', [validators.UUID()])
devices = StringField('Devices', [validators.length(min=1)])
def validate(self, extra_validators=None):
is_valid = super().validate(extra_validators)
if not is_valid:
return False
self._lot = (
Lot.query.outerjoin(Trade)
.filter(Lot.id == self.lot.data)
.filter(
or_(
Trade.user_from == g.user,
Trade.user_to == g.user,
Lot.owner_id == g.user.id,
)
)
.one()
)
devices = set(self.devices.data.split(","))
self._devices = (
Device.query.filter(Device.id.in_(devices))
.filter(Device.owner_id == g.user.id)
.distinct()
.all()
)
return bool(self._devices)
def save(self, commit=True):
trade = self._lot.trade
if trade:
for dev in self._devices:
if trade not in dev.actions:
trade.devices.add(dev)
if self._devices:
self._lot.devices.update(self._devices)
db.session.add(self._lot)
if commit:
db.session.commit()
def remove(self, commit=True):
if self._devices:
self._lot.devices.difference_update(self._devices)
db.session.add(self._lot)
if commit:
db.session.commit()
class LotForm(FlaskForm): class LotForm(FlaskForm):
name = StringField('Name', [validators.length(min=1)]) name = StringField('Name', [validators.length(min=1)])

48
ereuse_devicehub/inventory/views.py
View File

@ -16,7 +16,6 @@ from ereuse_devicehub.inventory.forms import (
AllocateForm, AllocateForm,
DataWipeForm, DataWipeForm,
FilterForm, FilterForm,
LotDeviceForm,
LotForm, LotForm,
NewActionForm, NewActionForm,
NewDeviceForm, NewDeviceForm,
@ -109,7 +108,6 @@ class DeviceListMix(GenericMixView):
self.context = { self.context = {
'devices': devices, 'devices': devices,
'lots': lots, 'lots': lots,
'form_lot_device': LotDeviceForm(),
'form_tag_device': TagDeviceForm(), 'form_tag_device': TagDeviceForm(),
'form_new_action': form_new_action, 'form_new_action': form_new_action,
'form_new_allocate': form_new_allocate, 'form_new_allocate': form_new_allocate,
@ -153,46 +151,6 @@ class DeviceDetailView(GenericMixView):
return flask.render_template(self.template_name, **context) return flask.render_template(self.template_name, **context)
class LotDeviceAddView(View):
methods = ['POST']
decorators = [login_required]
template_name = 'inventory/device_list.html'
def dispatch_request(self):
form = LotDeviceForm()
if form.validate_on_submit():
form.save(commit=False)
messages.success(
'Add devices to lot "{}" successfully!'.format(form._lot.name)
)
db.session.commit()
else:
messages.error('Error adding devices to lot!')
next_url = request.referrer or url_for('inventory.devicelist')
return flask.redirect(next_url)
class LotDeviceDeleteView(View):
methods = ['POST']
decorators = [login_required]
template_name = 'inventory/device_list.html'
def dispatch_request(self):
form = LotDeviceForm()
if form.validate_on_submit():
form.remove(commit=False)
messages.success(
'Remove devices from lot "{}" successfully!'.format(form._lot.name)
)
db.session.commit()
else:
messages.error('Error removing devices from lot!')
next_url = request.referrer or url_for('inventory.devicelist')
return flask.redirect(next_url)
class LotCreateView(GenericMixView): class LotCreateView(GenericMixView):
methods = ['GET', 'POST'] methods = ['GET', 'POST']
decorators = [login_required] decorators = [login_required]
@ -607,12 +565,6 @@ devices.add_url_rule(
devices.add_url_rule( devices.add_url_rule(
'/lot/<string:lot_id>/device/', view_func=DeviceListView.as_view('lotdevicelist') '/lot/<string:lot_id>/device/', view_func=DeviceListView.as_view('lotdevicelist')
) )
devices.add_url_rule(
'/lot/devices/add/', view_func=LotDeviceAddView.as_view('lot_devices_add')
)
devices.add_url_rule(
'/lot/devices/del/', view_func=LotDeviceDeleteView.as_view('lot_devices_del')
)
devices.add_url_rule('/lot/add/', view_func=LotCreateView.as_view('lot_add')) devices.add_url_rule('/lot/add/', view_func=LotCreateView.as_view('lot_add'))
devices.add_url_rule( devices.add_url_rule(
'/lot/<string:id>/del/', view_func=LotDeleteView.as_view('lot_del') '/lot/<string:id>/del/', view_func=LotDeleteView.as_view('lot_del')

76
ereuse_devicehub/static/js/api.js Normal file
View File

@ -0,0 +1,76 @@
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(ids) {
var request = await this.doRequest(API_URLS.devices + '?filter={"id": [' + ids.toString() + ']}', "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 search_device(id) {
var request = await this.doRequest(API_URLS.devices + '?filter={"devicehub_id": ["' + id + '"]}', "GET", null)
if (request != undefined) return request.items
throw request
},
/**
* Add devices to lot
* @param {number} lotID lot id
* @param {number[]} listDevices list devices id
*/
async devices_add(lotID, listDevices) {
var queryURL = API_URLS.devices_modify.replace("UUID", lotID) + "?" + listDevices.map(deviceID => "id=" + deviceID).join("&");
return await Api.doRequest(queryURL, "POST", null);
},
/**
* Remove devices from a lot
* @param {number} lotID lot id
* @param {number[]} listDevices list devices id
*/
async devices_remove(lotID, listDevices) {
var queryURL = API_URLS.devices_modify.replace("UUID", lotID) + "?" + listDevices.map(deviceID => "id=" + deviceID).join("&");
return await Api.doRequest(queryURL, "DELETE", null);
},
/**
*
* @param {string} url URL to be requested
* @param {String} type Action type
* @param {String | Object} body body content
* @returns
*/
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;
}
}
}

219
ereuse_devicehub/static/js/main.js
View File

@ -4,7 +4,7 @@
* Author: BootstrapMade.com * Author: BootstrapMade.com
* License: https://bootstrapmade.com/license/ * License: https://bootstrapmade.com/license/
*/ */
(function() { (function () {
"use strict"; "use strict";
/** /**
@ -41,7 +41,7 @@
* Sidebar toggle * Sidebar toggle
*/ */
if (select('.toggle-sidebar-btn')) { if (select('.toggle-sidebar-btn')) {
on('click', '.toggle-sidebar-btn', function(e) { on('click', '.toggle-sidebar-btn', function (e) {
select('body').classList.toggle('toggle-sidebar') select('body').classList.toggle('toggle-sidebar')
}) })
} }
@ -50,7 +50,7 @@
* Search bar toggle * Search bar toggle
*/ */
if (select('.search-bar-toggle')) { if (select('.search-bar-toggle')) {
on('click', '.search-bar-toggle', function(e) { on('click', '.search-bar-toggle', function (e) {
select('.search-bar').classList.toggle('search-bar-show') select('.search-bar').classList.toggle('search-bar-show')
}) })
} }
@ -111,7 +111,7 @@
* Initiate tooltips * Initiate tooltips
*/ */
var tooltipTriggerList = [].slice.call(document.querySelectorAll('[data-bs-toggle="tooltip"]')) var tooltipTriggerList = [].slice.call(document.querySelectorAll('[data-bs-toggle="tooltip"]'))
var tooltipList = tooltipTriggerList.map(function(tooltipTriggerEl) { var tooltipList = tooltipTriggerList.map(function (tooltipTriggerEl) {
return new bootstrap.Tooltip(tooltipTriggerEl) return new bootstrap.Tooltip(tooltipTriggerEl)
}) })
@ -141,31 +141,31 @@
}], }],
["bold", "italic", "underline", "strike"], ["bold", "italic", "underline", "strike"],
[{ [{
color: [] color: []
}, },
{ {
background: [] background: []
} }
], ],
[{ [{
script: "super" script: "super"
}, },
{ {
script: "sub" script: "sub"
} }
], ],
[{ [{
list: "ordered" list: "ordered"
}, },
{ {
list: "bullet" list: "bullet"
}, },
{ {
indent: "-1" indent: "-1"
}, },
{ {
indent: "+1" indent: "+1"
} }
], ],
["direction", { ["direction", {
align: [] align: []
@ -184,8 +184,8 @@
var needsValidation = document.querySelectorAll('.needs-validation') var needsValidation = document.querySelectorAll('.needs-validation')
Array.prototype.slice.call(needsValidation) Array.prototype.slice.call(needsValidation)
.forEach(function(form) { .forEach(function (form) {
form.addEventListener('submit', function(event) { form.addEventListener('submit', function (event) {
if (!form.checkValidity()) { if (!form.checkValidity()) {
event.preventDefault() event.preventDefault()
event.stopPropagation() event.stopPropagation()
@ -209,7 +209,7 @@
const mainContainer = select('#main'); const mainContainer = select('#main');
if (mainContainer) { if (mainContainer) {
setTimeout(() => { setTimeout(() => {
new ResizeObserver(function() { new ResizeObserver(function () {
select('.echart', true).forEach(getEchart => { select('.echart', true).forEach(getEchart => {
echarts.getInstanceByDom(getEchart).resize(); echarts.getInstanceByDom(getEchart).resize();
}) })
@ -217,4 +217,167 @@
}, 200); }, 200);
} }
/**
* Select all functionality
*/
var btnSelectAll = document.getElementById("SelectAllBTN");
var tableListCheckboxes = document.querySelectorAll(".deviceSelect");
function itemListCheckChanged(event) {
let isAllChecked = Array.from(tableListCheckboxes).map(itm => itm.checked);
if (isAllChecked.every(bool => bool == true)) {
btnSelectAll.checked = true;
btnSelectAll.indeterminate = false;
} else if (isAllChecked.every(bool => bool == false)) {
btnSelectAll.checked = false;
btnSelectAll.indeterminate = false;
} else {
btnSelectAll.indeterminate = true;
}
}
tableListCheckboxes.forEach(item => {
item.addEventListener("click", itemListCheckChanged);
})
btnSelectAll.addEventListener("click", event => {
let checkedState = event.target.checked;
tableListCheckboxes.forEach(ckeckbox => ckeckbox.checked = checkedState);
})
/**
* Avoid hide dropdown when user clicked inside
*/
document.getElementById("dropDownLotsSelector").addEventListener("click", event => {
event.stopPropagation();
})
/**
* Search form functionality
*/
window.addEventListener("DOMContentLoaded", () => {
var searchForm = document.getElementById("SearchForm")
var inputSearch = document.querySelector("#SearchForm > input")
var doSearch = true
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++;
setTimeout(() => {
if (resultCount == 2 && document.getElementById("dropdown-search-list").children.length == 2) {
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.search_device(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)
})
})
})(); })();

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

@ -1,359 +1,384 @@
$(document).ready(function () { $(document).ready(function() {
var show_allocate_form = $("#allocateModal").data('show-action-form'); var show_allocate_form = $("#allocateModal").data('show-action-form');
var show_datawipe_form = $("#datawipeModal").data('show-action-form'); var show_datawipe_form = $("#datawipeModal").data('show-action-form');
var show_trade_form = $("#tradeLotModal").data('show-action-form'); var show_trade_form = $("#tradeLotModal").data('show-action-form');
if (show_allocate_form != "None") { if (show_allocate_form != "None") {
$("#allocateModal .btn-primary").show(); $("#allocateModal .btn-primary").show();
newAllocate(show_allocate_form); newAllocate(show_allocate_form);
} else if (show_datawipe_form != "None") { } else if (show_datawipe_form != "None") {
$("#datawipeModal .btn-primary").show(); $("#datawipeModal .btn-primary").show();
newDataWipe(show_datawipe_form); newDataWipe(show_datawipe_form);
} else if (show_trade_form != "None") { } else if (show_trade_form != "None") {
$("#tradeLotModal .btn-primary").show(); $("#tradeLotModal .btn-primary").show();
newTrade(show_trade_form); newTrade(show_trade_form);
} else { } else {
$(".deviceSelect").on("change", deviceSelect); $(".deviceSelect").on("change", deviceSelect);
} }
// $('#selectLot').selectpicker(); // $('#selectLot').selectpicker();
}) })
function deviceSelect() { function deviceSelect() {
var devices_count = $(".deviceSelect").filter(':checked').length; var devices_count = $(".deviceSelect").filter(':checked').length;
get_device_list(); get_device_list();
if (devices_count == 0) { if (devices_count == 0) {
$("#addingLotModal .pol").show(); $("#addingLotModal .pol").show();
$("#addingLotModal .btn-primary").hide(); $("#addingLotModal .btn-primary").hide();
$("#removeLotModal .pol").show(); $("#removeLotModal .pol").show();
$("#removeLotModal .btn-primary").hide(); $("#removeLotModal .btn-primary").hide();
$("#addingTagModal .pol").show(); $("#addingTagModal .pol").show();
$("#addingTagModal .btn-primary").hide(); $("#addingTagModal .btn-primary").hide();
$("#actionModal .pol").show(); $("#actionModal .pol").show();
$("#actionModal .btn-primary").hide(); $("#actionModal .btn-primary").hide();
$("#allocateModal .pol").show(); $("#allocateModal .pol").show();
$("#allocateModal .btn-primary").hide(); $("#allocateModal .btn-primary").hide();
$("#datawipeModal .pol").show(); $("#datawipeModal .pol").show();
$("#datawipeModal .btn-primary").hide(); $("#datawipeModal .btn-primary").hide();
} else { } else {
$("#addingLotModal .pol").hide(); $("#addingLotModal .pol").hide();
$("#addingLotModal .btn-primary").show(); $("#addingLotModal .btn-primary").show();
$("#removeLotModal .pol").hide(); $("#removeLotModal .pol").hide();
$("#removeLotModal .btn-primary").show(); $("#removeLotModal .btn-primary").show();
$("#actionModal .pol").hide(); $("#actionModal .pol").hide();
$("#actionModal .btn-primary").show(); $("#actionModal .btn-primary").show();
$("#allocateModal .pol").hide(); $("#allocateModal .pol").hide();
$("#allocateModal .btn-primary").show(); $("#allocateModal .btn-primary").show();
$("#datawipeModal .pol").hide(); $("#datawipeModal .pol").hide();
$("#datawipeModal .btn-primary").show(); $("#datawipeModal .btn-primary").show();
$("#addingTagModal .pol").hide(); $("#addingTagModal .pol").hide();
$("#addingTagModal .btn-primary").show(); $("#addingTagModal .btn-primary").show();
} }
} }
function removeLot() { function removeLot() {
var devices = $(".deviceSelect"); var devices = $(".deviceSelect");
if (devices.length > 0) { if (devices.length > 0) {
$("#btnRemoveLots .text-danger").show(); $("#btnRemoveLots .text-danger").show();
} else { } else {
$("#btnRemoveLots .text-danger").hide(); $("#btnRemoveLots .text-danger").hide();
} }
$("#activeRemoveLotModal").click(); $("#activeRemoveLotModal").click();
} }
function removeTag() { function removeTag() {
var devices = $(".deviceSelect").filter(':checked'); var devices = $(".deviceSelect").filter(':checked');
var devices_id = $.map(devices, function (x) { return $(x).attr('data') }); var devices_id = $.map(devices, function(x) { return $(x).attr('data')});
if (devices_id.length == 1) { if (devices_id.length == 1) {
var url = "/inventory/tag/devices/" + devices_id[0] + "/del/"; var url = "/inventory/tag/devices/"+devices_id[0]+"/del/";
window.location.href = url; window.location.href = url;
} else { } else {
$("#unlinkTagAlertModal").click(); $("#unlinkTagAlertModal").click();
} }
} }
function addTag() { function addTag() {
var devices = $(".deviceSelect").filter(':checked'); var devices = $(".deviceSelect").filter(':checked');
var devices_id = $.map(devices, function (x) { return $(x).attr('data') }); var devices_id = $.map(devices, function(x) { return $(x).attr('data')});
if (devices_id.length == 1) { if (devices_id.length == 1) {
$("#addingTagModal .pol").hide(); $("#addingTagModal .pol").hide();
$("#addingTagModal .btn-primary").show(); $("#addingTagModal .btn-primary").show();
} else { } else {
$("#addingTagModal .pol").show(); $("#addingTagModal .pol").show();
$("#addingTagModal .btn-primary").hide(); $("#addingTagModal .btn-primary").hide();
} }
$("#addTagAlertModal").click(); $("#addTagAlertModal").click();
} }
function newTrade(action) { function newTrade(action) {
var title = "Trade " var title = "Trade "
var user_to = $("#user_to").data("email"); var user_to = $("#user_to").data("email");
var user_from = $("#user_from").data("email"); var user_from = $("#user_from").data("email");
if (action == 'user_from') { if (action == 'user_from') {
title = 'Trade Incoming'; title = 'Trade Incoming';
$("#user_to").attr('readonly', 'readonly'); $("#user_to").attr('readonly', 'readonly');
$("#user_from").prop('readonly', false); $("#user_from").prop('readonly', false);
$("#user_from").val(''); $("#user_from").val('');
$("#user_to").val(user_to); $("#user_to").val(user_to);
} else if (action == 'user_to') { } else if (action == 'user_to') {
title = 'Trade Outgoing'; title = 'Trade Outgoing';
$("#user_from").attr('readonly', 'readonly'); $("#user_from").attr('readonly', 'readonly');
$("#user_to").prop('readonly', false); $("#user_to").prop('readonly', false);
$("#user_to").val(''); $("#user_to").val('');
$("#user_from").val(user_from); $("#user_from").val(user_from);
} }
$("#tradeLotModal #title-action").html(title); $("#tradeLotModal #title-action").html(title);
$("#activeTradeModal").click(); $("#activeTradeModal").click();
} }
function newAction(action) { function newAction(action) {
$("#actionModal #type").val(action); $("#actionModal #type").val(action);
$("#actionModal #title-action").html(action); $("#actionModal #title-action").html(action);
deviceSelect(); deviceSelect();
$("#activeActionModal").click(); $("#activeActionModal").click();
} }
function newAllocate(action) { function newAllocate(action) {
$("#allocateModal #type").val(action); $("#allocateModal #type").val(action);
$("#allocateModal #title-action").html(action); $("#allocateModal #title-action").html(action);
deviceSelect(); deviceSelect();
$("#activeAllocateModal").click(); $("#activeAllocateModal").click();
} }
function newDataWipe(action) { function newDataWipe(action) {
$("#datawipeModal #type").val(action); $("#datawipeModal #type").val(action);
$("#datawipeModal #title-action").html(action); $("#datawipeModal #title-action").html(action);
deviceSelect(); deviceSelect();
$("#activeDatawipeModal").click(); $("#activeDatawipeModal").click();
} }
function get_device_list() { function get_device_list() {
var devices = $(".deviceSelect").filter(':checked'); var devices = $(".deviceSelect").filter(':checked');
/* Insert the correct count of devices in actions form */ /* Insert the correct count of devices in actions form */
var devices_count = devices.length; var devices_count = devices.length;
$("#datawipeModal .devices-count").html(devices_count); $("#datawipeModal .devices-count").html(devices_count);
$("#allocateModal .devices-count").html(devices_count); $("#allocateModal .devices-count").html(devices_count);
$("#actionModal .devices-count").html(devices_count); $("#actionModal .devices-count").html(devices_count);
/* Insert the correct value in the input devicesList */ /* Insert the correct value in the input devicesList */
var devices_id = $.map(devices, function (x) { return $(x).attr('data') }).join(","); var devices_id = $.map(devices, function(x) { return $(x).attr('data')}).join(",");
$.map($(".devicesList"), function (x) { $.map($(".devicesList"), function(x) {
$(x).val(devices_id); $(x).val(devices_id);
}); });
/* Create a list of devices for human representation */ /* Create a list of devices for human representation */
var computer = { var computer = {
"Desktop": "<i class='bi bi-building'></i>", "Desktop": "<i class='bi bi-building'></i>",
"Laptop": "<i class='bi bi-laptop'></i>", "Laptop": "<i class='bi bi-laptop'></i>",
}; };
list_devices = devices.map(function (x) { list_devices = devices.map(function (x) {
var typ = $(devices[x]).data("device-type"); var typ = $(devices[x]).data("device-type");
var manuf = $(devices[x]).data("device-manufacturer"); var manuf = $(devices[x]).data("device-manufacturer");
var dhid = $(devices[x]).data("device-dhid"); var dhid = $(devices[x]).data("device-dhid");
if (computer[typ]) { if (computer[typ]) {
typ = computer[typ]; typ = computer[typ];
}; };
return typ + " " + manuf + " " + dhid; return typ + " " + manuf + " " + dhid;
}); });
description = $.map(list_devices, function (x) { return x }).join(", "); description = $.map(list_devices, function(x) { return x }).join(", ");
$(".enumeration-devices").html(description); $(".enumeration-devices").html(description);
} }
function export_file(type_file) { function export_file(type_file) {
var devices = $(".deviceSelect").filter(':checked'); var devices = $(".deviceSelect").filter(':checked');
var devices_id = $.map(devices, function (x) { return $(x).attr('data-device-dhid') }).join(","); var devices_id = $.map(devices, function(x) { return $(x).attr('data-device-dhid')}).join(",");
if (devices_id) { if (devices_id){
var url = "/inventory/export/" + type_file + "/?ids=" + devices_id; var url = "/inventory/export/"+type_file+"/?ids="+devices_id;
window.location.href = url; window.location.href = url;
} else { } else {
$("#exportAlertModal").click(); $("#exportAlertModal").click();
} }
} }
window.addEventListener("DOMContentLoaded", () => {
var searchForm = document.getElementById("SearchForm") /**
var inputSearch = document.querySelector("#SearchForm > input") * Reactive lots button
var doSearch = true */
async function processSelectedDevices() {
const Api = { class Actions {
/**
* get lots id constructor() {
* @returns get lots this.list = []; // list of petitions of requests @item --> {type: ["Remove" | "Add"], "LotID": string, "devices": number[]}
*/ }
async get_lots() {
var request = await this.doRequest(API_URLS.lots, "GET", null) /**
if (request != undefined) return request.items * Manage the actions that will be performed when applying the changes
throw request * @param {*} ev event (Should be a checkbox type)
}, * @param {string} lotID lot id
* @param {number} deviceID device id
/** */
* Get filtered devices info manage(event, lotID, deviceListID) {
* @param {number[]} ids devices ids event.preventDefault();
* @returns full detailed device list const indeterminate = event.srcElement.indeterminate;
*/ const checked = !event.srcElement.checked;
async get_devices(id) {
var request = await this.doRequest(API_URLS.devices + '?filter={"devicehub_id": ["' + id + '"]}', "GET", null) var found = this.list.filter(list => list.lotID == lotID)[0];
if (request != undefined) return request.items var foundIndex = found != undefined ? this.list.findLastIndex(x => x.lotID == found.lotID) : -1;
throw request
}, if (checked) {
if (found != undefined && found.type == "Remove") {
/** if (found.isFromIndeterminate == true) {
* found.type = "Add";
* @param {string} url URL to be requested this.list[foundIndex] = found;
* @param {String} type Action type } else {
* @param {String | Object} body body content this.list = this.list.filter(list => list.lotID != lotID);
* @returns {Object[]} }
*/ } else {
async doRequest(url, type, body) { this.list.push({ type: "Add", lotID: lotID, devices: deviceListID, isFromIndeterminate: indeterminate });
var result; }
try { } else {
result = await $.ajax({ if (found != undefined && found.type == "Add") {
url: url, if (found.isFromIndeterminate == true) {
type: type, found.type = "Remove";
headers: { this.list[foundIndex] = found;
"Authorization": API_URLS.Auth_Token } else {
}, this.list = this.list.filter(list => list.lotID != lotID);
body: body }
}); } else {
return result this.list.push({ type: "Remove", lotID: lotID, devices: deviceListID, isFromIndeterminate: indeterminate });
} catch (error) { }
console.error(error) }
throw error
} if (this.list.length > 0) {
} document.getElementById("ApplyDeviceLots").classList.remove("disabled");
} } else {
document.getElementById("ApplyDeviceLots").classList.add("disabled");
}
}
searchForm.addEventListener("submit", (event) => {
event.preventDefault(); /**
}) * Creates notification to give feedback to user
* @param {string} title notification title
let timeoutHandler = setTimeout(() => { }, 1) * @param {string | null} toastText notification text
let dropdownList = document.getElementById("dropdown-search-list") * @param {boolean} isError defines if a toast is a error
let defaultEmptySearch = document.getElementById("dropdown-search-list").innerHTML */
notifyUser(title, toastText, isError) {
let toast = document.createElement("div");
inputSearch.addEventListener("input", (e) => { toast.classList = "alert alert-dismissible fade show " + (isError ? "alert-danger" : "alert-success");
clearTimeout(timeoutHandler) toast.attributes["data-autohide"] = !isError;
let searchText = e.target.value toast.attributes["role"] = "alert";
if (searchText == '') { toast.style = "margin-left: auto; width: fit-content;";
document.getElementById("dropdown-search-list").innerHTML = defaultEmptySearch; toast.innerHTML = `<strong>${title}</strong><button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>`;
return if (toastText && toastText.length > 0) {
} toast.innerHTML += `<br>${toastText}`;
}
let resultCount = 0;
function searchCompleted() { document.getElementById("NotificationsContainer").appendChild(toast);
resultCount++; if (!isError) {
if (resultCount < 2 && document.getElementById("dropdown-search-list").children.length > 0) { setTimeout(() => toast.classList.remove("show"), 3000);
setTimeout(() => { }
document.getElementById("dropdown-search-list").innerHTML = ` setTimeout(() => document.getElementById("NotificationsContainer").innerHTML == "", 3500);
<li id="deviceSearchLoader" class="dropdown-item"> }
<i class="bi bi-x-lg"></i>
<span style="margin-right: 10px">Nothing found</span> /**
</li>` * Get actions and execute call request to add or remove devices from lots
}, 100) */
} doActions() {
} var requestCount = 0; // This is for count all requested api count, to perform reRender of table device list
this.list.forEach(async action => {
timeoutHandler = setTimeout(async () => { if (action.type == "Add") {
dropdownList.innerHTML = ` try {
<li id="deviceSearchLoader" class="dropdown-item"> await Api.devices_add(action.lotID, action.devices);
<i class="bi bi-laptop"></i> this.notifyUser("Devices sucefully aded to selected lot/s", "", false);
<div class="spinner-border spinner-border-sm" role="status"> } catch (error) {
<span class="visually-hidden">Loading...</span> this.notifyUser("Failed to add devices to selected lot/s", error.responseJSON.message, true);
</div> }
</li> } else if (action.type == "Remove") {
<li id="lotSearchLoader" class="dropdown-item"> try {
<i class="bi bi-folder2"></i> await Api.devices_remove(action.lotID, action.devices);
<div class="spinner-border spinner-border-sm" role="status"> this.notifyUser("Devices sucefully removed from selected lot/s", "", false);
<span class="visually-hidden">Loading...</span> } catch (error) {
</div> this.notifyUser("Fail to remove devices from selected lot/s", error.responseJSON.message, true);
</li>`; }
}
requestCount += 1
try { if (requestCount == this.list.length) {
Api.get_devices(searchText.toUpperCase()).then(devices => { this.reRenderTable();
dropdownList.querySelector("#deviceSearchLoader").style = "display: none" this.list = [];
}
for (let i = 0; i < devices.length; i++) { })
const device = devices[i]; document.getElementById("dropDownLotsSelector").classList.remove("show");
}
// See: ereuse_devicehub/resources/device/models.py
var verboseName = `${device.type} ${device.manufacturer} ${device.model}` /**
* Re-render list in table
const templateString = ` */
<li> async reRenderTable() {
<a class="dropdown-item" href="${API_URLS.devices_detail.replace("ReplaceTEXT", device.devicehubID)}" style="display: flex; align-items: center;" href="#"> var newRequest = await Api.doRequest(window.location)
<i class="bi bi-laptop"></i>
<span style="margin-right: 10px">${verboseName}</span> var tmpDiv = document.createElement("div")
<span class="badge bg-secondary" style="margin-left: auto;">${device.devicehubID}</span> tmpDiv.innerHTML = newRequest
</a>
</li>`; var oldTable = Array.from(document.querySelectorAll("table.table > tbody > tr .deviceSelect")).map(x => x.attributes["data-device-dhid"].value)
dropdownList.innerHTML += templateString var newTable = Array.from(tmpDiv.querySelectorAll("table.table > tbody > tr .deviceSelect")).map(x => x.attributes["data-device-dhid"].value)
if (i == 4) { // Limit to 4 resullts
break; for (let i = 0; i < oldTable.length; i++) {
} if (!newTable.includes(oldTable[i])) {
} // variable from device_list.html --> See: ereuse_devicehub\templates\inventory\device_list.html (Ln: 411)
table.rows().remove(i)
searchCompleted(); }
}) }
} catch (error) { }
dropdownList.innerHTML += ` }
<li id="deviceSearchLoader" class="dropdown-item">
<i class="bi bi-x"></i> var eventClickActions;
<div class="spinner-border spinner-border-sm" role="status">
<span class="visually-hidden">Error searching devices</span> /**
</div> * Generates a list item with a correspondient checkbox state
</li>`; * @param {String} lotID
console.log(error); * @param {String} lotName
} * @param {Array<number>} selectedDevicesIDs
* @param {HTMLElement} target
try { */
Api.get_lots().then(lots => { function templateLot(lotID, lot, selectedDevicesIDs, elementTarget, actions) {
dropdownList.querySelector("#lotSearchLoader").style = "display: none" elementTarget.innerHTML = ""
for (let i = 0; i < lots.length; i++) {
const lot = lots[i]; var htmlTemplate = `<input class="form-check-input" type="checkbox" id="${lotID}" style="width: 20px; height: 20px; margin-right: 7px;">
if (lot.name.toUpperCase().includes(searchText.toUpperCase())) { <label class="form-check-label" for="${lotID}">${lot.name}</label>`;
const templateString = `
<li> var existLotList = selectedDevicesIDs.map(selected => lot.devices.includes(selected));
<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> var doc = document.createElement('li');
<span style="margin-right: 10px">${lot.name}</span> doc.innerHTML = htmlTemplate;
</a>
</li>`; if (selectedDevicesIDs.length <= 0) {
dropdownList.innerHTML += templateString doc.children[0].disabled = true;
if (i == 4) { // Limit to 4 resullts } else if (existLotList.every(value => value == true)) {
break; doc.children[0].checked = true;
} } else if (existLotList.every(value => value == false)) {
} doc.children[0].checked = false;
} } else {
searchCompleted(); doc.children[0].indeterminate = true;
}) }
} catch (error) { doc.children[0].addEventListener('mouseup', (ev) => actions.manage(ev, lotID, selectedDevicesIDs));
dropdownList.innerHTML += ` elementTarget.append(doc);
<li id="deviceSearchLoader" class="dropdown-item"> }
<i class="bi bi-x"></i>
<div class="spinner-border spinner-border-sm" role="status"> var listHTML = $("#LotsSelector")
<span class="visually-hidden">Error searching lots</span>
</div> // Get selected devices
</li>`; var selectedDevicesIDs = $.map($(".deviceSelect").filter(':checked'), function (x) { return parseInt($(x).attr('data')) });
console.log(error); if (selectedDevicesIDs.length <= 0) {
} listHTML.html('<li style="color: red; text-align: center">No devices selected</li>');
}, 1000) return;
}) }
// Initialize Actions list, and set checkbox triggers
}) var actions = new Actions();
if (eventClickActions) {
document.getElementById("ApplyDeviceLots").removeEventListener(eventClickActions);
}
eventClickActions = document.getElementById("ApplyDeviceLots").addEventListener("click", () => actions.doActions());
document.getElementById("ApplyDeviceLots").classList.add("disabled");
try {
listHTML.html('<li style="text-align: center"><div class="spinner-border text-info" style="margin: auto" role="status"></div></li>')
var devices = await Api.get_devices(selectedDevicesIDs);
var lots = await Api.get_lots();
lots = lots.map(lot => {
lot.devices = devices
.filter(device => device.lots.filter(devicelot => devicelot.id == lot.id).length > 0)
.map(device => parseInt(device.id));
return lot;
})
listHTML.html('');
lots.forEach(lot => templateLot(lot.id, lot, selectedDevicesIDs, listHTML, actions));
} catch (error) {
console.log(error);
listHTML.html('<li style="color: red; text-align: center">Error feching devices and lots<br>(see console for more details)</li>');
}
}

14
ereuse_devicehub/templates/ereuse_devicehub/base.html
View File

@ -50,6 +50,20 @@
<!-- Template Main JS File --> <!-- Template Main JS File -->
<script src="{{ url_for('static', filename='js/main.js') }}"></script> <script src="{{ url_for('static', filename='js/main.js') }}"></script>
<!-- Api backend -->
<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_modify: "{{ url_for('Lot.lot-device', id='UUID') }}",
devices_detail: "{{ url_for('inventory.device_details', id='ReplaceTEXT')}}"
}
</script>
<script src="{{ url_for('static', filename='js/api.js') }}"></script>
</body> </body>
</html> </html>

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

@ -1,245 +1,241 @@
{% extends "ereuse_devicehub/base.html" %} {% extends "ereuse_devicehub/base.html" %}
{% block page_title %}{{ page_title }}{% endblock %} {% block page_title %}{{ page_title }}{% endblock %}
{% block body %} {% block body %}
<!-- ======= Header ======= --> <!-- ======= Header ======= -->
<header id="header" class="header fixed-top d-flex align-items-center"> <header id="header" class="header fixed-top d-flex align-items-center">
<div class="d-flex align-items-center justify-content-between"> <div class="d-flex align-items-center justify-content-between">
<a href="{{ url_for('inventory.devicelist')}}" class="logo d-flex align-items-center"> <a href="{{ url_for('inventory.devicelist')}}" class="logo d-flex align-items-center">
<img src="{{ url_for('static', filename='img/usody-logo-black.svg') }}" alt=""> <img src="{{ url_for('static', filename='img/usody-logo-black.svg') }}" alt="">
</a> </a>
<i class="bi bi-list toggle-sidebar-btn"></i> <i class="bi bi-list toggle-sidebar-btn"></i>
</div><!-- End Logo --> </div><!-- End Logo -->
<div class="search-bar"> <div class="search-bar">
<form class="search-form d-flex align-items-center" method="POST" id="SearchForm" action="#"> <form class="search-form d-flex align-items-center" method="" 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"> <input class="dropdown-toggle" type="text" name="query" placeholder="Search" title="Enter search keyword"
<button type="submit" title="Search"><i class="bi bi-search"></i></button> 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> <ul class="dropdown-menu" autoClose="outside" aria-labelledby="dropdownSearch" id="dropdown-search-list"
<li class="dropdown-item"><i class="bi bi-laptop"></i> Devices <span class="badge bg-secondary" style="float: right;">DHID</span></li> style="min-width: 100px;">
<li class="dropdown-item"><i class="bi bi-folder2"></i> lots <span class="badge bg-secondary" style="float: right;">Name</span></li> <li class="dropdown-header">
</ul> <h6 class="dropdown-header">You can search:</h6>
</form> </li>
</div><!-- End Search Bar --> <li class="dropdown-item"><i class="bi bi-laptop"></i> Devices <span class="badge bg-secondary"
style="float: right;">DHID</span></li>
<nav class="header-nav ms-auto"> <li class="dropdown-item"><i class="bi bi-folder2"></i> lots <span class="badge bg-secondary"
<ul class="d-flex align-items-center"> style="float: right;">Name</span></li>
</ul>
<li class="nav-item d-block d-lg-none"> </form>
<a class="nav-link nav-icon search-bar-toggle " href="#"> </div><!-- End Search Bar -->
<i class="bi bi-search"></i>
</a> <nav class="header-nav ms-auto">
</li><!-- End Search Icon--> <ul class="d-flex align-items-center">
<li class="nav-item dropdown pe-3"> <li class="nav-item d-block d-lg-none">
<a class="nav-link nav-icon search-bar-toggle " href="#">
<a class="nav-link nav-profile d-flex align-items-center pe-0" href="#" data-bs-toggle="dropdown"> <i class="bi bi-search"></i>
<i class="bi bi-person-circle" style="font-size: 36px;"></i> </a>
<span class="d-none d-md-block dropdown-toggle ps-2">{{ current_user.email }}</span> </li><!-- End Search Icon-->
</a><!-- End Profile Iamge Icon -->
<li class="nav-item dropdown pe-3">
<ul class="dropdown-menu dropdown-menu-end dropdown-menu-arrow profile">
<li class="dropdown-header"> <a class="nav-link nav-profile d-flex align-items-center pe-0" href="#" data-bs-toggle="dropdown">
<h6>{{ current_user.get_full_name }}</h6> <i class="bi bi-person-circle" style="font-size: 36px;"></i>
</li> <span class="d-none d-md-block dropdown-toggle ps-2">{{ current_user.email }}</span>
<li> </a><!-- End Profile Iamge Icon -->
<hr class="dropdown-divider">
</li> <ul class="dropdown-menu dropdown-menu-end dropdown-menu-arrow profile">
<li class="dropdown-header">
<li> <h6>{{ current_user.get_full_name }}</h6>
<a class="dropdown-item d-flex align-items-center" href="{{ url_for('core.user-profile') }}"> </li>
<i class="bi bi-person"></i> <li>
<span>My Profile</span> <hr class="dropdown-divider">
</a> </li>
</li>
<li> <li>
<hr class="dropdown-divider"> <a class="dropdown-item d-flex align-items-center" href="{{ url_for('core.user-profile') }}">
</li> <i class="bi bi-person"></i>
<span>My Profile</span>
<li> </a>
<a class="dropdown-item d-flex align-items-center" href="https://help.usody.com/" target="_blank"> </li>
<i class="bi bi-question-circle"></i> <li>
<span>Need Help?</span> <hr class="dropdown-divider">
</a> </li>
</li>
<li> <li>
<hr class="dropdown-divider"> <a class="dropdown-item d-flex align-items-center" href="https://help.usody.com/" target="_blank">
</li> <i class="bi bi-question-circle"></i>
<span>Need Help?</span>
<li> </a>
<a class="dropdown-item d-flex align-items-center" href="{{ url_for('core.logout') }}"> </li>
<i class="bi bi-box-arrow-right"></i> <li>
<span>Sign Out</span> <hr class="dropdown-divider">
</a> </li>
</li>
<li>
</ul><!-- End Profile Dropdown Items --> <a class="dropdown-item d-flex align-items-center" href="{{ url_for('core.logout') }}">
</li><!-- End Profile Nav --> <i class="bi bi-box-arrow-right"></i>
<span>Sign Out</span>
</ul> </a>
</nav><!-- End Icons Navigation --> </li>
</header><!-- End Header --> </ul><!-- End Profile Dropdown Items -->
</li><!-- End Profile Nav -->
<!-- ======= Sidebar ======= -->
<aside id="sidebar" class="sidebar"> </ul>
</nav><!-- End Icons Navigation -->
<ul class="sidebar-nav" id="sidebar-nav">
<!-- We need defined before the Dashboard </header><!-- End Header -->
<li class="nav-item">
<a class="nav-link collapsed" href="index.html"> <!-- ======= Sidebar ======= -->
<i class="bi bi-grid"></i> <aside id="sidebar" class="sidebar">
<span>Dashboard</span>
</a> <ul class="sidebar-nav" id="sidebar-nav">
</li><!-- End Dashboard Nav --> <!-- We need defined before the Dashboard
<li class="nav-item">
<li class="nav-item"> <a class="nav-link collapsed" href="index.html">
<a class="nav-link collapsed" href="{{ url_for('inventory.devicelist') }}"> <i class="bi bi-grid"></i>
<i class="bi-menu-button-wide"></i> <span>Dashboard</span>
<span>Unassigned devices</span> </a>
</a> </li><!-- End Dashboard Nav -->
</li>
<li class="nav-item">
<li class="nav-heading">Lots</li> <a class="nav-link collapsed" href="{{ url_for('inventory.devicelist') }}">
<i class="bi-menu-button-wide"></i>
<li class="nav-item"> <span>Unassigned devices</span>
{% if lot and lot.is_incoming %} </a>
<a class="nav-link" data-bs-target="#incoming-lots-nav" data-bs-toggle="collapse" href="#"> </li>
{% else %}
<a class="nav-link collapsed" data-bs-target="#incoming-lots-nav" data-bs-toggle="collapse" href="#"> <li class="nav-heading">Lots</li>
{% endif %}
<i class="bi bi-arrow-down-right"></i><span>Incoming Lots</span><i class="bi bi-chevron-down ms-auto"></i> <li class="nav-item">
</a> {% if lot and lot.is_incoming %}
{% if lot and lot.is_incoming %} <a class="nav-link" data-bs-target="#incoming-lots-nav" data-bs-toggle="collapse" href="#">
<ul id="incoming-lots-nav" class="nav-content collapse show" data-bs-parent="#sidebar-nav"> {% else %}
{% else %} <a class="nav-link collapsed" data-bs-target="#incoming-lots-nav" data-bs-toggle="collapse" href="#">
<ul id="incoming-lots-nav" class="nav-content collapse" data-bs-parent="#sidebar-nav"> {% endif %}
{% endif %} <i class="bi bi-arrow-down-right"></i><span>Incoming Lots</span><i class="bi bi-chevron-down ms-auto"></i>
{% for lot in lots %} </a>
{% if lot.is_incoming %} {% if lot and lot.is_incoming %}
<li> <ul id="incoming-lots-nav" class="nav-content collapse show" data-bs-parent="#sidebar-nav">
<a href="{{ url_for('inventory.lotdevicelist', lot_id=lot.id) }}"> {% else %}
<i class="bi bi-circle"></i><span>{{ lot.name }}</span> <ul id="incoming-lots-nav" class="nav-content collapse" data-bs-parent="#sidebar-nav">
</a> {% endif %}
</li> {% for lot in lots %}
{% endif %} {% if lot.is_incoming %}
{% endfor %} <li>
</ul> <a href="{{ url_for('inventory.lotdevicelist', lot_id=lot.id) }}">
</li><!-- End Incoming Lots Nav --> <i class="bi bi-circle"></i><span>{{ lot.name }}</span>
</a>
<li class="nav-item"> </li>
{% if lot and lot.is_outgoing %} {% endif %}
<a class="nav-link" data-bs-target="#outgoing-lots-nav" data-bs-toggle="collapse" href="#"> {% endfor %}
{% else %} </ul>
<a class="nav-link collapsed" data-bs-target="#outgoing-lots-nav" data-bs-toggle="collapse" href="#"> </li><!-- End Incoming Lots Nav -->
{% endif %}
<i class="bi bi-arrow-up-right"></i><span>Outgoing Lots</span><i class="bi bi-chevron-down ms-auto"></i> <li class="nav-item">
</a> {% if lot and lot.is_outgoing %}
{% if lot and lot.is_outgoing %} <a class="nav-link" data-bs-target="#outgoing-lots-nav" data-bs-toggle="collapse" href="#">
<ul id="outgoing-lots-nav" class="nav-content collapse show" data-bs-parent="#sidebar-nav"> {% else %}
{% else %} <a class="nav-link collapsed" data-bs-target="#outgoing-lots-nav" data-bs-toggle="collapse" href="#">
<ul id="outgoing-lots-nav" class="nav-content collapse " data-bs-parent="#sidebar-nav"> {% endif %}
{% endif %} <i class="bi bi-arrow-up-right"></i><span>Outgoing Lots</span><i class="bi bi-chevron-down ms-auto"></i>
{% for lot in lots %} </a>
{% if lot.is_outgoing %} {% if lot and lot.is_outgoing %}
<li> <ul id="outgoing-lots-nav" class="nav-content collapse show" data-bs-parent="#sidebar-nav">
<a href="{{ url_for('inventory.lotdevicelist', lot_id=lot.id) }}"> {% else %}
<i class="bi bi-circle"></i><span>{{ lot.name }}</span> <ul id="outgoing-lots-nav" class="nav-content collapse " data-bs-parent="#sidebar-nav">
</a> {% endif %}
</li> {% for lot in lots %}
{% endif %} {% if lot.is_outgoing %}
{% endfor %} <li>
</ul> <a href="{{ url_for('inventory.lotdevicelist', lot_id=lot.id) }}">
</li><!-- End Outgoing Lots Nav --> <i class="bi bi-circle"></i><span>{{ lot.name }}</span>
</a>
<li class="nav-item"> </li>
{% if lot and lot.is_temporary %} {% endif %}
<a class="nav-link" data-bs-target="#temporal-lots-nav" data-bs-toggle="collapse" href="#"> {% endfor %}
{% else %} </ul>
<a class="nav-link collapsed" data-bs-target="#temporal-lots-nav" data-bs-toggle="collapse" href="#"> </li><!-- End Outgoing Lots Nav -->
{% endif %}
<i class="bi bi-layout-text-window-reverse"></i><span>Temporary Lots</span><i class="bi bi-chevron-down ms-auto"></i> <li class="nav-item">
</a> {% if lot and lot.is_temporary %}
{% if lot and lot.is_temporary %} <a class="nav-link" data-bs-target="#temporal-lots-nav" data-bs-toggle="collapse" href="#">
<ul id="temporal-lots-nav" class="nav-content collapse show" data-bs-parent="#sidebar-nav"> {% else %}
{% else %} <a class="nav-link collapsed" data-bs-target="#temporal-lots-nav" data-bs-toggle="collapse" href="#">
<ul id="temporal-lots-nav" class="nav-content collapse " data-bs-parent="#sidebar-nav"> {% endif %}
{% endif %} <i class="bi bi-layout-text-window-reverse"></i><span>Temporary Lots</span><i
<li> class="bi bi-chevron-down ms-auto"></i>
<a href="{{ url_for('inventory.lot_add')}}"> </a>
<i class="bi bi-plus" style="font-size: larger;"></i><span>New temporary lot</span> {% if lot and lot.is_temporary %}
</a> <ul id="temporal-lots-nav" class="nav-content collapse show" data-bs-parent="#sidebar-nav">
</li> {% else %}
{% for lot in lots %} <ul id="temporal-lots-nav" class="nav-content collapse " data-bs-parent="#sidebar-nav">
{% if lot.is_temporary %} {% endif %}
<li> <li>
<a href="{{ url_for('inventory.lotdevicelist', lot_id=lot.id) }}"> <a href="{{ url_for('inventory.lot_add')}}">
<i class="bi bi-circle"></i><span>{{ lot.name }}</span> <i class="bi bi-plus" style="font-size: larger;"></i><span>New temporary lot</span>
</a> </a>
</li> </li>
{% endif %} {% for lot in lots %}
{% endfor %} {% if lot.is_temporary %}
</ul> <li>
</li><!-- End Temporal Lots Nav --> <a href="{{ url_for('inventory.lotdevicelist', lot_id=lot.id) }}">
<i class="bi bi-circle"></i><span>{{ lot.name }}</span>
<li class="nav-heading">Utils</li> </a>
</li>
<li class="nav-item"> {% endif %}
<a class="nav-link collapsed" href="{{ url_for('labels.label_list')}}"> {% endfor %}
<i class="bi bi-tags"></i> </ul>
<span>Tags</span> </li><!-- End Temporal Lots Nav -->
</a>
</li><!-- End Tags Page Nav --> <li class="nav-heading">Utils</li>
</ul> <li class="nav-item">
<a class="nav-link collapsed" href="{{ url_for('labels.label_list')}}">
</aside><!-- End Sidebar--> <i class="bi bi-tags"></i>
<span>Tags</span>
<main id="main" class="main"> </a>
{% block messages %} </li><!-- End Tags Page Nav -->
{% for level, message in get_flashed_messages(with_categories=true) %}
<div class="alert alert-{{ level}} alert-dismissible fade show" role="alert"> </ul>
{% if '_message_icon' in session %}
<i class="bi bi-{{ session['_message_icon'][level]}} me-1"></i> </aside><!-- End Sidebar-->
{% else %}<!-- fallback if 3rd party libraries (e.g. flask_login.login_required) -->
<i class="bi bi-info-circle me-1"></i> <main id="main" class="main">
{% endif %} {% block messages %}
{{ message }} {% for level, message in get_flashed_messages(with_categories=true) %}
<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button> <div class="alert alert-{{ level}} alert-dismissible fade show" role="alert">
</div> {% if '_message_icon' in session %}
{% endfor %} <i class="bi bi-{{ session['_message_icon'][level]}} me-1"></i>
{% endblock %} {% else %}
{% block main %} <!-- fallback if 3rd party libraries (e.g. flask_login.login_required) -->
<i class="bi bi-info-circle me-1"></i>
{% endblock main %} {% endif %}
</main><!-- End #main --> {{ message }}
<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
<!-- ======= Footer ======= --> </div>
<footer id="footer" class="footer"> {% endfor %}
<div class="copyright"> {% endblock %}
&copy; Copyright <strong><span>USOdy</span></strong>. All Rights Reserved {% block main %}
</div>
<div class="credits"> {% endblock main %}
<!-- All the links in the footer should remain intact. --> </main><!-- End #main -->
<!-- You can delete the links only if you purchased the pro version. -->
<!-- Licensing information: https://bootstrapmade.com/license/ --> <!-- ======= Footer ======= -->
<!-- Purchase the pro version with working PHP/AJAX contact form: https://bootstrapmade.com/nice-admin-bootstrap-admin-html-template/ --> <footer id="footer" class="footer">
Designed by <a href="https://bootstrapmade.com/">BootstrapMade</a> // DeviceHub {{ version }} <div class="copyright">
</div> &copy; Copyright <strong><span>USOdy</span></strong>. All Rights Reserved
</footer><!-- End Footer --> </div>
<div class="credits">
<!-- API_CALLS --> <!-- All the links in the footer should remain intact. -->
<script> <!-- You can delete the links only if you purchased the pro version. -->
const API_URLS = { <!-- Licensing information: https://bootstrapmade.com/license/ -->
Auth_Token: `Basic ${btoa("{{ current_user.token }}:")}`, // <!-- Purchase the pro version with working PHP/AJAX contact form: https://bootstrapmade.com/nice-admin-bootstrap-admin-html-template/ -->
currentUserID: "{{ current_user.id }}", Designed by <a href="https://bootstrapmade.com/">BootstrapMade</a> // DeviceHub {{ version }}
lots: "{{ url_for('Lot.main') }}", </div>
lots_detail: "{{ url_for('inventory.lotdevicelist', lot_id='ReplaceTEXT') }}", </footer><!-- End Footer -->
devices: "{{ url_for('Device.main') }}",
devices_detail: "{{ url_for('inventory.device_details', id='ReplaceTEXT')}}" {% endblock body %}
}
</script>
{% endblock body %}

33
ereuse_devicehub/templates/inventory/addDeviceslot.html
View File

@ -1,33 +0,0 @@
<div class="modal fade" id="addingLotModal" tabindex="-1" style="display: none;" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title">Adding to a lot</h5>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<form action="{{ url_for('inventory.lot_devices_add') }}" method="post">
{{ form_lot_device.csrf_token }}
<div class="modal-body">
Please write a name of a lot
<select class="form-control selectpicker" id="selectLot" name="lot" data-live-search="true">
{% for lot in lots %}
<option value="{{ lot.id }}">{{ lot.name }}</option>
{% endfor %}
</select>
<input class="devicesList" type="hidden" name="devices" />
<p class="text-danger pol">
You need select first some device for adding this in a lot
</p>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
<input type="submit" class="btn btn-primary" style="display: none;" value="Save changes" />
</div>
</form>
</div>
</div>
</div>

26
ereuse_devicehub/templates/inventory/device_list.html
View File

@ -71,25 +71,21 @@
{% endif %} {% endif %}
<div class="tab-content pt-5"> <div class="tab-content pt-5">
<div id="devices-list" class="tab-pane fade devices-list active show"> <div id="devices-list" class="tab-pane fade devices-list active show">
<label class="btn btn-primary " for="SelectAllBTN"><input type="checkbox" id="SelectAllBTN" autocomplete="off"></label>
<div class="btn-group dropdown ml-1"> <div class="btn-group dropdown ml-1">
<button id="btnLots" type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false"> <button id="btnLots" type="button" onclick="processSelectedDevices()" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
<i class="bi bi-folder2"></i> <i class="bi bi-folder2"></i>
Lots Lots
<span class="caret"></span> <span class="caret"></span>
</button> </button>
<span class="d-none" id="activeTradeModal" data-bs-toggle="modal" data-bs-target="#tradeLotModal"></span> <ul class="dropdown-menu" aria-labelledby="btnLots" style="width: 300px;" id="dropDownLotsSelector">
<ul class="dropdown-menu" aria-labelledby="btnLots"> <h6 class="dropdown-header">Select some devices to manage lots</h6>
<ul style="list-style-type: none; margin: 0; padding: 0;" class="mx-3" id="LotsSelector"></ul>
<li><hr /></li>
<li> <li>
<a href="javascript:void()" class="dropdown-item" data-bs-toggle="modal" data-bs-target="#addingLotModal"> <a href="#" class="dropdown-item" id="ApplyDeviceLots">
<i class="bi bi-plus"></i> <i class="bi bi-check"></i>
Add selected Devices to a lot Apply
</a>
</li>
<li>
<a href="javascript:void()" class="dropdown-item" data-bs-toggle="modal" data-bs-target="#removeLotModal">
<i class="bi bi-x"></i>
Remove selected devices from a lot
</a> </a>
</li> </li>
</ul> </ul>
@ -394,12 +390,12 @@
</div> </div>
</div> </div>
<div id="NotificationsContainer" style="position: absolute; bottom: 0; right: 0; margin: 10px; margin-top: 70px; width: calc(100% - 310px);"></div>
</div> </div>
</div> </div>
</section> </section>
{% include "inventory/addDeviceslot.html" %}
{% include "inventory/addDevicestag.html" %} {% include "inventory/addDevicestag.html" %}
{% include "inventory/removeDeviceslot.html" %}
{% include "inventory/lot_delete_modal.html" %} {% include "inventory/lot_delete_modal.html" %}
{% include "inventory/actions.html" %} {% include "inventory/actions.html" %}
{% include "inventory/allocate.html" %} {% include "inventory/allocate.html" %}

32
ereuse_devicehub/templates/inventory/removeDeviceslot.html
View File

@ -1,32 +0,0 @@
<div class="modal fade" id="removeLotModal" tabindex="-1" style="display: none;" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title">Remove from lot</h5>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<form action="{{ url_for('inventory.lot_devices_del') }}" method="post">
{{ form_lot_device.csrf_token }}
<div class="modal-body">
Please write a name of a lot
<select class="form-control selectpicker" id="selectLot" name="lot" data-live-search="true">
{% for lot in lots %}
<option value="{{ lot.id }}">{{ lot.name }}</option>
{% endfor %}
</select>
<input class="devicesList" type="hidden" name="devices" />
<p class="text-danger pol">
You need select first some device for remove this from a lot
</p>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
<input type="submit" class="btn btn-primary" style="display: none;" value="Save changes" />
</div>
</form>
</div>
</div>
</div>