diff --git a/drupal/modules/epal/epal.routing.yml b/drupal/modules/epal/epal.routing.yml index 9c80840464574df0b7b70c7c265c52e9008ebc3e..66eb3b5078f62d8ec7c17db10a88a7e96233e8bf 100755 --- a/drupal/modules/epal/epal.routing.yml +++ b/drupal/modules/epal/epal.routing.yml @@ -147,7 +147,7 @@ epal.ministry.general_report: options: _auth: [ 'basic_auth' ] defaults: - _controller: '\Drupal\epal\Controller\ReportsCreator::makegGeneralReport' + _controller: '\Drupal\epal\Controller\ReportsCreator::makeGeneralReport' requirements: _user_is_logged_in: 'TRUE' epal.ministry.report-completeness: diff --git a/drupal/modules/epal/src/Controller/ReportsCreator.php b/drupal/modules/epal/src/Controller/ReportsCreator.php index 467a0be064031fb4d587c393e381ccc6c1fe737f..03f039e8249cb4d87d44b7deee15c5372f0c5d01 100644 --- a/drupal/modules/epal/src/Controller/ReportsCreator.php +++ b/drupal/modules/epal/src/Controller/ReportsCreator.php @@ -60,180 +60,189 @@ class ReportsCreator extends ControllerBase { ); } + public function makeReportUsers(Request $request) { + try { + if (!$request->isMethod('GET')) { + return $this->respondWithStatus([ + "message" => t("Method Not Allowed") + ], Response::HTTP_METHOD_NOT_ALLOWED); + } - public function makeReportUsers(Request $request) { - - try { - if (!$request->isMethod('GET')) { - return $this->respondWithStatus([ - "message" => t("Method Not Allowed") - ], Response::HTTP_METHOD_NOT_ALLOWED); - } - - //user validation - $authToken = $request->headers->get('PHP_AUTH_USER'); - $users = $this->entityTypeManager->getStorage('user')->loadByProperties(array('name' => $authToken)); - $user = reset($users); - if (!$user) { - return $this->respondWithStatus([ - 'message' => t("User not found"), - ], Response::HTTP_FORBIDDEN); - } - - //user role validation - $roles = $user->getRoles(); - $validRole = false; - foreach ($roles as $role) - if ($role === "ministry") { - $validRole = true; - break; - } - if (!$validRole) { - return $this->respondWithStatus([ - 'message' => t("User Invalid Role"), - ], Response::HTTP_FORBIDDEN); - } - - $list = array(); - - //υπολογισμός αριθμού αιτήσεων - $sCon = $this->connection->select('epal_student', 'eStudent') - ->fields('eStudent', array('id')); - $numApplications = $sCon->countQuery()->execute()->fetchField(); - array_push($list,(object) array('name' => "Αριθμός Αιτήσεων (συνολικά)", 'numStudents' => $numApplications)); - - //υπολογισμός αριθμού αιτήσεων ανά τάξη - for ($i = 1; $i <= 4; $i++) { - $sCon = $this->connection->select('epal_student', 'eStudent') - ->fields('eStudent', array('id')) - ->condition('eStudent.currentclass', strval($i) , '='); - $numApplications = $sCon->countQuery()->execute()->fetchField(); - array_push($list,(object) array('name' => "Αριθμός Αιτήσεων για " . $i . "η Τάξη", 'numStudents' => $numApplications)); - } + //user validation + $authToken = $request->headers->get('PHP_AUTH_USER'); + $users = $this->entityTypeManager->getStorage('user')->loadByProperties(array('name' => $authToken)); + $user = reset($users); + if (!$user) { + return $this->respondWithStatus([ + 'message' => t("User not found"), + ], Response::HTTP_FORBIDDEN); + } - //υπολογισμός αριθμού αιτήσεων για δεύτερη περίοδο - $sCon = $this->connection->select('epal_student', 'eStudent') - ->fields('eStudent', array('id')) - ->condition('eStudent.second_period', 1 , '='); - $numApplications = $sCon->countQuery()->execute()->fetchField(); - array_push($list,(object) array('name' => "Αριθμός Αιτήσεων B' περιόδου", 'numStudents' => $numApplications)); - - //υπολογισμός αριθμού χρηστών - $sCon = $this->connection->select('epal_users', 'eUser') - ->fields('eUser', array('id')); - $numUsers = $sCon->countQuery()->execute()->fetchField(); - array_push($list,(object) array('name' => "Αριθμός Εγγεγραμένων Χρηστών με ρόλο Αιτούντα", 'numStudents' => $numUsers)); - - - return $this->respondWithStatus( - $list - , Response::HTTP_OK); - } //end try - - catch (\Exception $e) { - $this->logger->warning($e->getMessage()); - return $this->respondWithStatus([ - "message" => t("An unexpected problem occured during makegGeneralReport Method") - ], Response::HTTP_INTERNAL_SERVER_ERROR); + //user role validation + $roles = $user->getRoles(); + $validRole = false; + foreach ($roles as $role) + if ($role === "ministry") { + $validRole = true; + break; } + if (!$validRole) { + return $this->respondWithStatus([ + 'message' => t("User Invalid Role"), + ], Response::HTTP_FORBIDDEN); + } + $list = array(); + + //υπολογισμός αριθμού αιτήσεων + $sCon = $this->connection + ->select('epal_student', 'eStudent') + ->fields('eStudent', array('id')); + $numApplications = $sCon->countQuery()->execute()->fetchField(); + array_push($list,(object) array('name' => "Αριθμός Αιτήσεων (συνολικά)", 'numStudents' => $numApplications)); + + //υπολογισμός αριθμού αιτήσεων ανά τάξη + $classes = [1 => 'Α', 2 => 'Β', 3 => 'Γ', 4 => 'Δ']; + foreach ($classes as $i => $label) { + $sCon = $this->connection + ->select('epal_student', 'eStudent') + ->fields('eStudent', array('id')) + ->condition('eStudent.currentclass', strval($i) , '='); + $numApplications = $sCon->countQuery()->execute()->fetchField(); + array_push($list,(object) array('name' => "Αριθμός Αιτήσεων για {$label} Τάξη", 'numStudents' => $numApplications)); } + //υπολογισμός αριθμού αιτήσεων για δεύτερη περίοδο + $sCon = $this->connection + ->select('epal_student', 'eStudent') + ->fields('eStudent', array('id')) + ->condition('eStudent.second_period', 1 , '='); + $numApplications = $sCon->countQuery()->execute()->fetchField(); + array_push($list,(object) array('name' => "Αριθμός Αιτήσεων B' περιόδου", 'numStudents' => $numApplications)); + + //υπολογισμός αριθμού χρηστών + $sCon = $this->connection + ->select('epal_users', 'eUser') + ->fields('eUser', array('id')); + $numUsers = $sCon->countQuery()->execute()->fetchField(); + array_push($list,(object) array('name' => "Αριθμός Εγγεγραμένων Χρηστών με ρόλο Αιτούντα", 'numStudents' => $numUsers)); + + return $this->respondWithStatus($list, Response::HTTP_OK); + } //end try + + catch (\Exception $e) { + $this->logger->warning($e->getMessage()); + return $this->respondWithStatus([ + "message" => t("An unexpected problem occured during report") + ], Response::HTTP_INTERNAL_SERVER_ERROR); + } + } - public function makegGeneralReport(Request $request) { - try { - if (!$request->isMethod('GET')) { - return $this->respondWithStatus([ - "message" => t("Method Not Allowed") - ], Response::HTTP_METHOD_NOT_ALLOWED); - } - //user validation - $authToken = $request->headers->get('PHP_AUTH_USER'); - $users = $this->entityTypeManager->getStorage('user')->loadByProperties(array('name' => $authToken)); - $user = reset($users); - if (!$user) { - return $this->respondWithStatus([ - 'message' => t("User not found"), - ], Response::HTTP_FORBIDDEN); - } + public function makeGeneralReport(Request $request) { - //user role validation - $roles = $user->getRoles(); - $validRole = false; - foreach ($roles as $role) - if ($role === "ministry") { - $validRole = true; - break; - } - if (!$validRole) { - return $this->respondWithStatus([ - 'message' => t("User Invalid Role"), - ], Response::HTTP_FORBIDDEN); - } - - //υπολογισμός αριθμού δηλώσεων - $sCon = $this->connection->select('epal_student', 'eStudent') - ->fields('eStudent', array('id')); - $numTotal = $sCon->countQuery()->execute()->fetchField(); - - //υπολογισμός αριθμού δηλώσεων που ικανοποιήθηκαν στην i προτίμηση - $numData = array(); - for ($i=0; $i < 3; $i++) { - $sCon = $this->connection->select('epal_student_class', 'eStudent') - ->fields('eStudent', array('id', 'distribution_id')) - ->condition('eStudent.distribution_id', $i+1, '=') - ->condition('eStudent.finalized', 1 , '='); - array_push($numData, $sCon->countQuery()->execute()->fetchField()); - } - - // υπολογισμός αριθμού δηλώσεων που ΔΕΝ ικανοποιήθηκαν - //Σημείωση: υπολογισμός με queries στη βάση - $sCon = $this->connection->select('epal_student_class', 'eStudent') - ->fields('eStudent', array('student_id')); - $epalStudents = $sCon->execute()->fetchAll(\PDO::FETCH_OBJ); - $studentIds = array(); - foreach ($epalStudents as $epalStudent) - array_push($studentIds, $epalStudent->student_id); - $sCon = $this->connection->select('epal_student', 'eStudent') - ->fields('eStudent', array('id')) - ->condition('eStudent.id', $studentIds, 'NOT IN'); - $numNoAllocated = $sCon->countQuery()->execute()->fetchField(); - - //υπολογισμός αριθμού δηλώσεων που τοποθετήθηκαν προσωρινά σε ολιγομελή τμήματα - $numInSmallClasses = 0; - $sCon = $this->connection->select('epal_student_class', 'eStudent') - ->fields('eStudent', array('id')) - ->condition('eStudent.finalized', 0 , '='); - $numInSmallClasses = $sCon->countQuery()->execute()->fetchField(); - - - $list = array(); - - array_push($list,(object) array('name' => "Αριθμός Δηλώσεων Προτίμησης", 'numStudents' => $numTotal)); - array_push($list,(object) array('name' => "Αριθμός μαθητών που τοποθετήθηκαν στην πρώτη τους προτίμηση", 'numStudents' => $numData[0])); - array_push($list,(object) array('name' => "Αριθμός μαθητών που τοποθετήθηκαν στην δεύτερή τους προτίμηση", 'numStudents' => $numData[1])); - array_push($list,(object) array('name' => "Αριθμός μαθητών που τοποθετήθηκαν στην τρίτη τους προτίμηση", 'numStudents' => $numData[2])); - array_push($list,(object) array('name' => "Αριθμός μαθητών που δεν τοποθετήθηκαν σε καμμία τους προτίμηση", 'numStudents' => $numNoAllocated)); - array_push($list,(object) array('name' => "Αριθμός μαθητών που τοποθετήθηκαν προσωρινά σε ολιγομελή τμήματα", 'numStudents' => $numInSmallClasses)); + try { + if (!$request->isMethod('GET')) { + return $this->respondWithStatus([ + "message" => t("Method Not Allowed") + ], Response::HTTP_METHOD_NOT_ALLOWED); + } - return $this->respondWithStatus( - $list - , Response::HTTP_OK); - } //end try + //user validation + $authToken = $request->headers->get('PHP_AUTH_USER'); + $users = $this->entityTypeManager->getStorage('user')->loadByProperties(array('name' => $authToken)); + $user = reset($users); + if (!$user) { + return $this->respondWithStatus([ + 'message' => t("User not found"), + ], Response::HTTP_FORBIDDEN); + } - catch (\Exception $e) { - $this->logger->warning($e->getMessage()); + //user role validation + $roles = $user->getRoles(); + $validRole = false; + foreach ($roles as $role) + if ($role === "ministry") { + $validRole = true; + break; + } + if (!$validRole) { return $this->respondWithStatus([ - "message" => t("An unexpected problem occured during makegGeneralReport Method") - ], Response::HTTP_INTERNAL_SERVER_ERROR); + 'message' => t("User Invalid Role"), + ], Response::HTTP_FORBIDDEN); + } + + //υπολογισμός αριθμού δηλώσεων + $sCon = $this->connection + ->select('epal_student', 'eStudent') + ->fields('eStudent', array('id')); + $numTotal = $sCon->countQuery()->execute()->fetchField(); + + //υπολογισμός αριθμού δηλώσεων που ικανοποιήθηκαν στην i προτίμηση + $numData = array(); + for ($i=0; $i < 3; $i++) { + $sCon = $this->connection + ->select('epal_student_class', 'eStudent') + ->fields('eStudent', array('id', 'distribution_id')) + ->condition('eStudent.distribution_id', $i+1, '=') + ->condition('eStudent.finalized', 1 , '='); + array_push($numData, $sCon->countQuery()->execute()->fetchField()); } + // υπολογισμός αριθμού δηλώσεων που ΔΕΝ ικανοποιήθηκαν + /* + $sCon = $this->connection + ->select('epal_student_class', 'eStudent') + ->fields('eStudent', array('student_id')); + $epalStudents = $sCon->execute()->fetchAll(\PDO::FETCH_OBJ); + $studentIds = array(); + foreach ($epalStudents as $epalStudent) + array_push($studentIds, $epalStudent->student_id); + $sCon = $this->connection + ->select('epal_student', 'eStudent') + ->fields('eStudent', array('id')) + ->condition('eStudent.id', $studentIds, 'NOT IN'); + $numNoAllocated = $sCon->countQuery()->execute()->fetchField(); + */ + $sCon = $this->connection->select('epal_student', 'epalStudent'); + $sCon->leftJoin('epal_student_class', 'eStudent', 'eStudent.student_id = epalStudent.id'); + $sCon->fields('eStudent', array('student_id')) + ->fields('epalStudent', array('id')) + ->isNull('eStudent.student_id'); + $numNoAllocated = $sCon->countQuery()->execute()->fetchField(); + + //υπολογισμός αριθμού δηλώσεων που τοποθετήθηκαν προσωρινά σε ολιγομελή τμήματα + $numInSmallClasses = 0; + $sCon = $this->connection + ->select('epal_student_class', 'eStudent') + ->fields('eStudent', array('id')) + ->condition('eStudent.finalized', 0 , '='); + $numInSmallClasses = $sCon->countQuery()->execute()->fetchField(); + + $list = array( + array('name' => "Αριθμός Δηλώσεων Προτίμησης", 'numStudents' => $numTotal), + array('name' => "Αριθμός μαθητών που τοποθετήθηκαν στην πρώτη τους προτίμηση", 'numStudents' => $numData[0]), + array('name' => "Αριθμός μαθητών που τοποθετήθηκαν στην δεύτερή τους προτίμηση", 'numStudents' => $numData[1]), + array('name' => "Αριθμός μαθητών που τοποθετήθηκαν στην τρίτη τους προτίμηση", 'numStudents' => $numData[2]), + array('name' => "Αριθμός μαθητών που δεν τοποθετήθηκαν σε καμμία τους προτίμηση", 'numStudents' => $numNoAllocated), + array('name' => "Αριθμός μαθητών που τοποθετήθηκαν προσωρινά σε ολιγομελή τμήματα", 'numStudents' => $numInSmallClasses) + ); + + return $this->respondWithStatus($list, Response::HTTP_OK); + } //end try + + catch (\Exception $e) { + $this->logger->warning($e->getMessage()); + return $this->respondWithStatus([ + "message" => t("An unexpected problem occured during report") + ], Response::HTTP_INTERNAL_SERVER_ERROR); } + } + public function makeReportCompleteness(Request $request, $regionId, $adminId, $schId) { @@ -1048,14 +1057,9 @@ class ReportsCreator extends ControllerBase { } private function respondWithStatus($arr, $s) { - $res = new JsonResponse($arr); - $res->setStatusCode($s); - return $res; - } - - - - - + $res = new JsonResponse($arr); + $res->setStatusCode($s); + return $res; + } } diff --git a/source/components/minister/minister-reports.ts b/source/components/minister/minister-reports.ts index ca7fe9f5c288a2db562cad0e00ea1e700c266822..659e35aca50b4b4cca859ddf8b641392226e3445 100644 --- a/source/components/minister/minister-reports.ts +++ b/source/components/minister/minister-reports.ts @@ -1,16 +1,16 @@ import { Component, OnInit, OnDestroy } from "@angular/core"; import { Injectable } from "@angular/core"; -import { AppSettings } from '../../app.settings'; -import { HelperDataService } from '../../services/helper-data-service'; +import { AppSettings } from "../../app.settings"; +import { HelperDataService } from "../../services/helper-data-service"; import { Observable} from "rxjs/Observable"; -import { Http, Headers, RequestOptions} from '@angular/http'; -import { NgRedux, select } from 'ng2-redux'; -import { IAppState } from '../../store/store'; -import { Router, ActivatedRoute, Params} from '@angular/router'; -import { BehaviorSubject, Subscription } from 'rxjs/Rx'; -import { ILoginInfo } from '../../store/logininfo/logininfo.types'; -import { LOGININFO_INITIAL_STATE } from '../../store/logininfo/logininfo.initial-state'; -import { MINISTRY_ROLE, PDE_ROLE, DIDE_ROLE } from '../../constants'; +import { Http, Headers, RequestOptions} from "@angular/http"; +import { NgRedux, select } from "ng2-redux"; +import { IAppState } from "../../store/store"; +import { Router, ActivatedRoute, Params} from "@angular/router"; +import { BehaviorSubject, Subscription } from "rxjs/Rx"; +import { ILoginInfo } from "../../store/logininfo/logininfo.types"; +import { LOGININFO_INITIAL_STATE } from "../../store/logininfo/logininfo.initial-state"; +import { MINISTRY_ROLE, PDE_ROLE, DIDE_ROLE } from "../../constants"; import { FormBuilder, @@ -18,13 +18,13 @@ import { FormControl, FormArray, Validators, -} from '@angular/forms'; +} from "@angular/forms"; -import { API_ENDPOINT } from '../../app.settings'; +import { API_ENDPOINT } from "../../app.settings"; @Component({ - selector: 'minister-reports', - //encapsulation: ViewEncapsulation.None, + selector: "minister-reports", + // encapsulation: ViewEncapsulation.None, template: ` @@ -35,34 +35,6 @@ import { API_ENDPOINT } from '../../app.settings';
-
@@ -89,8 +88,6 @@ import { API_ENDPOINT } from '../../app.settings'; private data; private validCreator: number; private createGraph: boolean; - private reportId: number; - private routerSub: any; private source: LocalDataSource; columnMap: Map = new Map(); @@ -99,7 +96,7 @@ import { API_ENDPOINT } from '../../app.settings'; private csvObj = new csvCreator(); private chartObj = new chartCreator(); - @ViewChild('chart') public chartContainer: ElementRef; + @ViewChild("chart") public chartContainer: ElementRef; private d3data: Array; @@ -110,14 +107,14 @@ import { API_ENDPOINT } from '../../app.settings'; private router: Router) { this.formGroup = this.fb.group({ - region: ['', []], - adminarea: ['', []], - schoollist: ['', []], + region: ["", []], + adminarea: ["", []], + schoollist: ["", []], }); this.loginInfo$ = new BehaviorSubject(LOGININFO_INITIAL_STATE); this.generalReport$ = new BehaviorSubject([{}]); - this.minedu_userName = ''; + this.minedu_userName = ""; this.validCreator = -1; this.createGraph = false; @@ -127,7 +124,7 @@ import { API_ENDPOINT } from '../../app.settings'; this.loginInfoSub = this._ngRedux.select(state => { if (state.loginInfo.size > 0) { - state.loginInfo.reduce(({}, loginInfoToken) => { + state.loginInfo.reduce(({ }, loginInfoToken) => { this.minedu_userName = loginInfoToken.minedu_username; this.minedu_userPassword = loginInfoToken.minedu_userpassword; return loginInfoToken; @@ -136,11 +133,6 @@ import { API_ENDPOINT } from '../../app.settings'; return state.loginInfo; }).subscribe(this.loginInfo$); - this.routerSub = this.activatedRoute.params.subscribe(params => { - this.reportId = +params['reportId']; - - }); - } ngOnDestroy() { @@ -156,41 +148,28 @@ import { API_ENDPOINT } from '../../app.settings'; } - - createReport(regionSel) { + createReport() { this.validCreator = 0; this.createGraph = false; - let route; - if (this.reportId === 1) { - route = "/ministry/general-report/"; - this.settings = this.reportSchema.genReportSchema; - } - else if (this.reportId === 2) { - route = "/ministry/report-completeness/"; - this.settings = this.reportSchema.reportCompletenessSchema; - } - else if (this.reportId === 3) { - route = "/ministry/report-all-stat/"; - this.settings = this.reportSchema.reportAllStatSchema; - } - - let regSel = 0; - - this.generalReportSub = this._hds.makeReport(this.minedu_userName, this.minedu_userPassword, route, 0, 0, 0, 0, 0, 0, 0).subscribe(data => { - this.generalReport$.next(data); - this.data = data; - this.validCreator = 1; - this.source = new LocalDataSource(this.data); - this.columnMap = new Map(); - - //pass parametes to csv class object - this.csvObj.columnMap = this.columnMap; - this.csvObj.source = this.source; - this.csvObj.settings = this.settings; - this.csvObj.prepareColumnMap(); - }, + let route = "/ministry/general-report/"; + this.settings = this.reportSchema.genReportSchema; + + this.generalReportSub = this._hds.makeReport(this.minedu_userName, this.minedu_userPassword, route, 0, 0, 0, 0, 0, 0, 0) + .subscribe(data => { + this.generalReport$.next(data); + this.data = data; + this.validCreator = 1; + this.source = new LocalDataSource(this.data); + this.columnMap = new Map(); + + // pass parametes to csv class object + this.csvObj.columnMap = this.columnMap; + this.csvObj.source = this.source; + this.csvObj.settings = this.settings; + this.csvObj.prepareColumnMap(); + }, error => { this.generalReport$.next([{}]); this.validCreator = -1; @@ -200,20 +179,15 @@ import { API_ENDPOINT } from '../../app.settings'; } navigateBack() { - this.router.navigate(['/ministry/minister-reports']); + this.router.navigate(["/ministry/minister-reports"]); } - - onSearch(query: string = '') { - + onSearch(query: string = "") { this.csvObj.onSearch(query); } - export2Csv() { - this.csvObj.export2Csv(); - } @@ -229,33 +203,20 @@ import { API_ENDPOINT } from '../../app.settings'; } generateGraphData() { - this.d3data = []; - if (this.reportId === 1) { - let labelsX = []; - labelsX.push("1η Προτίμηση"); - labelsX.push("2η Προτίμηση"); - labelsX.push("3η Προτίμηση"); - labelsX.push("Μη τοποθετημένοι"); - labelsX.push("Προσωρινά τοποθετημένοι σε ολιγομελή"); - for (let i = 1; i <= 5; i++) { - this.d3data.push([ - labelsX[i - 1], - this.data[i].numStudents / this.data[0].numStudents, - ]); - } + let labelsX = []; + labelsX.push("1η Προτίμηση"); + labelsX.push("2η Προτίμηση"); + labelsX.push("3η Προτίμηση"); + labelsX.push("Μη τοποθετημένοι"); + labelsX.push("Προσωρινά τοποθετημένοι σε ολιγομελή"); + for (let i = 1; i <= 5; i++) { + this.d3data.push([ + labelsX[i - 1], + this.data[i].numStudents / this.data[0].numStudents, + ]); } } - - - - - - - - - - } diff --git a/source/components/minister/report-users.ts b/source/components/minister/report-users.ts index 99625d026391d3055cb8320123ce2d1eb13fbc16..695c0a3b6e1d550794d271d5d79c36d5e04c8408 100644 --- a/source/components/minister/report-users.ts +++ b/source/components/minister/report-users.ts @@ -1,23 +1,23 @@ import { Component, OnInit, OnDestroy, ElementRef, ViewChild, Input } from "@angular/core"; import { Injectable } from "@angular/core"; -import { AppSettings } from '../../app.settings'; -import { HelperDataService } from '../../services/helper-data-service'; +import { AppSettings } from "../../app.settings"; +import { HelperDataService } from "../../services/helper-data-service"; import { Observable} from "rxjs/Observable"; -import { Http, Headers, RequestOptions} from '@angular/http'; -import { NgRedux, select } from 'ng2-redux'; -import { IAppState } from '../../store/store'; -import { Router, ActivatedRoute, Params} from '@angular/router'; -import { BehaviorSubject, Subscription } from 'rxjs/Rx'; -import { ILoginInfo } from '../../store/logininfo/logininfo.types'; -import { Ng2SmartTableModule, LocalDataSource } from 'ng2-smart-table'; -import {reportsSchema, TableColumn} from './reports-schema'; -import { LOGININFO_INITIAL_STATE } from '../../store/logininfo/logininfo.initial-state'; -import {csvCreator} from './csv-creator'; - -import { API_ENDPOINT } from '../../app.settings'; +import { Http, Headers, RequestOptions} from "@angular/http"; +import { NgRedux, select } from "ng2-redux"; +import { IAppState } from "../../store/store"; +import { Router, ActivatedRoute, Params} from "@angular/router"; +import { BehaviorSubject, Subscription } from "rxjs/Rx"; +import { ILoginInfo } from "../../store/logininfo/logininfo.types"; +import { Ng2SmartTableModule, LocalDataSource } from "ng2-smart-table"; +import {reportsSchema, TableColumn} from "./reports-schema"; +import { LOGININFO_INITIAL_STATE } from "../../store/logininfo/logininfo.initial-state"; +import {csvCreator} from "./csv-creator"; + +import { API_ENDPOINT } from "../../app.settings"; @Component({ - selector: 'report-users', + selector: "report-users", template: `
@@ -66,7 +66,7 @@ import { API_ENDPOINT } from '../../app.settings'; private distStatus = "READY"; private data; private validCreator: number; - //private reportId: number; + // private reportId: number; private routerSub: any; private source: LocalDataSource; @@ -75,17 +75,16 @@ import { API_ENDPOINT } from '../../app.settings'; private reportSchema = new reportsSchema(); private csvObj = new csvCreator(); - - constructor(private _ngRedux: NgRedux, + constructor( + private _ngRedux: NgRedux, private _hds: HelperDataService, private activatedRoute: ActivatedRoute, - private router: Router) { - + private router: Router + ) { this.loginInfo$ = new BehaviorSubject(LOGININFO_INITIAL_STATE); this.generalReport$ = new BehaviorSubject([{}]); - this.minedu_userName = ''; + this.minedu_userName = ""; this.validCreator = -1; - } ngOnInit() { @@ -120,23 +119,23 @@ import { API_ENDPOINT } from '../../app.settings'; this.validCreator = 0; - let route; - route = "/ministry/report-users/"; + let route = "/ministry/report-users/"; this.settings = this.reportSchema.ReportUsersSchema; - this.generalReportSub = this._hds.makeReport(this.minedu_userName, this.minedu_userPassword, route, 0, 0, 0, 0, 0, 0, 0).subscribe(data => { - this.generalReport$.next(data); - this.data = data; - this.validCreator = 1; - this.source = new LocalDataSource(this.data); - this.columnMap = new Map(); - - //pass parametes to csv class object - this.csvObj.columnMap = this.columnMap; - this.csvObj.source = this.source; - this.csvObj.settings = this.settings; - this.csvObj.prepareColumnMap(); - }, + this.generalReportSub = this._hds.makeReport(this.minedu_userName, this.minedu_userPassword, route, 0, 0, 0, 0, 0, 0, 0) + .subscribe(data => { + this.generalReport$.next(data); + this.data = data; + this.validCreator = 1; + this.source = new LocalDataSource(this.data); + this.columnMap = new Map(); + + // pass parametes to csv class object + this.csvObj.columnMap = this.columnMap; + this.csvObj.source = this.source; + this.csvObj.settings = this.settings; + this.csvObj.prepareColumnMap(); + }, error => { this.generalReport$.next([{}]); this.validCreator = -1; @@ -146,20 +145,15 @@ import { API_ENDPOINT } from '../../app.settings'; } navigateBack() { - this.router.navigate(['/ministry/minister-reports']); + this.router.navigate(["/ministry/minister-reports"]); } - - onSearch(query: string = '') { - + onSearch(query: string = "") { this.csvObj.onSearch(query); } - export2Csv() { - this.csvObj.export2Csv(); - } } diff --git a/source/containers/main.routes.ts b/source/containers/main.routes.ts index 5d20a455d57aaebc0f69627d8802cf2e382b814b..d89d86b3e1715ce3a5e92dc0000f3911fbb5ca07 100644 --- a/source/containers/main.routes.ts +++ b/source/containers/main.routes.ts @@ -77,7 +77,7 @@ export const MainRoutes: Routes = [ { path: 'ministry/minister-view', component: MinisterView, canActivate: [MinistryAuthGuard] }, { path: 'ministry/minister-reports', component: MinisterReports, canActivate: [ReportsAuthGuard] }, { path: 'ministry/report-all-stat/:reportId', component: ReportAllStat, canActivate: [ReportsAuthGuard] }, - { path: 'ministry/report-general/:reportId', component: ReportGeneral, canActivate: [MinistryAuthGuard] }, + { path: 'ministry/report-general', component: ReportGeneral, canActivate: [MinistryAuthGuard] }, { path: 'ministry/report-users/:reportId', component: ReportUsers, canActivate: [MinistryAuthGuard] }, { path: 'ministry/report-no-capacity/:reportId', component: ReportNoCapacity, canActivate: [MinistryAuthGuard] }, { path: 'ministry/minister-informstudents', component: InformStudents, canActivate: [MinistryAuthGuard] },