From cc8551df1d1f2549abc142254cb2f4e579a75882 Mon Sep 17 00:00:00 2001 From: calvinqh Date: Mon, 20 Jun 2016 12:48:01 -0400 Subject: [PATCH 01/48] Add state_id for each slot. --- .../components/project/detail.component.html | 8 +++ .../components/project/slots.component.ts | 52 +++++++++---------- .../components/project/state.component.ts | 5 +- 3 files changed, 37 insertions(+), 28 deletions(-) diff --git a/front/current/components/project/detail.component.html b/front/current/components/project/detail.component.html index c00227e..61efb53 100644 --- a/front/current/components/project/detail.component.html +++ b/front/current/components/project/detail.component.html @@ -31,6 +31,14 @@ + Date: Mon, 20 Jun 2016 16:18:33 -0400 Subject: [PATCH 02/48] Add state_id to each document slot. --- front/current/components/project/slots.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/current/components/project/slots.component.ts b/front/current/components/project/slots.component.ts index 4c73066..d7eea4a 100644 --- a/front/current/components/project/slots.component.ts +++ b/front/current/components/project/slots.component.ts @@ -41,7 +41,7 @@ export class SlotsComponent { {name: 'credit-reports', title: 'Credit Reports', state_id: 3}, {name: 'certificate-of-incorporation', title: 'Certificate of Incorporation', state_id: 3}, {name: 'bank-statements', title: 'Bank Statements', state_id: 3}, - {name: '501(c)3-confirmation', title: '501(c)3 Confirmation', state_id: }, + {name: '501(c)3-confirmation', title: '501(c)3 Confirmation', state_id: 3}, {name: 'proof-of-insurance', title: 'Proof of Property and Liability Insurance', state_id: 3}, {name: 'property-appraisal', title: 'Property Appraisal', state_id: 3}, {name: 'title-of-location', title: 'Title of Location', state_id: 3}, -- GitLab From 0f49035c55df3c34b5f50e841bd204efbebc2ac2 Mon Sep 17 00:00:00 2001 From: calvinqh Date: Mon, 20 Jun 2016 16:19:53 -0400 Subject: [PATCH 03/48] Revert "Add state_id to each document slot." This reverts commit 7050e07c68599d82434e6fac455698947f55fe19. --- front/current/components/project/slots.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/current/components/project/slots.component.ts b/front/current/components/project/slots.component.ts index d7eea4a..4c73066 100644 --- a/front/current/components/project/slots.component.ts +++ b/front/current/components/project/slots.component.ts @@ -41,7 +41,7 @@ export class SlotsComponent { {name: 'credit-reports', title: 'Credit Reports', state_id: 3}, {name: 'certificate-of-incorporation', title: 'Certificate of Incorporation', state_id: 3}, {name: 'bank-statements', title: 'Bank Statements', state_id: 3}, - {name: '501(c)3-confirmation', title: '501(c)3 Confirmation', state_id: 3}, + {name: '501(c)3-confirmation', title: '501(c)3 Confirmation', state_id: }, {name: 'proof-of-insurance', title: 'Proof of Property and Liability Insurance', state_id: 3}, {name: 'property-appraisal', title: 'Property Appraisal', state_id: 3}, {name: 'title-of-location', title: 'Title of Location', state_id: 3}, -- GitLab From 6aba84c7f2646c3dc06a2d391723993824277183 Mon Sep 17 00:00:00 2001 From: calvinqh Date: Mon, 20 Jun 2016 17:07:25 -0400 Subject: [PATCH 04/48] Add state_id to a slot. Remove unused document_slots from slots component and slot component. --- front/current/components/project/slot.component.ts | 2 +- front/current/components/project/slots.component.html | 1 - front/current/components/project/slots.component.ts | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/front/current/components/project/slot.component.ts b/front/current/components/project/slot.component.ts index 8652b0b..fb5e270 100644 --- a/front/current/components/project/slot.component.ts +++ b/front/current/components/project/slot.component.ts @@ -11,7 +11,7 @@ declare var moment:any; selector: 'document-slot', templateUrl: config.static_url + '/components/project/slot.component.html', inputs: [ - 'project', 'slot', 'document_slots', 'documents', 'parent_documents', + 'project', 'slot', 'documents', 'parent_documents', 'parent_document_slots'], directives: [NewDocumentSlotComponent] }) diff --git a/front/current/components/project/slots.component.html b/front/current/components/project/slots.component.html index e851a9b..638f45b 100644 --- a/front/current/components/project/slots.component.html +++ b/front/current/components/project/slots.component.html @@ -7,7 +7,6 @@ Date: Tue, 21 Jun 2016 11:57:34 -0400 Subject: [PATCH 05/48] Add getDocumentSlotsForState(state_id). It returns the document slots that belong to matching state id given. --- front/current/components/project/slots.component.ts | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/front/current/components/project/slots.component.ts b/front/current/components/project/slots.component.ts index d7eea4a..a25f021 100644 --- a/front/current/components/project/slots.component.ts +++ b/front/current/components/project/slots.component.ts @@ -88,4 +88,12 @@ export class SlotsComponent { collection.models = documents; return collection; } + public getDocumentSlotsForState(state_id: number){ + let state_slots = []; + for (let slot of slots) { + if(slot.state_id == state_id) + state_slots.push(slot); + } + return state_slots; + }; }; -- GitLab From 4d4598404e725c4204798903102c41ddeeb0064a Mon Sep 17 00:00:00 2001 From: calvinqh Date: Tue, 21 Jun 2016 13:33:09 -0400 Subject: [PATCH 06/48] Remove current state from states component, and states selector from detail.component.html. --- front/current/components/project/detail.component.html | 2 +- front/current/components/project/slots.component.ts | 6 ++++-- front/current/components/project/state.component.html | 5 ++++- front/current/components/project/state.component.ts | 6 ++++-- front/current/components/project/states.component.ts | 2 -- 5 files changed, 13 insertions(+), 8 deletions(-) diff --git a/front/current/components/project/detail.component.html b/front/current/components/project/detail.component.html index 61efb53..505c4dd 100644 --- a/front/current/components/project/detail.component.html +++ b/front/current/components/project/detail.component.html @@ -45,5 +45,5 @@ [(documents)]="documents" > - + diff --git a/front/current/components/project/slots.component.ts b/front/current/components/project/slots.component.ts index a25f021..43fd284 100644 --- a/front/current/components/project/slots.component.ts +++ b/front/current/components/project/slots.component.ts @@ -90,10 +90,12 @@ export class SlotsComponent { } public getDocumentSlotsForState(state_id: number){ let state_slots = []; - for (let slot of slots) { + let collection = this._restService.Collection(this.documentService, []); + for (let slot of this.slots) { if(slot.state_id == state_id) state_slots.push(slot); } - return state_slots; + collection.models = state_slots; + return collection; }; }; diff --git a/front/current/components/project/state.component.html b/front/current/components/project/state.component.html index 02a1f06..f94a463 100644 --- a/front/current/components/project/state.component.html +++ b/front/current/components/project/state.component.html @@ -3,4 +3,7 @@

{{state.description}}

- +
+ +

{{SlotsComponent.getDocumentSlotsForState(state.id)}}

+
diff --git a/front/current/components/project/state.component.ts b/front/current/components/project/state.component.ts index 4a6f4af..c8ab359 100644 --- a/front/current/components/project/state.component.ts +++ b/front/current/components/project/state.component.ts @@ -1,12 +1,14 @@ import { Component } from 'angular2/core'; import { config } from '../../config'; import { SlotsComponent } from './slots.component'; +import { SlotComponent } from './slot.component'; + @Component({ selector: 'state', templateUrl: config.static_url + '/components/project/state.component.html', - inputs: ['state'], - directives: [SlotsComponent] + inputs: ['state', 'docs'], + directives: [SlotsComponent, SlotComponent] }) export class StateComponent{ public state: any; diff --git a/front/current/components/project/states.component.ts b/front/current/components/project/states.component.ts index 76f9d15..3e958dd 100644 --- a/front/current/components/project/states.component.ts +++ b/front/current/components/project/states.component.ts @@ -5,12 +5,10 @@ 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 -- GitLab From 4f87e7fc35cbc649025fbbef0dac214bb8f72510 Mon Sep 17 00:00:00 2001 From: calvinqh Date: Tue, 21 Jun 2016 16:33:38 -0400 Subject: [PATCH 07/48] Change layout of states and slots to avoid circular dependency conflict. --- .../components/project/detail.component.html | 2 +- .../components/project/slots.component.html | 18 ++++++++++++++++++ .../components/project/slots.component.ts | 10 ++++++---- .../components/project/state.component.html | 12 ++++++++---- .../components/project/state.component.ts | 18 ++++++++++++++---- .../components/project/states.component.html | 8 ++++++-- .../components/project/states.component.ts | 14 +++++++++++--- 7 files changed, 64 insertions(+), 18 deletions(-) diff --git a/front/current/components/project/detail.component.html b/front/current/components/project/detail.component.html index 505c4dd..047f359 100644 --- a/front/current/components/project/detail.component.html +++ b/front/current/components/project/detail.component.html @@ -45,5 +45,5 @@ [(documents)]="documents" > - + diff --git a/front/current/components/project/slots.component.html b/front/current/components/project/slots.component.html index 638f45b..2a76c4a 100644 --- a/front/current/components/project/slots.component.html +++ b/front/current/components/project/slots.component.html @@ -4,6 +4,7 @@

+ + + + + +
diff --git a/front/current/components/project/slots.component.ts b/front/current/components/project/slots.component.ts index 43fd284..10b5b70 100644 --- a/front/current/components/project/slots.component.ts +++ b/front/current/components/project/slots.component.ts @@ -5,21 +5,23 @@ import { config } from '../../config'; import { RestService, Model, Collection } from '../../services/rest.service'; import { DocumentSlotService } from '../../services/project/document-slot.service'; import { DocumentService } from '../../services/document/document.service'; +import { ProjectService } from '../../services/project/project.service'; import { SlotComponent } from './slot.component'; - +import { StateComponent } from './state.component'; @Component({ selector: 'document-slots', templateUrl: config.static_url + '/components/project/slots.component.html', inputs: ['project', 'document_slots', 'documents'], - directives: [SlotComponent] + directives: [SlotComponent, StateComponent] }) export class SlotsComponent { constructor( private _restService:RestService, public documentSlotService:DocumentSlotService, - public documentService:DocumentService + public documentService:DocumentService, + public projectService:ProjectService ) {}; slots:any[] = [ @@ -96,6 +98,6 @@ export class SlotsComponent { state_slots.push(slot); } collection.models = state_slots; - return collection; + return state_slots; }; }; diff --git a/front/current/components/project/state.component.html b/front/current/components/project/state.component.html index f94a463..28baed2 100644 --- a/front/current/components/project/state.component.html +++ b/front/current/components/project/state.component.html @@ -3,7 +3,11 @@

{{state.description}}

-
- -

{{SlotsComponent.getDocumentSlotsForState(state.id)}}

-
+ diff --git a/front/current/components/project/state.component.ts b/front/current/components/project/state.component.ts index c8ab359..b69d176 100644 --- a/front/current/components/project/state.component.ts +++ b/front/current/components/project/state.component.ts @@ -1,15 +1,25 @@ import { Component } from 'angular2/core'; import { config } from '../../config'; +import { SlotComponent } from './slot.component'; import { SlotsComponent } from './slots.component'; -import { SlotComponent } from './slot.component'; - +import { Collection, Model } from '../../services/rest.service'; @Component({ selector: 'state', templateUrl: config.static_url + '/components/project/state.component.html', - inputs: ['state', 'docs'], - directives: [SlotsComponent, SlotComponent] + inputs: ['state', 'stateSlots','project','document_slots','documents'], + directives: [SlotComponent, SlotsComponent] }) export class StateComponent{ public state: any; + public stateSlots: any[]; + public project:Model; + public document_slots:Collection; + public documents:Collection; + + constructor( + public slotsComponent: SlotsComponent + ){ + this.stateSlots = slotsComponent.getDocumentSlotsForState(this.state.id); + } }; diff --git a/front/current/components/project/states.component.html b/front/current/components/project/states.component.html index 6fc5be4..241b0b8 100644 --- a/front/current/components/project/states.component.html +++ b/front/current/components/project/states.component.html @@ -1,7 +1,11 @@
diff --git a/front/current/components/project/states.component.ts b/front/current/components/project/states.component.ts index 3e958dd..39d8ebc 100644 --- a/front/current/components/project/states.component.ts +++ b/front/current/components/project/states.component.ts @@ -2,16 +2,24 @@ import { Component } from 'angular2/core'; import { config } from '../../config'; import { StateComponent } from './state.component'; import { ProjectService } from '../../services/project/project.service'; +import { SlotsComponent } from './slots.component'; +import { Model, Collection } from '../../services/rest.service'; + @Component({ selector: 'states', templateUrl: config.static_url + '/components/project/states.component.html', - directives: [StateComponent] + directives: [StateComponent], + providers: [SlotsComponent] }) export class StatesComponent{ - + public project: Model; + public document_slots: Collection; + public documents: Collection; + constructor( - public projectService:ProjectService + public projectService:ProjectService, + public slotsComponent:SlotsComponent ){}; }; -- GitLab From 8a79de8b94d0454e12f8e862396b5cfc6afc2abe Mon Sep 17 00:00:00 2001 From: Nadim Date: Wed, 22 Jun 2016 10:39:41 -0400 Subject: [PATCH 08/48] Successfully display states with document slots under them displayed in order --- .../components/project/slots.component.html | 10 +--- .../components/project/slots.component.ts | 2 +- .../components/project/state.component.html | 2 +- .../components/project/state.component.ts | 50 +++++++++++++++++-- .../components/project/states.component.html | 3 +- 5 files changed, 50 insertions(+), 17 deletions(-) diff --git a/front/current/components/project/slots.component.html b/front/current/components/project/slots.component.html index 2a76c4a..5ed338f 100644 --- a/front/current/components/project/slots.component.html +++ b/front/current/components/project/slots.component.html @@ -15,19 +15,13 @@ > --> - - - + >
diff --git a/front/current/components/project/slots.component.ts b/front/current/components/project/slots.component.ts index 10b5b70..58da1ee 100644 --- a/front/current/components/project/slots.component.ts +++ b/front/current/components/project/slots.component.ts @@ -52,7 +52,7 @@ export class SlotsComponent { {name: 'contractor-quotes', title: 'Contractor Quotes', state_id: 30}, {name: 'misc', title: 'Miscellaneous', state_id: 1} ] - project:Model + project:Model; document_slots:Collection; documents:Collection; diff --git a/front/current/components/project/state.component.html b/front/current/components/project/state.component.html index 28baed2..2ae468e 100644 --- a/front/current/components/project/state.component.html +++ b/front/current/components/project/state.component.html @@ -6,7 +6,7 @@ -1) + documents.push(document_); + } + + collection.models = documents; + return collection; + } + + }; diff --git a/front/current/components/project/states.component.html b/front/current/components/project/states.component.html index 241b0b8..ff13832 100644 --- a/front/current/components/project/states.component.html +++ b/front/current/components/project/states.component.html @@ -5,7 +5,6 @@ [project]="project" [(document_slots)]="document_slots" [(documents)]="documents" - [stateSlots]="getDocumentSlotsForState(3)" + [stateSlots]="slotsComponent.getDocumentSlotsForState(3)" > - -- GitLab From f66d9f383d28c19d789dc8777ff39afdb5e30dda Mon Sep 17 00:00:00 2001 From: calvinqh Date: Wed, 22 Jun 2016 11:38:20 -0400 Subject: [PATCH 09/48] Documents of each state show under their respective state. --- front/current/components/project/slots.component.html | 4 +--- front/current/components/project/state.component.ts | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/front/current/components/project/slots.component.html b/front/current/components/project/slots.component.html index 5ed338f..c9d690c 100644 --- a/front/current/components/project/slots.component.html +++ b/front/current/components/project/slots.component.html @@ -1,5 +1,3 @@ -

Documents

-

@@ -21,7 +19,7 @@ [project]="project" [(document_slots)]="document_slots" [(documents)]="documents" - [stateSlots]="getDocumentSlotsForState(3)" + [stateSlots]="getDocumentSlotsForState(state.id)" > diff --git a/front/current/components/project/state.component.ts b/front/current/components/project/state.component.ts index d23dfb9..3d23dc0 100644 --- a/front/current/components/project/state.component.ts +++ b/front/current/components/project/state.component.ts @@ -4,7 +4,7 @@ import { SlotComponent } from './slot.component'; import { Collection, Model, RestService } from '../../services/rest.service'; import { DocumentSlotService } from '../../services/project/document-slot.service'; import { DocumentService } from '../../services/document/document.service'; -import { ProjectService } from '../../services/project/project.service'; +//import { ProjectService } from '../../services/project/project.service'; @Component({ selector: 'state', -- GitLab From 88228d87618dce9331f2d6c611616368129a66d3 Mon Sep 17 00:00:00 2001 From: Nadim Date: Wed, 22 Jun 2016 12:00:22 -0400 Subject: [PATCH 10/48] Display multiple states in a side-scrolling view with document slots beneath. Still a bare bones implementation as the styles are extremely plain. --- .../assets/styles/components/_project.scss | 42 ++++++------------- .../components/project/slots.component.html | 6 +-- .../components/project/slots.component.ts | 4 +- .../components/project/state.component.html | 2 +- .../components/project/state.component.ts | 3 +- 5 files changed, 17 insertions(+), 40 deletions(-) diff --git a/front/current/assets/styles/components/_project.scss b/front/current/assets/styles/components/_project.scss index b99d6da..a10acc2 100644 --- a/front/current/assets/styles/components/_project.scss +++ b/front/current/assets/styles/components/_project.scss @@ -60,10 +60,20 @@ project { } document-slots { - display: block; - flex-grow: 1; - overflow: auto; padding: 10px; + display: inline-block; + overflow-x: scroll; + overflow-y: scroll; + white-space: nowrap; + + state { + display:inline-block; + vertical-align:top; + padding: 10px; + h4 { + color: $light-gray; + } + } document-slot { display: block; @@ -79,30 +89,4 @@ project { } } } - - .c_states{ - white-space: nowrap; - overflow-x:scroll; - //width:auto; - } - states{ - //white-space: nowrap; - //overflow-x:scroll; - //padding-top: 100px; - //flex-basis:auto; - border-top: 5px solid black; - //width:100%; - state { - display: inline-block; - //flex-basis: 300px; - //border-top: 5px solid black; - padding: 10px; - h4 { - color: $light-gray; - } - width:auto; - } - - } } - diff --git a/front/current/components/project/slots.component.html b/front/current/components/project/slots.component.html index 5ed338f..68876cc 100644 --- a/front/current/components/project/slots.component.html +++ b/front/current/components/project/slots.component.html @@ -1,5 +1,3 @@ -

Documents

-

@@ -14,14 +12,12 @@ [slot]="slot" >
--> - - diff --git a/front/current/components/project/slots.component.ts b/front/current/components/project/slots.component.ts index 58da1ee..367c95f 100644 --- a/front/current/components/project/slots.component.ts +++ b/front/current/components/project/slots.component.ts @@ -1,15 +1,13 @@ import { Component } from 'angular2/core'; - import { config } from '../../config'; - import { RestService, Model, Collection } from '../../services/rest.service'; import { DocumentSlotService } from '../../services/project/document-slot.service'; import { DocumentService } from '../../services/document/document.service'; import { ProjectService } from '../../services/project/project.service'; - import { SlotComponent } from './slot.component'; import { StateComponent } from './state.component'; + @Component({ selector: 'document-slots', templateUrl: config.static_url + '/components/project/slots.component.html', diff --git a/front/current/components/project/state.component.html b/front/current/components/project/state.component.html index 2ae468e..0d02f27 100644 --- a/front/current/components/project/state.component.html +++ b/front/current/components/project/state.component.html @@ -1,6 +1,5 @@

{{state.name}}


-

{{state.description}}

+
\ No newline at end of file diff --git a/front/current/components/project/state.component.ts b/front/current/components/project/state.component.ts index d23dfb9..afe4ff4 100644 --- a/front/current/components/project/state.component.ts +++ b/front/current/components/project/state.component.ts @@ -6,6 +6,7 @@ import { DocumentSlotService } from '../../services/project/document-slot.servic import { DocumentService } from '../../services/document/document.service'; import { ProjectService } from '../../services/project/project.service'; + @Component({ selector: 'state', templateUrl: config.static_url + '/components/project/state.component.html', @@ -60,6 +61,4 @@ export class StateComponent{ collection.models = documents; return collection; } - - }; -- GitLab From ada350247af9d42ae78cf9a9ca8b04d993a89491 Mon Sep 17 00:00:00 2001 From: Nadim Date: Wed, 22 Jun 2016 12:16:13 -0400 Subject: [PATCH 11/48] Add document label above document slots --- front/current/components/project/state.component.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/front/current/components/project/state.component.html b/front/current/components/project/state.component.html index 0d02f27..bed1ca3 100644 --- a/front/current/components/project/state.component.html +++ b/front/current/components/project/state.component.html @@ -1,6 +1,8 @@

{{state.name}}


{{state.description}}

+
+
Documents:
-
\ No newline at end of file +
-- GitLab From 4983272d118c069b03ee976bfabf8340e6c4f5ba Mon Sep 17 00:00:00 2001 From: calvinqh Date: Wed, 22 Jun 2016 17:18:20 -0400 Subject: [PATCH 12/48] Remove comments and extra spaces and newlines --- .../components/project/detail.component.html | 13 +------------ .../current/components/project/slots.component.html | 10 ---------- .../current/components/project/states.component.ts | 2 -- 3 files changed, 1 insertion(+), 24 deletions(-) diff --git a/front/current/components/project/detail.component.html b/front/current/components/project/detail.component.html index 047f359..2d31a3c 100644 --- a/front/current/components/project/detail.component.html +++ b/front/current/components/project/detail.component.html @@ -31,19 +31,8 @@
- - - - + > diff --git a/front/current/components/project/slots.component.html b/front/current/components/project/slots.component.html index 68876cc..479dd31 100644 --- a/front/current/components/project/slots.component.html +++ b/front/current/components/project/slots.component.html @@ -2,16 +2,6 @@

- Date: Thu, 23 Jun 2016 11:34:08 -0400 Subject: [PATCH 13/48] Add gray oval around title in order to match the prototype template. Make the word documents only appear under states that have documents to display. --- .../assets/styles/components/_project.scss | 19 ++++++++++++++++++- .../components/project/state.component.html | 9 +++++++-- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/front/current/assets/styles/components/_project.scss b/front/current/assets/styles/components/_project.scss index a10acc2..265e750 100644 --- a/front/current/assets/styles/components/_project.scss +++ b/front/current/assets/styles/components/_project.scss @@ -71,7 +71,24 @@ project { vertical-align:top; padding: 10px; h4 { - color: $light-gray; + color: $light-gray; + } + + .oval{ + width: auto; + display: inline-block; + height: 80px; + background: $light-gray; + border-radius: 40px; + padding-left: 20px; + padding-right: 20px; + + h3{ + text-align: center; + vertical-align: middle; + padding-top: 28px; //Since the vertical-align: middle had no effect, + // we use a 28px padding-top to center the title. + } } } diff --git a/front/current/components/project/state.component.html b/front/current/components/project/state.component.html index bed1ca3..326b87d 100644 --- a/front/current/components/project/state.component.html +++ b/front/current/components/project/state.component.html @@ -1,8 +1,13 @@ -

{{state.name}}

+
+

{{state.name}}

+

{{state.description}}


-
Documents:
+
+
Documents:
+
Date: Thu, 23 Jun 2016 11:51:42 -0400 Subject: [PATCH 14/48] Add dash line under state title. --- front/current/assets/styles/components/_project.scss | 9 +++++++-- front/current/components/project/state.component.html | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/front/current/assets/styles/components/_project.scss b/front/current/assets/styles/components/_project.scss index 265e750..100e9ab 100644 --- a/front/current/assets/styles/components/_project.scss +++ b/front/current/assets/styles/components/_project.scss @@ -84,12 +84,17 @@ project { padding-right: 20px; h3{ - text-align: center; - vertical-align: middle; + color: $white; padding-top: 28px; //Since the vertical-align: middle had no effect, // we use a 28px padding-top to center the title. } } + + .dashed-line{ + width: 50%; + border-top: dashed 2px; + color: $light-gray; + } } document-slot { diff --git a/front/current/components/project/state.component.html b/front/current/components/project/state.component.html index 326b87d..b062228 100644 --- a/front/current/components/project/state.component.html +++ b/front/current/components/project/state.component.html @@ -7,6 +7,7 @@
Documents:
+
Date: Thu, 23 Jun 2016 16:00:06 -0400 Subject: [PATCH 15/48] Add dashed line under each slot. Move upload icon above uploaded documents list. --- .../components/project/slot.component.html | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/front/current/components/project/slot.component.html b/front/current/components/project/slot.component.html index 4bd8999..9a14d51 100644 --- a/front/current/components/project/slot.component.html +++ b/front/current/components/project/slot.component.html @@ -1,6 +1,14 @@
{{ slot.title }}
    +
  • + +
  • -
  • - -
  • +
-- GitLab From 8799f3ad0da6e81c6d90fa5be6b4357bf1f33255 Mon Sep 17 00:00:00 2001 From: calvinqh Date: Fri, 24 Jun 2016 14:35:37 -0400 Subject: [PATCH 16/48] Remove inline css of hr line --- front/current/components/project/slot.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/current/components/project/slot.component.html b/front/current/components/project/slot.component.html index 9a14d51..ed524f3 100644 --- a/front/current/components/project/slot.component.html +++ b/front/current/components/project/slot.component.html @@ -19,5 +19,5 @@ --> -
+
-- GitLab From 56a7b84703f790f902b269f5df3e73a89c021f4b Mon Sep 17 00:00:00 2001 From: calvinqh Date: Fri, 24 Jun 2016 14:42:49 -0400 Subject: [PATCH 17/48] Add css for timeline track line and add css for hr, so that it aligns left. Add css for description, so that text would wrap --- .../assets/styles/components/_project.scss | 29 ++++++++++++++++--- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/front/current/assets/styles/components/_project.scss b/front/current/assets/styles/components/_project.scss index 079dc36..ba8dd0e 100644 --- a/front/current/assets/styles/components/_project.scss +++ b/front/current/assets/styles/components/_project.scss @@ -67,13 +67,31 @@ project { overflow-x: scroll; overflow-y: scroll; white-space: nowrap; - + + .timeline-track { + width:100%; + height: 10px; + background: $light-gray; + position: relative; + z-index: -1; + margin-left:20px; + top: 50px; + } + state { display:inline-block; vertical-align:top; padding: 10px; - h4 { - color: $light-gray; + + h3 { + color: gray; + padding-bottom:10px; + } + + p { + color: #838383; + width: 400px; + white-space: normal; } .oval{ @@ -95,7 +113,10 @@ project { .dashed-line{ width: 50%; border-top: dashed 2px; - color: $light-gray; + color: #ddd; + margin-top: 20px; + margin-bottom: 20px; + margin-left: 0px; } } -- GitLab From 03a5007de1b52eed33ab3dd0d43c7849c0f316ec Mon Sep 17 00:00:00 2001 From: calvinqh Date: Fri, 24 Jun 2016 14:45:49 -0400 Subject: [PATCH 18/48] Change description tag from h4 to p. Add div for dashed line to separate document slots. --- front/current/components/project/slots.component.html | 4 ++-- front/current/components/project/state.component.html | 9 ++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/front/current/components/project/slots.component.html b/front/current/components/project/slots.component.html index 479dd31..760a419 100644 --- a/front/current/components/project/slots.component.html +++ b/front/current/components/project/slots.component.html @@ -2,7 +2,7 @@

- -
+
diff --git a/front/current/components/project/state.component.html b/front/current/components/project/state.component.html index b062228..4a20099 100644 --- a/front/current/components/project/state.component.html +++ b/front/current/components/project/state.component.html @@ -1,15 +1,14 @@ +

{{state.name}}

-
-

{{state.description}}

+

{{state.description}}


+
-
Documents:
-
+

Documents:

-
Date: Fri, 24 Jun 2016 14:48:06 -0400 Subject: [PATCH 19/48] Remove extra spaces. --- front/current/components/project/slots.component.html | 2 +- front/current/components/project/state.component.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/front/current/components/project/slots.component.html b/front/current/components/project/slots.component.html index 760a419..d512b6a 100644 --- a/front/current/components/project/slots.component.html +++ b/front/current/components/project/slots.component.html @@ -10,4 +10,4 @@ [(documents)]="documents" [stateSlots]="getDocumentSlotsForState(state.id)" > -
+
diff --git a/front/current/components/project/state.component.html b/front/current/components/project/state.component.html index 4a20099..c8d257c 100644 --- a/front/current/components/project/state.component.html +++ b/front/current/components/project/state.component.html @@ -17,4 +17,4 @@ [(parent_document_slots)]="document_slots" [slot]="slot" > -
+
-- GitLab From 29d44dc9888385f96bfbcb1d694233d7da7a8b45 Mon Sep 17 00:00:00 2001 From: calvinqh Date: Fri, 24 Jun 2016 16:59:35 -0400 Subject: [PATCH 20/48] Remove getDocuments() and getDocumentSlots() function because they were moved to state.component.ts. --- .../components/project/slots.component.ts | 36 ------------------- 1 file changed, 36 deletions(-) diff --git a/front/current/components/project/slots.component.ts b/front/current/components/project/slots.component.ts index 367c95f..6621789 100644 --- a/front/current/components/project/slots.component.ts +++ b/front/current/components/project/slots.component.ts @@ -1,7 +1,6 @@ import { Component } from 'angular2/core'; import { config } from '../../config'; import { RestService, Model, Collection } from '../../services/rest.service'; -import { DocumentSlotService } from '../../services/project/document-slot.service'; import { DocumentService } from '../../services/document/document.service'; import { ProjectService } from '../../services/project/project.service'; import { SlotComponent } from './slot.component'; @@ -17,7 +16,6 @@ import { StateComponent } from './state.component'; export class SlotsComponent { constructor( private _restService:RestService, - public documentSlotService:DocumentSlotService, public documentService:DocumentService, public projectService:ProjectService ) {}; @@ -54,40 +52,6 @@ export class SlotsComponent { document_slots:Collection; documents:Collection; - public getDocumentSlots(slot:any) { - // Gets a subset of document slots for the given slot description. - let documentSlots = []; - let collection = this._restService.Collection(this.documentSlotService, []); - - for (let documentSlot of this.document_slots.models) { - if (documentSlot.data['role'] == slot.name) - documentSlots.push(documentSlot); - } - - collection.models = documentSlots; - return collection; - }; - - public getDocuments(slot:any) { - // Gets a subset of documents for the given slot description. - let documents = []; - let collection = this._restService.Collection(this.documentService, []); - let document_slots = this.getDocumentSlots(slot); - let keys = []; - - for (let document_slot of document_slots.models) { - let key = document_slot.data['document_key']; - keys.push(key); - } - - for (let document_ of this.documents.models) { - if (keys.indexOf(document_.data['key']) > -1) - documents.push(document_); - } - - collection.models = documents; - return collection; - } public getDocumentSlotsForState(state_id: number){ let state_slots = []; let collection = this._restService.Collection(this.documentService, []); -- GitLab From effa94b352b5c1c93e1b932d6b7f1a225d0b2fb0 Mon Sep 17 00:00:00 2001 From: calvinqh Date: Mon, 27 Jun 2016 09:56:18 -0400 Subject: [PATCH 21/48] Move hr tag outside of ul tag. --- front/current/components/project/slot.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/current/components/project/slot.component.html b/front/current/components/project/slot.component.html index ed524f3..5a239ab 100644 --- a/front/current/components/project/slot.component.html +++ b/front/current/components/project/slot.component.html @@ -19,5 +19,5 @@ --> -
+
-- GitLab From de8635e569d21f2a4e84cc3e9184bfe8edabe475 Mon Sep 17 00:00:00 2001 From: calvinqh Date: Tue, 28 Jun 2016 13:22:26 -0400 Subject: [PATCH 22/48] Remove z-index from timeline_track class and add position: relative to oval class. Timeline track displayed behind oval. --- front/current/assets/styles/components/_project.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/current/assets/styles/components/_project.scss b/front/current/assets/styles/components/_project.scss index ba8dd0e..b550be7 100644 --- a/front/current/assets/styles/components/_project.scss +++ b/front/current/assets/styles/components/_project.scss @@ -73,7 +73,6 @@ project { height: 10px; background: $light-gray; position: relative; - z-index: -1; margin-left:20px; top: 50px; } @@ -95,6 +94,7 @@ project { } .oval{ + position: relative; width: auto; display: inline-block; height: 80px; -- GitLab From ed0f973276bc5aec544aa5fd69452189b189f772 Mon Sep 17 00:00:00 2001 From: calvinqh Date: Tue, 28 Jun 2016 13:27:47 -0400 Subject: [PATCH 23/48] Remove state and states import statements and from directives. --- front/current/components/project/detail.component.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/front/current/components/project/detail.component.ts b/front/current/components/project/detail.component.ts index 4a44f63..14adba2 100644 --- a/front/current/components/project/detail.component.ts +++ b/front/current/components/project/detail.component.ts @@ -15,13 +15,11 @@ import { DocumentService } from '../../services/document/document.service'; 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, StatesComponent] + directives: [ROUTER_DIRECTIVES, AddressComponent, ContactsComponent, SlotsComponent] }) export class ProjectDetailComponent implements OnInit { constructor( -- GitLab From d6153671bac4db423a3d67b6e1da2ab1cd781856 Mon Sep 17 00:00:00 2001 From: calvinqh Date: Tue, 28 Jun 2016 13:29:52 -0400 Subject: [PATCH 24/48] Remove old import statment comment. --- front/current/components/project/state.component.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/front/current/components/project/state.component.ts b/front/current/components/project/state.component.ts index fdcb3d1..07af2f6 100644 --- a/front/current/components/project/state.component.ts +++ b/front/current/components/project/state.component.ts @@ -4,7 +4,6 @@ import { SlotComponent } from './slot.component'; import { Collection, Model, RestService } from '../../services/rest.service'; import { DocumentSlotService } from '../../services/project/document-slot.service'; import { DocumentService } from '../../services/document/document.service'; -//import { ProjectService } from '../../services/project/project.service'; @Component({ -- GitLab From fd97acffe3567bc2927ba5b312af344f7f5d23b0 Mon Sep 17 00:00:00 2001 From: calvinqh Date: Tue, 28 Jun 2016 13:31:47 -0400 Subject: [PATCH 25/48] Remove states files, states component is no longer in use. --- .../components/project/states.component.html | 10 -------- .../components/project/states.component.ts | 23 ------------------- 2 files changed, 33 deletions(-) delete mode 100644 front/current/components/project/states.component.html delete mode 100644 front/current/components/project/states.component.ts diff --git a/front/current/components/project/states.component.html b/front/current/components/project/states.component.html deleted file mode 100644 index ff13832..0000000 --- a/front/current/components/project/states.component.html +++ /dev/null @@ -1,10 +0,0 @@ -
- -
diff --git a/front/current/components/project/states.component.ts b/front/current/components/project/states.component.ts deleted file mode 100644 index 00ca997..0000000 --- a/front/current/components/project/states.component.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { Component } from 'angular2/core'; -import { config } from '../../config'; -import { StateComponent } from './state.component'; -import { ProjectService } from '../../services/project/project.service'; -import { SlotsComponent } from './slots.component'; -import { Model, Collection } from '../../services/rest.service'; - -@Component({ - selector: 'states', - templateUrl: config.static_url + '/components/project/states.component.html', - directives: [StateComponent], - providers: [SlotsComponent] -}) -export class StatesComponent{ - public project: Model; - public document_slots: Collection; - public documents: Collection; - - constructor( - public projectService:ProjectService, - public slotsComponent:SlotsComponent - ){}; -}; -- GitLab From ac422d71d62f8658df9bcaaf84ac5f41b06566d7 Mon Sep 17 00:00:00 2001 From: calvinqh Date: Tue, 28 Jun 2016 14:57:41 -0400 Subject: [PATCH 26/48] Remove collection variable from getDocumentSlotsForState() because it is not in use. --- front/current/components/project/slots.component.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/front/current/components/project/slots.component.ts b/front/current/components/project/slots.component.ts index 6621789..55c9210 100644 --- a/front/current/components/project/slots.component.ts +++ b/front/current/components/project/slots.component.ts @@ -54,12 +54,10 @@ export class SlotsComponent { public getDocumentSlotsForState(state_id: number){ let state_slots = []; - let collection = this._restService.Collection(this.documentService, []); for (let slot of this.slots) { if(slot.state_id == state_id) state_slots.push(slot); } - collection.models = state_slots; return state_slots; }; }; -- GitLab From 8fdd9505c32d4700b4dc316f6e77b493c911f5d9 Mon Sep 17 00:00:00 2001 From: calvinqh Date: Tue, 28 Jun 2016 15:05:19 -0400 Subject: [PATCH 27/48] Remove restService and documentService because they are not in use. Remove slotComponent because it is not in use here. --- front/current/components/project/slots.component.ts | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/front/current/components/project/slots.component.ts b/front/current/components/project/slots.component.ts index 55c9210..0e1395e 100644 --- a/front/current/components/project/slots.component.ts +++ b/front/current/components/project/slots.component.ts @@ -1,9 +1,7 @@ import { Component } from 'angular2/core'; import { config } from '../../config'; -import { RestService, Model, Collection } from '../../services/rest.service'; -import { DocumentService } from '../../services/document/document.service'; +import { Model, Collection } from '../../services/rest.service'; import { ProjectService } from '../../services/project/project.service'; -import { SlotComponent } from './slot.component'; import { StateComponent } from './state.component'; @@ -11,12 +9,10 @@ import { StateComponent } from './state.component'; selector: 'document-slots', templateUrl: config.static_url + '/components/project/slots.component.html', inputs: ['project', 'document_slots', 'documents'], - directives: [SlotComponent, StateComponent] + directives: [StateComponent] }) export class SlotsComponent { constructor( - private _restService:RestService, - public documentService:DocumentService, public projectService:ProjectService ) {}; -- GitLab From 234ec7ff9dd4a589e2764ab578bea29543a21586 Mon Sep 17 00:00:00 2001 From: calvinqh Date: Tue, 28 Jun 2016 17:05:09 -0400 Subject: [PATCH 28/48] Change stateSlots to state_slot for consistency. --- front/current/components/project/slots.component.html | 2 +- front/current/components/project/state.component.html | 4 ++-- front/current/components/project/state.component.ts | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/front/current/components/project/slots.component.html b/front/current/components/project/slots.component.html index d512b6a..ea4a4ac 100644 --- a/front/current/components/project/slots.component.html +++ b/front/current/components/project/slots.component.html @@ -8,6 +8,6 @@ [project]="project" [(document_slots)]="document_slots" [(documents)]="documents" - [stateSlots]="getDocumentSlotsForState(state.id)" + [state_slots]="getDocumentSlotsForState(state.id)" > diff --git a/front/current/components/project/state.component.html b/front/current/components/project/state.component.html index c8d257c..4afbc9e 100644 --- a/front/current/components/project/state.component.html +++ b/front/current/components/project/state.component.html @@ -5,12 +5,12 @@

{{state.description}}



-

Documents:

Date: Tue, 28 Jun 2016 17:06:07 -0400 Subject: [PATCH 29/48] Remove unecessary styles. --- front/current/assets/styles/components/_project.scss | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/front/current/assets/styles/components/_project.scss b/front/current/assets/styles/components/_project.scss index b550be7..fbb9a9a 100644 --- a/front/current/assets/styles/components/_project.scss +++ b/front/current/assets/styles/components/_project.scss @@ -63,8 +63,7 @@ project { document-slots { padding: 10px; - display: inline-block; - overflow-x: scroll; + overflow-x: auto; overflow-y: scroll; white-space: nowrap; -- GitLab From 58506c6457cbe69b632c98e73e7c77bab27d81de Mon Sep 17 00:00:00 2001 From: calvinqh Date: Tue, 28 Jun 2016 17:30:10 -0400 Subject: [PATCH 30/48] Remove hr tag from the bottom of the slot html. --- front/current/components/project/slot.component.html | 1 - 1 file changed, 1 deletion(-) diff --git a/front/current/components/project/slot.component.html b/front/current/components/project/slot.component.html index 5a239ab..583df8d 100644 --- a/front/current/components/project/slot.component.html +++ b/front/current/components/project/slot.component.html @@ -20,4 +20,3 @@ -
-- GitLab From e1212c033b04c31aca2d0de9ee82873d51e1b0de Mon Sep 17 00:00:00 2001 From: calvinqh Date: Tue, 28 Jun 2016 17:35:16 -0400 Subject: [PATCH 31/48] Add missing semicolon and spacing. Remove hr tag from state html. --- front/current/components/project/slots.component.ts | 4 ++-- front/current/components/project/state.component.html | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/front/current/components/project/slots.component.ts b/front/current/components/project/slots.component.ts index 0e1395e..489b06e 100644 --- a/front/current/components/project/slots.component.ts +++ b/front/current/components/project/slots.component.ts @@ -43,12 +43,12 @@ export class SlotsComponent { {name: 'loan-application', title: 'Loan Application', state_id: 40}, {name: 'contractor-quotes', title: 'Contractor Quotes', state_id: 30}, {name: 'misc', title: 'Miscellaneous', state_id: 1} - ] + ]; project:Model; document_slots:Collection; documents:Collection; - public getDocumentSlotsForState(state_id: number){ + public getDocumentSlotsForState(state_id: number) { let state_slots = []; for (let slot of this.slots) { if(slot.state_id == state_id) diff --git a/front/current/components/project/state.component.html b/front/current/components/project/state.component.html index 4afbc9e..ef7a321 100644 --- a/front/current/components/project/state.component.html +++ b/front/current/components/project/state.component.html @@ -4,7 +4,6 @@

{{state.description}}


-

Documents:

-- GitLab From 79063923db316d567fcf4cd11505d15d930a0180 Mon Sep 17 00:00:00 2001 From: calvinqh Date: Tue, 28 Jun 2016 17:37:27 -0400 Subject: [PATCH 32/48] Move comment before the conditional. --- front/current/components/project/state.component.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/front/current/components/project/state.component.html b/front/current/components/project/state.component.html index ef7a321..5b69ba8 100644 --- a/front/current/components/project/state.component.html +++ b/front/current/components/project/state.component.html @@ -4,9 +4,9 @@

{{state.description}}


-
-

Documents:

+ +
+

Documents:

Date: Tue, 28 Jun 2016 17:39:00 -0400 Subject: [PATCH 33/48] Add spacing between the operator --- front/current/components/project/state.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/current/components/project/state.component.html b/front/current/components/project/state.component.html index 5b69ba8..feab5ad 100644 --- a/front/current/components/project/state.component.html +++ b/front/current/components/project/state.component.html @@ -5,7 +5,7 @@

{{state.description}}


-
+

Documents:

Date: Tue, 28 Jun 2016 17:39:14 -0400 Subject: [PATCH 34/48] Revert "Add spacing between the operator" This reverts commit a2739f3b28a1f540623ea9d887549c744046fd55. --- front/current/components/project/state.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/current/components/project/state.component.html b/front/current/components/project/state.component.html index feab5ad..5b69ba8 100644 --- a/front/current/components/project/state.component.html +++ b/front/current/components/project/state.component.html @@ -5,7 +5,7 @@

{{state.description}}


-
+

Documents:

Date: Tue, 28 Jun 2016 17:40:04 -0400 Subject: [PATCH 35/48] Add spacing between the operator for the ngif conditional. --- front/current/components/project/state.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/current/components/project/state.component.html b/front/current/components/project/state.component.html index 5b69ba8..feab5ad 100644 --- a/front/current/components/project/state.component.html +++ b/front/current/components/project/state.component.html @@ -5,7 +5,7 @@

{{state.description}}


-
+

Documents:

Date: Tue, 28 Jun 2016 17:41:38 -0400 Subject: [PATCH 36/48] Fix weird indentation --- front/current/components/project/state.component.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/front/current/components/project/state.component.ts b/front/current/components/project/state.component.ts index d7578b3..352d511 100644 --- a/front/current/components/project/state.component.ts +++ b/front/current/components/project/state.component.ts @@ -12,6 +12,7 @@ import { DocumentService } from '../../services/document/document.service'; inputs: ['state', 'state_slots','project','document_slots','documents'], directives: [SlotComponent] }) + export class StateComponent{ public state: any; public state_slots: any[]; -- GitLab From ee7925d80c4e7ba76f7f8878e2674dce8681750a Mon Sep 17 00:00:00 2001 From: calvinqh Date: Tue, 28 Jun 2016 17:44:26 -0400 Subject: [PATCH 37/48] Fix weird indents and spacing. --- front/current/components/project/state.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/current/components/project/state.component.html b/front/current/components/project/state.component.html index feab5ad..7555f0e 100644 --- a/front/current/components/project/state.component.html +++ b/front/current/components/project/state.component.html @@ -1,6 +1,6 @@
-

{{state.name}}

+

{{state.name}}

{{state.description}}


-- GitLab From eeb77f657b2e7d733c5ef9312ee8cf140a58bd18 Mon Sep 17 00:00:00 2001 From: calvinqh Date: Wed, 29 Jun 2016 10:16:05 -0400 Subject: [PATCH 38/48] Add state container around state. Move state padding into container. --- .../assets/styles/components/_project.scss | 14 ++++---------- .../components/project/slots.component.html | 18 ++++++++++-------- 2 files changed, 14 insertions(+), 18 deletions(-) diff --git a/front/current/assets/styles/components/_project.scss b/front/current/assets/styles/components/_project.scss index fbb9a9a..b9e4a9a 100644 --- a/front/current/assets/styles/components/_project.scss +++ b/front/current/assets/styles/components/_project.scss @@ -76,10 +76,13 @@ project { top: 50px; } + .c_state { + padding: 10px; + } + state { display:inline-block; vertical-align:top; - padding: 10px; h3 { color: gray; @@ -108,15 +111,6 @@ project { // we use a 28px padding-top to center the title. } } - - .dashed-line{ - width: 50%; - border-top: dashed 2px; - color: #ddd; - margin-top: 20px; - margin-bottom: 20px; - margin-left: 0px; - } } document-slot { diff --git a/front/current/components/project/slots.component.html b/front/current/components/project/slots.component.html index ea4a4ac..abb83f0 100644 --- a/front/current/components/project/slots.component.html +++ b/front/current/components/project/slots.component.html @@ -2,12 +2,14 @@

- +
+ +
-- GitLab From 5e5ec8d926ad60b0149fb456bfa2b801f221e9b9 Mon Sep 17 00:00:00 2001 From: calvinqh Date: Wed, 29 Jun 2016 12:01:24 -0400 Subject: [PATCH 39/48] Remove padding from document slots. Remove margin-left from timeline track. Add margins to oval. Wrap content of each state with padding. --- front/current/assets/styles/components/_project.scss | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/front/current/assets/styles/components/_project.scss b/front/current/assets/styles/components/_project.scss index b9e4a9a..0d669f9 100644 --- a/front/current/assets/styles/components/_project.scss +++ b/front/current/assets/styles/components/_project.scss @@ -62,7 +62,6 @@ project { } document-slots { - padding: 10px; overflow-x: auto; overflow-y: scroll; white-space: nowrap; @@ -72,18 +71,17 @@ project { height: 10px; background: $light-gray; position: relative; - margin-left:20px; top: 50px; } - .c_state { - padding: 10px; - } - state { display:inline-block; vertical-align:top; + .content_padding { + padding : 10px; + } + h3 { color: gray; padding-bottom:10px; @@ -104,7 +102,7 @@ project { border-radius: 40px; padding-left: 20px; padding-right: 20px; - + margin: 10px; h3{ color: $white; padding-top: 28px; //Since the vertical-align: middle had no effect, -- GitLab From 1ce7ee3227b79b13fe5b01de22c7a1b6d9b64f3f Mon Sep 17 00:00:00 2001 From: calvinqh Date: Wed, 29 Jun 2016 12:04:18 -0400 Subject: [PATCH 40/48] Add content wrapper. Remove c_state. --- .../components/project/slots.component.html | 2 -- .../components/project/state.component.html | 30 ++++++++++--------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/front/current/components/project/slots.component.html b/front/current/components/project/slots.component.html index abb83f0..28149d2 100644 --- a/front/current/components/project/slots.component.html +++ b/front/current/components/project/slots.component.html @@ -2,7 +2,6 @@

-
-
diff --git a/front/current/components/project/state.component.html b/front/current/components/project/state.component.html index 7555f0e..d638c55 100644 --- a/front/current/components/project/state.component.html +++ b/front/current/components/project/state.component.html @@ -2,18 +2,20 @@

{{state.name}}

-

{{state.description}}

-
- -
-

Documents:

+
+

{{state.description}}

+
+ +
+

Documents:

+
+ +
- -
-- GitLab From c660b1d30abdf42bec5c07727e72a1f6ecd8c2f8 Mon Sep 17 00:00:00 2001 From: calvinqh Date: Wed, 29 Jun 2016 12:13:12 -0400 Subject: [PATCH 41/48] Move width from description to state. Remove div tag and move conditional to h3 tag in state html --- front/current/assets/styles/components/_project.scss | 4 ++-- front/current/components/project/state.component.html | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/front/current/assets/styles/components/_project.scss b/front/current/assets/styles/components/_project.scss index 0d669f9..7acc53b 100644 --- a/front/current/assets/styles/components/_project.scss +++ b/front/current/assets/styles/components/_project.scss @@ -77,7 +77,8 @@ project { state { display:inline-block; vertical-align:top; - + width: 600px; + .content_padding { padding : 10px; } @@ -89,7 +90,6 @@ project { p { color: #838383; - width: 400px; white-space: normal; } diff --git a/front/current/components/project/state.component.html b/front/current/components/project/state.component.html index d638c55..3f2c254 100644 --- a/front/current/components/project/state.component.html +++ b/front/current/components/project/state.component.html @@ -5,10 +5,8 @@

{{state.description}}


- -
-

Documents:

-
+ +

Documents:

Date: Wed, 29 Jun 2016 12:16:19 -0400 Subject: [PATCH 42/48] Change padding of content to only left,right, and bottom. --- front/current/assets/styles/components/_project.scss | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/front/current/assets/styles/components/_project.scss b/front/current/assets/styles/components/_project.scss index 7acc53b..43c3929 100644 --- a/front/current/assets/styles/components/_project.scss +++ b/front/current/assets/styles/components/_project.scss @@ -80,7 +80,9 @@ project { width: 600px; .content_padding { - padding : 10px; + padding-left : 10px; + padding-right: 10px; + padding-bottom: 10px; } h3 { -- GitLab From acb8593b75980e3ea6d814d6fb146afc49387e66 Mon Sep 17 00:00:00 2001 From: calvinqh Date: Wed, 29 Jun 2016 12:27:04 -0400 Subject: [PATCH 43/48] Remove indentation, add 2 spaces. --- front/current/components/project/state.component.html | 1 - front/current/components/project/state.component.ts | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/front/current/components/project/state.component.html b/front/current/components/project/state.component.html index 3f2c254..08181eb 100644 --- a/front/current/components/project/state.component.html +++ b/front/current/components/project/state.component.html @@ -4,7 +4,6 @@

{{state.description}}

-

Documents:

Date: Wed, 29 Jun 2016 12:35:35 -0400 Subject: [PATCH 44/48] Add margin-top to h3 that replaces the br tag. --- front/current/assets/styles/components/_project.scss | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/front/current/assets/styles/components/_project.scss b/front/current/assets/styles/components/_project.scss index 43c3929..6c5415a 100644 --- a/front/current/assets/styles/components/_project.scss +++ b/front/current/assets/styles/components/_project.scss @@ -71,7 +71,7 @@ project { height: 10px; background: $light-gray; position: relative; - top: 50px; + top: 55px; } state { @@ -88,6 +88,7 @@ project { h3 { color: gray; padding-bottom:10px; + margin-top: 15px; } p { @@ -107,8 +108,8 @@ project { margin: 10px; h3{ color: $white; - padding-top: 28px; //Since the vertical-align: middle had no effect, - // we use a 28px padding-top to center the title. + padding-top: 15px; //Since the vertical-align: middle had no effect, + // we use a 15px padding-top to center the title. } } } -- GitLab From 5f8549eee3b8e67518482b555065286796ae075c Mon Sep 17 00:00:00 2001 From: astex <0astex@gmail.com> Date: Wed, 29 Jun 2016 12:44:16 -0400 Subject: [PATCH 45/48] Make document-slots overflow-y auto. --- front/current/assets/styles/components/_project.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/current/assets/styles/components/_project.scss b/front/current/assets/styles/components/_project.scss index 6c5415a..e2759e4 100644 --- a/front/current/assets/styles/components/_project.scss +++ b/front/current/assets/styles/components/_project.scss @@ -63,7 +63,7 @@ project { document-slots { overflow-x: auto; - overflow-y: scroll; + overflow-y: auto; white-space: nowrap; .timeline-track { -- GitLab From b29ad08abf75df7ebc6c2122b971bf3419a27ed8 Mon Sep 17 00:00:00 2001 From: astex <0astex@gmail.com> Date: Wed, 29 Jun 2016 12:44:33 -0400 Subject: [PATCH 46/48] Fix spacing in project styles. --- front/current/assets/styles/components/_project.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/current/assets/styles/components/_project.scss b/front/current/assets/styles/components/_project.scss index e2759e4..5827eb2 100644 --- a/front/current/assets/styles/components/_project.scss +++ b/front/current/assets/styles/components/_project.scss @@ -67,7 +67,7 @@ project { white-space: nowrap; .timeline-track { - width:100%; + width: 100%; height: 10px; background: $light-gray; position: relative; -- GitLab From 782d74a42b1afebd875905ac747abd17f40f5dff Mon Sep 17 00:00:00 2001 From: astex <0astex@gmail.com> Date: Wed, 29 Jun 2016 12:44:44 -0400 Subject: [PATCH 47/48] Fix spacing in project styles. --- front/current/assets/styles/components/_project.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/front/current/assets/styles/components/_project.scss b/front/current/assets/styles/components/_project.scss index 5827eb2..6daccbe 100644 --- a/front/current/assets/styles/components/_project.scss +++ b/front/current/assets/styles/components/_project.scss @@ -75,8 +75,8 @@ project { } state { - display:inline-block; - vertical-align:top; + display: inline-block; + vertical-align: top; width: 600px; .content_padding { -- GitLab From c7bb58c41b22a856a42361ea6cb0b83b3b26b3a0 Mon Sep 17 00:00:00 2001 From: astex <0astex@gmail.com> Date: Wed, 29 Jun 2016 12:49:09 -0400 Subject: [PATCH 48/48] Fix badge centering in the project states list. --- .../assets/styles/components/_project.scss | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/front/current/assets/styles/components/_project.scss b/front/current/assets/styles/components/_project.scss index 6daccbe..7863b3b 100644 --- a/front/current/assets/styles/components/_project.scss +++ b/front/current/assets/styles/components/_project.scss @@ -71,7 +71,7 @@ project { height: 10px; background: $light-gray; position: relative; - top: 55px; + top: 45px; } state { @@ -99,17 +99,22 @@ project { .oval{ position: relative; width: auto; - display: inline-block; + display: table; height: 80px; background: $light-gray; border-radius: 40px; - padding-left: 20px; - padding-right: 20px; - margin: 10px; - h3{ + + padding: 20px; + + margin-left: 20px; + margin-right: 40px; + + h3 { + display: table-cell; + padding: 0; + text-align: center; + vertical-align: middle; color: $white; - padding-top: 15px; //Since the vertical-align: middle had no effect, - // we use a 15px padding-top to center the title. } } } -- GitLab