 Davide Bongiovanni
|
c886f2e860
|
Merge branch 'master' of git.elab.kth.se:davide/ELAB-partsearch
# Conflicts:
# parts/static/script.js
|
7 years ago |
|
Davide Bongiovanni
|
501491ac9a
|
Added file size check
|
7 years ago |
|
Davide Bongiovanni
|
257a8d9754
|
Turned "search in notes" into "has docs". Added cool icons. Fixed animation of No results.
|
7 years ago |
|
Davide Bongiovanni
|
005ea98f59
|
Empty results table if no results
|
7 years ago |
|
Davide Bongiovanni
|
e9b670bea8
|
Fixed syntax error. Minor refactoring.
|
7 years ago |
 Marek Baczynski
|
846b7297ce
|
location editor lists the new style of locations. Actual adding/editing locations coming soon.
|
7 years ago |
|
Marek Baczynski
|
777942aeaa
|
removed placeholder vault.png, resized "HERE" pointer
|
7 years ago |
|
Marek Baczynski
|
2ce132868c
|
fixed saving the location_id instead of container_id when adding or editing a part
|
7 years ago |
|
Marek Baczynski
|
694310a733
|
TEMPORARY disabled datasheet posting, because otherwise could not test other related functionality
|
7 years ago |
|
Marek Baczynski
|
42fb09f89b
|
ALL the maps and overlays! Please don't move any furniture in lab nao.
|
7 years ago |
|
Davide Bongiovanni
|
4c78533976
|
Added part number empty check
|
7 years ago |
|
Davide Bongiovanni
|
240293cf01
|
Various small changes
|
7 years ago |
|
Davide Bongiovanni
|
95fe77ce16
|
Gave class to dropdown
|
7 years ago |
|
Davide Bongiovanni
|
90079c70cd
|
Removed map upper margin
|
7 years ago |
|
Davide Bongiovanni
|
6670487ac0
|
Fixed minor issues
|
7 years ago |
|
Davide Bongiovanni
|
2efb06ef3c
|
Merge branch 'master' of git.elab.kth.se:davide/ELAB-partsearch
|
7 years ago |
|
Davide Bongiovanni
|
863ce49e98
|
Added container dropdown. Modified container-dropdown onchange event.
|
7 years ago |
|
Marek Baczynski
|
9c80db4943
|
Merge branch 'master' of https://git.elab.kth.se/davide/ELAB-partsearch
|
7 years ago |
|
Marek Baczynski
|
0fdcd100ff
|
maps with container overlays
|
7 years ago |
|
Marek Baczynski
|
c4ca575ca1
|
new maps
|
7 years ago |
|
Davide Bongiovanni
|
3788060c78
|
Fetching containers instead of locations. Fixed query and relative script for get_part_info
|
7 years ago |
|
Marek Baczynski
|
d31799b3aa
|
endpoint for listing locations in a given container
|
7 years ago |
|
Marek Baczynski
|
5df74f1276
|
Merge branch 'master' of https://git.elab.kth.se/davide/ELAB-partsearch
|
7 years ago |
|
Marek Baczynski
|
7c1fd24cb0
|
location containers part 1. Mostly broken.
|
7 years ago |
|
Davide Bongiovanni
|
f072ffab4a
|
Added new button, with style.
|
7 years ago |
|
Davide Bongiovanni
|
e25d09aa5d
|
Removed unnecessary comments. Re-performing query on save. Hiding/showing duplicate button. Fixed text field text showing the correct thing.
|
7 years ago |
|
Davide Bongiovanni
|
a40748d0b2
|
Fixed deleting
|
7 years ago |
|
Davide Bongiovanni
|
1d5eefd87b
|
Correctly displaying location name
|
7 years ago |
|
Davide Bongiovanni
|
20db75a8d7
|
Populating paragraphs on end edit. Can't add a bunch of stuff now.
|
7 years ago |
|
Davide Bongiovanni
|
a0a090b5c0
|
Server returns id of added/modified part. Removed authentication for now.
|
7 years ago |
|
Davide Bongiovanni
|
c1874759e2
|
Fixed modify part not working
|
7 years ago |
|
Marek Baczynski
|
2029ef5aeb
|
made location listing part of the template, rather than an unnecesary AJAX request + secret sauce sorting
|
7 years ago |
|
Marek Baczynski
|
fd4f29ca7d
|
temporary placeholder map for the VAULT. Hopefully just temporary and won't stay forever.
|
7 years ago |
|
Marek Baczynski
|
00a2d6f070
|
location editor (MVP - can only add locations)
|
7 years ago |
|
Marek Baczynski
|
d131bcede6
|
removed a temporary test file and script relating to it
|
7 years ago |
|
Marek Baczynski
|
3518c04c09
|
split script.js into a "common.js" that is useful for other pages and regular "script.js" for only the main page
|
7 years ago |
|
Marek Baczynski
|
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"
|
7 years ago |
|
Marek Baczynski
|
513cc34bdd
|
removed alpha channel from map before sending, to further reduce bandwidth abuse
|
7 years ago |
|
Marek Baczynski
|
1234bdfa14
|
made the map not strech and display inline with the data-table
|
7 years ago |
|
Marek Baczynski
|
2813481da4
|
updated map with chairs, so we can sit comfortably. Also reduced size
|
7 years ago |
|
Marek Baczynski
|
f8301552c4
|
made all parts relative with a global rootURL variable, for easy server deployment
|
7 years ago |
|
Davide Bongiovanni
|
0459cbdff0
|
Merge branch 'master' of git.elab.kth.se:davide/ELAB-partsearch
|
7 years ago |
|
Davide Bongiovanni
|
cf97254ff0
|
Modified save command. Added onchange for dropdown list
|
7 years ago |
|
Davide Bongiovanni
|
bd3715888a
|
Added uonchange event to dropdown list
|
7 years ago |
|
Davide Bongiovanni
|
bf37ea8c5c
|
Modified query to match new database
|
7 years ago |
|
Marek Baczynski
|
4d6ef6a07b
|
locations are returned alphabetically
|
7 years ago |
|
Davide Bongiovanni
|
d2e6e2de7c
|
Merge branch 'master' of git.elab.kth.se:davide/ELAB-partsearch
|
7 years ago |
|
Davide Bongiovanni
|
c1f36483ba
|
Whatevs
|
7 years ago |
|
Marek Baczynski
|
b8b014f314
|
Merge branch 'master' of https://git.elab.kth.se/davide/ELAB-partsearch
|
7 years ago |
|
Marek Baczynski
|
2b481df94c
|
endpoint for getting a map for a given location ID /parts/getlocationURL/<id>
|
7 years ago |
