Merge branch 'sch_sso' into 'develop'

SSO CAS Login: Adapted Director View and other fixes

See merge request !51

drupal/modules/casost/src/Controller/CASLogin.php

@@ -5,8 +5,6 @@ use Drupal\Core\Entity\Query\QueryFactory;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Drupal\Core\Controller\ControllerBase;
-// require_once '/home/haris/devel/eepal/drupal/modules/casost/src/CAS/phpCAS.php';
-
 use phpCAS;
 use Drupal\user\Entity\User;
 use Drupal\Core\Database\Connection;

drupal/modules/epal/src/Entity/EpalCriteria.php

@@ -192,7 +192,27 @@ class EpalCriteria extends ContentEntityBase implements EpalCriteriaInterface {
       ))
       ->setDisplayConfigurable('form', TRUE)
       ->setDisplayConfigurable('view', TRUE);
-	  
+
+      $fields['category'] = BaseFieldDefinition::create('string')
+        ->setLabel(t('Κατηγορα'))
+        ->setDescription(t('Κατηγορία κριτηρίου.'))
+        ->setSettings(array(
+          'max_length' => 100,
+          'text_processing' => 0,
+        ))
+  	  ->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['value_limit'] = BaseFieldDefinition::create('float')
           ->setLabel(t('Αριθμητικό όριο'))
           ->setDescription(t('Αριθμητικό όριο.'))
@@ -210,7 +230,7 @@ class EpalCriteria extends ContentEntityBase implements EpalCriteriaInterface {
           ))
           ->setDisplayConfigurable('form', TRUE)
           ->setDisplayConfigurable('view', TRUE);
-		  
+
 	$fields['moria'] = BaseFieldDefinition::create('float')
           ->setLabel(t('Μόρια'))
           ->setDescription(t('Μόρια.'))
@@ -228,7 +248,7 @@ class EpalCriteria extends ContentEntityBase implements EpalCriteriaInterface {
           ))
           ->setDisplayConfigurable('form', TRUE)
           ->setDisplayConfigurable('view', TRUE);
-		  
+
 	$fields['mutual_disabled_id'] = BaseFieldDefinition::create('integer')
           ->setLabel(t('Id αμοιβαία αποκλειόμενου κριτηρίου'))
           ->setDescription(t('Id αμοιβαία αποκλειόμενου κριτηρίου.'))

drupal/modules/epaldeploysystem/config/optional/user.role.epal.yml

+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'

source/app.ts

@@ -80,5 +80,5 @@ class MyLocalization extends NgLocalization {
 })
 class AppModule {}
 
- enableProdMode();
+// enableProdMode();
 platformBrowserDynamic().bootstrapModule(AppModule);

source/components/director/director-view.ts

@@ -28,7 +28,7 @@ import {
               <option value="2" >Β' Λυκείου</option>
               <option value="3" >Γ' Λυκείου</option>
             </select>
-      </div>      
+      </div>
       <div class="form-group">
 
             <select #tmop class="form-control" *ngIf="(selectionBClass | async)" (change)="checkbclass(tmop,txoption)" formControlName="tomeas">
@@ -54,10 +54,10 @@ import {
                  Όνομα Μητέρας: {{StudentDetails$.motherfirstname}}<br>
                  Επώνυμο Μητέρας:{{StudentDetails$.mothersurname}}<br>
                  Ημερομηνία Γέννησης: {{StudentDetails$.birthdate}}<br>
-                
-                 <strong>Επιβεβαίωση Εγγραφής: </strong> 
+
+                 <strong>Επιβεβαίωση Εγγραφής: </strong>
                  <input #cb class="pull-right" type="checkbox" name="{{ StudentDetails$.id }}" (change)="updateCheckedOptions(StudentDetails$.id, $event)" >
-                
+
              </div>
              </div>
             <button type="button" class="btn-primary btn-sm pull-right" (click)="confirmStudent()">
@@ -84,7 +84,7 @@ import {
 
 
     constructor(  private fb: FormBuilder,
-                  private _hds: HelperDataService, 
+                  private _hds: HelperDataService,
                   private activatedRoute: ActivatedRoute,
                   private router: Router )
     {
@@ -99,7 +99,7 @@ import {
          taxi: ['', []],
          specialit: ['', []],
        });
-       
+
     }
 
     ngOnDestroy()
@@ -111,11 +111,11 @@ import {
         if (this.selectionBClass)
             this.selectionBClass.unsubscribe();
         if (this.selectionCClass)
-            this.selectionCClass.unsubscribe();  
+            this.selectionCClass.unsubscribe();
          if (this.retrievedStudent)
             this.retrievedStudent.unsubscribe();
     }
- 
+
     ngOnInit() {
 
     }
@@ -134,24 +134,23 @@ import {
             {
                 this.selectionBClass.next(true);
                 this.selectionCClass.next(false);
-                this.StudentSelected$ = new BehaviorSubject([{}]);
+
                 this.StudentSelectedSub = this._hds.getSectorPerSchool(this.SchoolId).subscribe(this.StudentSelected$);
             }
             else if (txop.value === "3")
-            {  
+            {
               var sectorint = +this.formGroup.value.tomeas;
               console.log(sectorint,"test");
               if (this.formGroup.value.tomeas != '')
               {
                   var sectorint = +this.formGroup.value.tomeas;
-                  this.StudentSelectedSpecial$ = new BehaviorSubject([{}]);
-                  this.StudentSelectedSpecialSub = this._hds.getSpecialityPerSchool(this.SchoolId, sectorint).subscribe(this.StudentSelectedSpecial$);        
+
+                  this.StudentSelectedSpecialSub = this._hds.getSpecialityPerSchool(this.SchoolId, sectorint).subscribe(this.StudentSelectedSpecial$);
               }
               this.selectionBClass.next(true);
-              this.selectionCClass.next(true);              
-              this.StudentSelected$ = new BehaviorSubject([{}]);
+              this.selectionCClass.next(true);
               this.StudentSelectedSub = this._hds.getSectorPerSchool(this.SchoolId).subscribe(this.StudentSelected$);
-            }            
+            }
     }
 
 
@@ -163,13 +162,13 @@ import {
         if (txop.value === "3")
         {
             this.StudentSelectedSpecial$ = new BehaviorSubject([{}]);
-            this.StudentSelectedSpecialSub = this._hds.getSpecialityPerSchool(this.SchoolId, sectorint).subscribe(this.StudentSelectedSpecial$);        
+            this.StudentSelectedSpecialSub = this._hds.getSpecialityPerSchool(this.SchoolId, sectorint).subscribe(this.StudentSelectedSpecial$);
         }
     }
 
     findstudent(txop)
     {
-            
+
             var sectorint = +this.formGroup.value.tomeas;
             if (txop.value === "1")
             {
@@ -180,15 +179,15 @@ import {
                 this.currentclass = 2;
             }
             else if (txop.value === "3")
-            {  
+            {
               this.currentclass = 3;
-            }       
+            }
             this.retrievedStudent.next(true);
             this.StudentInfo$ = new BehaviorSubject(false);
-            this.StudentInfoSub = this._hds.getStudentPerSchool(this.SchoolId, sectorint, this.currentclass).subscribe(this.StudentInfo$);        
-         
-         
-        
+            this.StudentInfoSub = this._hds.getStudentPerSchool(this.SchoolId, sectorint, this.currentclass).subscribe(this.StudentInfo$);
+
+
+
     }
 
 updateCheckedOptions(id, event)
@@ -196,8 +195,8 @@ updateCheckedOptions(id, event)
 
     let i = this.saved.length;
 
-       
-    if (event.target.checked === false) 
+
+    if (event.target.checked === false)
     {
       var count=this.saved.length;
       for(var j=0;j<count;j++)
@@ -225,4 +224,4 @@ checkcclass()
   this.retrievedStudent.next(false);
 }
 
-}
\ No newline at end of file
+}

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;
                 }, {});
             }

source/containers/main.ts

@@ -83,7 +83,7 @@ export default class Main {
       {},
       middleware,
 //      tools ? [ ...enhancers, tools ] : enhancers);
-//      tools);
-      );
+      tools);
+//      );
   }
 }