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

Merged in release/2022-01-28 (pull request #358)

Browse Source 
release/2022-01-28

Approved-by: Patrick Fic
This commit is contained in:
Patrick Fic
2022-01-24 23:57:37 +00:00
parent a20e005583 7ddd29ca27
commit 9d770a4cd5
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
client/src/components/job-checklist/components/job-checklist-form/job-checklist-form.component.jsx
View File

@@ -171,7 +171,7 @@ export function JobChecklistForm({
}); });
} }
}; };
console.log(job,{ console.log(job, {
removeFromProduction: true, removeFromProduction: true,
actual_completion: actual_completion:
job && job.actual_completion && moment(job.actual_completion), job && job.actual_completion && moment(job.actual_completion),
@@ -212,7 +212,8 @@ export function JobChecklistForm({
0) / bodyshop.target_touchtime, 0) / bodyshop.target_touchtime,
"days" "days"
)), )),
scheduled_delivery: job && moment(job.scheduled_delivery), scheduled_delivery:
job.scheduled_delivery && moment(job.scheduled_delivery),
}), }),
...(type === "deliver" && { ...(type === "deliver" && {
removeFromProduction: true, removeFromProduction: true,

21
server/data/autohouse.js
View File

@@ -37,12 +37,15 @@ exports.default = async (req, res) => {
//Query for the List of Bodyshop Clients. //Query for the List of Bodyshop Clients.
logger.log("autohouse-start", "DEBUG", "api", null, null); logger.log("autohouse-start", "DEBUG", "api", null, null);
const { bodyshops } = await client.request(queries.GET_AUTOHOUSE_SHOPS); const { bodyshops } = await client.request(queries.GET_AUTOHOUSE_SHOPS);
639;
const specificShopIds = req.body.bodyshopIds; // ['uuid]
const start = req.body.start; //YYYY-MM-DD
const allxmlsToUpload = []; const allxmlsToUpload = [];
const allErrors = []; const allErrors = [];
try { try {
for (const bodyshop of bodyshops) { for (const bodyshop of specificShopIds
? bodyshops.filter((b) => specificShopIds.includes(b.id))
: bodyshops) {
logger.log("autohouse-start-shop-extract", "DEBUG", "api", bodyshop.id, { logger.log("autohouse-start-shop-extract", "DEBUG", "api", bodyshop.id, {
shopname: bodyshop.shopname, shopname: bodyshop.shopname,
}); });
@@ -52,7 +55,9 @@ exports.default = async (req, res) => {
queries.AUTOHOUSE_QUERY, queries.AUTOHOUSE_QUERY,
{ {
bodyshopid: bodyshop.id, bodyshopid: bodyshop.id,
start: moment().subtract(3, "days").startOf("day"), start: start
? moment(start).startOf("day")
: moment().subtract(3, "days").startOf("day"),
} }
); );
@@ -118,12 +123,12 @@ exports.default = async (req, res) => {
} }
} }
for (const xmlObj of allxmlsToUpload) { // for (const xmlObj of allxmlsToUpload) {
fs.writeFileSync(`./logs/${xmlObj.filename}`, xmlObj.xml); // fs.writeFileSync(`./logs/${xmlObj.filename}`, xmlObj.xml);
} // }
res.json(allxmlsToUpload); // res.json(allxmlsToUpload);
return; // return;
let sftp = new Client(); let sftp = new Client();
sftp.on("error", (errors) => sftp.on("error", (errors) =>