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

fix fee formatting issues

Browse Source
This commit is contained in:
Bilal Catic
2019-11-20 12:27:42 +01:00
parent 4ea9d37915
commit 136cad8bbd
5 changed files with 61 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/integration/reports.js
View File

@@ -225,6 +225,7 @@ const getAllIncidents = (dateRange, memberIds) => {
resourceName: resourcesMap[unlockedIncident.resourceId].resourceName,
officeId: resourcesMap[unlockedIncident.resourceId].officeId,
officeName: officesMap[resourcesMap[unlockedIncident.resourceId].officeId].officeName,
officeSlug: officesMap[resourcesMap[unlockedIncident.resourceId].officeId].officeSlug,
bookingStart: formatTime(unlockedIncident.bookingStart),
bookingEnd: formatTime(unlockedIncident.bookingEnd),
bookingStartRaw: unlockedIncident.bookingStart,
@@ -255,6 +256,7 @@ const getAllIncidents = (dateRange, memberIds) => {
resourceName: resourcesMap[unscheduledIncident.resourceId].resourceName,
officeId: resourcesMap[unscheduledIncident.resourceId].officeId,
officeName: officesMap[resourcesMap[unscheduledIncident.resourceId].officeId].officeName,
officeSlug: officesMap[resourcesMap[unscheduledIncident.resourceId].officeId].officeSlug,
bookingStart: formatTime(unscheduledIncident.bookingStart),
bookingEnd: formatTime(unscheduledIncident.bookingEnd),
bookingStartRaw: unscheduledIncident.bookingStart,
@@ -292,6 +294,7 @@ const getAllIncidents = (dateRange, memberIds) => {
const newResourceName = newResource ? newResource.resourceName : null;
const officeId = oldResource.officeId;
const officeName = officesMap[officeId].officeName;
const officeSlug = officesMap[officeId].officeSlug;
allIncidents.push({
incidentId: id,
memberId,
@@ -300,6 +303,7 @@ const getAllIncidents = (dateRange, memberIds) => {
newResourceName,
officeId,
officeName,
officeSlug,
oldBookingStart: formatTime(oldBookingStart),
oldBookingEnd: formatTime(oldBookingEnd),
newBookingStart: formatTime(newBookingStart),