Skip to content

Commit 264b7ce

Browse files
Merge pull request #123 from Accedia/develop
Production release 3/1/2024
2 parents b38363c + 001e1eb commit 264b7ce

File tree

3 files changed

+23
-24
lines changed

3 files changed

+23
-24
lines changed

electron-app/package-lock.json

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

electron-app/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "fit-mitchell-rpa",
33
"appname": "REV Import Technology",
44
"productName": "REV Import Technology",
5-
"version": "1.5.75",
5+
"version": "1.5.76",
66
"homepage": "./",
77
"main": "./dist/main.js",
88
"description": "Automation for CCC by FIT",

electron-app/src/utils/mitchell_importer.ts

+20-21
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ export class Mitchell_Importer extends Importer {
4848
screen.config.resourceDirectory = isLookingForCommitButton
4949
? this.getMitchellPathForCommitButton()
5050
: isLookingForCommitBtnInModal
51-
? this.getMitchellPathForCommitButtonInModal()
52-
: this.getMitchellPathForAssets();
51+
? this.getMitchellPathForCommitButtonInModal()
52+
: this.getMitchellPathForAssets();
5353

5454
// screen.config.resourceDirectory = isLookingForCommitButton
5555
// ? this.getMitchellPathForCommitButton()
@@ -109,26 +109,25 @@ export class Mitchell_Importer extends Importer {
109109
await this.populateMitchellTableData(forgettables, selectedTypeForCommit);
110110
this.setMitchellConfig(inputSpeedSeconds, true);
111111
await snooze(5000);
112-
const commitButtonCoordinates = await this.getButtonCoordinates(
113-
electronWindow,
114-
MitchellButtons.commitButton
115-
);
116-
117-
if (commitButtonCoordinates) {
118-
await this.commitMitchellData(commitButtonCoordinates, electronWindow);
119-
// await this.commitMitchellData(commitButtonCoordinates);
120-
} else {
121-
log.error("Can't find the Commit Button.");
122-
}
123-
112+
// const commitButtonCoordinates = await this.getButtonCoordinates(
113+
// electronWindow,
114+
// MitchellButtons.commitButton
115+
// );
116+
117+
// if (commitButtonCoordinates) {
118+
// await this.commitMitchellData(commitButtonCoordinates, electronWindow);
119+
// // await this.commitMitchellData(commitButtonCoordinates);
120+
// } else {
121+
// log.error("Can't find the Commit Button.");
122+
// }
123+
this.progressUpdater.setPercentage(100);
124124
await FirebaseService.useCurrentSession.setStatus(SessionStatus.VALIDATING);
125+
await FirebaseService.useCurrentSession.setStatus(SessionStatus.COMPLETED);
126+
this.complete(automationIdToFinishRPA, url);
125127
// await this.verifyPopulation(forgettables);
126128
} else {
127129
electronWindow.webContents.send(MESSAGE.RESET_CONTROLS_STATE, false);
128130
}
129-
130-
await FirebaseService.useCurrentSession.setStatus(SessionStatus.COMPLETED);
131-
this.complete(automationIdToFinishRPA, url);
132131
}
133132
}
134133

@@ -168,8 +167,8 @@ export class Mitchell_Importer extends Importer {
168167
typeButton === MitchellButtons.manualLineButton
169168
? await this.checkForButtonCoordinates(MitchellButtons.manualLineButton, electronWindow)
170169
: typeButton === MitchellButtons.commitButton
171-
? await this.checkForButtonCoordinates(MitchellButtons.commitButton, electronWindow)
172-
: await this.checkForButtonCoordinates(MitchellButtons.commitButtonInModal, electronWindow);
170+
? await this.checkForButtonCoordinates(MitchellButtons.commitButton, electronWindow)
171+
: await this.checkForButtonCoordinates(MitchellButtons.commitButtonInModal, electronWindow);
173172
if (buttonCoordinates) {
174173
const messageToSendToReact =
175174
typeButton === MitchellButtons.manualLineButton
@@ -196,8 +195,8 @@ export class Mitchell_Importer extends Importer {
196195
typeButton === MitchellButtons.manualLineButton
197196
? fs.readdirSync(this.getMitchellPathForAssets())
198197
: typeButton === MitchellButtons.commitButton
199-
? fs.readdirSync(this.getMitchellPathForCommitButton())
200-
: fs.readdirSync(this.getMitchellPathForCommitButtonInModal());
198+
? fs.readdirSync(this.getMitchellPathForCommitButton())
199+
: fs.readdirSync(this.getMitchellPathForCommitButtonInModal());
201200
const result: ImageSearchResult = {
202201
coordinates: null,
203202
errors: [],

0 commit comments

Comments
 (0)