Lista Navi

src/store/Modules/GlobalStore.ts

@@ -790,6 +790,7 @@ namespace Actions {
       msgextra: msgobj.msgextra,
       msgpar1: msgobj.msgpar1,
       username: msgobj.username,
+      username_mitt: msgobj.username_mitt,
       tipomsg,
       inviareale: msgobj.inviareale,
       navemediatore
@@ -831,6 +832,33 @@ namespace Actions {
       })
   }
 
+  async function GetNave(context, { riga, col, riga1don, col1don, ind_order }) {
+    // console.log('GetNave')
+
+    const mydata = {
+      idapp: process.env.APP_ID,
+      riga,
+      col,
+      riga1don,
+      col1don,
+      ind_order
+    }
+
+    return await Api.SendReq('/dashboard/getnave', 'POST', mydata)
+      .then((res) => {
+        if (res.status === 200) {
+          if (res.data.code === serv_constants.RIS_CODE_OK) {
+            return res.data.ris
+          }
+        }
+        return null
+      })
+      .catch((error) => {
+        console.error(error)
+        return null
+      })
+  }
+
   async function GetData(context, { data }) {
     console.log('GetData')
 
@@ -920,7 +948,7 @@ namespace Actions {
           const islogged = localStorage.getItem(tools.localStorage.username)
           console.log('islogged', islogged)
 
-          CalendarStore.state.editable = UserStore.state.isAdmin || UserStore.state.isManager
+          CalendarStore.state.editable = UserStore.state.isAdmin || UserStore.state.isManager || UserStore.state.isTutor
           if (res.data.myuser === null) {
             if (islogged) {
               // Fai Logout
@@ -1039,6 +1067,7 @@ namespace Actions {
     DuplicateRec: b.dispatch(DuplicateRec),
     InviaMsgADonatori: b.dispatch(InviaMsgADonatori),
     GetArrNavi: b.dispatch(GetArrNavi),
+    GetNave: b.dispatch(GetNave),
     GetArrDoniNavi: b.dispatch(GetArrDoniNavi),
     GetData: b.dispatch(GetData),
     addDynamicPages: b.dispatch(addDynamicPages)

src/store/Modules/UserStore.ts

@@ -78,6 +78,7 @@ const state: IUserState = {
   isLogged: false,
   isAdmin: false,
   isManager: false,
+  isTutor: false,
   usersList: [],
   countusers: 0,
   lastparamquery: {}
@@ -288,6 +289,7 @@ namespace Mutations {
 
     mystate.isAdmin = tools.isBitActive(mystate.my.perm, shared_consts.Permissions.Admin.value)
     mystate.isManager = tools.isBitActive(mystate.my.perm, shared_consts.Permissions.Manager.value)
+    mystate.isTutor = tools.isBitActive(mystate.my.perm, shared_consts.Permissions.Tutor.value)
     mystate.isTeacher = tools.isBitActive(mystate.my.perm, shared_consts.Permissions.Teacher.value)
 
     // console.log('authUser', 'state.isAdmin', mystate.isAdmin)

src/store/Modules/fieldsTable.ts

@@ -398,7 +398,7 @@ export const fieldsTable = {
 
   getTableJoinByName(table) {
     if (table === 'permissions')
-      return [shared_consts.Permissions.Admin, shared_consts.Permissions.Manager, shared_consts.Permissions.Teacher]
+      return [shared_consts.Permissions.Admin, shared_consts.Permissions.Manager, shared_consts.Permissions.Teacher, shared_consts.Permissions.Tutor]
     else if (table === 'accepted')
       return [shared_consts.Accepted.CHECK_READ_GUIDELINES, shared_consts.Accepted.CHECK_SEE_VIDEO_PRINCIPI]
     else if (table === 'fieldstype')
@@ -469,7 +469,7 @@ export const fieldsTable = {
 
     // IColGridTable
   colTableUsers: [
-    // AddCol({ name: '_id', label_trans: 'reg.id' }),
+    AddCol({ name: '_id', label_trans: 'reg.id' }),
     AddCol({ name: 'ind_order', label_trans: 'reg.ind_order' }),
     AddCol({ name: 'date_reg', label_trans: 'reg.date_reg', fieldtype: tools.FieldType.date }),
     AddCol({ name: 'date_temp_reg', label_trans: 'reg.date_temp_reg', fieldtype: tools.FieldType.date }),

src/store/Modules/tools.ts

@@ -1408,7 +1408,8 @@ export const tools = {
 
   visumenu(elem) {  // : IListRoutes
     let visu = ((elem.onlyAdmin && UserStore.state.isAdmin) || (elem.onlyManager && UserStore.state.isManager)
-      || ((!elem.onlyAdmin) && (!elem.onlyManager))) && elem.active
+      || (elem.onlyTutor && UserStore.state.isTutor)
+      || ((!elem.onlyAdmin) && (!elem.onlyManager) && (!elem.onlyTutor))) && elem.active
 
     if (!tools.isLoggedToSystem()) {
       if (elem.onlyif_logged)
@@ -1884,6 +1885,10 @@ export const tools = {
     return UserStore.state.isManager
   },
 
+  isTutor() {
+    return UserStore.state.isTutor
+  },
+
   getstrDate(mytimestamp) {
     // console.log('getstrDate', mytimestamp)
     if (!!mytimestamp)
@@ -2172,7 +2177,7 @@ export const tools = {
     const datenow = tools.getDateNow()
     const diff = date.getDateDiff(datenow, mydate)
     // console.log('diff = ' + diff)
-    if (diff >= 0) {
+    if (diff >= -1) {
       return true
     }
     return false
@@ -3286,6 +3291,8 @@ export const tools = {
         return 'fa-flag-fr'
       else if (lang === 'SI')
         return 'fa-flag-si'
+      else if (lang === 'MD')
+        return 'fa-flag-md'
       else if (lang === 'NG')
         return 'fa-flag-ng'
       else if (lang === 'SK')
@@ -3347,6 +3354,8 @@ export const tools = {
       return 'Slovakia'
     } else if (nat === 'NG') {
       return 'Nigeria'
+    } else if (nat === 'MD') {
+      return 'Moldova'
     } else if (nat === 'ES') {
       return 'Spain'
     } else if (nat === 'DE') {