psat-server-web 0.5.6__tar.gz → 0.5.7__tar.gz

{psat_server_web-0.5.6/psat_server_web.egg-info → psat_server_web-0.5.7}/PKG-INFO

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

psat_server_web-0.5.7/psat_server_web/__version__.py

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

{psat_server_web-0.5.6 → psat_server_web-0.5.7}/psat_server_web/atlas/atlas/dbviews.py

@@ -151,7 +151,8 @@ class FollowupRaw(models.Model):
     ra = models.FloatField(db_column='ra')
     dec = models.FloatField(db_column='dec')
     object_classification = models.IntegerField(db_column='object_classification')
-    followup_flag_date = models.DateField(db_column='followup_flag_date')
+    # 2025-02-13 KWS followup_flag_date now holds date and time
+    followup_flag_date = models.DateTimeField(db_column='followup_flag_date')
     observation_status = models.CharField(max_length=40, db_column='observation_status')
     current_trend = models.CharField(max_length=40, db_column='current_trend')
     earliest_mjd = models.FloatField(db_column='earliest_mjd')
@@ -223,7 +224,8 @@ class WebViewAbstractFollowup(models.Model):
     dec_avg = models.FloatField(db_column='dec_avg')
     object_classification = models.IntegerField(db_column='object_classification')
     sherlockClassification = models.CharField(max_length=120, db_column='sherlockClassification')
-    followup_flag_date = models.DateField(db_column='followup_flag_date')
+    # 2025-02-13 KWS followup_flag_date now holds date and time
+    followup_flag_date = models.DateTimeField(db_column='followup_flag_date')
     observation_status = models.CharField(max_length=40, db_column='observation_status')
     current_trend = models.CharField(max_length=40, db_column='current_trend')
     earliest_mjd = models.FloatField(db_column='earliest_mjd')
@@ -526,7 +528,8 @@ class WebViewAbstractUserDefined(models.Model):
     dec_avg = models.FloatField(db_column='dec_avg')
     object_classification = models.IntegerField(db_column='object_classification')
     sherlockClassification = models.CharField(max_length=120, db_column='sherlockClassification')
-    followup_flag_date = models.DateField(db_column='followup_flag_date')
+    # 2025-02-13 KWS followup_flag_date now holds date and time
+    followup_flag_date = models.DateTimeField(db_column='followup_flag_date')
     observation_status = models.CharField(max_length=40, db_column='observation_status')
     current_trend = models.CharField(max_length=40, db_column='current_trend')
     earliest_mjd = models.FloatField(db_column='earliest_mjd')

{psat_server_web-0.5.6 → psat_server_web-0.5.7}/psat_server_web/atlas/atlas/models.py

@@ -181,7 +181,8 @@ class AtlasDiffObjects(models.Model):
 
     id = models.BigIntegerField(primary_key=True)
     followup_id = models.IntegerField(blank=True, null=True)
-    followup_flag_date = models.DateField(blank=True, null=True)
+    # 2025-02-13 KWS followup_flag_date now holds date and time
+    followup_flag_date = models.DateTimeField(blank=True, null=True)
     #detection_id = models.IntegerField()
     # Note the quoted model name in the foreign key. This model has not yet been defined.
     detection_id = models.ForeignKey('AtlasDiffDetections', to_field='id', db_column='detection_id', on_delete=models.CASCADE)

{psat_server_web-0.5.6 → psat_server_web-0.5.7}/psat_server_web/atlas/atlas/views.py

@@ -1594,7 +1594,7 @@ def candidateddc(request, atlas_diff_objects_id, template_name):
         form.fields['user_list_membership'].choices = listMembership
 
         # 2011-10-04 KWS Added GARBAGE choices
-        if listId == EYEBALL or listId == FASTEYE or listId == SMCLMC or listId == AGN:
+        if listId in [EYEBALL, FASTEYE, SMCLMC, AGN, GALCAND]:
             form.fields['promote_demote'].choices = EYEBALL_PROMOTION_CHOICES
         elif listId == FOLLOWUP:
             form.fields['promote_demote'].choices = FOLLOWUP_POST_PROMOTION_CHOICES
@@ -1604,9 +1604,9 @@ def candidateddc(request, atlas_diff_objects_id, template_name):
             form.fields['promote_demote'].choices = POSSIBLE_POST_PROMOTION_CHOICES
         elif listId == ATTIC:
             form.fields['promote_demote'].choices = ATTIC_POST_PROMOTION_CHOICES
-        elif listId == STAR or listId == HPMSTAR:
+        elif listId in [STAR, HPMSTAR]:
             form.fields['promote_demote'].choices = STAR_POST_PROMOTION_CHOICES
-        elif listId == GARBAGE or listId == DUPLICATES:
+        elif listId in [GARBAGE, DUPLICATES]:
             form.fields['promote_demote'].choices = GARBAGE_CHOICES
         else:
             form.fields['promote_demote'].choices = FOLLOWUP_POST_PROMOTION_CHOICES