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

no message

This commit is contained in:
Ioannis Kalyvas 2018-01-25 10:14:43 +02:00
parent b30b5fd792
commit 5ef8689e54
10 changed files with 124 additions and 164 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
dmp-backend/src/main/java/eu/eudat/controllers/DatasetProfileController.java
View File

@ -9,6 +9,7 @@ import java.util.UUID;
import eu.eudat.models.components.commons.datafield.AutoCompleteData;
import eu.eudat.models.helpers.responses.ResponseItem;
import eu.eudat.models.user.composite.DatasetProfile;
import eu.eudat.models.user.composite.PagedDatasetProfile;
import eu.eudat.services.ApiContext;
import eu.eudat.types.ApiMessageCode;
import org.json.JSONObject;
@ -36,65 +37,58 @@ import eu.eudat.utilities.builders.XmlBuilder;
@RestController
@CrossOrigin
public class DatasetProfileController extends BaseController{
public class DatasetProfileController extends BaseController {
@Autowired
public DatasetProfileController(ApiContext apiContext) {
super(apiContext);
}
@Autowired
public DatasetProfileController(ApiContext apiContext) {
super(apiContext);
}
@RequestMapping(method = RequestMethod.GET, value = { "/datasetwizard/get/{id}" }, produces="application/json")
public ResponseEntity<ResponseItem<DatasetProfile>> getSingle(@PathVariable String id){
try {
eu.eudat.entities.Dataset dataset = this.getApiContext().getDatabaseRepository().getDatasetDao().find(UUID.fromString(id));
eu.eudat.models.user.composite.DatasetProfile datasetprofile = UserManager.generateDatasetProfileModel(dataset.getProfile());
datasetprofile.setStatus(dataset.getStatus());
if(dataset.getProperties()!=null){
JSONObject jobject = new JSONObject(dataset.getProperties());
Map<String,Object> properties = (Map<String, Object>)jobject.toMap();
datasetprofile.fromJsonObject(properties);
}
return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<DatasetProfile>().status(ApiMessageCode.NO_MESSAGE).payload(datasetprofile));
}
catch(Exception ex) {
ex.printStackTrace();
return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<DatasetProfile>().status(ApiMessageCode.DEFAULT_ERROR_MESSAGE).message(ex.getMessage()));
}
}
@Transactional
@RequestMapping(method = RequestMethod.POST, value = { "/datasetprofile/save/{id}" }, consumes="application/json",produces="application/json")
public ResponseEntity<Object> updateDataset(@PathVariable String id,@RequestBody PropertiesModel properties){
try {
eu.eudat.entities.Dataset dataset = this.getApiContext().getDatabaseRepository().getDatasetDao().find(UUID.fromString(id));
Map<String,Object> values = new HashMap();
properties.toMap(values);
JSONObject jobject = new JSONObject(values);
dataset.setProperties(jobject.toString());
dataset.setStatus((short)properties.getStatus());
this.getApiContext().getDatabaseRepository().getDatasetDao().createOrUpdate(dataset); //TODO
@RequestMapping(method = RequestMethod.GET, value = {"/datasetwizard/get/{id}"}, produces = "application/json")
public ResponseEntity<ResponseItem<DatasetProfile>> getSingle(@PathVariable String id) {
try {
eu.eudat.entities.DatasetProfile profile = this.getApiContext().getDatabaseRepository().getDatasetProfileDao().find(UUID.fromString(id));
eu.eudat.models.user.composite.DatasetProfile datasetprofile = UserManager.generateDatasetProfileModel(profile);
PagedDatasetProfile pagedDatasetProfile = new PagedDatasetProfile();
pagedDatasetProfile.buildPagedDatasetProfile(datasetprofile);
return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<DatasetProfile>().status(ApiMessageCode.NO_MESSAGE).payload(datasetprofile));
} catch (Exception ex) {
ex.printStackTrace();
return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<DatasetProfile>().status(ApiMessageCode.DEFAULT_ERROR_MESSAGE).message(ex.getMessage()));
}
}
return ResponseEntity.status(HttpStatus.OK).body(properties);
}
catch(Exception ex) {
ex.printStackTrace();
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("Serialization issue: "+ex.getMessage());
}
}
@RequestMapping(method = RequestMethod.POST, value = { "/search/autocomplete" }, consumes="application/json",produces="application/json")
public ResponseEntity<Object> getDataForAutocomplete(@RequestBody AutoCompleteLookupItem lookupItem){
try {
eu.eudat.entities.Dataset dataset = this.getApiContext().getDatabaseRepository().getDatasetDao().find(UUID.fromString(lookupItem.getProfileID()));
eu.eudat.entities.xmlmodels.datasetprofiledefinition.Field modelfield = new eu.eudat.entities.xmlmodels.datasetprofiledefinition.Field();
AutoCompleteData data = new AutoCompleteData().fromData(modelfield.getData());
@Transactional
@RequestMapping(method = RequestMethod.POST, value = {"/datasetprofile/save/{id}"}, consumes = "application/json", produces = "application/json")
public ResponseEntity<Object> updateDataset(@PathVariable String id, @RequestBody PropertiesModel properties) {
try {
eu.eudat.entities.Dataset dataset = this.getApiContext().getDatabaseRepository().getDatasetDao().find(UUID.fromString(id));
Map<String, Object> values = new HashMap();
properties.toMap(values);
JSONObject jobject = new JSONObject(values);
dataset.setProperties(jobject.toString());
dataset.setStatus((short) properties.getStatus());
this.getApiContext().getDatabaseRepository().getDatasetDao().createOrUpdate(dataset); //TODO
URL url = new URL(data.getUrl()+lookupItem.getSearchTerm());
HttpURLConnection con = (HttpURLConnection) url.openConnection();
return ResponseEntity.status(HttpStatus.OK).body(null);
}
catch(Exception ex) {
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("Serialization issue: "+ex.getMessage());
}
}
return ResponseEntity.status(HttpStatus.OK).body(properties);
} catch (Exception ex) {
ex.printStackTrace();
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("Serialization issue: " + ex.getMessage());
}
}
@RequestMapping(method = RequestMethod.POST, value = {"/search/autocomplete"}, consumes = "application/json", produces = "application/json")
public ResponseEntity<Object> getDataForAutocomplete(@RequestBody AutoCompleteLookupItem lookupItem) {
try {
eu.eudat.entities.Dataset dataset = this.getApiContext().getDatabaseRepository().getDatasetDao().find(UUID.fromString(lookupItem.getProfileID()));
eu.eudat.entities.xmlmodels.datasetprofiledefinition.Field modelfield = new eu.eudat.entities.xmlmodels.datasetprofiledefinition.Field();
AutoCompleteData data = new AutoCompleteData().fromData(modelfield.getData());
URL url = new URL(data.getUrl() + lookupItem.getSearchTerm());
HttpURLConnection con = (HttpURLConnection) url.openConnection();
return ResponseEntity.status(HttpStatus.OK).body(null);
} catch (Exception ex) {
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("Serialization issue: " + ex.getMessage());
}
}
}

2
dmp-backend/src/main/java/eu/eudat/controllers/DatasetWizardController.java
View File

@ -82,7 +82,7 @@ public class DatasetWizardController extends BaseController {
public @ResponseBody ResponseEntity<ResponseItem<Dataset>> createOrUpdate(@RequestBody DatasetWizardModel profile, Principal principal) {
try {
eu.eudat.entities.Dataset dataset = DatasetManager.createOrUpdate(this.getApiContext(), profile);
return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<eu.eudat.entities.Dataset>().status(ApiMessageCode.SUCCESS_MESSAGE).message("Created").payload(dataset));
return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<eu.eudat.entities.Dataset>().status(ApiMessageCode.SUCCESS_MESSAGE).message("Created").payload(null));
} catch (Exception ex) {
ex.printStackTrace();
return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem<eu.eudat.entities.Dataset>().status(ApiMessageCode.DEFAULT_ERROR_MESSAGE).message(ex.getMessage()));

1
dmp-backend/src/main/java/eu/eudat/entities/Dataset.java
View File

@ -314,6 +314,7 @@ public class Dataset implements DataEntity<Dataset> {
this.setProperties(entity.getProperties());
this.setExternalDatasets(entity.getExternalDatasets());
this.setStatus(entity.getStatus());
if(entity.getCreator()!=null) this.creator = entity.getCreator();
}
@Override

11
dmp-backend/src/main/java/eu/eudat/managers/DatasetManager.java
View File

@ -14,6 +14,7 @@ import eu.eudat.models.helpers.DataTableData;
import eu.eudat.models.listingmodels.DatasetListingModel;
import eu.eudat.models.project.Project;
import eu.eudat.models.project.ProjectTableRequest;
import eu.eudat.models.properties.PropertiesModel;
import eu.eudat.models.security.Principal;
import eu.eudat.models.user.composite.PagedDatasetProfile;
import eu.eudat.queryable.QueryableList;
@ -22,6 +23,7 @@ import eu.eudat.utilities.builders.DomainModelConverter;
import org.json.JSONObject;
import java.text.ParseException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;
@ -63,6 +65,7 @@ public class DatasetManager {
public static eu.eudat.entities.Dataset createOrUpdate(ApiContext apiContext, DatasetWizardModel profile) throws Exception {
eu.eudat.entities.Dataset dataset = profile.toDataModel();
propertiesModelToString(profile,dataset);
createRegistriesIfTheyDontExist(apiContext.getDatabaseRepository().getRegistryDao(), dataset);
createDataRepositoriesIfTheyDontExist(apiContext.getDatabaseRepository().getDataRepositoryDao(), dataset);
createServicesIfTheyDontExist(apiContext.getDatabaseRepository().getServiceDao(), dataset);
@ -70,6 +73,14 @@ public class DatasetManager {
return apiContext.getDatabaseRepository().getDatasetDao().createOrUpdate(dataset);
}
private static void propertiesModelToString(DatasetWizardModel datasetWizardModel,eu.eudat.entities.Dataset dataset){
Map<String,Object> values = new HashMap();
PropertiesModel properties = datasetWizardModel.getProperties();
properties.toMap(values);
JSONObject jobject = new JSONObject(values);
dataset.setProperties(jobject.toString());
}
private static void createRegistriesIfTheyDontExist(RegistryDao registryDao, eu.eudat.entities.Dataset dataset) {
if (dataset.getRegistries() != null && !dataset.getRegistries().isEmpty()) {

9
dmp-backend/src/main/java/eu/eudat/models/datasetwizard/DatasetWizardModel.java
View File

@ -11,6 +11,7 @@ import eu.eudat.models.datasetprofile.DatasetProfileListingModel;
import eu.eudat.models.dmp.DataManagementPlan;
import eu.eudat.models.externaldataset.ExternalDatasetListingModel;
import eu.eudat.models.listingmodels.DatasetListingModel;
import eu.eudat.models.properties.PropertiesModel;
import eu.eudat.models.user.composite.DatasetProfile;
import eu.eudat.models.user.composite.PagedDatasetProfile;
import eu.eudat.utilities.builders.DomainModelConverter;
@ -29,7 +30,6 @@ public class DatasetWizardModel implements DataModel<Dataset> {
private String uri;
private String description;
private short status;
private String properties;
private Date created;
private DataManagementPlan dmp;
private PagedDatasetProfile datasetProfileDefinition;
@ -38,6 +38,7 @@ public class DatasetWizardModel implements DataModel<Dataset> {
private List<DataRepository> dataRepositories;
private List<ExternalDatasetListingModel> externalDatasets;
private DatasetProfileListingModel profile;
private PropertiesModel properties;
public UUID getId() {
return id;
@ -87,11 +88,11 @@ public class DatasetWizardModel implements DataModel<Dataset> {
this.status = status;
}
public String getProperties() {
public PropertiesModel getProperties() {
return properties;
}
public void setProperties(String properties) {
public void setProperties(PropertiesModel properties) {
this.properties = properties;
}
@ -163,7 +164,6 @@ public class DatasetWizardModel implements DataModel<Dataset> {
public void fromDataModel(Dataset entity) throws InstantiationException, IllegalAccessException {
this.id = entity.getId();
this.label = entity.getLabel();
this.properties = entity.getProperties();
this.status = entity.getStatus();
this.reference = entity.getReference();
this.description = entity.getDescription();
@ -185,7 +185,6 @@ public class DatasetWizardModel implements DataModel<Dataset> {
entity.setLabel(this.label);
entity.setReference(this.reference);
entity.setUri(this.uri);
entity.setProperties(this.properties);
entity.setStatus(this.status);
entity.setDmp(dmp.toDataModel());
entity.setDescription(this.description);

10
dmp-frontend/src/app/dataset-wizard/dataset-wizard.component.html
View File

@ -1,7 +1,7 @@
<div class="dataset-wizard">
<h3 *ngIf="isNew">New {{datasetWizardModel?.dmp?.project?.label}} Dataset</h3>
<h3 *ngIf="!isNew">{{datasetWizardModel?.dmp?.project?.label}} Dataset</h3>
<mat-horizontal-stepper [linear]="isLinear" #stepper>
<h3 *ngIf="isNew">New {{datasetWizardModel?.dmp?.project?.label}} Dataset</h3>
<h3 *ngIf="!isNew">{{datasetWizardModel?.dmp?.project?.label}} Dataset</h3>
<mat-horizontal-stepper [linear]="isLinear" #stepper>
<mat-step [stepControl]="formGroup">
<form *ngIf="formGroup" [formGroup]="formGroup">
<ng-template matStepLabel>{{'DATASET-WIZARD.FIRST-STEP.TITLE' | translate}}</ng-template>
@ -80,13 +80,13 @@
<div class="navigation-buttons-container">
<button matStepperPrevious mat-raised-button color="primary">{{'DATASET-WIZARD.ACTIONS.BACK' | translate}}</button>
<button matStepperNext mat-raised-button color="primary" style="float:right;" (click)="formSubmit()">{{'DATASET-WIZARD.ACTIONS.NEXT' | translate}}</button>
<button matStepperNext mat-raised-button color="primary" style="float:right;" (click)="getDefinition()">{{'DATASET-WIZARD.ACTIONS.NEXT' | translate}}</button>
</div>
</form>
</mat-step>
<mat-step>
<ng-template matStepLabel>{{'DATASET-WIZARD.THIRD-STEP.TITLE' | translate}}</ng-template>
<dynamic-form class="full-width" *ngIf="datasetWizardModel && datasetWizardModel.id" [dataModel]="datasetWizardModel"></dynamic-form>
<dynamic-form class="full-width" *ngIf="datasetWizardModel && datasetWizardModel.id" [dataModel]="datasetWizardModel"></dynamic-form>
<div class="navigation-buttons-container">
<button style="margin-top:10px;" matStepperPrevious mat-raised-button color="primary">{{'DATASET-WIZARD.ACTIONS.BACK' | translate}}</button>
</div>

65
dmp-frontend/src/app/dataset-wizard/dataset-wizard.component.ts
View File

@ -15,7 +15,7 @@ import { DataManagementPlanModel } from "../models/data-managemnt-plans/DataMana
import { JsonSerializer } from "../utilities/JsonSerializer";
import { Observable } from "rxjs/Observable";
import { RequestItem } from "../models/criteria/RequestItem";
import { MatPaginator, MatSort, MatSnackBar, MatStepper } from "@angular/material";
import { MatPaginator, MatSort, MatSnackBar } from "@angular/material";
import { SnackBarNotificationComponent } from "../shared/components/notificaiton/snack-bar-notification.component";
import { DatasetProfileModel } from '../models/datasetprofile/DatasetProfileModel';
import { ExternalSourcesItemModel } from '../models/external-sources/ExternalSourcesItemModel';
@ -25,11 +25,10 @@ import { ExternalSourcesService } from '../services/external-sources/external-so
selector: 'app-dataset-wizard-component',
templateUrl: 'dataset-wizard.component.html',
styleUrls: ['./dataset-wizard.component.scss'],
providers: [DatasetWizardService, ExternalSourcesService, DataManagementPlanService, MatStepper],
providers: [DatasetWizardService, ExternalSourcesService, DataManagementPlanService],
encapsulation: ViewEncapsulation.None
})
export class DatasetWizardComponent implements AfterViewInit {
@ViewChild('stepper') stepper: MatStepper;
export class DatasetWizardComponent {
//dmpAutoCompleteConfiguration: AutoCompleteConfiguration;
//datasetProfileAutoCompleteConfiguration: AutoCompleteConfiguration;
@ -47,7 +46,7 @@ export class DatasetWizardComponent implements AfterViewInit {
filtereddataRepositories: ExternalSourcesItemModel[];
filteredRegistries: ExternalSourcesItemModel[];
filteredServices: ExternalSourcesItemModel[];
filteredExternalDatasets: ExternalSourcesItemModel[];
filteredExternalDatasets: ExternalSourcesItemModel[];
constructor(
private datasetWizardService: DatasetWizardService,
@ -70,7 +69,7 @@ export class DatasetWizardComponent implements AfterViewInit {
ngOnInit() {
let dmpRequestItem: RequestItem<DataManagementPlanCriteria> = new RequestItem();
dmpRequestItem.criteria = new DataManagementPlanCriteria();
//this.dmpAutoCompleteConfiguration = new AutoCompleteConfiguration(this.datasetWizardService.userDmps.bind(this.datasetWizardService), dmpRequestItem);
this.route.params.subscribe((params: Params) => {
const itemId = params['id'];
@ -81,7 +80,7 @@ export class DatasetWizardComponent implements AfterViewInit {
.subscribe(data => {
this.datasetWizardModel = JsonSerializer.fromJSONObject(data, DatasetWizardModel);
this.formGroup = this.datasetWizardModel.buildForm();
this.loadDatasetProfiles();
this.loadDatasetProfiles();
});
} else if (dmpId != null) {
this.isNew = true;
@ -110,39 +109,19 @@ export class DatasetWizardComponent implements AfterViewInit {
this.availableProfiles = JsonSerializer.fromJSONArray(items, DatasetProfileModel);
});
}
ngAfterViewInit() {
this.route.params.subscribe((params: Params) => {
let itemId = params['id'];
if(itemId !=null) this.stepper.selectedIndex = 2;
})
}
// this.route.params.subscribe((params: Params) => {
// const itemId = params['id'];
// if (itemId != null) {
// this.isNew = false;
// this.dataManagementPlanService.getSingle(itemId).map(data => data as DataManagementPlanModel)
// .subscribe(data => {
// this.dataManagementPlan = new JsonSerializer<DataManagementPlanModel>().fromJSONObject(data, DataManagementPlanModel);
// this.formGroup = this.dataManagementPlan.buildForm();
// });
// } else {
// this.dataManagementPlan = new DataManagementPlanModel();
// setTimeout(() => {
// this.formGroup = this.dataManagementPlan.buildForm();
// });
// }
// });
public cancel(): void {
//this.router.navigate(['/dataManagementPlans']);
}
getDefinition() {
this.datasetWizardService.getDefinition(this.datasetWizardModel.profile.id).subscribe(item => {
this.datasetWizardModel.datasetProfileDefinition = item;
})
}
formSubmit(): void {
//this.touchAllFormFields(this.formGroup);
//if(this.isNew)return;
if (!this.isFormValid()) { return; }
this.onSubmit();
}
@ -175,7 +154,6 @@ export class DatasetWizardComponent implements AfterViewInit {
onCallbackError(error: any) {
this.setErrorModel(error.error);
//this.validateAllFormFields(this.formGroup);
}
public setErrorModel(errorModel: BaseErrorModel) {
@ -193,11 +171,6 @@ export class DatasetWizardComponent implements AfterViewInit {
this.externalSourcesService.searchDatasetRepository(value).subscribe(items => {
this.filtereddataRepositories = items;
this.filtereddataRepositoriesAsync = false;
// this.filteredOrganisations = items.filter((filteredObj: any) => {
// return this.objectsModel ? this.objectsModel.indexOf(filteredObj) < 0 : true;
// });
});
}
}
@ -212,10 +185,6 @@ export class DatasetWizardComponent implements AfterViewInit {
this.filteredRegistries = items;
this.filteredRegistriesAsync = false;
// this.filteredOrganisations = items.filter((filteredObj: any) => {
// return this.objectsModel ? this.objectsModel.indexOf(filteredObj) < 0 : true;
// });
});
}
}
@ -229,11 +198,6 @@ export class DatasetWizardComponent implements AfterViewInit {
this.externalSourcesService.searchDatasetService(value).subscribe(items => {
this.filteredServices = items;
this.filteredServicesAsync = false;
// this.filteredOrganisations = items.filter((filteredObj: any) => {
// return this.objectsModel ? this.objectsModel.indexOf(filteredObj) < 0 : true;
// });
});
}
}
@ -248,11 +212,6 @@ export class DatasetWizardComponent implements AfterViewInit {
this.externalSourcesService.searchDatasetSExternalDatasetservice(value).subscribe(items => {
this.filteredExternalDatasets = items;
this.filteredExternalDatasetsAsync = false;
// this.filteredOrganisations = items.filter((filteredObj: any) => {
// return this.objectsModel ? this.objectsModel.indexOf(filteredObj) < 0 : true;
// });
});
}
}

64
dmp-frontend/src/app/form/dynamic-form.component.ts
View File

@ -12,7 +12,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';
import { MatSidenavModule } from '@angular/material/sidenav';
import { BaseHttpService } from '../utilities/cite-http-service-module/base-http.service';
import { DatasetWizardService } from '../services/dataset-wizard/dataset-wizard.service';
@ -60,48 +60,38 @@ export class DynamicFormComponent implements OnInit {
ngOnInit() {
this.datasetProfileDefinitionModel = this.dataModel.datasetProfileDefinition
//this.pages = this.getPages(this.datasetProfileDefinitionModel);
this.createPagination();
this.form = this.datasetProfileDefinitionModel.buildForm();
this.visibilityRulesService.formGroup = this.form;
let rules: Rule[] = JsonSerializer.fromJSONArray(this.datasetProfileDefinitionModel.rules, Rule);
this.visibilityRulesService.buildVisibilityRules(rules)
this.progressbar = true;
this.route.fragment.subscribe((fragment: string) => {
var self = this;
setTimeout(function () { self.scrollTo(fragment) });
});
this.route.queryParams.subscribe((params) => {
if (params && "page" in params)
this.changeCurrentPage(params["page"]);
});
/* else{
this.addSection();
}
this.dataModel = new JsonSerializer<DatasetModel>().fromJSONObject(TestModel,DatasetModel);
this.form = this.dataModel.buildForm();
this.datasetProfileDefinitionModel = this.dataModel.datasetProfileDefinition
this.createPagination();
this.form = this.datasetProfileDefinitionModel.buildForm();
this.visibilityRulesService.formGroup = this.form;
let rules:Rule[] = new JsonSerializer<Rule>().fromJSONArray(TestModel.rules,Rule);
this.visibilityRulesService.buildVisibilityRules(rules) */
}
submit(){
this.datasetWizardService.saveDataset(this.dataModel.id, this.dataModel.status, this.form.value).subscribe(data => {
this.router.navigateByUrl("/datasets/" + this.dataModel.dmp.id);
});
let rules: Rule[] = JsonSerializer.fromJSONArray(this.datasetProfileDefinitionModel.rules, Rule);
this.visibilityRulesService.buildVisibilityRules(rules)
this.progressbar = true;
this.route.fragment.subscribe((fragment: string) => {
var self = this;
setTimeout(function () { self.scrollTo(fragment) });
});
this.route.queryParams.subscribe((params) => {
if (params && "page" in params)
this.changeCurrentPage(params["page"]);
});
}
save(){
this.dataModel.status= "0";
submit() {
this.datasetWizardService.saveDataset(this.dataModel, this.form.value).subscribe(data => {
this.router.navigateByUrl("/datasets/" + this.dataModel.dmp.id);
});
}
save() {
this.dataModel.status = "0";
this.submit();
}
saveFinalize() {
this.dataModel.status= "1";
this.dataModel.status = "1";
this.submit();
}
@ -140,7 +130,7 @@ export class DynamicFormComponent implements OnInit {
var element = document.querySelector('#' + sectionID);
if (!element) return;
element.scrollIntoView();
this.visibleSidebar = true;
this.visibleSidebar = true;
var scrollElement = document.querySelector('.scrollableContent');
//scrollElement.scrollTop = topElement.offsetTop;
}

1
dmp-frontend/src/app/models/datasets/DatasetWizardModel.ts
View File

@ -26,6 +26,7 @@ export class DatasetWizardModel implements Serializable<DatasetWizardModel> {
public externalDatasets: ExternalDatasetModel[] = [];
public dmp: DataManagementPlanModel = new DataManagementPlanModel();
public datasetProfileDefinition = new DatasetProfileDefinitionModel();
public properties :any;
public errorModel: BaseErrorModel = new BaseErrorModel();
fromJSONObject(item: any): DatasetWizardModel {

17
dmp-frontend/src/app/services/dataset-wizard/dataset-wizard.service.ts
View File

@ -1,3 +1,4 @@
import { DatasetProfileDefinitionModel } from '../../models/DatasetProfileDefinitionModel';
import { DatasetWizardModel } from '../../models/datasets/DatasetWizardModel';
import { DatasetProfileCriteria } from '../../models/criteria/dataset-profile/DatasetProfileCriteria';
import 'rxjs/add/operator/map';
@ -35,16 +36,20 @@ export class DatasetWizardService {
return this.http.post<DatasetProfileModel[]>(this.actionUrl + 'getAvailableProfiles/', criteria, { headers: this.headers });
}
public getSingle(id:String): Observable<DatasetWizardModel> {
return this.http.get<DatasetWizardModel>(this.actionUrl + 'getSingle/'+id,{ headers: this.headers });
public getSingle(id: String): Observable<DatasetWizardModel> {
return this.http.get<DatasetWizardModel>(this.actionUrl + 'getSingle/' + id, { headers: this.headers });
}
createDataset(datasetModel: DatasetWizardModel): Observable<DatasetWizardModel> {
return this.http.post<DatasetWizardModel>(this.actionUrl + 'createOrUpdate', datasetModel, { headers: this.headers });
return this.http.post<DatasetWizardModel>(this.actionUrl + 'createOrUpdate', datasetModel, { headers: this.headers });
}
public saveDataset(datasetId:String, datasetStatus:String, formValue){
formValue.status = datasetStatus;
return this.http.post(HostConfiguration.Server +'datasetprofile/save/'+datasetId, formValue, { headers: this.headers })
public saveDataset(datasetWizard: DatasetWizardModel, formValue) {
datasetWizard.properties = formValue;
return this.createDataset(datasetWizard)
}
public getDefinition(id: String): Observable<DatasetProfileDefinitionModel> {
return this.http.get<DatasetProfileDefinitionModel>(this.actionUrl + 'get/' + id, { headers: this.headers });
}
}