Commit a03844ec authored by Ασπασία Κατσή's avatar Ασπασία Κατσή

Merge branch 'develop' of https://git.minedu.gov.gr/itminedu/e-epal into mergeschools

parents b77685f8 c85e9975
......@@ -193,13 +193,13 @@
<select class="form-control" formControlName="relationtostudent">
<option value="">Παρακαλώ επιλέξτε...</option>
<!-- [selected] = "(numAppSelf | async) !== 0" -->
<option *ngIf = "(!appUpdate | async) && (numAppChildren | async) < (numChildren | async)" value="Γονέας/Κηδεμόνας">Γονέας/Κηδεμόνας</option>
<option *ngIf = "!(appUpdate | async) && (numAppChildren | async) < (numChildren | async) " value="Γονέας/Κηδεμόνας">Γονέας/Κηδεμόνας</option>
<!-- [selected] = "(numAppChildren | async) === (numChildren | async)" -->
<option *ngIf = "(!appUpdate | async) && (numAppSelf | async) === 0" value="Μαθητής">Μαθητής</option>
<option *ngIf = "!(appUpdate | async) && !(numAppSelf | async)" value="Μαθητής">Μαθητής</option>
<option *ngIf = "(appUpdate | async)" [selected]="true" value={{reltostud.value}}>{{reltostud.value}}</option>
<option *ngIf = "(appUpdate | async) && (reltostud.value != 'Γονέας/Κηδεμόνας') && (numAppChildren | async) < (numChildren | async)" value="Γονέας/Κηδεμόνας">Γονέας/Κηδεμόνας</option>
<option *ngIf = "(appUpdate | async) && (reltostud.value != 'Μαθητής') && (numAppSelf | async) === 0" value="Μαθητής">Μαθητής</option>
<option *ngIf = "(appUpdate | async) && (reltostud.value != 'Μαθητής') && !(numAppSelf | async)" value="Μαθητής">Μαθητής</option>
</select>
......
......@@ -183,7 +183,7 @@ import {
this.previousCourse.next(datamode.get("course_name"));
this.previousSchools.next(datamode.get("epal_name_choice"));
this.reltostud.next(datamode.get("relationtostudent"));
if (datamode.get("edit") === true) {
this.dataEdit.next(true);
this.lastSchName.next(datamode.get("lastschool_schoolname"));
......
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