Merge branch 'stylesandmenus' into 'develop'

Stylesandmenus

See merge request !153

drupal/modules/epal/epal.routing.yml

@@ -103,7 +103,7 @@ epal.confirmstudents:
   requirements:
     _user_is_logged_in: 'TRUE'
 epal.studentperschool:
-  path: '/epal/studentperschool/{selectId}/{classId}/{limitdown}/{limitup}'
+  path: '/epal/studentperschool/{classId}/{sector}/{specialit}'
   options:
     _auth: [ 'basic_auth' ]
   defaults:

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

@@ -1034,6 +1034,26 @@ class EpalStudent extends ContentEntityBase implements EpalStudentInterface
         ->setDisplayConfigurable('form', true)
         ->setDisplayConfigurable('view', true);
 
+      $fields['second_period'] = BaseFieldDefinition::create('boolean')
+        ->setLabel(t('Δεύτερη περίοδος αιτήσεων'))
+        ->setDescription(t('Δεύτερη περίοδος αιτήσεων.'))
+        ->setSettings(array(
+          'text_processing' => 0,
+        ))
+        ->setRequired(false)
+        ->setDefaultValue(false)
+        ->setDisplayOptions('view', array(
+          'label' => 'above',
+          'type' => 'boolean',
+          'weight' => -4,
+        ))
+        ->setDisplayOptions('form', array(
+          'type' => 'boolean',
+          'weight' => -4,
+        ))
+        ->setDisplayConfigurable('form', true)
+        ->setDisplayConfigurable('view', true);
+
       $fields['guardian_name'] = BaseFieldDefinition::create('string')
             ->setLabel(t('Όνομα κηδεμόνα'))
             ->setDescription(t('Δώσε το όνομα κηδεμόνα.'))
@@ -1218,6 +1238,8 @@ class EpalStudent extends ContentEntityBase implements EpalStudentInterface
                                     ->setDisplayConfigurable('form', true)
                                     ->setDisplayConfigurable('view', true);
 
+
+
       $fields['status'] = BaseFieldDefinition::create('boolean')
           ->setLabel(t('Publishing status'))
           ->setDescription(t('A boolean indicating whether the EPAL Student is published.'))
@@ -1233,4 +1255,4 @@ class EpalStudent extends ContentEntityBase implements EpalStudentInterface
 
       return $fields;
   }
-}
+}
\ No newline at end of file

source/components/director/director-classcapacity.ts

@@ -33,7 +33,7 @@ import {
        επιλέξτε τη νέα δυναμική και πατήστε το σύμβολο <i>ok</i>. Προσοχή! Κανένα τμήμα δεν πρέπει να έχει δυναμική 0.</p>
       <div class="row" style="margin-top: 20px; line-height: 2em;" > <b> Οι δηλώσεις σας </b></div>
       <div *ngFor="let CapacityPerCourses$  of CapacityPerCourse$ | async; let i=index; let isOdd=odd; let isEven=even" >
-                <li *ngIf="(!(selectiontype | async) && (CapacityPerCourses$.class < 4)) ||((selectiontype | async) && (CapacityPerCourses$.class < 5))" class="list-group-item " [class.oddout]="isOdd" [class.evenout]="isEven" >
+                <li class="list-group-item " [class.oddout]="isOdd" [class.evenout]="isEven" >
                 <div class="row">
                 <div class="col-md-5">
                    <h5 [class.changelistcolor]= "CapacityPerCourses$.capacity === null" >{{CapacityPerCourses$.taxi}}&nbsp; <b></b></h5>
@@ -67,13 +67,13 @@ import {
     </div>
 
 
-  <div id="checksaved" (onHidden)="onHidden('#checksaved')"
+  <div id="checksaved1" (onHidden)="onHidden('#checksaved1')"
     class="modal fade" tabindex="-1" role="dialog" aria-hidden="true">
       <div class="modal-dialog modal-lg">
         <div class="modal-content">
           <div class="modal-header modal-header-danger">
             <h3 class="modal-title pull-left"><i class="fa fa-check-square-o"></i>&nbsp;&nbsp;Πρέπει να συπληρώσετε σωστά τη δυναμική</h3>
-            <button type="button" class="close pull-right" aria-label="Close" (click)="hideModal('#checksaved')">
+            <button type="button" class="close pull-right" aria-label="Close" (click)="hideModal('#checksaved1')">
               <span aria-hidden="true"><i class="fa fa-times"></i></span>
             </button>
           </div>
@@ -127,7 +127,7 @@ import {
 
 
    public showModal(popupMsgId):void {
-        console.log("about to show modal");
+        console.log("about to show modal",popupMsgId);
         //(<any>$('#distributionWaitingNotice')).modal('show');
         (<any>$(popupMsgId)).modal('show');
     }
@@ -147,7 +147,7 @@ import {
     }
 
     ngOnInit() {
-                 (<any>$('#checksaved')).appendTo("body");
+                 (<any>$('#checksaved1')).appendTo("body");
                   this.SchoolSub = this._hds.gettypeofschool().subscribe(x => {
                   this.School$.next(x);
                   console.log(x[0].type, "schoolid!");
@@ -195,7 +195,7 @@ import {
          {
           if (this.newvalue <=0 || this.newvalue >10)
           {
-              this.showModal("#checksaved");
+              this.showModal("#checksaved1");
           }
           else
           {
@@ -212,7 +212,7 @@ import {
                 error => {
                     std[ind].capacity = oldvalue;
                     this.CapacityPerCourse$.next(std);
-
+                    this.showLoader.next(false);
                     console.log("Error Saving Capacity");
                 },
                 () =>{
@@ -226,7 +226,7 @@ import {
            else
            {
              if (oldvalue === null)
-             this.showModal("#checksaved");
+             this.showModal("#checksaved1");
            }
         }
 

source/services/helper-data-service.ts

@@ -533,10 +533,7 @@ export class HelperDataService implements OnInit, OnDestroy {
 
 
 
-    getStudentPerSchool(SelectId, classId, limitdown, limitup) {
-
-        let SelectIdNew = SelectId.toString();
-
+    getStudentPerSchool(classId, sector, specialit) {
 
         this.loginInfo$.getValue().forEach(loginInfoToken => {
             this.authToken = loginInfoToken.auth_token;
@@ -548,13 +545,14 @@ export class HelperDataService implements OnInit, OnDestroy {
         });
         this.createAuthorizationHeader(headers);
         let options = new RequestOptions({ headers: headers });
-        return this.http.get(`${AppSettings.API_ENDPOINT}/epal/studentperschool/` + SelectIdNew + "/" + classId + "/" + limitdown + "/" + limitup, options)
+        return this.http.get(`${AppSettings.API_ENDPOINT}/epal/studentperschool/` + classId + "/" + sector + "/" + specialit, options)
             .map(response => response.json());
     }
 
 
 
     saveConfirmStudents(students, type) {
+        console.log(students, type, "confirm");
         this.loginInfo$.getValue().forEach(loginInfoToken => {
             this.authToken = loginInfoToken.auth_token;
             this.authRole = loginInfoToken.auth_role;