Skip to content

[EAM-715] Show warning on clearing signatures #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
BoykoBorisov wants to merge 6 commits into
base: master
Choose a base branch
from
Open

[EAM-715] Show warning on clearing signatures #56

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d76b6e1
[EAM-715] Show warning on clearing signatures
Oct 20, 2020
032710f
[EAM-715] Fix identation issue
Oct 20, 2020
91313c5
[EAM-715] Improve code according to PR #56
Oct 20, 2020
15cf815
[EAM-715] Make warning for clearing signatures be a dialog
Oct 21, 2020
ef4488f
[EAM-715] Add support for debouncing
Oct 21, 2020
c84063c
[EAM-715] Fix bug when canceling dialog, improve code style
Oct 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion dist/ui/components/checklists/ChecklistItem.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,11 @@ var ChecklistItem = /*#__PURE__*/function (_Component) {

var request = function request() {
_this2.props.updateChecklistItem(checklistItem).then(function () {
_this2.props.resetSignatures(checklistItem.activityCode);
if (_this2.props.signaturesWarningFlag(checklistItem.activityCode)) {
_this2.props.resetSignatures(checklistItem.activityCode);

_this2.props.showSuccess("Signatures were reset due to checklist updation");
}
})["catch"](function (error) {
handleError(error);

Expand Down
15 changes: 14 additions & 1 deletion dist/ui/components/checklists/Checklists.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,17 @@ var Checklists = /*#__PURE__*/function (_Component) {
});
};

_this.getSignaturesResetWarningFlag = function (activityCode) {
var activityIndex = _this.state.activities.findIndex(function (activity) {
return activity.activityCode === activityCode;
});

var signatures = _this.state.activities[activityIndex].signatures;
return signatures && signatures.filter(function (signature) {
return signature.signer !== null;
}).length !== 0;
};

_this.expandSignature = function (activity, expanded) {
var signaturesCollapsed = _objectSpread({}, _this.state.signaturesCollapsed);

Expand Down Expand Up @@ -374,9 +385,11 @@ var Checklists = /*#__PURE__*/function (_Component) {
onUpdateChecklistItem: _this3.onUpdateChecklistItem,
checklistItem: checklist,
handleError: handleError,
showSuccess: _this3.props.showSuccess,
minFindingsDropdown: minFindingsDropdown,
getWoLink: getWoLink,
resetSignatures: _this3.resetSignatures
resetSignatures: _this3.resetSignatures,
signaturesWarningFlag: _this3.getSignaturesResetWarningFlag
});
}))));
}
Expand Down
5 changes: 4 additions & 1 deletion src/ui/components/checklists/ChecklistItem.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,10 @@ export default class ChecklistItem extends Component {

this.props.updateChecklistItem(checklistItem)
.then(() =>{
this.props.resetSignatures(checklistItem.activityCode);
if(this.props.signaturesWarningFlag(checklistItem.activityCode)) {
this.props.resetSignatures(checklistItem.activityCode);
this.props.showSuccess("Signatures were reset due to checklist updation");
}
}).catch(error => {
handleError(error);
this.props.onUpdateChecklistItem(checklistItem);
Expand Down
8 changes: 8 additions & 0 deletions src/ui/components/checklists/Checklists.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,12 @@ class Checklists extends Component {
});
}

getSignaturesResetWarningFlag = activityCode => {
const activityIndex = this.state.activities.findIndex(activity => activity.activityCode === activityCode);
const signatures = this.state.activities[activityIndex].signatures;
return signatures && signatures.filter(signature => signature.signer !== null).length !== 0;
}

renderChecklistsForEquipment(key, checklists, activity) {
const {
updateChecklistItem,
Expand Down Expand Up @@ -234,9 +240,11 @@ class Checklists extends Component {
onUpdateChecklistItem={this.onUpdateChecklistItem}
checklistItem={checklist}
handleError={handleError}
showSuccess={this.props.showSuccess}
minFindingsDropdown={minFindingsDropdown}
getWoLink={getWoLink}
resetSignatures={this.resetSignatures}
signaturesWarningFlag={this.getSignaturesResetWarningFlag}
/>)}
</div>
</ExpansionPanelDetails>
Expand Down