From b9073647f22442348d44ef984914d649d17f61a9 Mon Sep 17 00:00:00 2001 From: Tor-Einar Skog <tor-einar.skog@nibio.no> Date: Thu, 24 May 2018 13:37:25 +0200 Subject: [PATCH] Adding message and observation link to notifications Adding i18n to observation form --- .../java/no/nibio/vips/logic/messaging/MessagingBean.java | 8 +++++--- .../no/nibio/vips/logic/i18n/vipslogictexts.properties | 3 +++ .../no/nibio/vips/logic/i18n/vipslogictexts_bs.properties | 3 +++ .../no/nibio/vips/logic/i18n/vipslogictexts_hr.properties | 3 +++ .../no/nibio/vips/logic/i18n/vipslogictexts_nb.properties | 3 +++ .../no/nibio/vips/logic/i18n/vipslogictexts_sr.properties | 3 +++ .../nibio/vips/logic/i18n/vipslogictexts_zh_CN.properties | 3 +++ src/main/webapp/templates/observationMap.ftl | 6 +++--- 8 files changed, 26 insertions(+), 6 deletions(-) diff --git a/src/main/java/no/nibio/vips/logic/messaging/MessagingBean.java b/src/main/java/no/nibio/vips/logic/messaging/MessagingBean.java index 971ac29c..c3527964 100755 --- a/src/main/java/no/nibio/vips/logic/messaging/MessagingBean.java +++ b/src/main/java/no/nibio/vips/logic/messaging/MessagingBean.java @@ -60,7 +60,7 @@ public class MessagingBean { public void sendUniversalMessage(Message message) { - String msgDownloadUrlTpl = "https://www.vips-landbruk.no/"; + String msgDownloadUrlTpl = "https://www.vips-landbruk.no/messages/" + message.getMessageId() + "/"; // Create a universal message from the message // TODO: When UniversalMessage has changed, pick UniversalMessage uMessage = new UniversalMessage(); @@ -401,7 +401,7 @@ public class MessagingBean { { return; } - String msgDownloadUrlTpl = "https://www.vips-landbruk.no/"; + String msgDownloadUrlTpl = "https://www.vips-landbruk.no/observations/" + observation.getObservationId() + "/"; // Create a universal message from the message // TODO: When UniversalMessage has changed, pick UniversalMessage uMessage = new UniversalMessage(); @@ -412,7 +412,9 @@ public class MessagingBean { uMessage.setExpiresAt(cal.getTime()); // For locale, we assume observer's language VipsLogicUser observer = em.find(VipsLogicUser.class, observation.getUserId()); - uMessage.addMessageLocalVersion(observer.getPreferredLocale(), observation.getObservationHeading(), "", observation.getObservationText(), msgDownloadUrlTpl); + uMessage.addMessageLocalVersion(observer.getPreferredLocale(), observation.getObservationHeading(), "", + observation.getObservationText() + , msgDownloadUrlTpl); // Find the suscribers, create distribution list uMessage.setDistributionList(this.getObservationNotificationSubscribers(observation)); diff --git a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts.properties b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts.properties index 26eae52a..a7f13aad 100755 --- a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts.properties +++ b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts.properties @@ -453,3 +453,6 @@ vipsLogicRole_8=Apple Fruit Moth Rowanberry Cluster Counter pointOfInterestType_4=Region task_RunGridModelsTask_name=Run grid models task_RunGridModelsTask_description=Run models that cover several locations +currentDate=Current date +days=Days +older=Older diff --git a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_bs.properties b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_bs.properties index 3af97459..dba53996 100755 --- a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_bs.properties +++ b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_bs.properties @@ -453,3 +453,6 @@ vipsLogicRole_8=Apple Fruit Moth Rowanberry Cluster Counter pointOfInterestType_4=Region task_RunGridModelsTask_name=Run grid models task_RunGridModelsTask_description=Test +currentDate=Current date +days=Days +older=Older diff --git a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_hr.properties b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_hr.properties index eaa5d435..2a7c8e50 100755 --- a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_hr.properties +++ b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_hr.properties @@ -452,3 +452,6 @@ vipsLogicRole_8=Apple Fruit Moth Rowanberry Cluster Counter pointOfInterestType_4=Region task_RunGridModelsTask_name=Run grid models task_RunGridModelsTask_description=Test +currentDate=Current date +days=Days +older=Older diff --git a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_nb.properties b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_nb.properties index 2a899f2b..7cae4bcc 100755 --- a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_nb.properties +++ b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_nb.properties @@ -453,3 +453,6 @@ vipsLogicRole_8=Rogneb\u00e6rm\u00f8llklaseteller pointOfInterestType_4=Region task_RunGridModelsTask_name=Kj\u00f8r GRID-baserte modeller task_RunGridModelsTask_description=Kj\u00f8r modeller som spenner over flere lokaliteter +currentDate=Gjeldende dato +days=Dager +older=Eldre diff --git a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_sr.properties b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_sr.properties index f722af4d..704bfdc7 100755 --- a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_sr.properties +++ b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_sr.properties @@ -453,3 +453,6 @@ vipsLogicRole_8=Apple Fruit Moth Rowanberry Cluster Counter pointOfInterestType_4=Region task_RunGridModelsTask_name=Run grid models task_RunGridModelsTask_description=Test +currentDate=Current date +days=Days +older=Older diff --git a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_zh_CN.properties b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_zh_CN.properties index 979001d6..f16f6fea 100755 --- a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_zh_CN.properties +++ b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_zh_CN.properties @@ -450,3 +450,6 @@ vipsLogicRole_8=Apple Fruit Moth Rowanberry Cluster Counter pointOfInterestType_4=Region task_RunGridModelsTask_name=Run grid models task_RunGridModelsTask_description=Test +currentDate=Current date +days=Days +older=Older diff --git a/src/main/webapp/templates/observationMap.ftl b/src/main/webapp/templates/observationMap.ftl index f9f67e0c..4adc17aa 100755 --- a/src/main/webapp/templates/observationMap.ftl +++ b/src/main/webapp/templates/observationMap.ftl @@ -95,9 +95,9 @@ var html = "<ul>"; for(var i in colors) { - html += '<li><i style="color: ' + colors[i][1] + ';" class="fa fa-square" aria-hidden="true"></i> ' + (i > 0 ? colors[i-1][0] + 1 : '0') + '-' + colors[i][0] + ' dager</li>'; + html += '<li><i style="color: ' + colors[i][1] + ';" class="fa fa-square" aria-hidden="true"></i> ' + (i > 0 ? colors[i-1][0] + 1 : '0') + '-' + colors[i][0] + ' ${i18nBundle.days?lower_case}</li>'; } - html += '<li><i style="color: black;" class="fa fa-square" aria-hidden="true"></i> Eldre</li>'; + html += '<li><i style="color: black;" class="fa fa-square" aria-hidden="true"></i> ${i18nBundle.older}</li>'; html += "</ul>"; lBox.innerHTML = html; } @@ -159,7 +159,7 @@ <div id="observationMap" class="map" style="position:relative;"> <div id="popover"></div> <div class="form-group" id="progressBar"> - <label for="dayInPeriod">Gjeldende dato: <span id="dayInPeriodDate">${to?date}</span></label><br/> + <label for="dayInPeriod">${i18nBundle.currentDate}: <span id="dayInPeriodDate">${to?date}</span></label><br/> <button type="button" id="playButton" class="btn" onclick="togglePlay(this);"><i class="fa fa-play" aria-hidden="true"></i></button> <input type="range" id="dayInPeriod" name="dayInPeriod" min="1" max="${periodDays}" step="1" value="${periodDays}" oninput="updateCurrentDate(this);" onchange="updateMap(this)"/> -- GitLab