diff --git a/README.md b/README.md
index f5db2a2..976da46 100644
--- a/README.md
+++ b/README.md
@@ -22,11 +22,11 @@ bun install
## Development Server
-Start the development server on `http://localhost:3000`:
+Start the development server on `https://localhost:3000`:
```bash
# npm
-npm run dev
+npm run dev -- --host 0.0.0.0
# pnpm
pnpm run dev
diff --git a/axios.config.js b/axios.config.js
new file mode 100644
index 0000000..dd8d5b5
--- /dev/null
+++ b/axios.config.js
@@ -0,0 +1,14 @@
+import axios from 'axios';
+
+//create axios instance
+const Axios = axios.create({
+ // baseURL: `https://${serversideConfig.url}:${serversideConfig.port}`,
+ headers: {
+ // 'Accept': 'application/json',
+ 'Content-Type': 'application/json',
+ //Authorization: `Bearer`,
+ Accept: "*",
+ },
+})
+
+export default Axios;
diff --git a/backend/controller/issueVariants.js b/backend/controller/issueVariants.js
index e209b49..8a4579c 100644
--- a/backend/controller/issueVariants.js
+++ b/backend/controller/issueVariants.js
@@ -8,7 +8,7 @@ import {
deleteIssueVariantById,
deleteIssueVariantByIssueSlipId,
insertIssueVariant,
-} from "../models/issuesModel.js";
+} from "../models/issueVariantsModel.js";
//get all issue variants
export const showIssueVariants = (req, res) => {
diff --git a/backend/controller/users.js b/backend/controller/users.js
index 5b031eb..26c568a 100644
--- a/backend/controller/users.js
+++ b/backend/controller/users.js
@@ -15,8 +15,9 @@ import {
//insert user to databased
export const signUp = async (req, res, next) => {
try {
- let sql = `SELECT id FROM users WHERE LOWER(username) = LOWER(?)`;
+ let sql = `SELECT id FROM users WHERE LOWER(username) = LOWER(?)`;
const result = await ownConn.execute(sql, [req.body.username])
+
if (result.length > 0) { //username already exists
return res.status(409).send({
message: 'This username is already in use!'
diff --git a/backend/index.js b/backend/index.js
index ade66eb..00d275a 100644
--- a/backend/index.js
+++ b/backend/index.js
@@ -15,12 +15,14 @@ import fs from "fs";
//import routes
import Router from "./routes/routes.js";
+import clientsideConfig from '../clientsideConfig.js';
+
//init express
const app = express();
//setup cors
const corsOptions = {
- origin: 'https://localhost:4173',
+ origin: `https://${clientsideConfig.url}:${clientsideConfig.port}`,
headers: 'authorization, content-type',
methods: 'GET,HEAD,PUT,PATCH,POST,DELETE',
credentials: true,
@@ -37,18 +39,18 @@ app.use(express.json());
app.use(Router);
//setup https
-var privateKey = fs.readFileSync('../certs/localhost.key');
-var certificate = fs.readFileSync('../certs/localhost.crt');
+var privateKey = fs.readFileSync('../certs/privkey.pem');
+var certificate = fs.readFileSync('../certs/fullchain.pem');
var server = https.createServer({
key: privateKey,
- cert: certificate
+ cert: certificate,
}, app);
-// const PORT = process.env.PORT || 5172;
-const PORT = process.env.PORT || config.port;
+// const PORT = process.env.PORT || 4172;
+const PORT = process.env.PORT || serversideConfig.port;
//PORT
server.listen(PORT, () => {
console.log(`Server running successfully (port ${PORT})`);
-});
\ No newline at end of file
+});
diff --git a/backend/models/checklistSolutionsModel.js b/backend/models/checklistSolutionsModel.js
index 2cee619..c6bffc7 100644
--- a/backend/models/checklistSolutionsModel.js
+++ b/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);
}
diff --git a/backend/models/configItemsModel.js b/backend/models/configItemsModel.js
index 01a9903..b3f2410 100644
--- a/backend/models/configItemsModel.js
+++ b/backend/models/configItemsModel.js
@@ -3,7 +3,7 @@ import ownConn from "../dbConfig.js";
//get all master checklists
export const getConfigItems = async (result) => {
try {
- let sql = `SELECT * FROM changeDB ORDER BY assetName ASC`;
+ let sql = `SELECT * FROM changedb ORDER BY assetName ASC`;
const results = await ownConn.query(sql)
result(null, results);
}
@@ -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,8 +60,9 @@ 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 = ?`;
- 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.networkBool, data.IPv4, data.IPv6, data.MAC, data.subnetmask, id]);
+ 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 = ?, license = ?, 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]);
+ results.insertId = results.insertId.toString();
result(null, results);
}
catch (err) {
@@ -74,7 +75,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, 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.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 +88,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 +102,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,8 +116,9 @@ 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])
+ results.insertId = results.insertId.toString();
result(null, results);
}
catch (err) {
@@ -124,4 +126,4 @@ export const deleteConfigItemById = async (id, result) => {
console.log("SQL error : ", err);
result(err, null);
}
-};
\ No newline at end of file
+};
diff --git a/backend/models/issueSlipsModel.js b/backend/models/issueSlipsModel.js
index 3814174..92c01e8 100644
--- a/backend/models/issueSlipsModel.js
+++ b/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);
}
diff --git a/backend/models/issueVariantsModel.js b/backend/models/issueVariantsModel.js
index 42ca13f..88ef620 100644
--- a/backend/models/issueVariantsModel.js
+++ b/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) {
diff --git a/backend/models/maintenanceVisitsModel.js b/backend/models/maintenanceVisitsModel.js
index ec341ee..b6d851a 100644
--- a/backend/models/maintenanceVisitsModel.js
+++ b/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);
}
diff --git a/backend/models/maintenanceVisitsTodosModel.js b/backend/models/maintenanceVisitsTodosModel.js
index 5c85cb6..5f052c1 100644
--- a/backend/models/maintenanceVisitsTodosModel.js
+++ b/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);
}
diff --git a/backend/models/masterMaintenanceTodosModel.js b/backend/models/masterMaintenanceTodosModel.js
index 04786ed..5050e71 100644
--- a/backend/models/masterMaintenanceTodosModel.js
+++ b/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) {
diff --git a/backend/models/masterMaintenanceVisitsModel.js b/backend/models/masterMaintenanceVisitsModel.js
index e4eec1e..758efcc 100644
--- a/backend/models/masterMaintenanceVisitsModel.js
+++ b/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);
}
diff --git a/backend/models/masterProductionOrderTodosModel.js b/backend/models/masterProductionOrderTodosModel.js
index c53a1c5..10c70cb 100644
--- a/backend/models/masterProductionOrderTodosModel.js
+++ b/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) {
diff --git a/backend/models/masterProductionOrdersModel.js b/backend/models/masterProductionOrdersModel.js
index be83965..6edd49d 100644
--- a/backend/models/masterProductionOrdersModel.js
+++ b/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);
}
diff --git a/backend/models/orderingInfoIssueSlipsModel.js b/backend/models/orderingInfoIssueSlipsModel.js
index 6abdf5a..b64fd02 100644
--- a/backend/models/orderingInfoIssueSlipsModel.js
+++ b/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) {
diff --git a/backend/models/productionOrdersModel.js b/backend/models/productionOrdersModel.js
index e1d3bb4..7823c73 100644
--- a/backend/models/productionOrdersModel.js
+++ b/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);
}
diff --git a/backend/models/productionOrdersTodosModel.js b/backend/models/productionOrdersTodosModel.js
index 1a9928e..790bc5c 100644
--- a/backend/models/productionOrdersTodosModel.js
+++ b/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);
}
diff --git a/certs/fullchain.pem b/certs/fullchain.pem
new file mode 100644
index 0000000..56fa643
--- /dev/null
+++ b/certs/fullchain.pem
@@ -0,0 +1,86 @@
+-----BEGIN CERTIFICATE-----
+MIIEJjCCAw6gAwIBAgISBH1fpnN5tMAmG9rSrKXMtWHmMA0GCSqGSIb3DQEBCwUA
+MDIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQD
+EwJSMzAeFw0yNDAyMDcxMTI4MzFaFw0yNDA1MDcxMTI4MzBaMBwxGjAYBgNVBAMT
+EXR1ZWl0YXBwLnR1ZWl0LmRlMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEp/Sf
+OcRDk6oMEUZnRMyOpMdVWJB6Q0Hs3Ly9QHoEjCwJaPXo5dRLilcb9cgU7omZYoyN
+Tf6ilHAvxGkr/k/saaOCAhUwggIRMA4GA1UdDwEB/wQEAwIHgDAdBgNVHSUEFjAU
+BggrBgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQU9GpF
+/YlVXjNNI8WDy9HBmmx6JMEwHwYDVR0jBBgwFoAUFC6zF7dYVsuuUAlA5h+vnYsU
+wsYwVQYIKwYBBQUHAQEESTBHMCEGCCsGAQUFBzABhhVodHRwOi8vcjMuby5sZW5j
+ci5vcmcwIgYIKwYBBQUHMAKGFmh0dHA6Ly9yMy5pLmxlbmNyLm9yZy8wHAYDVR0R
+BBUwE4IRdHVlaXRhcHAudHVlaXQuZGUwEwYDVR0gBAwwCjAIBgZngQwBAgEwggEG
+BgorBgEEAdZ5AgQCBIH3BIH0APIAdwA7U3d1Pi25gE6LMFsG/kA7Z9hPw/THvQAN
+LXJv4frUFwAAAY2DiovMAAAEAwBIMEYCIQDUiw7jGx4k8y49+QeuGNUX6WciOA0s
+Jipwvi+tjOumGgIhAN2jCoI3iQmpAYN3SvfieUPrAgd2X3RfZa0OzW91XYHWAHcA
+ouK/1h7eLy8HoNZObTen3GVDsMa1LqLat4r4mm31F9gAAAGNg4qMPQAABAMASDBG
+AiEAoA4lggVcXpGHlGLqJwVaKdcTsMEM9hsRaPnwtLeRNnMCIQCMUElVlogieFjP
+hroL/raJrPrakqu9qOm0U3OW8aGPGzANBgkqhkiG9w0BAQsFAAOCAQEAFbGv7Omn
+OWIW6/9zpasBhxOXNNxz5G1YDKnktgK9qrCius39oexbaxyRCgQj7Y2aVirjHEct
+pFkpqdT8oRxOwym3UnTe6en/KqSzahuTLxKsWzvt+zYScEAbdv+ShAycojvuCbcN
+NTzZzVbk5iT2GjPyzB+wBEbEILy1NFzf5sHBTsWOnbClidKpUvYgK6wuEoHb6DPP
+cfI5OHRU/cOB6rljYZYzz4znhNYuwviBUXEf1qIOfPDxZnM0zrh6eJ4wRXZDdGkn
+FQdmweAZn/dUpBEjRNuqSF4tGRKRtKZ3PQBNK35yAI4rFROJquhoQXxJK8XrAYyz
+KJl4MTF4Rk5VMQ==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIFFjCCAv6gAwIBAgIRAJErCErPDBinU/bWLiWnX1owDQYJKoZIhvcNAQELBQAw
+TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh
+cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwHhcNMjAwOTA0MDAwMDAw
+WhcNMjUwOTE1MTYwMDAwWjAyMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNTGV0J3Mg
+RW5jcnlwdDELMAkGA1UEAxMCUjMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQC7AhUozPaglNMPEuyNVZLD+ILxmaZ6QoinXSaqtSu5xUyxr45r+XXIo9cP
+R5QUVTVXjJ6oojkZ9YI8QqlObvU7wy7bjcCwXPNZOOftz2nwWgsbvsCUJCWH+jdx
+sxPnHKzhm+/b5DtFUkWWqcFTzjTIUu61ru2P3mBw4qVUq7ZtDpelQDRrK9O8Zutm
+NHz6a4uPVymZ+DAXXbpyb/uBxa3Shlg9F8fnCbvxK/eG3MHacV3URuPMrSXBiLxg
+Z3Vms/EY96Jc5lP/Ooi2R6X/ExjqmAl3P51T+c8B5fWmcBcUr2Ok/5mzk53cU6cG
+/kiFHaFpriV1uxPMUgP17VGhi9sVAgMBAAGjggEIMIIBBDAOBgNVHQ8BAf8EBAMC
+AYYwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMBIGA1UdEwEB/wQIMAYB
+Af8CAQAwHQYDVR0OBBYEFBQusxe3WFbLrlAJQOYfr52LFMLGMB8GA1UdIwQYMBaA
+FHm0WeZ7tuXkAXOACIjIGlj26ZtuMDIGCCsGAQUFBwEBBCYwJDAiBggrBgEFBQcw
+AoYWaHR0cDovL3gxLmkubGVuY3Iub3JnLzAnBgNVHR8EIDAeMBygGqAYhhZodHRw
+Oi8veDEuYy5sZW5jci5vcmcvMCIGA1UdIAQbMBkwCAYGZ4EMAQIBMA0GCysGAQQB
+gt8TAQEBMA0GCSqGSIb3DQEBCwUAA4ICAQCFyk5HPqP3hUSFvNVneLKYY611TR6W
+PTNlclQtgaDqw+34IL9fzLdwALduO/ZelN7kIJ+m74uyA+eitRY8kc607TkC53wl
+ikfmZW4/RvTZ8M6UK+5UzhK8jCdLuMGYL6KvzXGRSgi3yLgjewQtCPkIVz6D2QQz
+CkcheAmCJ8MqyJu5zlzyZMjAvnnAT45tRAxekrsu94sQ4egdRCnbWSDtY7kh+BIm
+lJNXoB1lBMEKIq4QDUOXoRgffuDghje1WrG9ML+Hbisq/yFOGwXD9RiX8F6sw6W4
+avAuvDszue5L3sz85K+EC4Y/wFVDNvZo4TYXao6Z0f+lQKc0t8DQYzk1OXVu8rp2
+yJMC6alLbBfODALZvYH7n7do1AZls4I9d1P4jnkDrQoxB3UqQ9hVl3LEKQ73xF1O
+yK5GhDDX8oVfGKF5u+decIsH4YaTw7mP3GFxJSqv3+0lUFJoi5Lc5da149p90Ids
+hCExroL1+7mryIkXPeFM5TgO9r0rvZaBFOvV2z0gp35Z0+L4WPlbuEjN/lxPFin+
+HlUjr8gRsI3qfJOQFy/9rKIJR0Y/8Omwt/8oTWgy1mdeHmmjk7j1nYsvC9JSQ6Zv
+MldlTTKB3zhThV1+XWYp6rjd5JW1zbVWEkLNxE7GJThEUG3szgBVGP7pSWTUTsqX
+nLRbwHOoq7hHwg==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIFYDCCBEigAwIBAgIQQAF3ITfU6UK47naqPGQKtzANBgkqhkiG9w0BAQsFADA/
+MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT
+DkRTVCBSb290IENBIFgzMB4XDTIxMDEyMDE5MTQwM1oXDTI0MDkzMDE4MTQwM1ow
+TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh
+cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwggIiMA0GCSqGSIb3DQEB
+AQUAA4ICDwAwggIKAoICAQCt6CRz9BQ385ueK1coHIe+3LffOJCMbjzmV6B493XC
+ov71am72AE8o295ohmxEk7axY/0UEmu/H9LqMZshftEzPLpI9d1537O4/xLxIZpL
+wYqGcWlKZmZsj348cL+tKSIG8+TA5oCu4kuPt5l+lAOf00eXfJlII1PoOK5PCm+D
+LtFJV4yAdLbaL9A4jXsDcCEbdfIwPPqPrt3aY6vrFk/CjhFLfs8L6P+1dy70sntK
+4EwSJQxwjQMpoOFTJOwT2e4ZvxCzSow/iaNhUd6shweU9GNx7C7ib1uYgeGJXDR5
+bHbvO5BieebbpJovJsXQEOEO3tkQjhb7t/eo98flAgeYjzYIlefiN5YNNnWe+w5y
+sR2bvAP5SQXYgd0FtCrWQemsAXaVCg/Y39W9Eh81LygXbNKYwagJZHduRze6zqxZ
+Xmidf3LWicUGQSk+WT7dJvUkyRGnWqNMQB9GoZm1pzpRboY7nn1ypxIFeFntPlF4
+FQsDj43QLwWyPntKHEtzBRL8xurgUBN8Q5N0s8p0544fAQjQMNRbcTa0B7rBMDBc
+SLeCO5imfWCKoqMpgsy6vYMEG6KDA0Gh1gXxG8K28Kh8hjtGqEgqiNx2mna/H2ql
+PRmP6zjzZN7IKw0KKP/32+IVQtQi0Cdd4Xn+GOdwiK1O5tmLOsbdJ1Fu/7xk9TND
+TwIDAQABo4IBRjCCAUIwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYw
+SwYIKwYBBQUHAQEEPzA9MDsGCCsGAQUFBzAChi9odHRwOi8vYXBwcy5pZGVudHJ1
+c3QuY29tL3Jvb3RzL2RzdHJvb3RjYXgzLnA3YzAfBgNVHSMEGDAWgBTEp7Gkeyxx
++tvhS5B1/8QVYIWJEDBUBgNVHSAETTBLMAgGBmeBDAECATA/BgsrBgEEAYLfEwEB
+ATAwMC4GCCsGAQUFBwIBFiJodHRwOi8vY3BzLnJvb3QteDEubGV0c2VuY3J5cHQu
+b3JnMDwGA1UdHwQ1MDMwMaAvoC2GK2h0dHA6Ly9jcmwuaWRlbnRydXN0LmNvbS9E
+U1RST09UQ0FYM0NSTC5jcmwwHQYDVR0OBBYEFHm0WeZ7tuXkAXOACIjIGlj26Ztu
+MA0GCSqGSIb3DQEBCwUAA4IBAQAKcwBslm7/DlLQrt2M51oGrS+o44+/yQoDFVDC
+5WxCu2+b9LRPwkSICHXM6webFGJueN7sJ7o5XPWioW5WlHAQU7G75K/QosMrAdSW
+9MUgNTP52GE24HGNtLi1qoJFlcDyqSMo59ahy2cI2qBDLKobkx/J3vWraV0T9VuG
+WCLKTVXkcGdtwlfFRjlBz4pYg1htmf5X6DYO8A4jqv2Il9DjXA6USbW1FzXSLr9O
+he8Y4IWS6wY7bCkjCWDcRQJMEhg76fsO3txE+FiYruq9RUWhiF1myv4Q6W+CyBFC
+Dfvp7OOGAN6dEOM4+qR9sdjoSYKEBpsr6GtPAQw4dy753ec5
+-----END CERTIFICATE-----
diff --git a/certs/localhost.crt b/certs/localhost.crt
deleted file mode 100644
index ff5b6ae..0000000
--- a/certs/localhost.crt
+++ /dev/null
@@ -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-----
\ No newline at end of file
diff --git a/certs/localhost.key b/certs/localhost.key
deleted file mode 100644
index 9a529a5..0000000
--- a/certs/localhost.key
+++ /dev/null
@@ -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-----
\ No newline at end of file
diff --git a/certs/privkey.pem b/certs/privkey.pem
new file mode 100644
index 0000000..6f796ba
--- /dev/null
+++ b/certs/privkey.pem
@@ -0,0 +1,5 @@
+-----BEGIN PRIVATE KEY-----
+MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgAYAjn8GuqhyMWJyf
+Bxt8nTpBWm3S06NgzF1sjJqFijmhRANCAASn9J85xEOTqgwRRmdEzI6kx1VYkHpD
+QezcvL1AegSMLAlo9ejl1EuKVxv1yBTuiZlijI1N/qKUcC/EaSv+T+xp
+-----END PRIVATE KEY-----
diff --git a/clientsideConfig.js b/clientsideConfig.js
index a618f85..0e0664f 100644
--- a/clientsideConfig.js
+++ b/clientsideConfig.js
@@ -1,8 +1,8 @@
const clientsideConfig = {
- // url: 'tueitapp.tueit.de',
- // port: 8000,
+ // later for the server
+ //url: 'tueitapp.tueit.de',
url: 'localhost',
port: 3000,
};
-export default clientsideConfig;
\ No newline at end of file
+export default clientsideConfig;
diff --git a/components/LoginForm.vue b/components/LoginForm.vue
index ede85ec..411b896 100644
--- a/components/LoginForm.vue
+++ b/components/LoginForm.vue
@@ -32,21 +32,121 @@
-
+
+
+
@@ -62,7 +162,7 @@ export default {
align-items: center;
justify-content: center;
width: 31.25rem;
- height: 31.25rem;
+ height: 33rem;
border-radius: 0.625rem;
padding: 2.5rem 1.875rem;
gap: 1.875rem;
@@ -138,6 +238,16 @@ export default {
gap: 0.625rem;
}
+.form-field-error-msg {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: space-between;
+ width: 25rem;
+ height: 3rem;
+ gap: 0.4rem;
+}
+
label {
display: flex;
flex-direction: row;
diff --git a/components/server/Accounting.vue b/components/server/Accounting.vue
index 57e6ad8..b072f7d 100644
--- a/components/server/Accounting.vue
+++ b/components/server/Accounting.vue
@@ -3,96 +3,98 @@
Accounting:
-
-
- Action
-
- Date
- Comments
-
-
-
- Supplier request
-
- ...
- ...
-
-
-
- Supplier offer
-
- ...
- ...
-
-
-
- Client offer
-
- ...
- ...
-
-
-
- Client order
-
- ...
- ...
-
-
-
- Supplier order
-
- ...
- ...
-
-
-
- Ingress
-
- ...
- ...
-
-
-
- Egress
-
- ...
- ...
-
-
-
- Ingress bill
-
- ...
- ...
-
-
-
- Egress bill
-
- ...
- ...
-
+
+
+
+ Action
+
+ Date
+ Comments
+
+
+
+ Supplier request
+
+ ...
+ ...
+
+
+
+ Supplier offer
+
+ ...
+ ...
+
+
+
+ Client offer
+
+ ...
+ ...
+
+
+
+ Client order
+
+ ...
+ ...
+
+
+
+ Supplier order
+
+ ...
+ ...
+
+
+
+ Ingress
+
+ ...
+ ...
+
+
+
+ Egress
+
+ ...
+ ...
+
+
+
+ Ingress bill
+
+ ...
+ ...
+
+
+
+ Egress bill
+
+ ...
+ ...
+
+
@@ -257,4 +259,5 @@ tr#row-2 {
.Comments {
width: 40%;
-}
\ No newline at end of file
+}
+
\ No newline at end of file
diff --git a/components/server/Asset.vue b/components/server/Asset.vue
index cadb524..e1a0b9a 100644
--- a/components/server/Asset.vue
+++ b/components/server/Asset.vue
@@ -1,31 +1,60 @@
- Asset name
+ {{ item.assetName }}
+
Client:
-
...
+
{{ item.customer }}
+
+
+
+ {{ cust.customername }}
+
+
Location:
-
...
+
{{ item.location }}
+
ID:
-
...
+
{{ item.primaryID }}
Type:
-
...
+
{{ item.type }}
+
-
-
Remote location:
-
...
+
+
+
Remote location:
+
{{ item.remoteLocation }}
+
+
+
+
State:
+
{{ item.state }}
+
+
@@ -51,15 +82,156 @@
@@ -93,6 +265,16 @@ export default {
sans-serif;
}
+.asset-name-input {
+ padding: 1rem 0;
+ margin: 1rem;
+ font-size: initial;
+ letter-spacing: 5%;
+ text-decoration-line: underline;
+ font: italic 400 1rem/187.5% Overpass, -apple-system, Roboto, Helvetica,
+ sans-serif;
+}
+
.h2-darkmode {
color: #fff;
}
@@ -112,6 +294,14 @@ export default {
border-radius: 0.625rem;
}
+.h2-input-darkmode {
+ background-color: #212121;
+}
+
+.h2-input-lightmode {
+ background-color: #EBEBEB;
+}
+
.data-field#street-name {
width: 70%;
}
@@ -133,9 +323,13 @@ export default {
color: #000;
}
+.input {
+ border: none;
+}
+
.data {
display: flex;
- flex-direction: row;
+ overflow-x: auto;
align-items: flex-start;
padding: 0 0.625rem;
border-radius: 0.3125rem;
@@ -157,6 +351,9 @@ export default {
.data#notes,
.data#description {
align-self: stretch;
+ /* width: 45%; */
+ scrollbar-width: none;
+ overflow-x: auto;
}
.asset-data {
@@ -203,7 +400,8 @@ export default {
color: #000;
}
-.id-type {
+.id-type,
+.remoteLocation-state {
display: flex;
flex-direction: row;
align-items: center;
@@ -243,4 +441,20 @@ export default {
.rectangle-lightmode {
background-color: #EBEBEB;
}
-
\ No newline at end of file
+
+.select-darkmode {
+ border: none;
+ color: white;
+ background: #212121;
+ padding: 0.4rem;
+ border-radius: 0.3125rem;
+}
+
+.select-lightmode {
+ border: none;
+ color: black;
+ background: #EBEBEB;
+ padding: 0.4rem;
+ border-radius: 0.3125rem;
+}
+
diff --git a/components/server/AssetSolutionList.vue b/components/server/AssetSolutionList.vue
index cfe2cd3..c17c152 100644
--- a/components/server/AssetSolutionList.vue
+++ b/components/server/AssetSolutionList.vue
@@ -2,18 +2,21 @@
Solutions:
-
-
- Solution
- Type
-
-
-
- ...
- ...
-
+
+
+
+ Solution
+ Type
+
+
+
+ ...
+ ...
+
+
+
@@ -168,4 +171,5 @@ th {
.label-lightmode {
color: #000;
-}
\ No newline at end of file
+}
+
\ No newline at end of file
diff --git a/components/server/AssetTable.vue b/components/server/AssetTable.vue
index 66af23d..877096b 100644
--- a/components/server/AssetTable.vue
+++ b/components/server/AssetTable.vue
@@ -2,44 +2,81 @@
Last viewed:
-
-
- Client
-
- Name
-
- Type
-
- State
- User
-
-
-
- ...
-
- ...
-
- ...
-
- ...
- ...
-
+
+
+
+ Client
+
+ Name
+
+ Type
+
+ State
+ User
+
+
+
+ {{ item.customer }}
+
+
+
+
+ {{ item.assetName }}
+
+
+
+ {{ item.type }}
+
+ {{ item.state }}
+ {{ item.user }}
+
+
-
-
\ No newline at end of file
+}
+
\ No newline at end of file
diff --git a/components/server/IssueVariants.vue b/components/server/IssueVariants.vue
index fa3af27..0bad0ef 100644
--- a/components/server/IssueVariants.vue
+++ b/components/server/IssueVariants.vue
@@ -2,36 +2,38 @@
Variants:
-
-
- Name
-
- Properties
-
- State
-
- Amount
- Price
-
-
-
- ...
-
- ...
-
- ...
-
- ...
- ...
-
+
+
+
+ Name
+
+ Properties
+
+ State
+
+ Amount
+ Price
+
+
+
+ ...
+
+ ...
+
+ ...
+
+ ...
+ ...
+
+
@@ -198,4 +200,5 @@ th {
.label-lightmode {
color: #000;
-}
\ No newline at end of file
+}
+
\ No newline at end of file
diff --git a/components/server/MaintenanceVisitsInstanceTable.vue b/components/server/MaintenanceVisitsInstanceTable.vue
index e2c4776..0ad927e 100644
--- a/components/server/MaintenanceVisitsInstanceTable.vue
+++ b/components/server/MaintenanceVisitsInstanceTable.vue
@@ -2,40 +2,44 @@
Instances:
-
-
- ID
-
- Maintenance type
-
- State
-
- Creation date
-
- Completion date
- User
-
-
-
- ...
-
- ...
-
- ...
-
- ...
-
- ...
- ...
-
+
+
+
+ ID
+
+ Maintenance type
+
+ State
+
+ Creation date
+
+ Completion date
+ User
+
+
+
+ ...
+
+ ...
+
+ ...
+
+ ...
+
+ ...
+ ...
+
+
diff --git a/components/server/MaintenanceVisitsTemplateTable.vue b/components/server/MaintenanceVisitsTemplateTable.vue
index 26356db..2ac623c 100644
--- a/components/server/MaintenanceVisitsTemplateTable.vue
+++ b/components/server/MaintenanceVisitsTemplateTable.vue
@@ -2,43 +2,66 @@
Last viewed:
-
-
- Client
-
- Name
- ID
-
-
- Type
- User
-
-
-
- ...
-
- ...
-
- ...
-
- ...
- ...
-
+
+
+
+ Client
+
+ Name
+
+ ID
+
+
+ Type
+ User
+
+
+
+ {{ template.customer }}
+
+ {{ template.name }}
+
+ {{ template.checklistID }}
+
+ {{ template.type }}
+ {{ template.user }}
+
+
\ No newline at end of file
diff --git a/layouts/Navigationbar.vue b/layouts/Navigationbar.vue
index e1b2c69..1fff937 100644
--- a/layouts/Navigationbar.vue
+++ b/layouts/Navigationbar.vue
@@ -13,8 +13,8 @@