admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

release/2024-11-01 - Misc fixes

Browse Source 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
This commit is contained in:
Dave Richer
2024-10-29 11:02:08 -07:00
parent 42f1d6fa13
commit 6b501e4619
2 changed files with 59 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
server/job/job-costing.js
View File

@@ -19,7 +19,8 @@ async function JobCosting(req, res) {
const BearerToken = req.BearerToken; const BearerToken = req.BearerToken;
const client = req.userGraphQLClient; const client = req.userGraphQLClient;
logger.log("job-costing-start", "DEBUG", req.user.email, jobid, null); //Uncomment for further testing
// logger.log("job-costing-start", "DEBUG", req.user.email, jobid, null);
try { try {
const resp = await client.setHeaders({ Authorization: BearerToken }).request(queries.QUERY_JOB_COSTING_DETAILS, { const resp = await client.setHeaders({ Authorization: BearerToken }).request(queries.QUERY_JOB_COSTING_DETAILS, {
@@ -46,9 +47,10 @@ async function JobCostingMulti(req, res) {
const BearerToken = req.BearerToken; const BearerToken = req.BearerToken;
const client = req.userGraphQLClient; const client = req.userGraphQLClient;
logger.log("job-costing-multi-start", "DEBUG", req?.user?.email, null, { //Uncomment for further testing
jobids // logger.log("job-costing-multi-start", "DEBUG", req?.user?.email, null, {
}); // jobids
// });
try { try {
const resp = await client const resp = await client
@@ -285,12 +287,13 @@ function GenerateCostingData(job) {
if (val.mod_lbr_ty) { if (val.mod_lbr_ty) {
const laborProfitCenter = val.profitcenter_labor || defaultProfits[val.mod_lbr_ty] || "Unknown"; const laborProfitCenter = val.profitcenter_labor || defaultProfits[val.mod_lbr_ty] || "Unknown";
if (laborProfitCenter === "Unknown") { //Uncomment for further testing
logger.log("job-costing unknown type", "debug", null, null, { // if (laborProfitCenter === "Unknown") {
line_desc: val.line_desc, // logger.log("job-costing unknown type", "debug", null, null, {
mod_lbr_ty: val.mod_lbr_ty // line_desc: val.line_desc,
}); // mod_lbr_ty: val.mod_lbr_ty
} // });
// }
const rateName = `rate_${(val.mod_lbr_ty || "").toLowerCase()}`; const rateName = `rate_${(val.mod_lbr_ty || "").toLowerCase()}`;
@@ -357,20 +360,21 @@ function GenerateCostingData(job) {
if (val.part_type && val.part_type !== "PAE" && val.part_type !== "PAS" && val.part_type !== "PASL") { if (val.part_type && val.part_type !== "PAE" && val.part_type !== "PAS" && val.part_type !== "PASL") {
const partsProfitCenter = val.profitcenter_part || defaultProfits[val.part_type] || "Unknown"; const partsProfitCenter = val.profitcenter_part || defaultProfits[val.part_type] || "Unknown";
if (partsProfitCenter === "Unknown" || !partsProfitCenter) { //Uncomment for further testing
logger.log( // if (partsProfitCenter === "Unknown" || !partsProfitCenter) {
partsProfitCenter === "Unknown" // logger.log(
? "job-costing unknown type" // partsProfitCenter === "Unknown"
: "Unknown cost/profit center mapping for parts.", // ? "job-costing unknown type"
"debug", // : "Unknown cost/profit center mapping for parts.",
null, // "debug",
null, // null,
{ // null,
line_desc: val.line_desc, // {
part_type: val.part_type // line_desc: val.line_desc,
} // part_type: val.part_type
); // }
} // );
// }
let partsAmount = Dinero({ let partsAmount = Dinero({
amount: val.act_price_before_ppc amount: val.act_price_before_ppc
@@ -428,20 +432,21 @@ function GenerateCostingData(job) {
if (val.part_type && val.part_type !== "PAE" && (val.part_type === "PAS" || val.part_type === "PASL")) { if (val.part_type && val.part_type !== "PAE" && (val.part_type === "PAS" || val.part_type === "PASL")) {
const partsProfitCenter = val.profitcenter_part || defaultProfits[val.part_type] || "Unknown"; const partsProfitCenter = val.profitcenter_part || defaultProfits[val.part_type] || "Unknown";
if (partsProfitCenter === "Unknown" || !partsProfitCenter) { //Uncomment for further testing
logger.log( // if (partsProfitCenter === "Unknown" || !partsProfitCenter) {
partsProfitCenter === "Unknown" // logger.log(
? "job-costing unknown type" // partsProfitCenter === "Unknown"
: "job-costing Unknown cost/profit center mapping for sublet", // ? "job-costing unknown type"
"debug", // : "job-costing Unknown cost/profit center mapping for sublet",
null, // "debug",
null, // null,
{ // null,
line_desc: val.line_desc, // {
part_type: val.part_type // line_desc: val.line_desc,
} // part_type: val.part_type
); // }
} // );
// }
const partsAmount = Dinero({ const partsAmount = Dinero({
amount: Math.round((val.act_price || 0) * 100) amount: Math.round((val.act_price || 0) * 100)
@@ -473,12 +478,14 @@ function GenerateCostingData(job) {
//If so, use it, otherwise try to use the same from the auto-allocate logic in IO app jobs-close-auto-allocate. //If so, use it, otherwise try to use the same from the auto-allocate logic in IO app jobs-close-auto-allocate.
const partsProfitCenter = val.profitcenter_part || getAdditionalCostCenter(val, defaultProfits) || "Unknown"; const partsProfitCenter = val.profitcenter_part || getAdditionalCostCenter(val, defaultProfits) || "Unknown";
if (partsProfitCenter === "Unknown") { //Uncomment for further testing
logger.log("job-costing unknown type", "debug", null, null, { // if (partsProfitCenter === "Unknown") {
line_desc: val.line_desc, // logger.log("job-costing unknown type", "debug", null, null, {
part_type: val.part_type // line_desc: val.line_desc,
}); // part_type: val.part_type
} // });
// }
const partsAmount = Dinero({ const partsAmount = Dinero({
amount: Math.round((val.act_price || 0) * 100) amount: Math.round((val.act_price || 0) * 100)
}) })

12
server/web-sockets/redisSocketEvents.js
View File

@@ -41,7 +41,8 @@ const redisSocketEvents = ({
// Register Socket Events // Register Socket Events
const registerSocketEvents = (socket) => { const registerSocketEvents = (socket) => {
createLogEvent(socket, "debug", `Registering RedisIO Socket Events.`); // Uncomment for further testing
// createLogEvent(socket, "debug", `Registering RedisIO Socket Events.`);
// Token Update Events // Token Update Events
const registerUpdateEvents = (socket) => { const registerUpdateEvents = (socket) => {
@@ -54,12 +55,13 @@ const redisSocketEvents = ({
// If We ever want to persist user Data across workers // If We ever want to persist user Data across workers
// await setSessionData(socket.id, "user", user); // await setSessionData(socket.id, "user", user);
createLogEvent(socket, "debug", "Token updated successfully"); // Uncomment for further testing
// createLogEvent(socket, "debug", "Token updated successfully");
socket.emit("token-updated", { success: true }); socket.emit("token-updated", { success: true });
} catch (error) { } catch (error) {
if (error.code === "auth/id-token-expired") { if (error.code === "auth/id-token-expired") {
createLogEvent(socket, "WARNING", "Stale token received, waiting for new token"); createLogEvent(socket, "warn", "Stale token received, waiting for new token");
socket.emit("token-updated", { socket.emit("token-updated", {
success: false, success: false,
error: "Stale token." error: "Stale token."
@@ -114,7 +116,9 @@ const redisSocketEvents = ({
// Disconnect Events // Disconnect Events
const registerDisconnectEvents = (socket) => { const registerDisconnectEvents = (socket) => {
const disconnect = () => { const disconnect = () => {
createLogEvent(socket, "debug", `User disconnected.`); // Uncomment for further testing
// createLogEvent(socket, "debug", `User disconnected.`);
const rooms = Array.from(socket.rooms).filter((room) => room !== socket.id); const rooms = Array.from(socket.rooms).filter((room) => room !== socket.id);
for (const room of rooms) { for (const room of rooms) {
socket.leave(room); socket.leave(room);