Commit Graph

458 Commits

Author SHA1 Message Date
Inga Kirschnick
d537a38712 Querybuilder 1.0 2022-09-07 09:06:21 +02:00
Patrick Jentsch
8e1d94bb5d Restructure project 2022-09-02 13:07:30 +02:00
Patrick Jentsch
131afd6419 New logic for forms including file upload. 2022-09-02 12:56:59 +02:00
Inga Kirschnick
9781425602 Query Builder New Design 2022-08-03 16:21:11 +02:00
Inga Kirschnick
4497567de0 Final prototype 2022-08-01 10:00:12 +02:00
Inga Kirschnick
5cbc6ea822 Prototype Query Builder for demo only 2022-07-13 14:06:22 +02:00
Patrick Jentsch
4e5957eea2 Change the Subscription Logic for Socket.IO Data exchange 2022-07-08 11:46:47 +02:00
Patrick Jentsch
76924956de Change the user session SocketIO Logic 2022-07-04 14:09:17 +02:00
Patrick Jentsch
b8bf004684 Restructure code and use APScheduler for daemon functionality 2022-06-28 12:30:02 +02:00
Patrick Jentsch
b4082a2547 Update services.yml 2022-04-29 13:04:03 +02:00
Patrick Jentsch
f425ca6fa1 Fix missing color for icons in corpus lists 2022-02-17 11:53:54 +01:00
Patrick Jentsch
15e897f005 Delete unused files, restructure assets and use scss 2022-02-15 09:25:34 +01:00
Patrick Jentsch
df6ab3991c Use enums where appropriate. This commit includes new migrations that are NOT compatible with older nopaque instances 2022-02-08 12:26:20 +01:00
Patrick Jentsch
fe938c0ca2 Big update, corpus analysis reworked, versioned services, preliminary work for contributions 2022-02-03 12:39:16 +01:00
Patrick Jentsch
0647537192 Fix automatic id generation for RessourceLists 2022-01-14 14:14:04 +01:00
Patrick Jentsch
40bd169101 Some cleanup (css, html, js) 2021-12-09 12:50:14 +01:00
Patrick Jentsch
067273df6d Minor Codestyle updates. 2021-12-08 15:36:10 +01:00
Patrick Jentsch
982d5bc46f Fix broken download link in job result lists 2021-12-08 14:45:15 +01:00
Patrick Jentsch
832a0283bd Some styling for ressource lists 2021-12-08 11:25:52 +01:00
Patrick Jentsch
9d30dda733 Codestyle 2021-12-06 14:42:49 +01:00
Patrick Jentsch
b3f34648c4 Bug fixes 2021-12-03 16:10:54 +01:00
Patrick Jentsch
89f518fe38 Sort lists by ressources creation date. CSS and HTML cleanup 2021-12-03 12:01:50 +01:00
Patrick Jentsch
03a57fd7ee Create a proper class for the upload form 2021-12-02 16:25:48 +01:00
Patrick Jentsch
d8f11a9759 update nopaque forms 2021-12-02 13:48:48 +01:00
Patrick Jentsch
962e58f2d3 Enable auto initialization for ressource lists 2021-12-02 11:16:06 +01:00
Patrick Jentsch
f977c808ec Even better solution for concurrent promise handling 2021-12-01 17:52:09 +01:00
Patrick Jentsch
ff514368c3 Try to avoid requesting user data multiple times 2021-12-01 17:07:05 +01:00
Patrick Jentsch
82745629bc Bug fixes 2021-12-01 16:03:55 +01:00
Patrick Jentsch
12ec6be60b JS codestyle enhancements 2021-12-01 14:15:20 +01:00
Patrick Jentsch
72ba61f369 Only reveal hashids to the ui 2021-11-30 16:22:16 +01:00
Patrick Jentsch
f6c2292e03 Big Corpus analysis update 2021-11-16 15:23:57 +01:00
Patrick Jentsch
727553412f add flag to socketio, hope it will improve firefox compatibility 2021-09-15 15:26:43 +02:00
Patrick Jentsch
10483c1e45 Fix Date display issue in UserList 2021-09-13 16:35:09 +02:00
Patrick Jentsch
281e568edf Use ISO 8601 as the default datetime format 2021-09-08 12:56:51 +02:00
Patrick Jentsch
5cd18c4c2a Sort after list ressource list insertions 2021-08-23 16:34:25 +02:00
Patrick Jentsch
d6ab379418 Change directory structure (move ./nopaque/* to ./) 2021-07-20 15:07:42 +02:00
Patrick Jentsch
cb2b64fa9d integrate nopaque repo 2020-06-05 14:42:04 +02:00
Patrick Jentsch
ba916b70bd Change location where socket is initialized...again 2020-05-27 13:32:07 +02:00
Patrick Jentsch
ecac2c481c Only initialize socket when the user is logged in 2020-05-27 11:11:54 +02:00
Patrick Jentsch
af527c1cf3 Bump socketio-client version. (2.2.0 -> 2.3.0) 2020-05-26 14:26:11 +02:00
Patrick Jentsch
d4e81b11e0 Fix foreign user data transmission for admins 2020-05-20 10:32:39 +02:00
Stephan Porada
c49684611a Add more metadata 2020-05-04 11:05:17 +02:00
Stephan Porada
58295b986d Rename some things. Add metadata to downloadable json 2020-04-30 15:21:55 +02:00
Stephan Porada
1350e6ddd6 Add metadata object on analysis 2020-04-30 14:45:54 +02:00
Patrick Jentsch
f87fe589c1 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-04-30 11:29:01 +02:00
Patrick Jentsch
e1b07d8719 Handle user data streams different 1/2
In the future this will be much more performant!
2020-04-30 11:28:55 +02:00
Stephan Porada
d54a3d3f33 First metadata addition 2020-04-29 16:15:11 +02:00
Stephan Porada
eb5e5c3253 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-04-27 16:16:59 +02:00
Stephan Porada
deda16f0f5 Add meta data recv after corpus analysis init 2020-04-27 16:16:57 +02:00
Patrick Jentsch
c67c033aec Rework notification system 2020-04-27 15:22:20 +02:00
Patrick Jentsch
45a3c664a2 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-04-27 13:51:07 +02:00
Patrick Jentsch
565274fce1 A lot of database changes and add options to change notification level 2020-04-27 13:50:54 +02:00
Stephan Porada
5dfaf51793 Add download for context data. 2020-04-27 13:25:29 +02:00
Patrick Jentsch
7fc1084749 Add notifications on status changes of jobs and corpora 2020-04-24 15:22:04 +02:00
Stephan Porada
9e693fc440 Remove &nsbp; 2020-04-23 13:28:13 +02:00
Stephan Porada
1c27c0a36c uncomment log messages 2020-04-23 12:10:36 +02:00
Stephan Porada
d9353e3d7d Clean up 2020-04-23 12:07:08 +02:00
Stephan Porada
a1439f37d7 Set callbac kfor match_context 2020-04-23 10:37:44 +02:00
Stephan Porada
beba4c1558 Fix expert mode automatic activation 2020-04-21 10:45:40 +02:00
Stephan Porada
b4c98a9713 Last fix 2020-04-20 13:59:28 +02:00
Stephan Porada
986336618b Add fix 2020-04-20 13:55:11 +02:00
Stephan Porada
6126477825 Finalize inspect view display options 2020-04-20 13:48:40 +02:00
Stephan Porada
2eb3d2f03e Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-04-20 09:59:34 +02:00
Patrick Jentsch
1f0a87a474 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-04-17 11:07:47 +02:00
Patrick Jentsch
3aafe664a3 Add macros and use them 2020-04-17 11:04:09 +02:00
Stephan Porada
9145265e4b Add expert mode and higlight sentences switch to inspect. WIP 2020-04-16 15:06:03 +02:00
Stephan Porada
fe26c56344 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-04-16 13:49:24 +02:00
Stephan Porada
1567e6e134 Filx text break 2020-04-16 13:49:21 +02:00
Patrick Jentsch
72e585395b status update handling for corpus list 2020-04-16 13:28:09 +02:00
Patrick Jentsch
8cec7b2d3a Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-04-16 09:40:45 +02:00
Patrick Jentsch
fede774196 Change nopaque upload forms. Add corpus file form has an upload progress bar now. 2020-04-16 09:40:38 +02:00
Stephan Porada
bcd431da22 fix 2020-04-15 15:22:48 +02:00
Stephan Porada
4992ac73a8 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-04-15 15:11:31 +02:00
Stephan Porada
8b27ddf5d2 fix 2020-04-15 15:11:25 +02:00
Patrick Jentsch
20d4d1c0b3 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-04-15 14:57:19 +02:00
Patrick Jentsch
f264b27ae5 Change validation process (currently broken) 2020-04-15 14:57:17 +02:00
Stephan Porada
68eb1d1972 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-04-15 14:55:36 +02:00
Stephan Porada
9031ca5845 New context options 2020-04-15 14:55:29 +02:00
Patrick Jentsch
338e760bfb Hide analyze button if corpus is not ready for this 2020-04-15 10:32:21 +02:00
Stephan Porada
9578a12f42 Fix match_count in resultsJSON 2020-04-14 12:46:33 +02:00
Stephan Porada
514baf0f5e New expert mode 2020-04-14 11:31:57 +02:00
Patrick Jentsch
9a1efbe5f3 corpus logic 2020-04-09 15:14:39 +02:00
Stephan Porada
f19f67614d Remove cascade plus new tooltip creation and destruction (a bit buggy) 2020-04-09 14:49:17 +02:00
Stephan Porada
ca333e29ee Some fixes and clean up 2020-04-09 10:17:04 +02:00
Stephan Porada
f69a401db6 Clean up and stuff 2020-04-08 11:37:34 +02:00
Stephan Porada
b0104fe606 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-04-08 09:46:38 +02:00
Stephan Porada
0146a92f6d reverse array 2020-04-08 09:46:37 +02:00
Patrick Jentsch
83a607728d cqi package update and changes to match the new functions 2020-04-07 16:25:44 +02:00
Stephan Porada
90ef828e61 Make analyse OOP style 2020-04-07 13:13:48 +02:00
Stephan Porada
6260f2436a Remove some useless loading animations 2020-04-07 09:53:17 +02:00
Stephan Porada
69b17f350e Remove all pjs! 2020-04-06 15:28:58 +02:00
Stephan Porada
961027a8f7 Add global prgress for inspect activation 2020-04-06 15:27:25 +02:00
Stephan Porada
2aca966d13 Fix wrong expert mode check 2020-04-06 14:35:57 +02:00
Stephan Porada
99e82a1cc3 Rename pj_analyse_corpus.js to analyse_corpus.js 2020-04-06 14:33:58 +02:00
Stephan Porada
52efa0e821 Remove old analyse_corpus.js 2020-04-06 14:33:26 +02:00
Stephan Porada
e7bed7dee1 Add comment 2020-04-06 14:09:12 +02:00
Stephan Porada
1ed696f558 Fix 2 2020-04-06 12:52:26 +02:00
Stephan Porada
41f24a03b4 Fix 2020-04-06 12:41:23 +02:00
Stephan Porada
12586bb13d First feature complete rebuilt of analysis interface 2020-04-06 12:32:29 +02:00
Patrick Jentsch
498defa386 Fix 2020-04-02 14:45:02 +02:00
Stephan Porada
2c93f02c11 Update 2020-04-02 14:22:03 +02:00
Stephan Porada
89891da663 handle result ranges 2020-04-02 11:37:45 +02:00
Stephan Porada
fb1403e9cb Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-04-01 15:58:26 +02:00
Patrick Jentsch
bfd7591f4d add comment 2020-04-01 14:27:01 +02:00
Stephan Porada
8c83bb87a5 Fix to 3.1 2020-04-01 13:49:28 +02:00
Stephan Porada
46b82f5737 Corpus analysis version 3.0 lul 2020-04-01 13:44:06 +02:00
Stephan Porada
90cf1bf8a0 Fix 2020-03-31 10:27:26 +02:00
Stephan Porada
0d40f04bdd Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-03-31 10:19:44 +02:00
Stephan Porada
c33889f617 Enhance pj_analyse 2020-03-31 10:17:04 +02:00
Patrick Jentsch
9ced65f34c Force socketio to use websockets 2020-03-30 17:27:24 +02:00
Patrick Jentsch
4ff372de77 small updates 2020-03-29 20:33:00 +02:00
Patrick Jentsch
d07b73781f Update 2020-03-29 19:40:29 +02:00
Patrick Jentsch
2db9677659 Make it work again 2020-03-28 20:45:33 +01:00
Patrick Jentsch
e3fde2d5c9 compatibility fixes and add reimplementations 2020-03-28 19:29:19 +01:00
Patrick Jentsch
3bbe45d015 remove legacy code 2020-03-27 10:32:33 +01:00
Patrick Jentsch
3ea1f4bd9f Rename nopaque.toast to nopaque.flash which offers styling by categories 2020-03-27 10:32:14 +01:00
Patrick Jentsch
ca8d438e79 Change how flashed messages are processed 2020-03-27 10:11:19 +01:00
Patrick Jentsch
4af7d8d4ba Update darkreader 2020-03-27 10:10:49 +01:00
Patrick Jentsch
8bedbfeae5 Use slim socketio again (this time with .map file) change socket behavior 2020-03-26 17:32:26 +01:00
Stephan Porada
08e7df4ad3 Add function to resend queries during running query 2020-03-26 15:28:11 +01:00
Stephan Porada
16b1733ec5 remove logger 2020-03-23 12:16:41 +01:00
Stephan Porada
ac14bedc62 Add neww result recieving 2020-03-23 12:14:32 +01:00
Patrick Jentsch
e13ed86d29 new style 2020-03-23 10:28:07 +01:00
Patrick Jentsch
acfcc0321b Add package implementation of cqi 2020-03-23 09:10:35 +01:00
Stephan Porada
7c9b9f0712 Code clean up 2020-03-19 13:59:31 +01:00
Stephan Porada
8a6eb04dbe Easy fix 2020-03-19 12:04:14 +01:00
Stephan Porada
7de4b391df Fix inspect activation on queryFinished 2020-03-19 11:04:36 +01:00
Stephan Porada
ebe598312f Add info tool tip 2020-03-19 10:25:09 +01:00
Stephan Porada
8147dc404a Inspect now only works when queryFinished is true 2020-03-19 09:25:23 +01:00
Stephan Porada
3111cc5175 Clean up corpus analysis and add new features 2020-03-18 15:52:53 +01:00
Stephan Porada
c5e56692b1 First analys_corpus clean up 2020-03-17 14:00:41 +01:00
Patrick Jentsch
fb0ca7e759 Fix job form error message generation 2020-03-02 14:57:12 +01:00
stephan
f8aa18e2a7 Add expert view to inspect view. 2020-02-25 11:00:30 +01:00
Patrick Jentsch
1817b6326d more feedback 2020-02-18 14:53:35 +01:00
Patrick Jentsch
4f803d0aa6 Readd some stuff 2020-02-18 14:44:31 +01:00
Patrick Jentsch
292c24b38f Simplify nopaque.js 2020-02-18 14:39:05 +01:00
Patrick Jentsch
54baa8633a Add Feedback for select field in job forms 2020-02-18 12:01:36 +01:00
Patrick Jentsch
8166ca840b Update landing page 2020-02-17 12:01:36 +01:00
Patrick Jentsch
611bb6ef62 Change RessourceList 2020-02-12 12:19:54 +01:00
Patrick Jentsch
e04f3d0ac3 Some fixes 2020-02-07 16:00:48 +01:00
Patrick Jentsch
acf5ae32ae Add roadmap and use just one template 2020-02-07 15:21:59 +01:00
Stephan Porada
004e85aad0 Add expert view in a hacky way 2020-02-05 16:09:59 +01:00
Patrick Jentsch
692b887d99 Add some documentation and code style 2020-02-04 10:10:22 +01:00
Patrick Jentsch
1d47e38780 Update 2020-02-03 16:04:47 +01:00
Stephan Porada
ccb97d5773 Add match nr 2020-02-03 13:59:37 +01:00
Stephan Porada
da766b32ca mv socket on event on match_context to nopaque.js 2020-02-03 13:01:26 +01:00
Stephan Porada
21371efde6 Continue new list building for results 2020-02-03 12:58:40 +01:00
Patrick Jentsch
279cdb70a8 Remove a lot of code redundancy 2020-01-31 14:14:08 +01:00
Patrick Jentsch
87cf04a87f Try to make the JavaScript a bit less pythonic. :D 2020-01-31 13:41:46 +01:00
Patrick Jentsch
56315c4e33 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-01-31 13:11:35 +01:00
Patrick Jentsch
20200dac30 Simplify corpus and job list data structure. 2020-01-31 13:11:30 +01:00
Stephan Porada
d03e04bcb9 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-01-30 14:23:21 +01:00
Stephan Porada
d36598bdda Update new analysis list construction 2020-01-30 14:23:19 +01:00
Patrick Jentsch
3dad22d41a Move JobList static attributes 2020-01-29 16:34:50 +01:00
Stephan Porada
da4cc75943 Work on new list bilding 2020-01-29 16:12:57 +01:00
Patrick Jentsch
bd8d0c14c3 Merge list classes 2020-01-29 10:50:31 +01:00
Patrick Jentsch
c9f5488a24 use empty template for JobList and CorpusList. performance++ 2020-01-28 16:42:15 +01:00
Patrick Jentsch
f1ab50b283 Change event names 2020-01-28 10:08:09 +01:00
Patrick Jentsch
6a4ad05c35 Integrate job list javascript in nopaque.js 2020-01-24 10:27:11 +01:00
Stephan Porada
4dce792b51 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-01-23 16:00:52 +01:00
Stephan Porada
87d6380e22 Rework corpus analysis list building part 1 2020-01-23 16:00:48 +01:00
Patrick Jentsch
77f1bf6cc8 not working test 2020-01-23 11:19:37 +01:00
Patrick Jentsch
3e85daf8ab Create and use a nopaque namespace for functions and ressources 2020-01-20 09:49:39 +01:00
Stephan Porada
e5928731ec Enhance toast to grilled cheese toast! 2020-01-17 15:10:01 +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
688591ebe8 Add sort function to corpus and job lists 2020-01-16 15:04:12 +01:00
Patrick Jentsch
32f2d7dbf7 New corpus and job lists. 2020-01-15 10:52:51 +01:00
Patrick Jentsch
310c652514 Package cleanup and add LICENSE files! 2020-01-13 15:33:05 +01:00
Patrick Jentsch
8416bda04b Add Icon and color for "merge_images" service. 2020-01-08 10:18:15 +01:00
Patrick Jentsch
eeed9268bb Remove gzip compression 2019-11-25 10:29:05 +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
Patrick Jentsch
fb5d9cbf7d Add errors to form, if they occur 2019-11-19 09:54:31 +01:00
Patrick Jentsch
6d807d897d Update add job js 2019-11-18 15:41:32 +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
4b0ef837ad Some renaming and moving 2019-11-08 12:21:59 +01:00
Patrick Jentsch
d420b80ac5 Fix wrong joblist additions. 2019-11-07 11:06:16 +01:00
Stephan Porada
08aafb8f99 Add corpus analysis stuff 2019-11-06 15:40:43 +01:00
Stephan Porada
d04f90dee8 Add live colors to corpu sstatus 2019-11-05 15:22:25 +01:00
Stephan Porada
bf4b9808c3 Fix undefined JobList error 2019-10-23 11:23:06 +02:00
Stephan Porada
88042dfd8e Add dark mode 2019-10-09 16:10:30 +02:00
Patrick Jentsch
f9649af08d Make CorpusList class ready for admin view. 2019-09-18 11:35:25 +02:00
Patrick Jentsch
b90d6114b0 Make JobList class ready for admin view. 2019-09-18 11:32:35 +02:00
Patrick Jentsch
d7e71638a2 Update progress modal 2019-09-17 16:15:37 +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
9005c583ca Add progress bar for file upload. 2019-09-16 12:12:42 +02:00
Patrick Jentsch
633bd58087 Codestyle. 2019-09-03 09:07:09 +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
565d273dd4 Add comment and remove debug code. 2019-09-02 09:17:13 +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
98de581132 Cleanup special list classes. 2019-08-28 17:31:09 +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
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
a86ae5c75c Use minimal list.js file. 2019-08-20 16:12:03 +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
025c51646c Add javascript code for polling with update subscibers. 2019-08-16 14:54:29 +02:00
Patrick Jentsch
12d9ac8727 Add list.js to base template. 2019-08-08 14:28:16 +02:00
Patrick Jentsch
bc5ec9695f Add materializecss. 2019-07-04 10:40:23 +02:00