Create Completed Monthly Return Logs page

app/controllers/return-logs.controller.js

@@ -0,0 +1,28 @@
+'use strict'
+
+/**
+ * Controller for /return-logs endpoints
+ * @module ReturnLogsController
+ */
+
+const Boom = require('@hapi/boom')
+
+const ViewReturnLogService = require('../services/return-logs/view-return-log.service.js')
+
+async function view(request, h) {
+  const { auth, query } = request
+
+  if (!query.id) {
+    return Boom.badImplementation('Id is required')
+  }
+
+  const version = query.version ? Number(query.version) : 0
+
+  const pageData = await ViewReturnLogService.go(query.id, version, auth)
+
+  return h.view('return-logs/view.njk', pageData)
+}
+
+module.exports = {
+  view
+}

app/lib/static-lookups.lib.js

@@ -123,6 +123,20 @@ const returnRequirementReasons = {
   'transfer-and-now-chargeable': 'Licence transferred and now chargeable'
 }
 
+const unitNames = {
+  CUBIC_METRES: 'm³',
+  LITRES: 'l',
+  MEGALITRES: 'Ml',
+  GALLONS: 'gal'
+}
+
+const returnUnits = {
+  [unitNames.CUBIC_METRES]: { multiplier: 1, label: 'cubic meters' },
+  [unitNames.LITRES]: { multiplier: 1000, label: 'litres' },
+  [unitNames.MEGALITRES]: { multiplier: 0.001, label: 'megalitres' },
+  [unitNames.GALLONS]: { multiplier: 219.969248299, label: 'gallons' }
+}
+
 const sources = ['nald', 'wrls']
 
 const twoPartTariffReviewIssues = {
@@ -151,7 +165,9 @@ module.exports = {
   returnPeriodDates,
   returnRequirementFrequencies,
   returnRequirementReasons,
+  returnUnits,
   sources,
   twoPartTariffReviewIssues,
-  quarterlyReturnPeriods
+  quarterlyReturnPeriods,
+  unitNames
 }

app/models/return-submission.model.js

@@ -8,6 +8,8 @@
 const { Model } = require('objection')
 
 const BaseModel = require('./base.model.js')
+const { formatDateObjectToISO } = require('../lib/dates.lib.js')
+const { unitNames } = require('../lib/static-lookups.lib.js')
 
 class ReturnSubmissionModel extends BaseModel {
   static get tableName() {
@@ -39,6 +41,47 @@ class ReturnSubmissionModel extends BaseModel {
       }
     }
   }
+
+  $applyReadings() {
+    const meter = this.$meter()
+
+    if (!this.returnSubmissionLines || !meter || !meter.readings) {
+      return
+    }
+
+    for (const line of this.returnSubmissionLines) {
+      const { startDate, endDate } = line
+      const key = `${formatDateObjectToISO(startDate)}_${formatDateObjectToISO(endDate)}`
+
+      const reading = meter?.readings[key]
+
+      line.reading = reading ?? null
+    }
+  }
+
+  $meter() {
+    if (!this.metadata?.meters) {
+      return null
+    }
+
+    return this.metadata.meters[0]
+  }
+
+  $method() {
+    if (!this.metadata?.method) {
+      return 'abstractionVolumes'
+    }
+
+    return this.metadata.method
+  }
+
+  $units() {
+    if (!this.metadata?.units) {
+      return unitNames.CUBIC_METRES
+    }
+
+    return this.metadata.units
+  }
 }
 
 module.exports = ReturnSubmissionModel

app/plugins/router.plugin.js

@@ -29,6 +29,7 @@ const LicenceRoutes = require('../routes/licence.routes.js')
 const LicenceEndDatesRoutes = require('../routes/licences-end-dates.routes.js')
 const MonitoringStationRoutes = require('../routes/monitoring-station.routes.js')
 const ReturnLogSetupRoutes = require('../routes/return-logs-setup.routes.js')
+const ReturnLogRoutes = require('../routes/return-logs.routes.js')
 const ReturnVersionsSetupRoutes = require('../routes/return-versions-setup.routes.js')
 const ReturnVersionsRoutes = require('../routes/return-versions.routes.js')
 const RootRoutes = require('../routes/root.routes.js')
@@ -51,6 +52,7 @@ const routes = [
   ...JobRoutes,
   ...MonitoringStationRoutes,
   ...ReturnLogSetupRoutes,
+  ...ReturnLogRoutes,
   ...ReturnVersionsRoutes,
   ...ReturnVersionsSetupRoutes,
   ...DataRoutes,

app/presenters/base.presenter.js

@@ -206,6 +206,25 @@ function formatMoney(valueInPence, signed = false) {
   return `${sign}£${positiveValueInPounds.toLocaleString('en-GB', { minimumFractionDigits: 2, maximumFractionDigits: 2 })}`
 }
 
+/**
+ * Formats a number as a string with commas and decimal places, for example, 1000 as '1,000.000'
+ *
+ * @param {number} number - The number to format
+ * @param {number} [minimumFractionDigits=0] - Minimum number of digits after the decimal point
+ * @param {number} [maximumFractionDigits=3] - Maximum number of digits after the decimal point
+ *
+ * @returns {string|null} The formatted number or null if the number is null or undefined
+ */
+function formatNumber(number, minimumFractionDigits = 0, maximumFractionDigits = 3) {
+  // NOTE: We don't use !number because that would match 0, which for this helper is a valid number and something we
+  // want to format
+  if (number === null) {
+    return null
+  }
+
+  return number.toLocaleString('en-GB', { minimumFractionDigits, maximumFractionDigits })
+}
+
 /**
  * Formats a number, which represents a value in pence to pounds, for example, 12776805 as '127768.05'
  *
@@ -247,7 +266,7 @@ function sentenceCase(value) {
 }
 
 /**
- * Convert a string to title case by capitalizing the first letter of each word
+ * Convert a string to title case by lowercasing all characters then capitalizing the first letter of each word
  *
  * Will work for strings containing multiple words or only one.
  *
@@ -256,7 +275,7 @@ function sentenceCase(value) {
  * @returns {string} The title cased string
  */
 function titleCase(value) {
-  const words = value.split(' ')
+  const words = value.toLowerCase().split(' ')
   const titleCasedWords = []
 
   words.forEach((word) => {
@@ -280,6 +299,7 @@ module.exports = {
   formatLongDate,
   formatLongDateTime,
   formatMoney,
+  formatNumber,
   formatPounds,
   leftPadZeroes,
   sentenceCase,

app/presenters/bill-runs/review/base-review.presenter.js

@@ -31,12 +31,12 @@ function calculateTotalBillableReturns(reviewChargeElements) {
 function determineReturnLink(reviewReturn) {
   const { returnId, returnStatus } = reviewReturn
 
+  if (FeatureFlagsConfig.enableSystemReturnsView) {
+    return `/system/return-logs?id=${returnId}`
+  }
+
   if (['due', 'received'].includes(returnStatus)) {
-    if (FeatureFlagsConfig.enableSystemReturnsView) {
-      return `/system/return-logs/setup?returnLogId=${returnId}`
-    } else {
-      return `/return/internal?returnId=${returnId}`
-    }
+    return `/return/internal?returnId=${returnId}`
   }
 
   return `/returns/return?id=${returnId}`

app/presenters/licences/view-licence-returns.presenter.js

@@ -30,16 +30,16 @@ function go(returnLogs, hasRequirements, auth) {
 }
 
 function _link(status, returnLogId, canManageReturns) {
+  if (FeatureFlagsConfig.enableSystemReturnsView) {
+    return `/system/return-logs?id=${returnLogId}`
+  }
+
   if (['completed', 'void'].includes(status)) {
     return `/returns/return?id=${returnLogId}`
   }
 
   if (canManageReturns) {
-    if (FeatureFlagsConfig.enableSystemReturnsView) {
-      return `/system/return-logs/setup?returnLogId=${returnLogId}`
-    } else {
-      return `/return/internal?returnId=${returnLogId}`
-    }
+    return `/return/internal?returnId=${returnLogId}`
   }
 
   return null