@universis/accommodation 1.1.3 → 1.1.5

package/src/config/models/RoomType.json

@@ -2,11 +2,11 @@
   "$schema": "https://themost-framework.github.io/themost/models/2018/2/schema.json",
   "@id": "https://universis.io/schemas/RoomType",
   "name": "RoomType",
-  "title": "Τύπος αίθουσας",
+  "title": "Τύπος δωματίου",
   "type": "lookup",
   "hidden": false,
   "sealed": false,
-  "version": "1.4",
+  "version": "1.4.1",
   "fields": [
     {
       "name": "id",
@@ -27,7 +27,7 @@
       "nullable": false,
       "size": 100
     },
-        {
+    {
       "name": "alternateName",
       "title": "Εναλλακτική Ονομασία",
       "description": "Εναλλακτική Ονομασία",
@@ -44,6 +44,12 @@
       "nullable": false,
       "value": "javascript:return 0;"
     },
+    {
+      "name": "bedsAllowed",
+      "type": "number",
+      "value": "javascript:return 0;",
+      "description": "The total allowed number of beds for the room type"
+    },
     {
       "name": "locales",
       "type": "RoomTypeLocale",
@@ -79,247 +85,247 @@
     }
   ],
   "privileges": [
-      {
-          "mask": 1,
-          "type": "global",
-          "account": "*"
-      },
-      {
-          "mask": 31,
-          "type": "global"
-      },
-      {
-          "mask": 15,
-          "type": "global",
-          "account": "Administrators"
-      },
-      {
-          "mask": 15,
-          "type": "global",
-          "account": "AccommodationAdministrators"
-      }
+    {
+      "mask": 1,
+      "type": "global",
+      "account": "*"
+    },
+    {
+      "mask": 31,
+      "type": "global"
+    },
+    {
+      "mask": 15,
+      "type": "global",
+      "account": "Administrators"
+    },
+    {
+      "mask": 15,
+      "type": "global",
+      "account": "AccommodationAdministrators"
+    }
   ],
   "eventListeners": [
     {
       "type": "./listeners/data-localization"
     }
   ],
-      "seed":[
-  {
-    "alternateName": "unknown",
-    "name": "Άγνωστο",
-    "description": "Άγνωστο",
-    "locales": [
-      {
-        "inLanguage": "en",
-        "name": "Unknown",
-        "description": "Unknown"
-      }
-    ]
-  },
-  {
-    "alternateName": "restaurant",
-    "name": "Εστιατόριο",
-    "description": "Εστιατόριο",
-    "locales": [
-      {
-        "inLanguage": "en",
-        "name": "Restaurant",
-        "description": "Restaurant"
-      }
-    ]
-  },
-  {
-    "alternateName": "plain",
-    "name": "Κανονικό",
-    "description": "Κανονικό",
-    "locales": [
-      {
-        "inLanguage": "en",
-        "name": "Plain",
-        "description": "Plain"
-      }
-    ]
-  },
-  {
-    "alternateName": "disabled",
-    "name": "Ανενεργό",
-    "description": "Ανενεργό",
-    "locales": [
-      {
-        "inLanguage": "en",
-        "name": "Disabled",
-        "description": "Disabled"
-      }
-    ]
-  },
-  {
-    "alternateName": "warehouse",
-    "name": "Αποθήκη",
-    "description": "Αποθήκη",
-    "locales": [
-      {
-        "inLanguage": "en",
-        "name": "Warehouse",
-        "description": "Warehouse"
-      }
-    ]
-  },
-  {
-    "alternateName": "office",
-    "name": "Γραφείο",
-    "description": "Γραφείο",
-    "locales": [
-      {
-        "inLanguage": "en",
-        "name": "Office",
-        "description": "Office"
-      }
-    ]
-  },
-  {
-    "alternateName": "lab",
-    "name": "Εργαστήριο",
-    "description": "Εργαστήριο",
-    "locales": [
-      {
-        "inLanguage": "en",
-        "name": "Lab",
-        "description": "Lab"
-      }
-    ]
-  },
-  {
-    "alternateName": "wc",
-    "name": "WC",
-    "description": "WC",
-    "locales": [
-      {
-        "inLanguage": "en",
-        "name": "WC",
-        "description": "WC"
-      }
-    ]
-  },
-  {
-    "alternateName": "reading-room",
-    "name": "Αναγνωστήριο",
-    "description": "Αναγνωστήριο",
-    "locales": [
-      {
-        "inLanguage": "en",
-        "name": "Reading Room",
-        "description": "Reading Room"
-      }
-    ]
-  },
-  {
-    "alternateName": "multi-purpose",
-    "name": "Πολυχρηστικό",
-    "description": "Πολυχρηστικό",
-    "locales": [
-      {
-        "inLanguage": "en",
-        "name": "Multi purpose",
-        "description": "Multi purpose"
-      }
-    ]
-  },
-  {
-    "alternateName": "event-hall",
-    "name": "Αίθουσα εκδηλώσεων",
-    "description": "Αίθουσα εκδηλώσεων",
-    "locales": [
-      {
-        "inLanguage": "en",
-        "name": "Event hall",
-        "description": "Event hall"
-      }
-    ]
-  },
-  {
-    "alternateName": "library",
-    "name": "Βιβλιοθήκη",
-    "description": "Βιβλιοθήκη",
-    "locales": [
-      {
-        "inLanguage": "en",
-        "name": "Library",
-        "description": "Library"
-      }
-    ]
-  },
-  {
-    "alternateName": "boiler",
-    "name": "Λεβητοστάσιο",
-    "description": "Λεβητοστάσιο",
-    "locales": [
-      {
-        "inLanguage": "en",
-        "name": "Boiler",
-        "description": "Boiler"
-      }
-    ]
-  },
-  {
-    "alternateName": "mechanical",
-    "name": "Μηχανοστάσιο",
-    "description": "Μηχανοστάσιο",
-    "locales": [
-      {
-        "inLanguage": "en",
-        "name": "Mechanical",
-        "description": "Mechanical"
-      }
-    ]
-  },
-  {
-    "alternateName": "laundry",
-    "name": "Πλυντήριο",
-    "description": "Πλυντήριο",
-    "locales": [
-      {
-        "inLanguage": "en",
-        "name": "Laundry",
-        "description": "Laundry"
-      }
-    ]
-  },
-  {
-    "alternateName": "church",
-    "name": "Εκκλησία",
-    "description": "Εκκλησία",
-    "locales": [
-      {
-        "inLanguage": "en",
-        "name": "Church",
-        "description": "Church"
-      }
-    ]
-  },
-  {
-    "alternateName": "hostel",
-    "name": "Χόστελ",
-    "description": "Χόστελ",
-    "locales": [
-      {
-        "inLanguage": "en",
-        "name": "Hostel",
-        "description": "Hostel"
-      }
-    ]
-  },
-  {
-    "alternateName": "temporary",
-    "name": "Προσωρινό",
-    "description": "Προσωρινό",
-    "locales": [
-      {
-        "inLanguage": "en",
-        "name": "Temporary",
-        "description": "Temporary"
-      }
-    ]
-  }
-]
+  "seed": [
+    {
+      "alternateName": "unknown",
+      "name": "Άγνωστο",
+      "description": "Άγνωστο",
+      "locales": [
+        {
+          "inLanguage": "en",
+          "name": "Unknown",
+          "description": "Unknown"
+        }
+      ]
+    },
+    {
+      "alternateName": "restaurant",
+      "name": "Εστιατόριο",
+      "description": "Εστιατόριο",
+      "locales": [
+        {
+          "inLanguage": "en",
+          "name": "Restaurant",
+          "description": "Restaurant"
+        }
+      ]
+    },
+    {
+      "alternateName": "plain",
+      "name": "Κανονικό",
+      "description": "Κανονικό",
+      "locales": [
+        {
+          "inLanguage": "en",
+          "name": "Plain",
+          "description": "Plain"
+        }
+      ]
+    },
+    {
+      "alternateName": "disabled",
+      "name": "Ανενεργό",
+      "description": "Ανενεργό",
+      "locales": [
+        {
+          "inLanguage": "en",
+          "name": "Disabled",
+          "description": "Disabled"
+        }
+      ]
+    },
+    {
+      "alternateName": "warehouse",
+      "name": "Αποθήκη",
+      "description": "Αποθήκη",
+      "locales": [
+        {
+          "inLanguage": "en",
+          "name": "Warehouse",
+          "description": "Warehouse"
+        }
+      ]
+    },
+    {
+      "alternateName": "office",
+      "name": "Γραφείο",
+      "description": "Γραφείο",
+      "locales": [
+        {
+          "inLanguage": "en",
+          "name": "Office",
+          "description": "Office"
+        }
+      ]
+    },
+    {
+      "alternateName": "lab",
+      "name": "Εργαστήριο",
+      "description": "Εργαστήριο",
+      "locales": [
+        {
+          "inLanguage": "en",
+          "name": "Lab",
+          "description": "Lab"
+        }
+      ]
+    },
+    {
+      "alternateName": "wc",
+      "name": "WC",
+      "description": "WC",
+      "locales": [
+        {
+          "inLanguage": "en",
+          "name": "WC",
+          "description": "WC"
+        }
+      ]
+    },
+    {
+      "alternateName": "reading-room",
+      "name": "Αναγνωστήριο",
+      "description": "Αναγνωστήριο",
+      "locales": [
+        {
+          "inLanguage": "en",
+          "name": "Reading Room",
+          "description": "Reading Room"
+        }
+      ]
+    },
+    {
+      "alternateName": "multi-purpose",
+      "name": "Πολυχρηστικό",
+      "description": "Πολυχρηστικό",
+      "locales": [
+        {
+          "inLanguage": "en",
+          "name": "Multi purpose",
+          "description": "Multi purpose"
+        }
+      ]
+    },
+    {
+      "alternateName": "event-hall",
+      "name": "Αίθουσα εκδηλώσεων",
+      "description": "Αίθουσα εκδηλώσεων",
+      "locales": [
+        {
+          "inLanguage": "en",
+          "name": "Event hall",
+          "description": "Event hall"
+        }
+      ]
+    },
+    {
+      "alternateName": "library",
+      "name": "Βιβλιοθήκη",
+      "description": "Βιβλιοθήκη",
+      "locales": [
+        {
+          "inLanguage": "en",
+          "name": "Library",
+          "description": "Library"
+        }
+      ]
+    },
+    {
+      "alternateName": "boiler",
+      "name": "Λεβητοστάσιο",
+      "description": "Λεβητοστάσιο",
+      "locales": [
+        {
+          "inLanguage": "en",
+          "name": "Boiler",
+          "description": "Boiler"
+        }
+      ]
+    },
+    {
+      "alternateName": "mechanical",
+      "name": "Μηχανοστάσιο",
+      "description": "Μηχανοστάσιο",
+      "locales": [
+        {
+          "inLanguage": "en",
+          "name": "Mechanical",
+          "description": "Mechanical"
+        }
+      ]
+    },
+    {
+      "alternateName": "laundry",
+      "name": "Πλυντήριο",
+      "description": "Πλυντήριο",
+      "locales": [
+        {
+          "inLanguage": "en",
+          "name": "Laundry",
+          "description": "Laundry"
+        }
+      ]
+    },
+    {
+      "alternateName": "church",
+      "name": "Εκκλησία",
+      "description": "Εκκλησία",
+      "locales": [
+        {
+          "inLanguage": "en",
+          "name": "Church",
+          "description": "Church"
+        }
+      ]
+    },
+    {
+      "alternateName": "hostel",
+      "name": "Χόστελ",
+      "description": "Χόστελ",
+      "locales": [
+        {
+          "inLanguage": "en",
+          "name": "Hostel",
+          "description": "Hostel"
+        }
+      ]
+    },
+    {
+      "alternateName": "temporary",
+      "name": "Προσωρινό",
+      "description": "Προσωρινό",
+      "locales": [
+        {
+          "inLanguage": "en",
+          "name": "Temporary",
+          "description": "Temporary"
+        }
+      ]
+    }
+  ]
 }

package/src/config/models/StudentAccommodationCard.json

@@ -5,7 +5,7 @@
   "title": "StudentAccommodationCard",
   "hidden": false,
   "sealed": false,
-  "version": "1.8",
+  "version": "1.9",
   "source": "StudentAccommodationCardBase",
   "view": "StudentAccommodationCardData",
   "classPath": "./models/StudentAccommodationCard",
@@ -150,9 +150,6 @@
     {
       "type": "./listeners/OnCancelAccommodationCardListener"
     },
-    {
-      "type": "./listeners/OnUpdateAccommodationRoomListener"
-    },
     {
       "type": "./listeners/SendEmailAfterCardStatusChangeListener"
     }

package/src/config/scope.access.js

@@ -268,6 +268,15 @@ export default [
             'read'
         ]
     },
+    {
+        'scope': [
+            'accommodation'
+        ],
+        'resource': '/api/Genders',
+        'access': [
+            'read'
+        ]
+    },
     {
         'scope': [
             'accommodation'

package/src/listeners/StudentAccommodationCardSaveListener.js

@@ -22,15 +22,26 @@ export function beforeSave(event, callback) {
                     throw new DataError('ERR_STATUS','Student cannot be found');
                 }
             }
-            // const isActive = await student.silent().isActive();
             const isActive = await student.is(':active');
-            if (!isActive) {
+            
+            if (!isActive && event.state===1)
+            {
                 throw new DataError('ERR_STATUS',
                     'Invalid student status. Student Accommodation Card may be published upon an active student only.'+student
                     , null,
                     'Student', 'studentStatus');
             }
-            
+            if (Object.prototype.hasOwnProperty.call(event.target, 'CardStatus')) {
+                const previousActionStatus = await context.model('ActionStatusType').find(previous.cardStatus).select('alternateName').value();
+                const targetActionStatus = await context.model('ActionStatusType').find(event.target.cardStatus).select('alternateName').value();
+                if (!isActive && previousActionStatus !== targetActionStatus && targetActionStatus!=='CancelledActionStatus') {
+                    throw new DataError('ERR_STATUS',
+                        'The student accommodation card cannot be activated for an inactive student' + student
+                        , null,
+                        'Student', 'studentStatus');
+                }
+            }
+        
             const academicYear = context.model('AcademicYear').convert(event.target.academicYear).getId();
             if (Number.isInteger(academicYear) === false) {
                 throw new DataError('E_VALUE', 'Invalid academic year. Expected number.', null, 'AcademicYear', 'id');