Merge branch 'edge' into 'master'

Merge to master

See merge request !259
parents e6b9140e 9aedf808
......@@ -74,7 +74,7 @@ export class CsvCreator {
// Set utf-8 header to let excel recognize its encoding
let blob = new Blob(["\ufeff", encodedStr], { type: "text/csv" });
a.href = window.URL.createObjectURL(blob);
a.download = (this.settings.fileName || "epalSystemReport") + "all_stat" + ".csv";
a.download = (this.settings.fileName || "epalSystemReport") + "_all_stat" + ".csv";
a.click();
});
}
......
......@@ -15,56 +15,32 @@ import { IAppState } from "../../store/store";
selector: "minister-reports",
// encapsulation: ViewEncapsulation.None,
template: `
<div style="min-height: 500px; ">
<h5> >Επιλογή Αναφοράς<br><br></h5>
<div class="col-md-1">
<div class="reports-container">
<h5>Επιλογή Αναφοράς</h5>
<div *ngIf = "minedu_userName != '' && userRole != 'pde' && userRole != 'dide'">
<button type="button" class="btn btn-alert" (click)="nav_to_reportpath(0)" >
<i class="fa fa-file-text"></i>
Αριθμός Αιτήσεων / Εγγεγραμμένων Χρηστών
</button>
<br><br>
<button type="button" class="btn btn-block" (click)="nav_to_reportpath(0)"><i class="fa fa-file-text"></i> Αριθμός Αιτήσεων / Εγγεγραμμένων Χρηστών</button>
</div>
<div *ngIf = "minedu_userName != '' && userRole != 'pde' && userRole != 'dide'">
<button type="button" class="btn btn-alert" (click)="nav_to_reportpath(1)" >
<i class="fa fa-file-text"></i>
Κατανομή Μαθητών με Βάση τη Σειρά Προτίμησης
</button>
<br><br>
<button type="button" class="btn btn-block" (click)="nav_to_reportpath(1)" ><i class="fa fa-file-text"></i> Κατανομή Μαθητών με Βάση τη Σειρά Προτίμησης</button>
</div>
<div *ngIf = "minedu_userName != ''" >
<button type="button" class="btn btn-alert" (click)="nav_to_reportpath(2)" >
<i class="fa fa-file-text"></i>
Συνολική Πληρότητα σχολικών μονάδων ΕΠΑΛ ανά τάξη
</button>
<br><br>
<button type="button" class="btn btn-block" (click)="nav_to_reportpath(2)"><i class="fa fa-file-text"></i> Συνολική Πληρότητα σχολικών μονάδων ΕΠΑΛ ανά τάξη</button>
</div>
<div *ngIf = "minedu_userName != ''" >
<button type="button" class="btn btn-alert" (click)="nav_to_reportpath(3)" >
<i class="fa fa-file-text"></i>
Αριθμός Μαθητών και Πληρότητα σχολικών μονάδων ΕΠΑΛ
</button>
<br><br>
<button type="button" class="btn btn-block" (click)="nav_to_reportpath(3)"><i class="fa fa-file-text"></i> Αριθμός Μαθητών και Πληρότητα σχολικών μονάδων ΕΠΑΛ</button>
</div>
<div *ngIf = "minedu_userName != '' && userRole != 'pde' && userRole != 'dide'">
<button type="button" class="btn btn-alert" (click)="nav_to_reportpath(4)" >
<i class="fa fa-file-text"></i>
Σχολικές μονάδες που δεν έχουν δηλώσει Χωρητικότητα τμημάτων
</button>
<br><br>
<button type="button" class="btn btn-block" (click)="nav_to_reportpath(4)"><i class="fa fa-file-text"></i> Σχολικές μονάδες που δεν έχουν δηλώσει Χωρητικότητα τμημάτων</button>
</div>
<div *ngIf = "minedu_userName != '' && userRole != 'pde' && userRole != 'dide'">
<button type="button" class="btn btn-alert" (click)="nav_to_reportpath(5)" >
<i class="fa fa-file-text"></i>
Ολιγομελή τμήματα (Προσωρινά τοποθετημένοι μαθητές)
</button>
<br><br>
<button type="button" class="btn btn-block" (click)="nav_to_reportpath(5)"><i class="fa fa-file-text"></i> Ολιγομελή τμήματα (Προσωρινά τοποθετημένοι μαθητές)</button>
</div>
</div>
</div>
`
......
......@@ -20,112 +20,96 @@ import { ReportsSchema, TableColumn } from "./reports-schema";
selector: "report-all-stat",
template: `
<div>
<div
class = "loading" *ngIf="validCreator === 0" >
</div>
<div class="reports-container">
<div class = "loading" *ngIf="validCreator === 0" ></div>
<form [formGroup]="formGroup" #form>
<div [ngSwitch]="reportId">
<h5 *ngSwitchCase="2">Συνολική Πληρότητα σχολικών μονάδων ΕΠΑΛ ανά τάξη</h5>
<h5 *ngSwitchCase="3">Αριθμός Μαθητών και Πληρότητα σχολικών μονάδων ΕΠΑΛ</h5>
<h5 *ngSwitchCase="5">Ολιγομελή τμήματα (Προσωρινά τοποθετημένοι μαθητές)</h5>
<h5 *ngSwitchDefault>Αναφορά</h5>
</div>
<h6>Επιλογή Φίλτρων</h6>
<button type="button" class="btn btn-sm" (click)="toggleRegionFilter()" >
<div *ngIf = "userLoggedIn === 'supervisor'">Φίλτρο Επιλογής Περιφ/κής Δ/νσης - Δ/νσης Εκπ/σης - Σχολείου</div>
<div *ngIf = "userLoggedIn === 'dide'">Φίλτρο Επιλογής Σχολείου</div>
<div *ngIf = "userLoggedIn === 'pde'">Φίλτρο Επιλογής Δ/νσης Εκπ/σης - Σχολείου</div>
</button>
<!--<h5> >Επιλογή Φίλτρων <br><br></h5>-->
<br>
<button type="button" class="btn-link" (click)="toggleRegionFilter()" >
<div *ngIf = "userLoggedIn === 'supervisor'"> > Φίλτρο Επιλογής Περιφ/κής Δ/νσης - Δ/νσης Εκπ/σης - Σχολείου </div>
<div *ngIf = "userLoggedIn === 'dide'" > > Φίλτρο Επιλογής Σχολείου </div>
<div *ngIf = "userLoggedIn === 'pde'"> > Φίλτρο Επιλογής Δ/νσης Εκπ/σης - Σχολείου </div>
</button>
<div class="col-md-11 offset-md-1">
<label *ngIf = "enableRegionFilter && userLoggedIn === 'supervisor'"> Περιφερειακή Διεύθυνση </label>
<select #regsel class="form-control" (change)="checkregion(regsel)" *ngIf = "enableRegionFilter" [value] = "regionSelected" [hidden] = "userLoggedIn !== 'supervisor'" formControlName="region">
<option value="0"></option>
<option *ngFor="let RegionSelection$ of RegionSelections$ | async; let i=index" [value] = "RegionSelection$.id"> {{RegionSelection$.name}} </option>
</select>
</div>
<div class="col-md-11 offset-md-1">
<label *ngIf="(showAdminList | async) && enableRegionFilter && userLoggedIn !== 'dide'">Διεύθυνση Εκπαίδευσης</label>
<select #admsel class="form-control" *ngIf="(showAdminList | async) && enableRegionFilter" (change)="checkadminarea(admsel)" [hidden] = "userLoggedIn === 'dide'" formControlName="adminarea">
<option value="0"></option>
<option *ngFor="let AdminAreaSelection$ of AdminAreaSelections$ | async; let i=index" [value] = "AdminAreaSelection$.id"> {{AdminAreaSelection$.name}}</option>
</select>
</div>
<div class="col-md-11 offset-md-1">
<label *ngIf="(showAdminList | async) && enableRegionFilter">Σχολείο</label>
<select #schsel class="form-control" *ngIf="(showAdminList | async) && enableRegionFilter" (change)="checkschool(schsel)" formControlName="schoollist">
<option value="0"></option>
<option *ngFor="let SchoolSelection$ of SchoolSelections$ | async; let i=index" [value] = "SchoolSelection$.epal_id"> {{SchoolSelection$.epal_name}} </option>
</select>
</div>
<div *ngIf = "reportId === 3 || reportId === 5" >
<button type="button" class="btn-link" (click)="toggleCourseFilter()" >
> Φίλτρο Επιλογής Τομέα / Ειδικότητας
<div class="col-md-11 offset-md-1">
<label *ngIf = "enableRegionFilter && userLoggedIn === 'supervisor'"> Περιφερειακή Διεύθυνση </label>
<select #regsel class="form-control" (change)="checkregion(regsel)" *ngIf = "enableRegionFilter" [value] = "regionSelected" [hidden] = "userLoggedIn !== 'supervisor'" formControlName="region">
<option value="0"></option>
<option *ngFor="let RegionSelection$ of RegionSelections$ | async; let i=index" [value] = "RegionSelection$.id"> {{RegionSelection$.name}} </option>
</select>
</div>
<div class="col-md-11 offset-md-1">
<label *ngIf="(showAdminList | async) && enableRegionFilter && userLoggedIn !== 'dide'">Διεύθυνση Εκπαίδευσης</label>
<select #admsel class="form-control" *ngIf="(showAdminList | async) && enableRegionFilter" (change)="checkadminarea(admsel)" [hidden] = "userLoggedIn === 'dide'" formControlName="adminarea">
<option value="0"></option>
<option *ngFor="let AdminAreaSelection$ of AdminAreaSelections$ | async; let i=index" [value] = "AdminAreaSelection$.id"> {{AdminAreaSelection$.name}}</option>
</select>
</div>
<div class="col-md-11 offset-md-1">
<label *ngIf="(showAdminList | async) && enableRegionFilter">Σχολείο</label>
<select #schsel class="form-control" *ngIf="(showAdminList | async) && enableRegionFilter" (change)="checkschool(schsel)" formControlName="schoollist">
<option value="0"></option>
<option *ngFor="let SchoolSelection$ of SchoolSelections$ | async; let i=index" [value] = "SchoolSelection$.epal_id"> {{SchoolSelection$.epal_name}} </option>
</select>
</div>
<div *ngIf = "reportId === 3 || reportId === 5" >
<button type="button" class="btn btn-sm" (click)="toggleCourseFilter()" >Φίλτρο Επιλογής Τομέα / Ειδικότητας</button>
<div class="col-md-11 offset-md-1">
<label for="classid" *ngIf = "enableCourseFilter" >Τάξη</label>
<select #class_sel class="form-control" (change)="checkclass(class_sel)" *ngIf = "enableCourseFilter" formControlName="classid" >
<option value="0" ></option>
<option value="1" >Α' Λυκείου</option>
<option value="2" >Β' Λυκείου</option>
<option value="3" >Γ' Λυκείου</option>
<option value="4" >Δ' Λυκείου</option>
</select>
</div>
<div class="col-md-11 offset-md-1">
<label *ngIf="(showSectorList | async) && enableCourseFilter && (classSelected === 2 || classSelected === 3 || classSelected === 4) ">Τομέας</label>
<select #secsel class="form-control" *ngIf="(showSectorList | async) && enableCourseFilter && (classSelected === 2 || classSelected === 3 || classSelected === 4)"
(change)="checksector(secsel)" formControlName="sector">
<option value="0"></option>
<option *ngFor="let SectorSelection$ of SectorSelections$ | async; let i=index" [value] = "SectorSelection$.id"> {{SectorSelection$.name}}</option>
</select>
</div>
<div class="col-md-11 offset-md-1">
<label *ngIf="(showCourseList | async) && enableCourseFilter && (classSelected === 3 || classSelected === 4)">Ειδικότητα</label>
<select #coursel class="form-control" *ngIf="(showCourseList | async) && enableCourseFilter && (classSelected === 3 || classSelected === 4)"
(change)="checkcourse(coursel)" formControlName="course">
<option value="0"></option>
<option *ngFor="let CourseSelection$ of CourseSelections$ | async; let i=index" [value] = "CourseSelection$.id"> {{CourseSelection$.name}}</option>
</select>
</div>
</div>
<button type="submit" class="btn btn-alert" (click)="createReport(regsel)" [hidden]="minedu_userName === ''" >
<i class="fa fa-file-text"></i>
Δημιουργία Αναφοράς
</button>
<button type="submit" class="btn btn-alert pull-right" (click)="navigateBack()" [hidden]="minedu_userName === ''" >
Επιστροφή
</button>
</div>
<div class="col-md-11 offset-md-1">
<label for="classid" *ngIf = "enableCourseFilter" >Τάξη</label><br/>
<select #class_sel class="form-control" (change)="checkclass(class_sel)" *ngIf = "enableCourseFilter" formControlName="classid" >
<option value="0" ></option>
<option value="1" >Α' Λυκείου</option>
<option value="2" >Β' Λυκείου</option>
<option value="3" >Γ' Λυκείου</option>
<option value="4" >Δ' Λυκείου</option>
</select>
</div>
<div class="col-md-11 offset-md-1">
<label *ngIf="(showSectorList | async) && enableCourseFilter && (classSelected === 2 || classSelected === 3 || classSelected === 4) ">Τομέας</label>
<select #secsel class="form-control" *ngIf="(showSectorList | async) && enableCourseFilter && (classSelected === 2 || classSelected === 3 || classSelected === 4)"
(change)="checksector(secsel)" formControlName="sector">
<option value="0"></option>
<option *ngFor="let SectorSelection$ of SectorSelections$ | async; let i=index" [value] = "SectorSelection$.id"> {{SectorSelection$.name}}</option>
</select>
</div>
<div class="col-md-11 offset-md-1">
<label *ngIf="(showCourseList | async) && enableCourseFilter && (classSelected === 3 || classSelected === 4)">Ειδικότητα</label>
<select #coursel class="form-control" *ngIf="(showCourseList | async) && enableCourseFilter && (classSelected === 3 || classSelected === 4)"
(change)="checkcourse(coursel)" formControlName="course">
<option value="0"></option>
<option *ngFor="let CourseSelection$ of CourseSelections$ | async; let i=index" [value] = "CourseSelection$.id"> {{CourseSelection$.name}}</option>
</select>
</div>
<br>
<button type="submit" class="btn btn-alert" (click)="createReport(regsel)" [hidden]="minedu_userName === ''" >
<i class="fa fa-file-text"></i>
Δημιουργία Αναφοράς
</button>
<button type="submit" class="btn btn-alert pull-right" (click)="navigateBack()" [hidden]="minedu_userName === ''" >
Επιστροφή
</button>
<br><br>
</form>
<div *ngIf="validCreator === 1 ">
<input #search class="search" type="text" placeholder="Αναζήτηση..." (keydown.enter)="onSearch(search.value)">
<div class="smart-table-container" reportScroll>
<input #search class="search" type="text" placeholder="Αναζήτηση..." (keydown.enter)="onSearch(search.value)">
<div class="smart-table-container table table-hover table-striped" reportScroll>
<ng2-smart-table [settings]="settings" [source]="source"></ng2-smart-table>
</div>
</div>
<button type="button" class="alert alert-info pull-right" (click)="export2Csv()" [hidden]="validCreator !== 1">
<i class="fa fa-download"></i>
<br>Εξαγωγή σε csv
</button>
<button type="button" class="alert alert-info pull-left" (click)="createDiagram()" [hidden]="validCreator !== 1 || schSelected === 0 || (reportId !== 2 ) ">
<i class="fa fa-bar-chart"></i>
Διάγραμμα
</button>
<div class="d3-chart" *ngIf = "validCreator === 1" #chart>
</div>
</div>
<br><br><br><br><br>
<button type="button" class="alert alert-info pull-right" (click)="export2Csv()" [hidden]="validCreator !== 1"><i class="fa fa-download"></i> Εξαγωγή σε csv</button>
<button type="button" class="alert alert-info pull-left" (click)="createDiagram()" [hidden]="validCreator !== 1 || schSelected === 0 || (reportId !== 2 ) "><i class="fa fa-bar-chart"></i> Διάγραμμα</button>
<div class="d3-chart" *ngIf = "validCreator === 1" #chart></div>
</div>
`
})
......@@ -316,11 +300,13 @@ import { ReportsSchema, TableColumn } from "./reports-schema";
route = "/ministry/report-all-stat/";
this.distribFinalized = 1;
this.settings = this.reportSchema.reportAllStatSchema;
this.settings.fileName = "e-ΕΠΑΛ Αριθμός Μαθητών και Πληρότητα σχολικών μονάδων ΕΠΑΛ";
}
else if (this.reportId === 5) {
route = "/ministry/report-all-stat/";
this.distribFinalized = 0;
this.settings = this.reportSchema.reportAllStatSchema;
this.settings.fileName = "e-ΕΠΑΛ Ολιγομελή τμήματα - Προσωρινά τοποθετημένοι μαθητές";
}
let regSel = 0, admSel = 0, schSel = 0;
......@@ -342,8 +328,9 @@ import { ReportsSchema, TableColumn } from "./reports-schema";
if (this.userLoggedIn === PDE_ROLE) {
regSel = this.regionSelected;
}
else if (this.userLoggedIn === DIDE_ROLE)
else if (this.userLoggedIn === DIDE_ROLE) {
admSel = this.adminAreaSelected;
}
this.generalReportSub = this._hds.makeReport(this.minedu_userName, this.minedu_userPassword, route, regSel, admSel, schSel, clSel, secSel, courSel, this.distribFinalized).subscribe(data => {
this.generalReport$.next(data);
......@@ -355,8 +342,17 @@ import { ReportsSchema, TableColumn } from "./reports-schema";
this.data[i].percTotal = Number(data[i].percTotal);
this.data[i].percA = Number(data[i].percA);
if (Number.isNaN(this.data[i].percA)) {
this.data[i].percA = "-";
}
this.data[i].percB = Number(data[i].percB);
if (Number.isNaN(this.data[i].percB)) {
this.data[i].percB = "-";
}
this.data[i].percC = Number(data[i].percC);
if (Number.isNaN(this.data[i].percC)) {
this.data[i].percC = "-";
}
}
this.validCreator = 1;
this.source = new LocalDataSource(this.data);
......@@ -369,10 +365,10 @@ import { ReportsSchema, TableColumn } from "./reports-schema";
// this.prepareColumnMap();
this.csvObj.prepareColumnMap();
},
error => {
this.generalReport$.next([{}]);
console.log("Error Getting generalReport");
});
error => {
this.generalReport$.next([{}]);
console.log("Error Getting generalReport");
});
}
navigateBack() {
......
......@@ -18,48 +18,26 @@ import { ReportsSchema, TableColumn } from "./reports-schema";
selector: "report-general",
template: `
<div>
<div
class = "loading" *ngIf="validCreator == 0" >
</div>
<form #form>
<div class="reports-container">
<div class = "loading" *ngIf="validCreator == 0" ></div>
<h5> >Επιλογή Φίλτρων <br><br></h5>
<h6> Δεν υπάρχουν διαθέσιμα φίλτρα <br><br><br></h6>
<h5>Κατανομή Μαθητών με Βάση τη Σειρά Προτίμησης</h5>
<h6>Επιλογή Φίλτρων: Δεν υπάρχουν διαθέσιμα φίλτρα</h6>
<button type="submit" class="btn btn-alert" (click)="createReport()" [hidden]="minedu_userName == ''" >
<i class="fa fa-file-text"></i>
Δημιουργία Αναφοράς
</button>
<button type="submit" class="btn btn-alert pull-right" (click)="navigateBack()" [hidden]="minedu_userName == ''" >
Επιστροφή
</button>
<br><br>
</form>
<button type="submit" class="btn btn-alert" (click)="createReport()" [hidden]="minedu_userName == ''" ><i class="fa fa-file-text"></i> Δημιουργία Αναφοράς</button>
<button type="submit" class="btn btn-alert pull-right" (click)="navigateBack()" [hidden]="minedu_userName == ''" > Επιστροφή</button>
<div *ngIf="validCreator == 1 ">
<input #search class="search" type="text" placeholder="Αναζήτηση..." (keydown.enter)="onSearch(search.value)">
<div class="smart-table-container" reportScroll>
<div class="smart-table-container table table-hover table-striped" reportScroll>
<ng2-smart-table [settings]="settings" [source]="source"></ng2-smart-table>
</div>
</div>
<button type="button" class="alert alert-info pull-right" (click)="export2Csv()" [hidden]="validCreator != 1">
<i class="fa fa-download"></i>
<br>Εξαγωγή σε csv
</button>
<button type="button" class="alert alert-info pull-left" (click)="createDiagram()" [hidden]="validCreator != 1 ">
<i class="fa fa-bar-chart"></i>
Διάγραμμα
</button>
<div class="d3-chart" *ngIf = "validCreator == 1" #chart>
</div>
<br><br><br><br><br>
<button type="button" class="alert alert-info pull-right" (click)="export2Csv()" [hidden]="validCreator != 1"><i class="fa fa-download"></i> Εξαγωγή σε csv</button>
<button type="button" class="alert alert-info pull-left" (click)="createDiagram()" [hidden]="validCreator != 1 "><i class="fa fa-bar-chart"></i> Διάγραμμα</button>
<div class="d3-chart" *ngIf = "validCreator == 1" #chart></div>
</div>
`
})
......
......@@ -19,48 +19,30 @@ import { ReportsSchema, TableColumn } from "./reports-schema";
selector: "report-no-capacity",
template: `
<div>
<div
class = "loading" *ngIf="validCreator == 0" >
</div>
<div class="reports-container">
<div class = "loading" *ngIf="validCreator == 0" ></div>
<form [formGroup]="formGroup" #form>
<h5> >Επιλογή Φίλτρων <br><br></h5>
<div class="row">
<div class="col-md-1 ">
<input type="checkbox" formControlName="capacityEnabled"
(click)="toggleCapacityFilter()" >
</div>
<div class="col-md-9">
<label for="capacityEnabled"><i>Εμφάνιση ΚΑΙ των σχολείων που έχουν καθορίσει χωρητικότητα</i></label>
<h5>Σχολικές μονάδες που δεν έχουν δηλώσει Χωρητικότητα τμημάτων</h5>
<h6>Επιλογή Φίλτρων</h6>
<div class="row">
<div class="col-md-1"><input type="checkbox" formControlName="capacityEnabled" (click)="toggleCapacityFilter()" ></div>
<div class="col-md-9"><label for="capacityEnabled"><i>Εμφάνιση ΚΑΙ των σχολείων που έχουν καθορίσει χωρητικότητα</i></label></div>
</div>
</div>
<br><br>
<button type="submit" class="btn btn-alert" (click)="createReport()" [hidden]="minedu_userName == ''" >
<i class="fa fa-file-text"></i>
Δημιουργία Αναφοράς
</button>
<button type="submit" class="btn btn-alert pull-right" (click)="navigateBack()" [hidden]="minedu_userName == ''" >
Επιστροφή
</button>
<br><br>
<button type="submit" class="btn btn-alert" (click)="createReport()" [hidden]="minedu_userName == ''" ><i class="fa fa-file-text"></i> Δημιουργία Αναφοράς</button>
<button type="submit" class="btn btn-alert pull-right" (click)="navigateBack()" [hidden]="minedu_userName == ''" > Επιστροφή</button>
</form>
<div *ngIf="validCreator == 1 ">
<input #search class="search" type="text" placeholder="Αναζήτηση..." (keydown.enter)="onSearch(search.value)">
<div class="smart-table-container" reportScroll>
<div class="smart-table-container table table-hover table-striped" reportScroll>
<ng2-smart-table [settings]="settings" [source]="source"></ng2-smart-table>
</div>
</div>
<button type="button" class="alert alert-info pull-right" (click)="export2Csv()" [hidden]="validCreator != 1">
<i class="fa fa-download"></i>
<br>Εξαγωγή σε csv
</button>
<button type="button" class="alert alert-info pull-right" (click)="export2Csv()" [hidden]="validCreator != 1"><i class="fa fa-download"></i> Εξαγωγή σε csv</button>
</div>
`
})
......
......@@ -17,37 +17,25 @@ import { ReportsSchema, TableColumn } from "./reports-schema";
selector: "report-users",
template: `
<div>
<div
class = "loading" *ngIf="validCreator == 0" >
</div>
<div class="reports-container">
<div class = "loading" *ngIf="validCreator == 0"></div>
<h5> >Επιλογή Φίλτρων <br><br></h5>
<h6> Δεν υπάρχουν διαθέσιμα φίλτρα <br><br><br></h6>
<h5>Αριθμός Αιτήσεων / Εγγεγραμμένων Χρηστών</h5>
<h6>Επιλογή Φίλτρων: Δεν υπάρχουν διαθέσιμα φίλτρα</h6>
<button type="submit" class="btn btn-alert" (click)="createReport()" [hidden]="minedu_userName == ''" >
<i class="fa fa-file-text"></i>
Δημιουργία Αναφοράς
</button>
<button type="submit" class="btn btn-alert pull-right" (click)="navigateBack()" [hidden]="minedu_userName == ''" >
Επιστροφή
</button>
<br><br>
<button type="submit" class="btn btn-alert" (click)="createReport()" [hidden]="minedu_userName == ''"><i class="fa fa-file-text"></i> Δημιουργία Αναφοράς</button>
<button type="submit" class="btn btn-alert pull-right" (click)="navigateBack()" [hidden]="minedu_userName == ''" >Επιστροφή</button>
<div *ngIf="validCreator == 1 ">
<input #search class="search" type="text" placeholder="Αναζήτηση..." (keydown.enter)="onSearch(search.value)">
<div class="smart-table-container" reportScroll>
<div class="smart-table-container table table-hover table-striped" reportScroll>
<ng2-smart-table [settings]="settings" [source]="source"></ng2-smart-table>
</div>
</div>
<button type="button" class="alert alert-info pull-right" (click)="export2Csv()" [hidden]="validCreator != 1">
<i class="fa fa-download"></i>
<br>Εξαγωγή σε csv
</button>
<i class="fa fa-download"></i> Εξαγωγή σε csv</button>
</div>
`
})
......
......@@ -12,6 +12,7 @@ export class ReportsSchema {
ReportUsersSchema = {
actions: false,
fileName: "e-ΕΠΑΛ Αριθμός Αιτήσεων - Εγγεγραμμένων Χρηστών",
noDataMessage: "Δεν υπάρχουν δεδομένα που περιέχουν το κείμενο αναζήτησης",
columns: {
name: {
......@@ -27,6 +28,7 @@ export class ReportsSchema {
genReportSchema = {
actions: false,
fileName: "e-ΕΠΑΛ Κατανομή Μαθητών με Βάση τη Σειρά Προτίμησης",
noDataMessage: "Δεν υπάρχουν δεδομένα που περιέχουν το κείμενο αναζήτησης",
columns: {
name: {
......@@ -42,6 +44,7 @@ export class ReportsSchema {
reportAllStatSchema = {
actions: false,
fileName: "e-ΕΠΑΛ Αναφορά",
pager: {
display: true,
perPage: 10
......@@ -88,6 +91,7 @@ export class ReportsSchema {
reportNoCapacity = {
actions: false,
fileName: "e-ΕΠΑΛ Σχολικές μονάδες που δεν έχουν δηλώσει Χωρητικότητα τμημάτων",
pager: {
display: true,
perPage: 10
......@@ -124,6 +128,7 @@ export class ReportsSchema {
reportCompletenessSchema = {
actions: false,
fileName: "e-ΕΠΑΛ Συνολική Πληρότητα σχολικών μονάδων ΕΠΑΛ ανά τάξη",
noDataMessage: "Δεν υπάρχουν δεδομένα που περιέχουν το κείμενο αναζήτησης",
columns: {
name: {
......
......@@ -236,7 +236,7 @@ div.changecolorbalck {
.d3-chart {
width: 100%;
height: 400px;
height: 550px;
}
.d3-chart .axis path, .d3-chart .axis line {
......@@ -339,3 +339,10 @@ label {
.ng2-smart-pagination {
display: inline-flex !important;
}
.reports-container { min-height: 550px; }
.reports-container h5,
.reports-container h6,
.reports-container button {
margin: 0 0 1em 0;
}
\ No newline at end of file
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