Skip to content

WIP: IMCA Shipments #136

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
stufisher wants to merge 40 commits into from
Closed

WIP: IMCA Shipments #136

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
562393d
allow container assigment by staff from prop + beamline as well as visit
stufisher Aug 22, 2020
7489a29
allow filtering containers by shipment, and by registry
stufisher Aug 22, 2020
b644444
add diffractionplan columns to sample, get samples by shipment
stufisher Aug 22, 2020
b4f721b
add new diffraction plan columns and container view toggle
stufisher Aug 22, 2020
981736f
add csv importer
stufisher Aug 22, 2020
900f297
add barcode scan container assign page
stufisher Aug 22, 2020
55fad21
add new config.json option
stufisher Aug 23, 2020
fb625f0
count distinct rather than groupby
stufisher Aug 23, 2020
1419e69
dont fetch if val empty, debounce right function
stufisher Aug 29, 2020
c333c73
update breadcrumbs
stufisher Aug 31, 2020
b4bf602
punctuation
stufisher Aug 31, 2020
10507dc
use concat_ws incase some values are null
stufisher Sep 1, 2020
c6ec642
Merge branch 'master' into feature/imca_shipments
stufisher Sep 6, 2020
fcccc64
add collectionmode and priority
stufisher Sep 14, 2020
d154388
add other csv mime types
stufisher Sep 16, 2020
1c6f369
mime type is not sent on windows :|
stufisher Sep 17, 2020
e64e24a
increase page size for sample
stufisher Sep 22, 2020
432d7aa
validate barcode on scan assign page
stufisher Dec 23, 2020
e18a002
Merge branch 'master' into feature/imca_shipments
stufisher Apr 5, 2021
a8b99ee
wip: mailin enhancements
stufisher Apr 10, 2021
b61b1d9
Merge branch 'master' into feature/imca_shipments
stufisher Apr 20, 2021
f98928b
make possible to disable diff plan columns for containers
stufisher Apr 26, 2021
3feb552
rename csv button
stufisher Apr 26, 2021
b6cb466
add mark shipment returned button and api, add mark queue completed a…
stufisher Apr 30, 2021
813ce91
document disabling exp_plan fields
stufisher Apr 30, 2021
886aa2b
add initial queued containers view
stufisher Apr 30, 2021
092c3d7
update container review page, link from container
stufisher Apr 30, 2021
04b1f4f
separate spacegroups
stufisher Apr 30, 2021
c8a4f8e
add additional filters to queue view
stufisher May 22, 2021
b244d6d
add queue button to admin menu
stufisher May 22, 2021
19e51ba
allow customising auto collect label
stufisher May 22, 2021
6d4c5a1
remove debug
stufisher May 22, 2021
0bde4e5
add link back to container
stufisher May 22, 2021
dd5496d
allow staff to queue entire shipment
stufisher May 22, 2021
045682c
remove debug
stufisher May 22, 2021
707f0d5
stop shipment return if there are still outstanding queued containers
stufisher May 24, 2021
96c1c09
allow anyone to use queue shipment button if enabled
stufisher May 29, 2021
6d8818d
add samples to containerqueue for pucks and allow editing their statu…
stufisher May 29, 2021
cc1e13d
correct where option comes from...
stufisher May 31, 2021
8886b9f
increase number of containers when queuing a shipment
stufisher Jun 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ This file should be copied to create a client/src/js/config.json file and edited
| csv_profile | The csv profile for importing shipments, currently only imca, see src/js/csv/imca.js |
| enable_exp_plan | Whether to enable editing of experimental plan fields when creating samples |
| auto_collect_label | Customise the auto collect label from the default 'Automated' |
| queue_shipment | Allow entire shipment to be queued for automated / mail-in collection |

### Build front end
See package.json for the full list of commands that can be run.
Expand Down
4 changes: 3 additions & 1 deletion client/src/js/modules/shipment/views/shipment.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,9 @@ define(['marionette',
APIURL: app.apiurl,
PROP: app.prop,
DHL_ENABLE: app.options.get('dhl_enable'),
IS_STAFF: app.staff
IS_STAFF: app.staff,
QUEUE_SHIPMENT: app.options.get('queue_shipment'),
Comment thread
stufisher marked this conversation as resolved.
Outdated
AUTO_LABEL: app.config.auto_collect_label || 'Automated'
}
},

Expand Down
4 changes: 2 additions & 2 deletions client/src/js/templates/shipment/shipment.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ <h1>Shipment: <span class="SHIPPINGNAME"><%-SHIPPINGNAME%></span></h1>

<% if (LCOUT && LCRET) { %>
<div class="ra">
<% if (IS_STAFF) { %>
<a class="button queue" href="#"><i class="fa fa-plus"></i> Queue</a>
<% if (QUEUE_SHIPMENT) { %>
<a class="button queue" href="#"><i class="fa fa-plus"></i> Queue for <%-AUTO_LABEL%></a>
<% } %>

<% if (SHIPPINGSTATUS == 'opened' || SHIPPINGSTATUS == 'awb created' || SHIPPINGSTATUS == 'pickup booked') { %>
Expand Down