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.

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

LIMS-77: Link Lab Contacts to fedids #622

Merged
merged 3 commits into from
Sep 13, 2023

Conversation

ndg63276
Copy link
Collaborator

Ticket: LIMS-77

  • Give users a new dropdown when creating a lab contact, to select either their own login, or blank for someone else
  • Prefill the form if we have the information
  • Dont allow them to create a lab contact linked to someone else's fedid
  • Only allow one personId/proposalId combination
  • Get actual postcode instead of blank string

@ndg63276 ndg63276 requested a review from gfrn July 10, 2023 10:52
client/src/js/modules/contact/views/addcontact.js Outdated Show resolved Hide resolved
client/src/js/modules/contact/views/addcontact.js Outdated Show resolved Hide resolved
ndg63276 and others added 2 commits September 12, 2023 18:37
Co-authored-by: Guilherme Francisco <guilherme.de-freitas@diamond.ac.uk>
@ndg63276 ndg63276 requested a review from gfrn September 12, 2023 17:40
@ndg63276 ndg63276 merged commit 0568e32 into prerelease Sep 13, 2023
1 of 2 checks passed
@ndg63276 ndg63276 deleted the improvement/LIMS-77/link-lab-contact-to-fedids branch September 13, 2023 07:46
MattPrit added a commit that referenced this pull request Oct 5, 2023
* LIMS-222: Apply experimental parameters to all samples (#595)

* LIMS-222: Apply experimental parameters to all samples

* LIMS-222: Fix bug from renaming method

* Use toArray instead of filter and make names better

---------

Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>
Co-authored-by: John Holt <John.Holt@diamond.ac.uk>

* LIMS-210: Prevent double clicking to create multiple samples (#660)

* LIMS-210: Prevent double clicking to create multiple samples

* Use loading state to avoid double click

---------

Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>
Co-authored-by: John Holt <John.Holt@diamond.ac.uk>

* LIMS-499: Make reciprocal space viewer more obvious (#653)

Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>

* LIMS-395: Display warning if no spots or incomplete PIA (#623)

* LIMS-395: Display a warning on grid scans if no spots found or incomplete PIA results

* LIMS-395: Use new XRC tables

---------

Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>

* LIMS-759: Show multipin samples and their sublocations (#648)

Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>

* LIMS-154: Enable display of all grid scan snapshots in full (#631)

* LIMS-154: Enable display of all grid scan snapshots in full

* Avoid overwriting globally scoped variable n

Co-authored-by: Guilherme Francisco <guilherme.de-freitas@diamond.ac.uk>

---------

Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>
Co-authored-by: Guilherme Francisco <guilherme.de-freitas@diamond.ac.uk>

* LIMS-952: Display xray centring results if running 3d xray centring (#647)

* LIMS-952: Display xray centring results if running 3d xray centring

* LIMS-952: Mark no results as xray centring failure

* LIMS-952: Display message if no diffraction found

---------

Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>

* LIMS-862: Reset registered container after creating container (#628)

Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>

* LIMS-77: Link Lab Contacts to fedids (#622)

* LIMS-77: Link Lab Contacts to fedids

* Use Promise.all rather than $.when

Co-authored-by: Guilherme Francisco <guilherme.de-freitas@diamond.ac.uk>

---------

Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>
Co-authored-by: Guilherme Francisco <guilherme.de-freitas@diamond.ac.uk>

* Fix user data invocation tests

* Revert "LIMS-759: Show multipin samples and their sublocations (#648)"

This reverts commit 5ec00f1.

---------

Co-authored-by: Mark W <24956497+ndg63276@users.noreply.github.com>
Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>
Co-authored-by: John Holt <John.Holt@diamond.ac.uk>
Co-authored-by: Guilherme Francisco <guilherme.de-freitas@diamond.ac.uk>
Co-authored-by: NKatti2011 <108797920+NKatti2011@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants