Marmelator/red-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1.4k Wiki Activity

Add/edit rule sets WIP

Browse Source
This commit is contained in:
Adina Țeudan 2021-01-06 20:14:14 +02:00
parent 8bcdfb9887
commit 5ff8e1fab8
6 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/red-ui/src/app/components/rule-set-actions/rule-set-actions.component.ts
View File

@ -16,7 +16,8 @@ export class RuleSetActionsComponent implements OnInit {
ngOnInit(): void {}
openAddEditRuleSetDialog(ruleSet?: RuleSetModel) {
openEditRuleSetDialog($event: any, ruleSet: RuleSetModel) {
$event.stopPropagation();
this._dialogService.openAddEditRuleSetDialog(ruleSet, async (newRuleSet) => {
if (newRuleSet) {
this.loadRuleSetsData.emit();
@ -24,11 +25,6 @@ export class RuleSetActionsComponent implements OnInit {
});
}
openEditRuleSetDialog($event: any, ruleSet: RuleSetModel) {
$event.stopPropagation();
this.openAddEditRuleSetDialog(ruleSet);
}
openDeleteRuleSetDialog($event: any, ruleSet: RuleSetModel) {
this._dialogService.openDeleteRuleSetDialog($event, ruleSet, async () => {
this.loadRuleSetsData.emit();

6
apps/red-ui/src/app/dialogs/add-edit-project-dialog/add-edit-project-dialog.component.html
View File

@ -19,9 +19,9 @@
<div class="red-input-group required w-400">
<mat-form-field floatLabel="always">
<mat-label>{{ 'project-listing.add-edit-dialog.form.template' | translate }}</mat-label>
<mat-select value="EFSA 1 (Vertebrate Authors)" style="width: 100%;" [disabled]="project?.hasFiles">
<mat-option *ngFor="let type of ['EFSA 1 (Vertebrate Authors)']" [value]="type">
{{ type }}
<mat-select formControlName="ruleSet" style="width: 100%;">
<mat-option *ngFor="let ruleSet of ruleSets" [value]="ruleSet.ruleSetId">
{{ ruleSet.name }}
</mat-option>
</mat-select>
</mat-form-field>

10
apps/red-ui/src/app/dialogs/add-edit-project-dialog/add-edit-project-dialog.component.ts
View File

@ -1,6 +1,6 @@
import { Component, Inject } from '@angular/core';
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
import { Project } from '@redaction/red-ui-http';
import { Project, RuleSetModel } from '@redaction/red-ui-http';
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import { AppStateService } from '../../state/app-state.service';
import { ProjectWrapper } from '../../state/model/project.wrapper';
@ -23,12 +23,17 @@ export class AddEditProjectDialogComponent {
) {
this.projectForm = this._formBuilder.group({
projectName: [this.project?.projectName, Validators.required],
ruleSet: [{ value: this.project?.ruleSetId, disabled: this.project?.hasFiles }, Validators.required],
description: [this.project?.description],
dueDate: [this.project?.dueDate]
});
this.hasDueDate = !!this.project?.dueDate;
}
public get ruleSets(): RuleSetModel[] {
return this._appStateService.ruleSets;
}
public get changed() {
if (!this.project) {
return true;
@ -77,7 +82,8 @@ export class AddEditProjectDialogComponent {
return {
projectName: this.projectForm.get('projectName').value,
description: this.projectForm.get('description').value,
dueDate: this.hasDueDate ? this.projectForm.get('dueDate').value : undefined
dueDate: this.hasDueDate ? this.projectForm.get('dueDate').value : undefined,
ruleSetId: this.projectForm.get('ruleSet').value
};
}

10
apps/red-ui/src/app/screens/admin/rule-sets-listing-screen/add-edit-rule-set-dialog/add-edit-rule-set-dialog.component.ts
View File

@ -3,7 +3,7 @@ import { AppStateService } from '../../../../state/app-state.service';
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
import * as moment from 'moment';
import { RuleSetModel } from '@redaction/red-ui-http';
import { RuleSetControllerService, RuleSetModel } from '@redaction/red-ui-http';
@Component({
selector: 'redaction-add-edit-rule-set-dialog',
@ -17,6 +17,7 @@ export class AddEditRuleSetDialogComponent {
constructor(
private readonly _appStateService: AppStateService,
private readonly _formBuilder: FormBuilder,
private readonly _ruleSetController: RuleSetControllerService,
public dialogRef: MatDialogRef<AddEditRuleSetDialogComponent>,
@Inject(MAT_DIALOG_DATA) public ruleSet: RuleSetModel
) {
@ -49,8 +50,11 @@ export class AddEditRuleSetDialogComponent {
}
async saveRuleSet() {
const ruleSet = this.ruleSetForm.getRawValue();
console.log({ ruleSet });
const ruleSet = {
ruleSetId: this.ruleSet?.ruleSetId,
...this.ruleSetForm.getRawValue()
};
const res = await this._ruleSetController.createOrUpdateRuleSet(ruleSet).toPromise();
this.dialogRef.close({ ruleSet });
}
}

6
apps/red-ui/src/app/screens/admin/rule-sets-listing-screen/rule-sets-listing-screen.component.html
View File

@ -128,7 +128,11 @@
{{ ruleSet.dateModified | date: 'd MMM. yyyy' }}
</div>
<redaction-rule-set-actions class="actions-container" (loadRuleSetsData)="loadRuleSetsData()"></redaction-rule-set-actions>
<redaction-rule-set-actions
class="actions-container"
[ruleSet]="ruleSet"
(loadRuleSetsData)="loadRuleSetsData()"
></redaction-rule-set-actions>
</div>
<div class="scrollbar-placeholder"></div>

2
apps/red-ui/src/app/screens/project-overview-screen/project-details/project-details.component.html
View File

@ -82,7 +82,7 @@
</div>
<div>
<mat-icon svgIcon="red:template"></mat-icon>
<span>{{ 'EFSA 1 (Vertebrate Authors)' }} </span>
<span>{{ appStateService.getRuleSetById(appStateService.activeProject.ruleSetId)?.name }} </span>
</div>
</div>