Fix: Display telegram, user role and phone number. (#352)

codescalers · Feb 7, 2024 · b169797 · b169797
1 parent a0e4c4c
commit b169797
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/client/src/components/cards/vacationCard.vue b/client/src/components/cards/vacationCard.vue
@@ -147,16 +147,17 @@ export default {
     })
 
     const couldApprove = computed(() => {
+      
       if (user.value) {
         if (
           user.value.fullUser.user_type === 'Admin' ||
           user.value.fullUser.user_type === 'Supervisor'
-        ) {
+          ) {
           if (props.vacation.user.id == user.value.fullUser.id) {
             return true
           }
           if (
-            props.vacation.user.reporting_to.includes(user.value.fullUser.id) &&
+            props.vacation.user.reporting_to[0].id === props.vacation.user.id &&
             props.vacation.user.location.name === user.value.fullUser.location.name
           ) {
             return true

diff --git a/client/src/views/TeamView.vue b/client/src/views/TeamView.vue
@@ -77,8 +77,8 @@ export default {
     const headers = [
       { title: 'Name', sortable: false, key: 'full_name' },
       { title: 'Email', key: 'email' },
-      { title: 'Phone', key: 'phone' },
-      { title: 'Position', key: 'position' },
+      { title: 'Phone', key: 'mobile_number' },
+      { title: 'Position', key: 'job_title' },
       { title: 'Telegram', key: 'telegram_link' },
       { title: 'Department', key: 'team' }
     ] as any[]

diff --git a/server/cshr/serializers/users.py b/server/cshr/serializers/users.py
@@ -370,6 +370,7 @@ class Meta:
             "address",
             "location",
             "is_active",
+            "telegram_link",
         ]
 
     def get_image(self, obj):