Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat/multiple line annotations #122

Merged
merged 13 commits into from
Oct 1, 2024
Merged

Conversation

ajeanneney
Copy link
Collaborator

Issue description :

Une fonction était présente dans le code afin de détecter les annotations sur plusieurs lignes. Cette fonction ne fonctionnait que sur le navigateur firefox (car basé sur les \t renvoyé lorque l'on sélectionne plusieurs lignes d'un tableau, alors que visiblement les autres navigateurs renvoient des \n). De plus cette fonction créait une annotation par ligne en créant une liaison ce qui n'est plus le comportement souhaité aujourd'hui.

Describe your changes :

  • Après analyse du fonctionnement, suppression de la fonction historique permettant d'annoter sur plusieurs lignes
  • Ajout de la possibiliter d'annoter un paragraphe en cliquant sur les numéros de lignes
  • Petites améliorations sur la tooltip de création d'une annotation pour améliorer l'affichage d'un long texte

How to test :

  • Annoter des paragraphes dans différents cas
  • Vérifier que cela n'a pas d'impacts sur les autres annotations (nottament à l'export)

Checklist before requesting a review

  • I have performed a self-review of my code.
  • The feature works locally.
  • If it's relevant I added tests.
  • Will this be part of a product update? If yes, please write one phrase about this update.

L'interface d'annotation permet désormais de créer des annotations sur plusieurs lignes en cliquant sur les numéros de ligne.

@ajeanneney ajeanneney changed the title Feat/multiple line selection Feat/multiple line annotations Aug 2, 2024
@Bouba-cassation
Copy link
Collaborator

Bouba-cassation commented Aug 14, 2024

Observations :

  • Après analyse du fonctionnement, suppression de la fonction historique permettant d'annoter sur plusieurs lignes :
    1.Effectivement en sélectionnant un texte sur plusieurs ligne (paragraphe) de haut en bas, le texte est juste mise en
    surbrillance, mais on a pas la tooltip des catégories qui s'affiche pour annoter ce texte.
    2.En revanche si on clique sur le texte choisit, la tooltip des catégories, s'ouvre pour nous donner le choix des catégories.
    3.La tooltip des catégories s'ouvre si on choisit le texte de bas en haut

  • Ajout de la possibiliter d'annoter un paragraphe en cliquant sur les numéros de lignes
    1. Cette fonctionnalité marche bien quand on sélectionne un numéros de ligne pour le début de texte et un deuxième
    numéro de ligne pour la délimitation du texte à annoté. Après annotation, les deux textes (deux lignes), deviennent un
    seule paragraphe. le texte de la ligne de délimitation, s'ajoute au texte de la première ligne choisit.
    3. Il n'est pas possible d'annoter un paragraphe qui contient déjà des annotations. (Message)

  • Petites améliorations sur la tooltip de création d'une annotation pour améliorer l'affichage d'un long texte
    1. Les longs texte s'affiche parfaitement

@ajeanneney ajeanneney merged commit 42a1bb8 into dev Oct 1, 2024
1 check passed
@ajeanneney ajeanneney deleted the feat/multiple-line-selection branch October 1, 2024 09:54
Bouba-cassation pushed a commit that referenced this pull request Oct 29, 2024
* first tests and documentation of what I have try/undertand

* multiline selection by clicking on line numbers

* remove logs

* remove buggy multiline feature

* format

* fine tune annotation tooltip

* fix bug : selecting empty lines

* hightlight selected line

* fix identical line selection

* auto create motivation annotation when use line selection

* add popup when delete motivation annotation

* disable changeCategory and link annotation for motivation

* split text in annotation tooltip if too long

---------

Co-authored-by: Antoine Jeanneney <[email protected]>
Bouba-cassation added a commit that referenced this pull request Nov 8, 2024
* adding checklist from annotationReports in statistics collection

* fixing lint

* log/add free documents count logging

* Feat/improve nlp job (#117)

* calculate axios call duration

* timeout to 5 hours on nlp job

* remove console log

* set timetout to 10 min

* finale fix

* timeout on every errors on nlp job

* increase pause after error

---------

Co-authored-by: Antoine Jeanneney <[email protected]>

* Increase timeout for cleaning job

* Feat/add show modifications options on problem report table (#123)

* add show modifications options on problem report table

* simplify isDisabled condition

* change order

---------

Co-authored-by: Antoine Jeanneney <[email protected]>

* Clean code and improve documentation (#125)

* remove migrations - unused

* improve readme

* delete unused readme

---------

Co-authored-by: Antoine Jeanneney <[email protected]>

* Feat/display decision nac (#127)

* add NAO

* show nac or nao in title

---------

Co-authored-by: Antoine Jeanneney <[email protected]>

* fix scrutator connection (#128)

* fix scrutator authorizations

* show preAssignation menu to scrutator

* remove adminView when disconnect

---------

Co-authored-by: Antoine Jeanneney <[email protected]>

* FEAT_add-docker-local-hot-reload (#124)

* FEAT_add-docker-local-hot-reload

* dockerize label with hot reload & network on sder repository

* fix docker:kill

* reset to give a root docker compose

* complete docker.env.example

* remove useless run_mode set

---------

Co-authored-by: Julien Grach <[email protected]>
Co-authored-by: Antoine Jeanneney <[email protected]>

* Feat/multiple line annotations (#122)

* first tests and documentation of what I have try/undertand

* multiline selection by clicking on line numbers

* remove logs

* remove buggy multiline feature

* format

* fine tune annotation tooltip

* fix bug : selecting empty lines

* hightlight selected line

* fix identical line selection

* auto create motivation annotation when use line selection

* add popup when delete motivation annotation

* disable changeCategory and link annotation for motivation

* split text in annotation tooltip if too long

---------

Co-authored-by: Antoine Jeanneney <[email protected]>

* Feat add docker local hot reload (#130)

* FEAT_add-docker-local-hot-reload

* fix dockerfile npm i

---------

Co-authored-by: Julien Grach <[email protected]>

* Fix/motivation entity (#131)

* customize entityId for motivations

* clean

---------

Co-authored-by: Antoine Jeanneney <[email protected]>

* Ops add restart policy for cron (#132)

* add restartPolicy on cronjobs

* deploy on dev

* change branch name

* change branch name

* fix ci

* disable branch deploy

---------

Co-authored-by: Antoine Jeanneney <[email protected]>

* Feat/rework assignation ordering (#119)

* Fix/try fix import (#114)

* j-7 to j-4

* add dateDecision import

* set schedule to not overlap import jobs

---------

Co-authored-by: Antoine Jeanneney <[email protected]>

* choose random in old and recent documents

---------

Co-authored-by: Antoine Jeanneney <[email protected]>

* Feat/new checklist (#136)

* create new annotationReport type

* handle only new annotationReport

* save checklist only if not empty

* extract checklist rendering

* add viewer mode for checklist

* put chekclist in accordion

* make check clickable

* show lines of concerned selected check

* diplay context lines for checklist

* styling

* add checklist header

* eslint

* simplify annotationReportType

* fix test

* change 'label' to 'category' in nlp response

* update storage-example

* review changes

---------

Co-authored-by: Antoine Jeanneney <[email protected]>

* fix IPs (#137)

Co-authored-by: Antoine Jeanneney <[email protected]>

* fix: update gitignore .ash-history > .ash_history (#138)

* set admin view on login (#139)

Co-authored-by: Antoine Jeanneney <[email protected]>

* addding annotation report if is not null

* harmonisation du typage de la checklist et cleaning code

* resolving commit conflict

* resolving lint

* adding and testing modif from antoine's branch

* removing annotationReportChecklist in sendDocumentPseudonymisationAndTreatments in sderBD

* lint resolving

* resolving changes with antoine's commits

* reverting storage-example 123456 file

* adapting test generator for checklist

* resolving test because checklist generator is random

* small fix

* change annotationReportChecklist to checklist

---------

Co-authored-by: Antoine Jeanneney <[email protected]>
Co-authored-by: Antoine Jeanneney <[email protected]>
Co-authored-by: JulienGrach <[email protected]>
Co-authored-by: Julien Grach <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants