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

Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development

This commit is contained in:
annabakouli 2017-12-06 14:49:01 +02:00
parent 3ced6b5236 e8d9190648
commit 5509307388
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dmp-frontend/src/app/app.module.ts
View File

@ -96,7 +96,7 @@ import { ProjectDetailedComponent } from './viewers/project-detailed/project-det
import {ProgressBarModule} from 'primeng/primeng'; import {ProgressBarModule} from 'primeng/primeng';
import {StepsModule,MenuItem} from 'primeng/primeng'; import {StepsModule,MenuItem} from 'primeng/primeng';
import {SidebarModule as NgSidebarModule} from 'primeng/primeng'; import {CheckboxModule} from 'primeng/primeng';
@NgModule({ @NgModule({
declarations: [ declarations: [
@ -155,7 +155,7 @@ import {SidebarModule as NgSidebarModule} from 'primeng/primeng';
BrowserAnimationsModule, BrowserAnimationsModule,
SidebarModule.forRoot(), SidebarModule.forRoot(),
StepsModule, StepsModule,
NgSidebarModule CheckboxModule
], ],
providers: [{ providers: [{
provide: HTTP_INTERCEPTORS, provide: HTTP_INTERCEPTORS,

3
dmp-frontend/src/app/form/dynamic-fields/dynamic-field-checkbox/dynamic-field-checkbox.html
View File

@ -1,4 +1,3 @@
<div [formGroup]="form" class="form-group"> <div [formGroup]="form" class="form-group">
<input id="{{field.id + 'checkboc'}}" class="checkbox-icon" formControlName="value" type="checkbox"> <p-checkbox [formControl]="form" label="Test"></p-checkbox>
<label for="{{field.id + 'checkboc'}}" class="checkbox-label">{{field.data.label}}</label>
</div> </div>

4
dmp-frontend/src/app/form/dynamic-fields/dynamic-field-dropdown/dynamic-field-dropdown.html
View File

@ -1,5 +1,5 @@
<div [formGroup]="form"> <div [formGroup]="form">
<select class="form-control" formControlName="value"> <select class="form-control" formControlName="value">
<option *ngFor="let opt of field.data.options" [value]="opt.value">{{opt.label}}</option> <option *ngFor="let opt of field.data.options" [value]="opt.value">{{opt.label}}</option>
</select> </select>
</div> </div>

2
dmp-frontend/src/app/services/rest-base.ts
View File

@ -18,7 +18,7 @@ export class RestBase {
protocol: string = "http"; protocol: string = "http";
hostname: string ="localhost" hostname: string ="192.168.32.103"
port: number = 8080; port: number = 8080;
webappname: string = "dmp-backend"; webappname: string = "dmp-backend";