add conditional formatting to blood report, add total vol to grid, move performedby field (#764)

Author: csebranek

WNPRC_EHR/resources/queries/study/blood.query.xml

@@ -13,6 +13,8 @@
                     </column>
                     <column columnName="date">
                     </column>
+                    <column columnName="performedby">
+                    </column>
                     <column columnName="project">
 
                     </column>

WNPRC_EHR/resources/queries/study/currentBloodDraws.query.xml

@@ -70,11 +70,27 @@
                     <column columnName="allowableBlood">
                         <columnTitle>Volume Available Today (mL)</columnTitle>
                         <description>This shows the amount of blood remaining today. It includes blood draws that happened 30 days in the past up to today.</description>
+                        <conditionalFormats>
+                            <conditionalFormat>
+                                <filters>
+                                    <filter operator="lt" value="0"/>
+                                </filters>
+                                <backgroundColor>FF0000</backgroundColor>
+                            </conditionalFormat>
+                        </conditionalFormats>
                     </column>
                     <column columnName="allowableBloodIncludingFutureDraws">
                         <columnTitle>Volume Remaining After All Draws (mL)</columnTitle>
                         <url>/WNPRC/EHR/ehr-animalHistory.view#subjects:${Id}&amp;inputType:singleSubject&amp;showReport:1&amp;activeReport:BloodSummary</url>
                         <description>This column shows the amount of blood remaining for the animal while considering future draws. It includes approved blood draws 30 days into the future and past blood draws 30 days in the past.</description>
+                        <conditionalFormats>
+                            <conditionalFormat>
+                                <filters>
+                                    <filter operator="lt" value="0"/>
+                                </filters>
+                                <backgroundColor>FF0000</backgroundColor>
+                            </conditionalFormat>
+                        </conditionalFormats>
                     </column>
                 </columns>
             </table>

WNPRC_EHR/resources/web/ehr/metadata/Default.js

@@ -2471,7 +2471,7 @@ EHR.Metadata.registerMetadata('Default', {
             }
             ,quantity: {
                 //xtype: 'displayfield',
-                shownInGrid: false,
+                shownInGrid: true,
                 allowBlank: false,
                 editorConfig: {
                     allowNegative: false,

WNPRC_EHR/resources/web/ehr/metadata/Metadata.js

@@ -239,7 +239,7 @@ EHR.Metadata.Columns = {
     'Behavior Remarks':              EHR.Metadata.topCols + ',so,a,p,category,'                                                                                                                                                                                                               + EHR.Metadata.bottomCols,
     Biopsies:                        EHR.Metadata.topCols + ',billingComplete,caseno,type,veterinarian,performedby,nhpbmd,grossdescription,histologicalDescription,'                                                                                                                          + EHR.Metadata.bottomCols + ',patho_notes',
     Birth:                           EHR.Metadata.topCols + ',estimated,gender,weight,wdate,dam,sire,room,cage,cond,origin,ancestry,conception,type,'                                                                                                                                                  + EHR.Metadata.bottomCols,
-    blood:                          'id/curlocation/location,' + EHR.Metadata.topCols + ',objectid,requestid,tube_type,tube_vol,num_tubes,quantity,requestor,additionalServices,billedby,assayCode,restraint,restraintDuration,daterequested,instructions,'                                                     + EHR.Metadata.bottomCols,
+    blood:                          'id/curlocation/location,'+ 'id,date,performedby,enddate,project,account' + ',objectid,requestid,tube_type,tube_vol,num_tubes,quantity,requestor,additionalServices,billedby,assayCode,restraint,restraintDuration,daterequested,instructions,'                                                     +'remark,qcstate,'+EHR.Metadata.hiddenCols,
     'Body Condition':                EHR.Metadata.topCols + ',score,weightstatus,remark,tattoo_chest,tattoo_thigh,microchip,tag,tattoo_remark,'                                                                                                                                               + EHR.Metadata.bottomCols,
     cage_observations:               'date,room,cage,feces,userId,no_observations,'                                                                                                                                                                                                           + EHR.Metadata.sharedCols,
     Charges:                         EHR.Metadata.topCols + ',type,unitCost,quantity,'                                                                                                                                                                                                        + EHR.Metadata.bottomCols,