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

Merge branch 'newreports' into 'develop'

Newreports

See merge request itminedu/e-epal!287
parents b0ff65ab 9c72b1c7
......@@ -174,14 +174,6 @@ epal.ministry.report-completeness:
_controller: '\Drupal\epal\Controller\ReportsCreator::makeReportCompleteness'
requirements:
_user_is_logged_in: 'TRUE'
epal.ministry.report-all-stat:
path: '/ministry/report-all-stat/{regionId}/{adminId}/{schId}/{classId}/{sectorId}/{courseId}/{finalized}'
options:
_auth: [ 'basic_auth' ]
defaults:
_controller: '\Drupal\epal\Controller\ReportsCreator::makeReportAllStat'
requirements:
_user_is_logged_in: 'TRUE'
epal.ministry.report-no-capacity:
path: '/ministry/report-no-capacity/{capacityEnabled}'
options:
......@@ -394,5 +386,45 @@ epal.undomerge:
_auth: [ 'basic_auth' ]
defaults:
_controller: '\Drupal\epal\Controller\SmallClassDistribution::UndoMerge'
requirements:
_user_is_logged_in: 'TRUE'
epal.ministry.report-applications:
path: '/ministry/report-applications/{regionId}/{adminId}/{schId}/{classId}/{sectorId}/{courseId}/{finalized}'
options:
_auth: [ 'basic_auth' ]
defaults:
_controller: '\Drupal\epal\Controller\ReportsCreator::makeReportApplications'
requirements:
_user_is_logged_in: 'TRUE'
epal.ministry.report-user-applications:
path: '/ministry/report-user-applications/{regionId}/{adminId}/{schId}/{classId}/{sectorId}/{courseId}/{finalized}'
options:
_auth: [ 'basic_auth' ]
defaults:
_controller: '\Drupal\epal\Controller\ReportsCreator::makeReportUserApplications'
requirements:
_user_is_logged_in: 'TRUE'
epal.ministry.report-gel-students:
path: '/ministry/report-gel-students/{regionId}/{adminId}/{schId}/{classId}/{sectorId}/{courseId}/{finalized}'
options:
_auth: [ 'basic_auth' ]
defaults:
_controller: '\Drupal\epal\Controller\ReportsCreator::makeReportGelStudents'
requirements:
_user_is_logged_in: 'TRUE'
epal.ministry.report-students-num:
path: '/ministry/report-students-num/{regionId}/{adminId}/{schId}/{classId}/{sectorId}/{courseId}/{finalized}'
options:
_auth: [ 'basic_auth' ]
defaults:
_controller: '\Drupal\epal\Controller\ReportsCreator::makeReportStudentsNum'
requirements:
_user_is_logged_in: 'TRUE'
epal.ministry.report-small-classest:
path: '/ministry/report-small-classes/{regionId}/{adminId}/{schId}/{classId}/{sectorId}/{courseId}/{finalized}'
options:
_auth: [ 'basic_auth' ]
defaults:
_controller: '\Drupal\epal\Controller\ReportsCreator::makeReportSmallClasses'
requirements:
_user_is_logged_in: 'TRUE'
\ No newline at end of file
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -92,5 +92,5 @@ class MyLocalization extends NgLocalization {
})
class AppModule { }
//enableProdMode();
// enableProdMode();
platformBrowserDynamic().bootstrapModule(AppModule);
......@@ -26,9 +26,11 @@ import { IAppState } from "../../store/store";
<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-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-block" (click)="nav_to_reportpath(3)"><i class="fa fa-file-text"></i> Αριθμός Μαθητών και Πληρότητα σχολικών μονάδων ΕΠΑΛ</button>
......@@ -45,6 +47,18 @@ import { IAppState } from "../../store/store";
<div *ngIf = "minedu_userName != ''">
<button type="button" class="btn btn-block" (click)="nav_to_reportpath(6)"><i class="fa fa-file-text"></i> Συγχωνεύσεις Ολιγομελών Τμημάτων</button>
</div>
<div *ngIf = "minedu_userName != '' && userRole != 'pde' && userRole != 'dide'" >
<button type="button" class="btn btn-block" (click)="nav_to_reportpath(7)"><i class="fa fa-file-text"></i> Αριθμός Αιτήσεων ανά σχολική μονάδα ΕΠΑΛ</button>
</div>
<div *ngIf = "minedu_userName != '' && userRole != 'pde' && userRole != 'dide'" >
<button type="button" class="btn btn-block" (click)="nav_to_reportpath(8)"><i class="fa fa-file-text"></i> Αριθμός Αιτήσεων ανά Αιτούντα</button>
</div>
<div *ngIf = "minedu_userName != '' && userRole != 'pde' && userRole != 'dide'" >
<button type="button" class="btn btn-block" (click)="nav_to_reportpath(9)"><i class="fa fa-file-text"></i> Αριθμός Αιτούντων Μαθητών προερχόμενων απο Γενικά Λύκεια</button>
</div>
</div>
`
......@@ -109,6 +123,12 @@ import { IAppState } from "../../store/store";
this.router.navigate(["/ministry/report-no-capacity", repId]);
} else if(repId === 6){
this.router.navigate(["/ministry/report-merged-classes"]);
} else if(repId === 7){
this.router.navigate(["/ministry/report-applications"]);
}else if(repId === 8){
this.router.navigate(["/ministry/report-user-applications"]);
}else if(repId === 9){
this.router.navigate(["/ministry/report-gel-students"]);
}
}
......
......@@ -297,13 +297,13 @@ import { ReportsSchema, TableColumn } from "./reports-schema";
this.settings = this.reportSchema.reportCompletenessSchema;
}
else if (this.reportId === 3) {
route = "/ministry/report-all-stat/";
route = "/ministry/report-students-num/";
this.distribFinalized = 1;
this.settings = this.reportSchema.reportAllStatSchema;
this.settings.fileName = "e-ΕΠΑΛ Αριθμός Μαθητών και Πληρότητα σχολικών μονάδων ΕΠΑΛ";
}
else if (this.reportId === 5) {
route = "/ministry/report-all-stat/";
route = "/ministry/report-small-classes/";
this.distribFinalized = 0;
this.settings = this.reportSchema.reportSmallClassesSchema;
this.settings.fileName = "e-ΕΠΑΛ Ολιγομελή τμήματα - Προσωρινά τοποθετημένοι μαθητές";
......@@ -449,7 +449,7 @@ import { ReportsSchema, TableColumn } from "./reports-schema";
}
checkclass(classId) {
this.classSelected = classId.value;
this.classSelected = Number(classId.value);
this.sectorSelected = 0;
this.courseSelected = 0;
......
This diff is collapsed.
This diff is collapsed.
......@@ -27,7 +27,7 @@ import { ReportsSchema, TableColumn } from "./reports-schema";
<h5>Συγχωνεύσεις Τμημάτων</h5>
<h6>Επιλογή Φίλτρων</h6>
<button type="button" class="btn btn-sm" (click)="toggleRegionFilter()" >
<div *ngIf = "userLoggedIn === 'supervisor'">Διαλεξε ΠΔΕ - Φίλτρο Επιλογής Περιφ/κής Δ/νσης</div>
<div *ngIf = "userLoggedIn === 'supervisor'">Φίλτρο Επιλογής Περιφ/κής Δ/νσης - Δ/νσης Εκπ/σης - Σχολείου</div>
<div *ngIf = "userLoggedIn === 'dide'">Φίλτρο Επιλογής Σχολείου</div>
<div *ngIf = "userLoggedIn === 'pde'">Φίλτρο Επιλογής Δ/νσης Εκπ/σης - Σχολείου</div>
</button>
......@@ -285,7 +285,6 @@ import { ReportsSchema, TableColumn } from "./reports-schema";
this.distribFinalized = 0;
this.settings = this.reportSchema.reportMergedClassesSchema;
this.settings.fileName = "e-ΕΠΑΛ Συγχωνέυσεις Τμημάτων";
let regSel = 0, admSel = 0, schSel = 0;
if (this.enableRegionFilter) {
// if (regionSel.value !== 0)
......
This diff is collapsed.
......@@ -71,8 +71,13 @@ export class ReportsSchema {
width: "18%",
filter: false
},
num_not_confirmed: {
title: "Κατανεμημένοι Μαθητές",
width: "8%",
filter: false
},
num: {
title: "Αριθμός Μαθητών",
title: "Εγγεγραμμένοι Μαθητές",
width: "8%",
filter: false
},
......@@ -227,7 +232,7 @@ export class ReportsSchema {
width: "5%",
filter: false
}
}
}
};
......@@ -262,12 +267,12 @@ export class ReportsSchema {
filter: false
},
num: {
title: "Αριθμός Μαθητών",
title: "Εγγεγραμμένοι Μαθητές",
width: "8%",
filter: false
},
limit_down: {
title: "Ελάχιστος Αριθμός Μαθητών",
title: "Κατώτατο Όριο Μαθητών",
width: "8%",
filter: false
},
......@@ -284,6 +289,103 @@ export class ReportsSchema {
}
};
reportUserApplicationsSchema = {
actions: false,
fileName: "e-ΕΠΑΛ Αριθμός Αιτήσεων ανά Αιτούντα",
pager: {
display: true,
perPage: 10
},
noDataMessage: "Δεν υπάρχουν δεδομένα που περιέχουν το κείμενο αναζήτησης",
columns: {
studentId: {
title: "Αιτών/ούσα",
width: "25%",
filter: false
},
numapps: {
title: "Αριθμός Αιτήσεων",
width: "25%",
filter: false
}
}
};
reportApplicationsSchema = {
actions: false,
fileName: "e-ΕΠΑΛ Αριθμός αιτησεων σχολικη μοναδα ΕΠΑΛ",
pager: {
display: true,
perPage: 10
},
noDataMessage: "Δεν υπάρχουν δεδομένα που περιέχουν το κείμενο αναζήτησης",
columns: {
name: {
title: "Σχολείο",
width: "20%",
filter: false
},
region: {
title: "Περιφερειακή Διεύθυνση",
width: "20%",
filter: false
},
admin: {
title: "Διεύθυνση Εκπαίδευσης",
width: "20%",
filter: false
},
section: {
title: "Τάξη/Τομέας/Ειδικότητα",
width: "30%",
filter: false
},
num: {
title: "Αριθμός Αιτήσεων",
width: "8%",
filter: false
}
}
};
reportgelStudentsSchema = {
actions: false,
fileName: "e-ΕΠΑΛ Αριθμός Μαθητών προερχόμενων από Γενικά Λύκεια",
pager: {
display: true,
perPage: 10
},
noDataMessage: "Δεν υπάρχουν δεδομένα που περιέχουν το κείμενο αναζήτησης",
columns: {
name: {
title: "Σχολείο",
width: "20%",
filter: false
},
region: {
title: "Περιφερειακή Διεύθυνση",
width: "20%",
filter: false
},
admin: {
title: "Διεύθυνση Εκπαίδευσης",
width: "20%",
filter: false
},
section: {
title: "Τάξη/Τομέας/Ειδικότητα",
width: "30%",
filter: false
},
num: {
title: "Αριθμός Αιτήσεων",
width: "8%",
filter: false
}
}
};
constructor() { }
}
......@@ -4,7 +4,6 @@ import { Component, ElementRef, OnDestroy, OnInit, ViewChild } from "@angular/co
import { Injectable } from "@angular/core";
import { ActivatedRoute, Router } from "@angular/router";
import { BehaviorSubject, Subscription } from "rxjs/Rx";
//import { EpalClassesActions } from "../../actions/epalclass.actions";
import { DataModeActions } from "../../actions/datamode.actions";
import { DATAMODE_INITIAL_STATE } from "../../store/datamode/datamode.initial-state";
import { IDataModeRecords } from "../../store/datamode/datamode.types";
......@@ -287,7 +286,7 @@ import { IAppState } from "../../store/store";
private router: Router,
private loc: Location
) {
//this.datamode$ = new BehaviorSubject(DATAMODE_INITIAL_STATE);
// this.datamode$ = new BehaviorSubject(DATAMODE_INITIAL_STATE);
this.SubmitedApplic$ = new BehaviorSubject([{}]);
this.SubmitedDetails$ = new BehaviorSubject([{}]);
this.showLoader$ = new BehaviorSubject(false);
......@@ -301,8 +300,8 @@ import { IAppState } from "../../store/store";
this.SubmitedUsersSub.unsubscribe();
if (this.SubmitedDetailsSub)
this.SubmitedDetailsSub.unsubscribe();
//if (this.datamodeSub)
// this.datamodeSub.unsubscribe();
// if (this.datamodeSub)
// this.datamodeSub.unsubscribe();
}
ngOnInit() {
......@@ -358,13 +357,13 @@ import { IAppState } from "../../store/store";
this.applicationId = appId;
this.router.navigate(["/epal-class-select"]);
//this.router.navigate(["/intro-statement"]);
// this.router.navigate(["/intro-statement"]);
this._sfa.initSectorFields();
this._rsa.initRegionSchools();
this._csa.initSectorCourses();
//this._cfa.saveEpalClassesSelected({name: this.SubmitedDetails$.getValue()[0].currentclass, appmode: "edit", studentfirsttname: this.SubmitedDetails$.getValue()[0].name});
// this._cfa.saveEpalClassesSelected({name: this.SubmitedDetails$.getValue()[0].currentclass, appmode: "edit", studentfirsttname: this.SubmitedDetails$.getValue()[0].name});
this._cfa.saveDataModeSelected({edit: true, edit_class: true, app_update: true, currentclass: this.SubmitedDetails$.getValue()[0].currentclass,
appid: this.SubmitedDetails$.getValue()[0].applicationId, studentfirstname: this.SubmitedDetails$.getValue()[0].name,
studentsurname: this.SubmitedDetails$.getValue()[0].studentsurname, fatherfirstname: this.SubmitedDetails$.getValue()[0].fatherfirstname,
......
......@@ -47,6 +47,11 @@ import StudentLockGuard from "../guards/student.lock.guard";
import { CamelCasePipe } from "../pipes/camelcase";
import { RemoveSpaces } from "../pipes/removespaces";
import ReportMergedClasses from "../components/minister/report-merged-classes";
import ReportApplications from "../components/minister/report-applications";
import ReportUserApplications from "../components/minister/report-user-applications";
import ReportGelStudents from "../components/minister/report-gel-students";
export const MainRoutes: Routes = [
{ path: "", component: Home },
......@@ -86,6 +91,11 @@ export const MainRoutes: Routes = [
{ path: "school/undomerge", component: UndoMergeSchools, canActivate: [DidepdeAuthGuard] },
{ path: "help-desk", component: HelpDesk, canActivate: [StudentAuthGuard] },
{ path: "ministry/report-merged-classes", component: ReportMergedClasses, canActivate: [ReportsAuthGuard] },
{ path: "ministry/report-applications", component: ReportApplications, canActivate: [ReportsAuthGuard] },
{ path: "ministry/report-user-applications", component: ReportUserApplications, canActivate: [ReportsAuthGuard] },
{ path: "ministry/report-gel-students", component: ReportGelStudents, canActivate: [ReportsAuthGuard] },
];
......@@ -127,4 +137,7 @@ export const MainDeclarations = [
MergeSchools,
UndoMergeSchools,
ReportMergedClasses,
ReportApplications,
ReportUserApplications,
ReportGelStudents,
];
......@@ -39,7 +39,7 @@ export default class Main {
rootReducer,
{},
[],
//_devTools.enhancer(),
// _devTools.enhancer(),
storeEnhancers);
// middleware,
// tools ? [ ...enhancers, tools ] : enhancers);
......
......@@ -606,7 +606,12 @@ export class HelperDataService implements OnInit, OnDestroy {
return this.http.get(`${AppSettings.API_ENDPOINT}` + routepath + regionsel + "/" + adminsel + "/" + schsel, options)
.map(response => response.json());
}
else if (routepath === "/ministry/report-all-stat/") {
else if (routepath === "/ministry/report-students-num/") {
return this.http.get(`${AppSettings.API_ENDPOINT}` + routepath + regionsel + "/" + adminsel + "/" + schsel + "/" +
clsel + "/" + secsel + "/" + coursel + "/" + distribfinal, options)
.map(response => response.json());
}
else if (routepath === "/ministry/report-small-classes/") {
return this.http.get(`${AppSettings.API_ENDPOINT}` + routepath + regionsel + "/" + adminsel + "/" + schsel + "/" +
clsel + "/" + secsel + "/" + coursel + "/" + distribfinal, options)
.map(response => response.json());
......@@ -623,6 +628,21 @@ export class HelperDataService implements OnInit, OnDestroy {
clsel + "/" + secsel + "/" + coursel + "/" + distribfinal, options)
.map(response => response.json());
}
else if (routepath === "/ministry/report-applications/") {
return this.http.get(`${AppSettings.API_ENDPOINT}` + routepath + regionsel + "/" + adminsel + "/" + schsel + "/" +
clsel + "/" + secsel + "/" + coursel + "/" + distribfinal, options)
.map(response => response.json());
}
else if (routepath === "/ministry/report-user-applications/") {
return this.http.get(`${AppSettings.API_ENDPOINT}` + routepath + regionsel + "/" + adminsel + "/" + schsel + "/" +
clsel + "/" + secsel + "/" + coursel + "/" + distribfinal, options)
.map(response => response.json());
}
else if (routepath === "/ministry/report-gel-students/") {
return this.http.get(`${AppSettings.API_ENDPOINT}` + routepath + regionsel + "/" + adminsel + "/" + schsel + "/" +
clsel + "/" + secsel + "/" + coursel + "/" + distribfinal, options)
.map(response => response.json());
}
}
......@@ -923,7 +943,7 @@ export class HelperDataService implements OnInit, OnDestroy {
let options = new RequestOptions({ headers: headers, responseType: ResponseContentType.Blob });
let headerIdStr = headerid.toString();
return this.http.get(`${AppSettings.API_ENDPOINT}/epal/pdf-application/` + headerIdStr + '/' + status, options)
return this.http.get(`${AppSettings.API_ENDPOINT}/epal/pdf-application/` + headerIdStr + "/" + status, options)
.map((res) => {
return new Blob([res["_body"]], { type: "application/octet-stream" });
})
......@@ -1027,9 +1047,8 @@ export class HelperDataService implements OnInit, OnDestroy {
return this.http.get(`${AppSettings.API_ENDPOINT}/coursefields/list/?sector_id=` + sectorid, options)
.map(response => response.json());
}
FindSmallCourses(classId,sector,specialit){
this.loginInfo$.getValue().forEach(loginInfoToken => {
this.authToken = loginInfoToken.auth_token;
......@@ -1044,9 +1063,7 @@ export class HelperDataService implements OnInit, OnDestroy {
.map(response => response.json());
}
FindMergingCourses(id,classId,sector,specialit){
this.loginInfo$.getValue().forEach(loginInfoToken => {
this.authToken = loginInfoToken.auth_token;
......@@ -1089,8 +1106,8 @@ export class HelperDataService implements OnInit, OnDestroy {
FindSmallCoursesforUdoMerging(classId,sector,specialit){
this.loginInfo$.getValue().forEach(loginInfoToken => {
this.authToken = loginInfoToken.auth_token;
this.authRole = loginInfoToken.auth_role;
this.authToken = loginInfoToken.auth_token;
this.authRole = loginInfoToken.auth_role;
});
let headers = new Headers({
"Content-Type": "application/json",
......@@ -1099,7 +1116,6 @@ export class HelperDataService implements OnInit, OnDestroy {
let options = new RequestOptions({ headers: headers });
return this.http.get(`${AppSettings.API_ENDPOINT}/epal/getmergingsmallgroupsforundo/` + classId + "/" + sector + "/" + specialit, options)
.map(response => response.json());
}
......
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