ramon
/
skillbox
1
0
Fork 0
Code Issues 1 Pull Requests 1 Packages Projects 1 Releases 1 Wiki Activity

Add rejoin button to class list

This commit is contained in:
Ramon Wenger 2021-08-31 15:24:02 +02:00
parent b705e68e3b
commit 94bd5757e5
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/cypress/integration/frontend/school-class-management.spec.js
View File

@ -199,7 +199,7 @@ describe('Teacher Class Management', () => {
cy.get('[data-cy=group-list-name]').should('contain', className); cy.get('[data-cy=group-list-name]').should('contain', className);
}); });
it('removes student, then leaves class', () => { it('removes student, then leaves class, then rejoins', () => {
const myId = btoa('PrivateUserNode:1'); const myId = btoa('PrivateUserNode:1');
const memberId = btoa('GroupMemberNode:1'); const memberId = btoa('GroupMemberNode:1');
let classMembers = [ let classMembers = [
@ -245,6 +245,8 @@ describe('Teacher Class Management', () => {
cy.getByDataCy('modal-body-text').should('contain', 'verlassen'); cy.getByDataCy('modal-body-text').should('contain', 'verlassen');
cy.getByDataCy('modal-save-button').click(); cy.getByDataCy('modal-save-button').click();
cy.getByDataCy('active-member').should('have.length', 1); cy.getByDataCy('active-member').should('have.length', 1);
cy.getByDataCy('rejoin-class').click();
cy.getByDataCy('active-member').should('have.length', 2);
}); });
it('creates a new class', () => { it('creates a new class', () => {

5
client/src/components/profile/GroupList.vue
View File

@ -58,6 +58,11 @@
data-cy="add-to-class" data-cy="add-to-class"
v-if="canEdit && enableDeactivate" v-if="canEdit && enableDeactivate"
@click="$emit('add', member)">Aktivieren</a> @click="$emit('add', member)">Aktivieren</a>
<a
class="member-item__action simple-list__action"
data-cy="rejoin-class"
v-if="member.isMe && member.isTeacher"
@click="$emit('add', member)">Aktivieren</a>
</li> </li>
</ul> </ul>
</template> </template>