166 Commits

Author SHA1 Message Date
Thomas Peetz 2cfaaa4d87 remove obsolete kontor.py
fixes #15
2025-04-30 17:28:09 +02:00
Thomas Peetz 5850b1cfb0 rename User to Profile and Role to Permission. refs #15 2025-04-30 17:22:40 +02:00
Thomas Peetz 8833d2ca6a add db-password.txt in preparation of switching to PostgreSQL 2025-04-29 14:48:31 +02:00
Thomas Peetz 1290a45fb5 kontor-api: Add details pages for Comics, Artists and MediaFiles 2025-04-28 15:47:07 +02:00
Thomas Peetz 3afbbf900d add life of MediaFile 2025-04-27 22:11:56 +02:00
tpeetz f71419d37b Merge branch 'feature/12-import-templates-from-bottle' into 'develop/0.1.0'
Resolve "import templates from  bottle"

Closes #12

See merge request tpeetz/kontor!16
2025-04-27 14:53:34 +02:00
Thomas Peetz f5f673fd4e add comic artist details page 2025-04-27 14:52:07 +02:00
Thomas Peetz 8ec0784490 import templates from bottle and django. Use bootstrap for HTML content 2025-04-27 14:14:56 +02:00
Thomas Peetz 13faff8e01 add dependency to mariadb for kontor and kontor-api 2025-04-26 22:57:52 +02:00
Thomas Peetz 0a4f6bb0f9 remove kontor-cli 2025-04-26 22:17:09 +02:00
Thomas Peetz 3b4e5634b1 remove scriptsa.bak 2025-04-26 00:40:00 +02:00
Thomas Peetz 8c98e6de26 kontor-spring: change IssueView to use StatusIcon 2025-04-25 16:32:31 +02:00
Thomas Peetz 525d82cbda remove conflict marker 2025-04-25 08:13:33 +02:00
Thomas Peetz e26aaa1420 fix deprecatino warning in build.gradle 2025-04-25 07:47:29 +02:00
tpeetz ec7f05d8fc Merge branch 'feature/10-improve-docker-image' into 'develop/0.1.0'
Feature/10 improve docker image

See merge request tpeetz/kontor!14
2025-04-25 01:21:16 +02:00
Thomas Peetz 727e95e732 setup kontor-schema 2025-04-25 01:19:59 +02:00
tpeetz 75d3bf6ffb Resolve "evaluate uv" 2025-04-25 01:19:59 +02:00
Thomas Peetz 94782fc468 relocate sources 2025-04-25 01:19:59 +02:00
tpeetz 101ece44d8 Resolve "evaluate uv" 2025-04-25 01:19:59 +02:00
Thomas Peetz e880594a5b change schema back to use BIT(1) for boolean 2025-04-25 01:19:59 +02:00
Thomas Peetz c222d4cd7a copy sources from branch develop/0.1.0 2025-04-25 01:19:59 +02:00
Thomas Peetz cb0fa3f728 change schema 2025-04-25 01:19:59 +02:00
Thomas Peetz 4709e431b7 add schema from kontor-schema 2025-04-25 01:19:59 +02:00
Thomas Peetz bfccca72a1 copy schema to kontor-api 2025-04-25 01:19:59 +02:00
Thomas Peetz 8a3eebaab5 move schema to separate uv project 2025-04-25 01:19:47 +02:00
Thomas Peetz 6716103d0c setup kontor-schema 2025-04-25 01:19:37 +02:00
Thomas Peetz ee78af1abe relocate sources 2025-04-25 01:19:28 +02:00
tpeetz 1fc726ee4b Resolve "evaluate uv" 2025-04-25 01:19:28 +02:00
Thomas Peetz 882f48de0b relocate sources 2025-04-25 01:19:14 +02:00
tpeetz 097a3efd4a Merge branch 'feature/11-evaluate-uv' into 'develop/0.1.0'
Resolve "evaluate uv"

Closes #11

See merge request tpeetz/kontor!15
2025-04-21 17:39:21 +02:00
tpeetz 934ef826c9 Resolve "evaluate uv" 2025-04-21 17:39:20 +02:00
Thomas Peetz bb049441b4 extend check_kontor.py for comparing json file with db 2025-04-21 00:55:50 +02:00
tpeetz 2bdbef8f8a change boolean fields in schema from Bit(1) to Boolean 2025-04-19 01:40:13 +02:00
tpeetz 20f29d88fa add script to copy from json to mariadb 2025-04-18 22:55:40 +02:00
Thomas Peetz 1997957069 remove .itlab-ci.yml and call of pytest to Makefile 2025-04-18 00:52:00 +02:00
Thomas Peetz 116bb77e4c update check_kontor.py to call Kontor API 2025-04-18 00:09:30 +02:00
Thomas Peetz a6eeea6c1f add testing to fastapi 2025-04-17 02:21:14 +02:00
Thomas Peetz 4a61d6a727 refactor scripts to work wit api 2025-04-16 05:08:59 +02:00
Thomas Peetz 98e3d91edd reorganize python projects 2025-04-15 01:29:08 +02:00
tpeetz a169f6a6c1 Merge branch 'feature/9-evaluate-sqlmodel' into 'develop/0.1.0'
evaluate sqlmodel

See merge request tpeetz/kontor!13
2025-04-13 16:16:10 +02:00
tpeetz b14a267b5b evaluate sqlmodel 2025-04-13 16:16:10 +02:00
Thomas Peetz a43e2c806c add virtualenv to scripts 2025-04-08 12:14:20 +02:00
Thomas Peetz 10834df92b add script for import data 2025-04-08 11:49:52 +02:00
Thomas Peetz 3d97c3360a add MetaDataColumn import 2025-04-07 22:26:33 +02:00
Thomas Peetz 76d91dd506 add import view 2025-04-07 19:34:08 +02:00
Thomas Peetz 84aff2b7d7 add data for cards 2025-04-06 09:41:53 +02:00
Thomas Peetz 2f8c10a692 add package repository and refactor classes 2025-04-03 22:31:11 +02:00
Thomas Peetz c5f74e007a organize imports 2025-04-01 23:13:08 +02:00
Thomas Peetz 243f693f9d ignore project files 2025-04-01 23:08:54 +02:00
Thomas Peetz 976b4f3f47 extract ColumnToggleContextMenu and createStatusIcon to separate classes 2025-04-01 22:09:41 +02:00
Thomas Peetz 1b18dae311 add scripts from repository python-scripts 2025-04-01 08:12:53 +02:00
Thomas Peetz 38e77b25b1 change display of boolean in ComicView and add docker tasks to build.gradle 2025-03-31 22:41:08 +02:00
tpeetz bbc08863f0 Merge branch 'feature/8-create-docker-build' into 'develop/0.1.0'
Resolve "Create docker build"

Closes #8

See merge request tpeetz/kontor!6
2025-03-31 18:40:40 +02:00
tpeetz d58f18d206 Merge branch 'develop/0.1.0' into 'feature/8-create-docker-build'
# Conflicts:
#   springboot/Dockerfile
2025-03-31 18:30:11 +02:00
Thomas Peetz fd5bc54eee import repositories kontor-java and kontor-ee 2025-03-30 15:57:09 +02:00
Thomas Peetz cbc57d22f8 add Docker build and domcker-compose file 2025-03-30 04:17:58 +02:00
Thomas Peetz a5cdf8867a move Git repository kontor-docker to directory bottle-docker 2025-03-29 19:05:31 +01:00
tpeetz 45971518ee change ModuleData view 2025-03-17 18:43:55 +01:00
Thomas Peetz 7db244f599 add length vor varchar for _id fields 2025-02-12 18:07:48 +01:00
Thomas Peetz 41e2b11da2 add details view 2025-02-11 16:16:38 +01:00
Thomas Peetz 0d1b2e416e add tab witg table and details 2025-02-11 10:39:07 +01:00
Thomas Peetz d8eecb4dab fix NPE in MediaActorView 2025-02-10 15:56:32 +01:00
Thomas Peetz 3bb3b22cea add MediaActor and MediaActorFile to kontor-schema 2025-02-10 12:54:59 +01:00
Thomas Peetz 8ffd421c1b add views for MediaActor and adapt MediaFile 2025-02-10 12:25:39 +01:00
Thomas Peetz 6d54c7f315 add MediaActor 2025-02-10 00:27:23 +01:00
Thomas Peetz f5fb743503 refactor kontor-schema 2025-02-08 20:22:21 +01:00
tpeetz ca9022d289 Merge branch 'table_sortable' into 'develop/0.1.0'
Table sortable

See merge request tpeetz/kontor!11
2025-02-06 15:59:29 +00:00
Thomas Peetz ed0e108599 refactor project by using enums for recurring strings 2025-02-06 16:48:41 +01:00
Thomas Peetz 7dc18b10cb refactor kontor-schema by moving classes to seprate modules 2025-02-06 16:44:14 +01:00
Thomas Peetz 171bc1676a refactor project by using enums for recurring strings 2025-02-06 16:33:15 +01:00
Thomas Peetz 1a5cd6ffe8 refactor kontor-schema by moving classes to seprate modules 2025-02-06 11:09:09 +01:00
Thomas Peetz 71ecfaff1f make tables sortable 2025-02-03 23:28:35 +01:00
Thomas Peetz f33aaadce7 fix problem with closing subwindows and define field length for id in schema 2025-02-03 17:37:19 +01:00
Thomas Peetz 591171b223 add meta data subwindow 2025-02-02 21:38:16 +01:00
Thomas Peetz da453d642d rename kontor.py to main.py for pyside6-deploy 2025-01-28 23:19:23 +01:00
Thomas Peetz e733fa21e6 moved update and download functionality to kontor-schema 2025-01-28 15:10:10 +01:00
Thomas Peetz c61e49720e update title 2025-01-27 22:42:32 +01:00
Thomas Peetz d01489b1fa reformat python file 2025-01-27 15:21:51 +01:00
Thomas Peetz 93c7498a83 setting return value of adding link to db 2025-01-27 15:20:35 +01:00
Thomas Peetz fe89cc6e0f add Mixin for videos 2025-01-27 13:34:15 +01:00
Thomas Peetz 1e9ca7c1a4 add Enum for Videotype 2025-01-25 03:53:47 +01:00
Thomas Peetz 400aff6524 Add MediaWindow 2025-01-24 08:58:59 +01:00
Thomas Peetz 845f085a76 remove data.json 2025-01-24 05:31:20 +01:00
Thomas Peetz 88c623edb7 subclass VideoFile 2025-01-24 05:02:08 +01:00
Thomas Peetz 0cc73c09aa remove pyproject.toml 2025-01-21 20:14:27 +01:00
Thomas Peetz e8660faa06 Refactor GUI to use Multi Document Interface 2025-01-21 20:12:50 +01:00
Thomas Peetz 4e884fdbe5 fix exporting and importing from file 2025-01-21 16:46:12 +01:00
Thomas Peetz 4c330a1138 remove kontor-cli.backup 2025-01-21 09:42:33 +01:00
Thomas Peetz 65288a53a1 complete MetaDataTable and MetaDataColumn 2025-01-20 15:40:45 +01:00
Thomas Peetz 60fba0d3e9 add dependencies to kontor-schema and kontor-video in rquirements.txt 2025-01-19 23:39:53 +01:00
Thomas Peetz ada723dc48 separate cli and gui application in own python packages. provide database schema as python package. 2025-01-19 23:36:52 +01:00
Thomas Peetz f07c7b74ee prepare progress bar for download 2025-01-19 17:49:13 +01:00
Thomas Peetz f3c59c11ba add progress in statusbar 2025-01-18 01:28:27 +01:00
Thomas Peetz 3c4d3ad326 add check files command 2025-01-17 17:19:31 +01:00
Thomas Peetz 917e287784 fix missing argument for KontorDB in import_cmd and export 2025-01-17 13:38:16 +01:00
Thomas Peetz 611d6b9e61 add update and download for MediaFile 2025-01-17 13:31:49 +01:00
Thomas Peetz 58263cb854 use sqlalchemy session only as short as possible 2025-01-16 23:03:30 +01:00
Thomas Peetz 33dcbc4413 add command to add link 2025-01-16 16:50:14 +01:00
Thomas Peetz f3cf1a17f3 add import functionality 2025-01-15 14:16:35 +01:00
Thomas Peetz 3466c10a88 add commands and subcommands 2025-01-14 22:58:15 +01:00
Thomas Peetz 4cea554116 add missing schema classes 2025-01-14 17:53:05 +01:00
tpeetz 332e09b283 Merge branch 'feature/5-add-token-management' into 'develop/0.1.0'
Resolve "Add token management"

Closes #5

See merge request tpeetz/kontor!3
2025-01-14 14:55:54 +00:00
tpeetz d3c720f995 Merge branch 'develop/0.1.0' into 'feature/5-add-token-management'
# Conflicts:
#   qt/gui/main_window.py
2025-01-14 14:44:46 +00:00
Thomas Peetz 453ad2af7b merged command line and gui app in one command 2025-01-14 15:39:07 +01:00
Thomas Peetz 54bc17ee7d add cli app and fix relationship typos 2025-01-14 15:39:06 +01:00
Thomas Peetz 89b7b87b8c add export to json 2025-01-14 15:39:03 +01:00
Thomas Peetz 3f0a37ff19 create files with abstract model class 2025-01-14 15:38:30 +01:00
Thomas Peetz 954dab289a extend MetaDataColumn by adding column for name of column for referenced tables 2025-01-14 15:38:30 +01:00
Thomas Peetz 5affa16505 add tysc schema 2025-01-14 15:38:30 +01:00
Thomas Peetz d2b1cb999a reorganize files for Qt application 2025-01-14 15:38:27 +01:00
Thomas Peetz f1d36acff7 add sqlalchemy as orm tool 2025-01-14 15:35:53 +01:00
Thomas Peetz 7e8a6b3c91 add repo kontor-quarkus 2025-01-14 15:35:53 +01:00
Thomas Peetz b424e95e05 import other kontor repos into directories 2025-01-14 15:35:53 +01:00
Thomas Peetz 28746adfbb import from kontor-flask branch develop/0.1.0 2025-01-14 15:35:53 +01:00
Thomas Peetz 0d2f27f771 import from kontor-flask 2025-01-14 15:35:53 +01:00
Thomas Peetz d6410e2584 implement generic table model
implement generic table model which reads table info from db and
constructs table view
2025-01-14 15:21:03 +01:00
Thomas Peetz ce1514f20a fix errors when displaying empty table 2025-01-14 15:18:49 +01:00
Thomas Peetz c8ea7c4188 refresh table when updated 2025-01-14 15:18:46 +01:00
Thomas Peetz 245ee2378e display tick and cross for boolean values 2025-01-14 15:17:41 +01:00
Thomas Peetz afb3ac88c8 first implementation to show Comics and MediaFiles 2025-01-14 15:17:37 +01:00
Thomas Peetz 3a0a0055a6 Add Taskjuggler project file 2025-01-14 15:13:59 +01:00
tpeetz 283577df9b Merge branch 'add-cli-app' into 'develop/0.1.0'
Add cli app

See merge request tpeetz/kontor!9
2025-01-14 12:22:53 +00:00
Thomas Peetz 276302570f merged command line and gui app in one command 2025-01-14 13:10:24 +01:00
Thomas Peetz f74c07af9a add cli app and fix relationship typos 2025-01-13 22:54:25 +01:00
Thomas Peetz d0eae1980a add export to json 2025-01-13 16:18:13 +01:00
Thomas Peetz 820ae3d374 create files with abstract model class 2025-01-13 00:26:42 +01:00
Thomas Peetz bf14c9a020 extend MetaDataColumn by adding column for name of column for referenced tables 2025-01-12 02:41:40 +01:00
Thomas Peetz a3652cc9b8 add tysc schema 2025-01-11 19:00:58 +01:00
Thomas Peetz 8f2e99195a reorganize files for Qt application 2025-01-11 01:54:05 +01:00
Thomas Peetz 2ae11e24ef add sqlalchemy as orm tool 2025-01-10 17:39:54 +01:00
Thomas Peetz a1e8474149 add repo kontor-quarkus 2025-01-09 22:28:46 +01:00
Thomas Peetz 9b329c0ac4 import other kontor repos into directories 2025-01-09 19:28:50 +01:00
tpeetz 8120c92b32 Merge branch 'feature/4-import-kontor-flask-into-directory-flask' into 'develop/0.1.0'
Import kontor-flask into directory flask

Closes #4

See merge request tpeetz/kontor!2
2025-01-08 21:44:47 +00:00
Thomas Peetz 5c261529fc import from kontor-flask branch develop/0.1.0 2025-01-08 22:34:21 +01:00
Thomas Peetz 6923b3e5ee import from kontor-flask 2025-01-08 22:31:20 +01:00
Thomas Peetz fc4110b11d fix problem in string formatting 2025-01-08 22:25:44 +01:00
tpeetz e078f43cc6 set correct project id in build.gradle 2025-01-08 22:25:44 +01:00
Thomas Peetz 24e4c0b58e import export dialog by adding selection of export type 2025-01-08 22:25:44 +01:00
Thomas Peetz 8d31a92692 improve view of meta data by using icons for boolean and add search 2025-01-08 22:25:44 +01:00
Thomas Peetz c619745a4a prevent NPE 2025-01-08 22:25:44 +01:00
Thomas Peetz c769115331 implement general data tab view 2025-01-08 22:25:44 +01:00
Thomas Peetz 1a7da0ab9f add column header info 2025-01-08 22:25:44 +01:00
tpeetz 78632e0e12 Import kontor-spring into directory springboot 2025-01-08 22:25:44 +01:00
Thomas Peetz 3aed8af868 implement generic table model
implement generic table model which reads table info from db and
constructs table view
2025-01-08 22:25:44 +01:00
Thomas Peetz c6d1e4d7e7 fix errors when displaying empty table 2025-01-08 22:25:44 +01:00
Thomas Peetz d98dc79cf8 refresh table when updated 2025-01-08 22:25:44 +01:00
Thomas Peetz 9dcc09c586 display tick and cross for boolean values 2025-01-08 22:25:44 +01:00
Thomas Peetz 57e7b9e999 first implementation to show Comics and MediaFiles 2025-01-08 22:25:44 +01:00
Thomas Peetz d97145b629 add first implementation of Dockerfile 2025-01-08 21:57:13 +01:00
Thomas Peetz 8ba23b6365 add first example of a Dockerfile for a Spring Boot Application 2025-01-08 21:41:20 +01:00
Thomas Peetz 66d61e2c1f add entity token 2025-01-08 21:08:15 +01:00
Thomas Peetz 83f645d4c6 fix problem in string formatting 2025-01-08 15:34:11 +01:00
tpeetz 7d84e341d6 set correct project id in build.gradle 2025-01-08 14:28:18 +00:00
Thomas Peetz c3ec0977c0 import export dialog by adding selection of export type 2025-01-08 14:15:29 +01:00
Thomas Peetz d51bc47ffe improve view of meta data by using icons for boolean and add search 2025-01-08 10:39:52 +01:00
Thomas Peetz faa1d73eea prevent NPE 2025-01-08 08:05:09 +01:00
Thomas Peetz fe407d6d89 implement general data tab view 2025-01-07 21:18:14 +01:00
Thomas Peetz 0759c99c1d add column header info 2025-01-07 01:48:03 +01:00
tpeetz 77bb86a9fa Merge branch 'feature/2-import-kontor-spring-into-directory-springboot' into 'develop/0.1.0'
Import kontor-spring into directory springboot

Closes #2

See merge request tpeetz/kontor!1
2025-01-06 17:09:38 +00:00
tpeetz 4d7d7391c3 Import kontor-spring into directory springboot 2025-01-06 17:09:38 +00:00
Thomas Peetz c5aa3b32ef implement generic table model
implement generic table model which reads table info from db and
constructs table view
2025-01-06 17:07:20 +01:00
Thomas Peetz 4ff999a74e fix errors when displaying empty table 2025-01-05 23:44:29 +01:00
Thomas Peetz bdf2b2ba43 refresh table when updated 2025-01-05 21:47:27 +01:00
Thomas Peetz 04dfe483e4 display tick and cross for boolean values 2025-01-05 14:13:15 +01:00
Thomas Peetz 4a279738e3 first implementation to show Comics and MediaFiles 2025-01-05 14:10:15 +01:00
Thomas Peetz 3f65ec55fc Add Taskjuggler project file 2024-12-05 20:40:13 +01:00
3 changed files with 3 additions and 3 deletions
+1 -1
View File
@@ -7,7 +7,7 @@ test:
DB_HOST=localhost uv run pytest -v --cov --cov-report=term --cov-report=html:coverage-report DB_HOST=localhost uv run pytest -v --cov --cov-report=term --cov-report=html:coverage-report
docker: clean docker: clean
docker build --target=production -t kontor-api -t kontor-api:0.1.0 -t kontor-api . docker build --target=production -t kontor-api -t kontor-api:0.1.0-SNAPSHOT .
dev: dev:
MARIADB_SERVER=localhost uv run fastapi dev src/main.py --port 8008 MARIADB_SERVER=localhost uv run fastapi dev src/main.py --port 8008
+1 -1
View File
@@ -1,5 +1,5 @@
FROM alpine/java:21-jdk FROM alpine/java:21-jdk
WORKDIR / WORKDIR /
ADD build/libs/kontor-spring-0.1.0.jar app.jar ADD build/libs/kontor-spring-0.1.0-SNAPSHOT.jar app.jar
EXPOSE 8000 EXPOSE 8000
CMD ["java", "-jar", "-Dspring.profiles.active=prod", "-Dvaadin.productionMode=true", "app.jar"] CMD ["java", "-jar", "-Dspring.profiles.active=prod", "-Dvaadin.productionMode=true", "app.jar"]
+1 -1
View File
@@ -1,3 +1,3 @@
description='Kontor with Spring Boot' description='Kontor with Spring Boot'
version=0.1.0 version=0.1.0-SNAPSHOT
group=de.thpeetz group=de.thpeetz