Commit 1bc3f6c8 authored by Kostas G's avatar Kostas G

school per student in idiwtika

parent dcacf5c0
......@@ -199,8 +199,8 @@ class WSConsumer extends ControllerBase
$sCon->condition('epal_app.lastschool_schoolyear','2017-2018', '<');
$sCon->condition('epal_app.myschool_id',NULL, 'IS NOT');
$sCon->condition('epal_app.delapp',0, '=');
//$sCon->condition('epal_app.myschool_promoted',2, '=');
$sCon->condition('epal_app.myschool_promoted',NULL, 'IS');
$sCon->condition('epal_app.myschool_promoted',2, '=');
//$sCon->condition('epal_app.myschool_promoted',NULL, 'IS');
$sCon->condition('epal_app.second_period',1, '=');
$students_promotions = $sCon->execute()->fetchAll(\PDO::FETCH_OBJ);
......
......@@ -339,8 +339,8 @@ class SdeDistribution extends ControllerBase
$sCon = $this->connection->select('gel_student', 'gStudent');
$sCon->leftJoin('gel_school', 'gSchool', 'gSchool.registry_no = gStudent.lastschool_registrynumber');
$sCon->fields('gStudent', array('lastschool_registrynumber','lastschool_unittypeid', 'lastschool_class' , 'delapp','nextclass','name','am','regionarea','regiontk','regionaddress','id','second_period'))
->fields('gSchool', array('id', 'edu_admin_id', 'registry_no','extra_unitid'))
$sCon->fields('gStudent', array('lastschool_registrynumber','lastschool_unittypeid', 'lastschool_class' , 'delapp','nextclass','am','regionarea','regiontk','regionaddress','id','second_period'))
->fields('gSchool', array('id', 'name','edu_admin_id', 'registry_no','extra_unitid'))
->condition('gStudent.delapp', 0, '=')
->condition('gSchool.extra_unitid',300,'=');
$studentPerSchool = $sCon->execute()->fetchAll(\PDO::FETCH_OBJ);
......@@ -355,7 +355,7 @@ class SdeDistribution extends ControllerBase
$i++;
$crypt = new Crypt();
try {
$name_decoded = $object->name;
//$name_decoded = $object->name;
$regionaddress_decoded = $crypt->decrypt($object->regionaddress);
if ($object->regiontk !== null)
$regiontk_decoded = $crypt->decrypt($object->regiontk);
......@@ -372,6 +372,8 @@ class SdeDistribution extends ControllerBase
else{
$school_type = "ΗΜΕΡΗΣΙΟ";
}
$school_sourceName = $object->name;//$crypt->decrypt($object->name);
} catch (\Exception $e) {
......@@ -387,6 +389,7 @@ class SdeDistribution extends ControllerBase
'regionaddress' => $regionaddress_decoded,
'regionarea' => $regionarea_decoded,
'regiontk'=>$regiontk_decoded,
'source_school'=>$school_sourceName,
'school_type'=>$school_type,
'oldschool' => $this->getSchoolperStudent($object->id),
......
......@@ -652,12 +652,14 @@ import {
<div *ngIf = "(showLoader | async) === false" class="list-group-item framecolor">
<div class="col-md-5" style="font-weight: bold; font-size: 1em align:center">
<div class="col-md-1" style="font-weight: bold; font-size: 1em align:center"></div>
<div class="col-md-4" style="font-weight: bold; font-size: 1em align:center">
<div>A/A Αίτησης</div>
<div>Διεύθυνση Κατοικίας </div>
<div>T.K., Περιοχή</div>
<div>Σχολείο Προέλευσης</div>
</div>
<div class="col-md-2" style="font-weight: bold; font-size: 1em align:center">Τύπος Σχολείου</div>
<div class="col-md-2" style="font-weight: bold; font-size: 1em align:center">Τύπος Σχολείου Τοποθέτησης</div>
<div class="col-md-4" style="font-weight: bold; font-size: 1em; align:center">Σχολείο Τοποθέτησης</div>
<div class="col-md-1"></div>
</div>
......@@ -675,7 +677,8 @@ import {
<div class="col-md-4" style = "font-size: 0.8em align:left">
<div>{{studentIdiwt$.id}}</div>
<div>{{studentIdiwt$.regionaddress}}</div>
<div>{{studentIdiwt$.regiontk}}{{studentIdiwt$.regionarea}}</div>
<div>{{studentIdiwt$.regiontk}}{{studentIdiwt$.regionarea}}</div>
<div style = "font-size: 0.8em bold; align:left">{{studentIdiwt$.source_school}}</div>
</div>
<div class="col-md-2" style = "font-size: 0.8em" ><div>{{studentIdiwt$.school_type}}</div></div>
<div class="col-md-4" style = "font-size: 0.8em align:right" >
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment