Merge branch 'ws-1814-1815-qa-pass-fail-email-window' into '2.8.2-DEVELOPMENT'

WS-1814 and WS-1815: Add email QA Pass button and remove email from QA Fail

See merge request !1425

apps/web/src/app/workspaces/components/capability-request/components/qa-controls/qa-controls.component.html

@@ -16,18 +16,30 @@
       </button>
 
       <send-email
-        id="set-qa-fail"
+        id="set-qa-email-pass"
         style="margin-left: 100px"
-        modalTitleText="Fail QA Email"
-        customStyle="btn btn-secondary btn-sm"
-        templateName="std_calibration_fail"
+        modalTitleText="QA Pass Email"
+        customStyle="btn btn-success btn-sm"
+        templateName="std_calibration_complete"
         [defaultCC]="defaultCC"
         [emailParameters]="getEmailParams()"
-        (emailSentEvent)="failQa(currentVersion)">
-          <span class="fas fa-times"></span>
-          <span class="pl-2">Fail QA</span>
+        (emailSentEvent)="passQa(currentVersion)">
+          <span class="fas fa fa-envelope"></span>
+          <span class="pl-2">QA Pass With Message</span>
       </send-email>
 
+
+      <button
+        id="set-qa-fail"
+        type="button"
+        class="btn btn-secondary btn-sm"
+        style="margin-left: 100px"
+        (click)="failQa(currentVersion)"
+      >
+        <span class="fas fa-times"></span>
+        <span class="pl-2">Fail QA</span>
+      </button>
+
       <send-email
         id="set-qa-abandon"
         style="margin-left: 100px"
@@ -63,19 +75,17 @@
         <span class="pl-2">Send to Stage 2</span>
       </button>
 
-      <send-email
+      <button
         id="set-qa-fail"
+        type="button"
+        class="btn btn-secondary btn-sm"
         style="margin-left: 100px"
-        modalTitleText="Fail QA Email"
-        customStyle="btn btn-secondary btn-sm"
-        templateName="std_calibration_fail"
-        [defaultCC]="defaultCC"
-        [emailParameters]="getEmailParams()"
-        (emailSentEvent)="failQa(currentVersion)"
-        [shouldDisable]="currentVersion.current_execution.state_name === 'Stage 2 Review'">
-          <span class="fas fa-times"></span>
-          <span class="pl-2">Fail QA</span>
-      </send-email>
+        (click)="failQa(currentVersion)"
+        [disabled]="currentVersion.current_execution.state_name === 'Stage 2 Review'"
+      >
+        <span class="fas fa-times"></span>
+        <span class="pl-2">Fail QA</span>
+      </button>
 
       <send-email
         id="set-qa-abandon"
@@ -109,6 +119,19 @@
         <span class="pl-2">QA Pass</span>
       </button>
 
+      <send-email
+        id="set-stage-2-email-pass"
+        style="margin-left: 120px"
+        modalTitleText="QA Pass Email"
+        customStyle="btn btn-success btn-sm"
+        templateName="std_calibration_complete"
+        [defaultCC]="defaultCC"
+        [emailParameters]="getEmailParams()"
+        (emailSentEvent)="confirmQa(currentVersion)">
+          <span class="fas fa fa-envelope"></span>
+          <span class="pl-2">QA Pass With Message</span>
+      </send-email>
+
       <button
         id="set-qa-revisit"
         type="button"

shared/workspaces/alembic/versions/8ccdd4674889_add_custom_text_option_to_std_.py

+"""add custom text option to std_calibration_complete template
+
+Revision ID: 8ccdd4674889
+Revises: 28b6a6bfb73c
+Create Date: 2023-08-24 10:05:59.908998
+
+"""
+from pathlib import Path
+
+import sqlalchemy as sa
+from alembic import op
+
+template_name = "std_calibration_complete"
+old_content = (Path.cwd() / "versions" / "templates" / "emails" / "std_calibration_complete_old.txt").read_text()
+new_content = (Path.cwd() / "versions" / "templates" / "emails" / "std_calibration_complete_new.txt").read_text()
+
+# revision identifiers, used by Alembic.
+revision = "8ccdd4674889"
+down_revision = "28b6a6bfb73c"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    op.execute(
+        f"""
+        UPDATE notification_templates
+        SET template=E'{new_content}'
+        WHERE name=E'{template_name}'
+        """
+    )
+
+
+def downgrade():
+    op.execute(
+        f"""
+        UPDATE notification_templates
+        SET template=E'{old_content}'
+        WHERE name=E'{template_name}'
+        """
+    )

shared/workspaces/alembic/versions/templates/emails/std_calibration_complete_new.txt

+{{#version}}{{#parameters}}{{#metadata}}{{#is_srdp}}Subject: Calibration complete for {{sdm_id}}
+{{#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}}
+
+Hello,
+
+One of your Scheduling Blocks,
+
+{{sdm_id}}, observed on {{obs_end_time}}, {{bands}}, <filesize>
+
+has been processed through the VLA CASA Calibration Pipeline using CASA 6.2.1, 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 (these notes are also in the weblog).
+
+{{#workflow_metadata}}{{#qa}}{{qa}}{{/qa}}{{^qa}}No QA notes available.{{/qa}}{{/workflow_metadata}}{{^workflow_metadata}}No QA notes available.{{/workflow_metadata}}
+
+Accessing Pipeline Products:
+
+There are two main pipeline products you may be interested in: the calibrated Measurement Set (MS) or the smaller pipeline product tar file that includes the weblog, final calibration and flag tables, a restore script, and other small files related to the calibration.
+
+For the entire Calibrated MS and pipeline tar file: you will need to request a calibrated MS (CMS) from our new archive access tool at https://data.nrao.edu . To access the pipeline products, please follow these steps:
+
+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 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.
+
+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.
+
+____________
+
+For more information about the pipeline, including instructions for rerunning the pipeline, applying pipeline calibration to raw data, or modification to suit your particular science goals, or access to the scripted pipeline please visit our pipeline web page: https://science.nrao.edu/facilities/vla/data-processing/pipeline
+
+For more information about the SRDP project, please see https://science.nrao.edu/srdp
+
+Please let us know if you have any questions or concerns through the NRAO Helpdesk (https://help.nrao.edu/) , using the VLA Pipeline department for questions about the pipeline processing, the VLA/VLBA Archive and Data Retrieval department for questions about data retrieval, and the VLA Data Products department for questions about quality assurance and the use of of Science-Ready (SRDP) products.{{/is_srdp}}{{^is_srdp}}Subject: Calibration complete for {{sdm_id}}
+
+Hello,
+
+One of your Scheduling Blocks has been processed through the VLA CASA Calibration Pipeline using CASA 6.2.1, 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>
+
+{{#workflow_metadata}}{{#qa}}{{qa}}{{/qa}}{{^qa}}No QA notes available.{{/qa}}{{/workflow_metadata}}{{^workflow_metadata}}No QA notes available.{{/workflow_metadata}}
+
+Notes
+
+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!
+
+If your observations used a resolved calibrator source, but does not have standard model images in CASA, the pipeline calibration would not be accurate. In such instances, re-calibration using UV limits, or imaging the calibrator first and using the resulting image model, will be needed.
+
+If your science involves spectral lines, you should be aware of the following:
+
+1) The pipeline applies Hanning-smoothing by default, which may make the calibrated data set not optimal for certain spectral-line science.
+
+2) During the calibration process, several edge channels in each sub-band get flagged by default because they are noisier. Therefore, breaks in the frequency span get introduced in the pipeline calibrated data, which in turn may make the output not suitable for certain spectral-line science.
+
+3) The pipeline runs an RFI flagging algorithm which should flag strong lines and may remove spectral lines of interest to your science.
+
+Accessing Pipeline Products:
+
+There are two main pipeline products you may be interested in: the calibrated Measurement Set (MS) or the smaller pipeline product tar file that includes the weblog, final calibration and flag tables, a restore script, and other small files related to the calibration.
+For the entire Calibrated MS and pipeline tar file: you will need to request a calibrated MS (CMS) from our new archive access tool at https://data.nrao.edu . To access the pipeline products, please follow these steps:
+
+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 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.
+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.
+
+More Information:
+
+For more information about the pipeline, including access to the scripted pipeline, instructions for rerunning the pipeline, applying pipeline calibration to raw data, or modification to suit your particular science goals, please go here:
+https://science.nrao.edu/facilities/vla/data-processing/pipeline
+
+Please let us know if you have any questions or concerns through the VLA Pipeline department of the Helpdesk at:
+https://help.nrao.edu/{{/is_srdp}}{{/metadata}}{{/parameters}}{{/version}}

shared/workspaces/alembic/versions/templates/emails/std_calibration_complete_old.txt

+{{#version}}{{#parameters}}{{#metadata}}{{#is_srdp}}Subject: Calibration complete for {{sdm_id}}
+
+Hello,
+
+One of your Scheduling Blocks,
+
+{{sdm_id}}, observed on {{obs_end_time}}, {{bands}}, <filesize>
+
+has been processed through the VLA CASA Calibration Pipeline using CASA 6.2.1, 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 (these notes are also in the weblog).
+
+{{#workflow_metadata}}{{#qa}}{{qa}}{{/qa}}{{^qa}}No QA notes available.{{/qa}}{{/workflow_metadata}}{{^workflow_metadata}}No QA notes available.{{/workflow_metadata}}
+
+Accessing Pipeline Products:
+
+There are two main pipeline products you may be interested in: the calibrated Measurement Set (MS) or the smaller pipeline product tar file that includes the weblog, final calibration and flag tables, a restore script, and other small files related to the calibration.
+
+For the entire Calibrated MS and pipeline tar file: you will need to request a calibrated MS (CMS) from our new archive access tool at https://data.nrao.edu . To access the pipeline products, please follow these steps:
+
+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 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.
+
+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.
+
+____________
+
+For more information about the pipeline, including instructions for rerunning the pipeline, applying pipeline calibration to raw data, or modification to suit your particular science goals, or access to the scripted pipeline please visit our pipeline web page: https://science.nrao.edu/facilities/vla/data-processing/pipeline
+
+For more information about the SRDP project, please see https://science.nrao.edu/srdp
+
+Please let us know if you have any questions or concerns through the NRAO Helpdesk (https://help.nrao.edu/) , using the VLA Pipeline department for questions about the pipeline processing, the VLA/VLBA Archive and Data Retrieval department for questions about data retrieval, and the VLA Data Products department for questions about quality assurance and the use of of Science-Ready (SRDP) products.{{/is_srdp}}{{^is_srdp}}Subject: Calibration complete for {{sdm_id}}
+
+Hello,
+
+One of your Scheduling Blocks has been processed through the VLA CASA Calibration Pipeline using CASA 6.2.1, 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>
+
+{{#workflow_metadata}}{{#qa}}{{qa}}{{/qa}}{{^qa}}No QA notes available.{{/qa}}{{/workflow_metadata}}{{^workflow_metadata}}No QA notes available.{{/workflow_metadata}}
+
+Notes
+
+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!
+
+If your observations used a resolved calibrator source, but does not have standard model images in CASA, the pipeline calibration would not be accurate. In such instances, re-calibration using UV limits, or imaging the calibrator first and using the resulting image model, will be needed.
+
+If your science involves spectral lines, you should be aware of the following:
+
+1) The pipeline applies Hanning-smoothing by default, which may make the calibrated data set not optimal for certain spectral-line science.
+
+2) During the calibration process, several edge channels in each sub-band get flagged by default because they are noisier. Therefore, breaks in the frequency span get introduced in the pipeline calibrated data, which in turn may make the output not suitable for certain spectral-line science.
+
+3) The pipeline runs an RFI flagging algorithm which should flag strong lines and may remove spectral lines of interest to your science.
+
+Accessing Pipeline Products:
+
+There are two main pipeline products you may be interested in: the calibrated Measurement Set (MS) or the smaller pipeline product tar file that includes the weblog, final calibration and flag tables, a restore script, and other small files related to the calibration.
+For the entire Calibrated MS and pipeline tar file: you will need to request a calibrated MS (CMS) from our new archive access tool at https://data.nrao.edu . To access the pipeline products, please follow these steps:
+
+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 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.
+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.
+
+More Information:
+
+For more information about the pipeline, including access to the scripted pipeline, instructions for rerunning the pipeline, applying pipeline calibration to raw data, or modification to suit your particular science goals, please go here:
+https://science.nrao.edu/facilities/vla/data-processing/pipeline
+
+Please let us know if you have any questions or concerns through the VLA Pipeline department of the Helpdesk at:
+https://help.nrao.edu/{{/is_srdp}}{{/metadata}}{{/parameters}}{{/version}}