Commit Graph

837 Commits

Author SHA1 Message Date
Stephan Porada
e5928731ec Enhance toast to grilled cheese toast! 2020-01-17 15:10:01 +01:00
Stephan Porada
9ee2e9bdbd Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-01-17 14:31:20 +01:00
Stephan Porada
e4b794d37c Add tmp List.js implemetation 2020-01-17 14:31:14 +01:00
Patrick Jentsch
cebe1c6d31 move dropdown menu code 2020-01-17 11:46:30 +01:00
Patrick Jentsch
501eb3756c Minor updates 2020-01-17 10:49:04 +01:00
Patrick Jentsch
04bfe108c3 Javascript cleanup 2020-01-17 10:42:02 +01:00
Patrick Jentsch
554cc735b0 Tune the new job modal 2020-01-16 15:24:24 +01:00
Patrick Jentsch
b0d1ba472b Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-01-16 15:04:17 +01:00
Patrick Jentsch
688591ebe8 Add sort function to corpus and job lists 2020-01-16 15:04:12 +01:00
Stephan Porada
e04b31d282 Add error handling of invalid CQP queries 2020-01-16 11:56:16 +01:00
Patrick Jentsch
ef1eb9976e Change query result display 2020-01-15 16:04:33 +01:00
Patrick Jentsch
9353a3d5db Change corpus analyse ui 2020-01-15 15:52:42 +01:00
Patrick Jentsch
88f87da86c Change scaling 2020-01-15 13:45:57 +01:00
Patrick Jentsch
8dcf195e1b Use tables instead of collections in admin user view 2020-01-15 13:20:20 +01:00
Patrick Jentsch
91da024f36 Remove unneccessary code 2020-01-15 13:20:04 +01:00
Patrick Jentsch
32f2d7dbf7 New corpus and job lists. 2020-01-15 10:52:51 +01:00
Patrick Jentsch
9862d32dbb Use default values for lists in admin user page 2020-01-13 15:35:21 +01:00
Patrick Jentsch
8c69c3881f Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-01-13 15:33:11 +01:00
Patrick Jentsch
310c652514 Package cleanup and add LICENSE files! 2020-01-13 15:33:05 +01:00
Stephan Porada
446eca2d22 Add function to edit new metadata fields 2020-01-10 12:13:42 +01:00
Stephan Porada
cee89dd712 continue additional metadata 2020-01-10 11:29:26 +01:00
Stephan Porada
e1a8fbc531 Add options to add more detailed metadate to corpus file 2020-01-09 16:04:52 +01:00
Stephan Porada
96700586c8 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-01-08 16:02:49 +01:00
Stephan Porada
8e02c2fd14 Add more metadate to corpus files 2020-01-08 16:02:42 +01:00
Patrick Jentsch
2308ed9a87 Add missing ";" 2020-01-08 13:20:56 +01:00
Patrick Jentsch
4446260c10 Change the way how the dismiss feature is added to toasts. 2020-01-08 10:47:59 +01:00
Patrick Jentsch
8416bda04b Add Icon and color for "merge_images" service. 2020-01-08 10:18:15 +01:00
Patrick Jentsch
6d65521000 Make toasts eckig again! 2020-01-08 10:16:49 +01:00
Patrick Jentsch
5aa4fcd66f Add close function for Toasts 2020-01-08 10:13:58 +01:00
Patrick Jentsch
a7e94b8c9b Add merge images functionality. 2020-01-07 14:39:01 +01:00
Stephan Porada
0b0838f6e0 Fix typo 2020-01-07 13:05:44 +01:00
Stephan Porada
f189460543 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-01-07 13:03:44 +01:00
Stephan Porada
93891a34c9 Add form and service 2020-01-07 13:03:42 +01:00
Patrick Jentsch
0a3f2d3a67 Add newer nlp version 2020-01-07 11:34:16 +01:00
Patrick Jentsch
e240bf7860 Show prepare button if status switches to failed. 2019-12-05 15:58:28 +01:00
Patrick Jentsch
19651433cd Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2019-12-04 11:03:49 +01:00
Stephan Porada
947e9f984b Add loading animation for query request 2019-12-04 10:54:40 +01:00
Patrick Jentsch
90c12e5800 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2019-12-04 10:40:15 +01:00
Patrick Jentsch
904e36a8bb Fix js 2019-12-04 10:40:11 +01:00
Stephan Porada
c3fe3d9247 Change loading animation 2019-12-04 10:31:01 +01:00
Stephan Porada
31ac9ddcf3 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2019-12-03 15:11:40 +01:00
Stephan Porada
7ec41a03be Add Inspect view 2019-12-03 15:11:31 +01:00
Patrick Jentsch
ccfd449260 Rename analysis container 2019-12-03 11:46:56 +01:00
Stephan Porada
94e8d0895c Add first things to get more context for one match. 2019-12-02 16:13:53 +01:00
Stephan Porada
d2334e6a1e Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2019-12-02 14:19:51 +01:00
Stephan Porada
3af400a732 Add get_sentences to wrapper 2019-12-02 14:19:40 +01:00
Patrick Jentsch
ae30ba7186 Change email template to fit new name 2019-12-02 12:03:50 +01:00
Patrick Jentsch
f63a850175 Renaming: opaque->nopaque 2019-12-02 11:34:28 +01:00
Patrick Jentsch
da2f7f6c7d Updates for stack deployment 2019-12-02 11:06:46 +01:00
Stephan Porada
1c9e715980 Fixe some things for query results 2019-11-28 15:19:52 +01:00
Stephan Porada
dbd580b3c0 Get results with wrapper 3.0 2019-11-28 14:14:56 +01:00
Patrick Jentsch
dec90e30b5 better tooltips 2019-11-28 13:45:00 +01:00
Patrick Jentsch
9b71fb0cc9 Add tooltips to query ui 2019-11-28 12:09:25 +01:00
Patrick Jentsch
49311f58f0 Add basic style for expert view 2019-11-27 15:56:39 +01:00
Patrick Jentsch
54f3036d89 push 2019-11-27 13:29:43 +01:00
Patrick Jentsch
5411bd91bd Fix imports and hardcoded values 2019-11-27 10:18:15 +01:00
Stephan Porada
b5afdf74f2 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2019-11-27 09:41:22 +01:00
Stephan Porada
b3d5c15df3 CQiWrapper new data structure 2019-11-27 09:41:21 +01:00
Patrick Jentsch
d63b5ec266 Handle new data structure 2019-11-27 09:36:27 +01:00
Patrick Jentsch
9f42b9b99d Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2019-11-26 14:58:48 +01:00
Patrick Jentsch
5336eac2c9 fix stack deploy yml 2019-11-26 14:58:33 +01:00
Patrick Jentsch
7edd635573 fix socketio redis 2019-11-26 14:58:21 +01:00
Stephan Porada
00d61a7bf5 Add sentences to results 2019-11-26 11:48:54 +01:00
Stephan Porada
52b7202017 Fix CQiClient 2019-11-26 11:48:42 +01:00
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
Patrick Jentsch
409d94d0ae Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2019-10-24 13:29:09 +02:00
Patrick Jentsch
810388b78b Add new values to to_dict methods 2019-10-24 13:29:02 +02:00
Patrick Jentsch
83f1aa1a6b Add dynamic output link creation. 2019-10-24 13:28:47 +02:00
Patrick Jentsch
fca352c3dd Add dir to job creation. 2019-10-24 13:28:32 +02:00
Stephan Porada
3e622ac553 Add first Corpus analysis page 2019-10-24 13:14:15 +02:00
Stephan Porada
dce834c9a1 Add full_width and limited_width templates. 2019-10-24 13:13:34 +02:00
Stephan Porada
f324bc9f3b Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2019-10-23 13:31:01 +02:00
Stephan Porada
bf4b9808c3 Fix undefined JobList error 2019-10-23 11:23:06 +02:00
Stephan Porada
afac42464a Add CurpusFile result relation to Corpus 2019-10-23 11:22:29 +02:00
Patrick Jentsch
c6341cbce6 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2019-10-23 08:35:17 +02:00
Patrick Jentsch
2ba80146e9 Some prework for files from database update 2019-10-23 08:35:15 +02:00
Stephan Porada
488baf0b67 Fix new results table view 2019-10-22 15:28:54 +02:00
Stephan Porada
83d6839fd7 Add new results table view 2019-10-22 13:06:57 +02:00
Stephan Porada
bafa522eae Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2019-10-17 13:33:19 +02:00
Stephan Porada
82fb73de1a Add new realtion 2019-10-17 13:32:22 +02:00
Patrick Jentsch
85b2100e60 Add to_dict methods 2019-10-17 13:26:20 +02:00
Patrick Jentsch
abe2ed1666 add tables for files 2019-10-16 16:52:05 +02:00
Patrick Jentsch
313a784766 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2019-10-15 15:00:02 +02:00
Patrick Jentsch
87a0657d4c Remove footer. 2019-10-15 15:00:00 +02:00
Stephan Porada
88042dfd8e Add dark mode 2019-10-09 16:10:30 +02:00
Patrick Jentsch
7ad9a61e24 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2019-09-27 13:56:58 +02:00
Patrick Jentsch
9d6e54e966 Change how job form works. 2019-09-27 13:56:52 +02:00
Stephan Porada
a8489a5550 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2019-09-24 17:10:23 +02:00
Stephan Porada
b05718c03d Fix result file order. 2019-09-24 17:10:18 +02:00
Patrick Jentsch
787bf4c377 Unify service pages. 2019-09-24 16:55:24 +02:00
Stephan Porada
a267de0867 Add cancel button to delete modal. 2019-09-24 16:21:22 +02:00
Stephan Porada
202ab2e0de Add download icons to job page download buttons. 2019-09-24 16:16:30 +02:00
Stephan Porada
1f9137be47 Fix admin user page layout. 2019-09-24 16:16:01 +02:00
Stephan Porada
873997fbbf Sort result files for sorted download buttons. 2019-09-24 16:15:46 +02:00
Stephan Porada
695a57560f Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2019-09-24 14:04:57 +02:00
Stephan Porada
ed288598cd Add delete corpora function and function to view an delete foreign jobs and corpora. 2019-09-24 14:04:49 +02:00
Patrick Jentsch
300832d403 further ui improvements 2019-09-24 13:42:30 +02:00
Patrick Jentsch
3cf42832f5 Add additional options to ocr form. 2019-09-24 12:03:24 +02:00
Patrick Jentsch
4858f36d76 Codestyle for auth package. 2019-09-23 16:39:36 +02:00
Patrick Jentsch
5749c94bca Codestyle for admin package. 2019-09-23 16:25:26 +02:00
Patrick Jentsch
783b8c7e82 Move auth.settings to a new package (profile) as profile.index 2019-09-23 16:11:01 +02:00
Patrick Jentsch
4aba8cbd51 Change border 2019-09-23 14:36:52 +02:00
Patrick Jentsch
8ba1d43f33 Further styling for ocr job form. 2019-09-23 14:10:27 +02:00
Patrick Jentsch
4c8ab6b3c1 Add dummy checkboxes for further ocr job options. 2019-09-23 13:55:25 +02:00
Patrick Jentsch
d269249db0 Only use one generic function for socketio background tasks and rename the socketio event (it's no connect so don't name it like one) 2019-09-18 14:05:56 +02:00
Stephan Porada
9f74e8ce82 Fix typo 2019-09-18 13:12:49 +02:00
Stephan Porada
43a01b8de6 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2019-09-18 12:07:06 +02:00
Stephan Porada
5ad5bc0a2f Add foreign admin views 2019-09-18 12:06:34 +02:00
Patrick Jentsch
f9649af08d Make CorpusList class ready for admin view. 2019-09-18 11:35:25 +02:00
Stephan Porada
daf6c15111 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2019-09-18 11:33:08 +02:00
Stephan Porada
1ebfee5cb3 Add admin view on foreign jobs. 2019-09-18 11:33:06 +02:00
Patrick Jentsch
b90d6114b0 Make JobList class ready for admin view. 2019-09-18 11:32:35 +02:00
Stephan Porada
0ea87de072 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2019-09-17 16:31:45 +02:00
Stephan Porada
0d060f0cbf Move job and user delete functions to utils.py 2019-09-17 16:31:41 +02:00
Patrick Jentsch
d7e71638a2 Update progress modal 2019-09-17 16:15:37 +02:00
Stephan Porada
09f7d7ac68 Add delete functions for jobs and users. 2019-09-17 14:36:15 +02:00
Patrick Jentsch
683b59bb47 Add function to cancel file upload. 2019-09-17 14:20:15 +02:00
Patrick Jentsch
07c4e31510 Use modals instead of toasts for progress indication. 2019-09-17 10:56:56 +02:00
Patrick Jentsch
3cacdf8185 Set version for latest. 2019-09-17 10:00:39 +02:00
Stephan Porada
ba838eaf1f Enhance delete_job method. 2019-09-16 14:09:07 +02:00
Patrick Jentsch
9005c583ca Add progress bar for file upload. 2019-09-16 12:12:42 +02:00
Stephan Porada
1bdae333b7 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2019-09-12 16:45:12 +02:00
Stephan Porada
b2e2484725 Add job delete function. 2019-09-12 16:45:05 +02:00
Patrick Jentsch
c51a9492f3 Add switch for binarization 2019-09-12 16:00:48 +02:00
Patrick Jentsch
6cf12fa799 Don't show character counter for EMail adresses. 2019-09-12 14:26:53 +02:00
Patrick Jentsch
36f10d51ee Show character counters on register page. 2019-09-12 14:25:03 +02:00
Patrick Jentsch
f0197b5af6 Allow Emails to be 254 characters long. 2019-09-12 14:24:43 +02:00
Patrick Jentsch
c6597d4e37 Add character counter for corpus form. 2019-09-12 12:05:59 +02:00
Patrick Jentsch
16fad5bb2d Add character counter to job forms. 2019-09-12 11:12:59 +02:00
Stephan Porada
50b21d056d Update .gitignore 2019-09-11 16:19:44 +02:00
Stephan Porada
66adec8b7d Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2019-09-11 15:53:51 +02:00
Stephan Porada
3accc058e3 Correct simple loging 2019-09-11 15:52:38 +02:00
Patrick Jentsch
8115c8b755 Add Version selection to NLP 2019-09-11 15:40:37 +02:00
Patrick Jentsch
dd7ef2a113 Fix wrong path. 2019-09-11 14:55:26 +02:00
Stephan Porada
0826f6a9f7 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2019-09-11 14:53:15 +02:00
Stephan Porada
c7337a5277 Add first stopping and deletion functions etc. 2019-09-11 14:51:59 +02:00
Stephan Porada
230d057fee Add simple logging 2019-09-11 14:50:29 +02:00
Patrick Jentsch
53428a01bb Add workflow dummy entry. 2019-09-11 10:00:52 +02:00
Patrick Jentsch
1960b14d9d Re- rename edit_profile to settings 2019-09-11 09:47:26 +02:00
Patrick Jentsch
15a418cf7c Add navigation highlighting. 2019-09-10 16:09:35 +02:00
Patrick Jentsch
51d2623e2e Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2019-09-10 15:10:21 +02:00
Patrick Jentsch
cc9460c901 Add Account navigation links for medium and small devices. 2019-09-10 15:10:16 +02:00
Stephan Porada
d537096f74 Add user self delete function 2019-09-10 14:18:20 +02:00
Stephan Porada
2f6dd37abb Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2019-09-10 13:49:14 +02:00
Stephan Porada
fda70e216e Add admin page to edit user informations. 2019-09-10 13:49:01 +02:00
Patrick Jentsch
48b5b09db1 Show locale time representation at corpus/job pages. 2019-09-10 13:40:26 +02:00
Patrick Jentsch
f87363ac13 Remove debug message. 2019-09-10 13:39:50 +02:00
Stephan Porada
8786defa01 Add function to change user email 2019-09-09 16:17:59 +02:00
Stephan Porada
35d126aaea Make admin user list sortable part 2 2019-09-09 15:04:43 +02:00
Stephan Porada
7775954123 Make admin user list sortable. 2019-09-09 15:02:17 +02:00
Patrick Jentsch
0f0c40951b Use fix path! 2019-09-05 12:00:31 +02:00
Patrick Jentsch
40809d9c7b Change setting names. 2019-09-05 10:12:40 +02:00
Patrick Jentsch
f2806f9473 Codestyle. 2019-09-04 16:00:14 +02:00
Patrick Jentsch
64475afc41 Change file download view. 2019-09-04 14:53:23 +02:00
Patrick Jentsch
bb26cba009 Codestyle. 2019-09-04 14:01:20 +02:00
Patrick Jentsch
aa23cf04b5 Small restructore of the design. 2019-09-04 13:51:21 +02:00
Patrick Jentsch
5952db0b4a Change how the job id is obtained. 2019-09-03 16:06:15 +02:00
Patrick Jentsch
4dc331b2fe Add corpus page. 2019-09-03 15:58:40 +02:00
Patrick Jentsch
633bd58087 Codestyle. 2019-09-03 09:07:09 +02:00
Patrick Jentsch
b904ee1e1c Change end-date value correctly. 2019-09-02 15:37:36 +02:00
Patrick Jentsch
8ed7697a63 Add live information updates to job page. 2019-09-02 15:25:30 +02:00
Patrick Jentsch
bec48e5f39 Fix method naming and add Animations.js to base template. 2019-09-02 15:24:39 +02:00
Patrick Jentsch
ff837aa943 Don't use extra variable for one-time use. 2019-09-02 15:24:09 +02:00
Patrick Jentsch
d30980bfa9 Add Animations class, including pulse. 2019-09-02 15:22:26 +02:00
Patrick Jentsch
6ed260b065 Remove unused import. 2019-09-02 10:59:13 +02:00
Patrick Jentsch
ade6d12eeb Codestyle 2019-09-02 10:42:43 +02:00
Patrick Jentsch
e658d2bbd0 Don't create new app instance for background tasks. Reuse the old one! 2019-09-02 10:42:28 +02:00
Patrick Jentsch
565d273dd4 Add comment and remove debug code. 2019-09-02 09:17:13 +02:00
Patrick Jentsch
6f4b9efa25 Add some comments and remove debug code. 2019-09-02 09:17:00 +02:00
Patrick Jentsch
7d4a1e6d37 Remove old scheduler code. 2019-08-30 14:00:08 +02:00
Patrick Jentsch
8f3c53dad2 Use JSON patch the correct way! 2019-08-30 13:31:00 +02:00
Patrick Jentsch
7702de8770 (Re)Implement live update of corpus and job lists. 2019-08-29 15:12:08 +02:00
Patrick Jentsch
1955d3c015 Remove old note. 2019-08-29 12:01:09 +02:00
Patrick Jentsch
876eb465b8 Add client side event handlers for update-* events. 2019-08-29 11:37:00 +02:00
Patrick Jentsch
cf56394441 Remove unused imports. 2019-08-29 11:06:32 +02:00
Patrick Jentsch
0d3f54d655 Implement JSON patches for corpus and job lists. 2019-08-29 10:42:53 +02:00
Patrick Jentsch
98de581132 Cleanup special list classes. 2019-08-28 17:31:09 +02:00
Patrick Jentsch
52bd8ec94e Add background task to handle data changes for corpora and jobs via socketio. 2019-08-28 17:27:43 +02:00
Patrick Jentsch
b48e74f560 Integrate the possibility to create a minimal app for auxillary functions. 2019-08-28 17:19:08 +02:00
Patrick Jentsch
b580f9cb9f Disable scheduler. 2019-08-28 09:48:10 +02:00
Patrick Jentsch
d34447686b Move socketio event handlers in seperate file. 2019-08-27 10:40:29 +02:00
Patrick Jentsch
9a9e3ebf73 Add socket.io.js.map to fix the client-side "not found" error 2019-08-27 09:27:40 +02:00
Stephan Porada
9f011b27c3 Add redis message qeue 2019-08-26 14:21:06 +02:00
Patrick Jentsch
7aef3de81d Stop polling. Use SocketIO! 2019-08-23 15:05:01 +02:00
Patrick Jentsch
9f215d7613 Add socketio javascript 2019-08-22 15:13:10 +02:00
Patrick Jentsch
19f60cfd0f Codestyle and new python package versions. 2019-08-22 09:33:34 +02:00
Patrick Jentsch
bfe28eca61 Add socketio. 2019-08-21 14:41:38 +02:00
Patrick Jentsch
3a6fdaa24b Catch more exceptions. 2019-08-21 11:40:09 +02:00
Patrick Jentsch
be0241519d Don't save job filtered job lists in variables. Handle service not found error. 2019-08-21 08:37:10 +02:00
Patrick Jentsch
a86ae5c75c Use minimal list.js file. 2019-08-20 16:12:03 +02:00
Patrick Jentsch
6975076fc3 Remove ugly workaround for scheduler function. Now the current app_context is used, instead of creating a new app instance. 2019-08-20 15:57:58 +02:00
Patrick Jentsch
5ff2ef9301 Use custom List classes for corpora and job lists. 2019-08-20 11:24:52 +02:00
Patrick Jentsch
74c863e0f7 Only handle difference of changes to the job list. 2019-08-19 17:09:01 +02:00
Patrick Jentsch
5ba08a21f4 Add jsondiffpatch. 2019-08-19 17:08:27 +02:00
Patrick Jentsch
8a49b8c871 Add jsondiffpatch. 2019-08-19 17:08:16 +02:00
Patrick Jentsch
025c51646c Add javascript code for polling with update subscibers. 2019-08-16 14:54:29 +02:00
Patrick Jentsch
6d0096c2cc Renome to_jsonifyable method to to_dict 2019-08-16 14:53:59 +02:00
Patrick Jentsch
22f6c6b4b6 Addition to last commit. 2019-08-16 09:49:47 +02:00
Patrick Jentsch
4a5804460f Add admin functions to api. Add to_jsonifyable method to Job and Corpus and use it in API. 2019-08-16 09:49:27 +02:00
Stephan Porada
2832dd8b6f Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2019-08-15 15:57:40 +02:00
Stephan Porada
388efbbd73 Add cascade deletion of jobs and corpora on user delete. 2019-08-15 15:57:27 +02:00