@plusscommunities/pluss-core-aws 2.0.17-beta.0 → 2.0.18

package/helper/time/getLocalTimestamp.js

@@ -0,0 +1,25 @@
+const moment = require("moment-timezone");
+
+module.exports = (dateString, timeOfDay, timezone, resultFormat = "value") => {
+  // Parse the date string into a moment object in the given timezone
+  const dateMoment = moment.tz(dateString, "DD-MM-YYYY", timezone);
+
+  // Calculate the hours and minutes from the timeOfDay in minutes
+  const hours = Math.floor(timeOfDay / 60);
+  const minutes = timeOfDay % 60;
+
+  // Set the hours and minutes to the dateMoment
+  dateMoment.hours(hours).minutes(minutes).seconds(0).milliseconds(0);
+
+  switch (resultFormat) {
+    case "string":
+      // return the timestamp in string format
+      return dateMoment.format();
+    case "value":
+      // Return the timestamp in milliseconds
+      return dateMoment.valueOf();
+    default:
+      // return the timestamp in a formatted string
+      return dateMoment.format(resultFormat);
+  }
+};

package/helper/time/getSiteTimezone.js

@@ -0,0 +1,17 @@
+const _ = require("lodash");
+const { getRowId } = require("../");
+const getRef = require("../../db/common/getRef");
+
+module.exports = async (site) => {
+  if (site) {
+    const timezone = await getRef(
+      "strings",
+      "RowId",
+      getRowId(site, "timezone")
+    );
+    if (timezone && !_.isEmpty(timezone.Value)) {
+      return timezone.Value;
+    }
+  }
+  return "Australia/Brisbane";
+};

package/notification/prepNotification.js

@@ -8,18 +8,33 @@ module.exports = (noti) => {
     thisNoti.Text = `Your request is ${noti.Data.status}`;
     thisNoti.Subtext = noti.Data.title || noti.Data.description;
     thisNoti.Icon = "wrench";
+    if (type.indexOf("Forms") > -1) {
+      thisNoti.Icon = "file-text-o";
+      thisNoti.Text = `Your form is ${noti.Data.status}`;
+    }
   } else if (type.startsWith("MaintenanceJobAssigned")) {
     thisNoti.Text = `You have been assigned a request`;
     thisNoti.Subtext = noti.Data.title || noti.Data.description;
     thisNoti.Icon = "wrench";
+    if (type.indexOf("Forms") > -1) {
+      thisNoti.Icon = "file-text-o";
+      thisNoti.Text = `You have been assigned a form`;
+    }
   } else if (type.startsWith("MaintenanceJobUnassigned")) {
     thisNoti.Text = `A request you were assigned has been reassigned`;
     thisNoti.Subtext = noti.Data.title || noti.Data.description;
     thisNoti.Icon = "wrench";
+    if (type.indexOf("Forms") > -1) {
+      thisNoti.Icon = "file-text-o";
+      thisNoti.Text = `A form you were assigned has been reassigned`;
+    }
   } else if (type.startsWith("MaintenanceJobCommented")) {
     thisNoti.Text = noti.Data.comment;
     thisNoti.Subtext = noti.Data.title || noti.Data.description;
     thisNoti.Icon = "wrench";
+    if (type.indexOf("Forms") > -1) {
+      thisNoti.Icon = "file-text-o";
+    }
   } else if (type.startsWith("EntityCommented")) {
     thisNoti.Text = noti.Data.comment;
     thisNoti.Subtext = noti.Data.title || noti.Data.description;
@@ -120,9 +135,12 @@ module.exports = (noti) => {
     thisNoti.Text = noti.Data.message;
     thisNoti.Icon = "bell-o";
   } else if (type.startsWith("FeedPostApproved")) {
-    thisNoti.Text = `You have a new post`;
+    thisNoti.Text = `You have a new post for ${noti.Data.user.displayName}`;
     thisNoti.Subtext = noti.Data.title;
-    thisNoti.Icon = "commenting";
+    thisNoti.Icon = "bars";
+  } else if (type.startsWith("FeedPostToday")) {
+    thisNoti.Text = `Review today's posts for ${noti.Data.displayName}`;
+    thisNoti.Icon = "bars";
   } else {
     thisNoti.Text = "You have received a notification";
     thisNoti.Icon = "bell-o";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plusscommunities/pluss-core-aws",
-  "version": "2.0.17-beta.0",
+  "version": "2.0.18",
   "description": "Core extension package for Pluss Communities platform",
   "scripts": {
     "betapatch": "npm version prepatch --preid=beta",
@@ -22,6 +22,7 @@
     "https": "^1.0.0",
     "lodash": "^4.17.10",
     "moment": "^2.30.1",
+    "moment-timezone": "^0.5.41",
     "node-fetch": "^2.2.0",
     "node-jose": "^1.0.0",
     "nodemailer": "^6.9.12",