Commit 6c21e746 authored by Kostas G's avatar Kostas G

User applications report

parent 7c76a020
......@@ -394,5 +394,29 @@ 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'
\ No newline at end of file
......@@ -45,6 +45,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 +121,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"]);
}
}
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -77,7 +77,7 @@ export class ReportsSchema {
filter: false
},
num: {
title: "Αριθμός Μαθητών",
title: "Εγγεγραμμένοι Μαθητές",
width: "8%",
filter: false
},
......@@ -267,12 +267,12 @@ export class ReportsSchema {
filter: false
},
num: {
title: "Αριθμός Μαθητών",
title: "Εγγεγραμμένοι Μαθητές",
width: "8%",
filter: false
},
limit_down: {
title: "Ελάχιστος Αριθμός Μαθητών",
title: "Κατώτατο Όριο Μαθητών",
width: "8%",
filter: false
},
......@@ -289,6 +289,66 @@ 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
}
}
};
constructor() { }
}
......@@ -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,
];
......@@ -623,6 +623,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());
}
}
......
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