diff --git a/backend/models/checklistSolutionsModel.js b/backend/models/checklistSolutionsModel.js
index c6bffc7..13903a6 100644
--- a/backend/models/checklistSolutionsModel.js
+++ b/backend/models/checklistSolutionsModel.js
@@ -4,6 +4,7 @@ import ownConn from "../dbConfig.js";
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]);
+ results.insertId = results.insertId.toString();
result(null, results);
}
catch (err) {
@@ -47,6 +48,7 @@ export const updateChecklistSolutionTodoById = async (data, result) => {
const id = data.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])
+ results.insertId = results.insertId.toString();
result(null, results);
}
catch (err) {
@@ -61,6 +63,7 @@ export const deleteAllChecklistSolutionTodosSolutionID = async (id, result) => {
try {
let sql = `DELETE FROM checklistsolutions WHERE solutionID = ?`;
const results = await ownConn.query(sql, [id])
+ results.insertId = results.insertId.toString();
result(null, results);
}
catch (err) {
@@ -75,6 +78,7 @@ export const deleteChecklistSolutionTodo = async (id, result) => {
try {
let sql = `DELETE FROM checklistsolutions WHERE primaryID = ?`;
const results = await ownConn.query(sql, [id])
+ results.insertId = results.insertId.toString();
result(null, results);
}
catch (err) {
diff --git a/backend/models/maintenanceVisitsModel.js b/backend/models/maintenanceVisitsModel.js
index 3c19e48..d699fc4 100644
--- a/backend/models/maintenanceVisitsModel.js
+++ b/backend/models/maintenanceVisitsModel.js
@@ -88,6 +88,7 @@ export const deleteMaintenanceVisitById = async (id, result) => {
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])
+ results.insertId = results.insertId.toString();
result(null, results);
}
catch (err) {
@@ -100,7 +101,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 +115,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]);
}
@@ -131,6 +132,7 @@ export const updateMaintenanceVisitStateById = async (data, result) => {
const id = data.primaryID;
let sql = `UPDATE maintenancevisits SET state = ? WHERE primaryID = ?`;
const results = await ownConn.query(sql, [data.state, id])
+ results.insertId = results.insertId.toString();
result(null, results);
}
catch (err) {
diff --git a/backend/models/maintenanceVisitsTodosModel.js b/backend/models/maintenanceVisitsTodosModel.js
index 5f052c1..1c81333 100644
--- a/backend/models/maintenanceVisitsTodosModel.js
+++ b/backend/models/maintenanceVisitsTodosModel.js
@@ -4,6 +4,7 @@ import ownConn from "../dbConfig.js";
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])
+ results.insertId = results.insertId.toString();
result(null, results);
}
catch (err) {
@@ -47,6 +48,7 @@ export const updateMaintenanceVisitTodoById = async (data, result) => {
const id = data.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])
+ results.insertId = results.insertId.toString();
result(null, results);
}
catch (err) {
diff --git a/backend/models/masterMaintenanceTodosModel.js b/backend/models/masterMaintenanceTodosModel.js
index 5050e71..61a9069 100644
--- a/backend/models/masterMaintenanceTodosModel.js
+++ b/backend/models/masterMaintenanceTodosModel.js
@@ -18,8 +18,9 @@ export const getMasterMaintenanceVisitTodoById = async (id, result) => {
export const updateMasterMaintenanceVisitTodoById = async (data, result) => {
try {
const id = data.primaryID;
- let sql = `UPDATE mastermaintenancetodos SET templateID = ?, asset = ? , task = ?, comments = ? WHERE primaryID = ?`;
+ let sql = `UPDATE mastermaintenancetodos SET templateID = ?, asset = ? , task = ?, commets = ? WHERE primaryID = ?`;
const results = await ownConn.query(sql, [data.templateID, data.asset, data.task, data.comments, id])
+ results.insertId = results.insertId.toString();
result(null, results);
}
catch (err) {
@@ -35,6 +36,7 @@ export const deleteMasterMaintenanceVisitTodoById = async (id, result) => {
try {
let sql = `DELETE FROM mastermaintenancetodos WHERE primaryID = ?`;
const results = await ownConn.query(sql, [id])
+ results.insertId = results.insertId.toString();
result(null, results);
}
catch (err) {
@@ -49,6 +51,7 @@ export const deleteMasterMaintenanceVisitTodoByTemplateId = async (id, result) =
try {
let sql = `DELETE FROM mastermaintenancetodos WHERE templateID = ?`;
const results = await ownConn.query(sql, [id])
+ results.insertId = results.insertId.toString();
result(null, results);
}
catch (err) {
@@ -79,7 +82,8 @@ 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 mastermaintenancetodos(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, commets) VALUES(?, ?, ?, ?, ?)`, [data.templateID, data.rowID, data.asset, data.task, data.comment])
+ results.insertId = results.insertId.toString();
result(null, results);
}
catch (err) {
diff --git a/backend/models/masterMaintenanceVisitsModel.js b/backend/models/masterMaintenanceVisitsModel.js
index 44b98d0..334db85 100644
--- a/backend/models/masterMaintenanceVisitsModel.js
+++ b/backend/models/masterMaintenanceVisitsModel.js
@@ -62,6 +62,7 @@ export const updateMasterMaintenanceVisitById = async (data, result) => {
const id = data.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])
+ results.insertId = results.insertId.toString();
result(null, results);
}
catch (err) {
@@ -75,6 +76,7 @@ export const updateMasterMaintenanceVisitById = async (data, result) => {
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])
+ results.insertId = results.insertId.toString();
result(null, results);
}
catch (err) {
@@ -89,6 +91,7 @@ export const deleteMasterMaintenanceVisitById = async (id, result) => {
try {
let sql = `DELETE FROM mastermaintenancevisits WHERE checklistID = ?`;
const results = await ownConn.query(sql, [id])
+ results.insertId = results.insertId.toString();
result(null, results);
}
catch (err) {
diff --git a/backend/models/productionOrdersModel.js b/backend/models/productionOrdersModel.js
index 378874e..b727c8a 100644
--- a/backend/models/productionOrdersModel.js
+++ b/backend/models/productionOrdersModel.js
@@ -115,7 +115,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]);
}
@@ -129,7 +129,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]);
}
diff --git a/backend/models/solutionsModel.js b/backend/models/solutionsModel.js
index 1458755..f014466 100644
--- a/backend/models/solutionsModel.js
+++ b/backend/models/solutionsModel.js
@@ -46,6 +46,7 @@ export const getSolutionByName = async (id, result) => {
export const insertSolution = async (data, result) => {
try {
const results = await ownConn.query(`INSERT INTO solutions(solutionName, assetName, customer, customerID, type, lastView, user, description, notes) VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?)`, [data.solutionName, data.assetName, data.customer, data.customerID, data.type, data.lastView, data.user, data.description, data.notes])
+ results.insertId = results.insertId.toString();
result(null, results);
}
catch (err) {
@@ -61,6 +62,7 @@ export const updateSolutionById = async (data, result) => {
const id = data.primaryID;
let sql = `UPDATE solutions SET solutionName = ?, assetName = ?, customer = ?, customerID = ?, type = ?, lastView = ?, user = ?, description = ?, notes = ? WHERE primaryID = ?`;
const results = await ownConn.query(sql, [data.solutionName, data.assetName, data.customer, data.customerID, data.type, data.lastView, data.user, data.description, data.notes, id])
+ results.insertId = results.insertId.toString();
result(null, results);
}
catch (err) {
@@ -131,6 +133,7 @@ export const deleteSolutionById = async (id, result) => {
try {
let sql = `DELETE FROM solutions WHERE primaryID = ?`;
const results = await ownConn.query(sql, [id])
+ results.insertId = results.insertId.toString();
result(null, results);
}
catch (err) {
@@ -138,4 +141,4 @@ export const deleteSolutionById = async (id, result) => {
console.log("SQL error : ", err);
result(err, null);
}
-};
+};
\ No newline at end of file
diff --git a/backend/routes/routes.js b/backend/routes/routes.js
index 95d9644..f248bbd 100644
--- a/backend/routes/routes.js
+++ b/backend/routes/routes.js
@@ -219,8 +219,8 @@ router.put("/masterMaintenanceVisitTodos", updateMasterMaintenanceVisitTodo);
// Delete master maintenance visit todo
router.delete("/masterMaintenanceVisitTodos/:id", deleteMasterMaintenanceVisitTodo);
-// Delete master maintenance visit todo by customer id
-router.delete("/masterMaintenanceVisitTodosByCustomerid/:id", deleteMasterMaintenanceVisitTodoByTemplateIds);
+// Delete master maintenance visit todo by template id
+router.delete("/masterMaintenanceVisitTodosByTemplateid/:id", deleteMasterMaintenanceVisitTodoByTemplateIds);
// Update all master maintenance visit todos
router.put("/allMasterMaintenanceVisitTodos", updateAllMasterMaintenanceVisitTodos)
diff --git a/components/ClientSearch.vue b/components/ClientSearch.vue
index b41ac05..858c594 100644
--- a/components/ClientSearch.vue
+++ b/components/ClientSearch.vue
@@ -1,9 +1,9 @@
@@ -98,8 +98,9 @@ export default {
color: #000;
}
-.input {
+.input-customer {
border: none;
+ margin-left: 1rem;
}
.data-darkmode {
diff --git a/components/server/Accounting.vue b/components/server/Accounting.vue
index b072f7d..818f40e 100644
--- a/components/server/Accounting.vue
+++ b/components/server/Accounting.vue
@@ -34,7 +34,7 @@
|
- Client offer |
+ Customer offer
... |
@@ -43,7 +43,7 @@
|
- Client order |
+ Customer order
... |
diff --git a/components/server/Asset.vue b/components/server/Asset.vue
index 77de5a1..5990c2d 100644
--- a/components/server/Asset.vue
+++ b/components/server/Asset.vue
@@ -7,7 +7,7 @@
-
Client:
+
Customer:
{{ item.customer }}