= 0) {
+ this.formPages.splice(index, 1);
+ //this.myForm.value.pages.splice(index, 1);
+ }
+ }
+}
+
+handleError(message: string, error) {
+ if(error == null) {
+ this.reset();
+ }
+ this.errorMessage = message + ' (Server responded: ' + error + ')';
+}
}
diff --git a/app/pages/divId/divIds.component.html b/app/pages/divId/divIds.component.html
index b740edf..5af57b3 100644
--- a/app/pages/divId/divIds.component.html
+++ b/app/pages/divId/divIds.component.html
@@ -66,7 +66,10 @@
- {{check.divId.page.name}}
+
+
+ {{page.name}},
+
|
@@ -96,7 +99,7 @@
-
+
diff --git a/app/pages/divId/divIds.component.ts b/app/pages/divId/divIds.component.ts
index adcd43c..d2e40cf 100644
--- a/app/pages/divId/divIds.component.ts
+++ b/app/pages/divId/divIds.component.ts
@@ -42,6 +42,7 @@ export class DivIdsComponent implements OnInit {
public selectedCommunityPid: string;
public communities: Community[] = [];
public pages: Page[] = [];
+ public formPages: Page[] = [];
ngOnInit() {
this.formGroup = this.formComponent.form;
@@ -144,7 +145,23 @@ export class DivIdsComponent implements OnInit {
public editDivId(i : number) {
let divId : DivId = this.checkboxes[i].divId;
+ this.formPages = divId.pages;
+
+ let pageIds: string[] = [];
+ let index = 0;
+ for(let page of divId.pages) {
+ pageIds[index] = page._id;
+ index++;
+ }
+ //divId.pages = pageIds;
+
+ let community: Community = divId.community;
this.formGroup.patchValue(divId);
+ this.formGroup.patchValue({
+ community: community._id
+ });
+ this.formComponent.setPages(pageIds);
+
this.updateModal.showModal();
}
@@ -191,6 +208,7 @@ export class DivIdsComponent implements OnInit {
handleError(message: string, error) {
if(error == null) {
+ console.info("handleError");
this.formComponent.reset();
}
this.errorMessage = message + ' (Server responded: ' + error + ')';
diff --git a/app/pages/divhelpcontent/div-help-contents.component.html b/app/pages/divhelpcontent/div-help-contents.component.html
index 97154a9..645a4c1 100644
--- a/app/pages/divhelpcontent/div-help-contents.component.html
+++ b/app/pages/divhelpcontent/div-help-contents.component.html
@@ -91,7 +91,10 @@
name="entitiescb[]" value="{{check.divHelpContent._id}}" [(ngModel)]="check.checked">
|
- {{check.divHelpContent.divId.page.name}}
+
+
+ {{page.name}},
+
|
diff --git a/app/pages/divhelpcontent/div-help-contents.component.ts b/app/pages/divhelpcontent/div-help-contents.component.ts
index 7ba9741..8b127b5 100644
--- a/app/pages/divhelpcontent/div-help-contents.component.ts
+++ b/app/pages/divhelpcontent/div-help-contents.component.ts
@@ -139,8 +139,10 @@ export class DivHelpContentsComponent implements OnInit {
});*/
for (let i = self.divHelpContents.length - 1; i >= 0; i -= 1) {
let divId: DivId = self.divHelpContents[i].divId as DivId;
- let page: Page = divId.page as Page;
- if(!self.selectedPageId || (page._id == self.selectedPageId)) {
+ let pages: Page[] = divId.pages as Page[];
+ const pageIds = pages.map(x => x._id);
+
+ if(!self.selectedPageId || pageIds.includes(self.selectedPageId)/*(page._id == self.selectedPageId)*/) {
self.checkboxes.push({divHelpContent : self.divHelpContents[i], checked : false});
} else {
self.divHelpContents.splice(i, 1);
@@ -212,7 +214,6 @@ export class DivHelpContentsComponent implements OnInit {
() => {
for(let id of ids) {
let i = this.checkboxes.findIndex(_ => _.divHelpContent._id == id);
- console.info(i);
this.checkboxes[i].divHelpContent.isActive=status;
}
this.countDivHelpContents();
@@ -223,8 +224,6 @@ export class DivHelpContentsComponent implements OnInit {
}
public saveDivHelpContent(data : any):void {
- console.log(data);
-
this._helpService.insertOrUpdateDivHelpContent(data).subscribe(
divHelpContent => this.divHelpContentSavedSuccessfully(divHelpContent),
error => this.handleError('System error saving the specified help content', error)
@@ -250,7 +249,10 @@ export class DivHelpContentsComponent implements OnInit {
public filterDivHelpContent(divHelpContent : DivHelpContent, filters : DivHelpContentFilterOptions) : boolean {
let divId: DivId = divHelpContent.divId as DivId;
- let idFlag = filters.id == '' || (divId.page)._id == filters.id;
+ let pages: Page[] = divId.pages;
+ let pageIds: string[] = pages.map(x => x._id);
+
+ let idFlag = filters.id == '' || /*(divId.pages)._id == filters.id*/ pageIds.includes(filters.id);
let activeFlag = filters.active == null || divHelpContent.isActive == filters.active;
let textFlag = filters.text.toString() == '' || (divHelpContent.content).match(filters.text) != null;
return idFlag && activeFlag && textFlag;
diff --git a/app/pages/modal-form.component.ts b/app/pages/modal-form.component.ts
index 6f55420..9d94dcf 100644
--- a/app/pages/modal-form.component.ts
+++ b/app/pages/modal-form.component.ts
@@ -125,14 +125,15 @@ export class ModalFormComponent {
error => this.emmitError.emit(error)
);
} else if(this.saveText == 'Save') {
+ //console.info( obj);
this._helpService.saveDivId( obj).subscribe(
data => this.emmitObject.emit(data),
error => this.emmitError.emit(error)
);
}
}
+ this.hideModal();
}
- this.hideModal();
}
}
}
|