Commit Graph
130 Commits
Author SHA1 Message Date
marek 9c80db4943 Merge branch 'master' of https://git.elab.kth.se/davide/ELAB-partsearch 2018-11-11 20:42:26 +01:00
marek 0fdcd100ff maps with container overlays 2018-11-11 20:42:09 +01:00
marek c4ca575ca1 new maps 2018-11-11 20:41:31 +01:00
davide 3788060c78 Fetching containers instead of locations. Fixed query and relative script for get_part_info 2018-11-11 20:27:43 +01:00
marek d31799b3aa endpoint for listing locations in a given container 2018-11-11 20:05:55 +01:00
marek 5df74f1276 Merge branch 'master' of https://git.elab.kth.se/davide/ELAB-partsearch 2018-11-11 18:46:31 +01:00
marek 7c1fd24cb0 location containers part 1. Mostly broken. 2018-11-11 18:46:17 +01:00
davide 329b076dec Merge branch 'master' of git.elab.kth.se:davide/ELAB-partsearch 2018-11-11 18:26:13 +01:00
davide f072ffab4a Added new button, with style. 2018-11-11 18:26:01 +01:00
davide e25d09aa5d Removed unnecessary comments. Re-performing query on save. Hiding/showing duplicate button. Fixed text field text showing the correct thing. 2018-11-11 18:25:42 +01:00
davide a40748d0b2 Fixed deleting 2018-11-11 18:24:28 +01:00
Wilhelm Westermark 9da62db5b8 Merge branch 'master' of git.elab.kth.se:davide/ELAB-partsearch 2018-11-11 17:45:22 +01:00
Wilhelm Westermark 6158439525 More deploy stuff 2018-11-11 17:45:18 +01:00
davide 752b32cf7a Merge branch 'master' of git.elab.kth.se:davide/ELAB-partsearch 2018-11-11 17:31:31 +01:00
davide 1d5eefd87b Correctly displaying location name 2018-11-11 17:31:04 +01:00
Wilhelm Westermark e592f300bb Merge branch 'master' of git.elab.kth.se:davide/ELAB-partsearch 2018-11-11 17:25:01 +01:00
Wilhelm Westermark 706038bf09 More deploy stuff 2018-11-11 17:24:57 +01:00
davide 161c866804 Merge branch 'master' of git.elab.kth.se:davide/ELAB-partsearch 2018-11-11 17:15:39 +01:00
davide 20db75a8d7 Populating paragraphs on end edit. Can't add a bunch of stuff now. 2018-11-11 17:15:22 +01:00
davide a0a090b5c0 Server returns id of added/modified part. Removed authentication for now. 2018-11-11 17:14:40 +01:00
Wilhelm Westermark 839d2f87f5 Added secret token for webhook 2018-11-11 16:48:47 +01:00
Wilhelm Westermark 56d2f9996c Merge branch 'master' of git.elab.kth.se:davide/ELAB-partsearch 2018-11-11 16:40:51 +01:00
Wilhelm Westermark ca5d9e392d Added autodeploy stuff 2018-11-11 16:40:05 +01:00
davide c1874759e2 Fixed modify part not working 2018-11-11 16:18:44 +01:00
marek 2029ef5aeb made location listing part of the template, rather than an unnecesary AJAX request + secret sauce sorting 2018-11-11 01:19:32 +01:00
marek fd4f29ca7d temporary placeholder map for the VAULT. Hopefully just temporary and won't stay forever. 2018-11-11 00:53:19 +01:00
marek 00a2d6f070 location editor (MVP - can only add locations) 2018-11-11 00:52:30 +01:00
marek d131bcede6 removed a temporary test file and script relating to it 2018-11-11 00:52:03 +01:00
marek 3518c04c09 split script.js into a "common.js" that is useful for other pages and regular "script.js" for only the main page 2018-11-11 00:51:16 +01:00
marek 2d867f327c made the map styling reusable for the clickable map. I'm working under the wild assumption that we might not desperatly need a class called exactly "map" in a place different than specifically in an element named "overlay" 2018-11-10 23:31:16 +01:00
marek 513cc34bdd removed alpha channel from map before sending, to further reduce bandwidth abuse 2018-11-10 21:59:01 +01:00
marek 1234bdfa14 made the map not strech and display inline with the data-table 2018-11-10 21:58:18 +01:00
marek 2813481da4 updated map with chairs, so we can sit comfortably. Also reduced size 2018-11-10 21:57:40 +01:00
marek f8301552c4 made all parts relative with a global rootURL variable, for easy server deployment 2018-11-10 17:57:53 +01:00
marek efc5af0b61 added a shitty readme.md 2018-11-10 17:42:04 +01:00
davide 0459cbdff0 Merge branch 'master' of git.elab.kth.se:davide/ELAB-partsearch 2018-11-10 15:35:07 +01:00
davide cf97254ff0 Modified save command. Added onchange for dropdown list 2018-11-10 15:35:00 +01:00
davide bd3715888a Added uonchange event to dropdown list 2018-11-10 15:33:15 +01:00
davide bf37ea8c5c Modified query to match new database 2018-11-10 15:32:09 +01:00
marek 4d6ef6a07b locations are returned alphabetically 2018-11-10 01:05:31 +01:00
davide d2e6e2de7c Merge branch 'master' of git.elab.kth.se:davide/ELAB-partsearch 2018-11-10 00:40:04 +01:00
davide c1f36483ba Whatevs 2018-11-10 00:40:00 +01:00
marek b8b014f314 Merge branch 'master' of https://git.elab.kth.se/davide/ELAB-partsearch 2018-11-10 00:39:15 +01:00
marek 2b481df94c endpoint for getting a map for a given location ID /parts/getlocationURL/<id> 2018-11-10 00:39:00 +01:00
davide cafe2f0914 Fixed locations query 2018-11-10 00:26:03 +01:00
davide 3fb61c0cbd Merge branch 'master' of git.elab.kth.se:davide/ELAB-partsearch 2018-11-10 00:21:52 +01:00
davide 3f709d6628 Populating dropdown from API 2018-11-10 00:21:48 +01:00
davide 1cefbfb744 Added input elements 2018-11-10 00:16:02 +01:00
marek dadab62e9e endpoint for listing locations 2018-11-10 00:15:00 +01:00
marek 7d5d5bb3b4 Merge branch 'master' of https://git.elab.kth.se/davide/ELAB-partsearch 2018-11-09 23:29:08 +01:00