PGL/Clyde
3
2
Fork 3
Code Issues 13 Pull Requests Actions Projects 3 Releases 2 Wiki Activity

Merge pull request 'Fixing some little bugs and details' (#174) from last into master
All checks were successful
Build and test backend / Build-backend (push) Successful in 1m28s
Details
deploy to production / deploy-frontend (push) Successful in 34s
Details
deploy to production / deploy-backend (push) Successful in 1m0s
Details
Build and test FrontEnd / Build-frontend (push) Successful in 31s
Details

Browse Source 
Reviewed-on: #174
This commit is contained in:
LeoMoulin
2024-04-22 00:42:56 +02:00
parent b382bf957f fcb48ac71a
commit 2d8fcb4712
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/ovh/herisson/Clyde/EndPoints/UserController.java
View File

@ -44,7 +44,7 @@ public class UserController {
@GetMapping("/user/{id}") @GetMapping("/user/{id}")
public ResponseEntity<HashMap<String ,Object>> getUserById(@RequestHeader("Authorization") String token, @PathVariable Long id){ public ResponseEntity<HashMap<String ,Object>> getUserById(@RequestHeader("Authorization") String token, @PathVariable Long id){
if (authServ.isNotIn(new Role[]{Role.Admin,Role.Secretary,Role.InscriptionService},token)) if (authServ.isNotIn(new Role[]{Role.Admin,Role.Secretary,Role.InscriptionService, Role.Teacher},token))
return new UnauthorizedResponse<>(null); return new UnauthorizedResponse<>(null);
return new ResponseEntity<>(ProtectionService.userWithoutPassword(userService.getUserById(id)), HttpStatus.OK); return new ResponseEntity<>(ProtectionService.userWithoutPassword(userService.getUserById(id)), HttpStatus.OK);

2
frontend/src/Apps/Inscription/CourseList.vue
View File

@ -80,7 +80,7 @@ function isExempted(course){
</div> </div>
</div> </div>
<div v-if="list === false"> <div v-if="list === false">
<button @click="list=!list;submitted=!submitted">{{ i18n("courses.back") }}</button> <button @click="list=!list;submitted=false">{{ i18n("courses.back") }}</button>
</div> </div>
</template> </template>

2
frontend/src/Apps/Inscription/ManageRequests.vue
View File

@ -115,7 +115,7 @@
<div class="studentfirstname">{{item.user.firstName}}</div> <div class="studentfirstname">{{item.user.firstName}}</div>
<div class="studentlastname">{{item.user.lastName}}</div> <div class="studentlastname">{{item.user.lastName}}</div>
<div class="reqState">{{ i18n("approval")}}{{item.state}}</div> <div class="reqState">{{ i18n("approval")}}{{item.state}}</div>
<div class="teacherApproval">{{ i18n("teacherapproval") }} : {{item.teacherApprovalState}}</div> <div class="teacherApproval">{{ i18n("teacherapproval") }} {{item.teacherApprovalState}}</div>
<div class="infos"><button @click="windowsState=5;targetId=item.id">{{ i18n("request.moreInfos") }}</button></div> <div class="infos"><button @click="windowsState=5;targetId=item.id">{{ i18n("request.moreInfos") }}</button></div>
</div> </div>
</div> </div>

2
frontend/src/Apps/Profil.vue
View File

@ -253,7 +253,7 @@
{{ i18n("alreadypaid") }} {{ i18n("alreadypaid") }}
</div> </div>
<div> <div>
<button @click="windowState=7" v-if="minerv.value.toPay <= 0">{{ i18n("askscholarship") }}</button> <button @click="windowState=7" v-if="minerv.value.toPay >= 0">{{ i18n("askscholarship") }}</button>
</div> </div>
</div> </div>
<div v-if="windowState === 5"> <div v-if="windowState === 5">