Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/fontawesome.js
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ import { faHistory } from '@fortawesome/free-solid-svg-icons/faHistory'
import { faUmbrellaBeach } from '@fortawesome/free-solid-svg-icons/faUmbrellaBeach'
import { faPlay } from '@fortawesome/free-solid-svg-icons/faPlay'
import { faStop } from '@fortawesome/free-solid-svg-icons/faStop'
import { faAddressBook } from '@fortawesome/free-solid-svg-icons/faAddressBook'
import { faBookReader } from '@fortawesome/free-solid-svg-icons/faBookReader'

library.add(faTimesCircle)
Expand Down Expand Up @@ -127,5 +128,6 @@ library.add(faUmbrellaBeach)
library.add(faPlay)
library.add(faStop)
library.add(faBookReader)
library.add(faAddressBook)

export default FontAwesomeIcon
5 changes: 5 additions & 0 deletions src/menu.json
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,11 @@
"icon": "book-reader",
"params": { "page_id": "kms" }
},
{
"name": "oms.contact",
"label": "Contact",
"icon": "address-book"
},
{
"name": "oms.helpdesk",
"link": "https://myaegee.atlassian.net/servicedesk/customer/portals",
Expand Down
8 changes: 8 additions & 0 deletions src/router/routes.js
Original file line number Diff line number Diff line change
Expand Up @@ -867,6 +867,14 @@ module.exports = [
},
component: 'static/Resources'
},
{
name: 'oms.contact',
path: '/contact',
meta: {
label: 'Contact'
},
component: 'static/Contact'
},
/* Discounts distribution */
{
name: 'oms.discounts',
Expand Down
3 changes: 2 additions & 1 deletion src/views/core/bodies/Single.vue
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,8 @@ export default {
address: null,
postal_address: null,
shadow_circle: null,
shadow_circle_id: null
shadow_circle_id: null,
members: null
},
boards: [],
isLoading: false,
Expand Down
82 changes: 82 additions & 0 deletions src/views/static/Contact.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
<template>
<div class="tile is-ancestor contact">
<div class="tile is-parent is-vertical">
<div class="tile is-child">
<div class="title">Get in contact with a European Body</div>

<b-table :data="bodies" :loading="isLoading" narrowed>
<template slot-scope="props">

<b-table-column field="name" label="Body name">
<router-link :to="{ name: 'oms.bodies.view', params: { id: props.row.id } }">{{ props.row.name }}</router-link>
</b-table-column>

<b-table-column field="email" label="Email">
<a :href="'mailto:' + props.row.email">
{{ props.row.email }}
</a>
</b-table-column>

<b-table-column field="members" label="Members">
<router-link
v-for="(member, index) in props.row.members"
v-bind:key="index"
:to="{ name: 'oms.members.view', params: { id: member.id } }">
{{ member.first_name }} {{ member.last_name }}
</router-link>
</b-table-column>

</template>

<template slot="empty">
<empty-table-stub />
</template>
</b-table>

</div>
</div>
</div>
</template>

<script>
import { mapGetters } from 'vuex'
import constants from '../../constants.js'

export default {
name: 'Contact',
data () {
return {
constants,
bodies: [],
isLoading: false
}
},
computed: mapGetters(['services']),
mounted () {
this.isLoading = true
this.fetchData()
},
methods: {
async fetchData () {
try {
const response = await this.axios.get(this.services['core'] + '/bodies')
const bodies = response.data.data.filter(a => !['antenna', 'contact antenna', 'contact', 'partner', 'other'].includes(a.type))

// Fetch members for each body
const bodiesWithMembers = await Promise.all(bodies.map(async (body) => {
const membersResponse = await this.axios.get(this.services['core'] + '/bodies/' + body.id + '/members')
body.members = membersResponse.data.data.map((member) => member.user)
return body
}))

this.bodies = bodiesWithMembers
} catch (err) {
this.$root.showError('Could not fetch bodies or members', err)
} finally {
this.isLoading = false
}
}
}
}

</script>
3 changes: 1 addition & 2 deletions src/views/statutory/UploadMembersList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -261,8 +261,7 @@ export default {
return this.$root.showError('Memberslist should contain at least 1 member.')
}

for (let index = 0; index < this.memberslist.members.length; index++) {
const member = this.memberslist.members[index]
for (const [index, member] of this.memberslist.members.entries()) {
if (typeof member.fee !== 'number') {
return this.$root.showError(`Please set the fee for member number ${index + 1}.`)
}
Expand Down
Loading