Commit Graph

447 Commits

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