LIMS-1664: Improvements to registered dewar and container pages (#927)

* LIMS-1664: Improvements to registered dewar and container pages

* LIMS-1664: Fix counts now where clause has changed

* LIMS-1664: Fix bug on first page of dewars/containers

---------

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

Author: ndg63276

api/src/Page/Shipment.php

@@ -649,7 +649,15 @@ function _dewar_registry()
 
         if ($this->has_arg('s')) {
             $st = sizeof($args) + 1;
-            $where .= " AND (lower(r.facilitycode) LIKE lower(CONCAT(CONCAT('%', :" . ($st) . "), '%')) OR lower(CONCAT(p.proposalcode,p.proposalnumber)) LIKE lower(CONCAT(CONCAT('%',:" . ($st + 1) . "), '%')))";
+            $where .= " AND (r.dewarregistryid IN (
+                            SELECT DISTINCT r2.dewarregistryid
+                            FROM dewarregistry r2
+                            LEFT JOIN dewarregistry_has_proposal rhp2 ON rhp2.dewarregistryid = r2.dewarregistryid
+                            LEFT JOIN Proposal p2 ON p2.proposalid = rhp2.proposalid
+                            WHERE r2.facilitycode LIKE CONCAT('%',:" . $st . ",'%')
+                               OR CONCAT(p2.proposalcode, p2.proposalnumber) LIKE CONCAT('%',:" . ($st + 1) . ",'%')
+                            )
+                        )";
             array_push($args, $this->arg('s'), $this->arg('s'));
         }
 
@@ -2731,10 +2739,17 @@ function _container_registry()
 
         if ($this->has_arg('s')) {
             $st = sizeof($args) + 1;
-            $where .= " AND (lower(r.barcode) LIKE lower(CONCAT(CONCAT('%',:" . $st . "), '%')) OR lower(r.comments) LIKE lower(CONCAT(CONCAT('%',:" . ($st + 1) . "), '%')) OR lower(CONCAT(p.proposalcode,p.proposalnumber)) LIKE lower(CONCAT(CONCAT('%',:" . ($st + 2) . "), '%')))";
-            array_push($args, $this->arg('s'));
-            array_push($args, $this->arg('s'));
-            array_push($args, $this->arg('s'));
+            $where .= " AND (r.containerregistryid IN (
+                            SELECT DISTINCT r2.containerregistryid
+                            FROM containerregistry r2
+                            LEFT JOIN containerregistry_has_proposal rhp2 ON rhp2.containerregistryid = r2.containerregistryid
+                            LEFT JOIN proposal p2 ON p2.proposalid = rhp2.proposalid
+                            WHERE r2.barcode LIKE CONCAT('%',:" . $st . ",'%')
+                               OR r2.comments LIKE CONCAT('%',:" . ($st + 1) . ",'%')
+                               OR CONCAT(p2.proposalcode, p2.proposalnumber) LIKE CONCAT('%',:" . ($st + 2) . ",'%')
+                            )
+                        )";
+            array_push($args, $this->arg('s'), $this->arg('s'), $this->arg('s'));
         }
 
         if ($this->has_arg('t')) {
@@ -2743,7 +2758,7 @@ function _container_registry()
         }
 
 
-        $tot = $this->db->pq("SELECT count(r.containerregistryid) as tot 
+        $tot = $this->db->pq("SELECT count(DISTINCT r.containerregistryid) as tot
               FROM containerregistry r 
               LEFT OUTER JOIN containerregistry_has_proposal rhp on rhp.containerregistryid = r.containerregistryid
               LEFT OUTER JOIN proposal p ON p.proposalid = rhp.proposalid 

client/src/js/modules/shipment/views/containerregistry.js

@@ -111,6 +111,7 @@ define(['marionette',
 
             if (app.staff) {
                 this.listenTo(this.collection, 'backgrid:selected', this.selectModel, this)
+                this.collection.each(this.bindModelEvents, this)
 
                 this.proposals = new Proposals()
                 this.listenTo(this.proposals, 'backgrid:selected', this.selectModel, this)
@@ -138,7 +139,11 @@ define(['marionette',
                 })
             }
         },
-                                          
+
+        bindModelEvents: function(model) {
+            this.listenTo(model, 'backgrid:selected', this.selectModel)
+        },
+
         addToCollection: function(m) {
             this.collection.add(m)
             this.addProposalsToModel(m)
@@ -156,7 +161,16 @@ define(['marionette',
                         props.push(p.get('PROPOSAL'))
                         m.set('PROPOSALS', props.join(','))
                         // This will be called multiple times for many proposals. Might be a cleaner method..?
-                        app.alert({message: 'Added registered container ' + m.get('BARCODE') + ' to proposal(s) ' + props, notify: true})
+                        app.message({message: 'Added registered container ' + m.get('BARCODE') + ' to proposal ' + p.get('PROPOSAL'), notify: true})
+                    },
+                    error: function(model, response, options) {
+                        var errorMsg
+                        try {
+                            errorMsg = response.responseJSON.message
+                        } catch (e) {
+                            errorMsg = 'An unknown error occurred.'
+                        }
+                        app.alert({message: 'Failed to add ' + m.get('BARCODE') + ' to proposal ' + p.get('PROPOSAL') + ': ' + errorMsg, notify: true})
                     }
                 })
             }, this)

client/src/js/modules/shipment/views/dewarregistry.js

@@ -161,6 +161,7 @@ define(['marionette', 'backgrid',
 
             if (app.staff) {
                 this.listenTo(this.collection, 'backgrid:selected', this.selectModel, this)
+                this.collection.each(this.bindModelEvents, this)
 
                 this.proposals = new Proposals()
                 this.listenTo(this.proposals, 'backgrid:selected', this.selectModel, this)
@@ -189,7 +190,11 @@ define(['marionette', 'backgrid',
                 })
             }
         },
-                                          
+
+        bindModelEvents: function(model) {
+            this.listenTo(model, 'backgrid:selected', this.selectModel)
+        },
+
         addToCollection: function(m) {
             this.collection.add(m)
             this.addProposalsToModel(m)
@@ -207,7 +212,16 @@ define(['marionette', 'backgrid',
                         m.set('PROPOSALS', props.join(','))
                         if (!m.get('PROP')) m.set('PROP', p.get('PROPOSAL'))
                         // This will be called multiple times for many proposals. Might be a cleaner method..?
-                        app.message({message: 'Added registered dewar ' + m.get('FACILITYCODE') + ' to proposal(s) ' + props, notify: true})
+                        app.message({message: 'Added registered dewar ' + m.get('FACILITYCODE') + ' to proposal ' + p.get('PROPOSAL'), notify: true})
+                    },
+                    error: function(model, response, options) {
+                        var errorMsg
+                        try {
+                            errorMsg = response.responseJSON.message
+                        } catch (e) {
+                            errorMsg = 'An unknown error occurred.'
+                        }
+                        app.alert({message: 'Failed to add ' + m.get('FACILITYCODE') + ' to proposal ' + p.get('PROPOSAL') + ': ' + errorMsg, notify: true})
                     }
                 })
             }, this)