diff --git a/src/assets/helper.ts b/src/assets/helper.ts index 1f4a535..8b4a003 100644 --- a/src/assets/helper.ts +++ b/src/assets/helper.ts @@ -72,7 +72,7 @@ export function parseIntRelation(data: string, relation_name: string = 'id', doN // This can be used by prisma to connect relations // If the incoming data is null or empty, return a prisma disconnect object instead of a connect one - if (data === null || data === '') { + if (data === null || data === '' || data === "undefined") { if (doNotDisconnect) { return undefined; } diff --git a/src/frontend/manage/storageManager.eta.html b/src/frontend/manage/storageManager.eta.html index 80a07f5..c6398e3 100644 --- a/src/frontend/manage/storageManager.eta.html +++ b/src/frontend/manage/storageManager.eta.html @@ -150,37 +150,16 @@ > - +
- - - + + + - <% it.storLocs.forEach(function(locations){ %> - - - - - - <% }) %> +
NameStorage UnitActionsNameStorage UnitActions
<%= locations.name %> - <% if (locations.storageUnit == null) { %> - No storage unit connected - <% } else { %> <%= locations.storageUnit.name %> <% } %> - - - -
@@ -195,29 +174,15 @@ Create new unit - +
- - - + + + - <% it.storUnits.forEach(function(units){ %> - - - - - - <% }) %>
NameAddressActionsNameAddressActions
<%= units.name %><%= units.contactInfo.street %> <%= units.contactInfo.houseNumber %>, <%= units.contactInfo.city %> <%= units.contactInfo.country %> - - -
diff --git a/src/routes/api/v1/storageLocations.ts b/src/routes/api/v1/storageLocations.ts index 593881b..bf9ec29 100644 --- a/src/routes/api/v1/storageLocations.ts +++ b/src/routes/api/v1/storageLocations.ts @@ -1,9 +1,19 @@ import { Request, Response } from 'express'; import { prisma, __path, log } from '../../../index.js'; -import { parseIntOrUndefined } from '../../../assets/helper.js'; +import { parseIntOrUndefined, parseDynamicSortBy, parseIntRelation } from '../../../assets/helper.js'; // Get storageLocation. -function get(req: Request, res: Response) { +async function get(req: Request, res: Response) { + if (req.query.sort === undefined) { + req.query.sort = 'id'; + } + if (req.query.order === undefined) { + req.query.order = 'asc'; + } + if (req.query.search === undefined) { + req.query.search = ''; + } + if (req.query.getAll === undefined) { // Check if required fields are present. if (!req.query.id) { @@ -32,16 +42,39 @@ function get(req: Request, res: Response) { res.status(500).json({ status: 'ERROR', errorcode: 'DB_ERROR', error: err, message: 'An error occurred during the database operation' }); }); } else { + // Get all items + const itemCountNotFiltered = await prisma.storageLocation.count({}); + + // Get all items (filtered) + const itemCountFiltered = await prisma.storageLocation.count({ + where: { + name: { + // @ts-ignore + contains: req.query.search.length > 0 ? req.query.search : '' + } + }, + orderBy: parseDynamicSortBy(req.query.sort.toString(), req.query.order.toString()) + }); + prisma.storageLocation .findMany({ + take: parseIntOrUndefined(req.query.limit), + skip: parseIntOrUndefined(req.query.offset), + where: { + name: { + // @ts-ignore + contains: req.query.search.length > 0 ? req.query.search : '' + } + }, // Get storageUnit from relation. include: { storageUnit: true - } + }, + orderBy: parseDynamicSortBy(req.query.sort.toString(), req.query.order.toString()), }) .then((items) => { if (items) { - res.status(200).json(items); + res.status(200).json({ total: itemCountFiltered, totalNotFiltered: itemCountNotFiltered, items: items }); } else { res.status(410).json({ status: 'ERROR', errorcode: 'NOT_EXISTING', message: 'storageLocation does not exist' }); } @@ -124,7 +157,7 @@ async function patch(req: Request, res: Response) { }, data: { name: req.body.name, - storageUnitId: parseIntOrUndefined(req.body.storageUnitId) + storageUnit: parseIntRelation(req.body.storageUnitId) }, select: { id: true diff --git a/src/routes/api/v1/storageUnits.ts b/src/routes/api/v1/storageUnits.ts index 5249a19..7ea87bb 100644 --- a/src/routes/api/v1/storageUnits.ts +++ b/src/routes/api/v1/storageUnits.ts @@ -1,9 +1,19 @@ import { Request, Response } from 'express'; import { prisma, __path, log } from '../../../index.js'; import { contactType } from '@prisma/client'; +import { parseDynamicSortBy, parseIntOrUndefined } from '../../../assets/helper.js'; // Get storageUnit. -function get(req: Request, res: Response) { +async function get(req: Request, res: Response) { + if (req.query.sort === undefined) { + req.query.sort = 'id'; + } + if (req.query.order === undefined) { + req.query.order = 'asc'; + } + if (req.query.search === undefined) { + req.query.search = ''; + } if (req.query.getAll === undefined) { // Check if required fields are present. if (!req.query.id) { @@ -33,17 +43,40 @@ function get(req: Request, res: Response) { res.status(500).json({ status: 'ERROR', errorcode: 'DB_ERROR', error: err, message: 'An error occurred during the database operation' }); }); } else { + // Get all items + const itemCountNotFiltered = await prisma.storageUnit.count({}); + + // Get all items (filtered) + const itemCountFiltered = await prisma.storageUnit.count({ + where: { + name: { + // @ts-ignore + contains: req.query.search.length > 0 ? req.query.search : '' + } + }, + orderBy: parseDynamicSortBy(req.query.sort.toString(), req.query.order.toString()) + }); + prisma.storageUnit .findMany({ + take: parseIntOrUndefined(req.query.limit), + skip: parseIntOrUndefined(req.query.offset), // Get contactInfo and StorageLocation from relation. include: { contactInfo: true, StorageLocation: true - } + }, + where: { + name: { + // @ts-ignore + contains: req.query.search.length > 0 ? req.query.search : '' + } + }, + orderBy: parseDynamicSortBy(req.query.sort.toString(), req.query.order.toString()) }) .then((items) => { if (items) { - res.status(200).json(items); + res.status(200).json({ total: itemCountFiltered, totalNotFiltered: itemCountNotFiltered, items: items }); } else { res.status(410).json({ status: 'ERROR', errorcode: 'NOT_EXISTING', message: 'storageUnit does not exist' }); } diff --git a/static/js/editStorages.js b/static/js/editStorages.js index e227d97..ff9fb7f 100644 --- a/static/js/editStorages.js +++ b/static/js/editStorages.js @@ -2,6 +2,8 @@ // This magic js codes enables anchor links to work with bootstrap tabs // Taken from https://stackoverflow.com/a/9393768/11317151 (and edited, like a lot) +const FLAG_supports_new_data_loader = true; + // Also update on location change window.addEventListener( 'hashchange', @@ -29,9 +31,9 @@ function primeCreateNew() { const form = document.getElementById('storageUnitModalForm'); const form2 = document.getElementById('storageLocationModalForm'); document.getElementById('createNewLocationSelection').disabled = false; - document.getElementById('storageUnitModalLocationSelectText').innerText= "Select or create a new location."; - document.getElementById('storageUnitModalLabel').innerText = "Create new storage unit"; - document.getElementById('storageLocationModalTitle').innerText = "Create new storage location"; + document.getElementById('storageUnitModalLocationSelectText').innerText = 'Select or create a new location.'; + document.getElementById('storageUnitModalLabel').innerText = 'Create new storage unit'; + document.getElementById('storageLocationModalTitle').innerText = 'Create new storage location'; form.setAttribute('method', 'POST'); form2.setAttribute('method', 'POST'); return true; @@ -42,25 +44,25 @@ function primeEdit() { const form2 = document.getElementById('storageLocationModalForm'); // Disable create new location document.getElementById('createNewLocationSelection').disabled = true; - document.getElementById('storageUnitModalLocationSelectText').innerText= "While editing you can only select already existing locations. Use the settings to create new ones."; - document.getElementById('storageUnitModalLabel').innerText = "Edit a storage unit"; - document.getElementById('storageLocationModalTitle').innerText = "Edit a storage location" - document.getElementById('storageUnitModalLocationSelect').selectedIndex = 1 - handleSelector() + document.getElementById('storageUnitModalLocationSelectText').innerText = 'While editing you can only select already existing locations. Use the settings to create new ones.'; + document.getElementById('storageUnitModalLabel').innerText = 'Edit a storage unit'; + document.getElementById('storageLocationModalTitle').innerText = 'Edit a storage location'; + document.getElementById('storageUnitModalLocationSelect').selectedIndex = 1; + handleSelector(); form.setAttribute('method', 'PATCH'); form2.setAttribute('method', 'PATCH'); return true; } -function handleSelector(){ - const selector = document.getElementById('storageUnitModalLocationSelect') +function handleSelector() { + const selector = document.getElementById('storageUnitModalLocationSelect'); const value = selector.options[selector.selectedIndex].value; - if(value == "META_CREATENEW") { - $('#storageUnitModalContactInfoCreator').removeClass('d-none') - $('.requireOnCreate').attr('required', true) + if (value == 'META_CREATENEW') { + $('#storageUnitModalContactInfoCreator').removeClass('d-none'); + $('.requireOnCreate').attr('required', true); } else { - $('#storageUnitModalContactInfoCreator').addClass('d-none') - $('.requireOnCreate').attr('required', false) + $('#storageUnitModalContactInfoCreator').addClass('d-none'); + $('.requireOnCreate').attr('required', false); } } @@ -69,7 +71,6 @@ function getDataForEdit(id) { type: 'get', url: `/api/v1/storageUnits?id=${id}`, success: function (result) { - // Get elements inside the editCategoryModal const modal_unitName = document.getElementById('storageUnitModalName'); const modal_unitLocation = document.getElementById('storageUnitModalLocationSelect'); @@ -80,15 +81,13 @@ function getDataForEdit(id) { modal_unitId.value = result.id; // Select the correct location from the select based on the value of the option - for(var i, j = 0; i = modal_unitLocation.options[j]; j++) { - if(i.value == result.contactInfoId) { - console.log("Found it"); + for (var i, j = 0; (i = modal_unitLocation.options[j]); j++) { + if (i.value == result.contactInfoId) { + console.log('Found it'); modal_unitLocation.selectedIndex = j; break; } } - - }, error: function (data) { console.log('!!!! ERROR !!!!', data); @@ -96,18 +95,16 @@ function getDataForEdit(id) { $('.loader-overlay').removeClass('active'); // Close the modal $('.modal').modal('hide'); - createNewToast(' Something went wrong. The storage unit does no longer exist.', "text-bg-danger") + createNewToast(' Something went wrong. The storage unit does no longer exist.', 'text-bg-danger'); } }); } - function getDataForEditLoc(id) { $.ajax({ type: 'get', url: `/api/v1/storageLocations?id=${id}`, success: function (result) { - // Get elements inside the editCategoryModal const modal_locationName = document.getElementById('storageLocationModalName'); const modal_locationUnitSel = document.getElementById('storageLocationModalUnit'); @@ -118,15 +115,13 @@ function getDataForEditLoc(id) { modal_locationId.value = result.id; // Select the correct location from the select based on the value of the option - for(var i, j = 0; i = modal_locationUnitSel.options[j]; j++) { - if(i.value == result.storageUnitId) { - console.log("Found it"); + for (var i, j = 0; (i = modal_locationUnitSel.options[j]); j++) { + if (i.value == result.storageUnitId) { + console.log('Found it'); modal_locationUnitSel.selectedIndex = j; break; } } - - }, error: function (data) { console.log('!!!! ERROR !!!!', data); @@ -134,9 +129,88 @@ function getDataForEditLoc(id) { $('.loader-overlay').removeClass('active'); // Close the modal $('.modal').modal('hide'); - createNewToast(' Something went wrong. The storage unit does no longer exist.', "text-bg-danger") + createNewToast(' Something went wrong. The storage unit does no longer exist.', 'text-bg-danger'); } }); } -handleSelector() \ No newline at end of file +const itemList = $('#itemList'); +const itemListUnit = $('#itemListUnit'); + +// itemList.empty(); +itemListUnit.bootstrapTable({ url: '/api/v1/storageUnits?getAll=true', search: true, showRefresh: true, responseHandler: dataResponseHandlerUnit, sidePagination: 'server', serverSort: true, silentSort: false }); +itemList.bootstrapTable({ url: '/api/v1/storageLocations?getAll=true', search: true, showRefresh: true, responseHandler: dataResponseHandler, sidePagination: 'server', serverSort: true, silentSort: false }); +setTimeout(() => { + activateTooltips(); +}, 1000); + +function loadPageData() { + // itemList.empty(); + itemList.bootstrapTable('refresh'); + itemListUnit.bootstrapTable('refresh'); + + setTimeout(() => { + activateTooltips(); + }, 1000); +} + +function dataResponseHandler(json) { + // console.log(json) + totalNotFiltered = json.totalNotFiltered; + total = json.total; + json = json.items; + json.forEach((item) => { + colorStatus = ''; + item.actions = ` + + `; + if (item.storageUnit == null) { + item.storageUnit = 'No storage unit assigned'; + } else { + item.storageUnit = item.storageUnit.name; + console.log(item.storageUnit); + } + + // item.SKU = `

${item.SKU}

` + }); + ///// --------------------------------- ///// + setTimeout(() => { + activateTooltips(); + }, 200); + return { rows: json, total: total, totalNotFiltered: totalNotFiltered, totalRows: total }; +} + +function dataResponseHandlerUnit(json) { + // console.log(json) + totalNotFiltered = json.totalNotFiltered; + total = json.total; + json = json.items; + json.forEach((item) => { + colorStatus = ''; + item.actions = ` + + `; + if (item.contactInfo == null) { + item.address = 'No address assigned'; + } else { + item.address = `${item.contactInfo.street} ${item.contactInfo.houseNumber}, ${item.contactInfo.city} ${item.contactInfo.country}`; + } + + // item.SKU = `

${item.SKU}

` + }); + ///// --------------------------------- ///// + setTimeout(() => { + activateTooltips(); + }, 200); + return { rows: json, total: total, totalNotFiltered: totalNotFiltered, totalRows: total }; +} + +handleSelector();