Fix fews things and rename the inscription app to managerequests also sort the files
This commit is contained in:
		@ -1,12 +1,12 @@
 | 
			
		||||
<script setup>
 | 
			
		||||
import i18n from "@/i18n.js"
 | 
			
		||||
import {getSelf, getUser} from '../rest/Users.js'
 | 
			
		||||
import {getSelf, getUser} from '../../rest/Users.js'
 | 
			
		||||
import {getcurriculum,getSomeonesCurriculumList} from "@/rest/curriculum.js";
 | 
			
		||||
import {getRegisters} from "@/rest/ServiceInscription.js";
 | 
			
		||||
import {get} from "jsdom/lib/jsdom/named-properties-tracker.js";
 | 
			
		||||
import {getExternalCurriculumByInscrReq} from "@/rest/externalCurriculum.js";
 | 
			
		||||
import {ref} from "vue";
 | 
			
		||||
import ExternalCurriculumList from "@/Apps/ExternalCurriculumList.vue";
 | 
			
		||||
import ExternalCurriculumList from "@/Apps/Inscription/ExternalCurriculumList.vue";
 | 
			
		||||
import {editEquivalenceState} from "@/rest/requests.js";
 | 
			
		||||
 | 
			
		||||
const props = defineProps(['target']);
 | 
			
		||||
@ -63,9 +63,10 @@ async function editEquivalence(id, newstate){
 | 
			
		||||
  </div>
 | 
			
		||||
  <div v-if="list==true">
 | 
			
		||||
    <ExternalCurriculumList :ext-curr-list="externalCurriculum" :inscr-req-id="request.id"></ExternalCurriculumList>
 | 
			
		||||
    <div>
 | 
			
		||||
      <button @click="editEquivalence(request.id, 'Accepted'); request.equivalenceState='Accepted'">Accept Equivalence</button>
 | 
			
		||||
      <button @click="editEquivalence(request.id, 'Refused'); request.equivalenceState='Refused'">Refuse Equivalence</button>
 | 
			
		||||
    <div style="margin-left: 15%;margin-top: 5%;">
 | 
			
		||||
      <button style="margin-left: 2%" @click="list = false;editEquivalence(request.id, 'Accepted'); request.equivalenceState='Accepted'">Accept Equivalence</button>
 | 
			
		||||
      <button style="margin-left: 2%" @click="list = false;editEquivalence(request.id, 'Refused'); request.equivalenceState='Refused'">Refuse Equivalence</button>
 | 
			
		||||
      <button style="margin-left: 2%" @click="list=false">Return to profile</button>
 | 
			
		||||
    </div>
 | 
			
		||||
  </div>
 | 
			
		||||
</template>
 | 
			
		||||
@ -127,6 +128,5 @@ button{
 | 
			
		||||
  width:100px;
 | 
			
		||||
  border:none;
 | 
			
		||||
  border-radius:20px;
 | 
			
		||||
 | 
			
		||||
}
 | 
			
		||||
</style>
 | 
			
		||||
@ -1,6 +1,6 @@
 | 
			
		||||
<script setup>
 | 
			
		||||
  import i18n from "@/i18n.js"
 | 
			
		||||
  import {getUser} from '../rest/Users.js'
 | 
			
		||||
  import {getUser} from '../../rest/Users.js'
 | 
			
		||||
  import {getSomeonesCurriculumList} from "@/rest/curriculum.js";
 | 
			
		||||
 | 
			
		||||
  const props = defineProps(['target']);
 | 
			
		||||
@ -1,8 +1,6 @@
 | 
			
		||||
<script setup>
 | 
			
		||||
  import i18n from "@/i18n.js";
 | 
			
		||||
  import {editExternalCurriculum} from "@/rest/externalCurriculum.js";
 | 
			
		||||
  import {ref} from "vue";
 | 
			
		||||
  import {editEquivalenceState} from "@/rest/requests.js";
 | 
			
		||||
 | 
			
		||||
  const props = defineProps(["extCurrList","inscrReqId"])
 | 
			
		||||
 | 
			
		||||
@ -64,19 +62,6 @@
 | 
			
		||||
  font-size: 70%;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.accept{
 | 
			
		||||
  grid-area:accept;
 | 
			
		||||
  align-self:center;
 | 
			
		||||
  white-space: nowrap;
 | 
			
		||||
  overflow: hidden;
 | 
			
		||||
  text-overflow:ellipsis;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.refuse{
 | 
			
		||||
  grid-area: refuse;
 | 
			
		||||
  align-self:center;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.download{
 | 
			
		||||
  grid-area: download;
 | 
			
		||||
  align-self:center;
 | 
			
		||||
@ -2,7 +2,7 @@
 | 
			
		||||
  import i18n from "@/i18n.js"
 | 
			
		||||
  import {ref} from 'vue'
 | 
			
		||||
  import {validateRegister, getAllRegisters } from '@/rest/ServiceInscription.js'
 | 
			
		||||
  import AboutRequest from "@/Apps/AboutRequest.vue";
 | 
			
		||||
  import AboutRequest from "@/Apps/Inscription/AboutRequest.vue";
 | 
			
		||||
  import {getAllExemptionsRequest, getAllScholarShipsRequest} from "@/rest/requests.js";
 | 
			
		||||
 | 
			
		||||
  const requests = ref(await getAllRegisters());
 | 
			
		||||
@ -38,7 +38,6 @@
 | 
			
		||||
<template>
 | 
			
		||||
  <div v-if="windowsState === 1">
 | 
			
		||||
    <AboutRequest :target="targetId"></AboutRequest>
 | 
			
		||||
    <button style="background-color:rgb(105,05,105);margin-left: 30%; margin-top: 5%" @click="windowsState=0;loadRequests()">Retour</button>
 | 
			
		||||
  </div>
 | 
			
		||||
  <div v-if="windowsState === 0">
 | 
			
		||||
    <div style="margin-top: 2%;margin-left: 2%">
 | 
			
		||||
@ -146,10 +145,6 @@
 | 
			
		||||
    align-self:center;
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  .titles {
 | 
			
		||||
    grid-area:titles;
 | 
			
		||||
    align-self:center;
 | 
			
		||||
  }
 | 
			
		||||
  .date{
 | 
			
		||||
    grid-area:date;
 | 
			
		||||
    margin-left:40px;
 | 
			
		||||
@ -162,11 +157,6 @@
 | 
			
		||||
    align-self:center;
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  .type{
 | 
			
		||||
    grid-area:type;
 | 
			
		||||
    align-self:center;
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  .surname{
 | 
			
		||||
    grid-area:surname;
 | 
			
		||||
    align-self:center;
 | 
			
		||||
@ -5,7 +5,7 @@
 | 
			
		||||
  import {getCourses} from "../rest/courses.js"
 | 
			
		||||
  import i18n from "@/i18n.js"
 | 
			
		||||
  import {uploadFile, uploadProfilePicture} from '@/rest/uploads.js'
 | 
			
		||||
  import CourseList from "@/Apps/CourseList.vue";
 | 
			
		||||
  import CourseList from "@/Apps/Inscription/CourseList.vue";
 | 
			
		||||
  import {editMinerval, getCurrentMinerval} from "@/rest/minerval.js";
 | 
			
		||||
  import {postPayment} from "@/rest/payment.js";
 | 
			
		||||
  import {createScholarshipRequest} from "@/rest/requests.js";
 | 
			
		||||
 | 
			
		||||
@ -2,7 +2,7 @@
 | 
			
		||||
  import i18n from "@/i18n.js"
 | 
			
		||||
  import {provide, reactive, ref} from 'vue'
 | 
			
		||||
  import { getStudents } from '../rest/Users.js'
 | 
			
		||||
  import AboutStudent from "@/Apps/AboutStudent.vue";
 | 
			
		||||
  import AboutStudent from "@/Apps/Inscription/AboutStudent.vue";
 | 
			
		||||
  const users = await getStudents();
 | 
			
		||||
 | 
			
		||||
  let targetRegNo = "";
 | 
			
		||||
 | 
			
		||||
@ -4,17 +4,18 @@ import i18n from '@/i18n.js'
 | 
			
		||||
 | 
			
		||||
// Liste des apps
 | 
			
		||||
import LoginPage from '@/Apps/Login.vue'
 | 
			
		||||
import Inscription from "@/Apps/Inscription.vue"
 | 
			
		||||
import Inscription from "@/Apps/Inscription/ManageRequests.vue"
 | 
			
		||||
import Profil from "@/Apps/Profil.vue"
 | 
			
		||||
import Courses from "@/Apps/ManageCourses.vue"
 | 
			
		||||
import Users from "@/Apps/UsersList.vue"
 | 
			
		||||
import Students from "@/Apps/StudentsList.vue"
 | 
			
		||||
import AboutStudent from "@/Apps/AboutStudent.vue";
 | 
			
		||||
import AboutStudent from "@/Apps/Inscription/AboutStudent.vue";
 | 
			
		||||
import Msg from "@/Apps/Msg.vue"
 | 
			
		||||
import ManageRequests from "@/Apps/Inscription/ManageRequests.vue";
 | 
			
		||||
 | 
			
		||||
const apps = {
 | 
			
		||||
		'/login': LoginPage,
 | 
			
		||||
		'/inscription': Inscription,
 | 
			
		||||
		'/requests': ManageRequests,
 | 
			
		||||
		'/profil': Profil,
 | 
			
		||||
		'/manage-courses' : Courses,
 | 
			
		||||
		'/users-list' : Users,
 | 
			
		||||
@ -27,7 +28,7 @@ const appsList = {
 | 
			
		||||
		'Notification': { path: '#/notifs', icon: 'fa-bell', text: i18n("app.notifications") },
 | 
			
		||||
		'Forum': { path: '#/forum', icon: 'fa-envelope', text: i18n("app.forum") },
 | 
			
		||||
		'Schedule': { path: '#/schedule', icon: 'fa-calendar-days', text: i18n("app.schedules") },
 | 
			
		||||
		'Inscription': { path: '#/inscription', icon: 'fa-users', text: i18n("app.inscription.requests") },
 | 
			
		||||
		'Requests': { path: '#/requests', icon: 'fa-users', text: "Requests" },
 | 
			
		||||
		'ManageCourses': { path: '#/manage-courses', icon: 'fa-book', text: i18n("app.manage.courses") },
 | 
			
		||||
		'StudentsList':{ path: '#/students-list',icon: 'fa-users',text: i18n("app.studentList")},
 | 
			
		||||
		'UsersList':{ path: '#/users-list',icon: 'fa-users',text: i18n("app.users")},
 | 
			
		||||
 | 
			
		||||
@ -17,6 +17,3 @@ export async function getExternalCurriculumByInscrReq(inscrReqId){
 | 
			
		||||
    return restGet("/externalcurriculum/"+inscrReqId)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
export async function editExternalCurriculum(extReqId, newState){
 | 
			
		||||
    return restPatch("/externalcurriculum/"+extReqId+"/"+newState)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
		Reference in New Issue
	
	Block a user