Add reactive lots list
This commit is contained in:
parent
8d3cad48bf
commit
629a773dd2
|
@ -1,4 +1,4 @@
|
||||||
$(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');
|
||||||
|
@ -71,9 +71,9 @@ function removeLot() {
|
||||||
|
|
||||||
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();
|
||||||
|
@ -82,7 +82,7 @@ function removeTag() {
|
||||||
|
|
||||||
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();
|
||||||
|
@ -146,8 +146,8 @@ function get_device_list() {
|
||||||
$("#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);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -166,17 +166,250 @@ function get_device_list() {
|
||||||
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();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Añade reactividad al botón de lotes
|
||||||
|
*/
|
||||||
|
async function processSelectedDevices() {
|
||||||
|
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
|
||||||
|
},
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 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
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class Actions {
|
||||||
|
|
||||||
|
constructor () {
|
||||||
|
this.list = [] // list of petitions of requests @item --> {type: ["Remove" | "Add"], "LotID": string, "devices": number[]}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Manage the actions that will be performed when applying the changes
|
||||||
|
* @param {*} ev event (Should be a checkbos type)
|
||||||
|
* @param {string} lotID lot id
|
||||||
|
* @param {number} deviceID device id
|
||||||
|
*/
|
||||||
|
manage(event, lotID, deviceListID) {
|
||||||
|
const checked = event.srcElement.checked
|
||||||
|
|
||||||
|
var found = this.list.filter(list => list.lotID == lotID)[0]
|
||||||
|
|
||||||
|
if (checked) {
|
||||||
|
if (found != undefined && found.type == "Remove") {
|
||||||
|
this.list = this.list.filter(list => list.lotID != lotID)
|
||||||
|
} else {
|
||||||
|
this.list.push({ type: "Add", lotID: lotID, devices: deviceListID })
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if (found != undefined && found.type == "Add") {
|
||||||
|
this.list = this.list.filter(list => list.lotID != lotID)
|
||||||
|
} else {
|
||||||
|
this.list.push({ type: "Remove", lotID: lotID, devices: deviceListID })
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (this.list.length > 0) {
|
||||||
|
document.getElementById("ApplyDeviceLots").classList.remove("disabled")
|
||||||
|
} else {
|
||||||
|
document.getElementById("ApplyDeviceLots").classList.add("disabled")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Creates notification to give feedback to user
|
||||||
|
* @param {string} title notification title
|
||||||
|
* @param {string | null} toastText notification text
|
||||||
|
* @param {boolean} isError defines if a toast is a error
|
||||||
|
*/
|
||||||
|
notifyUser(title, toastText, isError) {
|
||||||
|
let toast = document.createElement("div")
|
||||||
|
toast.classList = "alert alert-dismissible fade show " + (isError ? "alert-danger" : "alert-success")
|
||||||
|
toast.attributes["data-autohide"] = !isError
|
||||||
|
toast.attributes["role"] = "alert"
|
||||||
|
toast.style = "margin-left: auto; width: fit-content;"
|
||||||
|
toast.innerHTML = `<strong>${title}</strong><button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>`
|
||||||
|
if (toastText && toastText.length > 0) {
|
||||||
|
toast.innerHTML += `<br>${toastText}`
|
||||||
|
}
|
||||||
|
|
||||||
|
document.getElementById("NotificationsContainer").appendChild(toast)
|
||||||
|
if (!isError) {
|
||||||
|
setTimeout(() => toast.classList.remove("show"), 3000)
|
||||||
|
setTimeout(() => toast.remove(), 3500)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get actions and execute call request to add or remove devices from lots
|
||||||
|
*/
|
||||||
|
doActions() {
|
||||||
|
this.list.forEach(async action => {
|
||||||
|
if (action.type == "Add") {
|
||||||
|
try {
|
||||||
|
await Api.devices_add(action.lotID, action.devices)
|
||||||
|
this.notifyUser("Devices sucefully aded to selected lot/s", "", false)
|
||||||
|
} catch (error) {
|
||||||
|
this.notifyUser("Failed to add devices to selected lot/s", error.responseJSON.message, true)
|
||||||
|
}
|
||||||
|
} else if (action.type == "Remove") {
|
||||||
|
try {
|
||||||
|
await Api.devices_remove(action.lotID, action.devices)
|
||||||
|
this.notifyUser("Devices sucefully removed from selected lot/s", "", false)
|
||||||
|
} catch (error) {
|
||||||
|
this.notifyUser("Fail to remove devices from selected lot/s", error.responseJSON.message, true)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
var eventClickActions;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Generates a list item with a correspondient checkbox state
|
||||||
|
* @param {String} lotID
|
||||||
|
* @param {String} lotName
|
||||||
|
* @param {Array<number>} selectedDevicesIDs
|
||||||
|
* @param {HTMLElement} target
|
||||||
|
*/
|
||||||
|
function templateLot(lotID, lot, selectedDevicesIDs, elementTarget, actions) {
|
||||||
|
elementTarget.innerHTML = ""
|
||||||
|
|
||||||
|
var htmlTemplate = `<input class="form-check-input" type="checkbox" id="${lotID}" style="width: 20px; height: 20px; margin-right: 7px;">
|
||||||
|
<label class="form-check-label" for="${lotID}">${lot.name}</label>`;
|
||||||
|
|
||||||
|
var existLotList = selectedDevicesIDs.map(selected => lot.devices.includes(selected))
|
||||||
|
|
||||||
|
var doc = document.createElement('li')
|
||||||
|
doc.innerHTML = htmlTemplate
|
||||||
|
|
||||||
|
if (selectedDevicesIDs.length <= 0) {
|
||||||
|
doc.children[0].disabled = true
|
||||||
|
} else if (existLotList.every(value => value == true)) {
|
||||||
|
doc.children[0].checked = true
|
||||||
|
} else if (existLotList.every(value => value == false)) {
|
||||||
|
doc.children[0].checked = false
|
||||||
|
} else {
|
||||||
|
doc.children[0].indeterminate = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
doc.children[0].addEventListener('change', (ev) => actions.manage(ev, lotID, selectedDevicesIDs))
|
||||||
|
elementTarget.append(doc)
|
||||||
|
}
|
||||||
|
|
||||||
|
var listHTML = $("#LotsSelector")
|
||||||
|
|
||||||
|
// Get selected devices
|
||||||
|
var selectedDevicesIDs = $.map($(".deviceSelect").filter(':checked'), function (x) { return parseInt($(x).attr('data')) })
|
||||||
|
if (selectedDevicesIDs.length <= 0) {
|
||||||
|
listHTML.html('<li style="color: red; text-align: center">No devices selected</li>')
|
||||||
|
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>')
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
}
|
|
@ -71,25 +71,20 @@
|
||||||
{% 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">
|
||||||
|
|
||||||
<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;">
|
||||||
<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>
|
||||||
|
@ -303,7 +298,7 @@
|
||||||
<table class="table">
|
<table class="table">
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
<th scope="col">Select</th>
|
<th scope="col" style="min-with: 14px">Select</th>
|
||||||
<th scope="col">Title</th>
|
<th scope="col">Title</th>
|
||||||
<th scope="col">DHID</th>
|
<th scope="col">DHID</th>
|
||||||
<th scope="col">Tags</th>
|
<th scope="col">Tags</th>
|
||||||
|
@ -383,6 +378,8 @@
|
||||||
</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>
|
||||||
|
@ -400,6 +397,13 @@
|
||||||
<!-- Custom Code -->
|
<!-- Custom Code -->
|
||||||
<script>
|
<script>
|
||||||
const table = new simpleDatatables.DataTable("table")
|
const table = new simpleDatatables.DataTable("table")
|
||||||
|
const API_URLS = {
|
||||||
|
Auth_Token: "Basic ZDc5YjQyOGItZTJjMy00NDA0LThhODItNzJjMTNmOWNkYmNjOg==", // {{ current_user.token }}
|
||||||
|
currentUserID: "{{ current_user.id }}",
|
||||||
|
lots: "{{ url_for('Lot.main') }}",
|
||||||
|
devices: "{{ url_for('Device.main') }}",
|
||||||
|
devices_modify: "{{ url_for('Lot.lot-device', id='UUID') }}",
|
||||||
|
}
|
||||||
</script>
|
</script>
|
||||||
<script src="{{ url_for('static', filename='js/main_inventory.js') }}"></script>
|
<script src="{{ url_for('static', filename='js/main_inventory.js') }}"></script>
|
||||||
{% endblock main %}
|
{% endblock main %}
|
Reference in New Issue