diff --git a/shared/workspaces/alembic/versions/templates/emails/std_calibration_complete_non_srdp_custom_text.txt b/shared/workspaces/alembic/versions/templates/emails/std_calibration_complete_non_srdp_custom_text.txt
index d9a696d14a7f9fe9ed7c78dbfd61c77a26ac0bb7..8f3180ee9956a0dd1aa1b786ae39f57b1e141650 100644
--- a/shared/workspaces/alembic/versions/templates/emails/std_calibration_complete_non_srdp_custom_text.txt
+++ b/shared/workspaces/alembic/versions/templates/emails/std_calibration_complete_non_srdp_custom_text.txt
@@ -4,15 +4,11 @@ Hello,
One of your Scheduling Blocks,
-{{sdm_id}}, observed on {{obs_end_time}}, {{bands}}, <filesize>
+{{sdm_id}}, observed on {{obs_end_time}}, {{bands}}
-has been processed through the VLA CASA Calibration Pipeline using CASA 6.4.1, which is designed to handle Stokes I continuum data, and is now available should you wish to access the calibrated data.
+has been processed through the VLA CASA Calibration Pipeline using CASA 6.5.4, which is designed to handle Stokes I continuum data, and is now available should you wish to access the calibrated data.
-These results have been checked by NRAO staff and notes about the quality assurance are below.
-
-{{#custom_text}}{{custom_text}}{{/custom_text}}{{^custom_text}}The results of this data processing request passed our quality assurance, with the following notes:{{/custom_text}}
-
-The following notes are also in the weblog:
+{{#custom_text}}{{custom_text}}{{/custom_text}}{{^custom_text}}These results have been checked by NRAO staff and notes about the quality assurance are below (these notes are also in the weblog):{{/custom_text}}
{{#workflow_metadata}}{{#qa}}{{qa}}{{/qa}}{{^qa}}No QA notes available.{{/qa}}{{/workflow_metadata}}{{^workflow_metadata}}No QA notes available.{{/workflow_metadata}}
@@ -30,7 +26,7 @@ Find the specific observation you want and if you would like to recreate the pip
Click the "Download" button at the top of the project list.
-In the pop-up window that opens, leave the default options the same: this should have the "Choose download data format:" option to "Calibrated Measurement Set", and the "Restore previous CMS" option should be filled in with a tar file named something like project-code_YYYY_MM_DD_THH_MM_SS.SSS.tar. Note that these two options are unavailable when more than one archive file is added to the clipboard. If the calibrated measurement set is needed for multiple scheduling blocks they must be downloaded one at a time. Since this calibration was done with CASA 6.2.1-7 leave the "CASA Version:" drop-down menu at this version. Now click the "Submit Request" button.
+In the pop-up window that opens, leave the default options the same: this should have the "Choose download data format:" option to "Calibrated Measurement Set", and the "Restore previous CMS" option should be filled in with a tar file named something like FileSetID_YYYY_MM_DD_THH_MM_SS.SSS.caltables.tar. Note that these two options are unavailable when more than one archive file is added to the clipboard. If the calibrated measurement set is needed for multiple scheduling blocks they must be downloaded one at a time. Since this calibration was done with CASA 6.4.1-12 leave the "CASA Version:" drop-down menu at this version. Now click the "Submit Request" button.
Once ready, you should receive an email with download instructions. This restoration of the calibrated MS may take several hours or longer, depending on the specifics of your observation.
@@ -42,7 +38,7 @@ Click the "Log in" link at the top right of this page and select the NRAO login,
Once logged in, you should be able to access your projects, both public and proprietary: navigate to the desired project and click the "+" symbol at the left to expand the list of available SBs.
-Find the specific observation you want and if you would like to recreate the pipeline calibration, click the icon in the "Cals" column near the right side of the returned list, which should bring up a pop-up window to download a tar file named something like project-code_YYYY_MM_DD_THH_MM_SS.SSS.tar, and click "Submit Request". Once ready, you should receive an email with download instructions.
+Find the specific observation you want and if you would like to recreate the pipeline calibration, click the icon in the "Cals" column near the right side of the returned list, which should bring up a pop-up window to download a tar file named something like FileSetID_YYYY_MM_DD_THH_MM_SS.SSS.caltables.tar, and click "Submit Request". Once ready, you should receive an email with download instructions.
____________
@@ -54,18 +50,17 @@ Please let us know if you have any questions or concerns through the NRAO Helpde
Hello,
-One of your Scheduling Blocks has been processed through the VLA CASA Calibration Pipeline using CASA 6.4.1, which is designed to handle Stokes I continuum data, and is now available should you wish to access the calibrated data.
+One of your Scheduling Blocks has been processed through the VLA CASA Calibration Pipeline using CASA 6.5.4, which is designed to handle Stokes I continuum data, and is now available should you wish to access the calibrated data.
-{{sdm_id}}, observed on {{obs_end_time}}, {{bands}}, <filesize>
+{{sdm_id}}, observed on {{obs_end_time}}, {{bands}}
-These results have been checked by NRAO staff and notes about the quality assurance are below.
+{{#custom_text}}{{custom_text}}{{/custom_text}}{{^custom_text}}These results have been checked by NRAO staff and notes about the quality assurance are below{{/custom_text}}
-{{#custom_text}}{{custom_text}}{{/custom_text}}{{^custom_text}}The results of this data processing request passed our quality assurance, with the following notes:{{/custom_text}}
-
-The following notes are also in the weblog:
+Notes:
{{#workflow_metadata}}{{#qa}}{{qa}}{{/qa}}{{^qa}}No QA notes available.{{/qa}}{{/workflow_metadata}}{{^workflow_metadata}}No QA notes available.{{/workflow_metadata}}
+
These products are not included in NRAO\'s Science Ready Data Products (SRDP) program but have been checked by NRAO staff for general quality.
Some data may need further flagging before imaging: please check your data and the target calibration carefully before using the output from the pipeline for science!
@@ -89,13 +84,13 @@ Click the "Log in" link at the top right of this page and select the NRAO login,
Once logged in, you should be able to access your projects, both public and proprietary by selecting <yourusername>\'s data: navigate to the desired project and click the "+" symbol at the left to expand the list of available SBs.
Find the specific observation you want and if you would like to recreate the pipeline calibration, click the "Add to clipboard" button to the left of that observation.
Click the "Download" button at the top of the project list.
-In the pop-up window that opens, leave the default options the same: this should have the "Choose download data format:" option to "Calibrated Measurement Set", and the "Restore previous CMS" option should be filled in with a tar file named something like project-code_YYYY_MM_DD_THH_MM_SS.SSS.tar. Note that these two options are unavailable when more than one archive file is added to the clipboard. If the calibrated measurement set is needed for multiple scheduling blocks they must be downloaded one at a time. Since this calibration was done with CASA , 6.2.1-7 leave the "CASA Version:" drop-down menu at this version. Now click the "Submit Request" button.
+In the pop-up window that opens, leave the default options the same: this should have the "Choose download data format:" option to "Calibrated Measurement Set", and the "Restore previous CMS" option should be filled in with a tar file named something like FileSetID_YYYY_MM_DD_THH_MM_SS.SSS.caltables.tar. Note that these two options are unavailable when more than one archive file is added to the clipboard. If the calibrated measurement set is needed for multiple scheduling blocks they must be downloaded one at a time. Since this calibration was done with CASA , 6.4.1-12 leave the "CASA Version:" drop-down menu at this version. Now click the "Submit Request" button.
Once ready, you should receive an email with download instructions. This restoration of the calibrated MS may take several hours or longer, depending on the specifics of your observation.
=====
For just the pipeline tar file (includes the weblog, final flag versions, final calibration tables, restore script, and other related small files)
Click the "Log in" link at the top right of this page and select the NRAO login, which should take you to a page where you will enter your my.nrao.edu login information.
Once logged in, you should be able to access your projects, both public and proprietary: navigate to the desired project and click the "+" symbol at the left to expand the list of available SBs.
-Find the specific observation you want and if you would like to recreate the pipeline calibration, click the icon in the "Cals" column near the right side of the returned list, which should bring up a pop-up window to download a tar file named something like project-code_YYYY_MM_DD_THH_MM_SS.SSS.tar, and click "Submit Request". Once ready, you should receive an email with download instructions.
+Find the specific observation you want and if you would like to recreate the pipeline calibration, click the icon in the "Cals" column near the right side of the returned list, which should bring up a pop-up window to download a tar file named something like FileSetID_YYYY_MM_DD_THH_MM_SS.SSS.caltables.tar, and click "Submit Request". Once ready, you should receive an email with download instructions.
More Information:
diff --git a/shared/workspaces/workspaces/notification/services/notification_info.py b/shared/workspaces/workspaces/notification/services/notification_info.py
index 6d750dd6c5f57aa6abaf9ab6f7cda31613db2dad..b050a209a5cb736ba75c96841c889416f399b86f 100644
--- a/shared/workspaces/workspaces/notification/services/notification_info.py
+++ b/shared/workspaces/workspaces/notification/services/notification_info.py
@@ -35,7 +35,7 @@ class NotificationInfo(NotificationInfoIF):
self.session = session
def all_templates(self) -> List[NotificationTemplate]:
- return self.session.query(NotificationTemplate).all()
+ return self.session.query(NotificationTemplate).order_by(NotificationTemplate.name.desc()).all()
def lookup_template(self, template_name: str) -> NotificationTemplate:
return self.session.query(NotificationTemplate).filter_by(name=template_name).first()