...
 
Commits (8)
......@@ -59,8 +59,7 @@ class MinisterAdmin extends ControllerBase {
public function getApplicantUser(Request $request, $taxisuserid){
//\Drupal::logger('deploysystem')->info($taxisuserid);
//\Drupal::logger('deploysystem AFM:')->info($taxisuserid);
try {
if (!$request->isMethod('GET')) {
return $this->respondWithStatus([
......@@ -98,8 +97,7 @@ class MinisterAdmin extends ControllerBase {
$applicantUsers = $this->entityTypeManager->getStorage('applicant_users')->loadByProperties(array('taxis_userid' => $hashId ));
$applicantUser = reset($applicantUsers);
if ($applicantUser) {
$applicantEmails = $this->entityTypeManager->getStorage('user')->load($applicantUser->user_id->target_id);
$applicantEmails = $this->entityTypeManager->getStorage('user')->loadByProperties(array('uid' => $applicantUser->user_id->target_id ));
$applicantEmail = reset($applicantEmails);
$userId = $applicantUser->id->value;
......@@ -268,7 +266,7 @@ class MinisterAdmin extends ControllerBase {
}else{
$application->set('delapp', 1);
$application->set('delapp_role', 'ministry');
$timestamp = strtotime(date("Y-m-d"));
$timestamp = strtotime(date("Y-m-d H:i"));
$application->set('delapp_changed', $timestamp);
$application->set('delapp_epalid', NULL);
$application->set('delapp_studentid', NULL);
......
......@@ -436,38 +436,6 @@ epal.school.report-applications:
_controller: '\Drupal\epal\Controller\ReportsCreator::makeReportEpalApplications'
requirements:
_user_is_logged_in: 'TRUE'
epal.schoolgel.report-gel-applications:
path: '/school/report-gel-applications'
options:
_auth: [ 'basic_auth' ]
defaults:
_controller: '\Drupal\epal\Controller\ReportsCreator::makeReportGelApplications'
requirements:
_user_is_logged_in: 'TRUE'
epal.schoolgel.report-gel-choices:
path: '/school/report-gel-choices'
options:
_auth: [ 'basic_auth' ]
defaults:
_controller: '\Drupal\epal\Controller\ReportsCreator::makeReportGelChoices'
requirements:
_user_is_logged_in: 'TRUE'
epal.dide.report-gel-distrib:
path: '/dide/didegel-distrib-report'
options:
_auth: [ 'basic_auth' ]
defaults:
_controller: '\Drupal\epal\Controller\ReportsCreator::makeReportDideDistribGel'
requirements:
_user_is_logged_in: 'TRUE'
epal.dide.report-gel-complet:
path: '/dide/didegel-complet-report'
options:
_auth: [ 'basic_auth' ]
defaults:
_controller: '\Drupal\epal\Controller\ReportsCreator::makeReportDideCompletGel'
requirements:
_user_is_logged_in: 'TRUE'
epal.svc.transition-bperiod:
path: '/epal/transition-bperiod'
options:
......
......@@ -82,7 +82,7 @@ class Client
if (($response = json_decode($result['response'], true)) !== null) {
$tokenExpirationTS = time() + intval($response['expires_in']) - 15; // skip 15 seconds... just in case
$token = ucfirst($response['token_type']) . " {$response['access_token']}";
$tempstore->set('myschool_token', $token);
$tempstore->set('myschool_tokenExpirationTS', $tokenExpirationTS);
return $token;
......@@ -245,7 +245,15 @@ class Client
public function getStudentEpalPromotion($didactic_year_id,$id)
{
//$this->log(__METHOD__);
$testmode = true;
if ($testmode) {
$obj = array(
'message' => 'Επιτυχία',
'promotion' => 1
);
return $obj;
}
return $this->getStudentEpalPromotionOrCertification($this->_settings['ws_endpoint_studentepalpromotion'],$didactic_year_id,$id);
}
......
......@@ -80,7 +80,7 @@ class WSConsumer extends ControllerBase
'message' => 'Επιτυχία',
'data' => array(
//'id' => '15800',
'studentId' => 26634545,
'studentId' => 266345,
'lastname' => 'ΚΑΤΣΑΟΥΝΟΣ',
'firstname' => 'ΝΙΚΟΣ',
'custodianLastName' => 'κAΤσαούNΟΣ',
......@@ -90,7 +90,7 @@ class WSConsumer extends ControllerBase
'addressPostCode' => '26333',
'addressArea' => 'ΜΠΕΓΟΥΛΑΚΙ',
'unitTypeDescription' => 'Εσπερινό ΕΠΑΛ',
'levelName' => 'Α-ΛΥΚ',
'levelName' => 'Γ',
'sectionName' => 'Τεχνικός Μηχανοσυνθέτης',
'promoted' => 1
)
......@@ -179,8 +179,8 @@ public function getStudentEpalPromotion($lastschool_schoolyear,$myschool_id){
);
return (new JsonResponse($obj))->setStatusCode(Response::HTTP_OK);
}
$ts_start = microtime(true);
try {
......@@ -552,6 +552,9 @@ public function getStudentEpalPromotion($lastschool_schoolyear,$myschool_id){
case "2017-2018":
$didactic_year_id="25";
break;
case "2018-2019":
$didactic_year_id="26";
break;
}
return $didactic_year_id;
}
......
......@@ -111,7 +111,7 @@ gel.classesandstudents:
requirements:
_user_is_logged_in: 'TRUE'
gel.getstudents:
path: '/gel/studentperschoolgel/{classId}'
path: '/gel/studentperschoolgel/{classId}/{appStatus}'
options:
_auth: [ 'basic_auth' ]
defaults:
......@@ -214,3 +214,81 @@ gel.savehighscoolselectionforIDIWT:
_controller: '\Drupal\gel\Controller\SdeDistribution::SaveIdiwtStudentHighSchhool'
requirements:
_user_is_logged_in: 'TRUE'
gel.demodata:
path: '/gel/demodata'
defaults:
_controller: '\Drupal\gel\Controller\CreateGelDemoData::createData'
requirements:
_access: 'TRUE'
gel.studentstranscribed:
path: '/gel/findstudentstranscribed'
options:
_auth: [ 'basic_auth' ]
defaults:
_controller: '\Drupal\gel\Controller\GelDistribution::FindStudentsTranscribed'
requirements:
_user_is_logged_in: 'TRUE'
gel.updatepromotionandstatus:
path: '/gel/updatepromotionandstatus'
options:
_auth: [ 'basic_auth' ]
defaults:
_controller: '\Drupal\gel\Controller\GelDistribution::UpdatePromotionAndAppStatus'
requirements:
_user_is_logged_in: 'TRUE'
gel.updatestatus:
path: '/gel/updateappstatus'
options:
_auth: [ 'basic_auth' ]
defaults:
_controller: '\Drupal\gel\Controller\GelDistribution::UpdateAppStatus'
requirements:
_user_is_logged_in: 'TRUE'
gel.updatepromotionepal:
path: '/gel/updatepromotionepal'
options:
_auth: [ 'basic_auth' ]
defaults:
_controller: '\Drupal\gel\Controller\GelDistribution::UpdatePromotionEpal'
requirements:
_user_is_logged_in: 'TRUE'
gel.schoolgel.report-gel-applications:
path: '/school/report-gel-applications'
options:
_auth: [ 'basic_auth' ]
defaults:
_controller: '\Drupal\gel\Controller\ReportsCreator::makeReportGelApplications'
requirements:
_user_is_logged_in: 'TRUE'
gel.schoolgel.report-gel-choices:
path: '/school/report-gel-choices'
options:
_auth: [ 'basic_auth' ]
defaults:
_controller: '\Drupal\gel\Controller\ReportsCreator::makeReportGelChoices'
requirements:
_user_is_logged_in: 'TRUE'
gel.dide.report-gel-distrib:
path: '/dide/didegel-distrib-report'
options:
_auth: [ 'basic_auth' ]
defaults:
_controller: '\Drupal\gel\Controller\ReportsCreator::makeReportDideDistribGel'
requirements:
_user_is_logged_in: 'TRUE'
gel.dide.report-gel-complet:
path: '/dide/didegel-complet-report'
options:
_auth: [ 'basic_auth' ]
defaults:
_controller: '\Drupal\gel\Controller\ReportsCreator::makeReportDideCompletGel'
requirements:
_user_is_logged_in: 'TRUE'
gel.getepalstudents:
path: '/gel/studentepalperschoolgel/{classId}'
options:
_auth: [ 'basic_auth' ]
defaults:
_controller: '\Drupal\gel\Controller\GelDistribution::getStudentEpalPerSchoolGel'
requirements:
_user_is_logged_in: 'TRUE'
<?php
/**
* @file
* Contains \Drupal\query_example\Controller\QueryExampleController.
*/
namespace Drupal\gel\Controller;
use Drupal\Core\Entity\Query\QueryFactory;
use Drupal\Core\Entity\EntityTypeManagerInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\HttpFoundation\JsonResponse;
use Drupal\Core\Controller\ControllerBase;
use Symfony\Component\HttpFoundation\RedirectResponse;
use Drupal\Core\Database\Connection;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Drupal\Core\Logger\LoggerChannelFactoryInterface;
use Drupal\gel\Crypt;
class CreateGelDemoData extends ControllerBase {
protected $entity_query;
protected $entityTypeManager;
protected $logger;
protected $connection;
public function __construct(
EntityTypeManagerInterface $entityTypeManager,
QueryFactory $entity_query,
Connection $connection,
LoggerChannelFactoryInterface $loggerChannel)
{
$this->entityTypeManager = $entityTypeManager;
$this->entity_query = $entity_query;
$this->connection = $connection;
$this->logger = $loggerChannel->get('gel');
}
public static function create(ContainerInterface $container)
{
return new static(
$container->get('entity.manager'),
$container->get('entity.query'),
$container->get('database'),
$container->get('logger.factory')
);
}
public function make_seed() {
list($usec, $sec) = explode(' ', microtime());
return $sec + $usec * 1000000;
}
public function UniqueRandNum($min, $max, $quantity) {
$numbers = range($min, $max);
shuffle($numbers);
return array_slice($numbers, 0, $quantity);
}
public function createData() {
$entity_manager = \Drupal::entityTypeManager();
$sCon = $this->connection->select('gel_student', 'eStudent')
->fields('eStudent', array('id', 'nextclass', 'lastschool_registrynumber','delapp'))
->condition('eStudent.delapp', 0, '=')
->condition('eStudent.nextclass', 1, '!=');
$gelStudents = $sCon->execute()->fetchAll(\PDO::FETCH_OBJ);
$cnt = 0;
foreach ($gelStudents as $gelStudent)
{
$sCon = $this->connection->select('gel_school', 'eSchool')
->fields('eSchool', array('id'))
->condition('eSchool.registry_no', $gelStudent->lastschool_registrynumber, '=');
$gelSchools = $sCon->execute()->fetchAll(\PDO::FETCH_OBJ);
$gelSchool = reset($gelSchools);
$studentClass = array(
'name' => null,
'student_id'=> $gelStudent->id,
'gel_id' => $gelSchool->id,
'dide'=> null,
'distribution_type' => null,
'directorconfirm' => null,
'validation_type' => null,
'myschool_promoted' => null,
'app_status'=> 'FINAL'
);
$entity_storage_studentclass = $entity_manager->getStorage('gel_student_class');
$entity_object = $entity_storage_studentclass->create($studentClass);
$entity_storage_studentclass->save($entity_object);
/*
++$cnt;
if ($cnt == 10) {
$response = new JsonResponse(['hello' => 'world']);
$response->headers->set('X-AUTH-TOKEN', 'HELLOTOKEN');
return $response;
}
*/
}
$response = new JsonResponse(['hello' => 'world']);
$response->headers->set('X-AUTH-TOKEN', 'HELLOTOKEN');
return $response;
}
/*
$crypt = new Crypt();
$transaction = $this->connection->startTransaction();
try {
//insert demo records in entity: gel_student
$entity_manager = \Drupal::entityTypeManager();
$geluserid = \Drupal::currentUser()->id();
//$geluserid = 25;
$schoolIdsList = array();
$sCon = $this->connection->select('gel_school', 'eSchool')
->fields('eSchool', array('name', 'registry_no', 'unit_type_id','edu_admin_id'))
//περιοχή Γ' Αθήνας'
->condition('eSchool.edu_admin_id', 9, '=');
//
//->condition('eSchool.unit_type_id', 3, '=');
$gelSchools = $sCon->execute()->fetchAll(\PDO::FETCH_OBJ);
foreach ($gelSchools as $gelSchool) {
array_push($schoolIdsList, $gelSchool->id);
}
for ($i = 1; $i <= 5000; $i++) {
$curclass = rand(1,7);
$lastclass = rand(1,4);
$am = rand(1,100000);
$myschool_id = rand(1,100000);
$lastschool_id = rand(0, sizeof($schoolIdsList));
$lastschool_schoolname = $gelSchools[$lastschool_id]->name;
$lastschool_unittypeid = $gelSchools[$lastschool_id]->unit_type_id;
$lastschool_registrynumber = $gelSchools[$lastschool_id]->registry_no;
//$lastschool_schoolname = "8ο ΗΜΕΡΗΣΙΟ ΓΥΜΝΑΣΙΟ ΙΛΙΟΥ";
//$lastschool_unittypeid = 3;
//$lastschool_registrynumber = "0501067";
$student = array(
'gel_userid' => $geluserid,
'am' => $crypt->encrypt(strval($am)),
'myschool_id' =>$myschool_id,
'name' => $crypt->encrypt("όνομα" . $i),
'studentsurname' => $crypt->encrypt("επώνυμο" . $i),
'birthdate' => '01/01/1970',
'fatherfirstname' => $crypt->encrypt("όνομα_πατέρα" . $i),
'motherfirstname' => $crypt->encrypt("όνομα_μητέρας" . $i),
'regionaddress' => $crypt->encrypt("διεύθυνση" . $i),
'regionarea' => $crypt->encrypt("περιοχή" . $i),
'regiontk' => $crypt->encrypt("ΤΚ" . $i),
'nextclass' => $curclass,
'relationtostudent' => 'Γονέας/Κηδεμόνας',
'telnum' => $crypt->encrypt('6944123456'),
'guardian_name' => $crypt->encrypt('όνομα_κηδεμόνα'),
'guardian_surname' => $crypt->encrypt('επώνυμο_κηδεμόνα'),
'guardian_fathername' => $crypt->encrypt('όνομα_πατέρα_κηδεμόνα'),
'guardian_mothername' => $crypt->encrypt('όνομα_μητέρας_κηδεμόνα'),
'lastschool_class' => $lastclass,
'lastschool_schoolyear' => "2017-2018",
'lastschool_schoolname' => $lastschool_schoolname,
'lastschool_unittypeid' => $lastschool_unittypeid,
'lastschool_registrynumber' => $lastschool_registrynumber,
'agreement' => 1,
'myschool_currentsection' => "ΟΝΟΜΑ ΤΟΜΕΑ / ΟΜΑΔΑΣ ΠΡΟΣΑΝΑΤΟΛΙΣΜΟΥ"
);
$entity_storage_student = $entity_manager->getStorage('gel_student');
$entity_object = $entity_storage_student->create($student);
$entity_storage_student->save($entity_object);
//insert records in entity: gel_student_choices
//...
$created_student_id = $entity_object->id();
//$entity_storage_student->resetCache();
if ($curclass === 3 || $curclass === 7 || $curclass === 2 || $curclass === 6 ) {
$choice_id_OP = 0;
if ($curclass === 3 || $curclass === 7 )
$choice_id_OP = rand(15,17);
else if ($curclass === 2 || $curclass === 6)
$choice_id_OP = rand(15,16);
$studentChoicesOP = array(
'name' => '',
'student_id' =>$created_student_id,
'choice_id' => strval($choice_id_OP),
);
$entity_storage_choice = $entity_manager->getStorage('gel_student_choices');
$entity_object = $entity_storage_choice->create($studentChoicesOP);
$entity_storage_choice->save($entity_object);
}
else if ($curclass === 1 || $curclass === 4 || $curclass === 3 ) {
//$choice_id_EPIL;
if ($curclass === 1 || $curclass === 4)
//$choice_id_EPIL = rand(4,7);
$choice_id_EPIL = $this->UniqueRandNum(4,7,2);
else if ($curclass === 3)
//$choice_id_EPIL = rand(8,13);
$choice_id_EPIL = $this->UniqueRandNum(8,13,2);
for ($j=1; $j <= 2; $j++) {
$studentChoicesEPIL = array(
'name' => '',
'student_id' =>$created_student_id,
'choice_id' => strval($choice_id_EPIL[$j-1]),
'order_id' => $j,
);
$entity_storage_choice = $entity_manager->getStorage('gel_student_choices');
$entity_object = $entity_storage_choice->create($studentChoicesEPIL);
$entity_storage_choice->save($entity_object);
} //end for
} //end if
} //end for
} //end try
catch (\Exception $e) {
$this->logger->warning($e->getMessage());
$returnmsg = "Αποτυχία καταχώρησης demo data!";
$response = new JsonResponse([$returnmsg]);
// $transaction->rollback();
return $response;
}
$response = new JsonResponse(['hello' => 'world']);
$response->headers->set('X-AUTH-TOKEN', 'HELLOTOKEN');
return $response;
}
*/
}
......@@ -323,8 +323,12 @@ class GelApplicationSubmit extends ControllerBase
if ($applicationForm[0]['assigned_dde'] != null && $applicationForm[0]['assigned_dde'] != '')
$gelDde = $applicationForm[0]['assigned_dde'];
//$this->logger->warning("New " . $applicationForm[0]['lastschool_unittypeid']);
$myschool_promoted = $applicationForm[0]['promoted'];
if ($applicationForm[0]['lastschool_schoolyear'] < self::LIMIT_SCHOOL_YEAR && ($applicationForm[0]['promoted'] == 0 || $applicationForm[0]['promoted'] == null) ) {
//if ($applicationForm[0]['lastschool_schoolyear'] < self::LIMIT_SCHOOL_YEAR && ($applicationForm[0]['promoted'] == 0 || $applicationForm[0]['promoted'] == null) ) {
if ( ($applicationForm[0]['lastschool_schoolyear'] < self::LIMIT_SCHOOL_YEAR || $applicationForm[0]['lastschool_unittypeid'] == '40' )
&& ($applicationForm[0]['promoted'] == 0 || $applicationForm[0]['promoted'] == null) ) {
if ($applicationForm[0]['app_prom'] == 'Όχι')
$myschool_promoted = 6;
/*
......@@ -731,8 +735,11 @@ class GelApplicationSubmit extends ControllerBase
if ($applicationForm[0]['assigned_dde'] != null && $applicationForm[0]['assigned_dde'] != '')
$gelDde = $applicationForm[0]['assigned_dde'];
//$this->logger->warning("New " . $applicationForm[0]['lastschool_unittypeid']);
$myschool_promoted = $applicationForm[0]['promoted'];
if ($applicationForm[0]['lastschool_schoolyear'] < self::LIMIT_SCHOOL_YEAR && ($applicationForm[0]['promoted'] == 0 || $applicationForm[0]['promoted'] == null) ) {
if ( ($applicationForm[0]['lastschool_schoolyear'] < self::LIMIT_SCHOOL_YEAR || $applicationForm[0]['lastschool_unittypeid'] == '40' )
&& ($applicationForm[0]['promoted'] == 0 || $applicationForm[0]['promoted'] == null) ) {
if ($applicationForm[0]['app_prom'] == 'Όχι')
$myschool_promoted = 6;
/*
......@@ -1200,4 +1207,4 @@ class GelApplicationSubmit extends ControllerBase
}
}
\ No newline at end of file
}
This diff is collapsed.
This diff is collapsed.
......@@ -93,8 +93,8 @@ import { HelperDataService } from "../../services/helper-data-service";
<div class="col-md-8">&nbsp;</div>
<div class="col-md-4">
<strong><label>Επιβεβαίωση Εγγραφής:</label> </strong>
<select [disabled] = true class="form-control pull-right" #cb name="{{StudentDetails$.id}}" (change)="confirmStudent(StudentDetails$.id, cb, j)" >
<select class="form-control pull-right" #cb name="{{StudentDetails$.id}}" (change)="confirmStudent(StudentDetails$.id, cb, j)" >
<!--
<select class="form-control pull-right" #cb name="{{StudentDetails$.id}}" (change)="confirmStudent(StudentDetails$.id, cb, j)" >
......
This diff is collapsed.
......@@ -26,6 +26,10 @@ import { IAppState } from "../../store/store";
<button type="button" class="btn btn-block" (click)="nav_to_reportpath(1)"><i class="fa fa-file-text"></i> Επιλογές μαθητών</button>
</div>
<div *ngIf = "userRole == 'director_gel' ">
<button type="button" class="btn btn-block" (click)="nav_to_reportpath(2)"><i class="fa fa-file-text"></i> Κατάσταση αιτήσεων των μαθητών μου</button>
</div>
</div>
`
......@@ -77,6 +81,9 @@ import { IAppState } from "../../store/store";
else if (repId === 1) {
this.router.navigate(["/school/report-gel-choices"]);
}
else if (repId === 2) {
this.router.navigate(["/school/directorgel-transcription"]);
}
}
}
import { Component, OnDestroy, OnInit, Input } from "@angular/core";
import { Injectable } from "@angular/core";
import { ActivatedRoute, Router } from "@angular/router";
import { BehaviorSubject, Subscription } from "rxjs/Rx";
import { HelperDataService } from "../../services/helper-data-service";
import { CsvCreator } from "./../minister/csv-creator";
import { ReportsSchema, TableColumn } from ".//../minister/reports-schema";
import { LocalDataSource } from "ng2-smart-table";
@Component({
selector: "directorgel-transcription",
template: `
<div class="reports-container">
<div class = "loading" *ngIf="validCreator == 0" ></div>
<div style="min-height: 500px;">
<p style="margin-top: 20px; line-height: 2em;"> H παρακάτω λίστα περιλαμβάνει τους μαθητές του σχολείου σας που έχουν υποβάλει
Αίτηση εγγραφής - Δήλωση προτίμησης. </p>
<button type="submit" class="btn btn-alert pull-right" (click)="navigateBack()" > Επιστροφή</button>
<div *ngIf="validCreator == 1">
<div class="smart-table-container table table-hover table-striped">
<ng2-smart-table [settings]="settings" [source]="source"></ng2-smart-table>
</div>
</div>
<button type="button" class="alert alert-info pull-right" (click)="export2Csv()" [hidden]="validCreator != 1"><i class="fa fa-download"></i> Εξαγωγή σε csv</button>
</div>
`
})
@Injectable() export default class DirectorViewGelTranscription implements OnInit, OnDestroy {
private showLoader: BehaviorSubject<boolean>;
private generalReportSub: Subscription;
private generalReport$: BehaviorSubject<any>;
private data: any;
private source: LocalDataSource;
private validCreator: number;
columnMap: Map<string, TableColumn> = new Map<string, TableColumn>();
@Input() settings: any;
private reportSchema = new ReportsSchema();
private csvObj = new CsvCreator();
constructor(
private _hds: HelperDataService,
private activatedRoute: ActivatedRoute,
private router: Router
) {
this.showLoader = new BehaviorSubject(false);
this.generalReport$ = new BehaviorSubject([{}]);
}
ngOnDestroy() {
if (this.generalReportSub)
this.generalReportSub.unsubscribe();
}
ngOnInit() {
this.validCreator = 0;
this.showLoader.next(true);
this.settings = this.reportSchema.reportGelDirectorTranscription;
this.settings.fileName = "e-eggrafes - Μετεγγραφές μαθητών Σχολικής Μονάδας";
this.generalReportSub = this._hds.makeGelTranscriptionReport().subscribe(data => {
this.generalReport$.next(data);
this.data = data;
this.validCreator = 1;
this.showLoader.next(false);
this.source = new LocalDataSource(this.data);
this.columnMap = new Map<string, TableColumn>();
// pass parametes to csv class object
this.csvObj.columnMap = this.columnMap;
this.csvObj.source = this.source;
this.csvObj.settings = this.settings;
this.csvObj.prepareColumnMap();
},
error => {
this.generalReport$.next([{}]);
this.showLoader.next(false);
console.log("Error Getting report");
});
}
export2Csv() {
this.csvObj.export2Csv();
}
navigateBack() {
this.router.navigate(["/school/directorgel-reports"]);
}
}
......@@ -68,18 +68,18 @@ import { IAppState } from "../../store/store";
<div *ngIf="(showResults | async) === true">
<form novalidate [formGroup]="formApplicant" >
<p *ngIf="name"><b>Όνομα:</b> {{name}} </p>
<p *ngIf="surname"><b>Επώνυμο:</b> {{surname}} </p>
<p *ngIf="fathername"><b>Όνομα Πατέρα:</b> {{fathername}} </p>
<p *ngIf="mothername"><b>Όνομα Μητέρας:</b> {{mothername}} </p>
<p *ngIf="email"><b>E-mail:</b> {{email}} </p>
<p *ngIf="name">Όνομα: <strong>{{name}}</strong> </p>
<p *ngIf="surname">Επώνυμο: <strong>{{surname}}</strong> </p>
<p *ngIf="fathername">Όνομα Πατέρα: <strong>{{fathername}}</strong> </p>
<p *ngIf="mothername">Όνομα Μητέρας: <strong>{{mothername}}</strong> </p>
<p *ngIf="email">E-mail: <strong>{{email}}</strong> </p>
<p>
<label>Ενεργοποίηση Εξουσιοδότησης Υποβολής Αίτησης</label>
Ενεργοποίηση Εξουσιοδότησης Υποβολής Αίτησης
<input type="checkbox" formControlName="representative" (click)="toggleRepresentative()" >
</p>
<div class="form-group">
<label>Πλήθος Μαθητών που έχει δικαίωμα Υποβολής Αίτησης</label>
Πλήθος Μαθητών που έχει δικαίωμα Υποβολής Αίτησης
<input type="text" class="form-control" formControlName="numchildren" >
<div class="alert alert-danger" *ngIf="(formApplicant.get('numchildren').dirty || formApplicant.get('numchildren').touched) && formApplicant.get('numchildren').invalid">
......
......@@ -689,6 +689,53 @@ export class ReportsSchema {
},
};
reportGelDirectorTranscription = {
actions: false,
fileName: "e-eggrafes - Μετεγγραφές μαθητών Σχολικής Μονάδας",
pager: {
display: true,
perPage: 15
},
noDataMessage: "Δεν υπάρχουν δεδομένα",
columns: {
am: {
title: "Α.Μ. / Α.Α. αίτησης",
width: "5%",
filter: true
},
studentsurname: {
title: "Επώνυμο",
width: "20%",
filter: true
},
name: {
title: "Όνομα",
width: "20%",
filter: true
},
class: {
title: "Τελευταία τάξη φοίτησης",
width: "15%",
filter: true
},
type: {
title: "Τύπος αίτησης",
width: "15%",
filter: true
},
school: {
title: "Σχολείο Τοποθέτησης",
width: "40%",
filter: true
},
appstatus: {
title: "Χαρακτηρισμός αίτησης",
width: "30%",
filter: true
}
},
};
constructor() { }
......
......@@ -41,10 +41,40 @@
</div>
<div *ngIf="(loginInfo$ | async).size > 0 " class="nav-item" >
<li *ngIf="(authRole=='director_gel') || (authRole=='director_gymlt') " class="nav-item">
<a class="nav-link" [routerLink]="['/school/directorgel-view']" [routerLinkActive]="['active']"><b>Δηλώσεις Μαθητών</b></a>
<a class="nav-link" [routerLink]="['/school/directorgel-view', 'final' ]" [routerLinkActive]="['active']"><b>Κατανεμημένοι Μαθητές</b></a>
</li>
</div>
<div *ngIf="(loginInfo$ | async).size > 0 " class="nav-item" >
<li *ngIf="(authRole=='director_gel') || (authRole=='director_gymlt') " class="nav-item">
<a class="nav-link" [routerLink]="['/school/directorgel-view', 'invalid']" [routerLinkActive]="['active']"><b>Μη έγκυρες αιτήσεις</b></a>
</li>
</div>
<div *ngIf="(loginInfo$ | async).size > 0 " class="nav-item" >
<li *ngIf="(authRole=='director_gel') || (authRole=='director_gymlt') " class="nav-item">
<a class="nav-link" [routerLink]="['/school/directorgel-view', 'pending']" [routerLinkActive]="['active']"><b>Αιτήσεις σε αναμονή</b></a>
</li>
</div>
<div *ngIf="(loginInfo$ | async).size > 0 " class="nav-item" >
<li *ngIf="(authRole=='director_gel') || (authRole=='director_gymlt') " class="nav-item">
<a class="nav-link" [routerLink]="['/school/directorgel-epalview']" [routerLinkActive]="['active']"><b>Αιτήσεις σε ΕΠΑΛ</b></a>
</li>
</div>
<!--
<div *ngIf="(loginInfo$ | async).size > 0 " class="nav-item" >
<li *ngIf="(authRole=='director_gel') || (authRole=='director_gymlt') " class="nav-item">
<a class="nav-link" [routerLink]="['/school/directorgel-view', 'nonfinal']" [routerLinkActive]="['active']"><b>Αιτήσεις μη τοποθετημένες</b></a>
</li>
</div>
-->
<!--
<div *ngIf="(loginInfo$ | async).size > 0 " class="nav-item" >
<li *ngIf="(authRole=='director_gel') || (authRole=='director_gymlt') " class="nav-item">
<a class="nav-link" [routerLink]="['/school/directorgel-view', 'meteggrafes']" [routerLinkActive]="['active']"><b>Μεττεγγραφές</b></a>
</li>
</div>
-->
<div *ngIf="(loginInfo$ | async).size > 0 " class="nav-item" >
<li *ngIf="(authRole=='director_gel') " class="nav-item">
<a class="nav-link" [routerLink]="['/school/directorgel-reports']" [routerLinkActive]="['active']"><b>Αναφορές</b></a>
......@@ -53,7 +83,7 @@
<div *ngIf="(loginInfo$ | async).size > 0 && (userType | async) === 'epal'" class="nav-item">
<li *ngIf="authRole=='supervisor'" class="nav-item">
<a class="nav-link" [routerLink]="['/ministry/minister-authorize']" [routerLinkActive]="['active']"><b>Ρυθμίσεις</b></a>
<a class="nav-link" [routerLink]="['/ministry/minister-settings']" [routerLinkActive]="['active']"><b>Ρυθμίσεις</b></a>
</li>
</div>
<div *ngIf="(loginInfo$ | async).size > 0 && (userType | async) === 'epal'" class="nav-item">
......@@ -128,9 +158,7 @@
</div>
<div *ngIf="(loginInfo$ | async).size > 0 && (userType | async) === 'admin'" class="nav-item">
<li *ngIf="authRole=='supervisor'" class="nav-item">
<a class="nav-link" [routerLink]="['/ministry/admin-minister-recovery']" [routerLinkActive]="['active']"><b>Ανάκτηση Αίτησης</b></a>
</li>
</div>
<a class="nav-link" [routerLink]="['/ministry/admin-minister-recovery']" [routerLinkActive]="['active']"><b>Ανάκτηση Αίτησης</b></a> </li> </div>
<div *ngIf="(loginInfo$ | async).size > 0" class="nav-item">
......
......@@ -159,16 +159,16 @@ export default class SchoolHome implements OnInit, OnDestroy {
}
else if (this.authRole === "director_gel")
{
this.router.navigate(["/school/directorgel-view"]);
this.router.navigate(["/school/directorgel-view/", "final" ]);
}
else if (this.authRole === "director_gym" || this.authRole === "director_gymlt" )
{
this.router.navigate(["/school/directorgym-view"]);
}
this.router.navigate(["/school/directorgym-view"]);
}
else if (this.authRole === "pde")
{
this.router.navigate(["/school/perfecture-view"]);
this.router.navigate(["/school/perfecture-view"]);
}
else if (this.authRole === "dide")
this.router.navigate(["/school/school-type-selection"]);
......
......@@ -281,6 +281,7 @@ import {
let sdfds = <IGelStudentDataFieldRecords>studentDataFields;
if (sdfds.size > 0) {
sdfds.reduce(({}, studentDataField) => {
//make appProm control enabled or disabled
if ( (studentDataField.get("lastschool_schoolyear") == this.currentSchYear || studentDataField.get("lastschool_schoolyear") == "")
&& studentDataField.get("lastschool_schoolname").unit_type_id != "40") {
......@@ -294,7 +295,7 @@ import {
this.studentDataGroup.controls["app_prom"].updateValueAndValidity();
//make dde control enabled or disabled
if ( (studentDataField.get("lastschool_schoolname")).unit_type_id == 40) {
if ( (studentDataField.get("lastschool_schoolname")).unit_type_id == "40") {
this.studentDataGroup.controls["assigned_dde"].setValidators(this.checkChoice);
this.isDDEDisabled.next(false);
}
......@@ -316,15 +317,12 @@ import {
else
this.isStudentDataDisabled.next(true);
if ( studentDataField.get("lastschool_schoolyear") >= this.limitSchoolYear)
if ( studentDataField.get("lastschool_schoolyear") >= this.limitSchoolYear && studentDataField.get("lastschool_schoolname").unit_type_id != "40") {
this.disableStudentData();
//
if ((studentDataField.get("lastschool_schoolyear") >= this.limitSchoolYear)) {
this.studentDataGroup.controls["studentbirthdate"].disable();
this.studentDataGroup.controls["am"].disable();
this.studentDataGroup.controls["app_prom"].disable();
}
this.studentDataGroup.controls["studentbirthdate"].disable();
this.studentDataGroup.controls["am"].disable();
this.studentDataGroup.controls["app_prom"].disable();
}
this.lastSchName.next((studentDataField.get("lastschool_schoolname")).name);
if (typeof this.lastSchName.getValue() === "undefined" )
......@@ -334,7 +332,8 @@ import {
if (typeof this.lastDDEName.getValue() === "undefined" )
this.lastDDEName.next("");
if ( this.specials.has(Number((studentDataField.get("lastschool_schoolname")).extra_unitid)) && studentDataField.get("lastschool_class") != "33"){
if ( this.specials.has(Number((studentDataField.get("lastschool_schoolname")).extra_unitid)) /*&& studentDataField.get("lastschool_class") != "33"*/)
{
this.studentDataGroup.controls["special_type"].setValidators(this.checkChoice);
this.school_special_type.next(true);
......@@ -395,12 +394,11 @@ import {
this.studentDataGroup.controls["lastschool_schoolname"].setValue(studentDataField.get("lastschool_schoolname"));
this.studentDataGroup.controls["lastschool_schoolyear"].setValue(studentDataField.get("lastschool_schoolyear"));
this.studentDataGroup.controls["relationtostudent"].setValue(studentDataField.get("relationtostudent"));
//this.studentDataGroup.controls["app_prom"].setValue(studentDataField.get("app_prom"));
this.studentDataGroup.controls["telnum"].setValue(studentDataField.get("telnum"));
this.studentDataGroup.controls["studentbirthdate"].setValue(this.populateDate(studentDataField.get("studentbirthdate")));
this.studentDataGroup.controls["sex"].setValue(studentDataField.get("sex"));
if (studentDataField.get("lastschool_schoolname").unit_type_id =="40"){
if (studentDataField.get("lastschool_schoolname").unit_type_id == "40"){
this.studentDataGroup.controls["regionaddress"].setValue(studentDataField.get("regionaddress"));
this.studentDataGroup.controls["regiontk"].setValue(studentDataField.get("regiontk"));
this.studentDataGroup.controls["regionarea"].setValue(studentDataField.get("regionarea"));
......
......@@ -282,7 +282,7 @@ import { IAppState } from "../../store/store";
</div>
<div *ngFor="let gelChoices$ of GelStudentDetails$['gelStudentChoices'];" class="row oddin" style="margin: 0px 2px 0px 2px; line-height: 2em;">
<div *ngIf="gelChoices$.choice_type === 'ΟΠ' " class="col-md-3" style="font-size: 0.8em;">Ομαδα Προσανατολισμου</div>
<div *ngIf="gelChoices$.choice_type === 'ΟΠ' " class="col-md-3" style="font-size: 0.8em;">Ομάδα Προσανατολισμού</div>
<div *ngIf="gelChoices$.choice_type === 'ΟΠ' " class="col-md-9" style="font-size: 0.8em; font-weight: bold">{{gelChoices$.choice_name}}</div>
</div>
......@@ -303,7 +303,7 @@ import { IAppState } from "../../store/store";
<div *ngIf="GelStudentDetails$.nextclass==='1' || GelStudentDetails$.nextclass==='3' || GelStudentDetails$.nextclass==='4' " class="row oddin" style="margin: 0px 2px 0px 2px; line-height: 2em;">
<div class="col-md-6" style="font-size: 0.8em; font-weight: bold;">Μάθημα Επιλογης:</div>
<div class="col-md-6" style="font-size: 0.8em; font-weight: bold;">Μάθημα Επιλογής:</div>
</div>
<div *ngIf="GelStudentDetails$.nextclass==='1' || GelStudentDetails$.nextclass==='3' || GelStudentDetails$.nextclass==='4' " class="row oddin" style="margin: 0px 2px 0px 2px; line-height: 2em;">
<div class="col-md-2" style="font-size: 0.8em;"></div>
......
This diff is collapsed.
This diff is collapsed.