mirror of
https://github.com/HabitRPG/habitica.git
synced 2025-12-16 22:27:26 +01:00
Added notification for when leader is updated (#9674)
* Added notification for when leader is updated * Abstracted challenge member search component * Added challenge member search modal to challenge detail * Added group search
This commit is contained in:
@@ -33,10 +33,7 @@
|
||||
.col-7.offset-5
|
||||
span.view-progress
|
||||
strong {{ $t('viewProgressOf') }}
|
||||
b-dropdown.create-dropdown(text="Select a Participant")
|
||||
input.form-control(type='text', v-model='searchTerm')
|
||||
b-dropdown-item(v-for="member in memberResults", :key="member._id", @click="openMemberProgressModal(member._id)")
|
||||
| {{ member.profile.name }}
|
||||
member-search-dropdown(:text="$t('selectParticipant')", :members='members', :challengeId='challengeId', @member-selected='openMemberProgressModal')
|
||||
span(v-if='isLeader || isAdmin')
|
||||
b-dropdown.create-dropdown(:text="$t('addTaskToChallenge')", :variant="'success'")
|
||||
b-dropdown-item(v-for="type in columns", :key="type", @click="createTask(type)")
|
||||
@@ -51,7 +48,6 @@
|
||||
v-on:taskEdited='taskEdited',
|
||||
@taskDestroyed='taskDestroyed'
|
||||
)
|
||||
|
||||
.row
|
||||
task-column.col-12.col-sm-6(
|
||||
v-for="column in columns",
|
||||
@@ -185,6 +181,7 @@ import omit from 'lodash/omit';
|
||||
import uuid from 'uuid';
|
||||
|
||||
import { mapState } from 'client/libs/store';
|
||||
import memberSearchDropdown from 'client/components/members/memberSearchDropdown';
|
||||
import closeChallengeModal from './closeChallengeModal';
|
||||
import Column from '../tasks/column';
|
||||
import TaskModal from '../tasks/taskModal';
|
||||
@@ -211,6 +208,7 @@ export default {
|
||||
leaveChallengeModal,
|
||||
challengeModal,
|
||||
challengeMemberProgressModal,
|
||||
memberSearchDropdown,
|
||||
TaskColumn: Column,
|
||||
TaskModal,
|
||||
},
|
||||
@@ -388,8 +386,8 @@ export default {
|
||||
updatedChallenge (eventData) {
|
||||
Object.assign(this.challenge, eventData.challenge);
|
||||
},
|
||||
openMemberProgressModal (memberId) {
|
||||
this.progressMemberId = memberId;
|
||||
openMemberProgressModal (member) {
|
||||
this.progressMemberId = member._id;
|
||||
this.$root.$emit('bv::show::modal', 'challenge-member-modal');
|
||||
},
|
||||
async exportChallengeCsv () {
|
||||
|
||||
@@ -10,10 +10,7 @@ div
|
||||
.col-12
|
||||
strong(v-once) {{$t('selectChallengeWinnersDescription')}}
|
||||
.col-12
|
||||
b-dropdown.create-dropdown(:text="winnerText")
|
||||
input.form-control(type='text', v-model='searchTerm')
|
||||
b-dropdown-item(v-for="member in memberResults", :key="member._id", @click="selectMember(member)")
|
||||
| {{ member.profile.name }}
|
||||
member-search-dropdown(:text='winnerText', :members='members', :challengeId='challengeId', @member-selected='selectMember')
|
||||
.col-12
|
||||
button.btn.btn-primary(v-once, @click='closeChallenge') {{$t('awardWinners')}}
|
||||
.col-12
|
||||
@@ -74,16 +71,16 @@ div
|
||||
</style>
|
||||
|
||||
<script>
|
||||
import challengeMemberSearchMixin from 'client/mixins/challengeMemberSearch';
|
||||
import memberSearchDropdown from 'client/components/members/memberSearchDropdown';
|
||||
|
||||
export default {
|
||||
props: ['challengeId', 'members'],
|
||||
mixins: [challengeMemberSearchMixin],
|
||||
components: {
|
||||
memberSearchDropdown,
|
||||
},
|
||||
data () {
|
||||
return {
|
||||
winner: {},
|
||||
searchTerm: '',
|
||||
memberResults: [],
|
||||
};
|
||||
},
|
||||
computed: {
|
||||
|
||||
Reference in New Issue
Block a user