Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Σταύρος Παπαδάκης
e-epal
Commits
61c07e07
Commit
61c07e07
authored
Mar 11, 2017
by
Open Source Developer
Browse files
conficts
parents
c5c776d3
95c962f4
Changes
41
Hide whitespace changes
Inline
Side-by-side
.gitignore
View file @
61c07e07
dist/*
source/app.settings.ts
node_modules/*
!drupal/
drupal/*
...
...
drupal/modules/epal/epal.routing.yml
View file @
61c07e07
...
...
@@ -30,3 +30,12 @@ current_user:
_controller
:
'
\Drupal\epal\Controller\CurrentUser::content'
requirements
:
_user_is_logged_in
:
'
TRUE'
epal.application_submit
:
path
:
'
/epal/appsubmit'
options
:
_auth
:
[
'
basic_auth'
]
defaults
:
_controller
:
'
\Drupal\epal\Controller\ApplicationSubmit::appSubmit'
requirements
:
_user_is_logged_in
:
'
TRUE'
drupal/modules/epal/src/Controller/ApplicationSubmit.php
0 → 100644
View file @
61c07e07
<?php
/**
* @file
* Contains \Drupal\query_example\Controller\QueryExampleController.
*/
namespace
Drupal\epal\Controller
;
use
Drupal\Core\Entity\Query\QueryFactory
;
use
Drupal\Core\Entity\EntityTypeManagerInterface
;
use
Symfony\Component\DependencyInjection\ContainerInterface
;
use
Symfony\Component\HttpFoundation\JsonResponse
;
use
Drupal\Core\Controller\ControllerBase
;
use
Symfony\Component\HttpFoundation\RedirectResponse
;
use
Drupal\Core\Database\Connection
;
use
Symfony\Component\HttpFoundation\Request
;
use
Symfony\Component\HttpFoundation\Response
;
use
Drupal\Core\Logger\LoggerChannelFactoryInterface
;
class
ApplicationSubmit
extends
ControllerBase
{
protected
$entity_query
;
protected
$entityTypeManager
;
protected
$logger
;
protected
$connection
;
public
function
__construct
(
EntityTypeManagerInterface
$entityTypeManager
,
QueryFactory
$entity_query
,
Connection
$connection
,
LoggerChannelFactoryInterface
$loggerChannel
)
{
$this
->
entityTypeManager
=
$entityTypeManager
;
$this
->
entity_query
=
$entity_query
;
$this
->
connection
=
$connection
;
$this
->
logger
=
$loggerChannel
->
get
(
'oauthost'
);
}
public
static
function
create
(
ContainerInterface
$container
)
{
return
new
static
(
$container
->
get
(
'entity.manager'
),
$container
->
get
(
'entity.query'
),
$container
->
get
(
'database'
),
$container
->
get
(
'logger.factory'
)
);
}
public
function
appSubmitWORK
()
{
$db
=
\
Drupal\Core\Database\Database
::
getConnection
();
$transaction
=
$db
->
startTransaction
();
try
{
$student
=
array
(
'epaluser_id'
=>
1
,
'name'
=>
'ΝΙΚΟΣ'
,
'studentsurname'
=>
'ΚΑΤΣΑ'
,
'status'
=>
1
);
$entity_manager
=
\
Drupal
::
entityManager
();
$entity_storage_student
=
$entity_manager
->
getStorage
(
'epal_student'
);
$entity_storage_eidikotita
=
$entity_manager
->
getStorage
(
'epal_student_course_field'
);
$entity_object
=
$entity_storage_student
->
create
(
$student
);
$entity_storage_student
->
save
(
$entity_object
);
$created_student_id
=
$entity_object
->
id
();
$eidikotita
=
array
(
'name'
=>
'record1'
,
'student_id'
=>
1
,
'coursefield_id'
=>
4
,
'status'
=>
1
);
$entity_object
=
$entity_storage_eidikotita
->
create
(
$eidikotita
);
$entity_storage_eidikotita
->
save
(
$entity_object
);
$created_eidikotites_id
=
$entity_object
->
id
();
}
catch
(
\
Exception
$e
)
{
$transaction
->
rollback
();
}
}
public
function
appSubmit2
()
{
$db
=
\
Drupal\Core\Database\Database
::
getConnection
();
$transaction
=
$db
->
startTransaction
();
try
{
$student
=
array
(
'epaluser_id'
=>
1
,
'name'
=>
'ΝΙΚΟΣ'
,
'studentsurname'
=>
'ΚΑΤΣΑ'
,
'status'
=>
1
);
$entity_manager
=
\
Drupal
::
entityManager
();
$entity_storage_student
=
$entity_manager
->
getStorage
(
'epal_student'
);
$entity_storage_course
=
$entity_manager
->
getStorage
(
'epal_student_course_field'
);
$entity_object
=
$entity_storage_student
->
create
(
$student
);
$entity_storage_student
->
save
(
$entity_object
);
$created_student_id
=
$entity_object
->
id
();
$course
=
array
(
'name'
=>
'record1'
,
'student_id'
=>
1
,
'coursefield_id'
=>
4
,
'status'
=>
1
);
$entity_object
=
$entity_storage_course
->
create
(
$course
);
$entity_storage_course
->
save
(
$entity_object
);
}
catch
(
\
Exception
$e
)
{
$transaction
->
rollback
();
}
}
public
function
appSubmit
()
{
$aitisi
=
array
();
$content
=
\
Drupal
::
request
()
->
getContent
();
if
(
!
empty
(
$content
))
{
$aitisi
=
json_decode
(
$content
,
TRUE
);
//$aitisi[0] --> student data, $aitisi[1][] --> epals chosen, $aitisi[2][] --> criteria, $aitisi[3] --> sector or course chosen
}
$db
=
\
Drupal\Core\Database\Database
::
getConnection
();
$transaction
=
$db
->
startTransaction
();
try
{
//insert records in entity: epal_student
$entity_manager
=
\
Drupal
::
entityTypeManager
();
$epaluserid
=
\
Drupal
::
currentUser
()
->
id
();
$student
=
array
(
//'epaluser_id' => $aitisi[0][epaluser_id],
'epaluser_id'
=>
$epaluserid
,
'name'
=>
$aitisi
[
0
][
name
],
'studentsurname'
=>
$aitisi
[
0
][
studentsurname
],
//'birthdate' => $aitisi[0][birthdate],
//'fatherfirstname' => $aitisi[0][fatherfirstname],
//'fathersurname' => $aitisi[0][fathersurname],
//'motherfirstname' => $aitisi[0][motherfirstname],
//'mothersurname' => $aitisi[0][mothersurname],
'studentamka'
=>
$aitisi
[
0
][
studentamka
],
'regionaddress'
=>
$aitisi
[
0
][
regionaddress
],
'regionarea'
=>
$aitisi
[
0
][
regionarea
],
'regiontk'
=>
$aitisi
[
0
][
regiontk
],
'certificatetype'
=>
$aitisi
[
0
][
certificatetype
],
//'lastam' => $aitisi[0][lastam],
'currentclass'
=>
$aitisi
[
0
][
currentclass
],
//'currentepal' => $aitisi[0][currentepal],
//'currentsector' => $aitisi[0][currentsector],
'relationtostudent'
=>
$aitisi
[
0
][
relationtostudent
],
'telnum'
=>
$aitisi
[
0
][
telnum
]
);
$entity_storage_student
=
$entity_manager
->
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
(
$aitisi
[
1
]);
$i
++
)
{
$epalchosen
=
array
(
//'name' => $aitisi[1][$i][name],
'student_id'
=>
$created_student_id
,
'epal_id'
=>
$aitisi
[
1
][
$i
][
epal_id
],
'choice_no'
=>
$aitisi
[
1
][
$i
][
choice_no
]
//'points_for_order' => $aitisi[1][$i][points_for_order],
//'distance_from_epal' => $aitisi[1][$i][distance_from_epal],
//'points_for_distance' => $aitisi[1][$i][points_for_distance],
);
$entity_storage_epalchosen
=
$entity_manager
->
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
(
$aitisi
[
2
]);
$i
++
)
{
$criteria
=
array
(
//'name' => $aitisi[2][$i][name],
'student_id'
=>
$created_student_id
,
'income'
=>
$aitisi
[
2
][
$i
][
income
],
'criterio_id'
=>
$aitisi
[
2
][
$i
][
criterio_id
],
//'moria' => $aitisi[2][$i][moria],
);
$entity_storage_criteria
=
$entity_manager
->
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
(
$aitisi
[
0
][
currentclass
]
===
"Γ' Λυκείου"
)
{
//$course = array('name'=>'record1', 'student_id' => 1, 'coursefield_id' => 4, 'status'=> 1 );
$course
=
array
(
//'name' => $aitisi[3][name],
//'student_id' => $aitis[3][student_i],
'student_id'
=>
$created_student_id
,
'coursefield_id'
=>
$aitisi
[
3
][
coursefield_id
]
);
$entity_storage_course
=
$entity_manager
->
getStorage
(
'epal_student_course_field'
);
$entity_object
=
$entity_storage_course
->
create
(
$course
);
$entity_storage_course
->
save
(
$entity_object
);
}
else
if
(
$aitisi
[
0
][
currentclass
]
===
"Β' Λυκείου"
)
{
$sector
=
array
(
//'name' => $aitisi[3][name],
'student_id'
=>
$created_student_id
,
//'student_id' => $aitis[3][student_i],
'sectorfield_id'
=>
$aitisi
[
3
][
sectorfield_id
]
);
$entity_storage_sector
=
$entity_manager
->
getStorage
(
'epal_student_sector_field'
);
$entity_object
=
$entity_storage_sector
->
create
(
$sector
);
$entity_storage_sector
->
save
(
$entity_object
);
}
$returnmsg
=
"Επιτυχής καταχώρηση στοιχείων αίτησης!"
;
$response
=
new
JsonResponse
([
$returnmsg
]);
return
$response
;
}
catch
(
\
Exception
$e
)
{
$this
->
logger
->
warning
(
$e
->
getMessage
());
$transaction
->
rollback
();
$returnmsg
=
"Αποτυχία καταχώρησης στοιχείων αίτησης!"
;
$response
=
new
JsonResponse
([
$returnmsg
]);
return
$response
;
}
}
}
drupal/modules/epal/src/Entity/EpalCriteria.php
View file @
61c07e07
...
...
@@ -180,7 +180,7 @@ class EpalCriteria extends ContentEntityBase implements EpalCriteriaInterface {
'max_length'
=>
100
,
'text_processing'
=>
0
,
))
->
set
DefaultValue
(
''
)
->
set
Required
(
true
)
->
setDisplayOptions
(
'view'
,
array
(
'label'
=>
'above'
,
'type'
=>
'string'
,
...
...
drupal/modules/epal/src/Entity/EpalStudentClass.php
View file @
61c07e07
...
...
@@ -43,8 +43,8 @@ use Drupal\user\UserInterface;
* "uid" = "user_id",
* "langcode" = "langcode",
* "status" = "status",
* "
minno" = "minno
",
* "
maxno" = "maxno
",
* "
student_id" = "student_id
",
* "
epal_id" = "epal_id
",
* },
* links = {
* "canonical" = "/admin/epal/epal_student_class/{epal_student_class}",
...
...
drupal/modules/epal/src/Entity/EpalStudentCourseField.php
View file @
61c07e07
...
...
@@ -43,7 +43,7 @@ use Drupal\user\UserInterface;
* "langcode" = "langcode",
* "status" = "status",
* "student_id" = "student_id",
* "course
F
ield_id" = "course
F
ield_id",
* "course
f
ield_id" = "course
f
ield_id",
* },
* links = {
* "canonical" = "/admin/structure/epal_student_course_field/{epal_student_course_field}",
...
...
drupal/modules/epal/src/Entity/EpalStudentMoria.php
View file @
61c07e07
...
...
@@ -42,6 +42,8 @@ use Drupal\user\UserInterface;
* "uid" = "user_id",
* "langcode" = "langcode",
* "status" = "status",
* "student_id" = "student_id",
* "criterio_id" = "criterio_id",
* },
* links = {
* "canonical" = "/admin/structure/epal_student_moria/{epal_student_moria}",
...
...
drupal/modules/epal/src/Entity/EpalStudentSectorField.php
View file @
61c07e07
...
...
@@ -42,6 +42,8 @@ use Drupal\user\UserInterface;
* "uid" = "user_id",
* "langcode" = "langcode",
* "status" = "status",
* "student_id" = "student_id",
* "sectorfield_id" = "sectorfield_id",
* },
* links = {
* "canonical" = "/admin/structure/epal_student_sector_field/{epal_student_sector_field}",
...
...
drupal/modules/epaldeploysystem/config/install/rest.resource.entity.epal_class_limits.yml
0 → 100644
View file @
61c07e07
langcode
:
el
status
:
true
dependencies
:
module
:
-
basic_auth
-
epal
-
hal
-
serialization
-
user
id
:
entity.epal_class_limits
plugin_id
:
'
entity:epal_class_limits'
granularity
:
method
configuration
:
GET
:
supported_formats
:
-
hal_json
-
json
-
xml
supported_auth
:
-
basic_auth
-
cookie
POST
:
supported_formats
:
-
hal_json
-
json
-
xml
supported_auth
:
-
basic_auth
-
cookie
DELETE
:
supported_formats
:
-
hal_json
-
json
-
xml
supported_auth
:
-
basic_auth
-
cookie
PATCH
:
supported_formats
:
-
hal_json
-
json
-
xml
supported_auth
:
-
basic_auth
-
cookie
drupal/modules/epaldeploysystem/config/install/rest.resource.entity.epal_criteria.yml
0 → 100644
View file @
61c07e07
langcode
:
el
status
:
true
dependencies
:
module
:
-
basic_auth
-
epal
-
hal
-
serialization
-
user
id
:
entity.epal_criteria
plugin_id
:
'
entity:epal_criteria'
granularity
:
method
configuration
:
GET
:
supported_formats
:
-
hal_json
-
json
-
xml
supported_auth
:
-
basic_auth
-
cookie
POST
:
supported_formats
:
-
hal_json
-
json
-
xml
supported_auth
:
-
basic_auth
-
cookie
DELETE
:
supported_formats
:
-
hal_json
-
json
-
xml
supported_auth
:
-
basic_auth
-
cookie
PATCH
:
supported_formats
:
-
hal_json
-
json
-
xml
supported_auth
:
-
basic_auth
-
cookie
drupal/modules/epaldeploysystem/config/install/rest.resource.entity.epal_student_moria.yml
0 → 100644
View file @
61c07e07
langcode
:
el
status
:
true
dependencies
:
module
:
-
basic_auth
-
epal
-
hal
-
serialization
-
user
id
:
entity.epal_student_moria
plugin_id
:
'
entity:epal_student_moria'
granularity
:
method
configuration
:
GET
:
supported_formats
:
-
hal_json
-
json
-
xml
supported_auth
:
-
basic_auth
-
cookie
POST
:
supported_formats
:
-
hal_json
-
json
-
xml
supported_auth
:
-
basic_auth
-
cookie
DELETE
:
supported_formats
:
-
hal_json
-
json
-
xml
supported_auth
:
-
basic_auth
-
cookie
PATCH
:
supported_formats
:
-
hal_json
-
json
-
xml
supported_auth
:
-
basic_auth
-
cookie
drupal/modules/epaldeploysystem/config/install/rest.resource.entity.epal_student_sector_field.yml
0 → 100644
View file @
61c07e07
langcode
:
el
status
:
true
dependencies
:
module
:
-
basic_auth
-
epal
-
hal
-
serialization
-
user
id
:
entity.epal_student_sector_field
plugin_id
:
'
entity:epal_student_sector_field'
granularity
:
method
configuration
:
GET
:
supported_formats
:
-
hal_json
-
json
-
xml
supported_auth
:
-
basic_auth
-
cookie
POST
:
supported_formats
:
-
hal_json
-
json
-
xml
supported_auth
:
-
basic_auth
-
cookie
DELETE
:
supported_formats
:
-
hal_json
-
json
-
xml
supported_auth
:
-
basic_auth
-
cookie
PATCH
:
supported_formats
:
-
hal_json
-
json
-
xml
supported_auth
:
-
basic_auth
-
cookie
myschool/main.scss
View file @
61c07e07
.main-wrapper
{
background
:
#FFF
none
repeat-y
0
0
;
background
:
#FFF
none
repeat-y
0
0
;
min-height
:
calc
(
100vh
-
220px
);
#content
{
zoom
:
1
;
...
...
@@ -39,7 +39,7 @@
}
.left-choices
{
h4
{
h4
{
font-weight
:
bold
;
font-size
:
1rem
;
...
...
@@ -51,9 +51,9 @@
border
:
none
!
important
;
width
:
200px
;
padding
:
5px
10px
;
}
}
...
...
@@ -75,13 +75,13 @@
li
.list-group-item
{
color
:
black
;
background-color
:
white
;
//
background-color: white;
border
:
none
!
important
;
padding
:
0
.3rem
0
.3rem
!
important
;
h5
{
font-size
:
1rem
;
}
}
...
...
@@ -92,11 +92,11 @@
@include
media-breakpoint-up
(
md
)
{
@include
media-breakpoint-up
(
md
)
{
.main-wrapper
{
#content
{
padding
:
0
10px
10px
;
box-shadow
:
0
0
20px
#888888
;
}
}
}
\ No newline at end of file
}
source/actions/logininfo.actions.ts
View file @
61c07e07
import
{
LOGININFO_SAVE
,
LOGININFO_RECEIVED
}
from
'
../constants
'
;
import
{
LOGININFO_INIT
}
from
'
../constants
'
;
import
{
Injectable
}
from
'
@angular/core
'
;
import
{
NgRedux
}
from
'
ng2-redux
'
;
import
{
IAppState
}
from
'
../store
'
;
...
...
@@ -20,6 +21,15 @@ export class LoginInfoActions {
}
});
});
}
initLoginInfo
=
()
=>
{
return
this
.
_ngRedux
.
dispatch
({
type
:
LOGININFO_INIT
,
payload
:
{
}
});
};
}
}
\ No newline at end of file
source/actions/regionschools.actions.ts
View file @
61c07e07
import
{
REGIONSCHOOLS_RECEIVED
,
REGIONSCHOOLS_SELECTED_SAVE
,
REGIONSCHOOLS_ORDER_SAVE
}
from
'
../constants
'
;
import
{
REGIONSCHOOLS_RECEIVED
,
REGIONSCHOOLS_SELECTED_SAVE
,
REGIONSCHOOLS_ORDER_SAVE
,
REGIONSCHOOLS_INIT
}
from
'
../constants
'
;
import
{
Injectable
}
from
'
@angular/core
'
;
import
{
NgRedux
}
from
'
ng2-redux
'
;
import
{
IAppState
}
from
'
../store
'
;
...
...
@@ -25,6 +25,14 @@ export class RegionSchoolsActions {
}
};
initRegionSchools
=
()
=>
{
return
this
.
_ngRedux
.
dispatch
({
type
:
REGIONSCHOOLS_INIT
,
payload
:
{