Merge branch 'lock_actions' into 'develop'

Restructuring application views. Checking if account allowed(WIP)

See merge request !140
parents 71c37c05 d26c7f51
...@@ -173,7 +173,7 @@ class CASLogin extends ControllerBase ...@@ -173,7 +173,7 @@ class CASLogin extends ControllerBase
}; };
$umdobject = $filterAttribute("umdobject"); $umdobject = $filterAttribute("umdobject");
$physicaldeliveryofficename = $filterAttribute("physicaldeliveryofficename"); // $physicaldeliveryofficename = $filterAttribute("physicaldeliveryofficename");
/****** the following is for production : Χρήση μόνο από ΕΠΙΣΗΜΟΥΣ ΛΟΓΑΡΙΑΣΜΟΥΣ ***************************/ /****** the following is for production : Χρήση μόνο από ΕΠΙΣΗΜΟΥΣ ΛΟΓΑΡΙΑΣΜΟΥΣ ***************************/
...@@ -186,12 +186,27 @@ class CASLogin extends ControllerBase ...@@ -186,12 +186,27 @@ class CASLogin extends ControllerBase
} }
*/ */
phpCAS::trace($umdobject); phpCAS::trace($umdobject);
phpCAS::trace($physicaldeliveryofficename); phpCAS::trace($physicaldeliveryofficename);
$gsnunitcodedn = $filterAttribute('edupersonorgunitdn:gsnunitcode:extended'); $gsnunitcodedn = $filterAttribute('edupersonorgunitdn:gsnunitcode:extended');
$gsnunitcode = substr($gsnunitcodedn, strpos($gsnunitcodedn, ";") + 1); $gsnunitcode = substr($gsnunitcodedn, strpos($gsnunitcodedn, ";") + 1);
phpCAS::trace($gsnunitcode); phpCAS::trace($gsnunitcode);
/* check if myschool account */
if (!$umdobject || $umdobject !== "ISaccount") {
return $this->redirectForbidden($configRowName, '5002');
}
if (!$gsnunitcode || $gsnunitcode !== $CASUser) {
return $this->redirectForbidden($configRowName, '5003');
}
/* end of checking myschool account */
$userAssigned = $this->assignRoleToUser($gsnunitcode); $userAssigned = $this->assignRoleToUser($gsnunitcode);
if (sizeof($userAssigned) === 0) { if (sizeof($userAssigned) === 0) {
return $this->redirectForbidden($configRowName, '5004'); return $this->redirectForbidden($configRowName, '5004');
} }
......
...@@ -86,9 +86,27 @@ class SubmitedApplications extends ControllerBase ...@@ -86,9 +86,27 @@ class SubmitedApplications extends ControllerBase
$i = 0; $i = 0;
if ($epalStudents) { if ($epalStudents) {
$list = array(); $list = array();
foreach ($epalStudents as $object) { foreach ($epalStudents as $object) {
$sectorName = '';
$courseName = '';
if ($object->currentclass->value === '2') {
$sectors = $this->entityTypeManager->getStorage('epal_student_sector_field')->loadByProperties(array('student_id' => $object->id()));
$sector = reset($sectors);
if ($sector)
$sectorName = $this->entityTypeManager->getStorage('eepal_sectors')->load($sector->sectorfield_id->target_id)->name->value;
}
else if ($object->currentclass->value === '3' || $object->currentclass->value === '4') {
$courses = $this->entityTypeManager->getStorage('epal_student_course_field')->loadByProperties(array('student_id' => $object->id()));
$course = reset($courses);
if ($course)
$courseName = $this->entityTypeManager->getStorage('eepal_specialty')->load($course->coursefield_id->target_id)->name->value;
}
$list[] = array( $list[] = array(
'applicationId' => $object->id(),
'name' => $object -> name ->value, 'name' => $object -> name ->value,
'studentsurname' => $object -> studentsurname ->value, 'studentsurname' => $object -> studentsurname ->value,
'fatherfirstname' => $object -> fatherfirstname ->value, 'fatherfirstname' => $object -> fatherfirstname ->value,
...@@ -101,7 +119,10 @@ class SubmitedApplications extends ControllerBase ...@@ -101,7 +119,10 @@ class SubmitedApplications extends ControllerBase
'guardian_mothername' =>$object -> guardian_mothername ->value, 'guardian_mothername' =>$object -> guardian_mothername ->value,
'lastschool_schoolname' =>$object -> lastschool_schoolname ->value, 'lastschool_schoolname' =>$object -> lastschool_schoolname ->value,
'lastschool_schoolyear' =>$object -> lastschool_schoolyear ->value, 'lastschool_schoolyear' =>$object -> lastschool_schoolyear ->value,
'lastschool_class' =>$object -> currentclass ->value, 'lastschool_class' =>$object -> lastschool_class ->value,
'currentclass' =>$object -> currentclass ->value,
'currentsector' =>$sectorName,
'currentcourse' =>$courseName,
'regionaddress' =>$object -> regionaddress ->value, 'regionaddress' =>$object -> regionaddress ->value,
'regiontk' =>$object -> regiontk ->value, 'regiontk' =>$object -> regiontk ->value,
'regionarea' =>$object -> regionarea ->value, 'regionarea' =>$object -> regionarea ->value,
...@@ -109,7 +130,9 @@ class SubmitedApplications extends ControllerBase ...@@ -109,7 +130,9 @@ class SubmitedApplications extends ControllerBase
'graduation_year' =>$object -> graduation_year ->value, 'graduation_year' =>$object -> graduation_year ->value,
'telnum' =>$object -> telnum ->value, 'telnum' =>$object -> telnum ->value,
'relationtostudent' =>$object -> relationtostudent ->value, 'relationtostudent' =>$object -> relationtostudent ->value,
'birthdate' =>$object -> birthdate ->value, 'birthdate' => substr($object->birthdate->value, 8, 2) . '/' . substr($object->birthdate->value, 6, 2) . '/' . substr($object->birthdate->value, 0, 4),
'created' => date('d/m/Y H:i', $object -> created ->value),
); );
$i++; $i++;
......
...@@ -17,7 +17,7 @@ import {minValue} from '../../constants'; ...@@ -17,7 +17,7 @@ import {minValue} from '../../constants';
import { import {
FormBuilder, FormBuilder,
FormGroup, FormGroup,
FormControl, FormControl,
FormArray, FormArray,
Validators, Validators,
} from '@angular/forms'; } from '@angular/forms';
...@@ -27,7 +27,7 @@ import { ...@@ -27,7 +27,7 @@ import {
<div class = "loading" *ngIf="(showLoader | async) === true"></div> <div class = "loading" *ngIf="(showLoader | async) === true"></div>
<div style="min-height: 500px;"> <div style="min-height: 500px;">
<form [formGroup]="formGroup"> <form [formGroup]="formGroup">
<p style="margin-top: 20px; line-height: 2em;"> Στην παρακάτω'λίστα βλέπετε τα τμήματα του σχολείου σας με την αντίστοιχη δυναμίκη τους σε αίθουσες. Παρακαλώ για να τροποποποιήσετε τη δυναμικήαυτή κάντε κλικ στον αντίστοιχο αριθμό, <p style="margin-top: 20px; line-height: 2em;"> Στην παρακάτω'λίστα βλέπετε τα τμήματα του σχολείου σας με την αντίστοιχη δυναμίκη τους σε αίθουσες. Παρακαλώ για να τροποποποιήσετε τη δυναμικήαυτή κάντε κλικ στον αντίστοιχο αριθμό,
επιλέξτε τη νέα δυναμική και πατήστε το σύμβολο <i>ok</i>. Προσοχή! Κανένα τμήμα δεν πρέπει να έχει δυναμική 0.</p> επιλέξτε τη νέα δυναμική και πατήστε το σύμβολο <i>ok</i>. Προσοχή! Κανένα τμήμα δεν πρέπει να έχει δυναμική 0.</p>
<div class="row" style="margin-top: 20px; line-height: 2em;" > <b> Οι δηλώσεις σας </b></div> <div class="row" style="margin-top: 20px; line-height: 2em;" > <b> Οι δηλώσεις σας </b></div>
...@@ -40,11 +40,11 @@ import { ...@@ -40,11 +40,11 @@ import {
<div class="col-md-4" col-md-offset-2> <div class="col-md-4" col-md-offset-2>
<label *ngIf="!isEdit" (click)="isEdit=true" (click)="setActive(i)"> {{CapacityPerCourses$.capacity}} </label> <label *ngIf="!isEdit" (click)="isEdit=true" (click)="setActive(i)"> {{CapacityPerCourses$.capacity}} </label>
<input *ngIf="isEdit && CapacityPerCourses$.globalindex === courseActive" <input *ngIf="isEdit && CapacityPerCourses$.globalindex === courseActive"
id="{{CapacityPerCourses$.globalindex}}" type="number" id="{{CapacityPerCourses$.globalindex}}" type="number"
name="{{CapacityPerCourses$.globalindex}}" value ={{CapacityPerCourses$.capacity}} name="{{CapacityPerCourses$.globalindex}}" value ={{CapacityPerCourses$.capacity}}
(change)="handleChange($event)"> (change)="handleChange($event)">
</div> </div>
<div class="col-md-1"> <div class="col-md-1">
<button *ngIf="isEdit && CapacityPerCourses$.globalindex === courseActive" type="button" class="btn-primary pull-right" <button *ngIf="isEdit && CapacityPerCourses$.globalindex === courseActive" type="button" class="btn-primary pull-right"
(click)="isEdit=false" (click) ="saveCapacity(CapacityPerCourses$.newspecialit, CapacityPerCourses$.newsector, CapacityPerCourses$.class, CapacityPerCourses$.capacity)"> (click)="isEdit=false" (click) ="saveCapacity(CapacityPerCourses$.newspecialit, CapacityPerCourses$.newsector, CapacityPerCourses$.class, CapacityPerCourses$.capacity)">
<i class="fa fa-check" aria-hidden="true"></i> <i class="fa fa-check" aria-hidden="true"></i>
...@@ -53,12 +53,12 @@ import { ...@@ -53,12 +53,12 @@ import {
</div> </div>
</li> </li>
</div> </div>
</form> </form>
</div> </div>
<div id="checksaved" (onHidden)="onHidden('#checksaved')" <div id="checksaved" (onHidden)="onHidden('#checksaved')"
class="modal fade" tabindex="-1" role="dialog" aria-hidden="true"> class="modal fade" tabindex="-1" role="dialog" aria-hidden="true">
<div class="modal-dialog modal-lg"> <div class="modal-dialog modal-lg">
<div class="modal-content"> <div class="modal-content">
...@@ -78,19 +78,13 @@ import { ...@@ -78,19 +78,13 @@ import {
</div> </div>
</div> </div>
` `
}) })
@Injectable() export default class DirectorClassCapacity implements OnInit, OnDestroy { @Injectable() export default class DirectorClassCapacity implements OnInit, OnDestroy {
public formGroup: FormGroup; public formGroup: FormGroup;
private CapacityPerCourse$: BehaviorSubject<any>; private CapacityPerCourse$: BehaviorSubject<any>;
private CapacityPerCourseSub: Subscription; private CapacityPerCourseSub: Subscription;
private saveCapacitySub: Subscription; private saveCapacitySub: Subscription;
...@@ -104,25 +98,25 @@ import { ...@@ -104,25 +98,25 @@ import {
private SchoolId; private SchoolId;
constructor(private fb: FormBuilder, constructor(private fb: FormBuilder,
private _hds: HelperDataService, private _hds: HelperDataService,
private activatedRoute: ActivatedRoute, private activatedRoute: ActivatedRoute,
private router: Router) { private router: Router) {
this.CapacityPerCourse$ = new BehaviorSubject([{}]); this.CapacityPerCourse$ = new BehaviorSubject([{}]);
this.showLoader = new BehaviorSubject(false); this.showLoader = new BehaviorSubject(false);
this.isEdit = false; this.isEdit = false;
this.School$ = new BehaviorSubject([{}]); this.School$ = new BehaviorSubject([{}]);
this.selectiontype = new BehaviorSubject(true); this.selectiontype = new BehaviorSubject(true);
this.formGroup = this.fb.group({ this.formGroup = this.fb.group({
}); });
} }
public showModal(popupMsgId):void { public showModal(popupMsgId):void {
console.log("about to show modal"); console.log("about to show modal");
//(<any>$('#distributionWaitingNotice')).modal('show'); //(<any>$('#distributionWaitingNotice')).modal('show');
...@@ -140,13 +134,13 @@ import { ...@@ -140,13 +134,13 @@ import {
ngOnDestroy() { ngOnDestroy() {
} }
ngOnInit() { ngOnInit() {
(<any>$('#checksaved')).appendTo("body"); (<any>$('#checksaved')).appendTo("body");
this.SchoolSub = this._hds.gettypeofschool().subscribe(x => { this.SchoolSub = this._hds.gettypeofschool().subscribe(x => {
this.School$.next(x); this.School$.next(x);
console.log(x[0].type, "schoolid!"); console.log(x[0].type, "schoolid!");
this.SchoolId = x[0].type; this.SchoolId = x[0].type;
if (this.SchoolId == 'ΗΜΕΡΗΣΙΟ'){ if (this.SchoolId == 'ΗΜΕΡΗΣΙΟ'){
...@@ -161,10 +155,10 @@ import { ...@@ -161,10 +155,10 @@ import {
() => console.log("Getting School ")); () => console.log("Getting School "));
this.CapacityPerCourseSub = this._hds.FindCapacityPerSchool().subscribe(x => { this.CapacityPerCourseSub = this._hds.FindCapacityPerSchool().subscribe(x => {
this.CapacityPerCourse$.next(x); this.CapacityPerCourse$.next(x);
}, },
error => { error => {
this.CapacityPerCourse$.next([{}]); this.CapacityPerCourse$.next([{}]);
...@@ -192,15 +186,15 @@ import { ...@@ -192,15 +186,15 @@ import {
if (this.newvalue <=0 || this.newvalue >10) if (this.newvalue <=0 || this.newvalue >10)
{ {
this.showModal("#checksaved"); this.showModal("#checksaved");
} }
else else
{ {
this.showLoader.next(true); this.showLoader.next(true);
this.saveCapacitySub = this._hds.saveCapacity(taxi, sect, spec, this.newvalue).subscribe(data => { this.saveCapacitySub = this._hds.saveCapacity(taxi, sect, spec, this.newvalue).subscribe(data => {
this.showLoader.next(false); this.showLoader.next(false);
this.CapacityPerCourseSub = this._hds.FindCapacityPerSchool().subscribe(x => { this.CapacityPerCourseSub = this._hds.FindCapacityPerSchool().subscribe(x => {
this.CapacityPerCourse$.next(x); this.CapacityPerCourse$.next(x);
}, },
error => { error => {
this.CapacityPerCourse$.next([{}]); this.CapacityPerCourse$.next([{}]);
...@@ -209,7 +203,7 @@ import { ...@@ -209,7 +203,7 @@ import {
() => console.log("Getting School ")); () => console.log("Getting School "));
}, },
error => { error => {
console.log("Error Saving Capacity"); console.log("Error Saving Capacity");
}, },
() =>{ () =>{
...@@ -218,17 +212,17 @@ import { ...@@ -218,17 +212,17 @@ import {
} }
} }
} }
setActive(ind) { setActive(ind) {
this.courseActive = ind; this.courseActive = ind;
console.log(this.courseActive, ind, "ind"); console.log(this.courseActive, ind, "ind");
} }
} }
This diff is collapsed.
...@@ -22,25 +22,34 @@ import { BehaviorSubject, Subscription } from 'rxjs/Rx'; ...@@ -22,25 +22,34 @@ import { BehaviorSubject, Subscription } from 'rxjs/Rx';
<br/> <br/>
Έχει υποβληθεί αίτηση για εγγραφή στην Επαγγελματική Εκπαίδευση των παρακάτω ατόμων: Έχει υποβληθεί αίτηση για εγγραφή στην Επαγγελματική Εκπαίδευση των παρακάτω ατόμων:
<div class="row" style="margin: 0px 2px 0px 2px; line-height: 2em; background-color: #ccc;">
<div class="row list-group-item" style="margin: 0px 2px 0px 2px; background-color: #ccc;">
<div class="col-md-6" style="font-size: 1em; font-weight: bold;">Επώνυμο</div> <div class="col-md-6" style="font-size: 1em; font-weight: bold;">Επώνυμο</div>
<div class="col-md-6" style="font-size: 1em; font-weight: bold; text-align: center;">Όνομα</div> <div class="col-md-6" style="font-size: 1em; font-weight: bold;">Όνομα</div>
</div> </div>
<div class="row isclickable" style="margin: 0px 2px 0px 2px; line-height: 2em;" <div class="row list-group-item isclickable" style="margin: 0px 2px 0px 2px;"
[class.oddout]="isOdd" [class.oddout]="isOdd"
[class.evenout]="isEven" [class.evenout]="isEven"
(click)="setActiveUser(UserData$.id)" (click)="setActiveUser(UserData$.id)"
[class.selectedout]="userActive === UserData$.id" [class.selectedappout]="userActive === UserData$.id"
*ngFor="let UserData$ of SubmitedApplic$ | async; let i=index; let isOdd=odd; let isEven=even" > *ngFor="let UserData$ of SubmitedApplic$ | async; let i=index; let isOdd=odd; let isEven=even" >
<div class="col-md-6" style="font-size: 0.8em; font-weight: bold;">{{UserData$.studentsurname}}</div> <div class="col-md-6" style="font-size: 0.8em; font-weight: bold;">{{UserData$.studentsurname}}</div>
<div class="col-md-6" style="font-size: 0.8em; font-weight: bold; text-align: center;">{{UserData$.name}}</div> <div class="col-md-6" style="font-size: 0.8em; font-weight: bold;">{{UserData$.name}}</div>
<div style="width: 100%">
<div *ngFor="let StudentDetails$ of SubmitedDetails$ | async" [hidden]="UserData$.id !== userActive" style="margin: 10px 10px 10px 10px;">
<div *ngFor="let StudentDetails$ of SubmitedDetails$ | async" [hidden]="UserData$.id !== userActive" style="margin: 30px 30px 30px 30px;"> <div class="row oddin" style="margin: 0px 2px 0px 2px; line-height: 2em;">
<div class="col-md-3" style="font-size: 0.8em;">Αριθμός Αίτησης</div>
<div class="col-md-3" style="font-size: 0.8em; font-weight: bold">{{StudentDetails$.applicationId}}</div>
<div class="col-md-3" style="font-size: 0.8em;">Υποβλήθηκε</div>
<div class="col-md-3" style="font-size: 0.8em; font-weight: bold">{{StudentDetails$.created}}</div>
</div>
<div class="row evenin" style="margin: 0px 2px 0px 2px; line-height: 2em;"> <div class="row evenin" style="margin: 0px 2px 0px 2px; line-height: 2em;">
<div class="col-md-12" style="font-size: 1em; font-weight: bold; text-align: center;">Στοιχεία αιτούμενου</div> <div class="col-md-12" style="font-size: 1em; font-weight: bold; text-align: center;">Στοιχεία αιτούμενου</div>
</div> </div>
<div class="row oddin" style="margin: 0px 2px 0px 2px; line-height: 2em;"> <div class="row oddin" style="margin: 0px 2px 0px 2px; line-height: 2em;">
<div class="col-md-3" style="font-size: 0.8em;">Όνομα</div> <div class="col-md-3" style="font-size: 0.8em;">Όνομα</div>
<div class="col-md-3" style="font-size: 0.8em; font-weight: bold">{{StudentDetails$.guardian_name}}</div> <div class="col-md-3" style="font-size: 0.8em; font-weight: bold">{{StudentDetails$.guardian_name}}</div>
...@@ -59,15 +68,16 @@ import { BehaviorSubject, Subscription } from 'rxjs/Rx'; ...@@ -59,15 +68,16 @@ import { BehaviorSubject, Subscription } from 'rxjs/Rx';
<div class="col-md-3" style="font-size: 0.8em;">ΤΚ - Πόλη</div> <div class="col-md-3" style="font-size: 0.8em;">ΤΚ - Πόλη</div>
<div class="col-md-3" style="font-size: 0.8em; font-weight: bold">{{StudentDetails$.regiontk}} - {{StudentDetails$.regionarea}}</div> <div class="col-md-3" style="font-size: 0.8em; font-weight: bold">{{StudentDetails$.regiontk}} - {{StudentDetails$.regionarea}}</div>
</div> </div>
<div class="row evenin" style="margin: 0px 2px 0px 2px; line-height: 2em;">
<div class="col-md-12" style="font-size: 1em; font-weight: bold; text-align: center;">Στοιχεία μαθητή</div>
</div>
<div class="row oddin" style="margin: 0px 2px 0px 2px; line-height: 2em;"> <div class="row oddin" style="margin: 0px 2px 0px 2px; line-height: 2em;">
<div class="col-md-3" style="font-size: 0.8em;">Όνομα μαθητή</div> <div class="col-md-3" style="font-size: 0.8em;">Όνομα μαθητή</div>
<div class="col-md-3" style="font-size: 0.8em; font-weight: bold">{{StudentDetails$.name}}</div> <div class="col-md-3" style="font-size: 0.8em; font-weight: bold">{{StudentDetails$.name}}</div>
<div class="col-md-3" style="font-size: 0.8em;">Επώνυμο μαθητή</div> <div class="col-md-3" style="font-size: 0.8em;">Επώνυμο μαθητή</div>
<div class="col-md-3" style="font-size: 0.8em; font-weight: bold">{{StudentDetails$.studentsurname}}</div> <div class="col-md-3" style="font-size: 0.8em; font-weight: bold">{{StudentDetails$.studentsurname}}</div>
</div> </div>
<div class="row evenin" style="margin: 0px 2px 0px 2px; line-height: 2em;">
<div class="col-md-12" style="font-size: 1em; font-weight: bold; text-align: center;">Στοιχεία μαθητή</div>
</div>
<div class="row oddin" style="margin: 0px 2px 0px 2px; line-height: 2em;"> <div class="row oddin" style="margin: 0px 2px 0px 2px; line-height: 2em;">
<div class="col-md-3" style="font-size: 0.8em;">Όνομα Πατέρα</div> <div class="col-md-3" style="font-size: 0.8em;">Όνομα Πατέρα</div>
<div class="col-md-3" style="font-size: 0.8em; font-weight: bold">{{StudentDetails$.fatherfirstname}}</div> <div class="col-md-3" style="font-size: 0.8em; font-weight: bold">{{StudentDetails$.fatherfirstname}}</div>
...@@ -92,10 +102,26 @@ import { BehaviorSubject, Subscription } from 'rxjs/Rx'; ...@@ -92,10 +102,26 @@ import { BehaviorSubject, Subscription } from 'rxjs/Rx';
<div class="col-md-3" style="font-size: 0.8em;">Σχολικό έτος τελευταίας φοίτησης</div> <div class="col-md-3" style="font-size: 0.8em;">Σχολικό έτος τελευταίας φοίτησης</div>
<div class="col-md-3" style="font-size: 0.8em; font-weight: bold">{{StudentDetails$.lastschool_schoolyear}}</div> <div class="col-md-3" style="font-size: 0.8em; font-weight: bold">{{StudentDetails$.lastschool_schoolyear}}</div>
<div class="col-md-3" style="font-size: 0.8em;">Τάξη τελευταίας φοίτησης</div> <div class="col-md-3" style="font-size: 0.8em;">Τάξη τελευταίας φοίτησης</div>
<div *ngIf="StudentDetails$.lastschool_class === 1" class="col-md-3" style="font-size: 0.8em; font-weight: bold">Α'</div> <div *ngIf="StudentDetails$.lastschool_class === '1'" class="col-md-3" style="font-size: 0.8em; font-weight: bold">Α</div>
<div *ngIf="StudentDetails$.lastschool_class === 2" class="col-md-3" style="font-size: 0.8em; font-weight: bold">Β'</div> <div *ngIf="StudentDetails$.lastschool_class === '2'" class="col-md-3" style="font-size: 0.8em; font-weight: bold">Β</div>
<div *ngIf="StudentDetails$.lastschool_class === 3" class="col-md-3" style="font-size: 0.8em; font-weight: bold">Γ'</div> <div *ngIf="StudentDetails$.lastschool_class === '3'" class="col-md-3" style="font-size: 0.8em; font-weight: bold">Γ</div>
<div *ngIf="StudentDetails$.lastschool_class === 4" class="col-md-3" style="font-size: 0.8em; font-weight: bold">Δ'</div> <div *ngIf="StudentDetails$.lastschool_class === '4'" class="col-md-3" style="font-size: 0.8em; font-weight: bold">Δ</div>
</div>
<div class="row oddin" style="margin: 0px 2px 0px 2px; line-height: 2em;">
<div class="col-md-6" style="font-size: 0.8em;">Τάξη φοίτησης για το νέο σχολικό έτος</div>
<div *ngIf="StudentDetails$.currentclass === '1'" class="col-md-6" style="font-size: 0.8em; font-weight: bold">Α</div>
<div *ngIf="StudentDetails$.currentclass === '2'" class="col-md-6" style="font-size: 0.8em; font-weight: bold">Β</div>
<div *ngIf="StudentDetails$.currentclass === '3'" class="col-md-6" style="font-size: 0.8em; font-weight: bold">Γ</div>
<div *ngIf="StudentDetails$.currentclass === '4'" class="col-md-6" style="font-size: 0.8em; font-weight: bold">Δ</div>
</div>
<div *ngIf="StudentDetails$.currentclass === '2'" class="row oddin" style="margin: 0px 2px 0px 2px; line-height: 2em;">
<div class="col-md-6" style="font-size: 0.8em;">Τομέας φοίτησης για το νέο σχολικό έτος</div>
<div class="col-md-6" style="font-size: 0.8em; font-weight: bold">{{StudentDetails$.currentsector}}</div>
</div>
<div *ngIf="StudentDetails$.currentclass === '3' || StudentDetails$.currentclass === '4'" class="row oddin" style="margin: 0px 2px 0px 2px; line-height: 2em;">
<div class="col-md-6" style="font-size: 0.8em;">Ειδικότητα φοίτησης για το νέο σχολικό έτος</div>
<div class="col-md-6" style="font-size: 0.8em; font-weight: bold">{{StudentDetails$.currentcourse}}</div>
</div> </div>
<div class="row evenin" style="margin: 0px 2px 0px 2px; line-height: 2em;"> <div class="row evenin" style="margin: 0px 2px 0px 2px; line-height: 2em;">
...@@ -109,7 +135,7 @@ import { BehaviorSubject, Subscription } from 'rxjs/Rx'; ...@@ -109,7 +135,7 @@ import { BehaviorSubject, Subscription } from 'rxjs/Rx';
</div> </div>
<div class="row" style="margin-top: 20px; margin-bottom: 20px;"> <div class="row" style="margin-top: 20px; margin-bottom: 20px;">
<div class="col-md-12 col-md-offset-8"> <div class="col-md-12">
<button type="button" class="btn-primary btn-lg pull-right isclickable" style="width: 10em;" (click)="createPdfServerSide()"> <button type="button" class="btn-primary btn-lg pull-right isclickable" style="width: 10em;" (click)="createPdfServerSide()">
<span style="font-size: 0.9em; font-weight: bold;">Εκτύπωση(PDF)&nbsp;&nbsp;&nbsp;</span> <span style="font-size: 0.9em; font-weight: bold;">Εκτύπωση(PDF)&nbsp;&nbsp;&nbsp;</span>
</button> </button>
...@@ -117,6 +143,7 @@ import { BehaviorSubject, Subscription } from 'rxjs/Rx'; ...@@ -117,6 +143,7 @@ import { BehaviorSubject, Subscription } from 'rxjs/Rx';
</div> </div>
</div> </div>
</div>
</div> </div>
</div> </div>
......
...@@ -41,7 +41,7 @@ export const CRITERIA_INIT = 'CRITERIA_INIT'; ...@@ -41,7 +41,7 @@ export const CRITERIA_INIT = 'CRITERIA_INIT';
//export const VALID_NAMES_PATTERN = '[Α-ΩΆΈΉΊΎΌΏα-ωάέήίύόώ ]*$'; //export const VALID_NAMES_PATTERN = '[Α-ΩΆΈΉΊΎΌΏα-ωάέήίύόώ ]*$';
export const VALID_NAMES_PATTERN = '[A-Za-zΑ-ΩΆΈΉΊΙΎΌΏα-ωάέήίΐύόώ ]*$'; export const VALID_NAMES_PATTERN = '[A-Za-zΑ-ΩΆΈΉΊΙΎΌΏα-ωάέήίΐύόώ ]*$';
export const VALID_ADDRESS_PATTERN = '[0-9A-Za-zΑ-ΩΆΈΉΊΎΌΏα-ωάέήίύόώ ]*$'; export const VALID_ADDRESS_PATTERN = '[0-9A-Za-zΑ-ΩΆΈΉΊΎΌΏα-ωάέήίύόώ\/. ]*$';
export const VALID_ADDRESSTK_PATTERN = '[0-9 ]*$'; 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 = '[0-9]*$'; export const VALID_DIGITS_PATTERN = '[0-9]*$';
......
...@@ -174,8 +174,10 @@ ...@@ -174,8 +174,10 @@
background-color: #eeeeee; background-color: #eeeeee;
} }
.selectedout { .selectedout {
/* background-color: #fd9665; */ background-color: #fd9665;
background-color: #cfcfcf; }
.selectedappout {
background-color: #a38d82;
} }
.changecolor .changecolor
......
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