573 Commits

Author	SHA1	Message	Date
Patrick Jentsch	6c9b43367b	push	2019-11-25 12:31:48 +01:00
Patrick Jentsch	0f23cbe2a2	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development	2019-11-25 11:56:30 +01:00
Patrick Jentsch	2fc092285c	Dinge	2019-11-25 11:56:27 +01:00
Stephan Porada	d23656ae80	Some fixes	2019-11-25 11:51:56 +01:00
Patrick Jentsch	eeed9268bb	Remove gzip compression	2019-11-25 10:29:05 +01:00
Patrick Jentsch	3d8d2b3e48	Codestyle update	2019-11-25 10:12:39 +01:00
Patrick Jentsch	dd469386e1	change socket logic	2019-11-22 14:13:14 +01:00
Stephan Porada	e52622a5d5	First result view	2019-11-21 16:05:17 +01:00
Stephan Porada	fd2547de0c	Add compression of result dictionary and size infos for other compression or no compression methods	2019-11-21 16:05:00 +01:00
Stephan Porada	e6b27b0970	Add first setup for compression	2019-11-19 15:21:42 +01:00
Stephan Porada	1f74ad8a8e	Add Wrapper Version 2.0	2019-11-19 11:48:00 +01:00
Patrick Jentsch	e3db29e476	Change container name for analysis	2019-11-19 11:42:23 +01:00
Patrick Jentsch	88b0907fc5	Fix for loop	2019-11-19 10:23:47 +01:00
Patrick Jentsch	fb5d9cbf7d	Add errors to form, if they occur	2019-11-19 09:54:31 +01:00
Stephan Porada	96db5c1e75	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development	2019-11-18 16:07:12 +01:00
Stephan Porada	0ca4bf6030	Add first query result function	2019-11-18 16:07:07 +01:00
Patrick Jentsch	9a475f2ad2	Remove job deletion workaround	2019-11-18 15:55:19 +01:00
Patrick Jentsch	6d807d897d	Update add job js	2019-11-18 15:41:32 +01:00
Stephan Porada	5c8ca4e22d	Fix imports	2019-11-18 14:29:16 +01:00
Stephan Porada	14e869b2dd	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development	2019-11-18 14:26:39 +01:00
Stephan Porada	ba0e82738a	Some template stuff	2019-11-18 14:24:47 +01:00
Stephan Porada	ae6e252830	Temp event query handling	2019-11-18 14:24:31 +01:00
Stephan Porada	5fdd67ebf2	Add new CQiWrapper	2019-11-18 14:24:13 +01:00
Patrick Jentsch	ab0e79ac3b	Change add job handling (preparation for api processing)	2019-11-18 14:23:53 +01:00
Patrick Jentsch	8d47d16319	Remove debug statement	2019-11-18 11:22:28 +01:00
Patrick Jentsch	7a94b19326	Fix wrong job additions	2019-11-18 11:21:40 +01:00
Patrick Jentsch	0cd4be055e	Change corpus analysis socket behavior	2019-11-18 11:08:33 +01:00
Patrick Jentsch	fc560933bc	Change edit user form name	2019-11-15 14:01:36 +01:00
Patrick Jentsch	5fd9711da9	Simplify db lookup for queries by id	2019-11-15 13:09:12 +01:00
Patrick Jentsch	7457a4be94	Move admin tables in admin package.	2019-11-15 12:57:01 +01:00
Patrick Jentsch	aacfe40bd6	Code enhancement	2019-11-15 12:51:53 +01:00
Patrick Jentsch	f22bff4ed0	Updated URL Logic for admin package	2019-11-15 11:45:04 +01:00
Patrick Jentsch	74324ac0be	Remove back to corpus button	2019-11-14 16:15:24 +01:00
Patrick Jentsch	3fb5802682	Cleanup corpus analysis code	2019-11-14 15:53:43 +01:00
Patrick Jentsch	df98f3a900	Change HTML for corpus analysis	2019-11-14 15:34:07 +01:00
Patrick Jentsch	1b02d73d66	Update background functions	2019-11-14 13:40:05 +01:00
Patrick Jentsch	7dd55c47a0	Code update to new request system	2019-11-14 13:19:05 +01:00
Patrick Jentsch	baf06d3106	Add user directory on registration	2019-11-14 10:01:45 +01:00
Patrick Jentsch	bab479db20	Change delete execution	2019-11-14 09:48:30 +01:00
Patrick Jentsch	1152417419	First output of query results	2019-11-12 16:45:54 +01:00
Patrick Jentsch	28171eb525	init materialize elements the right way.	2019-11-12 16:16:41 +01:00
Stephan Porada	5660318450	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development	2019-11-12 14:02:20 +01:00
Stephan Porada	dfd9d09f3f	Clean up	2019-11-12 14:02:01 +01:00
Patrick Jentsch	4f53122515	Use CQiClient for testing purpose.	2019-11-12 14:00:03 +01:00
Patrick Jentsch	0d441a9364	Change import logic.	2019-11-12 13:36:22 +01:00
Patrick Jentsch	2bebd0256c	Implement logger in another way.	2019-11-12 13:23:54 +01:00
Stephan Porada	6459c9f064	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development	2019-11-12 12:08:11 +01:00
Stephan Porada	55cacf53fc	Add JSON handling with emit and on	2019-11-12 12:08:09 +01:00
Stephan Porada	d8b8c9f6e0	Remove unused import	2019-11-12 12:07:34 +01:00
Patrick Jentsch	b0c6bb9c05	Add checks if the user is allowed to start an analysis.	2019-11-12 12:04:07 +01:00
Patrick Jentsch	19f1dea4fa	Use list comprehension instead of class methods.	2019-11-12 12:03:46 +01:00
Patrick Jentsch	5602ba950f	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development	2019-11-11 15:58:00 +01:00
Patrick Jentsch	388e7eaa60	Add first implementation of loading modal	2019-11-11 15:57:55 +01:00
Stephan Porada	ffed8592c8	Add new CQiWrapper	2019-11-11 15:35:37 +01:00
Patrick Jentsch	0392d25464	Hups	2019-11-11 14:20:44 +01:00
Patrick Jentsch	8a607b6dc0	Multiple analyses sessions perfectly implemented.	2019-11-11 11:51:18 +01:00
Patrick Jentsch	87b7f07d26	Fix event loop	2019-11-11 09:41:34 +01:00
Patrick Jentsch	4b0ef837ad	Some renaming and moving	2019-11-08 12:21:59 +01:00
Stephan Porada	e0a1514084	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development	2019-11-07 15:58:24 +01:00
Stephan Porada	9be33ffc5a	Add first tr to implement VQiWrapper	2019-11-07 15:51:01 +01:00
Stephan Porada	8e5e8408bd	Add CQiWrapper	2019-11-07 15:48:47 +01:00
Patrick Jentsch	03b956c457	Remove workaround to wait for container	2019-11-07 15:28:07 +01:00
Stephan Porada	13421a9e7f	Remove	2019-11-07 14:37:37 +01:00
Patrick Jentsch	ebf2f00e0d	Add example for client management	2019-11-07 14:33:58 +01:00
Patrick Jentsch	3ccae085d2	Remove unused import	2019-11-07 14:33:48 +01:00
Stephan Porada	7233c74dca	Add some fixes	2019-11-07 13:56:21 +01:00
Patrick Jentsch	7efe39cbd5	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development	2019-11-07 11:06:21 +01:00
Patrick Jentsch	d420b80ac5	Fix wrong joblist additions.	2019-11-07 11:06:16 +01:00
Stephan Porada	54c0d0f27d	Fix app context	2019-11-07 10:55:23 +01:00
Patrick Jentsch	76fcb01186	Update socketio event names	2019-11-07 10:53:39 +01:00
Stephan Porada	19f470ca18	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development	2019-11-07 10:48:10 +01:00
Stephan Porada	47440880d5	Set up all things for first query	2019-11-07 10:45:12 +01:00
Patrick Jentsch	1b3d40eed3	Cleanup eventcode	2019-11-07 10:44:02 +01:00
Patrick Jentsch	414ebc73ff	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development	2019-11-06 15:44:10 +01:00
Patrick Jentsch	82ce08b938	Add CQiClient	2019-11-06 15:44:06 +01:00
Stephan Porada	0af783a5a6	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development	2019-11-06 15:40:47 +01:00
Stephan Porada	08aafb8f99	Add corpus analysis stuff	2019-11-06 15:40:43 +01:00
Patrick Jentsch	8f3517d5b6	Remove logging code	2019-11-06 15:38:00 +01:00
Patrick Jentsch	b0cf581da9	Remove logs	2019-11-06 15:35:27 +01:00
Patrick Jentsch	5aa777bc11	Set corpus analysis connection stop signal	2019-11-06 14:45:08 +01:00
Patrick Jentsch	1389b6b510	Change logic of how connected sessions are identified.	2019-11-06 14:35:33 +01:00
Patrick Jentsch	076ba7356d	Move events to app package	2019-11-06 13:22:18 +01:00
Patrick Jentsch	7757c12dc4	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development	2019-11-06 10:07:40 +01:00
Patrick Jentsch	958779ec61	Use background tasks for file operations.	2019-11-06 10:07:34 +01:00
Stephan Porada	64dce7ed28	Set status on upload, edit, or delete	2019-11-06 10:04:29 +01:00
Stephan Porada	2d4559e4fe	Show buttons only on wanted status	2019-11-06 10:04:01 +01:00
Patrick Jentsch	da077cae3f	Simplify informationupdater	2019-11-05 16:22:48 +01:00
Patrick Jentsch	4bcd97c003	Only use relative imports for functions in the same package.	2019-11-05 16:22:36 +01:00
Patrick Jentsch	eb85869158	Add status to dictionary represantion	2019-11-05 15:35:51 +01:00
Patrick Jentsch	a9efc06d07	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development	2019-11-05 15:34:46 +01:00
Patrick Jentsch	b29f9f5aa8	Add information updater to corpus page.	2019-11-05 15:33:42 +01:00
Stephan Porada	d04f90dee8	Add live colors to corpu sstatus	2019-11-05 15:22:25 +01:00
Stephan Porada	f2024be050	Add back button	2019-11-05 14:23:45 +01:00
Patrick Jentsch	04fe6b063e	Add sanity checks for corpus preparation	2019-11-05 13:40:31 +01:00
Patrick Jentsch	910a187c04	Add prepare button to corpus	2019-11-05 10:52:57 +01:00
Patrick Jentsch	29183b8763	prepare vrt file in background thread.	2019-11-05 10:32:42 +01:00
Patrick Jentsch	69387ee183	Insert metadata to corpus file in constructor	2019-11-05 09:12:06 +01:00
Patrick Jentsch	8ef6d3a04b	Fix date formatting for end-date display	2019-11-05 09:11:37 +01:00
Patrick Jentsch	84578c0d76	UI enhancements	2019-11-04 16:58:15 +01:00
Patrick Jentsch	7176ea26ad	Show Corpus status on corpus page.	2019-11-04 15:40:55 +01:00
Patrick Jentsch	ffcc13ef5b	Add status to corpus model again...	2019-11-04 15:35:09 +01:00
Patrick Jentsch	37d5802b42	Update	2019-11-04 15:06:54 +01:00
Stephan Porada	3bfe50b15c	Add status for Corpus model	2019-11-04 14:12:15 +01:00
Stephan Porada	ce39b24937	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development	2019-11-04 13:19:20 +01:00
Stephan Porada	9c611afdc3	Emit query data via socketio	2019-11-04 13:19:15 +01:00
Stephan Porada	fa61f97413	Add recv_query event for testing	2019-11-04 13:18:55 +01:00
Patrick Jentsch	093f3bfee8	Add confirmation modals for corpus file deletion	2019-11-04 13:11:17 +01:00
Patrick Jentsch	eea0f4635d	Add permission check for job deletion.	2019-11-04 11:04:42 +01:00
Patrick Jentsch	e1225c95bf	Set end date field as N.a. if the job is not completed.	2019-11-04 11:04:23 +01:00
Patrick Jentsch	dfb7f96d2d	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development	2019-11-04 09:54:36 +01:00
Patrick Jentsch	6dd16e8e78	Add edit corpus file form	2019-11-04 09:54:30 +01:00
Stephan Porada	85629aa006	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development	2019-11-04 09:52:59 +01:00
Stephan Porada	60f1cb7573	Revert to view per formular in user settings	2019-11-04 09:52:55 +01:00
Patrick Jentsch	fbde788b27	Center modals	2019-11-04 09:38:47 +01:00
Patrick Jentsch	69a0bb9fb5	Remove unused import	2019-11-04 09:03:58 +01:00
Patrick Jentsch	799101d380	Move /jobs related code in dedicated package.	2019-11-04 09:03:31 +01:00
Patrick Jentsch	162aa5d7c5	UI Update	2019-10-31 15:56:23 +01:00
Patrick Jentsch	5881444b9f	Use extra pages for add_corpus and add_corpus_file forms.	2019-10-31 15:29:02 +01:00
Stephan Porada	61545ed4ec	Push one fix idea for multiple forms	2019-10-31 13:19:18 +01:00
Patrick Jentsch	755f5f3137	Add error handling	2019-10-31 11:34:45 +01:00
Patrick Jentsch	74d9147735	Remove FAB + Codeformatting at corpus page.	2019-10-31 10:45:01 +01:00
Patrick Jentsch	08ba7476f1	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development	2019-10-31 10:25:52 +01:00
Patrick Jentsch	3135eb0897	Move corpora views, and forms in package.	2019-10-31 10:25:48 +01:00
Stephan Porada	4d953f85f7	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development	2019-10-30 15:16:42 +01:00
Stephan Porada	e9ef0d1391	Add new profile forms and views (error prone)	2019-10-30 15:16:37 +01:00
Patrick Jentsch	8fb52fcd31	Remove default values.	2019-10-30 14:29:17 +01:00
Patrick Jentsch	217a5a9e0c	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development	2019-10-30 14:26:17 +01:00
Patrick Jentsch	326507d361	Change submit button style.	2019-10-30 14:26:13 +01:00
Stephan Porada	dcea3ea8e2	Add corpus analysis fix	2019-10-30 14:15:06 +01:00
Stephan Porada	30eefbcb72	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development	2019-10-30 14:06:25 +01:00
Stephan Porada	0dc015b29c	Add more form fields to corpus analysis	2019-10-30 14:06:23 +01:00
Patrick Jentsch	14f779d66a	Change url logic of job handlers	2019-10-30 13:57:09 +01:00
Patrick Jentsch	e9d1734364	enhance routing for corpus actions	2019-10-30 13:12:31 +01:00
Patrick Jentsch	617cc06125	add directory creation	2019-10-30 09:20:57 +01:00
Patrick Jentsch	e2268f9234	add some debug logs	2019-10-30 09:02:45 +01:00
Patrick Jentsch	8b8939b17a	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development	2019-10-30 08:28:54 +01:00
Patrick Jentsch	7fb37dcb70	restructure corpus delete method	2019-10-30 08:28:52 +01:00
Stephan Porada	f586518e9a	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development	2019-10-29 17:44:24 +01:00
Stephan Porada	31c015f761	Add query analysis form options etc.	2019-10-29 17:42:32 +01:00
Patrick Jentsch	7dcc8c48da	Also delete corpus files when a corpus gets deleted	2019-10-29 14:35:23 +01:00
Patrick Jentsch	0a8f6a5a44	Fix file save path	2019-10-29 13:56:32 +01:00
Patrick Jentsch	b4d2093986	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development	2019-10-29 13:47:31 +01:00
Patrick Jentsch	4930709c9d	Add corpus file upload	2019-10-29 13:47:25 +01:00
Stephan Porada	5f29112390	Fix some things	2019-10-29 09:51:47 +01:00
Patrick Jentsch	f4c7af02ad	Change corpus file model to save metadata.	2019-10-28 15:46:25 +01:00
Patrick Jentsch	8a4a7577a0	Preview for new corpus page.	2019-10-28 14:53:25 +01:00
Stephan Porada	2534b4cae7	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development	2019-10-28 09:18:12 +01:00
Stephan Porada	b46090133d	Add first iteration of query and analysis corpora page	2019-10-28 09:16:34 +01:00
Patrick Jentsch	775ddc601e	Code enhancement	2019-10-25 15:09:19 +02:00
Patrick Jentsch	0a6bc055a0	Rewrite download function to use ressource ids instead of paths	2019-10-25 14:27:37 +02:00