Skip to content

LIMS-1432: Add shelxt downstream view#818

Merged
ndg63276 merged 16 commits into
DiamondLightSource:pre-release/2024-R4.2from
keeble:add/shelxt
Sep 3, 2024
Merged

LIMS-1432: Add shelxt downstream view#818
ndg63276 merged 16 commits into
DiamondLightSource:pre-release/2024-R4.2from
keeble:add/shelxt

Conversation

@keeble
Copy link
Copy Markdown
Contributor

@keeble keeble commented Aug 21, 2024

JIRA ticket: LIMS-1432

Summary:

Add support for shelxt downstream results.

Changes:

  • add a Shelxt extension of DownStreamPlugin
  • add the mapping to this plugin
  • add a dc_shelxt.html
  • add the accompanying javascript

(loosely based on dimple but with several differences)

To test:

I will add a screenshot once the restore database synch is run later today.

Comment thread api/src/Downstream/Type/Shelxt.php Outdated
Copy link
Copy Markdown
Collaborator

@ndg63276 ndg63276 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Couple of minor changes

Comment thread api/src/Downstream/Type/Shelxt.php Outdated
Comment thread api/src/Downstream/Type/Shelxt.php Outdated
Comment thread api/src/Downstream/Type/Shelxt.php Outdated
Comment thread api/src/Downstream/Type/Shelxt.php Outdated
Comment thread api/src/Downstream/Type/Shelxt.php Outdated
Comment thread client/src/js/templates/dc/dc_shelxt.html Outdated
keeble and others added 5 commits August 27, 2024 13:30
Co-authored-by: Mark W <24956497+ndg63276@users.noreply.github.com>
Co-authored-by: Mark W <24956497+ndg63276@users.noreply.github.com>
Co-authored-by: Mark W <24956497+ndg63276@users.noreply.github.com>
Co-authored-by: Mark W <24956497+ndg63276@users.noreply.github.com>
Co-authored-by: Mark W <24956497+ndg63276@users.noreply.github.com>
Comment thread api/src/Downstream/Type/Shelxt.php Outdated
Copy link
Copy Markdown
Collaborator

@ndg63276 ndg63276 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we change client/src/js/modules/dc/views/mapmodelview.js like this?

         loadMaps: function() {
             this.mapsToLoad = this.downstream.get('FEATURES').MAPMODEL[1];
             this.mapsLoaded = 0
-            this.doLoadMaps(1, this.onMapsLoaded.bind(this))
+            if (this.mapsToLoad > 0) {
+                this.doLoadMaps(1, this.onMapsLoaded.bind(this))
+            }
         },

That way it doesn't try to load a map file.

Copy link
Copy Markdown
Collaborator

@ndg63276 ndg63276 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@ndg63276 ndg63276 changed the base branch from master to pre-release/2024-R4.2 September 3, 2024 08:16
@ndg63276 ndg63276 merged commit 81a68b8 into DiamondLightSource:pre-release/2024-R4.2 Sep 3, 2024
ndg63276 added a commit that referenced this pull request Sep 17, 2024
* LIMS-1432: Add shelxt downstream view (#818)

* LIMS-1436: Use auth provider provided logout URL when SSO is enabled (#822)

* LIMS-1108: Improve message re international shipping (#721)

* LIMS-1396: Use shipping service callback URL to only send emails once shipment is booked (#814)

* LIMS-1435: Put CCP4 location into config variable (#821)

* LIMS-656: Show auto subsamples if they have data (#817)

---------

Co-authored-by: Dean Keeble <dean.keeble@diamond.ac.uk>
Co-authored-by: Guilherme Francisco <guilherme.de-freitas@diamond.ac.uk>
Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>
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