diff --git a/drupal/modules/casost/casost.info.yml b/drupal/modules/casost/casost.info.yml old mode 100644 new mode 100755 diff --git a/drupal/modules/casost/casost.links.action.yml b/drupal/modules/casost/casost.links.action.yml old mode 100644 new mode 100755 diff --git a/drupal/modules/casost/casost.links.menu.yml b/drupal/modules/casost/casost.links.menu.yml old mode 100644 new mode 100755 diff --git a/drupal/modules/casost/casost.links.task.yml b/drupal/modules/casost/casost.links.task.yml old mode 100644 new mode 100755 diff --git a/drupal/modules/casost/casost.module b/drupal/modules/casost/casost.module old mode 100644 new mode 100755 diff --git a/drupal/modules/casost/casost.permissions.yml b/drupal/modules/casost/casost.permissions.yml old mode 100644 new mode 100755 diff --git a/drupal/modules/casost/casost.routing.yml b/drupal/modules/casost/casost.routing.yml old mode 100644 new mode 100755 diff --git a/drupal/modules/casost/casost.services.yml b/drupal/modules/casost/casost.services.yml old mode 100644 new mode 100755 diff --git a/drupal/modules/casost/casost_config.page.inc b/drupal/modules/casost/casost_config.page.inc old mode 100644 new mode 100755 diff --git a/drupal/modules/casost/casost_session.page.inc b/drupal/modules/casost/casost_session.page.inc old mode 100644 new mode 100755 diff --git a/drupal/modules/casost/composer.json b/drupal/modules/casost/composer.json old mode 100644 new mode 100755 diff --git a/drupal/modules/casost/config/install/casost.settings.yml b/drupal/modules/casost/config/install/casost.settings.yml old mode 100644 new mode 100755 diff --git a/drupal/modules/casost/config/install/casost.settingsold.yml b/drupal/modules/casost/config/install/casost.settingsold.yml old mode 100644 new mode 100755 diff --git a/drupal/modules/casost/src/CASOSTConfigAccessControlHandler.php b/drupal/modules/casost/src/CASOSTConfigAccessControlHandler.php old mode 100644 new mode 100755 diff --git a/drupal/modules/casost/src/CASOSTConfigHtmlRouteProvider.php b/drupal/modules/casost/src/CASOSTConfigHtmlRouteProvider.php old mode 100644 new mode 100755 diff --git a/drupal/modules/casost/src/CASOSTConfigListBuilder.php b/drupal/modules/casost/src/CASOSTConfigListBuilder.php old mode 100644 new mode 100755 diff --git a/drupal/modules/casost/src/CASOSTSessionAccessControlHandler.php b/drupal/modules/casost/src/CASOSTSessionAccessControlHandler.php old mode 100644 new mode 100755 diff --git a/drupal/modules/casost/src/CASOSTSessionHtmlRouteProvider.php b/drupal/modules/casost/src/CASOSTSessionHtmlRouteProvider.php old mode 100644 new mode 100755 diff --git a/drupal/modules/casost/src/CASOSTSessionListBuilder.php b/drupal/modules/casost/src/CASOSTSessionListBuilder.php old mode 100644 new mode 100755 diff --git a/drupal/modules/casost/src/Controller/CASLogin.php b/drupal/modules/casost/src/Controller/CASLogin.php old mode 100644 new mode 100755 index e76d04848f747c8c020a77cc7a9ebe6e15ebad60..630237c2e38d2bc740c56d79ee8f2cb80f503149 --- a/drupal/modules/casost/src/Controller/CASLogin.php +++ b/drupal/modules/casost/src/Controller/CASLogin.php @@ -91,7 +91,7 @@ class CASLogin extends ControllerBase } // phpCAS::setDebug("/home/haris/devel/eepal/drupal/modules/casost/phpcas.log"); // Enable verbose error messages. Disable in production! - phpCAS::setVerbose(true); + // phpCAS::setVerbose(true); phpCAS::client($this->serverVersion, $this->serverHostname, diff --git a/drupal/modules/casost/src/Controller/CASLogout.php b/drupal/modules/casost/src/Controller/CASLogout.php old mode 100644 new mode 100755 index 639f327adcd8da6877aca917ca3f64876dd95adc..665765eafc087e4cecb739b92c095b6e4c1ef861 --- a/drupal/modules/casost/src/Controller/CASLogout.php +++ b/drupal/modules/casost/src/Controller/CASLogout.php @@ -94,7 +94,7 @@ class CASLogout extends ControllerBase // Enable debugging // phpCAS::setDebug("/home/haris/devel/eepal/drupal/modules/casost/phpcas.log"); // Enable verbose error messages. Disable in production! - phpCAS::setVerbose(true); + // phpCAS::setVerbose(true); // Initialize phpCAS phpCAS::client($this->serverVersion, diff --git a/drupal/modules/casost/src/Entity/CASOSTConfig.php b/drupal/modules/casost/src/Entity/CASOSTConfig.php old mode 100644 new mode 100755 diff --git a/drupal/modules/casost/src/Entity/CASOSTConfigInterface.php b/drupal/modules/casost/src/Entity/CASOSTConfigInterface.php old mode 100644 new mode 100755 diff --git a/drupal/modules/casost/src/Entity/CASOSTConfigViewsData.php b/drupal/modules/casost/src/Entity/CASOSTConfigViewsData.php old mode 100644 new mode 100755 diff --git a/drupal/modules/casost/src/Entity/CASOSTSession.php b/drupal/modules/casost/src/Entity/CASOSTSession.php old mode 100644 new mode 100755 diff --git a/drupal/modules/casost/src/Entity/CASOSTSessionInterface.php b/drupal/modules/casost/src/Entity/CASOSTSessionInterface.php old mode 100644 new mode 100755 diff --git a/drupal/modules/casost/src/Entity/CASOSTSessionViewsData.php b/drupal/modules/casost/src/Entity/CASOSTSessionViewsData.php old mode 100644 new mode 100755 diff --git a/drupal/modules/casost/src/Form/CASOSTConfigDeleteForm.php b/drupal/modules/casost/src/Form/CASOSTConfigDeleteForm.php old mode 100644 new mode 100755 diff --git a/drupal/modules/casost/src/Form/CASOSTConfigForm.php b/drupal/modules/casost/src/Form/CASOSTConfigForm.php old mode 100644 new mode 100755 diff --git a/drupal/modules/casost/src/Form/CASOSTConfigSettingsForm.php b/drupal/modules/casost/src/Form/CASOSTConfigSettingsForm.php old mode 100644 new mode 100755 diff --git a/drupal/modules/casost/src/Form/CASOSTSessionDeleteForm.php b/drupal/modules/casost/src/Form/CASOSTSessionDeleteForm.php old mode 100644 new mode 100755 diff --git a/drupal/modules/casost/src/Form/CASOSTSessionForm.php b/drupal/modules/casost/src/Form/CASOSTSessionForm.php old mode 100644 new mode 100755 diff --git a/drupal/modules/casost/src/Form/CASOSTSessionSettingsForm.php b/drupal/modules/casost/src/Form/CASOSTSessionSettingsForm.php old mode 100644 new mode 100755 diff --git a/drupal/modules/casost/src/Tests/LoadTest.php b/drupal/modules/casost/src/Tests/LoadTest.php old mode 100644 new mode 100755 diff --git a/drupal/modules/casost/templates/oauthost.html.twig b/drupal/modules/casost/templates/oauthost.html.twig old mode 100644 new mode 100755 diff --git a/drupal/modules/casost/templates/oauthost_config.html.twig b/drupal/modules/casost/templates/oauthost_config.html.twig old mode 100644 new mode 100755 diff --git a/drupal/modules/casost/templates/oauthost_session.html.twig b/drupal/modules/casost/templates/oauthost_session.html.twig old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/composer.json b/drupal/modules/epal/composer.json old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/epal.info.yml b/drupal/modules/epal/epal.info.yml old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/epal.links.action.yml b/drupal/modules/epal/epal.links.action.yml old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/epal.links.menu.yml b/drupal/modules/epal/epal.links.menu.yml old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/epal.links.task.yml b/drupal/modules/epal/epal.links.task.yml old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/epal.module b/drupal/modules/epal/epal.module old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/epal.permissions.yml b/drupal/modules/epal/epal.permissions.yml old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/epal.routing.yml b/drupal/modules/epal/epal.routing.yml old mode 100644 new mode 100755 index 0ea06fd5f2484f9951e3874d09ea4e2c00f53188..f6728216773acb259d99ea6bd87898b3f2ede312 --- a/drupal/modules/epal/epal.routing.yml +++ b/drupal/modules/epal/epal.routing.yml @@ -107,7 +107,7 @@ confirmstudents: requirements: _user_is_logged_in: 'TRUE' studentperschool: - path: '/epal/studentperSchool/{epalId}/{selectId}/{classId}' + path: '/epal/studentperSchool/{epalId}/{selectId}/{classId}/{limitdown}/{limitup}' options: _auth: [ 'basic_auth' ] defaults: diff --git a/drupal/modules/epal/epal.services.yml b/drupal/modules/epal/epal.services.yml old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/epal_class_limits.page.inc b/drupal/modules/epal/epal_class_limits.page.inc old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/epal_criteria.page.inc b/drupal/modules/epal/epal_criteria.page.inc old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/epal_student.page.inc b/drupal/modules/epal/epal_student.page.inc old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/epal_student_class.page.inc b/drupal/modules/epal/epal_student_class.page.inc old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/epal_student_course_field.page.inc b/drupal/modules/epal/epal_student_course_field.page.inc old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/epal_student_epal_chosen.page.inc b/drupal/modules/epal/epal_student_epal_chosen.page.inc old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/epal_student_moria.page.inc b/drupal/modules/epal/epal_student_moria.page.inc old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/epal_student_sector_field.page.inc b/drupal/modules/epal/epal_student_sector_field.page.inc old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/epal_users.page.inc b/drupal/modules/epal/epal_users.page.inc old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/src/Controller/ApplicationSubmit.php b/drupal/modules/epal/src/Controller/ApplicationSubmit.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/src/Controller/CreateDemoData.php b/drupal/modules/epal/src/Controller/CreateDemoData.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/src/Controller/CurrentUser.php b/drupal/modules/epal/src/Controller/CurrentUser.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/src/Controller/DirectorView.php b/drupal/modules/epal/src/Controller/DirectorView.php old mode 100644 new mode 100755 index bb866b4e3c51ab77b5d277713e90e3cf21cf2f26..74d6d1f852f47f1f6cf8b87e6b7fc03dc172d248 --- a/drupal/modules/epal/src/Controller/DirectorView.php +++ b/drupal/modules/epal/src/Controller/DirectorView.php @@ -155,7 +155,7 @@ public function getSpecialPerSchool(Request $request, $epalId , $sectorId) } -public function getStudentPerSchool(Request $request, $epalId , $selectId, $classId) +public function getStudentPerSchool(Request $request, $epalId , $selectId, $classId, $limitdown, $limitup) { $authToken = $request->headers->get('PHP_AUTH_USER'); @@ -192,32 +192,46 @@ public function getStudentPerSchool(Request $request, $epalId , $selectId, $clas if ($studentPerSchool) { $list = array(); - foreach ($studentPerSchool as $object) - { - $studentId = $object -> id() ; - $epalStudents = $this->entityTypeManager->getStorage('epal_student')->loadByProperties(array('id'=> $studentId)); - $epalStudent = reset($epalStudents); - $i = 0; - if ($epalStudents) { - - $list[] = array( - 'id' => $epalStudent -> id(), - 'name' => $epalStudent -> name ->value, - 'studentsurname' => $epalStudent -> studentsurname ->value, - 'fatherfirstname' => $epalStudent -> fatherfirstname ->value, - 'fathersurname' =>$epalStudent -> fathersurname ->value, - 'motherfirstname' => $epalStudent -> motherfirstname ->value, - 'mothersurname' =>$epalStudent -> mothersurname ->value, - 'birthdate' =>$epalStudent -> birthdate ->value, - ); - - $i++; + $i = 0; + if ($limitdown==$limitup && $limitup == 0) + { + $list=array( + 'id' => sizeof($studentPerSchool) + ); + } + + else + { + foreach ($studentPerSchool as $object) + { + $studentId = $object -> id() ; + $epalStudents = $this->entityTypeManager->getStorage('epal_student')->loadByProperties(array('id'=> $studentId)); + $epalStudent = reset($epalStudents); + + if ($epalStudents) { + + if ($i >= $limitdown && $i < $limitup) + { + $list[] = array( + 'i' => $i, + 'id' => $epalStudent -> id(), + 'name' => $epalStudent -> name ->value, + 'studentsurname' => $epalStudent -> studentsurname ->value, + 'fatherfirstname' => $epalStudent -> fatherfirstname ->value, + 'fathersurname' =>$epalStudent -> fathersurname ->value, + 'motherfirstname' => $epalStudent -> motherfirstname ->value, + 'mothersurname' =>$epalStudent -> mothersurname ->value, + 'birthdate' =>$epalStudent -> birthdate ->value, + ); + } + $i++; + } + } + } + return $this->respondWithStatus( + $list + , Response::HTTP_OK); } - } - return $this->respondWithStatus( - $list - , Response::HTTP_OK); - } else { $list = array(); return $this->respondWithStatus($list, Response::HTTP_OK); diff --git a/drupal/modules/epal/src/Controller/Distribution.php b/drupal/modules/epal/src/Controller/Distribution.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/src/Controller/SubmitedApplications.php b/drupal/modules/epal/src/Controller/SubmitedApplications.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/src/Entity/EpalClassLimits.php b/drupal/modules/epal/src/Entity/EpalClassLimits.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/src/Entity/EpalClassLimitsInterface.php b/drupal/modules/epal/src/Entity/EpalClassLimitsInterface.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/src/Entity/EpalClassLimitsViewsData.php b/drupal/modules/epal/src/Entity/EpalClassLimitsViewsData.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/src/Entity/EpalCriteria.php b/drupal/modules/epal/src/Entity/EpalCriteria.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/src/Entity/EpalCriteriaInterface.php b/drupal/modules/epal/src/Entity/EpalCriteriaInterface.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/src/Entity/EpalCriteriaViewsData.php b/drupal/modules/epal/src/Entity/EpalCriteriaViewsData.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/src/Entity/EpalStudent.php b/drupal/modules/epal/src/Entity/EpalStudent.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/src/Entity/EpalStudentClass.php b/drupal/modules/epal/src/Entity/EpalStudentClass.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/src/Entity/EpalStudentClassInterface.php b/drupal/modules/epal/src/Entity/EpalStudentClassInterface.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/src/Entity/EpalStudentClassViewsData.php b/drupal/modules/epal/src/Entity/EpalStudentClassViewsData.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/src/Entity/EpalStudentCourseField.php b/drupal/modules/epal/src/Entity/EpalStudentCourseField.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/src/Entity/EpalStudentCourseFieldInterface.php b/drupal/modules/epal/src/Entity/EpalStudentCourseFieldInterface.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/src/Entity/EpalStudentCourseFieldViewsData.php b/drupal/modules/epal/src/Entity/EpalStudentCourseFieldViewsData.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/src/Entity/EpalStudentEpalChosen.php b/drupal/modules/epal/src/Entity/EpalStudentEpalChosen.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/src/Entity/EpalStudentEpalChosenInterface.php b/drupal/modules/epal/src/Entity/EpalStudentEpalChosenInterface.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/src/Entity/EpalStudentEpalChosenViewsData.php b/drupal/modules/epal/src/Entity/EpalStudentEpalChosenViewsData.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/src/Entity/EpalStudentInterface.php b/drupal/modules/epal/src/Entity/EpalStudentInterface.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/src/Entity/EpalStudentMoria.php b/drupal/modules/epal/src/Entity/EpalStudentMoria.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/src/Entity/EpalStudentMoriaInterface.php b/drupal/modules/epal/src/Entity/EpalStudentMoriaInterface.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/src/Entity/EpalStudentMoriaViewsData.php b/drupal/modules/epal/src/Entity/EpalStudentMoriaViewsData.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/src/Entity/EpalStudentSectorField.php b/drupal/modules/epal/src/Entity/EpalStudentSectorField.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/src/Entity/EpalStudentSectorFieldInterface.php b/drupal/modules/epal/src/Entity/EpalStudentSectorFieldInterface.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/src/Entity/EpalStudentSectorFieldViewsData.php b/drupal/modules/epal/src/Entity/EpalStudentSectorFieldViewsData.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/src/Entity/EpalStudentViewsData.php b/drupal/modules/epal/src/Entity/EpalStudentViewsData.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/src/Entity/EpalUsers.php b/drupal/modules/epal/src/Entity/EpalUsers.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/src/Entity/EpalUsersInterface.php b/drupal/modules/epal/src/Entity/EpalUsersInterface.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/src/Entity/EpalUsersViewsData.php b/drupal/modules/epal/src/Entity/EpalUsersViewsData.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/src/EpalClassLimitsAccessControlHandler.php b/drupal/modules/epal/src/EpalClassLimitsAccessControlHandler.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/src/EpalClassLimitsHtmlRouteProvider.php b/drupal/modules/epal/src/EpalClassLimitsHtmlRouteProvider.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/src/EpalClassLimitsListBuilder.php b/drupal/modules/epal/src/EpalClassLimitsListBuilder.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/src/EpalCriteriaAccessControlHandler.php b/drupal/modules/epal/src/EpalCriteriaAccessControlHandler.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/src/EpalCriteriaHtmlRouteProvider.php b/drupal/modules/epal/src/EpalCriteriaHtmlRouteProvider.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/src/EpalCriteriaListBuilder.php b/drupal/modules/epal/src/EpalCriteriaListBuilder.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/src/EpalStudentAccessControlHandler.php b/drupal/modules/epal/src/EpalStudentAccessControlHandler.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/src/EpalStudentClassAccessControlHandler.php b/drupal/modules/epal/src/EpalStudentClassAccessControlHandler.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/src/EpalStudentClassHtmlRouteProvider.php b/drupal/modules/epal/src/EpalStudentClassHtmlRouteProvider.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/src/EpalStudentClassListBuilder.php b/drupal/modules/epal/src/EpalStudentClassListBuilder.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/src/EpalStudentCourseFieldAccessControlHandler.php b/drupal/modules/epal/src/EpalStudentCourseFieldAccessControlHandler.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/src/EpalStudentCourseFieldHtmlRouteProvider.php b/drupal/modules/epal/src/EpalStudentCourseFieldHtmlRouteProvider.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/src/EpalStudentCourseFieldListBuilder.php b/drupal/modules/epal/src/EpalStudentCourseFieldListBuilder.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/src/EpalStudentEpalChosenAccessControlHandler.php b/drupal/modules/epal/src/EpalStudentEpalChosenAccessControlHandler.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/src/EpalStudentEpalChosenHtmlRouteProvider.php b/drupal/modules/epal/src/EpalStudentEpalChosenHtmlRouteProvider.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/src/EpalStudentEpalChosenListBuilder.php b/drupal/modules/epal/src/EpalStudentEpalChosenListBuilder.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/src/EpalStudentHtmlRouteProvider.php b/drupal/modules/epal/src/EpalStudentHtmlRouteProvider.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/src/EpalStudentListBuilder.php b/drupal/modules/epal/src/EpalStudentListBuilder.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/src/EpalStudentMoriaAccessControlHandler.php b/drupal/modules/epal/src/EpalStudentMoriaAccessControlHandler.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/src/EpalStudentMoriaHtmlRouteProvider.php b/drupal/modules/epal/src/EpalStudentMoriaHtmlRouteProvider.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/src/EpalStudentMoriaListBuilder.php b/drupal/modules/epal/src/EpalStudentMoriaListBuilder.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/src/EpalStudentSectorFieldAccessControlHandler.php b/drupal/modules/epal/src/EpalStudentSectorFieldAccessControlHandler.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/src/EpalStudentSectorFieldHtmlRouteProvider.php b/drupal/modules/epal/src/EpalStudentSectorFieldHtmlRouteProvider.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/src/EpalStudentSectorFieldListBuilder.php b/drupal/modules/epal/src/EpalStudentSectorFieldListBuilder.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/src/EpalUsersAccessControlHandler.php b/drupal/modules/epal/src/EpalUsersAccessControlHandler.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/src/EpalUsersHtmlRouteProvider.php b/drupal/modules/epal/src/EpalUsersHtmlRouteProvider.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/src/EpalUsersListBuilder.php b/drupal/modules/epal/src/EpalUsersListBuilder.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/src/Form/EpalClassLimitsDeleteForm.php b/drupal/modules/epal/src/Form/EpalClassLimitsDeleteForm.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/src/Form/EpalClassLimitsForm.php b/drupal/modules/epal/src/Form/EpalClassLimitsForm.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/src/Form/EpalClassLimitsSettingsForm.php b/drupal/modules/epal/src/Form/EpalClassLimitsSettingsForm.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/src/Form/EpalCriteriaDeleteForm.php b/drupal/modules/epal/src/Form/EpalCriteriaDeleteForm.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/src/Form/EpalCriteriaForm.php b/drupal/modules/epal/src/Form/EpalCriteriaForm.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/src/Form/EpalCriteriaSettingsForm.php b/drupal/modules/epal/src/Form/EpalCriteriaSettingsForm.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/src/Form/EpalStudentClassDeleteForm.php b/drupal/modules/epal/src/Form/EpalStudentClassDeleteForm.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/src/Form/EpalStudentClassForm.php b/drupal/modules/epal/src/Form/EpalStudentClassForm.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/src/Form/EpalStudentClassSettingsForm.php b/drupal/modules/epal/src/Form/EpalStudentClassSettingsForm.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/src/Form/EpalStudentCourseFieldDeleteForm.php b/drupal/modules/epal/src/Form/EpalStudentCourseFieldDeleteForm.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/src/Form/EpalStudentCourseFieldForm.php b/drupal/modules/epal/src/Form/EpalStudentCourseFieldForm.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/src/Form/EpalStudentCourseFieldSettingsForm.php b/drupal/modules/epal/src/Form/EpalStudentCourseFieldSettingsForm.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/src/Form/EpalStudentDeleteForm.php b/drupal/modules/epal/src/Form/EpalStudentDeleteForm.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/src/Form/EpalStudentEpalChosenDeleteForm.php b/drupal/modules/epal/src/Form/EpalStudentEpalChosenDeleteForm.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/src/Form/EpalStudentEpalChosenForm.php b/drupal/modules/epal/src/Form/EpalStudentEpalChosenForm.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/src/Form/EpalStudentEpalChosenSettingsForm.php b/drupal/modules/epal/src/Form/EpalStudentEpalChosenSettingsForm.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/src/Form/EpalStudentForm.php b/drupal/modules/epal/src/Form/EpalStudentForm.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/src/Form/EpalStudentMoriaDeleteForm.php b/drupal/modules/epal/src/Form/EpalStudentMoriaDeleteForm.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/src/Form/EpalStudentMoriaForm.php b/drupal/modules/epal/src/Form/EpalStudentMoriaForm.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/src/Form/EpalStudentMoriaSettingsForm.php b/drupal/modules/epal/src/Form/EpalStudentMoriaSettingsForm.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/src/Form/EpalStudentSectorFieldDeleteForm.php b/drupal/modules/epal/src/Form/EpalStudentSectorFieldDeleteForm.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/src/Form/EpalStudentSectorFieldForm.php b/drupal/modules/epal/src/Form/EpalStudentSectorFieldForm.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/src/Form/EpalStudentSectorFieldSettingsForm.php b/drupal/modules/epal/src/Form/EpalStudentSectorFieldSettingsForm.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/src/Form/EpalStudentSettingsForm.php b/drupal/modules/epal/src/Form/EpalStudentSettingsForm.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/src/Form/EpalUsersDeleteForm.php b/drupal/modules/epal/src/Form/EpalUsersDeleteForm.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/src/Form/EpalUsersForm.php b/drupal/modules/epal/src/Form/EpalUsersForm.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/src/Form/EpalUsersSettingsForm.php b/drupal/modules/epal/src/Form/EpalUsersSettingsForm.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/src/Tests/LoadTest.php b/drupal/modules/epal/src/Tests/LoadTest.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/templates/epal.html.twig b/drupal/modules/epal/templates/epal.html.twig old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/templates/epal_class_limits.html.twig b/drupal/modules/epal/templates/epal_class_limits.html.twig old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/templates/epal_criteria.html.twig b/drupal/modules/epal/templates/epal_criteria.html.twig old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/templates/epal_student.html.twig b/drupal/modules/epal/templates/epal_student.html.twig old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/templates/epal_student_class.html.twig b/drupal/modules/epal/templates/epal_student_class.html.twig old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/templates/epal_student_course_field.html.twig b/drupal/modules/epal/templates/epal_student_course_field.html.twig old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/templates/epal_student_epal_chosen.html.twig b/drupal/modules/epal/templates/epal_student_epal_chosen.html.twig old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/templates/epal_student_moria.html.twig b/drupal/modules/epal/templates/epal_student_moria.html.twig old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/templates/epal_student_sector_field.html.twig b/drupal/modules/epal/templates/epal_student_sector_field.html.twig old mode 100644 new mode 100755 diff --git a/drupal/modules/epal/templates/epal_users.html.twig b/drupal/modules/epal/templates/epal_users.html.twig old mode 100644 new mode 100755 diff --git a/drupal/modules/epaldeploysystem/README.md b/drupal/modules/epaldeploysystem/README.md old mode 100644 new mode 100755 diff --git a/drupal/modules/epaldeploysystem/config/install/rest.resource.entity.eepal_admin_area.yml b/drupal/modules/epaldeploysystem/config/install/rest.resource.entity.eepal_admin_area.yml old mode 100644 new mode 100755 diff --git a/drupal/modules/epaldeploysystem/config/install/rest.resource.entity.eepal_prefecture.yml b/drupal/modules/epaldeploysystem/config/install/rest.resource.entity.eepal_prefecture.yml old mode 100644 new mode 100755 diff --git a/drupal/modules/epaldeploysystem/config/install/rest.resource.entity.eepal_region.yml b/drupal/modules/epaldeploysystem/config/install/rest.resource.entity.eepal_region.yml old mode 100644 new mode 100755 diff --git a/drupal/modules/epaldeploysystem/config/install/rest.resource.entity.eepal_school.yml b/drupal/modules/epaldeploysystem/config/install/rest.resource.entity.eepal_school.yml old mode 100644 new mode 100755 diff --git a/drupal/modules/epaldeploysystem/config/install/rest.resource.entity.eepal_sectors.yml b/drupal/modules/epaldeploysystem/config/install/rest.resource.entity.eepal_sectors.yml old mode 100644 new mode 100755 diff --git a/drupal/modules/epaldeploysystem/config/install/rest.resource.entity.eepal_sectors_in_epal.yml b/drupal/modules/epaldeploysystem/config/install/rest.resource.entity.eepal_sectors_in_epal.yml old mode 100644 new mode 100755 diff --git a/drupal/modules/epaldeploysystem/config/install/rest.resource.entity.eepal_specialties_in_epal.yml b/drupal/modules/epaldeploysystem/config/install/rest.resource.entity.eepal_specialties_in_epal.yml old mode 100644 new mode 100755 diff --git a/drupal/modules/epaldeploysystem/config/install/rest.resource.entity.eepal_specialty.yml b/drupal/modules/epaldeploysystem/config/install/rest.resource.entity.eepal_specialty.yml old mode 100644 new mode 100755 diff --git a/drupal/modules/epaldeploysystem/config/install/rest.resource.entity.epal_class_limits.yml b/drupal/modules/epaldeploysystem/config/install/rest.resource.entity.epal_class_limits.yml old mode 100644 new mode 100755 diff --git a/drupal/modules/epaldeploysystem/config/install/rest.resource.entity.epal_criteria.yml b/drupal/modules/epaldeploysystem/config/install/rest.resource.entity.epal_criteria.yml old mode 100644 new mode 100755 diff --git a/drupal/modules/epaldeploysystem/config/install/rest.resource.entity.epal_student.yml b/drupal/modules/epaldeploysystem/config/install/rest.resource.entity.epal_student.yml old mode 100644 new mode 100755 diff --git a/drupal/modules/epaldeploysystem/config/install/rest.resource.entity.epal_student_class.yml b/drupal/modules/epaldeploysystem/config/install/rest.resource.entity.epal_student_class.yml old mode 100644 new mode 100755 diff --git a/drupal/modules/epaldeploysystem/config/install/rest.resource.entity.epal_student_course_field.yml b/drupal/modules/epaldeploysystem/config/install/rest.resource.entity.epal_student_course_field.yml old mode 100644 new mode 100755 diff --git a/drupal/modules/epaldeploysystem/config/install/rest.resource.entity.epal_student_epal_chosen.yml b/drupal/modules/epaldeploysystem/config/install/rest.resource.entity.epal_student_epal_chosen.yml old mode 100644 new mode 100755 diff --git a/drupal/modules/epaldeploysystem/config/install/rest.resource.entity.epal_student_moria.yml b/drupal/modules/epaldeploysystem/config/install/rest.resource.entity.epal_student_moria.yml old mode 100644 new mode 100755 diff --git a/drupal/modules/epaldeploysystem/config/install/rest.resource.entity.epal_student_sector_field.yml b/drupal/modules/epaldeploysystem/config/install/rest.resource.entity.epal_student_sector_field.yml old mode 100644 new mode 100755 diff --git a/drupal/modules/epaldeploysystem/config/install/rest.resource.entity.epal_users.yml b/drupal/modules/epaldeploysystem/config/install/rest.resource.entity.epal_users.yml old mode 100644 new mode 100755 diff --git a/drupal/modules/epaldeploysystem/config/install/views.view.coursefields.yml b/drupal/modules/epaldeploysystem/config/install/views.view.coursefields.yml old mode 100644 new mode 100755 diff --git a/drupal/modules/epaldeploysystem/config/install/views.view.coursesectorlist.yml b/drupal/modules/epaldeploysystem/config/install/views.view.coursesectorlist.yml old mode 100644 new mode 100755 diff --git a/drupal/modules/epaldeploysystem/config/install/views.view.coursesperschool.yml b/drupal/modules/epaldeploysystem/config/install/views.view.coursesperschool.yml old mode 100644 new mode 100755 diff --git a/drupal/modules/epaldeploysystem/config/install/views.view.criterialist.yml b/drupal/modules/epaldeploysystem/config/install/views.view.criterialist.yml old mode 100644 new mode 100755 diff --git a/drupal/modules/epaldeploysystem/config/install/views.view.regional_epal.yml b/drupal/modules/epaldeploysystem/config/install/views.view.regional_epal.yml old mode 100644 new mode 100755 diff --git a/drupal/modules/epaldeploysystem/config/install/views.view.sectorlist.yml b/drupal/modules/epaldeploysystem/config/install/views.view.sectorlist.yml old mode 100644 new mode 100755 diff --git a/drupal/modules/epaldeploysystem/config/install/views.view.sectorsperschool.yml b/drupal/modules/epaldeploysystem/config/install/views.view.sectorsperschool.yml old mode 100644 new mode 100755 diff --git a/drupal/modules/epaldeploysystem/config/optional/user.role.applicant.yml b/drupal/modules/epaldeploysystem/config/optional/user.role.applicant.yml old mode 100644 new mode 100755 diff --git a/drupal/modules/epaldeploysystem/config/optional/user.role.epal.yml b/drupal/modules/epaldeploysystem/config/optional/user.role.epal.yml old mode 100644 new mode 100755 diff --git a/drupal/modules/epaldeploysystem/epaldeploysystem.info.yml b/drupal/modules/epaldeploysystem/epaldeploysystem.info.yml old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/composer.json b/drupal/modules/epalreadydata/composer.json old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/eepal_admin_area.page.inc b/drupal/modules/epalreadydata/eepal_admin_area.page.inc old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/eepal_prefecture.page.inc b/drupal/modules/epalreadydata/eepal_prefecture.page.inc old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/eepal_region.page.inc b/drupal/modules/epalreadydata/eepal_region.page.inc old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/eepal_school.page.inc b/drupal/modules/epalreadydata/eepal_school.page.inc old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/eepal_sectors.page.inc b/drupal/modules/epalreadydata/eepal_sectors.page.inc old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/eepal_sectors_in_epal.page.inc b/drupal/modules/epalreadydata/eepal_sectors_in_epal.page.inc old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/eepal_specialties_in_epal.page.inc b/drupal/modules/epalreadydata/eepal_specialties_in_epal.page.inc old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/eepal_specialty.page.inc b/drupal/modules/epalreadydata/eepal_specialty.page.inc old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/epalreadydata.info.yml b/drupal/modules/epalreadydata/epalreadydata.info.yml old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/epalreadydata.links.action.yml b/drupal/modules/epalreadydata/epalreadydata.links.action.yml old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/epalreadydata.links.menu.yml b/drupal/modules/epalreadydata/epalreadydata.links.menu.yml old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/epalreadydata.links.task.yml b/drupal/modules/epalreadydata/epalreadydata.links.task.yml old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/epalreadydata.module b/drupal/modules/epalreadydata/epalreadydata.module old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/epalreadydata.permissions.yml b/drupal/modules/epalreadydata/epalreadydata.permissions.yml old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/epalreadydata_module_description.md b/drupal/modules/epalreadydata/epalreadydata_module_description.md old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/src/EepalAdminAreaAccessControlHandler.php b/drupal/modules/epalreadydata/src/EepalAdminAreaAccessControlHandler.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/src/EepalAdminAreaHtmlRouteProvider.php b/drupal/modules/epalreadydata/src/EepalAdminAreaHtmlRouteProvider.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/src/EepalAdminAreaListBuilder.php b/drupal/modules/epalreadydata/src/EepalAdminAreaListBuilder.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/src/EepalAdminAreaTranslationHandler.php b/drupal/modules/epalreadydata/src/EepalAdminAreaTranslationHandler.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/src/EepalPrefectureAccessControlHandler.php b/drupal/modules/epalreadydata/src/EepalPrefectureAccessControlHandler.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/src/EepalPrefectureHtmlRouteProvider.php b/drupal/modules/epalreadydata/src/EepalPrefectureHtmlRouteProvider.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/src/EepalPrefectureListBuilder.php b/drupal/modules/epalreadydata/src/EepalPrefectureListBuilder.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/src/EepalPrefectureTranslationHandler.php b/drupal/modules/epalreadydata/src/EepalPrefectureTranslationHandler.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/src/EepalRegionAccessControlHandler.php b/drupal/modules/epalreadydata/src/EepalRegionAccessControlHandler.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/src/EepalRegionHtmlRouteProvider.php b/drupal/modules/epalreadydata/src/EepalRegionHtmlRouteProvider.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/src/EepalRegionListBuilder.php b/drupal/modules/epalreadydata/src/EepalRegionListBuilder.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/src/EepalRegionTranslationHandler.php b/drupal/modules/epalreadydata/src/EepalRegionTranslationHandler.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/src/EepalSchoolAccessControlHandler.php b/drupal/modules/epalreadydata/src/EepalSchoolAccessControlHandler.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/src/EepalSchoolHtmlRouteProvider.php b/drupal/modules/epalreadydata/src/EepalSchoolHtmlRouteProvider.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/src/EepalSchoolListBuilder.php b/drupal/modules/epalreadydata/src/EepalSchoolListBuilder.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/src/EepalSchoolTranslationHandler.php b/drupal/modules/epalreadydata/src/EepalSchoolTranslationHandler.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/src/EepalSectorsAccessControlHandler.php b/drupal/modules/epalreadydata/src/EepalSectorsAccessControlHandler.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/src/EepalSectorsHtmlRouteProvider.php b/drupal/modules/epalreadydata/src/EepalSectorsHtmlRouteProvider.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/src/EepalSectorsInEpalAccessControlHandler.php b/drupal/modules/epalreadydata/src/EepalSectorsInEpalAccessControlHandler.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/src/EepalSectorsInEpalHtmlRouteProvider.php b/drupal/modules/epalreadydata/src/EepalSectorsInEpalHtmlRouteProvider.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/src/EepalSectorsInEpalListBuilder.php b/drupal/modules/epalreadydata/src/EepalSectorsInEpalListBuilder.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/src/EepalSectorsInEpalTranslationHandler.php b/drupal/modules/epalreadydata/src/EepalSectorsInEpalTranslationHandler.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/src/EepalSectorsListBuilder.php b/drupal/modules/epalreadydata/src/EepalSectorsListBuilder.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/src/EepalSectorsTranslationHandler.php b/drupal/modules/epalreadydata/src/EepalSectorsTranslationHandler.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/src/EepalSpecialtiesInEpalAccessControlHandler.php b/drupal/modules/epalreadydata/src/EepalSpecialtiesInEpalAccessControlHandler.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/src/EepalSpecialtiesInEpalHtmlRouteProvider.php b/drupal/modules/epalreadydata/src/EepalSpecialtiesInEpalHtmlRouteProvider.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/src/EepalSpecialtiesInEpalListBuilder.php b/drupal/modules/epalreadydata/src/EepalSpecialtiesInEpalListBuilder.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/src/EepalSpecialtiesInEpalTranslationHandler.php b/drupal/modules/epalreadydata/src/EepalSpecialtiesInEpalTranslationHandler.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/src/EepalSpecialtyAccessControlHandler.php b/drupal/modules/epalreadydata/src/EepalSpecialtyAccessControlHandler.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/src/EepalSpecialtyHtmlRouteProvider.php b/drupal/modules/epalreadydata/src/EepalSpecialtyHtmlRouteProvider.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/src/EepalSpecialtyListBuilder.php b/drupal/modules/epalreadydata/src/EepalSpecialtyListBuilder.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/src/EepalSpecialtyTranslationHandler.php b/drupal/modules/epalreadydata/src/EepalSpecialtyTranslationHandler.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/src/Entity/EepalAdminArea.php b/drupal/modules/epalreadydata/src/Entity/EepalAdminArea.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/src/Entity/EepalAdminAreaInterface.php b/drupal/modules/epalreadydata/src/Entity/EepalAdminAreaInterface.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/src/Entity/EepalAdminAreaViewsData.php b/drupal/modules/epalreadydata/src/Entity/EepalAdminAreaViewsData.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/src/Entity/EepalPrefecture.php b/drupal/modules/epalreadydata/src/Entity/EepalPrefecture.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/src/Entity/EepalPrefectureInterface.php b/drupal/modules/epalreadydata/src/Entity/EepalPrefectureInterface.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/src/Entity/EepalPrefectureViewsData.php b/drupal/modules/epalreadydata/src/Entity/EepalPrefectureViewsData.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/src/Entity/EepalRegion.php b/drupal/modules/epalreadydata/src/Entity/EepalRegion.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/src/Entity/EepalRegionInterface.php b/drupal/modules/epalreadydata/src/Entity/EepalRegionInterface.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/src/Entity/EepalRegionViewsData.php b/drupal/modules/epalreadydata/src/Entity/EepalRegionViewsData.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/src/Entity/EepalSchool.php b/drupal/modules/epalreadydata/src/Entity/EepalSchool.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/src/Entity/EepalSchoolInterface.php b/drupal/modules/epalreadydata/src/Entity/EepalSchoolInterface.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/src/Entity/EepalSchoolViewsData.php b/drupal/modules/epalreadydata/src/Entity/EepalSchoolViewsData.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/src/Entity/EepalSectors.php b/drupal/modules/epalreadydata/src/Entity/EepalSectors.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/src/Entity/EepalSectorsInEpal.php b/drupal/modules/epalreadydata/src/Entity/EepalSectorsInEpal.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/src/Entity/EepalSectorsInEpalInterface.php b/drupal/modules/epalreadydata/src/Entity/EepalSectorsInEpalInterface.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/src/Entity/EepalSectorsInEpalViewsData.php b/drupal/modules/epalreadydata/src/Entity/EepalSectorsInEpalViewsData.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/src/Entity/EepalSectorsInterface.php b/drupal/modules/epalreadydata/src/Entity/EepalSectorsInterface.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/src/Entity/EepalSectorsViewsData.php b/drupal/modules/epalreadydata/src/Entity/EepalSectorsViewsData.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/src/Entity/EepalSpecialtiesInEpal.php b/drupal/modules/epalreadydata/src/Entity/EepalSpecialtiesInEpal.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/src/Entity/EepalSpecialtiesInEpalInterface.php b/drupal/modules/epalreadydata/src/Entity/EepalSpecialtiesInEpalInterface.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/src/Entity/EepalSpecialtiesInEpalViewsData.php b/drupal/modules/epalreadydata/src/Entity/EepalSpecialtiesInEpalViewsData.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/src/Entity/EepalSpecialty.php b/drupal/modules/epalreadydata/src/Entity/EepalSpecialty.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/src/Entity/EepalSpecialtyInterface.php b/drupal/modules/epalreadydata/src/Entity/EepalSpecialtyInterface.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/src/Entity/EepalSpecialtyViewsData.php b/drupal/modules/epalreadydata/src/Entity/EepalSpecialtyViewsData.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/src/Form/EepalAdminAreaDeleteForm.php b/drupal/modules/epalreadydata/src/Form/EepalAdminAreaDeleteForm.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/src/Form/EepalAdminAreaForm.php b/drupal/modules/epalreadydata/src/Form/EepalAdminAreaForm.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/src/Form/EepalAdminAreaSettingsForm.php b/drupal/modules/epalreadydata/src/Form/EepalAdminAreaSettingsForm.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/src/Form/EepalPrefectureDeleteForm.php b/drupal/modules/epalreadydata/src/Form/EepalPrefectureDeleteForm.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/src/Form/EepalPrefectureForm.php b/drupal/modules/epalreadydata/src/Form/EepalPrefectureForm.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/src/Form/EepalPrefectureSettingsForm.php b/drupal/modules/epalreadydata/src/Form/EepalPrefectureSettingsForm.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/src/Form/EepalRegionDeleteForm.php b/drupal/modules/epalreadydata/src/Form/EepalRegionDeleteForm.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/src/Form/EepalRegionForm.php b/drupal/modules/epalreadydata/src/Form/EepalRegionForm.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/src/Form/EepalRegionSettingsForm.php b/drupal/modules/epalreadydata/src/Form/EepalRegionSettingsForm.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/src/Form/EepalSchoolDeleteForm.php b/drupal/modules/epalreadydata/src/Form/EepalSchoolDeleteForm.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/src/Form/EepalSchoolForm.php b/drupal/modules/epalreadydata/src/Form/EepalSchoolForm.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/src/Form/EepalSchoolSettingsForm.php b/drupal/modules/epalreadydata/src/Form/EepalSchoolSettingsForm.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/src/Form/EepalSectorsDeleteForm.php b/drupal/modules/epalreadydata/src/Form/EepalSectorsDeleteForm.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/src/Form/EepalSectorsForm.php b/drupal/modules/epalreadydata/src/Form/EepalSectorsForm.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/src/Form/EepalSectorsInEpalDeleteForm.php b/drupal/modules/epalreadydata/src/Form/EepalSectorsInEpalDeleteForm.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/src/Form/EepalSectorsInEpalForm.php b/drupal/modules/epalreadydata/src/Form/EepalSectorsInEpalForm.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/src/Form/EepalSectorsInEpalSettingsForm.php b/drupal/modules/epalreadydata/src/Form/EepalSectorsInEpalSettingsForm.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/src/Form/EepalSectorsSettingsForm.php b/drupal/modules/epalreadydata/src/Form/EepalSectorsSettingsForm.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/src/Form/EepalSpecialtiesInEpalDeleteForm.php b/drupal/modules/epalreadydata/src/Form/EepalSpecialtiesInEpalDeleteForm.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/src/Form/EepalSpecialtiesInEpalForm.php b/drupal/modules/epalreadydata/src/Form/EepalSpecialtiesInEpalForm.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/src/Form/EepalSpecialtiesInEpalSettingsForm.php b/drupal/modules/epalreadydata/src/Form/EepalSpecialtiesInEpalSettingsForm.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/src/Form/EepalSpecialtyDeleteForm.php b/drupal/modules/epalreadydata/src/Form/EepalSpecialtyDeleteForm.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/src/Form/EepalSpecialtyForm.php b/drupal/modules/epalreadydata/src/Form/EepalSpecialtyForm.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/src/Form/EepalSpecialtySettingsForm.php b/drupal/modules/epalreadydata/src/Form/EepalSpecialtySettingsForm.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/src/Tests/LoadTest.php b/drupal/modules/epalreadydata/src/Tests/LoadTest.php old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/templates/eepal_admin_area.html.twig b/drupal/modules/epalreadydata/templates/eepal_admin_area.html.twig old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/templates/eepal_prefecture.html.twig b/drupal/modules/epalreadydata/templates/eepal_prefecture.html.twig old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/templates/eepal_region.html.twig b/drupal/modules/epalreadydata/templates/eepal_region.html.twig old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/templates/eepal_school.html.twig b/drupal/modules/epalreadydata/templates/eepal_school.html.twig old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/templates/eepal_sectors.html.twig b/drupal/modules/epalreadydata/templates/eepal_sectors.html.twig old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/templates/eepal_sectors_in_epal.html.twig b/drupal/modules/epalreadydata/templates/eepal_sectors_in_epal.html.twig old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/templates/eepal_specialties_in_epal.html.twig b/drupal/modules/epalreadydata/templates/eepal_specialties_in_epal.html.twig old mode 100644 new mode 100755 diff --git a/drupal/modules/epalreadydata/templates/eepal_specialty.html.twig b/drupal/modules/epalreadydata/templates/eepal_specialty.html.twig old mode 100644 new mode 100755 diff --git a/drupal/modules/oauthost/composer.json b/drupal/modules/oauthost/composer.json old mode 100644 new mode 100755 diff --git a/drupal/modules/oauthost/config/install/oauthost.settings.yml b/drupal/modules/oauthost/config/install/oauthost.settings.yml old mode 100644 new mode 100755 diff --git a/drupal/modules/oauthost/config/install/oauthost.settingsold.yml b/drupal/modules/oauthost/config/install/oauthost.settingsold.yml old mode 100644 new mode 100755 diff --git a/drupal/modules/oauthost/oauthost.info.yml b/drupal/modules/oauthost/oauthost.info.yml old mode 100644 new mode 100755 diff --git a/drupal/modules/oauthost/oauthost.links.action.yml b/drupal/modules/oauthost/oauthost.links.action.yml old mode 100644 new mode 100755 diff --git a/drupal/modules/oauthost/oauthost.links.menu.yml b/drupal/modules/oauthost/oauthost.links.menu.yml old mode 100644 new mode 100755 diff --git a/drupal/modules/oauthost/oauthost.links.task.yml b/drupal/modules/oauthost/oauthost.links.task.yml old mode 100644 new mode 100755 diff --git a/drupal/modules/oauthost/oauthost.module b/drupal/modules/oauthost/oauthost.module old mode 100644 new mode 100755 diff --git a/drupal/modules/oauthost/oauthost.permissions.yml b/drupal/modules/oauthost/oauthost.permissions.yml old mode 100644 new mode 100755 diff --git a/drupal/modules/oauthost/oauthost.routing.yml b/drupal/modules/oauthost/oauthost.routing.yml old mode 100644 new mode 100755 diff --git a/drupal/modules/oauthost/oauthost.services.yml b/drupal/modules/oauthost/oauthost.services.yml old mode 100644 new mode 100755 diff --git a/drupal/modules/oauthost/oauthost_config.page.inc b/drupal/modules/oauthost/oauthost_config.page.inc old mode 100644 new mode 100755 diff --git a/drupal/modules/oauthost/oauthost_session.page.inc b/drupal/modules/oauthost/oauthost_session.page.inc old mode 100644 new mode 100755 diff --git a/drupal/modules/oauthost/src/Controller/CBController.php b/drupal/modules/oauthost/src/Controller/CBController.php old mode 100644 new mode 100755 diff --git a/drupal/modules/oauthost/src/Controller/OAuthLogin.php b/drupal/modules/oauthost/src/Controller/OAuthLogin.php old mode 100644 new mode 100755 diff --git a/drupal/modules/oauthost/src/Controller/OAuthLogout.php b/drupal/modules/oauthost/src/Controller/OAuthLogout.php old mode 100644 new mode 100755 diff --git a/drupal/modules/oauthost/src/Entity/OAuthOSTConfig.php b/drupal/modules/oauthost/src/Entity/OAuthOSTConfig.php old mode 100644 new mode 100755 diff --git a/drupal/modules/oauthost/src/Entity/OAuthOSTConfigInterface.php b/drupal/modules/oauthost/src/Entity/OAuthOSTConfigInterface.php old mode 100644 new mode 100755 diff --git a/drupal/modules/oauthost/src/Entity/OAuthOSTConfigViewsData.php b/drupal/modules/oauthost/src/Entity/OAuthOSTConfigViewsData.php old mode 100644 new mode 100755 diff --git a/drupal/modules/oauthost/src/Entity/OAuthOSTSession.php b/drupal/modules/oauthost/src/Entity/OAuthOSTSession.php old mode 100644 new mode 100755 diff --git a/drupal/modules/oauthost/src/Entity/OAuthOSTSessionInterface.php b/drupal/modules/oauthost/src/Entity/OAuthOSTSessionInterface.php old mode 100644 new mode 100755 diff --git a/drupal/modules/oauthost/src/Entity/OAuthOSTSessionViewsData.php b/drupal/modules/oauthost/src/Entity/OAuthOSTSessionViewsData.php old mode 100644 new mode 100755 diff --git a/drupal/modules/oauthost/src/Form/OAuthOSTConfigDeleteForm.php b/drupal/modules/oauthost/src/Form/OAuthOSTConfigDeleteForm.php old mode 100644 new mode 100755 diff --git a/drupal/modules/oauthost/src/Form/OAuthOSTConfigForm.php b/drupal/modules/oauthost/src/Form/OAuthOSTConfigForm.php old mode 100644 new mode 100755 diff --git a/drupal/modules/oauthost/src/Form/OAuthOSTConfigSettingsForm.php b/drupal/modules/oauthost/src/Form/OAuthOSTConfigSettingsForm.php old mode 100644 new mode 100755 diff --git a/drupal/modules/oauthost/src/Form/OAuthOSTSessionDeleteForm.php b/drupal/modules/oauthost/src/Form/OAuthOSTSessionDeleteForm.php old mode 100644 new mode 100755 diff --git a/drupal/modules/oauthost/src/Form/OAuthOSTSessionForm.php b/drupal/modules/oauthost/src/Form/OAuthOSTSessionForm.php old mode 100644 new mode 100755 diff --git a/drupal/modules/oauthost/src/Form/OAuthOSTSessionSettingsForm.php b/drupal/modules/oauthost/src/Form/OAuthOSTSessionSettingsForm.php old mode 100644 new mode 100755 diff --git a/drupal/modules/oauthost/src/OAuthOSTConfigAccessControlHandler.php b/drupal/modules/oauthost/src/OAuthOSTConfigAccessControlHandler.php old mode 100644 new mode 100755 diff --git a/drupal/modules/oauthost/src/OAuthOSTConfigHtmlRouteProvider.php b/drupal/modules/oauthost/src/OAuthOSTConfigHtmlRouteProvider.php old mode 100644 new mode 100755 diff --git a/drupal/modules/oauthost/src/OAuthOSTConfigListBuilder.php b/drupal/modules/oauthost/src/OAuthOSTConfigListBuilder.php old mode 100644 new mode 100755 diff --git a/drupal/modules/oauthost/src/OAuthOSTSessionAccessControlHandler.php b/drupal/modules/oauthost/src/OAuthOSTSessionAccessControlHandler.php old mode 100644 new mode 100755 diff --git a/drupal/modules/oauthost/src/OAuthOSTSessionHtmlRouteProvider.php b/drupal/modules/oauthost/src/OAuthOSTSessionHtmlRouteProvider.php old mode 100644 new mode 100755 diff --git a/drupal/modules/oauthost/src/OAuthOSTSessionListBuilder.php b/drupal/modules/oauthost/src/OAuthOSTSessionListBuilder.php old mode 100644 new mode 100755 diff --git a/drupal/modules/oauthost/src/Tests/LoadTest.php b/drupal/modules/oauthost/src/Tests/LoadTest.php old mode 100644 new mode 100755 diff --git a/drupal/modules/oauthost/templates/oauthost.html.twig b/drupal/modules/oauthost/templates/oauthost.html.twig old mode 100644 new mode 100755 diff --git a/drupal/modules/oauthost/templates/oauthost_config.html.twig b/drupal/modules/oauthost/templates/oauthost_config.html.twig old mode 100644 new mode 100755 diff --git a/drupal/modules/oauthost/templates/oauthost_session.html.twig b/drupal/modules/oauthost/templates/oauthost_session.html.twig old mode 100644 new mode 100755 diff --git a/package.json b/package.json index cb45897f5c53008ff7e429c4b17c1696ca35e158..4e41f3c98dedeb0fecbf200a224b905d79ffc15c 100644 --- a/package.json +++ b/package.json @@ -62,9 +62,10 @@ "immutable": "^3.8.1", "jquery": "^3.1.1", "jspdf": "^1.3.3", - "ng2-bootstrap": "^1.4.2", + "ng2-bootstrap": "^1.6.3", "ng2-redux": "^5.1.0", "ng2-smart-table": "^0.4.0-5", + "ngx-bootstrap": "^1.6.6", "ngx-uploader": "^2.2.5", "raw-loader": "^0.5.1", "redux": "^3.6.0", diff --git a/source/app.settings.ts b/source/app.settings.ts index 91d0eac52125ed1a214b1ae8e571b12c7a8fea11..5f8446ffee014174d0081fb4acfd308f8d89506f 100644 --- a/source/app.settings.ts +++ b/source/app.settings.ts @@ -1,8 +1,8 @@ // export const API_ENDPOINT = 'http://eduslim2.minedu.gov.gr/drupal'; -export const API_ENDPOINT = 'http://eduslim2.minedu.gov.gr/drupal'; +export const API_ENDPOINT = 'http://eduslim2.minedu.gov.gr/angular/eepal-front/drupal'; export class AppSettings { public static get API_ENDPOINT(): string { // return 'http://eduslim2.minedu.gov.gr/drupal'; - return 'http://eduslim2.minedu.gov.gr/drupal'; + return 'http://eduslim2.minedu.gov.gr/angular/eepal-front/drupal'; } } diff --git a/source/components/director/director-view.ts b/source/components/director/director-view.ts index 7de9643afd0ec3c3e7c5ea6cf2515971099ae4fb..52c64bc25f5fb5cc05ea1403083ce51cba7a587f 100644 --- a/source/components/director/director-view.ts +++ b/source/components/director/director-view.ts @@ -21,6 +21,8 @@ import { selector: 'director-view', template: `
+ +
- @@ -40,7 +41,7 @@ import {
-
@@ -60,9 +61,38 @@ import {
+ +
+
+
+ Βρίσκεστε στη σελίδα: +
+ +
+ απο +
+ +
+
+ +
+ + + + ` }) @@ -73,6 +103,8 @@ import { private StudentSelectedSub: Subscription; private StudentInfo$: BehaviorSubject; private StudentInfoSub: Subscription; + private StudentsSize$: BehaviorSubject; + private StudentsSizeSub: Subscription; private StudentSelectedSpecial$: BehaviorSubject; private StudentSelectedSpecialSub: Subscription; private retrievedStudent: BehaviorSubject; @@ -81,6 +113,10 @@ import { private SchoolId = 147; private currentclass: Number; private saved: Array = new Array(); + private limitdown = 0; + private limitup= 5; + private pageno = 1; + //private maxpage:Number; constructor(private fb: FormBuilder, @@ -90,6 +126,7 @@ import { this.StudentSelected$ = new BehaviorSubject([{}]); this.StudentSelectedSpecial$ = new BehaviorSubject([{}]); this.StudentInfo$ = new BehaviorSubject([{}]); + this.StudentsSize$ = new BehaviorSubject({}); this.retrievedStudent = new BehaviorSubject(false); this.selectionBClass = new BehaviorSubject(false); this.selectionCClass = new BehaviorSubject(false); @@ -97,6 +134,8 @@ import { tomeas: ['', []], taxi: ['', []], specialit: ['', []], + maxpage:[{value: '', disabled: true}, []], + pageno:[{value: '', disabled: true}, []], }); } @@ -120,6 +159,7 @@ import { verifyclass(txop) { + this.pageno = 1; this.retrievedStudent.next(false); if (txop.value === "1") { this.selectionBClass.next(false); @@ -170,6 +210,7 @@ import { checkbclass(tmop, txop) { + this.pageno = 1; this.retrievedStudent.next(false); var sectorint = +this.formGroup.value.tomeas; console.log(sectorint, "tomeas"); @@ -187,8 +228,9 @@ import { } } - findstudent(txop) { + findstudent(txop, pageno) { + var tot_pages: Number; var sectorint = +this.formGroup.value.tomeas; if (txop.value === "1") { this.currentclass = 1; @@ -200,9 +242,24 @@ import { this.currentclass = 3; } + this.formGroup.get('pageno').setValue(this.pageno); + if (this.pageno == 1){ + console.log(this.SchoolId, sectorint, this.currentclass,"test"); + this.StudentsSizeSub = this._hds.getStudentPerSchool(this.SchoolId, sectorint, this.currentclass, 0, 0).subscribe(x => { + this.StudentsSize$.next(x); + tot_pages = x.id /5; + if (x.id%5 >0) + { + tot_pages = (x.id - (x.id%5))/5 +1; + } + this.formGroup.get('maxpage').setValue(tot_pages); + }); + + } + // this.StudentInfo$ = new BehaviorSubject([{}]); // this.StudentInfoSub = this._hds.getStudentPerSchool(this.SchoolId, sectorint, this.currentclass).subscribe(this.StudentInfo$); - this.StudentInfoSub = this._hds.getStudentPerSchool(this.SchoolId, sectorint, this.currentclass).subscribe(data => { + this.StudentInfoSub = this._hds.getStudentPerSchool(this.SchoolId, sectorint, this.currentclass, this.limitdown, this.limitup).subscribe(data => { this.StudentInfo$.next(data); this.retrievedStudent.next(true); }, @@ -238,7 +295,32 @@ import { } checkcclass() { + this.pageno = 1; this.retrievedStudent.next(false); } + nextpage(txop, maxpage){ + console.log(maxpage.value); + if (this.pageno < maxpage.value) + { + this.pageno = this.pageno+1; + this.limitdown = (this.pageno-1) * 5 ; + this.limitup = this.pageno * 5; + this.findstudent(txop, this.pageno) + } + } + + prevpage(txop){ + console.log(this.pageno,"pageno"); + if (this.pageno > 1) + { + this.pageno = this.pageno-1; + this.limitdown = (this.pageno-1) * 5 ; + this.limitup = this.pageno * 5; + this.findstudent(txop, this.pageno) + } + + } + + } diff --git a/source/components/navbar/navbar.component.html b/source/components/navbar/navbar.component.html index db766c2a259425064296fd2e2dad6520cc4baf89..f61fcfbe904971c95cb8b1c61a6669246c3d2553 100644 --- a/source/components/navbar/navbar.component.html +++ b/source/components/navbar/navbar.component.html @@ -19,14 +19,26 @@ - -
+ + + +
+ + @@ -34,3 +46,7 @@ + + + + \ No newline at end of file diff --git a/source/services/helper-data-service.ts b/source/services/helper-data-service.ts index 21a6d90f7295aa9f758656c851a7289c2dbb9e5c..95acd74a0fcadf3528d351de1ae852309fd3d56b 100644 --- a/source/services/helper-data-service.ts +++ b/source/services/helper-data-service.ts @@ -549,7 +549,7 @@ export class HelperDataService implements OnInit, OnDestroy { - getStudentPerSchool(SchoolId, SelectId, classId) { + getStudentPerSchool(SchoolId, SelectId, classId, limitdown, limitup) { let SchoolIdNew = SchoolId.toString(); let SelectIdNew = SelectId.toString(); @@ -567,7 +567,7 @@ export class HelperDataService implements OnInit, OnDestroy { }); this.createAuthorizationHeader(headers); let options = new RequestOptions({ headers: headers }); - return this.http.get(`${AppSettings.API_ENDPOINT}/epal/studentperSchool/` + SchoolIdNew + '/' + SelectIdNew + '/' + classId, options) + return this.http.get(`${AppSettings.API_ENDPOINT}/epal/studentperSchool/` + SchoolIdNew + '/' + SelectIdNew + '/' + classId + '/' + limitdown + '/' + limitup, options) .map(response => response.json()); }