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

Add support for Microsoft Active Directory in LDAP authentication #1

Open
wants to merge 838 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
838 commits
Select commit Hold shift + click to select a range
836a1f9
Fix/lims 514/change archive message visit page (#529)
John-Holt-Tessella Apr 20, 2023
316a4b5
LIMS-89: Add data-testid tags to MX elements already being tested by …
ndg63276 Apr 20, 2023
45e911b
LIMS-575: Re-add visit summary CSV and PDF buttons to visit list page…
ndg63276 Apr 20, 2023
c9045ad
LIMS-79: Extend energy range in beamline run view (#506)
ndg63276 Apr 20, 2023
15ab8c0
LIMS-267: Dont allow lab contacts to be plate owners (#507)
ndg63276 Apr 20, 2023
e290c58
Add test for archive downloads
Apr 20, 2023
a8f4878
Add test for archive downloads
Apr 20, 2023
721b640
LIMS-608: Check a user is not null before checking if an admin (#521)
ndg63276 Apr 21, 2023
2e48961
LIMS-142: Screening filter should show non-zero overlap or DCG.type=S…
ndg63276 Apr 21, 2023
4c12f8c
LIMS-165: Dont allow duplicate protein acronyms in a proposal by rena…
ndg63276 Apr 21, 2023
09ad866
LIMS-572: Use micronsPerPixel preferably over pixelsPerMicron for gri…
ndg63276 Apr 21, 2023
1ecd923
Bad merge left and else rows in (#530)
John-Holt-Tessella Apr 21, 2023
ab6a5bc
Merge pull request #531 from DiamondLightSource/prerelease
John-Holt-Tessella Apr 21, 2023
12fcb71
LIMS-596: Speed up most common call to getUsers by using UNION instea…
Apr 21, 2023
ecd9684
Update to test for downloading streaming zipfiles
Apr 24, 2023
7b164ab
Update error message in test for downloading streaming zipfiles
Apr 24, 2023
922115c
Remove unnecessary statements
Apr 24, 2023
4993a54
Remove mocked files
Apr 24, 2023
e7d9071
LIMS-596: is blank, reduce duplication
Apr 25, 2023
a5aa2fc
LIMS-639: Use getFromCache not setInCache
Apr 25, 2023
c3c824a
Update string match to be more like original
Apr 25, 2023
c728685
use is null
Apr 25, 2023
af2d012
Merge pull request #538 from DiamondLightSource/pre-release/Fix/LIMS-…
John-Holt-Tessella Apr 25, 2023
1df1cf9
return false on non string
Apr 25, 2023
d8770b7
Merge pull request #537 from DiamondLightSource/pre-release/Fix/LIMS-…
John-Holt-Tessella Apr 25, 2023
7c8b07e
Merge pull request #539 from DiamondLightSource/pre-release/Fix/LIMS-…
John-Holt-Tessella Apr 25, 2023
29a1ddc
Merge remote-tracking branch 'origin/prerelease' into feature/LIMS-61…
Apr 26, 2023
856f75f
Merge pull request #534 from DiamondLightSource/fix/LIMS-596/speed-up…
sshussain270 Apr 27, 2023
5895a3e
Make the test work
Apr 28, 2023
7ec8a13
make test shorter
Apr 28, 2023
0367668
Merge pull request #511 from DiamondLightSource/feature/LIMS-61/fix-b…
John-Holt-Tessella Apr 28, 2023
d08efdb
Merge branch 'dials-rest' of https://github.com/rjgildea/SynchWeb int…
Apr 28, 2023
f75ea20
Merge remote-tracking branch 'origin/master' into pre-release/2023-R2…
May 2, 2023
89b530e
Merge branch 'pre-release/2023-R2.1.1' of https://github.com/DiamondL…
May 2, 2023
9dc43b6
Merge branch 'prerelease' into pre-release/2023-R1.11
John-Holt-Tessella May 2, 2023
62aba77
Merge pull request #541 from DiamondLightSource/pre-release/2023-R1.11
John-Holt-Tessella May 2, 2023
73b9efe
Merge pull request #542 from DiamondLightSource/pre-release/2023-R2.1.1
John-Holt-Tessella May 2, 2023
6709afb
Merge remote-tracking branch 'origin/prerelease' into dials-rest
May 2, 2023
7b32a47
LIMS-677: Show screening method as none when strategyOption is null
May 3, 2023
7978d4f
Enable flask loading if setting dont exist and better errors
May 4, 2023
282cc94
Merge pull request #522 from rjgildea/dials-rest
John-Holt-Tessella May 4, 2023
6094e18
Fix index error
May 5, 2023
d72f3f3
Merge pull request #546 from DiamondLightSource/dials-rest
John-Holt-Tessella May 5, 2023
01e49ed
Merge pull request #550 from DiamondLightSource/dials-rest
John-Holt-Tessella May 5, 2023
ea57c8f
LIMS-610: Reprocessing limits to maximum of 15 datasets (#525)
ndg63276 May 5, 2023
9cb7647
LIMS-634: Dont fail sample validation on fields that aren't editable …
ndg63276 May 5, 2023
63a38b3
Merge pull request #536 from DiamondLightSource/fix/LIMS-639/error-ge…
John-Holt-Tessella May 11, 2023
99763b3
Merge branch 'prerelease' of https://github.com/DiamondLightSource/Sy…
May 11, 2023
582fdd6
fix sample editing (#247)
stufisher May 15, 2023
b7a39f9
LIMS-677: Show screening method as none when strategyOption is null (…
ndg63276 May 15, 2023
e24c358
Add sid parameter to uri (#551)
sshussain270 May 15, 2023
e71e878
LIMS-673: Extend error message for failing shipping service requests,…
MattPrit May 15, 2023
147b788
LIMS-684: Tweak error message in dispatch email (#556)
MattPrit May 16, 2023
790c0a9
LIMS-677: Make Screening Method not be required, but autofill if null…
May 16, 2023
7d7385b
Merge branch 'prerelease' into fix/LIMS-677/pucks-with-null-strategyo…
ndg63276 May 16, 2023
241d842
LIMS-452: Speed up _get_all_containers
May 17, 2023
d2413a6
Fix homepage redirect on proposal page
gfrn May 17, 2023
38c6708
LIMS-725: Fix bug stopping AWB's being booked
May 18, 2023
0a32128
LIMS-725: Fix bug stopping AWB's being booked (#564)
ndg63276 May 18, 2023
16e2adb
Merge branch 'prerelease' of https://github.com/DiamondLightSource/Sy…
May 18, 2023
06fad2d
Replace or statment with and statement for pid
May 18, 2023
ad4b12f
LIMS-640: Fix visit report PDF (#543)
ndg63276 May 19, 2023
470d102
Merge pull request #560 from DiamondLightSource/fix/lims-724/homepage…
gfrn May 22, 2023
2d5f2de
LIMS-336: Speed up 'View Container' page (#557)
ndg63276 May 23, 2023
89980a4
Merge branch 'prerelease' of https://github.com/DiamondLightSource/Sy…
May 23, 2023
c4eaa3c
LIMS-651: Allow colons in Shipping.extra fields (#540)
ndg63276 May 23, 2023
a48247d
dont allow marking shipment sent if a dewar is processing (#213)
stufisher May 23, 2023
4476b41
Fix sql issue (#565)
John-Holt-Tessella May 24, 2023
8f99210
user_fix
May 24, 2023
a2a9f36
Add catalog-info.yaml config file
John-Holt-Tessella May 24, 2023
9e0986d
Merge pull request #569 from DiamondLightSource/pre-release/2023-R2.2
John-Holt-Tessella May 24, 2023
e6281fa
Merge pull request #570 from DiamondLightSource/pre-release/2023-R2.2.1
John-Holt-Tessella May 24, 2023
30e763e
Merge pull request #558 from DiamondLightSource/fix/LIMS-677/pucks-wi…
John-Holt-Tessella May 24, 2023
18d4ad9
Merge pull request #571 from DiamondLightSource/prerelease
John-Holt-Tessella May 24, 2023
cde774e
Merge branch 'prerelease' of https://github.com/DiamondLightSource/Sy…
May 25, 2023
3da09b6
add zip extension
May 25, 2023
5356ea6
Merge pull request #574 from DiamondLightSource/fix/unittest
John-Holt-Tessella May 25, 2023
422d902
Merge pull request #575 from DiamondLightSource/fix/unittest
John-Holt-Tessella May 25, 2023
cda9dd3
Add proposal id argument to getUsers function tests
sshussain270 May 25, 2023
55548cb
Fix pid parameter position in getUsers call
May 25, 2023
f786a79
Remove pid empty string requirement from access control
May 25, 2023
519928d
Update catalog-info.yaml
John-Holt-Tessella May 25, 2023
3f6ac60
Merge pull request #568 from DiamondLightSource/backstage-integration
John-Holt-Tessella May 25, 2023
ae223f7
Update catalog-info.yaml
John-Holt-Tessella May 25, 2023
4af2d71
Update catalog-info.yaml
John-Holt-Tessella May 25, 2023
7bd62d9
Update catalog-info.yaml
John-Holt-Tessella May 25, 2023
0f5feb4
Remove pid from container pages in frontend
May 25, 2023
896368a
Update ticket number in logging
May 26, 2023
50023e1
LIMS-733: Show courier details in dispatch email if terms not accepte…
MattPrit May 31, 2023
c56b634
LIMS[682,688]Improvement: Seperate dispatch address fields, strip whi…
MattPrit May 31, 2023
c20cd95
Merge pull request #566 from DiamondLightSource/bug/LIMS-676/fix-cont…
John-Holt-Tessella Jun 2, 2023
c966f1c
LIMS-681: Allow editing of shipping AWB (#577)
ndg63276 Jun 7, 2023
057fbf6
LIMS-588: Make screen name and global fields editable (#554)
ndg63276 Jun 7, 2023
9495722
LIMS-611: Improve error message on lab contact add or migrate (#578)
ndg63276 Jun 7, 2023
0623873
Merge pull request #261 from isikhar/fix/group_by_autoprocprogramid
John-Holt-Tessella Jun 8, 2023
811191e
Merge pull request #584 from DiamondLightSource/prerelease
John-Holt-Tessella Jun 8, 2023
3c210e7
LIMS-779: Move archive url to config
Jun 12, 2023
e762ec1
Apply suggestions from code review
ndg63276 Jun 13, 2023
0d85e5a
LIMS-708: Add OIDC/cookie authentication support (#562)
gfrn Jun 13, 2023
7e069d4
Merge pull request #587 from DiamondLightSource/pre-release/2023-R2.3
John-Holt-Tessella Jun 13, 2023
15eb0bf
Merge pull request #588 from DiamondLightSource/master
John-Holt-Tessella Jun 13, 2023
dbde5cf
Add ispyb-database as dependency in catalog-info.yaml
KarlLevik Jun 14, 2023
9ded171
Fix user checking behaviour on token authentication (#589)
gfrn Jun 16, 2023
c413c02
LIMS-649: Increase max beam size for i23 in run stats page (#553)
ndg63276 Jun 16, 2023
13fa5c9
LIMS-653: Add data-testid's to improve Selenium use (#590)
ndg63276 Jun 19, 2023
7e98736
LIMS-98: Show Commissioning experiment type for staff (#596)
ndg63276 Jun 20, 2023
f7a4c38
Remove unused files (#594)
gfrn Jun 20, 2023
e191b08
Use Jest for unit tests, package upgrades, add login tests (#592)
gfrn Jun 20, 2023
9d01c8e
Merge pull request #598 from DiamondLightSource/pre-release/2023-R2.4
John-Holt-Tessella Jun 20, 2023
0a32ea2
update underscore so it will work on node18
Jun 21, 2023
8c6db68
Update ci.yml
gfrn Jun 21, 2023
3650b4d
Fix JS build step
gfrn Jun 21, 2023
c299f87
Explicitly print out Node version in test step
gfrn Jun 21, 2023
484b5ad
update underscore so it will work on node18
Jun 21, 2023
65aac01
Merge pull request #600 from DiamondLightSource/update-underscore
John-Holt-Tessella Jun 21, 2023
ad9ec33
Merge pull request #601 from DiamondLightSource/prerelease
John-Holt-Tessella Jun 21, 2023
bdab672
Add engine version to package.json
gfrn Jun 21, 2023
792ee73
Revert to satble version
Jun 22, 2023
5973edf
Merge pull request #604 from DiamondLightSource/RevertBackboneUpgrade
John-Holt-Tessella Jun 22, 2023
e77402d
Merge pull request #605 from DiamondLightSource/prerelease
John-Holt-Tessella Jun 22, 2023
4bf108b
LIMS-567: Allow up to 6 decimal places for unit cell and resolution f…
ndg63276 Jun 23, 2023
dcf148f
LIMS-155: Show plate as 12x8 (#555)
ndg63276 Jun 23, 2023
a6c96da
LIMS-612: Allow URL params in a different order (#535)
ndg63276 Jun 26, 2023
e63f260
LIMS-615: Add Migrate menu item to all villages with Lab Contacts men…
ndg63276 Jun 27, 2023
33560aa
Add specific URL for SSO
gfrn Jun 29, 2023
6c651ea
remove unneeded library and remove ? from url
Jun 29, 2023
53a1239
Merge pull request #585 from DiamondLightSource/fix/LIMS-779/beam-dum…
John-Holt-Tessella Jun 29, 2023
1a6613e
LIMS-397: Dont email if dewar moves from i19 to dewar store (#567)
ndg63276 Jun 29, 2023
84d5874
LIMS-685: Hover text wrongly suggests data collection comments are ed…
ndg63276 Jun 29, 2023
09c8642
Use MX view for single crystal collections
gfrn Jun 30, 2023
50258b3
Update user facing non-single crystal filter option
gfrn Jun 30, 2023
c725181
Add types to template, data collection
gfrn Jun 30, 2023
ded80e8
Update api/src/Page/DC.php
John-Holt-Tessella Jun 30, 2023
fe6fcab
Merge pull request #609 from DiamondLightSource/feature/lims-774/i15-…
John-Holt-Tessella Jun 30, 2023
9ad8cc8
Make general dc path less important
Jul 3, 2023
e47ceca
Update client/src/js/modules/dc/router.js
John-Holt-Tessella Jul 3, 2023
c6cf64c
Update api/src/Authentication/Type/OIDC.php
gfrn Jul 3, 2023
1dffbb9
Merge branch 'fix/lims-844/multiple-urls' into fix/LIMS-856/provide_a…
Jul 3, 2023
40c3733
Allow api logins through authenticate
Jul 3, 2023
c5e92c2
Merge pull request #613 from DiamondLightSource/fix/LIMS-856/provide_…
John-Holt-Tessella Jul 4, 2023
00b40c5
Merge pull request #607 from DiamondLightSource/fix/lims-844/multiple…
John-Holt-Tessella Jul 4, 2023
eade5fe
Merge branch 'master' into pre-release/2023-R3.1
John-Holt-Tessella Jul 4, 2023
9814675
Merge pull request #614 from DiamondLightSource/pre-release/2023-R3.1
John-Holt-Tessella Jul 4, 2023
73a5133
Merge pull request #610 from DiamondLightSource/fix_path_order_for_dc
John-Holt-Tessella Jul 4, 2023
641e884
Merge remote-tracking branch 'origin/master' into prerelease
Jul 4, 2023
6ba202f
Merge pull request #616 from DiamondLightSource/prerelease
John-Holt-Tessella Jul 4, 2023
56e9c6f
LIMS_817: Update shipping service requests
MattPrit Jul 5, 2023
f41563c
LIMS-858: Ignore containers with blank samplechangerlocation (#617)
ndg63276 Jul 5, 2023
abeb841
LIMS-614: Use new XrayCentring/XrayCentringResults tables (#612)
ndg63276 Jul 5, 2023
8a7419c
move reg ex even lower
Jul 5, 2023
0dbfe03
Merge pull request #620 from DiamondLightSource/fix_sample_changer_path
John-Holt-Tessella Jul 5, 2023
331e124
Merge pull request #619 from DiamondLightSource/fix_sample_changer_path
John-Holt-Tessella Jul 5, 2023
a691c84
Merge branch 'master' into fix/pin-node-ci-version
John-Holt-Tessella Jul 6, 2023
cec3896
Merge pull request #599 from DiamondLightSource/fix/pin-node-ci-version
John-Holt-Tessella Jul 6, 2023
5ad5719
Merge branch 'improvement/LIMS-817/update-shipping-service-requests' …
MattPrit Jul 10, 2023
7280f06
LIMS-817: Add param to dispatch function
MattPrit Jul 10, 2023
db0ec94
Merge branch 'improvement/LIMS-817/update-shipping-service-requests' …
MattPrit Jul 10, 2023
c1f2562
Move EM router to give dc path more precedent
Jul 11, 2023
3c0e1c0
Merge pull request #625 from DiamondLightSource/fix_routing_em_dataco…
John-Holt-Tessella Jul 11, 2023
c57b145
Merge pull request #624 from DiamondLightSource/fix_routing_em_dataco…
John-Holt-Tessella Jul 11, 2023
2b1bd92
Check for invalid responses
Jul 11, 2023
fcfbe4c
LIMS-871: Fix wrong number of dewar uses for staff (#626)
ndg63276 Jul 14, 2023
81529ad
LIMS-832: Book incoming shipments with the shipping service
MattPrit Jul 14, 2023
c6bc0f6
LIMS-832: Fix array string conversion error
MattPrit Jul 18, 2023
c2bfd9d
LIMS-832: Label address input with 'max 3 lines'
MattPrit Jul 18, 2023
5d66310
Format address & post code in dispatch form
MattPrit Jul 18, 2023
b99b6f2
LIMS-832: Trim post code & email for shipping service
MattPrit Jul 18, 2023
adcff10
Let P beamlines show autoprocessing (#602)
ndg63276 Jul 19, 2023
211a08c
LIMS-899: Null path to blobs causes errors (#632)
ndg63276 Jul 20, 2023
1894d74
Merge pull request #627 from DiamondLightSource/fix/LIMS-876/check_un…
John-Holt-Tessella Jul 21, 2023
e0c0764
LIMS-116: Summary page revamp (#606)
NKatti2011 Jul 25, 2023
15a7fcb
Merge pull request #635 from DiamondLightSource/prerelease
John-Holt-Tessella Jul 25, 2023
20eba26
Merge pull request #636 from DiamondLightSource/pre-release/2023-R3.2
John-Holt-Tessella Jul 26, 2023
5f7083b
Merge pull request #637 from DiamondLightSource/pre-release/2023-R3.2.1
John-Holt-Tessella Jul 26, 2023
6d9a5f0
[LIMS-116] Fix: Summary page revamp, make css local (#639)
NKatti2011 Jul 27, 2023
f3e5403
[LIMS-116] Fix: Summary page revamp, delete css global (#640)
NKatti2011 Jul 27, 2023
8415438
FIX: Prerelease merge for summary css fix (#641)
NKatti2011 Jul 28, 2023
f316177
Update api/src/Page/Shipment.php
John-Holt-Tessella Aug 9, 2023
4addcbe
Merge pull request #618 from DiamondLightSource/improvement/LIMS-817/…
John-Holt-Tessella Aug 9, 2023
f1a0f17
Merge remote-tracking branch 'origin/prerelease' into feature/lims-83…
Aug 9, 2023
c660603
Update to use fns in 7.3 and improve errors
Aug 10, 2023
3222016
Use constants
Aug 10, 2023
508addd
Fix failing tests
Aug 11, 2023
b0c9ad1
LIMS-892: Dont allow UDC samples with no screening method and no reqd…
ndg63276 Aug 14, 2023
3133f7e
User shipping service if using facility account number
Aug 14, 2023
2da5639
Merge pull request #630 from DiamondLightSource/feature/lims-832/ship…
John-Holt-Tessella Aug 14, 2023
d0df7be
Merge pull request #642 from DiamondLightSource/pre-release/2023-R3.3
MattPrit Aug 15, 2023
9b5bd86
LIMS-40: Remove concat(concat(concat( functions (#608)
ndg63276 Aug 16, 2023
d3fd07a
Update api/src/Page/Shipment.php
ndg63276 Aug 16, 2023
d3349a0
Fix bug with 'Has subsamples' filter
Aug 16, 2023
b76bc6c
Merge branch 'prerelease' into improvement/LIMS-452/speed-up-get-all-…
ndg63276 Aug 16, 2023
c53a41f
Merge pull request #559 from DiamondLightSource/improvement/LIMS-452/…
John-Holt-Tessella Aug 16, 2023
4613a7e
LIMS-101: Add dewar info to visits page (#581)
ndg63276 Aug 18, 2023
e8c96c8
LIMS-285: Make sample dimensions, color and shape visible and editabl…
ndg63276 Aug 21, 2023
9c43a25
LIMS-932: Send proposal when creating shipments in shipping service (…
MattPrit Aug 21, 2023
1809358
LIMS-276: Speed up count of _get_all_containers results by removing u…
ndg63276 Aug 23, 2023
cbb03d3
LIMS-903: Update email on dewar transfer (#649)
ndg63276 Aug 23, 2023
668fc94
LIMS-940: Add PR template (#643)
MattPrit Aug 23, 2023
ff6217e
LIMS-705: Ignore null visits (#586)
ndg63276 Aug 25, 2023
4180f2d
LIMS-219: Add All Samples To Queue (#591)
ndg63276 Aug 25, 2023
0d866a7
remove debug (#655)
John-Holt-Tessella Aug 29, 2023
89d82b6
Merge Pre-release/2023-R3.4 into Master (#656)
NKatti2011 Aug 29, 2023
7a34c12
Merge Master into Prerelease (#657)
NKatti2011 Aug 29, 2023
0eca499
Merge Master into Prerelease (#658)
NKatti2011 Aug 29, 2023
ee38e05
Merge pull request #659 from DiamondLightSource/master
NKatti2011 Aug 29, 2023
b7477a0
LIMS-222: Apply experimental parameters to all samples (#595)
ndg63276 Aug 31, 2023
eeb3e2d
LIMS-210: Prevent double clicking to create multiple samples (#660)
ndg63276 Sep 6, 2023
828e161
LIMS-499: Make reciprocal space viewer more obvious (#653)
ndg63276 Sep 11, 2023
235fd27
LIMS-395: Display warning if no spots or incomplete PIA (#623)
ndg63276 Sep 12, 2023
5ec00f1
LIMS-759: Show multipin samples and their sublocations (#648)
ndg63276 Sep 12, 2023
d6c4ba5
LIMS-154: Enable display of all grid scan snapshots in full (#631)
ndg63276 Sep 12, 2023
24dab04
LIMS-952: Display xray centring results if running 3d xray centring (…
ndg63276 Sep 12, 2023
e533e07
LIMS-862: Reset registered container after creating container (#628)
ndg63276 Sep 12, 2023
0568e32
LIMS-77: Link Lab Contacts to fedids (#622)
ndg63276 Sep 13, 2023
0ec4744
Fix user data invocation tests
gfrn Sep 14, 2023
01a08c7
Merge pull request #663 from DiamondLightSource/fix/update-tests-post…
gfrn Sep 14, 2023
fa177c3
Merge pull request #666 from DiamondLightSource/pre-release/2023-R4.1
NKatti2011 Sep 19, 2023
6178a92
Merge pull request #667 from DiamondLightSource/master
NKatti2011 Sep 19, 2023
3ed619b
Revert "LIMS-759: Show multipin samples and their sublocations (#648)"
NKatti2011 Sep 20, 2023
feca5b6
Merge pull request #669 from DiamondLightSource/revert-648-improvemen…
NKatti2011 Sep 20, 2023
066b15b
LIMS-743: Get MOTD from database (#611)
ndg63276 Sep 25, 2023
be3e0cc
LIMS-150: Cannot edit fault components (#670)
ndg63276 Sep 25, 2023
ea1011b
LIMS-960: Add logging to SynchWeb's OIDC auth (#662)
gfrn Sep 28, 2023
a2a7afd
LIMS-933: Attach auth header to shipping service requests (#675)
MattPrit Sep 29, 2023
506cc1e
If ldap not set do not do user lookup (#674)
John-Holt-Tessella Oct 4, 2023
bd36cd4
LIMS-1029: Fix bug creating lab contact with login (#676)
ndg63276 Oct 4, 2023
48bed40
I15_1-1318: Cannot create default shipment for visit 0 (#677)
ndg63276 Oct 4, 2023
7d6f57f
Merge pull request #679 from DiamondLightSource/pre-release/2023-R4.2
MattPrit Oct 5, 2023
f03a8d5
Merge pull request #680 from DiamondLightSource/master
MattPrit Oct 5, 2023
b8aeda5
LIMS-59: Never write null to DewarTransportHistory.storageLocation (#…
ndg63276 Oct 12, 2023
fc4295e
LIMS-95: Show max score for each drop in a plate (#621)
ndg63276 Oct 16, 2023
269cd3d
LIMS-95: Change label to match others (#682)
ndg63276 Oct 18, 2023
81fa9c0
LIMS-140: Fix pia_estimated_d_min display on VMXi grid scans (#678)
ndg63276 Oct 18, 2023
12777c9
Move discovery away from constructor, get cookie expiry dynamically
gfrn Oct 20, 2023
44b0dd0
Update api/src/Authentication/Type/OIDC.php
gfrn Nov 2, 2023
6f36e9f
LIMS-309: Remove the Create New button in the protein acronym field f…
ndg63276 Nov 2, 2023
9a0ad6f
LIMS-1074: Allow accessing zipped files (#684)
ndg63276 Nov 2, 2023
5fa8803
Merge branch 'prerelease' into fix/lims-1068/oidc-discovery-endpoint-fix
gfrn Nov 2, 2023
e0ac33d
Merge pull request #683 from DiamondLightSource/fix/lims-1068/oidc-di…
gfrn Nov 2, 2023
aa9dfcd
Merge pull request #687 from DiamondLightSource/pre-release/2023-R4.3
John-Holt-Tessella Nov 2, 2023
efe064c
Merge pull request #688 from DiamondLightSource/master
John-Holt-Tessella Nov 2, 2023
ab0c56e
LIMS-1009: Remove the word 'remote' from 'responsive remote' (#671)
ndg63276 Nov 2, 2023
4b7047c
On Build: Satisfy Psalm Config (#689)
John-Holt-Tessella Nov 2, 2023
a38203a
Make psalm passing part of the build
Nov 2, 2023
e8ea886
Update ci file
Nov 2, 2023
95f8618
UNdo changes in psalm.xml config
Nov 2, 2023
a250c12
undo changes to psalm config
Nov 2, 2023
c82aac0
Merge pull request #691 from DiamondLightSource/improve/make_php_lint…
John-Holt-Tessella Nov 2, 2023
c805a48
Merge branch 'prerelease' into add-legacy-ad-ldap-support
ndg63276 Nov 3, 2023
2c94541
Fix whitespace
ndg63276 Nov 15, 2023
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
Prev Previous commit
Next Next commit
Bad merge left and else rows in (DiamondLightSource#530)
Co-authored-by: John Holt <[email protected]>
John-Holt-Tessella and John Holt authored Apr 21, 2023
commit 1ecd923b15a50d79fe7a9ff4682c4cc53ac6e726
52 changes: 24 additions & 28 deletions api/src/Page/Exp.php
Original file line number Diff line number Diff line change
@@ -164,38 +164,34 @@ function _detectors()
array_push($args, $this->arg('BEAMLINENAME'));
}

$tot = $this->db->pq("SELECT count(d.detectorid) as tot
FROM detector d
LEFT OUTER JOIN beamlinesetup bls ON bls.detectorid = d.detectorid
WHERE $where", $args);
$tot = intval($tot[0]['TOT']);
$tot = $this->db->pq("SELECT count(d.detectorid) as tot
FROM detector d
LEFT OUTER JOIN beamlinesetup bls ON bls.detectorid = d.detectorid
WHERE $where", $args);
$tot = intval($tot[0]['TOT']);

$this->_get_start_end($args);
$this->_get_start_end($args);

$order = $this->_get_order(
array('DETECTORID' => 'd.detectorid'),
'd.detectorid ASC'
);
$order = $this->_get_order(
array('DETECTORID' => 'd.detectorid'),
'd.detectorid ASC'
);

$rows = $this->db->paginate("SELECT d.detectorid, d.detectortype, d.detectormanufacturer, d.detectorserialnumber, d.sensorthickness, d.detectormodel, d.detectorpixelsizehorizontal, d.detectorpixelsizevertical, d.detectordistancemin, d.detectordistancemax, d.density, d.composition, concat(d.detectormanufacturer,' ',d.detectormodel, ' (',d.detectortype,')') as description, d.detectormaxresolution, d.detectorminresolution, count(distinct dc.datacollectionid) as dcs, count(distinct bls.beamlinesetupid) as blsetups, (SELECT count(distinct dphd.detectorid) FROM DataCollectionPlan_has_Detector dphd WHERE dphd.detectorid = d.detectorid) as dps, GROUP_CONCAT(distinct bls.beamlinename) as beamlines, d.numberofpixelsx, d.numberofpixelsy, d.detectorrollmin, d.detectorrollmax
FROM detector d
LEFT OUTER JOIN datacollection dc ON dc.detectorid = d.detectorid
LEFT OUTER JOIN beamlinesetup bls ON bls.detectorid = d.detectorid
WHERE $where
GROUP BY d.detectorid
ORDER BY $order", $args);
$rows = $this->db->paginate("SELECT d.detectorid, d.detectortype, d.detectormanufacturer, d.detectorserialnumber, d.sensorthickness, d.detectormodel, d.detectorpixelsizehorizontal, d.detectorpixelsizevertical, d.detectordistancemin, d.detectordistancemax, d.density, d.composition, concat(d.detectormanufacturer,' ',d.detectormodel, ' (',d.detectortype,')') as description, d.detectormaxresolution, d.detectorminresolution, count(distinct dc.datacollectionid) as dcs, count(distinct bls.beamlinesetupid) as blsetups, (SELECT count(distinct dphd.detectorid) FROM DataCollectionPlan_has_Detector dphd WHERE dphd.detectorid = d.detectorid) as dps, GROUP_CONCAT(distinct bls.beamlinename) as beamlines, d.numberofpixelsx, d.numberofpixelsy, d.detectorrollmin, d.detectorrollmax
FROM detector d
LEFT OUTER JOIN datacollection dc ON dc.detectorid = d.detectorid
LEFT OUTER JOIN beamlinesetup bls ON bls.detectorid = d.detectorid
WHERE $where
GROUP BY d.detectorid
ORDER BY $order", $args);

if ($this->has_arg('DETECTORID')) {
if (sizeof($rows)) $this->_output($rows[0]);
else $this->_error('No such detector');

} else $this->_output(array(
'total' => $tot,
'data' => $rows,
));
}
else
$this->_output($rows);
if ($this->has_arg('DETECTORID')) {
if (sizeof($rows)) $this->_output($rows[0]);
else $this->_error('No such detector');
} else $this->_output(array(
'total' => $tot,
'data' => $rows,
));
}