From d6c0e581f6ae4c373fd4004bd40c1273c352ee77 Mon Sep 17 00:00:00 2001 From: Calvin Quach Date: Mon, 13 Jun 2016 11:05:17 -0400 Subject: [PATCH 01/16] 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 02/16] 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 03/16] 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 04/16] 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 05/16] 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 06/16] 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 07/16] 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 08/16] 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 09/16] 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 10/16] 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 11/16] 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 12/16] 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 13/16] 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 14/16] 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 15/16] 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 16/16] 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