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

Compare commits

base: PGL:2cffe28720227694fe4f39b0ed8cb9850f6df5c2
Branches Tags
PGL:master PGL:tonitch/fix/scrollIsue PGL:tonitch/max/front/fix/vue PGL:Schedule/master PGL:wal/front/temp
PGL:JalonB PGL:jalonA
...
compare: PGL:tonitch/fix/scrollIsue
Branches Tags
PGL:master PGL:tonitch/fix/scrollIsue PGL:tonitch/max/front/fix/vue PGL:Schedule/master PGL:wal/front/temp
PGL:JalonB PGL:jalonA

3 Commits
2cffe28720 ... tonitch/fi

Author SHA1 Message Date
Anthony Debucquoy
d21655c535 fix max's scroll issue
All checks were successful
Build and test backend / Build-backend (pull_request) Successful in 1m24s
Details
Build and test FrontEnd / Build-frontend (pull_request) Successful in 30s
Details
2024-04-22 10:25:07 +02:00
LeoMoulin
490bf403f0 Merge pull request 'Add the regNo in profile and aboutStudent' (#178) from regNoFix into master
All checks were successful
Build and test backend / Build-backend (push) Successful in 1m25s
Details
deploy to production / deploy-frontend (push) Successful in 33s
Details
deploy to production / deploy-backend (push) Successful in 18s
Details
Build and test FrontEnd / Build-frontend (push) Successful in 29s
Details 
Reviewed-on: #178
 2024-04-22 09:52:56 +02:00
LeoMoulin
c61a092809 Add the regNo in profile and aboutStudent
All checks were successful
Build and test backend / Build-backend (pull_request) Successful in 1m23s
Details
Build and test FrontEnd / Build-frontend (pull_request) Successful in 32s
Details
2024-04-22 09:39:48 +02:00
4 changed files with 8 additions and 6 deletions
Expand all files Collapse all files

3
frontend/src/Apps/Inscription/AboutStudent.vue
View File

@ -32,6 +32,9 @@
<div> <div>
{{ i18n("firstname/name") }} : {{user.firstName}} {{user.lastName}} {{ i18n("firstname/name") }} : {{user.firstName}} {{user.lastName}}
</div> </div>
<div>
{{ i18n("regNo") }} : {{user.regNo}}
</div>
<div> <div>
{{ i18n("login.guest.email") }}: {{user.email}} {{ i18n("login.guest.email") }}: {{user.email}}
</div> </div>

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

@ -192,10 +192,10 @@
<div> <div>
{{ i18n("login.guest.email") }}: {{user.email}} {{ i18n("login.guest.email") }}: {{user.email}}
</div> </div>
<div v-if="user.role==='Student'"> <div>
{{ i18n("regNo") }} : {{user.regNo}} {{ i18n("regNo") }} : {{user.regNo}}
</div> </div>
<div v-else> <div>
{{ i18n("role") }}: {{i18n((user.role))}} {{ i18n("role") }}: {{i18n((user.role))}}
</div> </div>
<div> <div>

3
frontend/src/Apps/ScientificPublications/ListResearches.vue
View File

@ -138,7 +138,6 @@ const emit = defineEmits(["modified"]);
#researches{ #researches{
width: 100%; width: 100%;
height: 100%; height: 100%;
overflow: scroll;
} }
#search{ #search{
width: 100%; width: 100%;
@ -223,4 +222,4 @@ a{
#toggledResearchButton:hover{ #toggledResearchButton:hover{
background: #ff2d55; background: #ff2d55;
} }
</style> </style>

4
frontend/src/Apps/ScientificPublications/ManageResearcherProfile.vue
View File

@ -82,7 +82,7 @@ function getPP(){
</div> </div>
<div> <ListResearches :allResearcher="allResearcher" :research-list="researchList" :manage="true" @modified="modifiedResearch"></ListResearches> </div> <ListResearches :allResearcher="allResearcher" :research-list="researchList" :manage="true" @modified="modifiedResearch"></ListResearches>
</div> </div>
</div> </div>
</template> </template>
@ -181,4 +181,4 @@ a{
text-decoration: underline; text-decoration: underline;
cursor: pointer; cursor: pointer;
} }
</style> </style>