Merge branch 'develop' of git@gitlab.2iopenservice.com:vincent/admin.git

into develop

Conflicts:
	lang/layout/fr-FR.js
	use/layout/Menus/configurationMenu.ts

config/abilities/pages/educational.yaml

@@ -6,6 +6,14 @@
       organization:
         - {function: hasModule, parameters: ['PedagogicsAdministation']}
 
+  education_notation_config_page:
+    action: 'display'
+    services:
+      access:
+        - {function: hasAbility, parameters: [{action: 'read', subject: 'pedagogics-administration'}]}
+      organization:
+        - {function: hasModule, parameters: ['AdvancedEducationNotation']}
+
   seizure_period_page:
     action: 'display'
     services:

config/abilities/pages/parameters.yaml

@@ -55,6 +55,14 @@
       organization:
         - {function: hasModule, parameters: ['GeneralConfig']}
 
+  template_systems_page:
+    action: 'display'
+    services:
+      access:
+        - {function: hasAbility, parameters: [{action: 'read', subject: 'general-config'}]}
+      organization:
+        - {function: hasModule, parameters: ['TemplateMessages']}
+
   billing_settings_page:
     action: 'display'
     services:

config/abilities/pages/stats.yaml

@@ -6,6 +6,14 @@
       organization:
         - {function: hasModule, parameters: ['Statistic']}
 
+  education_quotas_page:
+    action: 'display'
+    services:
+      access:
+        - {function: hasAbility, parameters: [{action: 'read', subject: 'educationstudent'}]}
+      organization:
+        - {function: hasModule, parameters: ['PedagogicsAdministation']}
+
   fede_stats_page:
     action: 'display'
     services:

lang/layout/fr-FR.js

@@ -13,6 +13,7 @@ export default (context, locale) => {
     equipment: 'Parc matériel',
     education_state: 'Suivi pédagogique',
     criteria_notations: "Critère d'évaluation",
+    education_notation_configs: "Grilles d'évaluation",
     seizure_period: 'Périodes de saisie',
     test_seizure: 'Saisie des évaluations',
     test_validation: 'Validation par évaluation',
@@ -35,6 +36,7 @@ export default (context, locale) => {
     medals: 'Médailles',
     stats: 'Statistiques',
     report_activity: 'Rapport d\'activité',
+    educations_quotas_by_education: 'Quotas par enseignement',
     fede_stats: 'Fédérations',
     structure_stats: 'Structures',
     rate_cotisation: 'Saisie du tarif',
@@ -102,6 +104,7 @@ export default (context, locale) => {
     date_choose: 'Choix de la période',
     my_list: 'Mes listes',
     searchList: 'Rechercher parmi mes listes personnalisées',
+    template_systems: 'Mails système',
     my_subscription: 'Mon abonnement',
     informations: 'Informations',
     more_features: 'Plus de fonctionnalités',

use/layout/Menus/configurationMenu.ts

@@ -30,7 +30,7 @@ class ConfigurationMenu extends BaseMenu implements Menu {
     const children: ItemsMenu = []
 
     if (this.$ability.can('display', 'organization_page')) {
-      children.push(this.constructMenu('organization_page', undefined, '/organization/edit'))
+      children.push(this.constructMenu('organization_page', undefined, `/main/organization/${this.$store.state.profile.organization.id}/dashboard`, true))
     }
 
     if (this.$ability.can('display', 'cmf_licence_page')) {
@@ -38,7 +38,7 @@ class ConfigurationMenu extends BaseMenu implements Menu {
     }
 
     if (this.$ability.can('display', 'parameters_page')) {
-      children.push(this.constructMenu('parameters', undefined, '/configuration/parameters'))
+      children.push(this.constructMenu('parameters', undefined,`/main/edit/parameters/${this.$store.state.profile.organization.id}`))
     }
 
     if (this.$ability.can('display', 'place_page')) {
@@ -57,6 +57,10 @@ class ConfigurationMenu extends BaseMenu implements Menu {
       children.push(this.constructMenu('activities', undefined, '/activities/list/', true))
     }
 
+    if (this.$ability.can('display', 'template_systems_page')) {
+      children.push(this.constructMenu('template_systems', undefined,'/template_systems/list/', true))
+    }
+
     if (this.$ability.can('display', 'billing_settings_page')) {
       children.push(this.constructMenu('billing_settings', undefined, '/billing_settings/' + this.$store.state.profile.organization.id, true))
     }

use/layout/Menus/educationalMenu.ts

@@ -31,6 +31,10 @@ class EducationalMenu extends BaseMenu implements Menu {
       children.push(this.constructMenu('criteria_notations', 'fa-bars', '/criteria_notations/list/', true))
     }
 
+    if (this.$ability.can('display', 'education_notation_config_page')) {
+      children.push(this.constructMenu('education_notation_configs', 'fa-bars',  '/education_notation_configs/list/', true))
+    }
+
     if (this.$ability.can('display', 'seizure_period_page')) {
       children.push(this.constructMenu('seizure_period', 'fa-calendar-alt', '/education_teachers/list/', true))
     }

use/layout/Menus/statsMenu.ts

@@ -31,6 +31,10 @@ class StatsMenu extends BaseMenu implements Menu {
       children.push(this.constructMenu('report_activity', 'fa-chart-bar', '/report_activity', true))
     }
 
+    if (this.$ability.can('display', 'education_quotas_page')) {
+      children.push(this.constructMenu('educations_quotas_by_education', 'fa-user-circle',  '/educations_quotas_by_education_year/list', true))
+    }
+
     if (this.$ability.can('display', 'fede_stats_page')) {
       children.push(this.constructMenu('fede_stats', 'fa-chart-bar', '/statistic/membersfedeonly', true))
     }