...
 
Commits (14)
......@@ -6,7 +6,6 @@ drupal/*
drupal/modules/oauthost/src/Controller/CBController.php
.*/
!/.gitignore
# Logs
*.log
......
<?xml version="1.0" encoding="UTF-8"?>
<module type="WEB_MODULE" version="4">
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/drupal/core/lib/Drupal/Core/Composer" isTestSource="false" packagePrefix="Drupal\Core\Composer\" />
<excludeFolder url="file://$MODULE_DIR$/drupal/vendor/asm89/stack-cors" />
<excludeFolder url="file://$MODULE_DIR$/drupal/vendor/behat/mink" />
<excludeFolder url="file://$MODULE_DIR$/drupal/vendor/behat/mink-browserkit-driver" />
<excludeFolder url="file://$MODULE_DIR$/drupal/vendor/behat/mink-goutte-driver" />
<excludeFolder url="file://$MODULE_DIR$/drupal/vendor/behat/mink-selenium2-driver" />
<excludeFolder url="file://$MODULE_DIR$/drupal/vendor/composer" />
<excludeFolder url="file://$MODULE_DIR$/drupal/vendor/defuse/php-encryption" />
<excludeFolder url="file://$MODULE_DIR$/drupal/vendor/doctrine/annotations" />
<excludeFolder url="file://$MODULE_DIR$/drupal/vendor/doctrine/cache" />
<excludeFolder url="file://$MODULE_DIR$/drupal/vendor/doctrine/collections" />
<excludeFolder url="file://$MODULE_DIR$/drupal/vendor/doctrine/common" />
<excludeFolder url="file://$MODULE_DIR$/drupal/vendor/doctrine/inflector" />
<excludeFolder url="file://$MODULE_DIR$/drupal/vendor/doctrine/instantiator" />
<excludeFolder url="file://$MODULE_DIR$/drupal/vendor/doctrine/lexer" />
<excludeFolder url="file://$MODULE_DIR$/drupal/vendor/drupal/coder" />
<excludeFolder url="file://$MODULE_DIR$/drupal/vendor/easyrdf/easyrdf" />
<excludeFolder url="file://$MODULE_DIR$/drupal/vendor/egulias/email-validator" />
<excludeFolder url="file://$MODULE_DIR$/drupal/vendor/fabpot/goutte" />
<excludeFolder url="file://$MODULE_DIR$/drupal/vendor/guzzlehttp/guzzle" />
<excludeFolder url="file://$MODULE_DIR$/drupal/vendor/guzzlehttp/promises" />
<excludeFolder url="file://$MODULE_DIR$/drupal/vendor/guzzlehttp/psr7" />
<excludeFolder url="file://$MODULE_DIR$/drupal/vendor/instaclick/php-webdriver" />
<excludeFolder url="file://$MODULE_DIR$/drupal/vendor/ircmaxell/password-compat" />
<excludeFolder url="file://$MODULE_DIR$/drupal/vendor/jasig/phpcas" />
<excludeFolder url="file://$MODULE_DIR$/drupal/vendor/jcalderonzumba/gastonjs" />
<excludeFolder url="file://$MODULE_DIR$/drupal/vendor/jcalderonzumba/mink-phantomjs-driver" />
<excludeFolder url="file://$MODULE_DIR$/drupal/vendor/masterminds/html5" />
<excludeFolder url="file://$MODULE_DIR$/drupal/vendor/mikey179/vfsStream" />
<excludeFolder url="file://$MODULE_DIR$/drupal/vendor/paragonie/random_compat" />
<excludeFolder url="file://$MODULE_DIR$/drupal/vendor/phpdocumentor/reflection-docblock" />
<excludeFolder url="file://$MODULE_DIR$/drupal/vendor/phpspec/prophecy" />
<excludeFolder url="file://$MODULE_DIR$/drupal/vendor/phpunit/php-code-coverage" />
<excludeFolder url="file://$MODULE_DIR$/drupal/vendor/phpunit/php-file-iterator" />
<excludeFolder url="file://$MODULE_DIR$/drupal/vendor/phpunit/php-text-template" />
<excludeFolder url="file://$MODULE_DIR$/drupal/vendor/phpunit/php-timer" />
<excludeFolder url="file://$MODULE_DIR$/drupal/vendor/phpunit/php-token-stream" />
<excludeFolder url="file://$MODULE_DIR$/drupal/vendor/phpunit/phpunit" />
<excludeFolder url="file://$MODULE_DIR$/drupal/vendor/phpunit/phpunit-mock-objects" />
<excludeFolder url="file://$MODULE_DIR$/drupal/vendor/psr/container" />
<excludeFolder url="file://$MODULE_DIR$/drupal/vendor/psr/http-message" />
<excludeFolder url="file://$MODULE_DIR$/drupal/vendor/psr/log" />
<excludeFolder url="file://$MODULE_DIR$/drupal/vendor/sebastian/comparator" />
<excludeFolder url="file://$MODULE_DIR$/drupal/vendor/sebastian/diff" />
<excludeFolder url="file://$MODULE_DIR$/drupal/vendor/sebastian/environment" />
<excludeFolder url="file://$MODULE_DIR$/drupal/vendor/sebastian/exporter" />
<excludeFolder url="file://$MODULE_DIR$/drupal/vendor/sebastian/global-state" />
<excludeFolder url="file://$MODULE_DIR$/drupal/vendor/sebastian/recursion-context" />
<excludeFolder url="file://$MODULE_DIR$/drupal/vendor/sebastian/version" />
<excludeFolder url="file://$MODULE_DIR$/drupal/vendor/setasign/fpdf" />
<excludeFolder url="file://$MODULE_DIR$/drupal/vendor/squizlabs/php_codesniffer" />
<excludeFolder url="file://$MODULE_DIR$/drupal/vendor/stack/builder" />
<excludeFolder url="file://$MODULE_DIR$/drupal/vendor/symfony-cmf/routing" />
<excludeFolder url="file://$MODULE_DIR$/drupal/vendor/symfony/browser-kit" />
<excludeFolder url="file://$MODULE_DIR$/drupal/vendor/symfony/class-loader" />
<excludeFolder url="file://$MODULE_DIR$/drupal/vendor/symfony/console" />
<excludeFolder url="file://$MODULE_DIR$/drupal/vendor/symfony/css-selector" />
<excludeFolder url="file://$MODULE_DIR$/drupal/vendor/symfony/debug" />
<excludeFolder url="file://$MODULE_DIR$/drupal/vendor/symfony/dependency-injection" />
<excludeFolder url="file://$MODULE_DIR$/drupal/vendor/symfony/dom-crawler" />
<excludeFolder url="file://$MODULE_DIR$/drupal/vendor/symfony/event-dispatcher" />
<excludeFolder url="file://$MODULE_DIR$/drupal/vendor/symfony/http-foundation" />
<excludeFolder url="file://$MODULE_DIR$/drupal/vendor/symfony/http-kernel" />
<excludeFolder url="file://$MODULE_DIR$/drupal/vendor/symfony/phpunit-bridge" />
<excludeFolder url="file://$MODULE_DIR$/drupal/vendor/symfony/polyfill-ctype" />
<excludeFolder url="file://$MODULE_DIR$/drupal/vendor/symfony/polyfill-iconv" />
<excludeFolder url="file://$MODULE_DIR$/drupal/vendor/symfony/polyfill-mbstring" />
<excludeFolder url="file://$MODULE_DIR$/drupal/vendor/symfony/polyfill-php70" />
<excludeFolder url="file://$MODULE_DIR$/drupal/vendor/symfony/process" />
<excludeFolder url="file://$MODULE_DIR$/drupal/vendor/symfony/psr-http-message-bridge" />
<excludeFolder url="file://$MODULE_DIR$/drupal/vendor/symfony/routing" />
<excludeFolder url="file://$MODULE_DIR$/drupal/vendor/symfony/serializer" />
<excludeFolder url="file://$MODULE_DIR$/drupal/vendor/symfony/translation" />
<excludeFolder url="file://$MODULE_DIR$/drupal/vendor/symfony/validator" />
<excludeFolder url="file://$MODULE_DIR$/drupal/vendor/symfony/yaml" />
<excludeFolder url="file://$MODULE_DIR$/drupal/vendor/twig/twig" />
<excludeFolder url="file://$MODULE_DIR$/drupal/vendor/wikimedia/composer-merge-plugin" />
<excludeFolder url="file://$MODULE_DIR$/drupal/vendor/zendframework/zend-diactoros" />
<excludeFolder url="file://$MODULE_DIR$/drupal/vendor/zendframework/zend-escaper" />
<excludeFolder url="file://$MODULE_DIR$/drupal/vendor/zendframework/zend-feed" />
<excludeFolder url="file://$MODULE_DIR$/drupal/vendor/zendframework/zend-stdlib" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="JavaScriptSettings">
<option name="languageLevel" value="ES6" />
</component>
</project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/e-eggrafes.iml" filepath="$PROJECT_DIR$/.idea/e-eggrafes.iml" />
</modules>
</component>
</project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="PhpIncludePathManager">
<include_path>
<path value="$PROJECT_DIR$/drupal/vendor/composer" />
<path value="$PROJECT_DIR$/drupal/vendor/zendframework/zend-diactoros" />
<path value="$PROJECT_DIR$/drupal/vendor/zendframework/zend-stdlib" />
<path value="$PROJECT_DIR$/drupal/vendor/zendframework/zend-feed" />
<path value="$PROJECT_DIR$/drupal/vendor/behat/mink-selenium2-driver" />
<path value="$PROJECT_DIR$/drupal/vendor/behat/mink" />
<path value="$PROJECT_DIR$/drupal/vendor/zendframework/zend-escaper" />
<path value="$PROJECT_DIR$/drupal/vendor/behat/mink-browserkit-driver" />
<path value="$PROJECT_DIR$/drupal/vendor/behat/mink-goutte-driver" />
<path value="$PROJECT_DIR$/drupal/vendor/masterminds/html5" />
<path value="$PROJECT_DIR$/drupal/vendor/asm89/stack-cors" />
<path value="$PROJECT_DIR$/drupal/vendor/symfony/yaml" />
<path value="$PROJECT_DIR$/drupal/vendor/symfony/psr-http-message-bridge" />
<path value="$PROJECT_DIR$/drupal/vendor/symfony/http-foundation" />
<path value="$PROJECT_DIR$/drupal/vendor/symfony/polyfill-mbstring" />
<path value="$PROJECT_DIR$/drupal/vendor/sebastian/version" />
<path value="$PROJECT_DIR$/drupal/vendor/easyrdf/easyrdf" />
<path value="$PROJECT_DIR$/drupal/vendor/symfony/class-loader" />
<path value="$PROJECT_DIR$/drupal/vendor/symfony/polyfill-ctype" />
<path value="$PROJECT_DIR$/drupal/vendor/sebastian/recursion-context" />
<path value="$PROJECT_DIR$/drupal/vendor/symfony/translation" />
<path value="$PROJECT_DIR$/drupal/vendor/sebastian/diff" />
<path value="$PROJECT_DIR$/drupal/vendor/symfony/css-selector" />
<path value="$PROJECT_DIR$/drupal/vendor/sebastian/environment" />
<path value="$PROJECT_DIR$/drupal/vendor/symfony/event-dispatcher" />
<path value="$PROJECT_DIR$/drupal/vendor/sebastian/exporter" />
<path value="$PROJECT_DIR$/drupal/vendor/symfony/dom-crawler" />
<path value="$PROJECT_DIR$/drupal/vendor/sebastian/global-state" />
<path value="$PROJECT_DIR$/drupal/vendor/symfony/routing" />
<path value="$PROJECT_DIR$/drupal/vendor/sebastian/comparator" />
<path value="$PROJECT_DIR$/drupal/vendor/symfony/http-kernel" />
<path value="$PROJECT_DIR$/drupal/vendor/symfony/polyfill-php70" />
<path value="$PROJECT_DIR$/drupal/vendor/symfony/serializer" />
<path value="$PROJECT_DIR$/drupal/vendor/symfony/browser-kit" />
<path value="$PROJECT_DIR$/drupal/vendor/symfony/validator" />
<path value="$PROJECT_DIR$/drupal/vendor/fabpot/goutte" />
<path value="$PROJECT_DIR$/drupal/vendor/symfony/polyfill-iconv" />
<path value="$PROJECT_DIR$/drupal/vendor/symfony/dependency-injection" />
<path value="$PROJECT_DIR$/drupal/vendor/doctrine/lexer" />
<path value="$PROJECT_DIR$/drupal/vendor/phpdocumentor/reflection-docblock" />
<path value="$PROJECT_DIR$/drupal/vendor/symfony/debug" />
<path value="$PROJECT_DIR$/drupal/vendor/symfony/console" />
<path value="$PROJECT_DIR$/drupal/vendor/doctrine/inflector" />
<path value="$PROJECT_DIR$/drupal/vendor/symfony/process" />
<path value="$PROJECT_DIR$/drupal/vendor/doctrine/annotations" />
<path value="$PROJECT_DIR$/drupal/vendor/doctrine/collections" />
<path value="$PROJECT_DIR$/drupal/vendor/jasig/phpcas" />
<path value="$PROJECT_DIR$/drupal/vendor/doctrine/instantiator" />
<path value="$PROJECT_DIR$/drupal/vendor/doctrine/cache" />
<path value="$PROJECT_DIR$/drupal/vendor/doctrine/common" />
<path value="$PROJECT_DIR$/drupal/vendor/twig/twig" />
<path value="$PROJECT_DIR$/drupal/vendor/paragonie/random_compat" />
<path value="$PROJECT_DIR$/drupal/vendor/setasign/fpdf" />
<path value="$PROJECT_DIR$/drupal/vendor/guzzlehttp/psr7" />
<path value="$PROJECT_DIR$/drupal/vendor/guzzlehttp/promises" />
<path value="$PROJECT_DIR$/drupal/vendor/guzzlehttp/guzzle" />
<path value="$PROJECT_DIR$/drupal/vendor/ircmaxell/password-compat" />
<path value="$PROJECT_DIR$/drupal/vendor/drupal/coder" />
<path value="$PROJECT_DIR$/drupal/vendor/phpspec/prophecy" />
<path value="$PROJECT_DIR$/drupal/vendor/jcalderonzumba/mink-phantomjs-driver" />
<path value="$PROJECT_DIR$/drupal/vendor/jcalderonzumba/gastonjs" />
<path value="$PROJECT_DIR$/drupal/vendor/wikimedia/composer-merge-plugin" />
<path value="$PROJECT_DIR$/drupal/vendor/egulias/email-validator" />
<path value="$PROJECT_DIR$/drupal/vendor/instaclick/php-webdriver" />
<path value="$PROJECT_DIR$/drupal/vendor/psr/http-message" />
<path value="$PROJECT_DIR$/drupal/vendor/symfony-cmf/routing" />
<path value="$PROJECT_DIR$/drupal/vendor/psr/log" />
<path value="$PROJECT_DIR$/drupal/vendor/mikey179/vfsStream" />
<path value="$PROJECT_DIR$/drupal/vendor/psr/container" />
<path value="$PROJECT_DIR$/drupal/vendor/defuse/php-encryption" />
<path value="$PROJECT_DIR$/drupal/vendor/phpunit/php-code-coverage" />
<path value="$PROJECT_DIR$/drupal/vendor/phpunit/phpunit-mock-objects" />
<path value="$PROJECT_DIR$/drupal/vendor/phpunit/php-token-stream" />
<path value="$PROJECT_DIR$/drupal/vendor/phpunit/php-file-iterator" />
<path value="$PROJECT_DIR$/drupal/vendor/phpunit/php-text-template" />
<path value="$PROJECT_DIR$/drupal/vendor/symfony/phpunit-bridge" />
<path value="$PROJECT_DIR$/drupal/vendor/phpunit/phpunit" />
<path value="$PROJECT_DIR$/drupal/vendor/phpunit/php-timer" />
<path value="$PROJECT_DIR$/drupal/vendor/squizlabs/php_codesniffer" />
<path value="$PROJECT_DIR$/drupal/vendor/stack/builder" />
</include_path>
</component>
</project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
<mapping directory="$PROJECT_DIR$/drupal/vendor/behat/mink" vcs="Git" />
<mapping directory="$PROJECT_DIR$/drupal/vendor/behat/mink-selenium2-driver" vcs="Git" />
<mapping directory="$PROJECT_DIR$/drupal/vendor/drupal/coder" vcs="Git" />
</component>
</project>
\ No newline at end of file
This diff is collapsed.
......@@ -389,7 +389,7 @@ epal.getcoursesperschoolsmallclasses_night:
requirements:
_user_is_logged_in: 'TRUE'
epal.svc.getstudentinfo:
path: '/epal/get-student-info/{didactic_year}/{lastname}/{firstname}/{father_firstname}/{mother_firstname}/{birthdate}/{registry_no}/{registration_no}'
path: '/epal/get-student-info/{bypass_guardian}/{guardian_enabled}/{cu_surname}/{app_prom}/{didactic_year}/{lastname}/{firstname}/{father_firstname}/{mother_firstname}/{birthdate}/{registry_no}/{registration_no}'
options:
_auth: [ 'basic_auth' ]
defaults:
......
......@@ -57,21 +57,24 @@ class CreateEncodedData extends ControllerBase {
public function createData() {
$crypt = new Crypt();
//test
/*
for ($i = 501; $i <= 715; $i++)
$this->connection->insert('eepal_school')->fields([
'id' => $i,
'uuid' => \Drupal::service('uuid')->generate(),
'langcode' => 'el',
])->execute();
*/
//print_r("string to be coded: " . "<br>");
/*
$name_encoded = $crypt->encrypt("xr7tgt9AbK3");
$name_encoded = $crypt->encrypt("*****");
print_r("Encrypted: " . $name_encoded);
print_r("<br>");
*/
/*
$name_encoded = $crypt->decrypt("def502007502e0be76f27ea5771de4a420dbcd4437f026dce1ffdbfabb6161694a3fc1721e63b808f7ec2ae7f1616ecbb3b180cf2b4161209b517048a3dad04180df4363d334caed56a323ce0e276bf9e70386c72eb6226223cf8a08fdd20397282488be3c6d");
......
......@@ -70,7 +70,7 @@ class WSConsumer extends ControllerBase
->setStatusCode(Response::HTTP_OK);
}
public function getStudentEpalInfo($didactic_year, $lastname, $firstname, $father_firstname, $mother_firstname, $birthdate, $registry_no, $registration_no)
public function getStudentEpalInfo($bypass_guardian, $guardian_enabled, $cu_surname, $app_prom, $didactic_year, $lastname, $firstname, $father_firstname, $mother_firstname, $birthdate, $registry_no, $registration_no)
{
$testmode = true;
$didactic_year_id=$this->getdidacticyear($didactic_year);
......@@ -78,31 +78,47 @@ class WSConsumer extends ControllerBase
if ($testmode) {
$obj = array(
'message' => 'Επιτυχία',
'data' => array(
'id' => '15800',
'studentId' => 26634546,
'lastname' => 'ΓΕ',
'firstname' => 'ΚΩ',
//'custodianLastName' => 'KAΤΣΑΟυΝΟΣ',
'custodianLastName' => 'γεωPΓΟYΛΑΣ',
'custodianFirstName' => '',
//'id' => '15800',
'studentId' => 26634545,
'lastname' => 'ΚΑΤΣΑΟΥΝΟΣ',
'firstname' => 'ΝΙΚΟΣ',
'custodianLastName' => 'κAΤσαούNΟΣ',
'custodianFirstName' => 'ΑΝΑΣΤΑΣΙΟΣ',
'birthDate' => '1997-01-04T00:00:00',
'addressStreet' => 'ΣΚΣ. //Δ Δ&&',
'addressPostCode' => '22222',
'addressArea' => 'Ν. / ,&^% ΣΜΥΡΝΗ',
'addressStreet' => 'ΧΑΤΖΗ Β. 16',
'addressPostCode' => '26334',
'addressArea' => 'ΜΠΕΓΟΥΛΑΚΙ',
'unitTypeDescription' => 'Ημερήσιο ΕΠΑΛ',
'levelName' => 'Β-ΛΥΚ',
'levelName' => 'Γ',
'sectionName' => 'Τεχνικός Μηχανοσυνθέτης Αεροσκαφών',
'promoted' => 1
)
//'data' => "null"
//return null
//'data' => null
);
if (($errorCode = $this->validateWSStudentData(
$bypass_guardian,
$guardian_enabled,
$cu_surname,
$app_prom,
$obj['data']['custodianLastName'],
$obj['data']['addressStreet'],
$obj['data']['levelName'],
$obj['data']['promoted']
)) > 0) {
return $this->respondWithStatus([
"error_code" => $errorCode
], Response::HTTP_OK);
}
return (new JsonResponse($obj))
->setStatusCode(Response::HTTP_OK);
}
//formal code
//$ts_start = microtime(true);
......@@ -111,12 +127,33 @@ class WSConsumer extends ControllerBase
} catch (\Exception $e) {
return (new JsonResponse(['message' => $e->getMessage()]))
->setStatusCode(($code = $e->getCode()) == 0 ? Response::HTTP_INTERNAL_SERVER_ERROR : $code);
//->setStatusCode(($code = $e->getCode()) == 0 ? Response::HTTP_OK : $code);
}
//$duration = microtime(true) - $ts_start;
//$this->logger->info(__METHOD__ . " :: timed [{$duration}]");
//πώς κάνω validation στο real-time web-service;
/*
if (($errorCode = $this->validateWSStudentData(
$bypass_guardian,
$guardian_enabled,
$cu_surname,
$app_prom,
$obj['data']['custodianLastName'],
$obj['data']['addressStreet'],
$obj['data']['levelName'],
$obj['data']['promoted']
)) > 0) {
return $this->respondWithStatus([
"error_code" => $errorCode
], Response::HTTP_OK);
}
return (new JsonResponse($obj))
->setStatusCode(Response::HTTP_OK);
}
*/
return (new JsonResponse([
'message' => 'Επιτυχία',
'data' => json_decode($result)
......@@ -190,7 +227,6 @@ class WSConsumer extends ControllerBase
$count++;
}
$this->logger->warning("telos gel....=".$count);
$count=1;
......@@ -256,7 +292,7 @@ class WSConsumer extends ControllerBase
$count++;
}
$this->logger->warning("telos epal....=".$count);
return (new JsonResponse([
'message' => 'Επιτυχία'
......@@ -477,4 +513,120 @@ class WSConsumer extends ControllerBase
return $didactic_year_id;
}
private function validateWSStudentData($bypass_guardian, $guardian_enabled, $cu_surname, $app_prom, $custodianLastName, $addressStreet, $levelName, $promoted) {
if ($guardian_enabled == 1 && $bypass_guardian == 0) {
if ($custodianLastName == null || preg_replace('/\s+/', '', $custodianLastName) == '')
return 800;
$custodianTransform = preg_replace('/\s+/', '', $custodianLastName);
$custodianTransform = mb_strtolower($custodianTransform, 'UTF-8');
$custodianTransform= $this->removeAccents($custodianTransform);
$custodianTransform = mb_strtoupper($custodianTransform, 'UTF-8');
$custodianTransform= $this->removeLatin($custodianTransform);
$cuTransform = preg_replace('/\s+/', '', $cu_surname);
$cuTransform = mb_strtolower($cuTransform, 'UTF-8');
$cuTransform= $this->removeAccents($cuTransform);
$cuTransform = mb_strtoupper($cuTransform, 'UTF-8');
$cuTransform= $this->removeLatin($cuTransform);
if ($custodianTransform != $cuTransform)
return 801;
}
if ($addressStreet == null || preg_replace('/\s+/', '', $addressStreet) == '')
return 802;
if (
($app_prom == 'Ναι' && $promoted != 1 && $promoted != 2 && $promoted != 0 && $promoted != null )
|| ($app_prom == 'Όχι' && ($promoted == 1 || $promoted == 2) )
)
return 803;
}
private function removeAccents($s)
{
$ret_str = '';
for ($i=0; $i < mb_strlen($s, 'UTF-8'); $i++) {
if (mb_substr($s, $i, 1) == 'ά')
$ret_str .= 'α';
else if (mb_substr($s, $i, 1) == 'έ')
$ret_str .= 'ε';
else if (mb_substr($s, $i, 1) == 'ό')
$ret_str .= 'ο';
else if (mb_substr($s, $i, 1) == 'ή')
$ret_str .= 'η';
else if (mb_substr($s, $i, 1) == 'ί')
$ret_str .= 'ι';
else if (mb_substr($s, $i, 1) == 'ώ')
$ret_str .= 'ω';
else if (mb_substr($s, $i, 1) == 'ϊ')
$ret_str .= 'ι';
else if (mb_substr($s, $i, 1) == 'ΐ')
$ret_str .= 'ι';
else if (mb_substr($s, $i, 1) == 'ύ')
$ret_str .= 'υ';
else if (mb_substr($s, $i, 1) == 'ϋ')
$ret_str .= 'υ';
else if (mb_substr($s, $i, 1) == 'ΰ')
$ret_str .= 'υ';
else
$ret_str .= mb_substr($s, $i, 1);
}
return $ret_str;
}
private function removeLatin($s)
{
$ret_str = '';
for ($i=0; $i < mb_strlen($s, 'UTF-8'); $i++) {
if (mb_substr($s, $i, 1) == 'A')
$ret_str .= 'Α';
else if (mb_substr($s, $i, 1) == 'B')
$ret_str .= 'Β';
else if (mb_substr($s, $i, 1) == 'E')
$ret_str .= 'Ε';
else if (mb_substr($s, $i, 1) == 'H')
$ret_str .= 'Η';
else if (mb_substr($s, $i, 1) == 'I')
$ret_str .= 'Ι';
else if (mb_substr($s, $i, 1) == 'K')
$ret_str .= 'Κ';
else if (mb_substr($s, $i, 1) == 'M')
$ret_str .= 'Μ';
else if (mb_substr($s, $i, 1) == 'N')
$ret_str .= 'Ν';
else if (mb_substr($s, $i, 1) == 'O')
$ret_str .= 'Ο';
else if (mb_substr($s, $i, 1) == 'P')
$ret_str .= 'Ρ';
else if (mb_substr($s, $i, 1) == 'T')
$ret_str .= 'Τ';
else if (mb_substr($s, $i, 1) == 'X')
$ret_str .= 'Χ';
else if (mb_substr($s, $i, 1) == 'Y')
$ret_str .= 'Υ';
else if (mb_substr($s, $i, 1) == 'Z')
$ret_str .= 'Ζ';
else
$ret_str .= mb_substr($s, $i, 1);
}
return $ret_str;
}
private function respondWithStatus($arr, $s)
{
$res = new JsonResponse($arr);
$res->setStatusCode($s);
return $res;
}
}
......@@ -735,7 +735,7 @@ class GelApplicationSubmit extends ControllerBase
}
$gelresult = array(
'student_id' => $created_student_id,
'student_id' => $studentId,
'gel_id' => $gelId ,
'dide' => $gelDde,
'distribution_type' => $distrType,
......@@ -1027,43 +1027,43 @@ class GelApplicationSubmit extends ControllerBase
else if (
($last_class == "1" || $last_class == "4")
&& ($next_class == 2 || $next_class == 5 )
&& ($last_sch_type == "4" )
&& ($last_sch_type == "4" || $last_sch_type == "6")
&& $validation_type == "NEXTCLASS"
)
return 1;
else if (
($last_class == "2" || $last_class == "5")
&& ($next_class == 2 || $next_class == 5 )
&& ($last_sch_type == "4" )
&& ($last_sch_type == "4" || $last_sch_type == "6")
&& $validation_type == "SAMECLASS"
)
return 1;
//ΚΑΙ όσοι έχουν απορριφθεί από τη Γ'-ΕΣΠ τετραετούς φοίτησης από το 2019-20 και εφεξής --> Μάλλον ΛΑΘΟΣ (εννοεί 2018-19)
else if (
($last_class == "6")
&& ($next_class == 2 || $next_class == 5 )
&& ($last_sch_type == "4" )
&& ($next_class == 3 || $next_class == 6 )
&& ($last_sch_type == "4" || $last_sch_type == "6")
&& $validation_type == "SAMECLASS"
)
return 1;
//ποιοι πάνε στην Γ' ΓΕΛ
//ΦΕΚ: Στη Γ ́ τάξη εγγράφονται οι προαγόμενοι/ες από τη Β ́ τάξη ημερήσιου ΓΕ.Λ.,
//οι ΦΕΚ: προαγόμενοι/ες από τη Β ́ τάξη εσπερινού ΓΕ.Λ. από το σχολικό έτος 2018-2019 και εφεξής,
//οι προαγόμενοι/ες από τη Β ́ τάξη εσπερινού ΓΕ.Λ. από το σχολικό έτος 2018-2019 και εφεξής,
//όσοι/ες έχουν απορριφθεί στη Γ ημερήσιου ΓΕ.Λ.,
//όσοι/ες έχουν απορριφθεί στη Γ ́ εσπερινού ΓΕ.Λ. από το σχολικό έτος 2019-2020 και εφεξής
//και όσοι/ες έχουν απορριφθεί στη Δ ́ Εσπερινού ΓΕ.Λ. από το σχολικό έτος 2019-2020
else if (
($last_class == "2" || $last_class == "5")
&& ($next_class == 3 || $next_class == 6 )
&& ($last_sch_type == "4" )
&& ($last_sch_type == "4" || $last_sch_type == "6")
&& $validation_type == "NEXTCLASS"
)
return 1;
else if (
($last_class == "3")
&& ($next_class == 3 || $next_class == 6 )
&& ($last_sch_type == "4" )
&& ($last_sch_type == "4" || $last_sch_type == "6")
&& $validation_type == "SAMECLASS"
)
return 1;
......@@ -1076,15 +1076,15 @@ class GelApplicationSubmit extends ControllerBase
//μόνο για φέτος (2018-19)
($last_class == "6")
&& ($next_class == 7 )
&& ($last_sch_type == "4" )
&& ($last_sch_type == "4" || $last_sch_type == "6")
&& $validation_type == "NEXTCLASS"
)
return 1;
else if (
//ισχύει μέχρι και "του χρόνου" (2019-20)
($last_class == "7" || $last_class == "3")
&& ($next_class == 7 )
&& ($last_sch_type == "4" )
($last_class == "7" /*|| $last_class == "3"*/)
&& ($next_class == 3 || $next_class == 7 )
&& ($last_sch_type == "4" || $last_sch_type == "6")
&& $validation_type == "SAMECLASS"
)
return 1;
......@@ -1103,7 +1103,7 @@ class GelApplicationSubmit extends ControllerBase
//και όσοι απορρίφθηκαν από Β'/Γ'/Δ' ΕΠΑΛ
else if (
($last_class == "1" || $last_class == "2" || $last_class == "4" || $last_class == "5" || $last_class == "6")
&& ($next_class == 2 || $next_class == 6 )
&& ($next_class == 2 || $next_class == 5 )
&& ($last_sch_type == "5")
&& $validation_type == "NEXTCLASS"
)
......
......@@ -167,6 +167,13 @@ import {
this.numAppSelf.next(Number(x.numAppSelf));
this.numAppChildren.next(Number(x.numAppChildren));
this.numAppRepresent.next(Number(x.numAppRepresent));
this.numChildren.next(Number(x.numChildren));
if (Number(x.representRole) == 1) {
//this.bypassGuardianVer = 1;
this.representativeRole.next(true);
}
else
this.representativeRole.next(false);
//To consider: here must }) close ????
......@@ -290,11 +297,11 @@ import {
//this.numAppSelf.next(Number(loginInfoObj.numapp_self));
//this.numAppChildren.next(Number(loginInfoObj.numapp_children));
//this.numAppRepresent.next(Number(loginInfoObj.numapp_represent));
this.numChildren.next(Number(loginInfoObj.numchildren));
if (Number(loginInfoObj.represent_role))
this.representativeRole.next(true);
else
this.representativeRole.next(false);
//this.numChildren.next(Number(loginInfoObj.numchildren));
//if (Number(loginInfoObj.represent_role))
// this.representativeRole.next(true);
//else
// this.representativeRole.next(false);
return loginInfoObj;
}, {});
......
......@@ -527,7 +527,8 @@ import { StudentCourseChosen, StudentEpalChosen, StudentSectorChosen } from "../
let birthparts = aitisiObj[0].studentbirthdate.split("-",3);
let date=birthparts[2]+"-"+birthparts[1]+"-"+birthparts[0];
this.ServiceStudentCertifSub = this._hds.getServiceStudentInfo(aitisiObj[0].lastschool_schoolyear,'null','null','null','null',
this.ServiceStudentCertifSub = this._hds.getServiceStudentInfo(this.bypassGuardianVer, this.guardianEnabled, this.cu_surname,
aitisiObj[0].lastschool_schoolyear,'null','null','null','null','null',
date, aitisiObj[0].lastschool_registrynumber, aitisiObj[0].am)
.subscribe(data => {
//if (typeof data.data["studentId"] !== "undefined") {
......
<div class="row">
<breadcrumbs></breadcrumbs>
</div>
<div class="loading" *ngIf="(loginInfo$ | async).size === 0"></div>
<div class="loading" *ngIf="(loginInfo$ | async).size === 0 || (showLoader | async) === true "></div>
<div id="applicationFormNotice" (onHidden)="onHidden()" class="modal fade" tabindex="-1" role="dialog" aria-hidden="true">
<div class="modal-dialog modal-lg">
......@@ -147,7 +147,9 @@
Η επιλογή από αυτή τη λίστα είναι απαραίτητη!
</div>
<!--
<div *ngIf="(studentDataGroup.get('lastschool_schoolyear').value >= '2013-2014' && studentDataGroup.get('lastschool_schoolname').value.unit_type_id !=40) || !(isStudentDataDisabled | async)" class="row evenin" style="margin: 20px 2px 10px 2px; line-height: 2em;">
-->
<div class="row evenin" style="margin: 20px 2px 10px 2px; line-height: 2em;">
<div class="col-md-12" style="font-size: 1.5em; font-weight: bold; text-align: center;">Προσωπικά Στοιχεία μαθητή</div>
</div>
......@@ -159,7 +161,13 @@
Το πεδίο δεν μπορεί να αφεθεί κενό!
</div>
<div class="form-group">
<!--
<button *ngIf="studentDataGroup.get('lastschool_schoolyear').value >= '2013-2014' && studentDataGroup.get('lastschool_schoolname').value.unit_type_id !=40 && (isStudentDataDisabled | async)" type="submit" class="btn btn-alert pull-right" (click)="getStudentData()" >
Επιστροφή
</button>
-->
<div *ngIf = "(studentDataGroup.get('lastschool_schoolyear').value < '2013-2014' && studentDataGroup.get('lastschool_schoolyear').value != '') " class="form-group">
<label for="sex">Φύλο μαθητή(<span style="color: #ff0000;">*</span>)</label>
<select class="form-control" formControlName="sex">
<option value="">Παρακαλώ επιλέξτε...</option>
......@@ -171,7 +179,7 @@
Το πεδίο δεν μπορεί να αφεθεί κενό!
</div>
<div class="form-group">
<div *ngIf = "!(isStudentDataDisabled | async)" class="form-group">
<label for="name">Όνομα μαθητή(<span style="color: #ff0000;">*</span>)</label><input class="form-control" type="text" formControlName="name">
</div>
<div class="alert alert-danger" *ngIf="studentDataGroup.get('name').touched && studentDataGroup.get('name').hasError('required')">
......@@ -181,8 +189,8 @@
Δεν επιτρέπονται ψηφία, πεζά γράμματα ή άλλοι μη έγκυροι χαρακτήρες σε αυτό το πεδίο!
</div>
<div class="form-group">
<label for="studentsurname">Επώνυμο μαθητή(<span style="color: #ff0000;">*</span>)</label><input class="form-control" type="text" formControlName="studentsurname">
<div *ngIf = "!(isStudentDataDisabled | async)" class="form-group">
<label for="studentsurname">Επώνυμο μαθητή(<span style="color: #ff0000;">*</span>)</label><input class="form-control" type="text" formControlName="studentsurname">
</div>
<div class="alert alert-danger" *ngIf="studentDataGroup.get('studentsurname').touched && studentDataGroup.get('studentsurname').hasError('required')">
Το πεδίο δεν μπορεί να αφεθεί κενό!
......@@ -191,7 +199,7 @@
Δεν επιτρέπονται ψηφία, πεζά γράμματα ή άλλοι μη έγκυροι χαρακτήρες σε αυτό το πεδίο!
</div>
<div class="form-group">
<div *ngIf = "!(isStudentDataDisabled | async)" class="form-group">
<label for="fatherfirstname">Όνομα πατέρα(<span style="color: #ff0000;">*</span>)</label><input class="form-control" type="text" formControlName="fatherfirstname">
</div>
<div class="alert alert-danger" *ngIf="studentDataGroup.get('fatherfirstname').touched && studentDataGroup.get('fatherfirstname').hasError('required')">
......@@ -201,7 +209,7 @@
Δεν επιτρέπονται ψηφία, πεζά γράμματα ή άλλοι μη έγκυροι χαρακτήρες σε αυτό το πεδίο!
</div>
<div class="form-group">
<div *ngIf = "!(isStudentDataDisabled | async)" class="form-group">
<label for="motherfirstname">Όνομα μητέρας(<span style="color: #ff0000;">*</span>)</label><input class="form-control" type="text" formControlName="motherfirstname">
</div>
<div class="alert alert-danger" *ngIf="studentDataGroup.get('motherfirstname').touched && studentDataGroup.get('motherfirstname').hasError('required')">
......@@ -219,6 +227,15 @@
Συμπληρώστε την ημερομηνία γέννησης του μαθητή!
</div>
<div *ngIf="studentDataGroup.get('lastschool_schoolyear').value >= '2013-2014' && studentDataGroup.get('lastschool_schoolname').value.unit_type_id !=40 && (isStudentDataDisabled | async)" class="row" style="margin-top: 20px; margin-bottom: 20px;">
<div class="col-md-6"></div>
<div class="col-md-6">
<button type="button" class="btn-primary btn-md pull-right isclickable" style="width: 11em;" (click)="getStudentData()">
<span style="font-size: 0.9em; font-weight: bold;">Ταυτοποίηση μαθητή&nbsp;&nbsp;&nbsp;</span><i class="fa fa-download"></i>
</button>
</div>
</div>
<div class="row evenin" style="margin: 20px 2px 10px 2px; line-height: 2em;">
<div class="col-md-12" style="font-size: 1.5em; font-weight: bold; text-align: center;">Στοιχεία Επικοινωνίας</div>
</div>
......@@ -305,9 +322,9 @@
<label for="relationtostudent">Η δήλωση προτίμησης γίνεται από:(<span style="color: #ff0000;">*</span>)</label><br/>
<select class="form-control" formControlName="relationtostudent">
<option value="">Παρακαλώ επιλέξτε...</option>
<option *ngIf = "((numAppChildren | async) + (numAppRepresent | async)) < (numChildren | async) " value="Γονέα/Κηδεμόνα">Γονέα/Κηδεμόνα</option>
<option *ngIf = "!(numAppSelf | async)" value="Μαθητή">Μαθητή</option>
<option *ngIf = "(representativeRole | async) && ((numAppChildren | async) + (numAppRepresent | async)) < (numChildren | async) "value="Εξουσιοδοτημένο">Εξουσιοδοτημένο Διευθυντή Σχολικής Μονάδας</option>
<option *ngIf = "((numAppChildren | async) + (numAppRepresent | async)) < (numChildren | async) " value="Γονέα/Κηδεμόνα">Γονέα/Κηδεμόνα </option>
<option *ngIf = "!(numAppSelf | async)" value="Μαθητή">Μαθητή</option>
<option *ngIf = "(representativeRole | async) && ((numAppChildren | async) + (numAppRepresent | async)) < (numChildren | async) " value="Εξουσιοδοτημένο">Εξουσιοδοτημένο Διευθυντή Σχολικής Μονάδας</option>
<!--
<option *ngIf = "((numAppChildren | async) + (numAppRepresent | async)) < (numChildren | async) " value="Γονέα/Κηδεμόνα">ΓΟΝΕΑ/ΚΗΔΕΜΟΝΑ</option>
<option *ngIf = "!(numAppSelf | async)" value="Μαθητή">ΜΑΘΗΤΗ</option>
......
......@@ -121,9 +121,13 @@ import { StudentGelCourseChosen } from "../students/student";
<label *ngIf="gelstudentDataField$.get('lastschool_schoolyear') >= '2013-2014' && gelstudentDataField$.get('lastschool_schoolname').unit_type_id !=40" for="am">Αριθμός Μητρώου Μαθητη</label>
<p *ngIf="gelstudentDataField$.get('lastschool_schoolyear') >= '2013-2014' && gelstudentDataField$.get('lastschool_schoolname').unit_type_id !=40" class="form-control" style="border:1px solid #eceeef;"> {{gelstudentDataField$.get("am")}} </p>
</div>
<div><label for="sex" >Φύλο μαθητή</label>
<div *ngIf = "gelstudentDataField$.get('lastschool_schoolyear') < '2013-2014' && gelstudentDataField$.get('lastschool_schoolyear') != '' ">
<label for="sex" >Φύλο μαθητή</label>
<div *ngIf="gelstudentDataField$.get('sex') === 'Άρρεν'"> <p class="form-control" style="border:1px solid #eceeef;">Αγόρι/Άνδρας</p></div>
<div *ngIf="gelstudentDataField$.get('sex') === 'Θήλυ'"><p class="form-control" style="border:1px solid #eceeef;">Κορίτσι/Γυναίκα</p></div>
</div>
<div>
<!--
<p class="form-control" style="border:1px solid #eceeef;"> {{gelstudentDataField$.get("sex")}} </p> </div>
-->
......@@ -311,12 +315,6 @@ import { StudentGelCourseChosen } from "../students/student";
this.bypassGuardianVer = 1;
});
//this.guardianIdentSub = this._hds.isGuardian_ident_enabled().subscribe(w => {
// this.guardianEnabled.next(Number(w.res)) ;
//});
this.loginInfoSub = this._ngRedux.select("loginInfo")
.map(loginInfo => <ILoginInfoRecords>loginInfo)
.subscribe(linfo => {
......@@ -514,9 +512,19 @@ import { StudentGelCourseChosen } from "../students/student";
aitisiObj[0].hasright = this.hasright;
aitisiObj[0].nextclass = this.classSelected.getValue();
aitisiObj[0].section_name = null;
aitisiObj[0].level_name = null;
aitisiObj[0].unittype_name = null;
//add these lines when web service is called
//aitisiObj[0].section_name = null;
//aitisiObj[0].level_name = null;
//aitisiObj[0].unittype_name = null;
//remove these lines when web service is called
//ανάκτηση από redux των επιστρεφόμενων τιμών του web service που καλέστηκε στην προηγούμενη φόρμα
aitisiObj[0].studentId = std.get("myschool_studentid");
aitisiObj[0].section_name = std.get("myschool_section_name");
aitisiObj[0].level_name = std.get("myschool_level_name");
aitisiObj[0].unittype_name = std.get("myschool_unit_type_description");
aitisiObj[0].promoted = std.get("myschool_promoted");
//aitisiObj[1]: ομάδα προσανατολισμού
let classIds = ["2", "3", "6", "7"];
......@@ -547,7 +555,10 @@ import { StudentGelCourseChosen } from "../students/student";
aitisiObj["3"] = langObj;
}
//κλήση myschool web service
/*
if (this.wsEnabled.getValue() === 1 && aitisiObj[0].lastschool_schoolyear >= this.limitSchoolYear && aitisiObj[0].lastschool_unittypeid != "40") {
this.showLoader.next(true);
......@@ -555,8 +566,9 @@ import { StudentGelCourseChosen } from "../students/student";
let birthparts = aitisiObj[0].studentbirthdate.split("-",3);
let date=birthparts[2]+"-"+birthparts[1]+"-"+birthparts[0];
this.ServiceStudentCertifSub = this._hds.getServiceStudentInfo(aitisiObj[0].lastschool_schoolyear,'null','null','null','null',
date, aitisiObj[0].lastschool_registrynumber, aitisiObj[0].am)
this.ServiceStudentCertifSub = this._hds.getServiceStudentInfo(this.bypassGuardianVer, this.guardianEnabled, this.cu_surname,
aitisiObj[0].lastschool_schoolyear,aitisiObj[0].app_prom,'null','null','null','null',
date, aitisiObj[0].lastschool_registrynumber, aitisiObj[0].am)
.subscribe(data => {
//if (typeof data.data["studentId"] !== "undefined") {
if (data.data!=null) {
......@@ -714,6 +726,10 @@ import { StudentGelCourseChosen } from "../students/student";
else {
this.submitRecord(newapp, aitisiObj);
}
*/
//add this line when web service is not called
this.submitRecord(newapp, aitisiObj);
}
......@@ -874,7 +890,7 @@ import { StudentGelCourseChosen } from "../students/student";
break;
case 8004:
mTitle = "Αποτυχία Υποβολής Δήλωσης Προτίμησης";
mText = "Τα στοιχεία φοίτησης που υποβάλλατε δεν είναι έγκυρα. Παρακαλώ ελέγξτε τη φόρμα σας και προσπαθήστε ξανά. Επιβεβαιώστε ότι δεν έχετε ήδη κάνει δήλωση για τον ίδιο μαθητή.";
mText = " Υπάρχει ήδη καταχωρημένη δήλωση για αυτόν τον μαθητή .";
mHeader = "modal-header-danger";
break;
......@@ -935,41 +951,11 @@ import { StudentGelCourseChosen } from "../students/student";
this.router.navigate(["/gelstudent-application-form-main"]);
}
/*
private levelNametoClass($level)
{
switch ($level){
case "Α"||"Α-ΛΥΚ":
return 1;
case "Β"||"Β-ΛΥΚ":
return 2;
case "Γ"||"Γ-ΛΥΚ"||"Γ (ΠΑΛΑΙΑ)"||"Γ-ΛΥΚ (ΠΑΛΑΙΑ)":
return 3;
case "Δ"||"Δ-ΛΥΚ"||"Δ (ΠΑΛΑΙΑ)"||"Δ-ΛΥΚ (ΠΑΛΑΙΑ)":
return 4;
//case "ΔΥΕΠ"||"ΠΡΟΚΑΤΑΡΚΤΙΚΗ"||"ΠΡΟΚΑΤΑΡΚΤΙΚΗ-ΛΥΚ":
// return -1;
default:
return -1;
}
}
*/
//redundant
/*
private levelNametoClass($level, $op_shift, $unit_type_id)
{
/*
if (){
}
else if (){
}
else if (){
}
*/
//if ($unit_type_id==3 || ($unit_type_id==6 && $level=="Γ")){
if ( ($unit_type_id==3 || $unit_type_id==6) && $level=="Γ") {
return 33;
}
......@@ -987,16 +973,16 @@ import { StudentGelCourseChosen } from "../students/student";
}
else{
if ($level=="Α" || $level=="Α-ΛΥΚ"){
return 1;
return 4;
}
else if($level=="Β" || $level=="Β-ΛΥΚ"){
return 2;
return 5;
}
else if($level=="Γ" || $level=="Γ-ΛΥΚ"|| $level=="Γ (ΠΑΛΑΙΑ)"|| $level=="Γ-ΛΥΚ (ΠΑΛΑΙΑ)"){
return 3;
return 6;
}
else if($level=="Δ" || $level=="Δ-ΛΥΚ"|| $level=="Δ (ΠΑΛΑΙΑ)"|| $level=="Δ-ΛΥΚ (ΠΑΛΑΙΑ)"){
return 4;
return 7;
}
}
}
......@@ -1023,5 +1009,6 @@ import { StudentGelCourseChosen } from "../students/student";
i.forEach(function(el, idx) {map[el] = o[idx]});
return s.replace(/[^A-Za-z0-9]/g, function(ch) { return map[ch] || ch; })
}
*/
}
......@@ -1037,7 +1037,7 @@ export class HelperDataService implements OnInit, OnDestroy {
.map(response => response.json());
}
getServiceStudentInfo(didactic_year, lastname, firstname, father_firstname, mother_firstname, birthdate, registry_no, registration_no) {
getServiceStudentInfo(bypass_guardian, guardian_enabled, cu_surname, app_prom, didactic_year, lastname, firstname, father_firstname, mother_firstname, birthdate, registry_no, registration_no) {
this.loginInfo$.getValue().forEach(loginInfoToken => {
this.authToken = loginInfoToken.auth_token;
......@@ -1048,7 +1048,7 @@ export class HelperDataService implements OnInit, OnDestroy {
});
this.createAuthorizationHeader(headers);
let options = new RequestOptions({ headers: headers });
let rpath = [didactic_year, lastname, firstname, father_firstname, mother_firstname, birthdate, registry_no, registration_no].join("/");
let rpath = [bypass_guardian, guardian_enabled, cu_surname, app_prom, didactic_year, lastname, firstname, father_firstname, mother_firstname, birthdate, registry_no, registration_no].join("/");
return this.http.get(`${AppSettings.API_ENDPOINT}/epal/get-student-info/` + rpath, options)
.map(response => response.json());
......@@ -1993,7 +1993,7 @@ getPde(username, userpassword)
this.createMinistryAuthorizationHeader(headers, username, userpassword);
let options = new RequestOptions({ headers: headers });
return this.http.get(`${AppSettings.API_ENDPOINT}/epal/getpde` , options)
.map(response => response.json());
}
......
......@@ -7,9 +7,7 @@ export interface IGelStudentDataField {
name: string;
studentsurname: string;
fatherfirstname: string;
//fathersurname: string;
motherfirstname: string;
//mothersurname: string;
studentbirthdate: Date;
regionaddress: string;
regiontk: string;
......@@ -18,11 +16,16 @@ export interface IGelStudentDataField {
lastschool_schoolyear: string;
lastschool_class: string;
relationtostudent: string;
//currentclass: string;
telnum: string;
app_prom: string;
special_type: string;
assigned_dde: string;
myschool_studentid: string;
myschool_unit_type_description: string;
myschool_level_name: string;
myschool_section_name:string;
myschool_promoted: string;
}
export interface IGelStudentDataFieldRecord extends TypedRecord<IGelStudentDataFieldRecord>, IGelStudentDataField { };
......