auto generate travel name

david-loe · Jun 28, 2023 · 378e006 · 378e006
1 parent 860e920
commit 378e006
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 6 deletions.
diff --git a/backend/routes/routes.js b/backend/routes/routes.js
@@ -319,6 +319,11 @@ router.post('/travel/appliedFor', async (req, res) => {
   delete req.body.stages
   delete req.body.expenses
   delete req.body.professionalShare
+
+  if(!req.body.name){
+    var date = new Date(req.body.startDate)
+    req.body.name = req.body.destinationPlace.place + ' ' + i18n.t('monthsShort.' + date.getUTCMonth(), {lng: user.settings.language}) + ' ' + date.getUTCFullYear()
+  }
 
   const check = async (oldObject) => {
     return oldObject.state === 'appliedFor' || oldObject.state === 'rejected'

diff --git a/backend/settings.json b/backend/settings.json
@@ -10,5 +10,6 @@
     "toleranceStageDatesToApprovedTravelDates": 3,
     "baseCurrency": {"_id": "EUR", "symbol": "€"},
     "allowSpouseRefund": true,
-    "refundPerKM" : 0.3
+    "refundPerKM" : 0.3,
+    "version": 0
 }
diff --git a/common/locales/de.json b/common/locales/de.json
@@ -104,7 +104,8 @@
     "invoiceDate": "Rechnungsdatum",
     "description": "Beschreibung",
     "receiptNumber" : "Beleg Nr.",
-    "date": "Datum"
+    "date": "Datum",
+    "days": "Tage"
   },
   "alerts": {
     "noStagesPresent": "Es sind noch keine Etappen vorhanden. Füge eine hinzu.",
@@ -195,6 +196,20 @@
     "5": "Fr",
     "6": "Sa"
   },
+  "monthsShort": {
+    "0": "Jan",
+    "1": "Feb",
+    "2": "März",
+    "3": "Apr",
+    "4": "Mai",
+    "5": "Jun",
+    "6": "Jul",
+    "7": "Aug",
+    "8": "Sept",
+    "9": "Okt",
+    "10": "Nov",
+    "11": "Dez"
+  },
   "states":{
     "rejected": "Abgelehnt",
     "appliedFor": "Beantragt",

diff --git a/common/locales/en.json b/common/locales/en.json
@@ -104,7 +104,8 @@
     "invoiceDate": "Date of invoice",
     "description": "Description",
     "receiptNumber" : "Receipt No.",
-    "date": "Date"
+    "date": "Date",
+    "days": "Days"
   },
   "alerts": {
     "noStagesPresent": "There are no stages present jet.",
@@ -196,6 +197,20 @@
     "5": "Fri",
     "6": "Sat"
   },
+  "monthsShort": {
+    "0": "Jan",
+    "1": "Feb",
+    "2": "Mar",
+    "3": "Apr",
+    "4": "May",
+    "5": "June",
+    "6": "July",
+    "7": "Aug",
+    "8": "Sept",
+    "9": "Oct",
+    "10": "Nov",
+    "11": "Dec"
+  },
   "states":{
     "rejected": "Rejected",
     "appliedFor": "Applied for",

diff --git a/frontend/src/components/Elements/TravelApplication.vue b/frontend/src/components/Elements/TravelApplication.vue
@@ -48,7 +48,7 @@
 <script>
 import StatePipeline from './StatePipeline.vue'
 import PlaceElement from './PlaceElement.vue'
-import { getMoneyString, datetoDateString } from '../../common/scripts.js'
+import { getMoneyString, datetoDateStringWithYear, getDiffInDays } from '../../common/scripts.js'
 export default {
   name: 'TravelApply',
   data() {
@@ -66,8 +66,9 @@ export default {
     displayKey(key) {
       switch (key) {
         case 'startDate':
+          return datetoDateStringWithYear(this.travel[key])
         case 'endDate':
-          return datetoDateString(this.travel[key])
+          return datetoDateStringWithYear(this.travel[key]) + ' (' + (getDiffInDays(this.travel.startDate, this.travel.endDate) + 1) + ' ' + this.$t('labels.days') + ')'
         case 'state':
           return this.$t('states.' + this.travel[key])
         case 'editor':

diff --git a/frontend/src/components/Elements/TravelCard.vue b/frontend/src/components/Elements/TravelCard.vue
@@ -3,7 +3,7 @@
     <div class="card-body">
       <div class="row">
         <div class="col">
-          <h5 class="card-title">{{ travel.name ? travel.name : travel.reason }}</h5>
+          <h5 class="card-title">{{ travel.name }}</h5>
         </div>
         <div class="col-auto">
           <ProgressCircle v-if="['approved', 'underExamination'].indexOf(travel.state) !== -1" :progress="travel.progress"></ProgressCircle>