From c327355c8a02d004a1d0b0d0ceac2c6022290258 Mon Sep 17 00:00:00 2001 From: "selina.mail" Date: Tue, 27 Feb 2024 10:31:03 +0100 Subject: [PATCH] basic functionality pot implemented --- backend/models/configItemsModel.js | 4 +- backend/models/customerModel.js | 2 +- backend/models/issueSlipsModel.js | 2 +- backend/models/issueVariantsModel.js | 2 +- backend/models/maintenanceVisitsModel.js | 6 +- .../models/masterMaintenanceVisitsModel.js | 4 +- backend/models/masterProductionOrdersModel.js | 7 +- backend/models/productionOrdersModel.js | 8 +- backend/models/solutionsModel.js | 8 +- components/ClientSearch.vue | 8 +- components/server/Asset.vue | 22 +- components/server/AssetTable.vue | 11 +- components/server/HardwareSpecifications.vue | 8 +- components/server/NetworkSpecifications.vue | 14 +- .../server/ProductionOrdersTemplate.vue | 294 +++++++++++++++++- .../server/ProductionOrdersTemplateTable.vue | 137 +++++++- components/server/SoftwareSpecifications.vue | 8 +- components/server/TemplateChecklist.vue | 122 +++++++- layouts/Actionbar.vue | 18 +- layouts/Navigationbar.vue | 9 +- middleware/auth.js | 12 - pages/productionOrders.vue | 16 +- plugins/vuex.js | 246 ++++++++++----- server/api/addPOT.ts | 21 ++ .../api/deleteProductionOrderTemplate/[id].ts | 22 ++ server/api/getProductionOrderTemplate/[id].ts | 22 ++ server/api/getSelectedPOTsByClient/[id].ts | 22 ++ server/api/getSelectedPOTsByPOT/[id].ts | 22 ++ server/api/updateProductionOrderTemplate.ts | 13 + server/middleware/productionOrderTemplates.ts | 212 ++++++++++++- 30 files changed, 1113 insertions(+), 189 deletions(-) delete mode 100644 middleware/auth.js create mode 100644 server/api/addPOT.ts create mode 100644 server/api/deleteProductionOrderTemplate/[id].ts create mode 100644 server/api/getProductionOrderTemplate/[id].ts create mode 100644 server/api/getSelectedPOTsByClient/[id].ts create mode 100644 server/api/getSelectedPOTsByPOT/[id].ts create mode 100644 server/api/updateProductionOrderTemplate.ts diff --git a/backend/models/configItemsModel.js b/backend/models/configItemsModel.js index aecf8bd..373efc5 100644 --- a/backend/models/configItemsModel.js +++ b/backend/models/configItemsModel.js @@ -89,7 +89,7 @@ export const insertConfigItem = async (data, result) => { //get all selected config items by customer export const getSelectedConfigItemsByCustomer = async (selected, result) => { try { - let sql = `SELECT * FROM changedb WHERE customer LIKE '%${selected}%' ORDER BY customer ASC`; + let sql = `SELECT * FROM changedb WHERE LOWER(customer) LIKE '%${selected.toLowerCase()}%' ORDER BY customer ASC`; const results = await ownConn.execute(sql) result(null, results); } @@ -103,7 +103,7 @@ export const getSelectedConfigItemsByCustomer = async (selected, result) => { //get all selected config items by asset name export const getSelectedConfigItemsByAssetName = async (selected, result) => { try { - let sql = `SELECT * FROM changedb WHERE assetName LIKE '%${selected}%' ORDER BY assetName ASC`; + let sql = `SELECT * FROM changedb WHERE LOWER(assetName) LIKE '%${selected.toLowerCase()}%' ORDER BY assetName ASC`; const results = await ownConn.execute(sql) result(null, results); } diff --git a/backend/models/customerModel.js b/backend/models/customerModel.js index 3a29adf..a0ec0a9 100644 --- a/backend/models/customerModel.js +++ b/backend/models/customerModel.js @@ -17,7 +17,7 @@ export const getCustomers = async (result) => { //get all selected customers export const getSelectedCustomers = async (selected, result) => { try { - let sql = `SELECT * FROM customers WHERE customername LIKE '%${selected}%' ORDER BY customername ASC`; + let sql = `SELECT * FROM customers WHERE LOWER(customername) LIKE '%${selected.toLowerCase()}%' ORDER BY customername ASC`; const results = await ownConn.execute(sql) result(null, results); } diff --git a/backend/models/issueSlipsModel.js b/backend/models/issueSlipsModel.js index 92c01e8..c1cd9e2 100644 --- a/backend/models/issueSlipsModel.js +++ b/backend/models/issueSlipsModel.js @@ -31,7 +31,7 @@ export const getSelectedIssueSlipsByTicketnumber = async (selected, result) => { //get all selected issue slips by customer export const getSelectedIssueSlipsByCustomer = async (selected, result) => { try { - let sql = `SELECT * FROM issueslips WHERE customer LIKE '%${selected}%' ORDER BY customer ASC`; + let sql = `SELECT * FROM issueslips WHERE LOWER(customer) LIKE '%${selected.toLowerCase()}%' ORDER BY customer ASC`; const results = await ownConn.execute(sql) result(null, results); } diff --git a/backend/models/issueVariantsModel.js b/backend/models/issueVariantsModel.js index 88ef620..b7ac8ba 100644 --- a/backend/models/issueVariantsModel.js +++ b/backend/models/issueVariantsModel.js @@ -45,7 +45,7 @@ export const getSelectedIssueVariantsByIssueId = async (selected, result) => { //get all selected issue variants by name export const getSelectedIssueVariantsByName = async (selected, result) => { try { - let sql = `SELECT * FROM issuevariants WHERE name LIKE '%${selected}%' ORDER BY name ASC`; + let sql = `SELECT * FROM issuevariants WHERE LOWER(name) LIKE '%${selected.toLowerCase()}%' ORDER BY name ASC`; const results = await ownConn.execute(sql) result(null, results); } diff --git a/backend/models/maintenanceVisitsModel.js b/backend/models/maintenanceVisitsModel.js index b6d851a..3c19e48 100644 --- a/backend/models/maintenanceVisitsModel.js +++ b/backend/models/maintenanceVisitsModel.js @@ -17,7 +17,7 @@ export const getMaintenanceVisits = async (result) => { //get all selected maintenance visits by checklistname export const getSelectedMaintenanceVisitsByChecklistname = async (selected, result) => { try { - let sql = `SELECT * FROM maintenancevisits WHERE name LIKE '%${selected}%' ORDER BY name ASC`; + let sql = `SELECT * FROM maintenancevisits WHERE LOWER(name) LIKE '%${selected.toLowerCase()}%' ORDER BY name ASC`; const results = await ownConn.execute(sql) result(null, results); } @@ -31,7 +31,7 @@ export const getSelectedMaintenanceVisitsByChecklistname = async (selected, resu //get all selected maintenance visits by customer export const getSelectedMaintenanceVisitsByCustomer = async (selected, result) => { try { - let sql = `SELECT * FROM maintenancevisits WHERE customer LIKE '%${selected}%' ORDER BY customer ASC`; + let sql = `SELECT * FROM maintenancevisits WHERE LOWER(customer) LIKE '%${selected.toLowerCase()}%' ORDER BY customer ASC`; const results = await ownConn.execute(sql) result(null, results); } @@ -59,7 +59,7 @@ export const getSelectedMaintenanceVisitsByDate = async (selected, result) => { //get all selected maintenance visits by state export const getSelectedMaintenanceVisitsByState = async (selected, result) => { try { - let sql = `SELECT * FROM maintenancevisits WHERE state LIKE '%${selected}%' ORDER BY state ASC`; + let sql = `SELECT * FROM maintenancevisits WHERE LOWER(state) LIKE '%${selected.toLowerCase()}%' ORDER BY state ASC`; const results = await ownConn.execute(sql) result(null, results); } diff --git a/backend/models/masterMaintenanceVisitsModel.js b/backend/models/masterMaintenanceVisitsModel.js index 758efcc..44b98d0 100644 --- a/backend/models/masterMaintenanceVisitsModel.js +++ b/backend/models/masterMaintenanceVisitsModel.js @@ -17,7 +17,7 @@ export const getMasterMaintenanceVisits = async (result) => { //get all selected master maintenance visits by customer export const getSelectedMasterMaintenanceVisitsByCustomer = async (selected, result) => { try { - let sql = `SELECT * FROM mastermaintenancevisits WHERE customer LIKE '%${selected}%' ORDER BY customer ASC`; + let sql = `SELECT * FROM mastermaintenancevisits WHERE LOWER(customer) LIKE '%${selected.toLowerCase()}%' ORDER BY customer ASC`; const results = await ownConn.execute(sql) result(null, results); } @@ -31,7 +31,7 @@ export const getSelectedMasterMaintenanceVisitsByCustomer = async (selected, res //get all selected master maintenance visits by checklistname export const getSelectedMasterMaintenanceVisitsByChecklistname = async (selected, result) => { try { - let sql = `SELECT * FROM mastermaintenancevisits WHERE name LIKE '%${selected}%' ORDER BY name ASC`; + let sql = `SELECT * FROM mastermaintenancevisits WHERE LOWER(name) LIKE '%${selected.toLowerCase()}%' ORDER BY name ASC`; const results = await ownConn.execute(sql) result(null, results); } diff --git a/backend/models/masterProductionOrdersModel.js b/backend/models/masterProductionOrdersModel.js index 6edd49d..57936e6 100644 --- a/backend/models/masterProductionOrdersModel.js +++ b/backend/models/masterProductionOrdersModel.js @@ -17,7 +17,7 @@ export const getMasterProductionOrders = async (result) => { //get all selected master production orders by customer export const getSelectedMasterProductionOrdersByCustomer = async (selected, result) => { try { - let sql = `SELECT * FROM masterproductionorders WHERE customer LIKE '%${selected}%' ORDER BY customer ASC`; + let sql = `SELECT * FROM masterproductionorders WHERE LOWER(customer) LIKE '%${selected.toLowerCase()}%' ORDER BY customer ASC`; const results = await ownConn.execute(sql) result(null, results); } @@ -31,7 +31,7 @@ export const getSelectedMasterProductionOrdersByCustomer = async (selected, resu //get all selected master production orders by checklistname export const getSelectedMasterProductionOrdersByChecklistname = async (selected, result) => { try { - let sql = `SELECT * FROM masterproductionorders WHERE name LIKE '%${selected}%' ORDER BY name ASC`; + let sql = `SELECT * FROM masterproductionorders WHERE LOWER(name) LIKE '%${selected.toLowerCase()}%' ORDER BY name ASC`; const results = await ownConn.execute(sql) result(null, results); } @@ -62,6 +62,7 @@ export const updateMasterProductionOrderById = async (data, result) => { const id = data.templateID; let sql = `UPDATE masterproductionorders SET name = ?, customerID = ? , customer = ?, lastView = ?, user = ?, description = ?, notes = ? WHERE templateID = ?`; const results = await ownConn.query(sql, [data.name, data.customerID, data.customer, data.lastView, data.user, data.description, data.notes, id]) + results.insertId = results.insertId.toString(); result(null, results); } catch (err) { @@ -75,6 +76,7 @@ export const updateMasterProductionOrderById = async (data, result) => { export const insertMasterProductionOrder = async (data, result) => { try { const results = await ownConn.query(`INSERT INTO masterproductionorders(name, customerID, customer, lastView, user, description, notes) VALUES(?, ?, ?, ?, ?, ?, ?)`, [data.name, data.customerID, data.customer, data.lastView, data.user, data.description, data.notes]) + results.insertId = results.insertId.toString(); result(null, results); } catch (err) { @@ -89,6 +91,7 @@ export const deleteMasterProductionOrderById = async (id, result) => { try { let sql = `DELETE FROM masterproductionorders WHERE templateID = ?`; const results = await ownConn.query(sql, [id]) + results.insertId = results.insertId.toString(); result(null, results); } catch (err) { diff --git a/backend/models/productionOrdersModel.js b/backend/models/productionOrdersModel.js index 7823c73..378874e 100644 --- a/backend/models/productionOrdersModel.js +++ b/backend/models/productionOrdersModel.js @@ -31,7 +31,7 @@ export const getSelectedProductionOrdersByTicketnumber = async (selected, result //get all selected production orders by customer export const getSelectedProductionOrdersByCustomer = async (selected, result) => { try { - let sql = `SELECT * FROM productionorders WHERE customer LIKE '%${selected}%' ORDER BY customer ASC`; + let sql = `SELECT * FROM productionorders WHERE LOWER(customer) LIKE '%${selected.toLowerCase()}%' ORDER BY customer ASC`; const results = await ownConn.execute(sql) result(null, results); } @@ -45,7 +45,7 @@ export const getSelectedProductionOrdersByCustomer = async (selected, result) => //get all selected production orders by state export const getSelectedProductionOrdersByState = async (selected, result) => { try { - let sql = `SELECT * FROM productionorders WHERE state LIKE '%${selected}%' ORDER BY state ASC`; + let sql = `SELECT * FROM productionorders WHERE LOWER(state) LIKE '%${selected.toLowerCase()}%' ORDER BY state ASC`; const results = await ownConn.execute(sql) result(null, results); } @@ -59,7 +59,7 @@ export const getSelectedProductionOrdersByState = async (selected, result) => { //get all selected production orders by checklistname export const getSelectedProductionOrdersByChecklistname = async (selected, result) => { try { - let sql = `SELECT * FROM productionorders WHERE name LIKE '%${selected}%' ORDER BY name ASC`; + let sql = `SELECT * FROM productionorders WHERE LOWER(name) LIKE '%${selected.toLowerCase()}%' ORDER BY name ASC`; const results = await ownConn.execute(sql) result(null, results); } @@ -102,6 +102,7 @@ export const deleteProductionOrderById = async (id, result) => { export const insertProductionOrder = async (data, result) => { try { const results = await ownConn.query(`INSERT INTO productionorders(name, templateID, customer, customerID, asset, state, creationDate, completionDate, user, templateDescription, templateNotes, timeSpent, notes) VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, [data.name, data.templateID, data.customer, data.customerID, data.asset, data.state, data.creationDate, data.completionDate, data.user, data.templateDescription, data.templateNotes, data.timeSpent, data.notes]) + results.insertId = results.insertId.toString(); result(null, results); } catch (err) { @@ -145,6 +146,7 @@ export const updateProductionOrderStateById = async (data, result) => { try { let sql = `UPDATE productionorders SET state = ? WHERE ticketNumber = ?`; const results = await ownConn.query(sql, [data.state, id]) + results.insertId = results.insertId.toString(); result(null, results); } catch (err) { diff --git a/backend/models/solutionsModel.js b/backend/models/solutionsModel.js index f830c48..1458755 100644 --- a/backend/models/solutionsModel.js +++ b/backend/models/solutionsModel.js @@ -73,7 +73,7 @@ export const updateSolutionById = async (data, result) => { //get all selected solutions by customer export const getSelectedSolutionsByCustomer = async (selected, result) => { try { - let sql = `SELECT * FROM solutions WHERE customer LIKE '%${selected}%' ORDER BY customer ASC`; + let sql = `SELECT * FROM solutions WHERE LOWER(customer) LIKE '%${selected.toLowerCase()}%' ORDER BY customer ASC`; const results = await ownConn.execute(sql) result(null, results); } @@ -86,7 +86,7 @@ export const getSelectedSolutionsByCustomer = async (selected, result) => { //get all selected solutions by solution name export const getSelectedSolutionsBySolutionName = async (selected, result) => { - let sql = `SELECT * FROM solutions WHERE solutionName LIKE '%${selected}%' ORDER BY solutionName ASC`; + let sql = `SELECT * FROM solutions WHERE LOWER(solutionName) LIKE '%${selected.toLowerCase()}%' ORDER BY solutionName ASC`; try { const results = await ownConn.execute(sql) result(null, results); @@ -101,7 +101,7 @@ export const getSelectedSolutionsBySolutionName = async (selected, result) => { //get all selected solutions by asset name export const getSelectedSolutionsByAssetName = async (selected, result) => { try { - let sql = `SELECT * FROM solutions WHERE assetName LIKE '%${selected}%' ORDER BY assetName ASC`; + let sql = `SELECT * FROM solutions WHERE LOWER(assetName) LIKE '%${selected.toLowerCase()}%' ORDER BY assetName ASC`; const results = await ownConn.execute(sql) result(null, results); } @@ -115,7 +115,7 @@ export const getSelectedSolutionsByAssetName = async (selected, result) => { //get all selected solutions by type export const getSelectedSolutionsByType = async (selected, result) => { try { - let sql = `SELECT * FROM solutions WHERE type LIKE '%${selected}%' ORDER BY solutionName ASC`; + let sql = `SELECT * FROM solutions WHERE LOWER(type) LIKE '%${selected.toLowerCase()}%' ORDER BY solutionName ASC`; const results = await ownConn.execute(sql) result(null, results); } diff --git a/components/ClientSearch.vue b/components/ClientSearch.vue index 9feaffd..b41ac05 100644 --- a/components/ClientSearch.vue +++ b/components/ClientSearch.vue @@ -13,9 +13,9 @@ import { useStore } from 'vuex'; import { computed } from 'vue'; const store = useStore(); -const filtered = computed(() => store.state.assetFiltered); -const filteredTerm = computed(() => store.state.filteredAssetbyClient); -const clientFilter = ref(store.state.filteredAssetbyClient); +const filtered = computed(() => store.state.filtered); +const filteredTerm = computed(() => store.state.filteredByClient); +const clientFilter = ref(store.state.filteredByClient); const darkMode = ref(true) @@ -26,7 +26,7 @@ const updateFilterTerm = () => { // update the filtered term in the store const filterConfigItemList = () => { - store.commit('updateAssetFilterbyClient', clientFilter.value); + store.commit('updateFilterbyClient', clientFilter.value); } watch(filteredTerm, updateFilterTerm) diff --git a/components/server/Asset.vue b/components/server/Asset.vue index 8e482dd..77de5a1 100644 --- a/components/server/Asset.vue +++ b/components/server/Asset.vue @@ -1,5 +1,5 @@