From bc4e0332474c08d1d1e476d72c2b7ab0f643a3c1 Mon Sep 17 00:00:00 2001
From: annampak <annampak@hotmail.com>
Date: Fri, 22 Dec 2017 15:46:36 +0200
Subject: [PATCH] replace ng prime with material

---
 dmp-admin/src/app/services/rest-base.ts            |  6 +++---
 .../src/app/dmps/editor/dmp-editor.component.ts    |  2 +-
 .../dynamic-field-boolean-decision.component.html  |  4 ++--
 .../dynamic-field-checkbox.html                    |  6 ++++--
 .../dynamic-field-radiobox.component.html          |  6 ++++--
 .../src/app/form/dynamic-form.component.html       | 14 +++++++-------
 .../src/app/form/dynamic-form.component.ts         |  1 +
 .../src/app/services/project/project.service.ts    |  4 ++++
 .../src/app/shared/material/material.module.ts     |  6 ++++--
 9 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/dmp-admin/src/app/services/rest-base.ts b/dmp-admin/src/app/services/rest-base.ts
index c2082b173..039c1f877 100644
--- a/dmp-admin/src/app/services/rest-base.ts
+++ b/dmp-admin/src/app/services/rest-base.ts
@@ -18,10 +18,10 @@ export class RestBase {
     /*
     */
     protocol: string = "http";
-    hostname: string = "192.168.32.103";
+    hostname: string = "192.168.32.171";
     port: number = 8080;
-    webappname: string = "dmp-backend";
-    restpath: string = "rest";
+    webappname: string = "";
+    restpath: string = "";
 
 /*
     protocol: string = "http";
diff --git a/dmp-frontend/src/app/dmps/editor/dmp-editor.component.ts b/dmp-frontend/src/app/dmps/editor/dmp-editor.component.ts
index 9a77e19ab..1139ea32f 100644
--- a/dmp-frontend/src/app/dmps/editor/dmp-editor.component.ts
+++ b/dmp-frontend/src/app/dmps/editor/dmp-editor.component.ts
@@ -64,7 +64,7 @@ export class DataManagementPlanEditorComponent implements AfterViewInit {
 
       let projectRequestItem: RequestItem<ProjectCriteria> = new RequestItem();
       projectRequestItem.criteria = new ProjectCriteria();
-      this.projectAutoCompleteConfiguration = new AutoCompleteConfiguration(this.projectService.get.bind(this.projectService), projectRequestItem);
+      this.projectAutoCompleteConfiguration = new AutoCompleteConfiguration(this.projectService.getWithExternal.bind(this.projectService), projectRequestItem);
 
       if (itemId != null) {
         this.isNew = false;
diff --git a/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-boolean-decision/dynamic-field-boolean-decision.component.html b/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-boolean-decision/dynamic-field-boolean-decision.component.html
index e90c46f87..fda66ed38 100644
--- a/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-boolean-decision/dynamic-field-boolean-decision.component.html
+++ b/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-boolean-decision/dynamic-field-boolean-decision.component.html
@@ -1,5 +1,5 @@
 <div [formGroup]="form">
-    <!-- <p-radioButton name="{{field.id}}" value="true" label="Yes" formControlName="value"></p-radioButton> -->
+    <mat-radio-button name="{{field.id}}" value="true" label="Yes" formControlName="value"></mat-radio-button>
     <br>
-    <!-- <p-radioButton name="{{field.id}}" value="false" label="No" formControlName="value"></p-radioButton> -->
+    <mat-radio-button name="{{field.id}}" value="false" label="No" formControlName="value"></mat-radio-button>
 </div>
\ No newline at end of file
diff --git a/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-checkbox/dynamic-field-checkbox.html b/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-checkbox/dynamic-field-checkbox.html
index 3aad48483..8404fae7a 100644
--- a/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-checkbox/dynamic-field-checkbox.html
+++ b/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-checkbox/dynamic-field-checkbox.html
@@ -1,3 +1,5 @@
 <div [formGroup]="form" class="form-group">
-    <!-- <p-checkbox [formControl]="form.get('value')" label="{{field.data.label}}" binary="true"></p-checkbox> -->
-</div>
\ No newline at end of file
+    <mat-checkbox [formControl]="form.get('value')"  binary="true">{{field.data.label}}</mat-checkbox>
+</div>
+
+<!-- label="{{field.data.label}}" -->
\ No newline at end of file
diff --git a/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-radiobox/dynamic-field-radiobox.component.html b/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-radiobox/dynamic-field-radiobox.component.html
index db4d6428b..ccfe61b59 100644
--- a/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-radiobox/dynamic-field-radiobox.component.html
+++ b/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-radiobox/dynamic-field-radiobox.component.html
@@ -1,5 +1,7 @@
 <div [formGroup]="form">
   <div *ngFor="let option of this.field.data.options let index = index">
-    <!-- <p-radioButton name="{{field.id}}" [value]="option.value" label="{{option.label}}" formControlName="value"></p-radioButton> -->
+    <mat-radio-button name="{{field.id}}" [value]="option.value" formControlName="value">{{option.label}}</mat-radio-button>
   </div>
-</div>
\ No newline at end of file
+</div>
+
+<!-- label="{{option.label}}" -->
\ No newline at end of file
diff --git a/dmp-frontend/src/app/form/dynamic-form.component.html b/dmp-frontend/src/app/form/dynamic-form.component.html
index 7add9bb92..e578cf0b7 100644
--- a/dmp-frontend/src/app/form/dynamic-form.component.html
+++ b/dmp-frontend/src/app/form/dynamic-form.component.html
@@ -1,10 +1,10 @@
 <div class="ui-g dynamic-formc full-width full-height">
-	<!-- <ng-sidebar-container contentClass="scrollableContent">
-		<ng-sidebar mode="push" position="right" [(opened)]="visibleSidebar">
+	 <mat-sidenav-container contentClass="scrollableContent">
+		<mat-sidenav mode="push" position="right" [(opened)]="visibleSidebar">
 			<table-of-content class="toc-container full-height" [model]="dataModel"></table-of-content>
-		</ng-sidebar>
+		</mat-sidenav>
 
-		<div class="ui-g" ng-sidebar-content>
+		 <mat-sidenav-content class="ui-g">
 			<button type="button" style="margin: 15px;" class="btn btn-primary" (click)="toggleSidebar()" icon="fa-arrow-left">Table Of Contents</button>
 			<button type="button" *ngIf="dataModel&&dataModel.status != 1" style="margin-top: 15px;margin-bottom: 15px;margin-right: 15px;"
 			 class="btn btn-primary" type="button" (click)="save();">Save</button>
@@ -12,7 +12,7 @@
 			 class="btn btn-primary" (click)="submit();">Save and Finalize</button>
 			<div class="ui-g-12">
 				<div class="alignment-center">
-					<ngb-pagination *ngIf="pages" [collectionSize]="pages.length*10" [page]="currentPageIndex" (pageChange)="changePageIndex($event)" aria-label="Default pagination"></ngb-pagination>
+					<!-- <ngb-pagination *ngIf="pages" [collectionSize]="pages.length*10" [page]="currentPageIndex" (pageChange)="changePageIndex($event)" aria-label="Default pagination"></ngb-pagination> -->
 				</div>
 			</div>
 			<div class="ui-g-12">
@@ -27,6 +27,6 @@
 					</div>
 				</form>
 			</div>
-		</div>
-	</ng-sidebar-container> -->
+		</mat-sidenav-content>
+	 </mat-sidenav-container>
 </div>
\ No newline at end of file
diff --git a/dmp-frontend/src/app/form/dynamic-form.component.ts b/dmp-frontend/src/app/form/dynamic-form.component.ts
index e89c89445..a262a9854 100644
--- a/dmp-frontend/src/app/form/dynamic-form.component.ts
+++ b/dmp-frontend/src/app/form/dynamic-form.component.ts
@@ -10,6 +10,7 @@ import { NgForm } from '@angular/forms';
 import { Router, ActivatedRoute, ParamMap, Params } from '@angular/router';
 import 'rxjs/add/operator/switchMap';
 import { Location } from '@angular/common';
+import {MatSidenavModule} from '@angular/material/sidenav';
 
 declare function simple_notifier(type: string, title: string, message: string): any;
 
diff --git a/dmp-frontend/src/app/services/project/project.service.ts b/dmp-frontend/src/app/services/project/project.service.ts
index e2fd4fe0b..b2b053c26 100644
--- a/dmp-frontend/src/app/services/project/project.service.ts
+++ b/dmp-frontend/src/app/services/project/project.service.ts
@@ -36,6 +36,10 @@ export class ProjectService {
         return this.http.post<ProjectModel[]>(this.actionUrl + 'get', requestItem, { headers: this.headers });
     }
 
+    getWithExternal(requestItem: RequestItem<ProjectCriteria>): Observable<ProjectModel[]> {
+        return this.http.post<ProjectModel[]>(this.actionUrl + 'getWithExternal', requestItem, { headers: this.headers });
+    }
+
     getSingle(id: string): Observable<ProjectModel> {
         return this.http.get<ProjectModel>(this.actionUrl + 'getSingle/' + id, { headers: this.headers });
     }
diff --git a/dmp-frontend/src/app/shared/material/material.module.ts b/dmp-frontend/src/app/shared/material/material.module.ts
index 843b348ee..d8e9dfdea 100644
--- a/dmp-frontend/src/app/shared/material/material.module.ts
+++ b/dmp-frontend/src/app/shared/material/material.module.ts
@@ -24,7 +24,8 @@ import {
 	MatTooltipModule,
 	MatCheckboxModule,
 	MatTabsModule,
-	MatStepperModule
+	MatStepperModule,
+	MatRadioModule	
 } from '@angular/material';
 import { CdkTableModule } from '@angular/cdk/table';
 import { SnackBarNotificationComponent } from '../components/notificaiton/snack-bar-notification.component';
@@ -62,7 +63,8 @@ import { CovalentLayoutModule, CovalentChipsModule, CovalentDialogsModule } from
 		CovalentLayoutModule,
 		CovalentChipsModule,
 		CovalentDialogsModule,
-		MatStepperModule
+		MatStepperModule,
+		MatRadioModule
 	],
 
 	providers: [