Skip to content
Snippets Groups Projects
Commit 891330ec authored by Charlotte Hausman's avatar Charlotte Hausman
Browse files

Merge branch 'catch_up_with_main' into 'release/2.4.2-RC1'

Catch up with main

See merge request !16
parents f30b06d8 fcaaa1ad
No related branches found
Tags 2.0.0
1 merge request!16Catch up with main
import {Component, Input, OnDestroy, OnInit} from '@angular/core';
import {Component, EventEmitter, Input, Output, OnDestroy, OnInit} from '@angular/core';
import {FormControl, FormGroup} from '@angular/forms';
import {AlertService} from '../../../../services/alert.service';
import {JobsService} from '../../../../services/jobs.service';
......@@ -13,6 +13,7 @@ import {Observable} from 'rxjs';
export class ExecutionDetailPlanesComponent implements OnInit, OnDestroy {
@Input() job: Job;
@Output() planesWritten: EventEmitter<any> = new EventEmitter();
planes: Observable<string>;
planeKeys: string[];
planesFormGroup: FormGroup;
......@@ -77,6 +78,9 @@ export class ExecutionDetailPlanesComponent implements OnInit, OnDestroy {
// Write out the planes string if any are selected
if (planesText.length > 0) {
this.jobService.writePlanes(this.job.job_id, planesText).subscribe(() => {
// Trigger acceptQa on the parent
this.planesWritten.emit();
this.alertService.success('Planes Saved');
},
error => {
......
<ng-container *ngIf="jobDetail; else loading">
<div class="row no-gutters" *ngIf="canAcceptArchive(jobDetail.status, jobDetail.archiveStatus)">
<div class="row no-gutters" *ngIf="jobDetail.queueName !== 'se_coarse_cube_imaging' && canAcceptArchive(jobDetail.status, jobDetail.archiveStatus)">
<div class="col">
<button type="button" class="btn btn-success btn-sm" (click)="acceptQa()">Accept &amp; Archive</button>
</div>
......@@ -44,7 +44,10 @@
</div>
</form>
<app-execution-detail-planes [job]="job" *ngIf="jobDetail.queueName === 'se_coarse_cube_imaging' && canAcceptArchive(jobDetail.status, jobDetail.archiveStatus)"></app-execution-detail-planes>
<app-execution-detail-planes [job]="job"
(planesWritten)="acceptQa()"
*ngIf="jobDetail.queueName === 'se_coarse_cube_imaging' && canAcceptArchive(jobDetail.status, jobDetail.archiveStatus)">
</app-execution-detail-planes>
<h4 class="pt-2 border-top">
<fa-icon [icon]="faList"></fa-icon>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment