From 78bd8376a7e6129a3dda9c3f799d5b077cba2e08 Mon Sep 17 00:00:00 2001 From: Nadim Date: Mon, 13 Jun 2016 17:05:33 -0400 Subject: [PATCH 01/14] 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 02/14] 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 03/14] 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 04/14] 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 05/14] 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 06/14] 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 07/14] 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 08/14] 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 09/14] 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 10/14] 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 11/14] 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 12/14] 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 f59227243e00c77a274a1f813616cd46206aedb3 Mon Sep 17 00:00:00 2001 From: calvinqh Date: Fri, 17 Jun 2016 10:46:46 -0400 Subject: [PATCH 13/14] 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 042b8957362fd12c23818ed943b5b0bde9475496 Mon Sep 17 00:00:00 2001 From: calvinqh Date: Mon, 20 Jun 2016 12:50:56 -0400 Subject: [PATCH 14/14] 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