Projekt

Obecné

Profil

Statistiky
| Větev: | Tag: | Revize:

# Datum Autor Komentář
0a9f9349 2022-04-19 13:37 Vojtěch Bartička

Backend document rendering

778fd294 2022-04-19 13:35 Vojtěch Bartička

Merge branch 'features/9465-documents-upload' into 'dev' Re #9465

Modal window uploading new documents was finished and connected to server API.

See merge request aswi/aswi-2022/aswi20220x00!32

441d6054 2022-04-19 13:35 Vojtěch Bartička

Merge branch 'features/9466-list-documents-annotator' into 'dev' Re #9466

Table showing anotator's documents was implemented.

See merge request aswi/aswi-2022/aswi20220x00!30

4a7bae81 2022-04-19 11:24 Jaroslav Hrubý

Documents upload implemented, connected to REST API

06d1aa21 2022-04-18 14:52 Jaroslav Hrubý

Refactoring

cb624ba8 2022-04-17 18:23 Jaroslav Hrubý

Merge remote-tracking branch 'origin/dev' into features/9466-list-documents-annotator

  1. Conflicts:
  2. webapp/pages/documents/admin/index.tsx
  3. webapp/pages/documents/annotator/index.tsx
4e871c6f 2022-04-17 14:05 Vojtěch Bartička

Merge branch 'features/9475-9478-annotations' into 'dev' Re #9475 Re #9478

Document text selection, adding tag/subtag to selected text, removing annotation occurrences

See merge request aswi/aswi-2022/aswi20220x00!29

51f70e00 2022-04-17 13:56 Lukáš Vlček

Build fixed

9fdb7d55 2022-04-17 13:56 Lukáš Vlček

Deleting occurences

3f66b624 2022-04-17 13:52 Lukáš Vlček

Comments added to selection utils

8316c102 2022-04-17 13:52 Vojtěch Bartička

Last fix

77667f3f 2022-04-17 13:51 Vojtěch Bartička

Minor rename

2ebf32d0 2022-04-17 13:49 Vojtěch Bartička

Changed Id to OccurenceId in TagInstanceInfo

0f8d6304 2022-04-17 13:41 Vojtěch Bartička

Endpoint for annotation instance deletion - untested

4bc99591 2022-04-17 13:24 Lukáš Vlček

Adding tag/subtag to selected text

abf94f21 2022-04-17 13:23 Lukáš Vlček

Backend - saving data fixed

d08c4fb0 2022-04-17 12:45 Vojtěch Bartička

Fixed error in AnnotationController

69af9d49 2022-04-17 12:38 Vojtěch Bartička

Merge branch 'features/9475-9478-annotations' of https://gitlab.kiv.zcu.cz/aswi/aswi-2022/aswi20220x00 into features/9475-9478-annotations

be4deff8 2022-04-17 12:38 Vojtěch Bartička

Minor fixes, added annotation instance endpoint - untested

c2192cda 2022-04-17 12:12 Lukáš Vlček

Selection detection and calculation of start and end position in original document

8837ddf3 2022-04-17 12:03 Vojtěch Bartička

Merge branch 'features/9472-document-preview' into 'dev' Re #9472

HTML preprocessing and sanitization (removing all original attributes from HTML)
Showing HTML on frontend

See merge request aswi/aswi-2022/aswi20220x00!28

ec1d738f 2022-04-17 12:01 Vojtěch Bartička

Merge branch 'features/9481-frontend-annotation-panel' into dev Re #9481

  1. Conflicts:
  2. webapp/pages/annotation/[id].tsx
8d667501 2022-04-17 11:48 Vojtěch Bartička

Merge branch 'features/9477-frontend-annotation-tag-tree' into 'dev' Re #9477

Implemented a left panel that shows a tree of tags

See merge request aswi/aswi-2022/aswi20220x00!26

b5f60842 2022-04-17 11:40 Lukáš Vlček

Document preview on frontend

bae9fbba 2022-04-17 11:16 Jaroslav Hrubý

Table of annotator's documents implemented

b5df208d 2022-04-17 10:44 Vojtěch Bartička

Fixed tag length detection

3c185841 2022-04-17 10:11 Vojtěch Bartička

HTML preprocessing and sanitization

76242338 2022-04-17 00:37 Dominik Poch

Connected annotation panel to API and updated visual

9a41c02f 2022-04-17 00:35 Dominik Poch

Added mapped annotation

Mapped annotation to instance and separated them to different tag occurrences

2c9bdf18 2022-04-16 23:14 Dominik Poch

Upgraded visual of the tag tree

6d6613d4 2022-04-16 23:13 Dominik Poch

Changed colors of dummy tags

Changed colors of dummy tags to show different colors in the tag tree

7652cf88 2022-04-16 20:47 Lukáš Vlček

Basic annotation document preview

0441c314 2022-04-16 20:42 Dominik Poch

Added comments

5593c10b 2022-04-16 20:37 Dominik Poch

Connected tag panel to server

ab68c8da 2022-04-16 20:33 Dominik Poch

Tag selection

Report when tag is selected

b8cae450 2022-04-16 20:13 Dominik Poch

Context for category

Changed context of tags to context of categories

ed01528f 2022-04-16 19:56 Dominik Poch

Implemented tag panel

Implemented tag panel and all its items

7595035c 2022-04-16 19:52 Lukáš Vlček

AnnotationID as dynamic route part in annotation page

484f2ac1 2022-04-16 19:49 Dominik Poch

Tag context

Added context that handles tags

a37f82ce 2022-04-16 19:43 Lukáš Vlček

Minor login optimisation

dd747fc5 2022-04-16 19:42 Lukáš Vlček

API regenerated

351d73ea 2022-04-16 19:09 Vojtěch Bartička

Merge branch 'features/9473-backend-document-annotation-api' into 'dev' Re #9473

Fixed some issues with GET requests requiring a body

See merge request aswi/aswi-2022/aswi20220x00!25

351351fa 2022-04-16 18:58 Lukáš Vlček

Re #9453

Login, Token management

7a32656e 2022-04-16 18:56 Jaroslav Hrubý

Refactoring

8c45ccb0 2022-04-16 18:49 hrubyjar

Token management implemented, redirections

42c654f6 2022-04-16 18:30 Vojtěch Bartička

Same fix in DocumentController - moved to QueryParams

f6eca400 2022-04-16 16:09 Vojtěch Bartička

Merge branch 'features/9481-frontend-annotation-panel' into 'dev' Re #9481

Renamed files, fixed overflow in annotation view, added access to the AnnotationContext in the annotation view, deleted visibility from add document modal window, deleted LayoutProps...

c0c74381 2022-04-16 16:08 Vojtěch Bartička

Annotation controller id in path, not request body

acb8a961 2022-04-16 15:40 Dominik Poch

Added comments

c73aecde 2022-04-16 14:48 Dominik Poch

Renamed files, fixed overflow in annotation view, added access to the AnnotationContext in annotation view, deleted visiblity from add document modal window, deleted LayoutProps

34e9f2d3 2022-04-16 09:31 Lukáš Vlček

AnnotationContext use demo

c057279b 2022-04-16 09:30 Lukáš Vlček

AnnotationContext added

3e6b15a7 2022-04-16 09:29 Lukáš Vlček

Current API model generated

a80db039 2022-04-16 09:04 Dominik Poch

Initialization of tags in annotation view

Initialized tags and created event handlers in the annotation view

4e91ed40 2022-04-16 09:01 Dominik Poch

Annotation panel events

Added events that propagate changes between panels in the annotation view

967f45fc 2022-04-16 09:00 Dominik Poch

Basic functionality of an annotation panel

The panel is without css styles. Basic functionality is implemented.

e39a1e68 2022-04-15 19:19 Vojtěch Bartička

Merge branch 'features/9473-backend-document-annotation-api' into 'dev' Re #9473

Beta version with support for returning current annotation state

See merge request aswi/aswi-2022/aswi20220x00!22

c2a89232 2022-04-15 19:19 Vojtěch Bartička

Resolved issues from code review

316210d4 2022-04-15 15:30 Vojtěch Bartička

Merge branch 'features/9346-backend-testing' into 'dev' Re #9346

Creation of skelet for backend testing.

See merge request aswi/aswi-2022/aswi20220x00!19

782b6d38 2022-04-15 15:25 Vojtěch Bartička

Fixed comments from code review, fixed DB access

09b22f6f 2022-04-15 14:27 Vojtěch Bartička

Added documents and annotations to seeding

a6675a6d 2022-04-15 14:04 Vojtěch Bartička

Added GET /annotation for retrieving annotation state

37259a80 2022-04-15 14:03 Vojtěch Bartička

Added DTOs and mapper profiles for annotation info

8b2a2c15 2022-04-15 14:03 Vojtěch Bartička

Seeding for an annotation tag instance

2d7e2ad6 2022-04-15 12:38 Vojtěch Bartička

Fix in AnnotationController

6bdb3d95 2022-04-15 11:24 Vojtěch Bartička

Endpoint /user/annotations for user's annotations

Added endpoint to UserController

8409298a 2022-04-15 10:46 Vojtěch Bartička

Merge branch 'features/9476-frontend-annotation-screen-layout' into 'dev' Re #9476

Refactored directory structure and changed hierarchy of annotation screen layout. Deleted Ant-Design layouts and used css grid instead.

See merge request aswi/aswi-2022/aswi20220x00!21

ce63b2ab 2022-04-15 10:22 Dominik Poch

Removed ant layout and used css grid

Changed layouting technology and added main layout for all pages.

2a6afa14 2022-04-14 17:23 Dominik Poch

Changed path of imports

Forgot to save files with changed imports

6d10fe14 2022-04-14 17:21 Dominik Poch

Refactored directory structure

Refactored directory structure and changed structure of layouts of the annotation screen

8f56b9fc 2022-04-14 15:12 Vojtěch Bartička

Merge branch 'features/9452-login-screen' into 'dev' Re #9452

Minor refactoring. Moved loginProps to loginLayout and changed a route of the login screen.

See merge request aswi/aswi-2022/aswi20220x00!20

6b2ab778 2022-04-14 14:29 Dominik Poch

Created more generic layout props

Props will be used in multiple layouts and all will have the same parameters. It does not have to be assigned specifically for the login.

deed893a 2022-04-14 14:06 Dominik Poch

Changed a route of the login page

Changed the route from /authentication/login to /login

0f3891f3 2022-04-14 14:05 Dominik Poch

Moved loginProps to loginLayout

LoginProps are not used outside of loginLayout and it does not make sense for it to exist outside of loginLayout.

592b5b81 2022-04-14 12:07 Jakub Schenk

Merge branch 'features/9346-backend-testing' of https://gitlab.kiv.zcu.cz/aswi/aswi-2022/aswi20220x00 into features/9346-backend-testing

bc95eeca 2022-04-14 06:23 Vojtěch Bartička

Backend testing skeleton

773d1205 2022-04-13 19:49 Jakub Schenk

Backend testing

Skelet for backend testing

858edfe4 2022-04-13 10:51 Vojtěch Bartička

Merge branch 'features/9474-backend-tag-tree-api' into dev Re #9474

  1. Conflicts:
  2. Backend/Core/Services/Registration.cs
ca815fc1 2022-04-13 10:32 Vojtěch Bartička

Merge branch 'features/9467-backend-document-assign-api' into 'dev' Re #9467

Assigning documents to users and getting a list of users

See merge request aswi/aswi-2022/aswi20220x00!13

ecb333b6 2022-04-13 10:31 Vojtěch Bartička

Optimized database access - prefetch tags and categories

153d77a8 2022-04-13 10:25 Vojtěch Bartička

Database access optimizations

1524324f 2022-04-13 10:10 Vojtěch Bartička

Shortened GetUsers in UserServiceEF

1088c14e 2022-04-13 10:07 Vojtěch Bartička

Don't throw if user already assigned to document

7ceeb02f 2022-04-13 08:16 Vojtěch Bartička

Created TagController, implemented GET on /tags

055ef5b5 2022-04-13 08:16 Vojtěch Bartička

Created TagService, implemented GetTagTree

b9c5b7dd 2022-04-13 08:15 Vojtěch Bartička

Added tag-related DTOs and mapping

050ce537 2022-04-13 08:13 Vojtěch Bartička

Merge branch 'features/9452-login-screen' into 'dev' Re #9452

Implemented a login screen and added ant-design package to the react project

See merge request aswi/aswi-2022/aswi20220x00!14

2d3822e7 2022-04-13 07:49 Dominik Poch

Changed email to username

Changed email field to username, changed error message when field is not filled and removed validation of a field format.

a13df91a 2022-04-13 06:00 Vojtěch Bartička

Merge branch 'features/9465-frontend-add-document-window' into 'dev' Re #9465

Created a modal that adds new documents and when API is implemented it will send documents to a server.

See merge request aswi/aswi-2022/aswi20220x00!16

b3230f99 2022-04-13 05:58 Vojtěch Bartička

Merge branch 'features/9476-anotation-screen-layout' into 'dev' Re #9476

Created a layout with empty panels. They will be done in other branches.

See merge request aswi/aswi-2022/aswi20220x00!15

428b6f89 2022-04-12 22:42 Dominik Poch

Created a document adding modal

Created a modal that adds new documents and when API is implemented it will send documents to a server.

ac59aec1 2022-04-12 21:45 Dominik Poch

Created a layout of the annotation screen

Created a layout with empty panels. They will be done in other branches.

98568917 2022-04-12 18:53 Dominik Poch

Renamed props.tsx to loginProps.tsx

Props was too generic so I renamed it to show its purpose better.

7a84a6d5 2022-04-12 18:47 Dominik Poch

Added documentation comments

Added documentation comments to the login screen and its layout

95311b56 2022-04-12 18:42 Dominik Poch

Updated layout of the login screen

Changed layout to bootstrap, added a logo and a title.

e5bc2de2 2022-04-12 18:41 Dominik Poch

Added todos for login form events

To test the functionality, login form values are logged to the console when the form is submitted. That is dangerous, so I added todos that will remind us to delete these logs when authentication is implemented.

882caa6a 2022-04-12 18:37 Dominik Poch

Streched login button

Login button now fills width of the form

cbd9de5e 2022-04-12 18:36 Dominik Poch

Changed error messages

Changed error messages for required email and password and added check of email address format

77eb11b3 2022-04-12 15:27 Dominik Poch

Added layout of the login screen

Created a layout in a separate file and added it to the login screen

e9c60748 2022-04-12 15:24 Dominik Poch

Added basic login form