approve

parent 22fdaf81
......@@ -476,3 +476,19 @@ epal.svc.transition-bperiod:
_controller: '\Drupal\epal\Controller\WSConsumer::transitionToBPeriod'
requirements:
_user_is_logged_in: 'TRUE'
epal.getpdes:
path: '/epal/getpde'
options:
_auth: [ 'basic_auth' ]
defaults:
_controller: '\Drupal\epal\Controller\DirectorView::getpde'
requirements:
_user_is_logged_in: 'TRUE'
epal.ministryschools:
path: '/epal/schools-per-perfministry/{pdeId}'
options:
_auth: [ 'basic_auth' ]
defaults:
_controller: '\Drupal\epal\Controller\DirectorView::getSchoolsMinistry'
requirements:
_user_is_logged_in: 'TRUE'
\ No newline at end of file
......@@ -35,16 +35,18 @@ import { HelperDataService } from "../../services/helper-data-service";
[class.evenout]="isEven" [class.selectedout]="regionActive === SchoolNames$.id" >
<div [class.changelistcolor]= "SchoolNames$.status === false" class="col-md-12">{{SchoolNames$.name}}</div>
<div class = "row" [hidden]="SchoolNames$.id !== regionActive" style="margin: 0px 2px 0px 2px;">
<div class="col-md-8">Τμήματα</div>
<div class="col-md-6">Τμήματα</div>
<div class="col-md-2">Επιλεχθέντες</div>
<div class="col-md-2">Επιβεβαιωμένοι</div>
<div class="col-md-2">Χωρητικότητα</div>
</div>
<div class = "row" *ngFor="let CoursesNames$ of CoursesPerPerf$ | async; let j=index; let isOdd2=odd; let isEven2=even"
[class.oddin]="isOdd2" [class.evenin]="isEven2" [class.changecolor]="calccolor(CoursesNames$.size,CoursesNames$.limitdown)"
[class.oddin]="isOdd2" [class.evenin]="isEven2" [class.changecolor]="calccolor(CoursesNames$.sizeconfirm,CoursesNames$.limitdown)"
[class.selectedappout]="regionActive === j"
[hidden]="SchoolNames$.id !== regionActive" style="margin: 0px 2px 0px 2px;">
<div class="col-md-8">{{CoursesNames$.name}}</div>
<div class="col-md-6">{{CoursesNames$.name}}</div>
<div class="col-md-2">{{CoursesNames$.size}}</div>
<div class="col-md-2">{{CoursesNames$.sizeconfirm}}</div>
<div class="col-md-2">{{CoursesNames$.capc}}</div>
</div>
</li>
......
This diff is collapsed.
......@@ -154,7 +154,13 @@
</li>
</div>
<div *ngIf="(loginInfo$ | async).size > 0" class="nav-item">
<li *ngIf=" authRole=='supervisor'" class="nav-item">
<a class="nav-link" [routerLink]="['/ministry/smallclassapprovementmin']" [routerLinkActive]="['active']"><b>Εγκρίσεις Ολιγομελών </b></a>
</li>
</div>
<div *ngIf="(loginInfo$ | async).size > 0" class="nav-item">
<li *ngIf="authRole=='pde'" class="nav-item">
......
......@@ -11,6 +11,7 @@ import EduadminView from "../components/infoviews/eduadmin-view";
import MergeSchools from "../components/mergeschools/mergeschools";
import UndoMergeSchools from "../components/mergeschools/undomerge";
import SmallClassApprovement from "../components/mergeschools/smallclassapprovment";
import SmallClassApprovementMin from "../components/mergeschools/smallclassapprovmentmin";
import PerfectureView from "../components/infoviews/perfecture-view";
import Breadcrumbs from "../components/main/breadcrumbs";
import InformStudents from "../components/minister/minister-informstudents";
......@@ -136,6 +137,7 @@ export const MainRoutes: Routes = [
{ path: "school/mergeschools", component: MergeSchools, canActivate: [DidepdeAuthGuard] },
{ path: "school/undomerge", component: UndoMergeSchools, canActivate: [DidepdeAuthGuard] },
{ path: "school/smallclassapprovement", component: SmallClassApprovement, canActivate: [RegionEduAuthGuard] },
{ path: "ministry/smallclassapprovementmin", component: SmallClassApprovementMin, canActivate: [MinistryAuthGuard] },
{ path: "help-desk", component: HelpDesk, canActivate: [StudentAuthGuard] },
{ path: "ministry/report-merged-classes", component: ReportMergedClasses, canActivate: [ReportsAuthGuard] },
{ path: "ministry/report-applications", component: ReportApplications, canActivate: [ReportsAuthGuard] },
......@@ -206,6 +208,7 @@ export const MainDeclarations = [
MergeSchools,
UndoMergeSchools,
SmallClassApprovement,
SmallClassApprovementMin,
ReportMergedClasses,
ReportApplications,
ReportUserApplications,
......
......@@ -1985,4 +1985,39 @@ this.loginInfo$.getValue().forEach(loginInfoToken => {
}
getPde(username, userpassword)
{
let headers = new Headers({
"Content-Type": "application/json",
});
this.createMinistryAuthorizationHeader(headers, username, userpassword);
let options = new RequestOptions({ headers: headers });
console.log("tralalala");
return this.http.get(`${AppSettings.API_ENDPOINT}/epal/getpde` , options)
.map(response => response.json());
}
getSchoolsMinistry(ind,username, userpassword) {
let headers = new Headers({
"Content-Type": "application/json",
});
this.createMinistryAuthorizationHeader(headers, username, userpassword);
let options = new RequestOptions({ headers: headers });
console.log("tralalala");
return this.http.get(`${AppSettings.API_ENDPOINT}/epal/schools-per-perfministry/` + ind, 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