v1.1.1 (#62)

* language fixes * fix for admin tasks not updating correctly (#61)
chiefonboarding · Apr 14, 2021 · b28a1ca · b28a1ca
1 parent 409857e
commit b28a1ca
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 20 deletions.
diff --git a/back/admin_tasks/emails.py b/back/admin_tasks/emails.py
@@ -17,7 +17,7 @@ def send_email_notification_to_external_person(admin_task):
                 "Hi! Could you please help me with this? It's for our new hire ") + admin_task.new_hire.full_name()
         }
     ]
-    if admin_task.comments.exists():
+    if admin_task.comment.exists():
         content.append({
             "type": "block",
             "text": admin_task.content.last().comment
@@ -37,7 +37,7 @@ def send_email_new_assigned_admin(admin_task):
             "text": _("This is about task: ") + admin_task.name + _(" for ") + admin_task.new_hire.full_name()
         }
     ]
-    if admin_task.comments.exists():
+    if admin_task.comment.exists():
         content.append({
             "type": "block",
             "text": '<strong>' + _("Last message: ") + '</strong><br />' + admin_task.content.last().comment

diff --git a/front/layouts/newhire.vue b/front/layouts/newhire.vue
@@ -12,7 +12,7 @@
     >
       <img :src="$store.state.baseInfo.org.logo" style="max-height: 40px; max-width: 100px; margin-right: 20px;">
 
-      <v-toolbar-title>Welcome {{ $store.state.baseInfo.new_hire.first_name }}!</v-toolbar-title>
+      <v-toolbar-title>Hi {{ $store.state.baseInfo.new_hire.first_name }}!</v-toolbar-title>
 
       <v-spacer />
       <v-toolbar-items>
@@ -96,8 +96,8 @@ export default {
       }
       this.$newhirepart.getMe(code).then((data) => {
         this.$store.commit('setBaseInfo', data)
-        moment.locale(data.language)
-        this.$i18n.locale = data.language
+        moment.locale(data.new_hire.language)
+        this.$i18n.locale = data.new_hire.language
         if (this.$router.currentRoute.name === 'portal') {
           if (data.new_hire.has_to_do) {
             this.$router.push({ name: 'portal-todo' })

diff --git a/front/pages/admin/hrtasks/mine.vue b/front/pages/admin/hrtasks/mine.vue
@@ -26,8 +26,8 @@
           <template v-slot:no-data>
             There are no to do items for you (yet).
           </template>
-          <template v-slot:item.first_name="{ item }">
-            {{ item.first_name }} {{ item.last_name }}
+          <template v-slot:item.new_hire.first_name="{ item }">
+            {{ item.new_hire.first_name }} {{ item.new_hire.last_name }}
           </template>
           <template v-slot:item.date="{ item }">
             {{ item.date | timeAgo }}

diff --git a/front/pages/portal/resources/index.vue b/front/pages/portal/resources/index.vue
@@ -82,6 +82,9 @@ export default {
       })
     },
     clickedItem (value) {
+      if (value.length === 0) {
+        return
+      }
       const item = this.searchResources.find(a => a.id === value[0])
       if (item.item) {
         this.item = item

diff --git a/front/pages/portal/todo.vue b/front/pages/portal/todo.vue
@@ -16,7 +16,7 @@
       <v-row v-for="(value, preopertyName) in toDoItems" :key="preopertyName">
         <v-col xs="12" mb="4">
           <v-subheader class="list-header">
-            {{ preopertyName | toCalendar }}
+            {{ toCalendar(preopertyName) }}
           </v-subheader>
           <div v-for="i in value" :key="i.id" class="upper">
             <ToDoItem :to-do="i" />
@@ -80,18 +80,6 @@ export default {
   layout: 'newhire',
   name: 'ToDoPart',
   components: { ToDoItem, BadgeModal },
-  filters: {
-    toCalendar (value) {
-      return moment(value).calendar(null, {
-        sameDay: '[Today]',
-        nextDay: '[Tomorrow]',
-        nextWeek: 'dddd',
-        lastDay: '[Yesterday]',
-        lastWeek: '[Last] dddd',
-        sameElse: 'MM/DD/YYYY'
-      })
-    }
-  },
   data: () => ({
     loading: true,
     loadingBadges: true,
@@ -127,6 +115,27 @@ export default {
         this.loading = false
       })
     },
+    toCalendar (value) {
+      if (this.$store.state.baseInfo.new_hire.language === 'en') {
+        return moment(value).calendar(null, {
+          sameDay: '[Today]',
+          nextDay: '[Tomorrow]',
+          nextWeek: 'dddd',
+          lastDay: '[Yesterday]',
+          lastWeek: '[Last] dddd',
+          sameElse: 'MM/DD/YYYY'
+        })
+      } else if (this.$store.state.baseInfo.new_hire.language === 'nl') {
+        return moment(value).calendar(null, {
+          lastDay: '[Gisteren]',
+          sameDay: '[Vandaag]',
+          nextDay: '[Morgen]',
+          lastWeek: '[Vorige week] dddd',
+          nextWeek: '[Volgende week] dddd',
+          sameElse: 'DD-MMMM'
+        })
+      }
+    },
     getBadges () {
       this.loadingBadges = true
       this.$newhirepart.getBadges().then((data) => {