LIMS-1639: List most common screens at the top of the list (#928)

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

Author: ndg63276

api/src/Page/Imaging.php

@@ -866,11 +866,12 @@ function _get_screens()
             array_push($args, $this->arg('scid'));
         }
 
-        $screens = $this->db->pq("SELECT ct.name as containertypeid, IFNULL(ct.capacity, 96) as capacity, CONCAT(p.proposalcode, p.proposalnumber) as prop, s.global, s.name, s.screenid, s.proposalid, count(distinct sg.screencomponentgroupid) as groups, count(distinct sc.screencomponentid) as components
+        $screens = $this->db->pq("SELECT ct.name as containertypeid, IFNULL(ct.capacity, 96) as capacity, CONCAT(p.proposalcode, p.proposalnumber) as prop, s.global, s.name, s.screenid, s.proposalid, count(distinct sg.screencomponentgroupid) as groups, count(distinct sc.screencomponentid) as components, COUNT(DISTINCT c.containerid) AS cnt
               FROM screen s
               LEFT OUTER JOIN screencomponentgroup sg ON sg.screenid = s.screenid
               LEFT OUTER JOIN screencomponent sc ON sc.screencomponentgroupid = sg.screencomponentgroupid
               LEFT OUTER JOIN containertype ct ON ct.containertypeid = s.containertypeid
+              LEFT OUTER JOIN container c ON c.screenId = s.screenid
               INNER JOIN proposal p ON p.proposalid = s.proposalid
               WHERE $where
               GROUP BY CONCAT(p.proposalcode, p.proposalnumber), s.global, s.name, s.screenid, s.proposalid", $args);

client/src/js/modules/types/mx/shipment/views/container-mixin.js

@@ -194,7 +194,10 @@ export default {
       this.imagingScreensCollection = new ImagingScreens(null, { state: { pageSize: 9999 } })
 
       const result = await this.$store.dispatch('getCollection', this.imagingScreensCollection)
-      this.imagingScreens = [{ NAME: '-', SCREENID: '' }, ... result.toJSON()]
+      const originalData = result.toJSON()
+      const resultCopy = JSON.parse(JSON.stringify(originalData))
+      const top15 = resultCopy.sort((a, b) => Number(b.CNT) - Number(a.CNT)).slice(0, 15)
+      this.imagingScreens = [{ NAME: '---', SCREENID: '' }, ...top15, { NAME: '---', SCREENID: '' }, ...originalData]
     },
     async getImagingScheduleComponentsCollection() {
       this.imagingScheduleComponentsCollection = new ImagingScheduleComponents(null, { state: { pageSize: 9999 } })