psat-server-web 0.1.9__tar.gz → 0.1.11__tar.gz

{psat-server-web-0.1.9/psat_server_web.egg-info → psat-server-web-0.1.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: psat-server-web
-Version: 0.1.9
+Version: 0.1.11
 Summary: Pan-STARRS and ATLAS web interface.
 Home-page: https://github.com/genghisken/psat-server-web
 Author: genghisken

psat-server-web-0.1.11/psat_server_web/__version__.py

@@ -0,0 +1 @@
+__version__ = '0.1.11'

{psat-server-web-0.1.9 → psat-server-web-0.1.11}/psat_server_web/atlas/atlas/dbviews.py

@@ -315,6 +315,39 @@ class WebViewFollowupTransients8(WebViewAbstractFollowup):
 
         db_table = 'atlas_v_followup8'
 
+class WebViewFollowupTransients9(WebViewAbstractFollowup):
+    """WebViewFollowupTransients9.
+    """
+
+
+    class Meta(WebViewAbstractFollowup.Meta):
+        """Meta.
+        """
+
+        db_table = 'atlas_v_followup9'
+
+class WebViewFollowupTransients10(WebViewAbstractFollowup):
+    """WebViewFollowupTransients10.
+    """
+
+
+    class Meta(WebViewAbstractFollowup.Meta):
+        """Meta.
+        """
+
+        db_table = 'atlas_v_followup10'
+
+class WebViewFollowupTransients11(WebViewAbstractFollowup):
+    """WebViewFollowupTransients11.
+    """
+
+
+    class Meta(WebViewAbstractFollowup.Meta):
+        """Meta.
+        """
+
+        db_table = 'atlas_v_followup11'
+
 class WebViewFollowupTransientsGeneric(WebViewAbstractFollowup):
     """WebViewFollowupTransientsGeneric.
     """

{psat-server-web-0.1.9 → psat-server-web-0.1.11}/psat_server_web/atlas/atlas/formchoices.py

@@ -1,11 +1,12 @@
 # Form display options file
 
 PROMOTION_CHOICES = (
-    ('Confirmed', 'Promote Object to Confirmed List'),
+    ('Followup', 'Promote Object to Followup List'),
     ('Good', 'Promote Object to Good List'),
     ('Attic', 'Promote Object to Attic List'),
     ('Eyeball', 'Move Object to Eyeball List'),
     ('Possible', 'Promote Object to Possible List'),
+    ('HPMStar', 'Move to HPM Star List'),
     ('Garbage', 'Consign to Garbage'),
     ('DoNothing', 'Undecided - Comment only'),
 )
@@ -17,13 +18,14 @@ EYEBALL_PROMOTION_CHOICES = (
     ('Good', 'Promote Object to Good List'),
     ('Attic', 'Promote Object to Attic List'),
     ('Possible', 'Promote Object to Possible List'),
+    ('HPMStar', 'Move to HPM Star List'),
     ('Garbage', 'Consign to Garbage'),
     ('DoNothing', 'Undecided - Comment only'),
 )
 
 # It's a GOOD object
 GOOD_POST_PROMOTION_CHOICES = (
-    ('Confirmed', 'Promote Object to Confirmed List'),
+    ('Followup', 'Promote Object to Followup List'),
     ('Attic', 'Move Object to Attic List'),
     ('Possible', 'Move Object to Possible List'),
     ('Garbage', 'Consign to Garbage'),
@@ -35,6 +37,7 @@ GOOD_POST_PROMOTION_CHOICES = (
 POSSIBLE_POST_PROMOTION_CHOICES = (
     ('Good', 'Promote Object to Good List'),
     ('Attic', 'Move Object to Attic List'),
+    ('HPMStar', 'Move to HPM Star List'),
     ('Garbage', 'Consign to Garbage'),
     ('DoNothing', 'Add a Comment'),
 )
@@ -58,8 +61,8 @@ STAR_POST_PROMOTION_CHOICES = (
     ('DoNothing', 'Add a Comment'),
 )
 
-# It's a CONFIRMED object
-CONFIRMED_POST_PROMOTION_CHOICES = (
+# It's a FOLLOWUP target (formerly confirmed)
+FOLLOWUP_POST_PROMOTION_CHOICES = (
     ('Good', 'Move Object to Good List'),
     ('Attic', 'Move Object to Attic List'),
     ('Possible', 'Move Object to Possible List'),
@@ -160,7 +163,7 @@ LIGHTCURVE_REPLOTTING_CHOICES = (
 
 # 2021-05-12 KWS Added selector templates for Django Tables2 for quickview.
 
-choiceSelectors = {'T': '0', 'C': '1', 'G': '2', 'P': '3', 'E': '4', 'A': '5', 'U': '1000'}
+choiceSelectors = {'T': '0', 'C': '1', 'G': '2', 'P': '3', 'E': '4', 'A': '5', 'S': '11', 'U': '1000'}
 
 def getChoiceSelectorTemplate(choice, checked = ''):
     templateParameters = {'template': None, 'attrs': None}

{psat-server-web-0.1.9 → psat-server-web-0.1.11}/psat_server_web/atlas/atlas/settings.py

@@ -173,3 +173,6 @@ INSTALLED_APPS = [
     'atlas',
     'django_tables2',
 ]
+#    'rest_framework',
+#    'rest_framework.authtoken',
+

{psat-server-web-0.1.9 → psat-server-web-0.1.11}/psat_server_web/atlas/atlas/urls.py

@@ -12,6 +12,7 @@ admin.autodiscover()
 urlpatterns = [
     # 2016-02-24 KWS Introduced the Django Admin URL
     path('admin/', admin.site.urls),
+#    path('', include('atlasapi.urls')),
     # 2016-02-26 KWS Add the authentication URLs
     url(r'^accounts/login/', views.login, name="login"),
     url(r'^accounts/logout/', views.logout, name="logout"),

{psat-server-web-0.1.9 → psat-server-web-0.1.11}/psat_server_web/atlas/atlas/views.py

@@ -190,11 +190,11 @@ class TcsDetectionListsForm(forms.Form):
 
     name = forms.CharField()
 
-GARBAGE, CONFIRMED, GOOD, POSSIBLE, EYEBALL, ATTIC, STAR, AGN, FASTEYE, MOVERS, SMCLMC = list(range(11))
+GARBAGE, FOLLOWUP, GOOD, POSSIBLE, EYEBALL, ATTIC, STAR, AGN, FASTEYE, MOVERS, SMCLMC, HPMSTAR = list(range(12))
 
 OBJECT_LISTS = {
     'Garbage': GARBAGE,
-    'Confirmed': CONFIRMED,
+    'Followup': FOLLOWUP,
     'Good': GOOD,
     'Possible': POSSIBLE,
     'Eyeball': EYEBALL,
@@ -204,6 +204,7 @@ OBJECT_LISTS = {
     'FastEye': FASTEYE,
     'Movers': MOVERS,
     'SMCLMC': SMCLMC,
+    'HPMStar': HPMSTAR,
     'DoNothing': -1
 }
 
@@ -853,7 +854,7 @@ def candidate(request, atlas_diff_objects_id):
 
                 # 2010-12-02 KWS Added check for atlasDesignation.  Don't choose a new designation
                 # if we already have one.
-                if not atlasDesignation and (listId == GOOD or listId == POSSIBLE or listId == ATTIC or listId == CONFIRMED):
+                if not atlasDesignation and (listId == GOOD or listId == POSSIBLE or listId == ATTIC or listId == FOLLOWUP):
                     surveyField = 'ATLAS'
 
                     try:
@@ -987,20 +988,20 @@ def candidate(request, atlas_diff_objects_id):
         # 2011-10-04 KWS Added GARBAGE choices
         if listId == EYEBALL or listId == FASTEYE or listId == SMCLMC or listId == AGN:
             form.fields['promote_demote'].choices = EYEBALL_PROMOTION_CHOICES
-        elif listId == CONFIRMED:
-            form.fields['promote_demote'].choices = CONFIRMED_POST_PROMOTION_CHOICES
+        elif listId == FOLLOWUP:
+            form.fields['promote_demote'].choices = FOLLOWUP_POST_PROMOTION_CHOICES
         elif listId == GOOD:
             form.fields['promote_demote'].choices = GOOD_POST_PROMOTION_CHOICES
         elif listId == POSSIBLE:
             form.fields['promote_demote'].choices = POSSIBLE_POST_PROMOTION_CHOICES
         elif listId == ATTIC:
             form.fields['promote_demote'].choices = ATTIC_POST_PROMOTION_CHOICES
-        elif listId == STAR:
+        elif listId == STAR or listId == HPMSTAR:
             form.fields['promote_demote'].choices = STAR_POST_PROMOTION_CHOICES
         elif listId == GARBAGE:
             form.fields['promote_demote'].choices = GARBAGE_CHOICES
         else:
-            form.fields['promote_demote'].choices = CONFIRMED_POST_PROMOTION_CHOICES
+            form.fields['promote_demote'].choices = FOLLOWUP_POST_PROMOTION_CHOICES
 
 
     transient_images = TcsPostageStampImages.objects.filter(image_filename__istartswith = str(transient.id)).exclude(image_filename__istartswith = str(transient.id), image_type__iendswith = 'finder').order_by('-image_filename')
@@ -1294,7 +1295,7 @@ def candidateddc(request, atlas_diff_objects_id, template_name):
 
                 # 2010-12-02 KWS Added check for atlasDesignation.  Don't choose a new designation
                 # if we already have one.
-                if not atlasDesignation and (listId == GOOD or listId == POSSIBLE or listId == ATTIC or listId == CONFIRMED):
+                if not atlasDesignation and (listId == GOOD or listId == POSSIBLE or listId == ATTIC or listId == FOLLOWUP):
                     surveyField = 'ATLAS'
 
                     try:
@@ -1354,7 +1355,17 @@ def candidateddc(request, atlas_diff_objects_id, template_name):
                 # Do an update if the form is valid, regardless of setting of detection list. If the
                 # form is valid, it means we've made a choice - if only to add some comments.
                 try:
-                   if (originalListId == EYEBALL or originalListId == POSSIBLE or originalListId == ATTIC or originalListId == STAR or originalListId == FASTEYE or originalListId == SMCLMC) and (listId == GOOD or listId == CONFIRMED):
+                   if (originalListId == GOOD) and (listId == FOLLOWUP) and comments.strip() == '':
+                       # Did the user add any comments? Ah, ah, ah - blank comments not allowed!
+                       request.session['error'] = "WARNING: Please add a comment before promoting to the Followup Targets list, so other users know why it is there!"
+                       redirect_to = "../../error/"
+                       return HttpResponseRedirect(redirect_to)
+                   if originalListId in [EYEBALL, FASTEYE, SMCLMC, STAR, HPMSTAR, AGN, MOVERS] and (listId == POSSIBLE) and comments.strip() == '':
+                       # Did the user add any comments? Ah, ah, ah - blank comments not allowed!
+                       request.session['error'] = "WARNING: Please add a comment before promoting to the Possible list, so other users know why it is there!"
+                       redirect_to = "../../error/"
+                       return HttpResponseRedirect(redirect_to)
+                   if (originalListId == EYEBALL or originalListId == POSSIBLE or originalListId == ATTIC or originalListId == STAR or originalListId == FASTEYE or originalListId == SMCLMC or originalListId == HPMSTAR) and (listId == GOOD or listId == FOLLOWUP):
                        # Is there an object already in the good or confirmed lists within 2.0 arcsec?
                        message, goodObjects = coneSearchHTM(transient.ra, transient.dec, 2.0, 'atlas_v_followup2', queryType = FULL, conn = connection, django = True)
                        message, confirmedObjects = coneSearchHTM(transient.ra, transient.dec, 2.0, 'atlas_v_followup1', queryType = FULL, conn = connection, django = True)
@@ -1362,7 +1373,7 @@ def candidateddc(request, atlas_diff_objects_id, template_name):
                            # Object is already in the good or confirmed lists. Please move to attic.
                            request.session['error'] = "WARNING: Duplicate object is already in the Good List. Please go back and move this to the Attic or Garbage."
                            redirect_to = "../../error/"
-                           return HttpResponseRedirect(redirect_to)  
+                           return HttpResponseRedirect(redirect_to)
 
                    # 2018-09-28 KWS Ok - we really need to stop updates happening if processing status is not
                    #                set correctly.
@@ -1393,9 +1404,9 @@ def candidateddc(request, atlas_diff_objects_id, template_name):
                    # Register the object on TNS
                    # 2018-05-14 KWS If the previous list was also good (e.g. just adding a comment) don't send a message
                    #                to the TNS daemon.
-                   # 2020-02-28 KWS Don't bother registering an object on TNS if the original list was CONFIRMED and
+                   # 2020-02-28 KWS Don't bother registering an object on TNS if the original list was FOLLOWUP and
                    #                we are moving back to GOOD.
-                   if listId == GOOD and originalListId != GOOD and originalListId != CONFIRMED and dbName == 'atlas4':
+                   if listId == GOOD and originalListId != GOOD and originalListId != FOLLOWUP and dbName == 'atlas4':
                        if settings.DAEMONS['tns']['test']:
                            response = sendMessage(settings.DAEMONS['tns']['host'], settings.DAEMONS['tns']['port'], TNS_MESSAGES['SUBMITTEST'])
                        else:
@@ -1470,20 +1481,20 @@ def candidateddc(request, atlas_diff_objects_id, template_name):
         # 2011-10-04 KWS Added GARBAGE choices
         if listId == EYEBALL or listId == FASTEYE or listId == SMCLMC or listId == AGN:
             form.fields['promote_demote'].choices = EYEBALL_PROMOTION_CHOICES
-        elif listId == CONFIRMED:
-            form.fields['promote_demote'].choices = CONFIRMED_POST_PROMOTION_CHOICES
+        elif listId == FOLLOWUP:
+            form.fields['promote_demote'].choices = FOLLOWUP_POST_PROMOTION_CHOICES
         elif listId == GOOD:
             form.fields['promote_demote'].choices = GOOD_POST_PROMOTION_CHOICES
         elif listId == POSSIBLE:
             form.fields['promote_demote'].choices = POSSIBLE_POST_PROMOTION_CHOICES
         elif listId == ATTIC:
             form.fields['promote_demote'].choices = ATTIC_POST_PROMOTION_CHOICES
-        elif listId == STAR:
+        elif listId == STAR or listId == HPMSTAR:
             form.fields['promote_demote'].choices = STAR_POST_PROMOTION_CHOICES
         elif listId == GARBAGE:
             form.fields['promote_demote'].choices = GARBAGE_CHOICES
         else:
-            form.fields['promote_demote'].choices = CONFIRMED_POST_PROMOTION_CHOICES
+            form.fields['promote_demote'].choices = FOLLOWUP_POST_PROMOTION_CHOICES
 
 
     transient_images = TcsPostageStampImages.objects.filter(image_filename__istartswith = str(transient.id)).exclude(image_filename__istartswith = str(transient.id), image_type__iendswith = 'finder').order_by('-image_filename')
@@ -2370,7 +2381,10 @@ followupClassList = [WebViewFollowupTransients0,
                      WebViewFollowupTransients5,
                      WebViewFollowupTransients6,
                      WebViewFollowupTransients7,
-                     WebViewFollowupTransients8]
+                     WebViewFollowupTransients8,
+                     WebViewFollowupTransients9,
+                     WebViewFollowupTransients10,
+                     WebViewFollowupTransients11]
 
 
 @login_required
@@ -2919,6 +2933,7 @@ class AtlasDiffObjectsTableEyeballOptions(AtlasDiffObjectsTable):
 
     # We want to render the id link as a drop down menu. Do is this way!
     U = tables2.TemplateColumn(getChoiceSelectorTemplate("U", checked = 'checked')['template'], verbose_name="U", orderable=False, attrs=getChoiceSelectorTemplate("U")['attrs'])
+    S = tables2.TemplateColumn(getChoiceSelectorTemplate("S")['template'], verbose_name="S", orderable=False, attrs=getChoiceSelectorTemplate("S")['attrs'])
     P = tables2.TemplateColumn(getChoiceSelectorTemplate("P")['template'], verbose_name="P", orderable=False, attrs=getChoiceSelectorTemplate("P")['attrs'])
     A = tables2.TemplateColumn(getChoiceSelectorTemplate("A")['template'], verbose_name="A", orderable=False, attrs=getChoiceSelectorTemplate("A")['attrs'])
     T = tables2.TemplateColumn(getChoiceSelectorTemplate("T")['template'], verbose_name="T", orderable=False, attrs=getChoiceSelectorTemplate("T")['attrs'])
@@ -2936,6 +2951,7 @@ class AtlasDiffObjectsTablePossibleOptions(AtlasDiffObjectsTable):
 
     # We want to render the id link as a drop down menu. Do is this way!
     U = tables2.TemplateColumn(getChoiceSelectorTemplate("U", checked = 'checked')['template'], verbose_name="U", orderable=False, attrs=getChoiceSelectorTemplate("U")['attrs'])
+    S = tables2.TemplateColumn(getChoiceSelectorTemplate("S")['template'], verbose_name="S", orderable=False, attrs=getChoiceSelectorTemplate("S")['attrs'])
     A = tables2.TemplateColumn(getChoiceSelectorTemplate("A")['template'], verbose_name="A", orderable=False, attrs=getChoiceSelectorTemplate("A")['attrs'])
     T = tables2.TemplateColumn(getChoiceSelectorTemplate("T")['template'], verbose_name="T", orderable=False, attrs=getChoiceSelectorTemplate("T")['attrs'])
 
@@ -2952,7 +2968,6 @@ class AtlasDiffObjectsTableGoodOptions(AtlasDiffObjectsTable):
 
     # We want to render the id link as a drop down menu. Do is this way!
     U = tables2.TemplateColumn(getChoiceSelectorTemplate("U", checked = 'checked')['template'], verbose_name="U", orderable=False, attrs=getChoiceSelectorTemplate("U")['attrs'])
-    C = tables2.TemplateColumn(getChoiceSelectorTemplate("C")['template'], verbose_name="C", orderable=False, attrs=getChoiceSelectorTemplate("C")['attrs'])
     P = tables2.TemplateColumn(getChoiceSelectorTemplate("P")['template'], verbose_name="P", orderable=False, attrs=getChoiceSelectorTemplate("P")['attrs'])
     A = tables2.TemplateColumn(getChoiceSelectorTemplate("A")['template'], verbose_name="A", orderable=False, attrs=getChoiceSelectorTemplate("A")['attrs'])
 
@@ -2963,7 +2978,7 @@ class AtlasDiffObjectsTableGoodOptions(AtlasDiffObjectsTable):
         template_name = "bootstrap4_django_tables2_atlas.html"
 
 
-class AtlasDiffObjectsTableConfirmedOptions(AtlasDiffObjectsTable):
+class AtlasDiffObjectsTableFollowupOptions(AtlasDiffObjectsTable):
     """AtlasDiffObjectsTable with buttons (templates in formchoices).
     """
 
@@ -2996,7 +3011,7 @@ class AtlasDiffObjectsTableGarbageOptions(AtlasDiffObjectsTable):
 
 
 AtlasDiffObjectsTables = [AtlasDiffObjectsTableGarbageOptions,
-                          AtlasDiffObjectsTableConfirmedOptions,
+                          AtlasDiffObjectsTableFollowupOptions,
                           AtlasDiffObjectsTableGoodOptions,
                           AtlasDiffObjectsTablePossibleOptions,
                           AtlasDiffObjectsTableEyeballOptions,
@@ -3005,9 +3020,10 @@ AtlasDiffObjectsTables = [AtlasDiffObjectsTableGarbageOptions,
                           AtlasDiffObjectsTableEyeballOptions,
                           AtlasDiffObjectsTableEyeballOptions,
                           AtlasDiffObjectsTableEyeballOptions,
+                          AtlasDiffObjectsTableEyeballOptions,
                           AtlasDiffObjectsTableEyeballOptions]
 
-PROMOTE_DEMOTE = {'C': 1, 'G': 2, 'P': 3, 'E': 4, 'A': 5, 'T': 0}
+PROMOTE_DEMOTE = {'C': 1, 'G': 2, 'P': 3, 'E': 4, 'A': 5, 'S': 11, 'T': 0}
 
 # 2015-02-26 KWS Need to hide the current trend and RB Factor from
 #                the public pages
@@ -3138,7 +3154,7 @@ def followupQuickView(request, listNumber):
                     fieldCounter = transient.followup_counter
 
 
-                    if not atlasDesignation and (listId == GOOD or listId == POSSIBLE or listId == ATTIC or listId == CONFIRMED):
+                    if not atlasDesignation and (listId == GOOD or listId == POSSIBLE or listId == ATTIC or listId == FOLLOWUP):
                         # ASSUMPTION!!  All filenames contain dots and the first part is the field name.
                         surveyField = 'ATLAS'
 
@@ -3746,7 +3762,7 @@ def followupQuickViewBootstrapPlotly(request, listNumber):
                     fieldCounter = transient.followup_counter
 
 
-                    if not atlasDesignation and (listId == GOOD or listId == POSSIBLE or listId == ATTIC or listId == CONFIRMED):
+                    if not atlasDesignation and (listId == GOOD or listId == POSSIBLE or listId == ATTIC or listId == FOLLOWUP):
                         # ASSUMPTION!!  All filenames contain dots and the first part is the field name.
                         surveyField = 'ATLAS'
 

psat-server-web-0.1.11/psat_server_web/atlas/atlasapi/apps.py

@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class ATLASapiConfig(AppConfig):
+    name = 'atlasapi'
+

psat-server-web-0.1.11/psat_server_web/atlas/atlasapi/query_auth.py

@@ -0,0 +1,17 @@
+from django.contrib.auth.models import User
+from rest_framework import authentication
+from rest_framework import exceptions
+from re import match
+
+class QueryAuthentication(authentication.TokenAuthentication):
+    def authenticate(self, request):
+        token = request.query_params.get('token')
+
+        if not token:
+            return None
+
+        if not match("^\w+$", token):
+            msg = 'Invalid token format.'
+            raise exceptions.AuthenticationFailed(msg)
+
+        return self.authenticate_credentials(token)

psat-server-web-0.1.11/psat_server_web/atlas/atlasapi/serializers.py

@@ -0,0 +1,70 @@
+import datetime
+import re
+import json
+import requests
+from django.db import IntegrityError
+from django.db import connection
+from datetime import datetime
+from gkutils.commonutils import coneSearchHTM, FULL, QUICK, CAT_ID_RA_DEC_COLS, base26, Struct
+from rest_framework import serializers
+import sys
+
+#CAT_ID_RA_DEC_COLS['objects'] = [['objectId', 'ramean', 'decmean'], 1018]
+
+REQUEST_TYPE_CHOICES = (
+    ('count', 'Count'),
+    ('all', 'All'),
+    ('nearest', 'Nearest'),
+)
+
+
+class ConeSerializer(serializers.Serializer):
+    ra = serializers.FloatField(required=True)
+    dec = serializers.FloatField(required=True)
+    radius = serializers.FloatField(required=True)
+    requestType = serializers.ChoiceField(choices=REQUEST_TYPE_CHOICES)
+
+    def save(self):
+
+        ra = self.validated_data['ra']
+        dec = self.validated_data['dec']
+        radius = self.validated_data['radius']
+        requestType = self.validated_data['requestType']
+
+        # Get the authenticated user, if it exists.
+        userId = 'unknown'
+        request = self.context.get("request")
+        if request and hasattr(request, "user"):
+            userId = request.user
+
+        if radius > 1000:
+            replyMessage = "Max radius is 1000 arcsec."
+            info = {"error": replyMessage}
+            return info
+
+        replyMessage = 'No object found ra=%.5f dec=%.5f radius=%.2f' % (ra, dec, radius)
+        info = {"error": replyMessage}
+
+        # Is there an object within RADIUS arcsec of this object? - KWS - need to fix the gkhtm code!!
+        message, results = coneSearchHTM(ra, dec, radius, 'atlas_diff_objects', queryType=QUICK, conn=connection, django=True, prefix='htm', suffix='')
+
+        obj = None
+        separation = None
+
+        objectList = []
+        if len(results) > 0:
+            if requestType == "nearest":
+                obj = results[0][1]['id']
+                separation = results[0][0]
+                info = {"object": obj, "separation": separation}
+            elif requestType == "all":
+                for row in results:
+                    objectList.append({"object": row[1]["id"], "separation": row[0]})
+                info = objectList
+            elif requestType == "count":
+                info = {'count': len(results)}
+            else:
+                info = {"error": "Invalid request type"}
+
+        return info
+

psat-server-web-0.1.11/psat_server_web/atlas/atlasapi/urls.py

@@ -0,0 +1,9 @@
+from django.urls import include, path
+from rest_framework import routers
+from rest_framework.authtoken.views import obtain_auth_token
+from . import views
+
+urlpatterns = [
+    path('api/cone/',                  views.ConeView.as_view()),
+    path('api/auth-token/',            obtain_auth_token, name='auth_token'),
+]

psat-server-web-0.1.11/psat_server_web/atlas/atlasapi/views.py

@@ -0,0 +1,31 @@
+from django.shortcuts import get_object_or_404, render
+from rest_framework.response import Response
+from rest_framework.views import APIView
+from rest_framework import status
+from .serializers import ConeSerializer
+from rest_framework.authentication import TokenAuthentication
+from rest_framework.permissions import IsAuthenticated
+from .query_auth import QueryAuthentication
+
+def retcode(message):
+    if 'error' in message: return status.HTTP_400_BAD_REQUEST
+    else:                  return status.HTTP_200_OK
+
+class ConeView(APIView):
+    authentication_classes = [TokenAuthentication, QueryAuthentication]
+    permission_classes = [IsAuthenticated]
+
+    def get(self, request):
+        serializer = ConeSerializer(data=request.GET, context={'request': request})
+        if serializer.is_valid():
+            message = serializer.save()
+            return Response(message, status=retcode(message))
+        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
+
+    def post(self, request, format=None):
+        serializer = ConeSerializer(data=request.data, context={'request': request})
+        if serializer.is_valid():
+            message = serializer.save()
+            return Response(message, status=retcode(message))
+        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
+

{psat-server-web-0.1.9 → psat-server-web-0.1.11}/psat_server_web/atlas/site_media/css/main.css

@@ -230,6 +230,22 @@ footer
 }
 
 
+.radio-ugpt-s input[type="radio"] {
+    display:none;
+}
+
+.radio-ugpt-s label {
+    display:inline-block;
+    background-color:#aaa;
+    padding:4px 11px;
+    font-size:16px;
+}
+
+.radio-ugpt-s input[type="radio"]:checked + label { 
+    background-color:purple;
+}
+
+
 .radio-ugpt-t input[type="radio"] {
     display:none; 
 }

{psat-server-web-0.1.9 → psat-server-web-0.1.11}/psat_server_web/atlas/site_media/css/main_bootstrap.css

@@ -104,6 +104,22 @@ div[id^="flot-recurrenceplot"] .legend .traces .legendtoggle {
     background-color:orange;
 }
 
+    
+.radio-ugpt-s input[type="radio"] {
+    display:none;
+}   
+    
+.radio-ugpt-s label {
+    display:inline-block;
+    background-color:#aaa;
+    padding:4px 11px;
+    font-size:16px;
+}
+
+.radio-ugpt-s input[type="radio"]:checked + label { 
+    background-color:purple;
+}
+
 
 .radio-ugpt-t input[type="radio"] {
     display:none; 

{psat-server-web-0.1.9 → psat-server-web-0.1.11}/psat_server_web/atlas/site_media/js/followup_selectall.js

@@ -57,6 +57,17 @@ $('#select_all_p').click(function(){
     });
 });
 
+// select all radio buttons in the "S" column (.S class)
+$('#select_all_s').click(function(){
+    $("input[class=S]").each(function(){
+        $(this).prop("checked", true);
+        sessionStorage.setItem($( this ).attr('name'),"S");
+    });
+    $("label[value=S]").each(function(){
+        $(this).addClass('active').siblings().removeClass('active');
+    });
+});
+
 // select all radio buttons in the "A" column (.A class)
 $('#select_all_a').click(function(){
     $("input[class=A]").each(function(){