From c269e56f071a4fc14a1460e6a3f8639062e6149f Mon Sep 17 00:00:00 2001 From: calvinqh Date: Wed, 8 Jun 2016 11:36:36 -0400 Subject: [PATCH 001/101] Bold table headers on the project list. --- front/current/assets/styles/components/_project-list.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/current/assets/styles/components/_project-list.scss b/front/current/assets/styles/components/_project-list.scss index 397f130..ce855ed 100644 --- a/front/current/assets/styles/components/_project-list.scss +++ b/front/current/assets/styles/components/_project-list.scss @@ -23,7 +23,7 @@ project-list { } th { text-transform: uppercase; - font-weight: normal; + font-weight: bold; text-align: left; color: $gray-02; } -- GitLab From f6788b2df4ffcf2b6bd11cad4f07405e5fbe01ae Mon Sep 17 00:00:00 2001 From: Nadim Date: Wed, 8 Jun 2016 11:48:02 -0400 Subject: [PATCH 002/101] Add placeholder text to project search bar. --- front/current/components/projects/list.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/current/components/projects/list.component.html b/front/current/components/projects/list.component.html index 299f2b4..670a457 100644 --- a/front/current/components/projects/list.component.html +++ b/front/current/components/projects/list.component.html @@ -1,7 +1,7 @@
- +
-- GitLab From d6c0e581f6ae4c373fd4004bd40c1273c352ee77 Mon Sep 17 00:00:00 2001 From: Calvin Quach Date: Mon, 13 Jun 2016 11:05:17 -0400 Subject: [PATCH 003/101] Create state component class with id, name, description. --- front/current/components/project/state.component.ts | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 front/current/components/project/state.component.ts diff --git a/front/current/components/project/state.component.ts b/front/current/components/project/state.component.ts new file mode 100644 index 0000000..c90724d --- /dev/null +++ b/front/current/components/project/state.component.ts @@ -0,0 +1,13 @@ +import { Component } from 'angular2/core'; +import { config } from '../../config'; + + +@Component({ + +}) + +export class StateComponent{ + name:string; + id:number; + descripition:string; +}; -- GitLab From f26a6890dabe822db32c8e9c5ed8210c5f5a82b5 Mon Sep 17 00:00:00 2001 From: Calvin Quach Date: Mon, 13 Jun 2016 11:17:23 -0400 Subject: [PATCH 004/101] Create array of state objects and add dummy states --- .../current/services/project/project.service.ts | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/front/current/services/project/project.service.ts b/front/current/services/project/project.service.ts index 0db2072..45c4288 100644 --- a/front/current/services/project/project.service.ts +++ b/front/current/services/project/project.service.ts @@ -1,14 +1,28 @@ import { Injectable } from 'angular2/core'; import { config } from '../../config'; import { Model } from '../rest.service'; +import { StateComponent } from '../../components/project/state.component'; @Injectable() export class ProjectService { public service_name:string = 'project'; public config:any = config.SERVICES.project; public url:string = '/project/'; - + public states: StateComponent[] = + [ + { + name: "alpha", + id: 1, + description: "blah" + }, + { + name : "beta"; + id : 2; + description : "blahblah"; + } + ]; getSalesForceUrl(model:Model) { return '//na34.salesforce.com/' + model.data['sales_force_id'].substr(0, 15); }; }; + -- GitLab From d99f8b47ab5f43508912555f8be8373506fd1b20 Mon Sep 17 00:00:00 2001 From: Calvin Quach Date: Mon, 13 Jun 2016 11:19:44 -0400 Subject: [PATCH 005/101] Revert "Create array of state objects and add dummy states" This reverts commit f26a6890dabe822db32c8e9c5ed8210c5f5a82b5. --- .../current/services/project/project.service.ts | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/front/current/services/project/project.service.ts b/front/current/services/project/project.service.ts index 45c4288..0db2072 100644 --- a/front/current/services/project/project.service.ts +++ b/front/current/services/project/project.service.ts @@ -1,28 +1,14 @@ import { Injectable } from 'angular2/core'; import { config } from '../../config'; import { Model } from '../rest.service'; -import { StateComponent } from '../../components/project/state.component'; @Injectable() export class ProjectService { public service_name:string = 'project'; public config:any = config.SERVICES.project; public url:string = '/project/'; - public states: StateComponent[] = - [ - { - name: "alpha", - id: 1, - description: "blah" - }, - { - name : "beta"; - id : 2; - description : "blahblah"; - } - ]; + getSalesForceUrl(model:Model) { return '//na34.salesforce.com/' + model.data['sales_force_id'].substr(0, 15); }; }; - -- GitLab From 64ea7fad85b4686ebd2446110adaa84d2b5dfed1 Mon Sep 17 00:00:00 2001 From: Calvin Quach Date: Mon, 13 Jun 2016 12:02:29 -0400 Subject: [PATCH 006/101] Add first half of states onto array. --- .../services/project/project.service.ts | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/front/current/services/project/project.service.ts b/front/current/services/project/project.service.ts index 0db2072..aa3ba3b 100644 --- a/front/current/services/project/project.service.ts +++ b/front/current/services/project/project.service.ts @@ -1,13 +1,63 @@ import { Injectable } from 'angular2/core'; import { config } from '../../config'; import { Model } from '../rest.service'; +import { } from '../../current/project/state.component'; @Injectable() export class ProjectService { public service_name:string = 'project'; public config:any = config.SERVICES.project; public url:string = '/project/'; + public states: StateComponent[] = + [ + { + name: 'Collect Forms'; + id: 03; + description: 'Collect 12 Months Utility Bills and 3 years of income. Fill out business section of PNS form.'; + }, + { + name: 'Create Oppurtunity'; + id: 04; + description: 'Create object on project dashboard with pending state. Create oppurnity on salesforce.'; + }, + { + name: 'Confirm Bill Validity'; + id: 05; + description: 'Quality Assurance check bills on dashboard are correct.'; + }, + { + name: 'Confirm 3 yrs Income Validity'; + id: 06; + description: 'Finance does quality check on 3 yrs of INcome statemnets on dashboard.'; + }, + { + name: 'Schedule Site Visit'; + id: 07; + description: 'Schedule site visit with client and project engineer.'; + }, + { + name: 'Perform Remote ASsessment'; + id: 08; + description: 'Project Engineers perform remote assement (Energy Watch) coding violations, google earth, heat load calculations'; + }, + { + name: 'Conduct Site Visit'; + id: 09; + description: 'Project Engineer conducts site visit audit. All data entry is complete by end of day. Sensors are installed'; + }, + { + name: 'Complete Finance PNS'; + id: 10; + description: 'Finance will complete Finance section of PNS. This step does not have any dependencies. Must only be compelete one month post site visit'; + }, + + + + + + + ] getSalesForceUrl(model:Model) { return '//na34.salesforce.com/' + model.data['sales_force_id'].substr(0, 15); }; -- GitLab From 0b7efd654c6620e114980f7a5d88eb14a56a8add Mon Sep 17 00:00:00 2001 From: Nadim Date: Mon, 13 Jun 2016 12:07:55 -0400 Subject: [PATCH 007/101] Revert "Create state component class with id, name, description." This reverts commit d6c0e581f6ae4c373fd4004bd40c1273c352ee77. --- front/current/components/project/state.component.ts | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 front/current/components/project/state.component.ts diff --git a/front/current/components/project/state.component.ts b/front/current/components/project/state.component.ts deleted file mode 100644 index c90724d..0000000 --- a/front/current/components/project/state.component.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { Component } from 'angular2/core'; -import { config } from '../../config'; - - -@Component({ - -}) - -export class StateComponent{ - name:string; - id:number; - descripition:string; -}; -- GitLab From 2f470a8146f0a2b1f5d240989e9a9bc2007d0e73 Mon Sep 17 00:00:00 2001 From: Nadim Date: Mon, 13 Jun 2016 12:30:43 -0400 Subject: [PATCH 008/101] Add stages 10-30 to states array in project service class --- .../services/project/project.service.ts | 103 +++++++++++++++++- 1 file changed, 102 insertions(+), 1 deletion(-) diff --git a/front/current/services/project/project.service.ts b/front/current/services/project/project.service.ts index aa3ba3b..2b98cf6 100644 --- a/front/current/services/project/project.service.ts +++ b/front/current/services/project/project.service.ts @@ -1,7 +1,6 @@ import { Injectable } from 'angular2/core'; import { config } from '../../config'; import { Model } from '../rest.service'; -import { } from '../../current/project/state.component'; @Injectable() export class ProjectService { @@ -50,6 +49,108 @@ export class ProjectService { id: 10; description: 'Finance will complete Finance section of PNS. This step does not have any dependencies. Must only be compelete one month post site visit'; }, + { + name: 'Send PNS Form'; + id: 11; + description: 'Project Engineer sends client PNS Form'; + } + { + name: 'Perform Initial Engineering Analysis'; + id: 12; + description: 'Project Engineer performs energy efficiency calculations for annual savings'; + } + { + name: 'Send Diagnostic Report'; + id: 13; + description: 'Project Engineer creates diagnostic report'; + } + { + name: 'Follw Up Post Project Update'; + id: 14; + description: 'Project Engineer contacts client to discover if client is interested in moving forward'; + } + { + name: 'Outsource Retrofit'; + id: 15; + description: 'Project Manager assesses potential outsourced retrofits (e.g. lighting and windows)' + } + { + name: 'HPD Finance'; + id: 16; + description: 'Finance discovers if HPD will finance the project'; + } + { + name: 'Confirm Client wants HPD'; + id: 17; + description: 'Finance confirms client wants to proceed with HPD program' + } + { + name: 'Preliminary Financial Analysis'; + id: 18; + description: 'Run preliminary finance model and suggest budget range for Project Engineer'; + } + { + name: 'Confirm Project Financing'; + id: 19; + description: 'Finance decides if project is feasible'; + } + { + name: 'Perform Detailed Calculations and Analysis' + id: 20; + description: 'Project Engineer runs models (hydronic, steam, cooling, heating, controls)'; + } + { + name: 'Write Scope of Work Report'; + id: 21; + description: 'Project Engineer selects desired equipment for retrofits'; + } + { + name: 'Obtain Quotes'; + id: 22; + description: 'Project Manager bundles nearby projects together and sends equipment lists to contractor to collect quotes and look for violations'; + } + { + name: 'Create Engineering Energy Output Model'; + id: 23; + description: 'Project Engineer generates Engineering Energy Output Model for suggested scenario'; + } + { + name: 'Create Finance Model'; + id: 24; + description: 'Finance uses quotes and Engineering Output model to run Finance model for suggested scenario'; + } + { + name: 'Create Client Presentation'; + id: 25; + description: 'Project Engineer creates final presentation for various retrofit scenarios with upfront cost estimates and annual savings'; + } + { + name: 'Schedule Client Presentation'; + id: 26; + description: 'Project Manager coordinates with client, engineer, and finance/business to set up presentation date'; + } + { + name: 'Present to Client'; + id: 27; + description: 'Project Engineer presents retrofit scenarios + and financing options to client'; + } + { + name: 'Client Chooses Retrofits'; + id: 28; + description: 'Project Engineer contacts Client to determine which retrofits they want to proceed with'; + } + { + name: 'Redesign Scope of Work'; + id: 29; + description: 'Project Engineer redesigns and finalizes scope of work'; + } + { + name: 'Finalize Quotes'; + id: 30; + description: 'Project Engineer sends contractor Final Scope of Work and finalizes quotes. Contractor signs contract.'; + } + -- GitLab From 6714abdfff53222df290a97706fdaa419968f030 Mon Sep 17 00:00:00 2001 From: Calvin Quach Date: Mon, 13 Jun 2016 12:51:50 -0400 Subject: [PATCH 009/101] Finish adding states into array. --- .../services/project/project.service.ts | 73 +++++++++++++++++-- 1 file changed, 65 insertions(+), 8 deletions(-) diff --git a/front/current/services/project/project.service.ts b/front/current/services/project/project.service.ts index 2b98cf6..baf8010 100644 --- a/front/current/services/project/project.service.ts +++ b/front/current/services/project/project.service.ts @@ -150,14 +150,71 @@ export class ProjectService { id: 30; description: 'Project Engineer sends contractor Final Scope of Work and finalizes quotes. Contractor signs contract.'; } - - - - - - - - + { + name: 'Final Finance Model' ; + id: 31; + description: 'Finance runs the finance model to obtain actual costs inclduing payback years.'; + } + { + name: 'Update Client with Project Financing' ; + id: 32 ; + description: 'Finance contacts client to discuss financing options such as loans and marketplace.'; + } + { + name: 'Client Decides on Marketplace' ; + id: 33 ; + description: 'Client decides if they want to use Marketplace.'; + } + { + name: 'Marketplace Content' ; + id: 34; + description: 'The Project content gets collected to prepare it for a Marketplace Launch.'; + } + { + name: 'Marketplace' ; + id: 35; + description: 'The Project is launched on the Marketplace and is being funded.'; + } + { + name: 'Contractor Downpayment' ; + id: 39; + description: 'A downpayment is payed to contractor.'; + } + { + name: 'Apply for Loan' ; + id: 40; + description: 'Finance appplies for loan.'; + } + { + name: 'Approval of Underwriter' ; + id: 41; + description: 'Finance is notified that the loan was approved by the Underwriter(banks)'; + } + { + name: 'Confirm Funding' ; + id: 42; + description: 'Finance confirms project is funded.'; + } + { + name: 'Commence Construction' ; + id: 43; + description: 'Construction Manager coordinates with client contractor, and engineers to schedule retrofit construction.'; + } + { + name: 'Measureent & Vertification' ; + id: 44; + description: 'Project Engineer collects sensor data during site visit recalibrates sensors, and reinstalls sensors for "post retrofit" measurement and vertification.'; + } + { + name: 'Loan Payback' ; + id: 45; + description: 'Loan is in the process of being paid back.'; + } + { + name: 'Completed' + id: 46; + description: 'Project is complete!' + } ] getSalesForceUrl(model:Model) { return '//na34.salesforce.com/' + model.data['sales_force_id'].substr(0, 15); -- GitLab From 5d325fdd85288a412446f92e1f8fef87e4ace180 Mon Sep 17 00:00:00 2001 From: Nadim Date: Mon, 13 Jun 2016 12:59:57 -0400 Subject: [PATCH 010/101] Add state variable into slot component class in order to specify the state to which each document slot belongs. Add as a number that corresponds its state ID --- front/current/components/project/slot.component.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/front/current/components/project/slot.component.ts b/front/current/components/project/slot.component.ts index 13c8c32..d4c7827 100644 --- a/front/current/components/project/slot.component.ts +++ b/front/current/components/project/slot.component.ts @@ -22,6 +22,7 @@ export class SlotComponent { documents:Collection; parent_documents:Collection; parent_document_slots:Collection; + state:number; /* This number corresponds to the state ID in order to properly place each slot in the relevant state */ moment = moment; -- GitLab From 806ad3ce53a0f27e30dec0e80478ae98d333906c Mon Sep 17 00:00:00 2001 From: Nadim Date: Mon, 13 Jun 2016 13:13:33 -0400 Subject: [PATCH 011/101] Change type of states array to any[] --- front/current/services/project/project.service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/current/services/project/project.service.ts b/front/current/services/project/project.service.ts index baf8010..a7fb3aa 100644 --- a/front/current/services/project/project.service.ts +++ b/front/current/services/project/project.service.ts @@ -7,7 +7,7 @@ export class ProjectService { public service_name:string = 'project'; public config:any = config.SERVICES.project; public url:string = '/project/'; - public states: StateComponent[] = + public states: any[] = [ { name: 'Collect Forms'; -- GitLab From a911bc63b9379dc598be7736fb89bff7ba1e37e3 Mon Sep 17 00:00:00 2001 From: Nadim Date: Mon, 13 Jun 2016 14:30:34 -0400 Subject: [PATCH 012/101] Edit state array to fit proper typescript syntax. In this case that means changing semicolons to commas and adding commmas between array members. --- .../services/project/project.service.ts | 324 +++++++++--------- 1 file changed, 162 insertions(+), 162 deletions(-) diff --git a/front/current/services/project/project.service.ts b/front/current/services/project/project.service.ts index a7fb3aa..312a8e6 100644 --- a/front/current/services/project/project.service.ts +++ b/front/current/services/project/project.service.ts @@ -10,213 +10,213 @@ export class ProjectService { public states: any[] = [ { - name: 'Collect Forms'; - id: 03; - description: 'Collect 12 Months Utility Bills and 3 years of income. Fill out business section of PNS form.'; + name: 'Collect Forms', + id: 03, + description: 'Collect 12 Months Utility Bills and 3 years of income. Fill out business section of PNS form.', }, { - name: 'Create Oppurtunity'; - id: 04; - description: 'Create object on project dashboard with pending state. Create oppurnity on salesforce.'; + name: 'Create Oppurtunity', + id: 04, + description: 'Create object on project dashboard with pending state. Create oppurnity on salesforce.', }, { - name: 'Confirm Bill Validity'; - id: 05; - description: 'Quality Assurance check bills on dashboard are correct.'; + name: 'Confirm Bill Validity', + id: 05, + description: 'Quality Assurance check bills on dashboard are correct.', }, { - name: 'Confirm 3 yrs Income Validity'; - id: 06; - description: 'Finance does quality check on 3 yrs of INcome statemnets on dashboard.'; + name: 'Confirm 3 yrs Income Validity', + id: 06, + description: 'Finance does quality check on 3 yrs of INcome statemnets on dashboard.', }, { - name: 'Schedule Site Visit'; - id: 07; - description: 'Schedule site visit with client and project engineer.'; + name: 'Schedule Site Visit', + id: 07, + description: 'Schedule site visit with client and project engineer.', }, { - name: 'Perform Remote ASsessment'; - id: 08; - description: 'Project Engineers perform remote assement (Energy Watch) coding violations, google earth, heat load calculations'; + name: 'Perform Remote ASsessment', + id: 08, + description: 'Project Engineers perform remote assement (Energy Watch) coding violations, google earth, heat load calculations', }, { - name: 'Conduct Site Visit'; - id: 09; - description: 'Project Engineer conducts site visit audit. All data entry is complete by end of day. Sensors are installed'; + name: 'Conduct Site Visit', + id: 09, + description: 'Project Engineer conducts site visit audit. All data entry is complete by end of day. Sensors are installed', }, { - name: 'Complete Finance PNS'; - id: 10; - description: 'Finance will complete Finance section of PNS. This step does not have any dependencies. Must only be compelete one month post site visit'; + name: 'Complete Finance PNS', + id: 10, + description: 'Finance will complete Finance section of PNS. This step does not have any dependencies. Must only be compelete one month post site visit', }, { - name: 'Send PNS Form'; - id: 11; - description: 'Project Engineer sends client PNS Form'; - } + name: 'Send PNS Form', + id: 11, + description: 'Project Engineer sends client PNS Form', + }, { - name: 'Perform Initial Engineering Analysis'; - id: 12; - description: 'Project Engineer performs energy efficiency calculations for annual savings'; - } + name: 'Perform Initial Engineering Analysis', + id: 12, + description: 'Project Engineer performs energy efficiency calculations for annual savings', + }, { - name: 'Send Diagnostic Report'; - id: 13; - description: 'Project Engineer creates diagnostic report'; - } + name: 'Send Diagnostic Report', + id: 13, + description: 'Project Engineer creates diagnostic report', + }, { - name: 'Follw Up Post Project Update'; - id: 14; - description: 'Project Engineer contacts client to discover if client is interested in moving forward'; - } + name: 'Follw Up Post Project Update', + id: 14, + description: 'Project Engineer contacts client to discover if client is interested in moving forward', + }, { - name: 'Outsource Retrofit'; - id: 15; + name: 'Outsource Retrofit', + id: 15, description: 'Project Manager assesses potential outsourced retrofits (e.g. lighting and windows)' - } + }, { - name: 'HPD Finance'; - id: 16; - description: 'Finance discovers if HPD will finance the project'; - } + name: 'HPD Finance', + id: 16, + description: 'Finance discovers if HPD will finance the project', + }, { - name: 'Confirm Client wants HPD'; - id: 17; + name: 'Confirm Client wants HPD', + id: 17, description: 'Finance confirms client wants to proceed with HPD program' - } + }, { - name: 'Preliminary Financial Analysis'; - id: 18; - description: 'Run preliminary finance model and suggest budget range for Project Engineer'; - } + name: 'Preliminary Financial Analysis', + id: 18, + description: 'Run preliminary finance model and suggest budget range for Project Engineer', + }, { - name: 'Confirm Project Financing'; - id: 19; - description: 'Finance decides if project is feasible'; - } + name: 'Confirm Project Financing', + id: 19, + description: 'Finance decides if project is feasible', + }, { name: 'Perform Detailed Calculations and Analysis' - id: 20; - description: 'Project Engineer runs models (hydronic, steam, cooling, heating, controls)'; - } + id: 20, + description: 'Project Engineer runs models (hydronic, steam, cooling, heating, controls)', + }, { - name: 'Write Scope of Work Report'; - id: 21; - description: 'Project Engineer selects desired equipment for retrofits'; - } + name: 'Write Scope of Work Report', + id: 21, + description: 'Project Engineer selects desired equipment for retrofits', + }, { - name: 'Obtain Quotes'; - id: 22; - description: 'Project Manager bundles nearby projects together and sends equipment lists to contractor to collect quotes and look for violations'; - } + name: 'Obtain Quotes', + id: 22, + description: 'Project Manager bundles nearby projects together and sends equipment lists to contractor to collect quotes and look for violations', + }, { - name: 'Create Engineering Energy Output Model'; - id: 23; - description: 'Project Engineer generates Engineering Energy Output Model for suggested scenario'; - } + name: 'Create Engineering Energy Output Model', + id: 23, + description: 'Project Engineer generates Engineering Energy Output Model for suggested scenario', + }, { - name: 'Create Finance Model'; - id: 24; - description: 'Finance uses quotes and Engineering Output model to run Finance model for suggested scenario'; - } + name: 'Create Finance Model', + id: 24, + description: 'Finance uses quotes and Engineering Output model to run Finance model for suggested scenario', + }, { - name: 'Create Client Presentation'; - id: 25; - description: 'Project Engineer creates final presentation for various retrofit scenarios with upfront cost estimates and annual savings'; - } + name: 'Create Client Presentation', + id: 25, + description: 'Project Engineer creates final presentation for various retrofit scenarios with upfront cost estimates and annual savings', + }, { - name: 'Schedule Client Presentation'; - id: 26; - description: 'Project Manager coordinates with client, engineer, and finance/business to set up presentation date'; - } + name: 'Schedule Client Presentation', + id: 26, + description: 'Project Manager coordinates with client, engineer, and finance/business to set up presentation date', + }, { - name: 'Present to Client'; - id: 27; + name: 'Present to Client', + id: 27, description: 'Project Engineer presents retrofit scenarios - and financing options to client'; - } + and financing options to client', + }, { - name: 'Client Chooses Retrofits'; - id: 28; - description: 'Project Engineer contacts Client to determine which retrofits they want to proceed with'; - } + name: 'Client Chooses Retrofits', + id: 28, + description: 'Project Engineer contacts Client to determine which retrofits they want to proceed with', + }, { - name: 'Redesign Scope of Work'; - id: 29; - description: 'Project Engineer redesigns and finalizes scope of work'; - } + name: 'Redesign Scope of Work', + id: 29, + description: 'Project Engineer redesigns and finalizes scope of work', + }, { - name: 'Finalize Quotes'; - id: 30; - description: 'Project Engineer sends contractor Final Scope of Work and finalizes quotes. Contractor signs contract.'; - } + name: 'Finalize Quotes', + id: 30, + description: 'Project Engineer sends contractor Final Scope of Work and finalizes quotes. Contractor signs contract.', + }, + { + name: 'Final Finance Model' , + id: 31, + description: 'Finance runs the finance model to obtain actual costs inclduing payback years.', + }, + { + name: 'Update Client with Project Financing' , + id: 32 , + description: 'Finance contacts client to discuss financing options such as loans and marketplace.', + }, { - name: 'Final Finance Model' ; - id: 31; - description: 'Finance runs the finance model to obtain actual costs inclduing payback years.'; - } - { - name: 'Update Client with Project Financing' ; - id: 32 ; - description: 'Finance contacts client to discuss financing options such as loans and marketplace.'; - } - { - name: 'Client Decides on Marketplace' ; - id: 33 ; - description: 'Client decides if they want to use Marketplace.'; - } - { - name: 'Marketplace Content' ; - id: 34; - description: 'The Project content gets collected to prepare it for a Marketplace Launch.'; - } - { - name: 'Marketplace' ; - id: 35; - description: 'The Project is launched on the Marketplace and is being funded.'; - } - { - name: 'Contractor Downpayment' ; - id: 39; - description: 'A downpayment is payed to contractor.'; - } - { - name: 'Apply for Loan' ; - id: 40; - description: 'Finance appplies for loan.'; - } - { - name: 'Approval of Underwriter' ; - id: 41; - description: 'Finance is notified that the loan was approved by the Underwriter(banks)'; - } - { - name: 'Confirm Funding' ; - id: 42; - description: 'Finance confirms project is funded.'; - } - { - name: 'Commence Construction' ; - id: 43; - description: 'Construction Manager coordinates with client contractor, and engineers to schedule retrofit construction.'; - } - { - name: 'Measureent & Vertification' ; - id: 44; - description: 'Project Engineer collects sensor data during site visit recalibrates sensors, and reinstalls sensors for "post retrofit" measurement and vertification.'; - } - { - name: 'Loan Payback' ; - id: 45; - description: 'Loan is in the process of being paid back.'; - } + name: 'Client Decides on Marketplace' , + id: 33 , + description: 'Client decides if they want to use Marketplace.', + }, + { + name: 'Marketplace Content' , + id: 34, + description: 'The Project content gets collected to prepare it for a Marketplace Launch.', + }, + { + name: 'Marketplace' , + id: 35, + description: 'The Project is launched on the Marketplace and is being funded.', + }, + { + name: 'Contractor Downpayment' , + id: 39, + description: 'A downpayment is payed to contractor.', + }, + { + name: 'Apply for Loan' , + id: 40, + description: 'Finance appplies for loan.', + }, + { + name: 'Approval of Underwriter' , + id: 41, + description: 'Finance is notified that the loan was approved by the Underwriter(banks)', + }, + { + name: 'Confirm Funding' , + id: 42, + description: 'Finance confirms project is funded.', + }, + { + name: 'Commence Construction' , + id: 43, + description: 'Construction Manager coordinates with client contractor, and engineers to schedule retrofit construction.', + }, + { + name: 'Measureent & Vertification' , + id: 44, + description: 'Project Engineer collects sensor data during site visit recalibrates sensors, and reinstalls sensors for "post retrofit" measurement and vertification.', + }, + { + name: 'Loan Payback' , + id: 45, + description: 'Loan is in the process of being paid back.', + }, { name: 'Completed' - id: 46; + id: 46, description: 'Project is complete!' } ] getSalesForceUrl(model:Model) { - return '//na34.salesforce.com/' + model.data['sales_force_id'].substr(0, 15); + return '//na34.salesforce.com/' + model.data['sales_force_id'].substr(0, 15), }; }; -- GitLab From fa6ff8417828e6ecf01a3210e37eae09f80621ef Mon Sep 17 00:00:00 2001 From: Nadim Date: Mon, 13 Jun 2016 14:35:52 -0400 Subject: [PATCH 013/101] More syntax fixes --- front/current/services/project/project.service.ts | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/front/current/services/project/project.service.ts b/front/current/services/project/project.service.ts index 312a8e6..f4cedcb 100644 --- a/front/current/services/project/project.service.ts +++ b/front/current/services/project/project.service.ts @@ -95,7 +95,7 @@ export class ProjectService { description: 'Finance decides if project is feasible', }, { - name: 'Perform Detailed Calculations and Analysis' + name: 'Perform Detailed Calculations and Analysis', id: 20, description: 'Project Engineer runs models (hydronic, steam, cooling, heating, controls)', }, @@ -132,8 +132,7 @@ export class ProjectService { { name: 'Present to Client', id: 27, - description: 'Project Engineer presents retrofit scenarios - and financing options to client', + description: 'Project Engineer presents retrofit scenarios and financing options to client', }, { name: 'Client Chooses Retrofits', @@ -211,12 +210,12 @@ export class ProjectService { description: 'Loan is in the process of being paid back.', }, { - name: 'Completed' + name: 'Completed', id: 46, description: 'Project is complete!' } ] getSalesForceUrl(model:Model) { - return '//na34.salesforce.com/' + model.data['sales_force_id'].substr(0, 15), + return '//na34.salesforce.com/' + model.data['sales_force_id'].substr(0, 15); }; }; -- GitLab From ced1c1febef7f6407137749bed6fc0e829fc1f32 Mon Sep 17 00:00:00 2001 From: Calvin Quach Date: Mon, 13 Jun 2016 14:52:16 -0400 Subject: [PATCH 014/101] Comment out the state variable. Left comment about its purpose. --- front/current/components/project/slot.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/current/components/project/slot.component.ts b/front/current/components/project/slot.component.ts index d4c7827..8652b0b 100644 --- a/front/current/components/project/slot.component.ts +++ b/front/current/components/project/slot.component.ts @@ -22,7 +22,7 @@ export class SlotComponent { documents:Collection; parent_documents:Collection; parent_document_slots:Collection; - state:number; /* This number corresponds to the state ID in order to properly place each slot in the relevant state */ + /*state:any*/ /* state will be a complete state model*/ moment = moment; -- GitLab From e30146e510e4d65382e61a05b62a7b57f683b0ab Mon Sep 17 00:00:00 2001 From: Calvin Quach Date: Mon, 13 Jun 2016 14:52:51 -0400 Subject: [PATCH 015/101] Delete the leading zeros --- front/current/services/project/project.service.ts | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/front/current/services/project/project.service.ts b/front/current/services/project/project.service.ts index f4cedcb..a71812e 100644 --- a/front/current/services/project/project.service.ts +++ b/front/current/services/project/project.service.ts @@ -11,37 +11,37 @@ export class ProjectService { [ { name: 'Collect Forms', - id: 03, + id: 3, description: 'Collect 12 Months Utility Bills and 3 years of income. Fill out business section of PNS form.', }, { name: 'Create Oppurtunity', - id: 04, + id: 4, description: 'Create object on project dashboard with pending state. Create oppurnity on salesforce.', }, { name: 'Confirm Bill Validity', - id: 05, + id: 5, description: 'Quality Assurance check bills on dashboard are correct.', }, { name: 'Confirm 3 yrs Income Validity', - id: 06, + id: 6, description: 'Finance does quality check on 3 yrs of INcome statemnets on dashboard.', }, { name: 'Schedule Site Visit', - id: 07, + id: 7, description: 'Schedule site visit with client and project engineer.', }, { name: 'Perform Remote ASsessment', - id: 08, + id: 8, description: 'Project Engineers perform remote assement (Energy Watch) coding violations, google earth, heat load calculations', }, { name: 'Conduct Site Visit', - id: 09, + id: 9, description: 'Project Engineer conducts site visit audit. All data entry is complete by end of day. Sensors are installed', }, { -- GitLab From 5a981a9dee0592ef51f231b30c90aca81db575ed Mon Sep 17 00:00:00 2001 From: Calvin Quach Date: Mon, 13 Jun 2016 15:15:56 -0400 Subject: [PATCH 016/101] Fix spelling and add missing periods --- .../services/project/project.service.ts | 58 +++++++++---------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/front/current/services/project/project.service.ts b/front/current/services/project/project.service.ts index a71812e..5b1ee3f 100644 --- a/front/current/services/project/project.service.ts +++ b/front/current/services/project/project.service.ts @@ -12,7 +12,7 @@ export class ProjectService { { name: 'Collect Forms', id: 3, - description: 'Collect 12 Months Utility Bills and 3 years of income. Fill out business section of PNS form.', + description: 'Collect 12 Months of Utility Bills and 3 years of Income. Fill out business section of PNS form.', }, { name: 'Create Oppurtunity', @@ -25,9 +25,9 @@ export class ProjectService { description: 'Quality Assurance check bills on dashboard are correct.', }, { - name: 'Confirm 3 yrs Income Validity', + name: 'Confirm Validity of 3 Years of Income statements ', id: 6, - description: 'Finance does quality check on 3 yrs of INcome statemnets on dashboard.', + description: 'Finance does quality check on 3 years of Income statemnets on dashboard.', }, { name: 'Schedule Site Visit', @@ -35,114 +35,114 @@ export class ProjectService { description: 'Schedule site visit with client and project engineer.', }, { - name: 'Perform Remote ASsessment', + name: 'Perform Remote Assessment', id: 8, - description: 'Project Engineers perform remote assement (Energy Watch) coding violations, google earth, heat load calculations', + description: 'Project Engineers perform remote assessment (Energy Watch, coding violations, Google Earth, heat load calculations).', }, { name: 'Conduct Site Visit', id: 9, - description: 'Project Engineer conducts site visit audit. All data entry is complete by end of day. Sensors are installed', + description: 'Project Engineer conducts site visit audit. All data entry is complete by end of day. Sensors are installed.', }, { name: 'Complete Finance PNS', id: 10, - description: 'Finance will complete Finance section of PNS. This step does not have any dependencies. Must only be compelete one month post site visit', + description: 'Complete Finance section of the PNS Form. This step does not have any dependencies. Must only be compelete one month post site visit.', }, { name: 'Send PNS Form', id: 11, - description: 'Project Engineer sends client PNS Form', + description: 'Project Engineer sends client PNS Form.', }, { name: 'Perform Initial Engineering Analysis', id: 12, - description: 'Project Engineer performs energy efficiency calculations for annual savings', + description: 'Project Engineer performs energy efficiency calculations for annual savings.', }, { name: 'Send Diagnostic Report', id: 13, - description: 'Project Engineer creates diagnostic report', + description: 'Project Engineer creates diagnostic report.', }, { name: 'Follw Up Post Project Update', id: 14, - description: 'Project Engineer contacts client to discover if client is interested in moving forward', + description: 'Project Engineer contacts client to discover if client is interested in moving forward.', }, { name: 'Outsource Retrofit', id: 15, - description: 'Project Manager assesses potential outsourced retrofits (e.g. lighting and windows)' + description: 'Project Manager assesses potential outsourced retrofits (e.g. lighting and windows).' }, { name: 'HPD Finance', id: 16, - description: 'Finance discovers if HPD will finance the project', + description: 'Finance discovers if HPD will finance the project.', }, { name: 'Confirm Client wants HPD', id: 17, - description: 'Finance confirms client wants to proceed with HPD program' + description: 'Finance confirms client wants to proceed with HPD program.' }, { name: 'Preliminary Financial Analysis', id: 18, - description: 'Run preliminary finance model and suggest budget range for Project Engineer', + description: 'Run preliminary finance model and suggest budget range for Project Engineer.', }, { name: 'Confirm Project Financing', id: 19, - description: 'Finance decides if project is feasible', + description: 'Finance decides if project is feasible.', }, { name: 'Perform Detailed Calculations and Analysis', id: 20, - description: 'Project Engineer runs models (hydronic, steam, cooling, heating, controls)', + description: 'Project Engineer runs models (hydronic, steam, cooling, heating, controls).', }, { name: 'Write Scope of Work Report', id: 21, - description: 'Project Engineer selects desired equipment for retrofits', + description: 'Project Engineer selects desired equipment for retrofits.', }, { name: 'Obtain Quotes', id: 22, - description: 'Project Manager bundles nearby projects together and sends equipment lists to contractor to collect quotes and look for violations', + description: 'Project Manager bundles nearby projects together and sends equipment lists to contractor to collect quotes and look for violations.', }, { name: 'Create Engineering Energy Output Model', id: 23, - description: 'Project Engineer generates Engineering Energy Output Model for suggested scenario', + description: 'Project Engineer generates Engineering Energy Output Model for suggested scenario.', }, { name: 'Create Finance Model', id: 24, - description: 'Finance uses quotes and Engineering Output model to run Finance model for suggested scenario', + description: 'Finance uses quotes and Engineering Output model to run Finance model for suggested scenario.', }, { name: 'Create Client Presentation', id: 25, - description: 'Project Engineer creates final presentation for various retrofit scenarios with upfront cost estimates and annual savings', + description: 'Project Engineer creates final presentation for various retrofit scenarios with upfront cost estimates and annual savings.', }, { name: 'Schedule Client Presentation', id: 26, - description: 'Project Manager coordinates with client, engineer, and finance/business to set up presentation date', + description: 'Project Manager coordinates with client, engineer, and finance/business to set up presentation date.', }, { name: 'Present to Client', id: 27, - description: 'Project Engineer presents retrofit scenarios and financing options to client', + description: 'Project Engineer presents retrofit scenarios and financing options to client.', }, { name: 'Client Chooses Retrofits', id: 28, - description: 'Project Engineer contacts Client to determine which retrofits they want to proceed with', + description: 'Project Engineer contacts Client to determine which retrofits they want to proceed with.', }, { name: 'Redesign Scope of Work', id: 29, - description: 'Project Engineer redesigns and finalizes scope of work', + description: 'Project Engineer redesigns and finalizes scope of work.', }, { name: 'Finalize Quotes', @@ -187,7 +187,7 @@ export class ProjectService { { name: 'Approval of Underwriter' , id: 41, - description: 'Finance is notified that the loan was approved by the Underwriter(banks)', + description: 'Finance is notified that the loan was approved by the Underwriter (banks).', }, { name: 'Confirm Funding' , @@ -200,9 +200,9 @@ export class ProjectService { description: 'Construction Manager coordinates with client contractor, and engineers to schedule retrofit construction.', }, { - name: 'Measureent & Vertification' , + name: 'Measurement & Vertification' , id: 44, - description: 'Project Engineer collects sensor data during site visit recalibrates sensors, and reinstalls sensors for "post retrofit" measurement and vertification.', + description: 'Project Engineer collects sensor data during site visit, recalibrates sensors, and reinstalls sensors for "post retrofit" measurement and vertification.', }, { name: 'Loan Payback' , -- GitLab From fcb0d1acf9f6fcf966f8691b0bc87c2624726fb6 Mon Sep 17 00:00:00 2001 From: Calvin Quach Date: Mon, 13 Jun 2016 15:51:25 -0400 Subject: [PATCH 017/101] Fix grammar, spelling, and punctuation. --- .../services/project/project.service.ts | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/front/current/services/project/project.service.ts b/front/current/services/project/project.service.ts index 5b1ee3f..d15b45f 100644 --- a/front/current/services/project/project.service.ts +++ b/front/current/services/project/project.service.ts @@ -15,9 +15,9 @@ export class ProjectService { description: 'Collect 12 Months of Utility Bills and 3 years of Income. Fill out business section of PNS form.', }, { - name: 'Create Oppurtunity', + name: 'Create Opportunity', id: 4, - description: 'Create object on project dashboard with pending state. Create oppurnity on salesforce.', + description: 'Create object on project dashboard with pending state. Create opportunity on salesforce.', }, { name: 'Confirm Bill Validity', @@ -25,9 +25,9 @@ export class ProjectService { description: 'Quality Assurance check bills on dashboard are correct.', }, { - name: 'Confirm Validity of 3 Years of Income statements ', + name: 'Confirm Validity of 3 Years of Income Statements ', id: 6, - description: 'Finance does quality check on 3 years of Income statemnets on dashboard.', + description: 'Finance does quality check on 3 Years of Income Statements on dashboard.', }, { name: 'Schedule Site Visit', @@ -37,17 +37,17 @@ export class ProjectService { { name: 'Perform Remote Assessment', id: 8, - description: 'Project Engineers perform remote assessment (Energy Watch, coding violations, Google Earth, heat load calculations).', + description: 'Project Engineers perform remote assessment (Energy Watch, Code violations, Google Earth, Heat Load Calculations).', }, { name: 'Conduct Site Visit', id: 9, - description: 'Project Engineer conducts site visit audit. All data entry is complete by end of day. Sensors are installed.', + description: 'Project Engineer conducts site visit audit. All data entry is complete. Sensors are installed.', }, { name: 'Complete Finance PNS', id: 10, - description: 'Complete Finance section of the PNS Form. This step does not have any dependencies. Must only be compelete one month post site visit.', + description: 'Complete Finance section of the PNS Form. This step does not have any dependencies. Must only be complete one month post site visit.', }, { name: 'Send PNS Form', @@ -65,7 +65,7 @@ export class ProjectService { description: 'Project Engineer creates diagnostic report.', }, { - name: 'Follw Up Post Project Update', + name: 'Follow Up Post Project Update', id: 14, description: 'Project Engineer contacts client to discover if client is interested in moving forward.', }, @@ -112,12 +112,12 @@ export class ProjectService { { name: 'Create Engineering Energy Output Model', id: 23, - description: 'Project Engineer generates Engineering Energy Output Model for suggested scenario.', + description: 'Project Engineer generates Engineering Output Model for suggested scenario.', }, { name: 'Create Finance Model', id: 24, - description: 'Finance uses quotes and Engineering Output model to run Finance model for suggested scenario.', + description: 'Finance uses quotes and Engineering Output Model to run Finance model for suggested scenario.', }, { name: 'Create Client Presentation', @@ -137,7 +137,7 @@ export class ProjectService { { name: 'Client Chooses Retrofits', id: 28, - description: 'Project Engineer contacts Client to determine which retrofits they want to proceed with.', + description: 'Project Engineer contacts Client to determine actionable retrofits. ', }, { name: 'Redesign Scope of Work', @@ -200,9 +200,9 @@ export class ProjectService { description: 'Construction Manager coordinates with client contractor, and engineers to schedule retrofit construction.', }, { - name: 'Measurement & Vertification' , + name: 'Measurement and Verification' , id: 44, - description: 'Project Engineer collects sensor data during site visit, recalibrates sensors, and reinstalls sensors for "post retrofit" measurement and vertification.', + description: 'Project Engineer collects sensor data during site visit, recalibrates sensors, and reinstalls sensors for "post retrofit" measurement and verification.', }, { name: 'Loan Payback' , -- GitLab From 1b66cc6af0a76197b32b7289ba2ee3778be190c7 Mon Sep 17 00:00:00 2001 From: Calvin Quach Date: Mon, 13 Jun 2016 16:11:38 -0400 Subject: [PATCH 018/101] Change check to checks and fix capitalization for Code violations --- front/current/services/project/project.service.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/front/current/services/project/project.service.ts b/front/current/services/project/project.service.ts index d15b45f..3ade946 100644 --- a/front/current/services/project/project.service.ts +++ b/front/current/services/project/project.service.ts @@ -22,7 +22,7 @@ export class ProjectService { { name: 'Confirm Bill Validity', id: 5, - description: 'Quality Assurance check bills on dashboard are correct.', + description: 'Quality Assurance checks bills on dashboard are correct.', }, { name: 'Confirm Validity of 3 Years of Income Statements ', @@ -37,7 +37,7 @@ export class ProjectService { { name: 'Perform Remote Assessment', id: 8, - description: 'Project Engineers perform remote assessment (Energy Watch, Code violations, Google Earth, Heat Load Calculations).', + description: 'Project Engineers perform remote assessment (Energy Watch, Code Violations, Google Earth, Heat Load Calculations).', }, { name: 'Conduct Site Visit', -- GitLab From 78bd8376a7e6129a3dda9c3f799d5b077cba2e08 Mon Sep 17 00:00:00 2001 From: Nadim Date: Mon, 13 Jun 2016 17:05:33 -0400 Subject: [PATCH 019/101] Create html and ts files for state component in order to start developing the single state display for the dashboard. The component that encompasses several states will be called states component instead (similar to slot component vs slots component) --- .../components/project/state.component.html | 3 +++ .../current/components/project/state.component.ts | 14 ++++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 front/current/components/project/state.component.html create mode 100644 front/current/components/project/state.component.ts diff --git a/front/current/components/project/state.component.html b/front/current/components/project/state.component.html new file mode 100644 index 0000000..025786a --- /dev/null +++ b/front/current/components/project/state.component.html @@ -0,0 +1,3 @@ +

{{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 new file mode 100644 index 0000000..957c943 --- /dev/null +++ b/front/current/components/project/state.component.ts @@ -0,0 +1,14 @@ +import { Component } from 'angular2/core'; +import { config } from '../../config'; + +@Component({ + templateUrl: './state.component.html' + +}) + +export class StateComponent{ + name: string; + id: number; + description: string; + +} \ No newline at end of file -- GitLab From ed3bec62dfabaac7f3972279426884003227f34a Mon Sep 17 00:00:00 2001 From: Nadim Date: Tue, 14 Jun 2016 14:23:02 -0400 Subject: [PATCH 020/101] Add Walker template to state componnet html file. Add input array and change the class variables to public in state component class definition --- .../components/project/state.component.html | 20 +++++++++++++++++-- .../components/project/state.component.ts | 15 +++++++------- 2 files changed, 26 insertions(+), 9 deletions(-) diff --git a/front/current/components/project/state.component.html b/front/current/components/project/state.component.html index 025786a..f471a2b 100644 --- a/front/current/components/project/state.component.html +++ b/front/current/components/project/state.component.html @@ -1,3 +1,19 @@ -

{{state.name}}

+ -

{{state.description}}

\ No newline at end of file +
+ +

This project is still in pending state

+ +
+ +

Documents

+ +

SCEEP Form

+ +

Upload document

+ + + +
diff --git a/front/current/components/project/state.component.ts b/front/current/components/project/state.component.ts index 957c943..fe450cc 100644 --- a/front/current/components/project/state.component.ts +++ b/front/current/components/project/state.component.ts @@ -1,14 +1,15 @@ import { Component } from 'angular2/core'; import { config } from '../../config'; -@Component({ - templateUrl: './state.component.html' +@Component({ + selector: 'state', + templateUrl: config.static_url + '/components/project/state.component.html', + inputs: ['name', 'id', 'description'] }) export class StateComponent{ - name: string; - id: number; - description: string; - -} \ No newline at end of file + public name: string; + public id: number; + public description: string; +} -- GitLab From e4309c69587795e3abfeb1ab11260769e87f1c5d Mon Sep 17 00:00:00 2001 From: Calvin Quach Date: Tue, 14 Jun 2016 15:05:03 -0400 Subject: [PATCH 021/101] Change name to title and id to stateid because name and id are keywords --- .../services/project/project.service.ts | 174 +++++++++--------- 1 file changed, 87 insertions(+), 87 deletions(-) diff --git a/front/current/services/project/project.service.ts b/front/current/services/project/project.service.ts index 3ade946..679f9fb 100644 --- a/front/current/services/project/project.service.ts +++ b/front/current/services/project/project.service.ts @@ -4,218 +4,218 @@ import { Model } from '../rest.service'; @Injectable() export class ProjectService { - public service_name:string = 'project'; + public service_title:string = 'project'; public config:any = config.SERVICES.project; public url:string = '/project/'; public states: any[] = [ { - name: 'Collect Forms', - id: 3, + title: 'Collect Forms', + stageid: 3, description: 'Collect 12 Months of Utility Bills and 3 years of Income. Fill out business section of PNS form.', }, { - name: 'Create Opportunity', - id: 4, + title: 'Create Opportunity', + stageid: 4, description: 'Create object on project dashboard with pending state. Create opportunity on salesforce.', }, { - name: 'Confirm Bill Validity', - id: 5, + title: 'Confirm Bill Valstageidity', + stageid: 5, description: 'Quality Assurance checks bills on dashboard are correct.', }, { - name: 'Confirm Validity of 3 Years of Income Statements ', - id: 6, + title: 'Confirm Valstageidity of 3 Years of Income Statements ', + stageid: 6, description: 'Finance does quality check on 3 Years of Income Statements on dashboard.', }, { - name: 'Schedule Site Visit', - id: 7, + title: 'Schedule Site Visit', + stageid: 7, description: 'Schedule site visit with client and project engineer.', }, { - name: 'Perform Remote Assessment', - id: 8, + title: 'Perform Remote Assessment', + stageid: 8, description: 'Project Engineers perform remote assessment (Energy Watch, Code Violations, Google Earth, Heat Load Calculations).', }, { - name: 'Conduct Site Visit', - id: 9, + title: 'Conduct Site Visit', + stageid: 9, description: 'Project Engineer conducts site visit audit. All data entry is complete. Sensors are installed.', }, { - name: 'Complete Finance PNS', - id: 10, + title: 'Complete Finance PNS', + stageid: 10, description: 'Complete Finance section of the PNS Form. This step does not have any dependencies. Must only be complete one month post site visit.', }, { - name: 'Send PNS Form', - id: 11, + title: 'Send PNS Form', + stageid: 11, description: 'Project Engineer sends client PNS Form.', }, { - name: 'Perform Initial Engineering Analysis', - id: 12, + title: 'Perform Initial Engineering Analysis', + stageid: 12, description: 'Project Engineer performs energy efficiency calculations for annual savings.', }, { - name: 'Send Diagnostic Report', - id: 13, + title: 'Send Diagnostic Report', + stageid: 13, description: 'Project Engineer creates diagnostic report.', }, { - name: 'Follow Up Post Project Update', - id: 14, + title: 'Follow Up Post Project Update', + stageid: 14, description: 'Project Engineer contacts client to discover if client is interested in moving forward.', }, { - name: 'Outsource Retrofit', - id: 15, + title: 'Outsource Retrofit', + stageid: 15, description: 'Project Manager assesses potential outsourced retrofits (e.g. lighting and windows).' }, { - name: 'HPD Finance', - id: 16, + title: 'HPD Finance', + stageid: 16, description: 'Finance discovers if HPD will finance the project.', }, { - name: 'Confirm Client wants HPD', - id: 17, + title: 'Confirm Client wants HPD', + stageid: 17, description: 'Finance confirms client wants to proceed with HPD program.' }, { - name: 'Preliminary Financial Analysis', - id: 18, + title: 'Preliminary Financial Analysis', + stageid: 18, description: 'Run preliminary finance model and suggest budget range for Project Engineer.', }, { - name: 'Confirm Project Financing', - id: 19, - description: 'Finance decides if project is feasible.', + title: 'Confirm Project Financing', + stageid: 19, + description: 'Finance decstageides if project is feasible.', }, { - name: 'Perform Detailed Calculations and Analysis', - id: 20, + title: 'Perform Detailed Calculations and Analysis', + stageid: 20, description: 'Project Engineer runs models (hydronic, steam, cooling, heating, controls).', }, { - name: 'Write Scope of Work Report', - id: 21, + title: 'Write Scope of Work Report', + stageid: 21, description: 'Project Engineer selects desired equipment for retrofits.', }, { - name: 'Obtain Quotes', - id: 22, + title: 'Obtain Quotes', + stageid: 22, description: 'Project Manager bundles nearby projects together and sends equipment lists to contractor to collect quotes and look for violations.', }, { - name: 'Create Engineering Energy Output Model', - id: 23, + title: 'Create Engineering Energy Output Model', + stageid: 23, description: 'Project Engineer generates Engineering Output Model for suggested scenario.', }, { - name: 'Create Finance Model', - id: 24, + title: 'Create Finance Model', + stageid: 24, description: 'Finance uses quotes and Engineering Output Model to run Finance model for suggested scenario.', }, { - name: 'Create Client Presentation', - id: 25, + title: 'Create Client Presentation', + stageid: 25, description: 'Project Engineer creates final presentation for various retrofit scenarios with upfront cost estimates and annual savings.', }, { - name: 'Schedule Client Presentation', - id: 26, + title: 'Schedule Client Presentation', + stageid: 26, description: 'Project Manager coordinates with client, engineer, and finance/business to set up presentation date.', }, { - name: 'Present to Client', - id: 27, + title: 'Present to Client', + stageid: 27, description: 'Project Engineer presents retrofit scenarios and financing options to client.', }, { - name: 'Client Chooses Retrofits', - id: 28, + title: 'Client Chooses Retrofits', + stageid: 28, description: 'Project Engineer contacts Client to determine actionable retrofits. ', }, { - name: 'Redesign Scope of Work', - id: 29, + title: 'Redesign Scope of Work', + stageid: 29, description: 'Project Engineer redesigns and finalizes scope of work.', }, { - name: 'Finalize Quotes', - id: 30, + title: 'Finalize Quotes', + stageid: 30, description: 'Project Engineer sends contractor Final Scope of Work and finalizes quotes. Contractor signs contract.', }, { - name: 'Final Finance Model' , - id: 31, + title: 'Final Finance Model' , + stageid: 31, description: 'Finance runs the finance model to obtain actual costs inclduing payback years.', }, { - name: 'Update Client with Project Financing' , - id: 32 , + title: 'Update Client with Project Financing' , + stageid: 32 , description: 'Finance contacts client to discuss financing options such as loans and marketplace.', }, { - name: 'Client Decides on Marketplace' , - id: 33 , - description: 'Client decides if they want to use Marketplace.', + title: 'Client Decstageides on Marketplace' , + stageid: 33 , + description: 'Client decstageides if they want to use Marketplace.', }, { - name: 'Marketplace Content' , - id: 34, + title: 'Marketplace Content' , + stageid: 34, description: 'The Project content gets collected to prepare it for a Marketplace Launch.', }, { - name: 'Marketplace' , - id: 35, + title: 'Marketplace' , + stageid: 35, description: 'The Project is launched on the Marketplace and is being funded.', }, { - name: 'Contractor Downpayment' , - id: 39, + title: 'Contractor Downpayment' , + stageid: 39, description: 'A downpayment is payed to contractor.', }, { - name: 'Apply for Loan' , - id: 40, + title: 'Apply for Loan' , + stageid: 40, description: 'Finance appplies for loan.', }, { - name: 'Approval of Underwriter' , - id: 41, + title: 'Approval of Underwriter' , + stageid: 41, description: 'Finance is notified that the loan was approved by the Underwriter (banks).', }, { - name: 'Confirm Funding' , - id: 42, + title: 'Confirm Funding' , + stageid: 42, description: 'Finance confirms project is funded.', }, { - name: 'Commence Construction' , - id: 43, + title: 'Commence Construction' , + stageid: 43, description: 'Construction Manager coordinates with client contractor, and engineers to schedule retrofit construction.', }, { - name: 'Measurement and Verification' , - id: 44, + title: 'Measurement and Verification' , + stageid: 44, description: 'Project Engineer collects sensor data during site visit, recalibrates sensors, and reinstalls sensors for "post retrofit" measurement and verification.', }, { - name: 'Loan Payback' , - id: 45, - description: 'Loan is in the process of being paid back.', + title: 'Loan Payback' , + stageid: 45, + description: 'Loan is in the process of being pastageid back.', }, { - name: 'Completed', - id: 46, + title: 'Completed', + stageid: 46, description: 'Project is complete!' } ] getSalesForceUrl(model:Model) { - return '//na34.salesforce.com/' + model.data['sales_force_id'].substr(0, 15); + return '//na34.salesforce.com/' + model.data['sales_force_stageid'].substr(0, 15); }; }; -- GitLab From b66520526a2b6f4bd4e5c6d26931a30beeb76cf5 Mon Sep 17 00:00:00 2001 From: Calvin Quach Date: Tue, 14 Jun 2016 15:09:39 -0400 Subject: [PATCH 022/101] Revert "Change name to title and id to stateid because name and id are keywords" This reverts commit e4309c69587795e3abfeb1ab11260769e87f1c5d. --- .../services/project/project.service.ts | 174 +++++++++--------- 1 file changed, 87 insertions(+), 87 deletions(-) diff --git a/front/current/services/project/project.service.ts b/front/current/services/project/project.service.ts index 679f9fb..3ade946 100644 --- a/front/current/services/project/project.service.ts +++ b/front/current/services/project/project.service.ts @@ -4,218 +4,218 @@ import { Model } from '../rest.service'; @Injectable() export class ProjectService { - public service_title:string = 'project'; + public service_name:string = 'project'; public config:any = config.SERVICES.project; public url:string = '/project/'; public states: any[] = [ { - title: 'Collect Forms', - stageid: 3, + name: 'Collect Forms', + id: 3, description: 'Collect 12 Months of Utility Bills and 3 years of Income. Fill out business section of PNS form.', }, { - title: 'Create Opportunity', - stageid: 4, + name: 'Create Opportunity', + id: 4, description: 'Create object on project dashboard with pending state. Create opportunity on salesforce.', }, { - title: 'Confirm Bill Valstageidity', - stageid: 5, + name: 'Confirm Bill Validity', + id: 5, description: 'Quality Assurance checks bills on dashboard are correct.', }, { - title: 'Confirm Valstageidity of 3 Years of Income Statements ', - stageid: 6, + name: 'Confirm Validity of 3 Years of Income Statements ', + id: 6, description: 'Finance does quality check on 3 Years of Income Statements on dashboard.', }, { - title: 'Schedule Site Visit', - stageid: 7, + name: 'Schedule Site Visit', + id: 7, description: 'Schedule site visit with client and project engineer.', }, { - title: 'Perform Remote Assessment', - stageid: 8, + name: 'Perform Remote Assessment', + id: 8, description: 'Project Engineers perform remote assessment (Energy Watch, Code Violations, Google Earth, Heat Load Calculations).', }, { - title: 'Conduct Site Visit', - stageid: 9, + name: 'Conduct Site Visit', + id: 9, description: 'Project Engineer conducts site visit audit. All data entry is complete. Sensors are installed.', }, { - title: 'Complete Finance PNS', - stageid: 10, + name: 'Complete Finance PNS', + id: 10, description: 'Complete Finance section of the PNS Form. This step does not have any dependencies. Must only be complete one month post site visit.', }, { - title: 'Send PNS Form', - stageid: 11, + name: 'Send PNS Form', + id: 11, description: 'Project Engineer sends client PNS Form.', }, { - title: 'Perform Initial Engineering Analysis', - stageid: 12, + name: 'Perform Initial Engineering Analysis', + id: 12, description: 'Project Engineer performs energy efficiency calculations for annual savings.', }, { - title: 'Send Diagnostic Report', - stageid: 13, + name: 'Send Diagnostic Report', + id: 13, description: 'Project Engineer creates diagnostic report.', }, { - title: 'Follow Up Post Project Update', - stageid: 14, + name: 'Follow Up Post Project Update', + id: 14, description: 'Project Engineer contacts client to discover if client is interested in moving forward.', }, { - title: 'Outsource Retrofit', - stageid: 15, + name: 'Outsource Retrofit', + id: 15, description: 'Project Manager assesses potential outsourced retrofits (e.g. lighting and windows).' }, { - title: 'HPD Finance', - stageid: 16, + name: 'HPD Finance', + id: 16, description: 'Finance discovers if HPD will finance the project.', }, { - title: 'Confirm Client wants HPD', - stageid: 17, + name: 'Confirm Client wants HPD', + id: 17, description: 'Finance confirms client wants to proceed with HPD program.' }, { - title: 'Preliminary Financial Analysis', - stageid: 18, + name: 'Preliminary Financial Analysis', + id: 18, description: 'Run preliminary finance model and suggest budget range for Project Engineer.', }, { - title: 'Confirm Project Financing', - stageid: 19, - description: 'Finance decstageides if project is feasible.', + name: 'Confirm Project Financing', + id: 19, + description: 'Finance decides if project is feasible.', }, { - title: 'Perform Detailed Calculations and Analysis', - stageid: 20, + name: 'Perform Detailed Calculations and Analysis', + id: 20, description: 'Project Engineer runs models (hydronic, steam, cooling, heating, controls).', }, { - title: 'Write Scope of Work Report', - stageid: 21, + name: 'Write Scope of Work Report', + id: 21, description: 'Project Engineer selects desired equipment for retrofits.', }, { - title: 'Obtain Quotes', - stageid: 22, + name: 'Obtain Quotes', + id: 22, description: 'Project Manager bundles nearby projects together and sends equipment lists to contractor to collect quotes and look for violations.', }, { - title: 'Create Engineering Energy Output Model', - stageid: 23, + name: 'Create Engineering Energy Output Model', + id: 23, description: 'Project Engineer generates Engineering Output Model for suggested scenario.', }, { - title: 'Create Finance Model', - stageid: 24, + name: 'Create Finance Model', + id: 24, description: 'Finance uses quotes and Engineering Output Model to run Finance model for suggested scenario.', }, { - title: 'Create Client Presentation', - stageid: 25, + name: 'Create Client Presentation', + id: 25, description: 'Project Engineer creates final presentation for various retrofit scenarios with upfront cost estimates and annual savings.', }, { - title: 'Schedule Client Presentation', - stageid: 26, + name: 'Schedule Client Presentation', + id: 26, description: 'Project Manager coordinates with client, engineer, and finance/business to set up presentation date.', }, { - title: 'Present to Client', - stageid: 27, + name: 'Present to Client', + id: 27, description: 'Project Engineer presents retrofit scenarios and financing options to client.', }, { - title: 'Client Chooses Retrofits', - stageid: 28, + name: 'Client Chooses Retrofits', + id: 28, description: 'Project Engineer contacts Client to determine actionable retrofits. ', }, { - title: 'Redesign Scope of Work', - stageid: 29, + name: 'Redesign Scope of Work', + id: 29, description: 'Project Engineer redesigns and finalizes scope of work.', }, { - title: 'Finalize Quotes', - stageid: 30, + name: 'Finalize Quotes', + id: 30, description: 'Project Engineer sends contractor Final Scope of Work and finalizes quotes. Contractor signs contract.', }, { - title: 'Final Finance Model' , - stageid: 31, + name: 'Final Finance Model' , + id: 31, description: 'Finance runs the finance model to obtain actual costs inclduing payback years.', }, { - title: 'Update Client with Project Financing' , - stageid: 32 , + name: 'Update Client with Project Financing' , + id: 32 , description: 'Finance contacts client to discuss financing options such as loans and marketplace.', }, { - title: 'Client Decstageides on Marketplace' , - stageid: 33 , - description: 'Client decstageides if they want to use Marketplace.', + name: 'Client Decides on Marketplace' , + id: 33 , + description: 'Client decides if they want to use Marketplace.', }, { - title: 'Marketplace Content' , - stageid: 34, + name: 'Marketplace Content' , + id: 34, description: 'The Project content gets collected to prepare it for a Marketplace Launch.', }, { - title: 'Marketplace' , - stageid: 35, + name: 'Marketplace' , + id: 35, description: 'The Project is launched on the Marketplace and is being funded.', }, { - title: 'Contractor Downpayment' , - stageid: 39, + name: 'Contractor Downpayment' , + id: 39, description: 'A downpayment is payed to contractor.', }, { - title: 'Apply for Loan' , - stageid: 40, + name: 'Apply for Loan' , + id: 40, description: 'Finance appplies for loan.', }, { - title: 'Approval of Underwriter' , - stageid: 41, + name: 'Approval of Underwriter' , + id: 41, description: 'Finance is notified that the loan was approved by the Underwriter (banks).', }, { - title: 'Confirm Funding' , - stageid: 42, + name: 'Confirm Funding' , + id: 42, description: 'Finance confirms project is funded.', }, { - title: 'Commence Construction' , - stageid: 43, + name: 'Commence Construction' , + id: 43, description: 'Construction Manager coordinates with client contractor, and engineers to schedule retrofit construction.', }, { - title: 'Measurement and Verification' , - stageid: 44, + name: 'Measurement and Verification' , + id: 44, description: 'Project Engineer collects sensor data during site visit, recalibrates sensors, and reinstalls sensors for "post retrofit" measurement and verification.', }, { - title: 'Loan Payback' , - stageid: 45, - description: 'Loan is in the process of being pastageid back.', + name: 'Loan Payback' , + id: 45, + description: 'Loan is in the process of being paid back.', }, { - title: 'Completed', - stageid: 46, + name: 'Completed', + id: 46, description: 'Project is complete!' } ] getSalesForceUrl(model:Model) { - return '//na34.salesforce.com/' + model.data['sales_force_stageid'].substr(0, 15); + return '//na34.salesforce.com/' + model.data['sales_force_id'].substr(0, 15); }; }; -- GitLab From 5598e4486b21e37fab4c93d647246d4ddad597bb Mon Sep 17 00:00:00 2001 From: Calvin Quach Date: Tue, 14 Jun 2016 15:13:17 -0400 Subject: [PATCH 023/101] Change name to state_title and id to state_id because name and id are keywords --- .../services/project/project.service.ts | 166 +++++++++--------- 1 file changed, 83 insertions(+), 83 deletions(-) diff --git a/front/current/services/project/project.service.ts b/front/current/services/project/project.service.ts index 3ade946..c6269bd 100644 --- a/front/current/services/project/project.service.ts +++ b/front/current/services/project/project.service.ts @@ -4,214 +4,214 @@ import { Model } from '../rest.service'; @Injectable() export class ProjectService { - public service_name:string = 'project'; + public service_state_title:string = 'project'; public config:any = config.SERVICES.project; public url:string = '/project/'; public states: any[] = [ { - name: 'Collect Forms', - id: 3, + state_title: 'Collect Forms', + state_id: 3, description: 'Collect 12 Months of Utility Bills and 3 years of Income. Fill out business section of PNS form.', }, { - name: 'Create Opportunity', - id: 4, + state_title: 'Create Opportunity', + state_id: 4, description: 'Create object on project dashboard with pending state. Create opportunity on salesforce.', }, { - name: 'Confirm Bill Validity', - id: 5, + state_title: 'Confirm Bill Validity', + state_id: 5, description: 'Quality Assurance checks bills on dashboard are correct.', }, { - name: 'Confirm Validity of 3 Years of Income Statements ', - id: 6, + state_title: 'Confirm Validity of 3 Years of Income Statements ', + state_id: 6, description: 'Finance does quality check on 3 Years of Income Statements on dashboard.', }, { - name: 'Schedule Site Visit', - id: 7, + state_title: 'Schedule Site Visit', + state_id: 7, description: 'Schedule site visit with client and project engineer.', }, { - name: 'Perform Remote Assessment', - id: 8, + state_title: 'Perform Remote Assessment', + state_id: 8, description: 'Project Engineers perform remote assessment (Energy Watch, Code Violations, Google Earth, Heat Load Calculations).', }, { - name: 'Conduct Site Visit', - id: 9, + state_title: 'Conduct Site Visit', + state_id: 9, description: 'Project Engineer conducts site visit audit. All data entry is complete. Sensors are installed.', }, { - name: 'Complete Finance PNS', - id: 10, + state_title: 'Complete Finance PNS', + state_id: 10, description: 'Complete Finance section of the PNS Form. This step does not have any dependencies. Must only be complete one month post site visit.', }, { - name: 'Send PNS Form', - id: 11, + state_title: 'Send PNS Form', + state_id: 11, description: 'Project Engineer sends client PNS Form.', }, { - name: 'Perform Initial Engineering Analysis', - id: 12, + state_title: 'Perform Initial Engineering Analysis', + state_id: 12, description: 'Project Engineer performs energy efficiency calculations for annual savings.', }, { - name: 'Send Diagnostic Report', - id: 13, + state_title: 'Send Diagnostic Report', + state_id: 13, description: 'Project Engineer creates diagnostic report.', }, { - name: 'Follow Up Post Project Update', - id: 14, + state_title: 'Follow Up Post Project Update', + state_id: 14, description: 'Project Engineer contacts client to discover if client is interested in moving forward.', }, { - name: 'Outsource Retrofit', - id: 15, + state_title: 'Outsource Retrofit', + state_id: 15, description: 'Project Manager assesses potential outsourced retrofits (e.g. lighting and windows).' }, { - name: 'HPD Finance', - id: 16, + state_title: 'HPD Finance', + state_id: 16, description: 'Finance discovers if HPD will finance the project.', }, { - name: 'Confirm Client wants HPD', - id: 17, + state_title: 'Confirm Client wants HPD', + state_id: 17, description: 'Finance confirms client wants to proceed with HPD program.' }, { - name: 'Preliminary Financial Analysis', - id: 18, + state_title: 'Preliminary Financial Analysis', + state_id: 18, description: 'Run preliminary finance model and suggest budget range for Project Engineer.', }, { - name: 'Confirm Project Financing', - id: 19, + state_title: 'Confirm Project Financing', + state_id: 19, description: 'Finance decides if project is feasible.', }, { - name: 'Perform Detailed Calculations and Analysis', - id: 20, + state_title: 'Perform Detailed Calculations and Analysis', + state_id: 20, description: 'Project Engineer runs models (hydronic, steam, cooling, heating, controls).', }, { - name: 'Write Scope of Work Report', - id: 21, + state_title: 'Write Scope of Work Report', + state_id: 21, description: 'Project Engineer selects desired equipment for retrofits.', }, { - name: 'Obtain Quotes', - id: 22, + state_title: 'Obtain Quotes', + state_id: 22, description: 'Project Manager bundles nearby projects together and sends equipment lists to contractor to collect quotes and look for violations.', }, { - name: 'Create Engineering Energy Output Model', - id: 23, + state_title: 'Create Engineering Energy Output Model', + state_id: 23, description: 'Project Engineer generates Engineering Output Model for suggested scenario.', }, { - name: 'Create Finance Model', - id: 24, + state_title: 'Create Finance Model', + state_id: 24, description: 'Finance uses quotes and Engineering Output Model to run Finance model for suggested scenario.', }, { - name: 'Create Client Presentation', - id: 25, + state_title: 'Create Client Presentation', + state_id: 25, description: 'Project Engineer creates final presentation for various retrofit scenarios with upfront cost estimates and annual savings.', }, { - name: 'Schedule Client Presentation', - id: 26, + state_title: 'Schedule Client Presentation', + state_id: 26, description: 'Project Manager coordinates with client, engineer, and finance/business to set up presentation date.', }, { - name: 'Present to Client', - id: 27, + state_title: 'Present to Client', + state_id: 27, description: 'Project Engineer presents retrofit scenarios and financing options to client.', }, { - name: 'Client Chooses Retrofits', - id: 28, + state_title: 'Client Chooses Retrofits', + state_id: 28, description: 'Project Engineer contacts Client to determine actionable retrofits. ', }, { - name: 'Redesign Scope of Work', - id: 29, + state_title: 'Redesign Scope of Work', + state_id: 29, description: 'Project Engineer redesigns and finalizes scope of work.', }, { - name: 'Finalize Quotes', - id: 30, + state_title: 'Finalize Quotes', + state_id: 30, description: 'Project Engineer sends contractor Final Scope of Work and finalizes quotes. Contractor signs contract.', }, { - name: 'Final Finance Model' , - id: 31, + state_title: 'Final Finance Model' , + state_id: 31, description: 'Finance runs the finance model to obtain actual costs inclduing payback years.', }, { - name: 'Update Client with Project Financing' , - id: 32 , + state_title: 'Update Client with Project Financing' , + state_id: 32 , description: 'Finance contacts client to discuss financing options such as loans and marketplace.', }, { - name: 'Client Decides on Marketplace' , - id: 33 , + state_title: 'Client Decides on Marketplace' , + state_id: 33 , description: 'Client decides if they want to use Marketplace.', }, { - name: 'Marketplace Content' , - id: 34, + state_title: 'Marketplace Content' , + state_id: 34, description: 'The Project content gets collected to prepare it for a Marketplace Launch.', }, { - name: 'Marketplace' , - id: 35, + state_title: 'Marketplace' , + state_id: 35, description: 'The Project is launched on the Marketplace and is being funded.', }, { - name: 'Contractor Downpayment' , - id: 39, + state_title: 'Contractor Downpayment' , + state_id: 39, description: 'A downpayment is payed to contractor.', }, { - name: 'Apply for Loan' , - id: 40, + state_title: 'Apply for Loan' , + state_id: 40, description: 'Finance appplies for loan.', }, { - name: 'Approval of Underwriter' , - id: 41, + state_title: 'Approval of Underwriter' , + state_id: 41, description: 'Finance is notified that the loan was approved by the Underwriter (banks).', }, { - name: 'Confirm Funding' , - id: 42, + state_title: 'Confirm Funding' , + state_id: 42, description: 'Finance confirms project is funded.', }, { - name: 'Commence Construction' , - id: 43, + state_title: 'Commence Construction' , + state_id: 43, description: 'Construction Manager coordinates with client contractor, and engineers to schedule retrofit construction.', }, { - name: 'Measurement and Verification' , - id: 44, + state_title: 'Measurement and Verification' , + state_id: 44, description: 'Project Engineer collects sensor data during site visit, recalibrates sensors, and reinstalls sensors for "post retrofit" measurement and verification.', }, { - name: 'Loan Payback' , - id: 45, + state_title: 'Loan Payback' , + state_id: 45, description: 'Loan is in the process of being paid back.', }, { - name: 'Completed', - id: 46, + state_title: 'Completed', + state_id: 46, description: 'Project is complete!' } ] -- GitLab From 0723136b7e8193139ca84bc65fdb4594611e01d3 Mon Sep 17 00:00:00 2001 From: Calvin Quach Date: Tue, 14 Jun 2016 16:24:05 -0400 Subject: [PATCH 024/101] Create visible state title and description at the bottom section of the single project view page. --- .../components/project/detail.component.html | 9 +++++++++ .../current/components/project/detail.component.ts | 4 ++-- .../current/components/project/state.component.html | 9 ++++++--- front/current/components/project/state.component.ts | 13 ++++++++----- 4 files changed, 25 insertions(+), 10 deletions(-) diff --git a/front/current/components/project/detail.component.html b/front/current/components/project/detail.component.html index 6a44d20..cfdcc36 100644 --- a/front/current/components/project/detail.component.html +++ b/front/current/components/project/detail.component.html @@ -36,3 +36,12 @@ [(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 63500c4..954ee5d 100644 --- a/front/current/components/project/detail.component.ts +++ b/front/current/components/project/detail.component.ts @@ -15,12 +15,12 @@ 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'; @Component({ selector: 'project', templateUrl: config.static_url + '/components/project/detail.component.html', - directives: [ROUTER_DIRECTIVES, AddressComponent, ContactsComponent, SlotsComponent] + directives: [ROUTER_DIRECTIVES, AddressComponent, ContactsComponent, SlotsComponent, StateComponent] }) export class ProjectDetailComponent implements OnInit { constructor( diff --git a/front/current/components/project/state.component.html b/front/current/components/project/state.component.html index f471a2b..5a45af5 100644 --- a/front/current/components/project/state.component.html +++ b/front/current/components/project/state.component.html @@ -1,8 +1,9 @@ - -
-

This project is still in pending state

+
+

{{state.state_title}}

+ +

{{state.description}}


@@ -17,3 +18,5 @@
+ + diff --git a/front/current/components/project/state.component.ts b/front/current/components/project/state.component.ts index fe450cc..9c28130 100644 --- a/front/current/components/project/state.component.ts +++ b/front/current/components/project/state.component.ts @@ -5,11 +5,14 @@ import { config } from '../../config'; @Component({ selector: 'state', templateUrl: config.static_url + '/components/project/state.component.html', - inputs: ['name', 'id', 'description'] + inputs: ['state'] }) export class StateComponent{ - public name: string; - public id: number; - public description: string; -} + public state_title: string; + public state: any; + public description: string; + public state_id: number; + +}; + -- GitLab From a92d792e15c1a4a9ac784db0dbdca9b6b097280c Mon Sep 17 00:00:00 2001 From: Nadim Date: Tue, 14 Jun 2016 16:50:22 -0400 Subject: [PATCH 025/101] Fix formatting issues including deleting new lines, deleting spaces, and reverting a variable name change which was done by accident --- front/current/components/project/detail.component.html | 10 +--------- front/current/components/project/state.component.ts | 7 +------ 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/front/current/components/project/detail.component.html b/front/current/components/project/detail.component.html index cfdcc36..ab19723 100644 --- a/front/current/components/project/detail.component.html +++ b/front/current/components/project/detail.component.html @@ -36,12 +36,4 @@ [(document_slots)]="document_slots" [(documents)]="documents" > - - - - - - - - - + diff --git a/front/current/components/project/state.component.ts b/front/current/components/project/state.component.ts index 9c28130..5776ece 100644 --- a/front/current/components/project/state.component.ts +++ b/front/current/components/project/state.component.ts @@ -9,10 +9,5 @@ import { config } from '../../config'; }) export class StateComponent{ - public state_title: string; - public state: any; - public description: string; - public state_id: number; - + public state: any; }; - -- GitLab From 69ed36bcf652594d5c768d69bfa77c15c5fc0a7b Mon Sep 17 00:00:00 2001 From: Nadim Date: Tue, 14 Jun 2016 16:55:44 -0400 Subject: [PATCH 026/101] Fix a naming convention issue by switching to Camel Case --- .../services/project/project.service.ts | 166 +++++++++--------- 1 file changed, 83 insertions(+), 83 deletions(-) diff --git a/front/current/services/project/project.service.ts b/front/current/services/project/project.service.ts index c6269bd..e6fdbf4 100644 --- a/front/current/services/project/project.service.ts +++ b/front/current/services/project/project.service.ts @@ -4,214 +4,214 @@ import { Model } from '../rest.service'; @Injectable() export class ProjectService { - public service_state_title:string = 'project'; + public service_name:string = 'project'; public config:any = config.SERVICES.project; public url:string = '/project/'; public states: any[] = [ { - state_title: 'Collect Forms', - state_id: 3, + stateTitle: 'Collect Forms', + stateID: 3, description: 'Collect 12 Months of Utility Bills and 3 years of Income. Fill out business section of PNS form.', }, { - state_title: 'Create Opportunity', - state_id: 4, + stateTitle: 'Create Opportunity', + stateID: 4, description: 'Create object on project dashboard with pending state. Create opportunity on salesforce.', }, { - state_title: 'Confirm Bill Validity', - state_id: 5, + stateTitle: 'Confirm Bill Validity', + stateID: 5, description: 'Quality Assurance checks bills on dashboard are correct.', }, { - state_title: 'Confirm Validity of 3 Years of Income Statements ', - state_id: 6, + stateTitle: 'Confirm Validity of 3 Years of Income Statements ', + stateID: 6, description: 'Finance does quality check on 3 Years of Income Statements on dashboard.', }, { - state_title: 'Schedule Site Visit', - state_id: 7, + stateTitle: 'Schedule Site Visit', + stateID: 7, description: 'Schedule site visit with client and project engineer.', }, { - state_title: 'Perform Remote Assessment', - state_id: 8, + stateTitle: 'Perform Remote Assessment', + stateID: 8, description: 'Project Engineers perform remote assessment (Energy Watch, Code Violations, Google Earth, Heat Load Calculations).', }, { - state_title: 'Conduct Site Visit', - state_id: 9, + stateTitle: 'Conduct Site Visit', + stateID: 9, description: 'Project Engineer conducts site visit audit. All data entry is complete. Sensors are installed.', }, { - state_title: 'Complete Finance PNS', - state_id: 10, + stateTitle: 'Complete Finance PNS', + stateID: 10, description: 'Complete Finance section of the PNS Form. This step does not have any dependencies. Must only be complete one month post site visit.', }, { - state_title: 'Send PNS Form', - state_id: 11, + stateTitle: 'Send PNS Form', + stateID: 11, description: 'Project Engineer sends client PNS Form.', }, { - state_title: 'Perform Initial Engineering Analysis', - state_id: 12, + stateTitle: 'Perform Initial Engineering Analysis', + stateID: 12, description: 'Project Engineer performs energy efficiency calculations for annual savings.', }, { - state_title: 'Send Diagnostic Report', - state_id: 13, + stateTitle: 'Send Diagnostic Report', + stateID: 13, description: 'Project Engineer creates diagnostic report.', }, { - state_title: 'Follow Up Post Project Update', - state_id: 14, + stateTitle: 'Follow Up Post Project Update', + stateID: 14, description: 'Project Engineer contacts client to discover if client is interested in moving forward.', }, { - state_title: 'Outsource Retrofit', - state_id: 15, + stateTitle: 'Outsource Retrofit', + stateID: 15, description: 'Project Manager assesses potential outsourced retrofits (e.g. lighting and windows).' }, { - state_title: 'HPD Finance', - state_id: 16, + stateTitle: 'HPD Finance', + stateID: 16, description: 'Finance discovers if HPD will finance the project.', }, { - state_title: 'Confirm Client wants HPD', - state_id: 17, + stateTitle: 'Confirm Client wants HPD', + stateID: 17, description: 'Finance confirms client wants to proceed with HPD program.' }, { - state_title: 'Preliminary Financial Analysis', - state_id: 18, + stateTitle: 'Preliminary Financial Analysis', + stateID: 18, description: 'Run preliminary finance model and suggest budget range for Project Engineer.', }, { - state_title: 'Confirm Project Financing', - state_id: 19, + stateTitle: 'Confirm Project Financing', + stateID: 19, description: 'Finance decides if project is feasible.', }, { - state_title: 'Perform Detailed Calculations and Analysis', - state_id: 20, + stateTitle: 'Perform Detailed Calculations and Analysis', + stateID: 20, description: 'Project Engineer runs models (hydronic, steam, cooling, heating, controls).', }, { - state_title: 'Write Scope of Work Report', - state_id: 21, + stateTitle: 'Write Scope of Work Report', + stateID: 21, description: 'Project Engineer selects desired equipment for retrofits.', }, { - state_title: 'Obtain Quotes', - state_id: 22, + stateTitle: 'Obtain Quotes', + stateID: 22, description: 'Project Manager bundles nearby projects together and sends equipment lists to contractor to collect quotes and look for violations.', }, { - state_title: 'Create Engineering Energy Output Model', - state_id: 23, + stateTitle: 'Create Engineering Energy Output Model', + stateID: 23, description: 'Project Engineer generates Engineering Output Model for suggested scenario.', }, { - state_title: 'Create Finance Model', - state_id: 24, + stateTitle: 'Create Finance Model', + stateID: 24, description: 'Finance uses quotes and Engineering Output Model to run Finance model for suggested scenario.', }, { - state_title: 'Create Client Presentation', - state_id: 25, + stateTitle: 'Create Client Presentation', + stateID: 25, description: 'Project Engineer creates final presentation for various retrofit scenarios with upfront cost estimates and annual savings.', }, { - state_title: 'Schedule Client Presentation', - state_id: 26, + stateTitle: 'Schedule Client Presentation', + stateID: 26, description: 'Project Manager coordinates with client, engineer, and finance/business to set up presentation date.', }, { - state_title: 'Present to Client', - state_id: 27, + stateTitle: 'Present to Client', + stateID: 27, description: 'Project Engineer presents retrofit scenarios and financing options to client.', }, { - state_title: 'Client Chooses Retrofits', - state_id: 28, + stateTitle: 'Client Chooses Retrofits', + stateID: 28, description: 'Project Engineer contacts Client to determine actionable retrofits. ', }, { - state_title: 'Redesign Scope of Work', - state_id: 29, + stateTitle: 'Redesign Scope of Work', + stateID: 29, description: 'Project Engineer redesigns and finalizes scope of work.', }, { - state_title: 'Finalize Quotes', - state_id: 30, + stateTitle: 'Finalize Quotes', + stateID: 30, description: 'Project Engineer sends contractor Final Scope of Work and finalizes quotes. Contractor signs contract.', }, { - state_title: 'Final Finance Model' , - state_id: 31, + stateTitle: 'Final Finance Model' , + stateID: 31, description: 'Finance runs the finance model to obtain actual costs inclduing payback years.', }, { - state_title: 'Update Client with Project Financing' , - state_id: 32 , + stateTitle: 'Update Client with Project Financing' , + stateID: 32 , description: 'Finance contacts client to discuss financing options such as loans and marketplace.', }, { - state_title: 'Client Decides on Marketplace' , - state_id: 33 , + stateTitle: 'Client Decides on Marketplace' , + stateID: 33 , description: 'Client decides if they want to use Marketplace.', }, { - state_title: 'Marketplace Content' , - state_id: 34, + stateTitle: 'Marketplace Content' , + stateID: 34, description: 'The Project content gets collected to prepare it for a Marketplace Launch.', }, { - state_title: 'Marketplace' , - state_id: 35, + stateTitle: 'Marketplace' , + stateID: 35, description: 'The Project is launched on the Marketplace and is being funded.', }, { - state_title: 'Contractor Downpayment' , - state_id: 39, + stateTitle: 'Contractor Downpayment' , + stateID: 39, description: 'A downpayment is payed to contractor.', }, { - state_title: 'Apply for Loan' , - state_id: 40, + stateTitle: 'Apply for Loan' , + stateID: 40, description: 'Finance appplies for loan.', }, { - state_title: 'Approval of Underwriter' , - state_id: 41, + stateTitle: 'Approval of Underwriter' , + stateID: 41, description: 'Finance is notified that the loan was approved by the Underwriter (banks).', }, { - state_title: 'Confirm Funding' , - state_id: 42, + stateTitle: 'Confirm Funding' , + stateID: 42, description: 'Finance confirms project is funded.', }, { - state_title: 'Commence Construction' , - state_id: 43, + stateTitle: 'Commence Construction' , + stateID: 43, description: 'Construction Manager coordinates with client contractor, and engineers to schedule retrofit construction.', }, { - state_title: 'Measurement and Verification' , - state_id: 44, + stateTitle: 'Measurement and Verification' , + stateID: 44, description: 'Project Engineer collects sensor data during site visit, recalibrates sensors, and reinstalls sensors for "post retrofit" measurement and verification.', }, { - state_title: 'Loan Payback' , - state_id: 45, + stateTitle: 'Loan Payback' , + stateID: 45, description: 'Loan is in the process of being paid back.', }, { - state_title: 'Completed', - state_id: 46, + stateTitle: 'Completed', + stateID: 46, description: 'Project is complete!' } ] -- GitLab From c0e047a5879d7afe028dc9e1c1ad479af8be70b5 Mon Sep 17 00:00:00 2001 From: Nadim Date: Tue, 14 Jun 2016 17:33:34 -0400 Subject: [PATCH 027/101] Delete dummy template in favor of a simpler implementation of the bottom section of the page. There is now an empty div waiting for the document slots after the full state machine implementation is done. Also fix one instance of the state title variable name for convention parity --- .../components/project/state.component.html | 23 ++++--------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/front/current/components/project/state.component.html b/front/current/components/project/state.component.html index 5a45af5..a3aefb6 100644 --- a/front/current/components/project/state.component.html +++ b/front/current/components/project/state.component.html @@ -1,22 +1,7 @@ - -
-

{{state.state_title}}

- +

{{state.stateTitle}}

{{state.description}}

- -
- -

Documents

- -

SCEEP Form

- -

Upload document

- - - +
+ +
- - -- GitLab From 7ebbc3cc144740c216562832de6b4197f4ff746e Mon Sep 17 00:00:00 2001 From: Nadim Date: Thu, 16 Jun 2016 11:02:16 -0400 Subject: [PATCH 028/101] More styling for state component. Add a horizontal line and space as well as padding for the text and coloring. --- front/current/assets/styles/components/_project.scss | 10 ++++++++++ front/current/components/project/state.component.html | 2 ++ 2 files changed, 12 insertions(+) diff --git a/front/current/assets/styles/components/_project.scss b/front/current/assets/styles/components/_project.scss index dedb30d..1c4f721 100644 --- a/front/current/assets/styles/components/_project.scss +++ b/front/current/assets/styles/components/_project.scss @@ -78,4 +78,14 @@ project { } } } + + state { + display: block; + flex-basis: 300px; + border-top: 5px solid black; + padding: 10px; + h4 { + color: $light-gray; + } + } } diff --git a/front/current/components/project/state.component.html b/front/current/components/project/state.component.html index a3aefb6..ec55a3c 100644 --- a/front/current/components/project/state.component.html +++ b/front/current/components/project/state.component.html @@ -1,5 +1,7 @@

{{state.stateTitle}}

+
+

{{state.description}}

-- GitLab From f99a4b3ab22a3da9dc2be2600380c7a45f5d0fbc Mon Sep 17 00:00:00 2001 From: Nadim Date: Thu, 16 Jun 2016 11:07:41 -0400 Subject: [PATCH 029/101] Revert a change that renamed variables in the states array in order to match coding convention. --- .../services/project/project.service.ts | 164 +++++++++--------- 1 file changed, 82 insertions(+), 82 deletions(-) diff --git a/front/current/services/project/project.service.ts b/front/current/services/project/project.service.ts index e6fdbf4..3ade946 100644 --- a/front/current/services/project/project.service.ts +++ b/front/current/services/project/project.service.ts @@ -10,208 +10,208 @@ export class ProjectService { public states: any[] = [ { - stateTitle: 'Collect Forms', - stateID: 3, + name: 'Collect Forms', + id: 3, description: 'Collect 12 Months of Utility Bills and 3 years of Income. Fill out business section of PNS form.', }, { - stateTitle: 'Create Opportunity', - stateID: 4, + name: 'Create Opportunity', + id: 4, description: 'Create object on project dashboard with pending state. Create opportunity on salesforce.', }, { - stateTitle: 'Confirm Bill Validity', - stateID: 5, + name: 'Confirm Bill Validity', + id: 5, description: 'Quality Assurance checks bills on dashboard are correct.', }, { - stateTitle: 'Confirm Validity of 3 Years of Income Statements ', - stateID: 6, + name: 'Confirm Validity of 3 Years of Income Statements ', + id: 6, description: 'Finance does quality check on 3 Years of Income Statements on dashboard.', }, { - stateTitle: 'Schedule Site Visit', - stateID: 7, + name: 'Schedule Site Visit', + id: 7, description: 'Schedule site visit with client and project engineer.', }, { - stateTitle: 'Perform Remote Assessment', - stateID: 8, + name: 'Perform Remote Assessment', + id: 8, description: 'Project Engineers perform remote assessment (Energy Watch, Code Violations, Google Earth, Heat Load Calculations).', }, { - stateTitle: 'Conduct Site Visit', - stateID: 9, + name: 'Conduct Site Visit', + id: 9, description: 'Project Engineer conducts site visit audit. All data entry is complete. Sensors are installed.', }, { - stateTitle: 'Complete Finance PNS', - stateID: 10, + name: 'Complete Finance PNS', + id: 10, description: 'Complete Finance section of the PNS Form. This step does not have any dependencies. Must only be complete one month post site visit.', }, { - stateTitle: 'Send PNS Form', - stateID: 11, + name: 'Send PNS Form', + id: 11, description: 'Project Engineer sends client PNS Form.', }, { - stateTitle: 'Perform Initial Engineering Analysis', - stateID: 12, + name: 'Perform Initial Engineering Analysis', + id: 12, description: 'Project Engineer performs energy efficiency calculations for annual savings.', }, { - stateTitle: 'Send Diagnostic Report', - stateID: 13, + name: 'Send Diagnostic Report', + id: 13, description: 'Project Engineer creates diagnostic report.', }, { - stateTitle: 'Follow Up Post Project Update', - stateID: 14, + name: 'Follow Up Post Project Update', + id: 14, description: 'Project Engineer contacts client to discover if client is interested in moving forward.', }, { - stateTitle: 'Outsource Retrofit', - stateID: 15, + name: 'Outsource Retrofit', + id: 15, description: 'Project Manager assesses potential outsourced retrofits (e.g. lighting and windows).' }, { - stateTitle: 'HPD Finance', - stateID: 16, + name: 'HPD Finance', + id: 16, description: 'Finance discovers if HPD will finance the project.', }, { - stateTitle: 'Confirm Client wants HPD', - stateID: 17, + name: 'Confirm Client wants HPD', + id: 17, description: 'Finance confirms client wants to proceed with HPD program.' }, { - stateTitle: 'Preliminary Financial Analysis', - stateID: 18, + name: 'Preliminary Financial Analysis', + id: 18, description: 'Run preliminary finance model and suggest budget range for Project Engineer.', }, { - stateTitle: 'Confirm Project Financing', - stateID: 19, + name: 'Confirm Project Financing', + id: 19, description: 'Finance decides if project is feasible.', }, { - stateTitle: 'Perform Detailed Calculations and Analysis', - stateID: 20, + name: 'Perform Detailed Calculations and Analysis', + id: 20, description: 'Project Engineer runs models (hydronic, steam, cooling, heating, controls).', }, { - stateTitle: 'Write Scope of Work Report', - stateID: 21, + name: 'Write Scope of Work Report', + id: 21, description: 'Project Engineer selects desired equipment for retrofits.', }, { - stateTitle: 'Obtain Quotes', - stateID: 22, + name: 'Obtain Quotes', + id: 22, description: 'Project Manager bundles nearby projects together and sends equipment lists to contractor to collect quotes and look for violations.', }, { - stateTitle: 'Create Engineering Energy Output Model', - stateID: 23, + name: 'Create Engineering Energy Output Model', + id: 23, description: 'Project Engineer generates Engineering Output Model for suggested scenario.', }, { - stateTitle: 'Create Finance Model', - stateID: 24, + name: 'Create Finance Model', + id: 24, description: 'Finance uses quotes and Engineering Output Model to run Finance model for suggested scenario.', }, { - stateTitle: 'Create Client Presentation', - stateID: 25, + name: 'Create Client Presentation', + id: 25, description: 'Project Engineer creates final presentation for various retrofit scenarios with upfront cost estimates and annual savings.', }, { - stateTitle: 'Schedule Client Presentation', - stateID: 26, + name: 'Schedule Client Presentation', + id: 26, description: 'Project Manager coordinates with client, engineer, and finance/business to set up presentation date.', }, { - stateTitle: 'Present to Client', - stateID: 27, + name: 'Present to Client', + id: 27, description: 'Project Engineer presents retrofit scenarios and financing options to client.', }, { - stateTitle: 'Client Chooses Retrofits', - stateID: 28, + name: 'Client Chooses Retrofits', + id: 28, description: 'Project Engineer contacts Client to determine actionable retrofits. ', }, { - stateTitle: 'Redesign Scope of Work', - stateID: 29, + name: 'Redesign Scope of Work', + id: 29, description: 'Project Engineer redesigns and finalizes scope of work.', }, { - stateTitle: 'Finalize Quotes', - stateID: 30, + name: 'Finalize Quotes', + id: 30, description: 'Project Engineer sends contractor Final Scope of Work and finalizes quotes. Contractor signs contract.', }, { - stateTitle: 'Final Finance Model' , - stateID: 31, + name: 'Final Finance Model' , + id: 31, description: 'Finance runs the finance model to obtain actual costs inclduing payback years.', }, { - stateTitle: 'Update Client with Project Financing' , - stateID: 32 , + name: 'Update Client with Project Financing' , + id: 32 , description: 'Finance contacts client to discuss financing options such as loans and marketplace.', }, { - stateTitle: 'Client Decides on Marketplace' , - stateID: 33 , + name: 'Client Decides on Marketplace' , + id: 33 , description: 'Client decides if they want to use Marketplace.', }, { - stateTitle: 'Marketplace Content' , - stateID: 34, + name: 'Marketplace Content' , + id: 34, description: 'The Project content gets collected to prepare it for a Marketplace Launch.', }, { - stateTitle: 'Marketplace' , - stateID: 35, + name: 'Marketplace' , + id: 35, description: 'The Project is launched on the Marketplace and is being funded.', }, { - stateTitle: 'Contractor Downpayment' , - stateID: 39, + name: 'Contractor Downpayment' , + id: 39, description: 'A downpayment is payed to contractor.', }, { - stateTitle: 'Apply for Loan' , - stateID: 40, + name: 'Apply for Loan' , + id: 40, description: 'Finance appplies for loan.', }, { - stateTitle: 'Approval of Underwriter' , - stateID: 41, + name: 'Approval of Underwriter' , + id: 41, description: 'Finance is notified that the loan was approved by the Underwriter (banks).', }, { - stateTitle: 'Confirm Funding' , - stateID: 42, + name: 'Confirm Funding' , + id: 42, description: 'Finance confirms project is funded.', }, { - stateTitle: 'Commence Construction' , - stateID: 43, + name: 'Commence Construction' , + id: 43, description: 'Construction Manager coordinates with client contractor, and engineers to schedule retrofit construction.', }, { - stateTitle: 'Measurement and Verification' , - stateID: 44, + name: 'Measurement and Verification' , + id: 44, description: 'Project Engineer collects sensor data during site visit, recalibrates sensors, and reinstalls sensors for "post retrofit" measurement and verification.', }, { - stateTitle: 'Loan Payback' , - stateID: 45, + name: 'Loan Payback' , + id: 45, description: 'Loan is in the process of being paid back.', }, { - stateTitle: 'Completed', - stateID: 46, + name: 'Completed', + id: 46, description: 'Project is complete!' } ] -- GitLab From d7e94ed33ed57557819000411dc8fb157e1750ca Mon Sep 17 00:00:00 2001 From: Nadim Date: Thu, 16 Jun 2016 11:09:29 -0400 Subject: [PATCH 030/101] Fix an instance of stateTitle instead of name in the state component html file --- 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 ec55a3c..bfa404c 100644 --- a/front/current/components/project/state.component.html +++ b/front/current/components/project/state.component.html @@ -1,5 +1,5 @@
-

{{state.stateTitle}}

+

{{state.name}}



{{state.description}}

-- GitLab From cd18d63b08e71400fdcf4c43e9a7e761501523cf Mon Sep 17 00:00:00 2001 From: calvinqh Date: Fri, 17 Jun 2016 10:41:50 -0400 Subject: [PATCH 031/101] Set up states.compoent.html and ts file. --- .../components/project/states.component.html | 5 +++++ .../components/project/states.component.ts | 16 ++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 front/current/components/project/states.component.html create 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 new file mode 100644 index 0000000..e4fcf81 --- /dev/null +++ b/front/current/components/project/states.component.html @@ -0,0 +1,5 @@ +
+

{{currentState.name}}

+

{{currentState.description}}

+ +
diff --git a/front/current/components/project/states.component.ts b/front/current/components/project/states.component.ts new file mode 100644 index 0000000..dadd4c8 --- /dev/null +++ b/front/current/components/project/states.component.ts @@ -0,0 +1,16 @@ +import { Component } from 'angular2/core'; +import { config } from '../../config'; +import { StateComponent } from './state.component'; + +@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*/ + +}; + -- GitLab From 26f732f129e9ac3426d4e850fff636b51a5869be Mon Sep 17 00:00:00 2001 From: calvinqh Date: Fri, 17 Jun 2016 10:43:07 -0400 Subject: [PATCH 032/101] Add states selector into detail html and StatesComponent into directives for the detail ts file. --- front/current/components/project/detail.component.html | 4 +++- front/current/components/project/detail.component.ts | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/front/current/components/project/detail.component.html b/front/current/components/project/detail.component.html index ab19723..c00227e 100644 --- a/front/current/components/project/detail.component.html +++ b/front/current/components/project/detail.component.html @@ -36,4 +36,6 @@ [(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 954ee5d..4a44f63 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( -- GitLab From f59227243e00c77a274a1f813616cd46206aedb3 Mon Sep 17 00:00:00 2001 From: calvinqh Date: Fri, 17 Jun 2016 10:46:46 -0400 Subject: [PATCH 033/101] Remove div tag from html file and extra newline from ts file. --- .../components/project/state.component.html | 15 +++++++-------- .../current/components/project/state.component.ts | 1 - 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/front/current/components/project/state.component.html b/front/current/components/project/state.component.html index bfa404c..9342cbd 100644 --- a/front/current/components/project/state.component.html +++ b/front/current/components/project/state.component.html @@ -1,9 +1,8 @@ -
-

{{state.name}}

-
-
-

{{state.description}}

-
- -
+

{{state.name}}

+
+
+

{{state.description}}

+
+
+ diff --git a/front/current/components/project/state.component.ts b/front/current/components/project/state.component.ts index 5776ece..179761e 100644 --- a/front/current/components/project/state.component.ts +++ b/front/current/components/project/state.component.ts @@ -7,7 +7,6 @@ import { config } from '../../config'; templateUrl: config.static_url + '/components/project/state.component.html', inputs: ['state'] }) - export class StateComponent{ public state: any; }; -- GitLab From fb68f9ae362520838b833c1bc17c48edd0ddf977 Mon Sep 17 00:00:00 2001 From: calvinqh Date: Fri, 17 Jun 2016 11:31:05 -0400 Subject: [PATCH 034/101] Add loop to states ts file to show all states on page. --- front/current/assets/styles/components/_project.scss | 2 +- front/current/components/project/state.component.html | 1 - front/current/components/project/states.component.html | 8 ++++---- front/current/components/project/states.component.ts | 8 ++++++-- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/front/current/assets/styles/components/_project.scss b/front/current/assets/styles/components/_project.scss index 1c4f721..4846528 100644 --- a/front/current/assets/styles/components/_project.scss +++ b/front/current/assets/styles/components/_project.scss @@ -79,7 +79,7 @@ project { } } - state { + states { display: block; flex-basis: 300px; border-top: 5px solid black; diff --git a/front/current/components/project/state.component.html b/front/current/components/project/state.component.html index bfa404c..e0d8813 100644 --- a/front/current/components/project/state.component.html +++ b/front/current/components/project/state.component.html @@ -1,7 +1,6 @@

{{state.name}}


-

{{state.description}}

diff --git a/front/current/components/project/states.component.html b/front/current/components/project/states.component.html index e4fcf81..3e1b8f8 100644 --- a/front/current/components/project/states.component.html +++ b/front/current/components/project/states.component.html @@ -1,5 +1,5 @@ -
-

{{currentState.name}}

-

{{currentState.description}}

+ -
diff --git a/front/current/components/project/states.component.ts b/front/current/components/project/states.component.ts index dadd4c8..76f9d15 100644 --- a/front/current/components/project/states.component.ts +++ b/front/current/components/project/states.component.ts @@ -1,16 +1,20 @@ 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'] + inputs: ['currentState'], directives: [StateComponent] }) export class StatesComponent{ public currentState: any; /*Points to current state*/ + constructor( + public projectService:ProjectService + ){}; + }; -- GitLab From 7497bc6f9228ddc81f46e52c064b3cb3a0853645 Mon Sep 17 00:00:00 2001 From: calvinqh Date: Fri, 17 Jun 2016 15:09:50 -0400 Subject: [PATCH 035/101] All the states show horizontally. --- .../assets/styles/components/_project.scss | 29 ++++++++++++++----- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/front/current/assets/styles/components/_project.scss b/front/current/assets/styles/components/_project.scss index 4846528..822f681 100644 --- a/front/current/assets/styles/components/_project.scss +++ b/front/current/assets/styles/components/_project.scss @@ -78,14 +78,29 @@ project { } } } - - states { - display: block; - flex-basis: 300px; + + .c_states{ + white-space: nowrap; + overflow-x:scroll; + } + states{ + //white-space: nowrap; + //overflow-x:scroll; + //padding-top: 100px; + flex-basis:300px; border-top: 5px solid black; - padding: 10px; - h4 { - color: $light-gray; + width:auto; + state { + display: inline-block; + //flex-basis: 300px; + //border-top: 5px solid black; + padding: 10px; + h4 { + color: $light-gray; + } + width:500px; } + } } + -- GitLab From 5eb8ccce09361a8bc56a96152e5bdcae0b35cd29 Mon Sep 17 00:00:00 2001 From: calvinqh Date: Fri, 17 Jun 2016 15:10:27 -0400 Subject: [PATCH 036/101] Create wrapper class for states html. --- front/current/components/project/states.component.html | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/front/current/components/project/states.component.html b/front/current/components/project/states.component.html index 3e1b8f8..6fc5be4 100644 --- a/front/current/components/project/states.component.html +++ b/front/current/components/project/states.component.html @@ -1,5 +1,7 @@ - +
+ +
-- GitLab From 22a60dac98681b88bfd815d71e402cf0c70b9f4f Mon Sep 17 00:00:00 2001 From: calvinqh Date: Fri, 17 Jun 2016 15:23:16 -0400 Subject: [PATCH 037/101] Changes to width --- 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 822f681..b5d8678 100644 --- a/front/current/assets/styles/components/_project.scss +++ b/front/current/assets/styles/components/_project.scss @@ -82,14 +82,15 @@ project { .c_states{ white-space: nowrap; overflow-x:scroll; + //width:auto; } states{ //white-space: nowrap; //overflow-x:scroll; //padding-top: 100px; - flex-basis:300px; + flex-basis:auto; border-top: 5px solid black; - width:auto; + //width:100%; state { display: inline-block; //flex-basis: 300px; @@ -98,7 +99,7 @@ project { h4 { color: $light-gray; } - width:500px; + width:auto; } } -- GitLab From 7089474863d0b839ef0de8072f720cc8c16b1b26 Mon Sep 17 00:00:00 2001 From: calvinqh Date: Fri, 17 Jun 2016 17:11:22 -0400 Subject: [PATCH 038/101] Add width to project selector, which is the parent of states component. The full scrolling states layout is complete. --- front/current/assets/styles/components/_project.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/front/current/assets/styles/components/_project.scss b/front/current/assets/styles/components/_project.scss index b5d8678..b99d6da 100644 --- a/front/current/assets/styles/components/_project.scss +++ b/front/current/assets/styles/components/_project.scss @@ -9,6 +9,7 @@ project { display: flex; flex-direction: column; flex-grow: 1; + width:100px; header { display: flex; @@ -88,7 +89,7 @@ project { //white-space: nowrap; //overflow-x:scroll; //padding-top: 100px; - flex-basis:auto; + //flex-basis:auto; border-top: 5px solid black; //width:100%; state { -- GitLab From cc8551df1d1f2549abc142254cb2f4e579a75882 Mon Sep 17 00:00:00 2001 From: calvinqh Date: Mon, 20 Jun 2016 12:48:01 -0400 Subject: [PATCH 039/101] 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 12:50:56 -0400 Subject: [PATCH 040/101] Remove extra line. --- front/current/components/project/state.component.html | 1 - 1 file changed, 1 deletion(-) diff --git a/front/current/components/project/state.component.html b/front/current/components/project/state.component.html index 9342cbd..deeec41 100644 --- a/front/current/components/project/state.component.html +++ b/front/current/components/project/state.component.html @@ -5,4 +5,3 @@
- -- GitLab From 7050e07c68599d82434e6fac455698947f55fe19 Mon Sep 17 00:00:00 2001 From: calvinqh Date: Mon, 20 Jun 2016 16:18:33 -0400 Subject: [PATCH 041/101] 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 042/101] 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 043/101] 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 10:13:51 -0400 Subject: [PATCH 044/101] Remove extra lines and delete extra comments. --- .../current/assets/styles/components/_project.scss | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/front/current/assets/styles/components/_project.scss b/front/current/assets/styles/components/_project.scss index b99d6da..3eb4a00 100644 --- a/front/current/assets/styles/components/_project.scss +++ b/front/current/assets/styles/components/_project.scss @@ -83,26 +83,20 @@ 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; + width: auto; + h4 { color: $light-gray; } - width:auto; } - } } -- GitLab From 8d7e38109911452871686b98d6053e690b0d8be7 Mon Sep 17 00:00:00 2001 From: calvinqh Date: Tue, 21 Jun 2016 10:17:17 -0400 Subject: [PATCH 045/101] Remove extra new lines. --- front/current/components/project/detail.component.html | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/front/current/components/project/detail.component.html b/front/current/components/project/detail.component.html index c00227e..d3a9d7f 100644 --- a/front/current/components/project/detail.component.html +++ b/front/current/components/project/detail.component.html @@ -35,7 +35,5 @@ [project]="project" [(document_slots)]="document_slots" [(documents)]="documents" - >
- - - + > + -- GitLab From 55b32d23d2d2f68e533d76b4e32368eb473b0754 Mon Sep 17 00:00:00 2001 From: calvinqh Date: Tue, 21 Jun 2016 10:18:16 -0400 Subject: [PATCH 046/101] Remove extra line. --- front/current/components/project/states.component.html | 1 - 1 file changed, 1 deletion(-) diff --git a/front/current/components/project/states.component.html b/front/current/components/project/states.component.html index 6fc5be4..ce5b55c 100644 --- a/front/current/components/project/states.component.html +++ b/front/current/components/project/states.component.html @@ -4,4 +4,3 @@ [state]="state" >
- -- GitLab From 5efaac3c7e0d50967ab15e9d5faa839f63631456 Mon Sep 17 00:00:00 2001 From: calvinqh Date: Tue, 21 Jun 2016 10:21:53 -0400 Subject: [PATCH 047/101] Add 2 lines between imports and start of code --- front/current/components/project/states.component.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/front/current/components/project/states.component.ts b/front/current/components/project/states.component.ts index 76f9d15..061ded1 100644 --- a/front/current/components/project/states.component.ts +++ b/front/current/components/project/states.component.ts @@ -2,6 +2,8 @@ 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', @@ -15,6 +17,4 @@ export class StatesComponent{ constructor( public projectService:ProjectService ){}; - }; - -- GitLab From c2fd63958bfd855385b17ea2980279d42a9c8ce8 Mon Sep 17 00:00:00 2001 From: calvinqh Date: Tue, 21 Jun 2016 11:19:47 -0400 Subject: [PATCH 048/101] Remove state-wrap class --- front/current/components/project/state.component.html | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/front/current/components/project/state.component.html b/front/current/components/project/state.component.html index fe82d82..deeec41 100644 --- a/front/current/components/project/state.component.html +++ b/front/current/components/project/state.component.html @@ -1,17 +1,7 @@ -<<<<<<< HEAD -
-

{{state.name}}

-
-

{{state.description}}

-
- -
-=======

{{state.name}}



{{state.description}}

->>>>>>> origin/master
-- GitLab From 6a44e62b409252132d7158c5bdcaa3dcc893bb1d Mon Sep 17 00:00:00 2001 From: calvinqh Date: Tue, 21 Jun 2016 11:57:34 -0400 Subject: [PATCH 049/101] 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 050/101] 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 051/101] 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 052/101] 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 6087276b74dd9bb7e1d504ef0d2a207608b216fa Mon Sep 17 00:00:00 2001 From: calvinqh Date: Wed, 22 Jun 2016 11:02:11 -0400 Subject: [PATCH 053/101] Delete trailing whitespace and delete extra newline. --- front/current/components/project/detail.component.html | 2 +- front/current/components/project/states.component.ts | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/front/current/components/project/detail.component.html b/front/current/components/project/detail.component.html index d3a9d7f..7a135a5 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/states.component.ts b/front/current/components/project/states.component.ts index 061ded1..1b48ade 100644 --- a/front/current/components/project/states.component.ts +++ b/front/current/components/project/states.component.ts @@ -10,7 +10,6 @@ import { ProjectService } from '../../services/project/project.service'; inputs: ['currentState'], directives: [StateComponent] }) - export class StatesComponent{ public currentState: any; /*Points to current state*/ -- GitLab From d389db1ed552c07b693d4aafc74985e9479e55d6 Mon Sep 17 00:00:00 2001 From: calvinqh Date: Wed, 22 Jun 2016 11:04:41 -0400 Subject: [PATCH 054/101] Delete trailing whitespace. --- front/current/components/project/detail.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/current/components/project/detail.component.html b/front/current/components/project/detail.component.html index 7a135a5..eddec1a 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" > - + -- GitLab From e554e50254cfb34c7ea25499145487dbc8e181c4 Mon Sep 17 00:00:00 2001 From: calvinqh Date: Wed, 22 Jun 2016 11:06:32 -0400 Subject: [PATCH 055/101] Delete trailing whitespace. --- front/current/components/project/detail.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/current/components/project/detail.component.html b/front/current/components/project/detail.component.html index eddec1a..9d19eef 100644 --- a/front/current/components/project/detail.component.html +++ b/front/current/components/project/detail.component.html @@ -35,5 +35,5 @@ [project]="project" [(document_slots)]="document_slots" [(documents)]="documents" - > + > -- GitLab From f66d9f383d28c19d789dc8777ff39afdb5e30dda Mon Sep 17 00:00:00 2001 From: calvinqh Date: Wed, 22 Jun 2016 11:38:20 -0400 Subject: [PATCH 056/101] 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 3af0cdcd7c0e46096e1df27874a2f2ce2743edfb Mon Sep 17 00:00:00 2001 From: calvinqh Date: Wed, 22 Jun 2016 11:41:52 -0400 Subject: [PATCH 057/101] Remove whitespace between state tag and extra newline at the end of styles --- front/current/assets/styles/components/_project.scss | 1 - front/current/components/project/states.component.html | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/front/current/assets/styles/components/_project.scss b/front/current/assets/styles/components/_project.scss index 3eb4a00..b7a6c11 100644 --- a/front/current/assets/styles/components/_project.scss +++ b/front/current/assets/styles/components/_project.scss @@ -99,4 +99,3 @@ project { } } } - diff --git a/front/current/components/project/states.component.html b/front/current/components/project/states.component.html index ce5b55c..160b4a3 100644 --- a/front/current/components/project/states.component.html +++ b/front/current/components/project/states.component.html @@ -2,5 +2,5 @@ + >
-- GitLab From 88228d87618dce9331f2d6c611616368129a66d3 Mon Sep 17 00:00:00 2001 From: Nadim Date: Wed, 22 Jun 2016 12:00:22 -0400 Subject: [PATCH 058/101] 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 059/101] 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 b135dbcae9595eea3b30d2814c0bb324885fe6fe Mon Sep 17 00:00:00 2001 From: calvinqh Date: Wed, 22 Jun 2016 17:07:09 -0400 Subject: [PATCH 060/101] Change the width of project selector to zero. --- 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 b7a6c11..3deed4f 100644 --- a/front/current/assets/styles/components/_project.scss +++ b/front/current/assets/styles/components/_project.scss @@ -9,7 +9,7 @@ project { display: flex; flex-direction: column; flex-grow: 1; - width:100px; + 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; -- GitLab From 4983272d118c069b03ee976bfabf8340e6c4f5ba Mon Sep 17 00:00:00 2001 From: calvinqh Date: Wed, 22 Jun 2016 17:18:20 -0400 Subject: [PATCH 061/101] 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 10:03:39 -0400 Subject: [PATCH 062/101] Fix comments so that line length is less than 100. --- 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 3deed4f..97828d2 100644 --- a/front/current/assets/styles/components/_project.scss +++ b/front/current/assets/styles/components/_project.scss @@ -9,7 +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 + 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; -- GitLab From c56812eae04d6c1c50661c4a0a61647bd095ba71 Mon Sep 17 00:00:00 2001 From: calvinqh Date: Thu, 23 Jun 2016 10:21:12 -0400 Subject: [PATCH 063/101] Add hanging indent to comments. --- 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 97828d2..ebff1e9 100644 --- a/front/current/assets/styles/components/_project.scss +++ b/front/current/assets/styles/components/_project.scss @@ -10,8 +10,8 @@ project { 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. + // 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; -- GitLab From eb01a51602a391de733845ed925a4a7c528a084f Mon Sep 17 00:00:00 2001 From: Nadim Date: Thu, 23 Jun 2016 11:34:08 -0400 Subject: [PATCH 064/101] 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 065/101] 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 066/101] 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 067/101] 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 068/101] 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 069/101] 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 070/101] 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 071/101] 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 072/101] 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 073/101] 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 074/101] 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 075/101] 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 076/101] 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 077/101] 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 078/101] 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 079/101] 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 080/101] 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 081/101] 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 082/101] 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 083/101] 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 084/101] 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 085/101] 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 086/101] 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 087/101] 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 088/101] 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 089/101] 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 090/101] 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 091/101] 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 092/101] 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 093/101] 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 094/101] 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 095/101] 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 096/101] 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 097/101] 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 098/101] 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 099/101] 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 From 4598a10778fcd4a609048cf28d7032dbcfa5728a Mon Sep 17 00:00:00 2001 From: astex <0astex@gmail.com> Date: Wed, 29 Jun 2016 14:06:14 -0400 Subject: [PATCH 100/101] Fix hidden file input positioning. --- front/current/assets/styles/components/_global.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/front/current/assets/styles/components/_global.scss b/front/current/assets/styles/components/_global.scss index 2a47036..3b56ff9 100644 --- a/front/current/assets/styles/components/_global.scss +++ b/front/current/assets/styles/components/_global.scss @@ -110,7 +110,6 @@ address { font-style: normal; } input[type=file].hidden { width: 0.1px; height: 0.1px; - position: absolute; opacity: 0; overflow: hidden; z-index: -1; -- GitLab From 78f81d1751beac27dfe5e685aafd8d46a1c5bdf3 Mon Sep 17 00:00:00 2001 From: calvinqh Date: Thu, 30 Jun 2016 12:55:18 -0400 Subject: [PATCH 101/101] Change state id of misc state to 3. --- 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 489b06e..83c2278 100644 --- a/front/current/components/project/slots.component.ts +++ b/front/current/components/project/slots.component.ts @@ -42,7 +42,7 @@ export class SlotsComponent { {name: 'nyserda', title: 'NYSERDA Request for Financing Form', state_id: 40}, {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} + {name: 'misc', title: 'Miscellaneous', state_id: 3} ]; project:Model; document_slots:Collection; -- GitLab