Navigation improvements

Author: labkey-jeckels

resources/queries/targetedms/msProject.query.xml

@@ -6,6 +6,9 @@
                     <column columnName="Id">
                         <url>/targetedms-msProjectDetails.view?project=${Id}</url>
                     </column>
+                    <column columnName="Title">
+                        <url>/targetedms-msProjectDetails.view?project=${Id}</url>
+                    </column>
                 </columns>
             </table>
         </tables>

resources/queries/targetedms/userProjects.query.xml

@@ -3,9 +3,6 @@
         <tables xmlns="http://labkey.org/data/xml">
             <table tableName="userProjects" tableDbType="TABLE">
                 <columns>
-                    <column columnName="Title">
-                        <url>/targetedms-msProjectDetails.view?project=${Id}</url>
-                    </column>
                 </columns>
             </table>
         </tables>

resources/views/instrumentSchedulingAdmin.html

@@ -1,5 +1,5 @@
 <div><a href="targetedms-scheduleAllInstruments.view">All instrument calendar view</a></div>
-<div><a href="query-executeQuery.view?schemaName=targetedms&query.queryName=userProjects">Your project list</a></div>
+<div><a href="targetedms-msProject.view">Your project list</a></div>
 
 <div>&nbsp;</div>
 

resources/views/msProject.html

@@ -1,18 +1,20 @@
 <div id="ms-project"></div>
+<br/>
+<div id="all-projects"></div>
 <script type="text/javascript" nonce="<%=scriptNonce%>">
     (function(){
-    let webpart = <%=webpartContext%>;
     let config = {
-        renderTo: webpart.wrapperDivId,
+        renderTo: 'ms-project',
         frame: 'none',
         schemaName: 'targetedms',
         queryName: 'userProjects',
         containerFilter: LABKEY.Query.containerFilter.currentAndSubfolders
     };
     // admins can see all projects, non-admins can only see projects they are a researcher on
-    if (!LABKEY.user.isAdmin) {
-        config.filterArray = [LABKEY.Filter.create('researcher', LABKEY.user.id, LABKEY.Filter.Types.EQUAL)];
-    }
     new LABKEY.QueryWebPart(config);
+
+    if (LABKEY.user.isAdmin) {
+        document.getElementById('all-projects').innerHTML = LABKEY.Utils.textLink({text: 'View all projects', href: 'query-executeQuery.view?schemaName=targetedms&query.queryName=msProject'});
+    }
     })();
 </script>

resources/views/msProjectDetails.html

@@ -1,10 +1,11 @@
 <div id="project-details">
 </div>
-<div id="payment-methods">
+<div id="schedule-instrument-time">
 </div>
-<div id="add-payment-method-link">
+<br/>
+<div id="payment-methods">
 </div>
-<div id="schedule-instrument-time">
+<div id="payment-summary">
 </div>
 
 <script type="text/javascript" nonce="<%=scriptNonce%>">
@@ -83,25 +84,25 @@
         });
 
         // query web part to show payment method and other invoice details - custom query
-        let webpart = <%=webpartContext%>;
         new LABKEY.QueryWebPart({
-            renderTo: 'payment-methods',
+            renderTo: 'payment-summary',
             frame: 'portal',
-            title: 'Payment Methods',
+            title: 'Payment Summary',
             schemaName: 'targetedms',
             queryName: 'paymentMethodCostSummary',
             filterArray: [LABKEY.Filter.create('project', project, LABKEY.Filter.Types.EQUAL)],
             containerFilter: LABKEY.Query.containerFilter.currentAndSubfolders
         });
 
-        // add payment method link
-        const addPaymentMethodEl = document.getElementById('add-payment-method-link');
-        const urlParams = {
+        new LABKEY.QueryWebPart({
+            renderTo: 'payment-methods',
+            frame: 'portal',
+            title: 'Payment Methods',
             schemaName: 'targetedms',
-            queryName: 'ProjectPaymentMethod',
-            returnUrl: LABKEY.ActionURL.buildURL('targetedms', 'msProjectDetails', null, { project: project })
-        };
-        addPaymentMethodEl.innerHTML = LABKEY.Utils.textLink({text: 'Add payment method', href: LABKEY.ActionURL.buildURL('query', 'insertQueryRow', LABKEY.ActionURL.getContainer(), urlParams)});;
+            queryName: 'projectPaymentMethod',
+            filterArray: [LABKEY.Filter.create('project', project, LABKEY.Filter.Types.EQUAL)],
+            containerFilter: LABKEY.Query.containerFilter.currentAndSubfolders
+        });
 
         const scheduleInstrumentTimeEl = document.getElementById('schedule-instrument-time');
         const scheduleUrlParams = {