Skip to content

GitLab

E
e-epal
Commit 765eaf59 authored by Χάρης Παπαδόπουλος's avatar Χάρης Παπαδόπουλος
Browse files
Options

fixed epal.routing. WIP: restructure application form(remove - add fields)

parent 5933a60e
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 132 additions and 259 deletions
drupal/modules/epal/epal.routing.yml
View file @ 765eaf59
......@@ -38,7 +38,7 @@ epal.current_user:
_controller: '\Drupal\epal\Controller\CurrentUser::getLoginInfo'
requirements:
_user_is_logged_in: 'TRUE'
submitedapplications:
epal.submitedapplications:
path: '/epal/subapplic'
options:
_auth: [ 'basic_auth' ]
......@@ -46,7 +46,7 @@ submitedapplications:
_controller: '\Drupal\epal\Controller\SubmitedApplications::getSubmittedApplications'
requirements:
_user_is_logged_in: 'TRUE'
studentapplication:
epal.studentapplication:
path: '/epal/student/{studentId}'
options:
_auth: [ 'basic_auth' ]
......@@ -54,7 +54,7 @@ studentapplication:
_controller: '\Drupal\epal\Controller\SubmitedApplications::getStudentApplications'
requirements:
_user_is_logged_in: 'TRUE'
epalchosen:
epal.epalchosen:
path: '/epal/epalchosen/{studentId}'
options:
_auth: [ 'basic_auth' ]
......@@ -73,12 +73,12 @@ epal.application_submit:
epal.allocation:
path: '/epal/distribution'
options:
_auth: [ 'basic_auth' ]
_auth: [ 'basic_auth' ]
defaults:
_controller: '\Drupal\epal\Controller\Distribution::createDistribution'
requirements:
_user_is_logged_in: 'TRUE'
sectorperschool:
epal.sectorperschool:
path: '/epal/sectorperSchool'
options:
_auth: [ 'basic_auth' ]
......@@ -86,7 +86,7 @@ sectorperschool:
_controller: '\Drupal\epal\Controller\DirectorView::getSectorsPerSchool'
requirements:
_user_is_logged_in: 'TRUE'
specialityperschool:
epal.specialityperschool:
path: '/epal/specialityperSchool/{sectorId}'
options:
_auth: [ 'basic_auth' ]
......@@ -94,7 +94,7 @@ specialityperschool:
_controller: '\Drupal\epal\Controller\DirectorView::getSpecialPerSchool'
requirements:
_user_is_logged_in: 'TRUE'
confirmstudents:
epal.confirmstudents:
path: '/epal/confirmstudent'
options:
_auth: [ 'basic_auth' ]
......@@ -102,7 +102,7 @@ confirmstudents:
_controller: '\Drupal\epal\Controller\DirectorView::ConfirmStudents'
requirements:
_user_is_logged_in: 'TRUE'
studentperschool:
epal.studentperschool:
path: '/epal/studentperSchool/{selectId}/{classId}/{limitdown}/{limitup}'
options:
_auth: [ 'basic_auth' ]
......@@ -110,7 +110,7 @@ studentperschool:
_controller: '\Drupal\epal\Controller\DirectorView::getStudentPerSchool'
requirements:
_user_is_logged_in: 'TRUE'
savecapacity:
epal.savecapacity:
path: '/epal/savecapacity/{taxi}/{tomeas}/{specialit}'
options:
_auth: [ 'basic_auth' ]
......@@ -125,7 +125,7 @@ epal.ministry.log_in_go:
defaults:
_controller: '\Drupal\epal\Controller\MinistryLogin::loginGo'
requirements:
_user_is_logged_in: 'TRUE'
_user_is_logged_in: 'TRUE'
epal.ministry.log_out_go:
path: '/ministry/logout'
options:
......@@ -133,7 +133,7 @@ epal.ministry.log_out_go:
defaults:
_controller: '\Drupal\epal\Controller\MinistryLogin::logoutGo'
requirements:
_user_is_logged_in: 'TRUE'
_user_is_logged_in: 'TRUE'
epal.ministry.general_report:
path: '/ministry/general-report'
options:
......@@ -141,7 +141,7 @@ epal.ministry.general_report:
defaults:
_controller: '\Drupal\epal\Controller\ReportsCreator::makegGeneralReport'
requirements:
_user_is_logged_in: 'TRUE'
_user_is_logged_in: 'TRUE'
epal.ministry.report-completeness:
path: '/ministry/report-completeness/{regionId}/{adminId}/{schId}'
options:
......@@ -149,7 +149,7 @@ epal.ministry.report-completeness:
defaults:
_controller: '\Drupal\epal\Controller\ReportsCreator::makeReportCompleteness'
requirements:
_user_is_logged_in: 'TRUE'
_user_is_logged_in: 'TRUE'
epal.ministry.report-all-stat:
path: '/ministry/report-all-stat/{regionId}/{adminId}/{schId}/{classId}/{sectorId}/{courseId}'
options:
......@@ -157,7 +157,7 @@ epal.ministry.report-all-stat:
defaults:
_controller: '\Drupal\epal\Controller\ReportsCreator::makeReportAllStat'
requirements:
_user_is_logged_in: 'TRUE'
_user_is_logged_in: 'TRUE'
epal.ministry.report-no-capacity:
path: '/ministry/report-no-capacity/{capacityEnabled}'
options:
......@@ -165,7 +165,7 @@ epal.ministry.report-no-capacity:
defaults:
_controller: '\Drupal\epal\Controller\ReportsCreator::makeReportNoCapacity'
requirements:
_user_is_logged_in: 'TRUE'
_user_is_logged_in: 'TRUE'
epal.ministry.retrieve-registry-id:
path: '/ministry/retrieve-registry-id'
options:
......@@ -173,7 +173,7 @@ epal.ministry.retrieve-registry-id:
defaults:
_controller: '\Drupal\epal\Controller\ReportsCreator::retrieveUserRegistryNo'
requirements:
_user_is_logged_in: 'TRUE'
_user_is_logged_in: 'TRUE'
epal.ministry.massive_mail:
path: '/ministry/send-massive-mail'
options:
......@@ -181,7 +181,7 @@ epal.ministry.massive_mail:
defaults:
_controller: '\Drupal\epal\Controller\InformUnlocatedStudents::sendMailToStudents'
requirements:
_user_is_logged_in: 'TRUE'
_user_is_logged_in: 'TRUE'
epal.ministry.retrievesettings:
path: '/ministry/retrieve-settings'
options:
......@@ -189,7 +189,7 @@ epal.ministry.retrievesettings:
defaults:
_controller: '\Drupal\epal\Controller\MinisterSettings::retrieveSettings'
requirements:
_user_is_logged_in: 'TRUE'
_user_is_logged_in: 'TRUE'
epal.ministry.storesettings:
path: '/ministry/store-settings/{capacityDisabled}/{directorViewDisabled}/{applicantsLoginDisabled}'
options:
......@@ -197,16 +197,16 @@ epal.ministry.storesettings:
defaults:
_controller: '\Drupal\epal\Controller\MinisterSettings::storeSettings'
requirements:
_user_is_logged_in: 'TRUE'
regionview:
path: '/epal/ScoolperPerf/{perfectureId}'
_user_is_logged_in: 'TRUE'
epal.perfectureschools:
path: '/epal/schools-per-perf'
options:
_auth: [ 'basic_auth' ]
defaults:
_controller: '\Drupal\epal\Controller\DirectorView::getSchoolsPerPerfetcure'
_controller: '\Drupal\epal\Controller\DirectorView::getSchoolsPerPerfecture'
requirements:
_user_is_logged_in: 'TRUE'
coursesperschools:
epal.coursesperschools:
path: '/epal/CoursesperSch/{schoolid}'
options:
_auth: [ 'basic_auth' ]
......@@ -214,7 +214,7 @@ coursesperschools:
_controller: '\Drupal\epal\Controller\DirectorView::getCoursesPerSchool'
requirements:
_user_is_logged_in: 'TRUE'
critirioschosen:
epal.critirioschosen:
path: '/epal/critiriachosen/{studentId}/{type}'
options:
_auth: [ 'basic_auth' ]
......@@ -222,7 +222,7 @@ critirioschosen:
_controller: '\Drupal\epal\Controller\SubmitedApplications::getCritiria'
requirements:
_user_is_logged_in: 'TRUE'
findcapacity:
epal.findcapacity:
path: '/epal/findCapacity/{taxi}/{tomeas}/{specialit}'
options:
_auth: [ 'basic_auth' ]
......@@ -230,7 +230,7 @@ findcapacity:
_controller: '\Drupal\epal\Controller\DirectorView::findCapacity'
requirements:
_user_is_logged_in: 'TRUE'
findschoolid:
epal.findschoolid:
path: '/epal/getschool'
options:
_auth: [ 'basic_auth' ]
......@@ -238,7 +238,7 @@ findschoolid:
_controller: '\Drupal\epal\Controller\DirectorView::getSchoolID'
requirements:
_user_is_logged_in: 'TRUE'
gettypeofschool:
epal.gettypeofschool:
path: '/epal/gettypeofschool'
options:
_auth: [ 'basic_auth' ]
......@@ -246,5 +246,3 @@ gettypeofschool:
_controller: '\Drupal\epal\Controller\DirectorView::gettypeofschool'
requirements:
_user_is_logged_in: 'TRUE'
drupal/modules/epal/src/Controller/DirectorView.php
View file @ 765eaf59
......@@ -200,27 +200,27 @@ public function getStudentPerSchool(Request $request , $selectId, $classId, $lim
{
$list=array(
'id' => sizeof($studentPerSchool),
'up' => $limitup,
'up' => $limitup,
'down' => $limitdown
);
);
}
else
else
{
foreach ($studentPerSchool as $object)
{
$studentId = $object -> id() ;
$epalStudents = $this->entityTypeManager->getStorage('epal_student')->loadByProperties(array('id'=> $studentId));
$epalStudent = reset($epalStudents);
if ($epalStudents) {
$studentIdNew = $epalStudent -> id();
$checkstatus = $this->entityTypeManager->getStorage('epal_student_class')->loadByProperties(array( 'student_id'=> $studentIdNew));
$checkstudentstatus = reset($checkstatus);
if ($i >= $limitdown && $i < $limitup)
{
{
$newstatus = $checkstudentstatus -> directorconfirm-> getValue();
$list[] = array(
'i' => $i,
'id' => $epalStudent -> id(),
......@@ -283,7 +283,7 @@ public function getStudentPerSchool(Request $request , $selectId, $classId, $lim
$users = $this->entityTypeManager->getStorage('user')->loadByProperties(array('name' => $authToken));
$user = reset($users);
if ($user) {
//
//
$postData = null;
......@@ -427,7 +427,7 @@ public function SaveCapacity(Request $request,$taxi,$tomeas,$specialit)
public function getSchoolsPerPerfetcure(Request $request)
public function getSchoolsPerPerfecture(Request $request)
{
$authToken = $request->headers->get('PHP_AUTH_USER');
......@@ -438,12 +438,12 @@ public function SaveCapacity(Request $request,$taxi,$tomeas,$specialit)
{
$perfectureId = $user -> init -> value;
$schools = $this->entityTypeManager->getStorage('eepal_school')->loadByProperties(array('region_edu_admin_id'=> $perfectureId ));
if ($schools)
if ($schools)
{
$list = array();
foreach ($schools as $object) {
$status = $this->returnstatus(147);
$status = $this->returnstatus(147);
$list[] = array(
'id' =>$object -> id(),
'name' => $object -> name ->value,
......@@ -463,7 +463,7 @@ public function SaveCapacity(Request $request,$taxi,$tomeas,$specialit)
], Response::HTTP_FORBIDDEN);
}
}
}
else
{
......@@ -489,14 +489,14 @@ public function SaveCapacity(Request $request,$taxi,$tomeas,$specialit)
$list= array();
$SchoolCats = $this->entityTypeManager->getStorage('eepal_school')->loadByProperties(array('id'=> $schoolid ));
$SchoolCats = $this->entityTypeManager->getStorage('eepal_school')->loadByProperties(array('id'=> $schoolid ));
$SchoolCat = reset($SchoolCats);
if ($SchoolCat){
$categ = $SchoolCat-> metathesis_region -> value;
}
$CourseA = $this->entityTypeManager->getStorage('epal_student')->loadByProperties(array('id'=> $schoolid ));
if ($CourseA)
if ($CourseA)
{
$limit_down = $this->entityTypeManager->getStorage('epal_class_limits')->loadByProperties(array('name'=> 1, 'category' => $categ ));
$limitdown = reset($limit_down);
......@@ -515,10 +515,10 @@ public function SaveCapacity(Request $request,$taxi,$tomeas,$specialit)
'classes' => 1,
'limitdown' => $limit,
);
} }
$CourseB = $this->entityTypeManager->getStorage('eepal_sectors_in_epal')->loadByProperties(array('epal_id' => $schoolid ));
if ($CourseB)
{
......@@ -564,13 +564,13 @@ public function SaveCapacity(Request $request,$taxi,$tomeas,$specialit)
'categ' => $categ,
'classes' => 3,
'limitdown' => $limit,
);
}
}
if ($CourseA || $CourseB || $CourseC)
{
return $this->respondWithStatus(
$list
, Response::HTTP_OK);
......@@ -582,7 +582,7 @@ public function SaveCapacity(Request $request,$taxi,$tomeas,$specialit)
], Response::HTTP_FORBIDDEN);
}
}
}
else
{
......@@ -598,7 +598,7 @@ public function returnstatus($id)
if ($id == 147)
return true ;
return false;
}
......@@ -624,22 +624,22 @@ public function findCapacity(Request $request,$taxi,$tomeas,$specialit)
$response->headers->set('Content-Type', 'application/json');
return $response;
}
$list = array();
if (($tomeasnew == 0) && ($specialitnew == 0))
{
$CapacityPerClass = $this->entityTypeManager->getStorage('eepal_school')->loadByProperties(array('id' => $schoolid ));
$classcapacity = reset($CapacityPerClass);
if ($classcapacity) {
$list[] = array(
'taxi' => $taxi,
'capacity' => $classcapacity -> capacity_class_a -> value ,
);
);
}
}
......@@ -699,7 +699,7 @@ public function findCapacity(Request $request,$taxi,$tomeas,$specialit)
return $this->respondWithStatus(
$list
, Response::HTTP_OK);
} else {
return $this->respondWithStatus([
......@@ -724,13 +724,11 @@ public function getSchoolID(Request $request)
'id' => $schid
);
$i++;
return $this->respondWithStatus(
$list
, Response::HTTP_OK);
} else {
......@@ -768,12 +766,12 @@ public function gettypeofschool(Request $request)
{
$list = array();
$list[] = array(
'type' => $school -> operation_shift -> value,
'type' => $school -> operation_shift -> value,
);
return $this->respondWithStatus(
$list
, Response::HTTP_OK);
}
} else {
......
source/components/student-application-form/application.form.main.ts
View file @ 765eaf59
......@@ -74,9 +74,7 @@ import {
studentbirthdate: ['', [Validators.required]],
//studentbirthdate: ['', [Validators.pattern(VALID_DATE_PATTERN),Validators.required]],
fatherfirstname: ['', [Validators.pattern(VALID_NAMES_PATTERN),Validators.required]],
fathersurname: ['', [Validators.pattern(VALID_NAMES_PATTERN),Validators.required]],
motherfirstname: ['', [Validators.pattern(VALID_NAMES_PATTERN),Validators.required]],
mothersurname: ['', [Validators.pattern(VALID_NAMES_PATTERN),Validators.required]],
regionaddress: ['', [Validators.pattern(VALID_ADDRESS_PATTERN),Validators.required]],
regiontk: ['', [Validators.pattern(VALID_ADDRESSTK_PATTERN),Validators.required]],
regionarea: ['', [Validators.pattern(VALID_NAMES_PATTERN),Validators.required]],
......@@ -110,9 +108,7 @@ import {
this.studentDataGroup.controls['name'].setValue(studentDataField.name);
this.studentDataGroup.controls['studentsurname'].setValue(studentDataField.studentsurname);
this.studentDataGroup.controls['fatherfirstname'].setValue(studentDataField.fatherfirstname);
this.studentDataGroup.controls['fathersurname'].setValue(studentDataField.fathersurname);
this.studentDataGroup.controls['motherfirstname'].setValue(studentDataField.motherfirstname);
this.studentDataGroup.controls['mothersurname'].setValue(studentDataField.mothersurname);
this.studentDataGroup.controls['regionaddress'].setValue(studentDataField.regionaddress);
this.studentDataGroup.controls['regiontk'].setValue(studentDataField.regiontk);
this.studentDataGroup.controls['regionarea'].setValue(studentDataField.regionarea);
......
source/components/student-application-form/application.preview.ts
View file @ 765eaf59
......@@ -87,7 +87,6 @@ import { SECTOR_FIELDS_INITIAL_STATE } from '../../store/sectorfields/sectorfiel
private sectorsSub: Subscription;
private regionsSub: Subscription;
private sectorFieldsSub: Subscription;
private criteriaFieldsSub: Subscription;
private courseActive = "-1";
private numSelectedSchools = <number>0;
private numSelectedOrder = <number>0;
......
source/components/student-application-form/submited.aplication.preview.ts
View file @ 765eaf59
......@@ -13,7 +13,7 @@ import { ILoginInfo } from '../../store/logininfo/logininfo.types';
import {Router, ActivatedRoute, Params} from '@angular/router';
import { BehaviorSubject, Subscription } from 'rxjs/Rx';
import * as html2canvas from "html2canvas"
@Component({
selector: 'submited-preview',
template: `
......@@ -77,16 +77,6 @@ import * as html2canvas from "html2canvas"
<div><label for="telnum">Τηλέφωνο επικοινωνίας</label> <p class="form-control" id = "telnum" style="border:1px solid #eceeef;"> {{StudentDetails$.telnum}} </p></div>
<div><label for="relationtostudent">Η αίτηση γίνεται από</label> <p class="form-control" id = "relationtostudent" style="border:1px solid #eceeef;"> {{StudentDetails$.relationtostudent}} </p></div>
<h5>Κοινωνικά Κριτίρια </h5>
<div *ngFor="let critiriaChoices$ of CritirioChosen$ | async" [hidden]="UserData$.id !== userActive">
{{critiriaChoices$.critirio}}
</div>
<h5>Εισοδηματικά Κριτίρια </h5>
<div *ngFor="let incomeChoices$ of incomeChosen$ | async" [hidden]="UserData$.id !== userActive">
{{incomeChoices$.critirio}}
</div>
<h5>Επιλογές ΕΠΑΛ</h5>
<div *ngFor="let epalChoices$ of EpalChosen$ | async" [hidden]="UserData$.id !== userActive">
Σχολείο: {{epalChoices$.epal_id}}
......@@ -211,20 +201,6 @@ import * as html2canvas from "html2canvas"
console.log("Error Getting Schools");
},
() => console.log("Getting Schools"));
this.CritirioChosenSub = this._hds.getCritiria(this.userActive+1, 1).subscribe(data => {
this.CritirioChosen$.next(data)},
error => {
this.CritirioChosen$.next([{}]);
console.log("Error Getting Schools");
},
() => console.log("Getting Schools"));
this.incomeChosenSub = this._hds.getCritiria(this.userActive+1, 2).subscribe(data => {
this.incomeChosen$.next(data)},
error => {
this.incomeChosen$.next([{}]);
console.log("Error Getting Schools");
},
() => console.log("Getting Schools"));
}
......@@ -244,7 +220,7 @@ import * as html2canvas from "html2canvas"
doc.addImage(img, 'PNG',0, 0, 210, 297);
console.log(img, doc, "ok2");
doc.save('applications.pdf');
}
......@@ -267,21 +243,19 @@ html2canvas(document.getElementById("target"), <Html2Canvas.Html2CanvasOptions>{
onrendered: function(canvas: HTMLCanvasElement) {
var img = canvas.toDataURL();
var doc = new jsPDF();
console.log("mphkaneo");
setTimeout(function(){
}, 100000);
doc.addImage(img, 'PNG',0, 0, 1000, 1000);
console.log("mphkaneoneo");
doc.save('applications.pdf');
}
}); }
}
}
source/constants.ts
View file @ 765eaf59
......@@ -39,7 +39,8 @@ export const CRITERIA_INIT = 'CRITERIA_INIT';
export const VALID_NAMES_PATTERN = '[A-Za-zΑ-ΩΆΈΉΊΙΎΌΏα-ωάέήίΐύόώ ]*$';
export const VALID_ADDRESS_PATTERN = '[0-9A-Za-zΑ-ΩΆΈΉΊΎΌΏα-ωάέήίύόώ ]*$';
export const VALID_ADDRESSTK_PATTERN = '[0-9 ]*$';
export const VALID_DIGITS_PATTERN = '69[0-9]*$';
// export const VALID_DIGITS_PATTERN = '69[0-9]*$';
export const VALID_DIGITS_PATTERN = '2[0-9]*$';
export const VALID_EMAIL_PATTERN = '[A-Z0-9a-z._%+-]+@[A-Za-z0-9.-]+\\.[A-Za-z]{2,64}';
......
source/services/helper-data-service.ts
View file @ 765eaf59
......@@ -542,8 +542,8 @@ export class HelperDataService implements OnInit, OnDestroy {
let options = new RequestOptions({ headers: headers });
return this.http.post(`${AppSettings.API_ENDPOINT}/epal/confirmstudent`, { students, type}, options)
.map(response => response.json());
}
......@@ -664,7 +664,7 @@ export class HelperDataService implements OnInit, OnDestroy {
});
this.createAuthorizationHeader(headers);
let options = new RequestOptions({ headers: headers });
return this.http.get(`${AppSettings.API_ENDPOINT}/epal/ScoolperPerf/` , options)
return this.http.get(`${AppSettings.API_ENDPOINT}/epal/schools-per-perf/` , options)
.map(response => response.json());
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment