Commit Graph

392 Commits

Author SHA1 Message Date
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
Stephan Porada
bccf661957 Add new admin blueprint with new user delete feature. Reorganize templates etc. 2019-08-15 15:56:53 +02:00
Patrick Jentsch
99614a56a9 Add switch for admins to get all jobs (of all users) 2019-08-15 13:33:15 +02:00
Patrick Jentsch
4ffb10fd11 Return 404 if requested ressource does not exist. 2019-08-15 12:09:00 +02:00
Patrick Jentsch
6bc1ef94dc Add api blueprint. 2019-08-15 12:02:50 +02:00
Patrick Jentsch
93330c0efb Remove api routes from main package. 2019-08-15 11:48:14 +02:00
Patrick Jentsch
47c3edeb7f Toggle paginations if one or less items are displayed. 2019-08-14 16:59:39 +02:00
Patrick Jentsch
ea399d2cdc Add api endpoints for testing. 2019-08-14 16:59:15 +02:00
Patrick Jentsch
b0c2f69568 Rename scheduler function 2019-08-13 14:27:02 +02:00
Patrick Jentsch
e3ceb19f7a Name docker client like mentioned in the api docs 2019-08-13 14:21:54 +02:00
Patrick Jentsch
db0c2532ad Use Flask-APScheduler. Move docker swarm logic to scheduler. 2019-08-13 14:10:50 +02:00
Patrick Jentsch
1fa9cbc586 pass job object instead of id. 2019-08-12 19:34:41 +02:00
Patrick Jentsch
a5687a3f1b Use scoped_session correctly. 2019-08-12 19:34:24 +02:00
Patrick Jentsch
faf54e57fa Use APScheduler to handle job execution. 2019-08-12 17:03:12 +02:00
Patrick Jentsch
344ba1a8e2 Add download helper for dev process 2019-08-12 10:37:02 +02:00
Patrick Jentsch
fa2827608c Add download helper for dev process. 2019-08-12 10:36:51 +02:00
Patrick Jentsch
e00d34ef81 Only use one file list. 2019-08-12 09:51:32 +02:00
Patrick Jentsch
759a29362c Increase desription length for corpora. 2019-08-12 08:57:21 +02:00
Patrick Jentsch
ad8a8a4696 use job id for swarm run instead of job object 2019-08-11 19:01:19 +02:00
Patrick Jentsch
a302d08405 Add infos to job model and show them on the job info pages. 2019-08-09 15:59:53 +02:00
Patrick Jentsch
359baf0297 Change job template. 2019-08-09 11:49:09 +02:00
Patrick Jentsch
a82b7292ed Change job model. 2019-08-09 11:48:43 +02:00
Patrick Jentsch
50273ea4d1 Use links as list items for corpora and jobs. Add colors for service types. Link jobs to job page. 2019-08-09 10:16:31 +02:00
Patrick Jentsch
136f2ee2b2 Add description for nlp (for now only german). 2019-08-09 10:15:51 +02:00
Patrick Jentsch
4d99c52983 Only use job_id as service name. 2019-08-09 09:13:24 +02:00
Patrick Jentsch
1d6f1a8933 Update ressource requirements. 2019-08-09 09:13:12 +02:00
Stephan Porada
388e0433fd Add searchable User table. 2019-08-08 16:06:41 +02:00
Patrick Jentsch
14b64f86ba Add pagination and search to dashboard. 2019-08-08 15:28:15 +02:00
Patrick Jentsch
12d9ac8727 Add list.js to base template. 2019-08-08 14:28:16 +02:00
Patrick Jentsch
01c5b3603e Remove job from database if an error occurs. Remove job object from session before thread starts. 2019-08-08 12:06:01 +02:00
Patrick Jentsch
202ade92e9 Set name for swarm service. 2019-08-08 12:01:55 +02:00
Patrick Jentsch
75b587e693 Remove redundant add to session. 2019-08-07 16:03:24 +02:00
Patrick Jentsch
c291fac22f Add dummy text to job section 2019-08-07 15:53:37 +02:00
Patrick Jentsch
6f8cef26e4 Map task states to job status. Colorize status badges on dashboard. 2019-08-07 15:01:37 +02:00
Patrick Jentsch
267f86d342 Remove debug message. 2019-08-07 14:36:19 +02:00
Patrick Jentsch
3de48946b9 Update job database entries on status change. 2019-08-07 14:35:33 +02:00
Patrick Jentsch
0461139bb7 Remove unused import. 2019-08-07 14:34:45 +02:00
Patrick Jentsch
e52629dd7e Remove unused import. 2019-08-07 10:22:30 +02:00
Patrick Jentsch
0ac3ed3a29 Set 'submitted' as initial job status value. 2019-08-07 10:21:04 +02:00
Patrick Jentsch
ed2d1abd8c Remove debug output. 2019-08-07 10:06:28 +02:00
Patrick Jentsch
ce051e8024 Remove dummy lists from Dashboard, show actual corpus and job list instead. 2019-08-07 09:40:18 +02:00
Patrick Jentsch
3c344bf023 Remove debug output. 2019-08-06 17:05:55 +02:00
Patrick Jentsch
f2eaa61f3c Add link to nlp service. 2019-08-06 17:04:53 +02:00
Patrick Jentsch
d860a5d279 Set backrefs correctly. 2019-08-06 17:04:38 +02:00
Patrick Jentsch
59016be061 Fix code for creation_date in corpus object. 2019-08-06 15:46:23 +02:00
Patrick Jentsch
b255f3bb4a rename createon.data to creaton.date 2019-08-06 15:41:07 +02:00