adding settings for warning limits

backend/data/settings.json

@@ -85,6 +85,8 @@
       "lunch": 0.4
     },
     "maxTravelDayCount": 92,
+    "minHoursOfTravel": 8,
+    "minProfessionalShare": 0.5,
     "secoundNightOnAirplaneLumpSumCountry": "AT",
     "secoundNightOnShipOrFerryLumpSumCountry": "LU",
     "toleranceStageDatesToApprovedTravelDates": 3,

backend/db.ts

@@ -11,6 +11,8 @@ import Currency from './models/currency.js'
 import HealthInsurance from './models/healthInsurance.js'
 import Organisation from './models/organisation.js'
 import Project from './models/project.js'
+import { mergeDeep } from '../common/scripts.js'
+import { getSettings } from './helper.js'
 
 export async function connectDB() {
   const first = mongoose.connection.readyState === 0
@@ -28,13 +30,13 @@ export function disconnectDB() {
 }
 
 export async function initDB() {
-  const DBsettings = (await mongoose.connection.collection('settings').findOne({})) as ISettings | null
+  const DBsettings = await getSettings()
   if (DBsettings) {
     if (DBsettings.version !== settings.version) {
       DBsettings.migrateFrom = DBsettings.version
     }
     DBsettings.version = settings.version
-    const mergedSettings = Object.assign({}, settings, DBsettings)
+    const mergedSettings = mergeDeep({}, settings, DBsettings)
     await mongoose.connection.collection('settings').findOneAndDelete({})
     await mongoose.connection.collection('settings').insertOne(mergedSettings)
     console.log(i18n.t('alerts.db.updatedSettings'))

backend/migrations.ts

@@ -198,7 +198,7 @@ export async function checkForMigrations() {
             fallBackLumpSumCountry: oldSettings.fallBackLumpSumCountry,
             secoundNightOnAirplaneLumpSumCountry: oldSettings.secoundNightOnAirplaneLumpSumCountry,
             secoundNightOnShipOrFerryLumpSumCountry: oldSettings.secoundNightOnShipOrFerryLumpSumCountry
-          }
+          } as any
           await settings.save()
         } else {
           throw Error("Couldn't find settings")

backend/models/settings.ts

@@ -107,7 +107,9 @@ export const settingsSchema = new Schema<Settings>({
       factorOvernightLumpSumExceptions: { type: [{ type: String, ref: 'Country' }], required: true },
       fallBackLumpSumCountry: { type: String, ref: 'Country', required: true },
       secoundNightOnAirplaneLumpSumCountry: { type: String, ref: 'Country', required: true },
-      secoundNightOnShipOrFerryLumpSumCountry: { type: String, ref: 'Country', required: true }
+      secoundNightOnShipOrFerryLumpSumCountry: { type: String, ref: 'Country', required: true },
+      minHoursOfTravel: {type: Number, min: 0, required: true},
+      minProfessionalShare: {type: Number, min: 0, max: 1, required: true}
     },
     required: true
   },

common/locales/de.json

@@ -120,7 +120,6 @@
     "balance": "Saldo",
     "bankDetails": "Bankverbindung",
     "breakfast": "Frühstück",
-    "breakfastCateringLumpSumCut": "Verpflegungspauschalenkürung fürs Frühstück",
     "budget": "Budget",
     "by": "von",
     "cancel": "Abbrechen",
@@ -158,7 +157,6 @@
     "description": "Beschreibung",
     "destinationPlace": "Reiseziel",
     "dinner": "Abendessen",
-    "dinnerCateringLumpSumCut": "Verpflegungspauschalenkürung fürs Abendessen",
     "disableReportType": "Antragsarten deaktivieren",
     "distance": "Entfernung [km]",
     "distanceRefunds": "Entfernungspauschalen",
@@ -213,16 +211,18 @@
     "location": "Ort",
     "logo": "Logo",
     "loseAccessAt": "Ablaufdatum",
+    "lumpSumCut": "Verpflegungspauschalenkürung",
     "lumpSums": "Pauschalen",
     "lumpSumsFrom": "Pauschalen von",
     "lunch": "Mittagessen",
-    "lunchCateringLumpSumCut": "Verpflegungspauschalenkürung fürs Mittagessen",
     "mailToInsurance": "E-Mail an Versicherung",
     "mailXDaysBeforeDeletion": "Informationsmail vor dem Löschen - in Tagen",
     "maxTravelDayCount": "Maximale Länge eine Dienstreise [Tage]",
     "mergeUsers": "Benutzer zusammenführen",
     "midnight": "24 Uhr",
     "midnightCountries": "Erreichte Länder um Mitternacht",
+    "minHoursOfTravel": "Mindestdauer einer Reise [Stunden]",
+    "minProfessionalShare": "Minimaler betrieblicher Anteil einer Reise",
     "mixed": "Gemischt",
     "model": "Modell",
     "models": "Modelle",
@@ -516,4 +516,4 @@
     "5": "Fr",
     "6": "Sa"
   }
-}
+}

common/locales/en.json

@@ -120,7 +120,6 @@
     "balance": "Balance",
     "bankDetails": "Bank details",
     "breakfast": "Breakfast",
-    "breakfastCateringLumpSumCut": "Catering lump sum cut for breakfast",
     "budget": "Budget",
     "by": "by",
     "cancel": "Cancel",
@@ -158,7 +157,6 @@
     "description": "Description",
     "destinationPlace": "Destination place",
     "dinner": "Dinner",
-    "dinnerCateringLumpSumCut": "Catering flat rate reduction for dinner",
     "disableReportType": "Deactivate application types",
     "distance": "Distance [km]",
     "distanceRefunds": "Distance refunds",
@@ -213,16 +211,18 @@
     "location": "Location",
     "logo": "Logo",
     "loseAccessAt": "Expiration date",
+    "lumpSumCut": "Catering lump sum cut",
     "lumpSums": "Lump sums",
     "lumpSumsFrom": "Lump sums from",
     "lunch": "Lunch",
-    "lunchCateringLumpSumCut": "Catering lump sum cut for lunch",
     "mailToInsurance": "Mail to insurance",
     "mailXDaysBeforeDeletion": "Receive notification mail before deletion - in days",
     "maxTravelDayCount": "Maximum length of a business trip [days]",
     "mergeUsers": "Merge Users",
     "midnight": "12AM",
     "midnightCountries": "Countries reached by midnight",
+    "minHoursOfTravel": "Minimum duration of a business trip [hours]",
+    "minProfessionalShare": "Minimum professional share of a business trip",
     "mixed": "Mixed",
     "model": "Model",
     "models": "Models",
@@ -516,4 +516,4 @@
     "5": "Fri",
     "6": "Sat"
   }
-}
+}

common/scripts.ts

@@ -345,3 +345,31 @@ export class Base64 {
     return string
   }
 }
+
+/**
+ * Simple object check.
+ */
+export function isObject(item: any) {
+  return (item && typeof item === 'object' && !Array.isArray(item) && !(item instanceof Date));
+}
+
+/**
+ * Deep merge two objects.
+ */
+export function mergeDeep(target: any, ... sources:any) {
+  if (!sources.length) return target;
+  const source = sources.shift();
+
+  if (isObject(target) && isObject(source)) {
+    for (const key in source) {
+      if (isObject(source[key])) {
+        if (!isObject(target[key])) Object.assign(target, { [key]: {} });
+        mergeDeep(target[key], source[key]);
+      } else {
+        Object.assign(target, { [key]: source[key] });
+      }
+    }
+  }
+
+  return mergeDeep(target, ...sources);
+}

common/travel.ts

@@ -26,7 +26,8 @@ export class TravelCalculator {
 
   constructor(getCountryById: (id: CountryCode) => Promise<Country>, travelSettings: SettingsTravel) {
     this.getCountryById = getCountryById
-    this.validator = new TravelValidator()
+    this.lumpSumCalculator = new LumpSumCalculator(this.getCountryById, travelSettings.fallBackLumpSumCountry)
+    this.validator = new TravelValidator(travelSettings)
     this.updateSettings(travelSettings)
   }
 
@@ -46,7 +47,8 @@ export class TravelCalculator {
 
   updateSettings(travelSettings: SettingsTravel) {
     this.travelSettings = travelSettings
-    this.lumpSumCalculator = new LumpSumCalculator(this.getCountryById, travelSettings.fallBackLumpSumCountry)
+    this.validator.updateSettings(travelSettings)
+    this.lumpSumCalculator.setFallBackLumpSumCountry(travelSettings.fallBackLumpSumCountry)
   }
 
   sort(travel: Travel) {
@@ -289,11 +291,28 @@ export class TravelCalculator {
 }
 
 type Invalid = { path: string; err: string | Error; val?: any }
-
+type Warning = {name: string, val?: any, limit?: any}
 export class TravelValidator {
+  travelSettings!: SettingsTravel
+
+  constructor(travelSettings: SettingsTravel) {
+    this.updateSettings(travelSettings)
+  }
+
+  updateSettings(travelSettings: SettingsTravel) {
+    this.travelSettings = travelSettings
+  }
+
   validate(travel: Travel): Invalid[] {
     return this.validateDates(travel).concat(this.validateCountries(travel))
   }
+
+  /**
+   * checks a travel for warnings
+   */
+  check(travel: Travel): Warning[]{
+    return this.checkProfessionalShare(travel).concat(this.checkTravelLength(travel))
+  }
 
   validateDates(travel: Travel): Invalid[] {
     const conflicts = new Set<Invalid>()
@@ -343,16 +362,42 @@ export class TravelValidator {
     }
     return conflicts
   }
+
+  checkTravelLength(travel: Travel): Warning[] {
+    const warnings: Warning[] = []
+    const cs = travel.stages.length
+    if(cs > 0){
+      const travelLength = (new Date(travel.stages[cs - 1].arrival)).valueOf() - (new Date(travel.stages[0].departure)).valueOf()
+      const limit = this.travelSettings.minHoursOfTravel * 1000 *60 *60
+      if(travelLength < limit){
+        warnings.push({name: 'travelLengthToShort', val: travelLength, limit: limit})
+      }
+    }
+    return warnings
+  }
+
+  checkProfessionalShare(travel: Travel): Warning[] {
+    const warnings: Warning[] = []
+    if(travel.professionalShare !== null && travel.professionalShare < this.travelSettings.minProfessionalShare){
+      warnings.push({name:'professionalShareToSmall', val: travel.professionalShare, limit: this.travelSettings.minProfessionalShare})
+    }
+    return warnings
+  }
 }
 
 export default class LumpSumCalculator {
-  fallBackLumpSumCountry: CountryCode
+  fallBackLumpSumCountry!: CountryCode
   getCountryById: (id: CountryCode) => Promise<Country>
 
   constructor(getCountryById: (id: CountryCode) => Promise<Country>, fallBackLumpSumCountry: CountryCode) {
     this.getCountryById = getCountryById
+    this.setFallBackLumpSumCountry(fallBackLumpSumCountry)
+  }
+
+  setFallBackLumpSumCountry(fallBackLumpSumCountry: CountryCode){
     this.fallBackLumpSumCountry = fallBackLumpSumCountry
   }
+
   async getLumpSum(country: Country, date: Date, special: string | undefined = undefined): Promise<LumpSum> {
     if (country.lumpSumsFrom) {
       const lumpSumFrom = await this.getCountryById(country.lumpSumsFrom)

common/types.ts

@@ -39,6 +39,8 @@ export interface SettingsTravel {
   fallBackLumpSumCountry: CountryCode
   secoundNightOnAirplaneLumpSumCountry: CountryCode
   secoundNightOnShipOrFerryLumpSumCountry: CountryCode
+  minHoursOfTravel: number
+  minProfessionalShare: number
 }
 
 /**

frontend/src/components/travel/TravelPage.vue

@@ -176,7 +176,7 @@
           <label class="form-check-label me-2" for="travelProfessionalShare">
             {{ $t('labels.professionalShare') + ':' }}
           </label>
-          <span id="travelProfessionalShare" :class="travel.professionalShare <= 0.5 ? 'text-danger' : ''">
+          <span id="travelProfessionalShare" :class="travel.professionalShare <= $root.settings.travelSettings.minProfessionalShare ? 'text-danger' : ''">
             {{ Math.round(travel.professionalShare * 100) + '%' }}</span
           >
           <InfoPoint class="ms-1" :text="$t('info.professionalShare')" />