diff --git a/front/current/assets/styles/components/_project.scss b/front/current/assets/styles/components/_project.scss index 1c4f7214c34fcaee0becf254f077ce99ba7cbbb3..ebff1e9362d6f3fff07f4d6ad54374e1823f0ddf 100644 --- a/front/current/assets/styles/components/_project.scss +++ b/front/current/assets/styles/components/_project.scss @@ -9,6 +9,9 @@ project { display: flex; flex-direction: column; flex-grow: 1; + width:0px;//Setting the width anything less than expanding width of flexgrow + // causes the with of all child elements to be relative to this + // element's width. So we use 0 as a placeholder. header { display: flex; @@ -78,14 +81,23 @@ project { } } } + + .c_states{ + white-space: nowrap; + overflow-x:scroll; + } - state { - display: block; - flex-basis: 300px; + states{ border-top: 5px solid black; - padding: 10px; - h4 { - color: $light-gray; + + state { + display: inline-block; + padding: 10px; + width: auto; + + h4 { + color: $light-gray; + } } } } diff --git a/front/current/components/project/detail.component.html b/front/current/components/project/detail.component.html index ab19723ead30d1aef9147c7f7a30d12b5a1acc26..9d19eef192146ffaae520744bf727de12c096cd3 100644 --- a/front/current/components/project/detail.component.html +++ b/front/current/components/project/detail.component.html @@ -36,4 +36,4 @@ [(document_slots)]="document_slots" [(documents)]="documents" > - + diff --git a/front/current/components/project/detail.component.ts b/front/current/components/project/detail.component.ts index 954ee5db8993349d0de3c7d3217de3d21605bebe..4a44f63dd4a7450850f215c0aacdeaca823605aa 100644 --- a/front/current/components/project/detail.component.ts +++ b/front/current/components/project/detail.component.ts @@ -16,11 +16,12 @@ import { AddressComponent } from './address.component'; import { ContactsComponent } from './contacts.component'; import { SlotsComponent } from './slots.component'; import { StateComponent } from './state.component'; +import { StatesComponent } from './states.component'; @Component({ selector: 'project', templateUrl: config.static_url + '/components/project/detail.component.html', - directives: [ROUTER_DIRECTIVES, AddressComponent, ContactsComponent, SlotsComponent, StateComponent] + directives: [ROUTER_DIRECTIVES, AddressComponent, ContactsComponent, SlotsComponent, StateComponent, StatesComponent] }) export class ProjectDetailComponent implements OnInit { constructor( diff --git a/front/current/components/project/states.component.html b/front/current/components/project/states.component.html new file mode 100644 index 0000000000000000000000000000000000000000..160b4a36fcd353d660579aa526f2cf81fa18cb21 --- /dev/null +++ b/front/current/components/project/states.component.html @@ -0,0 +1,6 @@ +
+ +
diff --git a/front/current/components/project/states.component.ts b/front/current/components/project/states.component.ts new file mode 100644 index 0000000000000000000000000000000000000000..1b48ade5d24abb3bd11697c90163932df427f9c5 --- /dev/null +++ b/front/current/components/project/states.component.ts @@ -0,0 +1,19 @@ +import { Component } from 'angular2/core'; +import { config } from '../../config'; +import { StateComponent } from './state.component'; +import { ProjectService } from '../../services/project/project.service'; + + +@Component({ + selector: 'states', + templateUrl: config.static_url + '/components/project/states.component.html', + inputs: ['currentState'], + directives: [StateComponent] +}) +export class StatesComponent{ + public currentState: any; /*Points to current state*/ + + constructor( + public projectService:ProjectService + ){}; +};