Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Χάρης Παπαδόπουλος
e-epal
Commits
ed2f86f3
Commit
ed2f86f3
authored
Jun 14, 2017
by
Χάρης Παπαδόπουλος
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'merge_to_master' into 'develop'
fixed disclaimer. added back student class See merge request !176
parents
5f2641f9
eaa8f7c5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
67 additions
and
1 deletion
+67
-1
source/components/student-application-form/disclaimer.ts
source/components/student-application-form/disclaimer.ts
+1
-1
source/components/students/student.ts
source/components/students/student.ts
+66
-0
No files found.
source/components/student-application-form/disclaimer.ts
View file @
ed2f86f3
...
...
@@ -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
0 → 100644
View file @
ed2f86f3
//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,
) {}
}
*/
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment