Merge pull request #234 from StartupsPoleEmploi/acantin/save_score_al…

…ternance_office_add OfficeAdd => set score_alternance in form
StartupsPoleEmploi · Jul 27, 2018 · 3dee3c6 · 3dee3c6
2 parents 65d9fd3 + 74fe96a
commit 3dee3c6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/labonneboite/tests/scripts/test_create_index.py b/labonneboite/tests/scripts/test_create_index.py
@@ -116,6 +116,7 @@ def test_office_admin_add(self):
             "departement": "57",
             "headcount": "12",
             "score": 90,
+            "score_alternance": 75,
             "x": 6.17952,
             "y": 49.1044,
             "reason": "Demande de mise en avant",

diff --git a/labonneboite/web/admin/views/office_admin_add.py b/labonneboite/web/admin/views/office_admin_add.py
@@ -49,6 +49,7 @@ class OfficeAdminAddModelView(AdminModelViewMixin, ModelView):
         'departement',
         'headcount',
         'score',
+        'score_alternance',
         'x',
         'y',
         'reason',
@@ -82,6 +83,7 @@ class OfficeAdminAddModelView(AdminModelViewMixin, ModelView):
         'departement': "Département",
         'headcount': "Tranche effectif",
         'score': "Score",
+        'score_alternance': "Score alternance",
         'x': "Longitude",
         'y': "Latitude",
         'reason': "Raison",
@@ -93,6 +95,8 @@ class OfficeAdminAddModelView(AdminModelViewMixin, ModelView):
 
     column_descriptions = {
         'reason': "Raison de l'ajout.",
+        'score': "Valeur recommandée : entre 80 et 90",
+        'score_alternance': "Valeur recommandée : entre 80 et 90",
     }
 
     form_columns = [
@@ -114,6 +118,7 @@ class OfficeAdminAddModelView(AdminModelViewMixin, ModelView):
         'flag_handicap',
         'headcount',
         'score',
+        'score_alternance',
         'y',
         'x',
         'reason',
@@ -172,6 +177,9 @@ class OfficeAdminAddModelView(AdminModelViewMixin, ModelView):
         'score': {
             'validators': [validators.NumberRange(min=0, max=100)],
         },
+        'score_alternance': {
+            'validators': [validators.NumberRange(min=0, max=100)],
+        },
         'reason': {
             'filters': [strip_filter],
         },