Let users set and view nicknames for instruments instead of serial numbers

resources/queries/targetedms/InstrumentSummaryByFolder.sql

@@ -1,11 +1,11 @@
 SELECT
-       COUNT(ReplicateId.RunId) AS SkylineDocumentCount,
+       COUNT(DISTINCT ReplicateId.RunId) AS SkylineDocumentCount,
        COUNT(DISTINCT ReplicateId) AS ReplicateCount,
        MIN(AcquiredTime) AS FirstAcquisition,
        MAX(AcquiredTime) AS LastAcquisition,
        ReplicateId.RunId.Container,
-       InstrumentSerialNumber
+       InstrumentNickname
 FROM targetedms.SampleFile
 GROUP BY
          ReplicateId.RunId.Container,
-         InstrumentSerialNumber
+         InstrumentNickname

resources/queries/targetedms/QCInstrumentSummary.sql

@@ -1,4 +1,5 @@
 SELECT
+    sf.InstrumentNickname AS Nickname,
     sf.InstrumentId.model AS InstrumentName,
     sf.InstrumentSerialNumber AS SerialNumber,
     MIN(sf.AcquiredTime) AS StartDate,
@@ -9,6 +10,7 @@ SELECT
 FROM targetedms.SampleFile sf
 INNER JOIN replicate rep ON sf.replicateId = rep.Id
 GROUP BY
+         sf.InstrumentNickname,
          sf.InstrumentSerialNumber,
          sf.InstrumentId.model,
          rep.runId

resources/queries/targetedms/samplefile/.qview.xml

@@ -9,8 +9,7 @@
                 <property name="columnTitle" value="Skyline Document"/>
             </properties>
         </column>
-        <column name="InstrumentId" />
-        <column name="InstrumentSerialNumber" />
+        <column name="InstrumentNickname" />
         <column name="ModifiedTime" />
     </columns>
     <sorts>

resources/schemas/dbscripts/postgresql/targetedms-25.003-25.004.sql

@@ -0,0 +1,18 @@
+CREATE TABLE targetedms.InstrumentNickname
+(
+    Id              BIGSERIAL NOT NULL,
+
+    Container       entityid NOT NULL,
+    Created         TIMESTAMP,
+    CreatedBy       USERID,
+    Modified        TIMESTAMP,
+    ModifiedBy      USERID,
+
+    SerialNumber    VARCHAR(200),
+    Model           VARCHAR(300),
+    Nickname        VARCHAR(200),
+
+    CONSTRAINT PK_InstrumentNickname PRIMARY KEY (Id)
+);
+CREATE INDEX IDX_InstrumentNickname_Container ON targetedms.InstrumentNickname(Container);
+

resources/schemas/dbscripts/sqlserver/targetedms-25.003-25.004.sql

@@ -0,0 +1,18 @@
+CREATE TABLE targetedms.InstrumentNickname
+(
+    Id              BIGINT IDENTITY(1, 1) NOT NULL,
+
+    Container       entityid NOT NULL,
+    Created         DATETIME,
+    CreatedBy       USERID,
+    Modified        DATETIME,
+    ModifiedBy      USERID,
+
+    SerialNumber    NVARCHAR(200),
+    Model           NVARCHAR(300),
+    Nickname        NVARCHAR(200),
+
+    CONSTRAINT PK_InstrumentNickname PRIMARY KEY (Id)
+);
+CREATE INDEX IDX_InstrumentNickname_Container ON targetedms.InstrumentNickname(Container);
+

resources/schemas/targetedms.xml

@@ -1920,4 +1920,17 @@
             <column columnName="Container"/>
         </columns>
     </table>
+    <table tableName="InstrumentNickname" tableDbType="TABLE">
+        <columns>
+            <column columnName="Id"/>
+            <column columnName="Created"/>
+            <column columnName="CreatedBy"/>
+            <column columnName="Modified"/>
+            <column columnName="ModifiedBy"/>
+            <column columnName="Container"/>
+            <column columnName="SerialNumber"/>
+            <column columnName="Model"/>
+            <column columnName="Nickname"/>
+        </columns>
+    </table>
 </tables>