diafora

parent 094efcfe
......@@ -3736,7 +3736,7 @@ public function getSchoolGel(Request $request)
);
if ($operation_shift != 'ΗΜΕΡΗΣΙΟ'){
$sCon = $this->connection->select('gel_student', 'gStudent');
$sCon = $this->connection->select('gel_student', 'gStudent');
$sCon->leftJoin('gelstudenthighschool', 'gSchool', 'gSchool.id = gStudent.id');
$sCon->fields('gStudent', array('id','lastschool_registrynumber','nextclass', 'delapp','name','studentsurname' ,'fatherfirstname' ,'motherfirstname' ,'regionaddress' ,'regiontk' ,'regionarea','telnum' ,'guardian_name' ,'guardian_surname','guardian_fathername ','guardian_mothername', 'birthdate', 'lastschool_schoolname','lastschool_class','lastschool_schoolyear','directorconfirm', 'created','myschool_promoted' ))
->fields('gSchool', array('id','school_id','taxi'))
......@@ -3772,10 +3772,6 @@ public function getSchoolGel(Request $request)
);
}
}
++$i;
......
......@@ -38,11 +38,59 @@ import { IAppState } from "../../store/store";
[class.oddout]="isOdd"
[class.evenout]="isEven" [class.selectedout]="pdeActive === PdeNames$.id" >
<div class="col-md-12">{{PdeNames$.name}}</div>
<div class = "row" [hidden]="PdeNames$.id !== pdeActive" style="margin: 0px 2px 0px 2px;">
<p style="margin-top: 20px; line-height: 2em;">Στην παρακάτω λίστα βλέπετε τα σχολεία ευθύνης σας.
<br/>Επιλέξτε σχολείο για να εμφανιστούν τα ολιγομελή τμήματα του σχολείου.</p>
<div class="row" style="margin-top: 20px; line-height: 2em;"><p><strong>Τα τμήματα</strong></p></div>
<div *ngFor="let SchoolNames$ of SchoolsPerPerf$ | async; let i=index; let isOdd=odd; let isEven=even" style="font-size: 0.8em; font-weight: bold;">
<li class="list-group-item isclickable" (click)="setActiveRegion(SchoolNames$.id)"
[class.oddout]="isOdd"
[class.evenout]="isEven" [class.selectedout]="regionActive === SchoolNames$.id" >
<div [class.changelistcolor]= "SchoolNames$.status === false" class="col-md-12">{{SchoolNames$.name}}</div>
<div class = "row" [hidden]="SchoolNames$.id !== regionActive" style="margin: 0px 2px 0px 2px;">
<div class="col-md-8">Τμήματα</div>
<div class="col-md-4">Έγκριση Ολιγομελούς</div>
</div>
</li>
<p></p>
<div class = "row" [hidden]="SchoolNames$.id !== regionActive" style="margin: 0px 2px 0px 2px;">
<div class="col-md-8">&nbsp;</div>
<div [hidden]="SchoolNames$.id !== regionActive" class="col-md-4 pull-right" style="color: black;" >
<span aria-hidden="true">
<button type="button" class="btn-primary btn-sm pull-right" (click) ="setActiveRegion(SchoolNames$.id)">Κλείσιμο</button>
</span>
</div>
</div>
<div class = "row" *ngFor="let CoursesNames$ of CoursesPerPerf$ | async; let j=index; let isOdd2=odd; let isEven2=even"
[class.oddin]="isOdd2" [class.evenin]="isEven2" [class.changecolor]="calccolor(CoursesNames$.size,CoursesNames$.limitdown)"
[class.changecolorbalck]="calccolor(CoursesNames$.limitdown, CoursesNames$.size)"
[class.selectedappout]="regionActive === j"
[hidden]="(SchoolNames$.id !== regionActive) ||(calccolor(CoursesNames$.size,CoursesNames$.limitdown) === false) "
style="margin: 0px 2px 0px 2px;" >
<div class="col-md-8">{{CoursesNames$.name}}</div>
<div class="col-md-4">
<strong><label>Έγκριση Ολιγομελούς:</label> </strong>
<select class="form-control pull-right" #cb name="{{CoursesNames$.id}}" (change)="confirmApproved(CoursesNames$.classes,CoursesNames$.approved_id, cb, j)" >
<option value="1" [selected]="CoursesNames$.approved === '1' ">Ναι</option>
<option value="2" [selected]="CoursesNames$.approved === '0' ">Όχι</option>
</select>
</div>
</div>
</div>
</div>
</li>
</div>
<div class = "row" [hidden]="PdeNames$.id !== pdeActive" style="margin: 0px 2px 0px 2px;">
<div class = "row" [hidden]="PdeNames$.id !== pdeActive" style="margin: 0px 2px 0px 2px;">
<p style="margin-top: 20px; line-height: 2em;">Στην παρακάτω λίστα βλέπετε τα σχολεία ευθύνης σας.
<br/>Επιλέξτε σχολείο για να εμφανιστούν τα ολιγομελή τμήματα του σχολείου.</p>
<div class="row" style="margin-top: 20px; line-height: 2em;"><p><strong>Τα τμήματα</strong></p></div>
......
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