Merge branch 'dev' into feat/class-functionality
This commit is contained in:
		
						commit
						1635449962
					
				
					 37 changed files with 1320 additions and 2052 deletions
				
			
		| 
						 | 
				
			
			@ -250,10 +250,11 @@
 | 
			
		|||
                <tbody>
 | 
			
		||||
                    <tr
 | 
			
		||||
                        v-for="i in invitations"
 | 
			
		||||
                        :key="(i.class as ClassDTO).id"
 | 
			
		||||
                        :key="i.classId"
 | 
			
		||||
                    >
 | 
			
		||||
                        <td>
 | 
			
		||||
                            {{ (i.class as ClassDTO).displayName }}
 | 
			
		||||
                            {{ i.classId }}
 | 
			
		||||
                            <!-- TODO fetch display name via classId because db only returns classId field -->
 | 
			
		||||
                        </td>
 | 
			
		||||
                        <td>{{ (i.sender as TeacherDTO).firstName + " " + (i.sender as TeacherDTO).lastName }}</td>
 | 
			
		||||
                        <td class="text-right">
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Reference in a new issue