diff --git a/application/config/routes.php b/application/config/routes.php index 943e7164f..c129c7b3b 100644 --- a/application/config/routes.php +++ b/application/config/routes.php @@ -103,8 +103,8 @@ $route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:num)/([A-Z]{2,3})/(:nu $route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:num)/([A-Z]{2,3})/(:num)/(:any)'] = 'api/frontend/v1/stv/Students/getStudentsOrgform/$1/$2/$3/$4/$5'; $route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:num)/([A-Z]{2,3})/(:num)/(:any)/(:any)'] = 'api/frontend/v1/stv/Students/getStudentsOrgform/$1/$2/$3/$4/$5/$6'; -// // (studiensemester_kurzbz)/student/(uid) -$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/student/(:any)'] = 'api/frontend/v1/stv/Students/getStudent/$1/$2'; +// // (studiensemester_kurzbz)/uid/(uid) +$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/uid/(:any)'] = 'api/frontend/v1/stv/Students/getStudent/$1/$2'; // // (studiensemester_kurzbz)/prestudent/(prestudent_id) $route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/prestudent/(:num)'] = 'api/frontend/v1/stv/Students/getPrestudent/$1/$2'; // // (studiensemester_kurzbz)/person/(person_id) diff --git a/application/controllers/api/frontend/v1/stv/Students.php b/application/controllers/api/frontend/v1/stv/Students.php index 68e7407bf..12785d6d7 100644 --- a/application/controllers/api/frontend/v1/stv/Students.php +++ b/application/controllers/api/frontend/v1/stv/Students.php @@ -82,7 +82,7 @@ class Students extends FHCAPI_Controller * /(studiensemester_kurzbz)/(studiengang_kz)/(orgform)/(semester)/(verband) => getStudentsOrgform * /(studiensemester_kurzbz)/(studiengang_kz)/(orgform)/(semester)/(verband)/(gruppe) => getStudentsOrgform * - * /(studiensemester_kurzbz)/student/(student_uid) => getStudent + * /(studiensemester_kurzbz)/uid/(student_uid) => getStudent * /(studiensemester_kurzbz)/prestudent/(prestudent_id) => getPrestudent * /(studiensemester_kurzbz)/person/(person_id) => getPerson */ diff --git a/public/js/api/factory/stv/students.js b/public/js/api/factory/stv/students.js index 582ba04e8..18f3b1743 100644 --- a/public/js/api/factory/stv/students.js +++ b/public/js/api/factory/stv/students.js @@ -16,22 +16,34 @@ */ export default { - uid(uid) { + uid(uid, studiensemester_kurzbz) { + let url = 'api/frontend/v1/stv/students/' + + encodeURIComponent(studiensemester_kurzbz) + + '/uid/' + + encodeURIComponent(uid); return { method: 'get', - url: 'api/frontend/v1/stv/students/uid/' + uid + url: url }; }, - prestudent(prestudent_id) { + prestudent(prestudent_id, studiensemester_kurzbz) { + let url = 'api/frontend/v1/stv/students/' + + encodeURIComponent(studiensemester_kurzbz) + + '/prestudent/' + + encodeURIComponent(prestudent_id); return { method: 'get', - url: 'api/frontend/v1/stv/students/prestudent/' + prestudent_id + url: url }; }, - person(person_id) { + person(person_id, studiensemester_kurzbz) { + let url = 'api/frontend/v1/stv/students/' + + encodeURIComponent(studiensemester_kurzbz) + + '/person/' + + encodeURIComponent(person_id); return { method: 'get', - url: 'api/frontend/v1/stv/students/person/' + person_id + url: url }; }, verband(relative_path) { diff --git a/public/js/api/stv/students.js b/public/js/api/stv/students.js index 797a13bb3..5a6c13922 100644 --- a/public/js/api/stv/students.js +++ b/public/js/api/stv/students.js @@ -1,12 +1,24 @@ export default { - uid(uid) { - return this.$fhcApi.getUri('api/frontend/v1/stv/students/uid/' + uid); + uid(uid, studiensemester_kurzbz) { + let url = 'api/frontend/v1/stv/students/' + + encodeURIComponent(studiensemester_kurzbz) + + '/uid/' + + encodeURIComponent(uid); + return this.$fhcApi.getUri(url); }, - prestudent(prestudent_id) { - return this.$fhcApi.getUri('api/frontend/v1/stv/students/prestudent/' + prestudent_id); + prestudent(prestudent_id, studiensemester_kurzbz) { + let url = 'api/frontend/v1/stv/students/' + + encodeURIComponent(studiensemester_kurzbz) + + '/prestudent/' + + encodeURIComponent(prestudent_id); + return this.$fhcApi.getUri(url); }, - person(person_id) { - return this.$fhcApi.getUri('api/frontend/v1/stv/students/person/' + person_id); + person(person_id, studiensemester_kurzbz) { + let url = 'api/frontend/v1/stv/students/' + + encodeURIComponent(studiensemester_kurzbz) + + '/person/' + + encodeURIComponent(person_id); + return this.$fhcApi.getUri(url); }, verband(relative_path) { return this.$fhcApi.getUri('api/frontend/v1/stv/students/' + relative_path); diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js index 9c53dc529..34622f406 100644 --- a/public/js/components/Stv/Studentenverwaltung.js +++ b/public/js/components/Stv/Studentenverwaltung.js @@ -201,17 +201,17 @@ export default { //FHC_JS_DATA_STORAGE_OBJECT.systemerror_mailto = 'ma0068@technikum-wien.at';this.$fhcAlert.handleSystemError(1); if (this.$route.params.id) { this.$refs.stvList.updateUrl( - ApiStv.students.uid(this.$route.params.id), + ApiStv.students.uid(this.$route.params.id, this.studiensemesterKurzbz), true ); } else if (this.$route.params.prestudent_id) { this.$refs.stvList.updateUrl( - ApiStv.students.prestudent(this.$route.params.prestudent_id), + ApiStv.students.prestudent(this.$route.params.prestudent_id, this.studiensemesterKurzbz), true ); } else if (this.$route.params.person_id) { this.$refs.stvList.updateUrl( - ApiStv.students.person(this.$route.params.person_id), + ApiStv.students.person(this.$route.params.person_id, this.studiensemesterKurzbz), true ); }