diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 5fe0d63..1dc69ec 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -829,4 +829,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: e6765d09fa16178cb1c9d5132c176055a3f545bc -COCOAPODS: 1.14.3 +COCOAPODS: 1.12.1 diff --git a/src/i18n/langs/en.ts b/src/i18n/langs/en.ts index de2bb7b..4ce102e 100644 --- a/src/i18n/langs/en.ts +++ b/src/i18n/langs/en.ts @@ -226,6 +226,8 @@ const enTranslation = { nin_description: 'National Identification Number', }, details: { + subject: 'Principal Subject', + school: 'School', editTeacher: 'Edit teacher', description: '{{subject}} teacher at {{school}}', }, diff --git a/src/i18n/langs/np.ts b/src/i18n/langs/np.ts index 4f3b09a..aa1a624 100644 --- a/src/i18n/langs/np.ts +++ b/src/i18n/langs/np.ts @@ -227,6 +227,8 @@ const npTranslation = { nin_description: 'शिक्षकको कोड', }, details: { + subject: 'मुख्य विषय', + school: 'बिद्यालय', editTeacher: 'शिक्षक सम्पादन गर्नुहोस्', description: '{{subject}} मा {{school}} शिक्षक', }, diff --git a/src/screens/Teacher/TeacherDetails/TeacherHeader/index.tsx b/src/screens/Teacher/TeacherDetails/TeacherHeader/index.tsx index cb5644a..e45b083 100644 --- a/src/screens/Teacher/TeacherDetails/TeacherHeader/index.tsx +++ b/src/screens/Teacher/TeacherDetails/TeacherHeader/index.tsx @@ -65,9 +65,27 @@ const TeacherHeader: React.FC = ({ {name} - - {t('teacher.details.description', {subject, school})} - + + + + {t('teacher.details.subject')} + Principal Subject + + + {subject} + + + + + + {t('teacher.details.school')} + School + + + {school} + + + ); }; diff --git a/src/services/session.service.ts b/src/services/session.service.ts index eb470aa..3016459 100644 --- a/src/services/session.service.ts +++ b/src/services/session.service.ts @@ -20,9 +20,10 @@ export const SessionService = { const result = (await db.executeSql( ` SELECT s.* - FROM session as s - WHERE s.teacher_id = ? - LIMIT ? + FROM session as s + WHERE s.teacher_id = ? + ORDER BY created_at DESC + LIMIT ? OFFSET ? `, [teacher_id, pageSize, (pageNumber - 1) * pageSize],