diff --git a/unionvms-web/app/partial/spatial/tripsPanel/tripModel-spec.js b/unionvms-web/app/partial/spatial/tripsPanel/tripModel-spec.js index 27974e00a..6d5b93305 100644 --- a/unionvms-web/app/partial/spatial/tripsPanel/tripModel-spec.js +++ b/unionvms-web/app/partial/spatial/tripsPanel/tripModel-spec.js @@ -280,7 +280,12 @@ describe('tripModel', function() { faReportDocumentType: docType, correction: reportId % 2 ? true : false }; - + if(actType === "ARRIVAL" && docType === "DECLARATION") { + actRep.fluxCharacteristics = []; + actRep.fluxCharacteristics.push({ + valueDateTime: "2013-05-26T09:40:31" + }); + } reportsData.activityReports.push(actRep); reportId++; }); diff --git a/unionvms-web/app/partial/spatial/tripsPanel/tripModel.js b/unionvms-web/app/partial/spatial/tripsPanel/tripModel.js index c6f3b90b3..708bdccc6 100644 --- a/unionvms-web/app/partial/spatial/tripsPanel/tripModel.js +++ b/unionvms-web/app/partial/spatial/tripsPanel/tripModel.js @@ -281,6 +281,10 @@ angular.module('unionvmsWeb').factory('Trip',function(locale,unitConversionServi } else { remarks = unitConversionService.date.convertToUserFormat(report.faReportAcceptedDateTime); } + if(report.activityType === 'ARRIVAL' && report.faReportDocumentType === 'DECLARATION' + && report.fluxCharacteristics && report.fluxCharacteristics[0] && report.fluxCharacteristics[0].valueDateTime) { + remarks = unitConversionService.date.convertToUserFormat(report.fluxCharacteristics[0].valueDateTime); + } } switch(report.activityType){