From 7159785aa95c6021249fd745da2470cc4278f731 Mon Sep 17 00:00:00 2001
From: Haris Papadopoulos <haris.rnd@gmail.com>
Date: Wed, 12 Apr 2017 11:52:58 +0300
Subject: [PATCH] WIP: adjusting director view to SSO CAS login

---
 .../config/optional/user.role.epal.yml        | 45 +++++++++++++++++++
 source/app.ts                                 |  2 +-
 source/components/school.home.ts              |  2 +-
 source/containers/main.ts                     |  4 +-
 source/services/helper-data-service.ts        | 17 ++++---
 5 files changed, 61 insertions(+), 9 deletions(-)
 create mode 100644 drupal/modules/epaldeploysystem/config/optional/user.role.epal.yml

diff --git a/drupal/modules/epaldeploysystem/config/optional/user.role.epal.yml b/drupal/modules/epaldeploysystem/config/optional/user.role.epal.yml
new file mode 100644
index 0000000..8c12087
--- /dev/null
+++ b/drupal/modules/epaldeploysystem/config/optional/user.role.epal.yml
@@ -0,0 +1,45 @@
+langcode: el
+status: true
+dependencies: {  }
+id: epal
+label: epal
+weight: 4
+is_admin: null
+permissions:
+  - 'add epal student course field entities'
+  - 'add epal student epal chosen entities'
+  - 'add epal student sector field entities'
+  - 'add epal users entities'
+  - 'delete epal student course field entities'
+  - 'delete epal student epal chosen entities'
+  - 'delete epal student sector field entities'
+  - 'delete epal users entities'
+  - 'edit epal class limits entities'
+  - 'edit epal student course field entities'
+  - 'edit epal student epal chosen entities'
+  - 'edit epal student sector field entities'
+  - 'edit epal users entities'
+  - 'view published epal student course field entities'
+  - 'view published epal student epal chosen entities'
+  - 'view published epal student sector field entities'
+  - 'view published epal users entities'
+  - 'view unpublished epal student course field entities'
+  - 'view unpublished epal student epal chosen entities'
+  - 'view unpublished epal student sector field entities'
+  - 'view unpublished epal users entities'
+  - 'view published eepal admin area entities'
+  - 'view published eepal prefecture entities'
+  - 'view published eepal region entities'
+  - 'view published eepal school entities'
+  - 'view published eepal sectors entities'
+  - 'view published eepal sectors in epal entities'
+  - 'view published eepal specialties in epal entities'
+  - 'view published eepal specialty entities'
+  - 'view unpublished eepal admin area entities'
+  - 'view unpublished eepal prefecture entities'
+  - 'view unpublished eepal region entities'
+  - 'view unpublished eepal school entities'
+  - 'view unpublished eepal sectors entities'
+  - 'view unpublished eepal sectors in epal entities'
+  - 'view unpublished eepal specialties in epal entities'
+  - 'view unpublished eepal specialty entities'
diff --git a/source/app.ts b/source/app.ts
index 691d4bb..27e8e8e 100644
--- a/source/app.ts
+++ b/source/app.ts
@@ -80,5 +80,5 @@ class MyLocalization extends NgLocalization {
 })
 class AppModule {}
 
- enableProdMode();
+// enableProdMode();
 platformBrowserDynamic().bootstrapModule(AppModule);
diff --git a/source/components/school.home.ts b/source/components/school.home.ts
index 033344a..e165e4c 100644
--- a/source/components/school.home.ts
+++ b/source/components/school.home.ts
@@ -65,7 +65,7 @@ export default class SchoolHome implements OnInit {
                     this.authToken = loginInfoToken.auth_token;
                     this.authRole = loginInfoToken.auth_role;
                     if (this.authToken && this.authToken.length > 0)
-                        this.router.navigate(['/submited-preview']);
+                        this.router.navigate(['/director-view']);
                     return loginInfoToken;
                 }, {});
             }
diff --git a/source/containers/main.ts b/source/containers/main.ts
index a2fe808..cbde173 100644
--- a/source/containers/main.ts
+++ b/source/containers/main.ts
@@ -83,7 +83,7 @@ export default class Main {
       {},
       middleware,
 //      tools ? [ ...enhancers, tools ] : enhancers);
-//      tools);
-      );
+      tools);
+//      );
   }
 }
diff --git a/source/services/helper-data-service.ts b/source/services/helper-data-service.ts
index 46ad183..59936f8 100644
--- a/source/services/helper-data-service.ts
+++ b/source/services/helper-data-service.ts
@@ -521,9 +521,16 @@ export class HelperDataService implements OnInit, OnDestroy{
      {
          let SchoolIdNew = SchoolId.toString();
          let SelectIdNew = SelectId.toString();
-         this.loginInfo$.forEach(loginInfoToken => {
-            this.authToken = loginInfoToken.get(0).auth_token;
-        });
+
+
+         this.loginInfo$.getValue().forEach(loginInfoToken => {
+            this.authToken = loginInfoToken.auth_token;
+            this.authRole = loginInfoToken.auth_role;
+         });
+         console.log("authToken=" + this.authToken);
+         console.log("authRole=" + this.authRole);
+
+
         let headers = new Headers({
             "Content-Type": "application/json",
         });
@@ -559,7 +566,7 @@ export class HelperDataService implements OnInit, OnDestroy{
             () => console.log("Saving Profile"));
         });
 
-    }    
+    }
 
 
 
@@ -588,7 +595,7 @@ export class HelperDataService implements OnInit, OnDestroy{
             () => console.log("Saving Capacity"));
         });
 
-    }    
+    }
 
 
 
-- 
GitLab