Projekt

Obecné

Profil

Statistiky
| Větev: | Revize:

# Datum Autor Komentář
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

a2e84e8c 2020-04-20 20:23 Vojtěch Danišík

re #7886 Creating + Editing assembly
Not working: Adding new role to access list, Loading values for parameter, Adding new values for parameter, disabling functions + operators if data type = enumeration, deleting role from Access list, Deleting parameter. Saving new assembly + checking all form elements....

5fded919 2020-04-20 11:50 Jan Čarnogurský

Added JS

bfd68253 2020-04-17 13:00 Jan Čarnogurský

fix view for chrome and firefox

0b434236 2020-04-17 07:58 Vojtěch Danišík

re #7871 Added edit formula for every assembly.

cfe48a96 2020-04-16 20:45 Jan Čarnogurský

re #7871 - connect templates with data from database

62f55be5 2020-04-16 17:36 Jan Čarnogurský

fix gitignore

80b3a14c 2020-04-16 17:34 Jan Čarnogurský

re #7775 added template for "Výběr sestavy"

3a515b92 2020-04-16 17:34 Jan Čarnogurský

re #7774 added webpack configuration + dependencies for react with example, added theme for "Editace sestavy"

295437cb 2020-04-16 17:33 Jan Čarnogurský

re #7773 Added template for "Přehled sestav"

a75f70fd 2020-04-16 14:30 Vojtěch Danišík

Merge branch 'enhancement/7870' into 'master'

re #7870 Displaying list of assemblies + displaying result table of selected assembly.

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

2868bb9a 2020-04-16 14:28 Vojtěch Danišík

re #7871 Displaying list of assemblies + displaying result table of selected assembly.

26829c29 2020-04-13 23:10 Vojtěch Danišík

Merge branch 'enhancement/7779' into 'master'

re #7779 Convert TableColumn -> ContingencyTableRow and send it to frontend....

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

417c1106 2020-04-13 23:10 Vojtěch Danišík

re #7779 Convert TableColumn -> ContingencyTableRow and send it to frontend. SQL query is now executed in specific class DatabaseInterface via SqlQueryManager.

4ca4561a 2020-04-13 23:06 Vojtěch Danišík

Merge branch 'enhancement/7780' into 'master'

re #7780 Loading data from database (with sql query) into specific models.

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

4d92f985 2020-04-13 23:04 Vojtěch Danišík

re #7780 Loading data from database (with sql query) into specific models.

8fc16602 2020-04-11 19:15 Michal Linha

Merge branch 'enhancement/7839' into 'master'

re #7839 Repositories with basic methods created, domain class attributes...

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

21d41302 2020-04-11 19:05 Michal Linha

re #7839 Repositories with basic methods created, domain class attributes mapped to names from database, services with basic methods created

7d0abe0b 2020-04-07 20:20 Michal Linha

Merge branch 'enhancement/7782_export_pdf' into 'master'

re #7782 Created new class ExporterPDF with export to PDF functionality and...

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

d1e50c3e 2020-04-07 20:16 Michal Linha

re #7782 Created new class ExporterPDF with export to PDF functionality and renamed the former Exporter class to ExporterXLSX, changed the version of a library used for export to XLSX functionality implementation

e23fdc07 2020-04-07 18:39 Michal Linha

Merge branch 'enhacement/7781_export_excel' into 'master'

re #7781 Created package utils for utility classes and created class Exporter...

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

16c847d8 2020-04-07 18:26 Michal Linha

re #7781 Created package utils for utility classes and created class Exporter with export to xlsx functionality

01a8b70e 2020-04-07 14:02 Vojtěch Danišík

Merge branch 'enhancement/7778' into 'master'

re #7778 Created classes representing tables in database.

re #7778 Created classes representing tables in database with attributes and relations between them.

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

58fdf8f4 2020-04-07 14:00 Vojtěch Danišík

re #7778 Created classes representing tables in database with attributes and relations between them.

a47918db 2020-03-25 15:09 Vojtěch Danišík

Merge branch 'master' of https://gitlab.kiv.zcu.cz/aswi/aswi-2020/aswi2020vldc

26342eaf 2020-03-25 15:09 Vojtěch Danišík

re #7668 Project init with connecting to demo database

5206a5d7 2020-03-24 21:10 Michal Linha

re #7703 Update README.md

b819bfeb 2020-02-28 07:43 Petr Pícha

Initial commit