Merge branch 'main' of github.com:Unipisa/dm-manager

Unipisa · Nov 26, 2024 · d6d6fd1 · d6d6fd1
2 parents 65489fd + 03b2aaa
commit d6d6fd1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/server/worker.js b/server/worker.js
@@ -421,7 +421,10 @@ ${visitsList}\n\n`
 
     if (seminars.length > 0) {
         const seminarsList = seminars.map(seminar => {
-            const daysUntilSeminar = Math.round((seminar.startDatetime - today) / (1000 * 60 * 60 * 24))
+            const seminarDate = new Date(seminar.startDatetime);
+            seminarDate.setHours(0, 0, 0, 0); 
+
+            const daysUntilSeminar = Math.round((seminarDate - today) / (1000 * 60 * 60 * 24))
 
             let text = daysUntilSeminar === 1 
                 ? `Seminario tra ${daysUntilSeminar} giorno\n` 

diff --git a/src/models/Room.js b/src/models/Room.js
@@ -15,7 +15,7 @@ export default class Room extends Model {
             'un oggetto': "una stanza", 
         }
         this.ModelName = 'Room'
-        this.indexDefaultFilter = {'_sort': 'number', '_limit': 10}
+        this.indexDefaultFilter = {'_sort': 'code', '_limit': 10}
         this.managerRoles = ['admin','room-manager']
         this.columns = {
             'code': 'codice',