Skip to content

LIMS-2064: Show no of pucks/plates on shipments page #1038

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

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

LIMS-2064: Show no of pucks/plates on shipments page #1038

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
02647dd
LIMS-2064: Show no of pucks/plates on shipments page
Feb 25, 2026
107f920
Update php-jwt as much as possible and ignore security advisory
Feb 25, 2026
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
5 changes: 4 additions & 1 deletion api/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"require": {
"apereo/phpcas": "1.6.1",
"ezyang/htmlpurifier": "4.12.0",
"firebase/php-jwt": "6.0.0",
"firebase/php-jwt": "^6.0.0",
"jdorn/sql-formatter": "1.2.9",
"mpdf/mpdf": "8.1.2",
"ralouphie/getallheaders": "2.0.5",
Expand Down Expand Up @@ -44,6 +44,9 @@
"config": {
"platform": {
"php": "7.3"
},
"audit": {
"ignore": ["PKSA-y2cr-5h3j-g3ys"]
}
}
}
19 changes: 14 additions & 5 deletions api/src/Page/Shipment.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ function _get_shipments()
$tot = $this->db->pq("SELECT count(distinct s.shippingid) as tot
FROM proposal p
INNER JOIN shipping s ON p.proposalid = s.proposalid
LEFT OUTER JOIN labcontact c ON s.sendinglabcontactid = c.labcontactid
LEFT OUTER JOIN labcontact lc ON s.sendinglabcontactid = lc.labcontactid
LEFT OUTER JOIN labcontact c2 ON s.returnlabcontactid = c2.labcontactid
LEFT OUTER JOIN dewar d ON d.shippingid = s.shippingid
WHERE $where", $args);
Expand Down Expand Up @@ -348,8 +348,10 @@ function _get_shipments()
TO_CHAR(s.deliveryagent_deliverydate, 'DD-MM-YYYY') as deliveryagent_deliverydate,
s.safetylevel,
count(d.dewarid) as dcount,
SUM(IFNULL(c.puckcount, 0)) as pcount,
SUM(IFNULL(c.platecount, 0)) as plcount,
s.sendinglabcontactid,
c.cardname as lcout,
lc.cardname as lcout,
c2.cardname as lcret,
s.returnlabcontactid,
s.shippingid,
Expand Down Expand Up @@ -392,14 +394,21 @@ function _get_shipments()
LEFT OUTER JOIN dewar d ON d.shippingid = s.shippingid
LEFT OUTER JOIN blsession b ON b.sessionid = d.firstexperimentid
LEFT OUTER JOIN couriertermsaccepted cta ON cta.shippingid = s.shippingid
LEFT OUTER JOIN labcontact c ON c.labcontactid = s.sendinglabcontactid
LEFT OUTER JOIN person pe ON c.personid = pe.personid
LEFT OUTER JOIN labcontact lc ON lc.labcontactid = s.sendinglabcontactid
LEFT OUTER JOIN person pe ON lc.personid = pe.personid
LEFT OUTER JOIN laboratory l ON l.laboratoryid = pe.laboratoryid
LEFT OUTER JOIN person pe2 ON pe2.personid = s.deliveryagent_flightcodepersonid
LEFT OUTER JOIN (
SELECT dewarid,
COUNT(IF(capacity < 25, 1, NULL)) as puckcount,
COUNT(IF(capacity >= 25, 1, NULL)) as platecount
FROM container
GROUP BY dewarid
) c ON c.dewarid = d.dewarid
WHERE $where
GROUP BY
s.sendinglabcontactid, s.returnlabcontactid, s.deliveryagent_agentname, s.deliveryagent_agentcode,
s.deliveryagent_shippingdate, s.deliveryagent_deliverydate, s.safetylevel, c.cardname, c2.cardname,
s.deliveryagent_shippingdate, s.deliveryagent_deliverydate, s.safetylevel, lc.cardname, c2.cardname,
s.shippingid, s.shippingname, s.shippingstatus,TO_CHAR(s.creationdate, 'DD-MM-YYYY'),
s.isstorageshipping, s.shippingtype, s.comments, s.creationdate
ORDER BY $order",
Expand Down
3 changes: 2 additions & 1 deletion client/src/js/modules/shipment/views/shipments.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,12 @@ define(['marionette',
initialize: function(options) {
var columns = [{ name: 'SHIPPINGNAME', label: 'Name', cell: 'string', editable: false },
{ name: 'DEWARS', label: 'Dewar(s)', cell: 'string', editable: false },
{ name: 'PCOUNT', label: '# Pucks', cell: 'string', editable: false },
{ name: 'PLCOUNT', label: '# Plates', cell: 'string', editable: false },
{ name: 'CREATED', label: 'Creation Date', cell: 'string', editable: false },
{ name: 'VISIT', label: 'Visit', cell: 'string', editable: false },
{ name: 'CONTACTS', label: 'Lab Contact', cell: ContactCell, editable: false },
{ name: 'SHIPPINGSTATUS', label: 'Status', cell: 'string', editable: false },
{ name: 'DCOUNT', label: '# Comp', cell: 'string', editable: false },
{ name: 'COMMENTS', label: 'Comments', cell: 'string', editable: false },
]

Expand Down
Loading