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
f3fcbb25
Commit
f3fcbb25
authored
Jun 14, 2017
by
Χάρης Παπαδόπουλος
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'pde-dde-views' into 'develop'
Pde dde views See merge request !170
parents
ce24213d
0285b30b
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
47 additions
and
2 deletions
+47
-2
drupal/modules/epal/src/Controller/DirectorView.php
drupal/modules/epal/src/Controller/DirectorView.php
+28
-2
drupal/modules/oauthost/src/Controller/CBController.php
drupal/modules/oauthost/src/Controller/CBController.php
+0
-0
myschool/assets/images/default_old.png
myschool/assets/images/default_old.png
+0
-0
source/components/student-application-form/disclaimer.ts
source/components/student-application-form/disclaimer.ts
+19
-0
No files found.
drupal/modules/epal/src/Controller/DirectorView.php
View file @
f3fcbb25
...
...
@@ -446,13 +446,16 @@ class DirectorView extends ControllerBase
$SchoolCats
=
$this
->
entityTypeManager
->
getStorage
(
'eepal_school'
)
->
loadByProperties
(
array
(
'id'
=>
$schoolid
,
'edu_admin_id'
=>
$newid
));
}
$SchoolCat
=
reset
(
$SchoolCats
);
if
(
$SchoolCat
)
{
$list
=
array
();
$categ
=
$SchoolCat
->
metathesis_region
->
value
;
$operation_shift
=
$SchoolCat
->
operation_shift
->
value
;
}
// $CourseA = $this->entityTypeManager->getStorage('epal_student')->loadByProperties(array('id' => $schoolid));
$CourseA
=
$this
->
entityTypeManager
->
getStorage
(
'epal_student_class'
)
->
loadByProperties
(
array
(
'epal_id'
=>
$schoolid
));
$CourseA
=
$this
->
entityTypeManager
->
getStorage
(
'eepal_school'
)
->
loadByProperties
(
array
(
'id'
=>
$schoolid
));
if
(
$CourseA
)
{
$limit_down
=
$this
->
entityTypeManager
->
getStorage
(
'epal_class_limits'
)
->
loadByProperties
(
array
(
'name'
=>
1
,
'category'
=>
$categ
));
...
...
@@ -519,6 +522,29 @@ class DirectorView extends ControllerBase
);
}
}
if
(
$CourseC
&&
$operation_shift
!=
'ΗΜΕΡΗΣΙΟ'
)
{
$limit_down
=
$this
->
entityTypeManager
->
getStorage
(
'epal_class_limits'
)
->
loadByProperties
(
array
(
'name'
=>
4
,
'category'
=>
$categ
));
$limitdown
=
reset
(
$limit_down
);
if
(
$limitdown
)
{
$limit
=
$limitdown
->
limit_down
->
value
;
}
foreach
(
$CourseC
as
$object
)
{
$specialityid
=
$object
->
specialty_id
->
entity
->
id
();
$studentPerSchool
=
$this
->
entityTypeManager
->
getStorage
(
'epal_student_class'
)
->
loadByProperties
(
array
(
'epal_id'
=>
$schoolid
,
'specialization_id'
=>
$specialityid
,
'currentclass'
=>
4
));
$list
[]
=
array
(
'id'
=>
$object
->
specialty_id
->
entity
->
id
(),
'name'
=>
'Δ Λυκείου '
.
$object
->
specialty_id
->
entity
->
get
(
'name'
)
->
value
,
'size'
=>
sizeof
(
$studentPerSchool
),
'categ'
=>
$categ
,
'classes'
=>
4
,
'limitdown'
=>
$limit
,
);
}
}
if
(
$CourseA
||
$CourseB
||
$CourseC
)
{
return
$this
->
respondWithStatus
(
$list
,
Response
::
HTTP_OK
);
...
...
drupal/modules/oauthost/src/Controller/CBController.php
100755 → 100644
View file @
f3fcbb25
File mode changed from 100755 to 100644
myschool/assets/images/default_old.png
0 → 100644
View file @
f3fcbb25
12.2 KB
source/components/student-application-form/disclaimer.ts
View file @
f3fcbb25
...
...
@@ -52,7 +52,26 @@ import {
<p>Επίσης πρέπει να γνωρίζετε ότι η Ηλεκτρονική Δήλωση Προτίμησης υπέχει θέση Υπ. Δήλωσης του ν. 1599/1986 (Α ́ 75) και οφείλετε τα στοιχεία που καταχωρίζετε σε αυτή να είναι αληθή.</p>
<form [formGroup]="formGroup" #form>
<ul>
<li class="list-group-item isclickable" [class.oddout]="isOdd" [class.evenout]="isEven" >
<div class="col-md-12" style="font-size: 1em; font-weight: bold;" >alalalallalalala</div>
</li>
<li class="list-group-item isclickable" [class.oddout]="isOdd" [class.evenout]="isEven" >
<div class="col-md-12" style="font-size: 1em; font-weight: bold;" >alalalallalalala</div>
</li>
<li class="list-group-item isclickable" [class.oddout]="isOdd" [class.evenout]="isEven" >
<div class="col-md-12" style="font-size: 1em; font-weight: bold;" >alalalallalalala</div>
</li>
<li class="list-group-item isclickable" [class.oddout]="isOdd" [class.evenout]="isEven" >
<div class="col-md-12" style="font-size: 1em; font-weight: bold;" >alalalallalalala</div>
</li>
</ul>
<div class="row">
<div class="col-md-1 ">
<input type="checkbox" [checked]="disclaimerChecked | async" formControlName="disclaimerChecked" >
...
...
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