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

Merge branch 'mergeschools' into 'develop'

merge-undomerge

See merge request !286
parents 79352335 ce54838c
......@@ -45,7 +45,7 @@ import { FormBuilder, FormGroup } from "@angular/forms";
<div *ngFor="let CoursesforMerges$ of School$ | async; let j=index; let isOdd=odd;
let isEven=even" class="row list-group-item isclickable"
[class.oddout]="isOdd" [class.evenout]="isEven" style="margin: 0px 2px 0px 2px;"
(click)="setActiveSchoolforCClass(CoursesforMerges$.id)"
(click)="setActiveCourses(CoursesforMerges$.id)"
(click)="findmergingcourse(CoursesforMerges$.id,1,0,0)">
......@@ -154,7 +154,7 @@ import { FormBuilder, FormGroup } from "@angular/forms";
class="row list-group-item isclickable"
[class.oddout]="isOdd" [class.evenout]="isEven"
style="margin: 0px 2px 0px 2px;"
(click)="setActiveSchoolforCClass(CoursesforMerges$.id)"
(click)="setActiveCourses(CoursesforMerges$.id)"
(click)="findmergingcourse(CoursesforMerges$.id,3,SectorNames$.id, Courses$.id)">
<div class="col-md-8" style=" font-weight: bold;" >{{CoursesforMerges$.name}}</div>
<div class="col-md-3" style=" font-weight: bold;" >{{CoursesforMerges$.studentcount}}</div>
......@@ -273,6 +273,12 @@ import { FormBuilder, FormGroup } from "@angular/forms";
setActiveSector(ind)
{
this.aclassActive = -1;
this.SectorActiveforBClass = -1;
this.regionActive = -1;
this.courseActive = -1;
this.specialActive = -1;
this.courseActiveforCClass = -1;
this.Specialit$.next([{}]);
if (ind === this.regionActive) {
ind = -1;
......@@ -301,7 +307,12 @@ import { FormBuilder, FormGroup } from "@angular/forms";
setActive(ind)
{
this.aclassActive = -1;
this.SectorActiveforBClass = -1;
this.regionActive = -1;
this.courseActive = -1;
this.specialActive = -1;
this.courseActiveforCClass = -1;
this.School$.next([{}]);
if (ind === this.SectorActiveforBClass) {
ind = -1;
......@@ -356,7 +367,7 @@ import { FormBuilder, FormGroup } from "@angular/forms";
setActiveSchoolforCClass(ind){
setActiveCourses(ind){
if (this.courseActive === ind) {
ind = -1;
......@@ -380,7 +391,13 @@ import { FormBuilder, FormGroup } from "@angular/forms";
setActiveclass(ind)
{
this.aclassActive = -1;
this.SectorActiveforBClass = -1;
this.regionActive = -1;
this.courseActive = -1;
this.specialActive = -1;
this.courseActiveforCClass = -1;
this.School$.next([{}]);
if (this.aclassActive === ind)
{
ind = -1;
......
......@@ -329,7 +329,9 @@ import { HelperDataService } from "../../services/helper-data-service";
setActiveclass(ind)
{
this.SectorActiveforBClass = -1;
this.SectorActiveforCClass = -1;
this.courseActive = -1;
if (this.aclassActive === ind)
{
ind = -1;
......@@ -390,6 +392,11 @@ import { HelperDataService } from "../../services/helper-data-service";
setActiveSectorBClass(ind)
{
this.SectorActiveforCClass = -1;
this.courseActive = -1;
this.aclassActive =-1;
if (this.SectorActiveforBClass === ind){
ind = -1
}
......@@ -404,6 +411,10 @@ import { HelperDataService } from "../../services/helper-data-service";
setActiveSectorCClass(ind)
{
this.SectorActiveforBClass = -1;
this.courseActive = -1;
this.aclassActive =-1;
if (this.SectorActiveforCClass === ind){
ind = -1
}
......
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