diff --git a/entity/Salesproject_entity/entityfields/inactivetime/valueProcess.js b/entity/Salesproject_entity/entityfields/inactivetime/valueProcess.js index ac06e819274086b19cdb2c46e8b93252b4e6277d..0daeae79aa840b4f4acaa4c0f65adcdcbdab2858 100644 --- a/entity/Salesproject_entity/entityfields/inactivetime/valueProcess.js +++ b/entity/Salesproject_entity/entityfields/inactivetime/valueProcess.js @@ -1,20 +1,28 @@ -import("system.datetime"); -import("system.translate"); -import("system.result"); -import("system.vars"); -import("ActivityTask_lib"); -import("Date_lib"); - -var entryDate = ActivityUtils.getLastActivityDate(vars.get("$field.SALESPROJECTID")); -if (!entryDate) - entryDate = vars.get("$field.STARTDATE"); - -var roleoutDate = vars.getString("$field.ENDDATE"); -var daysPassed ; -if (!roleoutDate || roleoutDate < datetime.date()) - daysPassed = 0; -else - daysPassed = DateUtils.getDayDifference(entryDate); - -if (daysPassed != null) - result.string(daysPassed); \ No newline at end of file +import("system.datetime"); +import("system.translate"); +import("system.result"); +import("system.vars"); +import("ActivityTask_lib"); +import("Date_lib"); + +var entryDate = ActivityUtils.getLastActivityDate(vars.get("$field.SALESPROJECTID")); +if (!entryDate) +{ + entryDate = vars.get("$field.DATE_NEW"); +} + +var roleoutDate = vars.getString("$field.ENDDATE"); +var daysPassed ; +if (!roleoutDate || roleoutDate < datetime.date()) +{ + daysPassed = 0; +} +else +{ + daysPassed = DateUtils.getDayDifference(entryDate); +} + +if (daysPassed != null) +{ + result.string(daysPassed); +} \ No newline at end of file diff --git a/process/Date_lib/process.js b/process/Date_lib/process.js index bb454d912a881007811c2ddc2badc19bfd5612fd..faab5091a0ed1e47aeb1ae0e103d14fb3e746c38 100644 --- a/process/Date_lib/process.js +++ b/process/Date_lib/process.js @@ -95,7 +95,7 @@ DateUtils.getDayDifference = function (pPastDate, pCurrentDate) if (pCurrentDate == null) pCurrentDate = datetime.date(); var millisecDiff = Math.abs(pCurrentDate - pPastDate); - var dayDiff = Math.floor(millisecDiff / datetime.ONE_DAY); + var dayDiff = Math.round(millisecDiff / datetime.ONE_DAY); return dayDiff; }