automated commit
This commit is contained in:
commit
2936e1d37c
|
@ -8,6 +8,7 @@
|
||||||
</button>
|
</button>
|
||||||
-->
|
-->
|
||||||
<div class="nav navbar-nav navbar-left">
|
<div class="nav navbar-nav navbar-left">
|
||||||
|
<!--
|
||||||
<div class="dropdown" [ngClass]="{false:'invisible'}[tokenService.isLoggedIn() == true]">
|
<div class="dropdown" [ngClass]="{false:'invisible'}[tokenService.isLoggedIn() == true]">
|
||||||
<button class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown"> Go To <span class="caret"></span> </button>
|
<button class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown"> Go To <span class="caret"></span> </button>
|
||||||
<ul class="dropdown-menu">
|
<ul class="dropdown-menu">
|
||||||
|
@ -15,6 +16,18 @@
|
||||||
<li><a class="cursor" (click)="goToProjects()">My Projects</a></li>
|
<li><a class="cursor" (click)="goToProjects()">My Projects</a></li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
|
-->
|
||||||
|
<li class="dropdown" [ngClass]="{false:'invisible'}[tokenService.isLoggedIn() == true]">
|
||||||
|
<a class="dropdown-toggle" data-toggle="dropdown" href="#">Quick Navigate
|
||||||
|
<span class="caret"></span></a>
|
||||||
|
<ul class="dropdown-menu">
|
||||||
|
<li><a class="cursor" (click)="goToDMPs()">My DMPs</a></li>
|
||||||
|
<li><a class="cursor" (click)="goToProjects()">My Projects</a></li>
|
||||||
|
</ul>
|
||||||
|
</li>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -57,3 +57,8 @@ tr.hover:hover > * {
|
||||||
font-size: 1em;
|
font-size: 1em;
|
||||||
padding: 2px;
|
padding: 2px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
.centered-text{
|
||||||
|
text-align: center;
|
||||||
|
}
|
|
@ -64,7 +64,7 @@ export class DmpComponent implements OnInit{
|
||||||
breadcrumbData: MenuItem[] = new Array<MenuItem>();
|
breadcrumbData: MenuItem[] = new Array<MenuItem>();
|
||||||
|
|
||||||
|
|
||||||
dmp : any;
|
dmp : any = null;
|
||||||
|
|
||||||
@Input() projectsDropDown:DropdownField;
|
@Input() projectsDropDown:DropdownField;
|
||||||
@Input() statusDropDown: DropdownField;
|
@Input() statusDropDown: DropdownField;
|
||||||
|
@ -83,14 +83,22 @@ export class DmpComponent implements OnInit{
|
||||||
this.statusDropDown.options= [{key:'', value:null},{key:'0', value:"Active"},{key:'1', value:"Inactive"}, {key:'2', value:"Submitted"}, {key:'3', value:"Cancel"}]
|
this.statusDropDown.options= [{key:'', value:null},{key:'0', value:"Active"},{key:'1', value:"Inactive"}, {key:'2', value:"Submitted"}, {key:'3', value:"Cancel"}]
|
||||||
//this.projects = [];
|
//this.projects = [];
|
||||||
|
|
||||||
|
this.dmp = this.clearDmp();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
clearDmp() {
|
||||||
|
|
||||||
this.dmp = {
|
this.dmp = {
|
||||||
id: null,
|
id: null,
|
||||||
label: '',
|
label: '',
|
||||||
previous:'',
|
previous:'',
|
||||||
version:'',
|
version:'',
|
||||||
profileData:''
|
profileData:'',
|
||||||
|
//project: '',
|
||||||
//profile:{}
|
//profile:{}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ngOnInit() {
|
ngOnInit() {
|
||||||
|
@ -151,11 +159,9 @@ export class DmpComponent implements OnInit{
|
||||||
}
|
}
|
||||||
|
|
||||||
newDMP(){
|
newDMP(){
|
||||||
console.log(this.dmp, this.dmp.projectsDropDownKey);
|
|
||||||
|
|
||||||
this.dmp.project = {"id" : this.dmp.project};
|
this.dmp.project = {"id" : this.dmp.project};
|
||||||
this.dmp["version"] = 1;
|
this.dmp["version"] = 1;
|
||||||
//this.dmp.profile = {};
|
|
||||||
|
|
||||||
this.serverService.createDmpForCurrentUser(this.dmp)
|
this.serverService.createDmpForCurrentUser(this.dmp)
|
||||||
.subscribe(
|
.subscribe(
|
||||||
|
@ -241,13 +247,9 @@ export class DmpComponent implements OnInit{
|
||||||
$("#newVersionDmpModal").modal("show");
|
$("#newVersionDmpModal").modal("show");
|
||||||
}
|
}
|
||||||
|
|
||||||
newDmp(item){
|
newDmpForm(item){
|
||||||
this.dmp.label = "";
|
|
||||||
this.dmp.id = null;
|
this.dmp = this.clearDmp();
|
||||||
this.dmp.version = "";
|
|
||||||
// this.dmp.profile = "";
|
|
||||||
this.dmp.profileData = "";
|
|
||||||
this.dmp.project = "";
|
|
||||||
|
|
||||||
$("#newDmpModal").modal("show");
|
$("#newDmpModal").modal("show");
|
||||||
}
|
}
|
||||||
|
@ -263,6 +265,8 @@ export class DmpComponent implements OnInit{
|
||||||
|
|
||||||
deleteRow(dmp){
|
deleteRow(dmp){
|
||||||
|
|
||||||
|
this.dmp = {"id": this.dmp.id}; //only id is needed to delete
|
||||||
|
|
||||||
this.serverService.deleteDmp(dmp).subscribe(
|
this.serverService.deleteDmp(dmp).subscribe(
|
||||||
response => {
|
response => {
|
||||||
simple_notifier("success",null,"Successfully deleted the DMP");
|
simple_notifier("success",null,"Successfully deleted the DMP");
|
||||||
|
|
|
@ -66,10 +66,10 @@
|
||||||
<tr *ngFor="let dmp of mf.data" class="hover">
|
<tr *ngFor="let dmp of mf.data" class="hover">
|
||||||
<td [ngClass]="{true:'visible', false:'invisible'}[showIDs]">{{dmp?.id}}</td>
|
<td [ngClass]="{true:'visible', false:'invisible'}[showIDs]">{{dmp?.id}}</td>
|
||||||
<td>{{dmp?.label}}</td>
|
<td>{{dmp?.label}}</td>
|
||||||
<td>{{dmp?.version}}</td>
|
<td style="width:20px;">{{dmp?.version}}</td>
|
||||||
<td>{{dmp?.previous}}</td>
|
<td style="width:300px;">{{dmp?.previous}}</td>
|
||||||
<td>{{dmp?.project?.label}}</td>
|
<td>{{dmp?.project?.label}}</td>
|
||||||
<td>{{dmp?.description}}</td>
|
<td>{{(dmp?.description?.length > 20) ? (dmp?.description | slice:0:20)+'...':(dmp?.description) }}</td>
|
||||||
<td>{{dmp?.created | date:'yyyy-MM-dd HH:mm:ss Z'}}</td>
|
<td>{{dmp?.created | date:'yyyy-MM-dd HH:mm:ss Z'}}</td>
|
||||||
<td>{{dmp?.status | statusToString }}</td>
|
<td>{{dmp?.status | statusToString }}</td>
|
||||||
<td>
|
<td>
|
||||||
|
@ -92,7 +92,7 @@
|
||||||
<tfoot>
|
<tfoot>
|
||||||
<tr>
|
<tr>
|
||||||
<td colspan="8">
|
<td colspan="8">
|
||||||
<button type="button" class="btn btn-info btncustom" (click)="newDmp(item)">New Dmp</button>
|
<button type="button" class="btn btn-info btncustom" (click)="newDmpForm(item)">Create New</button>
|
||||||
<mfBootstrapPaginator [rowsOnPageSet]="[5,20,40]"></mfBootstrapPaginator>
|
<mfBootstrapPaginator [rowsOnPageSet]="[5,20,40]"></mfBootstrapPaginator>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
@ -104,8 +104,8 @@
|
||||||
<div class="modal fade" id="newDmpModal" tabindex="-1" role="dialog" aria-labelledby="newDmpModalLabel" aria-hidden="true">
|
<div class="modal fade" id="newDmpModal" tabindex="-1" role="dialog" aria-labelledby="newDmpModalLabel" aria-hidden="true">
|
||||||
<div class="modal-dialog" role="document">
|
<div class="modal-dialog" role="document">
|
||||||
<div class="modal-content">
|
<div class="modal-content">
|
||||||
<div class="modal-header">
|
<div class="modal-header centered-text">
|
||||||
<h5 class="modal-title" id="exampleModalLabel">DMP</h5>
|
<h4 class="modal-title" id="exampleModalLabel"><b>{{ dmp?.id ? "Edit Data Management Plan" : "New Data Management Plan" }}</b></h4>
|
||||||
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
|
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
|
||||||
<span aria-hidden="true">×</span>
|
<span aria-hidden="true">×</span>
|
||||||
</button>
|
</button>
|
||||||
|
@ -115,43 +115,43 @@
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label for="label-name" class="form-control-label">Label:</label>
|
<label for="label-name" class="form-control-label">Label:</label>
|
||||||
<input type="text" class="form-control" id="label-name" [(ngModel)]="dmp.label" name="label">
|
<input type="text" class="form-control" id="label-name" [ngModel]="dmp?.label" (ngModelChange)="dmp.label=$event" name="label">
|
||||||
</div>
|
</div>
|
||||||
<label for="recipient-name" class="col-form-label">Project:</label>
|
<label for="recipient-name" class="col-form-label">Project:</label>
|
||||||
<select class="form-control" id="projectsDropDownKey" [(ngModel)]="dmp.project" name="projectsDropDown">
|
<select class="form-control" id="projectsDropDownKey" [ngModel]="dmp?.project" (ngModelChange)="dmp.project=$event" name="projectsDropDown">
|
||||||
<option *ngFor="let opt of projectsDropDown.options" [value]="opt.key">{{opt.value}}</option>
|
<option *ngFor="let opt of projectsDropDown.options" [value]="opt.key">{{opt.value}}</option>
|
||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label for="status-name" class="col-form-label">Status:</label>
|
<label for="status-name" class="col-form-label">Status:</label>
|
||||||
<select class="form-control" id="statusid" [(ngModel)]="dmp.status" name="statusDropDown" (change)="SelectDMPStatus(dmp, $event, oldValue);">
|
<select class="form-control" id="statusid" [ngModel]="dmp?.status" (ngModelChange)="dmp.status=$event" name="statusDropDown" (change)="SelectDMPStatus(dmp, $event, oldValue);">
|
||||||
<option *ngFor="let opt of statusDropDown.options" [value]="opt.key">{{opt.value}}</option>
|
<option *ngFor="let opt of statusDropDown.options" [value]="opt.key">{{opt.value}}</option>
|
||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label for="label-name" class="form-control-label">Previous:</label>
|
<label for="label-name" class="form-control-label">Previous:</label>
|
||||||
<input type="text" class="form-control" id="label-previous" [(ngModel)]="dmp.previous" name="previous" disabled>
|
<input type="text" class="form-control" id="label-previous" [ngModel]="dmp?.previous" (ngModelChange)="dmp.previous=$event" name="previous" disabled>
|
||||||
</div>
|
</div>
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label for="abbreviation-text" class="form-control-label">Version:</label>
|
<label for="abbreviation-text" class="form-control-label">Version:</label>
|
||||||
<input class="form-control" id="abbreviation-text" [(ngModel)]="dmp.version" name="version" disabled>
|
<input class="form-control" id="abbreviation-text" [ngModel]="dmp?.version" (ngModelChange)="dmp.version=$event" name="version" disabled>
|
||||||
</div>
|
</div>
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label for="abbreviation-text" class="form-control-label">Description:</label>
|
<label for="abbreviation-text" class="form-control-label">Description:</label>
|
||||||
<textarea rows="3" class="form-control" id="abbreviation-text" [(ngModel)]="dmp.description" name="description"></textarea>
|
<textarea rows="3" class="form-control" id="abbreviation-text" [ngModel]="dmp?.description" (ngModelChange)="dmp.description=$event" name="description"></textarea>
|
||||||
</div>
|
</div>
|
||||||
<!--
|
<!--
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label for="reference-text" class="form-control-label">Profile Data:</label>
|
<label for="reference-text" class="form-control-label">Profile Data:</label>
|
||||||
<textarea class="form-control" id="reference-text" [(ngModel)]="dmp.profileData" name="profileData"></textarea>
|
<textarea class="form-control" id="reference-text" [(ngModel)]="dmp?.profileData" name="profileData"></textarea>
|
||||||
</div>
|
</div>
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label for="start-date" class="form-control-label">Start Date:</label>
|
<label for="start-date" class="form-control-label">Start Date:</label>
|
||||||
<input class="form-control" id="startDate-date" [(ngModel)]= "dmp.startDate" name = "startDate">
|
<input class="form-control" id="startDate-date" [(ngModel)]= "dmp?.startDate" name = "startDate">
|
||||||
</div>
|
</div>
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label for="end-date" class="form-control-label">End Date:</label>
|
<label for="end-date" class="form-control-label">End Date:</label>
|
||||||
<input class="form-control" id="endDate-date" [(ngModel)]= "dmp.endDate" name = "endDate">
|
<input class="form-control" id="endDate-date" [(ngModel)]= "dmp?.endDate" name = "endDate">
|
||||||
</div>
|
</div>
|
||||||
-->
|
-->
|
||||||
</form>
|
</form>
|
||||||
|
@ -179,11 +179,11 @@
|
||||||
<form #newProjectForm="ngForm" (ngSubmit)="SaveNewDmp()">
|
<form #newProjectForm="ngForm" (ngSubmit)="SaveNewDmp()">
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label for="label-name" class="form-control-label">Label:</label>
|
<label for="label-name" class="form-control-label">Label:</label>
|
||||||
<input type="text" class="form-control" id="label-name" [(ngModel)]="dmp.label" name="label">
|
<input type="text" class="form-control" id="label-name" [ngModel]="dmp?.label" (ngModelChange)="dmp.label=$event" name="label">
|
||||||
</div>
|
</div>
|
||||||
<div class="form-group" hidden>
|
<div class="form-group" hidden>
|
||||||
<label for="recipient-name" class="col-form-label">Project:</label>
|
<label for="recipient-name" class="col-form-label">Project:</label>
|
||||||
<select class="form-control" [id]="projectsDropDownKey" [(ngModel)]="dmp.project" [name]="projectsDropDown" #datasetfield>
|
<select class="form-control" [id]="projectsDropDownKey" [ngModel]="dmp?.project" (ngModelChange)="dmp.project=$event" [name]="projectsDropDown" #datasetfield>
|
||||||
<option *ngFor="let opt of projectsDropDown.options" [value]="opt.key">{{opt.value}}</option>
|
<option *ngFor="let opt of projectsDropDown.options" [value]="opt.key">{{opt.value}}</option>
|
||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
|
@ -191,11 +191,11 @@
|
||||||
|
|
||||||
<div class="form-group" hidden>
|
<div class="form-group" hidden>
|
||||||
<label for="label-name" class="form-control-label">Previous:</label>
|
<label for="label-name" class="form-control-label">Previous:</label>
|
||||||
<input type="text" class="form-control" id="label-previous" [(ngModel)]="dmp.previous" name="previous">
|
<input type="text" class="form-control" id="label-previous" [ngModel]="dmp?.previous" (ngModelChange)="dmp.previous=$event" name="previous">
|
||||||
</div>
|
</div>
|
||||||
<div class="form-group" hidden>
|
<div class="form-group" hidden>
|
||||||
<label for="abbreviation-text" class="form-control-label">Version:</label>
|
<label for="abbreviation-text" class="form-control-label">Version:</label>
|
||||||
<input class="form-control" id="abbreviation-text" [(ngModel)]="dmp.version" name="version">
|
<input class="form-control" id="abbreviation-text" [ngModel]="dmp?.version" (ngModelChange)="dmp.version=$event" name="version">
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -11,11 +11,10 @@
|
||||||
<div *ngFor="let field of group.compositeFields.groupFields" >
|
<div *ngFor="let field of group.compositeFields.groupFields" >
|
||||||
<df-field [field]="field" [form]="form" [dataModel] = "dataModel"></df-field>
|
<df-field [field]="field" [form]="form" [dataModel] = "dataModel"></df-field>
|
||||||
</div>
|
</div>
|
||||||
<div *ngIf="shouldIShow();">
|
|
||||||
<a (click)="addFieldSet(form)" style="cursor: default">
|
<a (click)="addFieldSet(form)" style="cursor: default">
|
||||||
Add another fieldSet +
|
Add another fieldSet +
|
||||||
</a>
|
</a>
|
||||||
</div>
|
|
||||||
|
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
<div class="parent-div">
|
<div class="parent-div">
|
||||||
|
|
||||||
|
|
||||||
<div class=" child-div-left" [ngClass]="{true:'col-md-8 col-sm-9', false:'col-md-12 col-sm-12'}[expandedToc]">
|
<div class=" child-div-left" [ngClass]="{true:'col-md-8 col-sm-9', false:'col-md-12 col-sm-12'}[expandedToc]">
|
||||||
|
|
||||||
<div class="col-md-12 form-body-container" id="form-container">
|
<div class="col-md-12 form-body-container" id="form-container">
|
||||||
|
@ -90,16 +89,9 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<div class="child-div-caret" (click)="toggleTOC()">
|
<div class="child-div-caret" (click)="toggleTOC()">
|
||||||
<i class="fa toc-toggler" [ngClass]="{true:'fa-arrow-right', false:'fa-arrow-left'}[expandedToc]" aria-hidden="true" ></i>
|
<i class="fa toc-toggler" [ngClass]="{true:'fa-arrow-right', false:'fa-arrow-left'}[expandedToc]" aria-hidden="true" ></i>
|
||||||
</div>
|
</div>
|
||||||
|
@ -111,9 +103,6 @@
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -98,7 +98,7 @@ export class DynamicFormComponent implements OnInit {
|
||||||
if(data.status == 2) this.finalizeStatus=true;
|
if(data.status == 2) this.finalizeStatus=true;
|
||||||
}
|
}
|
||||||
|
|
||||||
//η κληση για το dataset profile pou htan prin pio panw anexarthth
|
//the call for the dataset profile above - independent
|
||||||
this.serverService.getDatasetProfileByID(this.id).subscribe(
|
this.serverService.getDatasetProfileByID(this.id).subscribe(
|
||||||
|
|
||||||
response => {
|
response => {
|
||||||
|
@ -211,7 +211,7 @@ export class DynamicFormComponent implements OnInit {
|
||||||
this.form.get(prop).setValue(flatList[prop].valueOf());
|
this.form.get(prop).setValue(flatList[prop].valueOf());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
//this.form.get("namingConventionGroup.nonamingConventionA213").setValue("TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ngAfterViewChecked(): void { //navigate to certain section of the page
|
ngAfterViewChecked(): void { //navigate to certain section of the page
|
||||||
|
@ -285,14 +285,6 @@ export class DynamicFormComponent implements OnInit {
|
||||||
//this.dataModel.groups = this.dataModel.groups.slice(this.pagination.startIndex, this.pagination.endIndex + 1);
|
//this.dataModel.groups = this.dataModel.groups.slice(this.pagination.startIndex, this.pagination.endIndex + 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
signOut2() {
|
|
||||||
var auth2 = gapi.auth2.getAuthInstance();
|
|
||||||
auth2.signOut().then(function () {
|
|
||||||
console.log('User signed out.');
|
|
||||||
localStorage.removeItem('currentUser');
|
|
||||||
});
|
|
||||||
this.tokenService.setToken(null); //kanonika prepei na mpei mesa sthn function.....
|
|
||||||
}
|
|
||||||
|
|
||||||
toggleTOC(){
|
toggleTOC(){
|
||||||
this.expandedToc = !this.expandedToc;
|
this.expandedToc = !this.expandedToc;
|
||||||
|
|
Loading…
Reference in New Issue