Merge branch 'merge_to_master' into 'develop'

fixed disclaimer. added back student class

See merge request !176

source/components/student-application-form/disclaimer.ts

@@ -52,7 +52,7 @@ import {
 <p>Επίσης πρέπει να γνωρίζετε ότι η Ηλεκτρονική Δήλωση Προτίμησης υπέχει θέση Υπ. Δήλωσης του ν. 1599/1986 (Α ́ 75) και οφείλετε τα στοιχεία που καταχωρίζετε σε αυτή να είναι αληθή.</p>
 
 
-
+<form novalidate [formGroup]="formGroup" #form>
 
           <div class="row">
             <div class="col-md-1 ">

source/components/students/student.ts

+
+//used only for demo form3.ts
+export class Student {
+    constructor(
+        //public user_id: number,
+        public epaluser_id: number,
+        public name: string,
+        public studentsurname: string,
+        //public studentbirthdate: Date,
+        public regionaddress: string,
+        public regiontk: string,
+        public regionarea: string,
+        public relationtostudent: string,
+        public studentamka: string,
+        public currentclass: string,
+        ){}
+}
+
+//used by dubmit component
+export class StudentEpalChosen  {
+  constructor(
+    //public user_id: number,
+    public student_id: number,
+    public epal_id: number,
+    public choice_no: number,
+  ) {}
+}
+
+export class StudentCourseChosen  {
+  constructor(
+    public student_id: number,
+    public coursefield_id: number,
+  ) {}
+}
+
+export class StudentSectorChosen  {
+  constructor(
+    public student_id: number,
+    public sectorfield_id: number,
+  ) {}
+}
+
+export class StudentCriteriaChosen  {
+  constructor(
+    public student_id: number,
+    public income: number,
+    public criterio_id: number,
+  ) {}
+}
+
+
+/*
+export class StudentCriteria  {
+  constructor(
+    public student_id: number,
+    public orphanmono: boolean,
+    public orphantwice: boolean,
+    public threechildren: boolean,
+    public manychildren: boolean,
+    public twins: boolean,
+    public disability: boolean,
+    public studies: boolean,
+    public income: number,
+  ) {}
+}
+*/