done with project title in backend and frontend

nokia-wroclaw · Apr 9, 2018 · 8e487b2 · 8e487b2
1 parent fdbb15e
commit 8e487b2
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 6 deletions.
diff --git a/src/Dashboard.Core/Entities/Project.cs b/src/Dashboard.Core/Entities/Project.cs
@@ -7,7 +7,7 @@ namespace Dashboard.Core.Entities
     public class Project
     {
         public int Id { get; set; }
-
+        public string ProjectTitle { get; set; }
         public string ApiHostUrl { get; set; }
         public string ApiProjectId { get; set; }
         public string ApiAuthenticationToken { get; set; }

diff --git a/src/Dashboard.WebApi/ApiModels/Requests/CreateProject.cs b/src/Dashboard.WebApi/ApiModels/Requests/CreateProject.cs
@@ -4,6 +4,8 @@ namespace Dashboard.WebApi.ApiModels.Requests
 {
     public class CreateProject
     {
+        [Required]
+        public string ProjectTitle { get; set; }
         [Required]
         public string ApiHostUrl { get; set; }
         [Required]

diff --git a/src/Dashboard.WebApi/ApiModels/Requests/UpdateProject.cs b/src/Dashboard.WebApi/ApiModels/Requests/UpdateProject.cs
@@ -5,6 +5,8 @@ namespace Dashboard.WebApi.ApiModels.Requests
 {
     public class UpdateProject
     {
+        [Required]
+        public string ProjectTitle { get; set; }
         [Required]
         public string ApiHostUrl { get; set; }
         [Required]

diff --git a/src/Dashboard.WebApi/Controllers/ProjectController.cs b/src/Dashboard.WebApi/Controllers/ProjectController.cs
@@ -44,6 +44,7 @@ public async Task<IActionResult> Create([FromBody]CreateProject model)
             //TODO: change when automapper
             var project = new Project()
             {
+                ProjectTitle = model.ProjectTitle,
                 ApiAuthenticationToken = model.ApiAuthenticationToken,
                 ApiHostUrl = model.ApiHostUrl,
                 ApiProjectId = model.ApiProjectId,
@@ -63,6 +64,7 @@ public async Task<IActionResult> Put(int id, [FromBody]UpdateProject model)
             var updatedProject = new Project()
             {
                 Id = id,
+                ProjectTitle = model.ProjectTitle,
                 ApiAuthenticationToken = model.ApiAuthenticationToken,
                 ApiHostUrl = model.ApiHostUrl,
                 ApiProjectId = model.ApiProjectId,

diff --git a/...opersDashboardFrontEnd/src/app/configuration/panel-projects/panel-projects.component.html b/...opersDashboardFrontEnd/src/app/configuration/panel-projects/panel-projects.component.html
@@ -7,6 +7,9 @@
 
   <form #projectForm="ngForm" (ngSubmit)="addProject()">
     <mat-card-content>
+        <mat-form-field class=" example-full-width ">
+            <input type="text" matInput placeholder="projectTitle " required [(ngModel)]="project.projectTitle" name="projectTitle">
+          </mat-form-field>
       <mat-form-field class=" example-full-width ">
         <input type="text" matInput placeholder="apiHostUrl " required [(ngModel)]="project.apiHostUrl" name="apiHostUrl">
       </mat-form-field>

diff --git a/...elopersDashboardFrontEnd/src/app/configuration/panel-projects/panel-projects.component.ts b/...elopersDashboardFrontEnd/src/app/configuration/panel-projects/panel-projects.component.ts
@@ -10,7 +10,7 @@ import {Router} from '@angular/router';
 })
 export class PanelProjectsComponent implements OnInit {
 
-  project = new Project('', '', '', '', undefined);
+  project = new Project('','', '', '', '', undefined);
   dataProviderNames = new SupportedProviders(undefined);
 
   constructor(private projectApiService : ProjectsApiService, private router : Router, private zone : NgZone,) {
@@ -21,7 +21,6 @@ export class PanelProjectsComponent implements OnInit {
   }
 
   addProject() {
-    console.log('XD');
     console.log(this.project);
     if (!this.project) {
       return;

diff --git a/...elopersDashboardFrontEnd/src/app/configuration/projects-list/projects-list.component.html b/...elopersDashboardFrontEnd/src/app/configuration/projects-list/projects-list.component.html
@@ -2,7 +2,8 @@
   <gridster-item *ngFor="let project of projects" [resizable]="true">
     <mat-card>
       <mat-card-title>
-        <h4 style="font-size:1.3vw;">Project number: {{project.id}}</h4>
+        <h4 style="font-size:1.3vw;">{{project.projectTitle}}</h4>
+        <h4 style="font-size:1.3vw;" *ngIf="!project.projectTitle">Default title</h4>
       </mat-card-title>
       <mat-card-content style="font-size:0.9vw; display: inline-block">
 

diff --git a/...evelopersDashboardFrontEnd/src/app/configuration/projects-list/projects-list.component.ts b/...evelopersDashboardFrontEnd/src/app/configuration/projects-list/projects-list.component.ts
@@ -1,6 +1,6 @@
 import {Component, OnInit} from '@angular/core';
 import {ProjectsApiService} from '../../projects-manager/api/projects-api.service';
-import {Project} from '../../projects-manager/project';
+import {Project, SupportedProviders} from '../../projects-manager/project';
 
 @Component({selector: 'app-projects-list', templateUrl: './projects-list.component.html', styleUrls: ['./projects-list.component.css']})
 export class ProjectsListComponent implements OnInit {

diff --git a/src/Dashboard.WebApi/developersDashboardFrontEnd/src/app/projects-manager/project.ts b/src/Dashboard.WebApi/developersDashboardFrontEnd/src/app/projects-manager/project.ts
@@ -20,12 +20,14 @@ export class SupportedProviders{
 }
 
 export class Project {
+
     id : number;
+    projectTitle : string;
     apiHostUrl : string;
     apiProjectId : string;
     apiAuthenticationToken : string;
     dataProviderName : string;
     pipelines : Pipeline[];
-    constructor(apiHostUrl : string, apiProjectId : string, apiAuthenticationToken : string, dataProviderName : string, pipelines : Pipeline[]) {}
+    constructor(projectTitle : string,apiHostUrl : string, apiProjectId : string, apiAuthenticationToken : string, dataProviderName : string, pipelines : Pipeline[]) {}
 
 }