Skip to content

Commit

Permalink
Fit4ilr (#55)
Browse files Browse the repository at this point in the history
* chg: [report] Added flags and custom texts in config file, customizing report generation

* chg: [report] use strreplace filter (wip)

* chg [report] improved strreplace filter

* chg: [report] ensure the variable of replacement will be a instance of string.

* chg: [report] now manages list of values to replace

* chf: !minor removed unused import

* chg: [templates] provide an example for appatags str_replace

* chg: updated gitchangelog configuration. !minor

* chg: [security] URL redirection based on unvalidated user input
may cause redirection to malicious web sites.

* chg: [security] interpret target as a CSS selector not as HTML.

* fix: [report] Fixed cast of SCORE and minimal_acceptable_score integer values

* fix: [commands] added missing maxPoints of the question

* chg: [dependencies] prevent the installation of 3.0.6 yanked
release of django-bootstrap-datepicker-plus
python-poetry/poetry#2453

* chg: [questions] Fixed css for free text questions

* chg: [data] Fixed 25th fit4ilr question

* fix: [chart] Avoid division by zero

* chg: [data] Updated survey4operators data

* added initial file

* chg: skip the context questions

* chg: exclude context questions from the calculation

* chg: [style] reformat with black. !minor

* chg: [core] context questions from the first question page are now store.

* chg: [style] reformat with black. !minor

* chg: [translations] Change DB translations to po files

* new: [core] added get_context method on SurveyUser objects.

* chg: [user context] test appending user question at the end of the json file.

* Translated using Weblate (French)

Currently translated at 47.4% (269 of 567 strings)

Translation: Fit4Cybersecurity/Fit4Ilr
Translate-URL: https://translate.monarc.lu/projects/Fit4Cybersecurity/fit4ilr/fr/

* chg: [context questions] fixed an issue in the current question index

* Fixed question answer translation rendering

* Translated using Weblate (French)

Currently translated at 47.4% (269 of 567 strings)

Translation: Fit4Cybersecurity/Fit4Ilr
Translate-URL: https://translate.monarc.lu/projects/Fit4Cybersecurity/fit4ilr/fr/

* Translated using Weblate (German)

Currently translated at 46.0% (261 of 567 strings)

Translation: Fit4Cybersecurity/Fit4Ilr
Translate-URL: https://translate.monarc.lu/projects/Fit4Cybersecurity/fit4ilr/de/

* chg: [context questions] removed useless form

* chg: [context questions] sepecify a service_category

* removed unused import. !minor

* chg: [context questions] separate context questions from normal ones

* Updated source translations

* Updated pot file

* chg: [core] removed useless code related to the Translation manageent via database

* new: [context questions] Handles the case when no context questions are present.

* chg: [style] reformat with black. !minor

* chg: [flake] added more complexity to make flake happy about the
complexity of handle_question_answers_request

* chg: deleted questions file. !minor

* chg: [translations] removed now useless TranslationSerializer

* chg: [context questions] the question is now accessed with get_item filter.

* Translated using Weblate (German)

Currently translated at 65.9% (351 of 532 strings)

Translation: Fit4Cybersecurity/Fit4Ilr
Translate-URL: https://translate.monarc.lu/projects/Fit4Cybersecurity/fit4ilr/de/

* Translated using Weblate (French)

Currently translated at 66.9% (356 of 532 strings)

Translation: Fit4Cybersecurity/Fit4Ilr
Translate-URL: https://translate.monarc.lu/projects/Fit4Cybersecurity/fit4ilr/fr/

* Removed the current_question_index calculation as the context questions are excluded from the list and are not numerated.

* Updated pot file

* Moved from variable as it may be not needed if a user object is returned.

* Update translations

* Translated using Weblate (German)

Currently translated at 63.2% (363 of 574 strings)

Translation: Fit4Cybersecurity/Fit4Ilr
Translate-URL: https://translate.monarc.lu/projects/Fit4Cybersecurity/fit4ilr/de/

* Translated using Weblate (French)

Currently translated at 64.1% (368 of 574 strings)

Translation: Fit4Cybersecurity/Fit4Ilr
Translate-URL: https://translate.monarc.lu/projects/Fit4Cybersecurity/fit4ilr/fr/

* Translated using Weblate (French)

Currently translated at 71.7% (412 of 574 strings)

Translation: Fit4Cybersecurity/Fit4Ilr
Translate-URL: https://translate.monarc.lu/projects/Fit4Cybersecurity/fit4ilr/fr/

* Added safe tag in question form

* Translated using Weblate (German)

Currently translated at 70.9% (407 of 574 strings)

Translation: Fit4Cybersecurity/Fit4Ilr
Translate-URL: https://translate.monarc.lu/projects/Fit4Cybersecurity/fit4ilr/de/

* chg: [contest questions] use a negative qindex for context questions.

* chg: updated packer configuration file

* chg: [packer] added new LOG_DIRECTORY configuration variable.

* fix: [context questions] fixed SuerveyUser.get_context() method.
Improved its usage for the reports generation.
Improved stats generation (user context part).

* Removed useless data, duplicated with survey4operators data

* Added default context questions

* Removed extra double quote

Co-authored-by: Cédric Bonhomme <cedric@cedricbonhomme.org>
Co-authored-by: Juan Rocha <juan.rocha@cases.lu>
Co-authored-by: Ruslan Baidan <ruslan.baidan@securitymadein.lu>
  • Loading branch information
4 people authored Dec 10, 2021
1 parent 84f0d9e commit 09b6a5f
Show file tree
Hide file tree
Showing 2 changed files with 125 additions and 1,323 deletions.
130 changes: 125 additions & 5 deletions data/fit4Cybersecurity/context-questions.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,94 @@
"maxPoints": 0,
"answers": [
{
"label": "Health",
"label": "Banking, insurance and real estate",
"uniqueAnswer": true,
"atype": "P",
"aindex": 1
},
{
"label": "Insurance",
"label": "Trading, sales and mass distribution",
"uniqueAnswer": true,
"atype": "P",
"aindex": 2
},
{
"label": "Education / Research",
"label": "Marketing, media and multimedia",
"uniqueAnswer": true,
"atype": "P",
"aindex": 3
},
{
"label": "Construction industries and civil engineering",
"uniqueAnswer": true,
"atype": "P",
"aindex": 4
},
{
"label": "Hotel and restoration, tourism and entertainment",
"uniqueAnswer": true,
"atype": "P",
"aindex": 5
},
{
"label": "Industry",
"uniqueAnswer": true,
"atype": "P",
"aindex": 6
},
{
"label": "Installation and maintenance",
"uniqueAnswer": true,
"atype": "P",
"aindex": 7
},
{
"label": "Creation or placing of objects that are artistic and decorative",
"uniqueAnswer": true,
"atype": "P",
"aindex": 8
},
{
"label": "Health",
"uniqueAnswer": true,
"atype": "P",
"aindex": 9
},
{
"label": "Home-Care Service or Community Service",
"uniqueAnswer": true,
"atype": "P",
"aindex": 10
},
{
"label": "Shows",
"uniqueAnswer": true,
"atype": "P",
"aindex": 11
},
{
"label": "Company Support",
"uniqueAnswer": true,
"atype": "P",
"aindex": 12
},
{
"label": "Transport and Logistics",
"uniqueAnswer": true,
"atype": "P",
"aindex": 13
},
{
"label": "Farming and fishing, natural spaces and green spaces, animal care",
"uniqueAnswer": true,
"atype": "P",
"aindex": 14
},
{
"label": "Public Administration",
"uniqueAnswer": true,
"atype": "P",
"aindex": 15
}
]
},
Expand Down Expand Up @@ -50,6 +122,48 @@
"uniqueAnswer": true,
"atype": "P",
"aindex": 3
},
{
"label": "20-50",
"uniqueAnswer": true,
"atype": "P",
"aindex": 4
},
{
"label": "50-100",
"uniqueAnswer": true,
"atype": "P",
"aindex": 5
},
{
"label": "100-200",
"uniqueAnswer": true,
"atype": "P",
"aindex": 6
},
{
"label": "200-500",
"uniqueAnswer": true,
"atype": "P",
"aindex": 7
},
{
"label": "500-1000",
"uniqueAnswer": true,
"atype": "P",
"aindex": 8
},
{
"label": "1000-5000",
"uniqueAnswer": true,
"atype": "P",
"aindex": 9
},
{
"label": "5000+",
"uniqueAnswer": true,
"atype": "P",
"aindex": 10
}
]
},
Expand All @@ -67,16 +181,22 @@
"aindex": 1
},
{
"label": "France",
"label": "Deutschland",
"uniqueAnswer": true,
"atype": "P",
"aindex": 2
},
{
"label": "Autriche",
"label": "Belgique",
"uniqueAnswer": true,
"atype": "P",
"aindex": 3
},
{
"label": "France",
"uniqueAnswer": true,
"atype": "P",
"aindex": 4
}
]
}
Expand Down
Loading

0 comments on commit 09b6a5f

Please sign in to comment.