Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(courses): change format reject button provisional grade #593

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat(courses): change format reject button provisional grade #593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions assets/translations/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,6 @@
"updatedAt": "Updated at",
"upload": "Upload",
"username": "Student ID",
"shortUsername": "ID",
"videoLecture": "Video lecture",
"videoLecture_plural": "Video lecture",
"virtualClassroom": "Virtual classroom",
Expand Down Expand Up @@ -682,7 +681,7 @@
"acceptGradeFeedback": "The evaluation has been recorded, it will appear in the transcript",
"contactProfessorCta": "Contact the teacher",
"rejectGradeConfirmMessage": "By rejecting this evaluation you will no longer be able to change your decision",
"rejectGradeCta": "Reject the evaluation by: <br><b>{{hours}}</b>",
"rejectGradeCta": "Reject the evaluation by: <br><b>{{date}}</b>",
"rejectGradeFeedback": "Evaluation rejected, it will be recorded in the next few hours",
"title": "Evaluation"
},
Expand Down
3 changes: 1 addition & 2 deletions assets/translations/it.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,6 @@
"updatedAt": "Aggiornato il",
"upload": "Carica",
"username": "Matricola",
"shortUsername": "Matr.",
"videoLecture": "Video lezione",
"videoLecture_plural": "Video lezioni",
"virtualClassroom": "Virtual classroom",
Expand Down Expand Up @@ -698,7 +697,7 @@
"acceptGradeFeedback": "Valutazione registrata, verrà visualizzata nel libretto",
"contactProfessorCta": "Contatta il docente",
"rejectGradeConfirmMessage": "Rifiutando la valutazione non potrai più cambiare la tua decisione",
"rejectGradeCta": "Rifiuta la valutazione entro:<br><b>{{hours}}</b>",
"rejectGradeCta": "Rifiutabile entro il:<br><b>{{date}}</b>",
"rejectGradeFeedback": "Valutazione rifiutata, verrà registrata nelle prossime ore",
"title": "Valutazione"
},
Expand Down
4 changes: 2 additions & 2 deletions src/features/transcript/screens/ProvisionalGradeScreen.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import {
useGetProvisionalGrades,
useRejectProvisionalGrade,
} from '../../../core/queries/studentHooks';
import { formatDate } from '../../../utils/dates';
import { formatDate, formatDateWithTimeIfNotNull } from '../../../utils/dates';
import { TeachingStackParamList } from '../../teaching/components/TeachingNavigator';
import { GradeStates } from '../components/GradeStates';
import { useGetRejectionTime } from '../hooks/useGetRejectionTime';
Expand Down Expand Up @@ -199,7 +199,7 @@ export const ProvisionalGradeScreen = ({ navigation, route }: Props) => {
{grade?.canBeRejected && (
<CtaButton
title={t('provisionalGradeScreen.rejectGradeCta', {
hours: rejectionTime,
date: formatDateWithTimeIfNotNull(grade.rejectingExpiresAt),
})}
action={() =>
confirmRejection().then(ok => {
Expand Down
Loading