Commit Graph

423 Commits

Author SHA1 Message Date
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