Merge branch 'master' into StudentInscription
This commit is contained in:
		@ -5,6 +5,7 @@
 | 
			
		||||
  import {ref} from "vue";
 | 
			
		||||
  import ExternalCurriculumList from "@/Apps/Inscription/ExternalCurriculumList.vue";
 | 
			
		||||
  import {getExternalCurriculumByUser} from "@/rest/externalCurriculum.js";
 | 
			
		||||
  import {getUserActualCourses} from "@/rest/courses.js";
 | 
			
		||||
 | 
			
		||||
  const props = defineProps(['target'])
 | 
			
		||||
  const user = await getUser(props.target)
 | 
			
		||||
@ -12,6 +13,9 @@
 | 
			
		||||
  const externalcurrlist = await getExternalCurriculumByUser(user.regNo)
 | 
			
		||||
  const extercurrlist = ref(false)
 | 
			
		||||
 | 
			
		||||
  const courselist = await getUserActualCourses(user.regNo)
 | 
			
		||||
  console.log(courselist)
 | 
			
		||||
 | 
			
		||||
  const watchingUser = await getSelf()
 | 
			
		||||
  function getPP(){
 | 
			
		||||
    if(user.profilePictureUrl === null){
 | 
			
		||||
 | 
			
		||||
@ -71,3 +71,11 @@ export async function getCourses(role){
 | 
			
		||||
export async function alterCourse(id, changes){
 | 
			
		||||
	return restPatch("/course/" + id, changes);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 * Return a list containing all the actual courses of a user
 | 
			
		||||
 */
 | 
			
		||||
 | 
			
		||||
export async function getUserActualCourses(userId){
 | 
			
		||||
	return restGet("/usercourses/"+userId)
 | 
			
		||||
}
 | 
			
		||||
		Reference in New Issue
	
	Block a user