Merge branch 'lock_actions' into 'develop'

Profile now is saved to store on updates. Various fixes. application.submit restructured etc

See merge request !104
parents 64f0a4b0 64c71ff5
...@@ -83,6 +83,12 @@ class ApplicationSubmit extends ControllerBase { ...@@ -83,6 +83,12 @@ class ApplicationSubmit extends ControllerBase {
'certificatetype' => $applicationForm[0][certificatetype], 'certificatetype' => $applicationForm[0][certificatetype],
//'lastam' => $applicationForm[0][lastam], //'lastam' => $applicationForm[0][lastam],
'currentclass' => $applicationForm[0][currentclass], 'currentclass' => $applicationForm[0][currentclass],
'guardian_name' => $applicationForm[0][cu_name],
'guardian_surname' => $applicationForm[0][cu_surname],
'guardian_fathername' => $applicationForm[0][cu_fathername],
'guardian_mothername' => $applicationForm[0][cu_mothername],
'agreement' => $applicationForm[0][disclaimer_checked],
//'currentepal' => $applicationForm[0][currentepal], //'currentepal' => $applicationForm[0][currentepal],
//'currentsector' => $applicationForm[0][currentsector], //'currentsector' => $applicationForm[0][currentsector],
'points' => $applicationForm[0][points], 'points' => $applicationForm[0][points],
......
...@@ -50,12 +50,30 @@ class CurrentUser extends ControllerBase ...@@ -50,12 +50,30 @@ class CurrentUser extends ControllerBase
], Response::HTTP_FORBIDDEN); ], Response::HTTP_FORBIDDEN);
} }
$epalConfigs = $this->entityTypeManager->getStorage('epal_config')->loadByProperties(array('name' => 'epal_config'));
$epalConfig = reset($epalConfigs);
if (!$epalConfig) {
return $this->respondWithStatus([
'message' => t("Configuration not found"),
], Response::HTTP_FORBIDDEN);
}
$userRoles = $user->getRoles(); $userRoles = $user->getRoles();
foreach ($userRoles as $userRole) { foreach ($userRoles as $userRole) {
if (($userRole === 'epal') || ($userRole === 'regioneduadmin') || ($userRole === 'eduadmin')) { if (($userRole === 'epal') || ($userRole === 'regioneduadmin') || ($userRole === 'eduadmin')) {
return $this->respondWithStatus([ return $this->respondWithStatus([
'name' => $user->mail->value, 'cu_name' => $user->mail->value,
'title' => $user->init->value, 'cu_surname' => '',
'cu_fathername' => '',
'cu_mothername' => '',
'cu_email' => '',
'minedu_username' => '',
'minedu_userpassword' => '',
'lock_capacity' => $epalConfig->lock_school_capacity->value,
'lock_students' => $epalConfig->lock_school_students_view->value,
'lock_application' => $epalConfig->lock_application->value,
'disclaimer_checked' => "0",
'title' => $user->init->value
], Response::HTTP_OK); ], Response::HTTP_OK);
} else if ($userRole === 'applicant') { } else if ($userRole === 'applicant') {
break; break;
...@@ -66,8 +84,24 @@ class CurrentUser extends ControllerBase ...@@ -66,8 +84,24 @@ class CurrentUser extends ControllerBase
$epalUsers = $this->entityTypeManager->getStorage('epal_users')->loadByProperties(array('authtoken' => $authToken)); $epalUsers = $this->entityTypeManager->getStorage('epal_users')->loadByProperties(array('authtoken' => $authToken));
$epalUser = reset($epalUsers); $epalUser = reset($epalUsers);
if ($epalUser) { if ($epalUser) {
$userName = $epalUser->name->value;
$userSurname = $epalUser->surname->value;
$userFathername = $epalUser->fathername->value;
$userMothername = $epalUser->mothername->value;
$userEmail = $user->mail->value;
return $this->respondWithStatus([ return $this->respondWithStatus([
'name' => $epalUser->name->value, 'cu_name' => mb_substr($epalUser->name->value,0,4,'UTF-8') !== "####" ? $epalUser->name->value : '',
'cu_surname' => mb_substr($epalUser->surname->value,0,4,'UTF-8') !== "####" ? $epalUser->surname->value : '',
'cu_fathername' => mb_substr($epalUser->fathername->value,0,4,'UTF-8') !== "####" ? $epalUser->fathername->value : '',
'cu_mothername' => mb_substr($epalUser->mothername->value,0,4,'UTF-8') !== "####" ? $epalUser->mothername->value : '',
'cu_email' => mb_substr($user->mail->value,0,4,'UTF-8') !== "####" ? $user->mail->value : '',
'minedu_username' => '',
'minedu_userpassword' => '',
'lock_capacity' => $epalConfig->lock_school_capacity->value,
'lock_students' => $epalConfig->lock_school_students_view->value,
'lock_application' => $epalConfig->lock_application->value,
'disclaimer_checked' => "0",
'verificationCodeVerified' => $epalUser->verificationcodeverified->value,
], Response::HTTP_OK); ], Response::HTTP_OK);
} else { } else {
return $this->respondWithStatus([ return $this->respondWithStatus([
......
...@@ -206,7 +206,7 @@ class EpalConfig extends ContentEntityBase implements EpalConfigInterface { ...@@ -206,7 +206,7 @@ class EpalConfig extends ContentEntityBase implements EpalConfigInterface {
->setSettings(array( ->setSettings(array(
'text_processing' => 0, 'text_processing' => 0,
)) ))
->setRequired(TRUE) ->setRequired(FALSE)
->setDefaultValue(FALSE) ->setDefaultValue(FALSE)
->setDisplayOptions('view', array( ->setDisplayOptions('view', array(
'label' => 'above', 'label' => 'above',
...@@ -226,7 +226,7 @@ class EpalConfig extends ContentEntityBase implements EpalConfigInterface { ...@@ -226,7 +226,7 @@ class EpalConfig extends ContentEntityBase implements EpalConfigInterface {
->setSettings(array( ->setSettings(array(
'text_processing' => 0, 'text_processing' => 0,
)) ))
->setRequired(TRUE) ->setRequired(FALSE)
->setDefaultValue(FALSE) ->setDefaultValue(FALSE)
->setDisplayOptions('view', array( ->setDisplayOptions('view', array(
'label' => 'above', 'label' => 'above',
...@@ -246,7 +246,7 @@ class EpalConfig extends ContentEntityBase implements EpalConfigInterface { ...@@ -246,7 +246,7 @@ class EpalConfig extends ContentEntityBase implements EpalConfigInterface {
->setSettings(array( ->setSettings(array(
'text_processing' => 0, 'text_processing' => 0,
)) ))
->setRequired(TRUE) ->setRequired(FALSE)
->setDefaultValue(FALSE) ->setDefaultValue(FALSE)
->setDisplayOptions('view', array( ->setDisplayOptions('view', array(
'label' => 'above', 'label' => 'above',
......
...@@ -505,7 +505,7 @@ class EpalStudent extends ContentEntityBase implements EpalStudentInterface { ...@@ -505,7 +505,7 @@ class EpalStudent extends ContentEntityBase implements EpalStudentInterface {
->setLabel(t('Ημερομηνία γέννησης μαθητή')) ->setLabel(t('Ημερομηνία γέννησης μαθητή'))
->setDescription(t('Δώσε την Ημερομηνία γέννησης μαθητή.')) ->setDescription(t('Δώσε την Ημερομηνία γέννησης μαθητή.'))
->setSetting('datetime_type', 'date') ->setSetting('datetime_type', 'date')
->setRequired(false) ->setRequired(true)
->setDisplayOptions('view', array( ->setDisplayOptions('view', array(
'label' => 'above', 'label' => 'above',
'type' => 'string', 'type' => 'string',
...@@ -543,7 +543,7 @@ class EpalStudent extends ContentEntityBase implements EpalStudentInterface { ...@@ -543,7 +543,7 @@ class EpalStudent extends ContentEntityBase implements EpalStudentInterface {
'max_length' => 50, 'max_length' => 50,
'text_processing' => 0, 'text_processing' => 0,
)) ))
->setRequired(false) ->setRequired(true)
->setDefaultValue('') ->setDefaultValue('')
->setDisplayOptions('view', array( ->setDisplayOptions('view', array(
'label' => 'above', 'label' => 'above',
...@@ -564,7 +564,7 @@ class EpalStudent extends ContentEntityBase implements EpalStudentInterface { ...@@ -564,7 +564,7 @@ class EpalStudent extends ContentEntityBase implements EpalStudentInterface {
'max_length' => 50, 'max_length' => 50,
'text_processing' => 0, 'text_processing' => 0,
)) ))
->setRequired(false) ->setRequired(true)
->setDefaultValue('') ->setDefaultValue('')
->setDisplayOptions('view', array( ->setDisplayOptions('view', array(
'label' => 'above', 'label' => 'above',
...@@ -585,7 +585,7 @@ class EpalStudent extends ContentEntityBase implements EpalStudentInterface { ...@@ -585,7 +585,7 @@ class EpalStudent extends ContentEntityBase implements EpalStudentInterface {
'max_length' => 50, 'max_length' => 50,
'text_processing' => 0, 'text_processing' => 0,
)) ))
->setRequired(false) ->setRequired(true)
->setDefaultValue('') ->setDefaultValue('')
->setDisplayOptions('view', array( ->setDisplayOptions('view', array(
'label' => 'above', 'label' => 'above',
...@@ -606,7 +606,7 @@ class EpalStudent extends ContentEntityBase implements EpalStudentInterface { ...@@ -606,7 +606,7 @@ class EpalStudent extends ContentEntityBase implements EpalStudentInterface {
'max_length' => 50, 'max_length' => 50,
'text_processing' => 0, 'text_processing' => 0,
)) ))
->setRequired(false) ->setRequired(true)
->setDefaultValue('') ->setDefaultValue('')
->setDisplayOptions('view', array( ->setDisplayOptions('view', array(
'label' => 'above', 'label' => 'above',
...@@ -627,6 +627,7 @@ class EpalStudent extends ContentEntityBase implements EpalStudentInterface { ...@@ -627,6 +627,7 @@ class EpalStudent extends ContentEntityBase implements EpalStudentInterface {
'max_length' => 20, 'max_length' => 20,
'text_processing' => 0, 'text_processing' => 0,
)) ))
->setRequired(false)
->setDefaultValue('') ->setDefaultValue('')
->setDisplayOptions('view', array( ->setDisplayOptions('view', array(
'label' => 'above', 'label' => 'above',
...@@ -647,6 +648,7 @@ class EpalStudent extends ContentEntityBase implements EpalStudentInterface { ...@@ -647,6 +648,7 @@ class EpalStudent extends ContentEntityBase implements EpalStudentInterface {
'max_length' => 100, 'max_length' => 100,
'text_processing' => 0, 'text_processing' => 0,
)) ))
->setRequired(true)
->setDefaultValue('') ->setDefaultValue('')
->setDisplayOptions('view', array( ->setDisplayOptions('view', array(
'label' => 'above', 'label' => 'above',
...@@ -667,27 +669,7 @@ class EpalStudent extends ContentEntityBase implements EpalStudentInterface { ...@@ -667,27 +669,7 @@ class EpalStudent extends ContentEntityBase implements EpalStudentInterface {
'max_length' => 10, 'max_length' => 10,
'text_processing' => 0, 'text_processing' => 0,
)) ))
->setDefaultValue('') ->setRequired(true)
->setDisplayOptions('view', array(
'label' => 'above',
'type' => 'string',
'weight' => -4,
))
->setDisplayOptions('form', array(
'type' => 'string_textfield',
'weight' => -4,
))
->setDisplayConfigurable('form', TRUE)
->setDisplayConfigurable('view', TRUE);
$fields['regionarea'] = BaseFieldDefinition::create('string')
->setLabel(t('Πόλη-Κοινότητα'))
->setDescription(t('Δώσε την πόλη ή κοινότητα που διαμένεις.'))
->setSettings(array(
'max_length' => 100,
'text_processing' => 0,
))
->setDefaultValue('')
->setDisplayOptions('view', array( ->setDisplayOptions('view', array(
'label' => 'above', 'label' => 'above',
'type' => 'string', 'type' => 'string',
...@@ -707,6 +689,7 @@ class EpalStudent extends ContentEntityBase implements EpalStudentInterface { ...@@ -707,6 +689,7 @@ class EpalStudent extends ContentEntityBase implements EpalStudentInterface {
'max_length' => 100, 'max_length' => 100,
'text_processing' => 0, 'text_processing' => 0,
)) ))
->setRequired(true)
->setDefaultValue('') ->setDefaultValue('')
->setDisplayOptions('view', array( ->setDisplayOptions('view', array(
'label' => 'above', 'label' => 'above',
...@@ -727,6 +710,7 @@ class EpalStudent extends ContentEntityBase implements EpalStudentInterface { ...@@ -727,6 +710,7 @@ class EpalStudent extends ContentEntityBase implements EpalStudentInterface {
'max_length' => 50, 'max_length' => 50,
'text_processing' => 0, 'text_processing' => 0,
)) ))
->setRequired(true)
->setDefaultValue('') ->setDefaultValue('')
->setDisplayOptions('view', array( ->setDisplayOptions('view', array(
'label' => 'above', 'label' => 'above',
...@@ -747,6 +731,7 @@ class EpalStudent extends ContentEntityBase implements EpalStudentInterface { ...@@ -747,6 +731,7 @@ class EpalStudent extends ContentEntityBase implements EpalStudentInterface {
'max_length' => 10, 'max_length' => 10,
'text_processing' => 0, 'text_processing' => 0,
)) ))
->setRequired(false)
->setDefaultValue('') ->setDefaultValue('')
->setDisplayOptions('view', array( ->setDisplayOptions('view', array(
'label' => 'above', 'label' => 'above',
...@@ -912,6 +897,7 @@ class EpalStudent extends ContentEntityBase implements EpalStudentInterface { ...@@ -912,6 +897,7 @@ class EpalStudent extends ContentEntityBase implements EpalStudentInterface {
'max_length' => 50, 'max_length' => 50,
'text_processing' => 0, 'text_processing' => 0,
)) ))
->setRequired(true)
->setDefaultValue('') ->setDefaultValue('')
->setDisplayOptions('view', array( ->setDisplayOptions('view', array(
'label' => 'above', 'label' => 'above',
...@@ -932,6 +918,7 @@ class EpalStudent extends ContentEntityBase implements EpalStudentInterface { ...@@ -932,6 +918,7 @@ class EpalStudent extends ContentEntityBase implements EpalStudentInterface {
'max_length' => 50, 'max_length' => 50,
'text_processing' => 0, 'text_processing' => 0,
)) ))
->setRequired(true)
->setDefaultValue('') ->setDefaultValue('')
->setDisplayOptions('view', array( ->setDisplayOptions('view', array(
'label' => 'above', 'label' => 'above',
...@@ -969,7 +956,7 @@ class EpalStudent extends ContentEntityBase implements EpalStudentInterface { ...@@ -969,7 +956,7 @@ class EpalStudent extends ContentEntityBase implements EpalStudentInterface {
->setSettings(array( ->setSettings(array(
'text_processing' => 0, 'text_processing' => 0,
)) ))
->setRequired(false) ->setRequired(true)
->setDisplayOptions('view', array( ->setDisplayOptions('view', array(
'label' => 'above', 'label' => 'above',
'type' => 'boolean', 'type' => 'boolean',
...@@ -982,6 +969,90 @@ class EpalStudent extends ContentEntityBase implements EpalStudentInterface { ...@@ -982,6 +969,90 @@ class EpalStudent extends ContentEntityBase implements EpalStudentInterface {
->setDisplayConfigurable('form', TRUE) ->setDisplayConfigurable('form', TRUE)
->setDisplayConfigurable('view', TRUE); ->setDisplayConfigurable('view', TRUE);
$fields['guardian_name'] = BaseFieldDefinition::create('string')
->setLabel(t('Όνομα κηδεμόνα'))
->setDescription(t('Δώσε το όνομα κηδεμόνα.'))
->setSettings(array(
'max_length' => 50,
'text_processing' => 0,
))
->setRequired(true)
->setDefaultValue('')
->setDisplayOptions('view', array(
'label' => 'above',
'type' => 'string',
'weight' => -4,
))
->setDisplayOptions('form', array(
'type' => 'string_textfield',
'weight' => -4,
))
->setDisplayConfigurable('form', TRUE)
->setDisplayConfigurable('view', TRUE);
$fields['guardian_surname'] = BaseFieldDefinition::create('string')
->setLabel(t('Επώνυμο κηδεμόνα'))
->setDescription(t('Δώσε το επώνυμο κηδεμόνα.'))
->setSettings(array(
'max_length' => 50,
'text_processing' => 0,
))
->setRequired(true)
->setDefaultValue('')
->setDisplayOptions('view', array(
'label' => 'above',
'type' => 'string',
'weight' => -4,
))
->setDisplayOptions('form', array(
'type' => 'string_textfield',
'weight' => -4,
))
->setDisplayConfigurable('form', TRUE)
->setDisplayConfigurable('view', TRUE);
$fields['guardian_fathername'] = BaseFieldDefinition::create('string')
->setLabel(t('Όνομα πατέρα κηδεμόνα'))
->setDescription(t('Δώσε το όνομα πατέρα του κηδεμόνα.'))
->setSettings(array(
'max_length' => 50,
'text_processing' => 0,
))
->setRequired(true)
->setDefaultValue('')
->setDisplayOptions('view', array(
'label' => 'above',
'type' => 'string',
'weight' => -4,
))
->setDisplayOptions('form', array(
'type' => 'string_textfield',
'weight' => -4,
))
->setDisplayConfigurable('form', TRUE)
->setDisplayConfigurable('view', TRUE);
$fields['guardian_mothername'] = BaseFieldDefinition::create('string')
->setLabel(t('Όνομα μητέρας κηδεμόνα'))
->setDescription(t('Δώσε το όνομα μητέρας του κηδεμόνα.'))
->setSettings(array(
'max_length' => 50,
'text_processing' => 0,
))
->setRequired(true)
->setDefaultValue('')
->setDisplayOptions('view', array(
'label' => 'above',
'type' => 'string',
'weight' => -4,
))
->setDisplayOptions('form', array(
'type' => 'string_textfield',
'weight' => -4,
))
->setDisplayConfigurable('form', TRUE)
->setDisplayConfigurable('view', TRUE);
$fields['status'] = BaseFieldDefinition::create('boolean') $fields['status'] = BaseFieldDefinition::create('boolean')
->setLabel(t('Publishing status')) ->setLabel(t('Publishing status'))
->setDescription(t('A boolean indicating whether the EPAL Student is published.')) ->setDescription(t('A boolean indicating whether the EPAL Student is published.'))
......
import { LOGININFO_SAVE, LOGININFO_RECEIVED } from '../constants'; import { LOGININFO_SAVE, PROFILE_SAVE, LOGININFO_RECEIVED } from '../constants';
import { LOGININFO_INIT } from '../constants'; import { LOGININFO_INIT } from '../constants';
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { NgRedux } from 'ng2-redux'; import { NgRedux } from 'ng2-redux';
...@@ -32,6 +32,15 @@ export class LoginInfoActions { ...@@ -32,6 +32,15 @@ export class LoginInfoActions {
}); });
}; };
saveProfile = (profile) => {
return this._ngRedux.dispatch({
type: PROFILE_SAVE,
payload: {
profile
}
});
};
initLoginInfo = () => { initLoginInfo = () => {
return this._ngRedux.dispatch({ return this._ngRedux.dispatch({
......
...@@ -6,6 +6,7 @@ import { NgModule } from '@angular/core'; ...@@ -6,6 +6,7 @@ import { NgModule } from '@angular/core';
import { NgReduxModule, DevToolsExtension, NgRedux } from 'ng2-redux'; import { NgReduxModule, DevToolsExtension, NgRedux } from 'ng2-redux';
import {BrowserModule} from '@angular/platform-browser'; import {BrowserModule} from '@angular/platform-browser';
import { CookieModule } from 'ngx-cookie'; import { CookieModule } from 'ngx-cookie';
import { MyDatePickerModule } from 'mydatepicker';
import { import {
FormsModule, FormsModule,
ReactiveFormsModule, ReactiveFormsModule,
...@@ -32,6 +33,8 @@ import {AuthService} from './services/auth.service'; ...@@ -32,6 +33,8 @@ import {AuthService} from './services/auth.service';
import SchoolAuthGuard from './guards/school.auth.guard'; import SchoolAuthGuard from './guards/school.auth.guard';
import StudentAuthGuard from './guards/student.auth.guard'; import StudentAuthGuard from './guards/student.auth.guard';
import RegionEduAuthGuard from './guards/regionedu.auth.guard'; import RegionEduAuthGuard from './guards/regionedu.auth.guard';
import EduAdminAuthGuard from './guards/eduadmin.auth.guard';
import MinistryAuthGuard from './guards/ministry.auth.guard';
import { ACTION_PROVIDERS } from './actions'; import { ACTION_PROVIDERS } from './actions';
import Home from './components/home'; import Home from './components/home';
...@@ -55,6 +58,7 @@ class MyLocalization extends NgLocalization { ...@@ -55,6 +58,7 @@ class MyLocalization extends NgLocalization {
@NgModule({ @NgModule({
imports: [ imports: [
BrowserModule, BrowserModule,
MyDatePickerModule,
FormsModule, FormsModule,
RouterModule, RouterModule,
ReactiveFormsModule, ReactiveFormsModule,
...@@ -81,7 +85,9 @@ class MyLocalization extends NgLocalization { ...@@ -81,7 +85,9 @@ class MyLocalization extends NgLocalization {
AuthService, AuthService,
SchoolAuthGuard, SchoolAuthGuard,
StudentAuthGuard, StudentAuthGuard,
RegionEduAuthGuard RegionEduAuthGuard,
EduAdminAuthGuard,
MinistryAuthGuard
] ]
}) })
......
<div class = "loading" *ngIf="(showLoader$ | async) === true"></div> <div class = "loading" *ngIf="(showLoader$ | async) === true"></div>
<div id="headerNotice" (onHidden)="onHidden()" class="modal fade" tabindex="-1" role="dialog" aria-hidden="true">
<div class="modal-dialog modal-lg">
<div class="modal-content">
<div class="modal-header {{modalHeader | async}}" >
<h3 class="modal-title pull-left"><i class="fa fa-check-square-o"></i>&nbsp;&nbsp;{{ modalTitle | async }}</h3>
<button type="button" class="close pull-right" aria-label="Close" (click)="hideModal()">
<span aria-hidden="true"><i class="fa fa-times"></i></span>
</button>
</div>
<div class="modal-body">
<p>{{ modalText | async }}</p>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default pull-left" data-dismiss="modal">Κλείσιμο</button>
</div>
</div>
</div>
</div>
<div class="header-wrapper"> <div class="header-wrapper">
<header id="navbar" role="banner" class="navbar navbar-default"> <header id="navbar" role="banner" class="navbar navbar-default">
......
...@@ -28,6 +28,9 @@ export default class HeaderComponent implements OnInit, OnDestroy { ...@@ -28,6 +28,9 @@ export default class HeaderComponent implements OnInit, OnDestroy {
private loginInfo$: BehaviorSubject<ILoginInfo>; private loginInfo$: BehaviorSubject<ILoginInfo>;
public cuser :any; public cuser :any;
private showLoader$: BehaviorSubject<boolean>; private showLoader$: BehaviorSubject<boolean>;
private modalTitle: BehaviorSubject<string>;
private modalText: BehaviorSubject<string>;
private modalHeader: BehaviorSubject<string>;
constructor( private _ata: LoginInfoActions, constructor( private _ata: LoginInfoActions,
private _hds: HelperDataService, private _hds: HelperDataService,
...@@ -46,10 +49,14 @@ export default class HeaderComponent implements OnInit, OnDestroy { ...@@ -46,10 +49,14 @@ export default class HeaderComponent implements OnInit, OnDestroy {
this.cuName = ''; this.cuName = '';
this.loginInfo$ = new BehaviorSubject(LOGININFO_INITIAL_STATE); this.loginInfo$ = new BehaviorSubject(LOGININFO_INITIAL_STATE);
this.showLoader$ = new BehaviorSubject(false); this.showLoader$ = new BehaviorSubject(false);
this.modalTitle = new BehaviorSubject("");
this.modalText = new BehaviorSubject("");
this.modalHeader = new BehaviorSubject("");
}; };
ngOnInit() { ngOnInit() {
(<any>$('#headerNotice')).appendTo("body");
this._ngRedux.select(state => { this._ngRedux.select(state => {
if (state.loginInfo.size > 0) { if (state.loginInfo.size > 0) {
state.loginInfo.reduce(({}, loginInfoToken) => { state.loginInfo.reduce(({}, loginInfoToken) => {
...@@ -66,6 +73,7 @@ export default class HeaderComponent implements OnInit, OnDestroy { ...@@ -66,6 +73,7 @@ export default class HeaderComponent implements OnInit, OnDestroy {
} }
ngOnDestroy() { ngOnDestroy() {
(<any>$('#headerNotice')).remove();
this.loginInfo$.unsubscribe(); this.loginInfo$.unsubscribe();
} }
...@@ -104,4 +112,12 @@ export default class HeaderComponent implements OnInit, OnDestroy { ...@@ -104,4 +112,12 @@ export default class HeaderComponent implements OnInit, OnDestroy {
}); });
} }
public showModal():void {
(<any>$('#headerNotice')).modal('show');
}
public hideModal():void {
(<any>$('#headerNotice')).modal('hide');
}
} }
...@@ -32,6 +32,7 @@ import { API_ENDPOINT, API_ENDPOINT_PARAMS } from '../app.settings'; ...@@ -32,6 +32,7 @@ import { API_ENDPOINT, API_ENDPOINT_PARAMS } from '../app.settings';
</button> </button>
</div> </div>
</div> </div>
</form> </form>
</div> </div>
` `
......
...@@ -116,8 +116,7 @@ export default class MinistryHome implements OnInit { ...@@ -116,8 +116,7 @@ export default class MinistryHome implements OnInit {
if (success) { if (success) {
this.authRole = 'supervisor'; this.authRole = 'supervisor';
this._hds.setMineduCurrentUser(this.userDataGroup.value['minedu_username'], this.userDataGroup.value['minedu_userpassword'], this.authRole); this._hds.setMineduCurrentUser(this.userDataGroup.value['minedu_username'], this.userDataGroup.value['minedu_userpassword'], this.authRole);
console.log("MPHKA");
//this.validLogin = true;
this.validLogin = 1; this.validLogin = 1;
this.userDataGroup.value['cu_name'] = this.userDataGroup.value['minedu_username']; this.userDataGroup.value['cu_name'] = this.userDataGroup.value['minedu_username'];
this.userDataGroup.value['auth_role'] = 'supervisor'; this.userDataGroup.value['auth_role'] = 'supervisor';
......