Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
e-epal
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Σταύρος Παπαδάκης
e-epal
Commits
e4897f30
Commit
e4897f30
authored
May 30, 2017
by
Χάρης Παπαδόπουλος
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
restructured application form. Added new fields in backend(WIP)
parent
765eaf59
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
472 additions
and
376 deletions
+472
-376
drupal/modules/epal/src/Controller/ApplicationSubmit.php
drupal/modules/epal/src/Controller/ApplicationSubmit.php
+49
-65
drupal/modules/epal/src/Entity/EpalStudent.php
drupal/modules/epal/src/Entity/EpalStudent.php
+384
-260
source/components/student-application-form/application.submit.ts
...components/student-application-form/application.submit.ts
+39
-51
No files found.
drupal/modules/epal/src/Controller/ApplicationSubmit.php
View file @
e4897f30
...
...
@@ -39,13 +39,11 @@ class ApplicationSubmit extends ControllerBase {
}
public
function
appSubmit
(
Request
$request
)
{
if
(
!
$request
->
isMethod
(
'POST'
))
{
return
$this
->
respondWithStatus
([
"error_code"
=>
2001
],
Response
::
HTTP_METHOD_NOT_ALLOWED
);
}
$applicationForm
=
array
();
$content
=
$request
->
getContent
();
...
...
@@ -58,96 +56,83 @@ class ApplicationSubmit extends ControllerBase {
"error_code"
=>
5002
],
Response
::
HTTP_BAD_REQUEST
);
}
$transaction
=
$this
->
connection
->
startTransaction
();
try
{
//insert records in entity: epal_student
$authToken
=
$request
->
headers
->
get
(
'PHP_AUTH_USER'
);
$epalUsers
=
$this
->
entityTypeManager
->
getStorage
(
'epal_users'
)
->
loadByProperties
(
array
(
'authtoken'
=>
$authToken
));
$epalUser
=
reset
(
$epalUsers
);
if
(
!
$epalUser
){
return
$this
->
respondWithStatus
([
"error_code"
=>
4003
],
Response
::
HTTP_FORBIDDEN
);
}
$student
=
array
(
'epaluser_id'
=>
$epalUser
->
id
(),
'name'
=>
$applicationForm
[
0
][
name
],
'studentsurname'
=>
$applicationForm
[
0
][
studentsurname
],
'birthdate'
=>
$applicationForm
[
0
][
studentbirthdate
],
'fatherfirstname'
=>
$applicationForm
[
0
][
fatherfirstname
],
'fathersurname'
=>
$applicationForm
[
0
][
fathersurname
],
'motherfirstname'
=>
$applicationForm
[
0
][
motherfirstname
],
'mothersurname'
=>
$applicationForm
[
0
][
mothersurname
],
'studentamka'
=>
$applicationForm
[
0
][
studentamka
],
'regionaddress'
=>
$applicationForm
[
0
][
regionaddress
],
'regionarea'
=>
$applicationForm
[
0
][
regionarea
],
'regiontk'
=>
$applicationForm
[
0
][
regiontk
],
'certificatetype'
=>
$applicationForm
[
0
][
certificatetype
],
//'lastam' => $applicationForm[0][lastam],
'currentclass'
=>
$applicationForm
[
0
][
currentclass
],
'guardian_name'
=>
$applicationForm
[
0
][
cu_name
],
'guardian_surname'
=>
$applicationForm
[
0
][
cu_surname
],
'guardian_fathername'
=>
$applicationForm
[
0
][
cu_fathername
],
'guardian_mothername'
=>
$applicationForm
[
0
][
cu_mothername
],
'agreement'
=>
$applicationForm
[
0
][
disclaimer_checked
],
//'currentepal' => $applicationForm[0][currentepal],
//'currentsector' => $applicationForm[0][currentsector],
'points'
=>
$applicationForm
[
0
][
points
],
'relationtostudent'
=>
$applicationForm
[
0
][
relationtostudent
],
'telnum'
=>
$applicationForm
[
0
][
telnum
]
'langcode'
=>
'el'
,
'student_record_id'
=>
0
,
'sex'
=>
0
,
'fathersurname'
=>
''
,
'mothersurname'
=>
''
,
'studentamka'
=>
''
,
'lastam'
=>
''
,
'graduate_school'
=>
0
,
'apolytirio_id'
=>
''
,
'currentsector'
=>
''
,
'currentcourse'
=>
''
,
'points'
=>
0
,
'user_id'
=>
$epalUser
->
user_id
->
target_id
,
'epaluser_id'
=>
$epalUser
->
id
(),
'name'
=>
$applicationForm
[
0
][
'name'
],
'studentsurname'
=>
$applicationForm
[
0
][
'studentsurname'
],
'birthdate'
=>
$applicationForm
[
0
][
'studentbirthdate'
],
'fatherfirstname'
=>
$applicationForm
[
0
][
'fatherfirstname'
],
'motherfirstname'
=>
$applicationForm
[
0
][
'motherfirstname'
],
'regionaddress'
=>
$applicationForm
[
0
][
'regionaddress'
],
'regionarea'
=>
$applicationForm
[
0
][
'regionarea'
],
'regiontk'
=>
$applicationForm
[
0
][
'regiontk'
],
'certificatetype'
=>
$applicationForm
[
0
][
'certificatetype'
],
'graduation_year'
=>
$applicationForm
[
0
][
'graduation_year'
],
'lastschool_registrynumber'
=>
$applicationForm
[
0
][
'lastschool_registrynumber'
],
'lastschool_schoolyear'
=>
$applicationForm
[
0
][
'lastschool_schoolyear'
],
'lastschool_class'
=>
$applicationForm
[
0
][
'lastschool_class'
],
'currentepal'
=>
$applicationForm
[
0
][
'currentepal'
],
'currentclass'
=>
$applicationForm
[
0
][
'currentclass'
],
'guardian_name'
=>
$applicationForm
[
0
][
'cu_name'
],
'guardian_surname'
=>
$applicationForm
[
0
][
'cu_surname'
],
'guardian_fathername'
=>
$applicationForm
[
0
][
'cu_fathername'
],
'guardian_mothername'
=>
$applicationForm
[
0
][
'cu_mothername'
],
'agreement'
=>
$applicationForm
[
0
][
'disclaimer_checked'
],
'relationtostudent'
=>
$applicationForm
[
0
][
'relationtostudent'
],
'telnum'
=>
$applicationForm
[
0
][
'telnum'
]
);
if
((
$errorCode
=
$this
->
validateStudent
(
$student
))
>
0
)
{
return
$this
->
respondWithStatus
([
"error_code"
=>
$errorCode
],
Response
::
HTTP_OK
);
}
$entity_storage_student
=
$this
->
entityTypeManager
->
getStorage
(
'epal_student'
);
$entity_object
=
$entity_storage_student
->
create
(
$student
);
$entity_storage_student
->
save
(
$entity_object
);
$created_student_id
=
$entity_object
->
id
();
//insert records in entity: epal_student_epal_chosen
for
(
$i
=
0
;
$i
<
sizeof
(
$applicationForm
[
1
]);
$i
++
)
{
$epalchosen
=
array
(
//'name' => $applicationForm[1][$i][name],
'student_id'
=>
$created_student_id
,
'epal_id'
=>
$applicationForm
[
1
][
$i
][
epal_id
],
'choice_no'
=>
$applicationForm
[
1
][
$i
][
choice_no
]
//'points_for_order' => $applicationForm[1][$i][points_for_order],
//'distance_from_epal' => $applicationForm[1][$i][distance_from_epal],
//'points_for_distance' => $applicationForm[1][$i][points_for_distance],
'epal_id'
=>
$applicationForm
[
1
][
$i
][
'epal_id'
],
'choice_no'
=>
$applicationForm
[
1
][
$i
][
'choice_no'
]
);
$entity_storage_epalchosen
=
$this
->
entityTypeManager
->
getStorage
(
'epal_student_epal_chosen'
);
$entity_object
=
$entity_storage_epalchosen
->
create
(
$epalchosen
);
$entity_storage_epalchosen
->
save
(
$entity_object
);
}
//insert records in entity: epal_student_moria
for
(
$i
=
0
;
$i
<
sizeof
(
$applicationForm
[
2
]);
$i
++
)
{
$criteria
=
array
(
//'name' => $applicationForm[2][$i][name],
'student_id'
=>
$created_student_id
,
'income'
=>
$applicationForm
[
2
][
$i
][
income
],
'criterio_id'
=>
$applicationForm
[
2
][
$i
][
criterio_id
],
//'moria' => $applicationForm[2][$i][moria],
);
$entity_storage_criteria
=
$this
->
entityTypeManager
->
getStorage
(
'epal_student_moria'
);
$entity_object
=
$entity_storage_criteria
->
create
(
$criteria
);
$entity_storage_criteria
->
save
(
$entity_object
);
}
//insert records in entity: epal_student_course_field (αφορά μαθητές Γ' Λυκείου)
// or: epal_student_sector_field (αφορά μαθητές Β' Λυκείου)
//if ($applicationForm[0][currentclass] === "Γ' Λυκείου") {
if
(
$applicationForm
[
0
][
currentclass
]
===
"3"
||
$applicationForm
[
0
][
currentclass
]
===
"4"
)
{
//$course = array('name
if
(
$applicationForm
[
0
][
'currentclass'
]
===
"3"
||
$applicationForm
[
0
][
'currentclass'
]
===
"4"
)
{
$course
=
array
(
//'name' => $aitisi[3][name],
//'student_id' => $aitis[3][student_i],
'student_id'
=>
$created_student_id
,
'coursefield_id'
=>
$applicationForm
[
3
][
coursefield_id
]
'coursefield_id'
=>
$applicationForm
[
3
][
'coursefield_id'
]
);
$entity_storage_course
=
$this
->
entityTypeManager
->
getStorage
(
'epal_student_course_field'
);
...
...
@@ -155,13 +140,10 @@ class ApplicationSubmit extends ControllerBase {
$entity_storage_course
->
save
(
$entity_object
);
}
//else if ($applicationForm[0][currentclass] === "Β' Λυκείου") {
else
if
(
$applicationForm
[
0
][
currentclass
]
===
"2"
)
{
else
if
(
$applicationForm
[
0
][
'currentclass'
]
===
"2"
)
{
$sector
=
array
(
//'name' => $applicationForm[3][name],
'student_id'
=>
$created_student_id
,
//'student_id' => $aitis[3][student_i],
'sectorfield_id'
=>
$applicationForm
[
3
][
sectorfield_id
]
'sectorfield_id'
=>
$applicationForm
[
3
][
'sectorfield_id'
]
);
$entity_storage_sector
=
$this
->
entityTypeManager
->
getStorage
(
'epal_student_sector_field'
);
...
...
@@ -174,7 +156,9 @@ class ApplicationSubmit extends ControllerBase {
}
catch
(
\
Exception
$e
)
{
print_r
(
$e
->
getMessage
());
$this
->
logger
->
warning
(
$e
->
getMessage
());
$transaction
->
rollback
();
return
$this
->
respondWithStatus
([
"error_code"
=>
5001
...
...
drupal/modules/epal/src/Entity/EpalStudent.php
View file @
e4897f30
This diff is collapsed.
Click to expand it.
source/components/student-application-form/application.submit.ts
View file @
e4897f30
...
...
@@ -15,7 +15,7 @@ import { REGION_SCHOOLS_INITIAL_STATE } from '../../store/regionschools/regionsc
import
{
EPALCLASSES_INITIAL_STATE
}
from
'
../../store/epalclasses/epalclasses.initial-state
'
;
import
{
SECTOR_COURSES_INITIAL_STATE
}
from
'
../../store/sectorcourses/sectorcourses.initial-state
'
;
import
{
SECTOR_FIELDS_INITIAL_STATE
}
from
'
../../store/sectorfields/sectorfields.initial-state
'
;
import
{
Student
,
Student
EpalChosen
,
StudentCourseChosen
,
StudentSectorChosen
}
from
'
../students/student
'
;
import
{
StudentEpalChosen
,
StudentCourseChosen
,
StudentSectorChosen
}
from
'
../students/student
'
;
import
{
AppSettings
}
from
'
../../app.settings
'
;
import
{
ILoginInfo
,
ILoginInfoToken
}
from
'
../../store/logininfo/logininfo.types
'
;
import
{
LOGININFO_INITIAL_STATE
}
from
'
../../store/logininfo/logininfo.initial-state
'
;
...
...
@@ -54,7 +54,7 @@ import { HelperDataService } from '../../services/helper-data-service';
<!-- <application-preview-select></application-preview-select> -->
<div *ngFor="let loginInfoRow$ of loginInfo$ | async; let i=index;"
style = "margin-bottom: 20px;"
>
<div *ngFor="let loginInfoRow$ of loginInfo$ | async; let i=index;" >
<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>
...
...
@@ -71,33 +71,17 @@ import { HelperDataService } from '../../services/helper-data-service';
<div class="col-md-3" style="font-size: 0.8em; font-weight: bold">{{ loginInfoRow$.cu_mothername }}</div>
</div>
</div>
<table>
<tr>
<td>
<div class="form-group">
<label for="regionaddress">Διεύθυνση κατοικίας αιτούμενου κηδεμόνα</label><p class="form-control" id = "regionaddress" style="border:1px solid #eceeef;"> {{studentDataField$.regionaddress}} </p>
</div>
</td>
<td>
<div class="form-group">
<label for="regiontk">TK </label><p class="form-control" id = "regiontk" style="border:1px solid #eceeef;"> {{studentDataField$.regiontk}} </p>
</div>
</td>
<td>
<div class="form-group">
<label for="regionarea">Πόλη/Περιοχή</label><p class="form-control" id = "regionarea" style="border:1px solid #eceeef;"> {{studentDataField$.regionarea}} </p>
</div>
</td>
</tr>
</table>
<div *ngFor="let studentDataField$ of studentDataFields$ | async;">
<div class="row oddin" style="margin: 0px 2px 20px 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">{{studentDataField$.regionaddress}}</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">{{studentDataField$.regiontk}} - {{studentDataField$.regionarea}}</div>
</div>
<ul class="list-group left-side-view" style="margin-bottom: 20px;">
<li class="list-group-item active">
Στοιχεία μαθητή
</li>
</ul>
<div class="row evenin" style="margin: 20px 2px 10px 2px; line-height: 2em;">
<div class="col-md-12" style="font-size: 1.5em; font-weight: bold; text-align: center;">Στοιχεία μαθητή</div>
</div>
<div><label for="name">Όνομα μαθητή</label> <p class="form-control" id="name" style="border:1px solid #eceeef;"> {{studentDataField$.name}} </p> </div>
<div><label for="studentsurname">Επώνυμο μαθητή</label> <p class="form-control" id = "studentsurname" style="border:1px solid #eceeef;"> {{studentDataField$.studentsurname}} </p></div>
<div><label for="fatherfirstname">Όνομα Πατέρα</label> <p class="form-control" id = "fatherfirstname" style="border:1px solid #eceeef;"> {{studentDataField$.fatherfirstname}} </p></div>
...
...
@@ -108,21 +92,7 @@ import { HelperDataService } from '../../services/helper-data-service';
<div><label for="telnum">Τηλέφωνο επικοινωνίας</label> <p class="form-control" id = "telnum" style="border:1px solid #eceeef;"> {{studentDataField$.telnum}} </p></div>
<div><label for="relationtostudent">Η αίτηση γίνεται από</label> <p class="form-control" id = "relationtostudent" style="border:1px solid #eceeef;"> {{studentDataField$.relationtostudent}} </p></div>
<!-- <ul class="list-group left-side-view" style="margin-bottom: 20px;">
<li class="list-group-item active">
<div *ngIf="currentUrl === '/application-submit'">
Κοινωνικά/Εισοδηματικά Κριτήρια
</div>
</li>
</ul> -->
</div>
<!-- <div *ngFor="let criteriaField$ of criteriaFields$ | async;">
<div *ngIf="criteriaField$.selected === true">
{{criteriaField$.name}}
</div>
</div> -->
<div class="row" style="margin-top: 20px; margin-bottom: 20px;">
<div class="col-md-6">
<button type="button" class="btn-primary btn-lg pull-left" (click)="navigateBack()">
...
...
@@ -143,7 +113,6 @@ import { HelperDataService } from '../../services/helper-data-service';
@
Injectable
()
export
default
class
ApplicationSubmit
implements
OnInit
{
private
authToken
;
private
student
;
private
epalSelected
:
Array
<
number
>
=
new
Array
();
private
epalSelectedOrder
:
Array
<
number
>
=
new
Array
();
private
courseSelected
;
...
...
@@ -234,12 +203,6 @@ import { HelperDataService } from '../../services/helper-data-service';
}).
subscribe
(
this
.
epalclasses$
);
this
.
studentDataFieldsSub
=
this
.
_ngRedux
.
select
(
state
=>
{
if
(
state
.
studentDataFields
.
size
>
0
)
{
state
.
studentDataFields
.
reduce
(({},
studentDataField
)
=>
{
this
.
student
=
studentDataField
;
return
studentDataField
;
},
{});
}
return
state
.
studentDataFields
;
}).
subscribe
(
this
.
studentDataFields$
);
...
...
@@ -304,14 +267,39 @@ import { HelperDataService } from '../../services/helper-data-service';
let
aitisiObj
:
Array
<
any
>
=
[];
let
epalObj
:
Array
<
StudentEpalChosen
>
=
[];
aitisiObj
[
0
]
=
this
.
student
;
let
std
=
this
.
studentDataFields$
.
getValue
().
get
(
0
);
console
.
log
(
std
);
aitisiObj
[
0
]
=
<
any
>
{};
aitisiObj
[
0
].
name
=
std
.
name
;
aitisiObj
[
0
].
studentsurname
=
std
.
studentsurname
;
aitisiObj
[
0
].
studentbirthdate
=
std
.
studentbirthdate
;
aitisiObj
[
0
].
fatherfirstname
=
std
.
fatherfirstname
;
aitisiObj
[
0
].
motherfirstname
=
std
.
motherfirstname
;
aitisiObj
[
0
].
regionaddress
=
std
.
regionaddress
;
aitisiObj
[
0
].
regionarea
=
std
.
regionarea
;
aitisiObj
[
0
].
regiontk
=
std
.
regiontk
;
aitisiObj
[
0
].
certificatetype
=
std
.
certificatetype
;
// aitisiObj[0].graduation_year = std.graduation_year;
// aitisiObj[0].lastschool_registrynumber = std.lastschool_registrynumber;
// aitisiObj[0].lastschool_schoolyear = std.lastschool_schoolyear;
// aitisiObj[0].lastschool_class = std.lastschool_class;
// aitisiObj[0].currentepal = std.currentepal;
aitisiObj
[
0
].
graduation_year
=
0
;
aitisiObj
[
0
].
lastschool_registrynumber
=
''
;
aitisiObj
[
0
].
lastschool_schoolyear
=
'
2015-2016
'
;
aitisiObj
[
0
].
lastschool_class
=
'
1
'
;
aitisiObj
[
0
].
currentepal
=
154
;
aitisiObj
[
0
].
relationtostudent
=
std
.
relationtostudent
;
aitisiObj
[
0
].
telnum
=
std
.
telnum
;
aitisiObj
[
0
].
cu_name
=
this
.
cu_name
;
aitisiObj
[
0
].
cu_surname
=
this
.
cu_surname
;
aitisiObj
[
0
].
cu_fathername
=
this
.
cu_fathername
;
aitisiObj
[
0
].
cu_mothername
=
this
.
cu_mothername
;
aitisiObj
[
0
].
disclaimer_checked
=
this
.
disclaimer_checked
;
aitisiObj
[
0
][
'
currentclass
'
]
=
this
.
classSelected
;
aitisiObj
[
0
][
'
points
'
]
=
this
.
totalPoints
;
aitisiObj
[
0
].
currentclass
=
this
.
classSelected
;
for
(
let
i
=
0
;
i
<
this
.
epalSelected
.
length
;
i
++
)
epalObj
[
i
]
=
new
StudentEpalChosen
(
null
,
this
.
epalSelected
[
i
]
,
this
.
epalSelectedOrder
[
i
]);
...
...
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