Update to SkyPortal 566972c2f6b99c4e221aff1f5dc40aa1db7c486c

grandma-collaboration · Nov 6, 2023 · 4c44cdd · 4c44cdd
1 parent 8751345
commit 4c44cdd
Show file tree

Hide file tree

Showing 3 changed files with 85 additions and 33 deletions.
diff --git a/extensions/skyportal/skyportal/app_server.py b/extensions/skyportal/skyportal/app_server.py
@@ -36,6 +36,7 @@
     IRSAQueryWISEHandler,
     VizierQueryHandler,
     DatalabQueryHandler,
+    PS1QueryHandler,
     DefaultFollowupRequestHandler,
     DefaultObservationPlanRequestHandler,
     DefaultSurveyEfficiencyRequestHandler,
@@ -478,6 +479,7 @@ def log_request(self, handler):
     (r'/api/sources(/[0-9A-Za-z-_\.\+]+)/annotations/irsa', IRSAQueryWISEHandler),
     (r'/api/sources(/[0-9A-Za-z-_\.\+]+)/annotations/vizier', VizierQueryHandler),
     (r'/api/sources(/[0-9A-Za-z-_\.\+]+)/annotations/datalab', DatalabQueryHandler),
+    (r'/api/sources(/[0-9A-Za-z-_\.\+]+)/annotations/ps1', PS1QueryHandler),
     (
         r'/api/(sources|spectra|photometry)(/[0-9A-Za-z-_\.\+]+)/annotations',
         AnnotationHandler,

diff --git a/extensions/skyportal/static/js/components/SourceDesktop.jsx b/extensions/skyportal/static/js/components/SourceDesktop.jsx
@@ -791,38 +791,88 @@ const SourceDesktop = ({ source }) => {
 
         {/* TODO 1) check for dead links; 2) simplify link formatting if possible */}
         <div className={classes.columnItem}>
-          <Accordion defaultExpanded>
-            <AccordionSummary
-              expandIcon={<ExpandMoreIcon />}
-              aria-controls="followup-content"
-              id="followup-header"
-            >
-              <Typography className={classes.accordionHeading}>
-                Follow-up
-              </Typography>
-            </AccordionSummary>
-            <AccordionDetails>
-              <div className={classes.followupContainer}>
-                <FollowupRequestForm
-                  obj_id={source.id}
-                  action="createNew"
-                  instrumentList={instrumentList}
-                  instrumentFormParams={instrumentFormParams}
-                />
-                <FollowupRequestLists
-                  followupRequests={source.followup_requests}
-                  instrumentList={instrumentList}
-                  instrumentFormParams={instrumentFormParams}
-                  totalMatches={source.followup_requests.length}
-                />
-                <AssignmentForm
-                  obj_id={source.id}
-                  observingRunList={observingRunList}
-                />
-                <AssignmentList assignments={source.assignments} />
-              </div>
-            </AccordionDetails>
-          </Accordion>
+          <div className={classes.columnItem}>
+            <Accordion defaultExpanded>
+              <AccordionSummary
+                expandIcon={<ExpandMoreIcon />}
+                aria-controls="followup-content"
+                id="followup-header"
+              >
+                <Typography className={classes.accordionHeading}>
+                  Follow-up
+                </Typography>
+              </AccordionSummary>
+              <AccordionDetails>
+                <div className={classes.followupContainer}>
+                  <FollowupRequestForm
+                    obj_id={source.id}
+                    action="createNew"
+                    instrumentList={instrumentList}
+                    instrumentFormParams={instrumentFormParams}
+                  />
+                  <FollowupRequestLists
+                    followupRequests={source.followup_requests}
+                    instrumentList={instrumentList}
+                    instrumentFormParams={instrumentFormParams}
+                    totalMatches={source.followup_requests.length}
+                  />
+                </div>
+              </AccordionDetails>
+            </Accordion>
+          </div>
+          <div className={classes.columnItem}>
+            <Accordion>
+              <AccordionSummary
+                expandIcon={<ExpandMoreIcon />}
+                aria-controls="followup-content"
+                id="forced-photometry-header"
+              >
+                <Typography className={classes.accordionHeading}>
+                  Forced Photometry
+                </Typography>
+              </AccordionSummary>
+              <AccordionDetails>
+                <div className={classes.followupContainer}>
+                  <FollowupRequestForm
+                    obj_id={source.id}
+                    action="createNew"
+                    instrumentList={instrumentList}
+                    instrumentFormParams={instrumentFormParams}
+                    requestType="forced_photometry"
+                  />
+                  <FollowupRequestLists
+                    followupRequests={source.followup_requests}
+                    instrumentList={instrumentList}
+                    instrumentFormParams={instrumentFormParams}
+                    totalMatches={source.followup_requests.length}
+                    requestType="forced_photometry"
+                  />
+                </div>
+              </AccordionDetails>
+            </Accordion>
+          </div>
+          <div className={classes.columnItem}>
+            <Accordion defaultExpanded>
+              <AccordionSummary
+                expandIcon={<ExpandMoreIcon />}
+                aria-controls="followup-content"
+                id="observing-run-header"
+              >
+                <Typography className={classes.accordionHeading}>
+                  Assign Target to Observing Run
+                </Typography>
+              </AccordionSummary>
+              <AccordionDetails>
+                <div className={classes.followupContainer}>
+                  <AssignmentForm
+                    obj_id={source.id}
+                    observingRunList={observingRunList}
+                  />
+                  <AssignmentList assignments={source.assignments} />
+                </div>
+              </AccordionDetails>
+            </Accordion>
+          </div>
         </div>
         <PhotometryTable
           obj_id={source.id}

diff --git a/skyportal b/skyportal