fixed backend imports

backend/index.js

@@ -22,7 +22,6 @@ const app = express();
 
 //setup cors
 const corsOptions = {
-  // origin: `https://localhost:3000`,
   origin: `https://${clientsideConfig.url}:${clientsideConfig.port}`,
   headers: 'authorization, content-type',
   methods: 'GET,HEAD,PUT,PATCH,POST,DELETE',

backend/models/checklistSolutionsModel.js

@@ -3,7 +3,7 @@ import ownConn from "../dbConfig.js";
 //insert checklist solution todo to databased
 export const insertChecklistSolutionTodo = async (data, result) => {
     try {
-        const results = await ownConn.query(`INSERT INTO checklistSolutions(solutionID, step, asset, task, comments) VALUES(?, ?, ?, ?, ?)`, [data.solutionID, data.step, data.asset, data.task, data.comments]);
+        const results = await ownConn.query(`INSERT INTO checklistsolutions(solutionID, step, asset, task, comments) VALUES(?, ?, ?, ?, ?)`, [data.solutionID, data.step, data.asset, data.task, data.comments]);
         result(null, results);
     }
     catch (err) {
@@ -16,7 +16,7 @@ export const insertChecklistSolutionTodo = async (data, result) => {
 //get single checklist solution todo by id
 export const getChecklistSolutionTodosById = async (id, result) => {
     try {
-        let sql = `SELECT * FROM checklistSolutions WHERE solutionID = ? ORDER BY primaryID ASC`;
+        let sql = `SELECT * FROM checklistsolutions WHERE solutionID = ? ORDER BY primaryID ASC`;
         const results = await ownConn.execute(sql, [id])
         result(null, results);
     }
@@ -30,7 +30,7 @@ export const getChecklistSolutionTodosById = async (id, result) => {
 //get single checklist solution todo by asset
 export const getChecklistSolutionTodosByAsset = async (id, result) => {
     try {
-        let sql = `SELECT * FROM checklistSolutions WHERE asset = ? ORDER BY primaryID ASC`;
+        let sql = `SELECT * FROM checklistsolutions WHERE asset = ? ORDER BY primaryID ASC`;
         const results = await ownConn.execute(sql, [id])
         result(null, results);
     }
@@ -45,7 +45,7 @@ export const getChecklistSolutionTodosByAsset = async (id, result) => {
 export const updateChecklistSolutionTodoById = async (data, result) => {
     try {
         const id = data.primaryID;
-        let sql = `UPDATE checklistSolutions SET step = ?, asset = ?, task = ?, comments = ? WHERE primaryID = ?`;
+        let sql = `UPDATE checklistsolutions SET step = ?, asset = ?, task = ?, comments = ? WHERE primaryID = ?`;
         const results = await ownConn.query(sql, [data.step, data.asset, data.task, data.comments, id])
         result(null, results);
     }
@@ -59,7 +59,7 @@ export const updateChecklistSolutionTodoById = async (data, result) => {
 // Delete all checklist solution todos by template ID to Database
 export const deleteAllChecklistSolutionTodosSolutionID = async (id, result) => {
     try {
-        let sql = `DELETE FROM checklistSolutions WHERE solutionID = ?`;
+        let sql = `DELETE FROM checklistsolutions WHERE solutionID = ?`;
         const results = await ownConn.query(sql, [id])
         result(null, results);
     }
@@ -73,7 +73,7 @@ export const deleteAllChecklistSolutionTodosSolutionID = async (id, result) => {
 // Delete single checklist solution todo by primary ID to Database
 export const deleteChecklistSolutionTodo = async (id, result) => {
     try {
-        let sql = `DELETE FROM checklistSolutions WHERE primaryID = ?`;
+        let sql = `DELETE FROM checklistsolutions WHERE primaryID = ?`;
         const results = await ownConn.query(sql, [id])
         result(null, results);
     }

backend/models/configItemsModel.js

@@ -17,7 +17,7 @@ export const getConfigItems = async (result) => {
 //get single config item by id
 export const getConfigItemById = async (id, result) => {
   try {
-    let sql = `SELECT * FROM changeDB WHERE primaryID = ?`;
+    let sql = `SELECT * FROM changedb WHERE primaryID = ?`;
     const results = await ownConn.execute(sql, [id])
     result(null, results[0]);
   }
@@ -31,7 +31,7 @@ export const getConfigItemById = async (id, result) => {
 //get single config item by name
 export const getConfigItemByName = async (name, result) => {
   try {
-    let sql = `SELECT * FROM changeDB WHERE assetName = ?`;
+    let sql = `SELECT * FROM changedb WHERE assetName = ?`;
     const results = await ownConn.query(sql, [name])
     result(null, results[0]);
   }
@@ -45,7 +45,7 @@ export const getConfigItemByName = async (name, result) => {
 //get config items by customer id
 export const getConfigItemByCustomerId = async (customerId, result) => {
   try {
-    let sql = `SELECT * FROM changeDB WHERE customerID = ? ORDER BY assetName ASC`;
+    let sql = `SELECT * FROM changedb WHERE customerID = ? ORDER BY assetName ASC`;
     const results = await ownConn.query(sql, [customerId])
     result(null, results);
   }
@@ -60,7 +60,7 @@ export const getConfigItemByCustomerId = async (customerId, result) => {
 export const updateConfigItemById = async (data, result) => {
   const id = data.primaryID;
   try {
-    let sql = `UPDATE changeDB SET assetName = ?, customerID = ?, customer = ?, location = ?, remoteLocation = ?, type = ?, description = ?, notes = ?, state = ?, lastView = ?, user = ?, hardwareBool = ?, model = ?, serialnumber = ?, CPU = ?, RAM = ?, storageConfiguration = ?, miscellaneous = ?, softwareBool = ?, software = ?, version = ?, networkBool = ?, IPv4 = ?, IPv6 = ?, MAC = ?, subnetmask = ? WHERE primaryID = ?`;
+    let sql = `UPDATE changedb SET assetName = ?, customerID = ?, customer = ?, location = ?, remoteLocation = ?, type = ?, description = ?, notes = ?, state = ?, lastView = ?, user = ?, hardwareBool = ?, model = ?, serialnumber = ?, CPU = ?, RAM = ?, storageConfiguration = ?, miscellaneous = ?, softwareBool = ?, software = ?, version = ?, networkBool = ?, IPv4 = ?, IPv6 = ?, MAC = ?, subnetmask = ? WHERE primaryID = ?`;
     const results = await ownConn.query(sql, [data.assetName, data.customerID, data.customer, data.location, data.remoteLocation, data.type, data.description, data.notes, data.state, data.lastView, data.user, data.hardwareBool, data.model, data.serialnumber, data.CPU, data.RAM, data.storageConfiguration, data.miscellaneous, data.softwareBool, data.software, data.version, data.license, data.networkBool, data.IPv4, data.IPv6, data.MAC, data.subnetmask, id]);
     result(null, results);
   }
@@ -74,7 +74,7 @@ export const updateConfigItemById = async (data, result) => {
 //insert config item to databased
 export const insertConfigItem = async (data, result) => {
   try {
-    const results = await ownConn.query(`INSERT INTO changeDB(assetName, customerID, customer, location, remoteLocation, type, description, notes, state, lastView, user, hardwareBool, model, serialnumber, CPU, RAM, storageConfiguration, miscellaneous, softwareBool, software, version, license, networkBool, IPv4, IPv6, MAC, subnetmask) VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, [data.assetName, data.customerID, data.customer, data.location, data.remoteLocation, data.type, data.description, data.notes, data.state, data.lastView, data.user, data.hardwareBool, data.model, data.serialnumber, data.CPU, data.RAM, data.storageConfiguration, data.miscellaneous, data.softwareBool, data.software, data.version, data.license, data.networkBool, data.IPv4, data.IPv6, data.MAC, data.subnetmask])
+    const results = await ownConn.query(`INSERT INTO changedb(assetName, customerID, customer, location, remoteLocation, type, description, notes, state, lastView, user, hardwareBool, model, serialnumber, CPU, RAM, storageConfiguration, miscellaneous, softwareBool, software, version, license, networkBool, IPv4, IPv6, MAC, subnetmask) VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, [data.assetName, data.customerID, data.customer, data.location, data.remoteLocation, data.type, data.description, data.notes, data.state, data.lastView, data.user, data.hardwareBool, data.model, data.serialnumber, data.CPU, data.RAM, data.storageConfiguration, data.miscellaneous, data.softwareBool, data.software, data.version, data.license, data.networkBool, data.IPv4, data.IPv6, data.MAC, data.subnetmask])
     result(null, results);
   }
   catch (err) {
@@ -87,7 +87,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 customer LIKE '%${selected}%' ORDER BY customer ASC`;
     const results = await ownConn.execute(sql)
     result(null, results);
   }
@@ -101,7 +101,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 assetName LIKE '%${selected}%' ORDER BY assetName ASC`;
     const results = await ownConn.execute(sql)
     result(null, results);
   }
@@ -115,7 +115,7 @@ export const getSelectedConfigItemsByAssetName = async (selected, result) => {
 // Delete config item to Database
 export const deleteConfigItemById = async (id, result) => {
   try {
-    let sql = `DELETE FROM changeDB WHERE primaryID = ?`;
+    let sql = `DELETE FROM changedb WHERE primaryID = ?`;
     const results = await ownConn.query(sql, [id])
     result(null, results);
   }

backend/models/issueSlipsModel.js

@@ -3,7 +3,7 @@ import ownConn from "../dbConfig.js";
 //get all issue slips
 export const getIssueSlips = async (result) => {
     try {
-        let sql = `SELECT * FROM issueSlips ORDER BY customer ASC`;
+        let sql = `SELECT * FROM issueslips ORDER BY customer ASC`;
         const results = await ownConn.execute(sql)
         result(null, results);
     }
@@ -17,7 +17,7 @@ export const getIssueSlips = async (result) => {
 //get all selected issue slips by ticketnumber
 export const getSelectedIssueSlipsByTicketnumber = async (selected, result) => {
     try {
-        let sql = `SELECT * FROM issueSlips WHERE ticketNo LIKE '%${selected}%' ORDER BY ticketNo ASC`;
+        let sql = `SELECT * FROM issueslips WHERE ticketNo LIKE '%${selected}%' ORDER BY ticketNo ASC`;
         const results = await ownConn.execute(sql)
         result(null, results);
     }
@@ -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 customer LIKE '%${selected}%' ORDER BY customer ASC`;
         const results = await ownConn.execute(sql)
         result(null, results);
     }
@@ -45,7 +45,7 @@ export const getSelectedIssueSlipsByCustomer = async (selected, result) => {
 //get all selected issue slips by date of creation
 export const getSelectedIssueSlipsByDate = async (selected, result) => {
     try {
-        let sql = `SELECT * FROM issueSlips WHERE creationDate LIKE '%${selected}%' ORDER BY creationDate ASC`;
+        let sql = `SELECT * FROM issueslips WHERE creationDate LIKE '%${selected}%' ORDER BY creationDate ASC`;
         const results = await ownConn.execute(sql)
         result(null, results);
     }
@@ -59,7 +59,7 @@ export const getSelectedIssueSlipsByDate = async (selected, result) => {
 // Delete issue slip to Database
 export const deleteIssueSlipById = async (id, result) => {
     try {
-        let sql = `DELETE FROM issueSlips WHERE primaryID = ?`;
+        let sql = `DELETE FROM issueslips WHERE primaryID = ?`;
         const results = await ownConn.query(sql, [id])
         result(null, results);
     }
@@ -73,7 +73,7 @@ export const deleteIssueSlipById = async (id, result) => {
 // Delete issue slip by ticketnumber to Database
 export const deleteIssueSlipByTicketNo = async (id, result) => {
     try {
-        let sql = `DELETE FROM issueSlips WHERE ticketNo = ?`;
+        let sql = `DELETE FROM issueslips WHERE ticketNo = ?`;
         const results = await ownConn.query(sql, [id])
         result(null, results);
     }
@@ -87,7 +87,7 @@ export const deleteIssueSlipByTicketNo = async (id, result) => {
 //insert issue slip to database
 export const insertIssueSlip = async (data, result) => {
     try {
-        const results = await ownConn.query(`INSERT INTO issueSlips(customerID, customer, ticketNo, creationDate, lastView, user, notes, supplierRequest, supplierOffer, clientOffer, clientOrder, supplierOrder, ingress, egress, ingressBill, egressBill) VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, [data.customerID, data.customer, data.ticketNo, data.creationDate, data.lastView, data.user, data.notes, data.supplierRequest, data.supplierOffer, data.clientOffer, data.clientOrder, data.supplierOrder, data.ingress, data.egress, data.ingressBill, data.egressBill])
+        const results = await ownConn.query(`INSERT INTO issueslips(customerID, customer, ticketNo, creationDate, lastView, user, notes, supplierRequest, supplierOffer, clientOffer, clientOrder, supplierOrder, ingress, egress, ingressBill, egressBill) VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, [data.customerID, data.customer, data.ticketNo, data.creationDate, data.lastView, data.user, data.notes, data.supplierRequest, data.supplierOffer, data.clientOffer, data.clientOrder, data.supplierOrder, data.ingress, data.egress, data.ingressBill, data.egressBill])
         result(null, results);
     }
     catch (err) {
@@ -100,7 +100,7 @@ export const insertIssueSlip = async (data, result) => {
 //get single issue slip by ticketNo
 export const getIssueSlipByTicketNo = async (id, result) => {
     try {
-        let sql = `SELECT * FROM issueSlips WHERE ticketNo = ?`;
+        let sql = `SELECT * FROM issueslips WHERE ticketNo = ?`;
         const results = await ownConn.execute(sql, [id])
         result(null, results[0]);
     }
@@ -114,7 +114,7 @@ export const getIssueSlipByTicketNo = async (id, result) => {
 //get single issue slip by id
 export const getIssueSlipById = async (id, result) => {
     try {
-        let sql = `SELECT * FROM issueSlips WHERE primaryID = ?`;
+        let sql = `SELECT * FROM issueslips WHERE primaryID = ?`;
         const results = await ownConn.execute(sql, [id])
         result(null, results[0]);
     }
@@ -129,7 +129,7 @@ export const getIssueSlipById = async (id, result) => {
 export const updateIssueSlipById = async (data, result) => {
     const id = data.primaryID;
     try {
-        let sql = `UPDATE issueSlips SET customerID = ?, customer = ?, ticketNo = ?, creationDate = ?, lastView = ?, user = ?, notes = ?, supplierRequest = ?, supplierOffer = ?, clientOffer = ?, clientOrder = ?, supplierOrder = ?, ingress = ?, egress = ?, ingressBill = ?, egressBill = ? WHERE primaryID = ?`;
+        let sql = `UPDATE issueslips SET customerID = ?, customer = ?, ticketNo = ?, creationDate = ?, lastView = ?, user = ?, notes = ?, supplierRequest = ?, supplierOffer = ?, clientOffer = ?, clientOrder = ?, supplierOrder = ?, ingress = ?, egress = ?, ingressBill = ?, egressBill = ? WHERE primaryID = ?`;
         const results = await ownConn.query(sql, [data.customerID, data.customer, data.ticketNo, data.creationDate, data.lastView, data.user, data.notes, data.supplierRequest, data.supplierOffer, data.clientOffer, data.clientOrder, data.supplierOrder, data.ingress, data.egress, data.ingressBill, data.egressBill, id])
         result(null, results);
     }

backend/models/issueVariantsModel.js

@@ -3,7 +3,7 @@ import ownConn from "../dbConfig.js";
 //get all issue variants
 export const getAllIssueVariants = async (result) => {
     try {
-        let sql = `SELECT * FROM issueVariants ORDER BY primaryID ASC`;
+        let sql = `SELECT * FROM issuevariants ORDER BY primaryID ASC`;
         const results = await ownConn.execute(sql)
         result(null, results);
     }
@@ -17,7 +17,7 @@ export const getAllIssueVariants = async (result) => {
 //get issue variant
 export const getIssueVariantById = async (id, result) => {
     try {
-        let sql = `SELECT * FROM issueVariants WHERE primaryID = ? ORDER BY primaryID ASC`;
+        let sql = `SELECT * FROM issuevariants WHERE primaryID = ? ORDER BY primaryID ASC`;
         const results = await ownConn.execute(sql, [id])
         result(null, results);
     }
@@ -31,7 +31,7 @@ export const getIssueVariantById = async (id, result) => {
 //get all selected issue variants by issueID
 export const getSelectedIssueVariantsByIssueId = async (selected, result) => {
     try {
-        let sql = `SELECT * FROM issueVariants WHERE issueID LIKE '%${selected}%' ORDER BY issueID ASC`;
+        let sql = `SELECT * FROM issuevariants WHERE issueID LIKE '%${selected}%' ORDER BY issueID ASC`;
         const results = await ownConn.execute(sql)
         result(null, results);
     }
@@ -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 name LIKE '%${selected}%' ORDER BY name ASC`;
         const results = await ownConn.execute(sql)
         result(null, results);
     }
@@ -60,7 +60,7 @@ export const getSelectedIssueVariantsByName = async (selected, result) => {
 export const updateIssueVariantById = async (data, result) => {
     try {
         const id = data.primaryID;
-        let sql = `UPDATE issueVariants SET issueID = ?, name = ? , properties = ?, state = ?, amount = ?, price = ? WHERE primaryID = ?`;
+        let sql = `UPDATE issuevariants SET issueID = ?, name = ? , properties = ?, state = ?, amount = ?, price = ? WHERE primaryID = ?`;
         const results = await ownConn.query(sql, [data.issueID, data.name, data.properties, data.state, data.amount, data.price, id])
         result(null, results);
     }
@@ -75,7 +75,7 @@ export const updateIssueVariantById = async (data, result) => {
 // Delete issue variant to Database
 export const deleteIssueVariantById = async (id, result) => {
     try {
-        let sql = `DELETE FROM issueVariants WHERE primaryID = ?`;
+        let sql = `DELETE FROM issuevariants WHERE primaryID = ?`;
         const results = await ownConn.query(sql, [id])
         result(null, results);
     }
@@ -89,7 +89,7 @@ export const deleteIssueVariantById = async (id, result) => {
 // Delete issue variants by issueID to Database
 export const deleteIssueVariantByIssueSlipId = async (id, result) => {
     try {
-        let sql = `DELETE FROM issueVariants WHERE issueID = ?`;
+        let sql = `DELETE FROM issuevariants WHERE issueID = ?`;
         const results = await ownConn.query(sql, [id])
         result(null, results);
     }
@@ -103,7 +103,7 @@ export const deleteIssueVariantByIssueSlipId = async (id, result) => {
 //insert issue to databased
 export const insertIssueVariant = async (data, result) => {
     try {
-        const results = await ownConn.query(`INSERT INTO issueVariants(issueID, name, properties, state, amount, price) VALUES(?, ?, ?, ?, ?, ?)`, [data.issueID, data.name, data.properties, data.state, data.amount, data.price])
+        const results = await ownConn.query(`INSERT INTO issuevariants(issueID, name, properties, state, amount, price) VALUES(?, ?, ?, ?, ?, ?)`, [data.issueID, data.name, data.properties, data.state, data.amount, data.price])
         result(null, results);
     }
     catch (err) {

backend/models/maintenanceVisitsModel.js

@@ -3,7 +3,7 @@ import ownConn from "../dbConfig.js";
 //get all maintenance visits
 export const getMaintenanceVisits = async (result) => {
   try {
-    let sql = `SELECT * FROM maintenanceVisits ORDER BY name ASC`;
+    let sql = `SELECT * FROM maintenancevisits ORDER BY name ASC`;
     const results = await ownConn.execute(sql)
     result(null, results);
   }
@@ -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 name LIKE '%${selected}%' 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 customer LIKE '%${selected}%' ORDER BY customer ASC`;
     const results = await ownConn.execute(sql)
     result(null, results);
   }
@@ -45,7 +45,7 @@ export const getSelectedMaintenanceVisitsByCustomer = async (selected, result) =
 //get all selected maintenance visits by date
 export const getSelectedMaintenanceVisitsByDate = async (selected, result) => {
   try {
-    let sql = `SELECT * FROM maintenanceVisits WHERE creationDate LIKE '%${selected}%' ORDER BY creationDate ASC`;
+    let sql = `SELECT * FROM maintenancevisits WHERE creationDate LIKE '%${selected}%' ORDER BY creationDate 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 state LIKE '%${selected}%' ORDER BY state ASC`;
     const results = await ownConn.execute(sql)
     result(null, results);
   }
@@ -73,7 +73,7 @@ export const getSelectedMaintenanceVisitsByState = async (selected, result) => {
 // Delete maintenance visit to Database
 export const deleteMaintenanceVisitById = async (id, result) => {
   try {
-    let sql = `DELETE FROM maintenanceVisits WHERE primaryID = ?`;
+    let sql = `DELETE FROM maintenancevisits WHERE primaryID = ?`;
     const results = await ownConn.query(sql, [id])
     result(null, results);
   }
@@ -87,7 +87,7 @@ export const deleteMaintenanceVisitById = async (id, result) => {
 //insert maintenance visit to databased
 export const insertMaintenanceVisit = async (data, result) => {
   try {
-    const results = await ownConn.query(`INSERT INTO maintenanceVisits(name, templateID, maintenanceType, state, creationDate, completionDate, user, customer, customerID, templateNotes, type, timeSpent, notes) VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, [data.name, data.templateID, data.maintenanceType, data.state, data.creationDate, data.completionDate, data.user, data.customer, data.customerID, data.templateNotes, data.type, data.timeSpent, data.notes])
+    const results = await ownConn.query(`INSERT INTO maintenancevisits(name, templateID, maintenanceType, state, creationDate, completionDate, user, customer, customerID, templateNotes, type, timeSpent, notes) VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, [data.name, data.templateID, data.maintenanceType, data.state, data.creationDate, data.completionDate, data.user, data.customer, data.customerID, data.templateNotes, data.type, data.timeSpent, data.notes])
     result(null, results);
   }
   catch (err) {
@@ -100,7 +100,7 @@ export const insertMaintenanceVisit = async (data, result) => {
 //get single maintenance visit by name
 export const getMaintenanceVisitByName = async (id, result) => {
   try {
-    let sql = `SELECT * FROM maintenanceVisits  WHERE name = ?`;
+    let sql = `SELECT * FROM maintenancevisits  WHERE name = ?`;
     const results = await ownConn.execute(sql, [id])
     result(null, results[0]);
   }
@@ -114,7 +114,7 @@ export const getMaintenanceVisitByName = async (id, result) => {
 //get single maintenance visit by id
 export const getMaintenanceVisitById = async (id, result) => {
   try {
-    let sql = `SELECT * FROM maintenanceVisits  WHERE primaryID = ?`;
+    let sql = `SELECT * FROM maintenancevisits  WHERE primaryID = ?`;
     const results = await ownConn.execute(sql, [id])
     result(null, results[0]);
   }
@@ -129,7 +129,7 @@ export const getMaintenanceVisitById = async (id, result) => {
 export const updateMaintenanceVisitStateById = async (data, result) => {
   try {
     const id = data.primaryID;
-    let sql = `UPDATE maintenanceVisits SET state = ? WHERE primaryID = ?`;
+    let sql = `UPDATE maintenancevisits SET state = ? WHERE primaryID = ?`;
     const results = await ownConn.query(sql, [data.state, id])
     result(null, results);
   }

backend/models/maintenanceVisitsTodosModel.js

@@ -3,7 +3,7 @@ import ownConn from "../dbConfig.js";
 //insert maintenance visit todo to databased
 export const insertMaintenanceVisitTodo = async (data, result) => {
   try {
-    const results = await ownConn.query(`INSERT INTO maintenanceVisitTodos(templateID, step, asset, task, comment, done) VALUES(?, ?, ?, ?, ?, ?)`, [data.templateID, data.step, data.asset, data.task, data.comment, data.done])
+    const results = await ownConn.query(`INSERT INTO maintenancevisittodos(templateID, step, asset, task, comment, done) VALUES(?, ?, ?, ?, ?, ?)`, [data.templateID, data.step, data.asset, data.task, data.comment, data.done])
     result(null, results);
   }
   catch (err) {
@@ -16,7 +16,7 @@ export const insertMaintenanceVisitTodo = async (data, result) => {
 //get single maintenance visit todo by id
 export const getMaintenanceVisitTodosById = async (id, result) => {
   try {
-    let sql = `SELECT * FROM maintenanceVisitTodos WHERE templateID = ? ORDER BY primaryID ASC`;
+    let sql = `SELECT * FROM maintenancevisittodos WHERE templateID = ? ORDER BY primaryID ASC`;
     const results = await ownConn.execute(sql, [id])
     result(null, results);
   }
@@ -30,7 +30,7 @@ export const getMaintenanceVisitTodosById = async (id, result) => {
 //get single maintenance visit todo by asset
 export const getMaintenanceVisitTodosByAsset = async (id, result) => {
   try {
-    let sql = `SELECT * FROM maintenanceVisitTodos WHERE asset = ? ORDER BY primaryID ASC`;
+    let sql = `SELECT * FROM maintenancevisittodos WHERE asset = ? ORDER BY primaryID ASC`;
     const results = await ownConn.execute(sql, [id])
     result(null, results);
   }
@@ -45,7 +45,7 @@ export const getMaintenanceVisitTodosByAsset = async (id, result) => {
 export const updateMaintenanceVisitTodoById = async (data, result) => {
   try {
     const id = data.primaryID;
-    let sql = `UPDATE maintenanceVisitTodos SET step = ?, asset = ?, task = ?, comment = ?, done = ? WHERE primaryID = ?`;
+    let sql = `UPDATE maintenancevisittodos SET step = ?, asset = ?, task = ?, comment = ?, done = ? WHERE primaryID = ?`;
     const results = await ownConn.query(sql, [data.step, data.asset, data.task, data.comment, id])
     result(null, results);
   }
@@ -59,7 +59,7 @@ export const updateMaintenanceVisitTodoById = async (data, result) => {
 // Delete maintenance visit todo to Database
 export const deleteMaintenanceVisitTodosByPrimaryID = async (id, result) => {
   try {
-    let sql = `DELETE FROM maintenanceVisitTodos WHERE primaryID = ?`;
+    let sql = `DELETE FROM maintenancevisittodos WHERE primaryID = ?`;
     const results = await ownConn.query(sql, [id])
     result(null, results);
   }

backend/models/masterMaintenanceTodosModel.js

@@ -3,7 +3,7 @@ import ownConn from "../dbConfig.js";
 //get single master maintenance visit todo
 export const getMasterMaintenanceVisitTodoById = async (id, result) => {
     try {
-        let sql = `SELECT * FROM masterMaintenanceVisitTodos WHERE templateID = ? ORDER BY rowID ASC`;
+        let sql = `SELECT * FROM mastermaintenancetodos WHERE templateID = ? ORDER BY rowID ASC`;
         const results = await ownConn.execute(sql, [id])
         result(null, results);
     }
@@ -18,7 +18,7 @@ export const getMasterMaintenanceVisitTodoById = async (id, result) => {
 export const updateMasterMaintenanceVisitTodoById = async (data, result) => {
     try {
         const id = data.primaryID;
-        let sql = `UPDATE masterMaintenanceVisitTodos SET templateID = ?, asset = ? , task = ?, comments = ? WHERE primaryID = ?`;
+        let sql = `UPDATE mastermaintenancetodos SET templateID = ?, asset = ? , task = ?, comments = ? WHERE primaryID = ?`;
         const results = await ownConn.query(sql, [data.templateID, data.asset, data.task, data.comments, id])
         result(null, results);
     }
@@ -33,7 +33,7 @@ export const updateMasterMaintenanceVisitTodoById = async (data, result) => {
 // Delete master maintenance visit todo to Database
 export const deleteMasterMaintenanceVisitTodoById = async (id, result) => {
     try {
-        let sql = `DELETE FROM masterMaintenanceVisitTodos WHERE primaryID = ?`;
+        let sql = `DELETE FROM mastermaintenancetodos WHERE primaryID = ?`;
         const results = await ownConn.query(sql, [id])
         result(null, results);
     }
@@ -47,7 +47,7 @@ export const deleteMasterMaintenanceVisitTodoById = async (id, result) => {
 // Delete master maintenance visit todo by templateID to Database
 export const deleteMasterMaintenanceVisitTodoByTemplateId = async (id, result) => {
     try {
-        let sql = `DELETE FROM masterMaintenanceVisitTodos WHERE templateID = ?`;
+        let sql = `DELETE FROM mastermaintenancetodos WHERE templateID = ?`;
         const results = await ownConn.query(sql, [id])
         result(null, results);
     }
@@ -61,7 +61,7 @@ export const deleteMasterMaintenanceVisitTodoByTemplateId = async (id, result) =
 // Update all master maintenance visit todos to Database
 export const updateMasterMaintenanceVisitTodos = async (data, result) => {
     try {
-        let sql = `UPDATE masterMaintenanceVisitTodos SET rowID = ? WHERE primaryID = ?`;
+        let sql = `UPDATE mastermaintenancetodos SET rowID = ? WHERE primaryID = ?`;
         data.data.forEach(async i => {
             let id = i.primaryID;
             let rowId = i.rowID;
@@ -79,7 +79,7 @@ export const updateMasterMaintenanceVisitTodos = async (data, result) => {
 //insert master maintenance visit todo to databased
 export const insertMasterMaintenanceVisitTodo = async (data, result) => {
     try {
-        const results = await ownConn.query(`INSERT INTO masterMaintenanceVisitTodos(templateID, rowID, asset, task, comments) VALUES(?, ?, ?, ?, ?)`, [data.templateID, data.rowID, data.asset, data.task, asset.comments])
+        const results = await ownConn.query(`INSERT INTO mastermaintenancetodos(templateID, rowID, asset, task, comments) VALUES(?, ?, ?, ?, ?)`, [data.templateID, data.rowID, data.asset, data.task, asset.comments])
         result(null, results);
     }
     catch (err) {

backend/models/masterMaintenanceVisitsModel.js

@@ -3,7 +3,7 @@ import ownConn from "../dbConfig.js";
 //get all master maintenance visits
 export const getMasterMaintenanceVisits = async (result) => {
     try {
-        let sql = `SELECT * FROM masterMaintenanceVisits ORDER BY name ASC`;
+        let sql = `SELECT * FROM mastermaintenancevisits ORDER BY name ASC`;
         const results = await ownConn.execute(sql)
         result(null, results);
     }
@@ -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 customer LIKE '%${selected}%' 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 name LIKE '%${selected}%' ORDER BY name ASC`;
         const results = await ownConn.execute(sql)
         result(null, results);
     }
@@ -45,7 +45,7 @@ export const getSelectedMasterMaintenanceVisitsByChecklistname = async (selected
 //get single master maintenance visit
 export const getMasterMaintenanceVisitById = async (id, result) => {
     try {
-        let sql = `SELECT * FROM masterMaintenanceVisits WHERE checklistID = ?`;
+        let sql = `SELECT * FROM mastermaintenancevisits WHERE checklistID = ?`;
         const results = await ownConn.execute(sql, [id])
         result(null, results[0]);
     }
@@ -60,7 +60,7 @@ export const getMasterMaintenanceVisitById = async (id, result) => {
 export const updateMasterMaintenanceVisitById = async (data, result) => {
     try {
         const id = data.checklistID;
-        let sql = `UPDATE masterMaintenanceVisits SET name = ?, customerID = ? , customer = ?, type = ?, lastView = ?, user = ?, notes = ? WHERE checklistID = ?`;
+        let sql = `UPDATE mastermaintenancevisits SET name = ?, customerID = ? , customer = ?, type = ?, lastView = ?, user = ?, notes = ? WHERE checklistID = ?`;
         const results = await ownConn.query(sql, [data.name, data.customerID, data.customer, data.type, data.lastView, data.user, data.notes, id])
         result(null, results);
     }
@@ -74,7 +74,7 @@ export const updateMasterMaintenanceVisitById = async (data, result) => {
 //insert master maintenance visit to databased
 export const insertMasterMaintenanceVisit = async (data, result) => {
     try {
-        const results = await ownConn.query(`INSERT INTO masterMaintenanceVisits(name, customerID, customer, type, lastView, user, notes) VALUES(?, ?, ?, ?, ?, ?, ?)`, [data.name, data.customerID, data.customer, data.type, data.lastView, data.user, data.notes])
+        const results = await ownConn.query(`INSERT INTO mastermaintenancevisits(name, customerID, customer, type, lastView, user, notes) VALUES(?, ?, ?, ?, ?, ?, ?)`, [data.name, data.customerID, data.customer, data.type, data.lastView, data.user, data.notes])
         result(null, results);
     }
     catch (err) {
@@ -87,7 +87,7 @@ export const insertMasterMaintenanceVisit = async (data, result) => {
 // Delete master maintenance visit to Database
 export const deleteMasterMaintenanceVisitById = async (id, result) => {
     try {
-        let sql = `DELETE FROM masterMaintenanceVisits WHERE checklistID = ?`;
+        let sql = `DELETE FROM mastermaintenancevisits WHERE checklistID = ?`;
         const results = await ownConn.query(sql, [id])
         result(null, results);
     }

backend/models/masterProductionOrderTodosModel.js

@@ -3,7 +3,7 @@ import ownConn from "../dbConfig.js";
 //get single master production order todo
 export const getMasterProductionOrderTodoById = async (id, result) => {
     try {
-        let sql = `SELECT * FROM masterOrderTodos WHERE templateID = ? ORDER BY rowID ASC`;
+        let sql = `SELECT * FROM masterordertodos WHERE templateID = ? ORDER BY rowID ASC`;
         const results = await ownConn.execute(sql, [id])
         result(null, results);
     }
@@ -18,7 +18,7 @@ export const getMasterProductionOrderTodoById = async (id, result) => {
 export const updateMasterProductionOrderTodoById = async (data, result) => {
     try {
         const id = data.primaryID;
-        let sql = `UPDATE masterOrderTodos SET templateID = ?, asset = ? , task = ?, comment = ? WHERE primaryID = ?`;
+        let sql = `UPDATE masterordertodos SET templateID = ?, asset = ? , task = ?, comment = ? WHERE primaryID = ?`;
         const results = await ownConn.query(sql, [data.templateID, data.asset, data.task, data.comment, id])
         result(null, results);
     }
@@ -33,7 +33,7 @@ export const updateMasterProductionOrderTodoById = async (data, result) => {
 // Delete master production order todo to Database
 export const deleteMasterProductionOrderTodoById = async (id, result) => {
     try {
-        let sql = `DELETE FROM masterOrderTodos WHERE primaryID = ?`;
+        let sql = `DELETE FROM masterordertodos WHERE primaryID = ?`;
         const results = await ownConn.query(sql, [id])
         result(null, results);
     }
@@ -47,7 +47,7 @@ export const deleteMasterProductionOrderTodoById = async (id, result) => {
 // Delete master production order todo by templateID to Database
 export const deleteMasterProductionOrderTodoByTemplateId = async (id, result) => {
     try {
-        let sql = `DELETE FROM masterOrderTodos WHERE templateID = ?`;
+        let sql = `DELETE FROM masterordertodos WHERE templateID = ?`;
         const results = await ownConn.query(sql, [id])
         result(null, results);
     }
@@ -61,7 +61,7 @@ export const deleteMasterProductionOrderTodoByTemplateId = async (id, result) =>
 // Update all master production order todos to Database
 export const updateMasterProductionOrderTodos = async (data, result) => {
     try {
-        let sql = `UPDATE masterOrderTodos SET rowID = ? WHERE primaryID = ?`;
+        let sql = `UPDATE masterordertodos SET rowID = ? WHERE primaryID = ?`;
         data.data.forEach(async i => {
             let id = i.primaryID;
             let rowId = i.rowID;
@@ -79,7 +79,7 @@ export const updateMasterProductionOrderTodos = async (data, result) => {
 //insert master production order todo to databased
 export const insertMasterProductionOrderTodo = async (data, result) => {
     try {
-        const results = await ownConn.query(`INSERT INTO masterOrderTodos(templateID, rowID, asset, task, comment) VALUES(?, ?, ?, ?, ?)`, [data.templateID, data.rowID, data.asset, data.task, data.comment])
+        const results = await ownConn.query(`INSERT INTO masterordertodos(templateID, rowID, asset, task, comment) VALUES(?, ?, ?, ?, ?)`, [data.templateID, data.rowID, data.asset, data.task, data.comment])
         result(null, results);
     }
     catch (err) {

backend/models/masterProductionOrdersModel.js

@@ -3,7 +3,7 @@ import ownConn from "../dbConfig.js";
 //get all master production orders
 export const getMasterProductionOrders = async (result) => {
     try {
-        let sql = `SELECT * FROM masterProductionOrders ORDER BY name ASC`;
+        let sql = `SELECT * FROM masterproductionorders ORDER BY name ASC`;
         const results = await ownConn.execute(sql)
         result(null, results);
     }
@@ -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 customer LIKE '%${selected}%' 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 name LIKE '%${selected}%' ORDER BY name ASC`;
         const results = await ownConn.execute(sql)
         result(null, results);
     }
@@ -45,7 +45,7 @@ export const getSelectedMasterProductionOrdersByChecklistname = async (selected,
 //get single master production order
 export const getMasterProductionOrderById = async (id, result) => {
     try {
-        let sql = `SELECT * FROM masterProductionOrders WHERE templateID = ?`;
+        let sql = `SELECT * FROM masterproductionorders WHERE templateID = ?`;
         const results = await ownConn.execute(sql, [id])
         result(null, results[0]);
     }
@@ -60,7 +60,7 @@ export const getMasterProductionOrderById = async (id, result) => {
 export const updateMasterProductionOrderById = async (data, result) => {
     try {
         const id = data.templateID;
-        let sql = `UPDATE masterProductionOrders SET name = ?, customerID = ? , customer = ?, lastView = ?, user = ?, description = ?, notes = ? WHERE 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])
         result(null, results);
     }
@@ -74,7 +74,7 @@ export const updateMasterProductionOrderById = async (data, result) => {
 //insert master production order to databased
 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])
+        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])
         result(null, results);
     }
     catch (err) {
@@ -87,7 +87,7 @@ export const insertMasterProductionOrder = async (data, result) => {
 // Delete master production order to Database
 export const deleteMasterProductionOrderById = async (id, result) => {
     try {
-        let sql = `DELETE FROM masterProductionOrders WHERE templateID = ?`;
+        let sql = `DELETE FROM masterproductionorders WHERE templateID = ?`;
         const results = await ownConn.query(sql, [id])
         result(null, results);
     }

backend/models/orderingInfoIssueSlipsModel.js

@@ -3,7 +3,7 @@ import ownConn from "../dbConfig.js";
 //get single ordering info issue slip
 export const getOrderingInfoIssueSlipById = async (id, result) => {
     try {
-        let sql = `SELECT * FROM orderingInfoIssueSlips WHERE issueSlipID = ? ORDER BY primaryID ASC`;
+        let sql = `SELECT * FROM orderinginfoissueslips WHERE issueSlipID = ? ORDER BY primaryID ASC`;
         const results = await ownConn.execute(sql, [id])
         result(null, results);
     }
@@ -18,7 +18,7 @@ export const getOrderingInfoIssueSlipById = async (id, result) => {
 export const updateOrderingInfoIssueSlipById = async (data, result) => {
     try {
         const id = data.primaryID;
-        let sql = `UPDATE orderingInfoIssueSlips SET issueSlipID = ?, article = ? , amount = ?, price = ?, comment = ? WHERE primaryID = ?`;
+        let sql = `UPDATE orderinginfoissueslips SET issueSlipID = ?, article = ? , amount = ?, price = ?, comment = ? WHERE primaryID = ?`;
         const results = await ownConn.query(sql, [data.issueSlipID, data.article, data.amount, data.price, data.comment, id])
         result(null, results);
     }
@@ -33,7 +33,7 @@ export const updateOrderingInfoIssueSlipById = async (data, result) => {
 // Delete ordering info issue slip to Database
 export const deleteOrderingInfoIssueSlipById = async (id, result) => {
     try {
-        let sql = `DELETE FROM orderingInfoIssueSlips WHERE primaryID = ?`;
+        let sql = `DELETE FROM orderinginfoissueslips WHERE primaryID = ?`;
         const results = await ownConn.query(sql, [id])
         result(null, results);
     }
@@ -47,7 +47,7 @@ export const deleteOrderingInfoIssueSlipById = async (id, result) => {
 // Delete ordering info issue slip by issueSlipID to Database
 export const deleteOrderingInfoIssueSlipByIssueSlipId = async (id, result) => {
     try {
-        let sql = `DELETE FROM orderingInfoIssueSlips WHERE issueSlipID = ?`;
+        let sql = `DELETE FROM orderinginfoissueslips WHERE issueSlipID = ?`;
         const results = await ownConn.query(sql, [id])
         result(null, results);
     }
@@ -61,7 +61,7 @@ export const deleteOrderingInfoIssueSlipByIssueSlipId = async (id, result) => {
 //insert ordering info issue slip to databased
 export const insertOrderingInfoIssueSlip = async (data, result) => {
     try {
-        const results = await ownConn.query(`INSERT INTO orderingInfoIssueSlips(issueSlipID, article, amount, price, comment) VALUES(?, ?, ?, ?, ?)`, [data.issueSlipID, data.article, data.amount, data.price, data.comment])
+        const results = await ownConn.query(`INSERT INTO orderinginfoissueslips(issueSlipID, article, amount, price, comment) VALUES(?, ?, ?, ?, ?)`, [data.issueSlipID, data.article, data.amount, data.price, data.comment])
         result(null, results);
     }
     catch (err) {

backend/models/productionOrdersModel.js

@@ -3,7 +3,7 @@ import ownConn from "../dbConfig.js";
 //get all production orders
 export const getProductionOrders = async (result) => {
     try {
-        let sql = `SELECT * FROM productionOrders ORDER BY name ASC`;
+        let sql = `SELECT * FROM productionorders ORDER BY name ASC`;
         const results = await ownConn.execute(sql)
         result(null, results);
     }
@@ -17,7 +17,7 @@ export const getProductionOrders = async (result) => {
 //get all selected production orders by ticketnumber
 export const getSelectedProductionOrdersByTicketnumber = async (selected, result) => {
     try {
-        let sql = `SELECT * FROM productionOrders WHERE ticketNumber LIKE '%${selected}%' ORDER BY ticketNumber ASC`;
+        let sql = `SELECT * FROM productionorders WHERE ticketNumber LIKE '%${selected}%' ORDER BY ticketNumber ASC`;
         const results = await ownConn.execute(sql)
         result(null, results);
     }
@@ -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 customer LIKE '%${selected}%' 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 state LIKE '%${selected}%' 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 name LIKE '%${selected}%' ORDER BY name ASC`;
         const results = await ownConn.execute(sql)
         result(null, results);
     }
@@ -73,7 +73,7 @@ export const getSelectedProductionOrdersByChecklistname = async (selected, resul
 //get all selected production orders by date of creation
 export const getSelectedProductionOrdersByDate = async (selected, result) => {
     try {
-        let sql = `SELECT * FROM productionOrders WHERE creationDate LIKE '%${selected}%' ORDER BY creationDate ASC`;
+        let sql = `SELECT * FROM productionorders WHERE creationDate LIKE '%${selected}%' ORDER BY creationDate ASC`;
         const results = await ownConn.execute(sql)
         result(null, results);
     }
@@ -87,7 +87,7 @@ export const getSelectedProductionOrdersByDate = async (selected, result) => {
 // Delete production order to Database
 export const deleteProductionOrderById = async (id, result) => {
     try {
-        let sql = `DELETE FROM productionOrders WHERE ticketNumber = ?`;
+        let sql = `DELETE FROM productionorders WHERE ticketNumber = ?`;
         const results = await ownConn.query(sql, [id])
         result(null, results);
     }
@@ -101,7 +101,7 @@ export const deleteProductionOrderById = async (id, result) => {
 //insert production order to database
 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])
+        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])
         result(null, results);
     }
     catch (err) {
@@ -114,7 +114,7 @@ export const insertProductionOrder = async (data, result) => {
 //get single production order by name
 export const getProductionOrderByName = async (id, result) => {
     try {
-        let sql = `SELECT * FROM productionOrders  WHERE name = ?`;
+        let sql = `SELECT * FROM productionorders  WHERE name = ?`;
         const results = await ownConn.execute(sql, [id])
         result(null, results[0]);
     }
@@ -128,7 +128,7 @@ export const getProductionOrderByName = async (id, result) => {
 //get single production order by id
 export const getProductionOrderById = async (id, result) => {
     try {
-        let sql = `SELECT * FROM productionOrders  WHERE ticketNumber = ?`;
+        let sql = `SELECT * FROM productionorders  WHERE ticketNumber = ?`;
         const results = await ownConn.execute(sql, [id])
         result(null, results[0]);
     }
@@ -143,7 +143,7 @@ export const getProductionOrderById = async (id, result) => {
 export const updateProductionOrderStateById = async (data, result) => {
     const id = data.ticketNumber;
     try {
-        let sql = `UPDATE productionOrders SET state = ? WHERE ticketNumber = ?`;
+        let sql = `UPDATE productionorders SET state = ? WHERE ticketNumber = ?`;
         const results = await ownConn.query(sql, [data.state, id])
         result(null, results);
     }

backend/models/productionOrdersTodosModel.js

@@ -3,7 +3,7 @@ import ownConn from "../dbConfig.js";
 //insert production order todo to databased
 export const insertProductionOrderTodo = async (data, result) => {
     try {
-        const results = await ownConn.query(`INSERT INTO productionOrderTodos(templateID, step, asset, task, comment, done) VALUES(?, ?, ?, ?, ?, ?)`, [data.templateID, data.step, data.asset, data.task, data.comment, data.done]);
+        const results = await ownConn.query(`INSERT INTO productionordertodos(templateID, step, asset, task, comment, done) VALUES(?, ?, ?, ?, ?, ?)`, [data.templateID, data.step, data.asset, data.task, data.comment, data.done]);
         result(null, results);
     }
     catch (err) {
@@ -16,7 +16,7 @@ export const insertProductionOrderTodo = async (data, result) => {
 //get single production order todo by id
 export const getProductionOrderTodosById = async (id, result) => {
     try {
-        let sql = `SELECT * FROM productionOrderTodos WHERE templateID = ? ORDER BY primaryID ASC`;
+        let sql = `SELECT * FROM productionordertodos WHERE templateID = ? ORDER BY primaryID ASC`;
         const results = await ownConn.execute(sql, [id])
         result(null, results);
     }
@@ -30,7 +30,7 @@ export const getProductionOrderTodosById = async (id, result) => {
 //get single production order todo by asset
 export const getProductionOrderTodosByAsset = async (id, result) => {
     try {
-        let sql = `SELECT * FROM productionOrderTodos WHERE asset = ? ORDER BY primaryID ASC`;
+        let sql = `SELECT * FROM productionordertodos WHERE asset = ? ORDER BY primaryID ASC`;
         const results = await ownConn.execute(sql, [id])
         result(null, results);
     }
@@ -45,7 +45,7 @@ export const getProductionOrderTodosByAsset = async (id, result) => {
 export const updateProductionOrderTodoById = async (data, result) => {
     try {
         const id = data.primaryID;
-        let sql = `UPDATE productionOrderTodos SET step = ?, asset = ?, task = ?, comment = ?, done = ? WHERE primaryID = ?`;
+        let sql = `UPDATE productionordertodos SET step = ?, asset = ?, task = ?, comment = ?, done = ? WHERE primaryID = ?`;
         const results = await ownConn.query(sql, [data.step, data.asset, data.task, data.comment, data.done, id])
         result(null, results);
     }
@@ -59,7 +59,7 @@ export const updateProductionOrderTodoById = async (data, result) => {
 // Delete production order todos to Database
 export const deleteProductionOrderTodosChecklistID = async (id, result) => {
     try {
-        let sql = `DELETE FROM productionOrderTodos WHERE templateID = ?`;
+        let sql = `DELETE FROM productionordertodos WHERE templateID = ?`;
         const results = await ownConn.query(sql, [id])
         result(null, results);
     }

certs/localhost.crt

@@ -1,24 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEAzCCAuugAwIBAgIUVwDWxw7XeYOG6Y0uziRnZq2qri8wDQYJKoZIhvcNAQEL
-BQAwKTELMAkGA1UEBhMCREUxGjAYBgNVBAMMEUxvY2FsaG9zdC1Sb290LUNBMB4X
-DTIzMTAxNjA5MDMxMFoXDTI2MDgwNTA5MDMxMFowdzELMAkGA1UEBhMCREUxGzAZ
-BgNVBAgMEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAGA1UEBwwJVHVlYmluZ2VuMR0w
-GwYDVQQKDBRFeGFtcGxlLUNlcnRpZmljYXRlczEYMBYGA1UEAwwPbG9jYWxob3N0
-LmxvY2FsMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAm9bmONlkhJ0s
-ZT+OQR7di5Ypu1BoSIDd53Lwj4V9ws02ThYZUfFfYnuUmQBoGe1SAbvfTZ3dpLjM
-slBqAxz2gxwTWZt5GteTxtmflvKqmAepybOBqAcFKPwMcjreJyuBxYwInwGfEFgG
-YyRMH6VmDbC3vdxSz1NHpCkNL5ctfLQ4tkUShJCHPApqRp1F+BSBQVrpUwzIjn33
-0whHOE346mK1TRI7Qqriyv482BfNCWdG6e8FhbGF6oIEcs7Y0YTcdxxmYHv/CkWI
-/rtqETRpWOn3YVNGD5hKLchplD2ZaYLvFswij9dSbJUR6j0w5OqgmLO4fyyLZNgN
-zARg4mQF7wIDAQABo4HUMIHRMB8GA1UdIwQYMBaAFAzjy/XAlhtTipXj30seDdNO
-97OVMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgTwMHcGA1UdEQRwMG6CCWxvY2FsaG9z
-dIIRdHVlaXRhcHAudHVlaXQuZGWCDmxvY2FsaG9zdDo1MTcyghZ0dWVpdGFwcC50
-dWVpdC5kZTo1MTcygg5sb2NhbGhvc3Q6NTE3M4IWdHVlaXRhcHAudHVlaXQuZGU6
-NTE3MzAdBgNVHQ4EFgQU7JiUZESlRqvV9kqKqR+I+EdpA7QwDQYJKoZIhvcNAQEL
-BQADggEBACvvYNLtaBoyM7Cy5WuaDaZtxbZvBqzORaNbHUqsGr5YLMlPwAoOj2cC
-NmeyVX/I8lqZC0vma1UuyXp6v2ykkuAHL+PJrzhJiUb1KDhC8qBtnviaqB4ZNwQ5
-m84BAiZGCS62q2vpFU4Ux/deDSiP8/P/cnRMCeN3DRtDumGq7/UBODbJuDw3Dt4U
-CT/cLF2gDm40CkCLFyI6mRSxck3LUvsHV05yf31ikuPQ/M5WIcVHtbQ/qavgDMUT
-SZmqKTg4NFVJGDhFQV/A0DBqC0qIVkszbrJSCwNTPyVID+jl9ukYoMQ4zjDwrwp5
-ScOInLpNHHsAJd2b7V9jEptt7gSE1dk=
------END CERTIFICATE-----

certs/localhost.key

@@ -1,28 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCb1uY42WSEnSxl
-P45BHt2Llim7UGhIgN3ncvCPhX3CzTZOFhlR8V9ie5SZAGgZ7VIBu99Nnd2kuMyy
-UGoDHPaDHBNZm3ka15PG2Z+W8qqYB6nJs4GoBwUo/AxyOt4nK4HFjAifAZ8QWAZj
-JEwfpWYNsLe93FLPU0ekKQ0vly18tDi2RRKEkIc8CmpGnUX4FIFBWulTDMiOfffT
-CEc4TfjqYrVNEjtCquLK/jzYF80JZ0bp7wWFsYXqggRyztjRhNx3HGZge/8KRYj+
-u2oRNGlY6fdhU0YPmEotyGmUPZlpgu8WzCKP11JslRHqPTDk6qCYs7h/LItk2A3M
-BGDiZAXvAgMBAAECggEAOatumfYVBSBW6Ab7gSzHZpsEyX0pgj8yHy8BR9NqJTck
-1APIjfLpTfwWkwI8A/A3a03XhpUXixgaJBivCoTi0sUGgiAPUngZhzpMnSMjL0yS
-sAI+RmyGo9KWVoVjZZJrnSvDmvgSIY25m2G4y/M8z28op9mLSY7zkZPhfc2Ptzg0
-HO+SvyfxjZF7hwbblo41GzXuk0L2xxJN4xVfLti2R1yc+R9bdbEmzmgeECeZaHyQ
-Y6XacbpafPZpC1bwNTv/0W8BVmXLG1FQo56zSTWOf8yt6gDBA970a++IPWNJzVBs
-qbVjaDCHAh+sjgeT0+2tUhInVHUrNTgCXxmjWmYf/QKBgQDWOca4y6tEy5r2bl2F
-OVdYYn44QUjccpV9WQ/UGzMfcrPcBxEWOYsddDkIdhK+ES9pU+dg0xjNVUGLkEKF
-IuWuUZAtU9048r+xYVTUT1BepTKD9CfZ72dpenfQqUWctT6Pm/fj55NtcowlqXu1
-IbbVcKv6sXmEj+FG7nb6olVcLQKBgQC6OnYBHFk4phQf1R7Zj+6khRYQTiy3z5Rh
-3gIzQq8YseHsfiQZRVkVI4YM+y9tlCKuiDyD9AnJAm37j5C9FrFTJmuigu5xNok5
-zG7Vz08Cm31Vrx/lO/flPDi8CYbjEvWHLu8F64gTiotneMSLy+Jex36A8Ez2dL9N
-A/w3z3dQCwKBgEHti/vJKk9Evc8DTiK27+uSfDfB17OIS/tEknt7V3NhMHsRba/C
-S87nurmg5Mm7rjSjDr0cmjBvAXn7Do28nKTWEyHwAlAJXPcw9hNUyW4nNvGnDTCj
-3dZ3SzJbNcIxgSxfGp334cY4D2tzyk+HLaZoQ3UmczhZs0HKF7GwjcaNAoGBAIej
-yQtqEHo4TPQakIu6UAE4hid+KQgAg3z87PFVIp+EAJ/2CGj3n7jL1Pljgtn3SYOB
-60HY37+uq1jM6okvHB0KIN+PKgj/xdd5VUkZ49xsUE+2bC7VDOvEfzZGYh7GUlsS
-DjproQNKp9rHlbCU4d5Sw4s6e3QO+L8ppe0oiSidAoGBAJCe7594SwX5JUwhdRuC
-c42pzlqgzeDFCxVafNG5Qi3myPZjum2RbvJVP7Abc+1OqMnRlHrejJZl/eFOxkiD
-baGMW+GneARmuwUGv8GWK4dsG+JNNtGKRh8D14ZzKokXKjcczh2xdnEbaK+6aQVt
-HvwvS3sXX44fuJaDd7rTtKkU
------END PRIVATE KEY-----

certs/server_ca.pem

@@ -1,51 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEogIBAAKCAQEAmhH63xr2TscMN+LXYWIiuDmoA71W4qTBd7Or3vwj1TnuOoXG
-ikBBJbrdQ2ux3tAm1AeMtl664pFI5Qo/SmnJYt5I9uHKlfJ1//OZnKfwjFTtriyK
-oyQ15dX84nmS5U7pWL6k1I5a4bCu8NZ+kfCKP+m0NBOY0edZD44xI2R6vRAoAIL+
-N112DyWkil8L+uNodW6SS3CMg/y8I8qOGsqeN9BllYg/VWo8nTwiNthRGCXIDurG
-Z2NH/hoO+C4hA3C8qwjhD/urhs1WgV9570OLO7Hx3at0JRFan49Qu4Edj+tb4/tC
-PviJHcGcalno4jO651ZB/TUJtNm0TgzGeKeh8wIDAQABAoIBABdXjAOLKS/sNiyt
-YGYvoQT6LztJz0UNIwaIoQxqdN9UJISXSeoeLACUW/tf8JXKQWe0MRxcI8I5sqqI
-r+gNOOaSuMk2kiO/lSMO/AHg66/HGi9eLi7jSIsmrWZ+dsPo/a9lSsGtQ5WX2BlC
-1fA0Wi2usY+GPIvomfSiXU14ZqQH92lBrw4rD0vUVzaX5/J7eke7DD+Pjvwpyv8X
-GF1lH/cz2g2lIr/+QuTf0mzGulO/8UAUo/aiUw+yaLd69yh7dMT8DkWVmmGAIYa7
-P6nCKUlsjP9I+CSSsRbZtOwZBj0PGW0gVVxqdf+yfcIvYraN1gf1JRGEyduYEgmg
-ujs1SgkCgYEAyKAHFlnI51YnpXKpj4+yVzHyzp//C/E3vDugahlQSzaV19lFJfXv
-qbqnd5UJHTDjnbdND1qlW7k5oxX72J952aRfE4p5nyN1oCl+fB2LRnAJrIIIuI/z
-dBo11CNsin+8lOfc2Cw0I3gJLJtySaqYeRQdiYfzGapExFtFMtPg7T0CgYEAxJhu
-SMMZHz1R+IUGqbWkZrQLOMlUttqUwWLP8JTrJEBtfo/pDfKfV+PTXPvdnOExRwnH
-oxzFgtDXO2N0gMQ49loaDj8LzuSN2yOl8CdtXiamYL5pVCB6fwOC5nBFz7qFzvIs
-OLSI4Qp+acHuozcTn4aqyLxe9a2O8HjHvC0hHu8CgYBLIdrlnOQm9lXMmN81Gyw/
-iT4T8UkTUNd9j5rogOhX8m41MnG54JtLJdKXbuHF48wqAT5DlL++VORn1dDF9Bsu
-zWapq78WQLJJM6DhnDLPQx/sUZowfABBJ5unAUkhqOqXnSlQb2VrLwXIhcJMIi4N
-keHp4lbA8snj+wY0HbLrRQKBgCuZOmv8iGe7K6CXr8CXPdxg9VQkohrjIrY4ebD6
-9aLWfvHgbGjhc6EEL22hlaYi8tC0RIfR66N1OSY8iiu8WH2ZwcmDBdVeLm942mYF
-+GU24RL3Z1h203OzjaYZJAJLdT1Ny6zPrMNrlllR3uBnaHyqWtmlnNGTKe3+ex0q
-TPwVAoGAO4rVc9aMEPLX0LWP2diqJR9WYuP3ctzocTUFNGb44Erc+aZ/cTw7wot5
-E98A2JbHB0cgi/CkH2NDTdrVQwkWvo4wmOXHKeRunvYLCPM4wmIJeYjMwGu1v5jY
-MXl5VKJjejnMba4yr4eKUeBVWkE0a4NKysggG9TpfqVkWfdMjTg=
------END RSA PRIVATE KEY-----
------BEGIN CERTIFICATE-----
-MIID9zCCAt+gAwIBAgIJSn3caCSNY4u+MA0GCSqGSIb3DQEBCwUAMGkxFDASBgNV
-BAMTC2V4YW1wbGUub3JnMQswCQYDVQQGEwJVUzERMA8GA1UECBMIVmlyZ2luaWEx
-EzARBgNVBAcTCkJsYWNrc2J1cmcxDTALBgNVBAoTBFRlc3QxDTALBgNVBAsTBFRl
-c3QwHhcNMjMxMDE2MDk0MTI3WhcNMjMxMTE1MTA0MTI3WjBpMRQwEgYDVQQDEwtl
-eGFtcGxlLm9yZzELMAkGA1UEBhMCVVMxETAPBgNVBAgTCFZpcmdpbmlhMRMwEQYD
-VQQHEwpCbGFja3NidXJnMQ0wCwYDVQQKEwRUZXN0MQ0wCwYDVQQLEwRUZXN0MIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmhH63xr2TscMN+LXYWIiuDmo
-A71W4qTBd7Or3vwj1TnuOoXGikBBJbrdQ2ux3tAm1AeMtl664pFI5Qo/SmnJYt5I
-9uHKlfJ1//OZnKfwjFTtriyKoyQ15dX84nmS5U7pWL6k1I5a4bCu8NZ+kfCKP+m0
-NBOY0edZD44xI2R6vRAoAIL+N112DyWkil8L+uNodW6SS3CMg/y8I8qOGsqeN9Bl
-lYg/VWo8nTwiNthRGCXIDurGZ2NH/hoO+C4hA3C8qwjhD/urhs1WgV9570OLO7Hx
-3at0JRFan49Qu4Edj+tb4/tCPviJHcGcalno4jO651ZB/TUJtNm0TgzGeKeh8wID
-AQABo4GhMIGeMAsGA1UdDwQEAwIC9DAxBgNVHSUEKjAoBggrBgEFBQcDAQYIKwYB
-BQUHAwIGCCsGAQUFBwMDBggrBgEFBQcDCDBcBgNVHREEVTBTgglsb2NhbGhvc3SC
-FWxvY2FsaG9zdC5sb2NhbGRvbWFpboIGbHZoLm1lgggqLmx2aC5tZYIFWzo6MV2H
-BH8AAAGHEP6AAAAAAAAAAAAAAAAAAAEwDQYJKoZIhvcNAQELBQADggEBAD1JPu9a
-eRd7j/VIuwxZf7Ex3S8Dcxoynm9btPm9F09w/AlftKmaikGyhFMhR1bu5DArKaxe
-eQ8Qsp94DJHMBmEPxnjAnl1HB6FvVnG2u9ncpmflD352ZJDwMPaUx6FoBxmt5bFX
-Dug2dnV1baj6ZfvsLcKROzxG6KvzB84wQDK1C0qEHHKfoJ3+FN/2BPZYnKSDiPMz
-R5gfjsWOTbp7j0Amg8Mi4+LAGQ6VSYPdy7OfClcNsG4kFDrTzkojbsWT4o/JkzBl
-XZ3D6UN1L4ONl0pwBblee6p/o6/qOzD86S+vctsY9Ee/4UkZrf7Sq3QEGsRr5rI1
-LQCaGcSTw6A7lDk=
------END CERTIFICATE-----

components/server/Asset.vue

@@ -53,18 +53,14 @@
             <div class="additional">
                 <div class="description">
                     <h3 :class="['area-title', darkMode ? 'h3-darkmode' : 'h3-lightmode']">Description:</h3>
-                    <input v-if="!editable" v-model="item.description"
+                    <input v-model="item.description" :readonly="!editable"
-                        :class="['data', 'input', darkMode ? 'data-darkmode' : 'data-lightmode']" id="description">
-                    <input v-if="editable" v-model="item.description"
                         :class="['data', 'input', darkMode ? 'data-darkmode' : 'data-lightmode']" id="description">
                 </div>
             </div>
             <div class="additional">
                 <div class="notes">
                     <h3 :class="['area-title', darkMode ? 'h3-darkmode' : 'h3-lightmode']">Notes:</h3>
-                    <input v-if="!editable" v-model="item.notes"
+                    <input v-model="item.notes" :readonly="!editable"
-                        :class="['data', 'input', darkMode ? 'data-darkmode' : 'data-lightmode']" id="notes">
-                    <input v-if="editable" v-model="item.notes"
                         :class="['data', 'input', darkMode ? 'data-darkmode' : 'data-lightmode']" id="notes">
                 </div>
             </div>
@@ -77,6 +73,12 @@
 import { ref, onMounted } from 'vue';
 import Axios from '../axios.config.js';
 import clientsideConfig from '../../clientsideConfig.js';
+import { useStore } from 'vuex';
+import { computed } from 'vue';
+
+const store = useStore();
+const editable = computed(() => store.state.assetEditable);
+const chosenAssetId = computed(() => store.state.chosenAssetId);
 
 const darkMode = ref(true)
 // const editable = ref(false)
@@ -84,10 +86,9 @@ const item = ref({});
 
 // get config item from id
 const getItemById = async () => {
-    console.log(this.chosenAssetId)
     try {
         const response = await Axios.get(
-            `https://${clientsideConfig.url}:${clientsideConfig.port}/api/getConfigItem/${chosenAssetId}`
+            `https://${clientsideConfig.url}:${clientsideConfig.port}/api/getConfigItem/${chosenAssetId.value}`
         );
         item.value = response.data;
     } catch (err) {
@@ -154,7 +155,6 @@ const updateConfigItem = async () => {
 
 onMounted(() => {
     getItemById();
-    // console.log(editable.value)
 });
 
 </script>
@@ -162,14 +162,6 @@ onMounted(() => {
 <script>
 export default {
     name: "Asset",
-    computed: {
-        editable() {
-            return this.$store.state.assetEditable
-        },
-        chosenAssetId() {
-            return this.$store.state.chosenAssetId
-        }
-    },
 }
 </script>
       

components/server/AssetTable.vue

@@ -29,7 +29,8 @@
                         <!-- <router-link to="/assets" class="button"
                             :class="[darkMode ? 'button-darkmode' : 'button-lightmode']" > {{
                                 item.assetName }} </router-link> -->
-                        <nuxt-link to="/assets" class="button" :class="[darkMode ? 'button-darkmode' : 'button-lightmode']"
+                        <nuxt-link to="/assets" id="nuxt-link" class="button"
+                            :class="[darkMode ? 'button-darkmode' : 'button-lightmode']"
                             @click="goToChosenAsset(item.primaryID)">
                             {{ item.assetName }}
                         </nuxt-link>
@@ -51,6 +52,14 @@
 import { ref, onMounted } from 'vue';
 import Axios from '../axios.config.js';
 import clientsideConfig from '../../clientsideConfig.js';
+import { useStore } from 'vuex';
+
+// get accesss to the store
+const store = useStore()
+const goToChosenAsset = (id) => {
+    store.commit('setChosenAsset', id);
+    store.commit('changeToAsset');
+};
 
 const darkMode = ref(true)
 const configItemList = ref([]);
@@ -73,13 +82,6 @@ onMounted(async () => {
 <script>
 export default {
     name: "AssetTable",
-    methods: {
-        // switch to chosen Asset page 
-        goToChosenAsset(id) {
-            this.$store.commit('toggleEditableAsset', id)
-            this.$store.commit('changeToAsset')
-        }
-    }
 };
 </script>    
     
@@ -233,4 +235,9 @@ th {
 .label-lightmode {
     color: #000;
 }
+
+#nuxt-link {
+    text-decoration: none;
+    color: white;
+}
 </style>

components/server/HardwareSpecifications.vue

@@ -39,10 +39,7 @@
             <div class="additional">
                 <div class="storage-configuration">
                     <h3 :class="['area-title', darkMode ? 'h3-darkmode' : 'h3-lightmode']">Storage configuration:</h3>
-                    <input v-if="!editable" v-model="item.storageConfiguration"
+                    <input v-model="item.storageConfiguration" :readonly="!editable"
-                        :class="['data', 'input', darkMode ? 'data-darkmode' : 'data-lightmode']"
-                        id="storage-configuration">
-                    <input v-if="editable" v-model="item.storageConfiguration"
                         :class="['data', 'input', darkMode ? 'data-darkmode' : 'data-lightmode']"
                         id="storage-configuration">
                 </div>
@@ -50,9 +47,7 @@
             <div class="additional">
                 <div class="miscellaneous">
                     <h3 :class="['area-title', darkMode ? 'h3-darkmode' : 'h3-lightmode']">Miscellaneous:</h3>
-                    <input v-if="!editable" v-model="item.miscellaneous"
+                    <input v-model="item.miscellaneous" :readonly="!editable"
-                        :class="['data', 'input', darkMode ? 'data-darkmode' : 'data-lightmode']" id="miscellaneous">
-                    <input v-if="editable" v-model="item.miscellaneous"
                         :class="['data', 'input', darkMode ? 'data-darkmode' : 'data-lightmode']" id="miscellaneous">
                 </div>
             </div>
@@ -65,6 +60,12 @@
 import { ref, onMounted } from 'vue';
 import Axios from '../axios.config.js';
 import clientsideConfig from '../../clientsideConfig.js';
+import { useStore } from 'vuex';
+import { computed } from 'vue';
+
+const store = useStore();
+const editable = computed(() => store.state.assetEditable);
+const chosenAssetId = computed(() => store.state.chosenAssetId);
 
 const darkMode = ref(true)
 const item = ref({});
@@ -72,11 +73,9 @@ const hardwareBoolean = ref(false)
 
 // get config item from id
 const getItemById = async () => {
-    // later itemIndex from route params
-    let itemIndex = 9;
     try {
         const response = await Axios.get(
-            `https://${clientsideConfig.url}:${clientsideConfig.port}/api/getConfigItem/${itemIndex}`
+            `https://${clientsideConfig.url}:${clientsideConfig.port}/api/getConfigItem/${chosenAssetId.value}`
         );
         item.value = response.data;
         if ((item.value.hardwareBool == 1) && (item.value.model === (null | "")) && (item.value.serialnumber.trim() === "") && (item.value.CPU.trim() === "") && (item.value.RAM.trim() === "") && (item.value.storageConfiguration.trim() === "") && (item.value.miscellaneous.trim() === "")) {
@@ -99,11 +98,6 @@ onMounted(() => {
 <script>
 export default {
     name: "HardwareSpecifications",
-    computed: {
-        editable() {
-            return this.$store.state.assetEditable
-        }
-    },
 };
 </script>   
 

components/server/NetworkSpecifications.vue

@@ -5,21 +5,33 @@
             <div class="IPv4-MAC">
                 <div class="data-field" id="IPv4">
                     <pre :class="['label', darkMode ? 'div-darkmode' : 'div-lightmode']">IPv4:</pre>
-                    <pre :class="['data', darkMode ? 'data-darkmode' : 'data-lightmode']">{{ inputIPv4 }}</pre>
+                    <pre v-if="!editable"
+                        :class="['data', darkMode ? 'data-darkmode' : 'data-lightmode']">{{ inputIPv4 }}</pre>
+                    <input v-if="editable" v-model="inputIPv4"
+                        :class="['data', 'input', darkMode ? 'data-darkmode' : 'data-lightmode']">
                 </div>
                 <div class="data-field" id="MAC">
                     <pre :class="['label', darkMode ? 'div-darkmode' : 'div-lightmode']">MAC:</pre>
-                    <pre :class="['data', darkMode ? 'data-darkmode' : 'data-lightmode']">{{ item.MAC }}</pre>
+                    <pre v-if="!editable"
+                        :class="['data', darkMode ? 'data-darkmode' : 'data-lightmode']">{{ item.MAC }}</pre>
+                    <input v-if="editable" v-model="item.MAC"
+                        :class="['data', 'input', darkMode ? 'data-darkmode' : 'data-lightmode']">
                 </div>
             </div>
             <div class="IPv6-subnetmask">
                 <div class="data-field" id="IPv6">
                     <pre :class="['label', darkMode ? 'div-darkmode' : 'div-lightmode']">IPv6:</pre>
-                    <pre :class="['data', darkMode ? 'data-darkmode' : 'data-lightmode']">{{ inputIPv6 }}</pre>
+                    <pre v-if="!editable"
+                        :class="['data', darkMode ? 'data-darkmode' : 'data-lightmode']">{{ inputIPv6 }}</pre>
+                    <input v-if="editable" v-model="inputIPv6"
+                        :class="['data', 'input', darkMode ? 'data-darkmode' : 'data-lightmode']">
                 </div>
                 <div class="data-field" id="subnetmask">
                     <pre :class="['label', darkMode ? 'div-darkmode' : 'div-lightmode']">Subnetmask:</pre>
-                    <pre :class="['data', darkMode ? 'data-darkmode' : 'data-lightmode']">{{ item.subnetmask }}</pre>
+                    <pre v-if="!editable"
+                        :class="['data', darkMode ? 'data-darkmode' : 'data-lightmode']">{{ item.subnetmask }}</pre>
+                    <input v-if="editable" v-model="item.subnetmask"
+                        :class="['data', 'input', darkMode ? 'data-darkmode' : 'data-lightmode']">
                 </div>
             </div>
         </div>
@@ -31,6 +43,12 @@
 import { ref, onMounted } from 'vue';
 import Axios from '../axios.config.js';
 import clientsideConfig from '../../clientsideConfig.js';
+import { useStore } from 'vuex';
+import { computed } from 'vue';
+
+const store = useStore();
+const editable = computed(() => store.state.assetEditable);
+const chosenAssetId = computed(() => store.state.chosenAssetId);
 
 const darkMode = ref(true)
 const item = ref({});
@@ -40,11 +58,9 @@ const inputIPv6 = ref('');
 
 // get config item from id
 const getItemById = async () => {
-    // later itemIndex from route params
-    let itemIndex = 9;
     try {
         const response = await Axios.get(
-            `https://${clientsideConfig.url}:${clientsideConfig.port}/api/getConfigItem/${itemIndex}`
+            `https://${clientsideConfig.url}:${clientsideConfig.port}/api/getConfigItem/${chosenAssetId.value}`
         );
         item.value = response.data;
         if ((item.value.networkBool == 1) && (item.value.IPv4 === (null | "")) && (item.value.IPv6 === (null | "")) && (item.value.subnetmask === (null | "")) && (item.value.MAC === (null | ""))) {
@@ -171,4 +187,8 @@ export default {
     padding: 0 0;
     border-radius: 0.3125rem;
 }
+
+.input {
+    border: none;
+}
 </style>

components/server/SoftwareSpecifications.vue

@@ -33,6 +33,12 @@
 import { ref, onMounted } from 'vue';
 import Axios from '../axios.config.js';
 import clientsideConfig from '../../clientsideConfig.js';
+import { useStore } from 'vuex';
+import { computed } from 'vue';
+
+const store = useStore();
+const editable = computed(() => store.state.assetEditable);
+const chosenAssetId = computed(() => store.state.chosenAssetId);
 
 const darkMode = ref(true)
 const item = ref({});
@@ -40,11 +46,9 @@ const softwareBoolean = ref(false)
 
 // get config item from id
 const getItemById = async () => {
-    // later itemIndex from route params
-    let itemIndex = 9;
     try {
         const response = await Axios.get(
-            `https://${clientsideConfig.url}:${clientsideConfig.port}/api/getConfigItem/${itemIndex}`
+            `https://${clientsideConfig.url}:${clientsideConfig.port}/api/getConfigItem/${chosenAssetId.value}`
         );
         item.value = response.data;
         if ((item.value.softwareBool == 1) && (item.value.version.trim() === "") && (item.value.software.trim() === "")) {

layouts/Actionbar.vue

@@ -4,7 +4,7 @@
     <div :class="['icon', darkMode ? 'indicator-darkmode' : 'indicator-lightmode']" id="indicator-icon"
       @click="toggleActionbar">
       <img :class="[darkMode ? 'img-darkmode' : 'img-lightmode']" loading="lazy"
-        src="../icons/actionbar-icons/Indicator-Icon-Opened.svg"/>
+        src="../icons/actionbar-icons/Indicator-Icon-Opened.svg" />
     </div>
     <nav class="actions">
       <button :class="[darkMode ? 'button-darkmode' : 'button-lightmode']" id="search">
@@ -92,6 +92,15 @@
   </aside>
 </template>
 
+<script setup>
+import { useStore } from 'vuex';
+
+// get accesss to the store
+const store = useStore()
+const toggleEditable = () => {
+  store.commit('toggleEditableAsset');
+};
+</script>
 
 
 <script>
@@ -109,9 +118,6 @@ export default {
       console.log('Actionbar toggled');
       this.isExpanded = !this.isExpanded;
     },
-    toggleEditable() {
-      this.$store.commit('toggleEditableAsset')
-    }
   },
 }
 
@@ -348,4 +354,5 @@ img {
     max-width: 0;
     max-inline-size: 0;
   }
-}</style>
+}
+</style>

layouts/Navigationbar.vue

@@ -13,14 +13,14 @@
     </div>
     <div class="menus">
       <nav id="home-menu" :class="[darkMode ? 'menu-darkmode' : 'menu-lightmode']">
-        <nuxt-link to="/home" class="button" @click="defaultAssetPage()"
+        <router-link to="/home" class="button"
           :class="[darkMode ? 'button-darkmode' : 'button-lightmode']" id="home-button">
           <div class="icon" id="home-icon">
             <img :class="[darkMode ? 'img-darkmode' : 'img-lightmode']" loading="lazy"
               src="../icons/navbar-icons/Home-Icon.svg" />
           </div>
           <span v-if="isExpanded" :class="['label', darkMode ? 'label-darkmode' : 'label-lightmode']">Home</span>
-        </nuxt-link>
+        </router-link>
       </nav>
       <nav id="site-menu">
         <router-link to="/maintenanceVisits" class="button" :class="[darkMode ? 'button-darkmode' : 'button-lightmode']"
@@ -31,14 +31,14 @@
           </div>
           <span v-if="isExpanded" :class="['label', darkMode ? 'label-darkmode' : 'label-lightmode']">Checklists</span>
         </router-link>
-        <router-link to="/assets" class="button" :class="[darkMode ? 'button-darkmode' : 'button-lightmode']"
+        <nuxt-link to="/assets" class="button" :class="[darkMode ? 'button-darkmode' : 'button-lightmode']"  @click="defaultAssetPage()"
           id="assets-button">
           <div class="icon" id="assets-icon">
             <img :class="[darkMode ? 'img-darkmode' : 'img-lightmode']" loading="lazy"
               src="../icons/navbar-icons/Assets-Icon.svg" />
           </div>
           <span v-if="isExpanded" :class="['label', darkMode ? 'label-darkmode' : 'label-lightmode']">Config Items</span>
-        </router-link>
+        </nuxt-link>
         <router-link to="/solutions" class="button" :class="[darkMode ? 'button-darkmode' : 'button-lightmode']"
           id="solutions-button">
           <div class="icon" id="solutions-icon">
@@ -72,25 +72,26 @@
 
 <script setup>
 import { ref } from 'vue';
+import { useStore } from 'vuex';
 
 const darkMode = ref(true)
 const isExpanded = ref(true)
 
+// get accesss to the store
+const store = useStore()
+const defaultAssetPage = () => {
+  store.commit('resetAssetStore');
+  store.commit('changeToAssetlist');
+};
+
 const ToggleSidebar = () => {
   isExpanded.value = !isExpanded.value;
 };
-
 </script>
 
 <script>
 export default {
   name: "Navigationbar",
-  methods: {
-    defaultAssetPage() {
-      this.$store.commit('resetChosenAsset')
-      this.$store.commit('changeToAssetlist')
-    }
-  }
 }
 </script>
   

pages/assets.vue

@@ -30,6 +30,14 @@ import SoftwareSpecifications from "../components/server/SoftwareSpecifications.
 import NetworkSpecifications from "../components/server/NetworkSpecifications.vue";
 import AssetSearch from "../components/AssetSearch.vue";
 import AssetSolutionList from "../components/server/AssetSolutionList.vue";
+import { useStore } from 'vuex';
+import { computed } from 'vue';
+
+const store = useStore();
+const onAssetlist = computed(() => store.state.onAssetlist);
+const onCustomerAssetlist = computed(() => store.state.onCustomerAssetlist);
+const onAsset = computed(() => store.state.onAsset);
+const onSolutionlistAsset = computed(() => store.state.onSolutionlistAsset);
 
 definePageMeta({
   layout: 'default'
@@ -41,20 +49,6 @@ const darkMode = ref(true)
 <script>
 export default {
   name: "AssetPage",
-  computed: {
-    onAssetlist() {
-      return this.$store.state.onAssetlist
-    },
-    onCustomerAssetlist() {
-      return this.$store.state.onCustomerAssetlist
-    },
-    onAsset() {
-      return this.$store.state.onAsset
-    },
-    onSolutionlistAsset() {
-      return this.$store.state.onSolutionlistAsset
-    }
-  }
 }
 </script>
     

plugins/vuex.js

@@ -42,8 +42,9 @@ const store = createStore({
         setChosenAsset(state, id) {
             state.chosenAssetId = id
         },
-        resetChosenAsset(state) {
+        resetAssetStore(state) {
             state.chosenAssetId = -1
+            state.assetEditable = false
         },
     },
 });