Projekt

Obecné

Profil

Statistiky
| Větev: | Revize:

# Datum Autor Komentář
6af5c07d 2020-09-09 18:54 Vojtěch Danišík

final commit

ea163a4c 2020-09-07 17:02 Michal Linha

changed parameter fetch type in assembly to LAZY, added comments, added table name check, changed in assembly template to always load table name

830a7e2e 2020-09-01 15:08 Michal Linha

re #8176 nothing; re #8178 added checks for data types; added table name to the generated table

74db519b 2020-09-01 11:39 Jan Čarnogurský

re #8119 - fix values functions bug, js refactoring

ba7a20a1 2020-08-27 20:32 Michal Linha

re #8176 removed comparators from controllers, added sorting to configuration manager

fb86dc6a 2020-08-24 15:09 Jan Čarnogurský

re #8175 - hide spinner after pdf/excel generation

121f8add 2020-08-24 14:08 Jan Čarnogurský

re #8173 added tooltip for filter

d90fc9de 2020-08-24 13:52 Vojtěch Danišík

re #8133 #8132 Export contingency table to XLSX + PDF (not fully complete).

b07f6ea7 2020-08-22 19:26 Michal Linha

re #7885 #8134re #8154 re #8136 added comments and connected switch to allow user to set if he wants to see empty rows or columns in the final table

7cf01f5b 2020-08-22 19:25 Michal Linha

re #7885 merge master re #8134 merge master; re #8154 merge master; re #8136 merge master; no comments

c08ea26b 2020-08-22 19:25 Michal Linha

re #7885 added option to show empty rows and columns, bug fixes re #8134 nothing; re #8154 added validator; re #8136 added column names no comments

d5ecddcb 2020-08-22 19:25 Michal Linha

re #8113 re #7885 bug fixes, list generation re #8134 changed row indentations in previous commit; re #8154 nothing; no comments

856636e3 2020-08-22 19:25 Michal Linha

re #8113 re #7885 changed header column generation and row indentations; re #8154 nothing; no comments

f30c9e9e 2020-08-22 19:25 Michal Linha

re #8113 re #7885 all functions implemented, contingency table generation improved; re #8154 value filtering added; no comments

d9b0bac7 2020-08-20 14:24 Jan Čarnogurský

sort selected parameters, fix constants in template (switch row/column index)

2111fb8f 2020-08-17 20:51 Jan Čarnogurský

re #8169 - validate action button combination

73291c2e 2020-08-17 19:58 Jan Čarnogurský

re #8168 - loading enum values

b7cd226e 2020-08-17 19:44 Jan Čarnogurský

re #8168 - added select picker for enum values in filter export

0486d642 2020-08-12 14:36 Jan Čarnogurský

re #8155 - added spinner after press button to table generation

2f725e7f 2020-08-12 14:04 Jan Čarnogurský

re #8170 - set up default value of select box to first element

abc5c3b0 2020-08-12 13:37 Jan Čarnogurský

re #8167 - added switch for empty rows, class for stripped table. Set up default values for login

26c4caa0 2020-08-09 14:37 Vojtěch Danišík

re #8101 Bad saving changes for configuration.

15c7afbe 2020-08-04 15:24 Vojtěch Danišík

re #8153 Assembly -> Configuration synchronization

91ec88f7 2020-08-03 12:38 Vojtěch Danišík

re #8152

509b3231 2020-07-23 12:09 Jan Čarnogurský

re #8150 - change assebly order success message

e9236d13 2020-07-23 12:07 Jan Čarnogurský

re #8150 - added success/error messages

38882a3e 2020-07-23 11:10 Jan Čarnogurský

re #8131 - přidání scrollování na tabulku

279b8873 2020-07-23 10:55 Jan Čarnogurský

re #8149 - odstranění šablon 4 část

56f6c6df 2020-07-23 10:55 Jan Čarnogurský

re #8149 - odstranění šablon 3 část

4605a44b 2020-07-23 10:54 Jan Čarnogurský

re #8149 - odstranění šablon 2 část

143404cb 2020-07-23 10:54 Jan Čarnogurský

re #8149 - odstranění šablon 1 část

10920ea3 2020-06-26 15:41 Vojtěch Danišík

re #8130 #8135 #8142

621e3fca 2020-06-20 15:04 Vojtěch Danišík

re #8144 #8143 #8148

bb2ed5bd 2020-05-28 21:17 Vojtěch Danišík

BindingResult check moved from end to start in configuration page post method. Added BindingResult check in assembly page post method.

001b955a 2020-05-28 16:38 Michal Linha

Merge remote-tracking branch 'origin/enhancement/7885' into enhancement/7885

cc39413d 2020-05-28 16:37 Michal Linha

re #7885 added SUM and ability to work with multiple values and sorted parameters in configuration, optimization

d12e5d6c 2020-05-28 16:35 Michal Linha

re #7885 changes in table generation and COUNT

efcabc4d 2020-05-28 16:35 Michal Linha

re #7885 basic contingency table generation (not completely finished)

9e9e8d67 2020-05-28 16:29 Michal Linha

re #7885 added SUM and ability to work with multiple values and sorted parameters in configuration, optimization

74eac55b 2020-05-26 15:49 Jan Čarnogurský

re #8115 - change function parameter

e8bf26d1 2020-05-23 13:03 Michal Linha

Merge remote-tracking branch 'remotes/origin/master' into enhancement/7885

48131bf6 2020-05-23 12:55 Michal Linha

re #7885 changes in table generation and COUNT

403c9955 2020-05-21 13:59 Michal Linha

re #7885 basic contingency table generation (not completely finished)

78a2184f 2020-05-21 06:20 Jan Čarnogurský

re #8102 - indication submit button in post

f38b6ac8 2020-05-20 19:06 Jan Čarnogurský

re #8024 - templates refaktoring

f09d9a1f 2020-05-20 14:38 Jan Čarnogurský

re #8099 added page titles

d50064e0 2020-05-20 14:18 Jan Čarnogurský

re #8100 - show assembly/configuration title

8db0bbf6 2020-05-20 04:03 Vojtěch Danišík

re #8103 Error text in assembly validation is now valid (not null).

5a4cdc03 2020-05-20 03:55 Vojtěch Danišík

re #8046 Assembly order does not change after assembly edit.

a9fb2046 2020-05-11 20:34 Jan Čarnogurský

re #7991 - update calculation for parameter enum value

a9e9c158 2020-05-11 19:55 Jan Čarnogurský

re #7993 update calculation of new parameter index

4c84792b 2020-05-11 11:12 Vojtěch Danišík

Added text file with account informations.

36a626d9 2020-05-07 19:29 Jan Čarnogurský

re #8026 - save order to selected parameters in assembly (frontend)

1c69708b 2020-05-07 13:42 Michal Linha

re #8025 added ability for admin to see and access all assemblies, added functionality that only visible assemblies load to users

6b630778 2020-05-06 11:39 Vojtěch Danišík

ID for assembly and configuration in /assembly, /configuration, /assembly_edit is now as RequestedParam instead of ModelAttribute.

a7423558 2020-05-06 11:17 Vojtěch Danišík

Changed name of role in application.

f4fb7437 2020-05-04 15:52 Michal Linha

Merge branch 'enhancement/7978' into 'master'

re #7978 Enhancement/7978

See merge request aswi/aswi-2020/aswi2020vldc!17

38350f55 2020-05-04 15:46 Michal Linha

re #7978 minor code improvements

fab2885e 2020-05-04 15:38 Michal Linha

re #7978 added functionality of only showing assemblies with correct role (same as user), added functionality of showing only logged in users's configurations in "Rychle k"

8bdaf192 2020-05-04 14:14 Michal Linha

Merge branch 'enhancement/7973' into 'master'

re #7973 changes of authorization - only admin can view pages assembly_new,...

See merge request aswi/aswi-2020/aswi2020vldc!15

853bb665 2020-05-04 14:12 Michal Linha

re #7973 changes of authorization - only admin can view pages assembly_new, assembly_edit and assembly_delete, implemented role name to spring role name converter

d149244c 2020-05-04 12:09 Jan Čarnogurský

re #7972 - Allow assembly order only for role Administrator, javascript comments

31f896bc 2020-05-04 12:09 Jan Čarnogurský

re #7971 show button to add new assemly only for role Administrátor

17ad8bc7 2020-05-04 12:09 Jan Čarnogurský

re #8015 added user logout

48e98533 2020-05-04 12:09 Jan Čarnogurský

re #7969 show actions on index page only to Administrátor

85a6fb49 2020-05-04 11:44 Vojtěch Danišík

Fixing minor bug, when sql query is not valid, then stop validating parameters in assembly.

d411f143 2020-05-04 11:17 Vojtěch Danišík

re #8014 Login into app + session for user.

8766d436 2020-05-04 10:03 Jan Čarnogurský

re #7975 - added flash message style, create one layout for all templates, refactoring

56f8e16e 2020-05-04 09:14 Jan Čarnogurský

re #7970 fix atribute

b3c57a7c 2020-05-04 09:13 Jan Čarnogurský

re #7970 added confirmation before assembly delete. Srcipts moved from templates to separated files

9baf5d8e 2020-05-03 15:41 Michal Linha

Merge branch 'enhancement/7979/7981/7974' into 'master'

re #7981 re #7979 re #7974 Enhancement/7979/7981/7974

See merge request aswi/aswi-2020/aswi2020vldc!14

81a76db9 2020-05-03 15:29 Michal Linha

Merge remote-tracking branch 'origin/enhancement/7979/7981/7974' into enhancement/7979/7981/7974

  1. Conflicts:
  2. src/main/java/vldc/aswi/web/controller/AssemblyController.java
  3. src/main/java/vldc/aswi/web/controller/ConfigurationController.java...
9714fae3 2020-05-03 15:18 Michal Linha

re #7981 parameter order in configuration implementation finished

7f644dea 2020-05-02 20:51 Michal Linha

re #7981 re #7979 re #7974 default table name added, assembly order implemented, parameter order in configuration implemented

50c00b46 2020-05-02 20:38 Michal Linha

re #7981 re #7979 re #7974 default table name added, assembly order implemented, parameter order in configuration implemented

0685cdcb 2020-05-02 18:50 Vojtěch Danišík

Merge branch 'enhancement/7990' into 'master'

re #7990 Added parameter ordering by parameterOrder.

See merge request aswi/aswi-2020/aswi2020vldc!13

85a3bff3 2020-05-02 18:43 Vojtěch Danišík

Added order for parameterInConfiguration.

45073efd 2020-05-02 17:31 Vojtěch Danišík

re #7990 Added parameter ordering by parameterOrder.

0319f844 2020-05-02 16:58 Vojtěch Danišík

Merge branch 'enhancement/7997' into 'master'

re #7988 Parameters are now deleted from assembly + deleted...

See merge request aswi/aswi-2020/aswi2020vldc!11

ae1ff627 2020-05-02 16:57 Vojtěch Danišík

re #7988 Parameters are now deleted from assembly + deleted parametersInConfiguration, which was created by deleted parameter.
re #7989 Added / deleted parameters are now instantly showed in page (refreshing not needed).

e49f76e4 2020-04-29 12:06 Jan Čarnogurský

re #7883 - added javascript to template assembly

58c566a9 2020-04-28 10:50 Jan Čarnogurský

re #7882 parameters order

1d137fc6 2020-04-28 08:46 Jan Čarnogurský

re #7882 change of form javascript

44924273 2020-04-28 08:46 Jan Čarnogurský

re #7882 added JS for assembly edit

33d18654 2020-04-28 08:45 Jan Čarnogurský

temp

74a73b3b 2020-04-27 17:53 Vojtěch Danišík

re #7887 Deleting configurations and assemblies, Minor restructuralization.

9037608d 2020-04-26 15:27 Jan Čarnogurský

re #7884 update functionality for updated template

f7dc4075 2020-04-26 15:06 Jan Čarnogurský

re #7884 - added frontend drag and drop for assembly

8490c92c 2020-04-24 15:53 Vojtěch Danišík

Updating last merge.

6faa5abe 2020-04-24 15:43 Vojtěch Danišík

Merge branch 'enhancement/7886' into 'master'

Enhancement/7886

See merge request aswi/aswi-2020/aswi2020vldc!10

9baf6c93 2020-04-24 15:43 Vojtěch Danišík

Merge branch 'master' into 'enhancement/7886'

  1. Conflicts:
  2. src/main/java/vldc/aswi/dao/parameter/ParameterTypeRepository.java
  3. src/main/java/vldc/aswi/domain/Assembly.java
  4. src/main/java/vldc/aswi/domain/Configuration.java
  5. src/main/java/vldc/aswi/domain/EntityParent.java...
7638be72 2020-04-24 15:17 Vojtěch Danišík

re #7886 Assembly validator completed (validating sql query, parameter name in select and parameter location) + displaying temp error message.
Added title for edit / add assembly forms.
Added toString method for all domains.

4ce66b51 2020-04-24 13:43 Michal Linha

Merge branch 'enhancement/7881' into 'master'

re #7881 loading and editing parameters in configuration in their locations,...

See merge request aswi/aswi-2020/aswi2020vldc!9

2cdd3adc 2020-04-24 13:42 Michal Linha

re #7881 loading and editing parameters in configuration in their locations, ability to set user name of parameter

d8a2496c 2020-04-24 11:07 Michal Linha

Merge branch 'enhancement/7881' into 'master'

Enhancement/7881

See merge request aswi/aswi-2020/aswi2020vldc!8

b439853d 2020-04-24 11:02 Michal Linha

re #7881 ability to create or edit a user configuration and set or edit its basic attributes, operator value and configuration name are validated, if operator value is wrong user is redirected to main page, auto increment functionality changed to IDENTITY

ba8b306a 2020-04-23 22:53 Vojtěch Danišík

re #7886 Assembly validator in progress (validating assembly SQLQuery + locations for existing assembly, not tested for new assembly).
Added comments.
Removing unused imports.

93fff090 2020-04-23 16:06 Vojtěch Danišík

re #7886 Adding + Editing parameters in assembly (only logic + pushing into database, which is not tested -> need JS implementation for adding new parameter).
Updated hibernate dialect from oracle 10 to oracle 12c.
Equals method comparing domain by id.

14917d37 2020-04-23 08:41 Jan Čarnogurský

re #7921 added template for login page

b66f682e 2020-04-20 20:32 Michal Linha

re #7881 loading of attributes of assembly on main page