MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

minor ui fixes

This commit is contained in:
Diamantis Tziotzios 2024-04-15 10:47:30 +03:00
parent 5118e696d0
commit af5a9c269e
5 changed files with 50 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.ts
View File

@ -34,7 +34,7 @@ export class DraftsComponent extends BaseComponent implements OnInit {
lookup: RecentActivityItemLookup = new RecentActivityItemLookup();
pageSize: number = 5;
pageLessSize= this.pageSize;
pageLessSize = this.pageSize;
listingItems: RecentActivityItem[] = [];
public formGroup = new UntypedFormBuilder().group({
@ -96,6 +96,13 @@ export class DraftsComponent extends BaseComponent implements OnInit {
}
});
this.formGroup.get('like').valueChanges
.pipe(takeUntil(this._destroyed), debounceTime(500))
.subscribe(x => this.refresh());
this.formGroup.get('order').valueChanges
.pipe(takeUntil(this._destroyed))
.subscribe(x => this.refresh());
this.refresh();
}
@ -119,12 +126,9 @@ export class DraftsComponent extends BaseComponent implements OnInit {
}
refresh(): void {
if (!this.formGroup.get('order').value) {
this.formGroup.get('order').setValue(this.order.UpdatedAt);
}
this.lookup.onlyDraft = true;
this.lookup.page = { size: this.pageSize, offset: 0 };
this.lookup.orderField = this.formGroup.get('order').value;
this.lookup.orderField = this.formGroup.get('order').value ?? this.order.UpdatedAt;
this.lookup.like = this.formGroup.get('like').value;
this.lookup.project = {
@ -195,13 +199,6 @@ export class DraftsComponent extends BaseComponent implements OnInit {
};
this.getItems();
this.formGroup.get('like').valueChanges
.pipe(takeUntil(this._destroyed), debounceTime(500))
.subscribe(x => this.refresh());
this.formGroup.get('order').valueChanges
.pipe(takeUntil(this._destroyed))
.subscribe(x => this.refresh());
}
loadMore() {
@ -216,7 +213,7 @@ export class DraftsComponent extends BaseComponent implements OnInit {
this.getItems();
}
private getItems(){
private getItems() {
this.listingItems = [];
this.dashboardService
@ -224,7 +221,7 @@ export class DraftsComponent extends BaseComponent implements OnInit {
.pipe(takeUntil(this._destroyed))
.subscribe(response => {
response.forEach(item => {
if (item.dmp){
if (item.dmp) {
if (item.dmp.descriptions) {
if (item.dmp.status == DmpStatus.Finalized) {
item.dmp.descriptions = item.dmp.descriptions.filter(x => x.isActive === IsActive.Active && x.status === DescriptionStatus.Finalized);
@ -232,10 +229,10 @@ export class DraftsComponent extends BaseComponent implements OnInit {
item.dmp.descriptions = item.dmp.descriptions.filter(x => x.isActive === IsActive.Active && x.status != DescriptionStatus.Canceled);
}
}
item.dmp.dmpUsers = item.dmp.dmpUsers.filter(x=> x.isActive === IsActive.Active);
item.dmp.dmpUsers = item.dmp.dmpUsers.filter(x => x.isActive === IsActive.Active);
this.listingItems.push(item);
}
if (item.description){
if (item.description) {
if (item.description.status != DescriptionStatus.Canceled) this.listingItems.push(item);
}
})

22
dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.ts
View File

@ -96,6 +96,16 @@ export class RecentEditedActivityComponent extends BaseComponent implements OnIn
}
});
this.formGroup.get('like').valueChanges
.pipe(takeUntil(this._destroyed), debounceTime(500))
.subscribe(x => {
console.log('valueChanges');
this.refresh()
});
this.formGroup.get('order').valueChanges
.pipe(takeUntil(this._destroyed))
.subscribe(x => this.refresh());
this.refresh();
}
@ -119,11 +129,8 @@ export class RecentEditedActivityComponent extends BaseComponent implements OnIn
}
refresh(): void {
if (!this.formGroup.get('order').value) {
this.formGroup.get('order').setValue(this.order.UpdatedAt);
}
this.lookup.page = { size: this.pageSize, offset: 0 };
this.lookup.orderField = this.formGroup.get('order').value;
this.lookup.orderField = this.formGroup.get('order').value ?? this.order.UpdatedAt;
this.lookup.like = this.formGroup.get('like').value;
this.lookup.project = {
@ -193,13 +200,6 @@ export class RecentEditedActivityComponent extends BaseComponent implements OnIn
};
this.getItems();
this.formGroup.get('like').valueChanges
.pipe(takeUntil(this._destroyed), debounceTime(500))
.subscribe(x => this.refresh());
this.formGroup.get('order').valueChanges
.pipe(takeUntil(this._destroyed))
.subscribe(x => this.refresh());
}
loadMore() {

25
dmp-frontend/src/app/ui/dashboard/recent-edited-description-activity/recent-edited-description-activity.component.ts
View File

@ -92,10 +92,19 @@ export class RecentEditedDescriptionActivityComponent extends BaseComponent impl
this.updateUrl();
}
});
if (this.isAuthenticated()) {
this.formGroup.get('like').valueChanges
.pipe(takeUntil(this._destroyed), debounceTime(500))
.subscribe(x => {
console.log('valueChanges');
this.refresh()
});
this.formGroup.get('order').valueChanges
.pipe(takeUntil(this._destroyed))
.subscribe(x => this.refresh());
this.refresh();
}
}
ngOnChanges() {
if (this.isActive) {
@ -117,12 +126,9 @@ export class RecentEditedDescriptionActivityComponent extends BaseComponent impl
}
refresh(): void {
if (!this.formGroup.get('order').value) {
this.formGroup.get('order').setValue(this.order.UpdatedAt);
}
this.lookup.page = { size: this.pageSize, offset: 0 };
this.lookup.onlyDescription = true;
this.lookup.orderField = this.formGroup.get('order').value;
this.lookup.orderField = this.formGroup.get('order').value ??this.order.UpdatedAt;
this.lookup.like = this.formGroup.get('like').value;
this.lookup.project = {
@ -157,13 +163,6 @@ export class RecentEditedDescriptionActivityComponent extends BaseComponent impl
};
this.getItems();
this.formGroup.get('like').valueChanges
.pipe(takeUntil(this._destroyed), debounceTime(500))
.subscribe(x => this.refresh());
this.formGroup.get('order').valueChanges
.pipe(takeUntil(this._destroyed))
.subscribe(x => this.refresh());
}
loadMore() {

27
dmp-frontend/src/app/ui/dashboard/recent-edited-dmp-activity/recent-edited-dmp-activity.component.ts
View File

@ -32,13 +32,13 @@ export class RecentEditedDmpActivityComponent extends BaseComponent implements O
lookup: RecentActivityItemLookup = new RecentActivityItemLookup();
pageSize: number = 5;
pageLessSize= this.pageSize;
pageLessSize = this.pageSize;
@Output() totalCountDmps: EventEmitter<any> = new EventEmitter();
@ViewChild("dmps") resultsContainer;
listingItems: Dmp[]= [];
listingItems: Dmp[] = [];
isDraft: boolean;
totalCount: number;
@ -101,6 +101,13 @@ export class RecentEditedDmpActivityComponent extends BaseComponent implements O
}
});
this.formGroup.get('like').valueChanges
.pipe(takeUntil(this._destroyed), debounceTime(500))
.subscribe(x => this.refresh());
this.formGroup.get('order').valueChanges
.pipe(takeUntil(this._destroyed))
.subscribe(x => this.refresh());
this.refresh();
}
@ -124,12 +131,9 @@ export class RecentEditedDmpActivityComponent extends BaseComponent implements O
}
refresh(): void {
if (!this.formGroup.get('order').value) {
this.formGroup.get('order').setValue(this.order.UpdatedAt);
}
this.lookup.page = { size: this.pageSize, offset: 0 };
this.lookup.onlyDmp = true;
this.lookup.orderField = this.formGroup.get('order').value;
this.lookup.orderField = this.formGroup.get('order').value ?? this.order.UpdatedAt;
this.lookup.like = this.formGroup.get('like').value;
this.lookup.project = {
fields: [
@ -169,13 +173,6 @@ export class RecentEditedDmpActivityComponent extends BaseComponent implements O
};
this.getItems();
this.formGroup.get('like').valueChanges
.pipe(takeUntil(this._destroyed), debounceTime(500))
.subscribe(x => this.refresh());
this.formGroup.get('order').valueChanges
.pipe(takeUntil(this._destroyed))
.subscribe(x => this.refresh());
}
loadMore() {
@ -190,7 +187,7 @@ export class RecentEditedDmpActivityComponent extends BaseComponent implements O
this.getItems();
}
private getItems(){
private getItems() {
this.listingItems = [];
this.dashboardService
@ -198,7 +195,7 @@ export class RecentEditedDmpActivityComponent extends BaseComponent implements O
.pipe(takeUntil(this._destroyed))
.subscribe(response => {
response.forEach(item => {
if (item.dmp){
if (item.dmp) {
item.dmp.dmpUsers = item.dmp.dmpUsers.filter(x => x.isActive === IsActive.Active);
if (item.dmp.descriptions) {
if (item.dmp.status == DmpStatus.Finalized) {

2
dmp-frontend/src/assets/i18n/en.json
View File

@ -1712,7 +1712,7 @@
"INTERNAL": "Internal",
"EXTERNAL": "External"
},
"NOTIFICATION-TEMPLATE-KIND - HERE!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!": {
"NOTIFICATION-TEMPLATE-KIND": {
"DRAFT": "Draft",
"SECONDARY": "Secondary",
"PRIMARY": "Primary",