Skip to content
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

Jump to bottom

Integrate/imca shipments #239

Open
wants to merge 56 commits into
base: master
Choose a base branch
from
Open

Integrate/imca shipments #239

wants to merge 56 commits into from

Conversation

drnasmith
Copy link
Contributor

This merges the imca shipments branch with vue changes.
It will need to coexist with the mx-add-container page that Victor is working on.
Potentially there should be a switch in the ContainerAddWrapper component that can select which page is loaded...

stufisher added 30 commits August 16, 2021 15:49
@stufisher
allow container assigment by staff from prop + beamline as well as visit
2080109
@stufisher
allow filtering containers by shipment, and by registry
970b402
@stufisher
add diffractionplan columns to sample, get samples by shipment
f58e11e
@stufisher
add new diffraction plan columns and container view toggle
f9f8b40
@stufisher
add csv importer
80e18cb
@stufisher
add barcode scan container assign page
80708bd
@stufisher
add new config.json option
3d64911
@stufisher
count distinct rather than groupby
f123ba1
@stufisher
dont fetch if val empty, debounce right function
9a44717
@stufisher
update breadcrumbs
387f20d
@stufisher
punctuation
4c6c614
@stufisher
use concat_ws incase some values are null
c0acf24
@stufisher
add collectionmode and priority
3bfa5a4
@stufisher
add other csv mime types
f4d07e5
@stufisher
mime type is not sent on windows :|
2f4e62b
@stufisher
increase page size for sample
c534cf4
@stufisher
validate barcode on scan assign page
9cc0d66
@stufisher
wip: mailin enhancements
6936828
@stufisher
make possible to disable diff plan columns for containers
aca1db8
@stufisher
rename csv button
35f1d48
@stufisher
add mark shipment returned button and api, add mark queue completed a…
5554832 
…pi, add prop code filter to containers
@stufisher
document disabling exp_plan fields
7544d8a
@stufisher
add initial queued containers view
2a14dcd
@stufisher
update container review page, link from container
548c8f8
@stufisher
separate spacegroups
94c266f
@stufisher
add additional filters to queue view
86fb5c6
@stufisher
add queue button to admin menu
3fe0a46
@stufisher
allow customising auto collect label
0263e95
@stufisher
remove debug
6fd7c79
@stufisher
add link back to container
b5b5ba7
stufisher and others added 13 commits August 16, 2021 17:08
@stufisher
allow anyone to use queue shipment button if enabled
2796146
@stufisher
add samples to containerqueue for pucks and allow editing their statu…
27112d6 
…s manually
@stufisher
correct where option comes from...
2fdd64b
@stufisher
increase number of containers when queuing a shipment
edf5155
Enable UAS API to set delivered time on close
168330a
Add hooks for determining delivered time on session close api call
38d4361
Add missing import in shipment routes file
f1d61b9
Update comments to describe custom site logo
5d868a1
Added missing route for import csv
3c09b29
Make clear csv_profile in config.json does not need file extension
252811f
Prevent sample patch failing because no container id
bf67b48
Revert "Enable UAS API to set delivered time on close"
35dfcb9 
This reverts commit 168330a.
Revert "Add hooks for determining delivered time on session close api…
d6be16e 
… call"

This reverts commit 38d4361.
@drnasmith drnasmith requested review from stufisher and vonvick August 17, 2021 16:05
@drnasmith
Copy link
Contributor Author

Also excuse the reverts - the uas changes were supposed to be on a separate branch...

@morybc
Copy link
Contributor

morybc commented Sep 8, 2022

Hi Neil,

What's the status of this change? I guess you're not going to fully remember the details, but if you can add any commentary to indicate what remains to be done here, it'd be appreciated - so we can properly decide what to do with this work. Thanks.

@vonvick or @JPHall-DLS - can you add anything?

@stufisher
Copy link
Contributor

This ones mine, and in use at IMCA-CAT. It can be left alone, not ready to be merged into master any time soon (please dont delete it!)

This was referenced Jan 16, 2024
Closed
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@stufisher stufisher Awaiting requested review from stufisher

@vonvick vonvick Awaiting requested review from vonvick

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@drnasmith @morybc @stufisher