Code

Integrate/imca shipments#239

Code

Open

drnasmith wants to merge 56 commits intomasterDiamondLightSource/SynchWeb:masterfrom integrate/imca-shipmentsDiamondLightSource/SynchWeb:integrate/imca-shipmentsCopy head branch name to clipboard

+2,266-83

Commits

Commits on Aug 16, 2021

• allow container assigment by staff from prop + beamline as well as visit

  

  stufisher

  authored and

  Neil A Smith

  committed
  2080109

  Copy full SHA for 2080109

• allow filtering containers by shipment, and by registry

  

  stufisher

  authored and

  Neil A Smith

  committed
  970b402

  Copy full SHA for 970b402

• add diffractionplan columns to sample, get samples by shipment

  

  stufisher

  authored and

  Neil A Smith

  committed
  f58e11e

  Copy full SHA for f58e11e

• add new diffraction plan columns and container view toggle

  

  stufisher

  authored and

  Neil A Smith

  committed
  f9f8b40

  Copy full SHA for f9f8b40

• add csv importer

  

  stufisher

  authored and

  Neil A Smith

  committed
  80e18cb

  Copy full SHA for 80e18cb

• add barcode scan container assign page

  

  stufisher

  authored and

  Neil A Smith

  committed
  80708bd

  Copy full SHA for 80708bd

• add new config.json option

  

  stufisher

  authored and

  Neil A Smith

  committed
  3d64911

  Copy full SHA for 3d64911

• count distinct rather than groupby

  

  stufisher

  authored and

  Neil A Smith

  committed
  f123ba1

  Copy full SHA for f123ba1

• dont fetch if val empty, debounce right function

  

  stufisher

  authored and

  Neil A Smith

  committed
  9a44717

  Copy full SHA for 9a44717

• update breadcrumbs

  

  stufisher

  authored and

  Neil A Smith

  committed
  387f20d

  Copy full SHA for 387f20d

• punctuation

  

  stufisher

  authored and

  Neil A Smith

  committed
  4c6c614

  Copy full SHA for 4c6c614

• use concat_ws incase some values are null

  

  stufisher

  authored and

  Neil A Smith

  committed
  c0acf24

  Copy full SHA for c0acf24

• add collectionmode and priority

  

  stufisher

  authored and

  Neil A Smith

  committed
  3bfa5a4

  Copy full SHA for 3bfa5a4

• add other csv mime types

  

  stufisher

  authored and

  Neil A Smith

  committed
  f4d07e5

  Copy full SHA for f4d07e5

• mime type is not sent on windows :|

  

  stufisher

  authored and

  Neil A Smith

  committed
  2f4e62b

  Copy full SHA for 2f4e62b

• increase page size for sample

  

  stufisher

  authored and

  Neil A Smith

  committed
  c534cf4

  Copy full SHA for c534cf4

• validate barcode on scan assign page

  

  stufisher

  authored and

  Neil A Smith

  committed
  9cc0d66

  Copy full SHA for 9cc0d66

• wip: mailin enhancements

  

  stufisher

  authored and

  Neil A Smith

  committed
  6936828

  Copy full SHA for 6936828

• make possible to disable diff plan columns for containers

  

  stufisher

  authored and

  Neil A Smith

  committed
  aca1db8

  Copy full SHA for aca1db8

• rename csv button

  

  stufisher

  authored and

  Neil A Smith

  committed
  35f1d48

  Copy full SHA for 35f1d48

• add mark shipment returned button and api, add mark queue completed api, add prop code filter to containers

  

  stufisher

  authored and

  Neil A Smith

  committed
  5554832

  Copy full SHA for 5554832

• document disabling exp_plan fields

  

  stufisher

  authored and

  Neil A Smith

  committed
  7544d8a

  Copy full SHA for 7544d8a

• add initial queued containers view

  

  stufisher

  authored and

  Neil A Smith

  committed
  2a14dcd

  Copy full SHA for 2a14dcd

• update container review page, link from container

  

  stufisher

  authored and

  Neil A Smith

  committed
  548c8f8

  Copy full SHA for 548c8f8

• separate spacegroups

  

  stufisher

  authored and

  Neil A Smith

  committed
  94c266f

  Copy full SHA for 94c266f

• add additional filters to queue view

  

  stufisher

  authored and

  Neil A Smith

  committed
  86fb5c6

  Copy full SHA for 86fb5c6

• add queue button to admin menu

  

  stufisher

  authored and

  Neil A Smith

  committed
  3fe0a46

  Copy full SHA for 3fe0a46

• allow customising auto collect label

  

  stufisher

  authored and

  Neil A Smith

  committed
  0263e95

  Copy full SHA for 0263e95

• remove debug

  

  stufisher

  authored and

  Neil A Smith

  committed
  6fd7c79

  Copy full SHA for 6fd7c79

• add link back to container

  

  stufisher

  authored and

  Neil A Smith

  committed
  b5b5ba7

  Copy full SHA for b5b5ba7

• allow staff to queue entire shipment

  

  stufisher

  authored and

  Neil A Smith

  committed
  60b03e4

  Copy full SHA for 60b03e4

• remove debug

  

  stufisher

  authored and

  Neil A Smith

  committed
  a4393c0

  Copy full SHA for a4393c0

• stop shipment return if there are still outstanding queued containers

  

  stufisher

  authored and

  Neil A Smith

  committed
  5ad92d8

  Copy full SHA for 5ad92d8

• allow anyone to use queue shipment button if enabled

  

  stufisher

  authored and

  Neil A Smith

  committed
  2796146

  Copy full SHA for 2796146

• add samples to containerqueue for pucks and allow editing their status manually

  

  stufisher

  authored and

  Neil A Smith

  committed
  27112d6

  Copy full SHA for 27112d6

• correct where option comes from...

  

  stufisher

  authored and

  Neil A Smith

  committed
  2fdd64b

  Copy full SHA for 2fdd64b

• increase number of containers when queuing a shipment

  

  stufisher

  authored and

  Neil A Smith

  committed
  edf5155

  Copy full SHA for edf5155

• Enable UAS API to set delivered time on close

  

  Neil A Smith

  committed
  168330a

  Copy full SHA for 168330a

• Add hooks for determining delivered time on session close api call

  

  Neil A Smith

  committed
  38d4361

  Copy full SHA for 38d4361

• Add missing import in shipment routes file

  

  Neil Smith

  committed
  f1d61b9

  Copy full SHA for f1d61b9

• Update comments to describe custom site logo

  

  Neil A Smith

  committed
  5d868a1

  Copy full SHA for 5d868a1

• Added missing route for import csv

  

  Neil A Smith

  committed
  3c09b29

  Copy full SHA for 3c09b29

• Make clear csv_profile in config.json does not need file extension

  

  Neil A Smith

  committed
  252811f

  Copy full SHA for 252811f

• Prevent sample patch failing because no container id

  

  Neil A Smith

  committed
  bf67b48

  Copy full SHA for bf67b48

Commits on Aug 17, 2021

• Revert "Enable UAS API to set delivered time on close"

  Show description for 35dfcb9
  

  Neil A Smith

  committed
  35dfcb9

  Copy full SHA for 35dfcb9

• Revert "Add hooks for determining delivered time on session close api call"

  Show description for d6be16e
  

  Neil A Smith

  committed
  d6be16e

  Copy full SHA for d6be16e

Commits on Sep 13, 2021

• add missing routes

  stufisher

  committed
  d20a907

  Copy full SHA for d20a907

Commits on Jan 7, 2022

• fix no images in review page

  stufisher

  committed
  5e48332

  Copy full SHA for 5e48332

• correct permission for queued containers

  stufisher

  committed
  9dea442

  Copy full SHA for 9dea442

• allow searching containers by owner(person).login

  stufisher

  committed
  55cc148

  Copy full SHA for 55cc148

• preserve search term in url (ty always first on queued containers)

  stufisher

  committed
  c2438fd

  Copy full SHA for c2438fd

• apply search params to count query

  stufisher

  committed
  a487761

  Copy full SHA for a487761

• make sure currentPage is int

  stufisher

  committed
  4904a8c

  Copy full SHA for 4904a8c

• add staffcomments to swagger api

  stufisher

  committed
  4927bbb

  Copy full SHA for 4927bbb

• received typo

  stufisher

  committed
  94a2e08

  Copy full SHA for 94a2e08

• prevent container / sample duplication for csv import

  stufisher

  committed
  24c5e79

  Copy full SHA for 24c5e79