senaduka/old-psihologija
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix "Delete fee" on Member Incidents Report screen

Browse Source
This commit is contained in:
Bilal Catic
2019-11-21 15:12:41 +01:00
parent d4a949aaf0
commit 06a40e98e9
5 changed files with 34 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
controllers/integration.js
View File

@@ -181,6 +181,7 @@ const deleteFees= (req, res) => {
const deleteData = req.body;
const dateRange = deleteData.dateRange ? deleteData.dateRange : null;
const incidents = deleteData.incidentsToDelete ? deleteData.incidentsToDelete : null;
const memberId = deleteData.memberId ? deleteData.memberId : null;
const unlockedIncidentIds = incidents.unlockedIncidentIds ? incidents.unlockedIncidentIds : [];
const unscheduledIncidentIds = incidents.unscheduledIncidentIds ? incidents.unscheduledIncidentIds : [];
@@ -198,14 +199,24 @@ const deleteFees= (req, res) => {
Promise.all(asyncDeleteActions)
.then(() => {
getAllIncidentsController(req, res);
if (memberId){
req.params.memberId = memberId;
getMemberIncidents(req, res);
}else{
getAllIncidentsController(req, res);
}
})
.catch((error) => {
console.log('Error deleting incidents : ', error);
res.status(500).send();
});
}else{
getAllIncidentsController(req, res);
if (memberId){
req.params.memberId = memberId;
getMemberIncidents(req, res);
}else{
getAllIncidentsController(req, res);
}
}
};